mlogjs 0.2.1 → 0.3.0

package/build/macros/commands/DrawFlush.js

@@ -1,17 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DrawFlush = void 0;
-const instructions_1 = require("../../instructions");
-const __1 = require("..");
-const values_1 = require("../../values");
-class DrawFlush extends __1.MacroFunction {
-    constructor(scope) {
-        super(scope, (target) => {
-            if (!(target instanceof values_1.ObjectValue))
-                throw new Error("The drawflush target must be a building");
-            return [null, [new instructions_1.InstructionBase("drawflush", target)]];
-        });
-    }
-}
-exports.DrawFlush = DrawFlush;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DrawFlush = void 0;
+const instructions_1 = require("../../instructions");
+const __1 = require("..");
+const values_1 = require("../../values");
+const CompilerError_1 = require("../../CompilerError");
+class DrawFlush extends __1.MacroFunction {
+    constructor(scope) {
+        super(scope, (target) => {
+            if (!(target instanceof values_1.ObjectValue))
+                throw new CompilerError_1.CompilerError("The drawflush target must be a building");
+            return [null, [new instructions_1.InstructionBase("drawflush", target)]];
+        });
+    }
+}
+exports.DrawFlush = DrawFlush;
 //# sourceMappingURL=DrawFlush.js.map

package/build/macros/commands/DrawFlush.js.map

@@ -1 +1 @@
-{"version":3,"file":"DrawFlush.js","sourceRoot":"","sources":["../../../src/macros/commands/DrawFlush.ts"],"names":[],"mappings":";;;AAAA,qDAAqD;AACrD,0BAAmC;AAEnC,yCAAuD;AAEvD,MAAa,SAAU,SAAQ,iBAAa;IAC1C,YAAY,KAAa;QACvB,KAAK,CAAC,KAAK,EAAE,CAAC,MAAc,EAAE,EAAE;YAC9B,IAAI,CAAC,CAAC,MAAM,YAAY,oBAAW,CAAC;gBAClC,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;YAC7D,OAAO,CAAC,IAAI,EAAE,CAAC,IAAI,8BAAe,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AARD,8BAQC"}
+{"version":3,"file":"DrawFlush.js","sourceRoot":"","sources":["../../../src/macros/commands/DrawFlush.ts"],"names":[],"mappings":";;;AAAA,qDAAqD;AACrD,0BAAmC;AAEnC,yCAA2C;AAC3C,uDAAoD;AAEpD,MAAa,SAAU,SAAQ,iBAAmB;IAChD,YAAY,KAAa;QACvB,KAAK,CAAC,KAAK,EAAE,CAAC,MAAc,EAAE,EAAE;YAC9B,IAAI,CAAC,CAAC,MAAM,YAAY,oBAAW,CAAC;gBAClC,MAAM,IAAI,6BAAa,CAAC,yCAAyC,CAAC,CAAC;YACrE,OAAO,CAAC,IAAI,EAAE,CAAC,IAAI,8BAAe,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AARD,8BAQC"}

package/build/macros/commands/GetLink.js

@@ -1,21 +1,25 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetLink = void 0;
-const instructions_1 = require("../../instructions");
-const __1 = require("..");
-const values_1 = require("../../values");
-const Building_1 = require("../Building");
-class GetLink extends __1.MacroFunction {
-    constructor(scope) {
-        super(scope, (index) => {
-            if (!(index instanceof values_1.StoreValue) &&
-                (!(index instanceof values_1.LiteralValue) || typeof index.data !== "number"))
-                throw new Error("The getlink index must be a number literal or a store");
-            const temp = new values_1.TempValue(scope);
-            const outBuild = new Building_1.Building(scope, temp.name);
-            return [outBuild, [new instructions_1.InstructionBase("getlink", temp, index)]];
-        });
-    }
-}
-exports.GetLink = GetLink;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetLink = void 0;
+const instructions_1 = require("../../instructions");
+const __1 = require("..");
+const values_1 = require("../../values");
+const Building_1 = require("../Building");
+const CompilerError_1 = require("../../CompilerError");
+class GetLink extends __1.MacroFunction {
+    constructor(scope) {
+        super(scope, (index) => {
+            if (!(index instanceof values_1.StoreValue) &&
+                (!(index instanceof values_1.LiteralValue) || typeof index.data !== "number"))
+                throw new CompilerError_1.CompilerError("The getlink index must be a number literal or a store");
+            const outBuild = new Building_1.Building({
+                scope,
+                name: scope.makeTempName(),
+                renameable: true,
+            });
+            return [outBuild, [new instructions_1.InstructionBase("getlink", outBuild, index)]];
+        });
+    }
+}
+exports.GetLink = GetLink;
 //# sourceMappingURL=GetLink.js.map

package/build/macros/commands/GetLink.js.map

