diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index c7f7921ae2..90863c2be1 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -2303,6 +2303,7 @@ lenum.xor = Bitwise XOR. lenum.min = Minimum of two numbers. lenum.max = Maximum of two numbers. lenum.angle = Angle of vector in degrees. +lenum.anglediff = Absolute distance between two angles in degrees. lenum.len = Length of vector. lenum.sin = Sine, in degrees. diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java index a20f1f30d8..b829351c3c 100644 --- a/core/src/mindustry/logic/LStatements.java +++ b/core/src/mindustry/logic/LStatements.java @@ -704,7 +704,7 @@ public class LStatements{ @Override public void build(Table table){ - fields(table, result, str -> result = str); + fields(table, result, str -> result = str).width(120f); table.add(" = lookup "); @@ -1632,11 +1632,13 @@ public class LStatements{ @Override public void build(Table table){ - fields(table, result, str -> result = str); + float width = LCanvas.useRows() ? 100f : 190f; + + fields(table, result, str -> result = str).width(width); table.add(" = flag "); - fields(table, flag, str -> flag = str); + fields(table, flag, str -> flag = str).width(width); } @Override @@ -1661,11 +1663,13 @@ public class LStatements{ @Override public void build(Table table){ - fields(table, flag, str -> flag = str); + float width = LCanvas.useRows() ? 100f : 190f; + + fields(table, flag, str -> flag = str).width(width); table.add(" = "); - fields(table, value, str -> value = str); + fields(table, value, str -> value = str).width(width); } @Override diff --git a/core/src/mindustry/logic/LogicOp.java b/core/src/mindustry/logic/LogicOp.java index 01bab145c0..994dfdc1a4 100644 --- a/core/src/mindustry/logic/LogicOp.java +++ b/core/src/mindustry/logic/LogicOp.java @@ -32,6 +32,7 @@ public enum LogicOp{ max("max", true, Math::max), min("min", true, Math::min), angle("angle", true, (x, y) -> Angles.angle((float)x, (float)y)), + angleDiff("anglediff", true, (x, y) -> Angles.angleDist((float)x, (float)y)), len("len", true, (x, y) -> Mathf.dst((float)x, (float)y)), noise("noise", true, (x, y) -> Simplex.raw2d(0, x, y)), abs("abs", a -> Math.abs(a)), //not a method reference because it fails to compile for some reason diff --git a/core/src/mindustry/maps/Maps.java b/core/src/mindustry/maps/Maps.java index 631ee13e6b..d9d6be3b54 100644 --- a/core/src/mindustry/maps/Maps.java +++ b/core/src/mindustry/maps/Maps.java @@ -19,6 +19,7 @@ import mindustry.game.*; import mindustry.io.*; import mindustry.maps.MapPreviewLoader.*; import mindustry.maps.filters.*; +import mindustry.service.*; import mindustry.world.*; import mindustry.world.blocks.storage.*; @@ -134,6 +135,8 @@ public class Maps{ //workshop for(Fi file : platform.getWorkshopContent(Map.class)){ try{ + //HACK this achievement isn't completing for some reason + Achievement.downloadMapWorkshop.complete(); Map map = loadMap(file, false); map.workshop = true; map.tags.put("steamid", file.parent().name()); diff --git a/gradle.properties b/gradle.properties index 99182f85a4..194354292b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,4 +25,4 @@ org.gradle.caching=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=6433d83dbd +archash=791c5fa502