Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove hack to Onyxia's combatreach & boundingrad #2387

Merged
merged 1 commit into from
Dec 28, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,6 @@ struct boss_onyxiaAI : public ScriptedAI

SetCombatMovement(true);
m_creature->SetSpeedRate(MOVE_RUN, ONYXIA_NORMAL_SPEED);
m_creature->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 15.0f);
m_creature->SetFloatValue(UNIT_FIELD_COMBATREACH, 16.0f);

// Daemon: remise en mode "dort"
m_creature->SetStandState(UNIT_STAND_STATE_SLEEP);
Expand Down Expand Up @@ -605,10 +603,6 @@ struct boss_onyxiaAI : public ScriptedAI
m_creature->CastSpell(m_creature, 17131, true); /** Start flying */
m_bTransition = false;
m_uiTransTimer = 0;

// increase Onyxia's hitbox while in the air to make it slightly easier for melee to use specials on her
m_creature->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 21.0f);
m_creature->SetFloatValue(UNIT_FIELD_COMBATREACH, 22.0f);

m_pPointData = GetMoveData();
m_creature->GetMotionMaster()->MovePoint(m_pPointData->uiLocId, m_pPointData->fX, m_pPointData->fY, m_pPointData->fZ, MOVE_PATHFINDING | MOVE_FLY_MODE);
Expand All @@ -631,8 +625,6 @@ struct boss_onyxiaAI : public ScriptedAI
m_creature->GetMotionMaster()->MovePoint(LANDING_FLIGHT, -8.86f, -212.752f, -88.542f, MOVE_FLY_MODE); // North

m_creature->RemoveAurasDueToSpell(17131); /** Stop flying */
m_creature->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 15.0f);
m_creature->SetFloatValue(UNIT_FIELD_COMBATREACH, 16.0f);
m_uiTransTimer = 60000; // handled by MovementInform
}
/** Landing in progress */
Expand Down
Loading