@datamoc/mw_games 0.7.4 → 0.7.7

package/dist/battle/UnitSelector.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"UnitSelector.d.ts","sourceRoot":"","sources":["../../src/battle/UnitSelector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,MAAM,WAAW,cAAc;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,yFAAyF;IACzF,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IACnC,KAAK,EAAE,SAAS,cAAc,EAAE,CAAC;IACjC,0EAA0E;IAC1E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,oFAAoF;IACpF,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,OAAO,CAAC;IAC7C,6EAA6E;IAC7E,SAAS,CAAC,EAAE,CAAC,QAAQ,EAAE,cAAc,EAAE,MAAM,EAAE,cAAc,KAAK,OAAO,CAAC;CAC1E;AAED,MAAM,MAAM,aAAa,GAAG,UAAU,GAAG,QAAQ,CAAC;AAElD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBAAa,YAAY;IACxB,QAAQ,CAAC,QAAQ,eAAsB;IAEvC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA4B;IAClD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;IAC/D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgE;IAE1F,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,MAAM,CAA+B;IAC7C,OAAO,CAAC,MAAM,CAA+B;IAC7C,OAAO,CAAC,UAAU,CAAK;IAEvB,YAAY,OAAO,EAAE,mBAAmB,EAKvC;IAED,IAAI,KAAK,IAAI,aAAa,CAEzB;IAED,IAAI,QAAQ,IAAI,cAAc,GAAG,IAAI,CAEpC;IAED,IAAI,MAAM,IAAI,cAAc,GAAG,IAAI,CAElC;IAED,+DAA+D;IAC/D,IAAI,IAAI,IAAI,OAAO,CAElB;IAED,mDAAmD;IACnD,IAAI,UAAU,IAAI,SAAS,cAAc,EAAE,CAI1C;IAED,+EAA+E;IAC/E,IAAI,OAAO,IAAI,SAAS,cAAc,EAAE,CAUvC;IAED,wDAAwD;IACxD,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,IAAI,WAAW,IAAI,cAAc,GAAG,IAAI,CAGvC;IAED,kFAAkF;IAClF,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAKxB;IAED,yFAAyF;IACzF,MAAM,IAAI,OAAO,CAYhB;IAED,0EAA0E;IAC1E,IAAI,IAAI,IAAI,CASX;IAED,KAAK,IAAI,IAAI,CAMZ;IAED,OAAO,CAAC,MAAM;CAGd"}

package/dist/battle/UnitSelector.js

