Update

50 files changed, 49 insertions, 19 deletions

diff --git a/2026/framing/art/font0.aseprite b/2026/framing/art/font0.aseprite
index 1893854..d6c11a8 100644
--- a/2026/framing/art/font0.aseprite
+++ b/2026/framing/art/font0.aseprite
diff --git a/2026/framing/dist/game_lib-756716c85f227e5e.js b/2026/framing/dist/game_lib-aa603afdb40ff7d9.js
index 51c21fe..b47f990 100644
--- a/2026/framing/dist/game_lib-756716c85f227e5e.js
+++ b/2026/framing/dist/game_lib-aa603afdb40ff7d9.js
@@ -1474,10 +1474,6 @@ function __wbg_get_imports() {
         const ret = false;
         return ret;
     };
-    imports.wbg.__wbindgen_closure_wrapper3202 = function(arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 530, __wbg_adapter_43);
-        return ret;
-    };
     imports.wbg.__wbindgen_closure_wrapper3203 = function(arg0, arg1, arg2) {
         const ret = makeMutClosure(arg0, arg1, 530, __wbg_adapter_43);
         return ret;
@@ -1495,10 +1491,14 @@ function __wbg_get_imports() {
         return ret;
     };
     imports.wbg.__wbindgen_closure_wrapper3207 = function(arg0, arg1, arg2) {
+        const ret = makeMutClosure(arg0, arg1, 530, __wbg_adapter_43);
+        return ret;
+    };
+    imports.wbg.__wbindgen_closure_wrapper3208 = function(arg0, arg1, arg2) {
         const ret = makeMutClosure(arg0, arg1, 530, __wbg_adapter_54);
         return ret;
     };
-    imports.wbg.__wbindgen_closure_wrapper3433 = function(arg0, arg1, arg2) {
+    imports.wbg.__wbindgen_closure_wrapper3434 = function(arg0, arg1, arg2) {
         const ret = makeMutClosure(arg0, arg1, 605, __wbg_adapter_57);
         return ret;
     };
diff --git a/2026/framing/dist/game_lib-756716c85f227e5e_bg.wasm b/2026/framing/dist/game_lib-aa603afdb40ff7d9_bg.wasm
index ef0aad6..75e96d8 100644
--- a/2026/framing/dist/game_lib-756716c85f227e5e_bg.wasm
+++ b/2026/framing/dist/game_lib-aa603afdb40ff7d9_bg.wasm
diff --git a/2026/framing/dist/index.html b/2026/framing/dist/index.html
index 8c53213..61cdd04 100644
--- a/2026/framing/dist/index.html
+++ b/2026/framing/dist/index.html
@@ -6,8 +6,8 @@
     <meta charset="UTF-8">
     
 <script type="module">
-import init, * as bindings from '/framing/dist/game_lib-756716c85f227e5e.js';
-const wasm = await init({ module_or_path: '/framing/dist/game_lib-756716c85f227e5e_bg.wasm' });
+import init, * as bindings from '/framing/dist/game_lib-aa603afdb40ff7d9.js';
+const wasm = await init({ module_or_path: '/framing/dist/game_lib-aa603afdb40ff7d9_bg.wasm' });
 
 
 window.wasmBindings = bindings;
@@ -23,7 +23,7 @@ dispatchEvent(new CustomEvent("TrunkApplicationStarted", {detail: {wasm}}));
     <link rel="icon" href="data:;base64,iVBORw0KGgo=">
     <link rel="stylesheet" href="/framing/dist/index-1e3cd2ca0ba4d1ec.css" integrity="sha384-1q3UDTmLdOyf9/QxW+Imap//HWhTWNfvn7j2iwuUap3HSD6IOGG7pDS9VJMk7nKv"/>
     <title>TODO TITLE</title>
-  <link rel="modulepreload" href="/framing/dist/game_lib-756716c85f227e5e.js" crossorigin="anonymous" integrity="sha384-kETWGSRk6mu21Pl7hsEBpB7eWp9Jg8dJ0WfMsHTslM4gPgB1ny4BccJxZQiG/rOL"><link rel="modulepreload" href="/framing/dist/snippets/teleia-727bf4351691f1c8/src/helpers.js" crossorigin="anonymous" integrity="sha384-HhtEY2WfGmhyPUSRWKZvqsRxYsdT/DLEdFUqWyDZt6G6lrNHmE1zMlw4BJ3RycRd"><link rel="modulepreload" href="/framing/dist/snippets/game_lib-09da6449fcb9d06e/src/bindings.js" crossorigin="anonymous" integrity="sha384-OqSoI1U/qGAdOIY23X7G4HXgi2h6nb8jbT8RiF1LDHgJg7UPDyGz1ZQ/rgmUg4ue"><link rel="preload" href="/framing/dist/game_lib-756716c85f227e5e_bg.wasm" crossorigin="anonymous" integrity="sha384-iM/1P6P3lvXgnPMw0tt4ocjj6nBFBjHbULHKLD27+v172BszheW1lu2oltfrpEnw" as="fetch" type="application/wasm"></head>
+  <link rel="modulepreload" href="/framing/dist/game_lib-aa603afdb40ff7d9.js" crossorigin="anonymous" integrity="sha384-eMCeJjAlA+b75LleOY7IhYi/P6ZjaOCSkvTktuCryApU0uVsgxpHwsIIit0mOM42"><link rel="modulepreload" href="/framing/dist/snippets/game_lib-09da6449fcb9d06e/src/bindings.js" crossorigin="anonymous" integrity="sha384-OqSoI1U/qGAdOIY23X7G4HXgi2h6nb8jbT8RiF1LDHgJg7UPDyGz1ZQ/rgmUg4ue"><link rel="modulepreload" href="/framing/dist/snippets/teleia-727bf4351691f1c8/src/helpers.js" crossorigin="anonymous" integrity="sha384-HhtEY2WfGmhyPUSRWKZvqsRxYsdT/DLEdFUqWyDZt6G6lrNHmE1zMlw4BJ3RycRd"><link rel="preload" href="/framing/dist/game_lib-aa603afdb40ff7d9_bg.wasm" crossorigin="anonymous" integrity="sha384-SqLip8RuTHuwH8gIf8seGo1v5B+xd39TtwJaaxne6cjMYgKQWKOqYRjVWL0ZsIa9" as="fetch" type="application/wasm"></head>
   <body>
     <script type="module">
       window.addEventListener("TrunkApplicationStarted", async (event) => {
diff --git a/2026/framing/src/assets/fonts/font0.png b/2026/framing/src/assets/fonts/font1.png
index 048ef6c..048ef6c 100644
--- a/2026/framing/src/assets/fonts/font0.png
+++ b/2026/framing/src/assets/fonts/font1.png
diff --git a/2026/framing/src/assets/fonts/font2.png b/2026/framing/src/assets/fonts/font2.png
new file mode 100644
index 0000000..1a3ddfe
--- /dev/null
+++ b/2026/framing/src/assets/fonts/font2.png
diff --git a/2026/framing/src/game.rs b/2026/framing/src/game.rs
index 30c778e..fa2efff 100644
--- a/2026/framing/src/game.rs
+++ b/2026/framing/src/game.rs
@@ -161,7 +161,8 @@ pub struct Game {
     mode: Mode,
     mode_started: Tick,
     renderer: renderer::Renderer<assets::Assets>,
-    font0: font::Bitmap,
+    font1: font::Bitmap,
+    font2: font::Bitmap,
     lives: Lives,
     verb: Option<String>,
 }
@@ -172,11 +173,18 @@ impl Game {
             mode: Mode::Titlescreen,
             mode_started: 0,
             renderer: renderer::Renderer::new(ctx, st, assets::Assets::new),
-            font0: font::Bitmap::from_image(ctx, 32, 48, 512, 288, include_bytes!("assets/fonts/font0.png")),
+            font1: font::Bitmap::from_image(ctx, 32, 48, 512, 288, include_bytes!("assets/fonts/font1.png")),
+            font2: font::Bitmap::from_image(ctx, 32, 48, 512, 288, include_bytes!("assets/fonts/font2.png")),
             lives: Lives::new(),
             verb: None,
         }
     }
+    pub fn reset(&mut self) {
+        self.mode = Mode::Titlescreen;
+        self.mode_started = 0;
+        self.lives = Lives::new();
+        self.verb = None;
+    }
     pub fn switch(&mut self, _ctx: &context::Context, st: &mut state::State, m: Mode) {
         self.mode = m;
         self.mode_started = st.tick;
@@ -205,12 +213,13 @@ impl Game {
         };
         self.renderer.render_square(ctx, st);
         if let Some(v) = &self.verb && let Some(t) = fadeout && t > 5 && t < 70 {
+            let tick = st.tick;
             self.renderer.text_screen(ctx, st,
                 glam::Vec2::new(st.render_dims.x / 2.0, st.render_dims.y / 2.0),
                 v
             )
                 .centered()
-                .font(&self.font0)
+                .font(if (tick / 16).is_multiple_of(2) { &self.font1 } else { &self.font2 })
                 .color(glam::Vec4::new(0.39, 0.61, 1.0, opacity))
                 .render();
         }
@@ -339,3 +348,10 @@ pub fn end_game(win: bool) {
         js_update_lifetotal(g.lives.lives_remaining());
     });
 }
+
+#[wasm_bindgen]
+pub fn reset() {
+    contextualize(|_ctx, _st, g: &mut Game| {
+        g.reset();
+    })
+}
diff --git a/2026/games_submissions/peetseater/MikuWantsPizza1.png b/2026/games/peetseater/MikuWantsPizza1.png
index c8ea1cb..c8ea1cb 100644
--- a/2026/games_submissions/peetseater/MikuWantsPizza1.png
+++ b/2026/games/peetseater/MikuWantsPizza1.png
diff --git a/2026/games_submissions/peetseater/deliverit.mp3 b/2026/games/peetseater/deliverit.mp3
index bc0a46b..bc0a46b 100644
--- a/2026/games_submissions/peetseater/deliverit.mp3
+++ b/2026/games/peetseater/deliverit.mp3
diff --git a/2026/games_submissions/peetseater/explosion.mp3 b/2026/games/peetseater/explosion.mp3
index 90ba5b5..90ba5b5 100644
--- a/2026/games_submissions/peetseater/explosion.mp3
+++ b/2026/games/peetseater/explosion.mp3
diff --git a/2026/games_submissions/peetseater/failure.mp3 b/2026/games/peetseater/failure.mp3
index b7f8661..b7f8661 100644
--- a/2026/games_submissions/peetseater/failure.mp3
+++ b/2026/games/peetseater/failure.mp3
diff --git a/2026/games_submissions/peetseater/harness.html b/2026/games/peetseater/harness.html
index be1eac3..be1eac3 100644
--- a/2026/games_submissions/peetseater/harness.html
+++ b/2026/games/peetseater/harness.html
diff --git a/2026/games_submissions/peetseater/index.html b/2026/games/peetseater/index.html
index 2927992..2927992 100644
--- a/2026/games_submissions/peetseater/index.html
+++ b/2026/games/peetseater/index.html
diff --git a/2026/games_submissions/peetseater/jump.mp3 b/2026/games/peetseater/jump.mp3
index 6c0510e..6c0510e 100644
--- a/2026/games_submissions/peetseater/jump.mp3
+++ b/2026/games/peetseater/jump.mp3
diff --git a/2026/games_submissions/peetseater/mikuscream.mp3 b/2026/games/peetseater/mikuscream.mp3
index efa9178..efa9178 100644
--- a/2026/games_submissions/peetseater/mikuscream.mp3
+++ b/2026/games/peetseater/mikuscream.mp3
diff --git a/2026/games_submissions/peetseater/pasta.mp3 b/2026/games/peetseater/pasta.mp3
index 8967aae..8967aae 100644
--- a/2026/games_submissions/peetseater/pasta.mp3
+++ b/2026/games/peetseater/pasta.mp3
diff --git a/2026/games_submissions/peetseater/pizza.mp3 b/2026/games/peetseater/pizza.mp3
index be4c32a..be4c32a 100644
--- a/2026/games_submissions/peetseater/pizza.mp3
+++ b/2026/games/peetseater/pizza.mp3
diff --git a/2026/games_submissions/peetseater/pizza.png b/2026/games/peetseater/pizza.png
index 43569e0..43569e0 100644
--- a/2026/games_submissions/peetseater/pizza.png
+++ b/2026/games/peetseater/pizza.png
diff --git a/2026/games_submissions/peetseater/weeee.mp3 b/2026/games/peetseater/weeee.mp3
index 022e30e..022e30e 100644
--- a/2026/games_submissions/peetseater/weeee.mp3
+++ b/2026/games/peetseater/weeee.mp3
diff --git a/2026/games/just__jane/.clang-format b/2026/games_submissions/just__jane/.clang-format
index d7dc6ec..d7dc6ec 100644
--- a/2026/games/just__jane/.clang-format
+++ b/2026/games_submissions/just__jane/.clang-format
diff --git a/2026/games/just__jane/.gitignore b/2026/games_submissions/just__jane/.gitignore
index 6de1189..6de1189 100644
--- a/2026/games/just__jane/.gitignore
+++ b/2026/games_submissions/just__jane/.gitignore
diff --git a/2026/games/just__jane/Makefile b/2026/games_submissions/just__jane/Makefile
index c9b8c8e..c9b8c8e 100644
--- a/2026/games/just__jane/Makefile
+++ b/2026/games_submissions/just__jane/Makefile
diff --git a/2026/games/just__jane/README.md b/2026/games_submissions/just__jane/README.md
index b1473f3..b1473f3 100644
--- a/2026/games/just__jane/README.md
+++ b/2026/games_submissions/just__jane/README.md
diff --git a/2026/games/just__jane/assets/background.png b/2026/games_submissions/just__jane/assets/background.png
index 866a5f6..866a5f6 100644
--- a/2026/games/just__jane/assets/background.png
+++ b/2026/games_submissions/just__jane/assets/background.png
diff --git a/2026/games/just__jane/assets/frame-v2.aseprite b/2026/games_submissions/just__jane/assets/frame-v2.aseprite
index cab5269..cab5269 100644
--- a/2026/games/just__jane/assets/frame-v2.aseprite
+++ b/2026/games_submissions/just__jane/assets/frame-v2.aseprite
diff --git a/2026/games/just__jane/assets/frame-v2.png b/2026/games_submissions/just__jane/assets/frame-v2.png
index 5dba8b0..5dba8b0 100644
--- a/2026/games/just__jane/assets/frame-v2.png
+++ b/2026/games_submissions/just__jane/assets/frame-v2.png
diff --git a/2026/games/just__jane/assets/frame.aseprite b/2026/games_submissions/just__jane/assets/frame.aseprite
index 052f910..052f910 100644
--- a/2026/games/just__jane/assets/frame.aseprite
+++ b/2026/games_submissions/just__jane/assets/frame.aseprite
diff --git a/2026/games/just__jane/assets/pedals/0.png b/2026/games_submissions/just__jane/assets/pedals/0.png
index 3d506bb..3d506bb 100644
--- a/2026/games/just__jane/assets/pedals/0.png
+++ b/2026/games_submissions/just__jane/assets/pedals/0.png
diff --git a/2026/games/just__jane/assets/pedals/1.png b/2026/games_submissions/just__jane/assets/pedals/1.png
index 54a3c83..54a3c83 100644
--- a/2026/games/just__jane/assets/pedals/1.png
+++ b/2026/games_submissions/just__jane/assets/pedals/1.png
diff --git a/2026/games/just__jane/assets/pedals/2.png b/2026/games_submissions/just__jane/assets/pedals/2.png
index 993c7e9..993c7e9 100644
--- a/2026/games/just__jane/assets/pedals/2.png
+++ b/2026/games_submissions/just__jane/assets/pedals/2.png
diff --git a/2026/games/just__jane/assets/pedals/cut_pedal.png b/2026/games_submissions/just__jane/assets/pedals/cut_pedal.png
index c7a0a19..c7a0a19 100644
--- a/2026/games/just__jane/assets/pedals/cut_pedal.png
+++ b/2026/games_submissions/just__jane/assets/pedals/cut_pedal.png
diff --git a/2026/games/just__jane/assets/ronin.png b/2026/games_submissions/just__jane/assets/ronin.png
index 9c78953..9c78953 100644
--- a/2026/games/just__jane/assets/ronin.png
+++ b/2026/games_submissions/just__jane/assets/ronin.png
diff --git a/2026/games/just__jane/assets/slash.wav b/2026/games_submissions/just__jane/assets/slash.wav
index b82b476..b82b476 100644
--- a/2026/games/just__jane/assets/slash.wav
+++ b/2026/games_submissions/just__jane/assets/slash.wav
diff --git a/2026/games/just__jane/compile_commands.json b/2026/games_submissions/just__jane/compile_commands.json
index 802ac1c..802ac1c 100644
--- a/2026/games/just__jane/compile_commands.json
+++ b/2026/games_submissions/just__jane/compile_commands.json
diff --git a/2026/games/just__jane/include/clock.hpp b/2026/games_submissions/just__jane/include/clock.hpp
index 41bec56..41bec56 100644
--- a/2026/games/just__jane/include/clock.hpp
+++ b/2026/games_submissions/just__jane/include/clock.hpp
diff --git a/2026/games/just__jane/include/cut.hpp b/2026/games_submissions/just__jane/include/cut.hpp
index 0804e86..0804e86 100644
--- a/2026/games/just__jane/include/cut.hpp
+++ b/2026/games_submissions/just__jane/include/cut.hpp
diff --git a/2026/games/just__jane/include/game_loop.hpp b/2026/games_submissions/just__jane/include/game_loop.hpp
index d2b537c..d2b537c 100644
--- a/2026/games/just__jane/include/game_loop.hpp
+++ b/2026/games_submissions/just__jane/include/game_loop.hpp
diff --git a/2026/games/just__jane/include/petal.hpp b/2026/games_submissions/just__jane/include/petal.hpp
index c85d227..c85d227 100644
--- a/2026/games/just__jane/include/petal.hpp
+++ b/2026/games_submissions/just__jane/include/petal.hpp
diff --git a/2026/games/just__jane/include/score.hpp b/2026/games_submissions/just__jane/include/score.hpp
index 20424ba..20424ba 100644
--- a/2026/games/just__jane/include/score.hpp
+++ b/2026/games_submissions/just__jane/include/score.hpp
diff --git a/2026/games/just__jane/index.html b/2026/games_submissions/just__jane/index.html
index 73f18d3..73f18d3 100644
--- a/2026/games/just__jane/index.html
+++ b/2026/games_submissions/just__jane/index.html
diff --git a/2026/games/just__jane/sakura_samurai.data b/2026/games_submissions/just__jane/sakura_samurai.data
index 5deda93..5deda93 100644
--- a/2026/games/just__jane/sakura_samurai.data
+++ b/2026/games_submissions/just__jane/sakura_samurai.data
diff --git a/2026/games/just__jane/sakura_samurai.html b/2026/games_submissions/just__jane/sakura_samurai.html
index 1182fb6..1182fb6 100644
--- a/2026/games/just__jane/sakura_samurai.html
+++ b/2026/games_submissions/just__jane/sakura_samurai.html
diff --git a/2026/games/just__jane/sakura_samurai.js b/2026/games_submissions/just__jane/sakura_samurai.js
index b47e1e1..b47e1e1 100644
--- a/2026/games/just__jane/sakura_samurai.js
+++ b/2026/games_submissions/just__jane/sakura_samurai.js
diff --git a/2026/games/just__jane/sakura_samurai.wasm b/2026/games_submissions/just__jane/sakura_samurai.wasm
index 5a2774e..5a2774e 100755
--- a/2026/games/just__jane/sakura_samurai.wasm
+++ b/2026/games_submissions/just__jane/sakura_samurai.wasm
diff --git a/2026/games/just__jane/src/clock.cpp b/2026/games_submissions/just__jane/src/clock.cpp
index fbe1dbb..fbe1dbb 100644
--- a/2026/games/just__jane/src/clock.cpp
+++ b/2026/games_submissions/just__jane/src/clock.cpp
diff --git a/2026/games/just__jane/src/cut.cpp b/2026/games_submissions/just__jane/src/cut.cpp
index 67e4c25..67e4c25 100644
--- a/2026/games/just__jane/src/cut.cpp
+++ b/2026/games_submissions/just__jane/src/cut.cpp
diff --git a/2026/games/just__jane/src/game_loop.cpp b/2026/games_submissions/just__jane/src/game_loop.cpp
index e95fc26..e95fc26 100644
--- a/2026/games/just__jane/src/game_loop.cpp
+++ b/2026/games_submissions/just__jane/src/game_loop.cpp
diff --git a/2026/games/just__jane/src/main.cpp b/2026/games_submissions/just__jane/src/main.cpp
index 2c07641..2c07641 100644
--- a/2026/games/just__jane/src/main.cpp
+++ b/2026/games_submissions/just__jane/src/main.cpp
diff --git a/2026/games/just__jane/src/score.cpp b/2026/games_submissions/just__jane/src/score.cpp
index ea0aa78..ea0aa78 100644
--- a/2026/games/just__jane/src/score.cpp
+++ b/2026/games_submissions/just__jane/src/score.cpp
diff --git a/2026/index.html b/2026/index.html
index 34f6504..ab7ffee 100644
--- a/2026/index.html
+++ b/2026/index.html
@@ -47,6 +47,7 @@
       let microgames = window.MICROGAMES.map(g => ({url: g, loaded: null, ready: false}));
       let framing = document.getElementById("jam-framing-iframe");
       let microgame_index = 0;
+      let streak = 1;
       let iframe_parent = document.getElementById("jam-iframe-parent");
       let iframes =[ ...Array(2).keys()].map(i => {
           let elem = document.createElement("iframe")
@@ -120,7 +121,7 @@
       }
 
       // microgame state machine
-      let state = {mode: "finished"};
+      let state = {mode: "titlescreen"};
       console.log(state);
       window.lcolonqState = () => state;
       function confirmReadyGame(idx) {
@@ -144,14 +145,25 @@
           }
       }
       function receivedLifeTotal(lives) {
-          setTimeout(startNextGameIfReady, 4000);
-          state = {mode: "finished"};
-          console.log(state);
+          console.log(`lives remaining: ${lives}`);
+          if (lives <= 0) {
+              gameOver();
+              state = {mode: "gameover"};
+              console.log(state);
+          } else {
+              streak += 1;
+              setTimeout(startNextGameIfReady, 4000);
+              state = {mode: "finished"};
+              console.log(state);
+          }
+      }
+      function gameOver() {
+          framing.contentWindow.postMessage({op: "gameover", streak: streak});
       }
       function startGame(idx) {
           if (state.mode == "waiting" && state.idx === idx) {
               console.log(`actually starting game: ${idx}`);
-              const resp = {op: "start", difficulty: 1.0};
+              const resp = {op: "start", difficulty: streak};
               microgames[idx].loaded.contentWindow.postMessage(resp);
               microgames[idx].loaded.contentWindow.lcolonqJamStart = resp.difficulty;
               microgames[idx].loaded.classList.remove("jam-hidden");
@@ -205,13 +217,15 @@
           }
       });
 
-      let started = false;
       document.body.addEventListener("click", () => {
-          if (!started) {
-              started = true;
+          switch (state.mode) {
+          case "titlescreen":
+              state = {mode: "finished"};
+              console.log(state);
               framing.contentWindow.postMessage({op: "titlescreenclick"});
               loadUpcomingGames();
               setTimeout(startNextGameIfReady, 8000);
+              break;
           }
       });
     </script>