narraleaf-react 0.5.0 → 0.7.0

package/dist/game/nlcore/action/action.d.ts

@@ -1,24 +1,29 @@
-import { LogicAction } from "./logicAction";
-import { ContentNode } from "../action/tree/actionTree";
-import type { CalledActionResult } from "../gameTypes";
-import { Awaitable } from "../../../util/data";
-import { GameState } from "../../player/gameState";
-import { Story } from "../elements/story";
-import { ActionSearchOptions } from "../types";
-export declare class Action<ContentNodeType = any, Callee = LogicAction.GameElement, Type extends string = any> {
-    static ActionTypes: {
-        action: string;
-    };
-    callee: Callee;
-    type: Type;
-    contentNode: ContentNode<ContentNodeType>;
-    _id: string;
-    readonly __stack: string;
-    constructor(callee: Callee, type: Type, contentNode: ContentNode<ContentNodeType>);
-    executeAction(_state: GameState): CalledActionResult | Awaitable<CalledActionResult, any>;
-    getId(): string;
-    setId(id: string): void;
-    setContent(content: ContentNodeType): this;
-    setContentNode(contentNode: ContentNode<ContentNodeType>): this;
-    getFutureActions(_story: Story, _options: ActionSearchOptions): LogicAction.Actions[];
-}
+import { LogicAction } from "./logicAction";
+import { ContentNode } from "../action/tree/actionTree";
+import type { CalledActionResult } from "../gameTypes";
+import { Awaitable } from "../../../util/data";
+import { GameState } from "../../player/gameState";
+import { Story } from "../elements/story";
+import { ActionSearchOptions } from "../types";
+import type { StackModel } from "./stackModel";
+export type ActionExecutionInjection = {
+    stackModel: StackModel;
+};
+export type ExecutedActionResult = CalledActionResult | Awaitable<CalledActionResult, any> | (CalledActionResult | Awaitable<CalledActionResult, any>)[] | null;
+export declare class Action<ContentNodeType = any, Callee = LogicAction.GameElement, Type extends string = any> {
+    static ActionTypes: {
+        action: string;
+    };
+    callee: Callee;
+    type: Type;
+    contentNode: ContentNode<ContentNodeType>;
+    _id: string;
+    readonly __stack: string;
+    constructor(callee: Callee, type: Type, contentNode: ContentNode<ContentNodeType>);
+    executeAction(_state: GameState, _injection: ActionExecutionInjection): ExecutedActionResult;
+    getId(): string;
+    setId(id: string): void;
+    setContent(content: ContentNodeType): this;
+    setContentNode(contentNode: ContentNode<ContentNodeType>): this;
+    getFutureActions(_story: Story, _options: ActionSearchOptions): LogicAction.Actions[];
+}

package/dist/game/nlcore/action/actionHistory.d.ts

