@urso/core 0.7.36 → 0.7.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@urso/core",
-  "version": "0.7.36",
+  "version": "0.7.38",
   "description": "HTML5 game engine",
   "main": "build/js/index.js",
   "author": "Megbrimef",

package/src/js/lib/cache.js

@@ -17,7 +17,7 @@ class LibCache {
 
     _setDataToAssetsList(assetType, key, data) {
         if (this.assetsList[assetType][key])
-            console.warn(`LibCache ${assetType}: key alredy exists: `, key, data);
+            console.warn(`LibCache ${assetType}: key already exists: `, key, data);
 
         this.assetsList[assetType][key] = data;
     }

package/src/js/lib/loader.js

@@ -1,5 +1,6 @@
 class LibLoader {
     constructor() {
+        this.RELOAD_DELAY = 250;
         this._isRunning = false;
         this._iterationNumber = 0;
         this._assetsQuery = [];
@@ -103,6 +104,7 @@ class LibLoader {
             return false;
 
         this._isRunning = true;
+        this._lastLoadFailed = false;
         this._iterationNumber++;
         const currentIteration = this._iterationNumber;
         this._completeCallback = callback;
@@ -134,7 +136,7 @@ class LibLoader {
         this._loader.onError.add(this._onError);
 
         this._loader.load(function (loader, resources) {
-            if (currentIteration !== this._iterationNumber)
+            if (currentIteration !== this._iterationNumber || this._lastLoadFailed)
                 return;
 
             this._onLoadUpdate({ progress: 100 });
@@ -146,9 +148,12 @@ class LibLoader {
 
 
     _onError(error) {
+        Urso.logger.warn('LibLoader file load error: ', error);
         this._loader.reset();
         this._isRunning = false;
-        this.start(this._completeCallback);
+        this._lastLoadFailed = true;
+
+        this._resizeTimeoutId = Urso.setTimeout(() => this.start(this._completeCallback), this.RELOAD_DELAY);
     }
 
 };

package/src/js/modules/statesManager/controller.js

@@ -4,6 +4,7 @@ class ModulesStatesManagerController {
 
         this._configStates;
         this._currentState;
+        this._forceNextStateKey = null;
         this._started = false;
         this._paused = false;
         this._pauseNeedResume = false;
@@ -42,6 +43,14 @@ class ModulesStatesManagerController {
         }
     }
 
+    setForceNextState(stateKey) {
+        if (!this._configStates[stateKey]) {
+            Urso.logger.error('ModulesStatesManagerController: setForceNextState name error', stateKey);
+        }
+
+        this._forceNextStateKey = stateKey
+    }
+
     _iteratorConstructor() {
         let nextIndex = 0;
 
@@ -57,6 +66,12 @@ class ModulesStatesManagerController {
 
         return {
             next: (() => {
+                if (this._forceNextStateKey) {
+                    const forceNextStateKey = this._forceNextStateKey;
+                    this._forceNextStateKey = null;
+                    return forceNextStateKey;
+                }
+
                 let statesArray = Object.keys(this._configStates);
 
                 //nextState