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

fix(Scripts/Spells): Hallow's End Candy punpkin treat should turn pla… (#13808)

Browse Source 
...yer into a pirate.
This commit is contained in:
UltraNix
2022-11-21 22:59:24 +01:00
committed by GitHub
parent b77e850397
commit 7f4fe2e3ec
2 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/sql/updates/pending_db_world/rev_1668360561748791400.sql
+4
View File
@@ -0,0 +1,4 @@
--
DELETE FROM `spell_script_names` WHERE `spell_id`=24926;
INSERT INTO `spell_script_names` VALUES
(24926,'spell_hallows_end_candy_pirate_costume');
src/server/scripts/Events/hallows_end.cpp
+33 -2
View File
@@ -156,7 +156,9 @@ enum eHallowsEndCandy
SPELL_HALLOWS_END_CANDY_1 = 24924, SPELL_HALLOWS_END_CANDY_1 = 24924,
SPELL_HALLOWS_END_CANDY_2 = 24925, SPELL_HALLOWS_END_CANDY_2 = 24925,
SPELL_HALLOWS_END_CANDY_3 = 24926, SPELL_HALLOWS_END_CANDY_3 = 24926,
SPELL_HALLOWS_END_CANDY_4 = 24927, SPELL_HALLOWS_END_CANDY_3_FEMALE = 44742,
SPELL_HALLOWS_END_CANDY_3_MALE = 44743,
SPELL_HALLOWS_END_CANDY_4 = 24927
}; };
class spell_hallows_end_candy : public SpellScript class spell_hallows_end_candy : public SpellScript
@@ -168,7 +170,7 @@ class spell_hallows_end_candy : public SpellScript
if (Player* target = GetHitPlayer()) if (Player* target = GetHitPlayer())
{ {
uint32 spellId = SPELL_HALLOWS_END_CANDY_1 + urand(0, 3); uint32 spellId = SPELL_HALLOWS_END_CANDY_1 + urand(0, 3);
GetCaster()->CastSpell(target, spellId, true, nullptr); GetCaster()->CastSpell(target, spellId, true);
} }
} }
@@ -178,6 +180,34 @@ class spell_hallows_end_candy : public SpellScript
} }
}; };
class spell_hallows_end_candy_pirate_costume : public AuraScript
{
PrepareAuraScript(spell_hallows_end_candy_pirate_costume);
void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (Unit* target = GetTarget())
{
target->CastSpell(target, target->getGender() == GENDER_MALE ? SPELL_HALLOWS_END_CANDY_3_MALE : SPELL_HALLOWS_END_CANDY_3_FEMALE, true);
}
}
void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (Unit* target = GetTarget())
{
target->RemoveAurasDueToSpell(SPELL_HALLOWS_END_CANDY_3_MALE);
target->RemoveAurasDueToSpell(SPELL_HALLOWS_END_CANDY_3_FEMALE);
}
}
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_hallows_end_candy_pirate_costume::HandleEffectApply, EFFECT_0, SPELL_AURA_MOD_INCREASE_SWIM_SPEED, AURA_EFFECT_HANDLE_REAL);
OnEffectRemove += AuraEffectRemoveFn(spell_hallows_end_candy_pirate_costume::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_INCREASE_SWIM_SPEED, AURA_EFFECT_HANDLE_REAL);
}
};
enum trickyTreat enum trickyTreat
{ {
SPELL_UPSET_TUMMY = 42966, SPELL_UPSET_TUMMY = 42966,
@@ -1426,6 +1456,7 @@ void AddSC_event_hallows_end_scripts()
RegisterSpellScript(spell_hallows_end_trick); RegisterSpellScript(spell_hallows_end_trick);
RegisterSpellScript(spell_hallows_end_trick_or_treat); RegisterSpellScript(spell_hallows_end_trick_or_treat);
RegisterSpellScript(spell_hallows_end_candy); RegisterSpellScript(spell_hallows_end_candy);
RegisterSpellScript(spell_hallows_end_candy_pirate_costume);
RegisterSpellScript(spell_hallows_end_tricky_treat); RegisterSpellScript(spell_hallows_end_tricky_treat);
RegisterSpellScriptWithArgs(spell_hallows_end_put_costume, "spell_hallows_end_pirate_costume", SPELL_PIRATE_COSTUME_MALE, SPELL_PIRATE_COSTUME_FEMALE); RegisterSpellScriptWithArgs(spell_hallows_end_put_costume, "spell_hallows_end_pirate_costume", SPELL_PIRATE_COSTUME_MALE, SPELL_PIRATE_COSTUME_FEMALE);
RegisterSpellScriptWithArgs(spell_hallows_end_put_costume, "spell_hallows_end_leper_costume", SPELL_LEPER_GNOME_COSTUME_MALE, SPELL_LEPER_GNOME_COSTUME_FEMALE); RegisterSpellScriptWithArgs(spell_hallows_end_put_costume, "spell_hallows_end_leper_costume", SPELL_LEPER_GNOME_COSTUME_MALE, SPELL_LEPER_GNOME_COSTUME_FEMALE);