sci2-ts 0.2.2 → 0.4.0

package/lib/996.sc

@@ -3,8 +3,25 @@
 (script 996)
 (include "system.sh")
 
+;; How text boxes and menus look, for the whole game (the `textStyle` global): the font, the
+;; ink, paper and border colours, and a frame drawn around each box instead of the border.
+;; The game sets it in its init, after (super init:):
+;;   (textStyle font: 1 fore: 3 back: 12 frame: 260)
+;; A frame is a view whose loop 0 has eight cels, each anchored at its top-left corner: the
+;; corners (top-left, top-right, bottom-left, bottom-right), then the edges (top, bottom, left,
+;; right). The edges are tiled between the corners; transparent pixels show the paper.
+(class TextStyle of Obj
+  (properties
+    font 0
+    fore 0          ; ink
+    back 255        ; paper
+    border 0        ; a one-pixel border's colour; -1: none
+    frame -1        ; a frame view, or -1
+    margin 4))      ; between the text and the border or frame
+
 ;; A box of text over the room: drawn by the interpreter into a bitmap, shown as a screen
-;; item in the UI plane. Set text (and font, colours, width, x, y), then init.
+;; item in the UI plane. Set text (and width, x, y), then init; it's as tall as the text
+;; unless height is set. Font, colours and frame come from the textStyle unless set here.
 (class TextItem of Obj
   (properties
     x 0 y 0 z 0
@@ -14,36 +31,66 @@
     bitmap 0
     scaleSignal 0 scaleX 128 scaleY 128
     text 0
-    font 0
-    fore 0
-    back 255
+    font -1         ; -1 here and below: the textStyle's
+    fore -1
+    back -1
     skip 254
     mode 0          ; 0 left, 1 centred
-    borderColor 0
+    borderColor -2  ; -1: none
+    frame -2        ; -1: none
     textLeft 0 textTop 0 textRight -1 textBottom -1
     width 200
     height 0)
 
-  (method (init &tmp r)
-    ;; As tall as the text needs, with a 4-pixel margin inside the border.
-    (= r (Array ARRAY_NEW 4 0))
-    (TextSize r text font (- width 8))
-    (= height (+ (Array ARRAY_AT r 3) 9))
-    (Array ARRAY_FREE r)
-    (= textLeft 4)
-    (= textTop 4)
-    (= textRight (- width 5))
-    (= textBottom (- height 5))
+  (method (init &tmp r m padL padT padR padB)
+    (if (== font -1) (= font (textStyle font?)))
+    (if (== fore -1) (= fore (textStyle fore?)))
+    (if (== back -1) (= back (textStyle back?)))
+    (if (== frame -2) (= frame (textStyle frame?)))
+    (if (== borderColor -2) (= borderColor (if (!= frame -1) -1 else (textStyle border?))))
+    ;; As tall as the text needs, inside the margin and the frame.
+    (= m (textStyle margin?))
+    (= padL m) (= padT m) (= padR m) (= padB m)
+    (if (!= frame -1)
+      (+= padL (CelWide frame 0 6))
+      (+= padR (CelWide frame 0 7))
+      (+= padT (CelHigh frame 0 4))
+      (+= padB (CelHigh frame 0 5)))
+    (if (not height)
+      (= r (Array ARRAY_NEW 4 0))
+      (TextSize r text font (- width (+ padL padR)))
+      (= height (+ (Array ARRAY_AT r 3) 1 padT padB))
+      (Array ARRAY_FREE r))
+    (= textLeft padL)
+    (= textTop padT)
+    (= textRight (- width (+ padR 1)))
+    (= textBottom (- height (+ padB 1)))
     (= plane uiPlane)
     (= bitmap (CreateTextBitmap 0 width height self))
+    (if (!= frame -1) (self drawFrame:))
     (AddScreenItem self))
 
+  ;; The edges, tiled, then the corners over their ends.
+  (method (drawFrame &tmp i step)
+    (if (< (= step (CelWide frame 0 4)) 1) (= step 1))
+    (for ((= i (CelWide frame 0 0))) (< i width) ((+= i step))
+      (Bitmap BITMAP_DRAW_VIEW bitmap frame 0 4 i 0)
+      (Bitmap BITMAP_DRAW_VIEW bitmap frame 0 5 i (- height (CelHigh frame 0 5))))
+    (if (< (= step (CelHigh frame 0 6)) 1) (= step 1))
+    (for ((= i (CelHigh frame 0 0))) (< i height) ((+= i step))
+      (Bitmap BITMAP_DRAW_VIEW bitmap frame 0 6 0 i)
+      (Bitmap BITMAP_DRAW_VIEW bitmap frame 0 7 (- width (CelWide frame 0 7)) i))
+    (Bitmap BITMAP_DRAW_VIEW bitmap frame 0 0 0 0)
+    (Bitmap BITMAP_DRAW_VIEW bitmap frame 0 1 (- width (CelWide frame 0 1)) 0)
+    (Bitmap BITMAP_DRAW_VIEW bitmap frame 0 2 0 (- height (CelHigh frame 0 2)))
+    (Bitmap BITMAP_DRAW_VIEW bitmap frame 0 3 (- width (CelWide frame 0 3)) (- height (CelHigh frame 0 3))))
+
   (method (onMe theX theY)
     (return (and (>= theX x) (< theX (+ x width)) (>= theY y) (< theY (+ y height)))))
 
   (method (dispose)
     (DeleteScreenItem self)
-    (if bitmap (Bitmap 1 bitmap) (= bitmap 0))
+    (if bitmap (Bitmap BITMAP_DISPOSE bitmap) (= bitmap 0))
     (super dispose:)))
 
 ;; Shows a line until it's been there long enough to read, or the player clicks; then
@@ -53,7 +100,7 @@
     caller 0
     box 0
     until 0         ; the game time it goes
-    font 0
+    font -1         ; -1: the textStyle's
     x -1            ; -1: centred
     y 16
     width 220)
