@drincs/pixi-vn 0.6.3 → 0.6.5

package/dist/labels/BaseCanvasElementTestLabel.js

@@ -503,8 +503,6 @@ function getMemoryContainer(element) {
   };
 }
 function setMemoryContainer(element, memory) {
-  memory.width && (element.width = memory.width);
-  memory.height && (element.height = memory.height);
   memory.isRenderGroup && (element.isRenderGroup = memory.isRenderGroup);
   memory.blendMode && (element.blendMode = memory.blendMode);
   memory.tint && (element.tint = memory.tint);
@@ -537,6 +535,8 @@ function setMemoryContainer(element, memory) {
   memory.interactive && (element.interactive = memory.interactive);
   memory.interactiveChildren && (element.interactiveChildren = memory.interactiveChildren);
   memory.hitArea && (element.hitArea = memory.hitArea);
+  memory.width && (element.width = memory.width);
+  memory.height && (element.height = memory.height);
 }
 
 // src/decorators/CharacterDecorator.ts
@@ -564,14 +564,15 @@ var Label = class {
   /**
    * @param id is the id of the label
    * @param steps is the list of steps that the label will perform
-   * @param onStepRun is a function that will be executed before any step is executed, is useful for example to make sure all images used have been cached
-   * @param choiseIndex is the index of the choice that the label will perform
+   * @param props is the properties of the label
    */
-  constructor(id, steps, onStepRun, choiseIndex) {
+  constructor(id, steps, props) {
     this._id = id;
     this._steps = steps;
-    this._onStepRun = onStepRun;
-    this._choiseIndex = choiseIndex;
+    this._onStepStart = props == null ? void 0 : props.onStepStart;
+    this._onLoadStep = props == null ? void 0 : props.onLoadStep;
+    this._onStepEnd = props == null ? void 0 : props.onStepEnd;
+    this._choiseIndex = props == null ? void 0 : props.choiseIndex;
   }
   /**
    * Get the id of the label. This variable is used in the system to get the label by id, {@link getLabelById}
@@ -608,18 +609,32 @@ var Label = class {
     return res;
   }
   /**
-   * Get the function that will be executed before any step is executed, is useful for example to make sure all images used have been cached
+   * Is a function that will be executed in {@link Label#onStepStart} and when the user goes back to it or when the user laods a save file.
+   * @returns Promise<void> or void
+   */
+  get onStepStart() {
+    return (stepIndex, label) => __async(this, null, function* () {
+      if (this._onLoadStep) {
+        yield this._onLoadStep(stepIndex, label);
+      }
+      if (this._onStepStart) {
+        return yield this._onStepStart(stepIndex, label);
+      }
+    });
+  }
+  /**
+   * Get the function that will be executed a old step is reloaded. A step is reloaded when the user goes back to it or when the user laods a save file.
    * @returns Promise<void> or void
-   * @example
-   * ```typescript
-   * newLabel("id", [], () => {
-   *     Assets.load('path/to/image1.png')
-   *     Assets.load('path/to/image2.png')
-   * })
-   * ```
    */
-  get onStepRun() {
-    return this._onStepRun;
+  get onLoadStep() {
+    return this._onLoadStep;
+  }
+  /**
+   * Is a function that will be executed when the step ends.
+   * @returns Promise<void> or void
+   */
+  get onStepEnd() {
+    return this._onStepEnd;
   }
   get choiseIndex() {
     return this._choiseIndex;
@@ -629,7 +644,9 @@ var Label = class {
 // src/classes/CloseLabel.ts
 var CLOSE_LABEL_ID = "__close-label-id__";
 function newCloseLabel(choiseIndex) {
-  return new Label(CLOSE_LABEL_ID, [], void 0, choiseIndex);
+  return new Label(CLOSE_LABEL_ID, [], {
+    choiseIndex
+  });
 }
 
 // src/types/CloseType.ts
@@ -680,7 +697,10 @@ function getChoiceMenuOptions() {
       }
       let label = getLabelById(option.label);
       if (label) {
-        let itemLabel = new Label(label.id, label.steps, label.onStepRun, index);
+        let itemLabel = new Label(label.id, label.steps, {
+          onStepStart: label.onStepStart,
+          choiseIndex: index
+        });
         options.push(__spreadProps(__spreadValues({}, option), {
           label: itemLabel
         }));
@@ -692,8 +712,9 @@ function getChoiceMenuOptions() {
 }
 
 // src/functions/TickerUtility.ts
-function updateTickerProgression(args, propertyName, progression) {
-  if (args[propertyName] === void 0 || !progression || args[propertyName] === progression.limit) {
+function updateTickerProgression(args, propertyName, progression, valueConvert) {
+  let limit = valueConvert && progression.limit ? valueConvert(progression.limit) : progression.limit;
+  if (args[propertyName] === void 0 || !progression || args[propertyName] === limit) {
     return;
   }
   if (typeof args[propertyName] === "number") {
@@ -712,22 +733,25 @@ function updateTickerProgression(args, propertyName, progression) {
     }
   }
 }
-function getLinearProgression(number, progression) {
-  if (progression.limit !== void 0) {
-    if (number > progression.limit && progression.amt > 0) {
-      return progression.limit;
-    } else if (number < progression.limit && progression.amt < 0) {
-      return progression.limit;
+function getLinearProgression(number, progression, valueConvert) {
+  let limit = valueConvert && progression.limit ? valueConvert(progression.limit) : progression.limit;
+  let amt = valueConvert ? valueConvert(progression.amt) : progression.amt;
+  if (limit !== void 0) {
+    if (number > limit && amt > 0) {
+      return limit;
+    } else if (number < limit && amt < 0) {
+      return limit;
     }
   }
-  return number + progression.amt / 60;
+  return number + amt;
 }
-function getExponentialProgression(number, progression) {
-  if (progression.limit !== void 0) {
-    if (number > progression.limit && progression.percentage > 0) {
-      return progression.limit;
-    } else if (number < progression.limit && progression.percentage < 0) {
-      return progression.limit;
+function getExponentialProgression(number, progression, valueConvert) {
+  let limit = valueConvert && progression.limit ? valueConvert(progression.limit) : progression.limit;
+  if (limit !== void 0) {
+    if (number > limit && progression.percentage > 0) {
+      return limit;
+    } else if (number < limit && progression.percentage < 0) {
+      return limit;
     }
   }
   return number + number * progression.percentage;
@@ -770,15 +794,13 @@ var ZoomTicker = class extends TickerBase {
     let ySpeed = 0.1;
     if (args.speed) {
       if (typeof args.speed === "number") {
-        xSpeed = args.speed;
-        ySpeed = args.speed;
+        xSpeed = this.speedConvert(args.speed);
+        ySpeed = this.speedConvert(args.speed);
       } else {
-        xSpeed = args.speed.x;
-        ySpeed = args.speed.y;
+        xSpeed = this.speedConvert(args.speed.x);
+        ySpeed = this.speedConvert(args.speed.y);
       }
     }
-    xSpeed /= 60;
-    ySpeed /= 60;
     let tagToRemoveAfter2 = args.tagToRemoveAfter || [];
     if (typeof tagToRemoveAfter2 === "string") {
       tagToRemoveAfter2 = [tagToRemoveAfter2];
@@ -845,7 +867,10 @@ var ZoomTicker = class extends TickerBase {
       }
     });
     if (args.speedProgression)
-      updateTickerProgression(args, "speed", args.speedProgression);
+      updateTickerProgression(args, "speed", args.speedProgression, this.speedConvert);
+  }
+  speedConvert(speed) {
+    return speed / 60;
   }
   onEndOfTicker(tag, tickerId, _element, tagToRemoveAfter2) {
     GameWindowManager.onEndOfTicker(tag, this, tagToRemoveAfter2, tickerId);
@@ -1840,6 +1865,16 @@ var _GameStepManager = class _GameStepManager {
   static set originalStepData(value) {
     _GameStepManager._originalStepData = createExportableElement(value);
   }
+  static get currentStepData() {
+    let currentStepData = {
+      path: window.location.pathname,
+      storage: GameStorageManager.export(),
+      canvas: GameWindowManager.export(),
+      labelIndex: _GameStepManager.currentLabelStepIndex || 0,
+      openedLabels: createExportableElement(_GameStepManager._openedLabels)
+    };
+    return currentStepData;
+  }
   /* Edit History Methods */
   /**
    * Add a label to the history.
@@ -1847,19 +1882,13 @@ var _GameStepManager = class _GameStepManager {
    */
   static addStepHistory(step, choiseMade) {
     let stepHistory = getStepSha1(step);
-    let historyStep = {
-      path: window.location.pathname,
-      storage: GameStorageManager.export(),
-      canvas: GameWindowManager.export(),
-      labelIndex: _GameStepManager.currentLabelStepIndex || 0,
-      openedLabels: createExportableElement(_GameStepManager._openedLabels)
-    };
+    let currentStepData = _GameStepManager.currentStepData;
     if (_GameStepManager.originalStepData) {
-      if (_GameStepManager.originalStepData.openedLabels.length === historyStep.openedLabels.length) {
+      if (_GameStepManager.originalStepData.openedLabels.length === currentStepData.openedLabels.length) {
         try {
           let lastStepDataOpenedLabelsString = JSON.stringify(_GameStepManager.originalStepData.openedLabels);
-          let historyStepOpenedLabelsString = JSON.stringify(historyStep.openedLabels);
-          if (lastStepDataOpenedLabelsString === historyStepOpenedLabelsString && _GameStepManager.originalStepData.path === historyStep.path && _GameStepManager.originalStepData.labelIndex === historyStep.labelIndex) {
+          let historyStepOpenedLabelsString = JSON.stringify(currentStepData.openedLabels);
+          if (lastStepDataOpenedLabelsString === historyStepOpenedLabelsString && _GameStepManager.originalStepData.path === currentStepData.path && _GameStepManager.originalStepData.labelIndex === currentStepData.labelIndex) {
             return;
           }
         } catch (e) {
@@ -1867,7 +1896,7 @@ var _GameStepManager = class _GameStepManager {
         }
       }
     }
-    let data = deepDiff.diff(_GameStepManager.originalStepData, historyStep);
+    let data = deepDiff.diff(_GameStepManager.originalStepData, currentStepData);
     if (data) {
       let dialoge = void 0;
       let requiredChoices = void 0;
@@ -1886,7 +1915,7 @@ var _GameStepManager = class _GameStepManager {
         index: _GameStepManager.lastStepIndex,
         choiceIndexMade: choiseMade
       });
-      _GameStepManager.originalStepData = historyStep;
+      _GameStepManager.originalStepData = currentStepData;
     }
     _GameStepManager.increaseLastStepIndex();
   }
@@ -1977,6 +2006,9 @@ var _GameStepManager = class _GameStepManager {
         console.warn("[Pixi'VN] The player must make a choice");
         return;
       }
+      if (_GameStepManager.currentLabel && _GameStepManager.currentLabel.onStepEnd) {
+        yield _GameStepManager.currentLabel.onStepEnd(_GameStepManager.currentLabelStepIndex || 0, _GameStepManager.currentLabel);
+      }
       _GameStepManager.increaseCurrentStepIndex();
       return yield _GameStepManager.runCurrentStep(props, choiseMade);
     });
@@ -2001,6 +2033,10 @@ var _GameStepManager = class _GameStepManager {
           return;
         }
         if (currentLabel.steps.length > currentLabelStepIndex) {
+          let onStepRun = currentLabel.onStepStart;
+          if (onStepRun) {
+            yield onStepRun(currentLabelStepIndex, currentLabel);
+          }
           let step = currentLabel.steps[currentLabelStepIndex];
           let result = yield step(props);
           _GameStepManager.addStepHistory(step, choiseMade);
@@ -2065,6 +2101,9 @@ var _GameStepManager = class _GameStepManager {
         if (!tempLabel) {
           throw new Error(`[Pixi'VN] Label ${labelId} not found`);
         }
+        if (_GameStepManager.currentLabel && _GameStepManager.currentLabel.onStepEnd) {
+          yield _GameStepManager.currentLabel.onStepEnd(_GameStepManager.currentLabelStepIndex || 0, _GameStepManager.currentLabel);
+        }
         _GameStepManager.pushNewLabel(tempLabel.id);
       } catch (e) {
         console.error("[Pixi'VN] Error calling label", e);
@@ -2123,6 +2162,9 @@ var _GameStepManager = class _GameStepManager {
         if (!tempLabel) {
           throw new Error(`[Pixi'VN] Label ${labelId} not found`);
         }
+        if (_GameStepManager.currentLabel && _GameStepManager.currentLabel.onStepEnd) {
+          yield _GameStepManager.currentLabel.onStepEnd(_GameStepManager.currentLabelStepIndex || 0, _GameStepManager.currentLabel);
+        }
         _GameStepManager.pushNewLabel(tempLabel.id);
       } catch (e) {
         console.error("[Pixi'VN] Error jumping label", e);
@@ -2228,24 +2270,29 @@ var _GameStepManager = class _GameStepManager {
    * ```
    */
   static goBack(navigate, steps = 1) {
-    if (steps <= 0) {
-      console.warn("[Pixi'VN] Steps must be greater than 0");
-      return;
-    }
-    if (_GameStepManager._stepsHistory.length <= 1) {
-      console.warn("[Pixi'VN] No steps to go back");
-      return;
-    }
-    let restoredStep = _GameStepManager.goBackInternal(steps, _GameStepManager.originalStepData);
-    if (restoredStep) {
-      _GameStepManager._originalStepData = restoredStep;
-      _GameStepManager._openedLabels = createExportableElement(restoredStep.openedLabels);
-      GameStorageManager.import(createExportableElement(restoredStep.storage));
-      GameWindowManager.import(createExportableElement(restoredStep.canvas));
-      navigate(restoredStep.path);
-    } else {
-      console.error("[Pixi'VN] Error going back");
-    }
+    return __async(this, null, function* () {
+      if (steps <= 0) {
+        console.warn("[Pixi'VN] Steps must be greater than 0");
+        return;
+      }
+      if (_GameStepManager._stepsHistory.length <= 1) {
+        console.warn("[Pixi'VN] No steps to go back");
+        return;
+      }
+      let restoredStep = _GameStepManager.goBackInternal(steps, _GameStepManager.originalStepData);
+      if (restoredStep) {
+        _GameStepManager._originalStepData = restoredStep;
+        _GameStepManager._openedLabels = createExportableElement(restoredStep.openedLabels);
+        if (_GameStepManager.currentLabel && _GameStepManager.currentLabel.onLoadStep) {
+          yield _GameStepManager.currentLabel.onLoadStep(_GameStepManager.currentLabelStepIndex || 0, _GameStepManager.currentLabel);
+        }
+        GameStorageManager.import(createExportableElement(restoredStep.storage));
+        GameWindowManager.import(createExportableElement(restoredStep.canvas));
+        navigate(restoredStep.path);
+      } else {
+        console.error("[Pixi'VN] Error going back");
+      }
+    });
   }
   static goBackInternal(steps, restoredStep) {
     if (steps <= 0) {
@@ -2307,38 +2354,45 @@ var _GameStepManager = class _GameStepManager {
    * @param dataString The history in a JSON string.
    */
   static importJson(dataString) {
-    _GameStepManager.import(JSON.parse(dataString));
+    return __async(this, null, function* () {
+      yield _GameStepManager.import(JSON.parse(dataString));
+    });
   }
   /**
    * Import the history from an object.
    * @param data The history in an object.
    */
   static import(data) {
-    _GameStepManager.clear();
-    try {
-      if (data.hasOwnProperty("stepsHistory")) {
-        _GameStepManager._stepsHistory = data["stepsHistory"];
-      } else {
-        console.warn("[Pixi'VN] Could not import stepsHistory data, so will be ignored");
-      }
-      if (data.hasOwnProperty("openedLabels")) {
-        _GameStepManager._openedLabels = data["openedLabels"];
-      } else {
-        console.warn("[Pixi'VN] Could not import openedLabels data, so will be ignored");
-      }
-      if (data.hasOwnProperty("lastStepIndex")) {
-        _GameStepManager._lastStepIndex = data["lastStepIndex"];
-      } else {
-        console.warn("[Pixi'VN] Could not import lastStepIndex data, so will be ignored");
-      }
-      if (data.hasOwnProperty("originalStepData")) {
-        _GameStepManager._originalStepData = data["originalStepData"];
-      } else {
-        console.warn("[Pixi'VN] Could not import originalStepData data, so will be ignored");
+    return __async(this, null, function* () {
+      _GameStepManager.clear();
+      try {
+        if (data.hasOwnProperty("stepsHistory")) {
+          _GameStepManager._stepsHistory = data["stepsHistory"];
+        } else {
+          console.warn("[Pixi'VN] Could not import stepsHistory data, so will be ignored");
+        }
+        if (data.hasOwnProperty("openedLabels")) {
+          _GameStepManager._openedLabels = data["openedLabels"];
+        } else {
+          console.warn("[Pixi'VN] Could not import openedLabels data, so will be ignored");
+        }
+        if (data.hasOwnProperty("lastStepIndex")) {
+          _GameStepManager._lastStepIndex = data["lastStepIndex"];
+        } else {
+          console.warn("[Pixi'VN] Could not import lastStepIndex data, so will be ignored");
+        }
+        if (data.hasOwnProperty("originalStepData")) {
+          _GameStepManager._originalStepData = data["originalStepData"];
+        } else {
+          console.warn("[Pixi'VN] Could not import originalStepData data, so will be ignored");
+        }
+        if (_GameStepManager.currentLabel && _GameStepManager.currentLabel.onLoadStep) {
+          yield _GameStepManager.currentLabel.onLoadStep(_GameStepManager.currentLabelStepIndex || 0, _GameStepManager.currentLabel);
+        }
+      } catch (e) {
+        console.error("[Pixi'VN] Error importing data", e);
       }
-    } catch (e) {
-      console.error("[Pixi'VN] Error importing data", e);
-    }
+    });
   }
 };
 /**
@@ -2512,11 +2566,11 @@ var DialogueBaseModel = class {
 
 // src/decorators/LabelDecorator.ts
 var registeredLabels = {};
-function newLabel(id, steps, onStepRun) {
+function newLabel(id, steps, props) {
   if (registeredLabels[id]) {
     console.info(`[Pixi'VN] Label ${id} already exists, it will be overwritten`);
   }
-  let label = new Label(id, steps, onStepRun);
+  let label = new Label(id, steps, props);
   registeredLabels[id] = label;
   return label;
 }
@@ -2583,15 +2637,13 @@ var MoveTicker = class extends TickerBase {
     let ySpeed = 1;
     if (args.speed) {
       if (typeof args.speed === "number") {
-        xSpeed = args.speed;
-        ySpeed = args.speed;
+        xSpeed = this.speedConvert(args.speed);
+        ySpeed = this.speedConvert(args.speed);
       } else {
-        xSpeed = args.speed.x;
-        ySpeed = args.speed.y;
+        xSpeed = this.speedConvert(args.speed.x);
+        ySpeed = this.speedConvert(args.speed.y);
       }
     }
-    xSpeed /= 60;
-    ySpeed /= 60;
     let destination = args.destination;
     let tagToRemoveAfter2 = args.tagToRemoveAfter || [];
     if (typeof tagToRemoveAfter2 === "string") {
@@ -2631,7 +2683,10 @@ var MoveTicker = class extends TickerBase {
       }
     });
     if (args.speedProgression)
-      updateTickerProgression(args, "speed", args.speedProgression);
+      updateTickerProgression(args, "speed", args.speedProgression, this.speedConvert);
+  }
+  speedConvert(speed) {
+    return speed / 6;
   }
 };
 MoveTicker = __decorateClass([
@@ -2639,7 +2694,7 @@ MoveTicker = __decorateClass([
 ], MoveTicker);
 var RotateTicker = class extends TickerBase {
   fn(ticker, args, tags, tickerId) {
-    let speed = (args.speed === void 0 ? 1 : args.speed) / 60;
+    let speed = this.speedConvert(args.speed === void 0 ? 1 : args.speed);
     let clockwise = args.clockwise === void 0 ? true : args.clockwise;
     let tagToRemoveAfter2 = args.tagToRemoveAfter || [];
     if (typeof tagToRemoveAfter2 === "string") {
@@ -2667,7 +2722,10 @@ var RotateTicker = class extends TickerBase {
       }
     });
     if (args.speedProgression)
-      updateTickerProgression(args, "speed", args.speedProgression);
+      updateTickerProgression(args, "speed", args.speedProgression, this.speedConvert);
+  }
+  speedConvert(speed) {
+    return speed / 60;
   }
 };
 RotateTicker = __decorateClass([
@@ -2678,7 +2736,7 @@ RotateTicker = __decorateClass([
 var juliette = new CharacterBaseModel2("___pixivn_juliette___", {
   name: "Juliette",
   age: 25,
-  icon: "https://firebasestorage.googleapis.com/v0/b/pixi-vn.appspot.com/o/public%2Fcharacters%2Fjuliette-square.webp?alt=media&token=5856ae7b-d99e-4563-86ec-cbc48cc9c6b4",
+  icon: "https://firebasestorage.googleapis.com/v0/b/pixi-vn.appspot.com/o/public%2Fcharacters%2Fjuliette-square.webp?alt=media",
   color: "#ac0086"
 });
 saveCharacter(juliette);
@@ -2714,10 +2772,16 @@ var baseCanvasElementTestLabel = newLabel(
       removeCanvasElement("container");
       setDialogue({
         character: juliette,
-        text: `Here's what's going to happen: I'm going to create some text elements with different styles and put them on the stage.
+        text: `Here's what's going to happen: I'm going to create some CanvasText with different styles and put them on the stage.
 But it will generate a warn message, because the FillGradient or FillPattern has not yet been supported by the Pixi\u2019VN ( you can see the status of the issue here: [#76](https://github.com/DRincs-Productions/pixi-vn/issues/76)).`
       });
-      const basicText = new CanvasText({ text: "Basic text in pixi" });
+      const basicStyle = new pixi_js.TextStyle({
+        fill: "#ffffff"
+      });
+      const basicText = new CanvasText({
+        text: "Basic text in pixi",
+        style: basicStyle
+      });
       basicText.x = 50;
       basicText.y = 100;
       GameWindowManager.addCanvasElement("basicText", basicText);
@@ -2735,7 +2799,7 @@ But it will generate a warn message, because the FillGradient or FillPattern has
         fill: { fill },
         stroke: { color: "#4a1850", width: 5, join: "round" },
         dropShadow: {
-          color: "#000000",
+          color: "#ff5f74",
           blur: 4,
           angle: Math.PI / 6,
           distance: 6