Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Script/Spell: fix Midsummer's Juggling Torch (#24885)

Browse Source 
* Script/Spell: fix Midsummer's Juggling Torch.

Closes #17446

* Remove unneeded GetPosition() call, thanks jackpoz for noticing!

* Rename 9999_99_99_99_world_midsummer_torch_juggling.sql to 2020_06_24_01_world.sql

Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
(cherry picked from commit 5f35bf9e79)
This commit is contained in:
Rothend
2020-06-24 21:26:01 +02:00
committed by Shauren
parent d8efda4ff3
commit f5967b8a87
2 changed files with 108 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/updates/world/master/2022_01_17_02_world_2020_06_24_01_world.sql Normal file
View File

@@ -0,0 +1,6 @@
-- UPDATE `achievement_criteria_data` SET `type`=6, `value1`=4395 WHERE `criteria_id`=6937;
DELETE FROM `spell_script_names` WHERE `ScriptName` IN ("spell_midsummer_juggle_torch", "spell_midsummer_torch_catch");
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
(45819, "spell_midsummer_juggle_torch"),
(45644, "spell_midsummer_torch_catch");

102
src/server/scripts/Spells/spell_holiday.cpp
View File

@@ -1678,6 +1678,106 @@ class spell_midsummer_ribbon_pole_periodic_visual : public AuraScript
}
};
enum JugglingTorch
{
SPELL_JUGGLE_TORCH_SLOW = 45792,
SPELL_JUGGLE_TORCH_MEDIUM = 45806,
SPELL_JUGGLE_TORCH_FAST = 45816,
SPELL_JUGGLE_TORCH_SELF = 45638,
SPELL_JUGGLE_TORCH_SHADOW_SLOW = 46120,
SPELL_JUGGLE_TORCH_SHADOW_MEDIUM = 46118,
SPELL_JUGGLE_TORCH_SHADOW_FAST = 46117,
SPELL_JUGGLE_TORCH_SHADOW_SELF = 46121,
SPELL_GIVE_TORCH = 45280,
QUEST_TORCH_CATCHING_A = 11657,
QUEST_TORCH_CATCHING_H = 11923
};
// 45819 - Throw Torch
class spell_midsummer_juggle_torch : public SpellScript
{
PrepareSpellScript(spell_midsummer_juggle_torch);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({
SPELL_JUGGLE_TORCH_SLOW, SPELL_JUGGLE_TORCH_MEDIUM, SPELL_JUGGLE_TORCH_FAST,
SPELL_JUGGLE_TORCH_SELF, SPELL_JUGGLE_TORCH_SHADOW_SLOW, SPELL_JUGGLE_TORCH_SHADOW_MEDIUM,
SPELL_JUGGLE_TORCH_SHADOW_FAST, SPELL_JUGGLE_TORCH_SHADOW_SELF
});
}
void HandleDummy(SpellEffIndex /*effIndex*/)
{
if (!GetExplTargetDest())
return;
Position spellDest = *GetExplTargetDest();
float distance = GetCaster()->GetExactDist2d(spellDest.GetPositionX(), spellDest.GetPositionY());
uint32 torchSpellID = 0;
uint32 torchShadowSpellID = 0;
if (distance <= 1.5f)
{
torchSpellID = SPELL_JUGGLE_TORCH_SELF;
torchShadowSpellID = SPELL_JUGGLE_TORCH_SHADOW_SELF;
spellDest = GetCaster()->GetPosition();
}
else if (distance <= 10.0f)
{
torchSpellID = SPELL_JUGGLE_TORCH_SLOW;
torchShadowSpellID = SPELL_JUGGLE_TORCH_SHADOW_SLOW;
}
else if (distance <= 20.0f)
{
torchSpellID = SPELL_JUGGLE_TORCH_MEDIUM;
torchShadowSpellID = SPELL_JUGGLE_TORCH_SHADOW_MEDIUM;
}
else
{
torchSpellID = SPELL_JUGGLE_TORCH_FAST;
torchShadowSpellID = SPELL_JUGGLE_TORCH_SHADOW_FAST;
}
GetCaster()->CastSpell(spellDest, torchSpellID);
GetCaster()->CastSpell(spellDest, torchShadowSpellID);
}
void Register() override
{
OnEffectHit += SpellEffectFn(spell_midsummer_juggle_torch::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
// 45644 - Juggle Torch (Catch)
class spell_midsummer_torch_catch : public SpellScript
{
PrepareSpellScript(spell_midsummer_torch_catch);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_GIVE_TORCH });
}
void HandleDummy(SpellEffIndex /*effIndex*/)
{
Player* player = GetHitPlayer();
if (!player)
return;
if (player->GetQuestStatus(QUEST_TORCH_CATCHING_A) == QUEST_STATUS_REWARDED || player->GetQuestStatus(QUEST_TORCH_CATCHING_H) == QUEST_STATUS_REWARDED)
player->CastSpell(player, SPELL_GIVE_TORCH);
}
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_midsummer_torch_catch::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
void AddSC_holiday_spell_scripts()
{
// Love is in the Air
@@ -1731,4 +1831,6 @@ void AddSC_holiday_spell_scripts()
RegisterSpellScript(spell_midsummer_torch_toss_land);
RegisterAuraScript(spell_midsummer_test_ribbon_pole_channel);
RegisterAuraScript(spell_midsummer_ribbon_pole_periodic_visual);
RegisterSpellScript(spell_midsummer_juggle_torch);
RegisterSpellScript(spell_midsummer_torch_catch);
}