Skip to content

Commit fb837f8

Browse files
Compat RHS USF - Add compatibility for stretcher (KAT-Advanced-Medical#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}`.
1 parent 9eb3a2e commit fb837f8

10 files changed

Lines changed: 79 additions & 83 deletions

File tree

.hemtt/launch.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,9 @@ workshop = [
44
"463939057", # ACE3's Workshop ID
55
"2369477168" # Advanced Developer Tools's Workshop ID
66
]
7+
8+
[rhs]
9+
extends = "default"
10+
workshop = [
11+
"843577117", # RHS USAF Workshop ID
12+
]

addons/compat_rhs_usf3/$PBOPREFIX$

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
x\kat\addons\compat_rhs_usf3
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
class CfgVehicles {
2+
class Truck_01_base_F;
3+
class rhsusf_fmtv_base: Truck_01_base_F {};
4+
class rhsusf_M1078A1P2_fmtv_usarmy: rhsusf_fmtv_base {};
5+
class rhsusf_M1078A1P2_D_fmtv_usarmy: rhsusf_M1078A1P2_fmtv_usarmy {
6+
kat_stretcherPos[] = {0,-1,-0.4};
7+
kat_stretcherVector[] = {{0, 0, 0}, {0, 0, 0}};
8+
};
9+
class rhsusf_M1083A1P2_fmtv_usarmy: rhsusf_M1078A1P2_fmtv_usarmy {};
10+
class rhsusf_M1083A1P2_B_fmtv_usarmy: rhsusf_M1083A1P2_fmtv_usarmy {};
11+
class rhsusf_M1085A1P2_B_Medical_fmtv_usarmy: rhsusf_M1083A1P2_B_fmtv_usarmy {
12+
kat_stretcherPos[] = {-0.9,3,0.67};
13+
kat_stretcherVector[] = {{0,0,0},{0,0,0}};
14+
};
15+
16+
class Heli_Transport_01_base_F;
17+
class RHS_UH60_Base: Heli_Transport_01_base_F {
18+
kat_stretcherPos[] = {0,1.25,-1.86};
19+
kat_stretcherVector[] = {{1, 0, 0}, {0, 0, 1}};
20+
};
21+
22+
class Heli_Transport_02_base_F;
23+
class RHS_CH_47F_base: Heli_Transport_02_base_F {
24+
kat_stretcherPos[] = {0,-0.43,-2.63};
25+
kat_stretcherVector[] = {{0, 0, 0}, {0, 0, 0}};
26+
};
27+
28+
class MRAP_01_base_F;
29+
class rhsusf_hmmwe_base: MRAP_01_base_F {
30+
kat_stretcherPos[] = {0,-0.5,-0.85};
31+
kat_stretcherVector[] = {{0, 0, 0}, {0, 0, 0}};
32+
};
33+
34+
class APC_Tracked_03_base_F;
35+
class RHS_M2A2_Base: APC_Tracked_03_base_F {
36+
kat_stretcherPos[] = {-1.19,-0.6,-0.45};
37+
kat_stretcherVector[] = {{0,0,0},{0,0,0}};
38+
};
39+
40+
class Tank_F;
41+
class APC_Tracked_02_base_F: Tank_F {};
42+
class rhsusf_m113tank_base: APC_Tracked_02_base_F {
43+
kat_stretcherPos[] = {0,-0.5,-2.05};
44+
kat_stretcherVector[] = {{0,0,0},{0,0,0}};
45+
};
46+
};
Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,17 @@
33
class CfgPatches {
44
class ADDON {
55
name = COMPONENT_NAME;
6-
requiredVersion = REQUIRED_VERSION;
76
units[] = {};
87
weapons[] = {};
9-
magazines[] = {};
10-
requiredAddons[] = {
11-
"kat_misc",
12-
"rhsusf_main"
13-
};
8+
requiredVersion = REQUIRED_VERSION;
9+
requiredAddons[] = {"kat_main", "rhsusf_main_loadorder"};
10+
skipWhenMissingDependencies = 1;
1411
author = "Katalam";
15-
authors[] = {"Katalam"};
12+
authors[] = {"MiszczuZPolski", "Katalam"};
1613
url = ECSTRING(main,URL);
1714
VERSION_CONFIG;
1815
};
1916
};
2017

2118
#include "CfgVehicles.hpp"
19+
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#define COMPONENT compat_rhs_usf3
2+
#define COMPONENT_BEAUTIFIED RHS USAF Compatibility
3+
4+
#include "\x\kat\addons\main\script_mod.hpp"
5+
#include "\x\kat\addons\main\script_macros.hpp"

addons/stretcher/functions/fnc_attachStretcher.sqf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,23 @@
1818
params [["_target", objNull, [objNull]]];
1919

2020
if !(isNull attachedTo _target) exitWith {};
21-
private _vehicles = nearestObjects [_target, ["Car", "Helicopter"], 20];
21+
private _vehicles = nearestObjects [_target, ["Car", "Helicopter", "Tank"], 20];
2222
private _actions = [];
2323

2424
{
2525
private _type = typeOf _x;
2626
private _name = getText (configFile >> "CfgVehicles" >> _type >> "displayName");
2727
private _uniqueName = format ["kat_stretcher_%1", _type];
28-
if (isArray (configFile >> "CfgVehicles" >> _type >> "stretcherPos")) then {
28+
if (isArray (configFile >> "CfgVehicles" >> _type >> "kat_stretcherPos")) then {
2929
_actions pushBack [
3030
[
3131
_uniqueName,
3232
_name,
3333
"",
3434
{
3535
params ["_target", "", "_parameter"];
36-
private _pos = getArray (configFile >> "CfgVehicles" >> typeOf (_parameter select 0) >> "stretcherPos");
37-
private _vector = getArray (configFile >> "CfgVehicles" >> typeOf (_parameter select 0) >> "stretcherVector");
36+
private _pos = getArray (configFile >> "CfgVehicles" >> typeOf (_parameter select 0) >> "kat_stretcherPos");
37+
private _vector = getArray (configFile >> "CfgVehicles" >> typeOf (_parameter select 0) >> "kat_stretcherVector");
3838
_target attachTo [(_parameter select 0), _pos];
3939
_target setVectorDirAndUp _vector;
4040
},
Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
class LSV_01_unarmed_base_F;
22
class B_LSV_01_unarmed_F: LSV_01_unarmed_base_F {
3-
stretcherPos[] = {0.08,-1.5,-0.69};
4-
stretcherVector[] = {{1, 0, 0}, {0, 0, 1}};
3+
kat_stretcherPos[] = {0.08,-1.5,-0.69};
4+
kat_stretcherVector[] = {{1, 0, 0}, {0, 0, 1}};
55
};
66
class Heli_Transport_01_base_F;
77
class B_Heli_Transport_01_F: Heli_Transport_01_base_F {
8-
stretcherPos[] = {0,1.6,-1.55};
9-
stretcherVector[] = {{1, 0, 0}, {0, 0, 1}};
8+
kat_stretcherPos[] = {0,1.6,-1.55};
9+
kat_stretcherVector[] = {{1, 0, 0}, {0, 0, 1}};
1010
};
1111
class B_Truck_01_transport_F;
1212
class B_Truck_01_medical_F: B_Truck_01_transport_F {
13-
stretcherPos[] = {-0.15,-4.7,0};
14-
stretcherVector[] = {{1, 0, 0}, {0, 0, 1}};
13+
kat_stretcherPos[] = {-0.15,-4.7,0};
14+
kat_stretcherVector[] = {{1, 0, 0}, {0, 0, 1}};
1515
};
1616
class B_APC_Wheeled_01_base_F;
1717
class B_APC_Wheeled_01_cannon_F: B_APC_Wheeled_01_base_F {
18-
stretcherPos[] = {0.85,1.7,-0.41};
19-
stretcherVector[] = {{0,0.78,-0.22},{0,0.22,0.78}};
18+
kat_stretcherPos[] = {0.85,1.7,-0.41};
19+
kat_stretcherVector[] = {{0,0.78,-0.22},{0,0.22,0.78}};
2020
};
2121
class Heli_Transport_03_base_F;
2222
class B_Heli_Transport_03_F: Heli_Transport_03_base_F {
23-
stretcherPos[] = {0,-0.4,-2.08};
24-
stretcherVector[] = {{0, 0, 0}, {0, 0, 0}};
23+
kat_stretcherPos[] = {0,-0.4,-2.08};
24+
kat_stretcherVector[] = {{0, 0, 0}, {0, 0, 0}};
2525
};
2626

2727
class LandVehicle;
2828
class Car: LandVehicle {};
2929
class Car_F: Car {};
3030
class Quadbike_01_base_F: Car_F {
31-
stretcherPos[] = {0,0.8,-0.56};
32-
stretcherVector[] = {{1, 0, 0}, {0, 0, 1}};
31+
kat_stretcherPos[] = {0,0.8,-0.56};
32+
kat_stretcherVector[] = {{1, 0, 0}, {0, 0, 1}};
3333
};

optionals/usaf/$PBOPREFIX$

Lines changed: 0 additions & 1 deletion
This file was deleted.

optionals/usaf/CfgVehicles.hpp

Lines changed: 0 additions & 42 deletions
This file was deleted.

optionals/usaf/script_component.hpp

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)