narrat 0.11.3 → 0.11.6

package/lib/app.vue.d.ts

@@ -1,8 +1,9 @@
 import { PropType } from 'vue';
-import { DialogKey } from './types/vuex';
+import { DialogKey } from './types/state';
 import { DialogBoxParameters } from './types/dialog-box-types';
 import { GameConfig } from './types/app-types';
 import { AppOptions } from '.';
+import { Parser } from './types/parser';
 declare const _default: import("vue").DefineComponent<{
     config: PropType<GameConfig>;
     options: PropType<AppOptions>;

package/lib/components/Skills.vue.d.ts

@@ -1,5 +1,5 @@
 import { SkillData } from '@/config';
-import { SkillsState } from '@/types/vuex';
+import { SkillsState } from '@/types/state';
 declare const _default: import("vue").DefineComponent<{
     close: any;
 }, unknown, {

package/lib/components/debug/debug-menu.vue.d.ts

@@ -1,5 +1,5 @@
-import { SkillCheckState, SkillsState } from '@/types/vuex';
-import { ErrorState } from 'vue';
+import { ErrorState, SkillCheckState, SkillsState } from '@/types/state';
+import { Parser } from '@/types/parser';
 declare const _default: import("vue").DefineComponent<{}, {}, {
     showDebug: boolean;
     jumping: boolean;

package/lib/components/hud.vue.d.ts

@@ -1,5 +1,5 @@
 import { HudStatConfig } from '@/config';
-import { HudStatsState } from 'vue';
+import { HudStatsState } from '@/types/state';
 declare const _default: import("vue").DefineComponent<{}, {}, void, {
     statsConfig(): {
         [key: string]: HudStatConfig;

package/lib/components/notification-toast.vue.d.ts

@@ -1,4 +1,4 @@
-import { NotificationState } from 'vue';
+import { NotificationState } from '@/types/state';
 declare const _default: import("vue").DefineComponent<{}, {}, void, {
     notifications(): {
         [key: string]: NotificationState;

package/lib/dialog-box.vue.d.ts

@@ -1,7 +1,7 @@
 import { PropType } from 'vue';
 import { DialogStyle } from './types/character-types';
 import { DialogBoxParameters } from './types/dialog-box-types';
-import { DialogChoice } from './types/vuex';
+import { DialogChoice } from './types/state';
 declare const _default: import("vue").DefineComponent<{
     options: {
         type: PropType<DialogBoxParameters>;

package/lib/exports/plugins.d.ts

@@ -1,8 +1,8 @@
-import { State } from 'vue';
 import { ActionContext } from 'vuex';
 import { NarratPlugin } from '../plugins/NarratPlugin';
 import { CommandPlugin, generateParser } from '../vm/commands/command-plugin';
 import type { CommandRunner } from '../vm/commands/command-plugin';
+import { NarratState } from '../types/state';
 export declare type NarratLifecycleHook = <T extends [...any[]]>(...args: T) => void;
 declare type NarratPluginObject = {
     onPageLoaded?: NarratLifecycleHook;
@@ -17,6 +17,6 @@ declare type NarratPluginObject = {
 };
 declare function registerPlugin(plugin: NarratPluginObject): void;
 declare function addCommand(command: CommandPlugin): void;
-export declare type NarratActionContext = ActionContext<State, State>;
+export declare type NarratActionContext = ActionContext<NarratState, NarratState>;
 export { CommandRunner };
 export { CommandPlugin, NarratPluginObject, NarratPlugin, registerPlugin, addCommand, generateParser, };

package/lib/index.d.ts

@@ -1,17 +1,18 @@
 import 'es6-promise/auto';
 import './/sass/main.css';
-import { App, State } from 'vue';
+import { App } from 'vue';
 import { GameConfig } from './types/app-types';
 import { Store } from 'vuex';
+import { NarratState } from './types/state';
 export interface AppOptions {
     logging: boolean;
     debug: boolean;
 }
 export declare function startApp(config: GameConfig, options: AppOptions): Promise<void>;
 export declare type Narrat = {
-    store: Store<State>;
+    store: Store<NarratState>;
     app: App;
-    state: State;
+    state: NarratState;
 };
 declare global {
     export interface Window {

package/lib/index.esm.js

@@ -1,4 +1,4 @@
-// Version: 0.11.3 - June 15, 2022 16:22:12
+// Version: 0.11.6 - June 15, 2022 16:58:57
 import 'es6-promise/auto';
 import { ref, reactive, readonly, defineComponent, openBlock, createElementBlock, normalizeStyle, createElementVNode, createCommentVNode, Fragment, renderList, normalizeClass, createBlock, Transition, withCtx, renderSlot, createTextVNode, resolveComponent, withDirectives, vModelText, toDisplayString, TransitionGroup, createVNode, createApp } from 'vue';
 import { createLogger, createStore } from 'vuex';
@@ -8000,7 +8000,7 @@ function setupStore(options) {
         mutations: {
             setLoadedData(state, save) {
                 state.machine.data = save.data;
-                state.skills = cjs(state.skillChecks, save.skills);
+                state.skills = cjs(state.skills, save.skills);
                 state.dialog = save.dialog;
                 state.buttons = cjs(state.buttons, save.buttons);
                 state.lastLabel = save.lastLabel;
@@ -8751,7 +8751,7 @@ async function startApp(config, options) {
     logManager.setupDebugger(options.debug);
     const configFile = await getFile('data/config.json');
     setConfig(JSON.parse(configFile));
-    console.log('%c Narrat game engine – 0.11.3 - June 15, 2022 16:22:12', 'background: #222; color: #bada55');
+    console.log('%c Narrat game engine – 0.11.6 - June 15, 2022 16:58:57', 'background: #222; color: #bada55');
     vm$1.callHook('onNarratSetup');
     const storeSetup = setupStore(options);
     store$2 = storeSetup.store;

package/lib/index.js

@@ -1,4 +1,4 @@
-// Version: 0.11.3 - June 15, 2022 16:22:12
+// Version: 0.11.6 - June 15, 2022 16:58:57
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
@@ -8004,7 +8004,7 @@ function setupStore(options) {
         mutations: {
             setLoadedData(state, save) {
                 state.machine.data = save.data;
-                state.skills = cjs(state.skillChecks, save.skills);
+                state.skills = cjs(state.skills, save.skills);
                 state.dialog = save.dialog;
                 state.buttons = cjs(state.buttons, save.buttons);
                 state.lastLabel = save.lastLabel;
@@ -8755,7 +8755,7 @@ async function startApp(config, options) {
     logManager.setupDebugger(options.debug);
     const configFile = await getFile('data/config.json');
     setConfig(JSON.parse(configFile));
-    console.log('%c Narrat game engine – 0.11.3 - June 15, 2022 16:22:12', 'background: #222; color: #bada55');
+    console.log('%c Narrat game engine – 0.11.6 - June 15, 2022 16:58:57', 'background: #222; color: #bada55');
     vm$1.callHook('onNarratSetup');
     const storeSetup = setupStore(options);
     store$2 = storeSetup.store;

package/lib/plugins/NarratPlugin.d.ts

@@ -1,4 +1,4 @@
-import { NarratPluginObject } from '@/exports/plugins';
+import { NarratPluginObject } from '../exports/plugins';
 export declare class NarratPlugin implements NarratPluginObject {
     onPageLoaded(): void;
     onNarratSetup(): void;

package/lib/store.d.ts

@@ -1,7 +1,7 @@
 import { InjectionKey, State } from 'vue';
 import { Store } from 'vuex';
-import { DialogKey, MachineStack } from './types/vuex';
 import { AppOptions } from '.';
+import { DialogKey, MachineStack } from './types/state';
 export declare type AddDialogParams = Omit<DialogKey, 'id'>;
 export interface SetupStoreResult {
     store: Store<State>;

package/lib/types/dialog-box-types.d.ts

@@ -1,4 +1,4 @@
-import { DialogChoice } from './vuex';
+import { DialogChoice } from './state';
 export interface DialogBoxParameters {
     title: string;
     text: string;

package/lib/types/game-save.d.ts

@@ -1,5 +1,4 @@
-import { ButtonsState, HudStatsState } from 'vue';
-import { DataState, DialogKey, SkillCheckState, SkillsState } from './vuex';
+import { ButtonsState, HudStatsState, DataState, DialogKey, SkillCheckState, SkillsState } from './state';
 export interface GameSave {
     data: DataState;
     skills: SkillsState;

package/lib/types/parser.d.ts

@@ -1,4 +1,4 @@
-declare namespace Parser {
+export declare namespace Parser {
     interface IfOptions {
         condition: string;
         success: Branch;
@@ -43,9 +43,6 @@ declare namespace Parser {
     interface WaitOptions {
         duration: number;
     }
-    interface IfOptions {
-        branch: Branch;
-    }
     interface TextOptions {
         text: string;
     }

package/lib/types/state.d.ts

@@ -0,0 +1,99 @@
+import { AppOptions } from '..';
+import { Parser } from './parser';
+export declare type DialogCallback = (choice: number) => void;
+export interface MachineStack {
+    currentIndex: number;
+    branch: Parser.Branch;
+    label: string;
+}
+export interface DialogKey {
+    speaker: string;
+    text: string;
+    pose?: string;
+    choices?: DialogChoice[];
+    interactive: boolean;
+    id: string;
+}
+export interface DialogChoice {
+    choice: string;
+    originalIndex: number;
+    allowed: boolean;
+}
+export interface SkillState {
+    level: number;
+    xp: number;
+}
+export interface SkillsState {
+    [key: string]: SkillState;
+}
+export interface DataState {
+    [key: string]: any;
+}
+export interface SkillCheckState {
+    passed: boolean;
+    available: boolean;
+}
+export interface Vue {
+    $mq: 'sm' | 'md' | 'lg';
+}
+export interface NarratState {
+    machine: {
+        stack: MachineStack[];
+        script: Parser.ParsedScript;
+        data: DataState;
+    };
+    skillChecks: {
+        [key: string]: SkillCheckState;
+    };
+    buttons: ButtonsState;
+    dialog: DialogKey[];
+    count: number;
+    ready: boolean;
+    skills: SkillsState;
+    lastLabel: string;
+    playing: boolean;
+    currentScreen: string;
+    rendering: RenderingState;
+    hudStats: HudStatsState;
+    audio: {
+        currentMusic?: string;
+        musicHowlId?: number;
+    };
+    errors: ErrorState[];
+    playTime: {
+        start: number;
+        previousPlaytime: number;
+    };
+    notifications: {
+        [key: string]: NotificationState;
+    };
+    options: AppOptions;
+    flowState: 'menu' | 'playing';
+    openModal: string | false;
+    paused: boolean;
+}
+export interface HudStatsState {
+    [key: string]: HudStat;
+}
+export declare type HudStat = number;
+export interface NotificationState {
+    text: string;
+}
+export interface ButtonsState {
+    [key: string]: {
+        enabled: boolean;
+    };
+}
+export interface RenderingState {
+    screenWidth: number;
+    screenHeight: number;
+    canvasWidth: number;
+    canvasHeight: number;
+    renderRatio: number;
+    topOffset: number;
+    leftOffset: number;
+    layoutMode: 'horizontal' | 'vertical';
+}
+export interface ErrorState {
+    text: string;
+}

package/lib/utils/data-helpers.d.ts

@@ -3,7 +3,7 @@ export declare function findDataHelper<T>(sourceObj: any, path: string): [T, str
 export declare function setDataHelper<T>(sourceObj: any, path: string, value: T): void;
 export declare function addDataHelper<T>(sourceObj: any, path: string, value: T): void;
 export declare function getModifiableData(state: State): {
-    data: import("../types/vuex").DataState;
-    skills: import("../types/vuex").SkillsState;
-    buttons: import("vue").ButtonsState;
+    data: import("../types/state").DataState;
+    skills: import("../types/state").SkillsState;
+    buttons: import("../types/state").ButtonsState;
 };

package/lib/utils/skillchecks.d.ts

@@ -1,5 +1,5 @@
 import { SkillCheckParams } from '@/vm/vm-helpers';
-import { SkillCheckState } from '@/types/vuex';
+import { SkillCheckState } from '@/types/state';
 import { State } from 'vue';
 import { ActionContext } from 'vuex';
 export declare function createSkillCheckState(): SkillCheckState;

package/lib/vm/commands/choice.d.ts

@@ -1,6 +1,7 @@
 import { State } from 'vue';
 import { ActionContext } from 'vuex';
 import { CommandPlugin, CommandRunner } from './command-plugin';
+import { Parser } from '@/types/parser';
 export declare const choice: CommandRunner;
 export declare function runChoice(context: ActionContext<State, State>, cmd: Parser.Command): Promise<void>;
 export declare const choicePlugin: CommandPlugin;

package/lib/vm/commands/command-plugin.d.ts

@@ -1,8 +1,8 @@
-import { DialogChoice } from '@/types/vuex';
-import { State } from 'vue';
+import { Parser } from '../../types/parser';
+import { DialogChoice, NarratState } from '../../types/state';
 import { ActionContext } from 'vuex';
 import { ParserContext } from '../vm-parser';
-export declare type CommandRunner = (context: ActionContext<State, State>, cmd: Parser.Command, choices?: DialogChoice[]) => Promise<void>;
+export declare type CommandRunner = (context: ActionContext<NarratState, NarratState>, cmd: Parser.Command, choices?: DialogChoice[]) => Promise<void>;
 export declare type CommandParserFunction = (ctx: CommandParsingContext) => void;
 export declare type ProcessCommandsFunction = (ctx: ParserContext, lines: Parser.Line[], parentLine: Parser.Line | undefined) => Parser.Branch;
 export interface CommandParsingContext {

package/lib/vm/vm-helpers.d.ts

@@ -1,4 +1,5 @@
 import { AddDialogParams } from '@/store';
+import { Parser } from '@/types/parser';
 import { State } from 'vue';
 import { ActionContext, Commit } from 'vuex';
 export declare function processSkillCheck(ctx: ActionContext<State, State>, skillcheck: Parser.SkillCheckOptions): boolean;

package/lib/vm/vm-parser.d.ts

@@ -1,3 +1,4 @@
+import { Parser } from '../types/parser';
 import { ProcessCommandsFunction } from './commands/command-plugin';
 export declare type ParserErrorHandler = (ctx: ParserContext, line: number, text: string) => void;
 export interface ParserContext {

package/lib/vm/vm.d.ts

@@ -1,8 +1,9 @@
 import { ActionContext } from 'vuex';
 import { State } from 'vue';
-import { DialogChoice } from '@/types/vuex';
+import { DialogChoice } from '@/types/state';
 import { CommandPlugin } from './commands/command-plugin';
 import { NarratPluginObject } from '@/exports/plugins';
+import { Parser } from '@/types/parser';
 export declare function runLine(context: ActionContext<State, State>): Promise<void>;
 export declare class VM {
     plugins: NarratPluginObject[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "narrat",
-  "version": "0.11.3",
+  "version": "0.11.6",
   "description": "narrat narrative engine",
   "main": "lib/index.js",
   "module": "lib/index.esm.js",