Merge pull request #341 from umbralOptimatum/misc-improvements

Desktop bug fixes and scriptfixerupper support
Ephenia · Aug 17, 2023 · ca714ad · ca714ad
2 parents 47254d3 + efb0436
commit ca714ad
Show file tree

Hide file tree

Showing 21 changed files with 191 additions and 132 deletions.
diff --git a/additionalvisualsettings.user.js b/additionalvisualsettings.user.js
@@ -185,7 +185,6 @@ function initVisualSettings() {
     function overrideNotifications() {
         Notifier.oldNotifyAVS = Notifier.notify;
         Notifier.notify = function(...args) {
-        //    console.log(...args)
             if (avsDisableNotifications) {
                 if (args.length && args[0].sound) {
                     args[0].sound.play();
@@ -379,11 +378,15 @@ function loadSetting(key, defaultVal) {
 }
 
 function loadScript(){
-    var oldInit = Preload.hideSplashScreen;
-
-    Preload.hideSplashScreen = function() {
-        var result = oldInit.apply(this, arguments)
-        initVisualSettings();
+    const oldInit = Preload.hideSplashScreen;
+    var hasInitialized = false;
+
+    Preload.hideSplashScreen = function (...args) {
+        var result = oldInit.apply(this, args)
+        if (App.game && !hasInitialized) {
+            initVisualSettings();
+            hasInitialized = true;
+        }
         return result;
     }
 

diff --git a/autobattleitems.user.js b/autobattleitems.user.js
@@ -99,12 +99,16 @@ if (!localStorage.getItem('toggleABItems')) {
 battleItemState = JSON.parse(localStorage.getItem('autoBattleItems'));
 ItemABPrefs = JSON.parse(localStorage.getItem('toggleABItems'));
 
-function loadScript(){
-    var oldInit = Preload.hideSplashScreen
+function loadScript() {
+    const oldInit = Preload.hideSplashScreen;
+    var hasInitialized = false;
 
-    Preload.hideSplashScreen = function(){
-        var result = oldInit.apply(this, arguments)
-        initAutoBattleItems()
+    Preload.hideSplashScreen = function (...args) {
+        var result = oldInit.apply(this, args)
+        if (App.game && !hasInitialized) {
+            initAutoBattleItems();
+            hasInitialized = true;
+        }
         return result
     }
 }

diff --git a/catchfilterfantasia.user.js b/catchfilterfantasia.user.js
@@ -472,12 +472,16 @@ if (fixIt.length != 0) {
     localStorage.setItem('filterBallPref', JSON.stringify(filterBallPref));
 }
 
-function loadScript(){
-    var oldInit = Preload.hideSplashScreen
-
-    Preload.hideSplashScreen = function(){
-        var result = oldInit.apply(this, arguments)
-        initCatchFilter()
+function loadScript() {
+    const oldInit = Preload.hideSplashScreen;
+    var hasInitialized = false;
+
+    Preload.hideSplashScreen = function (...args) {
+        var result = oldInit.apply(this, args);
+        if (App.game && !hasInitialized) {
+            initCatchFilter();
+            hasInitialized = true;
+        }
         return result
     }
 }

diff --git a/custom/autoquestcompleter.user.js b/custom/autoquestcompleter.user.js
@@ -296,13 +296,16 @@ function loadSetting(key, defaultVal) {
     return val;
 }
 
-
 function loadScript(){
-    var oldInit = Preload.hideSplashScreen;
-
-    Preload.hideSplashScreen = function() {
-        var result = oldInit.apply(this, arguments);
-        initAutoQuest();
+    const oldInit = Preload.hideSplashScreen;
+    var hasInitialized = false;
+
+    Preload.hideSplashScreen = function (...args) {
+        var result = oldInit.apply(this, args);
+        if (App.game && !hasInitialized) {
+            initAutoQuest();
+            hasInitialized = true;
+        }
         return result;
     }
 }

diff --git a/custom/catchspeedadjuster.user.js b/custom/catchspeedadjuster.user.js
@@ -35,24 +35,20 @@ function initBallAdjust() {
     document.getElementById('pokeballSelectorBody').style.maxHeight = "285px";
     document.getElementById('ball-adjust').addEventListener('click', event => changeAdjust(event.target));
 
-    if (ballAdjuster == "true") {
+    if (ballAdjuster) {
         document.getElementById('ball-adjust').checked = true;
         catchDelay();
     }
 
     function changeAdjust(ele) {
-        if (ballAdjuster == "true") {
-            ballAdjuster = "false"
-        } else {
-            ballAdjuster = "true"
-        }
+        ballAdjuster = !ballAdjuster;
         localStorage.setItem("ballAdjuster", ballAdjuster);
         catchDelay();
     }
 
     function catchDelay() {
         for (var i = 0; i < getBalls.length; i++) {
-            if (ballAdjuster == "true") {
+            if (ballAdjuster) {
                 getBalls[i].catchTime = 0;
             } else {
                 getBalls[i].catchTime = defaultTime[i];
@@ -62,17 +58,21 @@ function initBallAdjust() {
 }
 
 if (localStorage.getItem('ballAdjuster') == null) {
-    localStorage.setItem("ballAdjuster", "false");
+    localStorage.setItem('ballAdjuster', 'false');
 }
-ballAdjuster = localStorage.getItem('ballAdjuster');
+ballAdjuster = localStorage.getItem('ballAdjuster') == 'true';
 
-function loadScript(){
-    var oldInit = Preload.hideSplashScreen
+function loadScript() {
+    const oldInit = Preload.hideSplashScreen;
+    var hasInitialized = false;
 
-    Preload.hideSplashScreen = function(){
-        var result = oldInit.apply(this, arguments)
-        initBallAdjust()
-        return result
+    Preload.hideSplashScreen = function (...args) {
+        var result = oldInit.apply(this, args);
+        if (App.game && !hasInitialized) {
+            initBallAdjust();
+            hasInitialized = true;
+        }
+        return result;
     }
 }
 

diff --git a/custom/challengemodechanger.user.js b/custom/challengemodechanger.user.js
@@ -55,13 +55,17 @@ function initChallenger() {
     }
 }
 
-function loadScript(){
-    var oldInit = Preload.hideSplashScreen
+function loadScript() {
+    const oldInit = Preload.hideSplashScreen;
+    var hasInitialized = false;
 
-    Preload.hideSplashScreen = function(){
-        var result = oldInit.apply(this, arguments)
-        initChallenger()
-        return result
+    Preload.hideSplashScreen = function (...args) {
+        var result = oldInit.apply(this, args);
+        if (App.game && !hasInitialized) {
+            initChallenger();
+            hasInitialized = true;
+        }
+        return result;
     }
 }
 

diff --git a/custom/discordcodegenerator.user.js b/custom/discordcodegenerator.user.js
@@ -23,6 +23,7 @@ var resCodes;
 var validPoke = [];
 
 function initCodeGen() {
+    App.game.discord.codes.forEach(e => validPoke.push(e.name));
     genCodes();
     const saveTab = document.getElementById('saveTab');
     var fragment = new DocumentFragment();
@@ -81,14 +82,17 @@ function randInt() {
     return Math.floor((Math.random() * 65536) + 1);
 }
 
-function loadScript(){
-    var oldInit = Preload.hideSplashScreen
+function loadScript() {
+    const oldInit = Preload.hideSplashScreen;
+    var hasInitialized = false;
 
-    Preload.hideSplashScreen = function(){
-        var result = oldInit.apply(this, arguments)
-        App.game.discord.codes.forEach(e => validPoke.push(e.name));
-        initCodeGen()
-        return result
+    Preload.hideSplashScreen = function (...args) {
+        var result = oldInit.apply(this, args);
+        if (App.game && !hasInitialized) {
+            initCodeGen();
+            hasInitialized = true;
+        }
+        return result;
     }
 }
 

diff --git a/custom/infiniteseasonalevents.user.js b/custom/infiniteseasonalevents.user.js
@@ -231,13 +231,17 @@ function toggleEvent() {
 }
 
 //Made this script load like the others for consistency
-function loadScript(){
-    var oldInit = Preload.hideSplashScreen
+function loadScript() {
+    const oldInit = Preload.hideSplashScreen;
+    var hasInitialized = false;
 
-    Preload.hideSplashScreen = function(){
-        var result = oldInit.apply(this, arguments)
-        initEvents()
-        return result
+    Preload.hideSplashScreen = function (...args) {
+        var result = oldInit.apply(this, args);
+        if (App.game && !hasInitialized) {
+            initEvents();
+            hasInitialized = true;
+        }
+        return result;
     }
 }
 

diff --git a/custom/oakitemsunlimited.user.js b/custom/oakitemsunlimited.user.js
@@ -30,13 +30,17 @@ function initOakItems() {
     document.getElementById('oakItemsModal').querySelector('h5').innerHTML = "Oak Items Equipped: " + oakItems.activeCount() + '/' + oakMax;
 }
 
-function loadScript(){
-    var oldInit = Preload.hideSplashScreen
+function loadScript() {
+    const oldInit = Preload.hideSplashScreen;
+    hasInitialized = false;
 
-    Preload.hideSplashScreen = function(){
-        var result = oldInit.apply(this, arguments)
-        initOakItems()
-        return result
+    Preload.hideSplashScreen = function (...args) {
+        var result = oldInit.apply(this, args);
+        if (App.game && !hasInitialized) {
+            initOakItems();
+            hasInitialized = true;
+        }
+        return result;
     }
 }
 

diff --git a/custom/omegaproteingains.user.js b/custom/omegaproteingains.user.js
@@ -65,12 +65,16 @@ function initOmegaProtein() {
 }
 
 function loadScript() {
-    var oldInit = Preload.hideSplashScreen
+    const oldInit = Preload.hideSplashScreen;
+    var hasInitialized = false;
 
-    Preload.hideSplashScreen = function () {
-        var result = oldInit.apply(this, arguments)
-        initOmegaProtein()
-        return result
+    Preload.hideSplashScreen = function (...args) {
+        var result = oldInit.apply(this, args)
+        if (App.game && !hasInitialized) {
+            initOmegaProtein();
+            hasInitialized = true;
+        }
+        return result;
     }
 }
 

diff --git a/custom/overnightberrygrowth.user.js b/custom/overnightberrygrowth.user.js
@@ -208,10 +208,14 @@ if (![0, 1, 2].includes(overnightGrowthMode)) {
 
 function loadScript() {
     const oldInit = Preload.hideSplashScreen;
+    var hasInitialized = false;
 
-    Preload.hideSplashScreen = function () {
-        var result = oldInit.apply(this, arguments);
-        initSettings();
+    Preload.hideSplashScreen = function (...args) {
+        var result = oldInit.apply(this, args);
+        if (App.game && !hasInitialized) {
+            initSettings();
+            hasInitialized = true;
+        }
         return result;
     }
 }

diff --git a/custom/perkypokeruspandemic.user.js b/custom/perkypokeruspandemic.user.js
@@ -41,13 +41,17 @@ function initPokerusPandemic() {
     }
 }
 
-function loadScript(){
-    var oldInit = Preload.hideSplashScreen
+function loadScript() {
+    const oldInit = Preload.hideSplashScreen;
+    var hasInitialized = false;
 
-    Preload.hideSplashScreen = function(){
-        var result = oldInit.apply(this, arguments)
-        initPokerusPandemic()
-        return result
+    Preload.hideSplashScreen = function (...args) {
+        var result = oldInit.apply(this, args);
+        if (App.game && !hasInitialized) {
+            initPokerusPandemic();
+            hasInitialized = true;
+        }
+        return result;
     }
 }
 

diff --git a/custom/simpleweatherchanger.user.js b/custom/simpleweatherchanger.user.js
@@ -59,12 +59,16 @@ function overrideGenerateWeather() {
     }
 }
 
-function loadScript(){
-    var oldInit = Preload.hideSplashScreen;
+function loadScript() {
+    const oldInit = Preload.hideSplashScreen;
+    var hasInitialized = false;
 
-    Preload.hideSplashScreen = function() {
-        var result = oldInit.apply(this, arguments);
-        initWeatherChange();
+    Preload.hideSplashScreen = function (...args) {
+        var result = oldInit.apply(this, args);
+        if (App.game && !hasInitialized) {
+            initWeatherChange();
+            hasInitialized = true;
+        }
         return result;
     }
 }

diff --git a/custom/syntheticshinysynapse.user.js b/custom/syntheticshinysynapse.user.js
@@ -336,12 +336,16 @@ karmaRates = JSON.parse(localStorage.getItem('shinyKarmaRates'));
 shinyDOMUpdate = JSON.parse(localStorage.getItem('shinyDOMUpdate'));
 
 function loadScript() {
-    var oldInit = Preload.hideSplashScreen
-
-    Preload.hideSplashScreen = function () {
-        var result = oldInit.apply(this, arguments)
-        initShinySynapse()
-        return result
+    const oldInit = Preload.hideSplashScreen;
+    var hasInitialized = false;
+
+    Preload.hideSplashScreen = function (...args) {
+        var result = oldInit.apply(this, args);
+        if (App.game && !hasInitialized) {
+            initShinySynapse();
+            hasInitialized = true;
+        }
+        return result;
     }
 }
 

diff --git a/desktop/app.asar b/desktop/app.asar
diff --git a/desktop/app_src/src/main.js b/desktop/app_src/src/main.js
@@ -824,8 +824,8 @@ function startEpheniaScripts() {
       externalResolve = resolve;
     });
     const startApp = App.start.bind(App)
-    App.start = function start() {
-      allScriptsDone.finally(() => startApp());
+    App.start = function start(...args) {
+      allScriptsDone.finally(() => startApp(args));
     }
     return externalResolve;
   })();`);

diff --git a/enhancedautoclicker.user.js b/enhancedautoclicker.user.js
@@ -1081,10 +1081,14 @@ addGraphicsBindings();
 
 function loadScript() {
     const oldInit = Preload.hideSplashScreen;
+    var hasInitialized = false;
 
-    Preload.hideSplashScreen = function () {
-        var result = oldInit.apply(this, arguments);
-        initAutoClicker();
+    Preload.hideSplashScreen = function (...args) {
+        var result = oldInit.apply(this, args);
+        if (App.game && !hasInitialized) {
+            initAutoClicker();
+            hasInitialized = true;
+        }
         return result;
     }
 }