diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 85f3b8856c..0fba6af0d4 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -1539,7 +1539,7 @@ public class UnitTypes{ trailLength = 20; waveTrailX = 5.5f; waveTrailY = -4f; - tailScl = 1.9f; + trailScl = 1.9f; weapons.add(new Weapon("mount-weapon"){{ reload = 10f; @@ -1598,7 +1598,7 @@ public class UnitTypes{ trailLength = 22; waveTrailX = 7f; waveTrailY = -9f; - tailScl = 1.5f; + trailScl = 1.5f; abilities.add(new ShieldRegenFieldAbility(20f, 40f, 60f * 4, 60f)); @@ -1695,7 +1695,7 @@ public class UnitTypes{ trailLength = 50; waveTrailX = 18f; waveTrailY = -21f; - tailScl = 3f; + trailScl = 3f; weapons.add(new Weapon("sei-launcher"){{ @@ -1789,7 +1789,7 @@ public class UnitTypes{ trailLength = 70; waveTrailX = 23f; waveTrailY = -32f; - tailScl = 3.5f; + trailScl = 3.5f; weapons.add(new Weapon("omura-cannon"){{ reload = 110f; @@ -1833,7 +1833,7 @@ public class UnitTypes{ rotateSpeed = 5f; trailLength = 20; waveTrailX = 5f; - tailScl = 1.3f; + trailScl = 1.3f; faceTarget = false; range = 100f; ammoType = new PowerAmmoType(900); @@ -1924,7 +1924,7 @@ public class UnitTypes{ trailLength = 22; waveTrailX = 5.5f; waveTrailY = -4f; - tailScl = 1.9f; + trailScl = 1.9f; ammoType = new ItemAmmoType(Items.coal); abilities.add(new StatusFieldAbility(StatusEffects.overclock, 60f * 6, 60f * 6f, 60f)); @@ -2001,7 +2001,7 @@ public class UnitTypes{ trailLength = 23; waveTrailX = 9f; waveTrailY = -9f; - tailScl = 2f; + trailScl = 2f; buildSpeed = 2f; @@ -2142,7 +2142,7 @@ public class UnitTypes{ trailLength = 50; waveTrailX = 18f; waveTrailY = -17f; - tailScl = 3.2f; + trailScl = 3.2f; buildSpeed = 3f; @@ -2183,7 +2183,7 @@ public class UnitTypes{ trailLength = 70; waveTrailX = 23f; waveTrailY = -32f; - tailScl = 3.5f; + trailScl = 3.5f; buildSpeed = 3.5f; diff --git a/core/src/mindustry/entities/comp/WaterMoveComp.java b/core/src/mindustry/entities/comp/WaterMoveComp.java index 0bc68d02b1..9509b891f6 100644 --- a/core/src/mindustry/entities/comp/WaterMoveComp.java +++ b/core/src/mindustry/entities/comp/WaterMoveComp.java @@ -67,8 +67,8 @@ abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc, Unitc{ Color color = Tmp.c1.set(floor.mapColor.equals(Color.black) ? Blocks.water.mapColor : floor.mapColor).mul(1.5f); trailColor.lerp(color, Mathf.clamp(Time.delta * 0.04f)); - tleft.draw(trailColor, type.tailScl); - tright.draw(trailColor, type.tailScl); + tleft.draw(trailColor, type.trailScl); + tright.draw(trailColor, type.trailScl); Draw.z(z); } diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index 0861b42308..ac95dbb362 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -134,7 +134,7 @@ public class UnitType extends UnlockableContent{ /** vertical offset of wave trail in naval units */ waveTrailY = -3f, /** width of all trails (including naval ones) */ - tailScl = 1f; + trailScl = 1f; /** if true, this unit counts as an enemy in the wave counter (usually false for support-only units) */ public boolean isEnemy = true, @@ -1215,7 +1215,7 @@ public class UnitType extends UnlockableContent{ unit.trail = new Trail(trailLength); } Trail trail = unit.trail; - trail.draw(trailColor == null ? unit.team.color : trailColor, (engineSize + Mathf.absin(Time.time, 2f, engineSize / 4f) * (useEngineElevation ? unit.elevation : 1f)) * tailScl); + trail.draw(trailColor == null ? unit.team.color : trailColor, (engineSize + Mathf.absin(Time.time, 2f, engineSize / 4f) * (useEngineElevation ? unit.elevation : 1f)) * trailScl); } public void drawEngines(Unit unit){ diff --git a/core/src/mindustry/ui/Styles.java b/core/src/mindustry/ui/Styles.java index 42e0832e81..77f5b0dec7 100644 --- a/core/src/mindustry/ui/Styles.java +++ b/core/src/mindustry/ui/Styles.java @@ -67,7 +67,7 @@ public class Styles{ logici, /** Used for toolbar in map generation filters. */ geni, - /** Gray, toggleable, no backvround. */ + /** Gray, toggleable, no background. */ grayi, /** Flat, square, black background. */ flati, diff --git a/core/src/mindustry/world/blocks/power/ThermalGenerator.java b/core/src/mindustry/world/blocks/power/ThermalGenerator.java index 046e20b706..6dfdcb1518 100644 --- a/core/src/mindustry/world/blocks/power/ThermalGenerator.java +++ b/core/src/mindustry/world/blocks/power/ThermalGenerator.java @@ -78,8 +78,7 @@ public class ThermalGenerator extends PowerGenerator{ } public class ThermalGeneratorBuild extends GeneratorBuild{ - public float sum; - public float spinRotation; + public float sum, spinRotation; @Override public void updateTile(){