Closes Anuken/Mindustry-Suggestions/issues/4456

This commit is contained in:
Anuken
2023-06-02 11:56:08 -04:00
parent 2f675a3b75
commit 4dd414c22f
5 changed files with 15 additions and 6 deletions

View File

@@ -2303,6 +2303,7 @@ lenum.xor = Bitwise XOR.
lenum.min = Minimum of two numbers. lenum.min = Minimum of two numbers.
lenum.max = Maximum of two numbers. lenum.max = Maximum of two numbers.
lenum.angle = Angle of vector in degrees. lenum.angle = Angle of vector in degrees.
lenum.anglediff = Absolute distance between two angles in degrees.
lenum.len = Length of vector. lenum.len = Length of vector.
lenum.sin = Sine, in degrees. lenum.sin = Sine, in degrees.

View File

@@ -704,7 +704,7 @@ public class LStatements{
@Override @Override
public void build(Table table){ public void build(Table table){
fields(table, result, str -> result = str); fields(table, result, str -> result = str).width(120f);
table.add(" = lookup "); table.add(" = lookup ");
@@ -1632,11 +1632,13 @@ public class LStatements{
@Override @Override
public void build(Table table){ 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 "); table.add(" = flag ");
fields(table, flag, str -> flag = str); fields(table, flag, str -> flag = str).width(width);
} }
@Override @Override
@@ -1661,11 +1663,13 @@ public class LStatements{
@Override @Override
public void build(Table table){ 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(" = "); table.add(" = ");
fields(table, value, str -> value = str); fields(table, value, str -> value = str).width(width);
} }
@Override @Override

View File

@@ -32,6 +32,7 @@ public enum LogicOp{
max("max", true, Math::max), max("max", true, Math::max),
min("min", true, Math::min), min("min", true, Math::min),
angle("angle", true, (x, y) -> Angles.angle((float)x, (float)y)), 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)), len("len", true, (x, y) -> Mathf.dst((float)x, (float)y)),
noise("noise", true, (x, y) -> Simplex.raw2d(0, x, 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 abs("abs", a -> Math.abs(a)), //not a method reference because it fails to compile for some reason

View File

@@ -19,6 +19,7 @@ import mindustry.game.*;
import mindustry.io.*; import mindustry.io.*;
import mindustry.maps.MapPreviewLoader.*; import mindustry.maps.MapPreviewLoader.*;
import mindustry.maps.filters.*; import mindustry.maps.filters.*;
import mindustry.service.*;
import mindustry.world.*; import mindustry.world.*;
import mindustry.world.blocks.storage.*; import mindustry.world.blocks.storage.*;
@@ -134,6 +135,8 @@ public class Maps{
//workshop //workshop
for(Fi file : platform.getWorkshopContent(Map.class)){ for(Fi file : platform.getWorkshopContent(Map.class)){
try{ try{
//HACK this achievement isn't completing for some reason
Achievement.downloadMapWorkshop.complete();
Map map = loadMap(file, false); Map map = loadMap(file, false);
map.workshop = true; map.workshop = true;
map.tags.put("steamid", file.parent().name()); map.tags.put("steamid", file.parent().name());

View File

@@ -25,4 +25,4 @@ org.gradle.caching=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000 org.gradle.internal.http.connectionTimeout=100000
archash=6433d83dbd archash=791c5fa502