@@ -0,0 +1,117 @@
+import { Signal } from '../core/Signal.js';
+/**
+ * The two-step unit selector an attack starts with: pick who attacks, then pick what they attack.
+ *
+ * Renderer-free, so the choosing rules are tested without a board: `candidates` are the enabled
+ * units on the selecting side, `targets` are the enabled units that pass `canTarget` once an
+ * attacker is chosen, `move` walks the active list and `select` advances a stage. `back` undoes the
+ * attacker choice rather than only the target, so a player who picked the wrong attacker lands
+ * where they can pick again rather than being stuck one step in.
+ *
+ * @example
+ * ```ts
+ * import { UnitSelector } from '@datamoc/mw_games/battle';
+ *
+ * const selector = new UnitSelector({
+ *   units: [{ id: 'hero', side: '1' }, { id: 'rat', side: '2' }],
+ *   side: '1',
+ * });
+ * selector.select(); // hero attacks
+ * console.log(selector.targets.map((unit) => unit.id)); // ['rat']
+ * ```
+ */
+export class UnitSelector {
+    constructor(options) {
+        this.onChange = new Signal();
+        this.stage_ = 'attacker';
+        this.charge = null;
+        this.victim = null;
+        this.highlight_ = 0;
+        this.units = options.units;
+        this.side = options.side;
+        this.disabledOf = options.disabled ?? ((unit) => unit.disabled ?? false);
+        this.canTarget = options.canTarget ?? (() => true);
+    }
+    get stage() {
+        return this.stage_;
+    }
+    get attacker() {
+        return this.charge;
+    }
+    get target() {
+        return this.victim;
+    }
+    /** both steps are done, so the caller has an attack to make */
+    get done() {
+        return this.charge !== null && this.victim !== null;
+    }
+    /** the units that may be picked as the attacker */
+    get candidates() {
+        return this.units.filter((unit) => (this.side === undefined || unit.side === this.side) && !this.disabledOf(unit));
+    }
+    /** the units the chosen attacker may hit; empty until an attacker is chosen */
+    get targets() {
+        const attacker = this.charge;
+        if (!attacker)
+            return [];
+        return this.units.filter((unit) => unit.id !== attacker.id &&
+            !this.disabledOf(unit) &&
+            !(attacker.side !== undefined && unit.side === attacker.side) &&
+            this.canTarget(attacker, unit));
+    }
+    /** the index of the highlight within the active list */
+    get highlight() {
+        return this.highlight_;
+    }
+    get highlighted() {
+        const list = this.active();
+        return list[this.highlight_] ?? null;
+    }
+    /** moves the highlight, wrapping at both ends, within whichever list is active */
+    move(delta) {
+        const list = this.active();
+        if (list.length === 0)
+            return;
+        this.highlight_ = (((this.highlight_ + delta) % list.length) + list.length) % list.length;
+        this.onChange.dispatch();
+    }
+    /** takes the highlighted unit: on the attacker stage it advances to choosing a target */
+    select() {
+        const chosen = this.highlighted;
+        if (!chosen)
+            return false;
+        if (this.stage_ === 'attacker') {
+            this.charge = chosen;
+            this.stage_ = 'target';
+            this.highlight_ = 0;
+        }
+        else {
+            this.victim = chosen;
+        }
+        this.onChange.dispatch();
+        return true;
+    }
+    /** undoes the attacker choice, so a wrong attacker can be picked again */
+    back() {
+        if (this.stage_ === 'attacker')
+            return;
+        const previous = this.charge;
+        this.charge = null;
+        this.victim = null;
+        this.stage_ = 'attacker';
+        const index = previous ? this.candidates.findIndex((unit) => unit.id === previous.id) : -1;
+        this.highlight_ = index >= 0 ? index : 0;
+        this.onChange.dispatch();
+    }
+    reset() {
+        this.charge = null;
+        this.victim = null;
+        this.stage_ = 'attacker';
+        this.highlight_ = 0;
+        this.onChange.dispatch();
+    }
+    active() {
+        return this.stage_ === 'attacker' ? this.candidates : this.targets;
+    }
+}
+//# sourceMappingURL=UnitSelector.js.map

package/dist/battle/UnitSelector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"UnitSelector.js","sourceRoot":"","sources":["../../src/battle/UnitSelector.ts"],"names":[],"mappings":"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"}

package/dist/battle/Whiteboard.d.ts

@@ -0,0 +1,50 @@
+import { Signal } from '../core/Signal.ts';
+export interface WhiteboardEntry {
+    /** the unit the plan is for; one plan per unit, the way a turn's moves are planned */
+    unit: string;
+}
+/**
+ * The planned-but-uncommitted orders of a turn - Wesnoth's whiteboard - with undo across them.
+ *
+ * A plan is one entry per unit, so replanning a unit replaces its earlier order in place rather
+ * than stacking a second one for the same unit: what is on the board is the turn as it would be
+ * played, not the history of how a player got there. Undo pops the last plan onto a redo stack
+ * (planning again clears that stack, the usual undo contract), and `commit` hands the plans to the
+ * caller, which is where the framework stops - actually executing them is the game's turn.
+ *
+ * @example
+ * ```ts
+ * import { Whiteboard } from '@datamoc/mw_games/battle';
+ *
+ * const board = new Whiteboard<{ unit: string; x: number; y: number }>();
+ * board.plan({ unit: 'hero', x: 2, y: 3 });
+ * board.plan({ unit: 'archer', x: 5, y: 1 });
+ * board.undo();
+ * console.log(board.plans); // [{ unit: 'hero', x: 2, y: 3 }]
+ * ```
+ */
+export declare class Whiteboard<T extends WhiteboardEntry = WhiteboardEntry> {
+    readonly onChange: Signal<void>;
+    private planned;
+    private undone;
+    get plans(): readonly T[];
+    get isEmpty(): boolean;
+    get canUndo(): boolean;
+    get canRedo(): boolean;
+    /** the plan for a unit, if it has one on the board */
+    plannedFor(unit: string): T | undefined;
+    /** adds or replaces a unit's plan; clears the redo stack, as planning after undo does */
+    plan(action: T): void;
+    /** takes the last plan off the board, returning it so a caller can put it back */
+    undo(): T | null;
+    /** puts the last undone plan back, replacing any plan the unit has picked up since */
+    redo(): T | null;
+    /** empties the board, both the plans and anything undone */
+    clear(): void;
+    /**
+     * Hands the plans to the caller and empties the board - the moment a turn stops being a plan.
+     * The orders are returned in planning order.
+     */
+    commit(): T[];
+}
+//# sourceMappingURL=Whiteboard.d.ts.map

