diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 401f805ea7..3e0c54ba11 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -1546,7 +1546,7 @@ public class UnitTypes implements ContentList{ xRand = 8f; shotDelay = 1f; - bullet = new MissileBulletType(4.2f, 30){{ + bullet = new MissileBulletType(4.2f, 40){{ homingPower = 0.12f; width = 8f; height = 8f; @@ -1554,8 +1554,8 @@ public class UnitTypes implements ContentList{ drag = -0.003f; homingRange = 80f; keepVelocity = false; - splashDamageRadius = 30f; - splashDamage = 35f; + splashDamageRadius = 35f; + splashDamage = 45f; lifetime = 56f; trailColor = Pal.bulletYellowBack; backColor = Pal.bulletYellowBack; @@ -1568,7 +1568,7 @@ public class UnitTypes implements ContentList{ }}); weapons.add(new Weapon("large-bullet-mount"){{ - reload = 80f; + reload = 60f; cooldownTime = 90f; x = 70f/4f; y = -66f/4f; @@ -1583,7 +1583,7 @@ public class UnitTypes implements ContentList{ shots = 3; shotDelay = 4f; inaccuracy = 1f; - bullet = new BasicBulletType(7f, 50){{ + bullet = new BasicBulletType(7f, 55){{ width = 13f; height = 19f; shootEffect = Fx.shootBig; diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java index 47b7500e10..c30b526aa7 100644 --- a/core/src/mindustry/core/Renderer.java +++ b/core/src/mindustry/core/Renderer.java @@ -27,10 +27,11 @@ public class Renderer implements ApplicationListener{ public final Pixelator pixelator = new Pixelator(); public PlanetRenderer planets; + public @Nullable Bloom bloom; public FrameBuffer effectBuffer = new FrameBuffer(); public float laserOpacity = 1f; - private Bloom bloom; + //TODO unused private FxProcessor fx = new FxProcessor(); private Color clearColor = new Color(0f, 0f, 0f, 1f); private float targetscale = Scl.scl(4); diff --git a/desktop/src/mindustry/desktop/DesktopLauncher.java b/desktop/src/mindustry/desktop/DesktopLauncher.java index 76b72e3ca3..eedbd75f70 100644 --- a/desktop/src/mindustry/desktop/DesktopLauncher.java +++ b/desktop/src/mindustry/desktop/DesktopLauncher.java @@ -246,7 +246,7 @@ public class DesktopLauncher extends ClientLauncher{ if(inGame){ //TODO implement nice name for sector - gameMapWithWave = Strings.capitalize(state.map.name()); + gameMapWithWave = Strings.capitalize(Strings.stripColors(state.map.name())); if(state.rules.waves){ gameMapWithWave += " | Wave " + state.wave;