narrat 1.2.1 → 1.3.0

package/lib/index.esm.js

@@ -1,4 +1,4 @@
-// Version: 1.2.1 - June 25, 2022 14:20:12
+// Version: 1.3.0 - June 25, 2022 18:05:43
 import 'es6-promise/auto';
 import { ref, reactive, readonly, defineComponent, openBlock, createElementBlock, normalizeStyle, createElementVNode, createCommentVNode, Fragment, renderList, normalizeClass, createBlock, Transition, withCtx, renderSlot, createTextVNode, computed, resolveComponent, withDirectives, vModelText, toDisplayString, TransitionGroup, createVNode, createApp } from 'vue';
 import { defineStore, mapState, createPinia } from 'pinia';
@@ -3560,32 +3560,178 @@ function randomId() {
     return `${Date.now() - Math.floor(Math.random() * 99999999)}`;
 }
 
-// Create a pinia store named dialog with a state using the type DialogState, with actions addDialog and clearDialog
-const useDialogStore = defineStore('dialog', {
+// Generate a pinia store named notifications with a state using the type NotificationsState, and save type NotificationsSave, with actions:
+// addNotification(text: string): Adds a new notification to the state, and deletes it after a timeout
+// deleteNotification(id: string): Deletes a notification from the state
+const useNotifications = defineStore('notifications', {
+    state: () => ({ notifications: {} }),
+    actions: {
+        async addNotification(text) {
+            const id = `${Date.now()}-${Math.random() * 10000}`;
+            this.notifications[id] = {
+                text,
+            };
+            if (getConfig().notifications.alsoPrintInDialogue) {
+                writeText(`[NOTIFICATION] ${text}`);
+            }
+            await timeout(getConfig().notifications.timeOnScreen * 1000);
+            this.deleteNotification(id);
+        },
+        deleteNotification(id) {
+            delete this.notifications[id];
+        },
+    },
+});
+
+// create a pinia store named inventory with a state containing items and actions to add and delete items
+// create a pinia store named inventory with a state of type ItemState and actions to add and delete items. Adding items should increase the amount of any existing item that matches the id.
+const useInventory = defineStore('inventory', {
     state: () => ({
-        dialog: [],
+        items: {},
     }),
     actions: {
         generateSaveData() {
             return {
-                dialog: this.dialog,
+                items: this.items,
             };
         },
-        loadSaveData(data) {
-            this.dialog = data.dialog;
+        loadSaveData(save) {
+            this.items = { ...this.items, ...save.items };
         },
-        addDialog(dialog) {
-            this.dialog.push({
-                ...dialog,
-                interactive: dialog.interactive ?? false,
-                id: randomId(),
+        setupItems(items) {
+            Object.keys(items).forEach((key) => {
+                this.items[key] = {
+                    amount: 0,
+                    id: key,
+                };
             });
         },
-        clearDialog() {
-            this.dialog.splice(0, this.dialog.length);
+        getExistingItem(id) {
+            return this.items[id];
         },
-        reset() {
-            this.dialog = [];
+        getItemAmount(id) {
+            return this.getExistingItem(id)?.amount || 0;
+        },
+        add(item) {
+            const existingItem = this.getExistingItem(item.id);
+            if (existingItem) {
+                existingItem.amount += item.amount;
+            }
+            else {
+                this.items[item.id] = { ...item };
+            }
+            useNotifications().addNotification(`Received item: ${getItemConfig(item.id).name} x ${item.amount}`);
+        },
+        remove(item) {
+            const existingItem = this.getExistingItem(item.id);
+            if (existingItem) {
+                existingItem.amount -= item.amount;
+                useNotifications().addNotification(`Lost item: ${getItemConfig(item.id).name} x ${item.amount}`);
+                if (existingItem.amount <= 0) {
+                    this.deleteItem(item.id);
+                }
+            }
+        },
+        deleteItem(id) {
+            const existingItem = this.getExistingItem(id);
+            if (existingItem) {
+                this.items[id].amount = 0;
+            }
+        },
+    },
+});
+
+const everyObject = (object, predicate) => {
+    for (const key in object) {
+        if (!predicate(object[key])) {
+            return false;
+        }
+    }
+    return true;
+};
+const filterObject = (object, predicate) => {
+    const result = {};
+    for (const key in object) {
+        if (predicate(object[key])) {
+            result[key] = object[key];
+        }
+    }
+    return result;
+};
+
+const useQuests = defineStore('quests', {
+    state: () => ({
+        quests: {},
+    }),
+    actions: {
+        getQuest(questId) {
+            const quest = this.quests[questId];
+            if (quest) {
+                return quest;
+            }
+            error(`Quest ${questId} doesn't exist!`);
+        },
+        getObjective(quest, objectiveId) {
+            const questObjective = this.getQuest(quest).objectives[objectiveId];
+            if (questObjective) {
+                return questObjective;
+            }
+            error(`Objective ${objectiveId} doesn't exist in quest ${quest}!`);
+        },
+        setupQuests(quests) {
+            // iterate through quests to generate quest states to add to this.quests object
+            for (const key of Object.keys(quests)) {
+                const data = quests[key];
+                this.quests[key] = {
+                    id: key,
+                    state: 'hidden',
+                    objectives: {},
+                };
+                // iterate through data.objectives to populate the objectives array of this.quests[key]
+                for (const objectiveKey of Object.keys(data.objectives)) {
+                    const objective = data.objectives[objectiveKey];
+                    this.quests[key].objectives[objectiveKey] = {
+                        id: objectiveKey,
+                        state: objective.hidden ? 'hidden' : 'unlocked',
+                    };
+                }
+            }
+        },
+        startQuest(questId) {
+            this.getQuest(questId).state = 'unlocked';
+            useNotifications().addNotification(`Started quest: ${getQuestConfig(questId).title}`);
+        },
+        startObjective(questId, objectiveId) {
+            this.getObjective(questId, objectiveId).state = 'unlocked';
+            useNotifications().addNotification(`New quest objective: ${getObjectiveConfig(questId, objectiveId).description}`);
+        },
+        completeObjective(questId, objectiveId) {
+            this.getObjective(questId, objectiveId).state = 'completed';
+            useNotifications().addNotification(`Objective completed!`);
+        },
+        completeQuest(questId, ending) {
+            this.getQuest(questId).state = 'completed';
+            if (ending) {
+                this.getQuest(questId).ending = ending;
+            }
+            useNotifications().addNotification(`Quest completed: ${getQuestConfig(questId).title}`);
+        },
+        isQuestCompleted(questId) {
+            const quest = this.getQuest(questId);
+            return everyObject(quest.objectives, (objective) => objective.state === 'completed');
+        },
+        removeQuest(id) {
+            delete this.quests[id];
+        },
+        generateSaveData() {
+            return {
+                quests: {
+                    ...this.quests,
+                },
+            };
+        },
+        loadSaveData(data) {
+            this.quests = data.quests;
         },
     },
 });
@@ -3722,122 +3868,6 @@ var deepmerge_1 = deepmerge;
 
 var cjs = deepmerge_1;
 
-// Create a pinia store named hud with a state using the type HudState, and save type HudSave, with actions:
-// setupHudStats(stats: { [key: string]: HudStatConfig }): Iterates the stats argument to add new stats to the state
-// setStat(stat: string, value: number): Sets the value of a stat
-// addStat(stat: string, value: number): Adds a value to a stat
-// generateSaveData(): Function that generates a HudSave object from the data in the state
-// loadSaveData(data: HudSave): Function that loads the data into the state
-const useHud = defineStore('hud', {
-    state: () => ({
-        hudStats: {},
-    }),
-    actions: {
-        setupHudStats(stats) {
-            for (const stat in stats) {
-                this.hudStats[stat] = {
-                    value: stats[stat].startingValue,
-                };
-            }
-        },
-        setStat(stat, value) {
-            this.hudStats[stat].value = value;
-        },
-        addStat(stat, value) {
-            this.hudStats[stat].value += value;
-        },
-        generateSaveData() {
-            return {
-                hudStats: this.hudStats,
-            };
-        },
-        loadSaveData(data) {
-            this.hudStats = cjs(this.hudStats, data.hudStats);
-        },
-    },
-});
-
-// Generate a pinia store named notifications with a state using the type NotificationsState, and save type NotificationsSave, with actions:
-// addNotification(text: string): Adds a new notification to the state, and deletes it after a timeout
-// deleteNotification(id: string): Deletes a notification from the state
-const useNotifications = defineStore('notifications', {
-    state: () => ({ notifications: {} }),
-    actions: {
-        async addNotification(text) {
-            const id = `${Date.now()}-${Math.random() * 10000}`;
-            this.notifications[id] = {
-                text,
-            };
-            if (getConfig().notifications.alsoPrintInDialogue) {
-                writeText(`[NOTIFICATION] ${text}`);
-            }
-            await timeout(getConfig().notifications.timeOnScreen * 1000);
-            this.deleteNotification(id);
-        },
-        deleteNotification(id) {
-            delete this.notifications[id];
-        },
-    },
-});
-
-// create a pinia store named inventory with a state containing items and actions to add and delete items
-// create a pinia store named inventory with a state of type ItemState and actions to add and delete items. Adding items should increase the amount of any existing item that matches the id.
-const useInventory = defineStore('inventory', {
-    state: () => ({
-        items: {},
-    }),
-    actions: {
-        generateSaveData() {
-            return {
-                items: this.items,
-            };
-        },
-        loadSaveData(save) {
-            this.items = { ...this.items, ...save.items };
-        },
-        setupItems(items) {
-            Object.keys(items).forEach((key) => {
-                this.items[key] = {
-                    amount: 0,
-                    id: key,
-                };
-            });
-        },
-        getExistingItem(id) {
-            return this.items[id];
-        },
-        getItemAmount(id) {
-            return this.getExistingItem(id)?.amount || 0;
-        },
-        add(item) {
-            const existingItem = this.getExistingItem(item.id);
-            if (existingItem) {
-                existingItem.amount += item.amount;
-            }
-            else {
-                this.items[item.id] = { ...item };
-            }
-            useNotifications().addNotification(`Received item: ${getItemConfig(item.id).name} x ${item.amount}`);
-        },
-        remove(item) {
-            const existingItem = this.getExistingItem(item.id);
-            if (existingItem) {
-                existingItem.amount -= item.amount;
-                useNotifications().addNotification(`Lost item: ${getItemConfig(item.id).name} x ${item.amount}`);
-                if (existingItem.amount <= 0) {
-                    this.deleteItem(item.id);
-                }
-            }
-        },
-        deleteItem(id) {
-            const existingItem = this.getExistingItem(id);
-            if (existingItem) {
-                this.items[id].amount = 0;
-            }
-        },
-    },
-});
-
 // Create a pinia store named skills with a state using the type Skills, with actions:
 // setupSkillCheck(skillCheck: SkillCheckState, id: string)
 // passSkillCheck(skillCheckId: string)
@@ -3885,6 +3915,9 @@ const useSkills = defineStore('skills', {
         },
         addXp(skill, xp) {
             const skillData = this.skills[skill];
+            if (!skillData) {
+                error(`Skill ${skill} doesn't exist`);
+            }
             skillData.xp += xp;
             if (skillData.xp >= getConfig().skillOptions.xpPerLevel) {
                 skillData.xp = 0;
@@ -3925,101 +3958,6 @@ function getFile(url) {
     });
 }
 
-const everyObject = (object, predicate) => {
-    for (const key in object) {
-        if (!predicate(object[key])) {
-            return false;
-        }
-    }
-    return true;
-};
-const filterObject = (object, predicate) => {
-    const result = {};
-    for (const key in object) {
-        if (predicate(object[key])) {
-            result[key] = object[key];
-        }
-    }
-    return result;
-};
-
-const useQuests = defineStore('quests', {
-    state: () => ({
-        quests: {},
-    }),
-    actions: {
-        getQuest(questId) {
-            const quest = this.quests[questId];
-            if (quest) {
-                return quest;
-            }
-            error(`Quest ${questId} doesn't exist!`);
-        },
-        getObjective(quest, objectiveId) {
-            const questObjective = this.getQuest(quest).objectives[objectiveId];
-            if (questObjective) {
-                return questObjective;
-            }
-            error(`Objective ${objectiveId} doesn't exist in quest ${quest}!`);
-        },
-        setupQuests(quests) {
-            // iterate through quests to generate quest states to add to this.quests object
-            for (const key of Object.keys(quests)) {
-                const data = quests[key];
-                this.quests[key] = {
-                    id: key,
-                    state: 'hidden',
-                    objectives: {},
-                };
-                // iterate through data.objectives to populate the objectives array of this.quests[key]
-                for (const objectiveKey of Object.keys(data.objectives)) {
-                    const objective = data.objectives[objectiveKey];
-                    this.quests[key].objectives[objectiveKey] = {
-                        id: objectiveKey,
-                        state: objective.hidden ? 'hidden' : 'unlocked',
-                    };
-                }
-            }
-        },
-        startQuest(questId) {
-            this.getQuest(questId).state = 'unlocked';
-            useNotifications().addNotification(`Started quest: ${getQuestConfig(questId).title}`);
-        },
-        startObjective(questId, objectiveId) {
-            this.getObjective(questId, objectiveId).state = 'unlocked';
-            useNotifications().addNotification(`New quest objective: ${getObjectiveConfig(questId, objectiveId).description}`);
-        },
-        completeObjective(questId, objectiveId) {
-            this.getObjective(questId, objectiveId).state = 'completed';
-            useNotifications().addNotification(`Objective completed!`);
-        },
-        completeQuest(questId, ending) {
-            this.getQuest(questId).state = 'completed';
-            if (ending) {
-                this.getQuest(questId).ending = ending;
-            }
-            useNotifications().addNotification(`Quest completed: ${getQuestConfig(questId).title}`);
-        },
-        isQuestCompleted(questId) {
-            const quest = this.getQuest(questId);
-            return everyObject(quest.objectives, (objective) => objective.state === 'completed');
-        },
-        removeQuest(id) {
-            delete this.quests[id];
-        },
-        generateSaveData() {
-            return {
-                quests: {
-                    ...this.quests,
-                },
-            };
-        },
-        loadSaveData(data) {
-            this.quests = data.quests;
-        },
-    },
-});
-
 // Create a pinia store named screens with a state using the type ScreenState, with actions:
 // setScreen(screen: string): Sets the current screen to the given screen
 // setButtons(buttons: { [key: string]: ButtonConfig }): Adds buttons to the buttons state by using the values in the buttons config object
@@ -4311,6 +4249,7 @@ const useVM = defineStore('vm', {
         data: {},
         lastLabel: 'main',
         script: {},
+        labelStack: ['main'],
     }),
     actions: {
         generateSaveData() {
@@ -4427,6 +4366,19 @@ const useVM = defineStore('vm', {
             const cmd = this.currentLine;
             await runCommand(cmd);
         },
+        async runLabelFunction(label) {
+            const branch = this.script[label];
+            if (!branch) {
+                console.error(`Label ${branch} doesn't exist`);
+            }
+            const stack = {
+                currentIndex: 0,
+                branch: branch,
+                label,
+            };
+            this.addStack(stack);
+            await this.runLine();
+        },
         runLabel(label) {
             const branch = this.script[label];
             if (!branch) {
@@ -4455,6 +4407,88 @@ const useVM = defineStore('vm', {
     },
 });
 
+function processText(text) {
+    const vmStore = useVM();
+    const skillStore = useSkills();
+    return text.replace(/%{[^}]*}/g, (match) => {
+        const key = match.substr(2, match.length - 3);
+        const searchableState = {
+            data: vmStore.data,
+            skills: skillStore.skills,
+            items: useInventory().items,
+            quests: useQuests().quests,
+        };
+        const [obj, newKey] = findDataHelper(searchableState, key);
+        return obj[newKey];
+    });
+}
+
+// Create a pinia store named dialog with a state using the type DialogState, with actions addDialog and clearDialog
+const useDialogStore = defineStore('dialog', {
+    state: () => ({
+        dialog: [],
+    }),
+    actions: {
+        generateSaveData() {
+            return {
+                dialog: this.dialog,
+            };
+        },
+        loadSaveData(data) {
+            this.dialog = data.dialog;
+        },
+        addDialog(dialog) {
+            this.dialog.push({
+                ...dialog,
+                interactive: dialog.interactive ?? false,
+                id: randomId(),
+                text: processText(dialog.text),
+            });
+        },
+        clearDialog() {
+            this.dialog.splice(0, this.dialog.length);
+        },
+        reset() {
+            this.dialog = [];
+        },
+    },
+});
+
+// Create a pinia store named hud with a state using the type HudState, and save type HudSave, with actions:
+// setupHudStats(stats: { [key: string]: HudStatConfig }): Iterates the stats argument to add new stats to the state
+// setStat(stat: string, value: number): Sets the value of a stat
+// addStat(stat: string, value: number): Adds a value to a stat
+// generateSaveData(): Function that generates a HudSave object from the data in the state
+// loadSaveData(data: HudSave): Function that loads the data into the state
+const useHud = defineStore('hud', {
+    state: () => ({
+        hudStats: {},
+    }),
+    actions: {
+        setupHudStats(stats) {
+            for (const stat in stats) {
+                this.hudStats[stat] = {
+                    value: stats[stat].startingValue,
+                };
+            }
+        },
+        setStat(stat, value) {
+            this.hudStats[stat].value = value;
+        },
+        addStat(stat, value) {
+            this.hudStats[stat].value += value;
+        },
+        generateSaveData() {
+            return {
+                hudStats: this.hudStats,
+            };
+        },
+        loadSaveData(data) {
+            this.hudStats = cjs(this.hudStats, data.hudStats);
+        },
+    },
+});
+
 function createSkillCheckState() {
     const skillCheck = {
         passed: false,
@@ -7722,22 +7756,6 @@ styleInject(css_248z$8);
 
 script$7.render = render$7;
 
-function processText(text) {
-    const vmStore = useVM();
-    const skillStore = useSkills();
-    return text.replace(/%{[^}]*}/g, (match) => {
-        const key = match.substr(2, match.length - 3);
-        const searchableState = {
-            data: vmStore.data,
-            skills: skillStore.skills,
-            items: useInventory().items,
-            quests: useQuests().quests,
-        };
-        const [obj, newKey] = findDataHelper(searchableState, key);
-        return obj[newKey];
-    });
-}
-
 function aspectRatioFit(screenWidth, screenHeight, gameWidth, gameHeight) {
     const widthRatio = screenWidth / gameWidth;
     const heightRatio = screenHeight / gameHeight;
@@ -8719,7 +8737,7 @@ var script$d = defineComponent({
             }
             return {
                 title,
-                text: processText(dialogKey.text),
+                text: dialogKey.text,
                 styleId: dialogKey.speaker,
                 choices: dialogKey.choices,
                 old: index < this.dialog.length - 1,
@@ -9439,6 +9457,15 @@ const completeQuestPlugin = new CommandPlugin('complete_quest', async (cmd) => {
     return useVM().nextLine();
 }, generateParser('complete_quest'));
 
+// Write a CommandPlugin for running a label using the runLabelFunction of the useVM store
+const runLabelPlugin = new CommandPlugin('run_label', async (cmd) => {
+    const label = cmd.args[0];
+    if (!label) {
+        error(`run_label command needs a label to argument run`);
+    }
+    await useVM().runLabelFunction(label);
+}, generateParser('run_label'));
+
 function registerBaseCommands(vm) {
     vm.addCommand(addItemPlugin);
     vm.addCommand(addLevelPlugin);
@@ -9461,6 +9488,9 @@ function registerBaseCommands(vm) {
     vm.addCommand(talkCommand);
     vm.addCommand(textCommandPlugin);
     vm.addCommand(waitCommand);
+    // functions and labels
+    vm.addCommand(jumpCommand);
+    vm.addCommand(runLabelPlugin);
     // Quests
     vm.addCommand(startQuestPlugin);
     vm.addCommand(startObjectivePlugin);
@@ -9508,7 +9538,7 @@ async function startApp(config, options) {
     });
     registerBaseCommands(vm);
     logManager.setupDebugger(options.debug);
-    console.log('%c Narrat game engine – 1.2.1 - June 25, 2022 14:20:12', 'background: #222; color: #bada55');
+    console.log('%c Narrat game engine – 1.3.0 - June 25, 2022 18:05:43', 'background: #222; color: #bada55');
     vm.callHook('onNarratSetup');
     app.mount('#game-holder');
     if (options.debug) {

package/lib/index.js

@@ -1,4 +1,4 @@
-// Version: 1.2.1 - June 25, 2022 14:20:12
+// Version: 1.3.0 - June 25, 2022 18:05:43
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
@@ -3564,32 +3564,178 @@ function randomId() {
     return `${Date.now() - Math.floor(Math.random() * 99999999)}`;
 }
 
-// Create a pinia store named dialog with a state using the type DialogState, with actions addDialog and clearDialog
-const useDialogStore = pinia.defineStore('dialog', {
+// Generate a pinia store named notifications with a state using the type NotificationsState, and save type NotificationsSave, with actions:
+// addNotification(text: string): Adds a new notification to the state, and deletes it after a timeout
+// deleteNotification(id: string): Deletes a notification from the state
+const useNotifications = pinia.defineStore('notifications', {
+    state: () => ({ notifications: {} }),
+    actions: {
+        async addNotification(text) {
+            const id = `${Date.now()}-${Math.random() * 10000}`;
+            this.notifications[id] = {
+                text,
+            };
+            if (getConfig().notifications.alsoPrintInDialogue) {
+                writeText(`[NOTIFICATION] ${text}`);
+            }
+            await timeout(getConfig().notifications.timeOnScreen * 1000);
+            this.deleteNotification(id);
+        },
+        deleteNotification(id) {
+            delete this.notifications[id];
+        },
+    },
+});
+
+// create a pinia store named inventory with a state containing items and actions to add and delete items
+// create a pinia store named inventory with a state of type ItemState and actions to add and delete items. Adding items should increase the amount of any existing item that matches the id.
+const useInventory = pinia.defineStore('inventory', {
     state: () => ({
-        dialog: [],
+        items: {},
     }),
     actions: {
         generateSaveData() {
             return {
-                dialog: this.dialog,
+                items: this.items,
             };
         },
-        loadSaveData(data) {
-            this.dialog = data.dialog;
+        loadSaveData(save) {
+            this.items = { ...this.items, ...save.items };
         },
-        addDialog(dialog) {
-            this.dialog.push({
-                ...dialog,
-                interactive: dialog.interactive ?? false,
-                id: randomId(),
+        setupItems(items) {
+            Object.keys(items).forEach((key) => {
+                this.items[key] = {
+                    amount: 0,
+                    id: key,
+                };
             });
         },
-        clearDialog() {
-            this.dialog.splice(0, this.dialog.length);
+        getExistingItem(id) {
+            return this.items[id];
         },
-        reset() {
-            this.dialog = [];
+        getItemAmount(id) {
+            return this.getExistingItem(id)?.amount || 0;
+        },
+        add(item) {
+            const existingItem = this.getExistingItem(item.id);
+            if (existingItem) {
+                existingItem.amount += item.amount;
+            }
+            else {
+                this.items[item.id] = { ...item };
+            }
+            useNotifications().addNotification(`Received item: ${getItemConfig(item.id).name} x ${item.amount}`);
+        },
+        remove(item) {
+            const existingItem = this.getExistingItem(item.id);
+            if (existingItem) {
+                existingItem.amount -= item.amount;
+                useNotifications().addNotification(`Lost item: ${getItemConfig(item.id).name} x ${item.amount}`);
+                if (existingItem.amount <= 0) {
+                    this.deleteItem(item.id);
+                }
+            }
+        },
+        deleteItem(id) {
+            const existingItem = this.getExistingItem(id);
+            if (existingItem) {
+                this.items[id].amount = 0;
+            }
+        },
+    },
+});
+
+const everyObject = (object, predicate) => {
+    for (const key in object) {
+        if (!predicate(object[key])) {
+            return false;
+        }
+    }
+    return true;
+};
+const filterObject = (object, predicate) => {
+    const result = {};
+    for (const key in object) {
+        if (predicate(object[key])) {
+            result[key] = object[key];
+        }
+    }
+    return result;
+};
+
+const useQuests = pinia.defineStore('quests', {
+    state: () => ({
+        quests: {},
+    }),
+    actions: {
+        getQuest(questId) {
+            const quest = this.quests[questId];
+            if (quest) {
+                return quest;
+            }
+            error(`Quest ${questId} doesn't exist!`);
+        },
+        getObjective(quest, objectiveId) {
+            const questObjective = this.getQuest(quest).objectives[objectiveId];
+            if (questObjective) {
+                return questObjective;
+            }
+            error(`Objective ${objectiveId} doesn't exist in quest ${quest}!`);
+        },
+        setupQuests(quests) {
+            // iterate through quests to generate quest states to add to this.quests object
+            for (const key of Object.keys(quests)) {
+                const data = quests[key];
+                this.quests[key] = {
+                    id: key,
+                    state: 'hidden',
+                    objectives: {},
+                };
+                // iterate through data.objectives to populate the objectives array of this.quests[key]
+                for (const objectiveKey of Object.keys(data.objectives)) {
+                    const objective = data.objectives[objectiveKey];
+                    this.quests[key].objectives[objectiveKey] = {
+                        id: objectiveKey,
+                        state: objective.hidden ? 'hidden' : 'unlocked',
+                    };
+                }
+            }
+        },
+        startQuest(questId) {
+            this.getQuest(questId).state = 'unlocked';
+            useNotifications().addNotification(`Started quest: ${getQuestConfig(questId).title}`);
+        },
+        startObjective(questId, objectiveId) {
+            this.getObjective(questId, objectiveId).state = 'unlocked';
+            useNotifications().addNotification(`New quest objective: ${getObjectiveConfig(questId, objectiveId).description}`);
+        },
+        completeObjective(questId, objectiveId) {
+            this.getObjective(questId, objectiveId).state = 'completed';
+            useNotifications().addNotification(`Objective completed!`);
+        },
+        completeQuest(questId, ending) {
+            this.getQuest(questId).state = 'completed';
+            if (ending) {
+                this.getQuest(questId).ending = ending;
+            }
+            useNotifications().addNotification(`Quest completed: ${getQuestConfig(questId).title}`);
+        },
+        isQuestCompleted(questId) {
+            const quest = this.getQuest(questId);
+            return everyObject(quest.objectives, (objective) => objective.state === 'completed');
+        },
+        removeQuest(id) {
+            delete this.quests[id];
+        },
+        generateSaveData() {
+            return {
+                quests: {
+                    ...this.quests,
+                },
+            };
+        },
+        loadSaveData(data) {
+            this.quests = data.quests;
         },
     },
 });
@@ -3726,122 +3872,6 @@ var deepmerge_1 = deepmerge;
 
 var cjs = deepmerge_1;
 
-// Create a pinia store named hud with a state using the type HudState, and save type HudSave, with actions:
-// setupHudStats(stats: { [key: string]: HudStatConfig }): Iterates the stats argument to add new stats to the state
-// setStat(stat: string, value: number): Sets the value of a stat
-// addStat(stat: string, value: number): Adds a value to a stat
-// generateSaveData(): Function that generates a HudSave object from the data in the state
-// loadSaveData(data: HudSave): Function that loads the data into the state
-const useHud = pinia.defineStore('hud', {
-    state: () => ({
-        hudStats: {},
-    }),
-    actions: {
-        setupHudStats(stats) {
-            for (const stat in stats) {
-                this.hudStats[stat] = {
-                    value: stats[stat].startingValue,
-                };
-            }
-        },
-        setStat(stat, value) {
-            this.hudStats[stat].value = value;
-        },
-        addStat(stat, value) {
-            this.hudStats[stat].value += value;
-        },
-        generateSaveData() {
-            return {
-                hudStats: this.hudStats,
-            };
-        },
-        loadSaveData(data) {
-            this.hudStats = cjs(this.hudStats, data.hudStats);
-        },
-    },
-});
-
-// Generate a pinia store named notifications with a state using the type NotificationsState, and save type NotificationsSave, with actions:
-// addNotification(text: string): Adds a new notification to the state, and deletes it after a timeout
-// deleteNotification(id: string): Deletes a notification from the state
-const useNotifications = pinia.defineStore('notifications', {
-    state: () => ({ notifications: {} }),
-    actions: {
-        async addNotification(text) {
-            const id = `${Date.now()}-${Math.random() * 10000}`;
-            this.notifications[id] = {
-                text,
-            };
-            if (getConfig().notifications.alsoPrintInDialogue) {
-                writeText(`[NOTIFICATION] ${text}`);
-            }
-            await timeout(getConfig().notifications.timeOnScreen * 1000);
-            this.deleteNotification(id);
-        },
-        deleteNotification(id) {
-            delete this.notifications[id];
-        },
-    },
-});
-
-// create a pinia store named inventory with a state containing items and actions to add and delete items
-// create a pinia store named inventory with a state of type ItemState and actions to add and delete items. Adding items should increase the amount of any existing item that matches the id.
-const useInventory = pinia.defineStore('inventory', {
-    state: () => ({
-        items: {},
-    }),
-    actions: {
-        generateSaveData() {
-            return {
-                items: this.items,
-            };
-        },
-        loadSaveData(save) {
-            this.items = { ...this.items, ...save.items };
-        },
-        setupItems(items) {
-            Object.keys(items).forEach((key) => {
-                this.items[key] = {
-                    amount: 0,
-                    id: key,
-                };
-            });
-        },
-        getExistingItem(id) {
-            return this.items[id];
-        },
-        getItemAmount(id) {
-            return this.getExistingItem(id)?.amount || 0;
-        },
-        add(item) {
-            const existingItem = this.getExistingItem(item.id);
-            if (existingItem) {
-                existingItem.amount += item.amount;
-            }
-            else {
-                this.items[item.id] = { ...item };
-            }
-            useNotifications().addNotification(`Received item: ${getItemConfig(item.id).name} x ${item.amount}`);
-        },
-        remove(item) {
-            const existingItem = this.getExistingItem(item.id);
-            if (existingItem) {
-                existingItem.amount -= item.amount;
-                useNotifications().addNotification(`Lost item: ${getItemConfig(item.id).name} x ${item.amount}`);
-                if (existingItem.amount <= 0) {
-                    this.deleteItem(item.id);
-                }
-            }
-        },
-        deleteItem(id) {
-            const existingItem = this.getExistingItem(id);
-            if (existingItem) {
-                this.items[id].amount = 0;
-            }
-        },
-    },
-});
-
 // Create a pinia store named skills with a state using the type Skills, with actions:
 // setupSkillCheck(skillCheck: SkillCheckState, id: string)
 // passSkillCheck(skillCheckId: string)
@@ -3889,6 +3919,9 @@ const useSkills = pinia.defineStore('skills', {
         },
         addXp(skill, xp) {
             const skillData = this.skills[skill];
+            if (!skillData) {
+                error(`Skill ${skill} doesn't exist`);
+            }
             skillData.xp += xp;
             if (skillData.xp >= getConfig().skillOptions.xpPerLevel) {
                 skillData.xp = 0;
@@ -3929,101 +3962,6 @@ function getFile(url) {
     });
 }
 
-const everyObject = (object, predicate) => {
-    for (const key in object) {
-        if (!predicate(object[key])) {
-            return false;
-        }
-    }
-    return true;
-};
-const filterObject = (object, predicate) => {
-    const result = {};
-    for (const key in object) {
-        if (predicate(object[key])) {
-            result[key] = object[key];
-        }
-    }
-    return result;
-};
-
-const useQuests = pinia.defineStore('quests', {
-    state: () => ({
-        quests: {},
-    }),
-    actions: {
-        getQuest(questId) {
-            const quest = this.quests[questId];
-            if (quest) {
-                return quest;
-            }
-            error(`Quest ${questId} doesn't exist!`);
-        },
-        getObjective(quest, objectiveId) {
-            const questObjective = this.getQuest(quest).objectives[objectiveId];
-            if (questObjective) {
-                return questObjective;
-            }
-            error(`Objective ${objectiveId} doesn't exist in quest ${quest}!`);
-        },
-        setupQuests(quests) {
-            // iterate through quests to generate quest states to add to this.quests object
-            for (const key of Object.keys(quests)) {
-                const data = quests[key];
-                this.quests[key] = {
-                    id: key,
-                    state: 'hidden',
-                    objectives: {},
-                };
-                // iterate through data.objectives to populate the objectives array of this.quests[key]
-                for (const objectiveKey of Object.keys(data.objectives)) {
-                    const objective = data.objectives[objectiveKey];
-                    this.quests[key].objectives[objectiveKey] = {
-                        id: objectiveKey,
-                        state: objective.hidden ? 'hidden' : 'unlocked',
-                    };
-                }
-            }
-        },
-        startQuest(questId) {
-            this.getQuest(questId).state = 'unlocked';
-            useNotifications().addNotification(`Started quest: ${getQuestConfig(questId).title}`);
-        },
-        startObjective(questId, objectiveId) {
-            this.getObjective(questId, objectiveId).state = 'unlocked';
-            useNotifications().addNotification(`New quest objective: ${getObjectiveConfig(questId, objectiveId).description}`);
-        },
-        completeObjective(questId, objectiveId) {
-            this.getObjective(questId, objectiveId).state = 'completed';
-            useNotifications().addNotification(`Objective completed!`);
-        },
-        completeQuest(questId, ending) {
-            this.getQuest(questId).state = 'completed';
-            if (ending) {
-                this.getQuest(questId).ending = ending;
-            }
-            useNotifications().addNotification(`Quest completed: ${getQuestConfig(questId).title}`);
-        },
-        isQuestCompleted(questId) {
-            const quest = this.getQuest(questId);
-            return everyObject(quest.objectives, (objective) => objective.state === 'completed');
-        },
-        removeQuest(id) {
-            delete this.quests[id];
-        },
-        generateSaveData() {
-            return {
-                quests: {
-                    ...this.quests,
-                },
-            };
-        },
-        loadSaveData(data) {
-            this.quests = data.quests;
-        },
-    },
-});
-
 // Create a pinia store named screens with a state using the type ScreenState, with actions:
 // setScreen(screen: string): Sets the current screen to the given screen
 // setButtons(buttons: { [key: string]: ButtonConfig }): Adds buttons to the buttons state by using the values in the buttons config object
@@ -4315,6 +4253,7 @@ const useVM = pinia.defineStore('vm', {
         data: {},
         lastLabel: 'main',
         script: {},
+        labelStack: ['main'],
     }),
     actions: {
         generateSaveData() {
@@ -4431,6 +4370,19 @@ const useVM = pinia.defineStore('vm', {
             const cmd = this.currentLine;
             await runCommand(cmd);
         },
+        async runLabelFunction(label) {
+            const branch = this.script[label];
+            if (!branch) {
+                console.error(`Label ${branch} doesn't exist`);
+            }
+            const stack = {
+                currentIndex: 0,
+                branch: branch,
+                label,
+            };
+            this.addStack(stack);
+            await this.runLine();
+        },
         runLabel(label) {
             const branch = this.script[label];
             if (!branch) {
@@ -4459,6 +4411,88 @@ const useVM = pinia.defineStore('vm', {
     },
 });
 
+function processText(text) {
+    const vmStore = useVM();
+    const skillStore = useSkills();
+    return text.replace(/%{[^}]*}/g, (match) => {
+        const key = match.substr(2, match.length - 3);
+        const searchableState = {
+            data: vmStore.data,
+            skills: skillStore.skills,
+            items: useInventory().items,
+            quests: useQuests().quests,
+        };
+        const [obj, newKey] = findDataHelper(searchableState, key);
+        return obj[newKey];
+    });
+}
+
+// Create a pinia store named dialog with a state using the type DialogState, with actions addDialog and clearDialog
+const useDialogStore = pinia.defineStore('dialog', {
+    state: () => ({
+        dialog: [],
+    }),
+    actions: {
+        generateSaveData() {
+            return {
+                dialog: this.dialog,
+            };
+        },
+        loadSaveData(data) {
+            this.dialog = data.dialog;
+        },
+        addDialog(dialog) {
+            this.dialog.push({
+                ...dialog,
+                interactive: dialog.interactive ?? false,
+                id: randomId(),
+                text: processText(dialog.text),
+            });
+        },
+        clearDialog() {
+            this.dialog.splice(0, this.dialog.length);
+        },
+        reset() {
+            this.dialog = [];
+        },
+    },
+});
+
+// Create a pinia store named hud with a state using the type HudState, and save type HudSave, with actions:
+// setupHudStats(stats: { [key: string]: HudStatConfig }): Iterates the stats argument to add new stats to the state
+// setStat(stat: string, value: number): Sets the value of a stat
+// addStat(stat: string, value: number): Adds a value to a stat
+// generateSaveData(): Function that generates a HudSave object from the data in the state
+// loadSaveData(data: HudSave): Function that loads the data into the state
+const useHud = pinia.defineStore('hud', {
+    state: () => ({
+        hudStats: {},
+    }),
+    actions: {
+        setupHudStats(stats) {
+            for (const stat in stats) {
+                this.hudStats[stat] = {
+                    value: stats[stat].startingValue,
+                };
+            }
+        },
+        setStat(stat, value) {
+            this.hudStats[stat].value = value;
+        },
+        addStat(stat, value) {
+            this.hudStats[stat].value += value;
+        },
+        generateSaveData() {
+            return {
+                hudStats: this.hudStats,
+            };
+        },
+        loadSaveData(data) {
+            this.hudStats = cjs(this.hudStats, data.hudStats);
+        },
+    },
+});
+
 function createSkillCheckState() {
     const skillCheck = {
         passed: false,
@@ -7726,22 +7760,6 @@ styleInject(css_248z$8);
 
 script$7.render = render$7;
 
-function processText(text) {
-    const vmStore = useVM();
-    const skillStore = useSkills();
-    return text.replace(/%{[^}]*}/g, (match) => {
-        const key = match.substr(2, match.length - 3);
-        const searchableState = {
-            data: vmStore.data,
-            skills: skillStore.skills,
-            items: useInventory().items,
-            quests: useQuests().quests,
-        };
-        const [obj, newKey] = findDataHelper(searchableState, key);
-        return obj[newKey];
-    });
-}
-
 function aspectRatioFit(screenWidth, screenHeight, gameWidth, gameHeight) {
     const widthRatio = screenWidth / gameWidth;
     const heightRatio = screenHeight / gameHeight;
@@ -8723,7 +8741,7 @@ var script$d = vue.defineComponent({
             }
             return {
                 title,
-                text: processText(dialogKey.text),
+                text: dialogKey.text,
                 styleId: dialogKey.speaker,
                 choices: dialogKey.choices,
                 old: index < this.dialog.length - 1,
@@ -9443,6 +9461,15 @@ const completeQuestPlugin = new CommandPlugin('complete_quest', async (cmd) => {
     return useVM().nextLine();
 }, generateParser('complete_quest'));
 
+// Write a CommandPlugin for running a label using the runLabelFunction of the useVM store
+const runLabelPlugin = new CommandPlugin('run_label', async (cmd) => {
+    const label = cmd.args[0];
+    if (!label) {
+        error(`run_label command needs a label to argument run`);
+    }
+    await useVM().runLabelFunction(label);
+}, generateParser('run_label'));
+
 function registerBaseCommands(vm) {
     vm.addCommand(addItemPlugin);
     vm.addCommand(addLevelPlugin);
@@ -9465,6 +9492,9 @@ function registerBaseCommands(vm) {
     vm.addCommand(talkCommand);
     vm.addCommand(textCommandPlugin);
     vm.addCommand(waitCommand);
+    // functions and labels
+    vm.addCommand(jumpCommand);
+    vm.addCommand(runLabelPlugin);
     // Quests
     vm.addCommand(startQuestPlugin);
     vm.addCommand(startObjectivePlugin);
@@ -9512,7 +9542,7 @@ async function startApp(config, options) {
     });
     registerBaseCommands(vm);
     logManager.setupDebugger(options.debug);
-    console.log('%c Narrat game engine – 1.2.1 - June 25, 2022 14:20:12', 'background: #222; color: #bada55');
+    console.log('%c Narrat game engine – 1.3.0 - June 25, 2022 18:05:43', 'background: #222; color: #bada55');
     vm.callHook('onNarratSetup');
     app.mount('#game-holder');
     if (options.debug) {

package/lib/stores/main-store.d.ts

@@ -227,6 +227,7 @@ export declare const useMain: import("pinia").StoreDefinition<"main", MainState,
             previousStack(): void;
             finishGame(): void;
             runLine(): Promise<void>;
+            runLabelFunction(label: string): Promise<void>;
             runLabel(label: string): void;
         }>;
         hud: import("pinia").Store<"hud", import("./hud-stats-store").HudState, {}, {

package/lib/stores/vm-store.d.ts

@@ -147,5 +147,6 @@ export declare const useVM: import("pinia").StoreDefinition<"vm", VMState, {
     previousStack(): void;
     finishGame(): void;
     runLine(): Promise<void>;
+    runLabelFunction(label: string): Promise<void>;
     runLabel(label: string): void;
 }>;

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

@@ -0,0 +1,2 @@
+import { CommandPlugin } from './command-plugin';
+export declare const runLabelPlugin: CommandPlugin;

package/package.json

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