From aa018b314d24f8e3b67ba057f5f9a019d5fa57c4 Mon Sep 17 00:00:00 2001 From: ApsZoldat Date: Wed, 22 Nov 2023 22:33:05 +0300 Subject: [PATCH] World processor markers: remove toggleVisibility, swap makemarker's type and id arguments for instruction consistency --- core/src/mindustry/game/MapObjectives.java | 1 - core/src/mindustry/logic/LMarkerControl.java | 1 - core/src/mindustry/logic/LStatements.java | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java index afc4608e9a..8e6bf5e65d 100644 --- a/core/src/mindustry/game/MapObjectives.java +++ b/core/src/mindustry/game/MapObjectives.java @@ -629,7 +629,6 @@ public class MapObjectives implements Iterable, Eachable hidden = !hidden; case visibility -> hidden = ((Math.abs(p1) < 1e-5)); case drawLayer -> drawLayer = (float)p1; } diff --git a/core/src/mindustry/logic/LMarkerControl.java b/core/src/mindustry/logic/LMarkerControl.java index e7bbec9b5a..70e06e6aed 100644 --- a/core/src/mindustry/logic/LMarkerControl.java +++ b/core/src/mindustry/logic/LMarkerControl.java @@ -3,7 +3,6 @@ package mindustry.logic; public enum LMarkerControl{ remove, visibility("true/false"), - toggleVisibility, x("x"), y("y"), pos("x", "y"), diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java index 93a950c120..febcee4450 100644 --- a/core/src/mindustry/logic/LStatements.java +++ b/core/src/mindustry/logic/LStatements.java @@ -2000,7 +2000,7 @@ public class LStatements{ @RegisterStatement("makemarker") public static class MakeMarkerStatement extends LStatement{ - public String id = "0", type = "shape", x = "0", y = "0", replace = "true"; + public String type = "shape", id = "0", x = "0", y = "0", replace = "true"; @Override public void build(Table table){