Skip to content

Hearing - Remove deafness from vehicle secondary explosions #11419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PabstMirror merged 1 commit into from
Jul 19, 2026
+19 −7
Merged

Hearing - Remove deafness from vehicle secondary explosions #11419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions addons/hearing/XEH_postInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ if (isServer) then {
[{ // Convert ace_common's local explosion to a hearing global explosion event
params ["_projectile", "_pos"];
TRACE_1("Explode",_this);
if (typeOf _projectile isEqualTo "SmallSecondary") exitWith {};

// If projectile is local only, don't raise event globally
if ((netId _projectile) == "0:0") then {
Expand All @@ -30,7 +31,9 @@ if (isServer) then {
}] call EFUNC(common,addExplosionEventHandler);
} else {
[{
params ["_projectile"];
TRACE_1("Explode",_this);
if (typeOf _projectile isEqualTo "SmallSecondary") exitWith {};
[QGVAR(explosion), _this] call CBA_fnc_localEvent;
}] call EFUNC(common,addExplosionEventHandler);
};
Expand Down
23 changes: 16 additions & 7 deletions addons/hearing/functions/fnc_handleVehicleKilled.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,22 @@ if (_distance > 50) exitWith {};
// Calculate explosion power
// This formula was once revealed to me in a dream
private _cfg = configOf _vehicle;
private _explosionPower = getNumber (_cfg >> "secondaryExplosion");
if (_explosionPower == 0) exitWith {};
private _secondaryExplosion = getNumber (_cfg >> "secondaryExplosion");
if (_secondaryExplosion == 0) exitWith {};

if (_explosionPower < 0) then {
private _fuelCargoPower = (getFuelCargo _vehicle max 0) * getNumber (_cfg >> "transportFuel") * 0.1;
private _fuelPower = fuel _vehicle * getNumber (_cfg >> "fuelCapacity") * 0.1;
private _explosionPower = _secondaryExplosion;
if (_secondaryExplosion < 0) then {
private _ammoCargoPower = 0;
private _transportAmmo = getNumber (_cfg >> "transportAmmo");
if (_transportAmmo > 0) then {
private _ammoCargo = if (["ace_rearm"] call EFUNC(common,isModLoaded) && {EGVAR(rearm,enabled)}) then {
1 // ignoring rearm level
} else {
getAmmoCargo _vehicle max 0
};
_ammoCargoPower = _ammoCargo * _transportAmmo * 0.05;
};

private _ammoCargoPower = (getAmmoCargo _vehicle max 0) * getNumber (_cfg >> "transportAmmo") * 0.05;
private _ammoPower = 0;
private _magCache = createHashMap;
{
Expand All @@ -47,10 +55,11 @@ if (_explosionPower < 0) then {
_ammoPower = _ammoPower + _hit * _count * 0.015;
} forEach magazinesAmmoFull _vehicle;

_explosionPower = abs _explosionPower * (_ammoCargoPower + _fuelCargoPower + _fuelPower + _ammoPower);
_explosionPower = abs _secondaryExplosion * (_ammoCargoPower + _ammoPower);
};

private _powerCoef = getNumber (_cfg >> "fuelExplosionPower");
TRACE_5("VehicleKilled",_vehicle,_distance,_secondaryExplosion,_explosionPower,_powerCoef);

// A low explosion power causes no immediate audible explosion
// Number + coef mechanics found through extensive testing
Expand Down