diff --git a/dist/autoloader.js b/dist/autoloader.js index 214c720..d66c06f 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -1,4 +1,4 @@ -/*Generated on:Wed Feb 20 2019 00:34:31 GMT+0100 (CET)*/ +/*Generated on:Wed Feb 20 2019 00:40:34 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 3276742..8df56a3 100644 --- a/dist/autoloaderV2.js +++ b/dist/autoloaderV2.js @@ -1,4 +1,4 @@ -/*Generated on:Wed Feb 20 2019 00:34:31 GMT+0100 (CET)*/ +/*Generated on:Wed Feb 20 2019 00:40:34 GMT+0100 (CET)*/ /* * Dexie.js - a minimalistic wrapper for IndexedDB * =============================================== @@ -4513,8 +4513,11 @@ class AutomaticDisposeFaye { } replaceWithPrefix(data) { - return data.replaceAll('user_id', 'window.user_id').replaceAll('patientMarkerAddCombined', 'this.patientMarkerCombinedAdd').replaceAll('patientMarkerAdd', 'this.patientMarkerAdd') + return data.replaceAll('user_id', 'window.user_id') + .replaceAll('patientMarkerAddCombined', 'this.patientMarkerCombinedAdd') + .replaceAll('patientMarkerAdd', 'this.patientMarkerAdd') .replaceAll('"window.user_id"', 'user_id') + // here we can use sort .replaceAll('allianceChat', 'this.allianceChat') .replaceAll('mission_participation_add', 'this.mission_participation_add') .replaceAll('missionDelete', 'this.missionDelete') @@ -4522,11 +4525,11 @@ class AutomaticDisposeFaye { .replaceAll('missionInvolved', 'this.missionInvolved') .replaceAll('missionMarkerAdd', 'this.missionMarkerAdd') .replaceAll('patientDelete', 'this.patientDelete') - .replaceAll('patientFinish','this.patientFinish') - .replaceAll('prisonerDelete','this.prisonerDelete') + .replaceAll('patientFinish', 'this.patientFinish') + .replaceAll('prisonerDelete', 'this.prisonerDelete') .replaceAll('prisonerMarkerAdd', 'this.prisonerMarkerAdd') .replaceAll('radioMessage', 'this.radioMessage') - .replaceAll('subscribe','this.subscribe') + .replaceAll('subscribe', 'this.subscribe') .replaceAll('vehicleDrive', 'this.vehicleDrive') .replaceAll('vehicleMarkerAdd', 'this.vehicleMarkerAdd') } @@ -19151,8 +19154,10 @@ class AutomaticDispose { }).then(() => { if (typeof MissionID != 'undefined') { + const runnerID = self.ADisSettings.runner_divs.indexOf(Runner); + const runnerOpt = self.ADisSettings.runner[runnerID]; if ($('#mission_panel_' + MissionID).hasClass('mission_panel_red') && !$("#mission_" + MissionID).text().match(/Gefangene sollen abtransportiert werden/g)) { - return self.AddMission(MissionID, Runner); + return self.AddMission(MissionID, runnerOpt); } } else { return self.ADisSettings.runner_divs.forEach((RunnerX, index) => { diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js index 2deee2c..81f54f5 100644 --- a/src/autoloaderV2.js +++ b/src/autoloaderV2.js @@ -38,8 +38,11 @@ class AutomaticDisposeFaye { } replaceWithPrefix(data) { - return data.replaceAll('user_id', 'window.user_id').replaceAll('patientMarkerAddCombined', 'this.patientMarkerCombinedAdd').replaceAll('patientMarkerAdd', 'this.patientMarkerAdd') + return data.replaceAll('user_id', 'window.user_id') + .replaceAll('patientMarkerAddCombined', 'this.patientMarkerCombinedAdd') + .replaceAll('patientMarkerAdd', 'this.patientMarkerAdd') .replaceAll('"window.user_id"', 'user_id') + // here we can use sort .replaceAll('allianceChat', 'this.allianceChat') .replaceAll('mission_participation_add', 'this.mission_participation_add') .replaceAll('missionDelete', 'this.missionDelete') @@ -47,11 +50,11 @@ class AutomaticDisposeFaye { .replaceAll('missionInvolved', 'this.missionInvolved') .replaceAll('missionMarkerAdd', 'this.missionMarkerAdd') .replaceAll('patientDelete', 'this.patientDelete') - .replaceAll('patientFinish','this.patientFinish') - .replaceAll('prisonerDelete','this.prisonerDelete') + .replaceAll('patientFinish', 'this.patientFinish') + .replaceAll('prisonerDelete', 'this.prisonerDelete') .replaceAll('prisonerMarkerAdd', 'this.prisonerMarkerAdd') .replaceAll('radioMessage', 'this.radioMessage') - .replaceAll('subscribe','this.subscribe') + .replaceAll('subscribe', 'this.subscribe') .replaceAll('vehicleDrive', 'this.vehicleDrive') .replaceAll('vehicleMarkerAdd', 'this.vehicleMarkerAdd') } @@ -1118,8 +1121,10 @@ class AutomaticDispose { }).then(() => { if (typeof MissionID != 'undefined') { + const runnerID = self.ADisSettings.runner_divs.indexOf(Runner); + const runnerOpt = self.ADisSettings.runner[runnerID]; if ($('#mission_panel_' + MissionID).hasClass('mission_panel_red') && !$("#mission_" + MissionID).text().match(/Gefangene sollen abtransportiert werden/g)) { - return self.AddMission(MissionID, Runner); + return self.AddMission(MissionID, runnerOpt); } } else { return self.ADisSettings.runner_divs.forEach((RunnerX, index) => {