From d3a1f61d387d84f6b04f7199acb9ed0076ad0f59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Fr=C3=B6hle?= <froehle@b1-systems.de>
Date: Tue, 5 Feb 2019 21:31:12 +0100
Subject: [PATCH] Fix Need Feuerwehrleute new.

---
 additional/scan_benötigt.txt | 33 +++++++++++++++++++++++++++++++++
 dist/autoloader.js           |  2 +-
 dist/autoloaderV2.js         |  4 ++--
 server/gen_missionjs.php     |  6 ++++++
 src/autoloaderV2.js          |  4 ++--
 5 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 additional/scan_benötigt.txt

diff --git a/additional/scan_benötigt.txt b/additional/scan_benötigt.txt
new file mode 100644
index 0000000..48bb05e
--- /dev/null
+++ b/additional/scan_benötigt.txt
@@ -0,0 +1,33 @@
+Zusätzlich benötigte Fahrzeuge: 
+2 SEK-Fahrzeuge
+2 MEK-Fahrzeuge
+25 FuStW
+2 Polizeihubschrauber
+100 Löschfahrzeuge (LF)
+15 Drehleitern (DLK 23)
+10 FwK
+10 Rüstwagen oder HLF
+10 GW-A oder AB-Atemschutz
+10 Gerätekraftwagen (GKW)
+10 THW-Einsatzleitung (MTW TZ)
+10 THW-Mehrzweckkraftwagen (MzKW)
+5 Radlader (BRmG R)
+5 LKW Kipper (LKW K 9)
+8 GW-Öl
+20 Schlauchwagen (GW-L2 Wasser, SW 1000, SW 2000 oder Ähnliches)
+10 ELW 1
+10 Flugfeldlöschfahrzeuge
+2 Rettungstreppen
+50 GW-Werkfeuerwehr
+5 Turbolöscher
+3 ULF mit Löscharm
+10 Teleskopmasten
+10 Wasserwerfer
+10 Dekon-P
+25 GruKw
+5 FüKw
+10 leBefKw
+15 ELW 2
+5 GW-Messtechnik
+10 GW-Gefahrgut
+4 GW-Höhenrettung
\ No newline at end of file
diff --git a/dist/autoloader.js b/dist/autoloader.js
index e05f650..ee7819b 100755
--- a/dist/autoloader.js
+++ b/dist/autoloader.js
@@ -1,4 +1,4 @@
-/*Generated on:Fri Feb 01 2019 16:06:06 GMT+0100 (CET)*/
+/*Generated on:Tue Feb 05 2019 21:31:12 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 a2d55a5..ab8888d 100644
--- a/dist/autoloaderV2.js
+++ b/dist/autoloaderV2.js
@@ -1,4 +1,4 @@
-/*Generated on:Fri Feb 01 2019 16:06:06 GMT+0100 (CET)*/
+/*Generated on:Tue Feb 05 2019 21:31:12 GMT+0100 (CET)*/
 /*
  * Dexie.js - a minimalistic wrapper for IndexedDB
  * ===============================================
@@ -19388,7 +19388,7 @@ class AutomaticDispose {
             if (self.includesString(dangerText, "Wir benötigen min.") && self.includesString(dangerText, "Feuerwehrleute.")) {
                 const weNeed = self._ADisVehiclesNeed["0"];
                 const regex = /(\d+) Feuerwehrleute/gm;
-                const newNeed = Math.ceil(Number(parseInt(dangerText.match(regex))) / 6) - weNeed;
+                const newNeed = Math.ceil(Number(parseInt(dangerText.match(regex))) / 6) + weNeed;
                 self._ADisVehiclesNeed["0"] = newNeed;
             }
 
diff --git a/server/gen_missionjs.php b/server/gen_missionjs.php
index 66a0c30..edd61a2 100755
--- a/server/gen_missionjs.php
+++ b/server/gen_missionjs.php
@@ -295,6 +295,8 @@ foreach (glob("*.json") as $filename) {
     $mission['id'] = $mission_id;
     $mission['type'] = $mission_id;
     $mission['name'] = $data['Name'];
+    $mission['share'] = false;
+
     $fd = fireDepartment($data);
     if (array_sum($fd) > 0) {
         $mission['fire_department'] = $fd;
@@ -316,6 +318,10 @@ foreach (glob("*.json") as $filename) {
         $mission['water_rescue'] = $ws;
     }
 
+    if (isset($data['Credits im Durchschnitt']) &&  intval($data['Credits im Durchschnitt']) >= 7000 && $mission['share'] == false) {
+        $mission['share'] = true;
+    }
+
     $concat[$mission_id] = $mission;
 
 }
diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js
index 9b294cb..3c27bd1 100644
--- a/src/autoloaderV2.js
+++ b/src/autoloaderV2.js
@@ -1879,10 +1879,10 @@ class AutomaticDispose {
 
             var dangerText = $('#iframe-inside-container > div.alert.alert-danger').text();
             // TODO: need to check if already LF driving...
-            if (self.includesString(dangerText, "Wir benötigen min.") && self.includesString(dangerText, "Feuerwehrleute.")) {
+            if (self.includesString(dangerText, "Wir benötigen noch min.") && self.includesString(dangerText, "Feuerwehrleute.")) {
                 const weNeed = self._ADisVehiclesNeed["0"];
                 const regex = /(\d+) Feuerwehrleute/gm;
-                const newNeed = Math.ceil(Number(parseInt(dangerText.match(regex))) / 6) - weNeed;
+                const newNeed = Math.ceil(Number(parseInt(dangerText.match(regex))) / 6) + weNeed;
                 self._ADisVehiclesNeed["0"] = newNeed;
             }