@@ -1 +1 @@
-{"version":3,"file":"GetLink.js","sourceRoot":"","sources":["../../../src/macros/commands/GetLink.ts"],"names":[],"mappings":";;;AAAA,qDAAqD;AACrD,0BAAmC;AAEnC,yCAAmE;AACnE,0CAAuC;AAEvC,MAAa,OAAQ,SAAQ,iBAAa;IACxC,YAAY,KAAa;QACvB,KAAK,CAAC,KAAK,EAAE,CAAC,KAAa,EAAE,EAAE;YAC7B,IACE,CAAC,CAAC,KAAK,YAAY,mBAAU,CAAC;gBAC9B,CAAC,CAAC,CAAC,KAAK,YAAY,qBAAY,CAAC,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC;gBAEpE,MAAM,IAAI,KAAK,CACb,uDAAuD,CACxD,CAAC;YACJ,MAAM,IAAI,GAAG,IAAI,kBAAS,CAAC,KAAK,CAAC,CAAC;YAClC,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAChD,OAAO,CAAC,QAAQ,EAAE,CAAC,IAAI,8BAAe,CAAC,SAAS,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAfD,0BAeC"}
+{"version":3,"file":"GetLink.js","sourceRoot":"","sources":["../../../src/macros/commands/GetLink.ts"],"names":[],"mappings":";;;AAAA,qDAAqD;AACrD,0BAAmC;AAEnC,yCAAwD;AACxD,0CAAuC;AACvC,uDAAoD;AAEpD,MAAa,OAAQ,SAAQ,iBAAa;IACxC,YAAY,KAAa;QACvB,KAAK,CAAC,KAAK,EAAE,CAAC,KAAa,EAAE,EAAE;YAC7B,IACE,CAAC,CAAC,KAAK,YAAY,mBAAU,CAAC;gBAC9B,CAAC,CAAC,CAAC,KAAK,YAAY,qBAAY,CAAC,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC;gBAEpE,MAAM,IAAI,6BAAa,CACrB,uDAAuD,CACxD,CAAC;YACJ,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC;gBAC5B,KAAK;gBACL,IAAI,EAAE,KAAK,CAAC,YAAY,EAAE;gBAC1B,UAAU,EAAE,IAAI;aACjB,CAAC,CAAC;YACH,OAAO,CAAC,QAAQ,EAAE,CAAC,IAAI,8BAAe,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;QACvE,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAlBD,0BAkBC"}

package/build/macros/commands/Lookup.js

@@ -1,24 +1,25 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Lookup = void 0;
-const instructions_1 = require("../../instructions");
-const __1 = require("..");
-const values_1 = require("../../values");
-const validKinds = ["block", "unit", "item", "liquid"];
-class Lookup extends __1.MacroFunction {
-    constructor(scope) {
-        super(scope, (kind, index) => {
-            if (!(kind instanceof values_1.LiteralValue && typeof kind.data === "string"))
-                throw new Error("The lookup kind must be a string literal");
-            if (!validKinds.includes(kind.data))
-                throw new Error("Invalid lookup kind");
-            if (!(index instanceof values_1.LiteralValue && typeof index.data === "number") &&
-                !(index instanceof values_1.StoreValue))
-                throw new Error("The lookup index must be a number literal or a store");
-            const temp = new values_1.TempValue(scope);
-            return [temp, [new instructions_1.InstructionBase("lookup", kind.data, temp, index)]];
-        });
-    }
-}
-exports.Lookup = Lookup;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Lookup = void 0;
+const instructions_1 = require("../../instructions");
+const __1 = require("..");
+const values_1 = require("../../values");
+const CompilerError_1 = require("../../CompilerError");
+const validKinds = ["block", "unit", "item", "liquid"];
+class Lookup extends __1.MacroFunction {
+    constructor(scope) {
+        super(scope, (kind, index) => {
+            if (!(kind instanceof values_1.LiteralValue && typeof kind.data === "string"))
+                throw new CompilerError_1.CompilerError("The lookup kind must be a string literal");
+            if (!validKinds.includes(kind.data))
+                throw new CompilerError_1.CompilerError("Invalid lookup kind");
+            if (!(index instanceof values_1.LiteralValue && typeof index.data === "number") &&
+                !(index instanceof values_1.StoreValue))
+                throw new CompilerError_1.CompilerError("The lookup index must be a number literal or a store");
+            const temp = new values_1.TempValue({ scope });
+            return [temp, [new instructions_1.InstructionBase("lookup", kind.data, temp, index)]];
+        });
+    }
+}
+exports.Lookup = Lookup;
 //# sourceMappingURL=Lookup.js.map

package/build/macros/commands/Lookup.js.map

