diff --git a/CookieMonster.js b/CookieMonster.js index 0ec298e..3048252 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -4091,14 +4091,6 @@ CM.ReplaceNative = function() { l('bigCookie').removeEventListener('click', Game.ClickCookie, false); l('bigCookie').addEventListener('click', function() { CM.Main.FixMouseY(Game.ClickCookie); }, false); - // Probably better to load per minigame - CM.Backup.scriptLoaded = Game.scriptLoaded; - Game.scriptLoaded = function(who, script) { - CM.Backup.scriptLoaded(who, script); - CM.Main.ReplaceTooltipGrimoire() - CM.ReplaceNativeGrimoire(); - } - CM.Backup.RebuildUpgrades = Game.RebuildUpgrades; Game.RebuildUpgrades = function() { CM.Backup.RebuildUpgrades(); @@ -4318,9 +4310,17 @@ CM.DelayInit = function() { */ CM.Main.ReplaceTooltips = function() { CM.Main.ReplaceTooltipBuild(); - CM.Main.ReplaceTooltipGrimoire(); CM.Main.ReplaceTooltipLump(); - CM.Main.ReplaceTooltipGarden(); + CM.Main.ReplaceTooltipGrimoire(); + + CM.Backup.LoadMinigames = Game.LoadMinigames; + Game.LoadMinigames = function() { + CM.Backup.LoadMinigames(); + CM.Main.ReplaceTooltipGarden(); + CM.Main.ReplaceTooltipGrimoire() + CM.ReplaceNativeGrimoire(); + } + Game.LoadMinigames(); } /******** diff --git a/src/Main.js b/src/Main.js index 9a8e75e..06265b7 100644 --- a/src/Main.js +++ b/src/Main.js @@ -41,14 +41,6 @@ CM.ReplaceNative = function() { l('bigCookie').removeEventListener('click', Game.ClickCookie, false); l('bigCookie').addEventListener('click', function() { CM.Main.FixMouseY(Game.ClickCookie); }, false); - // Probably better to load per minigame - CM.Backup.scriptLoaded = Game.scriptLoaded; - Game.scriptLoaded = function(who, script) { - CM.Backup.scriptLoaded(who, script); - CM.Main.ReplaceTooltipGrimoire() - CM.ReplaceNativeGrimoire(); - } - CM.Backup.RebuildUpgrades = Game.RebuildUpgrades; Game.RebuildUpgrades = function() { CM.Backup.RebuildUpgrades(); @@ -268,9 +260,18 @@ CM.DelayInit = function() { */ CM.Main.ReplaceTooltips = function() { CM.Main.ReplaceTooltipBuild(); - CM.Main.ReplaceTooltipGrimoire(); - CM.Main.ReplaceTooltipLump(); - CM.Main.ReplaceTooltipGarden(); + CM.Main.ReplaceTooltipLump(); + + // Replace Tooltips of Minigames. Nesting it in LoadMinigames makes sure to replace them even if + // they were not loaded initially + CM.Backup.LoadMinigames = Game.LoadMinigames; + Game.LoadMinigames = function() { + CM.Backup.LoadMinigames(); + CM.Main.ReplaceTooltipGarden(); + CM.Main.ReplaceTooltipGrimoire() + CM.ReplaceNativeGrimoire(); + } + Game.LoadMinigames(); } /********