david/CookieMonster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sorting fixes

Browse Source
This commit is contained in:
Tom
2021-05-08 03:51:47 -04:00
parent 67d3562659
commit 41c28c21df
4 changed files with 10 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dist/CookieMonsterDev.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/CookieMonsterDev.js.map vendored
View File

File diff suppressed because one or more lines are too long

29
src/Disp/BuildingsUpgrades/Buildings.js
View File

@@ -75,17 +75,6 @@ export default function UpdateBuildings() {
o.id = Game.Objects[k].id; o.id = Game.Objects[k].id;
return o; return o;
}); });
arr.sort((a, b) =>
ColoursOrdering.indexOf(a.color) > // eslint-disable-line no-nested-ternary
ColoursOrdering.indexOf(b.color)
? 1
: ColoursOrdering.indexOf(a.color) < ColoursOrdering.indexOf(b.color) // eslint-disable-line no-nested-ternary
? -1
: a.pp < b.pp
? -1
: 0,
);
} else if (CMOptions.SortBuildings === 2) { } else if (CMOptions.SortBuildings === 2) {
arr = Object.keys(target).map((k) => { arr = Object.keys(target).map((k) => {
const o = target[k]; const o = target[k];
@@ -93,19 +82,13 @@ export default function UpdateBuildings() {
o.id = Game.Objects[k].id; o.id = Game.Objects[k].id;
return o; return o;
}); });
arr.sort((a, b) =>
ColoursOrdering.indexOf(a.color) > // eslint-disable-line no-nested-ternary
ColoursOrdering.indexOf(b.color)
? 1
: ColoursOrdering.indexOf(a.color) < ColoursOrdering.indexOf(b.color) // eslint-disable-line no-nested-ternary
? -1
: a.pp < b.pp
? -1
: 0,
);
} }
// Sort by pp colour group, then by pp.
arr.sort((a, b) =>
ColoursOrdering.indexOf(a.color) === ColoursOrdering.indexOf(b.color)
? a.pp - b.pp
: ColoursOrdering.indexOf(a.color) - ColoursOrdering.indexOf(b.color)
);
for (let x = 0; x < arr.length; x++) { for (let x = 0; x < arr.length; x++) {
Game.Objects[arr[x].name].l.style.gridRow = `${x + 2}/${x + 2}`; Game.Objects[arr[x].name].l.style.gridRow = `${x + 2}/${x + 2}`;
} }

4
src/Disp/BuildingsUpgrades/Upgrades.js
View File

@@ -77,9 +77,9 @@ export default function UpdateUpgrades() {
} }
if (CMOptions.SortUpgrades) { if (CMOptions.SortUpgrades) {
// Sort by pp group, then by pp. Put gray upgrades last. // Sort by pp colour group, then by pp.
arr.sort((a, b) => arr.sort((a, b) =>
ColoursOrdering.indexOf(a.color) == ColoursOrdering.indexOf(b.color) ColoursOrdering.indexOf(a.color) === ColoursOrdering.indexOf(b.color)
? a.pp - b.pp ? a.pp - b.pp
: ColoursOrdering.indexOf(a.color) - ColoursOrdering.indexOf(b.color) : ColoursOrdering.indexOf(a.color) - ColoursOrdering.indexOf(b.color)
); );