@fruit-pie/quicksave 1.0.0 → 1.1.0

package/dist/index.js

@@ -962,12 +962,12 @@ ${r(y.hello)}`;
 			createReads: g.filter((e) => _.has(e))
 		}
 	};
-}, H = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABWElEQVR4nM2VS3LCMAyGvew9ePXBIXoJLpI7dF9KIVDgGqw5RfPY9CY144CKKiJHsglh8U2UzNj/ZyESY/Z7AzwYcxNwJg23N4IXyLKsAi/I8/wPd18URQWu4b4sy4tAeJYkiUwAh9IaaBJwV0ywQN3p67qAQ+np1QL0tFwHfAJRHQAJ/BPQ1tP6qgJ1MwDXugHEdfQQdvY3xBLOFNsGwu5zfy8iCP+1byp+vl/FuP3T6cBu0/F/CY2AJjBKwFrDbsIhF3iRCWAJHGQnkwpaN4mAwEYj4LgIPeGrvQKL50CBhlCpwFojgMOlApyEWAAWgEAorMD8SSYAi7Qd2DUIfHUu8PnYnsAuVkDz4gmdAbUAne7YDqxmI7kAlfDVvvDWBHCoVGA5G+oE6CxwodJvwfIjQOCaX8MogRjOAgNeoG1cuJNgBRbvPYb+memRVMwxFII77QChyj4ABNYZj7JHZ24AAAAASUVORK5CYII=", U = 8, W = {
+}, H = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABWElEQVR4nM2VS3LCMAyGvew9ePXBIXoJLpI7dF9KIVDgGqw5RfPY9CY144CKKiJHsglh8U2UzNj/ZyESY/Z7AzwYcxNwJg23N4IXyLKsAi/I8/wPd18URQWu4b4sy4tAeJYkiUwAh9IaaBJwV0ywQN3p67qAQ+np1QL0tFwHfAJRHQAJ/BPQ1tP6qgJ1MwDXugHEdfQQdvY3xBLOFNsGwu5zfy8iCP+1byp+vl/FuP3T6cBu0/F/CY2AJjBKwFrDbsIhF3iRCWAJHGQnkwpaN4mAwEYj4LgIPeGrvQKL50CBhlCpwFojgMOlApyEWAAWgEAorMD8SSYAi7Qd2DUIfHUu8PnYnsAuVkDz4gmdAbUAne7YDqxmI7kAlfDVvvDWBHCoVGA5G+oE6CxwodJvwfIjQOCaX8MogRjOAgNeoG1cuJNgBRbvPYb+memRVMwxFII77QChyj4ABNYZj7JHZ24AAAAASUVORK5CYII=", U = 8, W = 64, G = 3, K = {
 	scale: .85,
 	alpha: .6,
 	swing: 8,
 	pace: 800
-}, G = {
+}, q = {
 	state: "global.quicksave_state",
 	room: "global.quicksave_room",
 	x: "global.quicksave_x",
@@ -975,11 +975,12 @@ ${r(y.hello)}`;
 	markerX: "global.quicksave_marker_x",
 	markerY: "global.quicksave_marker_y",
 	hasAnchor: "global.quicksave_has_anchor",
+	anchorRoom: "global.quicksave_anchor_room",
 	anchorX: "global.quicksave_anchor_x",
 	anchorY: "global.quicksave_anchor_y",
 	applying: "global.quicksave_applying",
 	carried: (e) => `global.quicksave_carried${e}`
