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

Added prettier (#661)

Browse Source 
* Added prettier

* Added prettier

* Added prettier
This commit is contained in:
Daniël van Noord
2021-03-14 18:57:07 +01:00
committed by GitHub
parent f3e7964262
commit 932509a877
132 changed files with 7143 additions and 4894 deletions
Download Patch File Download Diff File Expand all files Collapse all files

214
src/Sim/SimulationEvents/BuyUpgrades.js
View File

@@ -8,7 +8,12 @@ import SimHasGod from '../ReplacedGameFunctions/SimHasGod';
import CopyData from '../SimulationData/CopyData';
import SimWin from '../SimulationData/SimWin';
import {
SimAchievementsOwned, SimCookiesPs, SimObjects, SimPledges, SimUpgrades, SimUpgradesOwned,
SimAchievementsOwned,
SimCookiesPs,
SimObjects,
SimPledges,
SimUpgrades,
SimUpgradesOwned,
} from '../VariablesAndData';
/**
@@ -17,74 +22,91 @@ import {
* @returns {number} out The clicking power
*/
function MouseCps() {
let add = 0;
if (SimHas('Thousand fingers')) add += 0.1;
if (SimHas('Million fingers')) add *= 5;
if (SimHas('Billion fingers')) add *= 10;
if (SimHas('Trillion fingers')) add *= 20;
if (SimHas('Quadrillion fingers')) add *= 20;
if (SimHas('Quintillion fingers')) add *= 20;
if (SimHas('Sextillion fingers')) add *= 20;
if (SimHas('Septillion fingers')) add *= 20;
if (SimHas('Octillion fingers')) add *= 20;
if (SimHas('Nonillion fingers')) add *= 20;
let num = 0;
for (const i of Object.keys(SimObjects)) { num += SimObjects[i].amount; }
num -= SimObjects.Cursor.amount;
add *= num;
let add = 0;
if (SimHas('Thousand fingers')) add += 0.1;
if (SimHas('Million fingers')) add *= 5;
if (SimHas('Billion fingers')) add *= 10;
if (SimHas('Trillion fingers')) add *= 20;
if (SimHas('Quadrillion fingers')) add *= 20;
if (SimHas('Quintillion fingers')) add *= 20;
if (SimHas('Sextillion fingers')) add *= 20;
if (SimHas('Septillion fingers')) add *= 20;
if (SimHas('Octillion fingers')) add *= 20;
if (SimHas('Nonillion fingers')) add *= 20;
let num = 0;
for (const i of Object.keys(SimObjects)) {
num += SimObjects[i].amount;
}
num -= SimObjects.Cursor.amount;
add *= num;
// Can use SimCookiesPs as function is always called after CM.Sim.CalculateGains()
if (SimHas('Plastic mouse')) add += SimCookiesPs * 0.01;
if (SimHas('Iron mouse')) add += SimCookiesPs * 0.01;
if (SimHas('Titanium mouse')) add += SimCookiesPs * 0.01;
if (SimHas('Adamantium mouse')) add += SimCookiesPs * 0.01;
if (SimHas('Unobtainium mouse')) add += SimCookiesPs * 0.01;
if (SimHas('Eludium mouse')) add += SimCookiesPs * 0.01;
if (SimHas('Wishalloy mouse')) add += SimCookiesPs * 0.01;
if (SimHas('Fantasteel mouse')) add += SimCookiesPs * 0.01;
if (SimHas('Nevercrack mouse')) add += SimCookiesPs * 0.01;
if (SimHas('Armythril mouse')) add += SimCookiesPs * 0.01;
if (SimHas('Technobsidian mouse')) add += SimCookiesPs * 0.01;
if (SimHas('Plasmarble mouse')) add += SimCookiesPs * 0.01;
if (SimHas('Miraculite mouse')) add += SimCookiesPs * 0.01;
// Can use SimCookiesPs as function is always called after CM.Sim.CalculateGains()
if (SimHas('Plastic mouse')) add += SimCookiesPs * 0.01;
if (SimHas('Iron mouse')) add += SimCookiesPs * 0.01;
if (SimHas('Titanium mouse')) add += SimCookiesPs * 0.01;
if (SimHas('Adamantium mouse')) add += SimCookiesPs * 0.01;
if (SimHas('Unobtainium mouse')) add += SimCookiesPs * 0.01;
if (SimHas('Eludium mouse')) add += SimCookiesPs * 0.01;
if (SimHas('Wishalloy mouse')) add += SimCookiesPs * 0.01;
if (SimHas('Fantasteel mouse')) add += SimCookiesPs * 0.01;
if (SimHas('Nevercrack mouse')) add += SimCookiesPs * 0.01;
if (SimHas('Armythril mouse')) add += SimCookiesPs * 0.01;
if (SimHas('Technobsidian mouse')) add += SimCookiesPs * 0.01;
if (SimHas('Plasmarble mouse')) add += SimCookiesPs * 0.01;
if (SimHas('Miraculite mouse')) add += SimCookiesPs * 0.01;
if (SimHas('Fortune #104')) add += SimCookiesPs * 0.01;
if (SimHas('Fortune #104')) add += SimCookiesPs * 0.01;
let mult = 1;
if (SimHas('Santa\'s helpers')) mult *= 1.1;
if (SimHas('Cookie egg')) mult *= 1.1;
if (SimHas('Halo gloves')) mult *= 1.1;
if (SimHas('Dragon claw')) mult *= 1.03;
let mult = 1;
if (SimHas("Santa's helpers")) mult *= 1.1;
if (SimHas('Cookie egg')) mult *= 1.1;
if (SimHas('Halo gloves')) mult *= 1.1;
if (SimHas('Dragon claw')) mult *= 1.03;
if (SimHas('Aura gloves')) {
mult *= 1 + 0.05 * Math.min(Game.Objects.Cursor.level, SimHas('Luminous gloves') ? 20 : 10);
}
if (SimHas('Aura gloves')) {
mult *=
1 +
0.05 *
Math.min(
Game.Objects.Cursor.level,
SimHas('Luminous gloves') ? 20 : 10,
);
}
mult *= SimEff('click');
if (SimObjects.Temple.minigameLoaded) {
if (SimHasGod) {
const godLvl = SimHasGod('labor');
if (godLvl === 1) mult *= 1.15;
else if (godLvl === 2) mult *= 1.1;
else if (godLvl === 3) mult *= 1.05;
}
}
mult *= SimEff('click');
if (SimObjects.Temple.minigameLoaded) {
if (SimHasGod) {
const godLvl = SimHasGod('labor');
if (godLvl === 1) mult *= 1.15;
else if (godLvl === 2) mult *= 1.1;
else if (godLvl === 3) mult *= 1.05;
}
}
for (const i of Object.keys(Game.buffs)) {
if (typeof Game.buffs[i].multClick !== 'undefined') mult *= Game.buffs[i].multClick;
}
for (const i of Object.keys(Game.buffs)) {
if (typeof Game.buffs[i].multClick !== 'undefined')
mult *= Game.buffs[i].multClick;
}
// if (CM.Sim.auraMult('Dragon Cursor')) mult*=1.05;
mult *= 1 + SimAuraMult('Dragon Cursor') * 0.05;
// if (CM.Sim.auraMult('Dragon Cursor')) mult*=1.05;
mult *= 1 + SimAuraMult('Dragon Cursor') * 0.05;
// No need to make this function a CM function
let out = mult * Game.ComputeCps(1, SimHas('Reinforced index finger') + SimHas('Carpal tunnel prevention cream') + SimHas('Ambidextrous'), add);
// No need to make this function a CM function
let out =
mult *
Game.ComputeCps(
1,
SimHas('Reinforced index finger') +
SimHas('Carpal tunnel prevention cream') +
SimHas('Ambidextrous'),
add,
);
out = Game.runModHookOnValue('cookiesPerClick', out);
out = Game.runModHookOnValue('cookiesPerClick', out);
if (Game.hasBuff('Cursed finger')) out = Game.buffs['Cursed finger'].power;
if (Game.hasBuff('Cursed finger')) out = Game.buffs['Cursed finger'].power;
return out;
return out;
}
/**
@@ -94,45 +116,51 @@ function MouseCps() {
* @returns {[{number, number}]} The bonus income of the upgrade and the difference in MouseCPS
*/
export default function BuyUpgradesBonusIncome(upgrade) {
if (Game.Upgrades[upgrade].pool === 'toggle' || (Game.Upgrades[upgrade].bought === 0 && Game.Upgrades[upgrade].unlocked && Game.Upgrades[upgrade].pool !== 'prestige')) {
CopyData();
if (SimUpgrades[upgrade].name === 'Shimmering veil [on]') {
SimUpgrades['Shimmering veil [off]'].bought = 0;
} else if (SimUpgrades[upgrade].name === 'Golden switch [on]') {
SimUpgrades['Golden switch [off]'].bought = 0;
} else {
SimUpgrades[upgrade].bought = (SimUpgrades[upgrade].bought + 1) % 2;
}
const me = SimUpgrades[upgrade];
if (Game.CountsAsUpgradeOwned(Game.Upgrades[upgrade].pool)) SimUpgradesOwned++;
if (
Game.Upgrades[upgrade].pool === 'toggle' ||
(Game.Upgrades[upgrade].bought === 0 &&
Game.Upgrades[upgrade].unlocked &&
Game.Upgrades[upgrade].pool !== 'prestige')
) {
CopyData();
if (SimUpgrades[upgrade].name === 'Shimmering veil [on]') {
SimUpgrades['Shimmering veil [off]'].bought = 0;
} else if (SimUpgrades[upgrade].name === 'Golden switch [on]') {
SimUpgrades['Golden switch [off]'].bought = 0;
} else {
SimUpgrades[upgrade].bought = (SimUpgrades[upgrade].bought + 1) % 2;
}
const me = SimUpgrades[upgrade];
if (Game.CountsAsUpgradeOwned(Game.Upgrades[upgrade].pool))
SimUpgradesOwned++;
if (upgrade === 'Elder Pledge') {
SimPledges++;
if (SimPledges > 0) SimWin('Elder nap');
if (SimPledges >= 5) SimWin('Elder slumber');
} else if (upgrade === 'Elder Covenant') {
SimWin('Elder calm');
} else if (upgrade === 'Prism heart biscuits') {
SimWin('Lovely cookies');
} else if (upgrade === 'Heavenly key') {
SimWin('Wholesome');
}
if (upgrade === 'Elder Pledge') {
SimPledges++;
if (SimPledges > 0) SimWin('Elder nap');
if (SimPledges >= 5) SimWin('Elder slumber');
} else if (upgrade === 'Elder Covenant') {
SimWin('Elder calm');
} else if (upgrade === 'Prism heart biscuits') {
SimWin('Lovely cookies');
} else if (upgrade === 'Heavenly key') {
SimWin('Wholesome');
}
const lastAchievementsOwned = SimAchievementsOwned;
const lastAchievementsOwned = SimAchievementsOwned;
CalculateGains();
CalculateGains();
CheckOtherAchiev();
CheckOtherAchiev();
if (lastAchievementsOwned !== SimAchievementsOwned) {
CalculateGains();
}
if (lastAchievementsOwned !== SimAchievementsOwned) {
CalculateGains();
}
const diffMouseCPS = MouseCps() - Game.computedMouseCps;
if (diffMouseCPS) {
return [SimCookiesPs - Game.cookiesPs, diffMouseCPS];
}
return [SimCookiesPs - Game.cookiesPs];
}
return [];
const diffMouseCPS = MouseCps() - Game.computedMouseCps;
if (diffMouseCPS) {
return [SimCookiesPs - Game.cookiesPs, diffMouseCPS];
}
return [SimCookiesPs - Game.cookiesPs];
}
return [];
}