@origingame/create-game 0.3.0 → 0.4.0

package/archetypes/README.md

@@ -64,7 +64,7 @@ commands its playtests use and what a Maker changes first.
   og.CharacterController with blend trees and IK, navmesh sentinels on
   og.ai, particles, decals and the post stack, on the fantasy style pack
   (its README).
-- **The look as data.** `idle/` names its frame treatment and skin in
+- **The look as data.** `idle/` names its frame treatment and style in
   `assets/looks/idle.ogt` through `GameDesc.look` (og-taste §12); the
   others set theirs in `start` until they move to a look. A look that
   extends a catalogue preset changes the frames, so `references/` are

package/archetypes/arena/package.json

@@ -13,6 +13,6 @@
     "test": "og test ."
   },
   "dependencies": {
-    "@origingame/engine": "0.3.0"
+    "@origingame/engine": "0.4.0"
   }
 }

package/archetypes/arena/project.ogt

@@ -3,7 +3,7 @@ version 1
 ---
 name "Coin Duel"
 id "arena"
-engine "0.3.0"
+engine "0.4.0"
 entry "src/main.ts"
 profile "2d"
 tick 60

package/archetypes/idle/README.md

@@ -168,10 +168,10 @@ pure functions, the stars come from an og.Rng stream forked by name, and
    an `owned<n>` field.
 3. **Prestige**: `novaGain`, `dustMultiplier`.
 4. **The look**: `assets/looks/idle.ogt` (named by `GameDesc.look`) holds
-   the frame's treatment and names the skin; `extends "<slug>"` there
+   the frame's treatment and names the style; `extends "<slug>"` there
    starts from a style of the catalogue (og-taste §12), and the reference
    frames are then recorded again (`OG_FX_CAPTURE=1 og test .`). The
-   skin's palette is `assets/styles/sparkorb/style.ogt`, the art
+   style's palette is `assets/styles/sparkorb/style.ogt`, the art
    `tools/make-assets.py`: `python3 tools/make-assets.py && og cook .`.
 5. **Words and numbers**: `assets/strings/*.ogt` (a locale's `num.step`
    and units make its big numbers); a new Chinese string needs the script
@@ -221,8 +221,8 @@ in the engine repository).
 `tools/make-assets.py` regenerates every asset byte for byte (two runs
 give the same bytes): the orb, the glow, the spark and the motes, the
 emitters, the sounds and the music, the `og sfx` preset files of the UI's
-sounds, the font subset and the skin's recoloured atlas. `LICENSES.md`
-lists them; the skin's are in `assets/styles/sparkorb/LICENSES.md`.
+sounds, the font subset and the style's recoloured atlas. `LICENSES.md`
+lists them; the style's are in `assets/styles/sparkorb/LICENSES.md`.
 
 ## Known limits (engine gaps, not design)
 

package/archetypes/idle/assets/looks/idle.ogt

@@ -7,7 +7,7 @@ version 1
 # suit a glowing orb) adds that style's treatment under the lines below,
 # and the reference frames are then recorded again (OG_FX_CAPTURE=1 og test .).
 name "Spark Orb"
-# The UI wears the sparkorb skin (start keeps it and adds the sounds).
+# The UI wears the sparkorb style (start keeps it and adds the sounds).
 ui "styles/sparkorb/style.ogt"
 # The night and the orb are authored colour: not tone mapped, and no light
 # from the sky.

package/archetypes/idle/assets/styles/sparkorb/LICENSES.md

@@ -1,4 +1,4 @@
-# Spark Orb's skin (the engine's neon style pack, recoloured): licences
+# Spark Orb's style (the engine's neon style pack, recoloured): licences
 
 The palette, the body size and the fallback font in `style.ogt` are this
 game's edits by hand; `atlas.png` is the pack's atlas with its magenta
@@ -15,5 +15,5 @@ frames turned violet by `tools/make-assets.py`; the rest is the pack as
 | `Rajdhani-Bold.ttf` | SIL Open Font License 1.1 (`OFL.txt`) | Rajdhani Bold (Indian Type Foundry, Google Fonts); subset to Latin-1 with fontTools. Copyright (c) 2014 Indian Type Foundry (info@indiantypefoundry.com) |
 
 Characters these fonts lack (Chinese, Japanese, Korean) are drawn with the
-skin's `fallback` font, `fonts/NotoSansSC-subset.ttf` (Noto Sans SC subset to
+style's `fallback` font, `fonts/NotoSansSC-subset.ttf` (Noto Sans SC subset to
 this game's Chinese strings, OFL 1.1, `assets/fonts/OFL.txt`).

package/archetypes/idle/assets/styles/sparkorb/style.ogt

@@ -1,7 +1,7 @@
 type style
 version 1
 ---
-# Spark Orb's skin: the engine's neon style pack (templates/ui-kit/tools/make-styles.py, CC0 art,
+# Spark Orb's style: the engine's neon style pack (templates/ui-kit/tools/make-styles.py, CC0 art,
 # OFL fonts; LICENSES.md) with this game's palette (the orb's gold as the one accent on night
 # violet) and its Chinese fallback font, edited by hand.
 name "sparkorb"

package/archetypes/idle/package.json

@@ -13,6 +13,6 @@
     "test": "og test ."
   },
   "dependencies": {
-    "@origingame/engine": "0.3.0"
+    "@origingame/engine": "0.4.0"
   }
 }

package/archetypes/idle/project.ogt

@@ -3,7 +3,7 @@ version 1
 ---
 name "Spark Orb"
 id "idle"
-engine "0.3.0"
+engine "0.4.0"
 entry "src/main.ts"
 profile "2d"
 tick 60

package/archetypes/idle/src/components.ts

