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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2023-09-29 21:25:20 -04:00
parent 177125a616 dbea2e2161
commit 46ed5e05bb
5 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,7 +144,7 @@ public abstract class LStatement{
if(p instanceof Enum e){
tooltip(c, e);
}
}).checked(current == p).group(group));
}).checked(current.equals(p)).group(group));
if(++i % cols == 0) t.row();
}

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

@@ -1982,7 +1982,7 @@ public class LStatements{
@RegisterStatement("makemarker")
public static class MakeMarkerStatement extends LStatement{
public String id = "0", type = "Shape", x = "0", y = "0";
public String id = "0", type = "shape", x = "0", y = "0";
@Override
public void build(Table table){
@@ -1991,7 +1991,7 @@ public class LStatements{
table.button(b -> {
b.label(() -> type);
b.clicked(() -> showSelect(b, MapObjectives.allMarkerTypeNanes.toArray(String.class), type, t -> {
b.clicked(() -> showSelect(b, MapObjectives.allMarkerTypeNames.toArray(String.class), type, t -> {
type = t;
build(table);
}, 2, cell -> cell.size(160, 50)));