@@ -1 +1 @@
-{"version":3,"file":"Lookup.js","sourceRoot":"","sources":["../../../src/macros/commands/Lookup.ts"],"names":[],"mappings":";;;AAAA,qDAAqD;AACrD,0BAAmC;AAEnC,yCAAmE;AAEnE,MAAM,UAAU,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;AACvD,MAAa,MAAO,SAAQ,iBAAa;IACvC,YAAY,KAAa;QACvB,KAAK,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YAC3B,IAAI,CAAC,CAAC,IAAI,YAAY,qBAAY,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC;gBAClE,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;YAE9D,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;gBACjC,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;YAEzC,IACE,CAAC,CAAC,KAAK,YAAY,qBAAY,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC;gBAClE,CAAC,CAAC,KAAK,YAAY,mBAAU,CAAC;gBAE9B,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;YAE1E,MAAM,IAAI,GAAG,IAAI,kBAAS,CAAC,KAAK,CAAC,CAAC;YAClC,OAAO,CAAC,IAAI,EAAE,CAAC,IAAI,8BAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;QACzE,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAnBD,wBAmBC"}
+{"version":3,"file":"Lookup.js","sourceRoot":"","sources":["../../../src/macros/commands/Lookup.ts"],"names":[],"mappings":";;;AAAA,qDAAqD;AACrD,0BAAmC;AAEnC,yCAAmE;AACnE,uDAAoD;AAEpD,MAAM,UAAU,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;AACvD,MAAa,MAAO,SAAQ,iBAAa;IACvC,YAAY,KAAa;QACvB,KAAK,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YAC3B,IAAI,CAAC,CAAC,IAAI,YAAY,qBAAY,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC;gBAClE,MAAM,IAAI,6BAAa,CAAC,0CAA0C,CAAC,CAAC;YAEtE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;gBACjC,MAAM,IAAI,6BAAa,CAAC,qBAAqB,CAAC,CAAC;YAEjD,IACE,CAAC,CAAC,KAAK,YAAY,qBAAY,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC;gBAClE,CAAC,CAAC,KAAK,YAAY,mBAAU,CAAC;gBAE9B,MAAM,IAAI,6BAAa,CACrB,sDAAsD,CACvD,CAAC;YAEJ,MAAM,IAAI,GAAG,IAAI,kBAAS,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;YACtC,OAAO,CAAC,IAAI,EAAE,CAAC,IAAI,8BAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;QACzE,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AArBD,wBAqBC"}

package/build/macros/commands/Print.js

@@ -1,14 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Print = void 0;
-const instructions_1 = require("../../instructions");
-const __1 = require("..");
-class Print extends __1.MacroFunction {
-    constructor(scope) {
-        super(scope, (...values) => {
-            return [null, [new instructions_1.InstructionBase("print", ...values)]];
-        });
-    }
-}
-exports.Print = Print;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Print = void 0;
+const instructions_1 = require("../../instructions");
+const __1 = require("..");
+class Print extends __1.MacroFunction {
+    constructor(scope) {
+        super(scope, (...values) => {
+            const inst = [];
+            for (const value of values) {
+                inst.push(new instructions_1.InstructionBase("print", value));
+            }
+            return [null, inst];
+        });
+    }
+}
+exports.Print = Print;
 //# sourceMappingURL=Print.js.map

package/build/macros/commands/Print.js.map

@@ -1 +1 @@
-{"version":3,"file":"Print.js","sourceRoot":"","sources":["../../../src/macros/commands/Print.ts"],"names":[],"mappings":";;;AAAA,qDAAqD;AACrD,0BAAmC;AAGnC,MAAa,KAAM,SAAQ,iBAAa;IACtC,YAAY,KAAa;QACvB,KAAK,CAAC,KAAK,EAAE,CAAC,GAAG,MAAgB,EAAE,EAAE;YACnC,OAAO,CAAC,IAAI,EAAE,CAAC,IAAI,8BAAe,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAND,sBAMC"}
+{"version":3,"file":"Print.js","sourceRoot":"","sources":["../../../src/macros/commands/Print.ts"],"names":[],"mappings":";;;AAAA,qDAAqD;AACrD,0BAAmC;AAGnC,MAAa,KAAM,SAAQ,iBAAmB;IAC5C,YAAY,KAAa;QACvB,KAAK,CAAC,KAAK,EAAE,CAAC,GAAG,MAAgB,EAAE,EAAE;YACnC,MAAM,IAAI,GAAmB,EAAE,CAAC;YAEhC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;gBAC1B,IAAI,CAAC,IAAI,CAAC,IAAI,8BAAe,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;aAChD;YAED,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAZD,sBAYC"}

package/build/macros/commands/PrintFlush.js

