diff options
Diffstat (limited to 'src/scripts')
| -rw-r--r-- | src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp | 4 | ||||
| -rw-r--r-- | src/scripts/northrend/grizzly_hills.cpp | 32 |
2 files changed, 25 insertions, 11 deletions
diff --git a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp index 2adf1cb53a7..934a148afc6 100644 --- a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp +++ b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp @@ -216,9 +216,9 @@ struct boss_paletressAI : public ScriptedAI } } - void MovementInform(uint32 MovementType, uint32 Data) + void MovementInform(uint32 MovementType, uint32 Point) { - if (MovementType != POINT_MOTION_TYPE) + if (MovementType != POINT_MOTION_TYPE || Point != 0) return; if (pInstance) diff --git a/src/scripts/northrend/grizzly_hills.cpp b/src/scripts/northrend/grizzly_hills.cpp index 980c54df617..438e5091d6d 100644 --- a/src/scripts/northrend/grizzly_hills.cpp +++ b/src/scripts/northrend/grizzly_hills.cpp @@ -372,7 +372,10 @@ enum eOuthouseBunny }; enum eSounds -{
SOUND_FEMALE = 12671,
SOUND_MALE = 12670
}; +{ + SOUND_FEMALE = 12671, + SOUND_MALE = 12670 +}; struct npc_outhouse_bunnyAI : public ScriptedAI { npc_outhouse_bunnyAI(Creature* pCreature) : ScriptedAI(pCreature) {} @@ -427,14 +430,25 @@ struct npc_tallhorn_stagAI : public ScriptedAI { npc_tallhorn_stagAI(Creature* pCreature) : ScriptedAI(pCreature) {} + uint8 m_uiPhase; + + void Reset() + { + m_uiPhase = 1; + } + void UpdateAI(const uint32 uiDiff) { - if (GameObject* haunch = me->FindNearestGameObject(OBJECT_HAUNCH, 2.0f)) - { - me->SetStandState(UNIT_STAND_STATE_DEAD); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); - me->SetUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_DEAD); - } + if (m_uiPhase = 1) + { + if (GameObject* haunch = me->FindNearestGameObject(OBJECT_HAUNCH, 2.0f)) + { + me->SetStandState(UNIT_STAND_STATE_DEAD); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_DEAD); + } + m_uiPhase = 0; + } } }; @@ -465,6 +479,7 @@ struct npc_amberpine_woodsmanAI : public ScriptedAI void UpdateAI(const uint32 uiDiff) { + // call this each update tick? if (Creature* stag = me->FindNearestCreature(TALLHORN_STAG, 0.2f)) { me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USESTANDING); @@ -493,8 +508,7 @@ struct npc_amberpine_woodsmanAI : public ScriptedAI } ScriptedAI::UpdateAI(uiDiff); - if (!UpdateVictim()) - return; + UpdateVictim(); } }; |