diff --git a/dist/autoloader.js b/dist/autoloader.js index 77e0422..f80854e 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -1,4 +1,4 @@ -/*Generated on:Sat Dec 01 2018 14:26:28 GMT+0100 (CET)*/ +/*Generated on:Sat Dec 01 2018 14:31:25 GMT+0100 (CET)*/ var AutomaticDispose_Branch = "master"; var AutomaticDispose_URL = "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/"; var da_lss_adis_time = new Date().getTime(); diff --git a/dist/autoloaderV2.js b/dist/autoloaderV2.js index 74f3c17..e9496fe 100644 --- a/dist/autoloaderV2.js +++ b/dist/autoloaderV2.js @@ -1,4 +1,4 @@ -/*Generated on:Sat Dec 01 2018 14:26:28 GMT+0100 (CET)*/ +/*Generated on:Sat Dec 01 2018 14:31:25 GMT+0100 (CET)*/ /* * Dexie.js - a minimalistic wrapper for IndexedDB * =============================================== @@ -17007,7 +17007,7 @@ class AutomaticDispose { this.ADisDB.open().catch((err) => { console.error(err.stack || err); }); - this.ADisDB.on("ready", () => { + this.ADisDB.on("ready", async () => { self.adis_settings = { 'Krankentransport-Automatic': false, 'Sprechwunsch-Automatic': false, @@ -17015,7 +17015,7 @@ class AutomaticDispose { 'Alliance-Automatic': false, 'AllianceEvent-Automatic': false } - self.genSettings() + await self.genSettings() setInterval(self.genSettings.bind(self), 1000); if (window.location.pathname === "/" || window.location.pathname === "/#") { @@ -17026,9 +17026,13 @@ class AutomaticDispose { self.CollectRescueSprechwuensche(); setInterval(self.CollectPoliceSprechwuensche.bind(self), 2500); setInterval(self.OpenNextPoliceSprechwunsch.bind(self), 5000); - self.CollectPoliceSprechwuensche(); - self.CollectMissions(); - self.ReadAndAddMissions(); + + setTimeout(() => { + self.CollectPoliceSprechwuensche(); + self.CollectMissions(); + self.ReadAndAddMissions(); + }, 500); + self.ADisSettings.runner.forEach((runner) => { self.OpenNextMission(runner) }) @@ -17066,7 +17070,7 @@ class AutomaticDispose { genSettings() { let self = this; - self.ADisDB.ADisSettings.each((setting) => { + return self.ADisDB.ADisSettings.each((setting) => { self.adis_settings[setting.name] = setting.value; }); } @@ -18029,9 +18033,13 @@ class AutomaticDispose { const settingOpt = self.ADisSettings.runner_settings[runnerID]; const runnerOpt = self.ADisSettings.runner[runnerID]; - console.table({runnerID:runnerID,settingOpt:settingOpt,runnerOpt:runnerOpt}); + console.table({ + runnerID: runnerID, + settingOpt: settingOpt, + runnerOpt: runnerOpt + }); return self.ADSettings().then((setting) => { - console.log('setting',setting[settingOpt]); + console.log('setting', setting[settingOpt]); if (setting[settingOpt] == 'true') { return self.ADisDB.ADisMissions.where({ missionID: ID, diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js index fe7899b..5058b59 100644 --- a/src/autoloaderV2.js +++ b/src/autoloaderV2.js @@ -114,7 +114,7 @@ class AutomaticDispose { this.ADisDB.open().catch((err) => { console.error(err.stack || err); }); - this.ADisDB.on("ready", () => { + this.ADisDB.on("ready", async () => { self.adis_settings = { 'Krankentransport-Automatic': false, 'Sprechwunsch-Automatic': false, @@ -122,7 +122,7 @@ class AutomaticDispose { 'Alliance-Automatic': false, 'AllianceEvent-Automatic': false } - self.genSettings() + await self.genSettings() setInterval(self.genSettings.bind(self), 1000); if (window.location.pathname === "/" || window.location.pathname === "/#") { @@ -133,9 +133,13 @@ class AutomaticDispose { self.CollectRescueSprechwuensche(); setInterval(self.CollectPoliceSprechwuensche.bind(self), 2500); setInterval(self.OpenNextPoliceSprechwunsch.bind(self), 5000); - self.CollectPoliceSprechwuensche(); - self.CollectMissions(); - self.ReadAndAddMissions(); + + setTimeout(() => { + self.CollectPoliceSprechwuensche(); + self.CollectMissions(); + self.ReadAndAddMissions(); + }, 500); + self.ADisSettings.runner.forEach((runner) => { self.OpenNextMission(runner) }) @@ -173,7 +177,7 @@ class AutomaticDispose { genSettings() { let self = this; - self.ADisDB.ADisSettings.each((setting) => { + return self.ADisDB.ADisSettings.each((setting) => { self.adis_settings[setting.name] = setting.value; }); } @@ -902,9 +906,13 @@ class AutomaticDispose { const settingOpt = self.ADisSettings.runner_settings[runnerID]; const runnerOpt = self.ADisSettings.runner[runnerID]; - console.table({runnerID:runnerID,settingOpt:settingOpt,runnerOpt:runnerOpt}); + console.table({ + runnerID: runnerID, + settingOpt: settingOpt, + runnerOpt: runnerOpt + }); return self.ADSettings().then((setting) => { - console.log('setting',setting[settingOpt]); + console.log('setting', setting[settingOpt]); if (setting[settingOpt] == 'true') { return self.ADisDB.ADisMissions.where({ missionID: ID,