@@ -1,39 +1,48 @@
-import { Timeline } from "../../../game/player/Tasks";
-import { Action } from "./action";
-import { LiveGameEventToken } from "../types";
-import { LogicAction } from "../game";
-import { GameHistoryManager } from "./gameHistory";
-export type ActionHistory<T extends Array<unknown> = any> = {
-    action: Action;
-    timeline?: Timeline;
-    args: T;
-    id: string;
-    undo?: (...args: T) => void;
-};
-export declare class ActionHistoryManager {
-    private history;
-    private readonly maxHistorySize;
-    private hooks;
-    constructor(maxHistorySize?: number);
-    /**
-     * Push an action to the history
-     */
-    push<T extends Array<any> = Array<any>>(action: Action, onUndo?: (...args: T) => void, args?: T, timeline?: Timeline): {
-        id: string;
-    };
-    /**
-     * Undo all actions until the given id
-     *
-     * If the given id is not found, nothing will happen
-     * @param id random id generated by push
-     */
-    undoUntil(id: string): LogicAction.Actions | null;
-    undo(gameHistory: GameHistoryManager): LogicAction.Actions | null;
-    ableToUndo(gameHistory: GameHistoryManager): boolean;
-    onUndo(callback: (affected: ActionHistory<any>[]) => void): LiveGameEventToken;
-    offUndo(callback: (affected: ActionHistory<any>[]) => void): void;
-    getHistory(): ActionHistory<any>[];
-    onHistoryLimit(callback: (removed: ActionHistory<any>[]) => void): LiveGameEventToken;
-    offHistoryLimit(callback: (removed: ActionHistory<any>[]) => void): void;
-    reset(): void;
-}
+import { Timeline } from "../../../game/player/Tasks";
+import { Action } from "./action";
+import { LiveGameEventToken } from "../types";
+import { GameHistoryManager } from "./gameHistory";
+import { StackModel, StackModelRawData } from "./stackModel";
+import type { LiveGame } from "../game/liveGame";
+export type ActionHistory<T extends Array<unknown> = any> = {
+    action: Action;
+    timeline?: Timeline;
+    args: T;
+    id: string;
+    undo?: (...args: T) => void;
+    rootStackSnapshot: StackModelRawData;
+    stackModel: StackModel;
+};
+export type ActionHistoryPushOptions = {
+    timeline?: Timeline;
+    stackModel: StackModel;
+    action: Action;
+};
+export declare class ActionHistoryManager {
+    readonly liveGame: LiveGame;
+    private history;
+    private readonly maxHistorySize;
+    private hooks;
+    constructor(maxHistorySize: number | undefined, liveGame: LiveGame);
+    /**
+     * Push an action to the history
+     */
+    push<T extends Array<any> = Array<any>>(props: ActionHistoryPushOptions, onUndo?: (...args: T) => void, args?: T): {
+        id: string;
+    };
+    /**
+     * Undo all actions until the given id
+     *
+     * If the given id is not found, nothing will happen
+     * @param id random id generated by push
+     */
+    undoUntil(id: string): ActionHistory | null;
+    undo(gameHistory: GameHistoryManager): ActionHistory | null;
+    ableToUndo(gameHistory: GameHistoryManager): boolean;
+    onUndo(callback: (affected: ActionHistory<any>[]) => void): LiveGameEventToken;
+    offUndo(callback: (affected: ActionHistory<any>[]) => void): void;
+    getHistory(): ActionHistory<any>[];
+    onHistoryLimit(callback: (removed: ActionHistory<any>[]) => void): LiveGameEventToken;
+    offHistoryLimit(callback: (removed: ActionHistory<any>[]) => void): void;
+    reset(): void;
+}

package/dist/game/nlcore/action/actionTypes.d.ts

