varius fix

src/classes/LabelJson.ts

@@ -295,7 +295,7 @@ export default class LabelJson<T extends {} = {}> extends LabelAbstract<LabelJso
                         break
                 }
                 break
-            case "storage":
+            case "value":
                 setStorageJson(operation)
                 break
         }

src/functions/PixiVNJsonUtility.ts

@@ -1,8 +1,8 @@
-import { PixiVNJsonConditions, PixiVNJsonStorageGet, PixiVNJsonStorageSet, PixiVNJsonUnionCondition } from "../interface";
+import { PixiVNJsonConditions, PixiVNJsonLabelGet, PixiVNJsonStorageGet, PixiVNJsonUnionCondition, PixiVNJsonValueGet, PixiVNJsonValueSet } from "../interface";
 import PixiVNJsonConditionalStatements from "../interface/PixiVNJsonConditionalStatements";
 import { narration, storage } from "../managers";
 import { StorageElementType } from "../types";
-import { setFlag } from "./FlagsUtility";
+import { getFlag, setFlag } from "./FlagsUtility";
 
 /**
  * Get the value from the conditional statements.
@@ -108,7 +108,7 @@ function getConditionResult(condition: PixiVNJsonConditions): boolean {
  * @param value is the value to convert to string
  * @returns the value to string
  */
-function getValueToString(value: StorageElementType | PixiVNJsonStorageGet): string {
+function getValueToString(value: StorageElementType | PixiVNJsonValueGet): string {
     let newValue = getValue(value)
     if (typeof newValue === "string") {
         return newValue
@@ -124,11 +124,18 @@ function getValueToString(value: StorageElementType | PixiVNJsonStorageGet): str
  * @param value is the value to get
  * @returns the value from the storage or the value
  */
-function getValue(value: StorageElementType | PixiVNJsonStorageGet): any {
+function getValue(value: StorageElementType | PixiVNJsonValueGet): any {
     if (value && typeof value === "object") {
         if ("type" in value) {
-            if (value.storageOperationType === "get") {
-                return storage.getVariable((value as PixiVNJsonStorageGet).key)
+            if (value.type === "value" && value.storageOperationType === "get") {
+                switch (value.storageType) {
+                    case "storage":
+                        return storage.getVariable((value as PixiVNJsonStorageGet).key)
+                    case "flagStorage":
+                        return getFlag((value as PixiVNJsonStorageGet).key)
+                    case "label":
+                        return narration.getTimesLabelOpened((value as PixiVNJsonLabelGet).label)
+                }
             }
         }
     }
@@ -160,7 +167,7 @@ function getUnionConditionResult(condition: PixiVNJsonUnionCondition): boolean {
     return result
 }
 
-export function setStorageJson(value: PixiVNJsonStorageSet) {
+export function setStorageJson(value: PixiVNJsonValueSet) {
     if (value.storageType === "storage") {
         storage.setVariable(value.key, getValue(value.value))
     } else {

src/interface/PixiVNJson.ts

@@ -1,6 +1,6 @@
 import PixiVNJsonIfElse from "./PixiVNJsonIfElse"
 import PixiVNJsonLabels from "./PixiVNJsonLabels"
-import { PixiVNJsonStorageSet } from "./PixiVNJsonValue"
+import { PixiVNJsonValueSet } from "./PixiVNJsonValue"
 
 /**
  * PixiVNJson It can be defined as a programming language to write a narrative written in json.
@@ -10,13 +10,13 @@ export default interface PixiVNJson {
      * The initial variables are added to the system when this json is loaded.
      * They will be set only if there are no variables with the same key already.
      */
-    initialVariables?: (PixiVNJsonStorageSet | PixiVNJsonIfElse<PixiVNJsonStorageSet>)[]
+    initialVariables?: (PixiVNJsonValueSet | PixiVNJsonIfElse<PixiVNJsonValueSet>)[]
     /**
      * The variables are added to the system when this json is loaded.
      * if there are variables with the same key already, they will be overwritten.
      * This solution corresponds to the **constants**.
      */
-    constants?: (PixiVNJsonStorageSet | PixiVNJsonIfElse<PixiVNJsonStorageSet>)[]
+    constants?: (PixiVNJsonValueSet | PixiVNJsonIfElse<PixiVNJsonValueSet>)[]
     /**
      * The labels to be used in the narrative. They will be added to the system
      */

src/interface/PixiVNJsonOperations.ts

@@ -1,8 +1,8 @@
 import PixiVNJsonIfElse from "./PixiVNJsonIfElse"
 import { PixiVNJsonCanvas, PixiVNJsonSound } from "./PixiVNJsonMedia"
-import { PixiVNJsonStorageSet } from "./PixiVNJsonValue"
+import { PixiVNJsonValueSet } from "./PixiVNJsonValue"
 
-export type PixiVNJsonOperation = PixiVNJsonStorageSet | PixiVNJsonCanvas | PixiVNJsonSound
+export type PixiVNJsonOperation = PixiVNJsonValueSet | PixiVNJsonCanvas | PixiVNJsonSound
 
 type PixiVNJsonOperations = (PixiVNJsonOperation | PixiVNJsonIfElse<PixiVNJsonOperation>)[]
 

src/interface/PixiVNJsonValue.ts

@@ -1,7 +1,7 @@
 import { getFlag } from "../functions"
 import { StorageElementType } from "../types"
 
-type PixiVNJsonStorageGet = {
+export type PixiVNJsonStorageGet = {
     type: "value"
     storageOperationType: "get",
     /**
@@ -15,7 +15,7 @@ type PixiVNJsonStorageGet = {
     storageType: "storage" | "flagStorage",
 }
 
-type PixiVNJsonLabelGet = {
+export type PixiVNJsonLabelGet = {
     type: "value"
     storageOperationType: "get",
     /**
@@ -63,4 +63,4 @@ type PixiVNJsonFlagSet = {
     storageType: "flagStorage",
 }
 
-export type PixiVNJsonStorageSet = (PixiVNJsonOnlyStorageSet | PixiVNJsonFlagSet)
+export type PixiVNJsonValueSet = (PixiVNJsonOnlyStorageSet | PixiVNJsonFlagSet)

src/interface/index.ts

@@ -20,7 +20,7 @@ export type { PixiVNJsonCanvas, PixiVNJsonSound } from './PixiVNJsonMedia';
 export type { PixiVNJsonOperation, default as PixiVNJsonOperations } from './PixiVNJsonOperations';
 export type { default as PixiVNJsonStepSwitch } from './PixiVNJsonStepSwitch';
 export type { default as PixiVNJsonUnionCondition } from './PixiVNJsonUnionCondition';
-export type { PixiVNJsonValueGet as PixiVNJsonStorageGet, PixiVNJsonStorageSet } from './PixiVNJsonValue';
+export type { PixiVNJsonLabelGet, PixiVNJsonStorageGet, PixiVNJsonValueGet, PixiVNJsonValueSet } from './PixiVNJsonValue';
 export type { default as SoundOptions, SoundPlayOptions } from './SoundOptions';
 export type { default as TickerHistory, TickerHistoryForExport } from './TickerHistory';
 export type { TickerProgrationType } from './TickerProgrationType';