narrat 2.2.6 → 2.2.7

package/CHANGELOG.md

@@ -40,7 +40,7 @@ Examples:
 - `wait 2000`
 - `play music calm 1` will play the music `calm` on channel 1. Because it's a different channel, the musics will superpose
 - `wait 2000`
-- `stop music calm 1` will stop the music `calm` on channel 1.
+- `stop music 1` will stop the music on channel 1.
 - `play ambiant forest` will play the ambiant sound `forest` on channel 0. This is a different audio mode, so it will be played independently of the musics.
 
 Sounds now also use channels, but they ignore all the code related to fading musics in and out, or stopping the previous audio on the channel (because sounds are meant to be a one off and people shouldn't have to bother keeping track of sound channels).

package/dist/narrat.es.js

@@ -34410,13 +34410,6 @@ function getQuestConfig(questId) {
 function getObjectiveConfig(quest, objectiveId) {
   return getQuestConfig(quest).objectives[objectiveId];
 }
-const SAVE_FILE = "gameSave";
-const JUMP_SIGNAL = `###_--_~=:;_JUMP`;
-const RETURN_SIGNAL = `###_--_~=:;_RETURN`;
-const OK_SIGNAL = `###_--_~=:;_OK`;
-function isReturnSignal(s2) {
-  return s2 === JUMP_SIGNAL || s2 === RETURN_SIGNAL || s2 === OK_SIGNAL;
-}
 var howler = {};
 /*!
  *  howler.js v2.2.3
@@ -36374,68 +36367,6 @@ var howler = {};
     };
   })();
 })(howler);
-const audio = {};
-howler.Howler.volume(0.5);
-let audioTriggers = {};
-async function loadAudioAssets(config2) {
-  logger$1.log(`Loading audio`);
-  const loadingPromises = [];
-  howler.Howler.volume(config2.audioOptions.volume);
-  for (const key in config2.music) {
-    const musicConf = {
-      loop: true,
-      ...config2.music[key]
-    };
-    config2.audio[key] = musicConf;
-    console.warn(`Music config is deprecated, instead you can now add musics to the \`audio\` config as they behave the same as other sounds!`);
-  }
-  for (const key in config2.sound) {
-    config2.audio[key] = config2.sound[key];
-  }
-  for (const key in config2.audio) {
-    const sound = config2.audio[key];
-    if (!sound.src) {
-      sound.src = sound.path;
-      if (!sound.path) {
-        console.error(`Audio config for ${key} doesn't have any \`src\` value to find the file`);
-      }
-      console.warn("Using `path` for audio and musics is deprecated. Please replace `path` with `src` in your config file!");
-    }
-    loadingPromises.push(loadAudio(key, config2.audio[key]));
-  }
-  if (config2.audioTriggers) {
-    audioTriggers = config2.audioTriggers;
-  }
-  return Promise.all(loadingPromises);
-}
-function audioEvent(event) {
-  if (audioTriggers[event]) {
-    useAudio().playChannel("sound", audioTriggers[event], 0);
-  }
-}
-async function loadAudio(key, config2) {
-  return new Promise((resolve, reject) => {
-    logger$1.log(`Loading audio ${config2.src}`);
-    const sound = new howler.Howl({
-      ...config2,
-      src: getAssetUrl(config2.src)
-    });
-    sound.load();
-    audio[key] = sound;
-    resolve();
-  });
-}
-function stopHowlerById(musicKey, howlerId) {
-  const audio2 = getAudio(musicKey);
-  if (!audio2) {
-    error(`Could not find music ${musicKey}`);
-    return;
-  }
-  audio2.stop(howlerId);
-}
-function getAudio(key) {
-  return audio[key];
-}
 function timeout(durationMs) {
   return new Promise((resolve, reject) => {
     setTimeout(resolve, durationMs);
@@ -36958,6 +36889,75 @@ const useAudio = defineStore("audio", {
     }
   }
 });
+const audio = {};
+howler.Howler.volume(0.5);
+let audioTriggers = {};
+async function loadAudioAssets(config2) {
+  logger$1.log(`Loading audio`);
+  const loadingPromises = [];
+  howler.Howler.volume(config2.audioOptions.volume);
+  for (const key in config2.music) {
+    const musicConf = {
+      loop: true,
+      ...config2.music[key]
+    };
+    config2.audio[key] = musicConf;
+    console.warn(`Music config is deprecated, instead you can now add musics to the \`audio\` config as they behave the same as other sounds!`);
+  }
+  for (const key in config2.sound) {
+    config2.audio[key] = config2.sound[key];
+  }
+  for (const key in config2.audio) {
+    const sound = config2.audio[key];
+    if (!sound.src) {
+      sound.src = sound.path;
+      if (!sound.path) {
+        console.error(`Audio config for ${key} doesn't have any \`src\` value to find the file`);
+      }
+      console.warn("Using `path` for audio and musics is deprecated. Please replace `path` with `src` in your config file!");
+    }
+    loadingPromises.push(loadAudio(key, config2.audio[key]));
+  }
+  if (config2.audioTriggers) {
+    audioTriggers = config2.audioTriggers;
+  }
+  return Promise.all(loadingPromises);
+}
+function audioEvent(event) {
+  if (audioTriggers[event]) {
+    useAudio().playChannel("sound", audioTriggers[event], 0);
+  }
+}
+async function loadAudio(key, config2) {
+  return new Promise((resolve, reject) => {
+    logger$1.log(`Loading audio ${config2.src}`);
+    const sound = new howler.Howl({
+      ...config2,
+      src: getAssetUrl(config2.src)
+    });
+    sound.load();
+    audio[key] = sound;
+    resolve();
+  });
+}
+function stopHowlerById(musicKey, howlerId) {
+  const audio2 = getAudio(musicKey);
+  if (!audio2) {
+    error(`Could not find music ${musicKey}`);
+    return;
+  }
+  audio2.stop(howlerId);
+}
+function getAudio(key) {
+  return audio[key];
+}
+const SAVE_FILE = "gameSave";
+const JUMP_SIGNAL = `###_--_~=:;_JUMP`;
+const RETURN_SIGNAL = `###_--_~=:;_RETURN`;
+const OK_SIGNAL = `###_--_~=:;_OK`;
+function isReturnSignal(s2) {
+  return s2 === JUMP_SIGNAL || s2 === RETURN_SIGNAL || s2 === OK_SIGNAL;
+}
 function isOldSave(save2) {
   if (typeof save2 === "object") {
     const saveTest = save2;
@@ -38611,6 +38611,7 @@ const useMain = defineStore("main", {
     startMachine() {
       const audioStore = useAudio();
       audioStore.stopAll();
+      audioEvent("onPressStart");
       const vmStore = useVM();
       vmStore.start();
       this.ready = true;
@@ -40952,7 +40953,6 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     const saveSlot2 = ref(-1);
     const choosingSave = ref(false);
     async function startGame() {
-      audioEvent("onPressStart");
       const main2 = useMain();
       if (saveSlot2.value === -1) {
         saveSlot2.value = getFreeSlot();
@@ -40960,7 +40960,6 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       await main2.startGame(saveSlot2.value);
     }
     async function loadGame() {
-      audioEvent("onPressStart");
       const save2 = getSaveSlot(saveSlot2.value);
       if (!save2) {
         error("No save file found");