@@ -1,142 +1,142 @@
-import { LogicAction } from "../action/logicAction";
-import type { Story } from "../elements/story";
-import type { ConditionData } from "../elements/condition";
-import { Color, ImageSrc } from "../types";
-import { Transform } from "../elements/transform/transform";
-import type { Scene } from "../elements/scene";
-import type { MenuData } from "../elements/menu";
-import { Awaitable, FlexibleTuple, SelectElementFromEach } from "../../../util/data";
-import type { Sound } from "../elements/sound";
-import type { Script } from "../elements/script";
-import { Sentence } from "../elements/character/sentence";
-import type { TransformDefinitions } from "../elements/transform/type";
-import { Image, TagGroupDefinition } from "../elements/displayable/image";
-import { FadeOptions } from "../elements/type";
-import { Transition } from "../elements/transition/transition";
-import { ImageTransition } from "../elements/transition/transitions/image/imageTransition";
-import { Layer } from "../elements/layer";
-export declare const DisplayableActionTypes: {
-    readonly action: "displayable:action";
-    readonly applyTransform: "displayable:applyTransform";
-    readonly applyTransition: "displayable:applyTransition";
-    readonly init: "displayable:init";
-};
-export type DisplayableActionContentType<TransitionType extends Transition = Transition> = {
-    [K in typeof DisplayableActionTypes[keyof typeof DisplayableActionTypes]]: K extends "displayable:applyTransform" ? [Transform] : K extends "displayable:applyTransition" ? [TransitionType, ((transition: TransitionType) => TransitionType)?] : K extends "displayable:init" ? [scene: Scene | null, layer: Layer | null, isElement?: boolean] : any;
-};
-export declare const CharacterActionTypes: {
-    readonly say: "character:say";
-    readonly action: "character:action";
-    readonly setName: "character:setName";
-};
-export type CharacterActionContentType = {
-    [K in typeof CharacterActionTypes[keyof typeof CharacterActionTypes]]: K extends "character:say" ? Sentence : K extends "character:action" ? any : K extends "character:setName" ? [string] : any;
-};
-export declare const SceneActionTypes: {
-    readonly action: "scene:action";
-    readonly init: "scene:init";
-    readonly exit: "scene:exit";
-    readonly jumpTo: "scene:jumpTo";
-    readonly setBackgroundMusic: "scene:setBackgroundMusic";
-    readonly preUnmount: "scene:preUnmount";
-    readonly transitionToScene: "scene:transitionToScene";
-};
-export type SceneActionContentType = {
-    [K in typeof SceneActionTypes[keyof typeof SceneActionTypes]]: K extends typeof SceneActionTypes["action"] ? Scene : K extends typeof SceneActionTypes["init"] ? [Scene] : K extends typeof SceneActionTypes["exit"] ? [] : K extends typeof SceneActionTypes["jumpTo"] ? [Scene] : K extends typeof SceneActionTypes["setBackgroundMusic"] ? [Sound | null, number?] : K extends typeof SceneActionTypes["preUnmount"] ? [] : K extends typeof SceneActionTypes["transitionToScene"] ? [ImageTransition, Scene | undefined, ImageSrc | Color | undefined] : any;
-};
-export declare const StoryActionTypes: {
-    readonly action: "story:action";
-};
-export type StoryActionContentType = {
-    [K in typeof StoryActionTypes[keyof typeof StoryActionTypes]]: K extends "story:action" ? Story : any;
-};
-export declare const ImageActionTypes: {
-    readonly action: "image:action";
-    readonly setSrc: "image:setSrc";
-    readonly flush: "image:flush";
-    readonly initWearable: "image:initWearable";
-    readonly setAppearance: "image:setAppearance";
-    readonly setDarkness: "image:setDarkness";
-};
-export type ImageActionContentType = {
-    [K in typeof ImageActionTypes[keyof typeof ImageActionTypes]]: K extends "image:setSrc" ? [ImageSrc | Color] : K extends "image:flush" ? [] : K extends "image:initWearable" ? [Image] : K extends "image:setAppearance" ? [FlexibleTuple<SelectElementFromEach<TagGroupDefinition>> | string[], ImageTransition | undefined] : K extends "image:setDarkness" ? [darkness: number, duration?: number, easing?: TransformDefinitions.EasingDefinition] : any;
-} & DisplayableActionContentType<ImageTransition>;
-export declare const ConditionActionTypes: {
-    readonly action: "condition:action";
-};
-export type ConditionActionContentType = {
-    [K in typeof ConditionActionTypes[keyof typeof ConditionActionTypes]]: K extends "condition:action" ? ConditionData : any;
-};
-export declare const ScriptActionTypes: {
-    readonly action: "script:action";
-};
-export type ScriptActionContentType = {
-    [K in typeof ScriptActionTypes[keyof typeof ScriptActionTypes]]: K extends "script:action" ? Script : any;
-};
-export declare const MenuActionTypes: {
-    readonly action: "menu:action";
-};
-export type MenuActionContentType = {
-    [K in typeof MenuActionTypes[keyof typeof MenuActionTypes]]: K extends "menu:action" ? MenuData : any;
-};
-export declare const SoundActionTypes: {
-    readonly action: "sound:action";
-    readonly play: "sound:play";
-    readonly stop: "sound:stop";
-    readonly setVolume: "sound:setVolume";
-    readonly setRate: "sound:setRate";
-    readonly pause: "sound:pause";
-    readonly resume: "sound:resume";
-};
-export type SoundActionContentType = {
-    [K in typeof SoundActionTypes[keyof typeof SoundActionTypes]]: K extends "sound:play" ? [FadeOptions] : K extends "sound:stop" ? [FadeOptions] : K extends "sound:setVolume" ? [volumn: number, duration: number] : K extends "sound:setRate" ? [number] : K extends "sound:pause" ? [FadeOptions] : K extends "sound:resume" ? [FadeOptions] : any;
-};
-export declare const ControlActionTypes: {
-    readonly action: "control:action";
-    readonly do: "control:do";
-    readonly doAsync: "control:doAsync";
-    readonly any: "control:any";
-    readonly all: "control:all";
-    readonly allAsync: "control:allAsync";
-    readonly repeat: "control:repeat";
-    readonly sleep: "control:sleep";
-};
-export type ControlActionContentType = {
-    [K in typeof ControlActionTypes[keyof typeof ControlActionTypes]]: K extends "control:do" ? [LogicAction.Actions[]] : K extends "control:doAsync" ? [LogicAction.Actions[]] : K extends "control:any" ? [LogicAction.Actions[]] : K extends "control:all" ? [LogicAction.Actions[]] : K extends "control:parallel" ? [LogicAction.Actions[]] : K extends "control:allAsync" ? [LogicAction.Actions[]] : K extends "control:repeat" ? [LogicAction.Actions[], number] : K extends "control:sleep" ? [LogicAction.Actions[], number | Awaitable<any> | Promise<any>] : any;
-};
-export declare const TextActionTypes: {
-    readonly action: "text:action";
-    readonly setText: "text:setText";
-    readonly setFontSize: "text:setFontSize";
-};
-export type TextActionContentType = {
-    [K in typeof TextActionTypes[keyof typeof TextActionTypes]]: K extends "text:setText" ? [string] : K extends "text:show" ? [Transform<TransformDefinitions.TextTransformProps>] : K extends "text:hide" ? [Transform<TransformDefinitions.TextTransformProps>] : K extends "text:applyTransform" ? [Transform<TransformDefinitions.TextTransformProps>] : K extends "text:init" ? [Scene?] : K extends "text:setFontSize" ? [number] : any;
-};
-export declare const PersistentActionTypes: {
-    readonly action: "persistent:action";
-    readonly set: "persistent:set";
-    readonly assign: "persistent:assign";
-};
-export type PersistentActionContentType = {
-    [K in typeof PersistentActionTypes[keyof typeof PersistentActionTypes]]: K extends "persistent:action" ? any : K extends "persistent:set" ? [string, unknown | ((value: unknown) => unknown)] : K extends "persistent:assign" ? [Partial<unknown>] : any;
-};
-export declare const LayerActionTypes: {
-    readonly action: "layer:action";
-    readonly setZIndex: "layer:setZIndex";
-};
-export type LayerActionContentType = {
-    [K in typeof LayerActionTypes[keyof typeof LayerActionTypes]]: K extends "layer:action" ? any : K extends "layer:setZIndex" ? [number] : any;
-};
-export declare const VideoActionTypes: {
-    readonly action: "video:action";
-    readonly show: "video:show";
-    readonly hide: "video:hide";
-    readonly play: "video:play";
-    readonly pause: "video:pause";
-    readonly resume: "video:resume";
-    readonly stop: "video:stop";
-    readonly seek: "video:seek";
-};
-export type VideoActionContentType = {
-    [K in typeof VideoActionTypes[keyof typeof VideoActionTypes]]: K extends "video:action" ? any : K extends "video:show" | "video:hide" | "video:play" | "video:pause" | "video:stop" ? [] : K extends "video:seek" ? [number] : any;
-};
+import { LogicAction } from "../action/logicAction";
+import type { Story } from "../elements/story";
+import type { ConditionData } from "../elements/condition";
+import { Color, ImageSrc } from "../types";
+import { Transform } from "../elements/transform/transform";
+import type { Scene } from "../elements/scene";
+import type { MenuData } from "../elements/menu";
+import { Awaitable, FlexibleTuple, SelectElementFromEach } from "../../../util/data";
+import type { Sound } from "../elements/sound";
+import type { Script } from "../elements/script";
+import { Sentence } from "../elements/character/sentence";
+import type { TransformDefinitions } from "../elements/transform/type";
+import { Image, TagGroupDefinition } from "../elements/displayable/image";
+import { FadeOptions } from "../elements/type";
+import { Transition } from "../elements/transition/transition";
+import { ImageTransition } from "../elements/transition/transitions/image/imageTransition";
+import { Layer } from "../elements/layer";
+export declare const DisplayableActionTypes: {
+    readonly action: "displayable:action";
+    readonly applyTransform: "displayable:applyTransform";
+    readonly applyTransition: "displayable:applyTransition";
+    readonly init: "displayable:init";
+};
+export type DisplayableActionContentType<TransitionType extends Transition = Transition> = {
+    [K in typeof DisplayableActionTypes[keyof typeof DisplayableActionTypes]]: K extends "displayable:applyTransform" ? [Transform] : K extends "displayable:applyTransition" ? [TransitionType, ((transition: TransitionType) => TransitionType)?] : K extends "displayable:init" ? [scene: Scene | null, layer: Layer | null, isElement?: boolean] : any;
+};
+export declare const CharacterActionTypes: {
+    readonly say: "character:say";
+    readonly action: "character:action";
+    readonly setName: "character:setName";
+};
+export type CharacterActionContentType = {
+    [K in typeof CharacterActionTypes[keyof typeof CharacterActionTypes]]: K extends "character:say" ? Sentence : K extends "character:action" ? any : K extends "character:setName" ? [string] : any;
+};
+export declare const SceneActionTypes: {
+    readonly action: "scene:action";
+    readonly init: "scene:init";
+    readonly exit: "scene:exit";
+    readonly jumpTo: "scene:jumpTo";
+    readonly setBackgroundMusic: "scene:setBackgroundMusic";
+    readonly preUnmount: "scene:preUnmount";
+    readonly transitionToScene: "scene:transitionToScene";
+};
+export type SceneActionContentType = {
+    [K in typeof SceneActionTypes[keyof typeof SceneActionTypes]]: K extends typeof SceneActionTypes["action"] ? Scene : K extends typeof SceneActionTypes["init"] ? [Scene] : K extends typeof SceneActionTypes["exit"] ? [] : K extends typeof SceneActionTypes["jumpTo"] ? [Scene] : K extends typeof SceneActionTypes["setBackgroundMusic"] ? [Sound | null, number?] : K extends typeof SceneActionTypes["preUnmount"] ? [] : K extends typeof SceneActionTypes["transitionToScene"] ? [ImageTransition, Scene | undefined, ImageSrc | Color | undefined] : any;
+};
+export declare const StoryActionTypes: {
+    readonly action: "story:action";
+};
+export type StoryActionContentType = {
+    [K in typeof StoryActionTypes[keyof typeof StoryActionTypes]]: K extends "story:action" ? Story : any;
+};
+export declare const ImageActionTypes: {
+    readonly action: "image:action";
+    readonly setSrc: "image:setSrc";
+    readonly flush: "image:flush";
+    readonly initWearable: "image:initWearable";
+    readonly setAppearance: "image:setAppearance";
+    readonly setDarkness: "image:setDarkness";
+};
+export type ImageActionContentType = {
+    [K in typeof ImageActionTypes[keyof typeof ImageActionTypes]]: K extends "image:setSrc" ? [ImageSrc | Color] : K extends "image:flush" ? [] : K extends "image:initWearable" ? [Image] : K extends "image:setAppearance" ? [FlexibleTuple<SelectElementFromEach<TagGroupDefinition>> | string[], ImageTransition | undefined] : K extends "image:setDarkness" ? [darkness: number, duration?: number, easing?: TransformDefinitions.EasingDefinition] : any;
+} & DisplayableActionContentType<ImageTransition>;
+export declare const ConditionActionTypes: {
+    readonly action: "condition:action";
+};
+export type ConditionActionContentType = {
+    [K in typeof ConditionActionTypes[keyof typeof ConditionActionTypes]]: K extends "condition:action" ? ConditionData : any;
+};
+export declare const ScriptActionTypes: {
+    readonly action: "script:action";
+};
+export type ScriptActionContentType = {
+    [K in typeof ScriptActionTypes[keyof typeof ScriptActionTypes]]: K extends "script:action" ? Script : any;
+};
+export declare const MenuActionTypes: {
+    readonly action: "menu:action";
+};
+export type MenuActionContentType = {
+    [K in typeof MenuActionTypes[keyof typeof MenuActionTypes]]: K extends "menu:action" ? MenuData : any;
+};
+export declare const SoundActionTypes: {
+    readonly action: "sound:action";
+    readonly play: "sound:play";
+    readonly stop: "sound:stop";
+    readonly setVolume: "sound:setVolume";
+    readonly setRate: "sound:setRate";
+    readonly pause: "sound:pause";
+    readonly resume: "sound:resume";
+};
+export type SoundActionContentType = {
+    [K in typeof SoundActionTypes[keyof typeof SoundActionTypes]]: K extends "sound:play" ? [FadeOptions] : K extends "sound:stop" ? [FadeOptions] : K extends "sound:setVolume" ? [volumn: number, duration: number] : K extends "sound:setRate" ? [number] : K extends "sound:pause" ? [FadeOptions] : K extends "sound:resume" ? [FadeOptions] : any;
+};
+export declare const ControlActionTypes: {
+    readonly action: "control:action";
+    readonly do: "control:do";
+    readonly doAsync: "control:doAsync";
+    readonly any: "control:any";
+    readonly all: "control:all";
+    readonly allAsync: "control:allAsync";
+    readonly repeat: "control:repeat";
+    readonly sleep: "control:sleep";
+};
+export type ControlActionContentType = {
+    [K in typeof ControlActionTypes[keyof typeof ControlActionTypes]]: K extends "control:do" ? [LogicAction.Actions[]] : K extends "control:doAsync" ? [LogicAction.Actions[]] : K extends "control:any" ? [LogicAction.Actions[]] : K extends "control:all" ? [LogicAction.Actions[]] : K extends "control:parallel" ? [LogicAction.Actions[]] : K extends "control:allAsync" ? [LogicAction.Actions[]] : K extends "control:repeat" ? [LogicAction.Actions[], number] : K extends "control:sleep" ? [LogicAction.Actions[], number | Awaitable<any> | Promise<any>] : any;
+};
+export declare const TextActionTypes: {
+    readonly action: "text:action";
+    readonly setText: "text:setText";
+    readonly setFontSize: "text:setFontSize";
+};
+export type TextActionContentType = {
+    [K in typeof TextActionTypes[keyof typeof TextActionTypes]]: K extends "text:setText" ? [string] : K extends "text:show" ? [Transform<TransformDefinitions.TextTransformProps>] : K extends "text:hide" ? [Transform<TransformDefinitions.TextTransformProps>] : K extends "text:applyTransform" ? [Transform<TransformDefinitions.TextTransformProps>] : K extends "text:init" ? [Scene?] : K extends "text:setFontSize" ? [number] : any;
+};
+export declare const PersistentActionTypes: {
+    readonly action: "persistent:action";
+    readonly set: "persistent:set";
+    readonly assign: "persistent:assign";
+};
+export type PersistentActionContentType = {
+    [K in typeof PersistentActionTypes[keyof typeof PersistentActionTypes]]: K extends "persistent:action" ? any : K extends "persistent:set" ? [string, unknown | ((value: unknown) => unknown)] : K extends "persistent:assign" ? [Partial<unknown>] : any;
+};
+export declare const LayerActionTypes: {
+    readonly action: "layer:action";
+    readonly setZIndex: "layer:setZIndex";
+};
+export type LayerActionContentType = {
+    [K in typeof LayerActionTypes[keyof typeof LayerActionTypes]]: K extends "layer:action" ? any : K extends "layer:setZIndex" ? [number] : any;
+};
+export declare const VideoActionTypes: {
+    readonly action: "video:action";
+    readonly show: "video:show";
+    readonly hide: "video:hide";
+    readonly play: "video:play";
+    readonly pause: "video:pause";
+    readonly resume: "video:resume";
+    readonly stop: "video:stop";
+    readonly seek: "video:seek";
+};
+export type VideoActionContentType = {
+    [K in typeof VideoActionTypes[keyof typeof VideoActionTypes]]: K extends "video:action" ? any : K extends "video:show" | "video:hide" | "video:play" | "video:pause" | "video:stop" ? [] : K extends "video:seek" ? [number] : any;
+};

