narrat 0.7.1 → 0.8.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Narrat changelog
 
+## 0.7.2
+
+- Changed the `set` method to access things without caps (`data`, `skills`, `buttons` instead of `DATA`, `SKILLS`, `BUTTONS`) for consistency.
+- Changed string interpolation to have more accessible objects, now values in `data` need to be access with `%{data.something}` instead of just `%{something}`
+- Now possible to access skill levels in string interpolation with `%{skills.someSkill.level}`
+- Improvements to how skill checks are printed to be less awkward
+
 ## 0.7.1
 
 - Added `stop` and `pause` functions which work similarly to play for stopping or pausing audio.

package/lib/index.esm.js

@@ -1,4 +1,4 @@
-// Version: 0.7.1 - April 26, 2022 12:31:17
+// Version: 0.8.0 - April 26, 2022 13:18:38
 import 'es6-promise/auto';
 import { ref, reactive, readonly, defineComponent, openBlock, createElementBlock, normalizeStyle, createElementVNode, createCommentVNode, Fragment, renderList, createBlock, Transition, withCtx, renderSlot, createTextVNode, resolveComponent, toDisplayString, createVNode, TransitionGroup, createApp } from 'vue';
 import { createLogger, createStore } from 'vuex';
@@ -4079,16 +4079,20 @@ function addDataHelper(sourceObj, path, value) {
 }
 function getModifiableData(state) {
     return {
-        DATA: state.machine.data,
-        SKILLS: state.skills,
-        BUTTONS: state.buttons,
+        data: state.machine.data,
+        skills: state.skills,
+        buttons: state.buttons,
     };
 }
 
 function processText(store, text) {
     return text.replace(/%{[^}]*}/g, (match) => {
         const key = match.substr(2, match.length - 3);
-        const [obj, newKey] = findDataHelper(store.state.machine.data, key);
+        const searchableState = {
+            data: store.state.machine.data,
+            skills: store.state.skills,
+        };
+        const [obj, newKey] = findDataHelper(searchableState, key);
         return obj[newKey];
     });
 }
@@ -4716,6 +4720,8 @@ function processSkillCheck(ctx, skillcheck) {
         skill: skillcheck.skill,
         value: skillcheck.value,
         id: skillcheck.id,
+        success: skillcheck.success.text,
+        failure: skillcheck.failure.text,
     });
 }
 function runSkillCheck(ctx, params) {
@@ -4734,11 +4740,11 @@ function runSkillCheck(ctx, params) {
     }
     if (success) {
         ctx.commit('passSkillCheck', params.id);
-        writeText(ctx, `[${skill.name} - Success]`);
+        writeText(ctx, `[${skill.name} - Success] ${params.success || ''}`);
         return true;
     }
     ctx.commit('failSkillCheck', params.id);
-    writeText(ctx, `[${skill.name} - Failure]`);
+    writeText(ctx, `[${skill.name} - Failure] ${params.failure || ''}`);
     return false;
 }
 function runConditionCommand(ctx, command) {
@@ -4979,18 +4985,21 @@ async function playerAnswered(context, choiceIndex) {
                     const result = processSkillCheck(context, skillcheck);
                     const winner = result ? skillcheck.success : skillcheck.failure;
                     newBranch = winner.branch;
-                    playerText = `[${result ? 'SUCCESS' : 'FAILURE'}] – ${winner.text}`;
+                    playerText = undefined;
                 }
             }
             else {
                 newBranch = choice.branch;
             }
