Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

World processor markers: remove toggleVisibility, swap makemarker's type and id arguments for instruction consistency

Browse Source
This commit is contained in:
ApsZoldat
2023-11-22 22:33:05 +03:00
parent c434e18f8f
commit aa018b314d
3 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/game/MapObjectives.java
View File

@@ -629,7 +629,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
/** Control marker with world processor code*/ /** Control marker with world processor code*/
public void control(LMarkerControl type, double p1, double p2, double p3){ public void control(LMarkerControl type, double p1, double p2, double p3){
switch(type){ switch(type){
case toggleVisibility -> hidden = !hidden;
case visibility -> hidden = ((Math.abs(p1) < 1e-5)); case visibility -> hidden = ((Math.abs(p1) < 1e-5));
case drawLayer -> drawLayer = (float)p1; case drawLayer -> drawLayer = (float)p1;
} }

1
core/src/mindustry/logic/LMarkerControl.java
View File

@@ -3,7 +3,6 @@ package mindustry.logic;
public enum LMarkerControl{ public enum LMarkerControl{
remove, remove,
visibility("true/false"), visibility("true/false"),
toggleVisibility,
x("x"), x("x"),
y("y"), y("y"),
pos("x", "y"), pos("x", "y"),

2
core/src/mindustry/logic/LStatements.java
View File

@@ -2000,7 +2000,7 @@ public class LStatements{
@RegisterStatement("makemarker") @RegisterStatement("makemarker")
public static class MakeMarkerStatement extends LStatement{ 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 @Override
public void build(Table table){ public void build(Table table){