Overpressure - Add to vehicle/static Missile Launchers and Recoilless…

… Guns (#10270) Co-authored-by: johnb432 <[email protected]> Co-authored-by: PabstMirror <[email protected]>
acemod · Feb 8, 2025 · 8eb3312 · 8eb3312
1 parent 372272f
commit 8eb3312
Show file tree

Hide file tree

Showing 23 changed files with 225 additions and 65 deletions.
diff --git a/addons/common/XEH_PREP.hpp b/addons/common/XEH_PREP.hpp
@@ -214,6 +214,7 @@ PREP(unloadPerson);
 PREP(unloadPersonLocal);
 PREP(unloadUnitWeapon);
 PREP(unmuteUnit);
+PREP(updatePlayerVehAttenuation);
 PREP(useItem);
 PREP(useMagazine);
 PREP(watchVariable);

diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf
@@ -375,6 +375,15 @@ GVAR(OldIsCamera) = false;
     ["ace_activeCameraChanged", [_player, GVAR(OldIsCamera)]] call CBA_fnc_localEvent;
 }, true] call CBA_fnc_addPlayerEventHandler;
 
+// Update vehicle audio attenuation when player vehicle changes
+GVAR(playerVehAttenuation) = 1;
+["vehicle", {
+    params ["_player", "_vehicle"];
+    TRACE_2("vehicle change",_player,_vehicle);
+    _this call FUNC(updatePlayerVehAttenuation);
+}, true] call CBA_fnc_addPlayerEventHandler;
+["turret", LINKFUNC(updatePlayerVehAttenuation), false] call CBA_fnc_addPlayerEventHandler;
+
 // Add event handler for UAV control change
 ACE_controlledUAV = [objNull, objNull, [], ""];
 addMissionEventHandler ["PlayerViewChanged", {

diff --git a/...ctions/fnc_updatePlayerVehAttenuation.sqf → ...ctions/fnc_updatePlayerVehAttenuation.sqf b/...ctions/fnc_updatePlayerVehAttenuation.sqf → ...ctions/fnc_updatePlayerVehAttenuation.sqf
@@ -10,7 +10,7 @@
  * Amount that unit can hear outside <NUMBER>
  *
  * Example:
- * call ace_hearing_fnc_updatePlayerVehAttenuation
+ * call ace_common_fnc_updatePlayerVehAttenuation
  *
  * Public: No
  */
@@ -27,7 +27,7 @@ if (ACE_player != _vehicle) then {
     private _effectType = getText (_vehicleConfig >> "attenuationEffectType");
 
     if (_turretPath isNotEqualTo []) then {
-        private _turretConfig = [_vehicleConfig, _turretPath] call EFUNC(common,getTurretConfigPath);
+        private _turretConfig = [_vehicleConfig, _turretPath] call FUNC(getTurretConfigPath);
 
         if ((getNumber (_turretConfig >> "disableSoundAttenuation")) == 1) then {
             _effectType = "";

diff --git a/addons/compat_rhs_afrf3/CfgVehicles.hpp b/addons/compat_rhs_afrf3/CfgVehicles.hpp
@@ -101,6 +101,10 @@ class CfgVehicles {
         EGVAR(refuel,fuelCapacity) = 360;
     };
 
+    class RHS_BM21_MSV_01: RHS_Ural_BaseTurret {
+        EGVAR(overpressure,noReflection) = 1;
+    };
+
     class RHS_Ural_Base: RHS_Ural_BaseTurret {};
     class RHS_Ural_MSV_Base: RHS_Ural_Base {};
     class RHS_Ural_Support_MSV_Base_01: RHS_Ural_MSV_Base {};

diff --git a/addons/compat_rhs_afrf3/CfgWeapons.hpp b/addons/compat_rhs_afrf3/CfgWeapons.hpp
@@ -88,39 +88,37 @@ class CfgWeapons {
         EGVAR(overpressure,angle) = 40;
         EGVAR(overpressure,offset) = 0.9;
     };
-
     class rhs_weap_rpg26: Launcher_Base_F {
         EGVAR(overpressure,range) = 10;
         EGVAR(overpressure,angle) = 50;
         EGVAR(overpressure,offset) = 0.65;
     };
-
     class rhs_weap_rpg18: rhs_weap_rpg26 {
         EGVAR(overpressure,angle) = 45;
         EGVAR(overpressure,offset) = 1;
     };
-
     class rhs_weap_strela;
     class rhs_weap_igla: rhs_weap_strela {
         EGVAR(overpressure,range) = 6;
         EGVAR(overpressure,angle) = 40;
         EGVAR(overpressure,damage) = 0.6;
         EGVAR(overpressure,offset) = 1.65;
     };
-
-    class rhs_zsh7a;
-    class rhs_zsh7a_alt: rhs_zsh7a {
-        ACE_Protection = 1;
+    class missiles_titan_static;
+    class rhs_Igla_AA_pod_Base: missiles_titan_static { // Soft-launched Igla missile
+        EGVAR(overpressure,range) = 6;
+        EGVAR(overpressure,angle) = 40;
+        EGVAR(overpressure,damage) = 0.6;
+        EGVAR(overpressure,offset) = 1.8;
     };
-    class rhs_zsh7a_mike;
-    class rhs_zsh7a_mike_alt: rhs_zsh7a_mike {
-        ACE_Protection = 1;
+    class RocketPods;
+    class rhs_weap_SPG9: RocketPods {
+        EGVAR(overpressure,offset) = 1.2;
     };
-    class rhs_zsh7a_mike_green;
-    class rhs_zsh7a_mike_green_alt: rhs_zsh7a_mike_green {
-        ACE_Protection = 1;
+    class rhs_weap_grad;
+    class rhs_weap_bm21: rhs_weap_grad {
+        EGVAR(overpressure,offset) = 0;
     };
-
     class rhs_weap_d81;
     class rhs_weap_2a70: rhs_weap_d81 { // "Low pressure" 100mm cannon
         EGVAR(overpressure,range) = 15;
@@ -131,6 +129,23 @@ class CfgWeapons {
         EGVAR(overpressure,range) = 15;
         EGVAR(overpressure,damage) = 0.5;
     };
+    class mortar_82mm;
+    class rhs_weap_2b14: mortar_82mm {
+        EGVAR(overpressure,offset) = 0.4;
+    };
+
+    class rhs_zsh7a;
+    class rhs_zsh7a_alt: rhs_zsh7a {
+        ACE_Protection = 1;
+    };
+    class rhs_zsh7a_mike;
+    class rhs_zsh7a_mike_alt: rhs_zsh7a_mike {
+        ACE_Protection = 1;
+    };
+    class rhs_zsh7a_mike_green;
+    class rhs_zsh7a_mike_green_alt: rhs_zsh7a_mike_green {
+        ACE_Protection = 1;
+    };
 
     class rhs_uniform_flora;
     class rhs_uniform_df15: rhs_uniform_flora {

diff --git a/addons/compat_rhs_gref3/CfgVehicles.hpp b/addons/compat_rhs_gref3/CfgVehicles.hpp
@@ -14,5 +14,6 @@ class CfgVehicles {
         GVAR(turretFireProb) = 0.7;
         GVAR(engineFireProb) = 0.7;
         GVAR(detonationDuringFireProb) = 0.5;
+        EGVAR(overpressure,noReflection) = 1;
     };
 };
diff --git a/addons/compat_rhs_usf3/CfgWeapons.hpp b/addons/compat_rhs_usf3/CfgWeapons.hpp
@@ -175,15 +175,6 @@ class CfgWeapons {
     };
 
     // RHS launchers
-    class launch_O_Titan_F;
-
-    class rhs_weap_fim92: launch_O_Titan_F {
-        EGVAR(overpressure,range) = 6;
-        EGVAR(overpressure,angle) = 40;
-        EGVAR(overpressure,damage) = 0.6;
-        EGVAR(overpressure,offset) = 1.45;
-    };
-
     class Launcher_Base_F;
 
     class rhs_weap_smaw: Launcher_Base_F {
@@ -206,6 +197,40 @@ class CfgWeapons {
         EGVAR(overpressure,offset) = 0.9;
     };
 
+    class launch_O_Titan_F;
+    class rhs_weap_fim92: launch_O_Titan_F {
+        EGVAR(overpressure,range) = 6;
+        EGVAR(overpressure,angle) = 40;
+        EGVAR(overpressure,damage) = 0.6;
+        EGVAR(overpressure,offset) = 1.45;
+    };
+
+    class rhs_weap_stinger_Launcher;
+    class rhs_weap_stinger_Launcher_static: rhs_weap_stinger_Launcher {
+        EGVAR(overpressure,range) = 6;
+        EGVAR(overpressure,angle) = 40;
+        EGVAR(overpressure,damage) = 0.6;
+        EGVAR(overpressure,offset) = 1.2;
+    };
+
+    class missiles_titan;
+    class Rhs_weap_TOW_Launcher_static: missiles_titan {
+        EGVAR(overpressure,angle) = 40;
+        EGVAR(overpressure,range) = 4;
+        EGVAR(overpressure,damage) = 0.7;
+        EGVAR(overpressure,offset) = 0.8;
+    };
+
+    class rockets_230mm_GAT;
+    class rhs_weap_mlrs: rockets_230mm_GAT {
+        EGVAR(overpressure,offset) = 3.8;
+    };
+
+    class mortar_82mm;
+    class rhs_mortar_81mm: mortar_82mm {
+        EGVAR(overpressure,offset) = 0.2;
+    };
+
     class rhsusf_hgu56p;
     class rhsusf_hgu56p_visor: rhsusf_hgu56p {
         ACE_Protection = 1;

diff --git a/addons/dragon/CfgWeapons.hpp b/addons/dragon/CfgWeapons.hpp
@@ -33,9 +33,10 @@ class CfgWeapons {
     };
 
     class GVAR(superStatic): missiles_titan_static {
-        EGVAR(overpressure,angle) = 90;
-        EGVAR(overpressure,range) = 30;
+        EGVAR(overpressure,angle) = 60;
+        EGVAR(overpressure,range) = 10;
         EGVAR(overpressure,damage) = 0.85;
+        EGVAR(overpressure,offset) = 0.4;
 
         initSpeed = 120;
 

diff --git a/addons/hearing/XEH_PREP.hpp b/addons/hearing/XEH_PREP.hpp
@@ -14,5 +14,4 @@ PREP(removeEHP);
 PREP(statBarStatement_hearingProtection);
 PREP(statTextStatement_hearingProtection);
 PREP(updateHearingProtection);
-PREP(updatePlayerVehAttenuation);
 PREP(updateVolume);
diff --git a/addons/hearing/XEH_postInit.sqf b/addons/hearing/XEH_postInit.sqf
@@ -45,7 +45,6 @@ GVAR(cacheAmmoLoudness) = createHashMap;
 GVAR(deafnessDV) = 0;
 GVAR(deafnessPrior) = 0;
 GVAR(volume) = 1;
-GVAR(playerVehAttenuation) = 1;
 GVAR(time3) = 0;
 GVAR(damageCoefficent) = 1;
 GVAR(volumeAttenuation) = 1;
@@ -69,7 +68,6 @@ GVAR(ehpTimeout) = -1;
         params ["_player", "_vehicle"];
 
         TRACE_2("vehicle change",_player,_vehicle);
-        call FUNC(updatePlayerVehAttenuation);
 
         if (!isNull GVAR(lastPlayerVehicle)) then {
             private _firedEH = GVAR(lastPlayerVehicle) getVariable [QGVAR(firedEH), -1];
@@ -87,8 +85,6 @@ GVAR(ehpTimeout) = -1;
         };
     }, true] call CBA_fnc_addPlayerEventHandler;
 
-    ["turret", LINKFUNC(updatePlayerVehAttenuation), false] call CBA_fnc_addPlayerEventHandler;
-
     [QGVAR(firedNear), "FiredNear", LINKFUNC(firedNear), true] call CBA_fnc_addBISPlayerEventHandler;
     [QGVAR(slotItemChanged), "SlotItemChanged", {(_this select 2) call FUNC(updateHearingProtection)}, true] call CBA_fnc_addBISPlayerEventHandler;
 

diff --git a/addons/hearing/functions/fnc_firedNear.sqf b/addons/hearing/functions/fnc_firedNear.sqf
@@ -51,7 +51,7 @@ if (_magazine == "") exitWith {
 
 TRACE_6("mag",_magazine,_weapon,_muzzle,_ammo,_firer,_gunner);
 
-private _vehAttenuation = [GVAR(playerVehAttenuation), 1] select (isNull objectParent ACE_player || {isTurnedOut ACE_player});
+private _vehAttenuation = [EGVAR(common,playerVehAttenuation), 1] select (isNull objectParent ACE_player || {isTurnedOut ACE_player});
 private _loudness = _magazine call FUNC(getAmmoLoudness);
 
 _loudness = _loudness * _audibleFireCoef;

diff --git a/addons/hearing/functions/fnc_handleVehicleKilled.sqf b/addons/hearing/functions/fnc_handleVehicleKilled.sqf
@@ -56,7 +56,7 @@ private _powerCoef = getNumber (_cfg >> "fuelExplosionPower");
 // Number + coef mechanics found through extensive testing
 if (_explosionPower > 6.25 * _powerCoef) then {
     // Calculate effective strength for player
-    private _vehAttenuation = [GVAR(playerVehAttenuation), 1] select (isNull objectParent ACE_player || {isTurnedOut ACE_player});
+    private _vehAttenuation = [EGVAR(common,playerVehAttenuation), 1] select (isNull objectParent ACE_player || {isTurnedOut ACE_player});
 
     private _effect = getText (_cfg >> "explosionEffect");
     private _strength = [VEHICLE_EXPLOSION_STRENGTH, VEHICLE_EXPLOSION_BIG_STRENGTH] select (toLower _effect in ["fuelexplosionbig", "fuelcapacitorexplosion"]);

diff --git a/addons/javelin/CfgWeapons.hpp b/addons/javelin/CfgWeapons.hpp
@@ -19,6 +19,13 @@ class CfgWeapons {
         magazines[] = {"1Rnd_GAT_missiles"};
         lockingTargetSound[] = {"",0,1};
         lockedTargetSound[] = {"",0,1};
+
+        // Titan is a soft-launch launcher
+        EGVAR(overpressure,priority) = 1;
+        EGVAR(overpressure,angle) = 30;
+        EGVAR(overpressure,range) = 2;
+        EGVAR(overpressure,damage) = 0.5;
+        EGVAR(overpressure,offset) = 0.5;
     };
 
     class Launcher_Base_F;

diff --git a/addons/overpressure/CfgVehicles.hpp b/addons/overpressure/CfgVehicles.hpp
@@ -0,0 +1,6 @@
+class CfgVehicles {
+    class Truck_02_base_F;
+    class Truck_02_MRL_base_F: Truck_02_base_F {
+        GVAR(noReflection) = 1;
+    };
+};
diff --git a/addons/overpressure/CfgWeapons.hpp b/addons/overpressure/CfgWeapons.hpp
@@ -1,6 +1,8 @@
 
 class CfgWeapons {
 
+    // Man-Portable launchers, rear-facing backblast
+
     class LauncherCore;
     class Launcher: LauncherCore {
         GVAR(priority) = 1;
@@ -61,6 +63,49 @@ class CfgWeapons {
         GVAR(offset) = 0.9;
     };
 
+    // Vehicle recoilless rifles and missile launchers, rear-facing backblast
+
+    class MissileLauncher: LauncherCore {
+        GVAR(priority) = 1;
+        GVAR(angle) = 60;
+        GVAR(range) = 10;
+        GVAR(damage) = 0.7;
+        GVAR(offset) = 0.8;
+        GVAR(backblast) = 1;
+    };
+
+    class missiles_titan;
+    class missiles_titan_static: missiles_titan {
+        GVAR(angle) = 40;
+        GVAR(range) = 8;
+        GVAR(damage) = 0.5;
+    };
+
+    class missiles_Vorona: MissileLauncher {
+        GVAR(angle) = 50;
+        GVAR(offset) = 0.5;
+    };
+
+    class launcher_SPG9: MissileLauncher {
+        GVAR(offset) = 1.25;
+    };
+
+    class RocketPods: LauncherCore {
+        GVAR(priority) = 1;
+        GVAR(angle) = 60;
+        GVAR(range) = 10;
+        GVAR(damage) = 0.7;
+        GVAR(offset) = 0.8;
+        GVAR(backblast) = 1;
+    };
+
+    class rockets_230mm_GAT: RocketPods {
+        GVAR(damage) = 0.85;
+        GVAR(offset) = 0.5;
+    };
+
+    // Vehicle cannons, forward-facing overpressure
+
     class CannonCore;
     class cannon_120mm: CannonCore {
         GVAR(priority) = 1;
@@ -89,4 +134,12 @@ class CfgWeapons {
         GVAR(range) = 60;
         GVAR(damage) = 1;
     };
+
+    class mortar_82mm: CannonCore {
+        GVAR(priority) = 1;
+        GVAR(angle) = 80;
+        GVAR(range) = 5;
+        GVAR(damage) = 0.7;
+        GVAR(offset) = 0.6;
+    };
 };
diff --git a/addons/overpressure/XEH_postInit.sqf b/addons/overpressure/XEH_postInit.sqf
@@ -9,8 +9,14 @@
     if (GVAR(backblastDistanceCoefficient) > 0) then {
         ["ace_firedPlayer", LINKFUNC(firedEHBB)] call CBA_fnc_addEventHandler;
     };
-    if (GVAR(overpressureDistanceCoefficient) > 0) then {
-        ["ace_firedPlayerVehicle", LINKFUNC(firedEHOP)] call CBA_fnc_addEventHandler;
+    if (GVAR(overpressureDistanceCoefficient) > 0 || {GVAR(backblastDistanceCoefficient) > 0}) then {
+        ["ace_firedPlayerVehicle", { //IGNORE_PRIVATE_WARNING ["_weapon"];
+            if (getNumber (configFile >> "CfgWeapons" >> _weapon >> QGVAR(backblast)) == 1) then {
+                _this call FUNC(firedEHBB);
+            } else {
+                _this call FUNC(firedEHOP);
+            };
+        }] call CBA_fnc_addEventHandler;
     };
 
     GVAR(cacheHash) = createHashMap;

diff --git a/addons/overpressure/config.cpp b/addons/overpressure/config.cpp
@@ -15,6 +15,7 @@ class CfgPatches {
 };
 
 #include "CfgEventHandlers.hpp"
+#include "CfgVehicles.hpp"
 #include "CfgWeapons.hpp"
 #include "ACE_Arsenal_Stats.hpp"
 #include "CfgEden.hpp"