diff --git a/core/src/mindustry/content/Bullets.java b/core/src/mindustry/content/Bullets.java index 2792146ce9..6cc2a15757 100644 --- a/core/src/mindustry/content/Bullets.java +++ b/core/src/mindustry/content/Bullets.java @@ -63,7 +63,7 @@ public class Bullets implements ContentList{ lifetime = 80f; width = height = 11f; collidesTiles = false; - splashDamageRadius = 25f; + splashDamageRadius = 25f * 0.75f; splashDamage = 33f; }}; @@ -84,7 +84,7 @@ public class Bullets implements ContentList{ lifetime = 80f; width = height = 13f; collidesTiles = false; - splashDamageRadius = 35f; + splashDamageRadius = 35f * 0.75f; splashDamage = 45f; fragBullet = artilleryPlasticFrag; fragBullets = 10; @@ -98,7 +98,7 @@ public class Bullets implements ContentList{ lifetime = 80f; width = height = 11f; collidesTiles = false; - splashDamageRadius = 25f; + splashDamageRadius = 25f * 0.75f; splashDamage = 33f; reloadMultiplier = 1.2f; ammoMultiplier = 3f; @@ -112,7 +112,7 @@ public class Bullets implements ContentList{ lifetime = 80f; width = height = 13f; collidesTiles = false; - splashDamageRadius = 25f; + splashDamageRadius = 25f * 0.75f; splashDamage = 35f; status = StatusEffects.burning; frontColor = Pal.lightishOrange; @@ -128,7 +128,7 @@ public class Bullets implements ContentList{ width = height = 14f; collidesTiles = false; ammoMultiplier = 4f; - splashDamageRadius = 45f; + splashDamageRadius = 45f * 0.75f; splashDamage = 50f; backColor = Pal.missileYellowBack; frontColor = Pal.missileYellow; diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index a070550c4c..1d12279b07 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -138,7 +138,7 @@ public class UnitTypes implements ContentList{ collides = true; collidesTiles = true; splashDamageRadius = 28f; - splashDamage = 52f; + splashDamage = 54f; backColor = Pal.bulletYellowBack; frontColor = Pal.bulletYellow; }}; @@ -1537,7 +1537,7 @@ public class UnitTypes implements ContentList{ width = 15f; collidesTiles = false; ammoMultiplier = 4f; - splashDamageRadius = 50f; + splashDamageRadius = 40f; splashDamage = 80f; backColor = Pal.missileYellowBack; frontColor = Pal.missileYellow; diff --git a/core/src/mindustry/entities/Damage.java b/core/src/mindustry/entities/Damage.java index 69c16a8f50..458fd5220b 100644 --- a/core/src/mindustry/entities/Damage.java +++ b/core/src/mindustry/entities/Damage.java @@ -380,7 +380,7 @@ public class Damage{ //this needs to be compensated if(in != null && in.team != team && in.block.size > 1 && in.health > damage){ //deal the damage of an entire side + 1, to be equivalent with maximum 'standard' damage - in.damage(damage * Math.min((in.block.size + 1), baseRadius * 0.44f)); + in.damage(damage * Math.min((in.block.size), baseRadius * 0.45f)); //no need to continue with the explosion return; } diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java index 8b0dbc67fe..f4bd772950 100644 --- a/core/src/mindustry/entities/comp/UnitComp.java +++ b/core/src/mindustry/entities/comp/UnitComp.java @@ -140,7 +140,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I case controlled -> controller instanceof LogicAI || controller instanceof Player ? 1 : 0; case commanded -> controller instanceof FormationAI ? 1 : 0; case payloadCount -> self() instanceof Payloadc pay ? pay.payloads().size : 0; - default -> 0; + default -> Float.NaN; }; } @@ -162,7 +162,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I @Override public double sense(Content content){ if(content == stack().item) return stack().amount; - return 0; + return Float.NaN; } @Override