From 0171732e7066128018f830ce7c74301604588e2d Mon Sep 17 00:00:00 2001
From: Daniel van Noord <danielvannoord@me.com>
Date: Wed, 27 Jan 2021 21:30:50 +0100
Subject: [PATCH] Made Grimoire tooltip always launch

---
 CookieMonster.js | 11 ++---------
 src/Main.js      | 18 ++++++------------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/CookieMonster.js b/CookieMonster.js
index 709f3aa..3048252 100644
--- a/CookieMonster.js
+++ b/CookieMonster.js
@@ -4091,15 +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
-	// TODO!
-	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();
@@ -4326,6 +4317,8 @@ CM.Main.ReplaceTooltips = function() {
 	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 011f8cf..06265b7 100644
--- a/src/Main.js
+++ b/src/Main.js
@@ -41,15 +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
-	// TODO!
-	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();
@@ -269,13 +260,16 @@ CM.DelayInit = function() {
  */
 CM.Main.ReplaceTooltips = function() {
 	CM.Main.ReplaceTooltipBuild();
-	CM.Main.ReplaceTooltipLump();
-	CM.Main.ReplaceTooltipGrimoire();
-	
+	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();
 }