From ae11e1db737938f4f04b4a4c59a917079a9b2c13 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Bourgault Date: Sun, 1 May 2016 22:27:39 -0400 Subject: [PATCH 1/6] Added config for "XX:XX:XX:XX:XX" --- src/Config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Config.js b/src/Config.js index c39f99b..b11fa35 100644 --- a/src/Config.js +++ b/src/Config.js @@ -145,5 +145,6 @@ CM.ConfigData.ToolWrink = {label: ['Wrinkler Tooltip OFF', 'Wrinkler Tooltip ON' CM.ConfigData.Stats = {label: ['Statistics OFF', 'Statistics ON'], desc: 'Extra Cookie Monster statistics!', toggle: true}; CM.ConfigData.UpStats = {label: ['Statistics Update Rate (Default)', 'Statistics Update Rate (1s)'], desc: 'Default Game rate is once every 5 seconds', toggle: false}; CM.ConfigData.SayTime = {label: ['Format Time OFF', 'Format Time ON'], desc: 'Change how time is displayed in statistics', toggle: true, func: function() {CM.Disp.ToggleSayTime();}}; +CM.ConfigData.TimeFormat = {label: ['Time XXy, XXd, XXh, XXm, XXs', 'Time XX:XX:XX:XX:XX'], desc: 'Change the time format', toggle:true}; CM.ConfigData.Scale = {label: ['Game\'s Setting Scale', 'Metric', 'Short Scale', 'Scientific Notation'], desc: 'Change how long numbers are handled', toggle: false, func: function() {CM.Disp.RefreshScale();}}; From 6107be18a9c02e1b838ef9c8d84645a1f3534cd2 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Bourgault Date: Sun, 1 May 2016 22:30:24 -0400 Subject: [PATCH 2/6] Added listing for TimeFormat --- src/Disp.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Disp.js b/src/Disp.js index b150200..74ff8cb 100644 --- a/src/Disp.js +++ b/src/Disp.js @@ -957,6 +957,7 @@ CM.Disp.AddMenuPref = function(title) { frag.appendChild(listing('Stats')); frag.appendChild(listing('UpStats')); frag.appendChild(listing('SayTime')); + frag.appendChild(listing('TimeFormat')); frag.appendChild(header('Other')); frag.appendChild(listing('Scale')); From c3e85afb8508c5dea3cffdc330af998462ffb983 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Bourgault Date: Sun, 1 May 2016 22:45:55 -0400 Subject: [PATCH 3/6] Added an "if" for the XX:XX:XX:XX:XX time format Maybe the "if" is constructed backwards... simply a matter of changing the 1 to 0 in the condition. Otherwise I think it's good. --- src/Disp.js | 64 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 47 insertions(+), 17 deletions(-) diff --git a/src/Disp.js b/src/Disp.js index 74ff8cb..a8f1852 100644 --- a/src/Disp.js +++ b/src/Disp.js @@ -4,24 +4,54 @@ CM.Disp.FormatTime = function(time, format) { if (time == 'Infinity') return time; - if (time > 777600000) return format ? 'Over 9000 days!' : '>9000d'; - time = Math.ceil(time); - var d = Math.floor(time / 86400); - var h = Math.floor(time % 86400 / 3600); - var m = Math.floor(time % 3600 / 60); - var s = Math.floor(time % 60); - var str = ''; - if (d > 0) { - str += d + (format ? (d == 1 ? ' day' : ' days') : 'd') + ', '; + if (CM.ConfigData.TimeFormat == 1) { + if (time > 3153600000) return 'XX:XX:XX:XX:XX'; + time = Math.ceil(time); + var y = Math.floor(time / 31536000); + var d = Math.floor(time % 31536000 / 86400); + var h = Math.floor(time % 86400 / 3600); + var m = Math.floor(time % 3600 / 60); + var s = Math.floor(time % 60); + var str = ''; + if (y < 10) { + str += '0'; + } + str += y + ':'; + if (d < 10) { + str += '0'; + } + str += d + ':'; + if (h < 10) { + str += '0'; + } + str += h + ':'; + if (m < 10) { + str += '0'; + } + str += m + ':'; + if (s < 10) { + str += '0'; + } + str += s + ':'; + } else { + if (time > 777600000) return format ? 'Over 9000 days!' : '>9000d'; + time = Math.ceil(time); + var d = Math.floor(time / 86400); + var h = Math.floor(time % 86400 / 3600); + var m = Math.floor(time % 3600 / 60); + var s = Math.floor(time % 60); + var str = ''; + if (d > 0) { + str += d + (format ? (d == 1 ? ' day' : ' days') : 'd') + ', '; + } + if (str.length > 0 || h > 0) { + str += h + (format ? (h == 1 ? ' hour' : ' hours') : 'h') + ', '; + } + if (str.length > 0 || m > 0) { + str += m + (format ? (m == 1 ? ' minute' : ' minutes') : 'm') + ', '; + } + str += s + (format ? (s == 1 ? ' second' : ' seconds') : 's'); } - if (str.length > 0 || h > 0) { - str += h + (format ? (h == 1 ? ' hour' : ' hours') : 'h') + ', '; - } - if (str.length > 0 || m > 0) { - str += m + (format ? (m == 1 ? ' minute' : ' minutes') : 'm') + ', '; - } - str += s + (format ? (s == 1 ? ' second' : ' seconds') : 's'); - return str; } From 5fb084bd128b4b08b49479b9460636907b0a19cf Mon Sep 17 00:00:00 2001 From: Jean-Christophe Bourgault Date: Mon, 2 May 2016 20:13:12 -0400 Subject: [PATCH 4/6] Added condition for format and time lower than 1 --- src/Disp.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Disp.js b/src/Disp.js index a8f1852..3def81a 100644 --- a/src/Disp.js +++ b/src/Disp.js @@ -6,6 +6,7 @@ CM.Disp.FormatTime = function(time, format) { if (time == 'Infinity') return time; if (CM.ConfigData.TimeFormat == 1) { if (time > 3153600000) return 'XX:XX:XX:XX:XX'; + if ((format == 1) && (time < 1)) return ''; time = Math.ceil(time); var y = Math.floor(time / 31536000); var d = Math.floor(time % 31536000 / 86400); From ae2913217552dc4c420a093cc0c81c0e05a32a69 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Bourgault Date: Mon, 2 May 2016 20:33:48 -0400 Subject: [PATCH 5/6] Made a single second look nicer Changed the condition so it returns only ":01" when the time is at a second (or less) for the items with format = 1. --- src/Disp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Disp.js b/src/Disp.js index 3def81a..773ca06 100644 --- a/src/Disp.js +++ b/src/Disp.js @@ -6,7 +6,7 @@ CM.Disp.FormatTime = function(time, format) { if (time == 'Infinity') return time; if (CM.ConfigData.TimeFormat == 1) { if (time > 3153600000) return 'XX:XX:XX:XX:XX'; - if ((format == 1) && (time < 1)) return ''; + if ((format == 1) && (time == 1)) return ':01'; time = Math.ceil(time); var y = Math.floor(time / 31536000); var d = Math.floor(time % 31536000 / 86400); From 37f425250975d202da38c03550f4bb28d98a8bcf Mon Sep 17 00:00:00 2001 From: Jean-Christophe Bourgault Date: Mon, 2 May 2016 20:45:33 -0400 Subject: [PATCH 6/6] Removed the line, back to the original --- src/Disp.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Disp.js b/src/Disp.js index 773ca06..a8f1852 100644 --- a/src/Disp.js +++ b/src/Disp.js @@ -6,7 +6,6 @@ CM.Disp.FormatTime = function(time, format) { if (time == 'Infinity') return time; if (CM.ConfigData.TimeFormat == 1) { if (time > 3153600000) return 'XX:XX:XX:XX:XX'; - if ((format == 1) && (time == 1)) return ':01'; time = Math.ceil(time); var y = Math.floor(time / 31536000); var d = Math.floor(time % 31536000 / 86400);