diff --git a/core/src/mindustry/logic/LStatement.java b/core/src/mindustry/logic/LStatement.java index 76bcd781b3..a7a384084f 100644 --- a/core/src/mindustry/logic/LStatement.java +++ b/core/src/mindustry/logic/LStatement.java @@ -244,6 +244,10 @@ public abstract class LStatement{ } + public String typeName(){ + return getClass().getSimpleName().replace("Statement", ""); + } + public String name(){ return Strings.insertSpaces(getClass().getSimpleName().replace("Statement", "")); } diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java index 827d561715..e1b39969ce 100644 --- a/core/src/mindustry/logic/LStatements.java +++ b/core/src/mindustry/logic/LStatements.java @@ -1634,6 +1634,8 @@ public class LStatements{ case mapArea -> { table.add(" = "); + row(table); + fields(table, "x", p1, s -> p1 = s); fields(table, "y", p2, s -> p2 = s); row(table); @@ -1653,7 +1655,7 @@ public class LStatements{ case ban, unban -> { table.add(" block/unit "); - field(table, value, s -> value = s); + fields(table, value, s -> value = s); } default -> { table.add(" = "); diff --git a/core/src/mindustry/logic/LogicDialog.java b/core/src/mindustry/logic/LogicDialog.java index 047e54c99c..f5b09226f3 100644 --- a/core/src/mindustry/logic/LogicDialog.java +++ b/core/src/mindustry/logic/LogicDialog.java @@ -295,7 +295,8 @@ public class LogicDialog extends BaseDialog{ for(Prov prov : LogicIO.allStatements){ LStatement example = prov.get(); - if(example instanceof InvalidStatement || example.hidden() || (example.privileged() && !privileged) || (example.nonPrivileged() && privileged) || (!text.isEmpty() && !example.name().toLowerCase(Locale.ROOT).contains(text))) continue; + if(example instanceof InvalidStatement || example.hidden() || (example.privileged() && !privileged) || (example.nonPrivileged() && privileged) || + (!text.isEmpty() && !example.name().toLowerCase(Locale.ROOT).contains(text) && !example.typeName().toLowerCase(Locale.ROOT).contains(text))) continue; if(matched[0] == null){ matched[0] = prov;