sindicate 0.16.0 → 0.17.0

package/src/systems/enemy.js

@@ -175,11 +175,11 @@ export class Enemy extends Character {
     // A hostile is not: killing an Enemy reports nothing, which is the self-defence rule.
     const murder = this.civilian && (this._killer == null || this._killer === this.game.player);
     super.die();
-    if (murder) this.game.crime?.report('murder', this.position.clone());
+    if (murder) this.game.crime?.report?.('murder', this.position.clone());
     if (this.faction === 'ally') return;
     // outlaws bleed where they fall
     const gy = this.game.world.groundAt(this.position.x, this.position.z);
-    this.game.vfx?.bloodDecal({ x: this.position.x, y: gy, z: this.position.z });
+    this.game.vfx?.bloodDecal?.({ x: this.position.x, y: gy, z: this.position.z });
     // tell the mission engine — a kill stage tallies hostiles by the mission tag stamped on them
     // when they spawned (game/missions.js), so it advances only on the RIGHT deaths.
     this.game.missions?.enemyKilled?.(this);
@@ -221,16 +221,16 @@ export class Enemy extends Character {
         speed: rg.projSpeed, range: rg.max + 12, friendly: false, shooter: this,
       });
       this.game.vfx?.muzzleFlash?.(from.addScaledVector(dir, 0.35), dir);
-      this.game.audio?.play('gunshot');
+      this.game.audio?.play?.('gunshot');
       return;
     }
     const dd = dist2D(this.position.x, this.position.z, player.position.x, player.position.z);
     if (dd < 2.3 && !this.game.world.losBlocked(this.position, player.position)) { // not through a wall
       player.takeDamage(Math.round(this.def.damage * (this._dmgMul ?? 1)), this.position, { attacker: this });
-      if (player === this.game.player) this.game.audio?.play('hurt');   // YOU took it — the full body thud
+      if (player === this.game.player) this.game.audio?.play?.('hurt');   // YOU took it — the full body thud
       else {                                                            // a brawl you're only near — impact, distance-faded
         const dL = dist2D(this.position.x, this.position.z, this.game.player.position.x, this.game.player.position.z);
-        if (dL < 20) this.game.audio?.play('hit', 1 - dL / 20);
+        if (dL < 20) this.game.audio?.play?.('hit', 1 - dL / 20);
       }
     }
   }
@@ -271,9 +271,9 @@ export class Enemy extends Character {
       this._enraged = true;
       this.speed *= 1.3;
       this._dmgMul = 1.3;
-      this.game.ui?.toast(`${this.name} is enraged!`);
+      this.game.ui?.toast?.(`${this.name} is enraged!`);
       this.game.shake?.(0.25);
-      this.game.audio?.play('aggro');
+      this.game.audio?.play?.('aggro');
       this.game.vfx?.spawn?.({ pos: this.position.clone().setY(this.position.y + 1.2), count: 16, size: 0.5, life: 0.7, color: 0xff3020, spread: 2.0 });
     }
 
