Change: fix overestimated waiting time.

the score is weighted too much on avoiding waiting, thus it increases quickly when deals are getting affordable; All good things are worth waiting for and worth fighting for.

Author: jcppkkk

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2042.14] - 2021-09-25
+### Changed
+- Change: fix overestimated waiting time. the score is weighted too much on avoiding waiting, thus it increases quickly when deals are getting affordable; All good things are worth waiting for and worth fighting for.   
+
 ## [2042.13] - 2021-09-22
 ### Added
 - Add: `cpsAcceleration` now consider multiple buying until next tier upgrade.

RELEASE.md

@@ -1,4 +1,3 @@
-## [2042.13] - 2021-09-22
-### Added
-- Add: `cpsAcceleration` now consider multiple buying until next tier upgrade.
-- Add: button to ignore Wizard Tower.
+## [2042.14] - 2021-09-25
+### Changed
+- Change: fix overestimated waiting time. the score is weighted too much on avoiding waiting, thus it increases quickly when deals are getting affordable; All good things are worth waiting for and worth fighting for.

info.txt

@@ -3,9 +3,9 @@
 	"ID": "Best Deal Helper",
 	"Author": "Jethro Yu",
 	"Description": "Help you choose best deal!",
-	"ModVersion": 2042.13,
+	"ModVersion": 2042.14,
 	"GameVersion": 2.042,
-	"Date": "22/09/2021",
+	"Date": "25/09/2021",
 	"Dependencies": ["CCSE"],
 	"Disabled": 1,
 	"AllowSteamAchievs": 1

main.js

@@ -175,7 +175,11 @@ let BestDealHelper = {
         const deltaCps = newCps - cps;
         if (deltaCps === 0) return 0;
 
-        const deltaTime = Math.max(price - Game.cookies, 0) / cps + price / newCps;
+        let deltaTime;
+        if(price > Game.cookies)
+            deltaTime = (price - Game.cookies) / cps + Game.cookies / newCps;
+        else
+            deltaTime = price / newCps;
         if (deltaTime === 0) return 0; // "Milk selector"
 
         return deltaCps / deltaTime;
@@ -274,15 +278,15 @@ let BestDealHelper = {
             return time;
         }
 
-        while (target.price > Game.cookies) {
-            target.timeToTargetCookie = (target.price - Game.cookies) / Game.cookiesPs;
-            let helpers = all.filter(me => me !== target && me.price < target.price);
+        while (target.getPrice() > Game.cookies) {
+            target.timeToTargetCookie = (target.getPrice() - Game.cookies) / Game.cookiesPs;
+            let helpers = all.filter(me => me !== target && me.getPrice() < target.getPrice());
             if (!helpers.length) return;
 
             helpers.forEach(function (me) {
-                me.timeToTargetCookie = getTimeToTarget(me.price, me.buyOneCps, target.price, Game.cookies);
-                if (me.tierPrice <= target.price) {
-                    const timeBuyTier = getTimeToTarget(me.tierPrice, me.buyTierCps, target.price, Game.cookies);
+                me.timeToTargetCookie = getTimeToTarget(me.getPrice(), me.buyOneCps, target.getPrice(), Game.cookies);
+                if (me.tierPrice <= target.getPrice()) {
+                    const timeBuyTier = getTimeToTarget(me.tierPrice, me.buyTierCps, target.getPrice(), Game.cookies);
                     me.timeToTargetCookie = Math.min(me.timeToTargetCookie, timeBuyTier);
                 }
             });