Skip to content

Commit a10de0b

Browse files
authored
Merge pull request #104 from Tendsty/develop
bugfix patch 1.6.2
2 parents 8a281a5 + 5dd4e79 commit a10de0b

File tree

12 files changed

+54
-16
lines changed

12 files changed

+54
-16
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gooboo",
3-
"version": "1.6.1",
3+
"version": "1.6.2",
44
"description": "An idle game",
55
"author": "Tendsty",
66
"main": "main.js",

public/version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.6.1
1+
1.6.2

src/components/partial/patchnote/PatchnoteContent.vue

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@ export default {
9595
const subfeature = keySplit.length > 1 ? parseInt(keySplit[1]) : 0;
9696
const unlock = this.features[feature] ? (subfeature > 0 ? this.features[feature].subfeatures[subfeature - 1] : this.features[feature].unlock) : null;
9797
if (unlock === null || this.unlock[unlock].see) {
98-
const settingsList = elem.filter(el => !el.subtype || this.showDetailedPatchnotes);
99-
const itemList = settingsList.filter(el =>
98+
const settingsList = elem.filter(el =>
10099
(el.unlock === undefined || this.unlock[el.unlock].see) &&
101100
(el.subtype !== 'card' || this.card[el.name] === undefined || this.card[el.name].amount > 0) &&
102101
(el.subtype !== 'equipment' || this.equipment[el.name] === undefined || this.equipment[el.name].known) &&
@@ -106,11 +105,14 @@ export default {
106105
(el.subtype !== 'idea' || this.idea[el.name] === undefined || this.idea[el.name].owned) &&
107106
(el.subtype !== 'upgrade' || this.upgrade[el.name] === undefined || this.upgrade[el.name].highestLevel > 0)
108107
);
109-
hiddenDueToSetting += elem.length - settingsList.length;
110-
hiddenDueToUnlock += settingsList.length - itemList.length;
108+
const itemList = settingsList.filter(el => !el.subtype || this.showDetailedPatchnotes);
109+
hiddenDueToSetting += settingsList.length - itemList.length;
110+
hiddenDueToUnlock += elem.length - settingsList.length;
111111
if (itemList.length > 0) {
112112
obj[key] = itemList;
113113
}
114+
} else {
115+
hiddenDueToUnlock += elem.length;
114116
}
115117
}
116118
return {items: obj, hiddenDueToUnlock, hiddenDueToSetting};

src/components/partial/school/ChemistryMinigame.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
100% {margin-top: -20px;}
1919
}
2020
@keyframes particle-move-dl {
21-
0% {margin-left: -20px; margin-top: 20px;}
22-
50% {margin-left: 20px; margin-top: -20px;}
23-
100% {margin-left: -20px; margin-top: 20px;}
21+
0% {margin-left: 20px; margin-top: 20px;}
22+
50% {margin-left: -20px; margin-top: -20px;}
23+
100% {margin-left: 20px; margin-top: 20px;}
2424
}
2525
@keyframes particle-move-dr {
2626
0% {margin-left: 20px; margin-top: -20px;}
@@ -342,7 +342,7 @@ export default {
342342
currentSplit++;
343343
}
344344
moveDistribution[currentSplit >= 2 ? (currentSplit - 1) : 0]++;
345-
return {...el, move: currentSplit >= 2 ? ['h', 'v', chance(0.5) ? 'dl' : 'dr'][currentSplit - 1] : 'n'};
345+
return {...el, move: currentSplit >= 2 ? ['h', 'v', chance(0.5) ? 'dl' : 'dr'][currentSplit - 2] : 'n'};
346346
});
347347
}
348348

src/js/modules/patchnote/patchnotes.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ import v1_5_7 from "./v1_5_7";
2525
import v1_5_8 from "./v1_5_8";
2626
import v1_6_0 from "./v1_6_0";
2727
import v1_6_1 from "./v1_6_1";
28+
import v1_6_2 from "./v1_6_2";
2829

2930
export default {
31+
'1.6.2': v1_6_2,
3032
'1.6.1': v1_6_1,
3133
'1.6.0': v1_6_0,
3234
'1.5.8': v1_5_8,

src/js/modules/patchnote/v1_6_2.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
export default {
2+
day: '2025-11-10',
3+
content: {
4+
school: [
5+
{
6+
unlock: 'schoolChemistrySubfeature',
7+
type: 'bugfix',
8+
text: '650'
9+
},
10+
],
11+
treasure: [
12+
{
13+
type: 'change',
14+
text: '648'
15+
},
16+
{
17+
type: 'bugfix',
18+
text: '649'
19+
},
20+
],
21+
}
22+
}

src/js/modules/treasure/effect.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export default {
2323
miningSmelteryTime: {
2424
feature: 'mining',
2525
unlock: 'miningSmeltery',
26-
icon: 'mdi-fire',
26+
icon: 'mdi-thermometer',
2727
minTier: 1,
2828
value: 0.35,
2929
scaling: 'divisive',
@@ -217,7 +217,7 @@ export default {
217217
galleryCanvasSpeed: {
218218
feature: 'gallery',
219219
unlock: 'galleryCanvas',
220-
icon: 'mdi-package-variant',
220+
icon: 'mdi-artboard',
221221
minTier: 2,
222222
value: 0.15,
223223
},

src/lang/de/patchnote.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -762,6 +762,11 @@ export default {
762762
645: 'Ein Fehler wurde behoben, bei dem der Ertragsbonus aus Pflege nicht korrekt angewendet wurde',
763763
646: 'Energie zählt nicht mehr für diese Unterfunktion',
764764
647: 'Schatzeffekte werden nun entfernt, wenn ein Schatz gelöscht wird',
765+
766+
// v1.6.2
767+
648: 'Die Symbole einiger Schatzeffekte wurden verändert',
768+
649: 'Schätze mit leeren Plätzen können wieder zerstört werden',
769+
650: 'Ein Fehler in Chemie wurde behoben, bei dem Formen die falsche Bewegung gezeigt haben',
765770
},
766771
v: {
767772
1: {

src/lang/en/patchnote.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -762,6 +762,11 @@ export default {
762762
645: 'Fixed a bug where the yield bonus from care did not apply to crops',
763763
646: 'Power no longer applies to this subfeature',
764764
647: 'Treasure effects are now removed after deleting a treasure',
765+
766+
// v1.6.2
767+
648: 'Changed the icons of some treasure effects',
768+
649: 'Treasures with empty slots can now be destroyed',
769+
650: 'Fixed a bug where shapes in chemistry were not showing the correct movement',
765770
},
766771
v: {
767772
1: {

0 commit comments

Comments
 (0)