From 5bf6774d751637643a9ca5b3f88ab1384e3c4660 Mon Sep 17 00:00:00 2001 From: Cre8or <3143797+Cre8or@users.noreply.github.com> Date: Sun, 19 Mar 2023 17:12:58 +0100 Subject: [PATCH 1/5] Update fnc_setupExplosive.sqf - Added `setShotParents` to the resulting explosive, enabling support for kill tracking --- addons/explosives/functions/fnc_setupExplosive.sqf | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/explosives/functions/fnc_setupExplosive.sqf b/addons/explosives/functions/fnc_setupExplosive.sqf index 2e0c6ca4261..c55debf26a8 100644 --- a/addons/explosives/functions/fnc_setupExplosive.sqf +++ b/addons/explosives/functions/fnc_setupExplosive.sqf @@ -181,6 +181,7 @@ GVAR(TweakedAngle) = 0; _expSetupVehicle setVariable [QGVAR(class), _magClassname, true]; _expSetupVehicle setVariable [QGVAR(Direction), _placeAngle, true]; + _expSetupVehicle setShotParents [_unit, objNull]; _unit removeMagazine _magClassname; [_unit, "PutDown"] call EFUNC(common,doGesture); From f339fbb55692462fa528728a75f73cb863aeb91d Mon Sep 17 00:00:00 2001 From: Cre8or <3143797+Cre8or@users.noreply.github.com> Date: Fri, 24 Mar 2023 16:58:06 +0100 Subject: [PATCH 2/5] Add setShotParents to fnc_placeExplosive --- addons/explosives/functions/fnc_placeExplosive.sqf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/explosives/functions/fnc_placeExplosive.sqf b/addons/explosives/functions/fnc_placeExplosive.sqf index df8f3ab89cb..5f00fb839fa 100644 --- a/addons/explosives/functions/fnc_placeExplosive.sqf +++ b/addons/explosives/functions/fnc_placeExplosive.sqf @@ -87,6 +87,9 @@ if (isText(_triggerConfig >> "onPlace") && {[_unit,_explosive,_magazineClass,_tr _explosive }; +// Whoever places the explosive shall become the instigator (for damage tracking purposes) +[QEGVAR(common,setShotParents), [_explosive, _unit, _unit]] call CBA_fnc_serverEvent; + //TODO: placing explosives on hills looks funny private _pitch = getNumber (_magazineTrigger >> "pitch"); From 4cc4999987a58f1f994efa9a88a02241b3fcd2d5 Mon Sep 17 00:00:00 2001 From: Cre8or <3143797+Cre8or@users.noreply.github.com> Date: Fri, 24 Mar 2023 16:59:28 +0100 Subject: [PATCH 3/5] Remove setShotParents from fnc_setupExplosive --- addons/explosives/functions/fnc_setupExplosive.sqf | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/explosives/functions/fnc_setupExplosive.sqf b/addons/explosives/functions/fnc_setupExplosive.sqf index c55debf26a8..2e0c6ca4261 100644 --- a/addons/explosives/functions/fnc_setupExplosive.sqf +++ b/addons/explosives/functions/fnc_setupExplosive.sqf @@ -181,7 +181,6 @@ GVAR(TweakedAngle) = 0; _expSetupVehicle setVariable [QGVAR(class), _magClassname, true]; _expSetupVehicle setVariable [QGVAR(Direction), _placeAngle, true]; - _expSetupVehicle setShotParents [_unit, objNull]; _unit removeMagazine _magClassname; [_unit, "PutDown"] call EFUNC(common,doGesture); From 849ed46fc257c5a4950f520ed30ff0210c206371 Mon Sep 17 00:00:00 2001 From: Cre8or Date: Sun, 2 Apr 2023 21:08:13 +0200 Subject: [PATCH 4/5] Move setShotParents into place event --- addons/explosives/XEH_postInit.sqf | 10 +++++++++- addons/explosives/functions/fnc_placeExplosive.sqf | 3 --- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/addons/explosives/XEH_postInit.sqf b/addons/explosives/XEH_postInit.sqf index adbfebf858b..42f39533c4f 100644 --- a/addons/explosives/XEH_postInit.sqf +++ b/addons/explosives/XEH_postInit.sqf @@ -16,7 +16,15 @@ */ //Event for setting explosive placement angle/pitch: -[QGVAR(place), {_this call FUNC(setPosition)}] call CBA_fnc_addEventHandler; +[QGVAR(place), { + params ["_explosive", "", "", "_unit"]; + + _this call FUNC(setPosition); + + if (isServer) then { + _explosive setShotParents [_unit, _unit]; + }; +}] call CBA_fnc_addEventHandler; [QGVAR(startDefuse), FUNC(startDefuse)] call CBA_fnc_addEventHandler; //When getting knocked out in medical, trigger deadman explosives: diff --git a/addons/explosives/functions/fnc_placeExplosive.sqf b/addons/explosives/functions/fnc_placeExplosive.sqf index 5f00fb839fa..df8f3ab89cb 100644 --- a/addons/explosives/functions/fnc_placeExplosive.sqf +++ b/addons/explosives/functions/fnc_placeExplosive.sqf @@ -87,9 +87,6 @@ if (isText(_triggerConfig >> "onPlace") && {[_unit,_explosive,_magazineClass,_tr _explosive }; -// Whoever places the explosive shall become the instigator (for damage tracking purposes) -[QEGVAR(common,setShotParents), [_explosive, _unit, _unit]] call CBA_fnc_serverEvent; - //TODO: placing explosives on hills looks funny private _pitch = getNumber (_magazineTrigger >> "pitch"); From 1800561ac9ef9e521806ad6240347398d63dde9d Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Mon, 3 Apr 2023 12:23:15 -0500 Subject: [PATCH 5/5] fix tabs --- addons/explosives/XEH_postInit.sqf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/explosives/XEH_postInit.sqf b/addons/explosives/XEH_postInit.sqf index 42f39533c4f..18f9a9ef0d0 100644 --- a/addons/explosives/XEH_postInit.sqf +++ b/addons/explosives/XEH_postInit.sqf @@ -17,13 +17,13 @@ //Event for setting explosive placement angle/pitch: [QGVAR(place), { - params ["_explosive", "", "", "_unit"]; + params ["_explosive", "", "", "_unit"]; - _this call FUNC(setPosition); + _this call FUNC(setPosition); - if (isServer) then { - _explosive setShotParents [_unit, _unit]; - }; + if (isServer) then { + _explosive setShotParents [_unit, _unit]; + }; }] call CBA_fnc_addEventHandler; [QGVAR(startDefuse), FUNC(startDefuse)] call CBA_fnc_addEventHandler;