Merge branch 'main' into pixelspersecond

Engine.js

@@ -150,28 +150,27 @@ function initSprite(spriteData, that) {
 }
 
 const VALID_PARAMS = [
-  "x", 
-  "y", 
-  "vx", 
-  "vy", 
-  "tags", 
-  "sprite", 
+  "x",
+  "y",
+  "vx",
+  "vy",
+  "tags",
+  "sprite",
   "scale",
-  "rotate", 
-  "collides", 
-  "update", 
+  "rotate",
+  "collides",
+  "update",
   "solid",
   "bounce",
   "origin",
   "props",
+  "fps",
   // not doced?
   "click",
-  "drawBounds"
 ];
 
 class Object {
   constructor(params, engine) {
-
     for (const k in params) {
       if (!VALID_PARAMS.includes(k)) {
         const msg = `Sprite's "${k}" set to "${params[k]}", but sprites don't have "${k}"s`;
@@ -232,7 +231,6 @@ class Object {
     this.click = params.click ?? null;
     this.update = params.update ?? null;
     this.collides = params.collides ?? null;
-    this.drawBounds = params.drawBounds ?? false;
     this.props = params.props ?? {};
 
     const fps = params.fps;
@@ -269,7 +267,7 @@ class Object {
     return this._sprite;
   }
 
-  telport(x, y) {
+  teleport(x, y) {
     this.lastX = this.x = x;
     this.lasty = this.y = y;
   }

components/menuButtons.js

@@ -62,10 +62,11 @@ const newProjectImageLink = (state) => {
 }
 
 const newProjectClick = () => {
-  if (confirm("This will clear the existing project. Continue?")) {
-    dispatch("SOUND", "click");
-    dispatch("LOAD_DEFAULT_CARTRIDGE");
-  }
+  alert(`If you want to get back to this project, simply click "?"`);
+  dispatch("SOUND", "click");
+  dispatch("LOAD_DEFAULT_CARTRIDGE").then(() => {
+    dispatch("GENERATE_NAME");
+  });
 }
 
 const newProjectButton = state => button({

components/renderDocs.js

@@ -207,15 +207,15 @@ playTune(tune_asset_name);
 playTune(tune_0, tune_1, tune_2);
     </pre>
     To play a tune on repeat:
-    <pre>
+<pre>
 loopTune(tune_asset_name);
 
 // or loop multiple tunes
 
 loopTune(tune_0, tune_1, tune_2);
     </pre>
     To stop a tune on repeat:
-    <pre>
+<pre>
 const tuneToStop = loopTune(tune_asset_name);
 tuneToStop.end();
     </pre>

dispatch.js

@@ -97,6 +97,17 @@ const STATE = {
   challengeIndex: -1,
 };
 
+function randString(length) {
+  var randomChars = "abcdefghijklmnopqrstuvwxyz";
+  var result = "";
+  for (var i = 0; i < length; i++) {
+    result += randomChars.charAt(
+      Math.floor(Math.random() * randomChars.length)
+    );
+  }
+  return result;
+}
+
 const evalGameScript = createEval();
 
 const ACTIONS = {
@@ -299,6 +310,10 @@ const ACTIONS = {
     state.mouseY = mouseY;
     dispatch("RENDER");
   },
+  GENERATE_NAME({}, state) {
+    state.name = "gamelab-" + randString(3);
+    dispatch("RENDER");
+  },
   LOAD_DEFAULT_CARTRIDGE: async ({}, state) => {
     state.loadFileStatus = "loading";
     await dispatch("LOAD_CARTRIDGE", { saved: await loadFromDefault() });
@@ -374,17 +389,6 @@ const ACTIONS = {
 
     if (state.assetEditor && state.assetEditor.end) state.assetEditor.end();
 
-    function randString(length) {
-      var randomChars = "abcdefghijklmnopqrstuvwxyz";
-      var result = "";
-      for (var i = 0; i < length; i++) {
-        result += randomChars.charAt(
-          Math.floor(Math.random() * randomChars.length)
-        );
-      }
-      return result;
-    }
-
     if (assetType === "sprite") {
       state.assetEditor = createPixelEditor(
         document.querySelector(".asset-editor")

events.js

@@ -222,9 +222,27 @@ export function events(state) {
     }
   });
 
-  window.addEventListener("beforeunload", () => {
-    window.localStorage.setItem("hc-game-lab", dispatch("GET_SAVE_STATE"));
-  });
+  const save = () => {
+    let all = JSON.parse(window.localStorage.getItem("hc-game-lab"));
+    const fresh = JSON.parse(dispatch("GET_SAVE_STATE"));
+
+    (() => {
+      if (Array.isArray(all)) {
+        const existing = all.findIndex((x) => x.name == fresh.name);
+        if (existing > -1) return (all[existing] = fresh);
+      }
+
+      if (all == null) all = [];
+      else if (!Array.isArray(all)) all = [all];
+      all.push(fresh);
+    })();
+
+    window.localStorage.setItem("hc-game-lab", JSON.stringify(all));
+  };
+
+  window.addEventListener("beforeunload", save);
+  window.addEventListener("onkeydown", save);
+  window.addEventListener("onmousedown", save);
 
   addVerticalBarDrag(state, bodyListener);
   addHorzBarDrag(state, bodyListener);

init.js

@@ -16,6 +16,7 @@ function removeParam(key) {
 }
 
 export function loadFromDefault() {
+  dispatch("GENERATE_NAME");
   return loadFromS3(DEFAULT_CARTRIDGE);
 }
 
@@ -28,6 +29,25 @@ function loadFromStorage() {
   }
   const saved = JSON.parse(storedData);
 
+  if (Array.isArray(saved))
+    return dispatch("NOTIFICATION", {
+      message: html`
+        The following games were found in your storage:<br />
+        ${saved.map(
+          (save) => html`
+            <button
+              @click=${() => {
+                dispatch("LOAD_CARTRIDGE", { saved: save });
+              }}
+            >
+              ${save.name}
+            </button>
+          `
+        )}
+      `,
+      open: false,
+    });
+
   dispatch("NOTIFICATION", {
     message: html`
       An old game you were working on was found in your storage.<br />