@@ -24,7 +24,7 @@ export const Sound = { Tap: 1, Buy: 2, Milestone: 4, Nova: 8, Welcome: 16, Move:
 /** The run, the save and the effects' bookkeeping. */
 export const Game = defineResource("Game", {
   phase: u32(Phase.Title, { doc: "Phase.* of src/components.ts." }),
-  leftTitle: bool(false, { doc: "The player has left the title the game opened on: from then on the title enters with the skin's entrance (the opening one is built settled, og.ui.mainMenu's instant: the web draws it behind the play gate)." }),
+  leftTitle: bool(false, { doc: "The player has left the title the game opened on: from then on the title enters with the style's entrance (the opening one is built settled, og.ui.mainMenu's instant: the web draws it behind the play gate)." }),
   paused: bool(false),
   settingsOpen: bool(false),
   held: bool(false, { doc: "The time scale is held at 0 (paused, in the settings or a dialog)." }),

package/archetypes/idle/src/main.ts

@@ -9,7 +9,7 @@
 // the rate.
 //
 // The look (GameDesc.look, a file under assets/looks/) sets the frame's
-// treatment and the UI skin before start runs. `start` loads the strings,
+// treatment and the UI style before start runs. `start` loads the strings,
 // the sounds and the orb's art and spawns the rows: the orb and its glow,
 // 48 motes (12 per generator), the burst pools, a voice per sound and the
 // music. The systems are in
@@ -35,11 +35,11 @@ function must<T>(r: { ok: true; value?: T } | { ok: false; reason: string }): T
 
 function start(world: World): void {
   for (const l of LANGUAGES) must(og.i18n.load(world, `strings/${l.code}.ogt`));
-  // GameDesc.look set the frame and loaded the skin before start; the UI
-  // keeps that skin and adds the sounds.
-  const skin = og.render.look(world)?.style ?? null;
+  // GameDesc.look set the frame and loaded the style before start; the UI
+  // keeps that style and adds the sounds.
+  const style = og.render.look(world)?.style ?? null;
   const sound = (path: string) => must(og.load.sound(world, path));
-  must(og.ui.configure(world, { style: skin, sounds: { press: sound("audio/ui-press.ogt"), open: sound("audio/ui-open.ogt"), close: sound("audio/ui-close.ogt"), error: sound("audio/ui-error.ogt"), success: sound("audio/ui-success.ogt") } }));
+  must(og.ui.configure(world, { style, sounds: { press: sound("audio/ui-press.ogt"), open: sound("audio/ui-open.ogt"), close: sound("audio/ui-close.ogt"), error: sound("audio/ui-error.ogt"), success: sound("audio/ui-success.ogt") } }));
 
   const camera = must(world.resource(og.Camera));
   camera.orthographic = true;

package/archetypes/idle/src/ui.ts

@@ -1,4 +1,4 @@
-// Spark Orb's screens on og.ui and the skin in assets/styles/sparkorb (the
+// Spark Orb's screens on og.ui and the style in assets/styles/sparkorb (the
 // engine's neon pack in the orb's gold on night violet): the title, the
 // HUD (the sparks and their rate top left, stardust and pause top right,
 // the four generators along the bottom, the supernova's progress), the
@@ -25,7 +25,7 @@ export const LANGUAGES = [
   { code: "zh-CN", key: "lang.zh" },
 ] as const;
 
-/** The generators' icons in the skin's atlas. */
+/** The generators' icons in the style's atlas. */
 const ICONS = ["fire", "bolt", "gem", "star"] as const;
 
 /** The tokens' spacing scale in CSS px (og.ui.frameTheme answers it too, but builds the whole theme each call). */
@@ -373,7 +373,7 @@ export const Ui = defineSystem("Ui", { reads: [Tuning, og.Input, og.Gamepad], wr
       ],
       footer: say(world, "title.footer"),
       // The title the game opens on is built settled: the web draws it behind the play gate, where
-      // the skin's entrance would stand part-way until the tap (og-platform-sdk §3). Later titles enter.
+      // the style's entrance would stand part-way until the tap (og-platform-sdk §3). Later titles enter.
       instant: !g.leftTitle,
     });
     if (!g.settingsOpen && r.selected === "play") {

package/archetypes/idle/tools/make-assets.py

@@ -272,7 +272,7 @@ render sprite 0
 """)
 
 
-# ── the skin's atlas ───────────────────────────────────────────────────────
+# ── the style's atlas ───────────────────────────────────────────────────────
 
 def read_png(path):
     """An 8-bit RGBA, non-interlaced PNG's rows of pixels (what make-styles.py writes)."""

package/archetypes/match3/package.json

@@ -13,6 +13,6 @@
     "test": "og test ."
   },
   "dependencies": {
-    "@origingame/engine": "0.3.0"
+    "@origingame/engine": "0.4.0"
   }
 }

package/archetypes/match3/project.ogt

@@ -3,7 +3,7 @@ version 1
 ---
 name "Tile Swap"
 id "match3"
-engine "0.3.0"
+engine "0.4.0"
 entry "src/main.ts"
 profile "2d"
 tick 60

package/archetypes/rhythm/README.md

@@ -70,7 +70,7 @@ og build . --publish         # dist/: the play page as it ships
   of ten or more broken, louder); the rings breathe with the beat (not
   with reduced motion). There is no hit stop: it would hold the picture
   while the music runs on.
-- **Screens on og.ui with a skin** (og-ui §2–§6, og-taste §1–§7): the
+- **Screens on og.ui with a style** (og-ui §2–§6, og-taste §1–§7): the
   engine's sci-fi pack recoloured as `assets/styles/lanebeat`; the title
   (Play, Calibrate, Settings), the HUD (the score as an `og.ui.counter`
   and the groove top left, Pause top right, the combo beside the
@@ -221,7 +221,7 @@ in the engine repository).
 give the same bytes): the chart and the stems from one set of note lists,
 the click, the taps, the miss, the clear and the fail, the note, the ring,
 the lane's glow, the spark, the hit's burst, the `og sfx` preset files of
-the UI's sounds and the font subset. `LICENSES.md` lists them; the skin's
+the UI's sounds and the font subset. `LICENSES.md` lists them; the style's
 are in `assets/styles/lanebeat/LICENSES.md`.
 
 ## Known limits (engine gaps, not design)

package/archetypes/rhythm/assets/styles/lanebeat/LICENSES.md

@@ -1,4 +1,4 @@
-# Three-Lane Beat's skin (the engine's sci-fi style pack, recoloured): licences
+# Three-Lane Beat's style (the engine's sci-fi style pack, recoloured): licences
 
 The palette, the body sizes and the fallback font in `style.ogt` are this
 game's edits by hand; the rest is the pack as `templates/styles/scifi` ships it.
@@ -13,5 +13,5 @@ game's edits by hand; the rest is the pack as `templates/styles/scifi` ships it.
 | `Orbitron-Bold.ttf` | SIL Open Font License 1.1 (`OFL.txt`) | Orbitron Bold (github.com/theleagueof/orbitron); unmodified. Copyright 2018 The Orbitron Project Authors (https://github.com/theleagueof/orbitron), with Reserved Font Name: "Orbitron". |
 
 Characters these fonts lack (Chinese, Japanese, Korean) are drawn with the
-skin's `fallback` font, `fonts/NotoSansSC-subset.ttf` (Noto Sans SC subset to
+style's `fallback` font, `fonts/NotoSansSC-subset.ttf` (Noto Sans SC subset to
 this game's Chinese strings, OFL 1.1, `assets/fonts/OFL.txt`).

package/archetypes/rhythm/assets/styles/lanebeat/style.ogt

@@ -1,7 +1,7 @@
 type style
 version 1
 ---
-# Three-Lane Beat's skin: the engine's sci-fi style pack (templates/ui-kit/tools/make-styles.py,
+# Three-Lane Beat's style: the engine's sci-fi style pack (templates/ui-kit/tools/make-styles.py,
 # CC0 art, OFL fonts; LICENSES.md) with this game's palette and its Chinese fallback font, by hand.
 name "lanebeat"
 scheme dark

package/archetypes/rhythm/package.json

@@ -13,6 +13,6 @@
     "test": "og test ."
   },
   "dependencies": {
-    "@origingame/engine": "0.3.0"
+    "@origingame/engine": "0.4.0"
   }
 }

package/archetypes/rhythm/project.ogt

@@ -3,7 +3,7 @@ version 1
 ---
 name "Three-Lane Beat"
 id "rhythm"
-engine "0.3.0"
+engine "0.4.0"
 entry "src/main.ts"
 profile "2d"
 tick 60

package/archetypes/rhythm/src/components.ts