-            const dialog = {
-                speaker: 'player',
-                text: playerText,
-                interactive: false,
-            };
-            commit('addDialog', { dialog });
+            if (playerText) {
+                // If the choice involves printing a player dialog, show it
+                const dialog = {
+                    speaker: 'player',
+                    text: playerText,
+                    interactive: false,
+                };
+                commit('addDialog', { dialog });
+            }
             if (newBranch) {
                 const newStack = {
                     currentIndex: 0,
@@ -5802,7 +5811,7 @@ async function startApp(config, options) {
         mousePos.x = e.clientX;
         mousePos.y = e.clientY;
     });
-    console.log('%c Narrat game engine – 0.7.1 - April 26, 2022 12:31:17', 'background: #222; color: #bada55');
+    console.log('%c Narrat game engine – 0.8.0 - April 26, 2022 13:18:38', 'background: #222; color: #bada55');
     const storeSetup = setupStore(options);
     store$1 = storeSetup.store;
     app = createApp(script$8, {

package/lib/index.js

@@ -1,4 +1,4 @@
-// Version: 0.7.1 - April 26, 2022 12:31:17
+// Version: 0.8.0 - April 26, 2022 13:18:38
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
@@ -4083,16 +4083,20 @@ function addDataHelper(sourceObj, path, value) {
 }
 function getModifiableData(state) {
     return {
-        DATA: state.machine.data,
-        SKILLS: state.skills,
-        BUTTONS: state.buttons,
+        data: state.machine.data,
+        skills: state.skills,
+        buttons: state.buttons,
     };
 }
 
 function processText(store, text) {
     return text.replace(/%{[^}]*}/g, (match) => {
         const key = match.substr(2, match.length - 3);
-        const [obj, newKey] = findDataHelper(store.state.machine.data, key);
+        const searchableState = {
+            data: store.state.machine.data,
+            skills: store.state.skills,
+        };
+        const [obj, newKey] = findDataHelper(searchableState, key);
         return obj[newKey];
     });
 }
@@ -4720,6 +4724,8 @@ function processSkillCheck(ctx, skillcheck) {
         skill: skillcheck.skill,
         value: skillcheck.value,
         id: skillcheck.id,
+        success: skillcheck.success.text,
+        failure: skillcheck.failure.text,
     });
 }
 function runSkillCheck(ctx, params) {
@@ -4738,11 +4744,11 @@ function runSkillCheck(ctx, params) {
     }
     if (success) {
         ctx.commit('passSkillCheck', params.id);
-        writeText(ctx, `[${skill.name} - Success]`);
+        writeText(ctx, `[${skill.name} - Success] ${params.success || ''}`);
         return true;
     }
     ctx.commit('failSkillCheck', params.id);
-    writeText(ctx, `[${skill.name} - Failure]`);
+    writeText(ctx, `[${skill.name} - Failure] ${params.failure || ''}`);
     return false;
 }
 function runConditionCommand(ctx, command) {
@@ -4983,18 +4989,21 @@ async function playerAnswered(context, choiceIndex) {
                     const result = processSkillCheck(context, skillcheck);
                     const winner = result ? skillcheck.success : skillcheck.failure;
                     newBranch = winner.branch;
-                    playerText = `[${result ? 'SUCCESS' : 'FAILURE'}] – ${winner.text}`;
+                    playerText = undefined;
                 }
             }
             else {
                 newBranch = choice.branch;
             }
-            const dialog = {
-                speaker: 'player',
-                text: playerText,
-                interactive: false,
-            };
-            commit('addDialog', { dialog });
+            if (playerText) {
+                // If the choice involves printing a player dialog, show it
+                const dialog = {
+                    speaker: 'player',
+                    text: playerText,
+                    interactive: false,
+                };
+                commit('addDialog', { dialog });
+            }
             if (newBranch) {
                 const newStack = {
                     currentIndex: 0,
@@ -5806,7 +5815,7 @@ async function startApp(config, options) {
         mousePos.x = e.clientX;
         mousePos.y = e.clientY;
     });
-    console.log('%c Narrat game engine – 0.7.1 - April 26, 2022 12:31:17', 'background: #222; color: #bada55');
+    console.log('%c Narrat game engine – 0.8.0 - April 26, 2022 13:18:38', 'background: #222; color: #bada55');
     const storeSetup = setupStore(options);
     store$1 = storeSetup.store;
     app = vue.createApp(script$8, {

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

@@ -5,6 +5,8 @@ export interface SkillCheckParams {
     skill: string;
     value: number;
     id: string;
+    success?: string;
+    failure?: string;
 }
 export declare function runSkillCheck(ctx: ActionContext<State, State>, params: SkillCheckParams): boolean;
 export declare function runConditionCommand(ctx: ActionContext<State, State>, command: Parser.Command): Parser.Branch | undefined;

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/vuex").DataState;
+    skills: import("../types/vuex").SkillsState;
+    buttons: import("vue").ButtonsState;
 };

package/package.json

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