Skip to content

Commit 803754a

Browse files
committed
Change: Ignore sorting tech type upgrades
1 parent 037b35f commit 803754a

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

77
## [Unreleased]
8+
# Changed
9+
- Change: Ignore tech type upgrades
810

911
## [2042.11] - 2021-09-19
1012
### Added

main.js

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,17 @@
1919
* @property {number} price
2020
* @property {number} timeToTargetCookie
2121
* @property {number} newCookiesPs
22-
* @property {number} isBestHelper
22+
* @property {number} BestHelper
23+
* @property {number} cpsAcceleration
2324
*/
2425
/**
2526
* @typedef {Object} Upgrade
2627
* @property {function} getPrice
2728
* @property {number} bought
2829
* @property {number} timeToTargetCookie
2930
* @property {number} newCookiesPs
30-
* @property {number} isBestHelper
31+
* @property {number} BestHelper
32+
* @property {number} cpsAcceleration
3133
*/
3234
/**
3335
* @typedef {Object} Game
@@ -181,7 +183,7 @@ let BestDealHelper = {
181183
* @param {(Building|Upgrade)[]} all
182184
*/
183185
findHelper: function (all) {
184-
all.forEach(e => e.isBestHelper = 0);
186+
all.forEach(e => e.BestHelper = 0);
185187

186188
let i = 0;
187189
let target = all[0];
@@ -200,7 +202,7 @@ let BestDealHelper = {
200202
helpers.sort((a, b) => a.timeToTargetCookie - b.timeToTargetCookie);
201203
if (helpers[0].timeToTargetCookie >= target.timeToTargetCookie) return;
202204
i++;
203-
helpers[0].isBestHelper = i;
205+
helpers[0].BestHelper = i;
204206
target = helpers[0];
205207
}
206208

@@ -229,7 +231,7 @@ let BestDealHelper = {
229231
// Sorting by cpsAcceleration
230232
all.sort((a, b) => b.cpsAcceleration - a.cpsAcceleration);
231233

232-
// If the best cpsAcceleration is not affordable, try to find a pre-deal help us to get the best deal quicker.
234+
// If the best cpsAcceleration is not affordable, search pre-deals to help us get the best deal quicker.
233235
MOD.findHelper(all);
234236

235237
// Determine colors
@@ -298,7 +300,7 @@ let BestDealHelper = {
298300
span.style.fontWeight = "bolder";
299301
span.style.position = "absolute";
300302
span.style.bottom = "0px";
301-
span.style.left = "-5px";
303+
span.style.left = "-3px";
302304
span.style.textShadow = "0px 2px 6px #000, 0px 1px 1px #000";
303305
span.style.transform = "scale(0.8,1)";
304306
l("upgrade" + i).appendChild(span);
@@ -311,7 +313,7 @@ let BestDealHelper = {
311313
}
312314
span.textContent = Beautify(me.cpsAcceleration * 100 / avg, 1) + "%";
313315
if (me.waitingTime) span.innerHTML = me.waitingTime + "<br>" + span.textContent;
314-
if (me.isBestHelper) {
316+
if (me.BestHelper) {
315317
MOD.rainbow(span);
316318
} else {
317319
try {span.style.color = color(me.cpsAcceleration);} catch (e) { }
@@ -337,7 +339,7 @@ let BestDealHelper = {
337339
}
338340
span.textContent = " 💹" + Beautify(me.cpsAcceleration * 100 / avg, 2) + "%";
339341
if (me.waitingTime) span.textContent += " ⏳" + me.waitingTime;
340-
if (me.isBestHelper) {
342+
if (me.BestHelper) {
341343
MOD.rainbow(span);
342344
} else {
343345
try {span.style.color = color(me.cpsAcceleration);} catch (e) { }
@@ -348,15 +350,15 @@ let BestDealHelper = {
348350
// Sort upgrades & buildings (or leave them as default)
349351
if (MOD.config.sortbuildings) {
350352
upgrades.sort(function (a, b) {
351-
if (b.isBestHelper !== a.isBestHelper) {
352-
return b.isBestHelper - a.isBestHelper;
353+
if (b.BestHelper !== a.BestHelper) {
354+
return b.BestHelper - a.BestHelper;
353355
} else {
354356
return b.cpsAcceleration - a.cpsAcceleration;
355357
}
356358
});
357359
buildings.sort(function (a, b) {
358-
if (b.isBestHelper !== a.isBestHelper) {
359-
return b.isBestHelper - a.isBestHelper;
360+
if (b.BestHelper !== a.BestHelper) {
361+
return b.BestHelper - a.BestHelper;
360362
} else {
361363
return b.cpsAcceleration - a.cpsAcceleration;
362364
}
@@ -369,7 +371,7 @@ let BestDealHelper = {
369371
if (!upgrades_order.every((value, index) => value === current_upgrades_order[index])) {
370372
let store = document.querySelector("#upgrades");
371373
for (let i = 0; i < upgrades.length; ++i) {
372-
if (upgrades[i].pool === "toggle") continue;
374+
if (["toggle", "tech"].includes(upgrades[i].pool)) continue;
373375
store.appendChild(upgrades[i].l);
374376
}
375377
}

0 commit comments

Comments
 (0)