@@ -25,7 +25,7 @@ export const Sound = { Tap0: 1, Tap1: 2, Tap2: 4, Miss: 8, Clear: 16, Fail: 32,
 /** The play: the song's clock, the judgements, the score, the groove, the calibration, the best. */
 export const Game = defineResource("Game", {
   phase: u32(Phase.Title, { doc: "Phase.* of src/components.ts." }),
-  leftTitle: bool(false, { doc: "The player has left the title the game opened on: from then on the title enters with the skin's entrance (the opening one is built settled, og.ui.mainMenu's instant: the web draws it behind the play gate)." }),
+  leftTitle: bool(false, { doc: "The player has left the title the game opened on: from then on the title enters with the style's entrance (the opening one is built settled, og.ui.mainMenu's instant: the web draws it behind the play gate)." }),
   paused: bool(false),
   settingsOpen: bool(false),
   held: bool(false, { doc: "The time scale is held at 0 (paused or in the settings)." }),

package/archetypes/rhythm/src/main.ts

@@ -9,7 +9,7 @@
 //
 // The song is its stems, started on bar lines through og.Music (src/
 // systems.ts's Band); the chart is a scene (assets/charts/neon-pulse.ogt)
-// of a Song row and a Note row per note. `start` loads them, the skin, the
+// of a Song row and a Note row per note. `start` loads them, the style, the
 // strings and the sounds, and spawns the clock, the stems, the receptors
 // and the voices. The systems are in src/systems.ts, the screens in
 // src/ui.ts and the state in src/components.ts.
@@ -32,9 +32,9 @@ function must<T>(r: { ok: true; value?: T } | { ok: false; reason: string }): T
 
 function start(world: World): void {
   for (const l of LANGUAGES) must(og.i18n.load(world, `strings/${l.code}.ogt`));
-  const skin = must(og.load.style(world, "styles/lanebeat/style.ogt"));
+  const style = must(og.load.style(world, "styles/lanebeat/style.ogt"));
   const sound = (path: string) => must(og.load.sound(world, path));
-  must(og.ui.configure(world, { style: skin, sounds: { press: sound("audio/ui-press.ogt"), open: sound("audio/ui-open.ogt"), close: sound("audio/ui-close.ogt"), error: sound("audio/ui-error.ogt"), success: sound("audio/ui-success.ogt") } }));
+  must(og.ui.configure(world, { style, sounds: { press: sound("audio/ui-press.ogt"), open: sound("audio/ui-open.ogt"), close: sound("audio/ui-close.ogt"), error: sound("audio/ui-error.ogt"), success: sound("audio/ui-success.ogt") } }));
 
   const settings = must(world.resource(og.RenderSettings));
   settings.environmentIntensity = 0;

package/archetypes/rhythm/src/ui.ts

@@ -1,4 +1,4 @@
-// Three-Lane Beat's screens on og.ui and the skin in assets/styles/lanebeat
+// Three-Lane Beat's screens on og.ui and the style in assets/styles/lanebeat
 // (the engine's sci-fi pack): the title, the HUD (the score and the groove
 // top left, Pause top right, the combo and its multiplier beside the
 // highway), the pause menu, the settings with the offset, the calibration
@@ -380,7 +380,7 @@ export const Ui = defineSystem("Ui", { reads: [Tuning, og.Input, og.Gamepad], wr
       ],
       footer: say(world, "title.footer"),
       // The title the game opens on is built settled: the web draws it behind the play gate, where
-      // the skin's entrance would stand part-way until the tap (og-platform-sdk §3). Later titles enter.
+      // the style's entrance would stand part-way until the tap (og-platform-sdk §3). Later titles enter.
       instant: !g.leftTitle,
     });
     if (!g.settingsOpen && r.selected === "play") begin(world, g);

package/archetypes/roguelike/README.md

@@ -61,7 +61,7 @@ og build . --publish         # dist/: the play page as it ships
   flash, a squash, the red number, a hit stop and a kick; the guardian
   glows red and shows "!" the turn before a charged strike (twice the hit
   stop and trauma); its fall and the lamp going out are heavier still.
-- **Screens on og.ui with a skin** (og-ui §2–§6, og-taste §1–§7): the
+- **Screens on og.ui with a style** (og-ui §2–§6, og-taste §1–§7): the
   engine's pixel pack recoloured as `assets/styles/lampdive` (the tomb's
   violet panels, the lamp's amber as the one accent); the title over the
   lamp-lit first room, the HUD as capsules in the corners (health meter,
@@ -237,7 +237,7 @@ in the engine repository).
 `tools/make-assets.py` regenerates every asset byte for byte (two runs
 give the same bytes): the tileset, the map, the sprite sheet and the glow,
 the sounds and the music, the `og sfx` preset files of the UI's sounds and
-the footstep, and the font subset. `LICENSES.md` lists them; the skin's
+the footstep, and the font subset. `LICENSES.md` lists them; the style's
 are in `assets/styles/lampdive/LICENSES.md`.
 
 ## Known limits (engine gaps, not design)

package/archetypes/roguelike/assets/styles/lampdive/LICENSES.md

@@ -1,4 +1,4 @@
-# Lamp Dive's skin (the engine's pixel style pack, recoloured): licences
+# Lamp Dive's style (the engine's pixel style pack, recoloured): licences
 
 The palette, the body text's 1 px dark shadow and the fallback font in
 `style.ogt` are this game's edits by hand; the rest is the pack as
@@ -12,5 +12,5 @@ The palette, the body text's 1 px dark shadow and the fallback font in
 | `DotGothic16-Regular.ttf` | SIL Open Font License 1.1 (`OFL.txt`) | DotGothic16 (github.com/fontworks-fonts/DotGothic16); subset to Latin-1 with fontTools. Copyright 2020 The DotGothic16 Project Authors (https://github.com/fontworks-fonts/DotGothic16/) |
 
 Characters these fonts lack (Chinese, Japanese, Korean) are drawn with the
-skin's `fallback` font, `fonts/NotoSansSC-subset.ttf` (Noto Sans SC subset to
+style's `fallback` font, `fonts/NotoSansSC-subset.ttf` (Noto Sans SC subset to
 this game's Chinese strings, OFL 1.1, `assets/fonts/OFL.txt`).

package/archetypes/roguelike/assets/styles/lampdive/style.ogt

@@ -1,7 +1,7 @@
 type style
 version 1
 ---
-# Lamp Dive's skin: the engine's pixel style pack (templates/ui-kit/tools/make-styles.py; CC0 art, OFL
+# Lamp Dive's style: the engine's pixel style pack (templates/ui-kit/tools/make-styles.py; CC0 art, OFL
 # fonts; LICENSES.md) in tomb colours: plum stone panels, the lamp's amber as the one accent.
 name "lampdive"
 scheme dark

package/archetypes/roguelike/package.json

@@ -13,6 +13,6 @@
     "test": "og test ."
   },
   "dependencies": {
-    "@origingame/engine": "0.3.0"
+    "@origingame/engine": "0.4.0"
   }
 }

package/archetypes/roguelike/project.ogt

@@ -3,7 +3,7 @@ version 1
 ---
 name "Lamp Dive"
 id "roguelike"
-engine "0.3.0"
+engine "0.4.0"
 entry "src/main.ts"
 profile "2d"
 tick 60

package/archetypes/roguelike/src/components.ts

@@ -30,7 +30,7 @@ export const LOOT_SLOTS = 12;
 /** The dive: the lamp-bearer, the floor, the turn, the counts and the effects' bookkeeping. */
 export const Game = defineResource("Game", {
   phase: u32(Phase.Title, { doc: "Phase.* of src/components.ts." }),
-  leftTitle: bool(false, { doc: "The player has left the title the game opened on: from then on the title enters with the skin's entrance (the opening one is built settled, og.ui.mainMenu's instant: the web draws it behind the play gate)." }),
+  leftTitle: bool(false, { doc: "The player has left the title the game opened on: from then on the title enters with the style's entrance (the opening one is built settled, og.ui.mainMenu's instant: the web draws it behind the play gate)." }),
   paused: bool(false),
   settingsOpen: bool(false),
   held: bool(false, { doc: "The time scale is held at 0 (paused or in the settings)." }),

package/archetypes/roguelike/src/main.ts

@@ -37,9 +37,9 @@ function must<T>(r: { ok: true; value?: T } | { ok: false; reason: string }): T
 
 function start(world: World): void {
   for (const l of LANGUAGES) must(og.i18n.load(world, `strings/${l.code}.ogt`));
-  const skin = must(og.load.style(world, "styles/lampdive/style.ogt"));
+  const style = must(og.load.style(world, "styles/lampdive/style.ogt"));
   const sound = (path: string) => must(og.load.sound(world, path));
-  must(og.ui.configure(world, { style: skin, sounds: { press: sound("audio/ui-press.ogt"), open: sound("audio/ui-open.ogt"), close: sound("audio/ui-close.ogt"), error: sound("audio/ui-error.ogt"), success: sound("audio/ui-success.ogt") } }));
+  must(og.ui.configure(world, { style, sounds: { press: sound("audio/ui-press.ogt"), open: sound("audio/ui-open.ogt"), close: sound("audio/ui-close.ogt"), error: sound("audio/ui-error.ogt"), success: sound("audio/ui-success.ogt") } }));
 
   const settings = must(world.resource(og.RenderSettings));
   settings.environmentIntensity = 0;

package/archetypes/roguelike/src/ui.ts

@@ -1,4 +1,4 @@
-// Lamp Dive's screens on og.ui and the skin in assets/styles/lampdive (the
+// Lamp Dive's screens on og.ui and the style in assets/styles/lampdive (the
 // engine's pixel pack in tomb colours): the title, the HUD (health, strike,
 // armour and gold in the top-left corner, the floor and pause in the
 // top-right, the draught and, on a touch screen, Wait and a d-pad along the
@@ -317,7 +317,7 @@ export const Ui = defineSystem("Ui", { reads: [Tuning], writes: [Game, Prefs, og
       ],
       footer: say(world, "title.footer"),
       // The title the game opens on is built settled: the web draws it behind the play gate, where
-      // the skin's entrance would stand part-way until the tap (og-platform-sdk §3). Later titles enter.
+      // the style's entrance would stand part-way until the tap (og-platform-sdk §3). Later titles enter.
       instant: !g.leftTitle,
     });
     if (!g.settingsOpen && r.selected === "play") startDive(world, g);

package/archetypes/runner/package.json

@@ -13,6 +13,6 @@
     "test": "og test ."
   },
   "dependencies": {
-    "@origingame/engine": "0.3.0"
+    "@origingame/engine": "0.4.0"
   }
 }

package/archetypes/runner/project.ogt

@@ -3,7 +3,7 @@ version 1
 ---
 name "Runner"
 id "runner"
-engine "0.3.0"
+engine "0.4.0"
 entry "src/main.ts"
 profile "2d"
 tick 60

package/archetypes/third-person/README.md

@@ -180,7 +180,7 @@ stages.
 2. **The pressure**: `duskSeconds`, the sentinels' speeds and sight, their
    minds in `assets/ai/`, `HEARTS` in `src/components.ts`.
 3. **The look**: the post stack, fog and sky in `buildVale`, the water's
-   colours, the skin's palette in `assets/styles/ember/style.ogt`.
+   colours, the style's palette in `assets/styles/ember/style.ogt`.
 4. **The characters**: another CC0 humanoid in `assets/models/` with the
    clip library retargeted onto it (`src/anim.ts`), the graphs' thresholds.
 5. **Words**: `assets/strings/*.ogt`; a new Chinese string needs the script
@@ -230,7 +230,7 @@ Nothing here is downloaded. `tools/make-assets.py` regenerates the vale's
 heightmap and control map, the sounds and music, the `og sfx` presets, the
 sentinels' minds and the font subset byte for byte; the characters, the
 clip library, the textures and the beacon's effects are the engine's own
-CC0 assets. `LICENSES.md` lists every file; the skin's are in
+CC0 assets. `LICENSES.md` lists every file; the style's are in
 `assets/styles/ember/LICENSES.md`.
 
 ## Known limits (engine gaps, not design)

package/archetypes/third-person/assets/styles/ember/LICENSES.md

@@ -1,4 +1,4 @@
-# The ember skin (a copy of the fantasy style pack): licences
+# The ember style (a copy of the fantasy style pack): licences
 
 | File | Licence | Origin |
 |---|---|---|
@@ -9,5 +9,5 @@
 | `Newsreader-Medium.ttf` | SIL Open Font License 1.1 (`OFL.txt`) | Newsreader (github.com/productiontype/Newsreader); a static instance (wght 500, opsz 16) of the variable font, subset to Latin-1 with fontTools. Copyright 2020 The Newsreader Project Authors (http://github.com/productiontype/Newsreader) |
 
 Characters these fonts lack (Chinese, Japanese, Korean) are drawn with the
-skin's `fallback` font, `fonts/NotoSansSC-subset.ttf` (the platform's
+style's `fallback` font, `fonts/NotoSansSC-subset.ttf` (the platform's
 subset, OFL 1.1, `assets/fonts/OFL.txt`).

package/archetypes/third-person/assets/styles/ember/style.ogt

@@ -1,7 +1,7 @@
 type style
 version 1
 ---
-# Ember Vale's skin: a copy of the fantasy style pack (templates/ui-kit/tools/make-styles.py; CC0 art, OFL fonts; LICENSES.md).
+# Ember Vale's style: a copy of the fantasy style pack (templates/ui-kit/tools/make-styles.py; CC0 art, OFL fonts; LICENSES.md).
 name "ember"
 scheme dark
 atlas "styles/ember/atlas.png" 384 256

package/archetypes/third-person/package.json

@@ -13,6 +13,6 @@
     "test": "og test ."
   },
   "dependencies": {
-    "@origingame/engine": "0.3.0"
+    "@origingame/engine": "0.4.0"
   }
 }

package/archetypes/third-person/project.ogt

@@ -3,7 +3,7 @@ version 1
 ---
 name "Ember Vale"
 id "third-person"
-engine "0.3.0"
+engine "0.4.0"
 entry "src/main.ts"
 profile "3d"
 tick 60

package/archetypes/third-person/src/components.ts

@@ -31,7 +31,7 @@ export const HEARTS = 3;
 /** The run: the hero's progress, the clock and the effects' bookkeeping. */
 export const Game = defineResource("Game", {
   phase: u32(Phase.Title, { doc: "Phase.* of src/components.ts." }),
-  leftTitle: bool(false, { doc: "The player has left the title the game opened on: from then on the title enters with the skin's entrance (the opening one is built settled, og.ui.mainMenu's instant: the web draws it behind the play gate)." }),
+  leftTitle: bool(false, { doc: "The player has left the title the game opened on: from then on the title enters with the style's entrance (the opening one is built settled, og.ui.mainMenu's instant: the web draws it behind the play gate)." }),
   ending: u32(Ending.None, { doc: "Ending.* once a run is over." }),
   paused: bool(false),
   settingsOpen: bool(false),

package/archetypes/third-person/src/main.ts

@@ -8,7 +8,7 @@
 // grab costs a heart. Three hearts gone, or night, ends the run; every
 // beacon lit wins it. Then the summary, and again.
 //
-// `start` loads the strings, the skin and the sounds, builds the vale
+// `start` loads the strings, the style and the sounds, builds the vale
 // (src/world.ts) and spawns the hero (src/hero.ts), the sentinels
 // (src/sentinels.ts) and the voices (src/sound.ts). The beacons are in
 // src/beacons.ts, the screens and the run's clock in src/ui.ts and the
@@ -26,9 +26,9 @@ import { BEACON_AT, buildVale, ground, HOURS, must, setHour } from "./world.ts";
 
 function start(world: World): void {
   for (const l of LANGUAGES) must(og.i18n.load(world, `strings/${l.code}.ogt`));
-  const skin = must(og.load.style(world, "styles/ember/style.ogt"));
+  const style = must(og.load.style(world, "styles/ember/style.ogt"));
   const sound = (path: string) => must(og.load.sound(world, path));
-  must(og.ui.configure(world, { style: skin, sounds: { press: sound("audio/ui-press.ogt"), open: sound("audio/ui-open.ogt"), close: sound("audio/ui-close.ogt"), error: sound("audio/ui-error.ogt"), success: sound("audio/ui-success.ogt") } }));
+  must(og.ui.configure(world, { style, sounds: { press: sound("audio/ui-press.ogt"), open: sound("audio/ui-open.ogt"), close: sound("audio/ui-close.ogt"), error: sound("audio/ui-error.ogt"), success: sound("audio/ui-success.ogt") } }));
   buildVale(world);
   spawnHero(world);
   spawnSentinels(world);

package/archetypes/third-person/src/sound.ts

@@ -31,7 +31,7 @@ export function spawnVoices(world: World): void {
   must(world.insert(fx, og.AudioBusFx, { bus: "music", duck: true, duckBus: "sfx", duckDepth: 5, duckRelease: 0.6 }));
   const echo = must(world.spawn({ name: "sfx-bus" }));
   must(world.insert(echo, og.AudioBusFx, { bus: "sfx", reverb: 0.18 }));
-  // The touch HUD's Jump and Kindle: the skin's press sound on the ui bus,
+  // The touch HUD's Jump and Kindle: the style's press sound on the ui bus,
   // like every og.ui button, beside the jump's or the fire's own effect.
   const tap = must(world.spawn({ name: `sfx-${Sound.Tap}` }));
   must(world.insert(tap, og.AudioSource, { sound: sound("audio/ui-press.ogt"), playing: false, bus: "ui", volume: 0.5, priority: 150 }));

package/archetypes/third-person/src/ui.ts

@@ -1,4 +1,4 @@
-// Ember Vale's screens on og.ui and the skin in assets/styles/ember (the
+// Ember Vale's screens on og.ui and the style in assets/styles/ember (the
 // engine's fantasy pack): the title over an orbit of the vale, the HUD
 // (hearts and beacons top-left, the dusk clock and pause top-right, the
 // kindling prompt and its progress at the bottom; on a touch screen a
@@ -421,7 +421,7 @@ export const Ui = defineSystem("Ui", { reads: [Tuning, og.Gamepad, og.Pointers],
       ],
       footer: say(world, og.ui.frameViewport().coarsePointer ? "title.footer.touch" : "title.footer"),
       // The title the game opens on is built settled: the web draws it behind the play gate, where
-      // the skin's entrance would stand part-way until the tap (og-platform-sdk §3). Later titles enter.
+      // the style's entrance would stand part-way until the tap (og-platform-sdk §3). Later titles enter.
       instant: !g.leftTitle,
     });
     if (!g.settingsOpen && r.selected === "play" && g.phase === Phase.Title) startRun(world, g);

package/archetypes/topdown/package.json

@@ -13,6 +13,6 @@
     "test": "og test ."
   },
   "dependencies": {
-    "@origingame/engine": "0.3.0"
+    "@origingame/engine": "0.4.0"
   }
 }

package/archetypes/topdown/project.ogt

@@ -3,7 +3,7 @@ version 1
 ---
 name "Tomb Room"
 id "topdown"
-engine "0.3.0"
+engine "0.4.0"
 entry "src/main.ts"
 profile "2d"
 tick 60

package/archetypes/tower-defense/package.json

@@ -13,6 +13,6 @@
     "test": "og test ."
   },
   "dependencies": {
-    "@origingame/engine": "0.3.0"
+    "@origingame/engine": "0.4.0"
   }
 }

