sci2-ts 0.8.0 → 0.8.2

package/CHANGELOG.md

@@ -4,6 +4,22 @@ All notable changes to this project. Versions follow [Semantic Versioning](https
 and the entries are generated from commit messages
 ([Conventional Commits](https://www.conventionalcommits.org/)) when a release is made.
 
+## [0.8.2](https://github.com/rlueder/sci-ts/compare/v0.8.1...v0.8.2) (2026-10-02)
+
+### Fixed
+
+* **lib:** actors walk past each other and are clicked only where they're drawn ([#10](https://github.com/rlueder/sci-ts/issues/10)) ([99deb4a](https://github.com/rlueder/sci-ts/commit/99deb4a1e63bb5170ab0742942041ce3fde1801d))
+
+## [0.8.1](https://github.com/rlueder/sci-ts/compare/v0.8.0...v0.8.1) (2026-10-02)
+
+### Fixed
+
+* timers past 32767 cycles, waits on missing sounds, methods hidden by properties ([#9](https://github.com/rlueder/sci-ts/issues/9)) ([7ec09d7](https://github.com/rlueder/sci-ts/commit/7ec09d765ab2818cf0171d5e96d9fa1b6744b576))
+
+### Documentation
+
+* AGENTS.md for people and agents working here ([#8](https://github.com/rlueder/sci-ts/issues/8)) ([42bec1f](https://github.com/rlueder/sci-ts/commit/42bec1fafbb2798b26539923608882fef0c5118d))
+
 ## [0.8.0](https://github.com/rlueder/sci-ts/compare/v0.7.0...v0.8.0) (2026-10-02)
 
 ### Added

package/lib/996.sc

@@ -100,7 +100,8 @@
   (properties
     caller 0
     box 0
-    until 0         ; the game time it goes
+    shownAt 0       ; the game time it went up
+    readFor 0       ; how long it stays (-1: until dismissed)
     font -1         ; -1: the textStyle's
     x -1            ; -1: centred
     y 16
@@ -120,19 +121,21 @@
         yourself:))
     (box init:)
     (= talking self)
-    (= until (self readingTime: (String STRING_LENGTH txt))))
+    (= shownAt gameTime)
+    (= readFor (self readingTime: (String STRING_LENGTH txt))))
 
-  ;; Game time to read a line of n characters: normally two seconds, and more for longer
-  ;; lines; -1 is until the player dismisses it.
+  ;; Cycles to read a line of n characters: normally two seconds, and more for longer lines;
+  ;; -1 is until the player dismisses it.
   (method (readingTime n)
     (switch textSpeed
-      (TEXT_SLOW (return (+ gameTime 180 (* 5 n))))
-      (TEXT_FAST (return (+ gameTime 70 (* 2 n))))
+      (TEXT_SLOW (return (+ 180 (* 5 n))))
+      (TEXT_FAST (return (+ 70 (* 2 n))))
       (TEXT_CLICK (return -1))
-      (else (return (+ gameTime 120 (* 3 n))))))
+      (else (return (+ 120 (* 3 n))))))
 
+  ;; Time is measured as cycles since, which stays right when gameTime wraps past 32767.
   (method (doit)
-    (if (and box (!= until -1) (>= gameTime until)) (self done:)))
+    (if (and box (!= readFor -1) (>= (- gameTime shownAt) readFor)) (self done:)))
 
   ;; A click, Enter, Space or "." while a line is up dismisses it (and nothing else).
   (method (handleEvent event)
@@ -174,7 +177,7 @@
   (properties
     mouth 0 bust 0 eyes 0 frame 0
     priority 150
-    mouthUntil 0)   ; the game time the mouth stops
+    mouthFor 0)     ; cycles the mouth moves for
 
   (method (init theMouth theBust theEyes theFrame)
     (= mouth theMouth)
@@ -198,10 +201,10 @@
     (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))))))
+      (= mouthFor (+ 30 (* 2 (String STRING_LENGTH txt))))))
 
   (method (doit)
-    (if (and mouth (mouth cycler?) (>= gameTime mouthUntil))
+    (if (and mouth (mouth cycler?) (>= (- gameTime shownAt) mouthFor))
       (mouth setCycle: 0 setCel: 0))
     (super doit:))
 

package/lib/997.sc

@@ -173,18 +173,20 @@
 ;; (shut) and back to 0.
 (class Blink of Cycle
   (properties
-    nextBlink 0)
+    restSince 0
+    restFor 0)
 
   (method (init who)
     (super init: who)
     (self rest:))
 
   (method (rest)
-    (= nextBlink (+ gameTime 90 (Random 0 90))))
+    (= restSince gameTime)
+    (= restFor (+ 90 (Random 0 90))))
 
   (method (doit &tmp c)
     (if (== (client cel?) 0)
-      (if (and (>= gameTime nextBlink) (> (self lastCel:) 0))
+      (if (and (>= (- gameTime restSince) restFor) (> (self lastCel:) 0))
         (= cycleCnt gameTime)
         (client cel: 1))
      else

package/lib/998.sc

@@ -208,10 +208,13 @@
       (curRoom doVerb: verb))))
 
 ;; A Feature drawn with a view: a screen item in the room's plane. One that's only there to
