This commit is contained in:
2018-11-24 16:01:16 +01:00
parent a255565c09
commit a89edfba3e
4 changed files with 52 additions and 18 deletions

35
dist/autoloader.js vendored
View File

@@ -1,4 +1,4 @@
/*Generated on:Sat Nov 24 2018 15:56:49 GMT+0100 (CET)*/ /*Generated on:Sat Nov 24 2018 16:01:15 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();
@@ -6351,16 +6351,25 @@ ADisDB.on("ready", () => {
function ADis_CollectRescueSprechwuensche() { function ADis_CollectRescueSprechwuensche() {
ADisDB.ADisSprechwunsch.where({ ADisDB.ADisSprechwunsch.where({
done: 'false' done: 'false'
}).each((Wunsch) => { }).then((Wunsch) => {
if ($("#vehicle_list_" + Wunsch.vehicleID).find(".building_list_fms").text() != "5") { if (Wunsch !== undefined) {
return ADis_RemoveRescueSprechwunschFromQueue(Wunsch.vehicleID); return Wunsch.count(function (count) {
if (count > 0) {
return Wunsch.each((myWunsch) => {
if ($("#vehicle_list_" + myWunsch.vehicleID).find(".building_list_fms").text() != "5") {
return ADis_RemoveRescueSprechwunschFromQueue(myWunsch.vehicleID);
}
})
}
})
} }
}).then(() => { }).then(() => {
$("#building_list").find(".building_list_vehicle_element").each(function () { $("#building_list").find(".building_list_vehicle_element").each(function () {
var VehicleStatus = $(this).find(".building_list_fms").text(); var VehicleStatus = $(this).find(".building_list_fms").text();
var VehicleType = Number(parseInt($(this).find("a").attr("vehicle_type_id"))); var VehicleType = Number(parseInt($(this).find("a").attr("vehicle_type_id")));
var VehicleID = $(this).attr("vehicle_id"); var VehicleID = $(this).attr("vehicle_id");
if (VehicleStatus == "5" && [32,52].indexOf(VehicleType) === -1) { if (VehicleStatus == "5" && [32, 52].indexOf(VehicleType) === -1) {
ADis_AddRescueSprechwunschToQueue(VehicleID); ADis_AddRescueSprechwunschToQueue(VehicleID);
} }
}); });
@@ -6427,10 +6436,18 @@ ADisDB.on("ready", () => {
function ADis_CollectPoliceSprechwuensche() { function ADis_CollectPoliceSprechwuensche() {
ADisDB.ADisSprechwunschPolice.where({ ADisDB.ADisSprechwunschPolice.where({
done: 'false' done: 'false'
}).each((Wunsch) => { }).then((Wunsch) => {
if (!$("#mission_" + Wunsch.missionID).text().match(/Gefangene sollen abtransportiert werden/g)) { if (Wunsch !== undefined) {
$("#mission_" + Wunsch.missionID).remove(); return Wunsch.count(function (count) {
return ADis_RemovePoliceSprechwunschFromQueue(Wunsch.missionID); if (count > 0) {
return Wunsch.each((myWunsch) => {
if (!$("#mission_" + myWunsch.missionID).text().match(/Gefangene sollen abtransportiert werden/g)) {
$("#mission_" + myWunsch.missionID).remove();
return ADis_RemovePoliceSprechwunschFromQueue(myWunsch.missionID);
}
});
}
})
} }
}).then(() => { }).then(() => {
var MOIODOS = $('div#mission_list div.missionSideBarEntry:visible'); var MOIODOS = $('div#mission_list div.missionSideBarEntry:visible');

2
dist/standalone.js vendored
View File

@@ -1,4 +1,4 @@
/*Generated on:Sat Nov 24 2018 15:56:49 GMT+0100 (CET)*/ /*Generated on:Sat Nov 24 2018 16:01:15 GMT+0100 (CET)*/
function includesString(string1, string2) { function includesString(string1, string2) {
return string1.toLowerCase().includes(string2.toLowerCase()); return string1.toLowerCase().includes(string2.toLowerCase());
} }

View File

@@ -15,10 +15,18 @@ $(document).ready(function () {
function ADis_CollectPoliceSprechwuensche() { function ADis_CollectPoliceSprechwuensche() {
ADisDB.ADisSprechwunschPolice.where({ ADisDB.ADisSprechwunschPolice.where({
done: 'false' done: 'false'
}).each((Wunsch) => { }).then((Wunsch) => {
if (!$("#mission_" + Wunsch.missionID).text().match(/Gefangene sollen abtransportiert werden/g)) { if (Wunsch !== undefined) {
$("#mission_" + Wunsch.missionID).remove(); return Wunsch.count(function (count) {
return ADis_RemovePoliceSprechwunschFromQueue(Wunsch.missionID); if (count > 0) {
return Wunsch.each((myWunsch) => {
if (!$("#mission_" + myWunsch.missionID).text().match(/Gefangene sollen abtransportiert werden/g)) {
$("#mission_" + myWunsch.missionID).remove();
return ADis_RemovePoliceSprechwunschFromQueue(myWunsch.missionID);
}
});
}
})
} }
}).then(() => { }).then(() => {
var MOIODOS = $('div#mission_list div.missionSideBarEntry:visible'); var MOIODOS = $('div#mission_list div.missionSideBarEntry:visible');

View File

@@ -13,16 +13,25 @@ $(document).ready(function () {
function ADis_CollectRescueSprechwuensche() { function ADis_CollectRescueSprechwuensche() {
ADisDB.ADisSprechwunsch.where({ ADisDB.ADisSprechwunsch.where({
done: 'false' done: 'false'
}).each((Wunsch) => { }).then((Wunsch) => {
if ($("#vehicle_list_" + Wunsch.vehicleID).find(".building_list_fms").text() != "5") { if (Wunsch !== undefined) {
return ADis_RemoveRescueSprechwunschFromQueue(Wunsch.vehicleID); return Wunsch.count(function (count) {
if (count > 0) {
return Wunsch.each((myWunsch) => {
if ($("#vehicle_list_" + myWunsch.vehicleID).find(".building_list_fms").text() != "5") {
return ADis_RemoveRescueSprechwunschFromQueue(myWunsch.vehicleID);
}
})
}
})
} }
}).then(() => { }).then(() => {
$("#building_list").find(".building_list_vehicle_element").each(function () { $("#building_list").find(".building_list_vehicle_element").each(function () {
var VehicleStatus = $(this).find(".building_list_fms").text(); var VehicleStatus = $(this).find(".building_list_fms").text();
var VehicleType = Number(parseInt($(this).find("a").attr("vehicle_type_id"))); var VehicleType = Number(parseInt($(this).find("a").attr("vehicle_type_id")));
var VehicleID = $(this).attr("vehicle_id"); var VehicleID = $(this).attr("vehicle_id");
if (VehicleStatus == "5" && [32,52].indexOf(VehicleType) === -1) { if (VehicleStatus == "5" && [32, 52].indexOf(VehicleType) === -1) {
ADis_AddRescueSprechwunschToQueue(VehicleID); ADis_AddRescueSprechwunschToQueue(VehicleID);
} }
}); });