From fc20c8490cc28626913b19464e18a3b275cae806 Mon Sep 17 00:00:00 2001 From: DanielNoord Date: Mon, 23 Nov 2020 17:56:07 +0100 Subject: [PATCH] Finalized version 2.031 (#327) --- CookieMonster | 1 + CookieMonster.js | 9 ++++++--- src/Config.js | 2 +- src/Disp.js | 3 ++- src/Main.js | 5 +++-- 5 files changed, 13 insertions(+), 7 deletions(-) create mode 160000 CookieMonster diff --git a/CookieMonster b/CookieMonster new file mode 160000 index 0000000..4949b86 --- /dev/null +++ b/CookieMonster @@ -0,0 +1 @@ +Subproject commit 4949b868fa148dac5aa9f1c9ec7ac83fa1ffdbda diff --git a/CookieMonster.js b/CookieMonster.js index 64bd01a..1e05231 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -540,7 +540,7 @@ CM.ConfigData.Colors = { }, func: function() {CM.Disp.UpdateColors();} }; -CM.ConfigData.UpgradeBarFixedPos = {label: ['Upgrade Bar Fixed Position OFF', 'Upgrade Bar Fixed Positione ON'], desc: 'Lock the upgrade bar at top of the screen to prevent it from moving ofscreen when scrolling', toggle: true, func: function() {CM.Disp.ToggleUpgradeBarFixedPos();}}; +CM.ConfigData.UpgradeBarFixedPos = {label: ['Upgrade Bar Fixed Position OFF', 'Upgrade Bar Fixed Position ON'], desc: 'Lock the upgrade bar at top of the screen to prevent it from moving ofscreen when scrolling', toggle: true, func: function() {CM.Disp.ToggleUpgradeBarFixedPos();}}; 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 10s', 'Average CPS for past 15s', 'Average CPS for past 30s', '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}; @@ -1450,7 +1450,7 @@ CM.Disp.UpdateColors = function() { } CM.Disp.ToggleUpgradeBarFixedPos = function() { - if (CM.Config.UpgradeBarFixedPos() == 1) { + if (CM.Config.UpgradeBarFixedPos == 1) { CM.Disp.UpgradeBar.style.position = 'sticky'; CM.Disp.UpgradeBar.style.top = '0px'; } @@ -1841,6 +1841,7 @@ CM.Disp.AddMenuPref = function(title) { div.appendChild(label); frag.appendChild(div); } + frag.appendChild(listing('UpgradeBarFixedPos')); frag.appendChild(header('Calculation')); frag.appendChild(listing('CalcWrink')); @@ -3182,6 +3183,7 @@ CM.ConfigDefault = { BuildColor: 1, BulkBuildColor: 0, UpBarColor: 1, + UpgradeBarFixedPos: 1, CalcWrink: 0, CPSMode: 1, AvgCPSHist: 3, @@ -3212,6 +3214,7 @@ CM.ConfigDefault = { ToolWarnCautPos: 1, TooltipGrim:1, ToolWrink: 1, + TooltipLump: 1, Stats: 1, UpStats: 1, TimeFormat: 0, @@ -3225,7 +3228,7 @@ CM.ConfigDefault = { }; CM.ConfigPrefix = 'CMConfig'; -CM.VersionMajor = '2.022'; +CM.VersionMajor = '2.031'; CM.VersionMinor = '1'; /******* diff --git a/src/Config.js b/src/Config.js index 8c437cf..79d8613 100644 --- a/src/Config.js +++ b/src/Config.js @@ -134,7 +134,7 @@ CM.ConfigData.Colors = { }, func: function() {CM.Disp.UpdateColors();} }; -CM.ConfigData.UpgradeBarFixedPos = {label: ['Upgrade Bar Fixed Position OFF', 'Upgrade Bar Fixed Positione ON'], desc: 'Lock the upgrade bar at top of the screen to prevent it from moving ofscreen when scrolling', toggle: true, func: function() {CM.Disp.ToggleUpgradeBarFixedPos();}}; +CM.ConfigData.UpgradeBarFixedPos = {label: ['Upgrade Bar Fixed Position OFF', 'Upgrade Bar Fixed Position ON'], desc: 'Lock the upgrade bar at top of the screen to prevent it from moving ofscreen when scrolling', toggle: true, func: function() {CM.Disp.ToggleUpgradeBarFixedPos();}}; 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 10s', 'Average CPS for past 15s', 'Average CPS for past 30s', '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}; diff --git a/src/Disp.js b/src/Disp.js index de530fa..60d6920 100644 --- a/src/Disp.js +++ b/src/Disp.js @@ -823,7 +823,7 @@ CM.Disp.UpdateColors = function() { } CM.Disp.ToggleUpgradeBarFixedPos = function() { - if (CM.Config.UpgradeBarFixedPos() == 1) { + if (CM.Config.UpgradeBarFixedPos == 1) { CM.Disp.UpgradeBar.style.position = 'sticky'; CM.Disp.UpgradeBar.style.top = '0px'; } @@ -1214,6 +1214,7 @@ CM.Disp.AddMenuPref = function(title) { div.appendChild(label); frag.appendChild(div); } + frag.appendChild(listing('UpgradeBarFixedPos')); frag.appendChild(header('Calculation')); frag.appendChild(listing('CalcWrink')); diff --git a/src/Main.js b/src/Main.js index a325077..3eb16e6 100644 --- a/src/Main.js +++ b/src/Main.js @@ -252,7 +252,6 @@ CM.DelayInit = function() { 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: 3, AvgClicksHist: 0, ToolWarnCautBon: 0, Flash: 1, Sound: 1, Volume: 100, GCSoundURL: 'https://freesound.org/data/previews/66/66717_931655-lq.mp3', SeaSoundURL: 'https://www.freesound.org/data/previews/121/121099_2193266-lq.mp3', GCTimer: 1, Title: 1, Favicon: 1, TooltipBuildUp: 1, TooltipAmor: 0, ToolWarnCaut: 1, ToolWarnCautPos: 1, TooltipGrim:1, ToolWrink: 1, TooltipLump: 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, @@ -260,6 +259,7 @@ CM.ConfigDefault = { BuildColor: 1, BulkBuildColor: 0, UpBarColor: 1, + UpgradeBarFixedPos: 1, CalcWrink: 0, CPSMode: 1, AvgCPSHist: 3, @@ -290,6 +290,7 @@ CM.ConfigDefault = { ToolWarnCautPos: 1, TooltipGrim:1, ToolWrink: 1, + TooltipLump: 1, Stats: 1, UpStats: 1, TimeFormat: 0, @@ -303,6 +304,6 @@ CM.ConfigDefault = { }; CM.ConfigPrefix = 'CMConfig'; -CM.VersionMajor = '2.022'; +CM.VersionMajor = '2.031'; CM.VersionMinor = '1';