Merge branch 'KAT-Advanced-Medical:dev-Tomcat' into dev-Tomcat

Author: AtrixZockt

.gitignore

@@ -80,7 +80,8 @@ keys/*
 ####
 hemtt.exe
 ArmaScriptCompiler.exe
+.hemttprivatekey
 
 #SQF-VM Server
 .vscode\sqfvm-lsp
-.vscode
+.vscode

addons/airway/CfgSounds.hpp

@@ -15,9 +15,4 @@ class CfgSounds {
       sound[] = {QPATHTOF_SOUND(sounds\puking3.wav), "db + 2", 1, 15};
       titles[] = {};
   };
-  class GVAR(suction) {
-      name = QGVAR(suction);
-      sound[] = {QPATHTOF_SOUND(sounds\suction.wav), "db + 2", 1, 15};
-      titles[]    = {};
-  };
 };

addons/airway/initSettings.inc.sqf

@@ -55,7 +55,7 @@
     "SLIDER",
     [LLSTRING(SETTING_occlusion_cooldownPeriod), LLSTRING(SETTING_occlusion_cooldownPeriod_DESC)],
     [CBA_SETTINGS_CAT, ELSTRING(GUI,SubCategory_Basic)],
-    [0, 60, 6, 1],
+    [0, 1200, 6, 1],
     true
 ] call CBA_fnc_addSetting;
 

addons/airway/stringtable.xml

@@ -1,28 +1,6 @@
 class CfgSounds
 {
     sounds[] = {};
-    class normalbreathing {
-        name = "clear_lungs";
-
-        // filename, volume, pitch, distance (optional)
-        sound[] = { QPATHTOF(audio\Clear_Lung_Sounds.ogg), 2, 1, 3 };
-        titles[] = {};
-    };
-    class tensionpneumothoraxbreathing {
-        name = "tension_lungs";
-
-        // filename, volume, pitch, distance (optional)
-        sound[] = { QPATHTOF(audio\Tension_sounds.ogg), 2, 1, 3 };
-        titles[] = {};
-    };
-    class hemothoraxbreathing {
-        name = "hemo_lungs";
-
-        // filename, volume, pitch, distance (optional)
-        sound[] = { QPATHTOF(audio\hemo_sounds.ogg), 2, 1, 3 };
-        titles[] = {};
-    };
-
     class GVAR(pneumothoraxcough) {
         name = QGVAR(pneumothoraxcough);
 
@@ -37,4 +15,4 @@ class CfgSounds
         sound[] = { QPATHTOF(audio\respiratorTone.ogg), 5, 1, 2 };
         titles[] = {};
     };
-};  
+};

addons/breathing/CfgSounds.hpp

@@ -13,7 +13,13 @@ class CfgPatches {
             "kat_Pulseoximeter",
             "kat_chestSeal",
             "kat_stethoscope",
-            "kat_nasal"
+            "kat_nasal",
+            "kat_aatKit",
+            "kat_ncdKit",
+            "kat_BVM",
+            "kat_pocketBVM",
+            "kat_oxygenTank_150_Empty",
+            "kat_oxygenTank_300_Empty"
         };
         magazines[] = {};
         requiredAddons[] = {

addons/breathing/config.cpp

@@ -27,10 +27,10 @@ _patient setVariable [QGVAR(oxygenMaskActive), true, true];
 private _availableTanks = (magazinesAmmo [_patient, false]) select {(_x select 0) isEqualTo "kat_personal_oxygen"};
 private _largestTank = 0;
 
-{ 
-    if (_x select 1 > ((_availableTanks select _largestTank) select 1)) then { 
-        _largestTank = _y; 
-    }; 
+{
+    if (_x select 1 > ((_availableTanks select _largestTank) select 1)) then {
+        _largestTank = _forEachIndex;
+    };
 } forEach _availableTanks;
 
 private _largestTankValue = (_availableTanks select _largestTank) select 1;
@@ -52,7 +52,7 @@ _patient setVariable [QGVAR(oxygenMaskStatus), [(_largestTankValue + 1), 1], tru
         _patient call FUNC(detachPersonalOxygen);
         _pfhID call CBA_fnc_removePerFrameHandler;
     };
-    
+
 }, 5, [
     _patient
 ]] call CBA_fnc_addPerFrameHandler;

addons/breathing/functions/fnc_attachPersonalOxygen.sqf

@@ -118,7 +118,7 @@ GVAR(BVM_timeOut) = true;
                                 };
                             } forEach magazinesAmmo _medic;
 
-                            if (count _heldPreferredTanks > 0) then {
+                            if (_heldPreferredTanks isNotEqualTo []) then {
                                 _carriedTanks = _heldPreferredTanks;
                             };
                         } else {
@@ -129,7 +129,7 @@ GVAR(BVM_timeOut) = true;
                             } forEach magazinesAmmo _medic;
                         };
 
-                        if (count _carriedTanks > 0) then {
+                        if (_carriedTanks isNotEqualTo []) then {
                             _patient setVariable [QGVAR(oxygenTankConnected), true, true];
 
                             private _tank = _carriedTanks select - 1;
@@ -158,7 +158,7 @@ GVAR(BVM_timeOut) = true;
                             };
                         } forEach (magazinesAmmoCargo _vehicle);
 
-                        if (count _oxygenTanks > 0) then {
+                        if (_oxygenTanks isNotEqualTo []) then {
                             _patient setVariable [QGVAR(oxygenTankConnected), true, true];
 
                             private _tank = _oxygenTanks select - 1;

addons/breathing/functions/fnc_useBVM.sqf

@@ -73,7 +73,6 @@ class CfgAmmo {
         smokeColor[] = {0.671, 0.765, 0.184,1};
     };
 
-    class BombCore;
     //class Bo_GBU12_LGB;
     class BombCluster_01_Ammo_F;
     class KAT_CAS_M43_Ammo: BombCluster_01_Ammo_F {