package/dist/game/nlcore/action/actionable.d.ts

@@ -1,5 +1,5 @@
-import { LogicAction } from "../action/logicAction";
-import { Chainable } from "../action/chain";
-export declare class Actionable<StateData extends Record<string, any> | null = Record<string, any>, Self extends Actionable = any> extends Chainable<LogicAction.Actions, Self> {
-    constructor();
-}
+import { LogicAction } from "../action/logicAction";
+import { Chainable } from "../action/chain";
+export declare class Actionable<StateData extends Record<string, any> | null = Record<string, any>, Self extends Actionable = any> extends Chainable<LogicAction.Actions, Self> {
+    constructor();
+}

package/dist/game/nlcore/action/actions/characterAction.d.ts

@@ -1,17 +1,19 @@
-import { CharacterActionContentType, CharacterActionTypes } from "../../action/actionTypes";
-import type { Character } from "../../elements/character";
-import { GameState } from "../../../player/gameState";
-import type { CalledActionResult } from "../../gameTypes";
-import { Awaitable } from "../../../../util/data";
-import { Sentence } from "../../elements/character/sentence";
-import { TypedAction } from "../../action/actions";
-import { Sound } from "../../elements/sound";
-export declare class CharacterAction<T extends typeof CharacterActionTypes[keyof typeof CharacterActionTypes] = typeof CharacterActionTypes[keyof typeof CharacterActionTypes]> extends TypedAction<CharacterActionContentType, T, Character> {
-    static ActionTypes: {
-        readonly say: "character:say";
-        readonly action: "character:action";
-        readonly setName: "character:setName";
-    };
-    static getVoice(state: GameState, sentence: Sentence): Sound | null;
-    executeAction(gameState: GameState): CalledActionResult | Awaitable<CalledActionResult, any>;
-}
+import { CharacterActionContentType, CharacterActionTypes } from "../../action/actionTypes";
+import type { Character } from "../../elements/character";
+import { GameState } from "../../../player/gameState";
+import { Sentence } from "../../elements/character/sentence";
+import { TypedAction } from "../../action/actions";
+import { Sound } from "../../elements/sound";
+import { ActionExecutionInjection, ExecutedActionResult } from "../../action/action";
+import { LogicAction } from "../../action/logicAction";
+import { Story } from "../../elements/story";
+export declare class CharacterAction<T extends typeof CharacterActionTypes[keyof typeof CharacterActionTypes] = typeof CharacterActionTypes[keyof typeof CharacterActionTypes]> extends TypedAction<CharacterActionContentType, T, Character> {
+    static ActionTypes: {
+        readonly say: "character:say";
+        readonly action: "character:action";
+        readonly setName: "character:setName";
+    };
+    static getVoice(state: GameState, sentence: Sentence): Sound | null;
+    executeAction(gameState: GameState, injection: ActionExecutionInjection): ExecutedActionResult;
+    stringify(_story: Story, _seen: Set<LogicAction.Actions>, _strict: boolean): string;
+}

