@novely/core 0.26.0 → 0.27.0

package/dist/index.d.ts

@@ -160,6 +160,16 @@ type Renderer = {
          * Returns current screen
          */
         getScreen(): NovelyScreen | (string & Record<never, never>);
+        /**
+         * Shows loading
+         *
+         * Unline `showScreen('loading')` does not change screen
+         */
+        showLoading(): void;
+        /**
+         * Hides loading
+         */
+        hideLoading(): void;
         /**
          * Shows prompt to exit
          */
@@ -245,7 +255,7 @@ type Stack = {
     push(value: Save): void;
     clear(): void;
 };
-type NovelyScreen = 'mainmenu' | 'game' | 'saves' | 'settings' | 'loading';
+type NovelyScreen = 'mainmenu' | 'game' | 'saves' | 'settings';
 /**
  * @see https://pendletonjones.com/deep-partial
  */

package/dist/index.global.js

@@ -846,9 +846,8 @@ var Novely = (() => {
     const story = {};
     const times = /* @__PURE__ */ new Set();
     const ASSETS_TO_PRELOAD = /* @__PURE__ */ new Set();
-    const assetsLoaded = createControlledPromise();
     const dataLoaded = createControlledPromise();
-    let scriptCalled = false;
+    let initialScreenWasShown = false;
     defaultData ||= {};
     defaultState ||= {};
     const intime = (value) => {
@@ -856,8 +855,15 @@ var Novely = (() => {
     };
     const scriptBase = async (part) => {
       Object.assign(story, flattenStory(part));
+      let loadingIsShown = false;
+      if (!initialScreenWasShown) {
+        renderer.ui.showLoading();
+        loadingIsShown = true;
+      }
       if (preloadAssets === "blocking" && ASSETS_TO_PRELOAD.size > 0) {
-        renderer.ui.showScreen("loading");
+        if (!loadingIsShown) {
+          renderer.ui.showLoading();
+        }
         const { preloadAudioBlocking, preloadImageBlocking } = renderer.misc;
         const list = mapSet(ASSETS_TO_PRELOAD, (asset) => {
           return limitAssetsDownload(async () => {
@@ -876,20 +882,17 @@ var Novely = (() => {
         });
         await Promise.allSettled(list);
       }
-      const screen = renderer.ui.getScreen();
-      const nextScreen = scriptCalled ? screen : initialScreen;
       ASSETS_TO_PRELOAD.clear();
-      assetsLoaded.resolve();
-      if (nextScreen === "game") {
-        await assetsLoaded.promise;
-        await dataLoaded.promise;
-        if (!scriptCalled) {
+      await dataLoaded.promise;
+      renderer.ui.hideLoading();
+      if (!initialScreenWasShown) {
+        initialScreenWasShown = true;
+        if (initialScreen === "game") {
           restore();
+        } else {
+          renderer.ui.showScreen(initialScreen);
         }
-      } else {
-        renderer.ui.showScreen(nextScreen);
       }
-      scriptCalled = true;
     };
     const script = (part) => {
       return limitScript(() => scriptBase(part));