Merge branch 'develop' of ssh://200.144.254.107:2245/LInE/Ifractions-web into feature/new-game-scale-one

README.md

@@ -46,7 +46,7 @@ Follow the description below based on in which platform you want to run iFractio
 
 ## Releases:
 
-### [v3.0.0](http://200.144.254.107/git/LInE/Ifractions-web/src/release-3.0.0) (stable)
+### [v3.1.0](http://200.144.254.107/git/LInE/Ifractions-web/src/release-3.1.0) (stable)
 
 * Bug fixes 
 

js/games/circleOne.js

@@ -500,7 +500,7 @@ const circleOne = {
         self.circles.list[0].info.distance * self.circles.list[0].info.direc;
 
       let isBeforeMin = (isAfterMax = false);
-      let finalPosition = self.control.correctX;
+      let finalPosition = self.control.correctX.toFixed(1);
       // Restart if
       // In Game mode 'a' and 'b' : Kite position is out of bounds
       if (gameOperation === 'minus') {
@@ -508,7 +508,7 @@ const circleOne = {
         isAfterMax =
           finalPosition < validPath.x0 - 5 * validPath.distanceBetweenPoints;
       } else {
-        isBeforeMin = finalPosition < validPath.x0;
+        isBeforeMin = finalPosition <= validPath.x0;
         isAfterMax =
           finalPosition > validPath.x0 + 5 * validPath.distanceBetweenPoints;
       }
@@ -684,7 +684,9 @@ const circleOne = {
           nominators[i] = n + 0;
           denominators[i] = m + 0;
           values[i] = nm;
-          valueReal += nm;
+          if (gameOperation === 'mixed')
+            valueReal = temp < 0 ? valueReal - nm : valueReal + nm;
+          else valueReal += nm;
         }
 
         for (let i = 0; i < blocks; i++) {