diff options
Diffstat (limited to 'src')
5 files changed, 12 insertions, 5 deletions
diff --git a/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp b/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp index 9cf6d18b26f..0a90b870926 100644 --- a/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp +++ b/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp @@ -261,8 +261,7 @@ struct TRINITY_DLL_DECL npc_daranelleAI : public ScriptedAI { DoScriptText(SAY_SPELL_INFLUENCE, m_creature, who); //TODO: Move the below to updateAI and run if this statement == true - CAST_PLR(who)->KilledMonsterCredit(21511, m_creature->GetGUID()); - CAST_PLR(who)->RemoveAurasDueToSpell(36904); + DoCast(who,37028,true); } } diff --git a/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp b/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp index 1ae91c8983b..d8360d2c5b8 100644 --- a/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp +++ b/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp @@ -1103,7 +1103,7 @@ struct TRINITY_DLL_DECL npc_dkc1_gothikAI : public ScriptedAI { if(CAST_PLR(owner)->GetQuestStatus(12698) == QUEST_STATUS_INCOMPLETE) { - CAST_PLR(owner)->KilledMonsterCredit(28845, me->GetGUID()); + DoCast(owner, 52517, true); who->setDeathState(DEAD); } } diff --git a/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp b/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp index d1c90c709d0..3dd7c83a30f 100644 --- a/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp +++ b/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp @@ -114,7 +114,7 @@ struct TRINITY_DLL_DECL npc_greengill_slaveAI : public ScriptedAI { Unit* plr = Unit::GetUnit((*m_creature), PlayerGUID); if(plr && CAST_PLR(plr)->GetQuestStatus(QUESTG) == QUEST_STATUS_INCOMPLETE) - CAST_PLR(plr)->KilledMonsterCredit(25086, m_creature->GetGUID()); + DoCast(plr, 45110, true); } DoCast(m_creature, ENRAGE); Unit* Myrmidon = me->FindNearestCreature(DM, 70); diff --git a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp index 251d6f0441a..e02d077f927 100644 --- a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp +++ b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp @@ -269,7 +269,7 @@ struct TRINITY_DLL_DECL mob_enslaved_netherwing_drakeAI : public ScriptedAI Player* plr = Unit::GetPlayer(PlayerGUID); if(plr && plr->GetQuestStatus(10854) == QUEST_STATUS_INCOMPLETE) { - plr->KilledMonsterCredit(22316, m_creature->GetGUID()); + DoCast(plr, SPELL_FORCE_OF_NELTHARAKU, true); /* float x,y,z; m_creature->GetPosition(x,y,z); diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index e32673302af..9260a738683 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -4563,6 +4563,14 @@ void Spell::EffectScriptEffect(uint32 effIndex) { switch(m_spellInfo->Id) { + // Dispelling Analysis + case 37028: + { + if (unitTarget->HasAura(36904)) + unitTarget->RemoveAurasDueToSpell(36904); + + return; + } case 45204: // Clone Me! case 41055: // Copy Weapon case 45206: // Copy Off-hand Weapon |