@@ -1,17 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PrintFlush = void 0;
-const instructions_1 = require("../../instructions");
-const __1 = require("..");
-const values_1 = require("../../values");
-class PrintFlush extends __1.MacroFunction {
-    constructor(scope) {
-        super(scope, (target) => {
-            if (!(target instanceof values_1.ObjectValue))
-                throw new Error("The printflush target must be a building");
-            return [null, [new instructions_1.InstructionBase("printflush", target)]];
-        });
-    }
-}
-exports.PrintFlush = PrintFlush;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PrintFlush = void 0;
+const instructions_1 = require("../../instructions");
+const __1 = require("..");
+const values_1 = require("../../values");
+const CompilerError_1 = require("../../CompilerError");
+class PrintFlush extends __1.MacroFunction {
+    constructor(scope) {
+        super(scope, (target) => {
+            if (!(target instanceof values_1.ObjectValue))
+                throw new CompilerError_1.CompilerError("The printflush target must be a building");
+            return [null, [new instructions_1.InstructionBase("printflush", target)]];
+        });
+    }
+}
+exports.PrintFlush = PrintFlush;
 //# sourceMappingURL=PrintFlush.js.map

package/build/macros/commands/PrintFlush.js.map

@@ -1 +1 @@
-{"version":3,"file":"PrintFlush.js","sourceRoot":"","sources":["../../../src/macros/commands/PrintFlush.ts"],"names":[],"mappings":";;;AAAA,qDAAqD;AACrD,0BAAmC;AAEnC,yCAAuD;AAEvD,MAAa,UAAW,SAAQ,iBAAa;IAC3C,YAAY,KAAa;QACvB,KAAK,CAAC,KAAK,EAAE,CAAC,MAAc,EAAE,EAAE;YAC9B,IAAI,CAAC,CAAC,MAAM,YAAY,oBAAW,CAAC;gBAClC,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;YAC9D,OAAO,CAAC,IAAI,EAAE,CAAC,IAAI,8BAAe,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AARD,gCAQC"}
+{"version":3,"file":"PrintFlush.js","sourceRoot":"","sources":["../../../src/macros/commands/PrintFlush.ts"],"names":[],"mappings":";;;AAAA,qDAAqD;AACrD,0BAAmC;AAEnC,yCAA2C;AAC3C,uDAAoD;AAEpD,MAAa,UAAW,SAAQ,iBAAmB;IACjD,YAAY,KAAa;QACvB,KAAK,CAAC,KAAK,EAAE,CAAC,MAAc,EAAE,EAAE;YAC9B,IAAI,CAAC,CAAC,MAAM,YAAY,oBAAW,CAAC;gBAClC,MAAM,IAAI,6BAAa,CAAC,0CAA0C,CAAC,CAAC;YACtE,OAAO,CAAC,IAAI,EAAE,CAAC,IAAI,8BAAe,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AARD,gCAQC"}

package/build/macros/commands/Radar.js