package/dist/battle/Whiteboard.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Whiteboard.d.ts","sourceRoot":"","sources":["../../src/battle/Whiteboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,MAAM,WAAW,eAAe;IAC/B,sFAAsF;IACtF,IAAI,EAAE,MAAM,CAAC;CACb;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,qBAAa,UAAU,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe;IAClE,QAAQ,CAAC,QAAQ,eAAsB;IAEvC,OAAO,CAAC,OAAO,CAAW;IAC1B,OAAO,CAAC,MAAM,CAAW;IAEzB,IAAI,KAAK,IAAI,SAAS,CAAC,EAAE,CAExB;IAED,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,sDAAsD;IACtD,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS,CAEtC;IAED,yFAAyF;IACzF,IAAI,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,CAMpB;IAED,kFAAkF;IAClF,IAAI,IAAI,CAAC,GAAG,IAAI,CAMf;IAED,sFAAsF;IACtF,IAAI,IAAI,CAAC,GAAG,IAAI,CAOf;IAED,4DAA4D;IAC5D,KAAK,IAAI,IAAI,CAKZ;IAED;;;OAGG;IACH,MAAM,IAAI,CAAC,EAAE,CAMZ;CACD"}

package/dist/battle/Whiteboard.js

@@ -0,0 +1,94 @@
+import { Signal } from '../core/Signal.js';
+/**
+ * The planned-but-uncommitted orders of a turn - Wesnoth's whiteboard - with undo across them.
+ *
+ * A plan is one entry per unit, so replanning a unit replaces its earlier order in place rather
+ * than stacking a second one for the same unit: what is on the board is the turn as it would be
+ * played, not the history of how a player got there. Undo pops the last plan onto a redo stack
+ * (planning again clears that stack, the usual undo contract), and `commit` hands the plans to the
+ * caller, which is where the framework stops - actually executing them is the game's turn.
+ *
+ * @example
+ * ```ts
+ * import { Whiteboard } from '@datamoc/mw_games/battle';
+ *
+ * const board = new Whiteboard<{ unit: string; x: number; y: number }>();
+ * board.plan({ unit: 'hero', x: 2, y: 3 });
+ * board.plan({ unit: 'archer', x: 5, y: 1 });
+ * board.undo();
+ * console.log(board.plans); // [{ unit: 'hero', x: 2, y: 3 }]
+ * ```
+ */
+export class Whiteboard {
+    constructor() {
+        this.onChange = new Signal();
+        this.planned = [];
+        this.undone = [];
+    }
+    get plans() {
+        return this.planned;
+    }
+    get isEmpty() {
+        return this.planned.length === 0;
+    }
+    get canUndo() {
+        return this.planned.length > 0;
+    }
+    get canRedo() {
+        return this.undone.length > 0;
+    }
+    /** the plan for a unit, if it has one on the board */
+    plannedFor(unit) {
+        return this.planned.find((entry) => entry.unit === unit);
+    }
+    /** adds or replaces a unit's plan; clears the redo stack, as planning after undo does */
+    plan(action) {
+        const index = this.planned.findIndex((entry) => entry.unit === action.unit);
+        if (index >= 0)
+            this.planned[index] = action;
+        else
+            this.planned.push(action);
+        this.undone = [];
+        this.onChange.dispatch();
+    }
+    /** takes the last plan off the board, returning it so a caller can put it back */
+    undo() {
+        const entry = this.planned.pop();
+        if (!entry)
+            return null;
+        this.undone.push(entry);
+        this.onChange.dispatch();
+        return entry;
+    }
+    /** puts the last undone plan back, replacing any plan the unit has picked up since */
+    redo() {
+        const entry = this.undone.pop();
+        if (!entry)
+            return null;
+        this.planned = this.planned.filter((candidate) => candidate.unit !== entry.unit);
+        this.planned.push(entry);
+        this.onChange.dispatch();
+        return entry;
+    }
+    /** empties the board, both the plans and anything undone */
+    clear() {
+        if (this.planned.length === 0 && this.undone.length === 0)
+            return;
+        this.planned = [];
+        this.undone = [];
+        this.onChange.dispatch();
+    }
+    /**
+     * Hands the plans to the caller and empties the board - the moment a turn stops being a plan.
+     * The orders are returned in planning order.
+     */
+    commit() {
+        const committed = this.planned;
+        this.planned = [];
+        this.undone = [];
+        if (committed.length > 0)
+            this.onChange.dispatch();
+        return committed;
+    }
+}
+//# sourceMappingURL=Whiteboard.js.map

