Allow using script values in Actor Move+Set Relative (needs migration)

chrismaltby · Apr 11, 2024 · afa869c · afa869c
1 parent f690889
commit afa869c
Show file tree

Hide file tree

Showing 4 changed files with 187 additions and 16 deletions.
diff --git a/src/lib/compiler/scriptBuilder.ts b/src/lib/compiler/scriptBuilder.ts
@@ -72,6 +72,7 @@ import {
   sortFetchOperations,
   multiplyScriptValueConst,
   addScriptValueConst,
+  addScriptValueToScriptValue,
 } from "shared/lib/scriptValue/helpers";
 
 export type ScriptOutput = string[];
@@ -2510,6 +2511,80 @@ extern void __mute_mask_${symbol};
     this._addNL();
   };
 
+  actorMoveRelativeByScriptValues = (
+    actorId: string,
+    valueX: ScriptValue,
+    valueY: ScriptValue,
+    useCollisions: boolean,
+    moveType: ScriptBuilderMoveType,
+    units: DistanceUnitType = "tiles"
+  ) => {
+    const actorRef = this._declareLocal("actor", 4);
+    const stackPtr = this.stackPtr;
+    this._addComment("Actor Move Relative");
+
+    const [rpnOpsX, fetchOpsX] = precompileScriptValue(
+      optimiseScriptValue(
+        multiplyScriptValueConst(
+          addScriptValueToScriptValue(
+            {
+              type: "property",
+              target: actorId,
+              property: units === "tiles" ? "xpos" : "pxpos",
+            },
+            valueX
+          ),
+          (units === "tiles" ? 8 : 1) * 16
+        )
+      ),
+      "x"
+    );
+    const [rpnOpsY, fetchOpsY] = precompileScriptValue(
+      optimiseScriptValue(
+        multiplyScriptValueConst(
+          addScriptValueToScriptValue(
+            {
+              type: "property",
+              target: actorId,
+              property: units === "tiles" ? "ypos" : "pypos",
+            },
+            valueY
+          ),
+          (units === "tiles" ? 8 : 1) * 16
+        )
+      ),
+      "y"
+    );
+
+    const localsLookup = this._performFetchOperations([
+      ...fetchOpsX,
+      ...fetchOpsY,
+    ]);
+
+    const rpn = this._rpn();
+
+    this._addComment(`-- Calculate coordinate values`);
+
+    // X Value
+    this._performValueRPN(rpn, rpnOpsX, localsLookup);
+    rpn.refSet(this._localRef(actorRef, 1));
+
+    // Y Value
+    this._performValueRPN(rpn, rpnOpsY, localsLookup);
+    rpn.refSet(this._localRef(actorRef, 2));
+
+    rpn.stop();
+    this._setConst(
+      this._localRef(actorRef, 3),
+      toASMMoveFlags(moveType, useCollisions)
+    );
+    this._addComment(`-- Move Actor`);
+    this.actorSetById(actorId);
+    this._actorMoveTo(actorRef);
+    this._assertStackNeutral(stackPtr);
+    this._addNL();
+  };
+
   actorMoveCancel = () => {
     const actorRef = this._declareLocal("actor", 4);
     this._actorMoveCancel(actorRef);
@@ -2633,6 +2708,74 @@ extern void __mute_mask_${symbol};
     this._addNL();
   };
 
