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

Merge branch 'master' into gh-pages

Browse Source
This commit is contained in:
Aktanusa
2016-02-09 15:33:23 -05:00
parent dbd2b0ae51 348c47e1dc
commit 6995e86752
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CookieMonster.js
View File

@@ -1797,7 +1797,7 @@ CM.Disp.UpdateTooltip = function() {
if (Game.frenzy > 0) {
bonusNoFren /= Game.frenzyPower;
}
warn += ((bonusNoFren * 60 * 20) / 0.1);
warn += ((bonusNoFren * 60 * 15) / 0.15);
}
var caut = warn * 7;
var amount = Game.cookies - price;
@@ -2035,7 +2035,7 @@ CM.ReplaceNative = function() {
Game.RebuildUpgrades = function() {
CM.Backup.RebuildUpgrades();
CM.Disp.AddTooltipUpgrade();
Game.recalculateGains = 1;
Game.CalculateGains();
}
CM.Backup.UpdateMenu = Game.UpdateMenu;
@@ -2148,7 +2148,7 @@ CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, UpBar
CM.ConfigPrefix = 'CMConfig';
CM.VersionMajor = '2';
CM.VersionMinor = '1';
CM.VersionMinor = '2';
/*******
* Sim *

2
src/Disp.js
View File

@@ -1459,7 +1459,7 @@ CM.Disp.UpdateTooltip = function() {
if (Game.frenzy > 0) {
bonusNoFren /= Game.frenzyPower;
}
warn += ((bonusNoFren * 60 * 20) / 0.1);
warn += ((bonusNoFren * 60 * 15) / 0.15);
}
var caut = warn * 7;
var amount = Game.cookies - price;

4
src/Main.js
View File

@@ -54,7 +54,7 @@ CM.ReplaceNative = function() {
Game.RebuildUpgrades = function() {
CM.Backup.RebuildUpgrades();
CM.Disp.AddTooltipUpgrade();
Game.recalculateGains = 1;
Game.CalculateGains();
}
CM.Backup.UpdateMenu = Game.UpdateMenu;
@@ -167,5 +167,5 @@ CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, UpBar
CM.ConfigPrefix = 'CMConfig';
CM.VersionMajor = '2';
CM.VersionMinor = '1';
CM.VersionMinor = '2';