@adatechnology/game-fluids 0.3.6 → 0.4.1

package/dist/index.d.ts

@@ -194,6 +194,7 @@ type FluidEvent = {
     thirst: number;
     effects: string[];
     burn: boolean;
+    eaten?: boolean;
 } | {
     type: 'empty';
     container: string;
@@ -267,7 +268,10 @@ interface FluidWorld {
     /** Pour on purpose for `dt` seconds (tilts the flow out of the opening even when not tilted far). Returns litres out. */
     pour(id: string, dt: number, into?: string): number;
     /** Drink `liters` (sip ~0.03 l); returns the drink event or null when empty/closed. Too hot (> 65 °C) sets `burn`. */
-    drink(id: string, liters: number): Extract<FluidEvent, {
+    /** Takes `liters` out of an open container into the mouth. `eaten`: it is the liquid packed with food, eaten with it (no drinking effects). */
+    drink(id: string, liters: number, options?: {
+        eaten?: boolean;
+    }): Extract<FluidEvent, {
         type: 'drink';
     }> | null;
     /** Punch a hole (local space) — call it from a damage model's `hole`/`leak` events. */
@@ -322,7 +326,8 @@ declare function createFluids(options?: FluidOptions): FluidWorld;
  */
 declare const LIQUIDS: LiquidDef[];
 
-/** Built-in scripted uses of a held item (data in `data/item-uses.json`): `sip`, `drink`, `chug`, `pour`, `pour_out`, `open`, `close`. */
+/** Built-in scripted uses of a held item (data in `data/item-uses.json`): `sip`, `drink`, `chug`, `eat` (spoonfuls from an open tin), `pour`, `pour_out`, `open`, `close`,
+ * `unscrew` (the other hand turns a screw cap off, `turn` keys, before the `open` key). */
 declare const ITEM_USES: ItemUseDef[];
 /** World transform of the hand (or any holder) the item pose is relative to. */
 type HandTransform = () => {
@@ -330,7 +335,7 @@ type HandTransform = () => {
     rotation: Quat;
 };
 /**
- * Plays an item use on a container: interpolates the keys, applies `drink` (rate × dt litres) and `pour` (`world.pour`, `rate` multiplies the
+ * Plays an item use on a container: interpolates the keys, applies `drink` and `eat` (rate × dt litres) and `pour` (`world.pour`, `rate` multiplies the
  * time) while the current key has that action, and fires `open` / `close` once when their key is reached. When `getHandTransform` is given, the
  * container's world transform follows hand ∘ pose every update; otherwise the host animates the viewmodel from `pose()`.
  */

package/dist/index.global.js

@@ -1522,7 +1522,7 @@ var GameFluids = (() => {
         settle(c);
         return out;
       },
-      drink(id, liters) {
+      drink(id, liters, options2) {
         const c = containers.get(id);
         const def = c ? defOf(c) : null;
         if (!c || !def || c.closed || c.liters <= 1e-6 || !(liters > 0)) return null;
@@ -1535,8 +1535,9 @@ var GameFluids = (() => {
           liters: amount,
           temperature: c.temperature,
           thirst: (def.drink?.thirst ?? 0) * amount,
-          effects: [...def.drink?.effects ?? []],
-          burn: c.temperature > 65
+          effects: options2?.eaten ? [] : [...def.drink?.effects ?? []],
+          burn: c.temperature > 65,
+          ...options2?.eaten ? { eaten: true } : {}
         };
         emit(event);
         refreshLevel(c);
@@ -1884,6 +1885,128 @@ var GameFluids = (() => {
         }
       ]
     },
+    {
+      id: "eat",
+      duration: 3.6,
+      keys: [
+        {
+          t: 0,
+          position: [
+            0.22,
+            -0.2,
+            -0.4
+          ],
+          rotation: [
+            0,
+            0,
+            0
+          ],
+          action: "none"
+        },
+        {
+          t: 0.4,
+          position: [
+            0.04,
+            -0.12,
+            -0.28
+          ],
+          rotation: [
+            -0.35,
+            0,
+            0
+          ],
+          action: "none"
+        },
+        {
+          t: 0.6,
+          position: [
+            0.04,
+            -0.1,
+            -0.26
+          ],
+          rotation: [
+            -0.45,
+            0,
+            0
+          ],
+          action: "eat",
+          rate: 0.06
+        },
+        {
+          t: 1.3,
+          position: [
+            0.04,
+            -0.12,
+            -0.28
+          ],
+          rotation: [
+            -0.35,
+            0,
+            0
+          ],
+          action: "eat",
+          rate: 0.06
+        },
+        {
+          t: 2,
+          position: [
+            0.04,
+            -0.1,
+            -0.26
+          ],
+          rotation: [
+            -0.45,
+            0,
+            0
+          ],
+          action: "eat",
+          rate: 0.06
+        },
+        {
+          t: 2.7,
+          position: [
+            0.04,
+            -0.12,
+            -0.28
+          ],
+          rotation: [
+            -0.35,
+            0,
+            0
+          ],
+          action: "eat",
+          rate: 0.06
+        },
+        {
+          t: 3.1,
+          position: [
+            0.04,
+            -0.12,
+            -0.28
+          ],
+          rotation: [
+            -0.35,
+            0,
+            0
+          ],
+          action: "none"
+        },
+        {
+          t: 3.6,
+          position: [
+            0.22,
+            -0.2,
+            -0.4
+          ],
+          rotation: [
+            0,
+            0,
+            0
+          ],
+          action: "none"
+        }
+      ]
+    },
     {
       id: "pour",
       duration: 3,
@@ -2161,6 +2284,82 @@ var GameFluids = (() => {
           action: "none"
         }
       ]
+    },
+    {
+      id: "unscrew",
+      duration: 2.6,
+      keys: [
+        {
+          t: 0,
+          position: [
+            0.22,
+            -0.2,
+            -0.4
+          ],
+          rotation: [
+            0,
+            0,
+            0
+          ],
+          action: "none"
+        },
+        {
+          t: 0.35,
+          position: [
+            0.06,
+            -0.09,
+            -0.34
+          ],
+          rotation: [
+            0,
+            0,
+            0
+          ],
+          action: "turn"
+        },
+        {
+          t: 1.95,
+          position: [
+            0.06,
+            -0.09,
+            -0.34
+          ],
+          rotation: [
+            0,
+            0,
+            0
+          ],
+          action: "none"
+        },
+        {
+          t: 2.2,
+          position: [
+            0.06,
+            -0.09,
+            -0.34
+          ],
+          rotation: [
+            0,
+            0,
+            0
+          ],
+          action: "open"
+        },
+        {
+          t: 2.6,
+          position: [
+            0.22,
+            -0.2,
+            -0.4
+          ],
+          rotation: [
+            0,
+            0,
+            0
+          ],
+          action: "none"
+        }
+      ]
     }
   ];
 
@@ -2233,8 +2432,8 @@ var GameFluids = (() => {
             }
             const overlap = Math.min(end, spanEnd) - Math.max(start, spanStart);
             if (overlap <= 0) continue;
-            if (key.action === "drink") {
-              const ev = world.drink(containerId, (key.rate ?? DEFAULT_DRINK_RATE) * overlap);
+            if (key.action === "drink" || key.action === "eat") {
+              const ev = world.drink(containerId, (key.rate ?? DEFAULT_DRINK_RATE) * overlap, key.action === "eat" ? { eaten: true } : void 0);
               const left = world.container(containerId);
               if (!ev || !left || left.liters <= 1e-6) {
                 time = def.duration;