diff options
Diffstat (limited to 'src/scripts/northrend')
| -rw-r--r-- | src/scripts/northrend/naxxramas/boss_highlord_mograine.cpp | 28 | ||||
| -rw-r--r-- | src/scripts/northrend/storm_peaks.cpp | 14 |
2 files changed, 21 insertions, 21 deletions
diff --git a/src/scripts/northrend/naxxramas/boss_highlord_mograine.cpp b/src/scripts/northrend/naxxramas/boss_highlord_mograine.cpp index 9bef8ebd3f9..4eb72a3780e 100644 --- a/src/scripts/northrend/naxxramas/boss_highlord_mograine.cpp +++ b/src/scripts/northrend/naxxramas/boss_highlord_mograine.cpp @@ -29,7 +29,7 @@ EndScriptData */ // highlord mograine #define SPELL_MARK_OF_MOGRAINE 28834 -#define SPELL_RIGHTEOUS_FIRE 28882 // Applied as a 25% chance on melee hit to proc. m_creature->GetVictim() +#define SPELL_RIGHTEOUS_FIRE 28882 // Applied as a 25% chance on melee hit to proc. me->GetVictim() #define SAY_TAUNT1 "Enough prattling. Let them come! We shall grind their bones to dust." #define SAY_TAUNT2 "Conserve your anger! Harness your rage! You will all have outlets for your frustration soon enough." @@ -74,21 +74,21 @@ struct TRINITY_DLL_DECL boss_highlord_mograineAI : public ScriptedAI void InitialYell() { - if (!m_creature->isInCombat()) + if (!me->isInCombat()) { switch(rand()%3) { case 0: DoYell(SAY_AGGRO1,LANG_UNIVERSAL,NULL); - DoPlaySoundToSet(m_creature,SOUND_AGGRO1); + DoPlaySoundToSet(me,SOUND_AGGRO1); break; case 1: DoYell(SAY_AGGRO2,LANG_UNIVERSAL,NULL); - DoPlaySoundToSet(m_creature,SOUND_AGGRO2); + DoPlaySoundToSet(me,SOUND_AGGRO2); break; case 2: DoYell(SAY_AGGRO3,LANG_UNIVERSAL,NULL); - DoPlaySoundToSet(m_creature,SOUND_AGGRO3); + DoPlaySoundToSet(me,SOUND_AGGRO3); break; } } @@ -100,11 +100,11 @@ struct TRINITY_DLL_DECL boss_highlord_mograineAI : public ScriptedAI { case 0: DoYell(SAY_SLAY1,LANG_UNIVERSAL,NULL); - DoPlaySoundToSet(m_creature,SOUND_SLAY1); + DoPlaySoundToSet(me,SOUND_SLAY1); break; case 1: DoYell(SAY_SLAY2,LANG_UNIVERSAL,NULL); - DoPlaySoundToSet(m_creature,SOUND_SLAY2); + DoPlaySoundToSet(me,SOUND_SLAY2); break; } } @@ -112,7 +112,7 @@ struct TRINITY_DLL_DECL boss_highlord_mograineAI : public ScriptedAI void JustDied(Unit* Killer) { DoYell(SAY_DEATH,LANG_UNIVERSAL,NULL); - DoPlaySoundToSet(m_creature, SOUND_DEATH); + DoPlaySoundToSet(me, SOUND_DEATH); } void Aggro(Unit *who) @@ -128,24 +128,24 @@ struct TRINITY_DLL_DECL boss_highlord_mograineAI : public ScriptedAI // Mark of Mograine if (Mark_Timer < diff) { - DoCast(m_creature->getVictim(),SPELL_MARK_OF_MOGRAINE); + DoCast(me->getVictim(),SPELL_MARK_OF_MOGRAINE); Mark_Timer = 12000; }else Mark_Timer -= diff; // Shield Wall - All 4 horsemen will shield wall at 50% hp and 20% hp for 20 seconds - if (ShieldWall1 && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 50) + if (ShieldWall1 && (me->GetHealth()*100 / me->GetMaxHealth()) < 50) { if (ShieldWall1) { - DoCast(m_creature,SPELL_SHIELDWALL); + DoCast(me,SPELL_SHIELDWALL); ShieldWall1 = false; } } - if (ShieldWall2 && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 20) + if (ShieldWall2 && (me->GetHealth()*100 / me->GetMaxHealth()) < 20) { if (ShieldWall2) { - DoCast(m_creature,SPELL_SHIELDWALL); + DoCast(me,SPELL_SHIELDWALL); ShieldWall2 = false; } } @@ -155,7 +155,7 @@ struct TRINITY_DLL_DECL boss_highlord_mograineAI : public ScriptedAI { if (rand()%4 == 1) // 1/4 { - DoCast(m_creature->getVictim(),SPELL_RIGHTEOUS_FIRE); + DoCast(me->getVictim(),SPELL_RIGHTEOUS_FIRE); } RighteousFire_Timer = 2000; }else RighteousFire_Timer -= diff; diff --git a/src/scripts/northrend/storm_peaks.cpp b/src/scripts/northrend/storm_peaks.cpp index f71f3d2b935..08e5ca7c2d4 100644 --- a/src/scripts/northrend/storm_peaks.cpp +++ b/src/scripts/northrend/storm_peaks.cpp @@ -365,16 +365,16 @@ struct npc_injured_goblinAI : public npc_escortAI npc_injured_goblinAI(Creature* pCreature) : npc_escortAI(pCreature) { } void WaypointReached(uint32 i) - { - Player* pPlayer = GetPlayerForEscort(); + { + Player* pPlayer = GetPlayerForEscort(); switch (i) { case 26: - DoScriptText(SAY_END_WP_REACHED, m_creature, pPlayer); + DoScriptText(SAY_END_WP_REACHED, me, pPlayer); break; case 27: if (pPlayer) - pPlayer->GroupEventHappens(QUEST_BITTER_DEPARTURE, m_creature); + pPlayer->GroupEventHappens(QUEST_BITTER_DEPARTURE, me); break; } } @@ -387,7 +387,7 @@ struct npc_injured_goblinAI : public npc_escortAI { Player* pPlayer = GetPlayerForEscort(); if (HasEscortState(STATE_ESCORT_ESCORTING) && pPlayer) - pPlayer->FailQuest(QUEST_BITTER_DEPARTURE); + pPlayer->FailQuest(QUEST_BITTER_DEPARTURE); } void UpdateAI(const uint32 uiDiff) @@ -433,7 +433,7 @@ bool GossipSelect_npc_injured_goblin(Player* pPlayer, Creature* pCreature, uint3 if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { - pEscortAI->Start(true, true, pPlayer->GetGUID()); + pEscortAI->Start(true, true, pPlayer->GetGUID()); pCreature->setFaction(113); } return true; @@ -483,7 +483,7 @@ void AddSC_storm_peaks() newscript = new Script; newscript->Name = "npc_injured_goblin"; - newscript->GetAI = &GetAI_npc_injured_goblin; + newscript->GetAI = &GetAI_npc_injured_goblin; newscript->pGossipHello = &GossipHello_npc_injured_goblin; newscript->pGossipSelect = &GossipSelect_npc_injured_goblin; newscript->pQuestAccept = &QuestAccept_npc_injured_goblin; |