diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp index 4ba21b98..c870ab42 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -292,7 +292,7 @@ class boss_black_knight : public CreatureScript if (uiDeathBiteTimer <= diff) { DoCastAOE(SPELL_DEATH_BITE); - uiDeathBiteTimer = urand (1000, 2000); + uiDeathBiteTimer = urand (2000, 4000); } else uiDeathBiteTimer -= diff; if (uiMarkedDeathTimer <= diff) { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index efb8fcae..57ff4acd 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -255,6 +255,7 @@ class boss_deathbringer_saurfang : public CreatureScript void Reset() { _Reset(); + me->SetReactState(REACT_DEFENSIVE); events.SetPhase(PHASE_COMBAT); _frenzied = false; _dead = false; @@ -452,8 +453,6 @@ class boss_deathbringer_saurfang : public CreatureScript events.SetPhase(PHASE_COMBAT); _introDone = true; me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); - me->SetReactState(REACT_AGGRESSIVE); - me->SetInCombatWithZone(); break; case EVENT_SUMMON_BLOOD_BEAST: for (uint32 i10 = 0; i10 < 2; ++i10) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index 48fe89da..ce87d0b7 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -90,6 +90,7 @@ class boss_festergut : public CreatureScript void Reset() { _Reset(); + me->SetReactState(REACT_DEFENSIVE); events.ScheduleEvent(EVENT_BERSERK, 300000); events.ScheduleEvent(EVENT_INHALE_BLIGHT, urand(25000, 30000)); events.ScheduleEvent(EVENT_GAS_SPORE, urand(20000, 25000)); @@ -160,15 +161,6 @@ class boss_festergut : public CreatureScript if (spell->Id == PUNGENT_BLIGHT_HELPER) target->RemoveAurasDueToSpell(INOCULATED_HELPER); } - - void MoveInLineOfSight(Unit* who) - { - if (me->IsWithinDistInMap(who, 20.0f)) - { - me->SetReactState(REACT_AGGRESSIVE); - me->SetInCombatWithZone(); - } - } void UpdateAI(uint32 const diff) { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index a77c298e..a67e1bb1 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -145,11 +145,6 @@ class boss_lord_marrowgar : public CreatureScript Talk(SAY_ENTER_ZONE); _introDone = true; } - else if (me->IsWithinDistInMap(who, 20.0f)) - { - me->SetReactState(REACT_AGGRESSIVE); - me->SetInCombatWithZone(); - } } void UpdateAI(uint32 const diff) @@ -323,7 +318,7 @@ class npc_coldflame : public CreatureScript } me->SetOrientation(owner->GetAngle(target)); - owner->GetNearPosition(pos, owner->GetObjectSize() / 20.0f, 0.0f); + owner->GetNearPosition(pos, owner->GetObjectSize() / 2.0f, 0.0f); } me->NearTeleportTo(pos.GetPositionX(), pos.GetPositionY(), me->GetPositionZ(), me->GetOrientation()); @@ -572,12 +567,7 @@ class spell_marrowgar_bone_storm : public SpellScriptLoader void RecalculateDamage() { - if (Unit* caster = GetCaster()) - { - const float distance = GetHitUnit()->GetExactDist2d(caster); - const int32 damage = GetHitDamage(); - SetHitDamage(int32(damage - (damage * distance / (distance + caster->GetObjectSize() / 2)))); - } + SetHitDamage(int32(GetHitDamage() / std::max(sqrtf(GetHitUnit()->GetExactDist2d(GetCaster())), 1.0f))); } void Register() diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index 6832d279..b2662b64 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -221,7 +221,7 @@ class boss_professor_putricide : public CreatureScript summons.DespawnAll(); SetPhase(PHASE_COMBAT_1); _experimentState = EXPERIMENT_STATE_OOZE; - me->SetReactState(REACT_AGGRESSIVE); + me->SetReactState(REACT_DEFENSIVE); me->SetWalk(false); if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == POINT_MOTION_TYPE) me->GetMotionMaster()->MovementExpired(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index fbfa9475..1a006ccd 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -157,13 +157,9 @@ class boss_rotface : public CreatureScript Talk(SAY_SLIME_SPRAY); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* /*who*/) { - if (me->IsWithinDistInMap(who, 20.0f)) - { - me->SetReactState(REACT_AGGRESSIVE); - me->SetInCombatWithZone(); - } + // don't enter combat } void UpdateAI(const uint32 diff)