@@ -106,14 +153,16 @@
     (= line (String 11 "%s: %s" name txt))
     (super say: line &rest whoCares)))
 
-;; Someone with a portrait: a view whose loop 0 is the bust, loop 1 the mouth (moving while
-;; they talk) and loop 2 the eyes, every cel the same size and placed at one point (the
-;; bottom middle). The room's talker hands its parts to init: mouth bust eyes frame, where
-;; frame is drawn first (the bust). The text goes beside the portrait.
+;; Someone with a portrait: a view whose loop 0 is the bust, loop 1 the mouth and loop 2 the
+;; eyes, every cel the same size and anchored at its top-left corner. The room's talker hands
+;; its parts to init: mouth bust eyes frame, where frame is drawn first (the bust), placed
+;; where the portrait goes (the top left of the screen). The text goes to its right. While
+;; the line is said the mouth moves, then closes; the eyes blink.
 (class PortraitTalker of Talker
   (properties
     mouth 0 bust 0 eyes 0 frame 0
-    priority 150)
+    priority 150
+    mouthUntil 0)   ; the game time the mouth stops
 
   (method (init theMouth theBust theEyes theFrame)
     (= mouth theMouth)
@@ -125,15 +174,24 @@
     (self init:)
     (= portrait (if frame frame else bust))
     (if portrait
-      (= x (+ (portrait x?) (/ (CelWide (portrait view?) 0 0) 2) 6))
-      (= y (+ (- (portrait y?) (CelHigh (portrait view?) 0 0)) 1))
-      (= width (- (- SCREEN_WIDTH x) 8)))
+      (= x (+ (portrait x?) (CelWide (portrait view?) (portrait loop?) (portrait cel?)) 6))
+      (= y (portrait y?))
+      (= width (- SCREEN_WIDTH (+ x 6))))
     (super say: txt &rest whoCares)
     (self showPart: frame priority)
     (self showPart: bust priority)
     (self showPart: eyes (+ priority 1))
     (self showPart: mouth (+ priority 1))
-    (if mouth (mouth setCycle: Forward)))
+    (if eyes (eyes setCycle: Blink))
+    (if mouth
+      (mouth setCycle: Forward)
+      ;; About as long as it takes to say: half a second, and two cycles a letter.
+      (= mouthUntil (+ gameTime 30 (* 2 (String STRING_LENGTH txt))))))
+
+  (method (doit)
+    (if (and mouth (mouth cycler?) (>= gameTime mouthUntil))
+      (mouth setCycle: 0 setCel: 0))
+    (super doit:))
 
   (method (showPart part pri)
     (if part
@@ -232,6 +290,10 @@
       (c choose: v))
     (return TRUE))
 
