Merge pull request #75 from Tendsty/develop

1.5.5 hotfix

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gooboo",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "description": "An idle game",
   "author": "Tendsty",
   "main": "main.js",

public/version.txt

@@ -1 +1 @@
-1.5.4
+1.5.5

src/js/modules/meta.js

@@ -24,6 +24,7 @@ import v1_5_1 from "./patchnote/v1_5_1";
 import v1_5_2 from "./patchnote/v1_5_2";
 import v1_5_3 from "./patchnote/v1_5_3";
 import v1_5_4 from "./patchnote/v1_5_4";
+import v1_5_5 from "./patchnote/v1_5_5";
 
 export default {
     name: 'meta',
@@ -59,6 +60,7 @@ export default {
             store.commit('system/initTheme', {name: key, ...elem});
         }
         for (const [key, elem] of Object.entries({
+            '1.5.5': v1_5_5,
             '1.5.4': v1_5_4,
             '1.5.3': v1_5_3,
             '1.5.2': v1_5_2,

src/js/modules/migration/v1_5_4.js

@@ -4,31 +4,33 @@ export default function(save) {
         delete save.currency.event_snowball;
     }
 
-    // Convert tokens from the old to the new formula
-    let tokensExpected = 0;
-    const fights = save.event.snowdown_fight ?? 0;
-    for (let i = 0; i < fights; i++) {
-        tokensExpected += Math.floor(Math.pow(i * 0.35 + 1, 0.75) + 3);
-    }
-    if (save.stat.event_snowdownToken && save.currency.event_snowdownToken !== undefined) {
-        const tokenDiff = tokensExpected - save.stat.event_snowdownToken[0];
-        if (tokenDiff !== 0) {
-            save.currency.event_snowdownToken += tokenDiff;
-            if (tokenDiff > 0) {
-                save.stat.event_snowdownToken = [save.stat.event_snowdownToken[0] + tokenDiff, save.stat.event_snowdownToken[1] + tokenDiff];
+    if (save.event) {
+        // Convert tokens from the old to the new formula
+        let tokensExpected = 0;
+        const fights = save.event.snowdown_fight ?? 0;
+        for (let i = 0; i < fights; i++) {
+            tokensExpected += Math.floor(Math.pow(i * 0.35 + 1, 0.75) + 3);
+        }
+        if (save.stat.event_snowdownToken && save.currency.event_snowdownToken !== undefined) {
+            const tokenDiff = tokensExpected - save.stat.event_snowdownToken[0];
+            if (tokenDiff !== 0) {
+                save.currency.event_snowdownToken += tokenDiff;
+                if (tokenDiff > 0) {
+                    save.stat.event_snowdownToken = [save.stat.event_snowdownToken[0] + tokenDiff, save.stat.event_snowdownToken[1] + tokenDiff];
+                }
             }
         }
-    }
 
-    // Convert removed producers
-    if (save.event.snowdown_item !== undefined) {
-        if (save.event.snowdown_item.spiceJar) {
-            save.event.snowdown_item.shepherd = (save.event.snowdown_item.shepherd ?? 0) + save.event.snowdown_item.spiceJar;
-            delete save.event.snowdown_item.spiceJar;
-        }
-        if (save.event.snowdown_item.tap) {
-            save.event.snowdown_item.forest = (save.event.snowdown_item.forest ?? 0) + save.event.snowdown_item.tap;
-            delete save.event.snowdown_item.tap;
+        // Convert removed producers
+        if (save.event.snowdown_item !== undefined) {
+            if (save.event.snowdown_item.spiceJar) {
+                save.event.snowdown_item.shepherd = (save.event.snowdown_item.shepherd ?? 0) + save.event.snowdown_item.spiceJar;
+                delete save.event.snowdown_item.spiceJar;
+            }
+            if (save.event.snowdown_item.tap) {
+                save.event.snowdown_item.forest = (save.event.snowdown_item.forest ?? 0) + save.event.snowdown_item.tap;
+                delete save.event.snowdown_item.tap;
+            }
         }
     }
 

src/js/modules/patchnote/v1_5_5.js

@@ -0,0 +1,11 @@
+export default {
+    day: '2024-11-23',
+    content: {
+        meta: [
+            {
+                type: 'bugfix',
+                text: '428'
+            }
+        ],
+    }
+}

src/lang/de/patchnote.js

@@ -516,6 +516,9 @@ export default {
     425: 'Produzenten zeigen nun das Rohstoffeinkommen an',
     426: '"Tiefer Hass" gibt nun weniger Angriff, erhöht aber auch Leben',
     427: 'Ein Fehler wurde behoben, bei dem "Erste Pflanzen" nach dem Öffnen des Spiels nicht korrekt angewendet wurde',
+
+    // v1.5.5
+    428: 'Ein Fehler, bei dem das Spiel für einige Spieler nicht gestartet ist, wurde behoben',
   },
   v: {
     1: {

src/lang/en/patchnote.js

@@ -516,6 +516,9 @@ export default {
     425: 'Producers now show their resource gain',
     426: '"Deep hatred" now gives less attack, but also increases health',
     427: 'Fixed a bug where the "First crops" effect was not applied correctly when opening the game',
+
+    // v1.5.5
+    428: 'Fixed a bug where the game didn\'t load for some players',
   },
   v: {
     1: {

src/store/system.js

@@ -7,7 +7,7 @@ import { LOCAL_STORAGE_NAME } from "../js/constants";
 export default {
     namespaced: true,
     state: {
-        version: '1.5.4',
+        version: '1.5.5',
         cheaterSelfMark: 0,
         cheatDetected: {},
         lastPlayedDays: [],