From 2441e6988dc9d3218e1579eaf93ee5754e0c1fd4 Mon Sep 17 00:00:00 2001 From: "Mr. Zorn" Date: Sun, 1 Sep 2024 19:31:19 +0200 Subject: [PATCH 01/16] Update config.cpp --- addons/compat_rf/config.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/compat_rf/config.cpp b/addons/compat_rf/config.cpp index ab6fb942751..5172ee19e02 100644 --- a/addons/compat_rf/config.cpp +++ b/addons/compat_rf/config.cpp @@ -16,3 +16,4 @@ class CfgPatches { }; #include "CfgWeapons.hpp" +#include "CfgVehicles.hpp" From eae817c9a481f2fbc15a98f399cac41c31b0e167 Mon Sep 17 00:00:00 2001 From: "Mr. Zorn" Date: Sun, 1 Sep 2024 19:31:29 +0200 Subject: [PATCH 02/16] Create CfgVehicles.hpp --- addons/compat_rf/CfgVehicles.hpp | 39 ++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 addons/compat_rf/CfgVehicles.hpp diff --git a/addons/compat_rf/CfgVehicles.hpp b/addons/compat_rf/CfgVehicles.hpp new file mode 100644 index 00000000000..c22aa2c4891 --- /dev/null +++ b/addons/compat_rf/CfgVehicles.hpp @@ -0,0 +1,39 @@ +test attachTo [cursorObject, ]; + + +acex_field_rations_offset = [-0.04,-2.45,-0.9] + + +class CfgVehicles { + + + + class C_IDAP_Pickup_rf; + class C_IDAP_Pickup_water_rf: C_IDAP_Pickup_rf + { + acex_field_rations_waterSupply = 1000; + acex_field_rations_offset[] = {-0.04, -2.45, -0.9}; + }; + + class Pickup_01_base_rf; + class B_UN_Pickup_rf: Pickup_01_base_rf + { + acex_field_rations_offset[] = {-0.04, -2.45, -0.9}; + }; + + + class O_Truck_03_fuel_F; + class C_Truck_03_water_rf: O_Truck_03_fuel_F + { + acex_field_rations_waterSupply = 10000; + acex_field_rations_offset[] = {-0.03, -3.72, -1.05}; // Todo + }; + + class B_Truck_01_fuel_F; + class C_Truck_01_water_rf : B_Truck_01_fuel_F + { + acex_field_rations_waterSupply = 10000; + acex_field_rations_offset[] = {-0.03, -3.72, -1.05}; // Todo + }; + +}; From 21341e8edc997c070522ee8e0b52924f8e269958 Mon Sep 17 00:00:00 2001 From: "Mr. Zorn" Date: Sun, 1 Sep 2024 20:00:16 +0200 Subject: [PATCH 03/16] Update CfgVehicles.hpp --- addons/compat_rf/CfgVehicles.hpp | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/addons/compat_rf/CfgVehicles.hpp b/addons/compat_rf/CfgVehicles.hpp index c22aa2c4891..d8c6a906102 100644 --- a/addons/compat_rf/CfgVehicles.hpp +++ b/addons/compat_rf/CfgVehicles.hpp @@ -1,39 +1,30 @@ -test attachTo [cursorObject, ]; - - -acex_field_rations_offset = [-0.04,-2.45,-0.9] - - class CfgVehicles { - - - class C_IDAP_Pickup_rf; - class C_IDAP_Pickup_water_rf: C_IDAP_Pickup_rf + class Offroad_01_unarmed_base_F; + class Pickup_01_base_rf : Offroad_01_unarmed_base_F { - acex_field_rations_waterSupply = 1000; acex_field_rations_offset[] = {-0.04, -2.45, -0.9}; }; - class Pickup_01_base_rf; - class B_UN_Pickup_rf: Pickup_01_base_rf + class C_IDAP_Pickup_rf; + class C_IDAP_Pickup_water_rf: C_IDAP_Pickup_rf { + acex_field_rations_waterSupply = 500; acex_field_rations_offset[] = {-0.04, -2.45, -0.9}; }; - - + class O_Truck_03_fuel_F; class C_Truck_03_water_rf: O_Truck_03_fuel_F { acex_field_rations_waterSupply = 10000; - acex_field_rations_offset[] = {-0.03, -3.72, -1.05}; // Todo + acex_field_rations_offset[] = {0, -5.15, -0.3}; // Rear + //acex_field_rations_offset[] = {1.25,-1.59,-0.58}; // Right Side Latch }; class B_Truck_01_fuel_F; class C_Truck_01_water_rf : B_Truck_01_fuel_F { acex_field_rations_waterSupply = 10000; - acex_field_rations_offset[] = {-0.03, -3.72, -1.05}; // Todo + acex_field_rations_offset[] = {0, -5.15, -0.3}; }; - }; From 5a38c1d42bb4b834112d89a5543c950bd6d32a3b Mon Sep 17 00:00:00 2001 From: "Mr. Zorn" Date: Sun, 1 Sep 2024 20:05:22 +0200 Subject: [PATCH 04/16] Update CfgVehicles.hpp --- addons/compat_rf/CfgVehicles.hpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/compat_rf/CfgVehicles.hpp b/addons/compat_rf/CfgVehicles.hpp index d8c6a906102..00ed2e74cbc 100644 --- a/addons/compat_rf/CfgVehicles.hpp +++ b/addons/compat_rf/CfgVehicles.hpp @@ -1,23 +1,24 @@ class CfgVehicles { + // applies the offset to all RF Offroads which can have the optional Tank in the back class Offroad_01_unarmed_base_F; class Pickup_01_base_rf : Offroad_01_unarmed_base_F { acex_field_rations_offset[] = {-0.04, -2.45, -0.9}; }; + // Enable Water Source by Default class C_IDAP_Pickup_rf; class C_IDAP_Pickup_water_rf: C_IDAP_Pickup_rf { acex_field_rations_waterSupply = 500; - acex_field_rations_offset[] = {-0.04, -2.45, -0.9}; }; class O_Truck_03_fuel_F; class C_Truck_03_water_rf: O_Truck_03_fuel_F { acex_field_rations_waterSupply = 10000; - acex_field_rations_offset[] = {0, -5.15, -0.3}; // Rear + acex_field_rations_offset[] = {0, -5.05, -0.3}; // Rear //acex_field_rations_offset[] = {1.25,-1.59,-0.58}; // Right Side Latch }; @@ -25,6 +26,6 @@ class CfgVehicles { class C_Truck_01_water_rf : B_Truck_01_fuel_F { acex_field_rations_waterSupply = 10000; - acex_field_rations_offset[] = {0, -5.15, -0.3}; + acex_field_rations_offset[] = {-0.41,-5.15,-0.3}; }; }; From 7c4aa011e03466d2346543242a81c09786e8e9ec Mon Sep 17 00:00:00 2001 From: "Mr. Zorn" Date: Sun, 1 Sep 2024 20:19:33 +0200 Subject: [PATCH 05/16] remove empty line2 --- addons/compat_rf/CfgVehicles.hpp | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/compat_rf/CfgVehicles.hpp b/addons/compat_rf/CfgVehicles.hpp index 00ed2e74cbc..2f7298ec4d9 100644 --- a/addons/compat_rf/CfgVehicles.hpp +++ b/addons/compat_rf/CfgVehicles.hpp @@ -1,5 +1,4 @@ class CfgVehicles { - // applies the offset to all RF Offroads which can have the optional Tank in the back class Offroad_01_unarmed_base_F; class Pickup_01_base_rf : Offroad_01_unarmed_base_F From 55edf66ec9eb5206cccc3de81ae820dd36fe7f54 Mon Sep 17 00:00:00 2001 From: "Mr. Zorn" Date: Sun, 1 Sep 2024 20:57:41 +0200 Subject: [PATCH 06/16] macro'fied --- addons/compat_rf/CfgVehicles.hpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/compat_rf/CfgVehicles.hpp b/addons/compat_rf/CfgVehicles.hpp index 2f7298ec4d9..d3408d0b76e 100644 --- a/addons/compat_rf/CfgVehicles.hpp +++ b/addons/compat_rf/CfgVehicles.hpp @@ -3,28 +3,28 @@ class CfgVehicles { class Offroad_01_unarmed_base_F; class Pickup_01_base_rf : Offroad_01_unarmed_base_F { - acex_field_rations_offset[] = {-0.04, -2.45, -0.9}; + EXGVAR(field_rations,offset)[] = {-0.04, -2.45, -0.9}; }; // Enable Water Source by Default class C_IDAP_Pickup_rf; class C_IDAP_Pickup_water_rf: C_IDAP_Pickup_rf { - acex_field_rations_waterSupply = 500; + EXGVAR(field_rations,waterSupply) = 500; }; class O_Truck_03_fuel_F; class C_Truck_03_water_rf: O_Truck_03_fuel_F { - acex_field_rations_waterSupply = 10000; - acex_field_rations_offset[] = {0, -5.05, -0.3}; // Rear - //acex_field_rations_offset[] = {1.25,-1.59,-0.58}; // Right Side Latch + EXGVAR(field_rations,waterSupply) = 10000; + EXGVAR(field_rations,offset)[] = {0, -5.05, -0.3}; // Rear + //EXGVAR(field_rations,offset)[] = {1.25,-1.59,-0.58}; // Right Side Latch }; class B_Truck_01_fuel_F; class C_Truck_01_water_rf : B_Truck_01_fuel_F { - acex_field_rations_waterSupply = 10000; - acex_field_rations_offset[] = {-0.41,-5.15,-0.3}; + EXGVAR(field_rations,waterSupply) = 10000; + EXGVAR(field_rations,offset)[] = {-0.41,-5.15,-0.3}; }; }; From 43ea072cb043120c83cd906db2130613fe914864 Mon Sep 17 00:00:00 2001 From: "Mr. Zorn" Date: Mon, 2 Sep 2024 01:20:49 +0200 Subject: [PATCH 07/16] Update config.cpp --- addons/compat_rf/config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/compat_rf/config.cpp b/addons/compat_rf/config.cpp index 5172ee19e02..52ef83c1b74 100644 --- a/addons/compat_rf/config.cpp +++ b/addons/compat_rf/config.cpp @@ -9,7 +9,7 @@ class CfgPatches { requiredAddons[] = {"RF_Data_Loadorder"}; skipWhenMissingDependencies = 1; author = ECSTRING(common,ACETeam); - authors[] = {"Mike"}; + authors[] = {"Mike", "OverlordZorn[CVO]"}; url = ECSTRING(main,URL); VERSION_CONFIG; }; From 6ca00275e7ac445aeae410c27b3129a066f443d0 Mon Sep 17 00:00:00 2001 From: OverlordZorn <56258612+OverlordZorn@users.noreply.github.com> Date: Tue, 3 Sep 2024 20:48:34 +0200 Subject: [PATCH 08/16] Update addons/compat_rf/CfgVehicles.hpp Co-authored-by: PabstMirror --- addons/compat_rf/CfgVehicles.hpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/compat_rf/CfgVehicles.hpp b/addons/compat_rf/CfgVehicles.hpp index d3408d0b76e..aad21c36ec6 100644 --- a/addons/compat_rf/CfgVehicles.hpp +++ b/addons/compat_rf/CfgVehicles.hpp @@ -1,8 +1,7 @@ class CfgVehicles { // applies the offset to all RF Offroads which can have the optional Tank in the back class Offroad_01_unarmed_base_F; - class Pickup_01_base_rf : Offroad_01_unarmed_base_F - { + class Pickup_01_base_rf : Offroad_01_unarmed_base_F { EXGVAR(field_rations,offset)[] = {-0.04, -2.45, -0.9}; }; From 281982dfa86026b33c669d3c0d459fb8e80a8a8b Mon Sep 17 00:00:00 2001 From: OverlordZorn <56258612+OverlordZorn@users.noreply.github.com> Date: Tue, 3 Sep 2024 20:48:38 +0200 Subject: [PATCH 09/16] Update addons/compat_rf/CfgVehicles.hpp Co-authored-by: PabstMirror --- addons/compat_rf/CfgVehicles.hpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/compat_rf/CfgVehicles.hpp b/addons/compat_rf/CfgVehicles.hpp index aad21c36ec6..16132cd7059 100644 --- a/addons/compat_rf/CfgVehicles.hpp +++ b/addons/compat_rf/CfgVehicles.hpp @@ -7,8 +7,7 @@ class CfgVehicles { // Enable Water Source by Default class C_IDAP_Pickup_rf; - class C_IDAP_Pickup_water_rf: C_IDAP_Pickup_rf - { + class C_IDAP_Pickup_water_rf: C_IDAP_Pickup_rf { EXGVAR(field_rations,waterSupply) = 500; }; From 641ce575037d15630a4fa9d1d5078ca5d9e0d67d Mon Sep 17 00:00:00 2001 From: OverlordZorn <56258612+OverlordZorn@users.noreply.github.com> Date: Tue, 3 Sep 2024 20:48:48 +0200 Subject: [PATCH 10/16] Update addons/compat_rf/CfgVehicles.hpp Co-authored-by: PabstMirror --- addons/compat_rf/CfgVehicles.hpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/compat_rf/CfgVehicles.hpp b/addons/compat_rf/CfgVehicles.hpp index 16132cd7059..11ccf00b5fb 100644 --- a/addons/compat_rf/CfgVehicles.hpp +++ b/addons/compat_rf/CfgVehicles.hpp @@ -12,8 +12,7 @@ class CfgVehicles { }; class O_Truck_03_fuel_F; - class C_Truck_03_water_rf: O_Truck_03_fuel_F - { + class C_Truck_03_water_rf: O_Truck_03_fuel_F { EXGVAR(field_rations,waterSupply) = 10000; EXGVAR(field_rations,offset)[] = {0, -5.05, -0.3}; // Rear //EXGVAR(field_rations,offset)[] = {1.25,-1.59,-0.58}; // Right Side Latch From e3b6e4e99b56ce1d475379bbdc43df0652d95b1c Mon Sep 17 00:00:00 2001 From: OverlordZorn <56258612+OverlordZorn@users.noreply.github.com> Date: Tue, 3 Sep 2024 20:48:55 +0200 Subject: [PATCH 11/16] Update addons/compat_rf/CfgVehicles.hpp Co-authored-by: PabstMirror --- addons/compat_rf/CfgVehicles.hpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/compat_rf/CfgVehicles.hpp b/addons/compat_rf/CfgVehicles.hpp index 11ccf00b5fb..7cf3508f5c0 100644 --- a/addons/compat_rf/CfgVehicles.hpp +++ b/addons/compat_rf/CfgVehicles.hpp @@ -19,8 +19,7 @@ class CfgVehicles { }; class B_Truck_01_fuel_F; - class C_Truck_01_water_rf : B_Truck_01_fuel_F - { + class C_Truck_01_water_rf : B_Truck_01_fuel_F { EXGVAR(field_rations,waterSupply) = 10000; EXGVAR(field_rations,offset)[] = {-0.41,-5.15,-0.3}; }; From 17ca9b5a0a000f107e51d8ac815ca0d25aec28e6 Mon Sep 17 00:00:00 2001 From: OverlordZorn <56258612+OverlordZorn@users.noreply.github.com> Date: Fri, 6 Sep 2024 22:06:36 +0200 Subject: [PATCH 12/16] Update addons/compat_rf/CfgVehicles.hpp Co-authored-by: Mike-MF --- addons/compat_rf/CfgVehicles.hpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/compat_rf/CfgVehicles.hpp b/addons/compat_rf/CfgVehicles.hpp index 7cf3508f5c0..85e4ff76d22 100644 --- a/addons/compat_rf/CfgVehicles.hpp +++ b/addons/compat_rf/CfgVehicles.hpp @@ -14,8 +14,7 @@ class CfgVehicles { class O_Truck_03_fuel_F; class C_Truck_03_water_rf: O_Truck_03_fuel_F { EXGVAR(field_rations,waterSupply) = 10000; - EXGVAR(field_rations,offset)[] = {0, -5.05, -0.3}; // Rear - //EXGVAR(field_rations,offset)[] = {1.25,-1.59,-0.58}; // Right Side Latch + EXGVAR(field_rations,offset)[] = {0, -5.05, -0.3}; }; class B_Truck_01_fuel_F; From 6786707e33183b3ab8557c3ba477d280fac9a0f1 Mon Sep 17 00:00:00 2001 From: OverlordZorn <56258612+OverlordZorn@users.noreply.github.com> Date: Fri, 6 Sep 2024 22:06:47 +0200 Subject: [PATCH 13/16] Update addons/compat_rf/CfgVehicles.hpp Co-authored-by: Mike-MF --- addons/compat_rf/CfgVehicles.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/compat_rf/CfgVehicles.hpp b/addons/compat_rf/CfgVehicles.hpp index 85e4ff76d22..11daceb0c9c 100644 --- a/addons/compat_rf/CfgVehicles.hpp +++ b/addons/compat_rf/CfgVehicles.hpp @@ -20,6 +20,6 @@ class CfgVehicles { class B_Truck_01_fuel_F; class C_Truck_01_water_rf : B_Truck_01_fuel_F { EXGVAR(field_rations,waterSupply) = 10000; - EXGVAR(field_rations,offset)[] = {-0.41,-5.15,-0.3}; + EXGVAR(field_rations,offset)[] = {-0.41, -5.15, -0.3}; }; }; From ce3b87b98fc782654ec70dfdb7cc8f2a23ad1915 Mon Sep 17 00:00:00 2001 From: OverlordZorn <56258612+OverlordZorn@users.noreply.github.com> Date: Sun, 8 Sep 2024 22:45:41 +0200 Subject: [PATCH 14/16] Update addons/compat_rf/CfgVehicles.hpp Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> --- addons/compat_rf/CfgVehicles.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/compat_rf/CfgVehicles.hpp b/addons/compat_rf/CfgVehicles.hpp index 11daceb0c9c..15934a5addf 100644 --- a/addons/compat_rf/CfgVehicles.hpp +++ b/addons/compat_rf/CfgVehicles.hpp @@ -1,7 +1,7 @@ class CfgVehicles { // applies the offset to all RF Offroads which can have the optional Tank in the back class Offroad_01_unarmed_base_F; - class Pickup_01_base_rf : Offroad_01_unarmed_base_F { + class Pickup_01_base_rf: Offroad_01_unarmed_base_F { EXGVAR(field_rations,offset)[] = {-0.04, -2.45, -0.9}; }; From e55ef6c51e04f128d4f50d6c399d494342a9f90b Mon Sep 17 00:00:00 2001 From: OverlordZorn <56258612+OverlordZorn@users.noreply.github.com> Date: Sun, 8 Sep 2024 22:45:47 +0200 Subject: [PATCH 15/16] Update addons/compat_rf/CfgVehicles.hpp Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> --- addons/compat_rf/CfgVehicles.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/compat_rf/CfgVehicles.hpp b/addons/compat_rf/CfgVehicles.hpp index 15934a5addf..ea5dbf5802f 100644 --- a/addons/compat_rf/CfgVehicles.hpp +++ b/addons/compat_rf/CfgVehicles.hpp @@ -18,7 +18,7 @@ class CfgVehicles { }; class B_Truck_01_fuel_F; - class C_Truck_01_water_rf : B_Truck_01_fuel_F { + class C_Truck_01_water_rf: B_Truck_01_fuel_F { EXGVAR(field_rations,waterSupply) = 10000; EXGVAR(field_rations,offset)[] = {-0.41, -5.15, -0.3}; }; From 0f8eeec2d45ad8cef8101f787a6e8834e25c089e Mon Sep 17 00:00:00 2001 From: OverlordZorn <56258612+OverlordZorn@users.noreply.github.com> Date: Sun, 8 Sep 2024 22:45:53 +0200 Subject: [PATCH 16/16] Update addons/compat_rf/CfgVehicles.hpp Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> --- addons/compat_rf/CfgVehicles.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/compat_rf/CfgVehicles.hpp b/addons/compat_rf/CfgVehicles.hpp index ea5dbf5802f..fa0343908a9 100644 --- a/addons/compat_rf/CfgVehicles.hpp +++ b/addons/compat_rf/CfgVehicles.hpp @@ -1,5 +1,5 @@ class CfgVehicles { - // applies the offset to all RF Offroads which can have the optional Tank in the back + // Applies the offset to all RF Offroads which can have the optional tank in the back class Offroad_01_unarmed_base_F; class Pickup_01_base_rf: Offroad_01_unarmed_base_F { EXGVAR(field_rations,offset)[] = {-0.04, -2.45, -0.9};