+  ;; Closed without a choice.
+  (method (dismiss)
+    (self dispose:))
+
   (method (dispose)
     (if (== dialog self) (= dialog 0))
     (if items

package/lib/997.sc

@@ -169,6 +169,32 @@
      else
       (client cel: c))))
 
+;; Eyes: cel 0 (open) most of the time; every two or three seconds, the other cels in turn
+;; (shut) and back to 0.
+(class Blink of Cycle
+  (properties
+    nextBlink 0)
+
+  (method (init who)
+    (super init: who)
+    (self rest:))
+
+  (method (rest)
+    (= nextBlink (+ gameTime 90 (Random 0 90))))
+
+  (method (doit &tmp c)
+    (if (== (client cel?) 0)
+      (if (and (>= gameTime nextBlink) (> (self lastCel:) 0))
+        (= cycleCnt gameTime)
+        (client cel: 1))
+     else
+      (= c (self nextCel:))
+      (if (> c (self lastCel:))
+        (client cel: 0)
+        (self rest:)
+       else
+        (client cel: c)))))
+
 ;; Sizes its client by how far up the screen it stands: frontSize percent at frontY,
 ;; backSize at backY, in between in proportion.
 (class Scaler of Obj

package/lib/998.sc

@@ -20,7 +20,8 @@
 ;; The game: sets everything up, then runs one cycle after another until `quit`.
 (class Game of Obj
   (properties
-    script 0)
+    script 0
+    saver 0)        ; the SaveRestore behind the game menu
 
   (method (init)
     (= game self)
@@ -30,6 +31,8 @@
     (= theEvent (Event new:))
     (= messager (Messager new:))
     (= narrator (Narrator new:))
+    (= textStyle (TextStyle new:))
+    (= inventory (Inventory new:))
     (= music (Sound new:))
     (= sfx (Sound new:))
     (= uiPlane ((Plane new:) priority: 200 picture: -2 yourself:))
@@ -42,6 +45,38 @@
     (while (not quit)
       (self doit:)))
 
+  ;; After a restore (RestoreGame), the interpreter starts the game here, not at play: the
+  ;; game is as it was saved, but nothing is on screen and nothing is playing. Put the
+  ;; planes and the cast back and start looping sounds again, then carry on.
+  (method (replay)
+    (uiPlane init:)
+    (if curRoom ((curRoom plane?) init:))
+    (cast eachElementDo: #replay)
+    (sounds eachElementDo: #replay)
+    (user cursor: -1)
+    (while (not quit)
+      (self doit:)))
+
+  ;; The game menu (Escape): save, restore, start again.
+  (method (showMenu)
+    (self clearText:)
+    ((self saveRestore:) showMenu:))
+
+  (method (save)
+    ((self saveRestore:) save:))
+
+  (method (restore)
+    ((self saveRestore:) restore:))
+
+  (method (saveRestore)
+    (if (not saver) (= saver (SaveRestore new:)))
+    (return saver))
+
+  ;; Takes down a line being shown and whatever is open (a menu, the inventory, a close-up).
+  (method (clearText)
+    (if talking (talking clear:))
+    (if dialog (dialog dismiss:)))
+
   ;; One cycle: scripts, the room, everything on screen, text, drawing, then input.
   (method (doit)
     (++ gameTime)
@@ -57,8 +92,7 @@
   ;; Leaves the current room for room n (its script's export 0).
   (method (newRoom n &tmp old)
     (= newRoomNum 0)
-    (if talking (talking clear:))
-    (if dialog (dialog dispose:))
+    (self clearText:)
     (if curRoom
       (= old curRoomNum)
       (curRoom dispose:)
@@ -77,10 +111,10 @@
 
   ;; Clicks do nothing (but dismiss text) until handsOn: for cutscenes.
   (method (handsOff)
-    (user canInput: FALSE))
+    (user canInput: FALSE showCursor:))
 
   (method (handsOn)
-    (user canInput: TRUE)))
+    (user canInput: TRUE showCursor:)))
 
 ;; A room: its picture, where you can walk, its exits, and what's said about it.
 (class Room of Obj
@@ -237,6 +271,10 @@
   (method (roomDisposed)
     (self dispose:))
 
+  ;; Back on screen after a restore.
+  (method (replay)
+    (if (not (& signal SIG_HIDDEN)) (AddScreenItem self)))
+
   (method (dispose)
     (if (not (& signal SIG_HIDDEN)) (DeleteScreenItem self))
     (cast delete: self)

package/lib/999.sc

@@ -27,7 +27,10 @@
   uiPlane       ; the plane over the room, for text
   gameTime      ; cycles since the game started
   quit          ; set to end the game
-  [gameFlags 64]) ; story flags, a bit each
+  [gameFlags 64]  ; story flags, a bit each
+  textStyle       ; how text boxes and menus look (a TextStyle)
+  inventory       ; what the hero carries (an Inventory)
+  theItem)        ; the item picked to use, or 0
 
 (procedure (SetFlag n)
   (|= [gameFlags (/ n 16)] (<< 1 (mod n 16))))

package/lib/resources.js

@@ -1,9 +1,10 @@
 import { Colour, ResourceType, writeView } from "../tools/game/kit.js";
 /**
- * The class library's own resources: a cursor for each verb, view CURSOR_BASE + verb
- * (system.sh). X is black, W white, . transparent.
+ * The class library's own resources: a cursor for each verb, view CURSOR_BASE + verb, and
+ * one while the player waits, CURSOR_WAIT (system.sh). X is black, W white, . transparent.
  */
 const CURSOR_BASE = 990;
+const CURSOR_WAIT = 995;
 const CURSORS = {
     // V_LOOK: an eye.
     1: {
@@ -70,6 +71,22 @@ const CURSORS = {
             "...XXXXXX..",
         ],
     },
+    // Waiting: an hourglass.
+    [CURSOR_WAIT - CURSOR_BASE]: {
+        hotspot: "centre",
+        art: [
+            "XXXXXXXXX",
+            "XWWWWWWWX",
+            ".XWWWWWX.",
+            "..XWWWX..",
+            "...XWX...",
+            "...XWX...",
+            "..XWWWX..",
+            ".XWWWWWX.",
+            "XWWWWWWWX",
+            "XXXXXXXXX",
+        ],
+    },
 };
 function cursor(art, hotspot) {
     const width = art[0].length, height = art.length;
@@ -79,6 +96,19 @@ function cursor(art, hotspot) {
     const cel = { width, height, displaceX: (width >> 1) - hx, displaceY: height - 1 - hy, skipColor: Colour.Transparent, pixels };
     return writeView({ flags: 1, loops: [{ link: -1, mirror: false, cels: [cel] }], palette: undefined });
 }
+/**
+ * What a close-up dims the room with (CLOSE_UP_SHADE): the whole screen in colour 253, which
+ * CloseUp makes a remap colour that darkens what's under it.
+ */
+const CLOSE_UP_SHADE = 996;
+function shade() {
+    const [width, height] = [320, 200];
+    const cel = { width, height, displaceX: width >> 1, displaceY: height - 1, skipColor: Colour.Transparent, pixels: new Uint8Array(width * height).fill(253) };
+    return writeView({ flags: 1, loops: [{ link: -1, mirror: false, cels: [cel] }], palette: undefined });
+}
 export default function resources() {
-    return Object.entries(CURSORS).map(([verb, c]) => ({ type: ResourceType.View, number: CURSOR_BASE + Number(verb), data: cursor(c.art, c.hotspot) }));
+    return [
+        ...Object.entries(CURSORS).map(([verb, c]) => ({ type: ResourceType.View, number: CURSOR_BASE + Number(verb), data: cursor(c.art, c.hotspot) })),
+        { type: ResourceType.View, number: CLOSE_UP_SHADE, data: shade() },
+    ];
 }

package/lib/resources.ts

@@ -1,10 +1,11 @@
 import { Colour, ResourceType, writeView, type ResourceData } from "../tools/game/kit.ts";
 
 /**
- * The class library's own resources: a cursor for each verb, view CURSOR_BASE + verb
- * (system.sh). X is black, W white, . transparent.
+ * The class library's own resources: a cursor for each verb, view CURSOR_BASE + verb, and
+ * one while the player waits, CURSOR_WAIT (system.sh). X is black, W white, . transparent.
  */
 const CURSOR_BASE = 990;
+const CURSOR_WAIT = 995;
 
 const CURSORS: Record<number, { art: string[]; hotspot: "tip" | "centre" }> = {
   // V_LOOK: an eye.
@@ -72,6 +73,22 @@ const CURSORS: Record<number, { art: string[]; hotspot: "tip" | "centre" }> = {
       "...XXXXXX..",
     ],
   },
+  // Waiting: an hourglass.
+  [CURSOR_WAIT - CURSOR_BASE]: {
+    hotspot: "centre",
+    art: [
+      "XXXXXXXXX",
+      "XWWWWWWWX",
+      ".XWWWWWX.",
+      "..XWWWX..",
+      "...XWX...",
+      "...XWX...",
+      "..XWWWX..",
+      ".XWWWWWX.",
+      "XWWWWWWWX",
+      "XXXXXXXXX",
+    ],
+  },
 };
 
 function cursor(art: string[], hotspot: "tip" | "centre") {
@@ -83,6 +100,20 @@ function cursor(art: string[], hotspot: "tip" | "centre") {
   return writeView({ flags: 1, loops: [{ link: -1, mirror: false, cels: [cel] }], palette: undefined });
 }
 
+/**
+ * What a close-up dims the room with (CLOSE_UP_SHADE): the whole screen in colour 253, which
+ * CloseUp makes a remap colour that darkens what's under it.
+ */
+const CLOSE_UP_SHADE = 996;
+function shade() {
+  const [width, height] = [320, 200];
+  const cel = { width, height, displaceX: width >> 1, displaceY: height - 1, skipColor: Colour.Transparent, pixels: new Uint8Array(width * height).fill(253) };
+  return writeView({ flags: 1, loops: [{ link: -1, mirror: false, cels: [cel] }], palette: undefined });
+}
+
 export default function resources(): ResourceData[] {
-  return Object.entries(CURSORS).map(([verb, c]) => ({ type: ResourceType.View, number: CURSOR_BASE + Number(verb), data: cursor(c.art, c.hotspot) }));
+  return [
+    ...Object.entries(CURSORS).map(([verb, c]) => ({ type: ResourceType.View, number: CURSOR_BASE + Number(verb), data: cursor(c.art, c.hotspot) })),
+    { type: ResourceType.View, number: CLOSE_UP_SHADE, data: shade() },
+  ];
 }

package/lib/system.sh

@@ -8,15 +8,46 @@
   V_WALK
   V_DO)
 (define VERB_COUNT 4)
+(define V_ITEM 5)                   ; using the item picked in the inventory (theItem)
 
-;; Cursors: one view per verb, CURSOR_BASE + verb.
+;; Cursors: the library's are views CURSOR_BASE + verb, and CURSOR_WAIT while the player
+;; can't act (a game can bring its own: User).
 (define CURSOR_BASE 990)
+(define CURSOR_WAIT 995)
+
+;; The inventory window: icons are INV_ICON pixels square, INV_GAP apart.
+(define INV_ICON 24)
+(define INV_GAP 4)
+
+;; Close-ups: the room is dimmed by this view, drawn in a remap colour.
+(define CLOSE_UP_SHADE 996)
+(define REMAP_OFF 0)
+(define REMAP_BY_PERCENT 2)
+
+;; Saved games: a description is up to SAVE_DESCRIPTION - 1 characters; the menus show the
+;; newest SAVES_SHOWN. What SaveRestore's open menu is for:
+(define SAVE_DESCRIPTION 36)
+(define SAVES_SHOWN 8)
+(define SR_MENU 1)
+(define SR_SAVE 2)
+(define SR_RESTORE 3)
+(define SR_RESTART 4)
+(define SR_NAME 5)
 
 ;; Event types, as GetEvent reports them.
 (define EV_NULL 0)
 (define EV_MOUSE_DOWN 1)
 (define EV_MOUSE_UP 2)
 (define EV_KEY_DOWN 4)
+
+;; Keys (an event's message).
+(define KEY_TAB 9)
+(define KEY_ENTER 13)
+(define KEY_ESCAPE 27)
+(define KEY_F5 $3f00)
+(define KEY_F7 $4100)
+(define KEY_I 73)
+(define KEY_i 105)
 (define EV_ALL $7fff)
 ;; The right button arrives as a click with shift held.
 (define MOD_RIGHT 3)
@@ -36,6 +67,12 @@
 (define ARRAY_AT_PUT 3)
 (define ARRAY_FREE 4)
 (define STRING_LENGTH 10)
+(define STRING_FORMAT_INTO 12)
+(define ARRAY_COPY 6)
+
+;; Bitmap subfunctions.
+(define BITMAP_DISPOSE 1)
+(define BITMAP_DRAW_VIEW 3)
 
 ;; DoSound kernel calls.
 (define SND_INIT 6)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sci2-ts",
-  "version": "0.2.2",
+  "version": "0.4.0",
   "description": "An SCI2 adventure game engine in TypeScript, and the tools to make games with it",
   "license": "MIT",
   "type": "module",

package/packages/content/src/room.js

@@ -537,11 +537,23 @@ class RoomCompiler {
                     ? [{ op: "async", code: send({ global: g.sound }, [["number", [n]], ["loop", [1]], ["play", ["self"]]]) }]
                     : [{ op: "code", code: send({ global: g.sound }, [["number", [n]], ["loop", [1]], ["play", []]]) }];
             }
+            case "closeup": {
+                if (args.length < 1 || args.length > 3)
+                    fail("expected <<closeup view [loop [cel]]>>");
+                if (!this.target.closeUp)
+                    fail("this game has no close-ups");
+                const [view, loop = "0", cel = "0"] = args;
+                // A new close-up, shown until the player clicks; then it cues the script.
+                return [{ op: "async", code: [
+                            ...send({ cls: this.target.closeUp }, [["new", []]]),
+                            "pushi #show", "pushi 4", ...pushVal(int(view, "view", 0, 65535)), ...pushVal(int(loop, "loop", 0, 255)), ...pushVal(int(cel, "cel", 0, 255)), "pushSelf", "send 12",
+                        ] }];
+            }
             case "room":
                 arity(1, "number");
                 return [{ op: "code", code: send({ global: g.curRoom }, [["newRoom", [int(args[0], "room", 0, 65535)]]]) }];
             default:
-                return fail("unknown command (known: walk, face, wait, hide, show, loop, cel, animate, stop, music, sound, room; and set, if)");
+                return fail("unknown command (known: walk, face, wait, hide, show, loop, cel, animate, stop, music, sound, closeup, room; and set, if)");
         }
     }
     /** Loop music n, unless it's what's playing already. */

package/packages/content/src/room.ts

@@ -636,11 +636,21 @@ class RoomCompiler {
           ? [{ op: "async", code: send({ global: g.sound }, [["number", [n]], ["loop", [1]], ["play", ["self"]]]) }]
           : [{ op: "code", code: send({ global: g.sound }, [["number", [n]], ["loop", [1]], ["play", []]]) }];
       }
+      case "closeup": {
+        if (args.length < 1 || args.length > 3) fail("expected <<closeup view [loop [cel]]>>");
+        if (!this.target.closeUp) fail("this game has no close-ups");
+        const [view, loop = "0", cel = "0"] = args;
+        // A new close-up, shown until the player clicks; then it cues the script.
+        return [{ op: "async", code: [
+          ...send({ cls: this.target.closeUp! }, [["new", []]]),
+          "pushi #show", "pushi 4", ...pushVal(int(view, "view", 0, 65535)), ...pushVal(int(loop, "loop", 0, 255)), ...pushVal(int(cel, "cel", 0, 255)), "pushSelf", "send 12",
+        ] }];
+      }
       case "room":
         arity(1, "number");
         return [{ op: "code", code: send({ global: g.curRoom }, [["newRoom", [int(args[0], "room", 0, 65535)]]]) }];
       default:
-        return fail("unknown command (known: walk, face, wait, hide, show, loop, cel, animate, stop, music, sound, room; and set, if)");
+        return fail("unknown command (known: walk, face, wait, hide, show, loop, cel, animate, stop, music, sound, closeup, room; and set, if)");
     }
   }
 

