From 2a3a3359fa5ad43452cfac60bf6d8a84cb9a9ace Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 7 Jul 2022 09:53:38 -0400 Subject: [PATCH] Misc bugfixes --- core/src/mindustry/content/Items.java | 2 +- core/src/mindustry/game/Rules.java | 2 +- core/src/mindustry/input/InputHandler.java | 4 ++++ core/src/mindustry/input/MobileInput.java | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/content/Items.java b/core/src/mindustry/content/Items.java index 6ff6721305..8d79830c11 100644 --- a/core/src/mindustry/content/Items.java +++ b/core/src/mindustry/content/Items.java @@ -30,7 +30,7 @@ public class Items{ cost = 1.5f; }}; - graphite = new Item("graphite", Color.valueOf("95abd9")){{ + graphite = new Item("graphite", Color.valueOf("b2c6d2")){{ cost = 1f; }}; diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java index cdf63cc21a..67a9354516 100644 --- a/core/src/mindustry/game/Rules.java +++ b/core/src/mindustry/game/Rules.java @@ -230,7 +230,7 @@ public class Rules{ /** If true, this team has infinite unit ammo. */ public boolean infiniteAmmo; - /** Enables "RTS" unit AI. TODO wip */ + /** Enables "RTS" unit AI. */ public boolean rtsAi; /** Minimum size of attack squads. */ public int rtsMinSquad = 4; diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index 8b61045f1a..051de2e262 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/core/src/mindustry/input/InputHandler.java @@ -592,6 +592,10 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ logicCutsceneZoom = -1f; } + if(commandBuild != null && !commandBuild.isValid()){ + commandBuild = null; + } + if(!commandMode){ commandRect = false; } diff --git a/core/src/mindustry/input/MobileInput.java b/core/src/mindustry/input/MobileInput.java index ae9a4a6258..d9639c7733 100644 --- a/core/src/mindustry/input/MobileInput.java +++ b/core/src/mindustry/input/MobileInput.java @@ -715,6 +715,7 @@ public class MobileInput extends InputHandler implements GestureListener{ selectedUnits.removeAll(u -> !u.isCommandable() || !u.isValid()); if(!commandMode){ + commandBuild = null; selectedUnits.clear(); }