From 8cea7f40073f7f0853e6c55d3df840ac22961d97 Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Sat, 27 Nov 2021 19:11:39 -0600
Subject: [PATCH] RHS Compats - Fix various UBCs (#8688)

---
 optionals/compat_rhs_afrf3/CfgVehicles.hpp | 2 +-
 optionals/compat_rhs_afrf3/CfgWeapons.hpp  | 3 ++-
 optionals/compat_rhs_usf3/CfgAmmo.hpp      | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/optionals/compat_rhs_afrf3/CfgVehicles.hpp b/optionals/compat_rhs_afrf3/CfgVehicles.hpp
index b6fa189790..e1cfee0138 100644
--- a/optionals/compat_rhs_afrf3/CfgVehicles.hpp
+++ b/optionals/compat_rhs_afrf3/CfgVehicles.hpp
@@ -187,7 +187,7 @@ class CfgVehicles {
         ace_rearm_defaultSupply = 1200;
     };
 
-    class rhs_kamaz5350: rhs_truck {};
+    class rhs_kamaz5350;
     class rhs_kamaz5350_ammo_base: rhs_kamaz5350 {
         transportAmmo = 0;
         ace_rearm_defaultSupply = 1200;
diff --git a/optionals/compat_rhs_afrf3/CfgWeapons.hpp b/optionals/compat_rhs_afrf3/CfgWeapons.hpp
index 29fa16bc22..1f07f81872 100644
--- a/optionals/compat_rhs_afrf3/CfgWeapons.hpp
+++ b/optionals/compat_rhs_afrf3/CfgWeapons.hpp
@@ -126,7 +126,8 @@ class CfgWeapons {
         HEARING_PROTECTION_VICCREW
     };
 
-    class rhs_6b48: H_HelmetB {
+    class rhs_6b47_bare;
+    class rhs_6b48: rhs_6b47_bare {
         HEARING_PROTECTION_VICCREW
     };
 
diff --git a/optionals/compat_rhs_usf3/CfgAmmo.hpp b/optionals/compat_rhs_usf3/CfgAmmo.hpp
index d292c9e017..475df36fae 100644
--- a/optionals/compat_rhs_usf3/CfgAmmo.hpp
+++ b/optionals/compat_rhs_usf3/CfgAmmo.hpp
@@ -240,7 +240,8 @@ class CfgAmmo {
         EGVAR(vehicle_damage,incendiary) = 0.8;
     };
 
-    class rhs_ammo_mk19m3_M430I_penetrator: rhsusf_ammo_basic_penetrator {
+    class rhsusf_ammo_reduced_penetrator;
+    class rhs_ammo_mk19m3_M430I_penetrator: rhsusf_ammo_reduced_penetrator {
         EGVAR(vehicle_damage,incendiary) = 0.8;
     };