package/archetypes/tower-defense/project.ogt

@@ -3,7 +3,7 @@ version 1
 ---
 name "Path Guard"
 id "tower-defense"
-engine "0.3.0"
+engine "0.4.0"
 entry "src/main.ts"
 profile "2d"
 tick 60

package/archetypes/tower-defense/src/components.ts

@@ -28,7 +28,7 @@ export const Refusal = { None: 0, Poor: 1, Blocked: 2, Taken: 3 } as const;
 /** The round: the lantern's light, the purse, the waves and the effects' bookkeeping. */
 export const Game = defineResource("Game", {
   phase: u32(Phase.Title, { doc: "Phase.* of src/components.ts." }),
-  leftTitle: bool(false, { doc: "The player has left the title the game opened on: from then on the title enters with the skin's entrance (the opening one is built settled, og.ui.mainMenu's instant: the web draws it behind the play gate)." }),
+  leftTitle: bool(false, { doc: "The player has left the title the game opened on: from then on the title enters with the style's entrance (the opening one is built settled, og.ui.mainMenu's instant: the web draws it behind the play gate)." }),
   paused: bool(false, { doc: "The pause menu is open (the garden holds)." }),
   settingsOpen: bool(false, { doc: "The settings dialog is open." }),
   won: bool(false, { doc: "The last round held every wave." }),

package/archetypes/tower-defense/src/main.ts

@@ -32,11 +32,11 @@ function must<T>(r: { ok: true; value?: T } | { ok: false; reason: string }): T
 
 function start(world: World): void {
   for (const l of LANGUAGES) must(og.i18n.load(world, `strings/${l.code}.ogt`));
-  const skin = must(og.load.style(world, "styles/pathguard/style.ogt"));
+  const style = must(og.load.style(world, "styles/pathguard/style.ogt"));
   const sound = (path: string) => must(og.load.sound(world, path));
   must(
     og.ui.configure(world, {
-      style: skin,
+      style,
       sounds: { press: sound("audio/ui-press.ogt"), open: sound("audio/ui-open.ogt"), close: sound("audio/ui-close.ogt"), error: sound("audio/ui-error.ogt"), success: sound("audio/ui-success.ogt") },
     }),
   );

package/archetypes/tower-defense/src/ui.ts

@@ -1,4 +1,4 @@
-// Path Guard's screens on og.ui and the skin in assets/styles/pathguard:
+// Path Guard's screens on og.ui and the style in assets/styles/pathguard:
 // the title, the HUD (the light and the coins in the top-left corner, the
 // wave and pause in the top-right, the plant tray on the right on a wide
 // screen and along the bottom on a phone), the pause menu, the settings
@@ -351,7 +351,7 @@ export const Ui = defineSystem("Ui", { reads: [Tuning], writes: [Game, Prefs, og
       ],
       footer: say(world, "title.footer"),
       // The title the game opens on is built settled: the web draws it behind the play gate, where
-      // the skin's entrance would stand part-way until the tap (og-platform-sdk §3). Later titles enter.
+      // the style's entrance would stand part-way until the tap (og-platform-sdk §3). Later titles enter.
       instant: !g.leftTitle,
     });
     if (!g.settingsOpen && r.selected === "play") startRound(world, g, t);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@origingame/create-game",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Scaffolds an Origin Engine game from the project template: npm create @origingame/game.",
   "license": "MIT",
   "repository": {
@@ -29,6 +29,6 @@
   ],
   "scripts": {
     "prepack": "bun scripts/pack-template.ts",
-    "test": "bun test ${OG_BUN_TEST_TIMEOUT:+--timeout=$OG_BUN_TEST_TIMEOUT} tests/"
+    "test": "bun scripts/pack-template.ts && bun test ${OG_BUN_TEST_TIMEOUT:+--timeout=$OG_BUN_TEST_TIMEOUT} tests/"
   }
 }

package/template/package.json

@@ -13,6 +13,6 @@
     "test": "og test ."
   },
   "dependencies": {
-    "@origingame/engine": "0.3.0"
+    "@origingame/engine": "0.4.0"
   }
 }