package/dist/game/nlcore/action/actions/conditionAction.d.ts

@@ -1,17 +1,26 @@
-import { ConditionActionContentType, ConditionActionTypes } from "../../action/actionTypes";
-import type { Condition } from "../../elements/condition";
-import { GameState } from "../../../player/gameState";
-import { LogicAction } from "../../action/logicAction";
-import { TypedAction } from "../../action/actions";
-import { Story } from "../../elements/story";
-import { ActionSearchOptions } from "../../types";
-export declare class ConditionAction<T extends typeof ConditionActionTypes[keyof typeof ConditionActionTypes] = typeof ConditionActionTypes[keyof typeof ConditionActionTypes]> extends TypedAction<ConditionActionContentType, T, Condition> {
-    static ActionTypes: {
-        readonly action: "condition:action";
-    };
-    executeAction(gameState: GameState): {
-        type: any;
-        node: import("../tree/actionTree").RenderableNode | null;
-    };
-    getFutureActions(story: Story, options: ActionSearchOptions): LogicAction.Actions[];
-}
+import { ConditionActionContentType, ConditionActionTypes } from "../../action/actionTypes";
+import type { Condition } from "../../elements/condition";
+import { GameState } from "../../../player/gameState";
+import { LogicAction } from "../../action/logicAction";
+import { TypedAction } from "../../action/actions";
+import { Story } from "../../elements/story";
+import { ActionSearchOptions } from "../../types";
+export declare class ConditionAction<T extends typeof ConditionActionTypes[keyof typeof ConditionActionTypes] = typeof ConditionActionTypes[keyof typeof ConditionActionTypes]> extends TypedAction<ConditionActionContentType, T, Condition> {
+    static ActionTypes: {
+        readonly action: "condition:action";
+    };
+    executeAction(gameState: GameState): ({
+        type: T;
+        node: import("../../action/tree/actionTree").RenderableNode | null;
+        wait?: undefined;
+    } | {
+        type: T;
+        node: null;
+        wait: {
+            type: "all";
+            stackModels: import("../stackModel").StackModel[];
+        };
+    })[];
+    getFutureActions(story: Story, options: ActionSearchOptions): LogicAction.Actions[];
+    stringify(story: Story, seen: Set<LogicAction.Actions>, strict: boolean): string;
+}

