Compat RHS USF - Add compatibility for stretcher (#663)

**When merged this pull request will:** - Allows attaching stretcher to few selected vehicles ### IMPORTANT - [Development Guidelines](https://ace3.acemod.org/wiki/development/) are read, understood and applied. - Title of this PR uses our standard template `Component - Add|Fix|Improve|Change|Make|Remove {changes}`.
KAT-Advanced-Medical · Dec 17, 2024 · fb837f8 · fb837f8
1 parent 9eb3a2e
commit fb837f8
Show file tree

Hide file tree

Showing 10 changed files with 79 additions and 83 deletions.
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/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/optionals/usaf/config.cpp → addons/compat_rhs_usf3/config.cpp b/optionals/usaf/config.cpp → 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/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/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