incanto 0.74.0 → 0.76.0

package/templates-app/village-quest-3d/src/behaviors.ts

@@ -27,6 +27,7 @@ import { Behavior, findPath, gridFromRows, Timer } from 'incanto';
 import { mergeSolidRects, parseCells } from 'incanto/2d';
 import type { Camera3D, CharacterController3D, Node3D, Trail3D } from 'incanto/3d';
 import { MeshInstance3D, Particles3D, StaticBody3D } from 'incanto/3d';
+import type { Health } from 'incanto/gameplay';
 import { goToScene } from 'incanto/gameplay';
 import groveJsonRaw from './grove.scene.json';
 import { quest, resetQuest } from './quest';
@@ -558,19 +559,13 @@ export class SwordStrike extends Behavior {
     if (!wolf.tree) return; // already gone
     const at = (wolf as unknown as Positioned).position;
     (this.player.getNode('HitSfx') as AudioPlayer).play();
-    // two hits per wolf: the first FLINCHES it (knockback along the strike)
-    const hits = (wolfHits.get(wolf) ?? 0) + 1;
-    wolfHits.set(wolf, hits);
-    if (hits < 2) {
-      const [px, , pz] = this.player.position;
-      const dx = (at[0] ?? 0) - (px ?? 0);
-      const dz = (at[2] ?? 0) - (pz ?? 0);
-      const len = Math.hypot(dx, dz) || 1;
-      (wolf as unknown as Positioned).position = [
-        (at[0] ?? 0) + (dx / len) * 1.2,
-        at[1] ?? 0.45,
-        (at[2] ?? 0) + (dz / len) * 1.2,
-      ];
+    // two hits per wolf (`Vitals` is a `Health` of 2): the first FLINCHES it —
+    // `knockback` shoves it along the strike and `staggerSeconds` holds its
+    // PathFollow — and the second fells it. The blow's direction is the hit's
+    // source: the player's position.
+    const vitals = wolf.getNode('Vitals').behavior as Health;
+    vitals.damage(1, this.player.position);
+    if (!vitals.isDead) {
       (wolf.getNodeOrNull('GrowlSfx') as AudioPlayer | null)?.play();
       flashWolf(wolf);
       return;
@@ -591,9 +586,6 @@ export class SwordStrike extends Behavior {
   }
 }
 
-/** Strike bookkeeping: hits per wolf (module-scope — survives behavior instances). */
-const wolfHits = new WeakMap<Node, number>();
-
 /**
  * Red hurt-flash on every mesh of the wolf, reverted a beat later.
  *

package/templates-app/village-quest-3d/src/grove.scene.json

@@ -228,6 +228,15 @@
                 },
                 "uid": "n_7pidlrhnsw3irdcq"
               },
+              {
+                "name": "Vitals",
+                "type": "Node",
+                "script": {
+                  "name": "Health",
+                  "props": { "max": 2, "knockback": 3, "staggerSeconds": 0.35 }
+                },
+                "uid": "n_3a3vhg3kjbt8z3gy"
+              },
               {
                 "name": "Fang",
                 "type": "Area3D",
@@ -327,6 +336,15 @@
                 },
                 "uid": "n_b41lz424hn6e1jh1"
               },
+              {
+                "name": "Vitals",
+                "type": "Node",
+                "script": {
+                  "name": "Health",
+                  "props": { "max": 2, "knockback": 3, "staggerSeconds": 0.35 }
+                },
+                "uid": "n_8btt3s1ekwpzz16r"
+              },
               {
                 "name": "Fang",
                 "type": "Area3D",
@@ -426,6 +444,15 @@
                 },
                 "uid": "n_2ph84bwixda1kbuf"
               },
+              {
+                "name": "Vitals",
+                "type": "Node",
+                "script": {
+                  "name": "Health",
+                  "props": { "max": 2, "knockback": 3, "staggerSeconds": 0.35 }
+                },
+                "uid": "n_astg45lvndezejsw"
+              },
               {
                 "name": "Fang",
                 "type": "Area3D",
@@ -664,13 +691,77 @@
                 "uid": "n_ucyuyojea32g6zm4"
               },
               {
-                "name": "ResumeHint",
-                "type": "UiText",
-                "props": { "text": "Esc to resume · R to restart", "size": 13, "color": "#c9d2dd" },
-                "uid": "n_rs5w00p3m62rmoy6"
+                "name": "Resume",
+                "type": "UiButton",
+                "uid": "n_ibf6agaxzcxjhcmg",
+                "props": { "text": "RESUME", "size": 18 }
+              },
+              {
+                "name": "PauseOptions",
+                "type": "UiButton",
+                "uid": "n_kdecsevdetjk0q1i",
+                "props": { "text": "OPTIONS", "size": 16 }
+              },
+              {
+                "name": "Restart",
+                "type": "UiButton",
+                "uid": "n_vaxmkxrqot30vd7u",
+                "props": { "text": "START OVER", "size": 16 }
               }
             ],
             "uid": "n_5wfhk1dbgyv25gxl"
+          },
+          {
+            "name": "Options",
+            "type": "UiPanel",
+            "uid": "n_p9poexefeps6a5ti",
+            "props": {
+              "anchor": "center",
+              "layout": "column",
+              "gap": 10,
+              "padding": 22,
+              "visible": false,
+              "background": "rgba(10,14,22,0.92)",
+              "radius": 12
+            },
+            "children": [
+              {
+                "name": "OptionsTitle",
+                "type": "UiText",
+                "uid": "n_iewdvemq5y7qda2b",
+                "props": { "text": "OPTIONS", "size": 24 }
+              },
+              {
+                "name": "Master",
+                "type": "UiVolumeSlider",
+                "uid": "n_ycigwyt5cj3bjz3a",
+                "props": { "label": "master", "bus": "master", "width": 260 }
+              },
+              {
+                "name": "Sfx",
+                "type": "UiVolumeSlider",
+                "uid": "n_6mnynp8ycxxalwbi",
+                "props": { "label": "effects", "bus": "sfx", "width": 260 }
+              },
+              {
+                "name": "Mute",
+                "type": "UiMuteToggle",
+                "uid": "n_g2ckhuighfpqsz03",
+                "props": { "label": "mute everything" }
+              },
+              {
+                "name": "Quality",
+                "type": "UiQualitySelect",
+                "uid": "n_owxh3r8ktaohote2",
+                "props": { "label": "quality" }
+              },
+              {
+                "name": "Back",
+                "type": "UiButton",
+                "uid": "n_g7ugvwf2z03wjf2r",
+                "props": { "text": "BACK", "size": 16 }
+              }
+            ]
           }
         ],
         "uid": "n_wwhwnwye7olskfer"
@@ -680,6 +771,31 @@
   },
   "connections": [
     { "signal": "triggerEnter", "from": "ReturnPortal", "to": "/root", "handler": "onPortalEnter" },
-    { "signal": "died", "from": "Player", "to": "/root", "handler": "onPlayerDown" }
+    { "signal": "died", "from": "Player", "to": "/root", "handler": "onPlayerDown" },
+    {
+      "from": "/root/HUD/PauseMenu/Resume",
+      "signal": "pressed",
+      "to": "/root/Flow",
+      "handler": "resume"
+    },
+    {
+      "from": "/root/HUD/PauseMenu/PauseOptions",
+      "signal": "pressed",
+      "to": "/root/Flow",
+      "handler": "screen",
+      "args": ["/root/HUD/Options"]
+    },
+    {
+      "from": "/root/HUD/PauseMenu/Restart",
+      "signal": "pressed",
+      "to": "/root/Flow",
+      "handler": "restart"
+    },
+    {
+      "from": "/root/HUD/Options/Back",
+      "signal": "pressed",
+      "to": "/root/Flow",
+      "handler": "back"
+    }
   ]
 }

package/templates-app/village-quest-3d/src/village.scene.json

@@ -47,7 +47,8 @@
     "sprint": { "type": "button", "keys": ["ShiftLeft", "ShiftRight"] },
     "interact": { "type": "button", "keys": ["KeyE"] },
     "attack": { "type": "button", "keys": ["Mouse0", "KeyF"] },
-    "restart": { "type": "button", "keys": ["KeyR"] }
+    "restart": { "type": "button", "keys": ["KeyR"] },
+    "pause": { "type": "button", "keys": ["Escape"] }
   },
   "assets": {
     "characters/base": {
@@ -3092,9 +3093,107 @@
             "type": "UiLanguageSelect",
             "uid": "n_4m6tsfl0og3ekii3",
             "props": { "label": "@t:settings.language", "anchor": "topRight" }
+          },
+          {
+            "name": "PauseMenu",
+            "type": "UiPanel",
+            "uid": "n_2qwqjqh4quth7e2n",
+            "props": {
+              "anchor": "center",
+              "layout": "column",
+              "gap": 12,
+              "padding": 22,
+              "visible": false,
+              "background": "rgba(10,14,22,0.92)",
+              "radius": 12
+            },
+            "children": [
+              {
+                "name": "PausedTitle",
+                "type": "UiText",
+                "uid": "n_txt30ax88omwicjs",
+                "props": { "text": "PAUSED", "size": 26 }
+              },
+              {
+                "name": "Resume",
+                "type": "UiButton",
+                "uid": "n_jo0ovhcin79mtfel",
+                "props": { "text": "RESUME", "size": 18 }
+              },
+              {
+                "name": "PauseOptions",
+                "type": "UiButton",
+                "uid": "n_gu9f3scxx3ey6zoc",
+                "props": { "text": "OPTIONS", "size": 16 }
+              },
+              {
+                "name": "Restart",
+                "type": "UiButton",
+                "uid": "n_v1jdh9w3njlqtc4u",
+                "props": { "text": "START OVER", "size": 16 }
+              }
+            ]
+          },
+          {
+            "name": "Options",
+            "type": "UiPanel",
+            "uid": "n_kq3hlan3nrz5keog",
+            "props": {
+              "anchor": "center",
+              "layout": "column",
+              "gap": 10,
+              "padding": 22,
+              "visible": false,
+              "background": "rgba(10,14,22,0.92)",
+              "radius": 12
+            },
+            "children": [
+              {
+                "name": "OptionsTitle",
+                "type": "UiText",
+                "uid": "n_i0a6qykgauqump71",
+                "props": { "text": "OPTIONS", "size": 24 }
+              },
+              {
+                "name": "Master",
+                "type": "UiVolumeSlider",
+                "uid": "n_n5h7cfsjsych63ix",
+                "props": { "label": "master", "bus": "master", "width": 260 }
+              },
+              {
+                "name": "Sfx",
+                "type": "UiVolumeSlider",
+                "uid": "n_a37vbt17sodktb1h",
+                "props": { "label": "effects", "bus": "sfx", "width": 260 }
+              },
+              {
+                "name": "Mute",
+                "type": "UiMuteToggle",
+                "uid": "n_wxmwd9gbf16mia7v",
+                "props": { "label": "mute everything" }
+              },
+              {
+                "name": "Quality",
+                "type": "UiQualitySelect",
+                "uid": "n_g9f4iazzwcqxlykd",
+                "props": { "label": "quality" }
+              },
+              {
+                "name": "Back",
+                "type": "UiButton",
+                "uid": "n_6vkdb2onbyjrwakr",
+                "props": { "text": "BACK", "size": 16 }
+              }
+            ]
           }
         ],
         "uid": "n_6u92lb0drej635s9"
+      },
+      {
+        "name": "Flow",
+        "type": "Node",
+        "uid": "n_y2pc0uwbjnsx2ppe",
+        "script": { "name": "GameFlow" }
       }
     ],
     "uid": "n_2a2pghqmq92ko29c"
@@ -3102,6 +3201,31 @@
   "connections": [
     { "signal": "interacted", "from": "Elder", "to": "/root", "handler": "onTalk" },
     { "signal": "triggerEnter", "from": "GroveGate", "to": "/root", "handler": "onGateEnter" },
-    { "signal": "pressed", "from": "HUD/RestartBtn", "to": "/root", "handler": "onRestart" }
+    { "signal": "pressed", "from": "HUD/RestartBtn", "to": "/root", "handler": "onRestart" },
+    {
+      "from": "/root/HUD/PauseMenu/Resume",
+      "signal": "pressed",
+      "to": "/root/Flow",
+      "handler": "resume"
+    },
+    {
+      "from": "/root/HUD/PauseMenu/PauseOptions",
+      "signal": "pressed",
+      "to": "/root/Flow",
+      "handler": "screen",
+      "args": ["/root/HUD/Options"]
+    },
+    {
+      "from": "/root/HUD/PauseMenu/Restart",
+      "signal": "pressed",
+      "to": "/root/Flow",
+      "handler": "restart"
+    },
+    {
+      "from": "/root/HUD/Options/Back",
+      "signal": "pressed",
+      "to": "/root/Flow",
+      "handler": "back"
+    }
   ]
 }

package/templates-app/village-quest-3d/verify.ts

@@ -117,6 +117,8 @@ const ok = (label: string, cond: boolean): void => {
   let sceneName = (): string => 'unset';
   let wolvesWalked = false;
 
+  let wolfKnock = 0; // metres the first strike shoved the wolf along the blow (Health.knockback)
+  let wolfHeld = -1; // metres it walked in the 8 frames AFTER that — its PathFollow is held
   const result = await runScript(villageJson, {
     durationMs: 60000,
     seed: 7,
@@ -222,7 +224,8 @@ const ok = (label: string, cond: boolean): void => {
           const root = engine.scene?.tree.root;
           if (!root) throw new Error('no scene');
           const player = root.getNode('Player') as unknown as Vec;
-          // wolves take TWO strikes now (first = flinch knockback)
+          // wolves take TWO strikes now (first = flinch: `Health.knockback` shoves
+          // it along the blow and `staggerSeconds` holds its PathFollow)
           for (let round = 0; round < 6; round++) {
             const wolves = engine.scene?.tree.getNodesInGroup('wolf') ?? [];
             const target = wolves[0] as unknown as Vec | undefined;
@@ -233,10 +236,49 @@ const ok = (label: string, cond: boolean): void => {
               (target.position[2] ?? 0) + 0.8,
             ];
             engine.step();
+            let hitAt = -1;
+            let hitPos: number[] = [];
+            let cur = 0;
+            if (round === 0) {
+              const vitals = (
+                target as unknown as { getNode(p: string): { behavior: unknown } }
+              ).getNode('Vitals').behavior as {
+                on(s: string, f: () => void): void;
+              };
+              vitals.on('damaged', () => {
+                hitAt = cur;
+                hitPos = [...target.position];
+              });
+            }
             engine.input.pressAction('attack');
             engine.step();
             engine.input.releaseAction('attack');
-            for (let i = 0; i < 40; i++) engine.step();
+            let held: number[] = [];
+            for (let i = 0; i < (round === 0 ? 60 : 40); i++) {
+              cur = i;
+              engine.step();
+              if (round === 0 && hitAt >= 0) {
+                const away = [
+                  (target.position[0] ?? 0) - (player.position[0] ?? 0),
+                  (target.position[2] ?? 0) - (player.position[2] ?? 0),
+                ];
+                const len = Math.hypot(away[0] ?? 0, away[1] ?? 0) || 1;
+                const moved = [
+                  (target.position[0] ?? 0) - (hitPos[0] ?? 0),
+                  (target.position[2] ?? 0) - (hitPos[2] ?? 0),
+                ];
+                if (i === hitAt + 9) {
+                  wolfKnock =
+                    ((moved[0] ?? 0) * (away[0] ?? 0) + (moved[1] ?? 0) * (away[1] ?? 0)) / len;
+                  held = [...target.position];
+                }
+                if (i === hitAt + 17)
+                  wolfHeld = Math.hypot(
+                    (target.position[0] ?? 0) - (held[0] ?? 0),
+                    (target.position[2] ?? 0) - (held[2] ?? 0),
+                  );
+              }
+            }
           }
           const left = engine.scene?.tree.getNodesInGroup('wolf').length ?? -1;
           if (left !== 0) throw new Error(`${left} wolves survived`);
@@ -276,6 +318,14 @@ const ok = (label: string, cond: boolean): void => {
   });
 
   ok('QUEST: full loop (dialogue → grove → wolves → report back)', result.ok);
+  ok(
+    `QUEST: the first strike MOVED the wolf ${wolfKnock.toFixed(2)} m along the blow (Health.knockback)`,
+    wolfKnock > 0.12,
+  );
+  ok(
+    `QUEST: …and HELD it: ${wolfHeld.toFixed(2)} m walked in the 8 frames after (PathFollow staggered; free = 0.32 m)`,
+    wolfHeld >= 0 && wolfHeld < 0.05,
+  );
   for (const f of result.failures) console.error(`  ${f.label}: ${f.message}`);
 }