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

Merge pull request #526 from DanielNoord/fix/gardentooltip

Browse Source 
Make tooltips be replaced even when minigames were not loaded initially
This commit is contained in:
DanielNoord authored and GitHub committed 2021-01-27 21:31:29 +01:00
2 parents abc7dce047 0171732e70
commit 5af7be93e3
2 files changed
+21 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

CookieMonster.js
+10 -10
View File
@@ -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();
}
/********
src/Main.js
+11 -10
View File
@@ -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();
// 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();
}
/********