diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java index 80db8f354a..e0871c74ac 100644 --- a/core/src/mindustry/Vars.java +++ b/core/src/mindustry/Vars.java @@ -83,7 +83,7 @@ public class Vars implements Loadable{ /** range for moving items */ public static final float itemTransferRange = 220f; /** range for moving items for logic units */ - public static final float logicItemTransferRange = 40f; + public static final float logicItemTransferRange = 45f; /** duration of time between turns in ticks */ public static final float turnDuration = 20 * Time.toMinutes; /** turns needed to destroy a sector completely */ diff --git a/core/src/mindustry/ai/types/LogicAI.java b/core/src/mindustry/ai/types/LogicAI.java index 47e1510a2e..80ca77b778 100644 --- a/core/src/mindustry/ai/types/LogicAI.java +++ b/core/src/mindustry/ai/types/LogicAI.java @@ -61,7 +61,7 @@ public class LogicAI extends AIController{ moveTo(Tmp.v1.set(moveX, moveY), 1f, 30f); } case approach -> { - moveTo(Tmp.v1.set(moveX, moveY), moveRad, 10f); + moveTo(Tmp.v1.set(moveX, moveY), moveRad, 1f); } case pathfind -> { Building core = unit.closestEnemyCore(); diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 9e00bd65ce..a6dd9e2982 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -394,7 +394,7 @@ public class UnitTypes implements ContentList{ engineSize = 6f; lowAltitude = true; - health = 6500f; + health = 7000f; armor = 7f; canBoost = true; landShake = 4f; diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java index 0e51d7f0f9..47b7500e10 100644 --- a/core/src/mindustry/core/Renderer.java +++ b/core/src/mindustry/core/Renderer.java @@ -63,7 +63,9 @@ public class Renderer implements ApplicationListener{ Color.white.set(1f, 1f, 1f, 1f); Gl.clear(Gl.stencilBufferBit); - camerascale = Mathf.lerpDelta(camerascale, targetscale, 0.1f); + float dest = Mathf.round(targetscale, 0.5f); + camerascale = Mathf.lerpDelta(camerascale, dest, 0.1f); + if(Mathf.within(camerascale, dest, 0.001f)) camerascale = dest; laserOpacity = Core.settings.getInt("lasersopacity") / 100f; if(landTime > 0){ @@ -303,6 +305,10 @@ public class Renderer implements ApplicationListener{ targetscale = Mathf.clamp(targetscale, minScale(), Math.round(s * 6)); } + public float getDisplayScale(){ + return camerascale; + } + public float minScale(){ return Scl.scl(1.5f); }