From 9e039245acd3d626d0c7f8ce8a6a1c51f65ad8bf Mon Sep 17 00:00:00 2001
From: Tendsty <137620092+Tendsty@users.noreply.github.com>
Date: Mon, 20 Jan 2025 17:05:56 +0100
Subject: [PATCH] bugfix patch 1.5.8

---
 package-lock.json                  |  4 ++--
 package.json                       |  2 +-
 public/version.txt                 |  2 +-
 src/js/modules/event/prize.js      |  2 +-
 src/js/modules/farm/fertilizer.js  |  2 +-
 src/js/modules/general/grobodal.js |  2 +-
 src/js/modules/meta.js             |  2 ++
 src/js/modules/patchnote/v1_5_8.js | 18 ++++++++++++++++++
 src/lang/de/patchnote.js           |  4 ++++
 src/lang/en/patchnote.js           |  4 ++++
 src/store/system.js                |  2 +-
 11 files changed, 36 insertions(+), 8 deletions(-)
 create mode 100644 src/js/modules/patchnote/v1_5_8.js

diff --git a/package-lock.json b/package-lock.json
index 5248665..2ce1048 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "gooboo",
-  "version": "1.5.7",
+  "version": "1.5.8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "gooboo",
-      "version": "1.5.7",
+      "version": "1.5.8",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@fontsource/caveat": "^4.5.9",
diff --git a/package.json b/package.json
index 73cd5bd..ea6b8cf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gooboo",
-  "version": "1.5.7",
+  "version": "1.5.8",
   "description": "An idle game",
   "author": "Tendsty",
   "main": "main.js",
diff --git a/public/version.txt b/public/version.txt
index f01291b..1cc9c18 100644
--- a/public/version.txt
+++ b/public/version.txt
@@ -1 +1 @@
-1.5.7
+1.5.8
diff --git a/src/js/modules/event/prize.js b/src/js/modules/event/prize.js
index c6f87c3..a17365f 100644
--- a/src/js/modules/event/prize.js
+++ b/src/js/modules/event/prize.js
@@ -423,7 +423,7 @@ export default {
             return store.state.unlock.villageOffering1.see;
         },
         roundAmount: true,
-        amountMult: () => store.state.stat.village_bestOffering.total,
+        amountMult: () => store.getters['village/offeringScore'],
         pool: {
             bingo0: {amount: 0.15},
             bingo1: {amount: 0.5},
diff --git a/src/js/modules/farm/fertilizer.js b/src/js/modules/farm/fertilizer.js
index 7dd637d..4c4997c 100644
--- a/src/js/modules/farm/fertilizer.js
+++ b/src/js/modules/farm/fertilizer.js
@@ -91,7 +91,7 @@ export default {
         effect: {farmExperience: 1.35}
     },
     superJuicy: {
-        type: 'fruit',
+        type: 'berry',
         color: 'orange-red',
         price: {gem_sapphire: 3},
         effect: {farmCropGain: 2.5, farmRareDropChance: 1.6}
diff --git a/src/js/modules/general/grobodal.js b/src/js/modules/general/grobodal.js
index bd20807..67f8845 100644
--- a/src/js/modules/general/grobodal.js
+++ b/src/js/modules/general/grobodal.js
@@ -110,7 +110,7 @@ export default {
                     {type: 'equipmentMastery', name: 'luckyCharm', operator: '>=', value: 1}
                 ]},
                 {note: 'general_25', tasks: [
-                    {type: 'stat', subtype: 'current', name: 'village_bestOffering', operator: '>=', value: 150}
+                    {type: 'stat', subtype: 'total', name: 'village_offeringMax', operator: '>=', value: 4500}
                 ]},
                 {note: 'general_26', tasks: [
                     {type: 'stat', subtype: 'current', name: 'horde_maxZone', operator: '>=', value: 110},
diff --git a/src/js/modules/meta.js b/src/js/modules/meta.js
index 2409447..b915d15 100644
--- a/src/js/modules/meta.js
+++ b/src/js/modules/meta.js
@@ -27,6 +27,7 @@ import v1_5_4 from "./patchnote/v1_5_4";
 import v1_5_5 from "./patchnote/v1_5_5";
 import v1_5_6 from "./patchnote/v1_5_6";
 import v1_5_7 from "./patchnote/v1_5_7";
+import v1_5_8 from "./patchnote/v1_5_8";
 
 export default {
     name: 'meta',
@@ -62,6 +63,7 @@ export default {
             store.commit('system/initTheme', {name: key, ...elem});
         }
         for (const [key, elem] of Object.entries({
+            '1.5.8': v1_5_8,
             '1.5.7': v1_5_7,
             '1.5.6': v1_5_6,
             '1.5.5': v1_5_5,
diff --git a/src/js/modules/patchnote/v1_5_8.js b/src/js/modules/patchnote/v1_5_8.js
new file mode 100644
index 0000000..8401ad0
--- /dev/null
+++ b/src/js/modules/patchnote/v1_5_8.js
@@ -0,0 +1,18 @@
+export default {
+    day: '2025-01-20',
+    content: {
+        meta: [
+            {
+                type: 'bugfix',
+                text: '441'
+            },
+        ],
+        farm: [
+            {
+                unlock: 'farmFertilizer',
+                type: 'bugfix',
+                text: '442'
+            },
+        ],
+    }
+}
diff --git a/src/lang/de/patchnote.js b/src/lang/de/patchnote.js
index 4b6a617..9c109ed 100644
--- a/src/lang/de/patchnote.js
+++ b/src/lang/de/patchnote.js
@@ -535,6 +535,10 @@ export default {
 
     // v1.5.7
     440: 'Opfergaben durch Opfer werden nun korrekt erhöht',
+
+    // v1.5.8
+    441: 'Ein Fehler wurde behoben, bei dem das Spiel bei manchen Spielern nicht gestartet ist',
+    442: 'Ein Fehler wurde behoben, bei dem ein Dünger nicht in der Liste aufgetaucht ist',
   },
   v: {
     1: {
diff --git a/src/lang/en/patchnote.js b/src/lang/en/patchnote.js
index 9b0ba09..eda265d 100644
--- a/src/lang/en/patchnote.js
+++ b/src/lang/en/patchnote.js
@@ -535,6 +535,10 @@ export default {
 
     // v1.5.7
     440: 'Fixed offerings gained on sacrifice not increasing',
+
+    // v1.5.8
+    441: 'Fixed a bug where the game would not load for some players',
+    442: 'Fixed one fertilizer not showing up in the list',
   },
   v: {
     1: {
diff --git a/src/store/system.js b/src/store/system.js
index ee8c3a4..62f8eab 100644
--- a/src/store/system.js
+++ b/src/store/system.js
@@ -7,7 +7,7 @@ import { LOCAL_STORAGE_NAME } from "../js/constants";
 export default {
     namespaced: true,
     state: {
-        version: '1.5.7',
+        version: '1.5.8',
         cheaterSelfMark: 0,
         cheatDetected: {},
         lastPlayedDays: [],