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

Made Grimoire tooltip always launch

Browse Source
This commit is contained in:
Daniel van Noord
2021-01-27 21:30:50 +01:00
parent 00c513798a
commit 0171732e70
2 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
CookieMonster.js
View File

@@ -4091,15 +4091,6 @@ CM.ReplaceNative = function() {
l('bigCookie').removeEventListener('click', Game.ClickCookie, false); l('bigCookie').removeEventListener('click', Game.ClickCookie, false);
l('bigCookie').addEventListener('click', function() { CM.Main.FixMouseY(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; CM.Backup.RebuildUpgrades = Game.RebuildUpgrades;
Game.RebuildUpgrades = function() { Game.RebuildUpgrades = function() {
CM.Backup.RebuildUpgrades(); CM.Backup.RebuildUpgrades();
@@ -4326,6 +4317,8 @@ CM.Main.ReplaceTooltips = function() {
Game.LoadMinigames = function() { Game.LoadMinigames = function() {
CM.Backup.LoadMinigames(); CM.Backup.LoadMinigames();
CM.Main.ReplaceTooltipGarden(); CM.Main.ReplaceTooltipGarden();
CM.Main.ReplaceTooltipGrimoire()
CM.ReplaceNativeGrimoire();
} }
Game.LoadMinigames(); Game.LoadMinigames();
} }

18
src/Main.js
View File

@@ -41,15 +41,6 @@ CM.ReplaceNative = function() {
l('bigCookie').removeEventListener('click', Game.ClickCookie, false); l('bigCookie').removeEventListener('click', Game.ClickCookie, false);
l('bigCookie').addEventListener('click', function() { CM.Main.FixMouseY(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; CM.Backup.RebuildUpgrades = Game.RebuildUpgrades;
Game.RebuildUpgrades = function() { Game.RebuildUpgrades = function() {
CM.Backup.RebuildUpgrades(); CM.Backup.RebuildUpgrades();
@@ -269,13 +260,16 @@ CM.DelayInit = function() {
*/ */
CM.Main.ReplaceTooltips = function() { CM.Main.ReplaceTooltips = function() {
CM.Main.ReplaceTooltipBuild(); CM.Main.ReplaceTooltipBuild();
CM.Main.ReplaceTooltipLump(); CM.Main.ReplaceTooltipLump();
CM.Main.ReplaceTooltipGrimoire();
// 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; CM.Backup.LoadMinigames = Game.LoadMinigames;
Game.LoadMinigames = function() { Game.LoadMinigames = function() {
CM.Backup.LoadMinigames(); CM.Backup.LoadMinigames();
CM.Main.ReplaceTooltipGarden(); CM.Main.ReplaceTooltipGarden();
CM.Main.ReplaceTooltipGrimoire()
CM.ReplaceNativeGrimoire();
} }
Game.LoadMinigames(); Game.LoadMinigames();
} }