From 6eaec7d50561e85be4465e4d73acb92125bb0569 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 12 Nov 2020 18:46:20 -0500 Subject: [PATCH] Bugfixes + Binary and --- core/src/mindustry/logic/LogicOp.java | 11 +++++++---- gradle.properties | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/core/src/mindustry/logic/LogicOp.java b/core/src/mindustry/logic/LogicOp.java index 3d7d60a8d9..658a7cdeb8 100644 --- a/core/src/mindustry/logic/LogicOp.java +++ b/core/src/mindustry/logic/LogicOp.java @@ -10,25 +10,28 @@ public enum LogicOp{ div("/", (a, b) -> a / b), idiv("//", (a, b) -> Math.floor(a / b)), mod("%", (a, b) -> a % b), + pow("^", Math::pow), + equal("==", (a, b) -> Math.abs(a - b) < 0.000001 ? 1 : 0, (a, b) -> Structs.eq(a, b) ? 1 : 0), notEqual("not", (a, b) -> Math.abs(a - b) < 0.000001 ? 0 : 1, (a, b) -> !Structs.eq(a, b) ? 1 : 0), + land("and", (a, b) -> a != 0 && b != 0 ? 1 : 0), lessThan("<", (a, b) -> a < b ? 1 : 0), lessThanEq("<=", (a, b) -> a <= b ? 1 : 0), greaterThan(">", (a, b) -> a > b ? 1 : 0), greaterThanEq(">=", (a, b) -> a >= b ? 1 : 0), - pow("^", Math::pow), + shl("<<", (a, b) -> (long)a << (long)b), shr(">>", (a, b) -> (long)a >> (long)b), or("or", (a, b) -> (long)a | (long)b), - and("and", (a, b) -> (long)a & (long)b), + and("b-and", (a, b) -> (long)a & (long)b), xor("xor", (a, b) -> (long)a ^ (long)b), + not("flip", a -> ~(long)(a)), + max("max", Math::max), min("min", Math::min), atan2("atan2", (x, y) -> Mathf.atan2((float)x, (float)y) * Mathf.radDeg), dst("dst", (x, y) -> Mathf.dst((float)x, (float)y)), noise("noise", LExecutor.noise::rawNoise2D), - - not("not", a -> ~(long)(a)), abs("abs", a -> Math.abs(a)), log("log", Math::log), log10("log10", Math::log10), diff --git a/gradle.properties b/gradle.properties index 9dfabc4657..45daf3a1bf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=a14ed44889c9baa7ea20bb22c576c8e1aa7d3fff +archash=d7c1e1d5d0bffdd10de896c74d9852c99367ccad