From 710dce3f978e765f47ef1ee91ac2d91a6367b677 Mon Sep 17 00:00:00 2001 From: NoFantasy Date: Sun, 6 Mar 2011 11:44:40 +0100 Subject: [PATCH] [11224] Add script effect of spell 24751 Signed-off-by: NoFantasy --- src/game/SpellEffects.cpp | 23 +++++++++++++++++++++++ src/shared/revision_nr.h | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 08128b0ad..76c24fc48 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -6209,6 +6209,29 @@ void Spell::EffectScriptEffect(SpellEffectIndex eff_idx) m_caster->CastSpell(unitTarget, unitTarget->getGender() == GENDER_MALE ? 24735 : 24736, true); return; } + case 24751: // Trick or Treat + { + if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) + return; + + // Tricked or Treated + unitTarget->CastSpell(unitTarget, 24755, true); + + if (roll_chance_i(50)) + { + // Treat + unitTarget->CastSpell(unitTarget, 24715, true); + } + else + { + if (roll_chance_i(14)) // Trick (can be different critter models). 14% since below can have 1 of 6 + unitTarget->CastSpell(unitTarget, 24753, true); + else // Random Costume, 6 different (plus add. for gender) + unitTarget->CastSpell(unitTarget, 24720, true); + } + + return; + } case 26275: // PX-238 Winter Wondervolt TRAP { uint32 spells[4] = { 26272, 26157, 26273, 26274 }; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index cf4e2cbc2..db4e1b9e2 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11223" + #define REVISION_NR "11224" #endif // __REVISION_NR_H__