@@ -1,61 +1,65 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Radar = exports.validRadarSorts = exports.validRadarFilters = void 0;
-const instructions_1 = require("../../instructions");
-const __1 = require("..");
-const values_1 = require("../../values");
-const Namespace_1 = require("../Namespace");
-exports.validRadarFilters = [
-    "any",
-    "enemy",
-    "ally",
-    "player",
-    "attacker",
-    "flying",
-    "boss",
-    "ground",
-];
-exports.validRadarSorts = [
-    "distance",
-    "health",
-    "shield",
-    "armor",
-    "maxHealth",
-];
-class Radar extends __1.MacroFunction {
-    constructor(scope) {
-        super(scope, (building, filter1, filter2, filter3, order, sort) => {
-            if (!(building instanceof values_1.ObjectValue))
-                throw new Error("The building must a store");
-            if (!(filter1 instanceof values_1.LiteralValue) ||
-                typeof filter1.data !== "string" ||
-                !(filter2 instanceof values_1.LiteralValue) ||
-                typeof filter2.data !== "string" ||
-                !(filter3 instanceof values_1.LiteralValue) ||
-                typeof filter3.data !== "string")
-                throw new Error("The filters must be string literals");
-            if (!exports.validRadarFilters.includes(filter1.data))
-                throw new Error("Invalid value for filter1");
-            if (!exports.validRadarFilters.includes(filter2.data))
-                throw new Error("Invalid value for filter2");
-            if (!exports.validRadarFilters.includes(filter3.data))
-                throw new Error("Invalid value for filter3");
-            if (!(order instanceof values_1.LiteralValue || order instanceof values_1.StoreValue))
-                throw new Error("The radar order must be a literal or a store");
-            if (!(sort instanceof values_1.LiteralValue) || typeof sort.data !== "string")
-                throw new Error("The radar sort must be a string literal");
-            if (!exports.validRadarSorts.includes(sort.data))
-                throw new Error("Invalid sort value");
-            const temp = new values_1.TempValue(scope);
-            const resultUnit = new Namespace_1.Unit(scope, temp.name);
-            return [
-                resultUnit,
-                [
-                    new instructions_1.InstructionBase("radar", filter1.data, filter2.data, filter3.data, sort.data, building, order, temp),
-                ],
-            ];
-        });
-    }
-}
-exports.Radar = Radar;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Radar = exports.validRadarSorts = exports.validRadarFilters = void 0;
+const instructions_1 = require("../../instructions");
+const __1 = require("..");
+const values_1 = require("../../values");
+const Namespace_1 = require("../Namespace");
+const CompilerError_1 = require("../../CompilerError");
+exports.validRadarFilters = [
+    "any",
+    "enemy",
+    "ally",
+    "player",
+    "attacker",
+    "flying",
+    "boss",
+    "ground",
+];
+exports.validRadarSorts = [
+    "distance",
+    "health",
+    "shield",
+    "armor",
+    "maxHealth",
+];
+class Radar extends __1.MacroFunction {
+    constructor(scope) {
+        super(scope, (building, filter1, filter2, filter3, order, sort) => {
+            if (!(building instanceof values_1.ObjectValue))
+                throw new CompilerError_1.CompilerError("The building must a store");
+            if (!(filter1 instanceof values_1.LiteralValue) ||
+                typeof filter1.data !== "string" ||
+                !(filter2 instanceof values_1.LiteralValue) ||
+                typeof filter2.data !== "string" ||
+                !(filter3 instanceof values_1.LiteralValue) ||
+                typeof filter3.data !== "string")
+                throw new CompilerError_1.CompilerError("The filters must be string literals");
+            if (!exports.validRadarFilters.includes(filter1.data))
+                throw new CompilerError_1.CompilerError("Invalid value for filter1");
+            if (!exports.validRadarFilters.includes(filter2.data))
+                throw new CompilerError_1.CompilerError("Invalid value for filter2");
+            if (!exports.validRadarFilters.includes(filter3.data))
+                throw new CompilerError_1.CompilerError("Invalid value for filter3");
+            if (!(order instanceof values_1.LiteralValue || order instanceof values_1.StoreValue))
+                throw new CompilerError_1.CompilerError("The radar order must be a literal or a store");
+            if (!(sort instanceof values_1.LiteralValue) || typeof sort.data !== "string")
+                throw new CompilerError_1.CompilerError("The radar sort must be a string literal");
+            if (!exports.validRadarSorts.includes(sort.data))
+                throw new CompilerError_1.CompilerError("Invalid sort value");
+            const outUnit = new Namespace_1.Unit({
+                scope,
+                name: scope.makeTempName(),
+                renameable: true,
+            });
+            return [
+                outUnit,
+                [
+                    new instructions_1.InstructionBase("radar", filter1.data, filter2.data, filter3.data, sort.data, building, order, outUnit),
+                ],
+            ];
+        });
+    }
+}
+exports.Radar = Radar;
 //# sourceMappingURL=Radar.js.map

package/build/macros/commands/Radar.js.map

