nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-25 06:36:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Scripts/Midsummer): Make beam target Ribbon Pole top (#17358)

Browse Source 
* fix(Scripts/Midsummer): Make beam target Ribbon Pole top

progress #12145

* refactor(Scripts/Midsummer): shorten spell_midsummer_ribbon_pole_visual::UpdateTarget
This commit is contained in:
Ludwig
2023-09-26 23:51:59 +02:00
committed by GitHub
parent 2d620f20dd
commit 6649ad08d7
2 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/sql/updates/pending_db_world/rev_1695647577303392800.sql Normal file
View File

@@ -0,0 +1,4 @@
-- #12145 midsummer add spell script spell_midsummer_ribbon_pole_visual
DELETE FROM acore_world.spell_script_names WHERE spell_id = 29172;
INSERT INTO acore_world.spell_script_names (spell_id, ScriptName) VALUES
(29172, 'spell_midsummer_ribbon_pole_visual');

34
src/server/scripts/Events/midsummer.cpp
View File

@@ -253,6 +253,39 @@ class spell_midsummer_ribbon_pole : public AuraScript
}
};
class spell_midsummer_ribbon_pole_visual : public SpellScript
{
PrepareSpellScript(spell_midsummer_ribbon_pole_visual)
void UpdateTarget(WorldObject*& target)
{
if (!target)
return;
// find NPC at ribbon pole top as target
// trap 181604 also spawns NPCs at pole bottom - ignore those
std::list<Creature*> crList;
target->GetCreaturesWithEntryInRange(crList, 30.0f, NPC_RIBBON_POLE_DEBUG_TARGET);
if (crList.empty())
return;
for (std::list<Creature*>::const_iterator itr = crList.begin(); itr != crList.end(); ++itr)
{
// NPC on ribbon pole top is no tempsummon
if (!(*itr)->ToTempSummon())
{
target = *itr;
return;
}
}
}
void Register() override
{
OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_midsummer_ribbon_pole_visual::UpdateTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY);
}
};
class spell_midsummer_torch_quest : public AuraScript
{
PrepareAuraScript(spell_midsummer_torch_quest)
@@ -514,6 +547,7 @@ void AddSC_event_midsummer_scripts()
// Spells
RegisterSpellScript(spell_gen_crab_disguise);
RegisterSpellScript(spell_midsummer_ribbon_pole);
RegisterSpellScript(spell_midsummer_ribbon_pole_visual);
RegisterSpellScript(spell_midsummer_torch_quest);
RegisterSpellScript(spell_midsummer_fling_torch);
RegisterSpellScript(spell_midsummer_juggling_torch);