From 197fceaddcb9518ec118c0d08f787272542781af Mon Sep 17 00:00:00 2001 From: Aktanusa Date: Thu, 17 Aug 2017 16:39:55 -0400 Subject: [PATCH 01/10] Version change to 2.0042.2 --- CookieMonster.js | 2 +- src/Main.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CookieMonster.js b/CookieMonster.js index 029ee3a..6a765bd 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -2587,7 +2587,7 @@ CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, BulkB CM.ConfigPrefix = 'CMConfig'; CM.VersionMajor = '2.0042'; -CM.VersionMinor = '1'; +CM.VersionMinor = '2'; /******* * Sim * diff --git a/src/Main.js b/src/Main.js index 7ff217d..d4909cc 100644 --- a/src/Main.js +++ b/src/Main.js @@ -204,5 +204,5 @@ CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, BulkB CM.ConfigPrefix = 'CMConfig'; CM.VersionMajor = '2.0042'; -CM.VersionMinor = '1'; +CM.VersionMinor = '2'; From ba387bddc68d8cf5a0c74017ade1919905cbf50e Mon Sep 17 00:00:00 2001 From: Aktanusa Date: Thu, 17 Aug 2017 17:24:04 -0400 Subject: [PATCH 02/10] Fixed max prestige not always max with fixes to tooltip description also (Issue #131) --- CookieMonster.js | 22 +++++++++++++++------- src/Cache.js | 10 +++++++++- src/Disp.js | 4 ++-- src/Main.js | 8 ++++---- 4 files changed, 30 insertions(+), 14 deletions(-) diff --git a/CookieMonster.js b/CookieMonster.js index 6a765bd..8f3bd78 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -76,6 +76,13 @@ CM.Cache.RemakeWrinkBank = function() { totalSucked += sucked; } CM.Cache.WrinkBank = totalSucked; + CM.Cache.WrinkGodBank = totalSucked; + if (Game.hasGod) { + var godLvl = Game.hasGod('scorn'); + if (godLvl == 2) CM.Cache.WrinkGodBank = CM.Cache.WrinkGodBank * 1.15 / 1.1; + else if (godLvl == 3) CM.Cache.WrinkGodBank = CM.Cache.WrinkGodBank * 1.15 / 1.05; + else if (godLvl != 1) CM.Cache.WrinkGodBank *= 1.15; + } } CM.Cache.RemakeBuildingsPP = function() { @@ -256,7 +263,7 @@ CM.Cache.UpdateAvgCPS = function() { if (CM.Cache.lastDate != currDate) { var choEggTotal = Game.cookies + CM.Cache.SellForChoEgg; if (Game.cpsSucked > 0) { - choEggTotal += CM.Cache.WrinkBank; + choEggTotal += CM.Cache.WrinkGodBank; } choEggTotal *= 0.05; @@ -323,6 +330,7 @@ CM.Cache.min = -1; CM.Cache.max = -1; CM.Cache.mid = -1; CM.Cache.WrinkBank = -1; +CM.Cache.WrinkGodBank = -1; CM.Cache.NoGoldSwitchCookiesPS = 0; CM.Cache.Lucky = 0; CM.Cache.LuckyReward = 0; @@ -1788,8 +1796,8 @@ CM.Disp.AddMenuStats = function(title) { stats.appendChild(header('Prestige', 'Prestige')); if (CM.Config.StatsPref.Prestige) { - var possiblePresMax = Math.floor(Game.HowMuchPrestige(Game.cookiesEarned + Game.cookiesReset + CM.Cache.WrinkBank + (choEgg ? CM.Cache.lastChoEgg : 0))); - var neededCook = Game.HowManyCookiesReset(possiblePresMax + 1) - (Game.cookiesEarned + Game.cookiesReset + CM.Cache.WrinkBank + (choEgg ? CM.Cache.lastChoEgg : 0)); + var possiblePresMax = Math.floor(Game.HowMuchPrestige(Game.cookiesEarned + Game.cookiesReset + CM.Cache.WrinkGodBank + (choEgg ? CM.Cache.lastChoEgg : 0))); + var neededCook = Game.HowManyCookiesReset(possiblePresMax + 1) - (Game.cookiesEarned + Game.cookiesReset + CM.Cache.WrinkGodBank + (choEgg ? CM.Cache.lastChoEgg : 0)); stats.appendChild(listing(listingQuest('Prestige Level (CUR / MAX)', 'PrestMaxTooltipPlaceholder'), document.createTextNode(Beautify(Game.prestige) + ' / ' + Beautify(possiblePresMax)))); var cookiesNextFrag = document.createDocumentFragment(); @@ -2561,11 +2569,11 @@ CM.DelayInit = function() { CM.Disp.CreateFavicon(); CM.Disp.CreateGCTimer(); CM.Disp.CreateTooltip('GoldCookTooltipPlaceholder', 'Calculated with Golden Switch off', '200px'); - CM.Disp.CreateTooltip('PrestMaxTooltipPlaceholder', 'The MAX prestige is calculated with the cookies gained from popping all wrinklers, selling all buildings with Earth Shatterer aura, and buying Chocolate egg', '310px'); - CM.Disp.CreateTooltip('NextPrestTooltipPlaceholder', 'Not calculated with cookies gained from wrinklers or Chocolate egg', '200px'); - CM.Disp.CreateTooltip('HeavenChipMaxTooltipPlaceholder', 'The MAX heavenly chips is calculated with the cookies gained from popping all wrinklers, selling all buildings with Earth Shatterer aura, and buying Chocolate egg', '310px'); + CM.Disp.CreateTooltip('PrestMaxTooltipPlaceholder', 'The MAX prestige is calculated with the cookies gained from popping all wrinklers with Skruuia god in Diamind slot, selling all buildings with Earth Shatterer aura, and buying Chocolate egg', '370px'); + CM.Disp.CreateTooltip('NextPrestTooltipPlaceholder', 'Calculated with cookies gained from wrinklers and Chocolate egg', '200px'); + CM.Disp.CreateTooltip('HeavenChipMaxTooltipPlaceholder', 'The MAX heavenly chips is calculated with the cookies gained from popping all wrinklers with Skruuia god in Diamind slot, selling all buildings with Earth Shatterer aura, and buying Chocolate egg', '390px'); CM.Disp.CreateTooltip('ResetTooltipPlaceholder', 'The bonus income you would get from new prestige levels at 100% of its potential and from reset achievements if you have the same buildings/upgrades after reset', '340px'); - CM.Disp.CreateTooltip('ChoEggTooltipPlaceholder', 'The amount of cookies you would get from popping all wrinklers, selling all buildings with Earth Shatterer aura, and then buying Chocolate egg', '300px'); + CM.Disp.CreateTooltip('ChoEggTooltipPlaceholder', 'The amount of cookies you would get from popping all wrinklers with Skruuia god in Diamind slot, selling all buildings with Earth Shatterer aura, and then buying Chocolate egg', '360px'); CM.Disp.CreateTooltipWarnCaut(); CM.Disp.AddTooltipBuild(); CM.Disp.AddWrinklerAreaDetect(); diff --git a/src/Cache.js b/src/Cache.js index 8001792..bcc847e 100644 --- a/src/Cache.js +++ b/src/Cache.js @@ -56,6 +56,13 @@ CM.Cache.RemakeWrinkBank = function() { totalSucked += sucked; } CM.Cache.WrinkBank = totalSucked; + CM.Cache.WrinkGodBank = totalSucked; + if (Game.hasGod) { + var godLvl = Game.hasGod('scorn'); + if (godLvl == 2) CM.Cache.WrinkGodBank = CM.Cache.WrinkGodBank * 1.15 / 1.1; + else if (godLvl == 3) CM.Cache.WrinkGodBank = CM.Cache.WrinkGodBank * 1.15 / 1.05; + else if (godLvl != 1) CM.Cache.WrinkGodBank *= 1.15; + } } CM.Cache.RemakeBuildingsPP = function() { @@ -236,7 +243,7 @@ CM.Cache.UpdateAvgCPS = function() { if (CM.Cache.lastDate != currDate) { var choEggTotal = Game.cookies + CM.Cache.SellForChoEgg; if (Game.cpsSucked > 0) { - choEggTotal += CM.Cache.WrinkBank; + choEggTotal += CM.Cache.WrinkGodBank; } choEggTotal *= 0.05; @@ -303,6 +310,7 @@ CM.Cache.min = -1; CM.Cache.max = -1; CM.Cache.mid = -1; CM.Cache.WrinkBank = -1; +CM.Cache.WrinkGodBank = -1; CM.Cache.NoGoldSwitchCookiesPS = 0; CM.Cache.Lucky = 0; CM.Cache.LuckyReward = 0; diff --git a/src/Disp.js b/src/Disp.js index eacf65b..18895ed 100644 --- a/src/Disp.js +++ b/src/Disp.js @@ -1274,8 +1274,8 @@ CM.Disp.AddMenuStats = function(title) { stats.appendChild(header('Prestige', 'Prestige')); if (CM.Config.StatsPref.Prestige) { - var possiblePresMax = Math.floor(Game.HowMuchPrestige(Game.cookiesEarned + Game.cookiesReset + CM.Cache.WrinkBank + (choEgg ? CM.Cache.lastChoEgg : 0))); - var neededCook = Game.HowManyCookiesReset(possiblePresMax + 1) - (Game.cookiesEarned + Game.cookiesReset + CM.Cache.WrinkBank + (choEgg ? CM.Cache.lastChoEgg : 0)); + var possiblePresMax = Math.floor(Game.HowMuchPrestige(Game.cookiesEarned + Game.cookiesReset + CM.Cache.WrinkGodBank + (choEgg ? CM.Cache.lastChoEgg : 0))); + var neededCook = Game.HowManyCookiesReset(possiblePresMax + 1) - (Game.cookiesEarned + Game.cookiesReset + CM.Cache.WrinkGodBank + (choEgg ? CM.Cache.lastChoEgg : 0)); stats.appendChild(listing(listingQuest('Prestige Level (CUR / MAX)', 'PrestMaxTooltipPlaceholder'), document.createTextNode(Beautify(Game.prestige) + ' / ' + Beautify(possiblePresMax)))); var cookiesNextFrag = document.createDocumentFragment(); diff --git a/src/Main.js b/src/Main.js index d4909cc..6194e9b 100644 --- a/src/Main.js +++ b/src/Main.js @@ -178,11 +178,11 @@ CM.DelayInit = function() { CM.Disp.CreateFavicon(); CM.Disp.CreateGCTimer(); CM.Disp.CreateTooltip('GoldCookTooltipPlaceholder', 'Calculated with Golden Switch off', '200px'); - CM.Disp.CreateTooltip('PrestMaxTooltipPlaceholder', 'The MAX prestige is calculated with the cookies gained from popping all wrinklers, selling all buildings with Earth Shatterer aura, and buying Chocolate egg', '310px'); - CM.Disp.CreateTooltip('NextPrestTooltipPlaceholder', 'Not calculated with cookies gained from wrinklers or Chocolate egg', '200px'); - CM.Disp.CreateTooltip('HeavenChipMaxTooltipPlaceholder', 'The MAX heavenly chips is calculated with the cookies gained from popping all wrinklers, selling all buildings with Earth Shatterer aura, and buying Chocolate egg', '310px'); + CM.Disp.CreateTooltip('PrestMaxTooltipPlaceholder', 'The MAX prestige is calculated with the cookies gained from popping all wrinklers with Skruuia god in Diamind slot, selling all buildings with Earth Shatterer aura, and buying Chocolate egg', '370px'); + CM.Disp.CreateTooltip('NextPrestTooltipPlaceholder', 'Calculated with cookies gained from wrinklers and Chocolate egg', '200px'); + CM.Disp.CreateTooltip('HeavenChipMaxTooltipPlaceholder', 'The MAX heavenly chips is calculated with the cookies gained from popping all wrinklers with Skruuia god in Diamind slot, selling all buildings with Earth Shatterer aura, and buying Chocolate egg', '390px'); CM.Disp.CreateTooltip('ResetTooltipPlaceholder', 'The bonus income you would get from new prestige levels at 100% of its potential and from reset achievements if you have the same buildings/upgrades after reset', '340px'); - CM.Disp.CreateTooltip('ChoEggTooltipPlaceholder', 'The amount of cookies you would get from popping all wrinklers, selling all buildings with Earth Shatterer aura, and then buying Chocolate egg', '300px'); + CM.Disp.CreateTooltip('ChoEggTooltipPlaceholder', 'The amount of cookies you would get from popping all wrinklers with Skruuia god in Diamind slot, selling all buildings with Earth Shatterer aura, and then buying Chocolate egg', '360px'); CM.Disp.CreateTooltipWarnCaut(); CM.Disp.AddTooltipBuild(); CM.Disp.AddWrinklerAreaDetect(); From 80bb731f17a33342e4fb32c66097671c65b39a47 Mon Sep 17 00:00:00 2001 From: Aktanusa Date: Thu, 17 Aug 2017 17:28:34 -0400 Subject: [PATCH 03/10] Changed default for average CPS/clicks to be 1m/1s since people kept getting confused --- CookieMonster.js | 2 +- src/Main.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CookieMonster.js b/CookieMonster.js index 8f3bd78..8d21306 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -2591,7 +2591,7 @@ CM.DelayInit = function() { Game.Win('Third-party'); } -CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, BulkBuildColor: 0, UpBarColor: 1, CalcWrink: 0, CPSMode: 1, AvgCPSHist: 2, AvgClicksHist: 2, ToolWarnCautBon: 0, Flash: 1, Sound: 1, Volume: 100, GCSoundURL: 'http://freesound.org/data/previews/66/66717_931655-lq.mp3', SeaSoundURL: 'http://www.freesound.org/data/previews/121/121099_2193266-lq.mp3', GCTimer: 1, Title: 1, Favicon: 1, Tooltip: 1, TooltipAmor: 0, ToolWarnCaut: 1, ToolWarnCautPos: 1, ToolWrink: 1, Stats: 1, UpStats: 1, TimeFormat: 0, SayTime: 1, Scale: 2, StatsPref: {Lucky: 1, Chain: 1, Prestige: 1, Wrink: 1, Sea: 1, Misc: 1}, Colors : {Blue: '#4bb8f0', Green: '#00ff00', Yellow: '#ffff00', Orange: '#ff7f00', Red: '#ff0000', Purple: '#ff00ff', Gray: '#b3b3b3', Pink: '#ff1493', Brown: '#8b4513'}}; +CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, BulkBuildColor: 0, UpBarColor: 1, CalcWrink: 0, CPSMode: 1, AvgCPSHist: 0, AvgClicksHist: 0, ToolWarnCautBon: 0, Flash: 1, Sound: 1, Volume: 100, GCSoundURL: 'http://freesound.org/data/previews/66/66717_931655-lq.mp3', SeaSoundURL: 'http://www.freesound.org/data/previews/121/121099_2193266-lq.mp3', GCTimer: 1, Title: 1, Favicon: 1, Tooltip: 1, TooltipAmor: 0, ToolWarnCaut: 1, ToolWarnCautPos: 1, ToolWrink: 1, Stats: 1, UpStats: 1, TimeFormat: 0, SayTime: 1, Scale: 2, StatsPref: {Lucky: 1, Chain: 1, Prestige: 1, Wrink: 1, Sea: 1, Misc: 1}, Colors : {Blue: '#4bb8f0', Green: '#00ff00', Yellow: '#ffff00', Orange: '#ff7f00', Red: '#ff0000', Purple: '#ff00ff', Gray: '#b3b3b3', Pink: '#ff1493', Brown: '#8b4513'}}; CM.ConfigPrefix = 'CMConfig'; CM.VersionMajor = '2.0042'; diff --git a/src/Main.js b/src/Main.js index 6194e9b..e658ebe 100644 --- a/src/Main.js +++ b/src/Main.js @@ -200,7 +200,7 @@ CM.DelayInit = function() { Game.Win('Third-party'); } -CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, BulkBuildColor: 0, UpBarColor: 1, CalcWrink: 0, CPSMode: 1, AvgCPSHist: 2, AvgClicksHist: 2, ToolWarnCautBon: 0, Flash: 1, Sound: 1, Volume: 100, GCSoundURL: 'http://freesound.org/data/previews/66/66717_931655-lq.mp3', SeaSoundURL: 'http://www.freesound.org/data/previews/121/121099_2193266-lq.mp3', GCTimer: 1, Title: 1, Favicon: 1, Tooltip: 1, TooltipAmor: 0, ToolWarnCaut: 1, ToolWarnCautPos: 1, ToolWrink: 1, Stats: 1, UpStats: 1, TimeFormat: 0, SayTime: 1, Scale: 2, StatsPref: {Lucky: 1, Chain: 1, Prestige: 1, Wrink: 1, Sea: 1, Misc: 1}, Colors : {Blue: '#4bb8f0', Green: '#00ff00', Yellow: '#ffff00', Orange: '#ff7f00', Red: '#ff0000', Purple: '#ff00ff', Gray: '#b3b3b3', Pink: '#ff1493', Brown: '#8b4513'}}; +CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, BulkBuildColor: 0, UpBarColor: 1, CalcWrink: 0, CPSMode: 1, AvgCPSHist: 0, AvgClicksHist: 0, ToolWarnCautBon: 0, Flash: 1, Sound: 1, Volume: 100, GCSoundURL: 'http://freesound.org/data/previews/66/66717_931655-lq.mp3', SeaSoundURL: 'http://www.freesound.org/data/previews/121/121099_2193266-lq.mp3', GCTimer: 1, Title: 1, Favicon: 1, Tooltip: 1, TooltipAmor: 0, ToolWarnCaut: 1, ToolWarnCautPos: 1, ToolWrink: 1, Stats: 1, UpStats: 1, TimeFormat: 0, SayTime: 1, Scale: 2, StatsPref: {Lucky: 1, Chain: 1, Prestige: 1, Wrink: 1, Sea: 1, Misc: 1}, Colors : {Blue: '#4bb8f0', Green: '#00ff00', Yellow: '#ffff00', Orange: '#ff7f00', Red: '#ff0000', Purple: '#ff00ff', Gray: '#b3b3b3', Pink: '#ff1493', Brown: '#8b4513'}}; CM.ConfigPrefix = 'CMConfig'; CM.VersionMajor = '2.0042'; From 1633dfb28380cdc9f653d799abd7734ddf04ad33 Mon Sep 17 00:00:00 2001 From: Aktanusa Date: Thu, 17 Aug 2017 17:55:47 -0400 Subject: [PATCH 04/10] Fixed tooltip placement in minigames --- CookieMonster.js | 2 +- src/Main.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CookieMonster.js b/CookieMonster.js index 8d21306..42d510a 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -2413,7 +2413,7 @@ CM.ReplaceNative = function() { } CM.Backup.tooltip.update = Game.tooltip.update; - eval('CM.Backup.tooltip.updateMod = ' + Game.tooltip.update.toString().split('this').join('Game.tooltip')); + eval('CM.Backup.tooltip.updateMod = ' + Game.tooltip.update.toString().split('this.').join('Game.tooltip.')); Game.tooltip.update = function() { CM.Backup.tooltip.updateMod(); CM.Disp.UpdateTooltipWarnCaut(); diff --git a/src/Main.js b/src/Main.js index e658ebe..6996979 100644 --- a/src/Main.js +++ b/src/Main.js @@ -22,7 +22,7 @@ CM.ReplaceNative = function() { } CM.Backup.tooltip.update = Game.tooltip.update; - eval('CM.Backup.tooltip.updateMod = ' + Game.tooltip.update.toString().split('this').join('Game.tooltip')); + eval('CM.Backup.tooltip.updateMod = ' + Game.tooltip.update.toString().split('this.').join('Game.tooltip.')); Game.tooltip.update = function() { CM.Backup.tooltip.updateMod(); CM.Disp.UpdateTooltipWarnCaut(); From 92ff50d3a3e6d702e2d1864d6f3edfc135448c1c Mon Sep 17 00:00:00 2001 From: Aktanusa Date: Fri, 18 Aug 2017 00:40:23 -0400 Subject: [PATCH 05/10] Fix reset bonus stat to sometimes show the wrong number before 100% of potential is unlocked (hopefully) --- CookieMonster.js | 75 +++++++++++------------------------------------- src/Main.js | 2 +- src/Sim.js | 73 ++++++++++------------------------------------ 3 files changed, 32 insertions(+), 118 deletions(-) diff --git a/CookieMonster.js b/CookieMonster.js index 42d510a..357f5c8 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -2572,7 +2572,7 @@ CM.DelayInit = function() { CM.Disp.CreateTooltip('PrestMaxTooltipPlaceholder', 'The MAX prestige is calculated with the cookies gained from popping all wrinklers with Skruuia god in Diamind slot, selling all buildings with Earth Shatterer aura, and buying Chocolate egg', '370px'); CM.Disp.CreateTooltip('NextPrestTooltipPlaceholder', 'Calculated with cookies gained from wrinklers and Chocolate egg', '200px'); CM.Disp.CreateTooltip('HeavenChipMaxTooltipPlaceholder', 'The MAX heavenly chips is calculated with the cookies gained from popping all wrinklers with Skruuia god in Diamind slot, selling all buildings with Earth Shatterer aura, and buying Chocolate egg', '390px'); - CM.Disp.CreateTooltip('ResetTooltipPlaceholder', 'The bonus income you would get from new prestige levels at 100% of its potential and from reset achievements if you have the same buildings/upgrades after reset', '340px'); + CM.Disp.CreateTooltip('ResetTooltipPlaceholder', 'The bonus income you would get from new prestige levels unlocked at 100% of its potential and from reset achievements if you have the same buildings/upgrades after reset', '370px'); CM.Disp.CreateTooltip('ChoEggTooltipPlaceholder', 'The amount of cookies you would get from popping all wrinklers with Skruuia god in Diamind slot, selling all buildings with Earth Shatterer aura, and then buying Chocolate egg', '360px'); CM.Disp.CreateTooltipWarnCaut(); CM.Disp.AddTooltipBuild(); @@ -2727,7 +2727,7 @@ CM.Sim.CopyData = function() { CM.Sim.UpgradesOwned = Game.UpgradesOwned; CM.Sim.pledges = Game.pledges; CM.Sim.AchievementsOwned = Game.AchievementsOwned; - CM.Sim.heavenlyPower = Game.heavenlyPower; + CM.Sim.heavenlyPower = Game.heavenlyPower; // Unneeded? CM.Sim.prestige = Game.prestige; CM.Sim.dragonAura = Game.dragonAura; CM.Sim.dragonAura2 = Game.dragonAura2; @@ -3069,44 +3069,17 @@ CM.Sim.ResetBonus = function(possiblePresMax) { var lastAchievementsOwned = -1; // Calculate CPS with all Heavenly upgrades - var curCPS = Game.cookiesPs; - if (CM.Sim.Upgrades['Heavenly chip secret'].bought == 0 || CM.Sim.Upgrades['Heavenly cookie stand'].bought == 0 || CM.Sim.Upgrades['Heavenly bakery'].bought == 0 || CM.Sim.Upgrades['Heavenly confectionery'].bought == 0 || CM.Sim.Upgrades['Heavenly key'].bought == 0) { - CM.Sim.CopyData(); - - if (CM.Sim.Upgrades['Heavenly chip secret'].bought == 0) { - CM.Sim.Upgrades['Heavenly chip secret'].bought = 1; - CM.Sim.UpgradesOwned++; - } - if (CM.Sim.Upgrades['Heavenly cookie stand'].bought == 0) { - CM.Sim.Upgrades['Heavenly cookie stand'].bought = 1; - CM.Sim.UpgradesOwned++; - } - if (CM.Sim.Upgrades['Heavenly bakery'].bought == 0) { - CM.Sim.Upgrades['Heavenly bakery'].bought = 1; - CM.Sim.UpgradesOwned++; - } - if (CM.Sim.Upgrades['Heavenly confectionery'].bought == 0) { - CM.Sim.Upgrades['Heavenly confectionery'].bought = 1; - CM.Sim.UpgradesOwned++; - } - if (CM.Sim.Upgrades['Heavenly key'].bought == 0) { - CM.Sim.Upgrades['Heavenly key'].bought = 1; - CM.Sim.UpgradesOwned++; - CM.Sim.Win('Wholesome'); - } - - lastAchievementsOwned = CM.Sim.AchievementsOwned; - - CM.Sim.CalculateGains(); + CM.Sim.CopyData(); - CM.Sim.CheckOtherAchiev(); + CM.Sim.Upgrades['Heavenly chip secret'].bought = 1; + CM.Sim.Upgrades['Heavenly cookie stand'].bought = 1; + CM.Sim.Upgrades['Heavenly bakery'].bought = 1; + CM.Sim.Upgrades['Heavenly confectionery'].bought = 1; + CM.Sim.Upgrades['Heavenly key'].bought = 1; - if (lastAchievementsOwned != CM.Sim.AchievementsOwned) { - CM.Sim.CalculateGains(); - } - - curCPS = CM.Sim.cookiesPs; - } + CM.Sim.CalculateGains(); + + var curCPS = CM.Sim.cookiesPs; CM.Sim.CopyData(); @@ -3121,27 +3094,11 @@ CM.Sim.ResetBonus = function(possiblePresMax) { if (Game.cookiesEarned >= 1000000000000000000000000000000) CM.Sim.Win('Negative void'); if (Game.cookiesEarned >= 1000000000000000000000000000000000) CM.Sim.Win('To crumbs, you say?'); - if (CM.Sim.Upgrades['Heavenly chip secret'].bought == 0) { - CM.Sim.Upgrades['Heavenly chip secret'].bought = 1; - CM.Sim.UpgradesOwned++; - } - if (CM.Sim.Upgrades['Heavenly cookie stand'].bought == 0) { - CM.Sim.Upgrades['Heavenly cookie stand'].bought = 1; - CM.Sim.UpgradesOwned++; - } - if (CM.Sim.Upgrades['Heavenly bakery'].bought == 0) { - CM.Sim.Upgrades['Heavenly bakery'].bought = 1; - CM.Sim.UpgradesOwned++; - } - if (CM.Sim.Upgrades['Heavenly confectionery'].bought == 0) { - CM.Sim.Upgrades['Heavenly confectionery'].bought = 1; - CM.Sim.UpgradesOwned++; - } - if (CM.Sim.Upgrades['Heavenly key'].bought == 0) { - CM.Sim.Upgrades['Heavenly key'].bought = 1; - CM.Sim.UpgradesOwned++; - CM.Sim.Win('Wholesome'); - } + CM.Sim.Upgrades['Heavenly chip secret'].bought = 1; + CM.Sim.Upgrades['Heavenly cookie stand'].bought = 1; + CM.Sim.Upgrades['Heavenly bakery'].bought = 1; + CM.Sim.Upgrades['Heavenly confectionery'].bought = 1; + CM.Sim.Upgrades['Heavenly key'].bought = 1; CM.Sim.prestige = possiblePresMax; diff --git a/src/Main.js b/src/Main.js index 6996979..96db461 100644 --- a/src/Main.js +++ b/src/Main.js @@ -181,7 +181,7 @@ CM.DelayInit = function() { CM.Disp.CreateTooltip('PrestMaxTooltipPlaceholder', 'The MAX prestige is calculated with the cookies gained from popping all wrinklers with Skruuia god in Diamind slot, selling all buildings with Earth Shatterer aura, and buying Chocolate egg', '370px'); CM.Disp.CreateTooltip('NextPrestTooltipPlaceholder', 'Calculated with cookies gained from wrinklers and Chocolate egg', '200px'); CM.Disp.CreateTooltip('HeavenChipMaxTooltipPlaceholder', 'The MAX heavenly chips is calculated with the cookies gained from popping all wrinklers with Skruuia god in Diamind slot, selling all buildings with Earth Shatterer aura, and buying Chocolate egg', '390px'); - CM.Disp.CreateTooltip('ResetTooltipPlaceholder', 'The bonus income you would get from new prestige levels at 100% of its potential and from reset achievements if you have the same buildings/upgrades after reset', '340px'); + CM.Disp.CreateTooltip('ResetTooltipPlaceholder', 'The bonus income you would get from new prestige levels unlocked at 100% of its potential and from reset achievements if you have the same buildings/upgrades after reset', '370px'); CM.Disp.CreateTooltip('ChoEggTooltipPlaceholder', 'The amount of cookies you would get from popping all wrinklers with Skruuia god in Diamind slot, selling all buildings with Earth Shatterer aura, and then buying Chocolate egg', '360px'); CM.Disp.CreateTooltipWarnCaut(); CM.Disp.AddTooltipBuild(); diff --git a/src/Sim.js b/src/Sim.js index 80387bc..856c7f9 100644 --- a/src/Sim.js +++ b/src/Sim.js @@ -128,7 +128,7 @@ CM.Sim.CopyData = function() { CM.Sim.UpgradesOwned = Game.UpgradesOwned; CM.Sim.pledges = Game.pledges; CM.Sim.AchievementsOwned = Game.AchievementsOwned; - CM.Sim.heavenlyPower = Game.heavenlyPower; + CM.Sim.heavenlyPower = Game.heavenlyPower; // Unneeded? CM.Sim.prestige = Game.prestige; CM.Sim.dragonAura = Game.dragonAura; CM.Sim.dragonAura2 = Game.dragonAura2; @@ -470,44 +470,17 @@ CM.Sim.ResetBonus = function(possiblePresMax) { var lastAchievementsOwned = -1; // Calculate CPS with all Heavenly upgrades - var curCPS = Game.cookiesPs; - if (CM.Sim.Upgrades['Heavenly chip secret'].bought == 0 || CM.Sim.Upgrades['Heavenly cookie stand'].bought == 0 || CM.Sim.Upgrades['Heavenly bakery'].bought == 0 || CM.Sim.Upgrades['Heavenly confectionery'].bought == 0 || CM.Sim.Upgrades['Heavenly key'].bought == 0) { - CM.Sim.CopyData(); - - if (CM.Sim.Upgrades['Heavenly chip secret'].bought == 0) { - CM.Sim.Upgrades['Heavenly chip secret'].bought = 1; - CM.Sim.UpgradesOwned++; - } - if (CM.Sim.Upgrades['Heavenly cookie stand'].bought == 0) { - CM.Sim.Upgrades['Heavenly cookie stand'].bought = 1; - CM.Sim.UpgradesOwned++; - } - if (CM.Sim.Upgrades['Heavenly bakery'].bought == 0) { - CM.Sim.Upgrades['Heavenly bakery'].bought = 1; - CM.Sim.UpgradesOwned++; - } - if (CM.Sim.Upgrades['Heavenly confectionery'].bought == 0) { - CM.Sim.Upgrades['Heavenly confectionery'].bought = 1; - CM.Sim.UpgradesOwned++; - } - if (CM.Sim.Upgrades['Heavenly key'].bought == 0) { - CM.Sim.Upgrades['Heavenly key'].bought = 1; - CM.Sim.UpgradesOwned++; - CM.Sim.Win('Wholesome'); - } - - lastAchievementsOwned = CM.Sim.AchievementsOwned; - - CM.Sim.CalculateGains(); + CM.Sim.CopyData(); - CM.Sim.CheckOtherAchiev(); + CM.Sim.Upgrades['Heavenly chip secret'].bought = 1; + CM.Sim.Upgrades['Heavenly cookie stand'].bought = 1; + CM.Sim.Upgrades['Heavenly bakery'].bought = 1; + CM.Sim.Upgrades['Heavenly confectionery'].bought = 1; + CM.Sim.Upgrades['Heavenly key'].bought = 1; - if (lastAchievementsOwned != CM.Sim.AchievementsOwned) { - CM.Sim.CalculateGains(); - } - - curCPS = CM.Sim.cookiesPs; - } + CM.Sim.CalculateGains(); + + var curCPS = CM.Sim.cookiesPs; CM.Sim.CopyData(); @@ -522,27 +495,11 @@ CM.Sim.ResetBonus = function(possiblePresMax) { if (Game.cookiesEarned >= 1000000000000000000000000000000) CM.Sim.Win('Negative void'); if (Game.cookiesEarned >= 1000000000000000000000000000000000) CM.Sim.Win('To crumbs, you say?'); - if (CM.Sim.Upgrades['Heavenly chip secret'].bought == 0) { - CM.Sim.Upgrades['Heavenly chip secret'].bought = 1; - CM.Sim.UpgradesOwned++; - } - if (CM.Sim.Upgrades['Heavenly cookie stand'].bought == 0) { - CM.Sim.Upgrades['Heavenly cookie stand'].bought = 1; - CM.Sim.UpgradesOwned++; - } - if (CM.Sim.Upgrades['Heavenly bakery'].bought == 0) { - CM.Sim.Upgrades['Heavenly bakery'].bought = 1; - CM.Sim.UpgradesOwned++; - } - if (CM.Sim.Upgrades['Heavenly confectionery'].bought == 0) { - CM.Sim.Upgrades['Heavenly confectionery'].bought = 1; - CM.Sim.UpgradesOwned++; - } - if (CM.Sim.Upgrades['Heavenly key'].bought == 0) { - CM.Sim.Upgrades['Heavenly key'].bought = 1; - CM.Sim.UpgradesOwned++; - CM.Sim.Win('Wholesome'); - } + CM.Sim.Upgrades['Heavenly chip secret'].bought = 1; + CM.Sim.Upgrades['Heavenly cookie stand'].bought = 1; + CM.Sim.Upgrades['Heavenly bakery'].bought = 1; + CM.Sim.Upgrades['Heavenly confectionery'].bought = 1; + CM.Sim.Upgrades['Heavenly key'].bought = 1; CM.Sim.prestige = possiblePresMax; From b16510c6ed27771212be45c90479ba0a03634752 Mon Sep 17 00:00:00 2001 From: Aktanusa Date: Fri, 18 Aug 2017 08:04:52 -0400 Subject: [PATCH 06/10] Optimize reset bonus calculation --- CookieMonster.js | 26 +++++++++++++++----------- src/Sim.js | 26 +++++++++++++++----------- 2 files changed, 30 insertions(+), 22 deletions(-) diff --git a/CookieMonster.js b/CookieMonster.js index 357f5c8..b5d0b7a 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -3069,20 +3069,24 @@ CM.Sim.ResetBonus = function(possiblePresMax) { var lastAchievementsOwned = -1; // Calculate CPS with all Heavenly upgrades - CM.Sim.CopyData(); - - CM.Sim.Upgrades['Heavenly chip secret'].bought = 1; - CM.Sim.Upgrades['Heavenly cookie stand'].bought = 1; - CM.Sim.Upgrades['Heavenly bakery'].bought = 1; - CM.Sim.Upgrades['Heavenly confectionery'].bought = 1; - CM.Sim.Upgrades['Heavenly key'].bought = 1; - - CM.Sim.CalculateGains(); - - var curCPS = CM.Sim.cookiesPs; + var curCPS = Game.cookiesPs; CM.Sim.CopyData(); + if (CM.Sim.Upgrades['Heavenly key'].bought == 0) { + CM.Sim.Upgrades['Heavenly chip secret'].bought = 1; + CM.Sim.Upgrades['Heavenly cookie stand'].bought = 1; + CM.Sim.Upgrades['Heavenly bakery'].bought = 1; + CM.Sim.Upgrades['Heavenly confectionery'].bought = 1; + CM.Sim.Upgrades['Heavenly key'].bought = 1; + + CM.Sim.CalculateGains(); + + curCPS = CM.Sim.cookiesPs; + + CM.Sim.CopyData(); + } + if (Game.cookiesEarned >= 1000000) CM.Sim.Win('Sacrifice'); if (Game.cookiesEarned >= 1000000000) CM.Sim.Win('Oblivion'); if (Game.cookiesEarned >= 1000000000000) CM.Sim.Win('From scratch'); diff --git a/src/Sim.js b/src/Sim.js index 856c7f9..8c8ef44 100644 --- a/src/Sim.js +++ b/src/Sim.js @@ -470,20 +470,24 @@ CM.Sim.ResetBonus = function(possiblePresMax) { var lastAchievementsOwned = -1; // Calculate CPS with all Heavenly upgrades - CM.Sim.CopyData(); - - CM.Sim.Upgrades['Heavenly chip secret'].bought = 1; - CM.Sim.Upgrades['Heavenly cookie stand'].bought = 1; - CM.Sim.Upgrades['Heavenly bakery'].bought = 1; - CM.Sim.Upgrades['Heavenly confectionery'].bought = 1; - CM.Sim.Upgrades['Heavenly key'].bought = 1; - - CM.Sim.CalculateGains(); - - var curCPS = CM.Sim.cookiesPs; + var curCPS = Game.cookiesPs; CM.Sim.CopyData(); + if (CM.Sim.Upgrades['Heavenly key'].bought == 0) { + CM.Sim.Upgrades['Heavenly chip secret'].bought = 1; + CM.Sim.Upgrades['Heavenly cookie stand'].bought = 1; + CM.Sim.Upgrades['Heavenly bakery'].bought = 1; + CM.Sim.Upgrades['Heavenly confectionery'].bought = 1; + CM.Sim.Upgrades['Heavenly key'].bought = 1; + + CM.Sim.CalculateGains(); + + curCPS = CM.Sim.cookiesPs; + + CM.Sim.CopyData(); + } + if (Game.cookiesEarned >= 1000000) CM.Sim.Win('Sacrifice'); if (Game.cookiesEarned >= 1000000000) CM.Sim.Win('Oblivion'); if (Game.cookiesEarned >= 1000000000000) CM.Sim.Win('From scratch'); From 362e87610eae28f795e49ab6d6ac9737b1c9848a Mon Sep 17 00:00:00 2001 From: Aktanusa Date: Fri, 18 Aug 2017 12:28:07 -0400 Subject: [PATCH 07/10] Changed average CPS to ignore some outliers --- CookieMonster.js | 44 ++++++++++++++++++++++++++++++++++++-------- src/Cache.js | 44 ++++++++++++++++++++++++++++++++++++-------- 2 files changed, 72 insertions(+), 16 deletions(-) diff --git a/CookieMonster.js b/CookieMonster.js index b5d0b7a..9bbe887 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -296,22 +296,50 @@ CM.Cache.UpdateAvgCPS = function() { CM.Cache.lastChoEgg = choEggTotal; CM.Cache.lastClicks = Game.cookieClicks; + var sortedGainBank = new Array(); + var sortedGainWrink = new Array(); + var sortedGainChoEgg = new Array(); + + var cpsLength = Math.min(CM.Cache.CookiesDiff.getLength(), CM.Disp.times[CM.Config.AvgCPSHist] * 60); + + // Assumes the queues are the same length + for (var i = CM.Cache.CookiesDiff.getLength() - cpsLength; i < CM.Cache.CookiesDiff.getLength(); i++) { + sortedGainBank.push(CM.Cache.CookiesDiff.get(i)); + sortedGainWrink.push(CM.Cache.WrinkDiff.get(i)); + sortedGainChoEgg.push(CM.Cache.ChoEggDiff.get(i)); + } + + sortedGainBank.sort(function(a, b) { return a - b; }); + sortedGainWrink.sort(function(a, b) { return a - b; }); + sortedGainChoEgg.sort(function(a, b) { return a - b; }); + + var cut = Math.round(sortedGainBank.length / 10); + + while (cut > 0) { + sortedGainBank.shift(); + sortedGainBank.pop(); + sortedGainWrink.shift(); + sortedGainWrink.pop(); + sortedGainChoEgg.shift(); + sortedGainChoEgg.pop(); + cut--; + } + var totalGainBank = 0; var totalGainWrink = 0; var totalGainChoEgg = 0; - var cpsLength = Math.min(CM.Cache.CookiesDiff.getLength(), CM.Disp.times[CM.Config.AvgCPSHist] * 60); - // Assumes the queues are the same length - for (var i = CM.Cache.CookiesDiff.getLength() - cpsLength; i < CM.Cache.CookiesDiff.getLength(); i++) { - totalGainBank += CM.Cache.CookiesDiff.get(i); - totalGainWrink += CM.Cache.WrinkDiff.get(i); - totalGainChoEgg += CM.Cache.ChoEggDiff.get(i); + + for (var i = 0; i < sortedGainBank.length; i++) { + totalGainBank += sortedGainBank[i]; + totalGainWrink += sortedGainWrink[i]; + totalGainChoEgg += sortedGainChoEgg[i]; } - CM.Cache.AvgCPS = (totalGainBank + (CM.Config.CalcWrink ? totalGainWrink : 0)) / cpsLength; + CM.Cache.AvgCPS = (totalGainBank + (CM.Config.CalcWrink ? totalGainWrink : 0)) / sortedGainBank.length; var choEgg = (Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg')); if (choEgg || CM.Config.CalcWrink == 0) { - CM.Cache.AvgCPSChoEgg = (totalGainBank + totalGainWrink + (choEgg ? totalGainChoEgg : 0)) / cpsLength; + CM.Cache.AvgCPSChoEgg = (totalGainBank + totalGainWrink + (choEgg ? totalGainChoEgg : 0)) / sortedGainBank.length; } else { CM.Cache.AvgCPSChoEgg = CM.Cache.AvgCPS; diff --git a/src/Cache.js b/src/Cache.js index bcc847e..39c4ae3 100644 --- a/src/Cache.js +++ b/src/Cache.js @@ -276,22 +276,50 @@ CM.Cache.UpdateAvgCPS = function() { CM.Cache.lastChoEgg = choEggTotal; CM.Cache.lastClicks = Game.cookieClicks; + var sortedGainBank = new Array(); + var sortedGainWrink = new Array(); + var sortedGainChoEgg = new Array(); + + var cpsLength = Math.min(CM.Cache.CookiesDiff.getLength(), CM.Disp.times[CM.Config.AvgCPSHist] * 60); + + // Assumes the queues are the same length + for (var i = CM.Cache.CookiesDiff.getLength() - cpsLength; i < CM.Cache.CookiesDiff.getLength(); i++) { + sortedGainBank.push(CM.Cache.CookiesDiff.get(i)); + sortedGainWrink.push(CM.Cache.WrinkDiff.get(i)); + sortedGainChoEgg.push(CM.Cache.ChoEggDiff.get(i)); + } + + sortedGainBank.sort(function(a, b) { return a - b; }); + sortedGainWrink.sort(function(a, b) { return a - b; }); + sortedGainChoEgg.sort(function(a, b) { return a - b; }); + + var cut = Math.round(sortedGainBank.length / 10); + + while (cut > 0) { + sortedGainBank.shift(); + sortedGainBank.pop(); + sortedGainWrink.shift(); + sortedGainWrink.pop(); + sortedGainChoEgg.shift(); + sortedGainChoEgg.pop(); + cut--; + } + var totalGainBank = 0; var totalGainWrink = 0; var totalGainChoEgg = 0; - var cpsLength = Math.min(CM.Cache.CookiesDiff.getLength(), CM.Disp.times[CM.Config.AvgCPSHist] * 60); - // Assumes the queues are the same length - for (var i = CM.Cache.CookiesDiff.getLength() - cpsLength; i < CM.Cache.CookiesDiff.getLength(); i++) { - totalGainBank += CM.Cache.CookiesDiff.get(i); - totalGainWrink += CM.Cache.WrinkDiff.get(i); - totalGainChoEgg += CM.Cache.ChoEggDiff.get(i); + + for (var i = 0; i < sortedGainBank.length; i++) { + totalGainBank += sortedGainBank[i]; + totalGainWrink += sortedGainWrink[i]; + totalGainChoEgg += sortedGainChoEgg[i]; } - CM.Cache.AvgCPS = (totalGainBank + (CM.Config.CalcWrink ? totalGainWrink : 0)) / cpsLength; + CM.Cache.AvgCPS = (totalGainBank + (CM.Config.CalcWrink ? totalGainWrink : 0)) / sortedGainBank.length; var choEgg = (Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg')); if (choEgg || CM.Config.CalcWrink == 0) { - CM.Cache.AvgCPSChoEgg = (totalGainBank + totalGainWrink + (choEgg ? totalGainChoEgg : 0)) / cpsLength; + CM.Cache.AvgCPSChoEgg = (totalGainBank + totalGainWrink + (choEgg ? totalGainChoEgg : 0)) / sortedGainBank.length; } else { CM.Cache.AvgCPSChoEgg = CM.Cache.AvgCPS; From f773a9595adfb338e90f41caf1b4b2f1aa81d0f7 Mon Sep 17 00:00:00 2001 From: Tayray Date: Fri, 25 Aug 2017 13:14:45 +1000 Subject: [PATCH 08/10] Fix Wrinklers Typo in Description --- CookieMonster.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CookieMonster.js b/CookieMonster.js index 029ee3a..4b3cb4d 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -477,7 +477,7 @@ CM.ConfigData.BuildColor = {label: ['Building Colors OFF', 'Building Colors ON'] CM.ConfigData.BulkBuildColor = {label: ['Bulk Building Colors (Single Buildings Color)', 'Bulk Building Colors (Calculated Color)'], desc: 'Color code bulk buildings based on single buildings color or calculated bulk value color', toggle: false, func: function() {CM.Disp.UpdateBuildings();}}; CM.ConfigData.UpBarColor = {label: ['Upgrade Bar/Colors OFF', 'Upgrade Bar/Colors ON'], desc: 'Color code upgrades and add a counter', toggle: true, func: function() {CM.Disp.ToggleUpBarColor();}}; CM.ConfigData.Colors = {desc: {Blue: 'Color Blue. Used to show better than best PP building, for Click Frenzy bar, and for various labels', Green: 'Color Green. Used to show best PP building, for Blood Frenzy bar, and for various labels', Yellow: 'Color Yellow. Used to show between best and worst PP buildings closer to best, for Frenzy bar, and for various labels', Orange: 'Color Orange. Used to show between best and worst PP buildings closer to worst, for Next Reindeer bar, and for various labels', Red: 'Color Red. Used to show worst PP building, for Clot bar, and for various labels', Purple: 'Color Purple. Used to show worse than worst PP building, for Next Cookie bar, and for various labels', Gray: 'Color Gray. Used to show negative or infinity PP, and for Next Cookie/Next Reindeer bar', Pink: 'Color Pink. Used for Dragonflight bar', Brown: 'Color Brown. Used for Dragon Harvest bar'}, func: function() {CM.Disp.UpdateColors();}}; -CM.ConfigData.CalcWrink = {label: ['Calculate with Wrinklers OFF', 'Calculate with Wrinklers ON'], desc: 'Calculate times and average Cookies Per Second with Wrinkers', toggle: true}; +CM.ConfigData.CalcWrink = {label: ['Calculate with Wrinklers OFF', 'Calculate with Wrinklers ON'], desc: 'Calculate times and average Cookies Per Second with Wrinklers', toggle: true}; CM.ConfigData.CPSMode = {label: ['Current Cookies Per Second', 'Average Cookies Per Second'], desc: 'Calculate times using current Cookies Per Second or average Cookies Per Second', toggle: false}; CM.ConfigData.AvgCPSHist = {label: ['Average CPS for past 1m', 'Average CPS for past 5m', 'Average CPS for past 10m', 'Average CPS for past 15m', 'Average CPS for past 30m'], desc: 'How much time average Cookies Per Second should consider', toggle: false}; CM.ConfigData.AvgClicksHist = {label: ['Average Cookie Clicks for past 1s', 'Average Cookie Clicks for past 5s', 'Average Cookie Clicks for past 10s', 'Average Cookie Clicks for past 15s', 'Average Cookie Clicks for past 30s'], desc: 'How much time average Cookie Clicks should consider', toggle: false}; From 04549b5e214bfa41b68eddaf7c5248713fd8eb9d Mon Sep 17 00:00:00 2001 From: Aktanusa Date: Sat, 9 Sep 2017 15:17:04 -0400 Subject: [PATCH 09/10] Fix Wrinklers typo in description (forgot the source file also) (Issue #142) --- src/Config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Config.js b/src/Config.js index 6da6bad..7f7e59b 100644 --- a/src/Config.js +++ b/src/Config.js @@ -121,7 +121,7 @@ CM.ConfigData.BuildColor = {label: ['Building Colors OFF', 'Building Colors ON'] CM.ConfigData.BulkBuildColor = {label: ['Bulk Building Colors (Single Buildings Color)', 'Bulk Building Colors (Calculated Color)'], desc: 'Color code bulk buildings based on single buildings color or calculated bulk value color', toggle: false, func: function() {CM.Disp.UpdateBuildings();}}; CM.ConfigData.UpBarColor = {label: ['Upgrade Bar/Colors OFF', 'Upgrade Bar/Colors ON'], desc: 'Color code upgrades and add a counter', toggle: true, func: function() {CM.Disp.ToggleUpBarColor();}}; CM.ConfigData.Colors = {desc: {Blue: 'Color Blue. Used to show better than best PP building, for Click Frenzy bar, and for various labels', Green: 'Color Green. Used to show best PP building, for Blood Frenzy bar, and for various labels', Yellow: 'Color Yellow. Used to show between best and worst PP buildings closer to best, for Frenzy bar, and for various labels', Orange: 'Color Orange. Used to show between best and worst PP buildings closer to worst, for Next Reindeer bar, and for various labels', Red: 'Color Red. Used to show worst PP building, for Clot bar, and for various labels', Purple: 'Color Purple. Used to show worse than worst PP building, for Next Cookie bar, and for various labels', Gray: 'Color Gray. Used to show negative or infinity PP, and for Next Cookie/Next Reindeer bar', Pink: 'Color Pink. Used for Dragonflight bar', Brown: 'Color Brown. Used for Dragon Harvest bar'}, func: function() {CM.Disp.UpdateColors();}}; -CM.ConfigData.CalcWrink = {label: ['Calculate with Wrinklers OFF', 'Calculate with Wrinklers ON'], desc: 'Calculate times and average Cookies Per Second with Wrinkers', toggle: true}; +CM.ConfigData.CalcWrink = {label: ['Calculate with Wrinklers OFF', 'Calculate with Wrinklers ON'], desc: 'Calculate times and average Cookies Per Second with Wrinklers', toggle: true}; CM.ConfigData.CPSMode = {label: ['Current Cookies Per Second', 'Average Cookies Per Second'], desc: 'Calculate times using current Cookies Per Second or average Cookies Per Second', toggle: false}; CM.ConfigData.AvgCPSHist = {label: ['Average CPS for past 1m', 'Average CPS for past 5m', 'Average CPS for past 10m', 'Average CPS for past 15m', 'Average CPS for past 30m'], desc: 'How much time average Cookies Per Second should consider', toggle: false}; CM.ConfigData.AvgClicksHist = {label: ['Average Cookie Clicks for past 1s', 'Average Cookie Clicks for past 5s', 'Average Cookie Clicks for past 10s', 'Average Cookie Clicks for past 15s', 'Average Cookie Clicks for past 30s'], desc: 'How much time average Cookie Clicks should consider', toggle: false}; From bd2b59efde10d66bf57035754bc1876f89d7e1ae Mon Sep 17 00:00:00 2001 From: Aktanusa Date: Tue, 12 Sep 2017 17:09:24 -0400 Subject: [PATCH 10/10] Added timer to Grimoire spells (Issue #136) with the help from @Hoten pull request (Issue #138) and fixed a very minor tooltip bug --- CookieMonster.js | 288 ++++++++++++++++++++++++++++++++++------------- src/Disp.js | 239 ++++++++++++++++++++++++++------------- src/Main.js | 49 +++++++- 3 files changed, 414 insertions(+), 162 deletions(-) diff --git a/CookieMonster.js b/CookieMonster.js index 14c8593..34b2844 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -605,7 +605,7 @@ CM.Disp.FormatTime = function(time, format) { return str; } -CM.Disp.GetTimeColor = function(price, bank, cps) { +CM.Disp.GetTimeColor = function(price, bank, cps, time) { var color; var text; if (bank >= price) { @@ -618,7 +618,12 @@ CM.Disp.GetTimeColor = function(price, bank, cps) { } } else { - var time = (price - bank) / cps; + if (typeof time !== 'undefined') { + var time = time; + } + else { + var time = (price - bank) / cps; + } text = CM.Disp.FormatTime(time); if (time > 300) { color = CM.Disp.colorRed; @@ -2064,6 +2069,15 @@ CM.Disp.ToggleToolWarnCautPos = function() { } } +CM.Disp.CalculateGrimoireRefillTime = function(currentMagic, maxMagic, targetMagic) { + var count = 0; + while (currentMagic < targetMagic) { + currentMagic += Math.max(0.002, Math.pow(currentMagic / Math.max(maxMagic, 100), 0.5)) * 0.002; + count++; + } + return count / Game.fps; +} + CM.Disp.AddTooltipBuild = function() { CM.Disp.TooltipBuildBack = []; for (var i in Game.Objects) { @@ -2086,6 +2100,18 @@ CM.Disp.AddTooltipUpgrade = function() { } } +CM.Disp.AddTooltipGrimoire = function() { + if (Game.Objects['Wizard tower'].minigameLoaded) { + CM.Disp.TooltipGrimoireBack = []; + for (var i in Game.Objects['Wizard tower'].minigame.spellsById) { + if (l('grimoireSpell' + i).onmouseover != null) { + CM.Disp.TooltipGrimoireBack[i] = l('grimoireSpell' + i).onmouseover; + eval('l(\'grimoireSpell\' + i).onmouseover = function() {Game.tooltip.dynamic = 1; Game.tooltip.draw(this, function() {return CM.Disp.Tooltip(\'g\', \'' + i + '\');}, \'this\'); Game.tooltip.wobble();}'); + } + } + } +} + CM.Disp.Tooltip = function(type, name) { if (type == 'b') { l('tooltip').innerHTML = Game.Objects[name].tooltip(); @@ -2120,16 +2146,19 @@ CM.Disp.Tooltip = function(type, name) { } } } - else { // Upgrades + else if (type == 'u') { if (!Game.UpgradesInStore[name]) return ''; l('tooltip').innerHTML = Game.crate(Game.UpgradesInStore[name], 'store', undefined, undefined, 1)(); } + else { // Grimoire + l('tooltip').innerHTML = Game.Objects['Wizard tower'].minigame.spellTooltip(name)(); + } var area = document.createElement('div'); area.id = 'CMTooltipArea'; l('tooltip').appendChild(area); - if (CM.Config.Tooltip == 1 && (type != 'b' || Game.buyMode == 1)) { + if (CM.Config.Tooltip == 1 && (type == 'u' || (type == 'b' && Game.buyMode == 1))) { l('tooltip').firstChild.style.paddingBottom = '4px'; var tooltip = document.createElement('div'); tooltip.style.border = '1px solid'; @@ -2144,6 +2173,7 @@ CM.Disp.Tooltip = function(type, name) { div.textContent = text; return div; } + tooltip.appendChild(header('Bonus Income')); var income = document.createElement('div'); income.style.marginBottom = '4px'; @@ -2160,7 +2190,7 @@ CM.Disp.Tooltip = function(type, name) { time.id = 'CMTooltipTime'; tooltip.appendChild(time); - l('tooltip').appendChild(tooltip); + area.appendChild(tooltip); } CM.Disp.tooltipType = type; @@ -2174,92 +2204,141 @@ CM.Disp.Tooltip = function(type, name) { CM.Disp.UpdateTooltip = function() { if (l('tooltipAnchor').style.display != 'none' && l('CMTooltipArea') != null) { - // Error checking - if (CM.Disp.tooltipType == 'u' && (typeof Game.UpgradesInStore[CM.Disp.tooltipName] === 'undefined' || typeof CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name] === 'undefined')) { - return; - } - var price; - var bonus; - if (CM.Disp.tooltipType == 'b') { - var target = ''; - if (Game.buyMode == 1 && Game.buyBulk == 10) { - target = 'Objects10'; - price = CM.Cache[target][CM.Disp.tooltipName].price; + if (CM.Disp.tooltipType == 'b' || CM.Disp.tooltipType == 'u') { + // Error checking + if (CM.Disp.tooltipType == 'u' && (typeof Game.UpgradesInStore[CM.Disp.tooltipName] === 'undefined' || typeof CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name] === 'undefined')) { + return; } - else if (Game.buyMode == 1 && Game.buyBulk == 100) { - target = 'Objects100'; - price = CM.Cache[target][CM.Disp.tooltipName].price; - } - else { - target = 'Objects'; - price = Game.Objects[CM.Disp.tooltipName].getPrice(); - } - bonus = CM.Cache[target][CM.Disp.tooltipName].bonus; - if (CM.Config.Tooltip == 1 && Game.buyMode == 1) { - l('CMTooltipBorder').className = CM.Disp.colorTextPre + CM.Cache[target][CM.Disp.tooltipName].color; - l('CMTooltipPP').textContent = Beautify(CM.Cache[target][CM.Disp.tooltipName].pp, 2); - l('CMTooltipPP').className = CM.Disp.colorTextPre + CM.Cache[target][CM.Disp.tooltipName].color; - } - } - else { // Upgrades - bonus = CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].bonus; - price = Game.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].getPrice(); - if (CM.Config.Tooltip == 1) { - l('CMTooltipBorder').className = CM.Disp.colorTextPre + CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].color; - l('CMTooltipPP').textContent = Beautify(CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].pp, 2); - l('CMTooltipPP').className = CM.Disp.colorTextPre + CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].color; - } - } - if (CM.Config.Tooltip == 1 && (CM.Disp.tooltipType != 'b' || Game.buyMode == 1)) { - l('CMTooltipIncome').textContent = Beautify(bonus, 2); - - var increase = Math.round(bonus / Game.cookiesPs * 10000); - if (isFinite(increase) && increase != 0) { - l('CMTooltipIncome').textContent += ' (' + (increase / 100) + '% of income)'; - } - - var timeColor = CM.Disp.GetTimeColor(price, (Game.cookies + CM.Disp.GetWrinkConfigBank()), CM.Disp.GetCPS()); - l('CMTooltipTime').textContent = timeColor.text; - l('CMTooltipTime').className = CM.Disp.colorTextPre + timeColor.color; - } - - if (CM.Config.ToolWarnCaut == 1) { - var warn = CM.Cache.Lucky; - if (CM.Config.ToolWarnCautBon == 1) { - var bonusNoFren = bonus; - bonusNoFren /= CM.Sim.getCPSBuffMult(); - warn += ((bonusNoFren * 60 * 15) / 0.15); - } - var caut = warn * 7; - var amount = (Game.cookies + CM.Disp.GetWrinkConfigBank()) - price; - if ((amount < warn || amount < caut) && (CM.Disp.tooltipType != 'b' || Game.buyMode == 1)) { - if (CM.Config.ToolWarnCautPos == 0) { - CM.Disp.TooltipWarnCaut.style.right = '0px'; + var price; + var bonus; + if (CM.Disp.tooltipType == 'b') { + var target = ''; + if (Game.buyMode == 1 && Game.buyBulk == 10) { + target = 'Objects10'; + price = CM.Cache[target][CM.Disp.tooltipName].price; + } + else if (Game.buyMode == 1 && Game.buyBulk == 100) { + target = 'Objects100'; + price = CM.Cache[target][CM.Disp.tooltipName].price; } else { - CM.Disp.TooltipWarnCaut.style.top = (l('tooltip').offsetHeight) + 'px'; + target = 'Objects'; + price = Game.Objects[CM.Disp.tooltipName].getPrice(); } - CM.Disp.TooltipWarnCaut.style.width = (l('tooltip').offsetWidth - 6) + 'px'; - - if (amount < warn) { - l('CMDispTooltipWarn').style.display = ''; - l('CMDispTooltipWarnText').textContent = Beautify(warn - amount) + ' (' + CM.Disp.FormatTime((warn - amount) / CM.Disp.GetCPS()) + ')'; - l('CMDispTooltipCaut').style.display = ''; - l('CMDispTooltipCautText').textContent = Beautify(caut - amount) + ' (' + CM.Disp.FormatTime((caut - amount) / CM.Disp.GetCPS()) + ')'; + bonus = CM.Cache[target][CM.Disp.tooltipName].bonus; + if (CM.Config.Tooltip == 1 && Game.buyMode == 1) { + l('CMTooltipBorder').className = CM.Disp.colorTextPre + CM.Cache[target][CM.Disp.tooltipName].color; + l('CMTooltipPP').textContent = Beautify(CM.Cache[target][CM.Disp.tooltipName].pp, 2); + l('CMTooltipPP').className = CM.Disp.colorTextPre + CM.Cache[target][CM.Disp.tooltipName].color; } - else if (amount < caut) { - l('CMDispTooltipCaut').style.display = ''; - l('CMDispTooltipCautText').textContent = Beautify(caut - amount) + ' (' + CM.Disp.FormatTime((caut - amount) / CM.Disp.GetCPS()) + ')'; - l('CMDispTooltipWarn').style.display = 'none'; + } + else { // Upgrades + bonus = CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].bonus; + price = Game.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].getPrice(); + if (CM.Config.Tooltip == 1) { + l('CMTooltipBorder').className = CM.Disp.colorTextPre + CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].color; + l('CMTooltipPP').textContent = Beautify(CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].pp, 2); + l('CMTooltipPP').className = CM.Disp.colorTextPre + CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].color; + } + } + if (CM.Config.Tooltip == 1 && (CM.Disp.tooltipType != 'b' || Game.buyMode == 1)) { + l('CMTooltipIncome').textContent = Beautify(bonus, 2); + + var increase = Math.round(bonus / Game.cookiesPs * 10000); + if (isFinite(increase) && increase != 0) { + l('CMTooltipIncome').textContent += ' (' + (increase / 100) + '% of income)'; + } + + var timeColor = CM.Disp.GetTimeColor(price, (Game.cookies + CM.Disp.GetWrinkConfigBank()), CM.Disp.GetCPS()); + l('CMTooltipTime').textContent = timeColor.text; + l('CMTooltipTime').className = CM.Disp.colorTextPre + timeColor.color; + } + + if (CM.Config.ToolWarnCaut == 1) { + var warn = CM.Cache.Lucky; + if (CM.Config.ToolWarnCautBon == 1) { + var bonusNoFren = bonus; + bonusNoFren /= CM.Sim.getCPSBuffMult(); + warn += ((bonusNoFren * 60 * 15) / 0.15); + } + var caut = warn * 7; + var amount = (Game.cookies + CM.Disp.GetWrinkConfigBank()) - price; + if ((amount < warn || amount < caut) && (CM.Disp.tooltipType != 'b' || Game.buyMode == 1)) { + if (CM.Config.ToolWarnCautPos == 0) { + CM.Disp.TooltipWarnCaut.style.right = '0px'; + } + else { + CM.Disp.TooltipWarnCaut.style.top = (l('tooltip').offsetHeight) + 'px'; + } + CM.Disp.TooltipWarnCaut.style.width = (l('tooltip').offsetWidth - 6) + 'px'; + + if (amount < warn) { + l('CMDispTooltipWarn').style.display = ''; + l('CMDispTooltipWarnText').textContent = Beautify(warn - amount) + ' (' + CM.Disp.FormatTime((warn - amount) / CM.Disp.GetCPS()) + ')'; + l('CMDispTooltipCaut').style.display = ''; + l('CMDispTooltipCautText').textContent = Beautify(caut - amount) + ' (' + CM.Disp.FormatTime((caut - amount) / CM.Disp.GetCPS()) + ')'; + } + else if (amount < caut) { + l('CMDispTooltipCaut').style.display = ''; + l('CMDispTooltipCautText').textContent = Beautify(caut - amount) + ' (' + CM.Disp.FormatTime((caut - amount) / CM.Disp.GetCPS()) + ')'; + l('CMDispTooltipWarn').style.display = 'none'; + } + else { + l('CMDispTooltipWarn').style.display = 'none'; + l('CMDispTooltipCaut').style.display = 'none'; + } } else { l('CMDispTooltipWarn').style.display = 'none'; l('CMDispTooltipCaut').style.display = 'none'; } } - else { - l('CMDispTooltipWarn').style.display = 'none'; - l('CMDispTooltipCaut').style.display = 'none'; + } + else { // Grimoire + l('CMDispTooltipWarn').style.display = 'none'; + l('CMDispTooltipCaut').style.display = 'none'; + + var minigame = Game.Objects['Wizard tower'].minigame; + var spellCost = minigame.getSpellCost(minigame.spellsById[CM.Disp.tooltipName]); + + if (CM.Config.Tooltip == 1 && spellCost <= minigame.magicM) { + l('CMTooltipArea').innerHTML = ''; + + l('tooltip').firstChild.style.paddingBottom = '4px'; + var tooltip = document.createElement('div'); + tooltip.style.border = '1px solid'; + tooltip.style.padding = '4px'; + tooltip.style.margin = '0px -4px'; + tooltip.id = 'CMTooltipBorder'; + tooltip.className = CM.Disp.colorTextPre + CM.Disp.colorGray; + + var header = function(text) { + var div = document.createElement('div'); + div.style.fontWeight = 'bold'; + div.className = CM.Disp.colorTextPre + CM.Disp.colorBlue; + div.textContent = text; + return div; + } + + tooltip.appendChild(header('Time Left')); + var time = document.createElement('div'); + time.id = 'CMTooltipTime'; + tooltip.appendChild(time); + var timeColor = CM.Disp.GetTimeColor(spellCost, minigame.magic, undefined, CM.Disp.CalculateGrimoireRefillTime(minigame.magic, minigame.magicM, spellCost)); + time.textContent = timeColor.text; + time.className = CM.Disp.colorTextPre + timeColor.color; + + if (spellCost <= minigame.magic) { + tooltip.appendChild(header('Recover Time')); + var recover = document.createElement('div'); + recover.id = 'CMTooltipRecover'; + tooltip.appendChild(recover); + var recoverColor = CM.Disp.GetTimeColor(minigame.magic, Math.max(0, minigame.magic - spellCost), undefined, CM.Disp.CalculateGrimoireRefillTime(Math.max(0, minigame.magic - spellCost), minigame.magicM, minigame.magic)); + recover.textContent = recoverColor.text; + recover.className = CM.Disp.colorTextPre + recoverColor.color; + } + + l('CMTooltipArea').appendChild(tooltip); } } } @@ -2460,7 +2539,15 @@ CM.ReplaceNative = function() { CM.Backup.UpdateSpecial(); } } - + + // Probably better to load per minigame + CM.Backup.scriptLoaded = Game.scriptLoaded; + Game.scriptLoaded = function(who, script) { + CM.Backup.scriptLoaded(who, script); + CM.Disp.AddTooltipGrimoire() + CM.ReplaceNativeGrimoire(); + } + CM.Backup.RebuildUpgrades = Game.RebuildUpgrades; Game.RebuildUpgrades = function() { CM.Backup.RebuildUpgrades(); @@ -2498,6 +2585,40 @@ CM.ReplaceNative = function() { } } +CM.ReplaceNativeGrimoire = function() { + CM.ReplaceNativeGrimoireLaunch(); + CM.ReplaceNativeGrimoireDraw(); +} + +CM.ReplaceNativeGrimoireLaunch = function() { + if (!CM.HasReplaceNativeGrimoireLaunch && Game.Objects['Wizard tower'].minigameLoaded) { + var minigame = Game.Objects['Wizard tower'].minigame; + CM.Backup.GrimoireLaunch = minigame.launch; + eval('CM.Backup.GrimoireLaunchMod = ' + minigame.launch.toString().split('=this').join('= Game.Objects[\'Wizard tower\'].minigame')); + Game.Objects['Wizard tower'].minigame.launch = function() { + CM.Backup.GrimoireLaunchMod(); + CM.Disp.AddTooltipGrimoire(); + CM.HasReplaceNativeGrimoireDraw = false; + CM.ReplaceNativeGrimoireDraw(); + } + CM.HasReplaceNativeGrimoireLaunch = true; + } +} + +CM.ReplaceNativeGrimoireDraw = function() { + if (!CM.HasReplaceNativeGrimoireDraw && Game.Objects['Wizard tower'].minigameLoaded) { + var minigame = Game.Objects['Wizard tower'].minigame; + CM.Backup.GrimoireDraw = minigame.draw; + Game.Objects['Wizard tower'].minigame.draw = function() { + CM.Backup.GrimoireDraw(); + if (minigame.magic < minigame.magicM) { + minigame.magicBarTextL.innerHTML += ' (' + CM.Disp.FormatTime(CM.Disp.CalculateGrimoireRefillTime(minigame.magic, minigame.magicM, minigame.magicM)) + ')'; + } + } + CM.HasReplaceNativeGrimoireDraw = true; + } +} + CM.Loop = function() { if (CM.Disp.lastAscendState != Game.OnAscend) { CM.Disp.lastAscendState = Game.OnAscend; @@ -2604,9 +2725,11 @@ CM.DelayInit = function() { CM.Disp.CreateTooltip('ChoEggTooltipPlaceholder', 'The amount of cookies you would get from popping all wrinklers with Skruuia god in Diamind slot, selling all buildings with Earth Shatterer aura, and then buying Chocolate egg', '360px'); CM.Disp.CreateTooltipWarnCaut(); CM.Disp.AddTooltipBuild(); + CM.Disp.AddTooltipGrimoire(); CM.Disp.AddWrinklerAreaDetect(); CM.Cache.InitCookiesDiff(); CM.ReplaceNative(); + CM.ReplaceNativeGrimoire(); Game.CalculateGains(); CM.LoadConfig(); // Must be after all things are created! CM.Disp.lastAscendState = Game.OnAscend; @@ -2619,6 +2742,9 @@ CM.DelayInit = function() { Game.Win('Third-party'); } +CM.HasReplaceNativeGrimoireLaunch = false; +CM.HasReplaceNativeGrimoireDraw = false; + CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, BulkBuildColor: 0, UpBarColor: 1, CalcWrink: 0, CPSMode: 1, AvgCPSHist: 0, AvgClicksHist: 0, ToolWarnCautBon: 0, Flash: 1, Sound: 1, Volume: 100, GCSoundURL: 'http://freesound.org/data/previews/66/66717_931655-lq.mp3', SeaSoundURL: 'http://www.freesound.org/data/previews/121/121099_2193266-lq.mp3', GCTimer: 1, Title: 1, Favicon: 1, Tooltip: 1, TooltipAmor: 0, ToolWarnCaut: 1, ToolWarnCautPos: 1, ToolWrink: 1, Stats: 1, UpStats: 1, TimeFormat: 0, SayTime: 1, Scale: 2, StatsPref: {Lucky: 1, Chain: 1, Prestige: 1, Wrink: 1, Sea: 1, Misc: 1}, Colors : {Blue: '#4bb8f0', Green: '#00ff00', Yellow: '#ffff00', Orange: '#ff7f00', Red: '#ff0000', Purple: '#ff00ff', Gray: '#b3b3b3', Pink: '#ff1493', Brown: '#8b4513'}}; CM.ConfigPrefix = 'CMConfig'; diff --git a/src/Disp.js b/src/Disp.js index 18895ed..a91aab5 100644 --- a/src/Disp.js +++ b/src/Disp.js @@ -55,7 +55,7 @@ CM.Disp.FormatTime = function(time, format) { return str; } -CM.Disp.GetTimeColor = function(price, bank, cps) { +CM.Disp.GetTimeColor = function(price, bank, cps, time) { var color; var text; if (bank >= price) { @@ -68,7 +68,12 @@ CM.Disp.GetTimeColor = function(price, bank, cps) { } } else { - var time = (price - bank) / cps; + if (typeof time !== 'undefined') { + var time = time; + } + else { + var time = (price - bank) / cps; + } text = CM.Disp.FormatTime(time); if (time > 300) { color = CM.Disp.colorRed; @@ -1514,6 +1519,15 @@ CM.Disp.ToggleToolWarnCautPos = function() { } } +CM.Disp.CalculateGrimoireRefillTime = function(currentMagic, maxMagic, targetMagic) { + var count = 0; + while (currentMagic < targetMagic) { + currentMagic += Math.max(0.002, Math.pow(currentMagic / Math.max(maxMagic, 100), 0.5)) * 0.002; + count++; + } + return count / Game.fps; +} + CM.Disp.AddTooltipBuild = function() { CM.Disp.TooltipBuildBack = []; for (var i in Game.Objects) { @@ -1536,6 +1550,18 @@ CM.Disp.AddTooltipUpgrade = function() { } } +CM.Disp.AddTooltipGrimoire = function() { + if (Game.Objects['Wizard tower'].minigameLoaded) { + CM.Disp.TooltipGrimoireBack = []; + for (var i in Game.Objects['Wizard tower'].minigame.spellsById) { + if (l('grimoireSpell' + i).onmouseover != null) { + CM.Disp.TooltipGrimoireBack[i] = l('grimoireSpell' + i).onmouseover; + eval('l(\'grimoireSpell\' + i).onmouseover = function() {Game.tooltip.dynamic = 1; Game.tooltip.draw(this, function() {return CM.Disp.Tooltip(\'g\', \'' + i + '\');}, \'this\'); Game.tooltip.wobble();}'); + } + } + } +} + CM.Disp.Tooltip = function(type, name) { if (type == 'b') { l('tooltip').innerHTML = Game.Objects[name].tooltip(); @@ -1570,16 +1596,19 @@ CM.Disp.Tooltip = function(type, name) { } } } - else { // Upgrades + else if (type == 'u') { if (!Game.UpgradesInStore[name]) return ''; l('tooltip').innerHTML = Game.crate(Game.UpgradesInStore[name], 'store', undefined, undefined, 1)(); } + else { // Grimoire + l('tooltip').innerHTML = Game.Objects['Wizard tower'].minigame.spellTooltip(name)(); + } var area = document.createElement('div'); area.id = 'CMTooltipArea'; l('tooltip').appendChild(area); - if (CM.Config.Tooltip == 1 && (type != 'b' || Game.buyMode == 1)) { + if (CM.Config.Tooltip == 1 && (type == 'u' || (type == 'b' && Game.buyMode == 1))) { l('tooltip').firstChild.style.paddingBottom = '4px'; var tooltip = document.createElement('div'); tooltip.style.border = '1px solid'; @@ -1594,6 +1623,7 @@ CM.Disp.Tooltip = function(type, name) { div.textContent = text; return div; } + tooltip.appendChild(header('Bonus Income')); var income = document.createElement('div'); income.style.marginBottom = '4px'; @@ -1610,7 +1640,7 @@ CM.Disp.Tooltip = function(type, name) { time.id = 'CMTooltipTime'; tooltip.appendChild(time); - l('tooltip').appendChild(tooltip); + area.appendChild(tooltip); } CM.Disp.tooltipType = type; @@ -1624,92 +1654,141 @@ CM.Disp.Tooltip = function(type, name) { CM.Disp.UpdateTooltip = function() { if (l('tooltipAnchor').style.display != 'none' && l('CMTooltipArea') != null) { - // Error checking - if (CM.Disp.tooltipType == 'u' && (typeof Game.UpgradesInStore[CM.Disp.tooltipName] === 'undefined' || typeof CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name] === 'undefined')) { - return; - } - var price; - var bonus; - if (CM.Disp.tooltipType == 'b') { - var target = ''; - if (Game.buyMode == 1 && Game.buyBulk == 10) { - target = 'Objects10'; - price = CM.Cache[target][CM.Disp.tooltipName].price; + if (CM.Disp.tooltipType == 'b' || CM.Disp.tooltipType == 'u') { + // Error checking + if (CM.Disp.tooltipType == 'u' && (typeof Game.UpgradesInStore[CM.Disp.tooltipName] === 'undefined' || typeof CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name] === 'undefined')) { + return; } - else if (Game.buyMode == 1 && Game.buyBulk == 100) { - target = 'Objects100'; - price = CM.Cache[target][CM.Disp.tooltipName].price; - } - else { - target = 'Objects'; - price = Game.Objects[CM.Disp.tooltipName].getPrice(); - } - bonus = CM.Cache[target][CM.Disp.tooltipName].bonus; - if (CM.Config.Tooltip == 1 && Game.buyMode == 1) { - l('CMTooltipBorder').className = CM.Disp.colorTextPre + CM.Cache[target][CM.Disp.tooltipName].color; - l('CMTooltipPP').textContent = Beautify(CM.Cache[target][CM.Disp.tooltipName].pp, 2); - l('CMTooltipPP').className = CM.Disp.colorTextPre + CM.Cache[target][CM.Disp.tooltipName].color; - } - } - else { // Upgrades - bonus = CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].bonus; - price = Game.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].getPrice(); - if (CM.Config.Tooltip == 1) { - l('CMTooltipBorder').className = CM.Disp.colorTextPre + CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].color; - l('CMTooltipPP').textContent = Beautify(CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].pp, 2); - l('CMTooltipPP').className = CM.Disp.colorTextPre + CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].color; - } - } - if (CM.Config.Tooltip == 1 && (CM.Disp.tooltipType != 'b' || Game.buyMode == 1)) { - l('CMTooltipIncome').textContent = Beautify(bonus, 2); - - var increase = Math.round(bonus / Game.cookiesPs * 10000); - if (isFinite(increase) && increase != 0) { - l('CMTooltipIncome').textContent += ' (' + (increase / 100) + '% of income)'; - } - - var timeColor = CM.Disp.GetTimeColor(price, (Game.cookies + CM.Disp.GetWrinkConfigBank()), CM.Disp.GetCPS()); - l('CMTooltipTime').textContent = timeColor.text; - l('CMTooltipTime').className = CM.Disp.colorTextPre + timeColor.color; - } - - if (CM.Config.ToolWarnCaut == 1) { - var warn = CM.Cache.Lucky; - if (CM.Config.ToolWarnCautBon == 1) { - var bonusNoFren = bonus; - bonusNoFren /= CM.Sim.getCPSBuffMult(); - warn += ((bonusNoFren * 60 * 15) / 0.15); - } - var caut = warn * 7; - var amount = (Game.cookies + CM.Disp.GetWrinkConfigBank()) - price; - if ((amount < warn || amount < caut) && (CM.Disp.tooltipType != 'b' || Game.buyMode == 1)) { - if (CM.Config.ToolWarnCautPos == 0) { - CM.Disp.TooltipWarnCaut.style.right = '0px'; + var price; + var bonus; + if (CM.Disp.tooltipType == 'b') { + var target = ''; + if (Game.buyMode == 1 && Game.buyBulk == 10) { + target = 'Objects10'; + price = CM.Cache[target][CM.Disp.tooltipName].price; + } + else if (Game.buyMode == 1 && Game.buyBulk == 100) { + target = 'Objects100'; + price = CM.Cache[target][CM.Disp.tooltipName].price; } else { - CM.Disp.TooltipWarnCaut.style.top = (l('tooltip').offsetHeight) + 'px'; + target = 'Objects'; + price = Game.Objects[CM.Disp.tooltipName].getPrice(); } - CM.Disp.TooltipWarnCaut.style.width = (l('tooltip').offsetWidth - 6) + 'px'; - - if (amount < warn) { - l('CMDispTooltipWarn').style.display = ''; - l('CMDispTooltipWarnText').textContent = Beautify(warn - amount) + ' (' + CM.Disp.FormatTime((warn - amount) / CM.Disp.GetCPS()) + ')'; - l('CMDispTooltipCaut').style.display = ''; - l('CMDispTooltipCautText').textContent = Beautify(caut - amount) + ' (' + CM.Disp.FormatTime((caut - amount) / CM.Disp.GetCPS()) + ')'; + bonus = CM.Cache[target][CM.Disp.tooltipName].bonus; + if (CM.Config.Tooltip == 1 && Game.buyMode == 1) { + l('CMTooltipBorder').className = CM.Disp.colorTextPre + CM.Cache[target][CM.Disp.tooltipName].color; + l('CMTooltipPP').textContent = Beautify(CM.Cache[target][CM.Disp.tooltipName].pp, 2); + l('CMTooltipPP').className = CM.Disp.colorTextPre + CM.Cache[target][CM.Disp.tooltipName].color; } - else if (amount < caut) { - l('CMDispTooltipCaut').style.display = ''; - l('CMDispTooltipCautText').textContent = Beautify(caut - amount) + ' (' + CM.Disp.FormatTime((caut - amount) / CM.Disp.GetCPS()) + ')'; - l('CMDispTooltipWarn').style.display = 'none'; + } + else { // Upgrades + bonus = CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].bonus; + price = Game.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].getPrice(); + if (CM.Config.Tooltip == 1) { + l('CMTooltipBorder').className = CM.Disp.colorTextPre + CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].color; + l('CMTooltipPP').textContent = Beautify(CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].pp, 2); + l('CMTooltipPP').className = CM.Disp.colorTextPre + CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].color; + } + } + if (CM.Config.Tooltip == 1 && (CM.Disp.tooltipType != 'b' || Game.buyMode == 1)) { + l('CMTooltipIncome').textContent = Beautify(bonus, 2); + + var increase = Math.round(bonus / Game.cookiesPs * 10000); + if (isFinite(increase) && increase != 0) { + l('CMTooltipIncome').textContent += ' (' + (increase / 100) + '% of income)'; + } + + var timeColor = CM.Disp.GetTimeColor(price, (Game.cookies + CM.Disp.GetWrinkConfigBank()), CM.Disp.GetCPS()); + l('CMTooltipTime').textContent = timeColor.text; + l('CMTooltipTime').className = CM.Disp.colorTextPre + timeColor.color; + } + + if (CM.Config.ToolWarnCaut == 1) { + var warn = CM.Cache.Lucky; + if (CM.Config.ToolWarnCautBon == 1) { + var bonusNoFren = bonus; + bonusNoFren /= CM.Sim.getCPSBuffMult(); + warn += ((bonusNoFren * 60 * 15) / 0.15); + } + var caut = warn * 7; + var amount = (Game.cookies + CM.Disp.GetWrinkConfigBank()) - price; + if ((amount < warn || amount < caut) && (CM.Disp.tooltipType != 'b' || Game.buyMode == 1)) { + if (CM.Config.ToolWarnCautPos == 0) { + CM.Disp.TooltipWarnCaut.style.right = '0px'; + } + else { + CM.Disp.TooltipWarnCaut.style.top = (l('tooltip').offsetHeight) + 'px'; + } + CM.Disp.TooltipWarnCaut.style.width = (l('tooltip').offsetWidth - 6) + 'px'; + + if (amount < warn) { + l('CMDispTooltipWarn').style.display = ''; + l('CMDispTooltipWarnText').textContent = Beautify(warn - amount) + ' (' + CM.Disp.FormatTime((warn - amount) / CM.Disp.GetCPS()) + ')'; + l('CMDispTooltipCaut').style.display = ''; + l('CMDispTooltipCautText').textContent = Beautify(caut - amount) + ' (' + CM.Disp.FormatTime((caut - amount) / CM.Disp.GetCPS()) + ')'; + } + else if (amount < caut) { + l('CMDispTooltipCaut').style.display = ''; + l('CMDispTooltipCautText').textContent = Beautify(caut - amount) + ' (' + CM.Disp.FormatTime((caut - amount) / CM.Disp.GetCPS()) + ')'; + l('CMDispTooltipWarn').style.display = 'none'; + } + else { + l('CMDispTooltipWarn').style.display = 'none'; + l('CMDispTooltipCaut').style.display = 'none'; + } } else { l('CMDispTooltipWarn').style.display = 'none'; l('CMDispTooltipCaut').style.display = 'none'; } } - else { - l('CMDispTooltipWarn').style.display = 'none'; - l('CMDispTooltipCaut').style.display = 'none'; + } + else { // Grimoire + l('CMDispTooltipWarn').style.display = 'none'; + l('CMDispTooltipCaut').style.display = 'none'; + + var minigame = Game.Objects['Wizard tower'].minigame; + var spellCost = minigame.getSpellCost(minigame.spellsById[CM.Disp.tooltipName]); + + if (CM.Config.Tooltip == 1 && spellCost <= minigame.magicM) { + l('CMTooltipArea').innerHTML = ''; + + l('tooltip').firstChild.style.paddingBottom = '4px'; + var tooltip = document.createElement('div'); + tooltip.style.border = '1px solid'; + tooltip.style.padding = '4px'; + tooltip.style.margin = '0px -4px'; + tooltip.id = 'CMTooltipBorder'; + tooltip.className = CM.Disp.colorTextPre + CM.Disp.colorGray; + + var header = function(text) { + var div = document.createElement('div'); + div.style.fontWeight = 'bold'; + div.className = CM.Disp.colorTextPre + CM.Disp.colorBlue; + div.textContent = text; + return div; + } + + tooltip.appendChild(header('Time Left')); + var time = document.createElement('div'); + time.id = 'CMTooltipTime'; + tooltip.appendChild(time); + var timeColor = CM.Disp.GetTimeColor(spellCost, minigame.magic, undefined, CM.Disp.CalculateGrimoireRefillTime(minigame.magic, minigame.magicM, spellCost)); + time.textContent = timeColor.text; + time.className = CM.Disp.colorTextPre + timeColor.color; + + if (spellCost <= minigame.magic) { + tooltip.appendChild(header('Recover Time')); + var recover = document.createElement('div'); + recover.id = 'CMTooltipRecover'; + tooltip.appendChild(recover); + var recoverColor = CM.Disp.GetTimeColor(minigame.magic, Math.max(0, minigame.magic - spellCost), undefined, CM.Disp.CalculateGrimoireRefillTime(Math.max(0, minigame.magic - spellCost), minigame.magicM, minigame.magic)); + recover.textContent = recoverColor.text; + recover.className = CM.Disp.colorTextPre + recoverColor.color; + } + + l('CMTooltipArea').appendChild(tooltip); } } } diff --git a/src/Main.js b/src/Main.js index 96db461..f4ba933 100644 --- a/src/Main.js +++ b/src/Main.js @@ -41,7 +41,15 @@ CM.ReplaceNative = function() { CM.Backup.UpdateSpecial(); } } - + + // Probably better to load per minigame + CM.Backup.scriptLoaded = Game.scriptLoaded; + Game.scriptLoaded = function(who, script) { + CM.Backup.scriptLoaded(who, script); + CM.Disp.AddTooltipGrimoire() + CM.ReplaceNativeGrimoire(); + } + CM.Backup.RebuildUpgrades = Game.RebuildUpgrades; Game.RebuildUpgrades = function() { CM.Backup.RebuildUpgrades(); @@ -79,6 +87,40 @@ CM.ReplaceNative = function() { } } +CM.ReplaceNativeGrimoire = function() { + CM.ReplaceNativeGrimoireLaunch(); + CM.ReplaceNativeGrimoireDraw(); +} + +CM.ReplaceNativeGrimoireLaunch = function() { + if (!CM.HasReplaceNativeGrimoireLaunch && Game.Objects['Wizard tower'].minigameLoaded) { + var minigame = Game.Objects['Wizard tower'].minigame; + CM.Backup.GrimoireLaunch = minigame.launch; + eval('CM.Backup.GrimoireLaunchMod = ' + minigame.launch.toString().split('=this').join('= Game.Objects[\'Wizard tower\'].minigame')); + Game.Objects['Wizard tower'].minigame.launch = function() { + CM.Backup.GrimoireLaunchMod(); + CM.Disp.AddTooltipGrimoire(); + CM.HasReplaceNativeGrimoireDraw = false; + CM.ReplaceNativeGrimoireDraw(); + } + CM.HasReplaceNativeGrimoireLaunch = true; + } +} + +CM.ReplaceNativeGrimoireDraw = function() { + if (!CM.HasReplaceNativeGrimoireDraw && Game.Objects['Wizard tower'].minigameLoaded) { + var minigame = Game.Objects['Wizard tower'].minigame; + CM.Backup.GrimoireDraw = minigame.draw; + Game.Objects['Wizard tower'].minigame.draw = function() { + CM.Backup.GrimoireDraw(); + if (minigame.magic < minigame.magicM) { + minigame.magicBarTextL.innerHTML += ' (' + CM.Disp.FormatTime(CM.Disp.CalculateGrimoireRefillTime(minigame.magic, minigame.magicM, minigame.magicM)) + ')'; + } + } + CM.HasReplaceNativeGrimoireDraw = true; + } +} + CM.Loop = function() { if (CM.Disp.lastAscendState != Game.OnAscend) { CM.Disp.lastAscendState = Game.OnAscend; @@ -185,9 +227,11 @@ CM.DelayInit = function() { CM.Disp.CreateTooltip('ChoEggTooltipPlaceholder', 'The amount of cookies you would get from popping all wrinklers with Skruuia god in Diamind slot, selling all buildings with Earth Shatterer aura, and then buying Chocolate egg', '360px'); CM.Disp.CreateTooltipWarnCaut(); CM.Disp.AddTooltipBuild(); + CM.Disp.AddTooltipGrimoire(); CM.Disp.AddWrinklerAreaDetect(); CM.Cache.InitCookiesDiff(); CM.ReplaceNative(); + CM.ReplaceNativeGrimoire(); Game.CalculateGains(); CM.LoadConfig(); // Must be after all things are created! CM.Disp.lastAscendState = Game.OnAscend; @@ -200,6 +244,9 @@ CM.DelayInit = function() { Game.Win('Third-party'); } +CM.HasReplaceNativeGrimoireLaunch = false; +CM.HasReplaceNativeGrimoireDraw = false; + CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, BulkBuildColor: 0, UpBarColor: 1, CalcWrink: 0, CPSMode: 1, AvgCPSHist: 0, AvgClicksHist: 0, ToolWarnCautBon: 0, Flash: 1, Sound: 1, Volume: 100, GCSoundURL: 'http://freesound.org/data/previews/66/66717_931655-lq.mp3', SeaSoundURL: 'http://www.freesound.org/data/previews/121/121099_2193266-lq.mp3', GCTimer: 1, Title: 1, Favicon: 1, Tooltip: 1, TooltipAmor: 0, ToolWarnCaut: 1, ToolWarnCautPos: 1, ToolWrink: 1, Stats: 1, UpStats: 1, TimeFormat: 0, SayTime: 1, Scale: 2, StatsPref: {Lucky: 1, Chain: 1, Prestige: 1, Wrink: 1, Sea: 1, Misc: 1}, Colors : {Blue: '#4bb8f0', Green: '#00ff00', Yellow: '#ffff00', Orange: '#ff7f00', Red: '#ff0000', Purple: '#ff00ff', Gray: '#b3b3b3', Pink: '#ff1493', Brown: '#8b4513'}}; CM.ConfigPrefix = 'CMConfig';