@@ -1 +1 @@
-{"version":3,"file":"Radar.js","sourceRoot":"","sources":["../../../src/macros/commands/Radar.ts"],"names":[],"mappings":";;;AAAA,qDAAqD;AACrD,0BAAmC;AAEnC,yCAAgF;AAChF,4CAAoC;AAEvB,QAAA,iBAAiB,GAAG;IAC/B,KAAK;IACL,OAAO;IACP,MAAM;IACN,QAAQ;IACR,UAAU;IACV,QAAQ;IACR,MAAM;IACN,QAAQ;CACT,CAAC;AAEW,QAAA,eAAe,GAAG;IAC7B,UAAU;IACV,QAAQ;IACR,QAAQ;IACR,OAAO;IACP,WAAW;CACZ,CAAC;AAEF,MAAa,KAAM,SAAQ,iBAAa;IACtC,YAAY,KAAa;QACvB,KAAK,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YAChE,IAAI,CAAC,CAAC,QAAQ,YAAY,oBAAW,CAAC;gBACpC,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;YAE/C,IACE,CAAC,CAAC,OAAO,YAAY,qBAAY,CAAC;gBAClC,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ;gBAChC,CAAC,CAAC,OAAO,YAAY,qBAAY,CAAC;gBAClC,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ;gBAChC,CAAC,CAAC,OAAO,YAAY,qBAAY,CAAC;gBAClC,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ;gBAEhC,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;YAEzD,IAAI,CAAC,yBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC;gBAC3C,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;YAC/C,IAAI,CAAC,yBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC;gBAC3C,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;YAC/C,IAAI,CAAC,yBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC;gBAC3C,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;YAE/C,IAAI,CAAC,CAAC,KAAK,YAAY,qBAAY,IAAI,KAAK,YAAY,mBAAU,CAAC;gBACjE,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;YAElE,IAAI,CAAC,CAAC,IAAI,YAAY,qBAAY,CAAC,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ;gBAClE,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;YAE7D,IAAI,CAAC,uBAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;gBACtC,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;YAExC,MAAM,IAAI,GAAG,IAAI,kBAAS,CAAC,KAAK,CAAC,CAAC;YAClC,MAAM,UAAU,GAAG,IAAI,gBAAI,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9C,OAAO;gBACL,UAAU;gBACV;oBACE,IAAI,8BAAe,CACjB,OAAO,EACP,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,IAAI,EACZ,IAAI,CAAC,IAAI,EACT,QAAQ,EACR,KAAK,EACL,IAAI,CACL;iBACF;aACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAnDD,sBAmDC"}
+{"version":3,"file":"Radar.js","sourceRoot":"","sources":["../../../src/macros/commands/Radar.ts"],"names":[],"mappings":";;;AAAA,qDAAqD;AACrD,0BAAmC;AAEnC,yCAAqE;AACrE,4CAAoC;AACpC,uDAAoD;AAEvC,QAAA,iBAAiB,GAAG;IAC/B,KAAK;IACL,OAAO;IACP,MAAM;IACN,QAAQ;IACR,UAAU;IACV,QAAQ;IACR,MAAM;IACN,QAAQ;CACT,CAAC;AAEW,QAAA,eAAe,GAAG;IAC7B,UAAU;IACV,QAAQ;IACR,QAAQ;IACR,OAAO;IACP,WAAW;CACZ,CAAC;AAEF,MAAa,KAAM,SAAQ,iBAAa;IACtC,YAAY,KAAa;QACvB,KAAK,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YAChE,IAAI,CAAC,CAAC,QAAQ,YAAY,oBAAW,CAAC;gBACpC,MAAM,IAAI,6BAAa,CAAC,2BAA2B,CAAC,CAAC;YAEvD,IACE,CAAC,CAAC,OAAO,YAAY,qBAAY,CAAC;gBAClC,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ;gBAChC,CAAC,CAAC,OAAO,YAAY,qBAAY,CAAC;gBAClC,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ;gBAChC,CAAC,CAAC,OAAO,YAAY,qBAAY,CAAC;gBAClC,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ;gBAEhC,MAAM,IAAI,6BAAa,CAAC,qCAAqC,CAAC,CAAC;YAEjE,IAAI,CAAC,yBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC;gBAC3C,MAAM,IAAI,6BAAa,CAAC,2BAA2B,CAAC,CAAC;YACvD,IAAI,CAAC,yBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC;gBAC3C,MAAM,IAAI,6BAAa,CAAC,2BAA2B,CAAC,CAAC;YACvD,IAAI,CAAC,yBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC;gBAC3C,MAAM,IAAI,6BAAa,CAAC,2BAA2B,CAAC,CAAC;YAEvD,IAAI,CAAC,CAAC,KAAK,YAAY,qBAAY,IAAI,KAAK,YAAY,mBAAU,CAAC;gBACjE,MAAM,IAAI,6BAAa,CAAC,8CAA8C,CAAC,CAAC;YAE1E,IAAI,CAAC,CAAC,IAAI,YAAY,qBAAY,CAAC,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ;gBAClE,MAAM,IAAI,6BAAa,CAAC,yCAAyC,CAAC,CAAC;YAErE,IAAI,CAAC,uBAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;gBACtC,MAAM,IAAI,6BAAa,CAAC,oBAAoB,CAAC,CAAC;YAEhD,MAAM,OAAO,GAAG,IAAI,gBAAI,CAAC;gBACvB,KAAK;gBACL,IAAI,EAAE,KAAK,CAAC,YAAY,EAAE;gBAC1B,UAAU,EAAE,IAAI;aACjB,CAAC,CAAC;YACH,OAAO;gBACL,OAAO;gBACP;oBACE,IAAI,8BAAe,CACjB,OAAO,EACP,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,IAAI,EACZ,IAAI,CAAC,IAAI,EACT,QAAQ,EACR,KAAK,EACL,OAAO,CACR;iBACF;aACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAtDD,sBAsDC"}

package/build/macros/commands/Sensor.js

@@ -1,20 +1,21 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Sensor = void 0;
-const instructions_1 = require("../../instructions");
-const __1 = require("..");
-const values_1 = require("../../values");
-class Sensor extends __1.MacroFunction {
-    constructor(scope) {
-        super(scope, (property, target) => {
-            if (!(property instanceof values_1.StoreValue))
-                throw new Error("The sensor property must be a store");
-            if (!(target instanceof values_1.ObjectValue))
-                throw new Error("The sensor target must be a store");
-            const temp = new values_1.TempValue(scope);
-            return [temp, [new instructions_1.InstructionBase("sensor", temp, property, target)]];
-        });
-    }
-}
-exports.Sensor = Sensor;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Sensor = void 0;
+const instructions_1 = require("../../instructions");
+const __1 = require("..");
+const values_1 = require("../../values");
+const CompilerError_1 = require("../../CompilerError");
+class Sensor extends __1.MacroFunction {
+    constructor(scope) {
+        super(scope, (property, target) => {
+            if (!(property instanceof values_1.StoreValue))
+                throw new CompilerError_1.CompilerError("The sensor property must be a store");
+            if (!(target instanceof values_1.ObjectValue))
+                throw new CompilerError_1.CompilerError("The sensor target must be a store");
+            const temp = new values_1.TempValue({ scope });
+            return [temp, [new instructions_1.InstructionBase("sensor", temp, property, target)]];
+        });
+    }
+}
+exports.Sensor = Sensor;
 //# sourceMappingURL=Sensor.js.map

