@urso/core 0.3.2 → 0.3.3

package/build/js/index.js.LICENSE.txt

@@ -151,7 +151,7 @@ object-assign
  */
 
 /*!
- * GSAP 3.9.0
+ * GSAP 3.8.0
  * https://greensock.com
  *
  * @license Copyright 2008-2021, GreenSock. All rights reserved.

package/package.json

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

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

@@ -27,6 +27,16 @@ class ModulesStatesManagerController {
 
     _iteratorConstructor() {
         let nextIndex = 0;
+    
+
+        const getNextStateByOrder = () => {
+            let statesArray = Object.keys(this._configStates);
+
+            if (nextIndex === statesArray.length)
+                nextIndex = 0;
+
+            return statesArray[nextIndex++];
+        }
 
         return {
             next: (() => {
@@ -36,7 +46,7 @@ class ModulesStatesManagerController {
                 if (this._currentState) {
                     const currentState = this._configStates[this._currentState];
 
-                    if (this.checkStateGuard(this._currentState) && currentState.nextState) { //nextState: ["PICK_GAME2", "PICK_GAME1", "IDLE"]
+                    if (currentState.nextState) { //nextState: ["PICK_GAME2", "PICK_GAME1", "IDLE"]
                         for (const stateKey of currentState.nextState) {
                             if (this.checkStateGuard(stateKey)) {
                                 nextIndex = statesArray.indexOf(stateKey) + 1;
@@ -52,11 +62,14 @@ class ModulesStatesManagerController {
                     }
                 }
 
-                //regular round logic
-                if (nextIndex === statesArray.length)
-                    nextIndex = 0;
+                //go next state by order
+                let stateName;
 
-                return statesArray[nextIndex++];
+                do {
+                    stateName = getNextStateByOrder();
+                } while (!this.checkStateGuard(stateName));
+
+                return stateName;
             }).bind(this)
         }
     }
@@ -71,10 +84,6 @@ class ModulesStatesManagerController {
         let config = this._configStates[this._currentState];
         let classInstance = this.getInstance('Helper').getActionByConfig(config);
 
-        //state guard
-        if (!this.checkStateGuard(this._currentState))
-            return this._nextState();
-
         //actions instances guard
         if (!classInstance.guard())
             return this._nextState();