From 121d428ebb6e08e479af5c3d65d2a7258867e8e0 Mon Sep 17 00:00:00 2001 From: Atrik Date: Thu, 23 Apr 2026 13:08:20 +0200 Subject: [PATCH] Fix terrain elevation not affecting attack range The parabolic range formula in GetEffectiveParabolicRange was only computating height differences from manual HeightOffset values, completely ignoring actual terrain elevation. This meant units on hills received no tactical advantage despite the UI stat tooltip correctly showing extended ranges. Fixes #8889 --- .../components/CCmpRangeManager.cpp | 7 ++++++- .../components/tests/test_RangeManager.h | 19 +++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/source/simulation2/components/CCmpRangeManager.cpp b/source/simulation2/components/CCmpRangeManager.cpp index 9799f529e8..4f9e77efa6 100644 --- a/source/simulation2/components/CCmpRangeManager.cpp +++ b/source/simulation2/components/CCmpRangeManager.cpp @@ -1408,7 +1408,12 @@ public: if (!cmpTargetPosition || !cmpTargetPosition->IsInWorld()) return NEVER_IN_RANGE; - entity_pos_t heightDifference = cmpSourcePosition->GetHeightOffset() - cmpTargetPosition->GetHeightOffset() + yOrigin; + // GetPosition() returns the world height (terrain + water + offset) + CFixedVector3D sourcePos = cmpSourcePosition->GetPosition(); + CFixedVector3D targetPos = cmpTargetPosition->GetPosition(); + + entity_pos_t heightDifference = sourcePos.Y - targetPos.Y + yOrigin; + if (heightDifference < -range / 2) return NEVER_IN_RANGE; diff --git a/source/simulation2/components/tests/test_RangeManager.h b/source/simulation2/components/tests/test_RangeManager.h index a07f6faaeb..0d13cd286c 100644 --- a/source/simulation2/components/tests/test_RangeManager.h +++ b/source/simulation2/components/tests/test_RangeManager.h @@ -63,13 +63,13 @@ public: entity_id_t GetTurretParent() const override {return INVALID_ENTITY;} void UpdateTurretPosition() override {} std::set* GetTurrets() override { return nullptr; } - bool IsInWorld() const override { return true; } - void MoveOutOfWorld() override { } + bool IsInWorld() const override { return m_InWorld; } + void MoveOutOfWorld() override { m_InWorld = false; } void MoveTo(entity_pos_t /*x*/, entity_pos_t /*z*/) override { } void MoveAndTurnTo(entity_pos_t /*x*/, entity_pos_t /*z*/, entity_angle_t /*a*/) override { } void JumpTo(entity_pos_t /*x*/, entity_pos_t /*z*/) override { } - void SetHeightOffset(entity_pos_t /*dy*/) override { } - entity_pos_t GetHeightOffset() const override { return entity_pos_t::Zero(); } + void SetHeightOffset(entity_pos_t dy) override { m_HeightOffset = dy; } + entity_pos_t GetHeightOffset() const override { return m_HeightOffset; } void SetHeightFixed(entity_pos_t /*y*/) override { } entity_pos_t GetHeightFixed() const override { return entity_pos_t::Zero(); } entity_pos_t GetHeightAtFixed(entity_pos_t, entity_pos_t) const override { return entity_pos_t::Zero(); } @@ -94,6 +94,8 @@ public: CMatrix3D GetInterpolatedTransform(float /*frameOffset*/) const override { return CMatrix3D(); } CFixedVector3D m_Pos; + entity_pos_t m_HeightOffset = entity_pos_t::Zero(); + bool m_InWorld = true; }; class MockObstructionRgm : public ICmpObstruction @@ -291,14 +293,15 @@ public: } - void test_IsInTargetParabolicRange() + void test_ParabolicRangeBasic() { ComponentTestHelper test(*g_ScriptContext); ICmpRangeManager* cmp = test.Add(CID_RangeManager, "", SYSTEM_ENTITY); + const entity_id_t source = 200; const entity_id_t target = 201; - entity_pos_t range = fixed::FromInt(-3); - entity_pos_t yOrigin = fixed::FromInt(-20); + entity_pos_t range{fixed::FromInt(-3)}; + entity_pos_t yOrigin{fixed::FromInt(-20)}; // Invalid range. TS_ASSERT_EQUALS(cmp->GetEffectiveParabolicRange(source, target, range, yOrigin), range); @@ -323,7 +326,7 @@ public: TS_ASSERT_EQUALS(cmp->GetEffectiveParabolicRange(source, target, range, yOrigin), range); TS_ASSERT_EQUALS(cmp->GetEffectiveParabolicRange(source, target, fixed::Zero(), yOrigin), fixed::Zero()); - // Normal case. + // Normal case with yOrigin only (no terrain difference) yOrigin = fixed::FromInt(5); range = fixed::FromInt(10); TS_ASSERT_EQUALS(cmp->GetEffectiveParabolicRange(source, target, range, yOrigin), fixed::FromFloat(14.142136f));