package/template/project.ogt

@@ -7,7 +7,7 @@ version 1
 name "Origin Game"
 id "origin-game"
 # The engine this game is written against (design §9: upgrades are explicit).
-engine "0.3.0"
+engine "0.4.0"
 entry "src/main.ts"
 # 2d (orthographic camera, sprites, 2D physics) or 3d.
 profile "3d"

package/template-2d/README.md

@@ -7,7 +7,8 @@ the rooftops of one level, takes coins, jumps up through one-way ledges and
 lands on them, loses a life in the pit and clears the level at the far
 wall; Escape (or the HUD's Pause) opens the pause menu. Beside the spawn a
 lamp keeper, a 2D skeletal rig, breathes on a ramp with its feet planted
-and walks along it when sent (`keeper:<x>`), stepping on the plank.
+and walks along it when sent (`keeper:<x>`): it turns over a few ticks,
+steps along the plank, lets both feet land and turns back.
 
 ```sh
 og run .     # headless with the probe; og dev . reloads on save
@@ -22,7 +23,7 @@ og build .   # the play page
 | The project in the 2D profile: an orthographic camera, sprites, 2D physics | `project.ogt`, `start` in `src/main.ts` | og-game §2, §8 |
 | A hand-written tilemap over a tileset: a parallax skyline, roofs that collide, ledges on their own collider layer (`colliderLayers 2`) that the controller makes one-way | `assets/maps/level.ogt`, `assets/tiles/city.ogt` | og-game §8 (the grammar) |
 | A flipbook sheet, its clips numbered in file order and checked against the code | `assets/sprites/courier.ogt`, `CLIP`, `checkClips` | og-game §8 |
-| A 2D skeletal rig: bones, slots, region attachments, a weighted-mesh cape the idle clip deforms, two-bone IK legs planted on a slope (og.IkTarget2D) and stepping along it under a walk clip with Bézier keys, its clip events (breaths, footfalls) read as og.Skeleton2DEvent, its lantern an og.Light2D under og.Lighting2D (layers 1 and 2) | `assets/rigs/keeper.ogt`, `spawnKeeper`, `Walk`, `Plant`, `tests/keeper.og.ts` | og-game §8 |
+| A 2D skeletal rig: bones, slots, region attachments, a weighted-mesh cape the idle clip deforms, two-bone IK legs planted on a slope (og.IkTarget2D) and stepping along it under a walk clip with Bézier keys (turning over 12 ticks, no foot faster than the gait's swing, settling before idle), its clip events (breaths, footfalls) read as og.Skeleton2DEvent, its lantern an og.Light2D under og.Lighting2D (layers 1 and 2) | `assets/rigs/keeper.ogt`, `spawnKeeper`, `Walk`, `Plant`, `tests/keeper.og.ts` | og-game §8 |
 | og.PlatformerController: run, jump (held for the full height), coyote time, the jump buffer, one-way ledges, Down to drop | `Control`, the hero in `start` | og-game §13; og-feel §12 |
 | The map's objects: the spawn, the coins, the goal | `start`, `Pickups` | og-game §8 |
 | Input on the press's tick: keys, a pad, the HUD's touch controls on a phone | `Control`, `Hud` | og-feel §1; og-ui §5 |

package/template-2d/package.json

@@ -13,6 +13,6 @@
     "test": "og test ."
   },
   "dependencies": {
-    "@origingame/engine": "0.3.0"
+    "@origingame/engine": "0.4.0"
   }
 }

package/template-2d/project.ogt

@@ -7,7 +7,7 @@ version 1
 name "Origin Game 2D"
 id "origin-game-2d"
 # The engine this game is written against (design §9: upgrades are explicit).
-engine "0.3.0"
+engine "0.4.0"
 entry "src/main.ts"
 # 2d: an orthographic camera, sprites, flipbooks, tilemaps and 2D physics.
 profile "2d"

package/template-2d/src/main.ts

@@ -16,9 +16,11 @@
 // idle clip deforms, whose feet two-bone IK planted on the slope
 // (og.IkTarget2D, the Plant system), and whose lantern lights the sprite
 // layers through og.Lighting2D (og-game §8; og-anim's 2D skeletons). Sent
-// along the ramp (`keeper:<x>`), it plays its walk clip there, each foot
-// planted while it carries the keeper and lifted while it swings, and
-// breathes again when it arrives (the Walk and Plant systems).
+// along the ramp (`keeper:<x>`), it turns to face the way (a paper turn
+// over a few ticks), plays its walk clip there, each foot planted while it
+// carries the keeper and lifted while it swings, lets both feet land when
+// it arrives, turns back and breathes again (the Walk and Plant systems).
+// No foot ever moves faster than the gait's own swing.
 //
 // The frame's look is data: GameDesc.look names a file under assets/looks/
 // that extends a preset of the style catalogue, applied before start runs.
@@ -47,6 +49,16 @@ const LIFT = 0.08;
 const LANTERN = { x: 0.25, y: 1.0 } as const;
 /** The keeper's gait: the walk clip's 0.8 s cycle carries it a stride of 0.4 m (a step per foot), each foot lifted at most `lift` mid-swing. */
 const WALK = { speed: 0.5, stride: 0.4, lift: 0.08 } as const;
+/**
+ * The fastest a foot moves (m/s): the gait's swing at its start, a stride
+ * forward in half a cycle (twice the walking speed) while it rises up the
+ * slope and off it (the lift's parabola, 4 lift over the swing's length,
+ * at its steepest). A foot sent elsewhere (setting off, stopping, a turn)
+ * steps there no faster.
+ */
+const FOOT_SPEED = Math.hypot(2 * WALK.speed, 2 * WALK.speed * RAMP.slope + (8 * WALK.lift * WALK.speed) / WALK.stride);
+/** A turn's ticks: the rig narrows to its edge and opens the other way (og.Transform's scale x, never 0). */
+const TURN_TICKS = 12;
 
 /** The courier. */
 export const Hero = defineComponent("Hero", { spawnX: f32(0, { unit: "m" }), spawnY: f32(0, { unit: "m" }) });
@@ -54,8 +66,17 @@ export const Hero = defineComponent("Hero", { spawnX: f32(0, { unit: "m" }), spa
 /** A coin of the map's `coin` objects; taken once. */
 export const Coin = defineComponent("Coin", { taken: bool() });
 
-/** One of the keeper's feet: its IK target stays on the ramp `dx` ahead of the keeper (behind when negative), `lag` of a gait cycle after the front foot. */
-export const Plant = defineComponent("Plant", { dx: f32(0, { unit: "m" }), lag: f32(0, { min: 0, max: 1 }) });
+/**
+ * One of the keeper's feet: its IK target stands on the ramp `dx` ahead of
+ * the keeper (behind when negative), `lag` of a gait cycle after the front
+ * foot; `x`, `y` is where the foot is.
+ */
+export const Plant = defineComponent("Plant", {
+  dx: f32(0, { unit: "m" }),
+  lag: f32(0, { min: 0, max: 1 }),
+  x: f32(0, { unit: "m" }),
+  y: f32(0, { unit: "m" }),
+});
 
 /** A voice: the sound bit (Sound) it plays when Game.sfx asks for it. */
 export const Voice = defineComponent("Voice", { bit: u32() });
@@ -86,13 +107,20 @@ export const Game = defineResource("Game", {
   steps: u32(),
 });
 
-/** Where the keeper walks (`keeper:<x>`), how far it has walked since it set off (its gait's phase), and its clips. */
+/** Where the keeper walks (`keeper:<x>`), how far it has walked since it set off (its gait's phase), its turn and stop, and its clips. */
 export const KeeperWalk = defineResource("KeeperWalk", {
   goal: f32(6, { unit: "m" }),
   walked: f32(0, { unit: "m" }),
   walking: bool(),
   /** -1 facing left (towards the spawn), 1 right. */
   facing: f32(-1),
+  /** Ticks of a turn done (0: not turning). */
+  turning: u32(),
+  /** og.Transform's scale x: 1, or through a turn from 1 towards -1. */
+  squash: f32(1),
+  /** Arrived, the feet stepping to stand (Plant sets `landed` when both are down). */
+  settling: bool(),
+  landed: bool(true),
   idle: u32(),
   walk: u32(),
 });
@@ -201,30 +229,62 @@ export const Animate = defineSystem("Animate", { reads: [Hero, og.PlatformerCont
 /**
  * Walks the keeper towards KeeperWalk.goal along the ramp at the gait's
  * speed (by scaled time, as the clip plays: paused, both hold), facing the
- * way it goes, with the walk clip; on arrival it faces the spawn again with
- * the idle clip (which starts over, breathing in).
+ * way it goes, with the walk clip. Facing the other way first, it turns
+ * over TURN_TICKS (og.Transform's scale x eased from 1 to -1, never 0, then
+ * flipX), its feet stepping across with it. On arrival it holds the walk
+ * pose until Plant has both feet down, turns to face the spawn, and once
+ * they are down again breathes with the idle clip (which starts over,
+ * breathing in).
  */
 export const Walk = defineSystem("Walk", { writes: [KeeperWalk, og.Skeleton2D, og.Transform], after: ["Control"] }, (_q, time, world) => {
   const keeper = world.find("keeper");
   if (keeper === null) return;
   const w = must(world.resource(KeeperWalk));
   const x = must(world.get(keeper, og.Transform)).position.x;
-  const left = w.goal - x;
-  if (left === 0 && !w.walking) return;
-  const step = WALK.speed * time.scaledDt;
-  const arrived = Math.abs(left) <= step;
-  const nx = arrived ? w.goal : x + Math.sign(left) * step;
-  w.walked = arrived ? 0 : (w.walking ? w.walked : 0) + Math.abs(nx - x);
-  w.walking = !arrived;
-  w.facing = arrived ? -1 : Math.sign(left);
-  must(world.set(keeper, og.Transform, { position: { x: nx, y: rampY(nx) + LIFT, z: 0 } }));
   const s = must(world.get(keeper, og.Skeleton2D));
-  const clip = arrived ? w.idle : w.walk;
-  const flipX = w.facing < 0;
-  // Only what changed: a new clip starts at 0 (the idle clip's breath, the walk's first step).
-  if (s.clip !== clip || s.flipX !== flipX) must(world.set(keeper, og.Skeleton2D, { clip, flipX }));
+  const place = (nx: number) => must(world.set(keeper, og.Transform, { position: { x: nx, y: rampY(nx) + LIFT, z: 0 }, scale: { x: w.squash, y: 1, z: 1 } }));
+  if (w.turning > 0 || (time.scaledDt > 0 && w.turning === 0 && wantsTurn(w, x))) {
+    // A turn: the rig narrows to its edge and opens facing the other way.
+    if (time.scaledDt === 0) return;
+    w.turning += 1;
+    if (w.turning < TURN_TICKS) {
+      w.squash = Math.cos((Math.PI * (w.turning - 0.5)) / (TURN_TICKS - 0.5));
+    } else {
+      w.turning = 0;
+      w.squash = 1;
+      w.facing = -w.facing;
+      must(world.set(keeper, og.Skeleton2D, { flipX: w.facing < 0 }));
+    }
+    place(x);
+    return;
+  }
+  const left = w.goal - x;
+  if (left !== 0) {
+    const step = WALK.speed * time.scaledDt;
+    const arrived = Math.abs(left) <= step;
+    const nx = arrived ? w.goal : x + Math.sign(left) * step;
+    w.walked = (w.walking ? w.walked : 0) + Math.abs(nx - x);
+    w.walking = !arrived;
+    w.settling = arrived;
+    w.landed = false;
+    place(nx);
+    // Walking plays the walk clip from its first step; arrived, it holds its pose while the feet land.
+    if (s.clip !== w.walk) must(world.set(keeper, og.Skeleton2D, { clip: w.walk, speed: 1 }));
+    else if (arrived) must(world.set(keeper, og.Skeleton2D, { speed: 0 }));
+    return;
+  }
+  if (w.settling && w.landed) w.settling = false;
+  // Standing, both feet down and facing the spawn: breathe.
+  if (!w.settling && w.landed && w.facing < 0 && s.clip !== w.idle) must(world.set(keeper, og.Skeleton2D, { clip: w.idle, speed: 1 }));
 });
 
+/** Whether the keeper must turn before it goes on: towards its goal, or back to the spawn once it stands with both feet down. */
+function wantsTurn(w: { goal: number; facing: number; settling: boolean; walking: boolean }, x: number): boolean {
+  const left = w.goal - x;
+  if (left !== 0) return Math.sign(left) !== w.facing && !w.walking;
+  return !w.settling && w.facing > 0;
+}
+
 /**
  * Puts the keeper's feet on the ramp (og.IkTarget2D: the legs' two-bone IK
  * reaches each target, the knees bend as the hip bobs). Standing, each foot
@@ -232,14 +292,19 @@ export const Walk = defineSystem("Walk", { writes: [KeeperWalk, og.Skeleton2D, o
  * distance walked over the stride and the back foot's half a cycle later:
  * for half a cycle a foot stays where it is on the plank while the keeper
  * passes over it, for the other half it swings a stride forward, lifted on
- * a parabola. Keeps the lantern's light at its hand, and counts the
- * clips' breaths and footfalls.
+ * a parabola. A foot steps to where it should be at most FOOT_SPEED fast,
+ * lifted while it is still on its way, so turning, setting off and
+ * stopping are steps, not jumps (each leg hangs from its own hip: the
+ * front foot crosses to the other side in a turn). Keeps the lantern's light at its hand, and
+ * counts the clips' breaths and footfalls.
  */
-export const Plant2D = defineSystem("Plant", { reads: [Plant, KeeperWalk, og.Skeleton2DEvent], writes: [Game, og.IkTarget2D, og.Transform], after: ["Walk"] }, (q, _time, world) => {
+export const Plant2D = defineSystem("Plant", { reads: [og.Skeleton2DEvent], writes: [Game, KeeperWalk, Plant, og.IkTarget2D, og.Transform], after: ["Walk"] }, (q, time, world) => {
   const keeper = world.find("keeper");
   if (keeper === null) return;
   const at = must(world.get(keeper, og.Transform)).position;
   const w = must(world.resource(KeeperWalk));
+  const reach = FOOT_SPEED * time.scaledDt;
+  let down = true;
   for (const a of q.archetypes()) {
     const plant = a.column(Plant);
     const target = a.column(og.IkTarget2D).target;
@@ -258,13 +323,22 @@ export const Plant2D = defineSystem("Plant", { reads: [Plant, KeeperWalk, og.Ske
           lift = WALK.lift * 4 * s * (1 - s);
         }
       }
-      const x = at.x + w.facing * ahead;
-      target[i * 2] = x;
-      target[i * 2 + 1] = rampY(x) + ANKLE + lift;
+      // Turning, each foot follows its hip as the rig narrows and opens the other way.
+      const wx = at.x + w.facing * w.squash * ahead;
+      const [x, y] = toward(plant.x[i]!, plant.y[i]!, wx, rampY(wx) + ANKLE + lift, reach);
+      // Still on its way: lifted with how far it has left (a step's height at half a stride), as fast as it may rise.
+      const rest = Math.abs(wx - x);
+      const [fx, fy] = rest > 1e-6 ? toward(plant.x[i]!, plant.y[i]!, x, Math.max(y, rampY(x) + ANKLE + WALK.lift * Math.min(1, rest / (WALK.stride / 2))), reach) : [x, y];
+      plant.x[i] = fx;
+      plant.y[i] = fy;
+      target[i * 2] = fx;
+      target[i * 2 + 1] = fy;
+      if (Math.hypot(wx - fx, rampY(wx) + ANKLE + lift - fy) > 1e-5 || lift > 0) down = false;
     }
   }
+  w.landed = down;
   const lantern = world.find("lantern");
-  if (lantern !== null) must(world.set(lantern, og.Transform, { position: { x: at.x - w.facing * LANTERN.x, y: at.y + LANTERN.y, z: 0 } }));
+  if (lantern !== null) must(world.set(lantern, og.Transform, { position: { x: at.x - w.facing * w.squash * LANTERN.x, y: at.y + LANTERN.y, z: 0 } }));
   const g = must(world.resource(Game));
   for (const e of world.events(og.Skeleton2DEvent)) {
     if (e.name === "inhale") g.inhales += 1;
@@ -272,6 +346,13 @@ export const Plant2D = defineSystem("Plant", { reads: [Plant, KeeperWalk, og.Ske
   }
 });
 
+/** (x, y) moved towards (tx, ty) by at most `reach`. */
+function toward(x: number, y: number, tx: number, ty: number, reach: number): [number, number] {
+  const d = Math.hypot(tx - x, ty - y);
+  if (d <= reach) return [tx, ty];
+  return [x + ((tx - x) * reach) / d, y + ((ty - y) * reach) / d];
+}
+
 /** Plays each sound asked for once: a voice still playing is stopped this tick and played again the next. */
 export const Voices = defineSystem("Voices", { reads: [Voice], writes: [Game, og.AudioSource], after: ["Pickups"] }, (q, _time, world) => {
   const g = must(world.resource(Game));
@@ -340,7 +421,7 @@ function spawnKeeper(world: World, rig: Rig2DInfo): void {
   const keeper = must(world.spawn({ name: "keeper", position: { x, y: rampY(x) + LIFT, z: 0 } }));
   must(world.insert(keeper, og.Skeleton2D, { rig: rig.rig, clip: idle, flipX: true, layer: 1 }));
   const w = must(world.resource(KeeperWalk));
-  Object.assign(w, { goal: x, walked: 0, walking: false, facing: -1, idle, walk });
+  Object.assign(w, { goal: x, walked: 0, walking: false, facing: -1, turning: 0, squash: 1, settling: false, landed: true, idle, walk });
   // Facing left, the front foot is the left one; the back foot steps half a cycle later.
   for (const [name, ahead, lag] of [["leg-f", 0.15, 0], ["leg-b", -0.15, 0.5]] as const) {
     const constraint = rig.constraints.indexOf(name);
@@ -348,7 +429,7 @@ function spawnKeeper(world: World, rig: Rig2DInfo): void {
     const fx = x - ahead;
     const foot = must(world.spawn({ name: `keeper-${name}` }));
     must(world.insert(foot, og.IkTarget2D, { skeleton: keeper, constraint, target: { x: fx, y: rampY(fx) + ANKLE }, tolerance: 0.02 }));
-    must(world.insert(foot, Plant, { dx: ahead, lag }));
+    must(world.insert(foot, Plant, { dx: ahead, lag, x: fx, y: rampY(fx) + ANKLE }));
   }
   const light = must(world.spawn({ name: "lantern", position: { x: x + LANTERN.x, y: rampY(x) + LIFT + LANTERN.y, z: 0 } }));
   must(world.insert(light, og.Light2D, { color: { r: 1, g: 0.72, b: 0.35 }, intensity: 1.6, radius: 4, castShadows: false }));

package/template-2d/tests/keeper.og.ts

@@ -3,7 +3,10 @@
 // the ramp and reached; `keeper:7` sends it walking up the ramp with its
 // walk clip, facing the way it goes, one foot planted on the plank while
 // the other swings above it; it arrives, faces the spawn and breathes again
-// with both feet planted, higher.
+// with both feet planted, higher. Every tick from the command to the end
+// is dumped: the turns take several ticks, and no foot ever moves further
+// in a tick than the gait's own swing does, setting off and stopping
+// included; the idle clip comes back only once both feet are down.
 import { playtest } from "@origingame/engine/playtest";
 
 interface Got<T> {
@@ -24,15 +27,38 @@ const LIFT = 0.08;
 /** The rig's clips, in file order. */
 const IDLE = 0;
 const WALK = 1;
+/**
+ * The most a foot moves in a 60 Hz tick: the gait's swing at its start,
+ * worked out by hand from src/main.ts's WALK and RAMP. Forward twice the
+ * walking speed, 1 m/s; up the 0.21256 slope at that, plus the lift's
+ * parabola at its steepest, 4 x 0.08 m over the swing's half cycle of
+ * 0.4 s (2.5 per second of its parameter), 0.8 m/s: 1.01256 m/s. Together
+ * 1.42316 m/s, 0.023719 m a tick.
+ */
+const STRIDE_STEP = 0.023719;
+/** The ticks dumped every tick: from just before `keeper:7` (2.2 s) to the end (5 s). */
+const FIRST = 130;
+const LAST = 300;
+const perTick = Array.from({ length: LAST - FIRST + 1 }, (_, i) => {
+  const k = FIRST + i;
+  const at = (j: number) => (k / 60 + 0.002 * j).toFixed(4);
+  return `${at(1)}:dump_entity:keeper:k${k}.json;${at(2)}:dump_entity:keeper-leg-f:f${k}.json;${at(3)}:dump_entity:keeper-leg-b:b${k}.json`;
+}).join(";");
 
 export default playtest({
   name: "The lamp keeper breathes on its ramp with both feet planted, walks up the slope stepping on the plank, and stands planted again",
-  commands:
-    "1.0:screenshot:keeper.png;1.01:dump_entity:keeper:keeper.json;1.02:dump_entity:keeper-leg-f:front.json;1.03:dump_entity:keeper-leg-b:back.json;" +
-    "2.1:get:Game:game.json;2.2:keeper:7;" +
-    "2.6:screenshot:walk.png;2.61:dump_entity:keeper:walk.json;2.62:dump_entity:keeper-leg-f:walk-front.json;2.63:dump_entity:keeper-leg-b:walk-back.json;" +
-    "2.9:dump_entity:keeper:walk-later.json;2.91:dump_entity:keeper-leg-f:walk-front-later.json;2.92:dump_entity:keeper-leg-b:walk-back-later.json;" +
-    "4.6:dump_entity:keeper:keeper-up.json;4.61:dump_entity:keeper-leg-f:front-up.json;4.62:dump_entity:keeper-leg-b:back-up.json;4.7:get:Game:game-end.json;4.8:quit",
+  commands: [
+    "1.0:screenshot:keeper.png;1.01:dump_entity:keeper:keeper.json;1.02:dump_entity:keeper-leg-f:front.json;1.03:dump_entity:keeper-leg-b:back.json",
+    "2.1:get:Game:game.json;2.2:keeper:7",
+    "2.85:screenshot:walk.png;2.851:dump_entity:keeper:walk.json;2.852:dump_entity:keeper-leg-f:walk-front.json;2.853:dump_entity:keeper-leg-b:walk-back.json",
+    "3.15:dump_entity:keeper:walk-later.json;3.151:dump_entity:keeper-leg-f:walk-front-later.json;3.152:dump_entity:keeper-leg-b:walk-back-later.json",
+    perTick,
+    "5.1:dump_entity:keeper:keeper-up.json;5.11:dump_entity:keeper-leg-f:front-up.json;5.12:dump_entity:keeper-leg-b:back-up.json;5.2:get:Game:game-end.json;5.3:quit",
+  ]
+    .join(";")
+    .split(";")
+    .sort((a, b) => Number(a.split(":")[0]) - Number(b.split(":")[0]))
+    .join(";"),
   check(run, t) {
     t.ok(run.quit, "the script reached quit");
     for (const png of ["keeper.png", "walk.png"]) {
@@ -73,7 +99,7 @@ export default playtest({
       }
     }
     t.ok(planted >= 2, `while it walks a foot stays planted on the plank (${planted} of 4 targets on it)`);
-    // The back foot carried the keeper from 2.6 s to 2.9 s: it did not move.
+    // The back foot carried the keeper from 2.85 s to 3.15 s (the walk starts after the turn): it did not move.
     const before = foot("walk-back.json")["target"] as number[];
     const later = foot("walk-back-later.json")["target"] as number[];
     t.ok(Math.abs(before[0]! - later[0]!) < 1e-4 && Math.abs(before[1]! - later[1]!) < 1e-4, `the planted foot stays put while the keeper passes over it (${before.join(", ")} then ${later.join(", ")})`);
@@ -82,6 +108,65 @@ export default playtest({
     const up = skeleton("keeper-up.json");
     t.ok(up["clip"] === IDLE && up["flipX"] === true && Math.abs(at("keeper-up.json") - 7) < 1e-4, `it arrived at 7 and breathes facing the spawn (clip ${up["clip"]}, x ${at("keeper-up.json")})`);
 
+    // Tick by tick: the keeper's scale x, facing, clip and place, and each foot's target.
+    const ticks = Array.from({ length: LAST - FIRST + 1 }, (_, i) => {
+      const k = FIRST + i;
+      const keeper = run.json<EntityDump>(`k${k}.json`).components;
+      const s = keeper["og.Skeleton2D"]!;
+      return {
+        k,
+        x: (keeper["og.Transform"]!["position"] as number[])[0]!,
+        squash: (keeper["og.Transform"]!["scale"] as number[])[0]!,
+        flipX: s["flipX"] === true,
+        clip: s["clip"] as number,
+        feet: [`f${k}.json`, `b${k}.json`].map((f) => foot(f)["target"] as number[]),
+      };
+    });
+    // No foot moves further in a tick than the gait's swing: setting off, walking, stopping and both turns.
+    let worst = 0;
+    let worstAt = 0;
+    for (let i = 1; i < ticks.length; i++) {
+      for (const f of [0, 1]) {
+        const [a, b] = [ticks[i - 1]!.feet[f]!, ticks[i]!.feet[f]!];
+        const d = Math.hypot(b[0]! - a[0]!, b[1]! - a[1]!);
+        if (d > worst) [worst, worstAt] = [d, ticks[i]!.k];
+      }
+    }
+    t.ok(worst <= STRIDE_STEP + 1e-6, `no foot moves more than a gait tick's ${STRIDE_STEP} m in one tick (at most ${worst.toFixed(6)} m, tick ${worstAt})`);
+    // The walk itself moves the swinging foot nearly that far, so the bound is the gait's, not a loose one.
+    t.ok(worst > STRIDE_STEP * 0.9, `the walk's swing reaches the bound (${worst.toFixed(6)} m)`);
+    // Each turn: several ticks of a narrowed rig (never edge-on), standing still, between one facing and the other.
+    const turns: { from: number; to: number; ticks: number; still: boolean; steady: boolean }[] = [];
+    for (let i = 1; i < ticks.length; i++) {
+      if (ticks[i]!.flipX === ticks[i - 1]!.flipX) continue;
+      let j = i - 1;
+      while (j > 0 && ticks[j]!.squash !== 1) j--;
+      const span = ticks.slice(j, i + 1);
+      turns.push({
+        from: ticks[j]!.k,
+        to: ticks[i]!.k,
+        ticks: i - j - 1,
+        still: span.every((u) => Math.abs(u.x - span[0]!.x) < 1e-6),
+        steady: span.every((u, n) => u.squash !== 0 && (n === 0 || Math.abs(u.squash * (u.flipX ? -1 : 1) - span[n - 1]!.squash * (span[n - 1]!.flipX ? -1 : 1)) <= 0.5)),
+      });
+    }
+    t.ok(turns.length === 2, `the keeper turned twice: setting off and on arrival (${turns.length})`);
+    for (const u of turns) {
+      t.ok(u.ticks >= 4 && u.still && u.steady, `a turn (ticks ${u.from} to ${u.to}) narrows the rig over ${u.ticks} ticks in place, never edge-on or by half its width at once`);
+    }
+    // The stop: the idle clip returns only with both feet down on the ramp, where they stand.
+    const back = ticks.findIndex((u, i) => i > 0 && u.clip === IDLE && ticks[i - 1]!.clip !== IDLE);
+    t.ok(back > 0, `the idle clip came back (tick ${ticks[back]?.k})`);
+    if (back > 0) {
+      const u = ticks[back]!;
+      for (const [f, dx] of [[0, -0.15], [1, 0.15]] as const) {
+        const [fx, fy] = u.feet[f]!;
+        t.ok(Math.abs(fx! - (u.x + dx)) < 1e-4 && Math.abs(fy! - ankleY(fx!)) < 1e-4, `when idle returns, foot ${f} is down where it stands (${fx}, ${fy})`);
+      }
+      const arrived = ticks.findIndex((v) => Math.abs(v.x - 7) < 1e-6);
+      t.ok(arrived > 0 && back - arrived > 1, `between arriving (tick ${ticks[arrived]?.k}) and breathing (tick ${u.k}) the feet land and the keeper turns`);
+    }
+
     // A loop of 2 s from tick 0 to 2.1 s passed its event at 0 and at 2; the walk
     // (2 s at 0.5 m/s, a step every 0.4 s) stepped 5 times, and the idle clip
     // started over on arrival with a breath.