package/dist/game/nlcore/action/actions/controlAction.d.ts

@@ -1,38 +1,26 @@
-import { ControlActionContentType, ControlActionTypes } from "../../action/actionTypes";
-import { Control } from "../../elements/control";
-import { GameState } from "../../../player/gameState";
-import { LogicAction } from "../../action/logicAction";
-import { Awaitable } from "../../../../util/data";
-import type { CalledActionResult } from "../../gameTypes";
-import { TypedAction } from "../../action/actions";
-import { Story } from "../../elements/story";
-import { ActionSearchOptions } from "../../types";
-import { Timeline } from "../../../player/Tasks";
-export declare class ControlAction<T extends typeof ControlActionTypes[keyof typeof ControlActionTypes] = typeof ControlActionTypes[keyof typeof ControlActionTypes]> extends TypedAction<ControlActionContentType, T, Control> {
-    static ActionTypes: {
-        readonly action: "control:action";
-        readonly do: "control:do";
-        readonly doAsync: "control:doAsync";
-        readonly any: "control:any";
-        readonly all: "control:all";
-        readonly allAsync: "control:allAsync";
-        readonly repeat: "control:repeat";
-        readonly sleep: "control:sleep";
-    };
-    /**
-     * Perform an action and all its children. Due to bidirectional bubbling, the Awaitable interrupt returned by the function affects the children who're executing.
-     *
-     * At the same time, the child interrupt will bubble up to the Awaitable returned by this function and interrupt the execution of the Timeline.
-     * This is because all later results of this function depend on the previous result, so it isn't possible to silently ignore interrupted sub operations.
-     *
-     * @template T The type of the result returned by the onResolved callback.
-     * @param {GameState} gameState - The current game state.
-     * @param {LogicAction.Actions} action - The action to be executed.
-     * @param {function(CalledActionResult): T} onResolved - A callback function that processes the result of the action. The awaitable will be resolved to the value returned by this callback.
-     * @returns {[Awaitable<T>, Timeline]} A tuple containing the Awaitable and the Timeline.
-     */
-    executeActionSeries<T>(gameState: GameState, action: LogicAction.Actions, onResolved: (result: CalledActionResult) => T): [awaitable: Awaitable<T>, timeline: Timeline];
-    executeSingleAction(gameState: GameState, action: LogicAction.Actions): Awaitable<CalledActionResult> | LogicAction.Actions | null;
-    executeAction(gameState: GameState): CalledActionResult | Awaitable<CalledActionResult, CalledActionResult>;
-    getFutureActions(story: Story, options: ActionSearchOptions): LogicAction.Actions[];
-}
+import { TypedAction } from "../../action/actions";
+import { ControlActionContentType, ControlActionTypes } from "../../action/actionTypes";
+import { LogicAction } from "../../action/logicAction";
+import { Control } from "../../elements/control";
+import { Story } from "../../elements/story";
+import { ActionSearchOptions } from "../../types";
+import { Awaitable } from "../../../../util/data";
+import { GameState } from "../../../player/gameState";
+import { ActionExecutionInjection, ExecutedActionResult } from "../../action/action";
+export declare class ControlAction<T extends typeof ControlActionTypes[keyof typeof ControlActionTypes] = typeof ControlActionTypes[keyof typeof ControlActionTypes]> extends TypedAction<ControlActionContentType, T, Control> {
+    static ActionTypes: {
+        readonly action: "control:action";
+        readonly do: "control:do";
+        readonly doAsync: "control:doAsync";
+        readonly any: "control:any";
+        readonly all: "control:all";
+        readonly allAsync: "control:allAsync";
+        readonly repeat: "control:repeat";
+        readonly sleep: "control:sleep";
+    };
+    static executeActionsAsync(gameState: GameState, action: LogicAction.Actions): Awaitable<void>;
+    checkActionChain(actions: LogicAction.Actions[]): LogicAction.Actions[];
+    executeAction(gameState: GameState, injection: ActionExecutionInjection): ExecutedActionResult;
+    getFutureActions(story: Story, options: ActionSearchOptions): LogicAction.Actions[];
+    stringify(story: Story, _seen: Set<LogicAction.Actions>, _strict: boolean): string;
+}