diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 35b3cb719f..87e0612dae 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -411,7 +411,7 @@ public class UnitTypes implements ContentList{ mechStepShake = 0.15f; ammoType = AmmoTypes.powerHigh; - speed = 0.38f; + speed = 0.39f; boostMultiplier = 2.2f; engineOffset = 12f; engineSize = 6f; @@ -442,7 +442,7 @@ public class UnitTypes implements ContentList{ cooldownTime = 200f; bullet = new ContinuousLaserBulletType(){{ - damage = 28f; + damage = 30f; length = 175f; hitEffect = Fx.hitMeltHeal; drawSize = 420f; @@ -453,7 +453,7 @@ public class UnitTypes implements ContentList{ shootEffect = Fx.greenLaserChargeSmall; - incendChance = 0.09f; + incendChance = 0.1f; incendSpread = 5f; incendAmount = 1; diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java index 18c04df545..9efd20f9fc 100644 --- a/core/src/mindustry/entities/comp/UnitComp.java +++ b/core/src/mindustry/entities/comp/UnitComp.java @@ -28,6 +28,7 @@ import mindustry.world.blocks.environment.*; import mindustry.world.blocks.payloads.*; import static mindustry.Vars.*; +import static mindustry.logic.GlobalConstants.*; @Component(base = true) abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, Itemsc, Rotc, Unitc, Weaponsc, Drawc, Boundedc, Syncc, Shieldc, Commanderc, Displayable, Senseable, Ranged, Minerc, Builderc{ @@ -140,9 +141,9 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I case mineY -> mining() ? mineTile.y : -1; case flag -> flag; case controlled -> !isValid() ? 0 : - controller instanceof LogicAI ? GlobalConstants.ctrlProcessor : - controller instanceof Player ? GlobalConstants.ctrlPlayer : - controller instanceof FormationAI ? GlobalConstants.ctrlFormation : + controller instanceof LogicAI ? ctrlProcessor : + controller instanceof Player ? ctrlPlayer : + controller instanceof FormationAI ? ctrlFormation : 0; case commanded -> controller instanceof FormationAI && isValid() ? 1 : 0; case payloadCount -> self() instanceof Payloadc pay ? pay.payloads().size : 0; diff --git a/core/src/mindustry/ui/Fonts.java b/core/src/mindustry/ui/Fonts.java index 35c6f1bcd9..6bd969fe4b 100644 --- a/core/src/mindustry/ui/Fonts.java +++ b/core/src/mindustry/ui/Fonts.java @@ -117,7 +117,6 @@ public class Fonts{ if(region.texture != uitex){ continue; - //throw new IllegalArgumentException("Font icon '" + texture + "' is not in the UI texture."); } unicodeIcons.put(nametex[0], ch);