-;; look at (rain on a window, a sky) has clickable 0, and clicks go to what's behind it.
+;; look at (rain on a window, a sky) has clickable 0, and clicks go to what's behind it. With
+;; checkPixels, it's hit only where it's drawn, not anywhere in its cel (Actors: people are
+;; often drawn on canvases much wider than they are).
 (class View of Feature
   (properties
     clickable 1
+    checkPixels 0
     view -1 loop 0 cel 0
     z 0
     priority 0 fixPriority 0
@@ -232,7 +235,7 @@
     (if (not (& signal SIG_HIDDEN)) (UpdateScreenItem self)))
 
   (method (onMe theX theY)
-    (return (and clickable (not (& signal SIG_HIDDEN)) (IsOnMe theX theY self))))
+    (return (and clickable (not (& signal SIG_HIDDEN)) (IsOnMe theX theY self checkPixels))))
 
   (method (hide)
     (|= signal SIG_HIDDEN)
@@ -315,9 +318,13 @@
     (if script (script dispose:))
     (super dispose:)))
 
-;; A Prop that moves (a mover), facing where it goes.
+;; A Prop that moves (a mover), facing where it goes. Actors walk through each other unless
+;; ignoreActors is 0: the interpreter measures an actor by its whole cel, and characters are
+;; often drawn on canvases much wider than they are, so blocking would stop them far apart.
 (class Actor of Prop
   (properties
+    ignoreActors 1
+    checkPixels 1
     mover 0
     moveSpeed 2     ; cycles between steps
     heading 0
@@ -359,6 +366,7 @@
 
   ;; Whether another actor is in the way (DoBresen asks).
   (method (cantBeHere)
+    (if ignoreActors (return 0))
     (return (CantBeHere self (cast elements?))))
 
   (method (dispose)

package/package.json

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

package/packages/sci/src/script/compiler.js

@@ -95,6 +95,27 @@ export function compileScripts(sources, ctx) {
                     defined.add(m.name);
             }
         }
+        // A method named like a property of its object: `x:` sets the property and the method
+        // never runs.
+        const propertiesOf = (name, seen = new Set()) => {
+            if (!name || seen.has(name))
+                return new Set(OBJECT_HEADER);
+            seen.add(name);
+            const c = classes.get(name);
+            if (c)
+                return new Set([...c.obj.props.map((p) => p.name), ...propertiesOf(c.obj.superName, seen)]);
+            return new Set([...OBJECT_HEADER, ...(ctx.externalClass?.(name)?.properties.map((p) => p.name) ?? [])]);
+        };
+        for (const u of units) {
+            for (const o of u.objects) {
+                const props = new Set([...o.props.map((p) => p.name), ...propertiesOf(o.superName)]);
+                for (const m of o.methods) {
+                    if (!props.has(m.name))
+                        continue;
+                    ctx.onWarning({ message: `method ${m.name}: ${o.name} has a property called ${m.name}, so ${m.name}: sets it and this never runs`, file: u.file, line: m.line });
+                }
+            }
+        }
         const reported = new Set();
         for (const s of project.sent) {
             if (defined.has(s.name) || reported.has(s.name))

package/packages/sci/src/script/compiler.ts

@@ -195,6 +195,24 @@ export function compileScripts(sources: readonly CompileSource[], ctx: CompileCo
         for (const m of o.methods) defined.add(m.name);
       }
     }
+    // A method named like a property of its object: `x:` sets the property and the method
+    // never runs.
+    const propertiesOf = (name: string | undefined, seen = new Set<string>()): Set<string> => {
+      if (!name || seen.has(name)) return new Set(OBJECT_HEADER);
+      seen.add(name);
+      const c = classes.get(name);
+      if (c) return new Set([...c.obj.props.map((p) => p.name), ...propertiesOf(c.obj.superName, seen)]);
+      return new Set([...OBJECT_HEADER, ...(ctx.externalClass?.(name)?.properties.map((p) => p.name) ?? [])]);
+    };
+    for (const u of units) {
+      for (const o of u.objects) {
+        const props = new Set([...o.props.map((p) => p.name), ...propertiesOf(o.superName)]);
+        for (const m of o.methods) {
+          if (!props.has(m.name)) continue;
+          ctx.onWarning({ message: `method ${m.name}: ${o.name} has a property called ${m.name}, so ${m.name}: sets it and this never runs`, file: u.file, line: m.line });
+        }
+      }
+    }
     const reported = new Set<string>();
     for (const s of project.sent) {
       if (defined.has(s.name) || reported.has(s.name)) continue;

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

@@ -266,6 +266,10 @@ export const audioKernels = {
                     a.play(soundKey(obj), clip, loop, volume);
                 else
                     a.startSong(obj, number, loop, volume);
+                // Neither an effect nor a song by that number: it has ended already, so the next
+                // update reports it and whoever waits for it carries on.
+                if (!clip && !a.songs.has(obj))
+                    vm.setProp(obj, "signal", NOT_PLAYING);
                 return 0;
             }
             case 9: // stop

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

@@ -274,6 +274,9 @@ export const audioKernels: Record<string, KernelFn> = {
         const clip = a.index.effects.get(number);
         if (clip) a.play(soundKey(obj), clip, loop, volume);
         else a.startSong(obj, number, loop, volume);
+        // Neither an effect nor a song by that number: it has ended already, so the next
+        // update reports it and whoever waits for it carries on.
+        if (!clip && !a.songs.has(obj)) vm.setProp(obj, "signal", NOT_PLAYING);
         return 0;
       }
       case 9: // stop

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

@@ -409,14 +409,22 @@ export const graphicsKernels = {
         vm.setProp(obj, "brBottom", fromInt(bottom));
         vm.setProp(obj, "brTop", fromInt(bottom - g.prop(obj, "yStep")));
     },
-    IsOnMe: (vm, [x = 0, y = 0, obj = 0]) => {
+    // IsOnMe(x, y, obj, checkPixels): with checkPixels, only where the cel isn't transparent.
+    IsOnMe: (vm, [x = 0, y = 0, obj = 0, checkPixels = 0]) => {
         const g = graphics(vm);
         const px = toSigned(x), py = toSigned(y);
         // Like SSCI, a screen item is hit where its cel is actually drawn (scaled, current
         // position): its ns* props can be stale, since only SetNowSeen updates them.
         const r = g.items.has(obj) ? g.viewRect(obj) : undefined;
-        if (r)
-            return bool(px >= r.x && px < r.x + r.width && py >= r.y && py < r.y + r.height);
+        if (r) {
+            if (!(px >= r.x && px < r.x + r.width && py >= r.y && py < r.y + r.height))
+                return 0;
+            if (!checkPixels)
+                return 1;
+            const cx = Math.min(r.cel.width - 1, Math.floor((px - r.x) / r.sx));
+            const cy = Math.min(r.cel.height - 1, Math.floor((py - r.y) / r.sy));
+            return bool(r.cel.pixels[cy * r.cel.width + (r.mirror ? r.cel.width - 1 - cx : cx)] !== r.cel.skipColor);
+        }
         return bool(px >= g.prop(obj, "nsLeft") && px <= g.prop(obj, "nsRight") && py >= g.prop(obj, "nsTop") && py <= g.prop(obj, "nsBottom"));
     },
     IsHiRes: () => 0,

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

@@ -448,13 +448,20 @@ export const graphicsKernels: Record<string, KernelFn> = {
     vm.setProp(obj, "brBottom", fromInt(bottom));
     vm.setProp(obj, "brTop", fromInt(bottom - g.prop(obj, "yStep")));
   },
-  IsOnMe: (vm, [x = 0, y = 0, obj = 0]) => {
+  // IsOnMe(x, y, obj, checkPixels): with checkPixels, only where the cel isn't transparent.
+  IsOnMe: (vm, [x = 0, y = 0, obj = 0, checkPixels = 0]) => {
     const g = graphics(vm);
     const px = toSigned(x), py = toSigned(y);
     // Like SSCI, a screen item is hit where its cel is actually drawn (scaled, current
     // position): its ns* props can be stale, since only SetNowSeen updates them.
     const r = g.items.has(obj) ? g.viewRect(obj) : undefined;
-    if (r) return bool(px >= r.x && px < r.x + r.width && py >= r.y && py < r.y + r.height);
+    if (r) {
+      if (!(px >= r.x && px < r.x + r.width && py >= r.y && py < r.y + r.height)) return 0;
+      if (!checkPixels) return 1;
+      const cx = Math.min(r.cel.width - 1, Math.floor((px - r.x) / r.sx));
+      const cy = Math.min(r.cel.height - 1, Math.floor((py - r.y) / r.sy));
+      return bool(r.cel.pixels[cy * r.cel.width + (r.mirror ? r.cel.width - 1 - cx : cx)] !== r.cel.skipColor);
+    }
     return bool(px >= g.prop(obj, "nsLeft") && px <= g.prop(obj, "nsRight") && py >= g.prop(obj, "nsTop") && py <= g.prop(obj, "nsBottom"));
   },
   IsHiRes: () => 0,