Added prettier (#661)
* Added prettier * Added prettier * Added prettier
This commit is contained in:
Daniël van Noord
@@ -1,4 +1,8 @@
|
||||
import { CacheObjects1, CacheObjects10, CacheObjects100 } from '../../Cache/VariablesAndData';
|
||||
import {
|
||||
CacheObjects1,
|
||||
CacheObjects10,
|
||||
CacheObjects100,
|
||||
} from '../../Cache/VariablesAndData';
|
||||
import { CMOptions } from '../../Config/VariablesAndData';
|
||||
import BuildingSell from '../../Sim/SimulationEvents/SellBuilding';
|
||||
import { Beautify } from '../BeautifyAndFormatting/BeautifyFormatting';
|
||||
@@ -14,68 +18,79 @@ import { Colors, LastTargetBuildings } from '../VariablesAndData';
|
||||
* And by changes in CM.Options.BuildColor, CM.Options.SortBuild & CM.Data.Config.BulkBuildColor
|
||||
*/
|
||||
export default function UpdateBuildings() {
|
||||
let target = Game.buyBulk;
|
||||
if (Game.buyMode === 1) {
|
||||
LastTargetBuildings = target;
|
||||
} else {
|
||||
target = LastTargetBuildings;
|
||||
}
|
||||
if (target === 1) target = CacheObjects1;
|
||||
else if (target === 10) target = CacheObjects10;
|
||||
else if (target === 100) target = CacheObjects100;
|
||||
let target = Game.buyBulk;
|
||||
if (Game.buyMode === 1) {
|
||||
LastTargetBuildings = target;
|
||||
} else {
|
||||
target = LastTargetBuildings;
|
||||
}
|
||||
if (target === 1) target = CacheObjects1;
|
||||
else if (target === 10) target = CacheObjects10;
|
||||
else if (target === 100) target = CacheObjects100;
|
||||
|
||||
if (Game.buyMode === 1) {
|
||||
if (CMOptions.BuildColor === 1) {
|
||||
for (const i of Object.keys(target)) {
|
||||
l(`productPrice${Game.Objects[i].id}`).style.color = CMOptions.Colors[target[i].color];
|
||||
}
|
||||
} else {
|
||||
for (const i of Object.keys(Game.Objects)) {
|
||||
l(`productPrice${Game.Objects[i].id}`).style.removeProperty('color');
|
||||
}
|
||||
}
|
||||
} else if (Game.buyMode === -1) {
|
||||
for (const i of Object.keys(CacheObjects1)) {
|
||||
const o = Game.Objects[i];
|
||||
l(`productPrice${o.id}`).style.color = '';
|
||||
/*
|
||||
* Fix sell price displayed in the object in the store.
|
||||
*
|
||||
* The buildings sell price displayed by the game itself (without any mod) is incorrect.
|
||||
* The following line of code fixes this issue, and can be safely removed when the game gets fixed.
|
||||
*
|
||||
* This issue is extensively detailed here: https://github.com/Aktanusa/CookieMonster/issues/359#issuecomment-735658262
|
||||
*/
|
||||
l(`productPrice${o.id}`).innerHTML = Beautify(BuildingSell(o, o.basePrice, o.amount, o.free, Game.buyBulk, 1));
|
||||
}
|
||||
}
|
||||
if (Game.buyMode === 1) {
|
||||
if (CMOptions.BuildColor === 1) {
|
||||
for (const i of Object.keys(target)) {
|
||||
l(`productPrice${Game.Objects[i].id}`).style.color =
|
||||
CMOptions.Colors[target[i].color];
|
||||
}
|
||||
} else {
|
||||
for (const i of Object.keys(Game.Objects)) {
|
||||
l(`productPrice${Game.Objects[i].id}`).style.removeProperty('color');
|
||||
}
|
||||
}
|
||||
} else if (Game.buyMode === -1) {
|
||||
for (const i of Object.keys(CacheObjects1)) {
|
||||
const o = Game.Objects[i];
|
||||
l(`productPrice${o.id}`).style.color = '';
|
||||
/*
|
||||
* Fix sell price displayed in the object in the store.
|
||||
*
|
||||
* The buildings sell price displayed by the game itself (without any mod) is incorrect.
|
||||
* The following line of code fixes this issue, and can be safely removed when the game gets fixed.
|
||||
*
|
||||
* This issue is extensively detailed here: https://github.com/Aktanusa/CookieMonster/issues/359#issuecomment-735658262
|
||||
*/
|
||||
l(`productPrice${o.id}`).innerHTML = Beautify(
|
||||
BuildingSell(o, o.basePrice, o.amount, o.free, Game.buyBulk, 1),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// Build array of pointers, sort by pp, use array index (+2) as the grid row number
|
||||
// (grid rows are 1-based indexing, and row 1 is the bulk buy/sell options)
|
||||
// This regulates sorting of buildings
|
||||
if (Game.buyMode === 1 && CMOptions.SortBuildings) {
|
||||
const arr = Object.keys(target).map((k) => {
|
||||
const o = target[k];
|
||||
o.name = k;
|
||||
o.id = Game.Objects[k].id;
|
||||
return o;
|
||||
});
|
||||
// Build array of pointers, sort by pp, use array index (+2) as the grid row number
|
||||
// (grid rows are 1-based indexing, and row 1 is the bulk buy/sell options)
|
||||
// This regulates sorting of buildings
|
||||
if (Game.buyMode === 1 && CMOptions.SortBuildings) {
|
||||
const arr = Object.keys(target).map((k) => {
|
||||
const o = target[k];
|
||||
o.name = k;
|
||||
o.id = Game.Objects[k].id;
|
||||
return o;
|
||||
});
|
||||
|
||||
arr.sort(function (a, b) { return (Colors.indexOf(a.color) > Colors.indexOf(b.color) ? 1 : (Colors.indexOf(a.color) < Colors.indexOf(b.color) ? -1 : (a.pp < b.pp) ? -1 : 0)); });
|
||||
arr.sort(function (a, b) {
|
||||
return Colors.indexOf(a.color) > Colors.indexOf(b.color)
|
||||
? 1
|
||||
: Colors.indexOf(a.color) < Colors.indexOf(b.color)
|
||||
? -1
|
||||
: a.pp < b.pp
|
||||
? -1
|
||||
: 0;
|
||||
});
|
||||
|
||||
for (let x = 0; x < arr.length; x++) {
|
||||
Game.Objects[arr[x].name].l.style.gridRow = `${x + 2}/${x + 2}`;
|
||||
}
|
||||
} else {
|
||||
const arr = Object.keys(CacheObjects1).map((k) => {
|
||||
const o = CacheObjects1[k];
|
||||
o.name = k;
|
||||
o.id = Game.Objects[k].id;
|
||||
return o;
|
||||
});
|
||||
arr.sort((a, b) => a.id - b.id);
|
||||
for (let x = 0; x < arr.length; x++) {
|
||||
Game.Objects[arr[x].name].l.style.gridRow = `${x + 2}/${x + 2}`;
|
||||
}
|
||||
}
|
||||
for (let x = 0; x < arr.length; x++) {
|
||||
Game.Objects[arr[x].name].l.style.gridRow = `${x + 2}/${x + 2}`;
|
||||
}
|
||||
} else {
|
||||
const arr = Object.keys(CacheObjects1).map((k) => {
|
||||
const o = CacheObjects1[k];
|
||||
o.name = k;
|
||||
o.id = Game.Objects[k].id;
|
||||
return o;
|
||||
});
|
||||
arr.sort((a, b) => a.id - b.id);
|
||||
for (let x = 0; x < arr.length; x++) {
|
||||
Game.Objects[arr[x].name].l.style.gridRow = `${x + 2}/${x + 2}`;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,13 @@
|
||||
import {
|
||||
ColorBackPre, ColorBlue, ColorGray, ColorGreen, ColorOrange, ColorPurple, ColorRed, ColorTextPre, ColorYellow,
|
||||
ColorBackPre,
|
||||
ColorBlue,
|
||||
ColorGray,
|
||||
ColorGreen,
|
||||
ColorOrange,
|
||||
ColorPurple,
|
||||
ColorRed,
|
||||
ColorTextPre,
|
||||
ColorYellow,
|
||||
} from '../VariablesAndData';
|
||||
|
||||
/**
|
||||
@@ -7,73 +15,90 @@ import {
|
||||
* @returns {object} legend The legend-object to be added
|
||||
*/
|
||||
function CreateUpgradeBarLegend() {
|
||||
const legend = document.createElement('div');
|
||||
legend.style.minWidth = '330px';
|
||||
legend.style.marginBottom = '4px';
|
||||
const title = document.createElement('div');
|
||||
title.className = 'name';
|
||||
title.style.marginBottom = '4px';
|
||||
title.textContent = 'Legend';
|
||||
legend.appendChild(title);
|
||||
const legend = document.createElement('div');
|
||||
legend.style.minWidth = '330px';
|
||||
legend.style.marginBottom = '4px';
|
||||
const title = document.createElement('div');
|
||||
title.className = 'name';
|
||||
title.style.marginBottom = '4px';
|
||||
title.textContent = 'Legend';
|
||||
legend.appendChild(title);
|
||||
|
||||
const legendLine = function (color, text) {
|
||||
const div = document.createElement('div');
|
||||
div.style.verticalAlign = 'middle';
|
||||
const span = document.createElement('span');
|
||||
span.className = ColorBackPre + color;
|
||||
span.style.display = 'inline-block';
|
||||
span.style.height = '10px';
|
||||
span.style.width = '10px';
|
||||
span.style.marginRight = '4px';
|
||||
div.appendChild(span);
|
||||
div.appendChild(document.createTextNode(text));
|
||||
return div;
|
||||
};
|
||||
const legendLine = function (color, text) {
|
||||
const div = document.createElement('div');
|
||||
div.style.verticalAlign = 'middle';
|
||||
const span = document.createElement('span');
|
||||
span.className = ColorBackPre + color;
|
||||
span.style.display = 'inline-block';
|
||||
span.style.height = '10px';
|
||||
span.style.width = '10px';
|
||||
span.style.marginRight = '4px';
|
||||
div.appendChild(span);
|
||||
div.appendChild(document.createTextNode(text));
|
||||
return div;
|
||||
};
|
||||
|
||||
legend.appendChild(legendLine(ColorBlue, 'Better than best PP building'));
|
||||
legend.appendChild(legendLine(ColorGreen, 'Same as best PP building'));
|
||||
legend.appendChild(legendLine(ColorYellow, 'Between best and worst PP buildings closer to best'));
|
||||
legend.appendChild(legendLine(ColorOrange, 'Between best and worst PP buildings closer to worst'));
|
||||
legend.appendChild(legendLine(ColorRed, 'Same as worst PP building'));
|
||||
legend.appendChild(legendLine(ColorPurple, 'Worse than worst PP building'));
|
||||
legend.appendChild(legendLine(ColorGray, 'Negative or infinity PP'));
|
||||
return legend;
|
||||
legend.appendChild(legendLine(ColorBlue, 'Better than best PP building'));
|
||||
legend.appendChild(legendLine(ColorGreen, 'Same as best PP building'));
|
||||
legend.appendChild(
|
||||
legendLine(
|
||||
ColorYellow,
|
||||
'Between best and worst PP buildings closer to best',
|
||||
),
|
||||
);
|
||||
legend.appendChild(
|
||||
legendLine(
|
||||
ColorOrange,
|
||||
'Between best and worst PP buildings closer to worst',
|
||||
),
|
||||
);
|
||||
legend.appendChild(legendLine(ColorRed, 'Same as worst PP building'));
|
||||
legend.appendChild(legendLine(ColorPurple, 'Worse than worst PP building'));
|
||||
legend.appendChild(legendLine(ColorGray, 'Negative or infinity PP'));
|
||||
return legend;
|
||||
}
|
||||
|
||||
/**
|
||||
* This function creates the upgrade bar above the upgrade-section in the right section of the screen
|
||||
*/
|
||||
export default function CreateUpgradeBar() {
|
||||
const UpgradeBar = document.createElement('div');
|
||||
UpgradeBar.id = 'CMUpgradeBar';
|
||||
UpgradeBar.style.width = '100%';
|
||||
UpgradeBar.style.backgroundColor = 'black';
|
||||
UpgradeBar.style.textAlign = 'center';
|
||||
UpgradeBar.style.fontWeight = 'bold';
|
||||
UpgradeBar.style.display = 'none';
|
||||
UpgradeBar.style.zIndex = '21';
|
||||
UpgradeBar.onmouseout = function () { Game.tooltip.hide(); };
|
||||
const UpgradeBar = document.createElement('div');
|
||||
UpgradeBar.id = 'CMUpgradeBar';
|
||||
UpgradeBar.style.width = '100%';
|
||||
UpgradeBar.style.backgroundColor = 'black';
|
||||
UpgradeBar.style.textAlign = 'center';
|
||||
UpgradeBar.style.fontWeight = 'bold';
|
||||
UpgradeBar.style.display = 'none';
|
||||
UpgradeBar.style.zIndex = '21';
|
||||
UpgradeBar.onmouseout = function () {
|
||||
Game.tooltip.hide();
|
||||
};
|
||||
|
||||
const placeholder = document.createElement('div');
|
||||
placeholder.appendChild(CreateUpgradeBarLegend());
|
||||
UpgradeBar.onmouseover = function () { Game.tooltip.draw(this, escape(placeholder.innerHTML), 'store'); };
|
||||
const placeholder = document.createElement('div');
|
||||
placeholder.appendChild(CreateUpgradeBarLegend());
|
||||
UpgradeBar.onmouseover = function () {
|
||||
Game.tooltip.draw(this, escape(placeholder.innerHTML), 'store');
|
||||
};
|
||||
|
||||
const upgradeNumber = function (id, color) {
|
||||
const span = document.createElement('span');
|
||||
span.id = id;
|
||||
span.className = ColorTextPre + color;
|
||||
span.style.width = '14.28571428571429%';
|
||||
span.style.display = 'inline-block';
|
||||
span.textContent = '0';
|
||||
return span;
|
||||
};
|
||||
UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarBlue', ColorBlue));
|
||||
UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarGreen', ColorGreen));
|
||||
UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarYellow', ColorYellow));
|
||||
UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarOrange', ColorOrange));
|
||||
UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarRed', ColorRed));
|
||||
UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarPurple', ColorPurple));
|
||||
UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarGray', ColorGray));
|
||||
const upgradeNumber = function (id, color) {
|
||||
const span = document.createElement('span');
|
||||
span.id = id;
|
||||
span.className = ColorTextPre + color;
|
||||
span.style.width = '14.28571428571429%';
|
||||
span.style.display = 'inline-block';
|
||||
span.textContent = '0';
|
||||
return span;
|
||||
};
|
||||
UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarBlue', ColorBlue));
|
||||
UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarGreen', ColorGreen));
|
||||
UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarYellow', ColorYellow));
|
||||
UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarOrange', ColorOrange));
|
||||
UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarRed', ColorRed));
|
||||
UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarPurple', ColorPurple));
|
||||
UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarGray', ColorGray));
|
||||
|
||||
l('upgrades').parentNode.insertBefore(UpgradeBar, l('upgrades').parentNode.childNodes[3]);
|
||||
l('upgrades').parentNode.insertBefore(
|
||||
UpgradeBar,
|
||||
l('upgrades').parentNode.childNodes[3],
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,7 +1,15 @@
|
||||
import { CacheUpgrades } from '../../Cache/VariablesAndData';
|
||||
import { CMOptions } from '../../Config/VariablesAndData';
|
||||
import {
|
||||
ColorBackPre, ColorBlue, ColorGray, ColorGreen, ColorOrange, ColorPurple, ColorRed, Colors, ColorYellow,
|
||||
ColorBackPre,
|
||||
ColorBlue,
|
||||
ColorGray,
|
||||
ColorGreen,
|
||||
ColorOrange,
|
||||
ColorPurple,
|
||||
ColorRed,
|
||||
Colors,
|
||||
ColorYellow,
|
||||
} from '../VariablesAndData';
|
||||
|
||||
/**
|
||||
@@ -11,72 +19,84 @@ import {
|
||||
* And by changes in CM.Options.SortUpgrades
|
||||
*/
|
||||
export default function UpdateUpgrades() {
|
||||
// This counts the amount of upgrades for each pp group and updates the Upgrade Bar
|
||||
if (CMOptions.UpBarColor > 0) {
|
||||
let blue = 0;
|
||||
let green = 0;
|
||||
let yellow = 0;
|
||||
let orange = 0;
|
||||
let red = 0;
|
||||
let purple = 0;
|
||||
let gray = 0;
|
||||
// This counts the amount of upgrades for each pp group and updates the Upgrade Bar
|
||||
if (CMOptions.UpBarColor > 0) {
|
||||
let blue = 0;
|
||||
let green = 0;
|
||||
let yellow = 0;
|
||||
let orange = 0;
|
||||
let red = 0;
|
||||
let purple = 0;
|
||||
let gray = 0;
|
||||
|
||||
for (const i of Object.keys(Game.UpgradesInStore)) {
|
||||
const me = Game.UpgradesInStore[i];
|
||||
let addedColor = false;
|
||||
for (let j = 0; j < l(`upgrade${i}`).childNodes.length; j++) {
|
||||
if (l(`upgrade${i}`).childNodes[j].className.indexOf(ColorBackPre) !== -1) {
|
||||
l(`upgrade${i}`).childNodes[j].className = ColorBackPre + CacheUpgrades[me.name].color;
|
||||
addedColor = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!addedColor) {
|
||||
const div = document.createElement('div');
|
||||
div.style.width = '10px';
|
||||
div.style.height = '10px';
|
||||
div.className = ColorBackPre + CacheUpgrades[me.name].color;
|
||||
l(`upgrade${i}`).appendChild(div);
|
||||
}
|
||||
if (CacheUpgrades[me.name].color === ColorBlue) blue++;
|
||||
else if (CacheUpgrades[me.name].color === ColorGreen) green++;
|
||||
else if (CacheUpgrades[me.name].color === ColorYellow) yellow++;
|
||||
else if (CacheUpgrades[me.name].color === ColorOrange) orange++;
|
||||
else if (CacheUpgrades[me.name].color === ColorRed) red++;
|
||||
else if (CacheUpgrades[me.name].color === ColorPurple) purple++;
|
||||
else if (CacheUpgrades[me.name].color === ColorGray) gray++;
|
||||
}
|
||||
for (const i of Object.keys(Game.UpgradesInStore)) {
|
||||
const me = Game.UpgradesInStore[i];
|
||||
let addedColor = false;
|
||||
for (let j = 0; j < l(`upgrade${i}`).childNodes.length; j++) {
|
||||
if (
|
||||
l(`upgrade${i}`).childNodes[j].className.indexOf(ColorBackPre) !== -1
|
||||
) {
|
||||
l(`upgrade${i}`).childNodes[j].className =
|
||||
ColorBackPre + CacheUpgrades[me.name].color;
|
||||
addedColor = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!addedColor) {
|
||||
const div = document.createElement('div');
|
||||
div.style.width = '10px';
|
||||
div.style.height = '10px';
|
||||
div.className = ColorBackPre + CacheUpgrades[me.name].color;
|
||||
l(`upgrade${i}`).appendChild(div);
|
||||
}
|
||||
if (CacheUpgrades[me.name].color === ColorBlue) blue++;
|
||||
else if (CacheUpgrades[me.name].color === ColorGreen) green++;
|
||||
else if (CacheUpgrades[me.name].color === ColorYellow) yellow++;
|
||||
else if (CacheUpgrades[me.name].color === ColorOrange) orange++;
|
||||
else if (CacheUpgrades[me.name].color === ColorRed) red++;
|
||||
else if (CacheUpgrades[me.name].color === ColorPurple) purple++;
|
||||
else if (CacheUpgrades[me.name].color === ColorGray) gray++;
|
||||
}
|
||||
|
||||
l('CMUpgradeBarBlue').textContent = blue;
|
||||
l('CMUpgradeBarGreen').textContent = green;
|
||||
l('CMUpgradeBarYellow').textContent = yellow;
|
||||
l('CMUpgradeBarOrange').textContent = orange;
|
||||
l('CMUpgradeBarRed').textContent = red;
|
||||
l('CMUpgradeBarPurple').textContent = purple;
|
||||
l('CMUpgradeBarGray').textContent = gray;
|
||||
}
|
||||
l('CMUpgradeBarBlue').textContent = blue;
|
||||
l('CMUpgradeBarGreen').textContent = green;
|
||||
l('CMUpgradeBarYellow').textContent = yellow;
|
||||
l('CMUpgradeBarOrange').textContent = orange;
|
||||
l('CMUpgradeBarRed').textContent = red;
|
||||
l('CMUpgradeBarPurple').textContent = purple;
|
||||
l('CMUpgradeBarGray').textContent = gray;
|
||||
}
|
||||
|
||||
const arr = [];
|
||||
// Build array of pointers, sort by pp, set flex positions
|
||||
// This regulates sorting of upgrades
|
||||
for (let x = 0; x < Game.UpgradesInStore.length; x++) {
|
||||
const o = {};
|
||||
o.name = Game.UpgradesInStore[x].name;
|
||||
o.price = Game.UpgradesInStore[x].basePrice;
|
||||
o.pp = CacheUpgrades[o.name].pp;
|
||||
arr.push(o);
|
||||
}
|
||||
const arr = [];
|
||||
// Build array of pointers, sort by pp, set flex positions
|
||||
// This regulates sorting of upgrades
|
||||
for (let x = 0; x < Game.UpgradesInStore.length; x++) {
|
||||
const o = {};
|
||||
o.name = Game.UpgradesInStore[x].name;
|
||||
o.price = Game.UpgradesInStore[x].basePrice;
|
||||
o.pp = CacheUpgrades[o.name].pp;
|
||||
arr.push(o);
|
||||
}
|
||||
|
||||
if (CMOptions.SortUpgrades) {
|
||||
arr.sort(function (a, b) { return (Colors.indexOf(a.color) > Colors.indexOf(b.color) ? 1 : (Colors.indexOf(a.color) < Colors.indexOf(b.color) ? -1 : (a.pp < b.pp) ? -1 : 0)); });
|
||||
} else {
|
||||
arr.sort((a, b) => a.price - b.price);
|
||||
}
|
||||
if (CMOptions.SortUpgrades) {
|
||||
arr.sort(function (a, b) {
|
||||
return Colors.indexOf(a.color) > Colors.indexOf(b.color)
|
||||
? 1
|
||||
: Colors.indexOf(a.color) < Colors.indexOf(b.color)
|
||||
? -1
|
||||
: a.pp < b.pp
|
||||
? -1
|
||||
: 0;
|
||||
});
|
||||
} else {
|
||||
arr.sort((a, b) => a.price - b.price);
|
||||
}
|
||||
|
||||
const nameChecker = function (arr2, upgrade) {
|
||||
return arr2.findIndex((e) => e.name === upgrade.name);
|
||||
};
|
||||
for (let x = 0; x < Game.UpgradesInStore.length; x++) {
|
||||
l(`upgrade${x}`).style.order = nameChecker(arr, Game.UpgradesInStore[x]) + 1;
|
||||
}
|
||||
const nameChecker = function (arr2, upgrade) {
|
||||
return arr2.findIndex((e) => e.name === upgrade.name);
|
||||
};
|
||||
for (let x = 0; x < Game.UpgradesInStore.length; x++) {
|
||||
l(`upgrade${x}`).style.order =
|
||||
nameChecker(arr, Game.UpgradesInStore[x]) + 1;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user