aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSnapperRy <snapperryen@gmail.com>2016-08-23 13:14:38 +0200
committerjoschiwald <joschiwald.trinity@gmail.com>2017-02-18 14:38:42 +0100
commit2574667854b17c20a77e61136ac13d7c0ca1ce15 (patch)
treed756ad9a6d03792aca2323424c44fb7d85053bf1 /src
parent3b32bfb650762b2949e0cc6d762119390bd8ed87 (diff)
Scripts/ArgentTournament: improve training dummy script
Now the ranged and charge target dummies will cast their spells and behave correctly for the related quests (cherry picked from commit 433beb77e32db097bf15f9faea222e99ad6373e3)
Diffstat (limited to 'src')
-rw-r--r--src/server/scripts/Northrend/zone_icecrown.cpp15
1 files changed, 2 insertions, 13 deletions
diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp
index 39565978bba..18858474478 100644
--- a/src/server/scripts/Northrend/zone_icecrown.cpp
+++ b/src/server/scripts/Northrend/zone_icecrown.cpp
@@ -215,17 +215,6 @@ class npc_tournament_training_dummy : public CreatureScript
me->SetControlled(true, UNIT_STATE_STUNNED);
Initialize();
- // Cast Defend spells to max stack size
- switch (me->GetEntry())
- {
- case NPC_CHARGE_TARGET:
- DoCast(SPELL_CHARGE_DEFEND);
- break;
- case NPC_RANGED_TARGET:
- me->CastCustomSpell(SPELL_RANGED_DEFEND, SPELLVALUE_AURA_STACK, 3, me);
- break;
- }
-
events.Reset();
events.ScheduleEvent(EVENT_DUMMY_RECAST_DEFEND, 5000);
}
@@ -286,14 +275,14 @@ class npc_tournament_training_dummy : public CreatureScript
case NPC_CHARGE_TARGET:
{
if (!me->HasAura(SPELL_CHARGE_DEFEND))
- DoCast(SPELL_CHARGE_DEFEND);
+ DoCast(me, SPELL_CHARGE_DEFEND, true);
break;
}
case NPC_RANGED_TARGET:
{
Aura* defend = me->GetAura(SPELL_RANGED_DEFEND);
if (!defend || defend->GetStackAmount() < 3 || defend->GetDuration() <= 8000)
- DoCast(SPELL_RANGED_DEFEND);
+ DoCast(me, SPELL_RANGED_DEFEND, true);
break;
}
}