narrat 2.0.2 → 2.0.5

package/dist/narrat.es.js

@@ -34291,7 +34291,6 @@ ws.exports.parseJSONPointer;
 ws.exports.revertJSONPatch;
 ws.exports.setIn;
 ws.exports.updateIn;
-const SAVE_FILE = "gameSave";
 const defaultConfig = {
   gameTitle: "Narrat Game Example",
   images: {
@@ -36696,8 +36695,9 @@ const useAudio = defineStore("audio", {
   actions: {
     stopMusic() {
       if (this.currentMusic) {
-        stopAudio(this.currentMusic);
+        const music = this.currentMusic;
         this.currentMusic = void 0;
+        stopAudio(music);
       }
     },
     setMusic(music, soundId) {
@@ -36780,16 +36780,24 @@ async function changeMusic(newMusic) {
       }, audioOptions.musicFadeOutTime * 1e3);
     }
   }
+  let sound;
+  let newId;
+  if (newMusic) {
+    sound = getAudio(newMusic);
+    if (!sound) {
+      throw new Error(`Could not find music ${newMusic}`);
+    }
+    sound.volume(0);
+    newId = sound.play();
+    sound.pause();
+    audio2.setMusic(newMusic, newId);
+  }
   if (audio2.currentMusic) {
     await timeout(audioOptions.musicFadeInDelay * 1e3);
   }
-  if (newMusic) {
-    const sound = getAudio(newMusic);
-    if (sound) {
-      const newId = sound.play();
-      sound.fade(0, 1, audioOptions.musicFadeInTime * 1e3, newId);
-      audio2.setMusic(newMusic, newId);
-    }
+  if (sound && useAudio().musicHowlId === newId) {
+    sound.play();
+    sound.fade(0, 1, audioOptions.musicFadeInTime * 1e3, newId);
   }
 }
 function playAudio(key) {
@@ -36805,9 +36813,13 @@ function getAudio(key) {
   return audio[key];
 }
 function stopAudio(key) {
-  const sound = getAudio(key);
-  if (sound) {
-    sound.stop();
+  if (key === useAudio().currentMusic) {
+    useAudio().stopMusic();
+  } else {
+    const sound = getAudio(key);
+    if (sound) {
+      sound.stop();
+    }
   }
 }
 function pauseAudio(key) {
@@ -36816,6 +36828,10 @@ function pauseAudio(key) {
     sound.pause();
   }
 }
+const SAVE_FILE = "gameSave";
+function saveGame(object) {
+  localStorage.setItem(SAVE_FILE, JSON.stringify(object));
+}
 function randomId() {
   return `${Date.now() - Math.floor(Math.random() * 99999999)}`;
 }
@@ -38327,7 +38343,7 @@ const useMain = defineStore("main", {
         inventory: inventoryStore.generateSaveData(),
         quests: useQuests().generateSaveData()
       };
-      localStorage.setItem(SAVE_FILE, JSON.stringify(save));
+      saveGame(save);
     },
     setLoadedData(save) {
       const screensStore = useScreens();
@@ -40790,7 +40806,7 @@ const stopCommand = new CommandPlugin("stop", playCommandArgs, async (cmd) => {
   if (stopOptions.mode === "music") {
     const audioStore = useAudio();
     if (audioStore.currentMusic) {
-      stopAudio(audioStore.currentMusic);
+      useAudio().stopMusic();
     }
   } else if (stopOptions.mode === "sound" && stopOptions.audio) {
     stopAudio(stopOptions.audio);
@@ -41474,3 +41490,4 @@ function addCommand(command) {
   vm.addCommand(command);
 }
 export { CommandPlugin, NarratPlugin, addCommand, aspectRatioFit, generateParser, getConfig, registerPlugin, startApp };
+//# sourceMappingURL=narrat.es.js.map