diff options
| author | Shauren <shauren.trinity@gmail.com> | 2025-11-23 11:54:42 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2025-11-23 11:54:42 +0100 |
| commit | ed599208ea8492319dd748daa1151318fd3ba03b (patch) | |
| tree | d4390ad404246a7d57904d99ab2194fc26f8bbf2 /src/server/scripts/BrokenIsles | |
| parent | faab5afaf4f30d9e28d4b0843c3f5e1d561b97df (diff) | |
Core/Movement: Change MoveJump to use min/max height argument instead of vertical speed
Diffstat (limited to 'src/server/scripts/BrokenIsles')
| -rw-r--r-- | src/server/scripts/BrokenIsles/TrialOfValor/boss_guarm.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/BrokenIsles/zone_orderhall_warrior.cpp | 13 |
2 files changed, 6 insertions, 11 deletions
diff --git a/src/server/scripts/BrokenIsles/TrialOfValor/boss_guarm.cpp b/src/server/scripts/BrokenIsles/TrialOfValor/boss_guarm.cpp index 30d4e8a9167..fa5b8a08fb2 100644 --- a/src/server/scripts/BrokenIsles/TrialOfValor/boss_guarm.cpp +++ b/src/server/scripts/BrokenIsles/TrialOfValor/boss_guarm.cpp @@ -286,7 +286,7 @@ struct boss_guarm : public BossAI events.CancelEvent(EVENT_LICK); me->GetMotionMaster()->Clear(); // remove ChaseMovementGen me->SetReactState(REACT_PASSIVE); - me->GetMotionMaster()->MoveJump(BerserkerPair.JumpPos, 42.0f, 21.5f, POINT_BERSERK_JUMP); + me->GetMotionMaster()->MoveJump(POINT_BERSERK_JUMP, BerserkerPair.JumpPos, {}, 12.0f); break; default: break; @@ -642,7 +642,7 @@ class spell_headlong_charge_trigger : public SpellScript uint8 pairId = urand(0, 3); caster->GetMotionMaster()->Clear(); // remove ChaseMovementGen caster->SetReactState(REACT_PASSIVE); - caster->GetMotionMaster()->MoveJump(HeadlongChargePairs[pairId].JumpPos, 42.0f, 21.5f, POINT_HEADLONG_CHARGE + pairId); + caster->GetMotionMaster()->MoveJump(POINT_HEADLONG_CHARGE + pairId, HeadlongChargePairs[pairId].JumpPos, {}, 12.0f); } void Register() override diff --git a/src/server/scripts/BrokenIsles/zone_orderhall_warrior.cpp b/src/server/scripts/BrokenIsles/zone_orderhall_warrior.cpp index 35e1c3d2480..ca3add81c22 100644 --- a/src/server/scripts/BrokenIsles/zone_orderhall_warrior.cpp +++ b/src/server/scripts/BrokenIsles/zone_orderhall_warrior.cpp @@ -593,13 +593,7 @@ struct npc_valkyr_of_odyn : public ScriptedAI case POINT_JUMP: _scheduler.Schedule(250ms, [this](TaskContext /*context*/) { - /* - * (MovementMonsterSpline) (MovementSpline) MoveTime: 3111 - * (MovementMonsterSpline) (MovementSpline) JumpGravity: 19.2911 -> +-Movement::gravity - * 1.4125f is guessed value. Which makes the JumpGravity way closer to the intended one. Not sure how to do it 100% blizzlike. - * Also the MoveTime is not correct but I don't know how to set it here. - */ - me->GetMotionMaster()->MoveJump({ 1107.84f, 7222.57f, 38.9725f, me->GetOrientation() }, me->GetSpeed(MOVE_RUN), Movement::gravity * 1.4125f, POINT_DESPAWN_JUMP); + me->GetMotionMaster()->MoveJump(POINT_DESPAWN_JUMP, { 1107.84f, 7222.57f, 38.9725f, me->GetOrientation() }); }); break; case POINT_DESPAWN: @@ -610,12 +604,13 @@ struct npc_valkyr_of_odyn : public ScriptedAI } } - void MovementInform(uint32 /*type*/, uint32 id) override + void MovementInform(uint32 type, uint32 id) override { switch (id) { case POINT_DESPAWN_JUMP: - me->DespawnOrUnsummon(); + if (type == EFFECT_MOTION_TYPE) + me->DespawnOrUnsummon(); break; default: break; |