package/build/macros/commands/Sensor.js.map

@@ -1 +1 @@
-{"version":3,"file":"Sensor.js","sourceRoot":"","sources":["../../../src/macros/commands/Sensor.ts"],"names":[],"mappings":";;;AAAA,qDAAqD;AACrD,0BAAmC;AAEnC,yCAAkE;AAElE,MAAa,MAAO,SAAQ,iBAAa;IACvC,YAAY,KAAa;QACvB,KAAK,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE;YAChC,IAAI,CAAC,CAAC,QAAQ,YAAY,mBAAU,CAAC;gBACnC,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;YAEzD,IAAI,CAAC,CAAC,MAAM,YAAY,oBAAW,CAAC;gBAClC,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;YAEvD,MAAM,IAAI,GAAG,IAAI,kBAAS,CAAC,KAAK,CAAC,CAAC;YAClC,OAAO,CAAC,IAAI,EAAE,CAAC,IAAI,8BAAe,CAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;QACzE,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAbD,wBAaC"}
+{"version":3,"file":"Sensor.js","sourceRoot":"","sources":["../../../src/macros/commands/Sensor.ts"],"names":[],"mappings":";;;AAAA,qDAAqD;AACrD,0BAAmC;AAEnC,yCAAkE;AAClE,uDAAoD;AAEpD,MAAa,MAAO,SAAQ,iBAAa;IACvC,YAAY,KAAa;QACvB,KAAK,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE;YAChC,IAAI,CAAC,CAAC,QAAQ,YAAY,mBAAU,CAAC;gBACnC,MAAM,IAAI,6BAAa,CAAC,qCAAqC,CAAC,CAAC;YAEjE,IAAI,CAAC,CAAC,MAAM,YAAY,oBAAW,CAAC;gBAClC,MAAM,IAAI,6BAAa,CAAC,mCAAmC,CAAC,CAAC;YAE/D,MAAM,IAAI,GAAG,IAAI,kBAAS,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;YACtC,OAAO,CAAC,IAAI,EAAE,CAAC,IAAI,8BAAe,CAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;QACzE,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAbD,wBAaC"}

package/build/macros/commands/UnitBind.js

@@ -1,17 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UnitBind = void 0;
-const instructions_1 = require("../../instructions");
-const __1 = require("..");
-const values_1 = require("../../values");
-class UnitBind extends __1.MacroFunction {
-    constructor(scope) {
-        super(scope, type => {
-            if (!(type instanceof values_1.StoreValue))
-                throw new Error("The unitBind type must be a store");
-            return [null, [new instructions_1.InstructionBase("ubind", type)]];
-        });
-    }
-}
-exports.UnitBind = UnitBind;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UnitBind = void 0;
+const instructions_1 = require("../../instructions");
+const __1 = require("..");
+const values_1 = require("../../values");
+const CompilerError_1 = require("../../CompilerError");
+class UnitBind extends __1.MacroFunction {
+    constructor(scope) {
+        super(scope, type => {
+            if (!(type instanceof values_1.StoreValue))
+                throw new CompilerError_1.CompilerError("The unitBind type must be a store");
+            return [null, [new instructions_1.InstructionBase("ubind", type)]];
+        });
+    }
+}
+exports.UnitBind = UnitBind;
 //# sourceMappingURL=UnitBind.js.map

package/build/macros/commands/UnitBind.js.map

@@ -1 +1 @@
-{"version":3,"file":"UnitBind.js","sourceRoot":"","sources":["../../../src/macros/commands/UnitBind.ts"],"names":[],"mappings":";;;AAAA,qDAAqD;AACrD,0BAAmC;AAEnC,yCAAqD;AAErD,MAAa,QAAS,SAAQ,iBAAa;IACzC,YAAY,KAAa;QACvB,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE;YAClB,IAAI,CAAC,CAAC,IAAI,YAAY,mBAAU,CAAC;gBAC/B,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;YAEvD,OAAO,CAAC,IAAI,EAAE,CAAC,IAAI,8BAAe,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AATD,4BASC"}
+{"version":3,"file":"UnitBind.js","sourceRoot":"","sources":["../../../src/macros/commands/UnitBind.ts"],"names":[],"mappings":";;;AAAA,qDAAqD;AACrD,0BAAmC;AAEnC,yCAA0C;AAC1C,uDAAoD;AAEpD,MAAa,QAAS,SAAQ,iBAAmB;IAC/C,YAAY,KAAa;QACvB,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE;YAClB,IAAI,CAAC,CAAC,IAAI,YAAY,mBAAU,CAAC;gBAC/B,MAAM,IAAI,6BAAa,CAAC,mCAAmC,CAAC,CAAC;YAE/D,OAAO,CAAC,IAAI,EAAE,CAAC,IAAI,8BAAe,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AATD,4BASC"}