-}, K = function(e, t) {
+}, J = function(e, t) {
 	let { players: n, carried: r, createReads: i, positionWrites: a, loads: o } = t, s = e.scratchPath("state.txt"), c = e.resource.sprite.create("save", { origin: {
 		x: 16,
 		y: 16
@@ -1008,34 +1009,36 @@ return global.quicksave_grounded;`
 file_text_writeln(qs_file);`, u = (e) => `qs_kind = file_text_read_string(qs_file); file_text_readln(qs_file);
 if (qs_kind == "s") ${e} = file_text_read_string(qs_file); else ${e} = file_text_read_real(qs_file);
 file_text_readln(qs_file);`, d = [
-		G.state,
-		G.room,
-		G.x,
-		G.y,
-		G.markerX,
-		G.markerY,
-		G.hasAnchor,
-		G.anchorX,
-		G.anchorY
+		q.state,
+		q.room,
+		q.x,
+		q.y,
+		q.markerX,
+		q.markerY,
+		q.hasAnchor,
+		q.anchorRoom,
+		q.anchorX,
+		q.anchorY
 	];
 	e.resource.script.create({
 		name: "persist",
 		body: () => `var qs_file;
-if (${G.state} == 0) {
+if (${q.state} == 0) {
   if (file_exists(${s})) file_delete(${s});
   exit;
 }
 qs_file = file_text_open_write(${s});
 ${d.map((e) => `file_text_write_real(qs_file, ${e}); file_text_writeln(qs_file);`).join("\n")}
-${r.map((e, t) => l(G.carried(t))).join("\n")}
+${r.map((e, t) => l(q.carried(t))).join("\n")}
 file_text_close(qs_file);`
 	}), e.resource.script.create({
 		name: "reset",
 		body: () => `${[
 			...d,
-			G.applying,
-			...r.map((e, t) => G.carried(t))
-		].map((e) => `${e} = 0;`).join("\n")}`
+			q.applying,
+			...r.map((e, t) => q.carried(t))
+		].map((e) => `${e} = 0;`).join("\n")}
+${q.anchorRoom} = -1;`
 	}), e.resource.script.create({
 		name: "restore",
 		body: ({ call: e }) => `var qs_file, qs_kind;
@@ -1043,61 +1046,76 @@ ${e("reset")};
 if (!file_exists(${s})) exit;
 qs_file = file_text_open_read(${s});
 ${d.map((e) => `${e} = file_text_read_real(qs_file); file_text_readln(qs_file);`).join("\n")}
-${r.map((e, t) => u(G.carried(t))).join("\n")}
+${r.map((e, t) => u(q.carried(t))).join("\n")}
 file_text_close(qs_file);`
+	}), e.resource.script.create({
+		name: "atAnchor",
+		args: ["who", "checkRoom"],
+		body: ({ a: e }) => `if (!${q.hasAnchor}) return 0;
+if (${e.checkRoom} && ${q.anchorRoom} >= 0 && ${q.anchorRoom} != room) return 0;
+if (abs(${e.who}.x - ${q.anchorX}) > ${U}) return 0;
+if (abs(${e.who}.y - ${q.anchorY}) > ${U}) return 0;
+return 1;`
+	});
+	let f = i.map((e) => `if (global.${e} != ${q.carried(r.indexOf(e))}) qs_rebuild = 1;`).join("\n");
+	e.resource.script.create({
+		name: "apply",
+		args: ["who", "inPlace"],
+		body: ({ a: e }) => `var qs_rebuild;
+${q.applying} = 1;
+qs_rebuild = 0;
+${f}
+${r.map((e, t) => `global.${e} = ${q.carried(t)};`).join("\n")}
+if (${e.inPlace} == 0 || room != ${q.room}) room_goto(${q.room});
+with (${e.who}) {
+  if (qs_rebuild) event_perform(ev_create, 0);
+  x = ${q.x};
+  y = ${q.y};
+  xprevious = x;
+  yprevious = y;
+  hspeed = 0;
+  vspeed = 0;
+}
+${q.applying} = 0;`
 	});
 	for (let t of a) e.resource.script.insert({
 		at: t,
 		place: "after",
 		body: ({ call: e, send: t }) => `
         var qs_player;
-        if (!${G.applying}) {
+        if (!${q.applying}) {
           qs_player = ${e("player")};
           if (qs_player != noone) {
-            ${G.anchorX} = qs_player.x;
-            ${G.anchorY} = qs_player.y;
-            ${G.hasAnchor} = 1;
+            ${q.anchorX} = qs_player.x;
+            ${q.anchorY} = qs_player.y;
+            ${q.anchorRoom} = room;
+            ${q.hasAnchor} = 1;
           }
-          if (${G.state} != 0) {
-            ${G.state} = 0;
+          if (${q.state} != 0) {
+            ${q.state} = 0;
             ${t("cleared", "\"a real save\"")}
           }
           ${e("persist")};
         }
       `
 	});
-	let f = i.map((e) => `if (global.${e} != ${G.carried(r.indexOf(e))}) qs_rebuild = 1;`).join("\n            ");
-	for (let t of o) e.resource.script.hook(t, ({ original: e, call: n, send: i }) => `
-        var qs_result, qs_player, qs_near, qs_rebuild;
+	for (let t of o) e.resource.script.hook(t, ({ original: e, call: n, send: r }) => `
+        var qs_result, qs_player;
         qs_result = ${e.call()};
         qs_player = ${n("player")};
         if (qs_player != noone) {
-          qs_near = ${G.hasAnchor}
-            && abs(qs_player.x - ${G.anchorX}) <= ${U}
-            && abs(qs_player.y - ${G.anchorY}) <= ${U};
-          if (${G.state} == 1 && qs_near) {
-            ${G.applying} = 1;
-            qs_rebuild = 0;
-            ${f}
-            ${r.map((e, t) => `global.${e} = ${G.carried(t)};`).join("\n            ")}
-            room_goto(${G.room});
-            with (qs_player) {
-              if (qs_rebuild) event_perform(ev_create, 0);
-              x = ${G.x};
-              y = ${G.y};
-              xprevious = x;
-              yprevious = y;
-              hspeed = 0;
-              vspeed = 0;
-            }
-            ${G.applying} = 0;
-            ${i("restored", `"by ${t}"`)}
+          if (${q.state} == 1 && ${n("atAnchor", "qs_player", "0")}) {
+            ${n("apply", "qs_player", "0")};
+            ${r("restored", `"by ${t}"`)}
+          } else if (${q.state} == 1) {
+            ${r("missed", "\"a load landed away from this quicksave's save\"")}
           } else {
-            if (${G.state} == 1) ${i("dropped", "\"the game loaded a different save\"")}
-            ${G.state} = 0;
-            ${G.anchorX} = qs_player.x;
-            ${G.anchorY} = qs_player.y;
-            ${G.hasAnchor} = 1;
+            if (${q.state} == 2) ${r("rearmed", `"by ${t}"`)}
+            ${q.state} = 0;
+            ${q.anchorX} = qs_player.x;
+            ${q.anchorY} = qs_player.y;
+            ${q.anchorRoom} = -1;
+            ${q.hasAnchor} = 1;
           }
           ${n("persist")};
         }
@@ -1105,50 +1123,121 @@ file_text_close(qs_file);`
       `);
 	e.resource.object.create({
 		name: "quicksave",
-		vars: ["standing", "who"],
+		vars: [
+			"standing",
+			"who",
+			"seen",
+			"settle",
+			"lastId",
+			"lastX",
+			"lastY",
+			"lastRoom"
+		],
 		events: {
 			create: ({ v: e, call: t }) => `
         ${t("restore")};
         ${e.standing} = 0;
+        ${e.seen} = 0;
+        ${e.settle} = 0;
+        ${e.lastId} = noone;
+        ${e.lastX} = 0;
+        ${e.lastY} = 0;
+        ${e.lastRoom} = -1;
       `,
 			step: ({ v: e, call: t, send: n }) => `
         ${e.who} = ${t("player")};
-        // One behind the player: the only depth that means the same thing in every game.
         if (${e.who} != noone) depth = ${e.who}.depth + 1;
-        // Two steps, so bumping a ceiling mid-jump is not standing on it.
         if (${e.who} != noone && ${t("grounded", e.who)}) ${e.standing} += 1;
         else ${e.standing} = 0;
 
         if (keyboard_check_pressed(ord("X"))) {
-          if (${G.state} != 0) {
+          if (${q.state} != 0) {
             ${n("refused", "\"a quicksave is already placed, or was cancelled until the next respawn\"")}
-          } else if (!${G.hasAnchor}) {
+          } else if (!${q.hasAnchor}) {
             ${n("refused", "\"the game has not saved or loaded yet\"")}
           } else if (${e.standing} < 2) {
             ${n("refused", "\"not standing on anything\"")}
           } else {
-            ${G.room} = room;
-            ${G.x} = ${e.who}.x;
-            ${G.y} = ${e.who}.y;
-            ${G.markerX} = (${e.who}.bbox_left + ${e.who}.bbox_right) / 2;
-            ${G.markerY} = (${e.who}.bbox_top + ${e.who}.bbox_bottom) / 2;
-            ${r.map((e, t) => `${G.carried(t)} = global.${e};`).join("\n          ")}
-            ${G.state} = 1;
+            ${q.room} = room;
+            ${q.x} = ${e.who}.x;
+            ${q.y} = ${e.who}.y;
+            ${q.markerX} = (${e.who}.bbox_left + ${e.who}.bbox_right) / 2;
+            ${q.markerY} = (${e.who}.bbox_top + ${e.who}.bbox_bottom) / 2;
+            ${r.map((e, t) => `${q.carried(t)} = global.${e};`).join("\n          ")}
+            ${q.state} = 1;
             ${t("persist")};
-            ${n("placed", `room_get_name(room) + " " + string(${G.x}) + "," + string(${G.y})`)}
+            ${n("placed", `room_get_name(room) + " " + string(${q.x}) + "," + string(${q.y})`)}
           }
         }
 
-        if (keyboard_check_pressed(ord("C")) && ${G.state} == 1) {
-          ${G.state} = 2;
+        if (keyboard_check_pressed(ord("C")) && ${q.state} == 1) {
+          ${q.state} = 2;
           ${t("persist")};
           ${n("cancelled")}
         }
+      `,
+			endStep: ({ v: e, call: t, send: n }) => `
+        var qs_who, qs_jump, qs_here;
+        qs_who = ${t("player")};
+
+        if (qs_who != noone && ${q.hasAnchor} && ${q.anchorRoom} < 0) {
+          if (${t("atAnchor", "qs_who", "0")}) ${q.anchorRoom} = room;
+        }
+
+        qs_jump = 0;
+        if (qs_who == noone) {
+          ${e.seen} = 0;
+        } else if (!${e.seen}) {
+          qs_jump = 1;
+        } else if (qs_who != ${e.lastId} || room != ${e.lastRoom}) {
+          qs_jump = 1;
+        } else if (abs(qs_who.x - ${e.lastX}) > ${W}
+                || abs(qs_who.y - ${e.lastY}) > ${W}) {
+          qs_jump = 1;
+        }
+
+        if (qs_who != noone) {
+          if (${e.settle} > 0) {
+            ${e.settle} -= 1;
+            if (${q.state} == 1 && room != ${q.room}) {
+              ${t("apply", "qs_who", "0")};
+              ${t("persist")};
+            }
+          }
+
+          if (qs_jump && ${q.state} != 0) {
+            if (${t("atAnchor", "qs_who", "1")}) {
+              qs_here = 0;
+              if (${q.state} == 1) {
+                qs_here = (room == ${q.room}
+                  && abs(qs_who.x - ${q.x}) <= ${U}
+                  && abs(qs_who.y - ${q.y}) <= ${U});
+              }
+              if (!qs_here) {
+                if (${q.state} == 1) {
+                  ${t("apply", "qs_who", "1")};
+                  ${n("restored", "\"after a respawn\"")}
+                  ${t("persist")};
+                  ${e.settle} = ${G};
+                } else if (${q.state} == 2) {
+                  ${q.state} = 0;
+                  ${t("persist")};
+                  ${n("rearmed", "\"after a respawn\"")}
+                }
+              }
+            }
+          }
+          ${e.seen} = 1;
+          ${e.lastId} = qs_who;
+          ${e.lastX} = qs_who.x;
+          ${e.lastY} = qs_who.y;
+          ${e.lastRoom} = room;
+        }
       `,
 			draw: () => `
-        if (${G.state} == 1 && room == ${G.room} && ${c.id} >= 0) {
-          draw_sprite_ext(${c.id}, 0, ${G.markerX}, ${G.markerY}, ${W.scale}, ${W.scale},
-            ${W.swing} * sin(current_time / ${W.pace}), c_white, ${W.alpha});
+        if (${q.state} == 1 && room == ${q.room} && ${c.id} >= 0) {
+          draw_sprite_ext(${c.id}, 0, ${q.markerX}, ${q.markerY}, ${K.scale}, ${K.scale},
+            ${K.swing} * sin(current_time / ${K.pace}), c_white, ${K.alpha});
         }
       `
 		},
@@ -1161,13 +1250,14 @@ file_text_close(qs_file);`
 		"placed",
 		"cancelled",
 		"restored",
+		"rearmed",
 		"cleared",
-		"dropped",
+		"missed",
 		"refused"
 	]) e.on(t, (e) => console.log(`[quicksave] ${t}${e ? `: ${e}` : ""}`));
-}, q = T((e) => {
+}, Y = T((e) => {
 	let t = V(e.content);
-	t.ok ? K(e, t.value) : console.warn(`[quicksave] this game is not supported: ${t.error}`);
+	t.ok ? J(e, t.value) : console.warn(`[quicksave] this game is not supported: ${t.error}`);
 });
 //#endregion
-export { q as default };
+export { Y as default };

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@fruit-pie/quicksave",
-  "version": "1.0.0",
+  "version": "1.1.0",
+  "displayName": "Quicksave",
   "description": "Save anywhere between two of the game's saves, without touching its save files.",
   "type": "module",
   "main": "dist/index.js",