Fix rounding in beam damage calculation (FAForever#6201)

GodFuper · May 21, 2024 · b97bdc6 · b97bdc6
1 parent a91e9f3
commit b97bdc6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/changelog/snippets/fix.6115.md b/changelog/snippets/fix.6115.md
@@ -1 +1 @@
-- (#6115) Fix damage calculation in the unit view UI for beam weapons with a `BeamCollisionDelay` such as the Zapper's weapon.
+- (#6115, #6201) Fix damage calculation in the unit view UI for beam weapons with a `BeamCollisionDelay` such as the Zapper's weapon.
diff --git a/lua/ui/game/unitviewDetail.lua b/lua/ui/game/unitviewDetail.lua
@@ -567,7 +567,7 @@ function WrapAndPlaceText(bp, builder, descID, control)
                                 Damage = math.max(Damage, info.DamageToShields)
                             end
                             if info.BeamLifetime > 0 then
-                                Damage = Damage * (1 + MathFloor(MATH_IRound(info.BeamLifetime)/(info.BeamCollisionDelay+0.1)))
+                                Damage = Damage * (1 + MathFloor(MATH_IRound(info.BeamLifetime*10)/(MATH_IRound(info.BeamCollisionDelay*10)+1)))
                             else
                                 Damage = Damage * (info.DoTPulses or 1) + (info.InitialDamage or 0)
                                 local ProjectilePhysics = __blueprints[info.ProjectileId].Physics

diff --git a/units/DSLK004/DSLK004_unit.bp b/units/DSLK004/DSLK004_unit.bp
@@ -249,7 +249,7 @@ UnitBlueprint{
             },
             AutoInitiateAttackCommand = false,
             BallisticArc = "RULEUBA_None",
-            BeamCollisionDelay = 0.01,
+            BeamCollisionDelay = 0,
             BeamLifetime = 0.6,
             CannotAttackGround = true,
             CollideFriendly = false,
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		- (#6115) Fix damage calculation in the unit view UI for beam weapons with a `BeamCollisionDelay` such as the Zapper's weapon.
		- (#6115, #6201) Fix damage calculation in the unit view UI for beam weapons with a `BeamCollisionDelay` such as the Zapper's weapon.