+  actorSetPositionRelativeByScriptValues = (
+    actorId: string,
+    valueX: ScriptValue,
+    valueY: ScriptValue,
+    units: DistanceUnitType = "tiles"
+  ) => {
+    const actorRef = this._declareLocal("actor", 4);
+    const stackPtr = this.stackPtr;
+    this._addComment("Actor Set Position Relative");
+
+    const [rpnOpsX, fetchOpsX] = precompileScriptValue(
+      optimiseScriptValue(
+        multiplyScriptValueConst(
+          addScriptValueToScriptValue(
+            {
+              type: "property",
+              target: actorId,
+              property: units === "tiles" ? "xpos" : "pxpos",
+            },
+            valueX
+          ),
+          (units === "tiles" ? 8 : 1) * 16
+        )
+      ),
+      "x"
+    );
+    const [rpnOpsY, fetchOpsY] = precompileScriptValue(
+      optimiseScriptValue(
+        multiplyScriptValueConst(
+          addScriptValueToScriptValue(
+            {
+              type: "property",
+              target: actorId,
+              property: units === "tiles" ? "ypos" : "pypos",
+            },
+            valueY
+          ),
+          (units === "tiles" ? 8 : 1) * 16
+        )
+      ),
+      "y"
+    );
+
+    const localsLookup = this._performFetchOperations([
+      ...fetchOpsX,
+      ...fetchOpsY,
+    ]);
+
+    const rpn = this._rpn();
+
+    this._addComment(`-- Calculate coordinate values`);
+
+    // X Value
+    this._performValueRPN(rpn, rpnOpsX, localsLookup);
+    rpn.refSet(this._localRef(actorRef, 1));
+
+    // Y Value
+    this._performValueRPN(rpn, rpnOpsY, localsLookup);
+    rpn.refSet(this._localRef(actorRef, 2));
+
+    rpn.stop();
+    this._addComment(`-- Position Actor`);
+    this.actorSetById(actorId);
+    this._actorSetPosition(actorRef);
+    this._assertStackNeutral(stackPtr);
+    this._addNL();
+  };
+
   actorGetPosition = (
     variableX: string,
     variableY: string,

diff --git a/src/lib/events/eventActorMoveRelative.js b/src/lib/events/eventActorMoveRelative.js
@@ -31,11 +31,14 @@ const fields = [
         key: "x",
         label: l10n("FIELD_X"),
         description: l10n("FIELD_X_RELATIVE_DESC"),
-        type: "number",
+        type: "value",
         min: -31,
         max: 31,
         width: "50%",
-        defaultValue: 0,
+        defaultValue: {
+          type: "number",
+          value: 0,
+        },
         unitsField: "units",
         unitsDefault: "tiles",
         unitsAllowed: ["tiles", "pixels"],
@@ -44,11 +47,14 @@ const fields = [
         key: "y",
         label: l10n("FIELD_Y"),
         description: l10n("FIELD_Y_RELATIVE_DESC"),
-        type: "number",
+        type: "value",
         min: -31,
         max: 31,
         width: "50%",
-        defaultValue: 0,
+        defaultValue: {
+          type: "number",
+          value: 0,
+        },
         unitsField: "units",
         unitsDefault: "tiles",
         unitsAllowed: ["tiles", "pixels"],
@@ -64,6 +70,7 @@ const fields = [
     defaultValue: "horizontal",
     flexBasis: 30,
     flexGrow: 0,
+    alignBottom: true,
   },
   {
     key: "useCollisions",
@@ -76,9 +83,9 @@ const fields = [
 ];
 
 const compile = (input, helpers) => {
-  const { actorSetActive, actorMoveRelative } = helpers;
-  actorSetActive(input.actorId);
-  actorMoveRelative(
+  const { actorMoveRelativeByScriptValues } = helpers;
+  actorMoveRelativeByScriptValues(
+    input.actorId,
     input.x,
     input.y,
     input.useCollisions,

diff --git a/src/lib/events/eventActorSetPositionRelative.js b/src/lib/events/eventActorSetPositionRelative.js
@@ -31,11 +31,14 @@ const fields = [
         key: "x",
         label: l10n("FIELD_X"),
         description: l10n("FIELD_X_RELATIVE_DESC"),
-        type: "number",
+        type: "value",
         min: -31,
         max: 31,
         width: "50%",
-        defaultValue: 0,
+        defaultValue: {
+          type: "number",
+          value: 0,
+        },
         unitsField: "units",
         unitsDefault: "tiles",
         unitsAllowed: ["tiles", "pixels"],
@@ -44,11 +47,14 @@ const fields = [
         key: "y",
         label: l10n("FIELD_Y"),
         description: l10n("FIELD_Y_RELATIVE_DESC"),
-        type: "number",
+        type: "value",
         min: -31,
         max: 31,
         width: "50%",
-        defaultValue: 0,
+        defaultValue: {
+          type: "number",
+          value: 0,
+        },
         unitsField: "units",
         unitsDefault: "tiles",
         unitsAllowed: ["tiles", "pixels"],
@@ -58,9 +64,13 @@ const fields = [
 ];
 
 const compile = (input, helpers) => {
-  const { actorSetActive, actorSetPositionRelative } = helpers;
-  actorSetActive(input.actorId);
-  actorSetPositionRelative(input.x, input.y, input.units);
+  const { actorSetPositionRelativeByScriptValues } = helpers;
+  actorSetPositionRelativeByScriptValues(
+    input.actorId,
+    input.x,
+    input.y,
+    input.units
+  );
 };
 
 module.exports = {

diff --git a/src/shared/lib/scriptValue/helpers.ts b/src/shared/lib/scriptValue/helpers.ts
@@ -199,9 +199,9 @@ export const precompileScriptValue = (
       type: input.type,
     });
   } else if (input.type === "true") {
-    rpnOperations.push({type:"number", value: 1})
+    rpnOperations.push({ type: "number", value: 1 });
   } else if (input.type === "false") {
-    rpnOperations.push({type:"number", value: 0})  
+    rpnOperations.push({ type: "number", value: 0 });
   } else {
     rpnOperations.push(input);
   }
@@ -252,3 +252,14 @@ export const addScriptValueConst = (
     },
   };
 };
+
+export const addScriptValueToScriptValue = (
+  valueA: ScriptValue,
+  valueB: ScriptValue
+): ScriptValue => {
+  return {
+    type: "add",
+    valueA: valueA,
+    valueB: valueB,
+  };
+};