package/dist/battle/Whiteboard.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Whiteboard.js","sourceRoot":"","sources":["../../src/battle/Whiteboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAO3C;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,OAAO,UAAU;IAAvB;QACU,aAAQ,GAAG,IAAI,MAAM,EAAQ,CAAC;QAE/B,YAAO,GAAQ,EAAE,CAAC;QAClB,WAAM,GAAQ,EAAE,CAAC;IAsE1B,CAAC;IApEA,IAAI,KAAK;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;IAED,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC;IAClC,CAAC;IAED,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;IAChC,CAAC;IAED,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;IAC/B,CAAC;IAED,sDAAsD;IACtD,UAAU,CAAC,IAAY;QACtB,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IAC1D,CAAC;IAED,yFAAyF;IACzF,IAAI,CAAC,MAAS;QACb,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC;QAC5E,IAAI,KAAK,IAAI,CAAC;YAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC;;YACxC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAC1B,CAAC;IAED,kFAAkF;IAClF,IAAI;QACH,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;QACjC,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxB,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC;IACd,CAAC;IAED,sFAAsF;IACtF,IAAI;QACH,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;QAChC,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC;QACjF,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzB,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC;IACd,CAAC;IAED,4DAA4D;IAC5D,KAAK;QACJ,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAClE,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAC1B,CAAC;IAED;;;OAGG;IACH,MAAM;QACL,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC;YAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACnD,OAAO,SAAS,CAAC;IAClB,CAAC;CACD"}

package/dist/battle/index.d.ts

@@ -13,4 +13,14 @@ export { BattleHooks } from './Hooks.ts';
 export type { BattleHook } from './Hooks.ts';
 export { Field } from './Field.ts';
 export type { FieldCondition } from './Field.ts';
+export { AttackPreview } from './AttackPreview.ts';
+export { AttackDialog } from './AttackDialog.ts';
+export type { AttackDialogOptions, StrikeNumbers } from './AttackDialog.ts';
+export type { AttackFrame, AttackPreviewOptions, PreviewCombatant } from './AttackPreview.ts';
+export { UnitSelector } from './UnitSelector.ts';
+export type { SelectableUnit, SelectorStage, UnitSelectorOptions } from './UnitSelector.ts';
+export { Whiteboard } from './Whiteboard.ts';
+export type { WhiteboardEntry } from './Whiteboard.ts';
+export { BattleStats } from './BattleStats.ts';
+export type { BattleStatCategory } from './BattleStats.ts';
 //# sourceMappingURL=index.d.ts.map

package/dist/battle/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/battle/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,YAAY,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,YAAY,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,YAAY,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,YAAY,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/battle/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,YAAY,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,YAAY,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,YAAY,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,YAAY,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,YAAY,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAC5E,YAAY,EAAE,WAAW,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC9F,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,YAAY,EAAE,cAAc,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,YAAY,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,YAAY,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC"}

package/dist/battle/index.js

@@ -7,4 +7,9 @@ export { StatStages } from './StatStages.js';
 export { chooseMove, chooseSwitch } from './BattleAI.js';
 export { BattleHooks } from './Hooks.js';
 export { Field } from './Field.js';
+export { AttackPreview } from './AttackPreview.js';
+export { AttackDialog } from './AttackDialog.js';
+export { UnitSelector } from './UnitSelector.js';
+export { Whiteboard } from './Whiteboard.js';
+export { BattleStats } from './BattleStats.js';
 //# sourceMappingURL=index.js.map

package/dist/battle/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/battle/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAExC,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/battle/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAExC,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGjD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC"}

package/dist/board/FogOfWar.d.ts

