From 3a0b1a6cf5c7dccab278b27d1d3dccb5a38bd4bb Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 6 Nov 2022 13:38:38 -0500 Subject: [PATCH] Fixed missile unit DPS calculation --- core/assets/maps/fungalPass.msav | Bin 12233 -> 12516 bytes core/src/mindustry/content/UnitTypes.java | 2 ++ .../mindustry/entities/bullet/BulletType.java | 4 ++++ core/src/mindustry/type/UnitType.java | 12 +++++++++--- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/core/assets/maps/fungalPass.msav b/core/assets/maps/fungalPass.msav index fd685af2d6328b0fdc227b425cf548b309302fff..a8ec35c1c4324e51e9846bd43dbf486bda9de94d 100644 GIT binary patch literal 12516 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 XvKzL}UNq;q#N|Jbo&ngB`^L$ literal 12233 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 diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 5945e50ed6..68169fcc50 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -3161,6 +3161,8 @@ public class UnitTypes{ rotationLimit = 70f; rotateSpeed = 2f; inaccuracy = 20f; + shootStatus = StatusEffects.slow; + alwaysShootWhenMoving = true; rotate = true; diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java index 4846be98f0..a0fddc0772 100644 --- a/core/src/mindustry/entities/bullet/BulletType.java +++ b/core/src/mindustry/entities/bullet/BulletType.java @@ -314,6 +314,10 @@ public class BulletType extends Content implements Cloneable{ /** @return estimated damage per shot. this can be very inaccurate. */ public float estimateDPS(){ + if(spawnUnit != null){ + return spawnUnit.estimateDps(); + } + float sum = damage + splashDamage*0.75f; if(fragBullet != null && fragBullet != this){ sum += fragBullet.estimateDPS() * fragBullets / 2f; diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index 85e0f3f4ef..7c035caab0 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -828,6 +828,13 @@ public class UnitType extends UnlockableContent{ ammoCapacity = Math.max(1, (int)(shotsPerSecond * targetSeconds)); } + estimateDps(); + + //only do this after everything else was initialized + sample = constructor.get(); + } + + public float estimateDps(){ //calculate estimated DPS for one target based on weapons if(dpsEstimate < 0){ dpsEstimate = weapons.sumf(Weapon::dps); @@ -838,9 +845,8 @@ public class UnitType extends UnlockableContent{ dpsEstimate /= 25f; } } - - //only do this after everything else was initialized - sample = constructor.get(); + + return dpsEstimate; } @CallSuper