From f0d492ea4a702331237fa975edb095651386a4a8 Mon Sep 17 00:00:00 2001 From: Aktanusa Date: Thu, 10 Mar 2016 21:33:23 -0500 Subject: [PATCH] Split/combine "Lucky!" stat when needed (Issue #60) --- CookieMonster.js | 10 +++++++--- src/Disp.js | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/CookieMonster.js b/CookieMonster.js index 3f821bd..c21c858 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -1384,6 +1384,10 @@ CM.Disp.AddMenuStats = function(title) { luckyRewardFrenzyMaxWrath *= 1.1; luckyCurWrath *= 1.1; } + var luckySplit = false; + if (luckyRewardMax != luckyRewardMaxWrath) { + luckySplit = true; + } var luckyReqFrag = document.createDocumentFragment(); var luckyReqSpan = document.createElement('span'); @@ -1409,9 +1413,9 @@ CM.Disp.AddMenuStats = function(title) { luckyReqFrenFrag.appendChild(luckyReqFrenSmall); } stats.appendChild(listing('\"Lucky!\" Cookies Required (Frenzy)', luckyReqFrenFrag)); - stats.appendChild(listing('\"Lucky!\" Reward (MAX) (Golden / Wrath)', document.createTextNode(Beautify(luckyRewardMax) + ' / ' + Beautify(luckyRewardMaxWrath)))); - stats.appendChild(listing('\"Lucky!\" Reward (MAX) (Frenzy) (Golden / Wrath)', document.createTextNode(Beautify(luckyRewardFrenzyMax) + ' / ' + Beautify(luckyRewardFrenzyMaxWrath)))); - stats.appendChild(listing('\"Lucky!\" Reward (CUR) (Golden / Wrath)', document.createTextNode(Beautify(luckyCur) + ' / ' + Beautify(luckyCurWrath)))); + stats.appendChild(listing('\"Lucky!\" Reward (MAX)' + (luckySplit ? ' (Golden / Wrath)' : ''), document.createTextNode(Beautify(luckyRewardMax) + (luckySplit ? (' / ' + Beautify(luckyRewardMaxWrath)) : '')))); + stats.appendChild(listing('\"Lucky!\" Reward (MAX) (Frenzy)' + (luckySplit ? ' (Golden / Wrath)' : ''), document.createTextNode(Beautify(luckyRewardFrenzyMax) + (luckySplit ? (' / ' + Beautify(luckyRewardFrenzyMaxWrath)) : '')))); + stats.appendChild(listing('\"Lucky!\" Reward (CUR)' + (luckySplit ? ' (Golden / Wrath)' : ''), document.createTextNode(Beautify(luckyCur) + (luckySplit ? (' / ' + Beautify(luckyCurWrath)) : '')))); } stats.appendChild(header('Chain Cookies', 'Chain')); diff --git a/src/Disp.js b/src/Disp.js index 660b363..3241207 100644 --- a/src/Disp.js +++ b/src/Disp.js @@ -1000,6 +1000,10 @@ CM.Disp.AddMenuStats = function(title) { luckyRewardFrenzyMaxWrath *= 1.1; luckyCurWrath *= 1.1; } + var luckySplit = false; + if (luckyRewardMax != luckyRewardMaxWrath) { + luckySplit = true; + } var luckyReqFrag = document.createDocumentFragment(); var luckyReqSpan = document.createElement('span'); @@ -1025,9 +1029,9 @@ CM.Disp.AddMenuStats = function(title) { luckyReqFrenFrag.appendChild(luckyReqFrenSmall); } stats.appendChild(listing('\"Lucky!\" Cookies Required (Frenzy)', luckyReqFrenFrag)); - stats.appendChild(listing('\"Lucky!\" Reward (MAX) (Golden / Wrath)', document.createTextNode(Beautify(luckyRewardMax) + ' / ' + Beautify(luckyRewardMaxWrath)))); - stats.appendChild(listing('\"Lucky!\" Reward (MAX) (Frenzy) (Golden / Wrath)', document.createTextNode(Beautify(luckyRewardFrenzyMax) + ' / ' + Beautify(luckyRewardFrenzyMaxWrath)))); - stats.appendChild(listing('\"Lucky!\" Reward (CUR) (Golden / Wrath)', document.createTextNode(Beautify(luckyCur) + ' / ' + Beautify(luckyCurWrath)))); + stats.appendChild(listing('\"Lucky!\" Reward (MAX)' + (luckySplit ? ' (Golden / Wrath)' : ''), document.createTextNode(Beautify(luckyRewardMax) + (luckySplit ? (' / ' + Beautify(luckyRewardMaxWrath)) : '')))); + stats.appendChild(listing('\"Lucky!\" Reward (MAX) (Frenzy)' + (luckySplit ? ' (Golden / Wrath)' : ''), document.createTextNode(Beautify(luckyRewardFrenzyMax) + (luckySplit ? (' / ' + Beautify(luckyRewardFrenzyMaxWrath)) : '')))); + stats.appendChild(listing('\"Lucky!\" Reward (CUR)' + (luckySplit ? ' (Golden / Wrath)' : ''), document.createTextNode(Beautify(luckyCur) + (luckySplit ? (' / ' + Beautify(luckyCurWrath)) : '')))); } stats.appendChild(header('Chain Cookies', 'Chain'));