david/CookieMonster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #681 from DanielNoord/mastertodev

Browse Source 
Mastertodev
This commit is contained in:
Daniël van Noord
2021-03-15 23:46:14 +01:00
committed by GitHub
parent b09dcd6f47 c3b1637d08
commit 8ff50fbbb9
5 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CookieMonster.js
View File

File diff suppressed because one or more lines are too long

2
dist/CookieMonster.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/CookieMonster.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
src/Disp/Draw.js
View File

@@ -53,8 +53,10 @@ export default function Draw() {
RefreshMenu();
// Replace Cookies counter because Orteil uses very weird code to "pad" it...
l('cookies').innerHTML = l('cookies').innerHTML.replace(
let str = l('cookies').innerHTML.replace(
/.*(?=<br>)/i,
Beautify(Game.cookies),
);
if (Game.prefs.monospace) str = `<span class="monospace">${str}</span>`;
l('cookies').innerHTML = str;
}

16
src/Disp/MenuSections/CreateStatsSections.js
View File

@@ -505,11 +505,11 @@ export function GardenSection() {
section.className = 'CMStatsGardenSection';
const bakeberryColor =
Game.cookies < Game.cookiesPs * 60 * 30 ? ColorRed : ColorGreen;
Game.cookies < Game.cookiesPs * 60 * 10 * 100 ? ColorRed : ColorGreen;
const bakeberryFrag = document.createElement('span');
bakeberryFrag.style.fontWeight = 'bold';
bakeberryFrag.className = ColorTextPre + bakeberryColor;
bakeberryFrag.textContent = Beautify(Game.cookiesPs * 60 * 30);
bakeberryFrag.textContent = Beautify(Game.cookiesPs * 60 * 10 * 100);
section.appendChild(
StatsListing(
'basic',
@@ -519,11 +519,11 @@ export function GardenSection() {
);
const chocorootColor =
Game.cookies < Game.cookiesPs * 60 * 3 ? ColorRed : ColorGreen;
Game.cookies < Game.cookiesPs * 60 * 100 ? ColorRed : ColorGreen;
const chocorootFrag = document.createElement('span');
chocorootFrag.style.fontWeight = 'bold';
chocorootFrag.className = ColorTextPre + chocorootColor;
chocorootFrag.textContent = Beautify(Game.cookiesPs * 60 * 3);
chocorootFrag.textContent = Beautify(Game.cookiesPs * 60 * 100);
section.appendChild(
StatsListing(
'basic',
@@ -533,11 +533,11 @@ export function GardenSection() {
);
const queenbeetColor =
Game.cookies < Game.cookiesPs * 60 * 60 ? ColorRed : ColorGreen;
Game.cookies < Game.cookiesPs * 60 * 60 * 25 ? ColorRed : ColorGreen;
const queenbeetFrag = document.createElement('span');
queenbeetFrag.style.fontWeight = 'bold';
queenbeetFrag.className = ColorTextPre + queenbeetColor;
queenbeetFrag.textContent = Beautify(Game.cookiesPs * 60 * 60);
queenbeetFrag.textContent = Beautify(Game.cookiesPs * 60 * 60 * 25);
section.appendChild(
StatsListing(
'basic',
@@ -547,11 +547,11 @@ export function GardenSection() {
);
const duketaterColor =
Game.cookies < Game.cookiesPs * 60 * 120 ? ColorRed : ColorGreen;
Game.cookies < Game.cookiesPs * 60 * 15 * 100 ? ColorRed : ColorGreen;
const duketaterFrag = document.createElement('span');
duketaterFrag.style.fontWeight = 'bold';
duketaterFrag.className = ColorTextPre + duketaterColor;
duketaterFrag.textContent = Beautify(Game.cookiesPs * 60 * 120);
duketaterFrag.textContent = Beautify(Game.cookiesPs * 60 * 15 * 100);
section.appendChild(
StatsListing(
'basic',