@energy8platform/shell 0.6.4 → 0.6.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@energy8platform/shell",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "description": "Energy8 branded game shell — one logic core, pluggable html/pixi renderers behind a stable contract.",
   "type": "module",
   "main": "./dist/index.cjs.js",

package/src/core/ShellController.ts

@@ -304,9 +304,9 @@ export class ShellController extends EventEmitter<ShellEvents> implements ShellH
   }
 
   // ── game-facing public API (mirrors GameShell/PixiGameShell) ───────────────────
-  private money(field: 'balance' | 'win', from: number, to: number): void {
+  private money(field: 'balance' | 'win', from: number, to: number, durationMs?: number): void {
     this.renderer.renderBar();
-    if (to !== from) this.renderer.animateMoney(field, from, to);
+    if (to !== from) this.renderer.animateMoney(field, from, to, durationMs);
   }
   setBalance(n: number): void {
     const from = this.prevBalance;
@@ -316,8 +316,10 @@ export class ShellController extends EventEmitter<ShellEvents> implements ShellH
   }
   /** Set the WIN readout. Counts up/down from the previous value by default. Pass
    *  `{ animate: false }` to SNAP instantly (renderBar cancels any in-flight count-up) — used by the
-   *  host to clear WIN to 0 at spin start, where an animated count-DOWN would look wrong. */
-  setWin(n: number, opts?: { animate?: boolean }): void {
+   *  host to clear WIN to 0 at spin start, where an animated count-DOWN would look wrong.
+   *  `{ durationMs }` shortens/lengthens the count-up (default 450ms) — a scene reporting a win per
+   *  cascade step passes its step length so each count-up finishes before the next step lands. */
+  setWin(n: number, opts?: { animate?: boolean; durationMs?: number }): void {
     const from = this.prevWin;
     this.state.win = n;
     this.prevWin = n;
@@ -325,7 +327,7 @@ export class ShellController extends EventEmitter<ShellEvents> implements ShellH
       this.renderer.renderBar(); // instant repaint from state; cancels running money anims
       return;
     }
-    this.money('win', from, n);
+    this.money('win', from, n, opts?.durationMs);
   }
   setBet(n: number): void {
     this.state.bet = n;

package/src/core/renderer.ts

@@ -18,8 +18,10 @@ export interface ShellRenderer {
   setLayout(layout: ShellLayoutMode): void;
   /** Apply colour tokens (CSS vars in DOM / repaint in Pixi). */
   applyTheme(tokens: ShellTokens): void;
-  /** Count a money readout from→to on the freshly-rendered bar (DOM rAF / Pixi ticker). */
-  animateMoney(field: 'balance' | 'win', from: number, to: number): void;
+  /** Count a money readout from→to on the freshly-rendered bar (DOM rAF / Pixi ticker).
+   *  `durationMs` overrides the renderer's default count-up length — a cascade/tumble scene
+   *  reporting a win per step needs each count-up to fit inside its step. */
+  animateMoney(field: 'balance' | 'win', from: number, to: number, durationMs?: number): void;
   /** Build + show an overlay from a controller-supplied model; return a handle for key routing
    *  and programmatic close. Returns void when nothing was shown. */
   openOverlay(req: OverlayRequest): OverlayHandle | void;
@@ -86,6 +88,11 @@ export interface ShellHost {
   setVolumeRefresh(fn: ((key: VolumeKey, value: number) => void) | null): void;
   /** Logic-bearing actions invoked by renderer controls. */
   readonly actions: ShellActions;
+  /** Re-show the replay summary modal through the controller (keeps its OverlayHandle in sync).
+   *  Used as the modal's own reopen callback after START REPLAY, so a renderer never re-pushes a
+   *  replay modal behind the controller's back (which would strand `overlay` and dead-end the
+   *  next close). */
+  openReplay(opts: ReplayModalOptions): void;
 }
 
 /** Every state-changing thing a control can do. Each runs logic in the controller, emits the

package/src/core/version.ts

@@ -1,3 +1,3 @@
 // AUTO-GENERATED by scripts/gen-version.mjs — do not edit. Mirrors package.json "version".
 /** The @energy8platform/shell package version, stamped into the game-info footer. */
-export const PACKAGE_VERSION = '0.6.4';
+export const PACKAGE_VERSION = '0.6.6';

package/src/ui/html/HtmlRenderer.ts

@@ -19,10 +19,10 @@ const REMOVE_FADE_MS = 300;
 
 /** Count-up the value span (.ge-rd-val) of a readout, leaving its label untouched.
  *  Returns the count-up canceler so the renderer can stop it before the node is replaced. */
-function animateReadout(el: HTMLElement, from: number, to: number, fmt: (n: number) => string): () => void {
+function animateReadout(el: HTMLElement, from: number, to: number, fmt: (n: number) => string, durationMs?: number): () => void {
   const val = el.querySelector('.ge-rd-val') as HTMLElement | null;
   if (!val) { el.textContent = fmt(to); return () => {}; }
-  return countUp(val, from, to, fmt);
+  return durationMs == null ? countUp(val, from, to, fmt) : countUp(val, from, to, fmt, durationMs);
 }
 
 export class HtmlRenderer implements ShellRenderer {
@@ -87,10 +87,10 @@ export class HtmlRenderer implements ShellRenderer {
     this.renderBar();
   }
 
-  animateMoney(field: 'balance' | 'win', from: number, to: number): void {
+  animateMoney(field: 'balance' | 'win', from: number, to: number, durationMs?: number): void {
     const fmt = (n: number) => this.host.formatCurrency(n, field === 'win');
     const el = this.barHost.querySelector(`[data-ge="${field}"]`) as HTMLElement | null;
-    if (el) this.moneyAnims.push(animateReadout(el, from, to, fmt));
+    if (el) this.moneyAnims.push(animateReadout(el, from, to, fmt, durationMs));
   }
 
   openOverlay(req: OverlayRequest): OverlayHandle | void {
@@ -162,7 +162,9 @@ export class HtmlRenderer implements ShellRenderer {
       }
       case 'replay': {
         const opts = req.opts;
-        const reopen = (): void => { this.openReplayInternal(opts); };
+        // Reopen through the controller (not a renderer-direct re-push) so its OverlayHandle stays
+        // in sync — otherwise a reopened replay modal is untracked and the next close no-ops.
+        const reopen = (): void => { this.host.openReplay(opts); };
         const root = buildReplayModal(this.host, opts, reopen);
         return { root };
       }
@@ -173,14 +175,6 @@ export class HtmlRenderer implements ShellRenderer {
     }
   }
 
-  /** Opens a replay modal and shows it — used as the reopen callback after START REPLAY. */
-  private openReplayInternal(opts: import('@/core/types').ReplayModalOptions): void {
-    if (this.destroyed) return;
-    const reopen = (): void => { this.openReplayInternal(opts); };
-    const root = buildReplayModal(this.host, opts, reopen);
-    this.showModal(root);
-  }
-
   private showModal(el: HTMLElement, onKey?: (e: KeyboardEvent) => boolean): void {
     // Drop focus from any open shell control so a stray Space/Enter doesn't re-activate it
     const active = document.activeElement as HTMLElement | null;

package/src/ui/pixi/PixiRenderer.ts

@@ -6,6 +6,7 @@ import {
   RenderTexture,
   Sprite,
   type Application,
+  type Text,
   type Ticker,
 } from 'pixi.js';
 import type { ShellRenderer, ShellHost, OverlayRequest, OverlayHandle } from '@/core/renderer';
@@ -20,7 +21,6 @@ import { openBuyBonus } from './components/BuyBonus';
 import { openBetPicker, openAutoplayPicker } from './components/pickers';
 import { buildModal } from './components/Modal';
 import { buildReplayModal } from './components/ReplayModal';
-import type { ReplayModalOptions } from '@/core/types';
 
 export interface PixiRendererOptions {
   app: Application;
@@ -110,16 +110,17 @@ export class PixiRenderer implements ShellRenderer {
 
   /** Count a money readout from→to on the freshly-rendered bar's value Text node. Mirrors
    *  PixiGameShell.animateMoney (which counted on the just-built bar's value Texts). */
-  animateMoney(field: 'balance' | 'win', from: number, to: number): void {
+  animateMoney(field: 'balance' | 'win', from: number, to: number, durationMs?: number): void {
     if (!this.bar) return;
+    // countUpText defaults durationMs to 450 — pass it only when the caller overrode it.
+    const count = (text: Text, fmt: (n: number) => string) =>
+      durationMs == null
+        ? countUpText(this.ticker, text, from, to, fmt)
+        : countUpText(this.ticker, text, from, to, fmt, durationMs);
     if (field === 'balance' && this.bar.balanceValue) {
-      this.moneyAnims.push(
-        countUpText(this.ticker, this.bar.balanceValue, from, to, (n) => this.ctx.fmt(n)),
-      );
+      this.moneyAnims.push(count(this.bar.balanceValue, (n) => this.ctx.fmt(n)));
     } else if (field === 'win' && this.bar.winValue) {
-      this.moneyAnims.push(
-        countUpText(this.ticker, this.bar.winValue, from, to, (n) => this.ctx.fmtWin(n)),
-      );
+      this.moneyAnims.push(count(this.bar.winValue, (n) => this.ctx.fmtWin(n)));
     }
   }
 
@@ -147,7 +148,7 @@ export class PixiRenderer implements ShellRenderer {
         layer = openAutoplayPicker(this.ctx);
         break;
       case 'replay':
-        layer = buildReplayModal(this.ctx, req.opts, () => this.openReplayInternal(req.opts));
+        layer = buildReplayModal(this.ctx, req.opts, () => this.host.openReplay(req.opts));
         break;
       case 'modal':
         layer = buildModal(this.ctx, req.opts);
@@ -226,15 +227,6 @@ export class PixiRenderer implements ShellRenderer {
     this.currentLayer?.fit?.();
   }
 
-  /** Replay's reopen path: a replay modal can rebuild itself (e.g. after a replay completes). It is
-   *  routed back through the controller-equivalent open flow so the layer stack + backdrop stay in
-   *  sync — mirrors PixiGameShell.openReplay (push a fresh replay modal). */
-  private openReplayInternal(opts: ReplayModalOptions): void {
-    if (this.destroyed) return;
-    const layer = buildReplayModal(this.ctx, opts, () => this.openReplayInternal(opts));
-    this.pushLayer(layer);
-  }
-
   // ── frosted backdrop ─────────────────────────────────────────────────────────
   /** Snapshot the scene behind the modal layer and blur it — the Pixi analogue of the overlay's
    *  `backdrop-filter: blur(20px) saturate(120%)`. Static (captured at open time): the game is paused
@@ -333,6 +325,7 @@ export class PixiRenderer implements ShellRenderer {
       get layout() { return host.layout; },
       get soundOn() { return host.soundOn; },
       get actions() { return host.actions; },
+      openReplay: (opts) => host.openReplay(opts),
       t: (s) => host.t(s),
       formatCurrency: (n, win) => host.formatCurrency(n, win),
       emit: host.emit.bind(host),

package/src/ui/pixi/text.ts

@@ -103,6 +103,11 @@ export function makeText(str: string, opts: TextOpts): Text {
   if (opts.wrapWidth != null) {
     style.wordWrap = true;
     style.wordWrapWidth = opts.wrapWidth;
+    // CJK (and any long unbroken run) has no spaces to wrap on — without breakWords the line
+    // overflows the wrap width instead of wrapping. This is the single shell text helper (How to
+    // Play, disclaimer, Game Info section titles, mode table, win messages, buy-bonus cards), so
+    // one flag fixes wrapping everywhere.
+    style.breakWords = true;
   }
   if (opts.lineHeight != null) style.lineHeight = opts.lineHeight;
   if (opts.shadow) {