Merge pull request #53 from Tendsty/develop

Develop
Tendsty · Jun 9, 2024 · f97135d · f97135d
2 parents ca67867 + 1c0a105
commit f97135d
Show file tree

Hide file tree

Showing 12 changed files with 94 additions and 29 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gooboo",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "An idle game",
   "author": "Tendsty",
   "main": "main.js",

diff --git a/public/version.txt b/public/version.txt
@@ -1 +1 @@
-1.4.1
+1.4.2
diff --git a/src/js/modules/event/relic.js b/src/js/modules/event/relic.js
@@ -76,7 +76,7 @@ export default {
         {name: 'currencyMiningScrapGain', type: 'mult', value: 1.08}
     ]},
     suitcase: {icon: 'mdi-bag-carry-on', color: 'dark-blue', effect: [
-        {name: 'hordeMaxItems', type: 'base', value: 1}
+        {name: 'currencyHordeBoneCap', type: 'mult', value: 1.07}
     ]},
 
     // Summer festival

diff --git a/src/js/modules/event/weatherChaos/tick.js b/src/js/modules/event/weatherChaos/tick.js
@@ -2,15 +2,17 @@ import store from "../../../../store";
 import { SECONDS_PER_HOUR } from "../../../constants";
 
 export default function(seconds, oldTime, newTime) {
-    let step = oldTime;
-    while (step < newTime) {
-        const oldStep = step;
-        step = Math.min(Math.floor((step + SECONDS_PER_HOUR) / SECONDS_PER_HOUR) * SECONDS_PER_HOUR, newTime);
-        if (step % SECONDS_PER_HOUR === 0) {
-            store.dispatch('weatherChaos/nextWeatherStep');
-        }
-        if (step > oldStep) {
-            singleTick(step - oldStep);
+    if (store.getters['weatherChaos/currentWeather'] !== undefined) {
+        let step = oldTime;
+        while (step < newTime) {
+            const oldStep = step;
+            step = Math.min(Math.floor((step + SECONDS_PER_HOUR) / SECONDS_PER_HOUR) * SECONDS_PER_HOUR, newTime);
+            if (step % SECONDS_PER_HOUR === 0) {
+                store.dispatch('weatherChaos/nextWeatherStep');
+            }
+            if (step > oldStep) {
+                singleTick(step - oldStep);
+            }
         }
     }
 }

diff --git a/src/js/modules/farm/gene.js b/src/js/modules/farm/gene.js
@@ -2,30 +2,33 @@ export default {
     // Level 1 genes
     yield: {
         icon: 'mdi-sack',
-        effect: [{name: 'farmCropGain', type: 'mult', value: 1.4}],
-        upgrade: [{name: 'farmCropGain', type: 'mult', value: lvl => Math.pow(1.1, lvl)}]
+        effect: [{name: 'farmCropGain', type: 'mult', value: 1.3}],
+        upgrade: [{name: 'farmCropGain', type: 'mult', value: lvl => lvl * 0.1 + 1}]
     },
     gold: {
         icon: 'mdi-gold',
-        effect: [{name: 'farmGoldChance', type: 'mult', value: 1.75}],
-        upgrade: [{name: 'farmGoldChance', type: 'mult', value: lvl => Math.pow(1.12, lvl)}]
+        effect: [{name: 'farmGoldChance', type: 'mult', value: 1.4}],
+        upgrade: [{name: 'farmGoldChance', type: 'mult', value: lvl => lvl * 0.05 + 1}]
     },
     exp: {
         icon: 'mdi-star',
-        effect: [{name: 'farmExperience', type: 'mult', value: 1.3}],
+        effect: [{name: 'farmExperience', type: 'mult', value: 1.175}],
         upgrade: [{name: 'farmExperience', type: 'base', value: lvl => lvl * 0.15}]
     },
     rareDrop: {
         icon: 'mdi-dice-2',
         effect: [{name: 'farmRareDropChance', type: 'mult', value: 1.25}],
-        upgrade: [{name: 'farmRareDropChance', type: 'mult', value: lvl => Math.pow(1.08, lvl)}]
+        upgrade: [{name: 'farmRareDropChance', type: 'mult', value: lvl => lvl * 0.09 + 1}]
     },
 
     // Level 5 genes
     grow: {
         icon: 'mdi-timer',
         effect: [{name: 'farmGrow', type: 'mult', value: 0.8}],
-        upgrade: [{name: 'farmExperience', type: 'base', value: lvl => lvl * 0.12}]
+        upgrade: [
+            {name: 'farmGrow', type: 'mult', value: lvl => 1 / (lvl * 0.01 + 1)},
+            {name: 'farmExperience', type: 'base', value: lvl => lvl * 0.1}
+        ]
     },
     overgrow: {
         icon: 'mdi-sprout',
@@ -38,7 +41,10 @@ export default {
             {name: 'farmGrow', type: 'mult', value: 5},
             {name: 'farmAllGain', type: 'mult', value: 4}
         ],
-        upgrade: [{name: 'farmCropGain', type: 'mult', value: lvl => Math.pow(1.08, lvl)}]
+        upgrade: [
+            {name: 'farmCropGain', type: 'mult', value: lvl => lvl * 0.06 + 1},
+            {name: 'farmRareDropChance', type: 'mult', value: lvl => lvl * 0.04 + 1}
+        ]
     },
     grass: {
         icon: 'mdi-grass',
@@ -55,17 +61,26 @@ export default {
     gnome: {
         icon: 'mdi-human-child',
         effect: [{name: 'farmGnomeBoost', type: 'text'}],
-        upgrade: [{name: 'farmGoldChance', type: 'mult', value: lvl => Math.pow(1.09, lvl)}]
+        upgrade: [
+            {name: 'farmCropGain', type: 'mult', value: lvl => lvl * 0.04 + 1},
+            {name: 'farmExperience', type: 'base', value: lvl => lvl * 0.05}
+        ]
     },
     lonely: {
         icon: 'mdi-circle-expand',
         effect: [{name: 'farmLonelyGrow', type: 'text'}],
-        upgrade: [{name: 'farmOvergrow', type: 'base', value: lvl => lvl * 0.12}]
+        upgrade: [
+            {name: 'farmGrow', type: 'mult', value: lvl => 1 / (lvl * 0.01 + 1)},
+            {name: 'farmOvergrow', type: 'base', value: lvl => lvl * 0.12}
+        ]
     },
     fertile: {
         icon: 'mdi-sack-percent',
         effect: [{name: 'farmFertileBoost', type: 'text'}],
-        upgrade: [{name: 'farmAllGain', type: 'mult', value: lvl => lvl * 0.02 + 1}]
+        upgrade: [
+            {name: 'farmAllGain', type: 'mult', value: lvl => lvl * 0.02 + 1},
+            {name: 'farmOvergrow', type: 'base', value: lvl => lvl * 0.05}
+        ]
     },
 
     // Level 15 genes
@@ -77,7 +92,10 @@ export default {
     conversion: {
         icon: 'mdi-swap-horizontal',
         effect: [{name: 'farmYieldConversion', type: 'text'}],
-        upgrade: [{name: 'farmCropGain', type: 'mult', value: lvl => Math.pow(1.07, lvl)}]
+        upgrade: [
+            {name: 'farmCropGain', type: 'mult', value: lvl => lvl * 0.04 + 1},
+            {name: 'farmExperience', type: 'base', value: lvl => lvl * 0.05}
+        ]
     },
     prestige: {
         icon: 'mdi-shimmer',

diff --git a/src/js/modules/horde/cardList.js b/src/js/modules/horde/cardList.js
@@ -60,7 +60,7 @@ export default [
     ]},
 
     {id: 7, collection: 'maintainingSafety', reward: [
-        {name: 'hordeMaxItems', type: 'base', value: 1}
+        {name: 'hordeItemChance', type: 'mult', value: 1.6}
     ], color: 'pale-yellow', icons: [
         {"x": 0, "y": 1, "rotate": 90, "size": 2, "icon": "mdi-rectangle"},
         {"x": 0, "y": 0.35, "rotate": 0, "size": 1, "icon": "mdi-bag-personal"},
@@ -344,7 +344,8 @@ export default [
         {"x": 0.5, "y": 0.5, "rotate": 0, "size": 3, "icon": "mdi-minus"}
     ]},
     {id: 37, collection: 'againstTheCorruption', reward: [
-        {name: 'hordeMaxItems', type: 'base', value: 3},
+        {name: 'hordeAttack', type: 'mult', value: 1.75},
+        {name: 'hordeHealth', type: 'mult', value: 1.75},
         {name: 'hordeCorruption', type: 'mult', value: 1.15}
     ], color: 'brown', icons: [
         {"x": 0.25, "y": -0.6, "rotate": 0, "size": 1.75, "icon": "mdi-truck-cargo-container"},

diff --git a/src/js/modules/meta.js b/src/js/modules/meta.js
@@ -18,6 +18,7 @@ import v1_3_5 from "./patchnote/v1_3_5";
 import v1_4_0 from "./patchnote/v1_4_0";
 import v1_3_6 from "./patchnote/v1_3_6";
 import v1_4_1 from "./patchnote/v1_4_1";
+import v1_4_2 from "./patchnote/v1_4_2";
 
 export default {
     name: 'meta',
@@ -53,6 +54,7 @@ export default {
             store.commit('system/initTheme', {name: key, ...elem});
         }
         for (const [key, elem] of Object.entries({
+            '1.4.2': v1_4_2,
             '1.4.1': v1_4_1,
             '1.4.0': v1_4_0,
             '1.3.6': v1_3_6,

diff --git a/src/js/modules/patchnote/v1_4_2.js b/src/js/modules/patchnote/v1_4_2.js
@@ -0,0 +1,30 @@
+export default {
+    day: '2024-06-09',
+    content: {
+        card: [
+            {
+                type: 'balance',
+                text: '299_2'
+            }
+        ],
+        farm: [
+            {
+                unlock: 'farmCropExp',
+                type: 'balance',
+                text: '299_4'
+            },
+        ],
+        event: [
+            {
+                unlock: 'weatherChaosEvent',
+                type: 'bugfix',
+                text: '299_1'
+            },
+            {
+                unlock: 'weatherChaosEvent',
+                type: 'balance',
+                text: '299_3'
+            }
+        ]
+    }
+}
diff --git a/src/lang/de/patchnote.js b/src/lang/de/patchnote.js
@@ -358,6 +358,12 @@ export default {
     297: 'Kosten von Stufe-4-Opfergaben steigen nun mit jedem Kauf',
     298: 'Die Erfolgsnachricht hat jetzt einen Textschatten, wenn ein Relikt enthalten ist',
     299: 'Die Anforderungen für den "Genie"-Erfolg wurden ab Stufe 10 erhöht',
+
+    // v1.4.2
+    '299_1': 'Ein Spielabsturz wurde behoben, der nach dem Ende vom Wetterchaos auftrat',
+    '299_2': 'Ausrüstungskapazität wurde von Horde-Karten entfernt',
+    '299_3': 'Ausrüstungskapazität wurde von einem Event-Relikt entfernt',
+    '299_4': 'Die meisten Gene steigern sich jetzt linear',
   },
   v: {
     1: {

diff --git a/src/lang/en/patchnote.js b/src/lang/en/patchnote.js
@@ -358,6 +358,12 @@ export default {
     297: 'Tier 4 offerings now increase their cost with each purchase',
     298: 'Added a text shadow to the achievement message if it contains relics',
     299: 'Increased the requirement for the "Mastermind" achievement after level 10',
+
+    // v1.4.2
+    '299_1': 'Fixed a game crash when the weather chaos event ends',
+    '299_2': 'Removed equipment capacity from horde cards',
+    '299_3': 'Removed equipment capacity from an event relic',
+    '299_4': 'Changed most genes to a linear scaling',
   },
   v: {
     1: {

diff --git a/src/store/system.js b/src/store/system.js
@@ -7,7 +7,7 @@ import seedrandom from "seedrandom";
 export default {
     namespaced: true,
     state: {
-        version: '1.4.1',
+        version: '1.4.2',
         patchnote: {},
         timestamp: null,
         screen: 'newGame',