From 9371c878ec21bc5499cb9d19c1e515a7cc9d51cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Fr=C3=B6hle?= Date: Wed, 13 Feb 2019 18:50:07 +0100 Subject: [PATCH] fix add mission when gefangene --- dist/autoloader.js | 2 +- dist/autoloaderV2.js | 10 +++++----- src/autoloaderV2.js | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dist/autoloader.js b/dist/autoloader.js index 5400f21..f160a45 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -1,4 +1,4 @@ -/*Generated on:Wed Feb 13 2019 18:37:07 GMT+0100 (CET)*/ +/*Generated on:Wed Feb 13 2019 18:50:07 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 171a9b3..7f35b8d 100644 --- a/dist/autoloaderV2.js +++ b/dist/autoloaderV2.js @@ -1,4 +1,4 @@ -/*Generated on:Wed Feb 13 2019 18:37:07 GMT+0100 (CET)*/ +/*Generated on:Wed Feb 13 2019 18:50:07 GMT+0100 (CET)*/ /* * Dexie.js - a minimalistic wrapper for IndexedDB * =============================================== @@ -17897,7 +17897,7 @@ setInterval(function () { let self = this; self.ADisSettings.runner.forEach((runner) => { - self.OpenNextMission.call(self,runner) + self.OpenNextMission.call(self, runner) }) }.bind(self), 1000); }, 500); @@ -18906,7 +18906,7 @@ if (count > 0) { return Missions.each((MyMission) => { var MissionElement = $("#mission_" + MyMission.missionID); - if (MissionElement.length == 0 || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_green') || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_yellow')) { + if (MissionElement.length == 0 || MissionElement.text().match(/Gefangene sollen abtransportiert werden/g) || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_green') || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_yellow')) { // remove //console.log("Remove :", MyMission) self.RemoveMissionsFromQueue(MyMission.missionID) @@ -18918,14 +18918,14 @@ }).then(() => { if (typeof MissionID != 'undefined') { - if (!($('#mission_panel_' + MissionID).hasClass('mission_panel_green') && $('#mission_panel_' + MissionID).hasClass('mission_panel_yellow'))) { + if ($('#mission_panel_' + MissionID).hasClass('mission_panel_red') && !$("#mission_" + MissionID).text().match(/Gefangene sollen abtransportiert werden/g)) { return self.AddMission(MissionID, Runner); } } else { return self.ADisSettings.runner_divs.forEach((RunnerX, index) => { $("#" + RunnerX).find(".missionSideBarEntry").each((index, elem) => { MissionID = $(elem).attr("mission_id"); - if (!($('#mission_panel_' + MissionID).hasClass('mission_panel_green') && $('#mission_panel_' + MissionID).hasClass('mission_panel_yellow'))) { + if ($('#mission_panel_' + MissionID).hasClass('mission_panel_red') && !$("#mission_" + MissionID).text().match(/Gefangene sollen abtransportiert werden/g)) { return self.AddMission(MissionID, RunnerX); } return true; diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js index 3e16597..19db948 100644 --- a/src/autoloaderV2.js +++ b/src/autoloaderV2.js @@ -141,7 +141,7 @@ setInterval(function () { let self = this; self.ADisSettings.runner.forEach((runner) => { - self.OpenNextMission.call(self,runner) + self.OpenNextMission.call(self, runner) }) }.bind(self), 1000); }, 500); @@ -916,7 +916,7 @@ if (count > 0) { return Missions.each((MyMission) => { var MissionElement = $("#mission_" + MyMission.missionID); - if (MissionElement.length == 0 || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_green') || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_yellow')) { + if (MissionElement.length == 0 || MissionElement.text().match(/Gefangene sollen abtransportiert werden/g) || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_green') || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_yellow')) { // remove //console.log("Remove :", MyMission) self.RemoveMissionsFromQueue(MyMission.missionID) @@ -928,14 +928,14 @@ }).then(() => { if (typeof MissionID != 'undefined') { - if (!($('#mission_panel_' + MissionID).hasClass('mission_panel_green') && $('#mission_panel_' + MissionID).hasClass('mission_panel_yellow'))) { + if ($('#mission_panel_' + MissionID).hasClass('mission_panel_red') && !$("#mission_" + MissionID).text().match(/Gefangene sollen abtransportiert werden/g)) { return self.AddMission(MissionID, Runner); } } else { return self.ADisSettings.runner_divs.forEach((RunnerX, index) => { $("#" + RunnerX).find(".missionSideBarEntry").each((index, elem) => { MissionID = $(elem).attr("mission_id"); - if (!($('#mission_panel_' + MissionID).hasClass('mission_panel_green') && $('#mission_panel_' + MissionID).hasClass('mission_panel_yellow'))) { + if ($('#mission_panel_' + MissionID).hasClass('mission_panel_red') && !$("#mission_" + MissionID).text().match(/Gefangene sollen abtransportiert werden/g)) { return self.AddMission(MissionID, RunnerX); } return true;