package/packages/content/src/target.d.ts

@@ -59,6 +59,11 @@ export interface Target {
     };
     /** The class that cycles a prop's cels forever (<<animate x forever>>, cycle: forward). */
     forwardCycle: string;
+    /**
+     * Close-ups (<<closeup view [loop [cel]]>>), if the target has them: a class whose new
+     * instance takes `show: view loop cel caller` and cues the caller when it's dismissed.
+     */
+    closeUp?: string;
     /** Verb number for "said on arrival" messages. */
     narrationVerb: number;
     /** Verb names as used in Yarn node titles (lower case) -> verb numbers. */

package/packages/content/src/target.ts

@@ -46,6 +46,11 @@ export interface Target {
   teller: { class: string; props: Record<string, number>; verb: number };
   /** The class that cycles a prop's cels forever (<<animate x forever>>, cycle: forward). */
   forwardCycle: string;
+  /**
+   * Close-ups (<<closeup view [loop [cel]]>>), if the target has them: a class whose new
+   * instance takes `show: view loop cel caller` and cues the caller when it's dismissed.
+   */
+  closeUp?: string;
   /** Verb number for "said on arrival" messages. */
   narrationVerb: number;
   /** Verb names as used in Yarn node titles (lower case) -> verb numbers. */

package/packages/sci/src/vm/kernels/index.d.ts

@@ -3,6 +3,6 @@ export { graphics, Graphics, type Frame, SCREEN_WIDTH, SCREEN_HEIGHT, ShowStyle,
 export { input, Input, EventType, SciKey, hostFiles, type SciEvent } from "./system.ts";
 export { audio, AudioState, readingTime } from "./audio.ts";
 export { paletteEffects, PaletteEffects } from "./palette.ts";
-export { saves, restoreGame, MemorySaveStore, type SaveStore, type SaveInfo } from "./saves.ts";
+export { saves, restoreGame, scriptsFingerprint, MemorySaveStore, type SaveStore, type SaveInfo } from "./saves.ts";
 export declare const allKernels: Record<string, KernelFn>;
 export { stringHelpers } from "./arrays.ts";

package/packages/sci/src/vm/kernels/index.js

@@ -12,7 +12,7 @@ export { graphics, Graphics, SCREEN_WIDTH, SCREEN_HEIGHT, ShowStyle, frameRgb }
 export { input, Input, EventType, SciKey, hostFiles } from "./system.js";
 export { audio, AudioState, readingTime } from "./audio.js";
 export { paletteEffects, PaletteEffects } from "./palette.js";
-export { saves, restoreGame, MemorySaveStore } from "./saves.js";
+export { saves, restoreGame, scriptsFingerprint, MemorySaveStore } from "./saves.js";
 export const allKernels = {
     ...coreKernels,
     ...mathKernels,

package/packages/sci/src/vm/kernels/index.ts

@@ -14,7 +14,7 @@ export { graphics, Graphics, type Frame, SCREEN_WIDTH, SCREEN_HEIGHT, ShowStyle,
 export { input, Input, EventType, SciKey, hostFiles, type SciEvent } from "./system.ts";
 export { audio, AudioState, readingTime } from "./audio.ts";
 export { paletteEffects, PaletteEffects } from "./palette.ts";
-export { saves, restoreGame, MemorySaveStore, type SaveStore, type SaveInfo } from "./saves.ts";
+export { saves, restoreGame, scriptsFingerprint, MemorySaveStore, type SaveStore, type SaveInfo } from "./saves.ts";
 
 export const allKernels: Record<string, KernelFn> = {
   ...coreKernels,

package/packages/sci/src/vm/kernels/saves.d.ts

@@ -5,6 +5,11 @@ export interface SaveInfo {
     description: string;
     version: string;
     date: number;
+    /**
+     * The scripts it was made with (scriptsFingerprint). A save is a snapshot of running
+     * scripts, so it only restores into the same ones; saves from before this was kept have none.
+     */
+    scripts?: string;
 }
 /** Where saves live. Synchronous because kernels are; hosts preload and write through. */
 export interface SaveStore {
@@ -32,7 +37,10 @@ export declare class MemorySaveStore implements SaveStore {
 declare class SaveState {
     store: SaveStore;
     restarting: number;
+    fingerprint: string | undefined;
 }
+/** A hash (FNV-1a) of every script and heap resource: which scripts a save belongs to. */
+export declare function scriptsFingerprint(vm: Vm): string;
 export declare const saves: (vm: Vm) => SaveState;
 /**
  * Loads a saved game the way SSCI's RestoreGame does: host state (planes, screen items,