Skip to content

Vehicle Damage - Fix Slammer optic cookoff #11427

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

Open
DarkBall123 wants to merge 2 commits into
base: master
Choose a base branch
from
+27 −6
Open

Vehicle Damage - Fix Slammer optic cookoff #11427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49e294a
Fix commander optic damage
DarkBall123 Jul 12, 2026
e457de2
Handle secondary turret hitpoints
DarkBall123 Jul 12, 2026
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
26 changes: 21 additions & 5 deletions addons/vehicle_damage/functions/fnc_addEventHandler.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ private _typeOf = typeOf _vehicle;
if (_typeOf in GVAR(vehicleClassesHitPointHash)) exitWith {};

private _hitPointHash = createHashMap;
private _ambiguousHitpoints = [];
private _vehicleConfig = configOf _vehicle;
private _hitPointsConfig = _vehicleConfig >> "HitPoints";

Expand All @@ -62,7 +63,7 @@ private _hitPointsConfig = _vehicleConfig >> "HitPoints";

// Gun and turret hitpoints aren't hardcoded anymore - dig through config to find correct names
private _fnc_iterateThroughConfig = {
params ["_config"];
params ["_config", ["_turretPath", false, [[], false]]];
TRACE_1("checking config",_config);

private _configName = toLowerANSI configName _config;
Expand Down Expand Up @@ -95,7 +96,19 @@ private _fnc_iterateThroughConfig = {
_hitPointHash set [_configName, ["gun", abs getNumber (_config >> "minimalHit")]];
};
if (_isTurret) then {
_hitPointHash set [_configName, ["turret", abs getNumber (_config >> "minimalHit")]];
private _hitPointData = ["turret", abs getNumber (_config >> "minimalHit")];

if (_turretPath isEqualType [] && {!(_configName in _ambiguousHitpoints)}) then {
private _existingTurretPath = (_hitPointHash getOrDefault [_configName, []]) param [2, false, [[], false]];

if (_existingTurretPath isEqualType [] && {_existingTurretPath isNotEqualTo _turretPath}) then {
_ambiguousHitpoints pushBack _configName;
} else {
_hitPointData pushBack _turretPath;
};
};

_hitPointHash set [_configName, _hitPointData];
};
if (_isEra) then {
_hitPointHash set [_configName, ["era", abs getNumber (_config >> "minimalHit")]];
Expand All @@ -107,12 +120,11 @@ private _fnc_iterateThroughConfig = {
TRACE_6("found gun/turret/era/slat/misc",_isGun,_isTurret,_isEra,_isSlat,_isMisc,_hitPointHash);
} else {
{
_x call _fnc_iterateThroughConfig;
[_x, _turretPath] call _fnc_iterateThroughConfig;
} forEach configProperties [_config, "isClass _x", true];
};
};

private _turretConfig = _vehicleConfig >> "Turrets";
private _eraHitpoints = (getArray (_vehicleConfig >> QGVAR(eraHitpoints))) apply {toLowerANSI _x};
private _slatHitpoints = (getArray (_vehicleConfig >> QGVAR(slatHitpoints))) apply {toLowerANSI _x};

Expand All @@ -132,7 +144,11 @@ private _hitPointAliases = (getArray (_vehicleConfig >> QGVAR(hitpointAlias))) c
TRACE_1("hitpoint alias",_hitPointAliases);

_hitPointsConfig call _fnc_iterateThroughConfig;
_turretConfig call _fnc_iterateThroughConfig;

{
private _turretConfig = [_vehicleConfig, _x] call EFUNC(common,getTurretConfigPath);
[_turretConfig >> "HitPoints", _x] call _fnc_iterateThroughConfig;
} forEach allTurrets [_vehicle, true];

GVAR(vehicleClassesHitPointHash) set [_typeOf, _hitPointHash];

Expand Down
7 changes: 6 additions & 1 deletion addons/vehicle_damage/functions/fnc_processHit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ private _warheadType = ["he", "ap", "heat", "tandemheat"] find _warheadTypeStr;
private _incendiary = [_projectileConfig >> QGVAR(incendiary), "NUMBER", [0.3, 0.1, 1, 1, 0] select _warheadType] call CBA_fnc_getConfigEntry;

private _hitPointHash = GVAR(vehicleClassesHitPointHash) getOrDefault [typeOf _vehicle, createHashMap];
(_hitPointHash getOrDefault [_hitPoint, []]) params ["_hitArea", "_minDamage"];
(_hitPointHash getOrDefault [_hitPoint, []]) params ["_hitArea", "_minDamage", ["_turretPath", false, [[], false]]];

private _projectileExplosive = getNumber (_projectileConfig >> "explosive");
private _indirectHit = getNumber (_projectileConfig >> "indirectHit");
Expand Down Expand Up @@ -152,6 +152,11 @@ if (_magazines isNotEqualTo []) then {

private _return = true;

// Secondary turrets are non-lethal
if (_hitArea == "turret" && {_turretPath isEqualType [] && {_turretPath isNotEqualTo [0]}}) then {
_hitArea = "gun";
};

switch (_hitArea) do {
case "engine": {
private _vehicleConfig = configOf _vehicle;
Expand Down