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

.github/workflows/arma.yml

@@ -41,7 +41,8 @@ jobs:
       - name: Run HEMTT Build
         run: hemtt build
       - name: Upload Release
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: '@kat'
           path: '.hemttout/build/*'
+          include-hidden-files: true # Because .hemttout is a hidden directory

.hemtt/launch.toml

@@ -0,0 +1,6 @@
+[default]
+workshop = [
+    "450814997", # CBA_A3's Workshop ID
+    "463939057", # ACE3's Workshop ID
+    "2369477168", # Advanced Developer Tools's Workshop ID
+]

.hemtt/project.toml

@@ -1,12 +1,8 @@
 name = "KAM"
 prefix = "kat"
-author = "Katalam, Tomcat, Kygan, YetheSamartaka, Battlekeeper, MJSTIC, Digii / Julian and MiszczuZPolski"
+author = "Katalam, Tomcat, Kygan, YetheSamartaka, Battlekeeper, MJSTIC, Digii / Julian, MiszczuZPolski and Blue"
 mainprefix = "x"
 
-#modname = "{{prefix}}_mods"
-#key_name = "{{prefix}}_{{version}}"
-#authority = "{{prefix}}_{{version}}"
-
 [files]
 include = [
     "mod.cpp",
@@ -19,35 +15,3 @@ include = [
 
 [version]
 git_hash = 0
-
-#[properties]
-#version = "{{git \"id 8\"}}"
-
-[lint.sqf]
-enabled = true # Default: true
-exclude = [
-    "a3/3DEN/UI/macroexecs.inc",
-    "a3/ui_f/hpp/defineResincl.inc",
-    "a3/ui_f/hpp/defineDIKCodes.inc",
-    "a3/ui_f/hpp/defineCommonGrids.inc",
-    "a3/ui_f/hpp/defineCommonColors.inc",
-]
-
-
-
-[asc]
-enabled = true
-exclude = [
-    "/initsettings.sqf",
-    "/initkeybinds.sqf",
-    "/xeh_prep.sqf"
-]
-
-[hemtt.config]
-preset = "Hemtt"
-
-[hemtt.launch]
-workshop = [
-    "450814997", # CBA_A3's Workshop ID
-    "463939057", # ACE3's Workshop ID
-]

addons/airway/functions/fnc_gui_updateInjuryListGeneral.sqf

@@ -21,5 +21,5 @@
 params ["_ctrl", "_target", "_selectionN", "_entries"];
 
 if (_target getVariable [QGVAR(recovery), false]) then {
-    _entries pushback [LLSTRING(RecoveryPosition), [0.1, 1, 1, 1]];
+    _entries pushBack [LLSTRING(RecoveryPosition), [0.1, 1, 1, 1]];
 };

addons/airway/functions/fnc_gui_updateInjuryListPart.sqf

@@ -28,6 +28,6 @@ if (_target getVariable [QGVAR(airway), false] && _selectionN isEqualTo 0) then
     private _a = _target getVariable [QGVAR(airway_item), ""];
     if !(_a isEqualTo "") then {
         private _text = format [LSTRING(%1_Display), _a];
-        _entries pushback [localize _text, [0.1, 1, 1, 1]];
+        _entries pushBack [localize _text, [0.1, 1, 1, 1]];
     };
 };

addons/airway/functions/fnc_handlePuking.sqf

@@ -39,7 +39,7 @@ _unit setVariable ["kat_pukeActive_PFH", true];
         if !(_unit getVariable [QGVAR(occluded), false]) then {
             _unit setVariable [QGVAR(occluded), true, true];
             if (GVAR(checkbox_puking_sound)) then {
-                playsound3D [selectRandom [QPATHTOF_SOUND(sounds\puking1.wav),QPATHTOF_SOUND(sounds\puking2.wav),QPATHTOF_SOUND(sounds\puking3.wav)], _unit, false, getPosASL _unit, 8, 1, 15];
+                playSound3D [selectRandom [QPATHTOF_SOUND(sounds\puking1.wav),QPATHTOF_SOUND(sounds\puking2.wav),QPATHTOF_SOUND(sounds\puking3.wav)], _unit, false, getPosASL _unit, 8, 1, 15];
             };
         };
     };

addons/airway/functions/fnc_treatmentAdvanced_RemoveAirwayItemLocal.sqf

@@ -27,7 +27,7 @@ if (_item isEqualTo "Larynxtubus") then {
     _patient call FUNC(handlePuking);
 };
 
