Skip to content
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.

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

SOG Compat - Add isDamageAllowed check to punji damage handler #8670

Merged
merged 2 commits into from
Nov 9, 2021
Merged
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ params ["_trap"];
if (isNull (configFile >> "CfgPatches" >> "ace_medical")) exitWith {};

private _radius = getNumber (configOf _trap >> "indirectHitRange");
private _affectedUnits = (_trap nearEntities ["CAManBase", _radius]) select {local _x};
private _affectedUnits = (_trap nearEntities ["CAManBase", _radius]) select {local _x && isDamageAllowed _x};
(getShotParents _trap) params ["", "_instigator"];

if (_affectedUnits isEqualTo []) exitWith {};
Expand Down