sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Scripts/Midsummer): Add missing torch shadows (#17323)

Browse Source
This commit is contained in:
Ludwig
2023-09-24 21:24:33 +02:00
committed by GitHub
parent 6990a1d2a4
commit e2e393502c
1 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Events/midsummer.cpp
+25 -1
View File
@@ -296,6 +296,7 @@ enum flingTorch
SPELL_FLING_TORCH_DUMMY = 46747, SPELL_FLING_TORCH_DUMMY = 46747,
SPELL_MISSED_TORCH = 45676, SPELL_MISSED_TORCH = 45676,
SPELL_TORCH_COUNTER = 45693, SPELL_TORCH_COUNTER = 45693,
SPELL_TORCH_SHADOW = 46105
}; };
class spell_midsummer_fling_torch : public SpellScript class spell_midsummer_fling_torch : public SpellScript
@@ -339,7 +340,10 @@ class spell_midsummer_fling_torch : public SpellScript
// we have any pos // we have any pos
if (pos.GetPositionX()) if (pos.GetPositionX())
{
caster->CastSpell(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), SPELL_FLING_TORCH, true); caster->CastSpell(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), SPELL_FLING_TORCH, true);
caster->CastSpell(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), SPELL_TORCH_SHADOW, true);
}
} }
void HandleFinish() void HandleFinish()
@@ -417,7 +421,12 @@ enum eJuggle
SPELL_TORCH_CHECK = 45644, SPELL_TORCH_CHECK = 45644,
SPELL_GIVE_TORCH = 45280, SPELL_GIVE_TORCH = 45280,
QUEST_TORCH_CATCHING_A = 11657, QUEST_TORCH_CATCHING_A = 11657,
QUEST_TORCH_CATCHING_H = 11923 QUEST_TORCH_CATCHING_H = 11923,
SPELL_TORCH_SHADOW_SELF = 46121,
SPELL_TORCH_SHADOW_SLOW = 46120,
SPELL_TORCH_SHADOW_MED = 46118,
SPELL_TORCH_SHADOW_FAST = 46117
}; };
class spell_midsummer_juggling_torch : public SpellScript class spell_midsummer_juggling_torch : public SpellScript
@@ -433,16 +442,31 @@ class spell_midsummer_juggling_torch : public SpellScript
if (const WorldLocation* loc = GetExplTargetDest()) if (const WorldLocation* loc = GetExplTargetDest())
{ {
if (loc->GetExactDist(caster) < 3.0f) if (loc->GetExactDist(caster) < 3.0f)
{
caster->CastSpell(loc->GetPositionX(), loc->GetPositionY(), loc->GetPositionZ(), SPELL_JUGGLE_SELF, true); caster->CastSpell(loc->GetPositionX(), loc->GetPositionY(), loc->GetPositionZ(), SPELL_JUGGLE_SELF, true);
caster->CastSpell(loc->GetPositionX(), loc->GetPositionY(), loc->GetPositionZ(), SPELL_TORCH_SHADOW_SELF, true);
}
else if (loc->GetExactDist(caster) < 10.0f) else if (loc->GetExactDist(caster) < 10.0f)
{
caster->CastSpell(loc->GetPositionX(), loc->GetPositionY(), loc->GetPositionZ(), SPELL_JUGGLE_SLOW, true); caster->CastSpell(loc->GetPositionX(), loc->GetPositionY(), loc->GetPositionZ(), SPELL_JUGGLE_SLOW, true);
caster->CastSpell(loc->GetPositionX(), loc->GetPositionY(), loc->GetPositionZ(), SPELL_TORCH_SHADOW_SLOW, true);
}
else if (loc->GetExactDist(caster) < 25.0f) else if (loc->GetExactDist(caster) < 25.0f)
{
caster->CastSpell(loc->GetPositionX(), loc->GetPositionY(), loc->GetPositionZ(), SPELL_JUGGLE_MED, true); caster->CastSpell(loc->GetPositionX(), loc->GetPositionY(), loc->GetPositionZ(), SPELL_JUGGLE_MED, true);
caster->CastSpell(loc->GetPositionX(), loc->GetPositionY(), loc->GetPositionZ(), SPELL_TORCH_SHADOW_MED, true);
}
else else
{
caster->CastSpell(loc->GetPositionX(), loc->GetPositionY(), loc->GetPositionZ(), SPELL_JUGGLE_FAST, true); caster->CastSpell(loc->GetPositionX(), loc->GetPositionY(), loc->GetPositionZ(), SPELL_JUGGLE_FAST, true);
caster->CastSpell(loc->GetPositionX(), loc->GetPositionY(), loc->GetPositionZ(), SPELL_TORCH_SHADOW_FAST, true);
}
} }
else else
{
caster->CastSpell(caster, SPELL_JUGGLE_SELF, true); caster->CastSpell(caster, SPELL_JUGGLE_SELF, true);
caster->CastSpell(caster, SPELL_TORCH_SHADOW_SELF, true);
}
} }
void Register() override void Register() override