v2 iaoijfaofijaovopy

This commit is contained in:
2018-12-01 14:31:25 +01:00
parent 8488772173
commit 8cb3351897
3 changed files with 34 additions and 18 deletions
+1 -1
View File
@@ -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_Branch = "master";
var AutomaticDispose_URL = "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/"; var AutomaticDispose_URL = "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/";
var da_lss_adis_time = new Date().getTime(); var da_lss_adis_time = new Date().getTime();
+14 -6
View File
@@ -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 * Dexie.js - a minimalistic wrapper for IndexedDB
* =============================================== * ===============================================
@@ -17007,7 +17007,7 @@ class AutomaticDispose {
this.ADisDB.open().catch((err) => { this.ADisDB.open().catch((err) => {
console.error(err.stack || err); console.error(err.stack || err);
}); });
this.ADisDB.on("ready", () => { this.ADisDB.on("ready", async () => {
self.adis_settings = { self.adis_settings = {
'Krankentransport-Automatic': false, 'Krankentransport-Automatic': false,
'Sprechwunsch-Automatic': false, 'Sprechwunsch-Automatic': false,
@@ -17015,7 +17015,7 @@ class AutomaticDispose {
'Alliance-Automatic': false, 'Alliance-Automatic': false,
'AllianceEvent-Automatic': false 'AllianceEvent-Automatic': false
} }
self.genSettings() await self.genSettings()
setInterval(self.genSettings.bind(self), 1000); setInterval(self.genSettings.bind(self), 1000);
if (window.location.pathname === "/" || window.location.pathname === "/#") { if (window.location.pathname === "/" || window.location.pathname === "/#") {
@@ -17026,9 +17026,13 @@ class AutomaticDispose {
self.CollectRescueSprechwuensche(); self.CollectRescueSprechwuensche();
setInterval(self.CollectPoliceSprechwuensche.bind(self), 2500); setInterval(self.CollectPoliceSprechwuensche.bind(self), 2500);
setInterval(self.OpenNextPoliceSprechwunsch.bind(self), 5000); setInterval(self.OpenNextPoliceSprechwunsch.bind(self), 5000);
setTimeout(() => {
self.CollectPoliceSprechwuensche(); self.CollectPoliceSprechwuensche();
self.CollectMissions(); self.CollectMissions();
self.ReadAndAddMissions(); self.ReadAndAddMissions();
}, 500);
self.ADisSettings.runner.forEach((runner) => { self.ADisSettings.runner.forEach((runner) => {
self.OpenNextMission(runner) self.OpenNextMission(runner)
}) })
@@ -17066,7 +17070,7 @@ class AutomaticDispose {
genSettings() { genSettings() {
let self = this; let self = this;
self.ADisDB.ADisSettings.each((setting) => { return self.ADisDB.ADisSettings.each((setting) => {
self.adis_settings[setting.name] = setting.value; self.adis_settings[setting.name] = setting.value;
}); });
} }
@@ -18029,9 +18033,13 @@ class AutomaticDispose {
const settingOpt = self.ADisSettings.runner_settings[runnerID]; const settingOpt = self.ADisSettings.runner_settings[runnerID];
const runnerOpt = self.ADisSettings.runner[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) => { return self.ADSettings().then((setting) => {
console.log('setting',setting[settingOpt]); console.log('setting', setting[settingOpt]);
if (setting[settingOpt] == 'true') { if (setting[settingOpt] == 'true') {
return self.ADisDB.ADisMissions.where({ return self.ADisDB.ADisMissions.where({
missionID: ID, missionID: ID,
+13 -5
View File
@@ -114,7 +114,7 @@ class AutomaticDispose {
this.ADisDB.open().catch((err) => { this.ADisDB.open().catch((err) => {
console.error(err.stack || err); console.error(err.stack || err);
}); });
this.ADisDB.on("ready", () => { this.ADisDB.on("ready", async () => {
self.adis_settings = { self.adis_settings = {
'Krankentransport-Automatic': false, 'Krankentransport-Automatic': false,
'Sprechwunsch-Automatic': false, 'Sprechwunsch-Automatic': false,
@@ -122,7 +122,7 @@ class AutomaticDispose {
'Alliance-Automatic': false, 'Alliance-Automatic': false,
'AllianceEvent-Automatic': false 'AllianceEvent-Automatic': false
} }
self.genSettings() await self.genSettings()
setInterval(self.genSettings.bind(self), 1000); setInterval(self.genSettings.bind(self), 1000);
if (window.location.pathname === "/" || window.location.pathname === "/#") { if (window.location.pathname === "/" || window.location.pathname === "/#") {
@@ -133,9 +133,13 @@ class AutomaticDispose {
self.CollectRescueSprechwuensche(); self.CollectRescueSprechwuensche();
setInterval(self.CollectPoliceSprechwuensche.bind(self), 2500); setInterval(self.CollectPoliceSprechwuensche.bind(self), 2500);
setInterval(self.OpenNextPoliceSprechwunsch.bind(self), 5000); setInterval(self.OpenNextPoliceSprechwunsch.bind(self), 5000);
setTimeout(() => {
self.CollectPoliceSprechwuensche(); self.CollectPoliceSprechwuensche();
self.CollectMissions(); self.CollectMissions();
self.ReadAndAddMissions(); self.ReadAndAddMissions();
}, 500);
self.ADisSettings.runner.forEach((runner) => { self.ADisSettings.runner.forEach((runner) => {
self.OpenNextMission(runner) self.OpenNextMission(runner)
}) })
@@ -173,7 +177,7 @@ class AutomaticDispose {
genSettings() { genSettings() {
let self = this; let self = this;
self.ADisDB.ADisSettings.each((setting) => { return self.ADisDB.ADisSettings.each((setting) => {
self.adis_settings[setting.name] = setting.value; self.adis_settings[setting.name] = setting.value;
}); });
} }
@@ -902,9 +906,13 @@ class AutomaticDispose {
const settingOpt = self.ADisSettings.runner_settings[runnerID]; const settingOpt = self.ADisSettings.runner_settings[runnerID];
const runnerOpt = self.ADisSettings.runner[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) => { return self.ADSettings().then((setting) => {
console.log('setting',setting[settingOpt]); console.log('setting', setting[settingOpt]);
if (setting[settingOpt] == 'true') { if (setting[settingOpt] == 'true') {
return self.ADisDB.ADisMissions.where({ return self.ADisDB.ADisMissions.where({
missionID: ID, missionID: ID,