package/build/macros/commands/UnitControl.js

@@ -1,68 +1,73 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UnitControl = void 0;
-const instructions_1 = require("../../instructions");
-const __1 = require("..");
-const values_1 = require("../../values");
-const Building_1 = require("../Building");
-const validModes = [
-    "idle",
-    "stop",
-    "move",
-    "approach",
-    "boost",
-    "pathfind",
-    "target",
-    "targetp",
-    "itemDrop",
-    "itemTake",
-    "payDrop",
-    "payTake",
-    "payEnter",
-    "mine",
-    "flag",
-    "build",
-    "getBlock",
-    "within",
-];
-class UnitControl extends __1.MacroFunction {
-    constructor(scope) {
-        super(scope, (mode, ...args) => {
-            if (!(mode instanceof values_1.LiteralValue) || typeof mode.data !== "string")
-                throw new Error("The unitControl mode must be a string literal");
-            if (!validModes.includes(mode.data))
-                throw new Error("Invalid unitControl mode");
-            if (args.some(value => !(value instanceof values_1.StoreValue ||
-                value instanceof values_1.LiteralValue ||
-                value instanceof values_1.ObjectValue)))
-                throw new Error("The others arguments of unitControl must be literals or stores");
-            let result = null;
-            let extraArgs = [];
-            switch (mode.data) {
-                case "getBlock": {
-                    const outType = new values_1.TempValue(scope);
-                    const outBuilding = new values_1.TempValue(scope);
-                    result = new values_1.ObjectValue(scope, {
-                        0: outType,
-                        1: new Building_1.Building(scope, outBuilding.name),
-                        length: new values_1.LiteralValue(scope, 2),
-                    });
-                    extraArgs = [outType, outBuilding, new values_1.LiteralValue(scope, 0)];
-                    break;
-                }
-                case "within": {
-                    const temp = new values_1.TempValue(scope);
-                    result = temp;
-                    extraArgs = [temp, 0];
-                    break;
-                }
-            }
-            return [
-                result,
-                [new instructions_1.InstructionBase("ucontrol", mode.data, ...args, ...extraArgs)],
-            ];
-        });
-    }
-}
-exports.UnitControl = UnitControl;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UnitControl = void 0;
+const instructions_1 = require("../../instructions");
+const __1 = require("..");
+const values_1 = require("../../values");
+const Building_1 = require("../Building");
+const CompilerError_1 = require("../../CompilerError");
+const validModes = [
+    "idle",
+    "stop",
+    "move",
+    "approach",
+    "boost",
+    "pathfind",
+    "target",
+    "targetp",
+    "itemDrop",
+    "itemTake",
+    "payDrop",
+    "payTake",
+    "payEnter",
+    "mine",
+    "flag",
+    "build",
+    "getBlock",
+    "within",
+];
+class UnitControl extends __1.MacroFunction {
+    constructor(scope) {
+        super(scope, (mode, ...args) => {
+            if (!(mode instanceof values_1.LiteralValue) || typeof mode.data !== "string")
+                throw new CompilerError_1.CompilerError("The unitControl mode must be a string literal");
+            if (!validModes.includes(mode.data))
+                throw new CompilerError_1.CompilerError("Invalid unitControl mode");
+            if (args.some(value => !(value instanceof values_1.StoreValue ||
+                value instanceof values_1.LiteralValue ||
+                value instanceof values_1.ObjectValue)))
+                throw new CompilerError_1.CompilerError("The others arguments of unitControl must be literals or stores");
+            let result = null;
+            let extraArgs = [];
+            switch (mode.data) {
+                case "getBlock": {
+                    const outType = new values_1.TempValue({ scope });
+                    const outBuilding = new Building_1.Building({
+                        scope,
+                        name: scope.makeTempName(),
+                        renameable: true,
+                    });
+                    result = new values_1.ObjectValue(scope, {
+                        0: outType,
+                        1: outBuilding,
+                        length: new values_1.LiteralValue(scope, 2),
+                    });
+                    extraArgs = [outType, outBuilding, new values_1.LiteralValue(scope, 0)];
+                    break;
+                }
+                case "within": {
+                    const temp = new values_1.TempValue({ scope });
+                    result = temp;
+                    extraArgs = [temp, new values_1.LiteralValue(scope, 0)];
+                    break;
+                }
+            }
+            return [
+                result,
+                [new instructions_1.InstructionBase("ucontrol", mode.data, ...args, ...extraArgs)],
+            ];
+        });
+    }
+}
+exports.UnitControl = UnitControl;
 //# sourceMappingURL=UnitControl.js.map