Hopefully to fix the crashing (part 3)

Hopefully to fix the crashing (part 2)
Hopefully to fix the crashing
2016-02-09 13:46:50 -05:00 · 2016-02-09 13:45:42 -05:00 · 2016-02-09 13:04:35 -05:00 · 2016-02-09 11:56:37 -05:00 · 2016-02-09 11:55:28 -05:00
3 changed files with 6 additions and 6 deletions
--- a/CookieMonster.js
+++ b/CookieMonster.js
@@ -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 *
--- a/src/Disp.js
+++ b/src/Disp.js
@@ -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;
--- a/src/Main.js
+++ b/src/Main.js
@@ -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';
Author	SHA1	Message	Date
Aktanusa	348c47e1dc	Hopefully to fix the crashing (part 3)	2016-02-09 13:46:50 -05:00
Aktanusa	6e09c8dafb	Hopefully to fix the crashing (part 2)	2016-02-09 13:45:42 -05:00
Aktanusa	f1a79cbaa3	Hopefully to fix the crashing	2016-02-09 13:04:35 -05:00
Aktanusa	5640cbb9c8	Version change to 2.2 (forgot to do this first so previous commit is under this version)	2016-02-09 11:56:37 -05:00
Aktanusa	6917e3139a	Fixed bug where Caut/Warn Tooltip calculation with bonus CPS didn't use the new Lucky reward way	2016-02-09 11:55:28 -05:00