@@ -284,7 +284,7 @@ export class Enemy extends Character {
       if (!this.passive && d < this.def.aggroR) {
         this.state = 'chase';
         if (player === this.game.player) {   // don't announce a scrap the player isn't in
-          this.game.audio?.play('aggro');
+          this.game.audio?.play?.('aggro');
           this.game.hint?.('combat', 'Tab locks on. Ctrl dodge-rolls — time it as the blow lands.');
         }
       } else {
@@ -366,7 +366,7 @@ export class Enemy extends Character {
         // the WHIFF of the blow — attenuated by the listener's (player's) distance so a brawl across
         // the street is faint, not full-blast. The uppercut gets the beefier swing.
         const dL = dist2D(this.position.x, this.position.z, this.game.player.position.x, this.game.player.position.z);
-        if (dL < 20) this.game.audio?.play(swing === 'punchUpper' ? 'swingHeavy' : 'swing', 1 - dL / 20);
+        if (dL < 20) this.game.audio?.play?.(swing === 'punchUpper' ? 'swingHeavy' : 'swing', 1 - dL / 20);
         // damage lands mid-swing — stored so a hit on this enemy can cancel it (interrupt)
         this._swing = { t: 0.42, kind: 'melee', target: player };        // lands via _landSwing (game-time)
       } else if (!this.busy) {

package/src/systems/footsteps.js

@@ -50,7 +50,7 @@ export class Footsteps {
     const F = '/assets/audio/footsteps';
     const map = {};
     for (const s of SURFACES) for (let i = 1; i <= VARIANTS; i++) map[`${s}${i}`] = `${F}/${s}${i}.wav`;
-    this.game.audio?.loadSamples(map);
+    this.game.audio?.loadSamples?.(map);
   }
 
   // What is the hero standing on? A desert plain: wading water (the creek) > packed

package/src/systems/loot.js

@@ -67,7 +67,7 @@ export class Loot {
     n = Math.round(n);
     if (!n) return this.money;
     this.money = Math.max(0, this.money + n);
-    if (n > 0) { this._bump = true; this.game.audio?.play('coin'); }   // synth.js has a 'coin' case
+    if (n > 0) { this._bump = true; this.game.audio?.play?.('coin'); }   // synth.js has a 'coin' case
     return this.money;
   }
 
@@ -153,7 +153,7 @@ export class Loot {
       // TAKEN. The float reads like a damage number because that's the beat it lands on —
       // showDamage() takes any {position} and any string (combat.js passes 'HEADSHOT').
       this.add(p.amount);
-      this.game.ui?.showDamage({ position: p.root.position }, `$${p.amount}`);
+      this.game.ui?.showDamage?.({ position: p.root.position }, `$${p.amount}`);
       this._giveItems(p.items);   // BEFORE _park clears the slot — the money floats, the things get a toast
       this._park(p);
     }

package/src/systems/npc.js

@@ -566,7 +566,7 @@ export class NPC extends Character {
             this.animator?.play?.('gunFire', { once: true, fade: 0.08, onDone: () => {} });
             const mz = tmpV1.set(this.position.x, this.position.y + 1.35, this.position.z);
             this.game.vfx?.muzzleFlash?.(mz, null);
-            this.game.audio?.play('gunshot_far');
+            this.game.audio?.play?.('gunshot_far');
             if (Math.random() < 0.38) t.takeDamage(12, this.position, { attacker: this });
           } else if (!this.animator?.actions?.gunFire?.isRunning?.()) this.play('gunAim');
           return;                                   // standing his ground — no follow-move this frame

package/src/systems/player.js

@@ -135,15 +135,20 @@ export class Player extends Character {
     this.capsuleSteps = 5;     // smoother capsule stepping for the player (stairs)
 
     // ---- gun state (HUD contract: weapon/aiming/ammo/ammoMax/reloading/deadEye/drawn)
-    this.weapon = 'revolver';  // 'revolver' | 'rifle' | 'fists'
+    // WHATEVER THE GAME REGISTERED, not western's two names. Everything downstream already
+    // reads WEAPONS[this.weapon] generically; only these few lines named `revolver` and
+    // `rifle` — and naming them meant a game without both could not construct a Player at
+    // all. The starting weapon is the first registered, or 'fists' if none are.
+    this.weapon = Object.keys(WEAPONS)[0] ?? 'fists';
     this.aiming = false;       // RMB held — ADS. NOT required to fire.
     this.drawn = false;        // gun in hand vs in leather (HUD contract)
     this.reloading = false;
     this.deadEye = 1;          // 0..1 meter — OWNED by game/deadeye.js (Ctrl). HUD contract.
     this.deadEyeActive = false; // slow-mo + tagging running — set by deadeye.js. HUD contract.
-    this._mags = { revolver: WEAPONS.revolver.mag, rifle: WEAPONS.rifle.mag }; // per-weapon mag persists across Q cycling
-    this.ammo = this._mags.revolver;
-    this.ammoMax = WEAPONS.revolver.mag;
+    // per-weapon mag persists across Q cycling — one entry per weapon the game registered
+    this._mags = Object.fromEntries(Object.entries(WEAPONS).map(([k, w]) => [k, w.mag]));
+    this.ammo = this._mags[this.weapon] ?? 0;
+    this.ammoMax = WEAPONS[this.weapon]?.mag ?? 0;
     this._drawT = 0;           // gunDraw one-shot input gate
     this._holsterT = 0;        // unaimed seconds until the gun goes back to leather
     this._holstering = false;  // holster clip in flight — the gun is still in hand
@@ -927,7 +932,19 @@ export class Player extends Character {
     const gunPose = !!gunW && (this.aiming || this.reloading || this._drawT > 0 || this._gunRecoilT > 0);
     if (!this.busy && !this.airborne) {
       if (this.animator._overlay) this.animator.setOverlay(null, { fade: BASE_FADE });
-      if (this.drawn && gunW) {
+      // WHICH CLIP IS THE BODY PLAYING? A decision point (core/overrides.js), because the
+      // answer below is right for a pack that has a full-body clip for every gun state and
+      // wrong for one that does not: Kubold's rifle set has a single standing reload, so
+      // `gunReloadWalk` maps onto it and walking into a reload stops the legs dead. A game
+      // whose pack differs answers for itself; one that says nothing gets exactly this.
+      const chosen = this.game?.engine?.overrides?.ask('locomotionClip', {
+        moving, sprinting, drawn: this.drawn, aiming: this.aiming,
+        reloading: this.reloading, holstering: this._holstering,
+        weapon: this.weapon, animator: this.animator,
+        has: (n) => !!this.animator.actions[n],
+      });
+      if (chosen) this.animator.play(chosen);
+      else if (this.drawn && gunW) {
         if (this.reloading) this.animator.play(moving ? 'gunReloadWalk' : 'gunReload');
         else if (this._holstering) this.animator.play(moving ? 'gunWalkHolster' : 'gunHolster');
         else if (this.aiming) this.animator.play(moving ? 'gunWalkAimed' : 'gunAim');
@@ -1153,7 +1170,7 @@ export class Player extends Character {
       this.drawn = false; // fresh weapon starts holstered — first fire/aim plays the draw
       this._holstering = false;
       this.placeWeapons();
-      this.game.audio?.play('ui');
+      this.game.audio?.play?.('ui');
     }
     // WHISTLE (H) — call the companion horse over. On foot only (this whole block never runs mounted).
     if (input.hit('KeyH') && !this.busy) this.whistle();
@@ -1252,11 +1269,11 @@ export class Player extends Character {
         this._fireBuf = 0;                                       // consumed — one click, one shot
         this._holsterT = HOLSTER_IDLE;
         if (this.ammo > 0) this._fire(w, movin);
-        else { this.game.audio?.play('dryfire'); this._gunFireT = 0.25; }
+        else { this.game.audio?.play?.('dryfire'); this._gunFireT = 0.25; }
       }
     }
 
-    if (this.drawn) this.game.ui?.aimTarget(this._aimingAtBody());
+    if (this.drawn) this.game.ui?.aimTarget?.(this._aimingAtBody());
     if (this.drawn) this._menaceCheck(dt);
     if (this.aiming || this.reloading || this._drawT > 0) this._holsterT = HOLSTER_IDLE;
     if (this.drawn) this.game.hint?.('gun', 'Left-click to fire — hold right-click to aim down the sights. R reloads.');
@@ -1302,7 +1319,7 @@ export class Player extends Character {
     if (!this.drawn) { this.drawn = true; this.placeWeapons(); }
     if (this._holstering) this._abortHolster();
     this._holsterT = HOLSTER_IDLE;
-    this.game.audio?.play('reload');
+    this.game.audio?.play?.('reload');
     const done = () => {
       if (!this.reloading) return;   // cancelled — the old ammo stands
       this.reloading = false;
@@ -1379,7 +1396,7 @@ export class Player extends Character {
     // at 5 Hz meant walking all 150 souls 750 times a second to re-panic the same dozen men.
     if (this._menaceCool <= 0) {
       this._menaceCool = 4;
-      this.game.crime?.report('menace', best.position.clone());
+      this.game.crime?.report?.('menace', best.position.clone());
     }
   }
 
@@ -1424,7 +1441,7 @@ export class Player extends Character {
     this.ammo = this._mags[this.weapon] = Math.max(0, this.ammo - 1);
     this.game.combat?.fireBullet?.({ from, dir, damage: w.damage, speed: 90, range: w.range, friendly: true, shooter: this });
     this.game.vfx?.muzzleFlash?.(from, dir);
-    this.game.audio?.play('gunshot');
+    this.game.audio?.play?.('gunshot');
     // camera kick (RECOIL_KICK × recoil, eased settle — see update)
     this._recoilAmp = RECOIL_KICK * w.recoil;
     this._recoilT = RECOIL_TIME;
@@ -1527,7 +1544,7 @@ export class Player extends Character {
     const run = moving ? Math.min(1, (this._hspeed ?? 0) / top) : 0;
     this.vy = 7.2 * (1 + 0.33 * run);
     this.busy = true; // suppress locomotion overrides; cleared on landing
-    this.game.audio?.play('whoosh');
+    this.game.audio?.play?.('whoosh');
     // start/speed/end come from CLIP_TIMING (tuned in /anim.html)
     this.animator.play(moving ? 'jumpRun' : 'jumpIdle', { once: true, fade: 0.03 });
     this.busy = false; // allow air control; anim continues as one-shot
@@ -1559,7 +1576,7 @@ export class Player extends Character {
   }
 
   dodge(input) {
-    if (this.stamina < 20) { this.game.audio?.play('whoosh'); return; } // too winded to roll
+    if (this.stamina < 20) { this.game.audio?.play?.('whoosh'); return; } // too winded to roll
     this.stamina -= 20;
     this._stamPause = 1;
     let anim = 'dodgeF';
@@ -1568,7 +1585,7 @@ export class Player extends Character {
     else if (input.down('KeyD')) anim = 'dodgeR';
     this.busy = true;
     this.dodgeT = 0.7;
-    this.game.audio?.play('whoosh');
+    this.game.audio?.play?.('whoosh');
     this.animator.play(anim, { once: true, fade: 0.08, timeScale: 1.25, onDone: () => { this.busy = false; } });
     // BURST OF MOVEMENT — WHERE YOU ARE RUNNING, not where the lens is pointed.
     //
@@ -1607,7 +1624,7 @@ export class Player extends Character {
     super.takeDamage(amount, fromPos, opts);
     this._combatT = Math.max(this._combatT, 4); // struck → stay in combat
     this.game.noteDamageTaken?.();
-    this.game.ui?.flashDamage();
+    this.game.ui?.flashDamage?.();
     if (!this.alive) {
       // dying mid-aim/mid-reload: cancel the gun so the corpse doesn't fall with the aim
       // overlay blended over the death clip, and a cancelled reload can't refill on respawn

package/src/systems/riding.js

@@ -9,12 +9,31 @@ import { clone as skeletonClone } from 'three/addons/utils/SkeletonUtils.js';
 import { loadModel, loadClips } from '../core/assets.js';
 import { clamp, angleLerp } from '../core/utils.js';
 
+// WHERE THE SEATED SOURCE POSE COMES FROM. Hardcoded, these are western's horse assets, and a
+// seated pose is not a horse thing: a soldier in a tank hatch, a driver in a car and a rider on
+// a horse all want the same retarget from the same kind of source clip. The paths are content,
+// so they are injected — `setSeatedContent()` — and default to exactly what was here.
+//
+// This is the pattern createCar() already follows and riding.js did not: createCar takes
+// surfaceAt/obstacleAt and knows nothing about any game, which is why it needed no changes to
+// serve a third one.
+let SEAT_RIG = '/assets/horse/Rider.fbx';
+let SEAT_AUDIO = '/assets/audio/horse';
 const HA = '/assets/horse/anims';
-const RIDER_CLIPS = {
+let RIDER_CLIPS = {
   rideIdle: `${HA}/Rider_Idle_01.fbx`,
   mountL: `${HA}/Rider_Mount_Dismount_Left.fbx`,
   mountR: `${HA}/Rider_Mount_Dismount_Right.fbx`,
 };
+
+// A game supplies its own seated source: the rig the pose is read FROM, the clips on it, and
+// where the mount/dismount audio lives. Anything omitted keeps western's.
+//   setSeatedContent({ rig: '/assets/mil/Soldier.fbx', clips: { rideIdle: '…/Sit_Turret.fbx' } })
+export function setSeatedContent({ rig, clips, audioDir } = {}) {
+  if (rig) { SEAT_RIG = rig; _riderRigPromise = null; }   // drop the cache — it holds the old rig
+  if (clips) { RIDER_CLIPS = { ...RIDER_CLIPS, ...clips }; _riderRigPromise = null; }
+  if (audioDir) SEAT_AUDIO = audioDir;
+}
 // Rider Biped → player-rig bone map, from Unity's Humanoid avatar (R_CG is the Hips). The
 // player is the Modular Fantasy Hero rig (Hips/Shoulder/Elbow/UpperLeg naming), NOT the old
 // peasant (Pelvis/UpperArm/Thigh). Foot→Ball, Toe→Toes (modular has no separate ankle bone).
@@ -112,7 +131,7 @@ const _poseCache = new Map();   // clip url -> the loaded clip (the rig master i
 export async function makeSeatedPose(targetRoot, boneMap = BIPED_TO_PEASANT, clipUrl = null) {
   // FRESH FBX load (not the shared loadModel master — the player's Riding setup poses that and
   // never restores it, so captureBind on it would read a posed rig, not bind).
-  if (!_riderRigPromise) _riderRigPromise = Promise.all([new FBXLoader().loadAsync('/assets/horse/Rider.fbx'), loadClips({ rideIdle: RIDER_CLIPS.rideIdle })]);
+  if (!_riderRigPromise) _riderRigPromise = Promise.all([new FBXLoader().loadAsync(SEAT_RIG), loadClips({ rideIdle: RIDER_CLIPS.rideIdle })]);
   const [riderMaster, rClips] = await _riderRigPromise;
   // Pick the clip into a LOCAL — never write it back into rClips. That shared object is the
   // cache: overwriting rideIdle with the chair sit meant the very next call that asked for the
@@ -244,8 +263,8 @@ export class Riding {
   _loadSfx() {
     if (this._sfxLoaded) return;
     this._sfxLoaded = true;
-    const H = '/assets/audio/horse';
-    this.game.audio?.loadSamples({
+    const H = SEAT_AUDIO;
+    this.game.audio?.loadSamples?.({
       step1: `${H}/step1.m4a`, step2: `${H}/step2.m4a`, step3: `${H}/step3.m4a`, step4: `${H}/step4.m4a`, step5: `${H}/step5.m4a`,
       whinny1: `${H}/whinny1.m4a`, whinny2: `${H}/whinny2.m4a`, whinny3: `${H}/whinny3.m4a`,
       neigh: `${H}/neigh.m4a`, neigh2: `${H}/neigh2.m4a`, neigh3: `${H}/neigh3.m4a`,
@@ -288,7 +307,7 @@ export class Riding {
   async setup() {
     const player = this.player.model;
     const [riderRig, rClips] = await Promise.all([
-      loadModel('/assets/horse/Rider.fbx'),
+      loadModel(SEAT_RIG),
       loadClips(RIDER_CLIPS),
     ]);
     for (const b of realBonesOf(player)) this.pbone[b.name] = b; // first-occurrence bones (modular dupes)
@@ -395,7 +414,7 @@ export class Riding {
     if (this.game.ownHorse && this.game.ownHorse !== horse) this.game.ownHorse.owner = null;
     this.game.ownHorse = horse; horse.owner = this.player;
     this.mode = 'mounting'; this.mountT = 0; this.speed = 0;
-    this._loadSfx(); this.game.audio?.sample('snort', { gain: 0.5 }); // silent the very first mount (samples still decoding)
+    this._loadSfx(); this.game.audio?.sample?.('snort', { gain: 0.5 }); // silent the very first mount (samples still decoding)
     this.startClimb(this.climbSide());
     this.besidePos(this.player.position);
     this.player.root.rotation.y = horse.heading;
@@ -521,7 +540,7 @@ export class Riding {
     this.besidePos(this.player.root.position);
     this.player.heading = horse.heading; this.player.root.rotation.set(0, horse.heading, 0); // clear saddle tilt
     this._seatQuat = null; this._reinLoc = null; // recapture seat + rein hands on the next mount
-    this.game.audio?.sample('snort', { gain: 0.45 });
+    this.game.audio?.sample?.('snort', { gain: 0.45 });
     horse.rider = null; horse.speed = 0;
     this.horse = null; this.mode = 'foot';
     this.player.vy = 0; this.player._capGrounded = false;

package/src/systems/shop.js

@@ -213,7 +213,7 @@ export class Shop {
   _buy(id) {
     if (this._curStock(id) <= 0) { this.ui.toast?.(`He's clean out of that.`); this.game.audio?.play?.('ui'); return; }
     const price = SH.buyPrice(id);
-    if (!this.game.loot?.spend(price)) {          // spend() returns false and takes nothing if he's short
+    if (!this.game.loot?.spend?.(price)) {          // spend() returns false and takes nothing if he's short
       this.ui.toast?.(`You're short the coin for that.`);
       this.game.audio?.play?.('ui');
       return;
@@ -229,7 +229,7 @@ export class Shop {
     if (!this.ui.satchel.has(id, 1)) return;
     const price = SH.sellPrice(id);
     this.ui.satchel.remove(id, 1);
-    this.game.loot?.add(price);                   // add() plays the coin chime
+    this.game.loot?.add?.(price);                   // add() plays the coin chime
     this.ui.toast?.(`Sold ${SH.items[id].name} — $${price}.`);
     this._rebuild();
   }

package/src/systems/train.js

@@ -34,10 +34,23 @@ import { SeatedRider, SEAT, passengerPosture, driverPosture } from './seatedRide
 //   setTrainContent({ colliders, dropItemsFor, railPaths, railStops, crossing, halts })
 let colliders = [], dropItemsFor = () => null;
 let SURVEY_PATHS = [], SURVEY_STOPS = [], SURVEY_CROSSING = null, RAIL_HALTS = [];
+// KEYS THIS ACCEPTS AND NEVER READS. `railPaths`, `railStops` and `crossing` are assigned to
+// module state that nothing consults — a game supplying them gets silence, and no way to tell
+// that from working. They are kept (removing them would break callers that pass them today)
+// and now say so once, so the next game to reach for one finds out at the call rather than by
+// wondering why its level crossings do nothing.
+const DEAD = new Set();
+const dead = (k) => {
+  if (DEAD.has(k)) return;
+  DEAD.add(k);
+  console.warn(`[train] setTrainContent({ ${k} }) is accepted but never read — it has no effect. `
+    + 'Use railLines / railLineStops / levelCrossing / junction / railTop / halts.');
+};
+
 export function setTrainContent(c = {}) {
   if (c.colliders) colliders = c.colliders;
   if (c.dropItemsFor) dropItemsFor = c.dropItemsFor;
-  if (c.railPaths) SURVEY_PATHS = c.railPaths;
+  if (c.railPaths) { SURVEY_PATHS = c.railPaths; dead('railPaths'); }
   // THE TRACK AUTHOR'S OWN SURVEY. Without it the fleet grades its own polyline and runs
   // beside the rails the county actually laid.
   if (c.railLines) LINES_IN = c.railLines;
@@ -45,8 +58,8 @@ export function setTrainContent(c = {}) {
   if (c.levelCrossing) XING_IN = c.levelCrossing;
   if (c.junction) JUNC_IN = c.junction;
   if (c.railTop != null) { RAIL_TOP = c.railTop; RAIL_Y = RAIL_TOP - FLANGE; }
-  if (c.railStops) SURVEY_STOPS = c.railStops;
-  if (c.crossing !== undefined) SURVEY_CROSSING = c.crossing;
+  if (c.railStops) { SURVEY_STOPS = c.railStops; dead('railStops'); }
+  if (c.crossing !== undefined) { SURVEY_CROSSING = c.crossing; dead('crossing'); }
   if (c.halts) RAIL_HALTS = c.halts;
 }
 import { dist2D } from '../core/utils.js';

package/src/vehicle/car.js

@@ -164,7 +164,10 @@ export function createCar({ surfaceAt, obstacleAt = null, x = 0, y = 0, z = 0, h
   const seatY = surfaceAt?.(x, z, y);
   const car = {
     cfg,
-    pos: { x, y: (seatY ?? y) + CAR_DEFAULTS.rideHeight, z },
+    // cfg, NOT CAR_DEFAULTS. Every later frame uses cfg.rideHeight, so spawning from the
+    // default drops a vehicle with a custom one at the wrong height and pops it up on the
+    // first update — a tank at 0.9 starts 0.56 m low and jumps.
+    pos: { x, y: (seatY ?? y) + cfg.rideHeight, z },
     heading,                 // where the car POINTS
     travel: heading,         // where it is actually GOING — the two differ when it slides
     speed: 0,