@@ -6,6 +6,11 @@ export interface VisionCell {
  * Unions the visible cells of several units for each faction and retains explored memory.
  * The caller supplies visibility because board games differ in terrain, range, and blockers.
  *
+ * Factions that `share` see through one another's eyes - one map for the group, what is lit now
+ * and what they remember having seen, which is what Wesnoth's `share_vision` means. Nothing shares
+ * until asked, and sharing is a property of the sides rather than of any unit, so it survives every
+ * `sync`.
+ *
  * @example
  * ```ts
  * import { FactionFog } from '@datamoc/mw_games/board';
@@ -21,9 +26,12 @@ export interface VisionCell {
  * console.log(fog.isVisible('blue', 3, 2)); // true - lit by the scout right now
  * console.log(fog.isVisible('blue', 5, 5)); // false - never seen
  *
+ * fog.share(['blue', 'green']); // the two now see one map
+ * console.log(fog.isVisible('green', 3, 2)); // true - blue's scout is watching for both
+ *
  * fog.sync('blue', [], () => []); // the scout moved away, nothing visible this turn
- * console.log(fog.isVisible('blue', 3, 2)); // false - no longer in sight
- * console.log(fog.isExplored('blue', 3, 2)); // true - stays remembered after leaving
+ * console.log(fog.isVisible('green', 3, 2)); // false - no longer in sight, for either of them
+ * console.log(fog.isExplored('green', 3, 2)); // true - stays remembered, for both
  * ```
  */
 export declare class FactionFog {
@@ -31,7 +39,18 @@ export declare class FactionFog {
     readonly height: number;
     private visible;
     private explored;
+    /** faction to the factions it shares vision with, itself included. Absent means it shares with nobody. */
+    private readonly shared;
     constructor(width: number, height: number);
+    /**
+     * Makes these factions see with one pair of eyes: each one's cells count as the others', both
+     * for what is visible now and for the shroud they remember.
+     *
+     * Calling it again widens the group rather than replacing it, so `share(['blue', 'green'])`
+     * after `share(['green', 'teal'])` leaves all three on one map. A side may also be told to share
+     * with itself, or with nobody at all, without harm.
+     */
+    share(factions: readonly string[]): void;
     sync(faction: string, sources: readonly VisionCell[], cells: (source: VisionCell) => Iterable<VisionCell>): void;
     /**
      * Mark cells explored without changing what is currently visible: the
@@ -40,9 +59,20 @@ export declare class FactionFog {
      */
     reveal(faction: string, cells: Iterable<VisionCell>): void;
     isVisible(faction: string, x: number, y: number): boolean;
+    /**
+     * One faction's sight as a predicate, ready to hand to anything that asks what a side can see -
+     * `ai`'s score views, for one. It reads the shroud as it is when called, not as it was when the
+     * predicate was made, so a caller holding one across a `sync` sees the update, and it follows
+     * whatever `share` the faction later joins.
+     */
+    sees(faction: string): (x: number, y: number) => boolean;
     isExplored(faction: string, x: number, y: number): boolean;
     visibleCells(faction: string): readonly number[];
     exploredCells(faction: string): readonly number[];
+    /** one cell, as the faction or anyone it shares with sees it */
+    private seenBy;
+    /** one faction's cells, or the union over the group it shares with */
+    private cellsSeenBy;
     private inside;
     private index;
 }

package/dist/board/FogOfWar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FogOfWar.d.ts","sourceRoot":"","sources":["../../src/board/FogOfWar.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,UAAU;IAC1B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACV;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,qBAAa,UAAU;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,OAAO,CAAkC;IACjD,OAAO,CAAC,QAAQ,CAAkC;IAElD,YAAY,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAIxC;IAED,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,UAAU,EAAE,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI,CAW/G;IAED;;;;OAIG;IACH,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI,CAOzD;IAED,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAExD;IAED,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAEzD;IAED,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAE/C;IACD,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAEhD;IAED,OAAO,CAAC,MAAM;IAGd,OAAO,CAAC,KAAK;CAGb"}
+{"version":3,"file":"FogOfWar.d.ts","sourceRoot":"","sources":["../../src/board/FogOfWar.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,UAAU;IAC1B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACV;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,qBAAa,UAAU;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,OAAO,CAAkC;IACjD,OAAO,CAAC,QAAQ,CAAkC;IAElD,0GAA0G;IAC1G,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkC;IAEzD,YAAY,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAIxC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CASvC;IAED,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,UAAU,EAAE,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI,CAW/G;IAED;;;;OAIG;IACH,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI,CAOzD;IAED,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAExD;IAED;;;;;OAKG;IACH,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,OAAO,CAEvD;IAED,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAEzD;IAED,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAE/C;IACD,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAEhD;IAED,gEAAgE;IAChE,OAAO,CAAC,MAAM;IASd,sEAAsE;IACtE,OAAO,CAAC,WAAW;IAanB,OAAO,CAAC,MAAM;IAGd,OAAO,CAAC,KAAK;CAGb"}

package/dist/board/FogOfWar.js

@@ -2,6 +2,11 @@
  * Unions the visible cells of several units for each faction and retains explored memory.
  * The caller supplies visibility because board games differ in terrain, range, and blockers.
  *
+ * Factions that `share` see through one another's eyes - one map for the group, what is lit now
+ * and what they remember having seen, which is what Wesnoth's `share_vision` means. Nothing shares
+ * until asked, and sharing is a property of the sides rather than of any unit, so it survives every
+ * `sync`.
+ *
  * @example
  * ```ts
  * import { FactionFog } from '@datamoc/mw_games/board';
@@ -17,20 +22,45 @@
  * console.log(fog.isVisible('blue', 3, 2)); // true - lit by the scout right now
  * console.log(fog.isVisible('blue', 5, 5)); // false - never seen
  *
+ * fog.share(['blue', 'green']); // the two now see one map
+ * console.log(fog.isVisible('green', 3, 2)); // true - blue's scout is watching for both
+ *
  * fog.sync('blue', [], () => []); // the scout moved away, nothing visible this turn
- * console.log(fog.isVisible('blue', 3, 2)); // false - no longer in sight
- * console.log(fog.isExplored('blue', 3, 2)); // true - stays remembered after leaving
+ * console.log(fog.isVisible('green', 3, 2)); // false - no longer in sight, for either of them
+ * console.log(fog.isExplored('green', 3, 2)); // true - stays remembered, for both
  * ```
  */
 export class FactionFog {
     constructor(width, height) {
         this.visible = new Map();
         this.explored = new Map();
+        /** faction to the factions it shares vision with, itself included. Absent means it shares with nobody. */
+        this.shared = new Map();
         if (width < 1 || height < 1)
             throw new Error('fog needs positive dimensions');
         this.width = width;
         this.height = height;
     }
+    /**
+     * Makes these factions see with one pair of eyes: each one's cells count as the others', both
+     * for what is visible now and for the shroud they remember.
+     *
+     * Calling it again widens the group rather than replacing it, so `share(['blue', 'green'])`
+     * after `share(['green', 'teal'])` leaves all three on one map. A side may also be told to share
+     * with itself, or with nobody at all, without harm.
+     */
+    share(factions) {
+        const named = [...new Set(factions)].filter((faction) => Boolean(faction));
+        if (named.length === 0)
+            return;
+        const group = new Set(named);
+        for (const faction of named) {
+            for (const mate of this.shared.get(faction) ?? [])
+                group.add(mate);
+        }
+        for (const faction of group)
+            this.shared.set(faction, group);
+    }
     sync(faction, sources, cells) {
         if (!faction)
             throw new Error('fog needs a faction id');
@@ -62,16 +92,50 @@ export class FactionFog {
         this.explored.set(faction, memory);
     }
     isVisible(faction, x, y) {
-        return this.visible.get(faction)?.has(this.index(x, y)) ?? false;
+        return this.seenBy(this.visible, faction, this.index(x, y));
+    }
+    /**
+     * One faction's sight as a predicate, ready to hand to anything that asks what a side can see -
+     * `ai`'s score views, for one. It reads the shroud as it is when called, not as it was when the
+     * predicate was made, so a caller holding one across a `sync` sees the update, and it follows
+     * whatever `share` the faction later joins.
+     */
+    sees(faction) {
+        return (x, y) => this.isVisible(faction, x, y);
     }
     isExplored(faction, x, y) {
-        return this.explored.get(faction)?.has(this.index(x, y)) ?? false;
+        return this.seenBy(this.explored, faction, this.index(x, y));
     }
     visibleCells(faction) {
-        return [...(this.visible.get(faction) ?? [])];
+        return this.cellsSeenBy(this.visible, faction);
     }
     exploredCells(faction) {
-        return [...(this.explored.get(faction) ?? [])];
+        return this.cellsSeenBy(this.explored, faction);
+    }
+    /** one cell, as the faction or anyone it shares with sees it */
+    seenBy(cells, faction, cell) {
+        const group = this.shared.get(faction);
+        if (!group)
+            return cells.get(faction)?.has(cell) ?? false;
+        for (const mate of group) {
+            if (cells.get(mate)?.has(cell))
+                return true;
+        }
+        return false;
+    }
+    /** one faction's cells, or the union over the group it shares with */
+    cellsSeenBy(cells, faction) {
+        const group = this.shared.get(faction);
+        if (!group)
+            return [...(cells.get(faction) ?? [])];
+        const union = new Set();
+        for (const mate of group) {
+            for (const cell of cells.get(mate) ?? [])
+                union.add(cell);
+        }
+        //sorted because a union of sets has no order of its own, and a caller comparing two of these
+        //should not have to care which of the group was synced first
+        return [...union].sort((a, b) => a - b);
     }
     inside(x, y) {
         return x >= 0 && y >= 0 && x < this.width && y < this.height;

package/dist/board/FogOfWar.js.map

@@ -1 +1 @@
-{"version":3,"file":"FogOfWar.js","sourceRoot":"","sources":["../../src/board/FogOfWar.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FogOfWar.js","sourceRoot":"","sources":["../../src/board/FogOfWar.ts"],"names":[],"mappings":"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"}

package/dist/core/Achievements.d.ts

@@ -9,6 +9,13 @@
  * count behind it. Descriptions are display text `mwg` never reads; persistence is the
  * usual definitions-fresh, progress-saved split (`QuestLog`'s own convention).
  *
+ * An achievement can also name several criteria instead of one - Wesnoth's own
+ * "sub-achievements" shape, such as "recruit one of every unit type" being six counters
+ * that must each reach 1 - and it unlocks only once every one of them has. A single
+ * `counter`/`target` is shorthand for a one-criterion achievement; both forms share the
+ * same unlock, progress and save code, since a one-element criteria list behaves
+ * identically to the shorthand.
+ *
  * @example
  * ```ts
  * import { Achievements } from '@datamoc/mw_games/core';
@@ -16,6 +23,13 @@
  * const achievements = new Achievements();
  * achievements.define({ id: 'first-blood', counter: 'kills', target: 1 });
  * achievements.define({ id: 'slayer', counter: 'kills', target: 100 });
+ * achievements.define({
+ * 	id: 'diverse-army',
+ * 	criteria: [
+ * 		{ counter: 'recruited-archer', target: 1 },
+ * 		{ counter: 'recruited-knight', target: 1 },
+ * 	],
+ * });
  *
  * const unlocked = achievements.increment('kills', 1);
  * console.log(unlocked); // ['first-blood']
@@ -24,12 +38,20 @@
  * const toast = achievements.drainNew();
  * ```
  */
-export interface AchievementDef {
-    id: string;
-    /** the counter this watches, incremented by the game as things happen */
+export interface AchievementCriterion {
+    /** the counter this criterion watches, incremented by the game as things happen */
     counter: string;
-    /** the counter value that earns this */
+    /** the counter value that satisfies this criterion */
     target: number;
+}
+export interface AchievementDef {
+    id: string;
+    /** shorthand for a single-criterion achievement; mutually exclusive with `criteria` */
+    counter?: string;
+    /** shorthand for a single-criterion achievement; mutually exclusive with `criteria` */
+    target?: number;
+    /** every criterion here must be met before this achievement unlocks; mutually exclusive with `counter`/`target` */
+    criteria?: AchievementCriterion[];
     /** shown on an achievement screen; `mwg` never reads this itself */
     description?: string;
 }
@@ -42,19 +64,30 @@ export declare class Achievements {
     /** the current value of a counter; 0 for one nothing has touched yet */
     count(counter: string): number;
     /**
-     * Adds to a counter, unlocking whatever that newly earns.
+     * Adds to a counter, unlocking whatever that newly earns - a multi-criteria achievement
+     * unlocks only on the increment that leaves every one of its criteria met.
      *
      * @returns the ids unlocked by exactly this increment, so a game can announce each
      * one once ("Achievement unlocked: ...") rather than re-scanning everything
      */
     increment(counter: string, amount?: number): string[];
-    /** whether an achievement's counter has reached its target - throws for an unknown id */
+    /** whether every one of an achievement's criteria has reached its target - throws for an unknown id */
     unlocked(id: string): boolean;
-    /** progress towards an achievement: current count and target - throws for an unknown id */
+    /**
+     * Progress towards a single-criterion achievement: current count and target - throws for
+     * an unknown id or a multi-criteria one (use `subProgress` there instead).
+     */
     progress(id: string): {
         count: number;
         target: number;
     };
+    /** progress towards each of an achievement's criteria, in definition order - throws for an unknown id */
+    subProgress(id: string): readonly {
+        counter: string;
+        count: number;
+        target: number;
+        met: boolean;
+    }[];
     /** every id unlocked but not yet announced, clearing the queue as it reads */
     drainNew(): string[];
     toJSON(): {

package/dist/core/Achievements.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Achievements.d.ts","sourceRoot":"","sources":["../../src/core/Achievements.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,MAAM,WAAW,cAAc;IAC9B,EAAE,EAAE,MAAM,CAAC;IAEX,yEAAyE;IACzE,OAAO,EAAE,MAAM,CAAC;IAEhB,wCAAwC;IACxC,MAAM,EAAE,MAAM,CAAC;IAEf,oEAAoE;IACpE,WAAW,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,YAAY;IACxB,OAAO,CAAC,WAAW,CAAqC;IACxD,OAAO,CAAC,MAAM,CAA6B;IAE3C,iFAAiF;IACjF,OAAO,CAAC,KAAK,CAAgB;IAE7B,MAAM,CAAC,UAAU,EAAE,cAAc,GAAG,IAAI,CAEvC;IAED,wEAAwE;IACxE,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE7B;IAED;;;;;OAKG;IACH,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAI,GAAG,MAAM,EAAE,CAa/C;IAED,yFAAyF;IACzF,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAI5B;IAED,2FAA2F;IAC3F,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAItD;IAED,8EAA8E;IAC9E,QAAQ,IAAI,MAAM,EAAE,CAInB;IAED,MAAM,IAAI;QAAE,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;KAAE,CAEvC;IAED,oGAAoG;IACpG,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,cAAc,EAAE,EAAE,IAAI,EAAE;QAAE,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;KAAE,GAAG,YAAY,CAMjG;CACD"}
+{"version":3,"file":"Achievements.d.ts","sourceRoot":"","sources":["../../src/core/Achievements.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AAEH,MAAM,WAAW,oBAAoB;IACpC,mFAAmF;IACnF,OAAO,EAAE,MAAM,CAAC;IAEhB,sDAAsD;IACtD,MAAM,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,cAAc;IAC9B,EAAE,EAAE,MAAM,CAAC;IAEX,uFAAuF;IACvF,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,uFAAuF;IACvF,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,mHAAmH;IACnH,QAAQ,CAAC,EAAE,oBAAoB,EAAE,CAAC;IAElC,oEAAoE;IACpE,WAAW,CAAC,EAAE,MAAM,CAAC;CACrB;AAUD,qBAAa,YAAY;IACxB,OAAO,CAAC,WAAW,CAAqC;IACxD,OAAO,CAAC,MAAM,CAA6B;IAE3C,iFAAiF;IACjF,OAAO,CAAC,KAAK,CAAgB;IAE7B,MAAM,CAAC,UAAU,EAAE,cAAc,GAAG,IAAI,CAEvC;IAED,wEAAwE;IACxE,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE7B;IAED;;;;;;OAMG;IACH,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAI,GAAG,MAAM,EAAE,CAmB/C;IAED,uGAAuG;IACvG,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAI5B;IAED;;;OAGG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAMtD;IAED,yGAAyG;IACzG,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,OAAO,CAAA;KAAE,EAAE,CAOnG;IAED,8EAA8E;IAC9E,QAAQ,IAAI,MAAM,EAAE,CAInB;IAED,MAAM,IAAI;QAAE,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;KAAE,CAEvC;IAED,oGAAoG;IACpG,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,cAAc,EAAE,EAAE,IAAI,EAAE;QAAE,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;KAAE,GAAG,YAAY,CAMjG;CACD"}