-if !(GVAR(ReusableAirwayItems)) exitwith {};
+if !(GVAR(ReusableAirwayItems)) exitWith {};
 
 if (_item isEqualTo "Larynxtubus") then {
     [_medic, "kat_larynx"] call ACEFUNC(common,addToInventory);

addons/breathing/functions/fnc_gui_updateInjuryListPart.sqf

@@ -46,12 +46,12 @@ if (GVAR(showCyanosis) && _selectionN in [0,2,3]) then {
 
 if (_target getVariable [QGVAR(pulseoximeter), false] && _selectionN in [2,3]) then {
     if((_target getVariable [QGVAR(PulseOximeter_Attached), [0,0]] select (_selectionN - 2)) > 0) then {
-        _entries pushback [LLSTRING(Pulseoximeter), [0.3, 0.8, 0.8, 1]];
+        _entries pushBack [LLSTRING(Pulseoximeter), [0.3, 0.8, 0.8, 1]];
     };
 };
 
 if (_target getVariable [QGVAR(nasalCannula), false] && _selectionN isEqualTo 0) then {
-    _entries pushback [LLSTRING(NasalCannula_Display), [0.3, 0.8, 0.8, 1]];
+    _entries pushBack [LLSTRING(NasalCannula_Display), [0.3, 0.8, 0.8, 1]];
 };
 
 private _ptxEntry = [];
@@ -70,7 +70,7 @@ if (_selectionN isEqualTo 1) then {
 
     if (GVAR(PneumothoraxAlwaysVisible)) then {
         if ((_target getVariable [QGVAR(pneumothorax), 0] > 0) && !(_tensionhemothorax)) then {
-            _ptxEntry pushback [LLSTRING(pneumothorax_mm), [1,1,1,1]];
+            _ptxEntry pushBack [LLSTRING(pneumothorax_mm), [1,1,1,1]];
         };
     } else {
         if (_target getVariable [QGVAR(deepPenetratingInjury), false]) then {
@@ -80,11 +80,11 @@ if (_selectionN isEqualTo 1) then {
 
     if (GVAR(TensionHemothoraxAlwaysVisible)) then {
         if (_target getVariable [QGVAR(hemopneumothorax), false]) then {
-            _ptxEntry pushback [LLSTRING(hemopneumothorax_mm), [1,1,1,1]];
+            _ptxEntry pushBack [LLSTRING(hemopneumothorax_mm), [1,1,1,1]];
         };
 
         if (_target getVariable [QGVAR(tensionpneumothorax), false]) then {
-            _ptxEntry pushback [LLSTRING(tensionpneumothorax_mm), [1,1,1,1]];
+            _ptxEntry pushBack [LLSTRING(tensionpneumothorax_mm), [1,1,1,1]];
         };
     };
 };

addons/breathing/functions/fnc_handlePulmoHit.sqf

@@ -23,7 +23,7 @@
 params ["_unit", "_allDamages", "", "_ammo"];
 _allDamages select 0 params ["_damage", "_bodyPart"];
 
-if (!(GVAR(enable)) || !(_bodyPart isEqualTo "Body") || !(_ammo isKindOF "BulletBase")) exitWith {};
+if (!(GVAR(enable)) || !(_bodyPart isEqualTo "Body") || !(_ammo isKindOf "BulletBase")) exitWith {};
 //Other mods can utilise KAT_Pneumothorax_Exclusion variable to prevent Pneumothorax from happening
 if ((_damage < GVAR(pneumothoraxDamageThreshold)) || (_unit getVariable ["KAT_Pneumothorax_Exclusion", false])) exitWith {};
 
@@ -33,7 +33,7 @@ if (GVAR(pneumothoraxDamageThreshold_TakenDamage)) then {
 };
 
 if (floor (random 100) < (GVAR(pneumothoraxChance) + _chanceIncrease)) then {
-    if (_unit getVariable [QGVAR(pneumothorax), 0] isEqualto 0 && !(_unit getVariable [QGVAR(tensionpneumothorax), false])) then { // Initial pneumothorax
+    if (_unit getVariable [QGVAR(pneumothorax), 0] isEqualTo 0 && !(_unit getVariable [QGVAR(tensionpneumothorax), false])) then { // Initial pneumothorax
         // add breathing sound
         [_unit, 0.2] call ACEFUNC(medical_status,adjustPainLevel);
         _unit setVariable [QGVAR(pneumothorax), 1, true];

addons/breathing/functions/fnc_useBVM.sqf

@@ -182,7 +182,7 @@ GVAR(BVM_timeOut) = true;
                 _patient setVariable [QGVAR(oxygenTankConnected), false, true];
             };
 
-            playsound3D [QPATHTOF_SOUND(audio\squeeze_BVM.ogg), _patient, false, getPosASL _patient, 8, 1, 15];
+            playSound3D [QPATHTOF_SOUND(audio\squeeze_BVM.ogg), _patient, false, getPosASL _patient, 8, 1, 15];
 
             [{ // Squeeze BVM every 5 seconds
                 params ["_patient"];