diff options
| -rw-r--r-- | src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp | 7 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp | 8 |
2 files changed, 8 insertions, 7 deletions
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 a0422f1c6d6..fe68c2eca34 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 @@ -210,8 +210,8 @@ struct TRINITY_DLL_DECL npc_unworthy_initiateAI : public ScriptedAI m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); - anchor->GetPosition(targ_x,targ_y,targ_z); - anchor->DealDamage(anchor,anchor->GetHealth()); + anchor->GetNearPoint2D(targ_x,targ_y,1,anchor->GetAngle(m_creature)); + //anchor->DealDamage(anchor,anchor->GetHealth()); m_creature->RemoveAurasDueToSpell(SPELL_SOUL_PRISON_CHAIN_SELF); m_creature->RemoveAurasDueToSpell(SPELL_SOUL_PRISON_CHAIN); @@ -275,10 +275,11 @@ void npc_unworthy_initiateAI::UpdateAI(const uint32 diff) } } } + if(dist == 99) return; - Creature* trigger = m_creature->SummonCreature(29521,x,y,z,0,TEMPSUMMON_MANUAL_DESPAWN,100); + Creature* trigger = m_creature->FindNearestCreature(29521,30); if(trigger) { if(GameObject* go_prison = GameObject::GetGameObject((*m_creature),nearest_prison)) diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp index 06f1b9efe1a..2d8ce56428a 100644 --- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp +++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp @@ -296,10 +296,10 @@ struct TRINITY_DLL_DECL mob_annhylde_the_callerAI : public ScriptedAI void Reset() { m_creature->AddUnitMovementFlag(MOVEMENTFLAG_FLYING + MOVEMENTFLAG_HOVER); - m_creature->SetSpeed(MOVE_SWIM , 0.1f); - m_creature->SetSpeed(MOVE_RUN , 0.1f); - m_creature->SetSpeed(MOVE_WALK , 0.1f); - m_creature->SetSpeed(MOVE_FLIGHT , 0.1f); + m_creature->SetSpeed(MOVE_SWIM , 1.0f); + m_creature->SetSpeed(MOVE_RUN , 1.0f); + m_creature->SetSpeed(MOVE_WALK , 1.0f); + //m_creature->SetSpeed(MOVE_FLIGHT , 1.0f); m_creature->GetPosition(x,y,z); DoTeleportTo(x+1,y,z+30); |