Jomaar/automatic-dispose
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix ReadAndAddMissions Runner target to runner conversation bug

Browse Source
This commit is contained in:
Josef Fröhle
2019-02-20 00:40:34 +01:00
parent 20cebee12d
commit 5e938178a2
3 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/autoloader.js
Vendored
+1 -1
View File
@@ -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_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();
dist/autoloaderV2.js
Vendored
+11 -6
View File
@@ -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 * Dexie.js - a minimalistic wrapper for IndexedDB
* =============================================== * ===============================================
@@ -4513,8 +4513,11 @@ class AutomaticDisposeFaye {
} }
replaceWithPrefix(data) { 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') .replaceAll('"window.user_id"', 'user_id')
// here we can use sort
.replaceAll('allianceChat', 'this.allianceChat') .replaceAll('allianceChat', 'this.allianceChat')
.replaceAll('mission_participation_add', 'this.mission_participation_add') .replaceAll('mission_participation_add', 'this.mission_participation_add')
.replaceAll('missionDelete', 'this.missionDelete') .replaceAll('missionDelete', 'this.missionDelete')
@@ -4522,11 +4525,11 @@ class AutomaticDisposeFaye {
.replaceAll('missionInvolved', 'this.missionInvolved') .replaceAll('missionInvolved', 'this.missionInvolved')
.replaceAll('missionMarkerAdd', 'this.missionMarkerAdd') .replaceAll('missionMarkerAdd', 'this.missionMarkerAdd')
.replaceAll('patientDelete', 'this.patientDelete') .replaceAll('patientDelete', 'this.patientDelete')
.replaceAll('patientFinish','this.patientFinish') .replaceAll('patientFinish', 'this.patientFinish')
.replaceAll('prisonerDelete','this.prisonerDelete') .replaceAll('prisonerDelete', 'this.prisonerDelete')
.replaceAll('prisonerMarkerAdd', 'this.prisonerMarkerAdd') .replaceAll('prisonerMarkerAdd', 'this.prisonerMarkerAdd')
.replaceAll('radioMessage', 'this.radioMessage') .replaceAll('radioMessage', 'this.radioMessage')
.replaceAll('subscribe','this.subscribe') .replaceAll('subscribe', 'this.subscribe')
.replaceAll('vehicleDrive', 'this.vehicleDrive') .replaceAll('vehicleDrive', 'this.vehicleDrive')
.replaceAll('vehicleMarkerAdd', 'this.vehicleMarkerAdd') .replaceAll('vehicleMarkerAdd', 'this.vehicleMarkerAdd')
} }
@@ -19151,8 +19154,10 @@ class AutomaticDispose {
}).then(() => { }).then(() => {
if (typeof MissionID != 'undefined') { 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)) { 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 { } else {
return self.ADisSettings.runner_divs.forEach((RunnerX, index) => { return self.ADisSettings.runner_divs.forEach((RunnerX, index) => {
src/autoloaderV2.js
+10 -5
View File
@@ -38,8 +38,11 @@ class AutomaticDisposeFaye {
} }
replaceWithPrefix(data) { 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') .replaceAll('"window.user_id"', 'user_id')
// here we can use sort
.replaceAll('allianceChat', 'this.allianceChat') .replaceAll('allianceChat', 'this.allianceChat')
.replaceAll('mission_participation_add', 'this.mission_participation_add') .replaceAll('mission_participation_add', 'this.mission_participation_add')
.replaceAll('missionDelete', 'this.missionDelete') .replaceAll('missionDelete', 'this.missionDelete')
@@ -47,11 +50,11 @@ class AutomaticDisposeFaye {
.replaceAll('missionInvolved', 'this.missionInvolved') .replaceAll('missionInvolved', 'this.missionInvolved')
.replaceAll('missionMarkerAdd', 'this.missionMarkerAdd') .replaceAll('missionMarkerAdd', 'this.missionMarkerAdd')
.replaceAll('patientDelete', 'this.patientDelete') .replaceAll('patientDelete', 'this.patientDelete')
.replaceAll('patientFinish','this.patientFinish') .replaceAll('patientFinish', 'this.patientFinish')
.replaceAll('prisonerDelete','this.prisonerDelete') .replaceAll('prisonerDelete', 'this.prisonerDelete')
.replaceAll('prisonerMarkerAdd', 'this.prisonerMarkerAdd') .replaceAll('prisonerMarkerAdd', 'this.prisonerMarkerAdd')
.replaceAll('radioMessage', 'this.radioMessage') .replaceAll('radioMessage', 'this.radioMessage')
.replaceAll('subscribe','this.subscribe') .replaceAll('subscribe', 'this.subscribe')
.replaceAll('vehicleDrive', 'this.vehicleDrive') .replaceAll('vehicleDrive', 'this.vehicleDrive')
.replaceAll('vehicleMarkerAdd', 'this.vehicleMarkerAdd') .replaceAll('vehicleMarkerAdd', 'this.vehicleMarkerAdd')
} }
@@ -1118,8 +1121,10 @@ class AutomaticDispose {
}).then(() => { }).then(() => {
if (typeof MissionID != 'undefined') { 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)) { 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 { } else {
return self.ADisSettings.runner_divs.forEach((RunnerX, index) => { return self.ADisSettings.runner_divs.forEach((RunnerX, index) => {