Add on move script to trigger

appData/src/gb/include/gbs_types.h

@@ -77,6 +77,7 @@ typedef struct actor_t
 
 #define TRIGGER_HAS_ENTER_SCRIPT 1
 #define TRIGGER_HAS_LEAVE_SCRIPT 2
+#define TRIGGER_HAS_UPDATE_SCRIPT 4
 
 typedef struct trigger_t {
  uint8_t x, y, width, height;

appData/src/gb/src/core/trigger.c

@@ -8,6 +8,8 @@ UBYTE triggers_len = 0;
 UBYTE last_trigger_tx;
 UBYTE last_trigger_ty;
 UBYTE last_trigger;
+UWORD last_pos_tx;
+UWORD last_pos_ty;
 
 void trigger_reset() BANKED {
  last_trigger_tx = 0;
@@ -70,14 +72,20 @@ UBYTE trigger_activate_at_intersection(bounding_box_t *bb, upoint16_t *offset, U
  UBYTE hit_trigger = trigger_at_intersection(bb, offset);
  UBYTE trigger_script_called = FALSE;
 
- // Don't reactivate trigger if not changed tile
  if (!force && (last_trigger == hit_trigger)) {
- return FALSE;
+ if ((last_pos_tx != offset->x >> 3 || last_pos_ty != offset->y >> 3) && hit_trigger != NO_TRIGGER_COLLISON && triggers[hit_trigger].script_flags & TRIGGER_HAS_UPDATE_SCRIPT) {
+ last_pos_tx = offset->x >> 3;
+ last_pos_ty = offset->y >> 3;
+
+ script_execute(triggers[hit_trigger].script.bank, triggers[hit_trigger].script.ptr, 0, 1, 3);
+
+ return TRUE;
+ } else {
+ return FALSE;
+ }
  }
 
- if (last_trigger != NO_TRIGGER_COLLISON && 
- (hit_trigger == NO_TRIGGER_COLLISON || hit_trigger != last_trigger)) {
-
+ if (last_trigger != NO_TRIGGER_COLLISON && hit_trigger != last_trigger) {
  if (hit_trigger != NO_TRIGGER_COLLISON && triggers[hit_trigger].script_flags & TRIGGER_HAS_ENTER_SCRIPT) {
  script_execute(triggers[hit_trigger].script.bank, triggers[hit_trigger].script.ptr, 0, 1, 1);
  trigger_script_called = TRUE;

src/components/editors/TriggerEditor.tsx

@@ -50,11 +50,12 @@ interface ScriptHandlers {
  leave: ScriptHandler;
 }
 
-type TriggerScriptKey = "script" | "leaveScript";
+type TriggerScriptKey = "script" | "leaveScript" | "updateScript";
 
 const scriptTabs = {
  trigger: l10n("SIDEBAR_ON_ENTER"),
  leave: l10n("SIDEBAR_ON_LEAVE"),
+ update: l10n("SIDEBAR_ON_MOVE"),
 } as const;
 
 const pointNClickScriptTabs = {
@@ -68,6 +69,9 @@ const getScriptKey = (tab: keyof typeof scriptTabs): TriggerScriptKey => {
  if (tab === "leave") {
  return "leaveScript";
  }
+ if (tab === "update") {
+ return "updateScript";
+ }
  return "script";
 };
 

src/lang/en.json

@@ -71,6 +71,7 @@
  "SIDEBAR_ON_TRIGGER": "On Trigger",
  "SIDEBAR_ON_ENTER": "On Enter",
  "SIDEBAR_ON_LEAVE": "On Leave",
+ "SIDEBAR_ON_MOVE": "On Move",
  "SIDEBAR_ON_INTERACT": "On Interact",
  "SIDEBAR_ON_HIT": "On Hit",
  "SIDEBAR_ON_PLAYER_HIT": "On Player Hit",

src/lib/compiler/compileData.js

@@ -965,7 +965,10 @@ export const precompileScenes = (
  trigger.script[0].command !== EVENT_END) ||
  (trigger.leaveScript &&
  trigger.leaveScript.length >= 1 &&
- trigger.leaveScript[0].command !== EVENT_END)
+ trigger.leaveScript[0].command !== EVENT_END) ||
+ (trigger.updateScript &&
+ trigger.updateScript.length >= 1 &&
+ trigger.updateScript[0].command !== EVENT_END)
  );
  }),
  playerSprite,
@@ -1507,6 +1510,7 @@ VM_ACTOR_SET_SPRITESHEET_BY_REF .ARG2, .ARG1`,
  [
  { parameter: 0, value: 1, script: entity.script },
  { parameter: 0, value: 2, script: entity.leaveScript },
+ { parameter: 0, value: 3, script: entity.updateScript },
  ],
  true
  );

src/lib/compiler/compileData2.ts

@@ -199,6 +199,7 @@ export const toASMTriggerScriptFlags = (trigger: Trigger) => {
 
  if (trigger.script.length > 0) flags.push("TRIGGER_HAS_ENTER_SCRIPT");
  if (trigger.leaveScript.length > 0) flags.push("TRIGGER_HAS_LEAVE_SCRIPT");
+ if (trigger.updateScript.length > 0) flags.push("TRIGGER_HAS_UPDATE_SCRIPT");
 
  return flags.length > 0 ? flags.join(" | ") : 0;
 };

src/lib/helpers/eventHelpers.ts

@@ -170,6 +170,7 @@ export const walkDenormalizedTriggerEvents = (
  };
  walk(trigger.script);
  walk(trigger.leaveScript);
+ walk(trigger.updateScript);
 };
 
 export const walkDenormalizedSceneSpecificEvents = (

src/lib/helpers/eventSystem.ts

@@ -57,6 +57,7 @@ const mapSceneEvents = (scene: any, callback: any) => {
  ...trigger,
  script: mapEvents(trigger.script, callback),
  leaveScript: mapEvents(trigger.leaveScript, callback),
+ updateScript: mapEvents(trigger.updateScript, callback),
  };
  }),
  };
@@ -109,6 +110,7 @@ const walkActorEvents = (actor: any, callback: any) => {
 const walkTriggerEvents = (trigger: any, callback: any) => {
  walkEvents(trigger.script, callback);
  walkEvents(trigger.leaveScript, callback);
+ walkEvents(trigger.updateScript, callback);
 };
 
 const walkSceneEvents = (scene: any, callback: any) => {

src/lib/project/migrateProject.js

@@ -22,7 +22,7 @@ import { toValidSymbol } from "lib/helpers/symbols";
 const indexById = indexBy("id");
 
 export const LATEST_PROJECT_VERSION = "3.1.0";
-export const LATEST_PROJECT_MINOR_VERSION = "2";
+export const LATEST_PROJECT_MINOR_VERSION = "3";
 
 const ensureProjectAssetSync = (relativePath, { projectRoot }) => {
  const projectPath = `${projectRoot}/${relativePath}`;
@@ -1704,6 +1704,25 @@ const migrateFrom310r1To310r2Events = (data) => {
  };
 };
 
+/* Version 3.1.0 r2 to r3 Triggers migration to include the on move script
+ */
+export const migrateFrom310r2To310r3Triggers = (data) => {
+ return {
+ ...data,
+ scenes: data.scenes.map((scene) => {
+ return {
+ ...scene,
+ triggers: scene.triggers.map((trigger) => {
+ return {
+ ...trigger,
+ updateScript: trigger.updateScript || [],
+ };
+ }),
+ };
+ }),
+ };
+};
+
 const migrateProject = (project, projectRoot) => {
  let data = { ...project };
  let version = project._version || "1.0.0";
@@ -1805,7 +1824,6 @@ const migrateProject = (project, projectRoot) => {
  release = "1";
  }
  }
-
  if (version === "3.0.0") {
  if (release === "1") {
  data = migrateFrom300r1To300r2Events(data);
@@ -1827,6 +1845,11 @@ const migrateProject = (project, projectRoot) => {
  data = migrateFrom310r1To310r2Events(data);
  release = "2";
  }
+
+ if (release === "2") {
+ data = migrateFrom310r2To310r3Triggers(data);
+ release = "3";
+ }
  }
 
  if (process.env.NODE_ENV !== "production") {

src/store/features/electron/electronMiddleware.ts

@@ -270,6 +270,10 @@ const electronMiddleware: Middleware<Dispatch, RootState> =
  triggersLookup[triggerId]?.leaveScript || [],
  filter
  ),
+ updateScript: filterEvents(
+ triggersLookup[triggerId]?.updateScript || [],
+ filter
+ ),
  },
  })
  );

src/store/features/entities/entitiesHelpers.ts

@@ -125,6 +125,7 @@ const actorSchema = new schema.Entity("actors", {
 const triggerSchema = new schema.Entity("triggers", {
  script: [scriptEventSchema],
  leaveScript: [scriptEventSchema],
+ updateScript: [scriptEventSchema],
 });
 const metaspriteTilesSchema = new schema.Entity("metaspriteTiles");
 const metaspritesSchema = new schema.Entity("metasprites", {
@@ -432,6 +433,7 @@ export const walkNormalisedTriggerEvents = (
 ) => {
  walkNormalisedScriptEvents(trigger.script, lookup, options, callback);
  walkNormalisedScriptEvents(trigger.leaveScript, lookup, options, callback);
+ walkNormalisedScriptEvents(trigger.updateScript, lookup, options, callback);
 };
 
 export const walkNormalisedSceneEvents = (

src/store/features/entities/entitiesState.ts

@@ -1030,6 +1030,7 @@ const addTrigger: CaseReducer<
  height,
  script: [],
  leaveScript: [],
+ updateScript: [],
  };
 
  // Add to scene

src/store/features/entities/entitiesTypes.ts

@@ -116,7 +116,11 @@ export type ActorDenormalized = Omit<
  hit3Script: ScriptEventDenormalized[];
 };
 
-export const triggerScriptKeys = ["script", "leaveScript"] as const;
+export const triggerScriptKeys = [
+ "script",
+ "leaveScript",
+ "updateScript",
+] as const;
 export type TriggerScriptKey = typeof triggerScriptKeys[number];
 
 export type Trigger = {
@@ -130,11 +134,16 @@ export type Trigger = {
  height: number;
  script: string[];
  leaveScript: string[];
+ updateScript: string[];
 };
 
-export type TriggerDenormalized = Omit<Trigger, "script" | "leaveScript"> & {
+export type TriggerDenormalized = Omit<
+ Trigger,
+ "script" | "leaveScript" | "updateScript"
+> & {
  script: ScriptEventDenormalized[];
  leaveScript: ScriptEventDenormalized[];
+ updateScript: ScriptEventDenormalized[];
 };
 
 export type Background = {