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

Merge branch 'master' into beta

Browse Source 
Conflicts:
	CookieMonster.js
	src/Main.js
This commit is contained in:
Aktanusa
2014-10-31 20:25:47 -04:00
parent 0941e33c11 2063fa9db7
commit 35ddafdca7
6 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Disp.js
View File

@@ -850,6 +850,7 @@ CM.Disp.AddMenuPref = function(title) {
frag.appendChild(listing('TooltipAmor'));
frag.appendChild(listing('ToolWarnCaut'));
frag.appendChild(listing('ToolWarnCautPos'));
frag.appendChild(listing('ToolWarnCautBon'));
frag.appendChild(listing('ToolWrink'));
frag.appendChild(header('Statistics'));
@@ -1426,11 +1427,14 @@ CM.Disp.UpdateTooltip = function() {
}
if (CM.Config.ToolWarnCaut == 1) {
var bonusNoFren = bonus;
if (Game.frenzy > 0) {
bonusNoFren /= Game.frenzyPower;
var warn = CM.Cache.Lucky;
if (CM.Config.ToolWarnCautBon == 1) {
var bonusNoFren = bonus;
if (Game.frenzy > 0) {
bonusNoFren /= Game.frenzyPower;
}
warn += ((bonusNoFren * 60 * 20) / 0.1);
}
var warn = CM.Cache.Lucky + ((bonusNoFren * 60 * 20) / 0.1);
var caut = warn * 7;
var amount = Game.cookies - price;
if (amount < warn || amount < caut) {