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

Merge pull request #655 from Aktanusa/master

Browse Source 
Master
This commit is contained in:
Daniël van Noord
2021-03-14 16:38:39 +01:00
committed by GitHub
parent b4426e48db 80b8a0b834
commit 918790cad4
5 changed files with 5 additions and 6 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

1
src/Cache/VariablesAndData.js
View File

@@ -33,7 +33,6 @@ export let CacheWrinklersTotal = 0;
export let CacheWrinklersNormal = 0; export let CacheWrinklersNormal = 0;
export let CacheWrinklersFattest = [0, null]; export let CacheWrinklersFattest = [0, null];
export let CacheAvgCps = 0;
export let CacheCurrWrinklerCPSMult = 0; export let CacheCurrWrinklerCPSMult = 0;
export let CacheCurrWrinklerCount = 0; export let CacheCurrWrinklerCount = 0;

4
src/Disp/HelperFunctions/GetCPS.js
View File

@@ -1,5 +1,5 @@
import { import {
CacheAvgCps, CacheCurrWrinklerCount, CacheCurrWrinklerCPSMult, CacheWrinklersFattest, CacheAverageCPS, CacheCurrWrinklerCount, CacheCurrWrinklerCPSMult, CacheWrinklersFattest,
} from '../../Cache/VariablesAndData'; } from '../../Cache/VariablesAndData';
import { CMOptions } from '../../Config/VariablesAndData'; import { CMOptions } from '../../Config/VariablesAndData';
@@ -9,7 +9,7 @@ import { CMOptions } from '../../Config/VariablesAndData';
*/ */
export default function GetCPS() { export default function GetCPS() {
if (CMOptions.CPSMode) { if (CMOptions.CPSMode) {
return CacheAvgCps; return CacheAverageCPS;
} if (CMOptions.CalcWrink === 0) { } if (CMOptions.CalcWrink === 0) {
return (Game.cookiesPs * (1 - Game.cpsSucked)); return (Game.cookiesPs * (1 - Game.cpsSucked));
} if (CMOptions.CalcWrink === 1) { } if (CMOptions.CalcWrink === 1) {