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

AtrixZockt · web-flow · commit 292f4e874d30 · 2024-12-18T18:53:04.000+01:00
diff --git a/.hemtt/launch.toml b/.hemtt/launch.toml
@@ -4,3 +4,9 @@ workshop = [
     "463939057", # ACE3's Workshop ID
     "2369477168" # Advanced Developer Tools's Workshop ID
 ]
+
+[rhs]
+extends = "default"
+workshop = [
+    "843577117", # RHS USAF Workshop ID
+]
diff --git a/addons/chemical/functions/fnc_poison.sqf b/addons/chemical/functions/fnc_poison.sqf
@@ -45,7 +45,7 @@ if (_gasLevel == 0) exitWith {
 };
 
 // We assume that oxygen masks only cover the mouth and nose, leaving the eyes exposed to CS gas
-if ((_unit getVariable [QEGVAR(breathing,oxygenMaskActive)])) exitWith {
+if ((_unit getVariable [QEGVAR(breathing,oxygenMaskActive), false])) exitWith {
     TRACE_1("unit has oxygen mask",_unit);
 };
 
diff --git a/addons/circulation/CfgVehicles.hpp b/addons/circulation/CfgVehicles.hpp
@@ -235,6 +235,15 @@ class CfgVehicles {
 
     class LandVehicle;
     class Car: LandVehicle {
+        class ACE_SelfActions {
+            class KAT_ArterialTest {
+                displayName = CSTRING(Arterial_Test_Action); 
+                condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle));
+                statement = "";
+                insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions));
+                icon = QACEPATHTOF(medical_gui,ui\cross.paa);
+            };
+        };
         class ACE_Actions {
             class ACE_MainActions {
                 class KAT_ArterialTest {
@@ -250,6 +259,15 @@ class CfgVehicles {
 
     class Car_F: Car {};
     class Quadbike_01_base_F: Car_F {
+        class ACE_SelfActions {
+            class KAT_ArterialTest {
+                displayName = CSTRING(Arterial_Test_Action); 
+                condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle));
+                statement = "";
+                insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions));
+                icon = QACEPATHTOF(medical_gui,ui\cross.paa);
+            };
+        };
         class ACE_Actions: ACE_Actions {
             class ACE_MainActions: ACE_MainActions {
                 class KAT_ArterialTest {
@@ -264,6 +282,15 @@ class CfgVehicles {
     };
 
     class Kart_01_Base_F: Car_F {
+        class ACE_SelfActions {
+            class KAT_ArterialTest {
+                displayName = CSTRING(Arterial_Test_Action); 
+                condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle));
+                statement = "";
+                insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions));
+                icon = QACEPATHTOF(medical_gui,ui\cross.paa);
+            };
+        };
         class ACE_Actions: ACE_Actions {
             class ACE_MainActions: ACE_MainActions {
                 class KAT_ArterialTest {
@@ -278,6 +305,15 @@ class CfgVehicles {
     };
 
     class Tank: LandVehicle {
+        class ACE_SelfActions {
+            class KAT_ArterialTest {
+                displayName = CSTRING(Arterial_Test_Action); 
+                condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle));
+                statement = "";
+                insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions));
+                icon = QACEPATHTOF(medical_gui,ui\cross.paa);
+            };
+        };
         class ACE_Actions {
             class ACE_MainActions {
                 class KAT_ArterialTest {
@@ -292,6 +328,15 @@ class CfgVehicles {
     };
 
     class Motorcycle: LandVehicle {
+        class ACE_SelfActions {
+            class KAT_ArterialTest {
+                displayName = CSTRING(Arterial_Test_Action); 
+                condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle));
+                statement = "";
+                insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions));
+                icon = QACEPATHTOF(medical_gui,ui\cross.paa);
+            };
+        };
         class ACE_Actions {
             class ACE_MainActions {
                 class KAT_ArterialTest {
@@ -307,6 +352,15 @@ class CfgVehicles {
 
     class Air;
     class Helicopter: Air {
+        class ACE_SelfActions {
+            class KAT_ArterialTest {
+                displayName = CSTRING(Arterial_Test_Action); 
+                condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle));
+                statement = "";
+                insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions));
+                icon = QACEPATHTOF(medical_gui,ui\cross.paa);
+            };
+        };
         class ACE_Actions {
             class ACE_MainActions {
                 class KAT_ArterialTest {
@@ -321,6 +375,15 @@ class CfgVehicles {
     };
 
     class Plane: Air {
+        class ACE_SelfActions {
+            class KAT_ArterialTest {
+                displayName = CSTRING(Arterial_Test_Action); 
+                condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle));
+                statement = "";
+                insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions));
+                icon = QACEPATHTOF(medical_gui,ui\cross.paa);
+            };
+        };
         class ACE_Actions {
             class ACE_MainActions {
                 class KAT_ArterialTest {
@@ -336,6 +399,15 @@ class CfgVehicles {
 
     class Ship;
     class Ship_F: Ship {
+        class ACE_SelfActions {
+            class KAT_ArterialTest {
+                displayName = CSTRING(Arterial_Test_Action); 
+                condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle));
+                statement = "";
+                insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions));
+                icon = QACEPATHTOF(medical_gui,ui\cross.paa);
+            };
+        };
         class ACE_Actions {
             class ACE_MainActions {
                 class KAT_ArterialTest {
@@ -354,12 +426,12 @@ class CfgVehicles {
         class ACE_Actions {
             class ACE_MainActions {
                 class KAT_ApplyBloodTest {
-                        displayName = CSTRING(Arterial_Test);
-                        condition = "true";
-                        statement = "true";
-                        insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialApplyActions));
-                        icon = QACEPATHTOF(medical_gui,ui\cross.paa);
-                    };
+                    displayName = CSTRING(Arterial_Test);
+                    condition = QUOTE(GVAR(abgEnable));
+                    statement = "true";
+                    insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialApplyActions));
+                    icon = QACEPATHTOF(medical_gui,ui\cross.paa);
+                };
             };
             class ACE_Head {
                 class CheckBloodPressure {}; // Remove the ability to check blood pressure at the head
diff --git a/addons/circulation/functions/fnc_addArterialApplyActions.sqf b/addons/circulation/functions/fnc_addArterialApplyActions.sqf
@@ -30,9 +30,9 @@ private _fnc_getActions = {
 
         if (_idNumber > 0) then {   
             private _resultSampleMap = missionNamespace getVariable [QEGVAR(circulation,resultSampleMap), []];
-            _resultSampleMap = _resultSampleMap get _idNumber;
-            _resultSampleMap = _resultSampleMap select 1;
-            private _patient = _resultSampleMap select 0;
+            _resultSampleArray = _resultSampleMap get _idNumber;
+            _resultSampleActual = _resultSampleArray select 1;
+            private _patient = _resultSampleArray select 0;
 
             _actions pushBack [
                 [
@@ -45,7 +45,7 @@ private _fnc_getActions = {
                     []
                 ] call ACEFUNC(interact_menu,createAction),
                 [],
-                [_resultSampleMap, _target, _idNumber, _player]
+                [_resultSampleActual, _target, _idNumber, _player]
             ];
         };
     } forEach ([_player, 0] call ACEFUNC(common,uniqueItems));
@@ -54,4 +54,4 @@ private _fnc_getActions = {
 };
 
 
-[[], _fnc_getActions, _player, QGVAR(actionsCache), 9999, "cba_events_loadoutEvent"] call ACEFUNC(common,cachedCall);
+[[], _fnc_getActions, _player, QGVAR(actionsCache), 9999, "cba_events_loadoutEvent"] call ACEFUNC(common,cachedCall);
diff --git a/addons/circulation/functions/fnc_addArterialTestActions.sqf b/addons/circulation/functions/fnc_addArterialTestActions.sqf
@@ -56,4 +56,4 @@ private _fnc_getActions = {
 };
 
 
-[[], _fnc_getActions, _player, QGVAR(actionsCache), 9999, "cba_events_loadoutEvent"] call ACEFUNC(common,cachedCall);
+[[], _fnc_getActions, _player, QGVAR(actionsCache), 9999, "cba_events_loadoutEvent"] call ACEFUNC(common,cachedCall);
diff --git a/addons/circulation/functions/fnc_attachBloodGas.sqf b/addons/circulation/functions/fnc_attachBloodGas.sqf
@@ -16,8 +16,7 @@
  */
 params ["_entries"];
 _entries params ["_bloodGas", "_patient", "_idNumber", "_player"];
-_bloodGas params ["_patientName", "_bloodGasArray"];
 
-_patient setVariable [QGVAR(testedBloodGas), _bloodGasArray, true];
+_patient setVariable [QGVAR(testedBloodGas), _bloodGas, true];
 
 _player removeItem (format ["KAT_bloodResult_%1",_idNumber]);
diff --git a/addons/circulation/functions/fnc_showBloodGas.sqf b/addons/circulation/functions/fnc_showBloodGas.sqf
@@ -28,7 +28,7 @@ private _resultSampleMap = missionNamespace getVariable [QEGVAR(circulation,resu
 _resultCounter = [_resultCounter +1, 1] select (_resultCounter == 20);
 missionNamespace setVariable [QEGVAR(circulation,resultCounter), _resultCounter, true];
 
-_resultSampleMap set [_resultCounter, [name(_patient), _bloodGas]];
+_resultSampleMap set [_resultCounter, [_patientName, _bloodGasArray]];
 missionNamespace setVariable [QEGVAR(circulation,resultSampleMap), _resultSampleMap, true];
 
 private _itemStr = format ["KAT_bloodResult_%1", _resultCounter];
diff --git a/addons/compat_rhs_usf3/$PBOPREFIX$ b/addons/compat_rhs_usf3/$PBOPREFIX$
@@ -0,0 +1 @@
+x\kat\addons\compat_rhs_usf3
diff --git a/addons/compat_rhs_usf3/CfgVehicles.hpp b/addons/compat_rhs_usf3/CfgVehicles.hpp
@@ -0,0 +1,46 @@
+class CfgVehicles {
+    class Truck_01_base_F;
+    class rhsusf_fmtv_base: Truck_01_base_F {};
+    class rhsusf_M1078A1P2_fmtv_usarmy: rhsusf_fmtv_base {};
+    class rhsusf_M1078A1P2_D_fmtv_usarmy: rhsusf_M1078A1P2_fmtv_usarmy {
+        kat_stretcherPos[] = {0,-1,-0.4};
+        kat_stretcherVector[] = {{0, 0, 0}, {0, 0, 0}};
+    };
+    class rhsusf_M1083A1P2_fmtv_usarmy: rhsusf_M1078A1P2_fmtv_usarmy {};
+    class rhsusf_M1083A1P2_B_fmtv_usarmy: rhsusf_M1083A1P2_fmtv_usarmy {};
+    class rhsusf_M1085A1P2_B_Medical_fmtv_usarmy: rhsusf_M1083A1P2_B_fmtv_usarmy {
+        kat_stretcherPos[] = {-0.9,3,0.67};
+        kat_stretcherVector[] = {{0,0,0},{0,0,0}};
+    };
+
+    class Heli_Transport_01_base_F;
+    class RHS_UH60_Base: Heli_Transport_01_base_F {
+        kat_stretcherPos[] = {0,1.25,-1.86};
+        kat_stretcherVector[] = {{1, 0, 0}, {0, 0, 1}};
+    };
+
+    class Heli_Transport_02_base_F;
+    class RHS_CH_47F_base: Heli_Transport_02_base_F {
+        kat_stretcherPos[] = {0,-0.43,-2.63};
+        kat_stretcherVector[] = {{0, 0, 0}, {0, 0, 0}};
+    };
+
+    class MRAP_01_base_F;
+    class rhsusf_hmmwe_base: MRAP_01_base_F {
+        kat_stretcherPos[] = {0,-0.5,-0.85};
+        kat_stretcherVector[] = {{0, 0, 0}, {0, 0, 0}};
+    };
+
+    class APC_Tracked_03_base_F;
+    class RHS_M2A2_Base: APC_Tracked_03_base_F {
+        kat_stretcherPos[] = {-1.19,-0.6,-0.45};
+        kat_stretcherVector[] = {{0,0,0},{0,0,0}};
+    };
+
+    class Tank_F;
+    class APC_Tracked_02_base_F: Tank_F {};
+    class rhsusf_m113tank_base: APC_Tracked_02_base_F {
+        kat_stretcherPos[] = {0,-0.5,-2.05};
+        kat_stretcherVector[] = {{0,0,0},{0,0,0}};
+    };
+};
diff --git a/addons/compat_rhs_usf3/config.cpp b/addons/compat_rhs_usf3/config.cpp
@@ -3,19 +3,17 @@
 class CfgPatches {
     class ADDON {
         name = COMPONENT_NAME;
-        requiredVersion = REQUIRED_VERSION;
         units[] = {};
         weapons[] = {};
-        magazines[] = {};
-        requiredAddons[] = {
-            "kat_misc",
-            "rhsusf_main"
-        };
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {"kat_main", "rhsusf_main_loadorder"};
+        skipWhenMissingDependencies = 1;
         author = "Katalam";
-        authors[] = {"Katalam"};
+        authors[] = {"MiszczuZPolski", "Katalam"};
         url = ECSTRING(main,URL);
         VERSION_CONFIG;
     };
 };
 
 #include "CfgVehicles.hpp"
+
diff --git a/addons/compat_rhs_usf3/script_component.hpp b/addons/compat_rhs_usf3/script_component.hpp
@@ -0,0 +1,5 @@
+#define COMPONENT compat_rhs_usf3
+#define COMPONENT_BEAUTIFIED RHS USAF Compatibility
+
+#include "\x\kat\addons\main\script_mod.hpp"
+#include "\x\kat\addons\main\script_macros.hpp"
diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp
@@ -1,4 +1,4 @@
 #define MAJOR 3
 #define MINOR 0
 #define PATCH 4
-#define BUILD 59
+#define BUILD 60
diff --git a/addons/stretcher/functions/fnc_attachStretcher.sqf b/addons/stretcher/functions/fnc_attachStretcher.sqf
@@ -18,23 +18,23 @@
 params [["_target", objNull, [objNull]]];
 
 if !(isNull attachedTo _target) exitWith {};
-private _vehicles = nearestObjects [_target, ["Car", "Helicopter"], 20];
+private _vehicles = nearestObjects [_target, ["Car", "Helicopter", "Tank"], 20];
 private _actions = [];
 
 {
     private _type = typeOf _x;
     private _name = getText (configFile >> "CfgVehicles" >> _type >> "displayName");
     private _uniqueName = format ["kat_stretcher_%1", _type];
-    if (isArray (configFile >> "CfgVehicles" >> _type >> "stretcherPos")) then {
+    if (isArray (configFile >> "CfgVehicles" >> _type >> "kat_stretcherPos")) then {
         _actions pushBack [
             [
                 _uniqueName,
                 _name,
                 "",
                 {
                     params ["_target", "", "_parameter"];
-                    private _pos = getArray (configFile >> "CfgVehicles" >> typeOf (_parameter select 0) >> "stretcherPos");
-                    private _vector = getArray (configFile >> "CfgVehicles" >> typeOf (_parameter select 0) >> "stretcherVector");
+                    private _pos = getArray (configFile >> "CfgVehicles" >> typeOf (_parameter select 0) >> "kat_stretcherPos");
+                    private _vector = getArray (configFile >> "CfgVehicles" >> typeOf (_parameter select 0) >> "kat_stretcherVector");
                     _target attachTo [(_parameter select 0), _pos];
                     _target setVectorDirAndUp _vector;
                 },
diff --git a/addons/stretcher/vehicle_stretcher.hpp b/addons/stretcher/vehicle_stretcher.hpp
@@ -1,33 +1,33 @@
 class LSV_01_unarmed_base_F;
 class B_LSV_01_unarmed_F: LSV_01_unarmed_base_F {
-    stretcherPos[] = {0.08,-1.5,-0.69};
-    stretcherVector[] = {{1, 0, 0}, {0, 0, 1}};
+    kat_stretcherPos[] = {0.08,-1.5,-0.69};
+    kat_stretcherVector[] = {{1, 0, 0}, {0, 0, 1}};
 };
 class Heli_Transport_01_base_F;
 class B_Heli_Transport_01_F: Heli_Transport_01_base_F {
-    stretcherPos[] = {0,1.6,-1.55};
-    stretcherVector[] = {{1, 0, 0}, {0, 0, 1}};
+    kat_stretcherPos[] = {0,1.6,-1.55};
+    kat_stretcherVector[] = {{1, 0, 0}, {0, 0, 1}};
 };
 class B_Truck_01_transport_F;
 class B_Truck_01_medical_F: B_Truck_01_transport_F {
-    stretcherPos[] = {-0.15,-4.7,0};
-    stretcherVector[] = {{1, 0, 0}, {0, 0, 1}};
+    kat_stretcherPos[] = {-0.15,-4.7,0};
+    kat_stretcherVector[] = {{1, 0, 0}, {0, 0, 1}};
 };
 class B_APC_Wheeled_01_base_F;
 class B_APC_Wheeled_01_cannon_F: B_APC_Wheeled_01_base_F {
-    stretcherPos[] = {0.85,1.7,-0.41};
-    stretcherVector[] = {{0,0.78,-0.22},{0,0.22,0.78}};
+    kat_stretcherPos[] = {0.85,1.7,-0.41};
+    kat_stretcherVector[] = {{0,0.78,-0.22},{0,0.22,0.78}};
 };
 class Heli_Transport_03_base_F;
 class B_Heli_Transport_03_F: Heli_Transport_03_base_F {
-    stretcherPos[] = {0,-0.4,-2.08};
-    stretcherVector[] = {{0, 0, 0}, {0, 0, 0}};
+    kat_stretcherPos[] = {0,-0.4,-2.08};
+    kat_stretcherVector[] = {{0, 0, 0}, {0, 0, 0}};
 };
 
 class LandVehicle;
 class Car: LandVehicle {};
 class Car_F: Car {};
 class Quadbike_01_base_F: Car_F {
-    stretcherPos[] = {0,0.8,-0.56};
-    stretcherVector[] = {{1, 0, 0}, {0, 0, 1}};
+    kat_stretcherPos[] = {0,0.8,-0.56};
+    kat_stretcherVector[] = {{1, 0, 0}, {0, 0, 1}};
 };
diff --git a/addons/watch/XEH_PREP.hpp b/addons/watch/XEH_PREP.hpp
@@ -1,4 +1,3 @@
-PREP(closeWatchTimer);
 PREP(handleRespawn);
 PREP(hideKWatch);
 PREP(hideCWatch);
@@ -8,4 +7,5 @@ PREP(init);
 PREP(showKWatch);
 PREP(showCWatch);
 PREP(showSWatch);
-PREP(showRWatch);
+PREP(showRWatch);
+PREP(startWatchTimer);
diff --git a/addons/watch/XEH_postInit.sqf b/addons/watch/XEH_postInit.sqf
diff --git a/addons/watch/functions/fnc_handleRespawn.sqf b/addons/watch/functions/fnc_handleRespawn.sqf
diff --git a/addons/watch/functions/fnc_showRWatch.sqf b/addons/watch/functions/fnc_showRWatch.sqf
diff --git a/addons/watch/functions/fnc_startWatchTimer.sqf b/addons/watch/functions/fnc_startWatchTimer.sqf
diff --git a/optionals/usaf/$PBOPREFIX$ b/optionals/usaf/$PBOPREFIX$
diff --git a/optionals/usaf/CfgVehicles.hpp b/optionals/usaf/CfgVehicles.hpp
diff --git a/optionals/usaf/script_component.hpp b/optionals/usaf/script_component.hpp

Original file line number	Diff line number	Diff line change
`@@ -56,4 +56,4 @@ private _fnc_getActions = {`
`56`	`56`	`};`
`57`	`57`
`58`	`58`
`59`		`-[[], _fnc_getActions, _player, QGVAR(actionsCache), 9999, "cba_events_loadoutEvent"] call ACEFUNC(common,cachedCall);`
	`59`	`+[[], _fnc_getActions, _player, QGVAR(actionsCache), 9999, "cba_events_loadoutEvent"] call ACEFUNC(common,cachedCall);`