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.

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

Jump to bottom

Medical - Fix broken AI ragdolls if AI unconsciousness is disabled #9917

Merged
merged 6 commits into from
Apr 7, 2024
Merged

Medical - Fix broken AI ragdolls if AI unconsciousness is disabled #9917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d7c1bcb
fix broken ai ragdolls with ai uncon off
LinkIsGrim Apr 3, 2024
daa6547
make it work
LinkIsGrim Apr 3, 2024
759f1bf
a singular whitespace
LinkIsGrim Apr 3, 2024
8ae3f60
take unit uncon var into account
LinkIsGrim Apr 4, 2024
d28bdd2
clear uncon variable on death
LinkIsGrim Apr 7, 2024
4df3ee4
Merge branch 'fix-ai-uncon' of https://github.com/acemod/ACE3 into fi…
LinkIsGrim Apr 7, 2024
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
6 changes: 0 additions & 6 deletions addons/medical_engine/XEH_postInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,6 @@
if (!isNull objectParent _unit && {local objectParent _unit}) exitWith {
[_unit] call FUNC(lockUnconsciousSeat);
};

// Prevent second ragdoll of uncon units when they're killed
if (IS_UNCONSCIOUS(_unit) && !isAwake _unit) then {
_unit enableSimulation false;
[{_this enableSimulation true}, _unit, 2] call CBA_fnc_waitAndExecute;
};
}] call CBA_fnc_addEventHandler;

["CAManBase", "deleted", {
Expand Down
6 changes: 6 additions & 0 deletions addons/medical_statemachine/CfgEventHandlers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ class Extended_PreInit_EventHandlers {
};
};

class Extended_PostInit_EventHandlers {
class ADDON {
init = QUOTE(call COMPILE_SCRIPT(XEH_postInit));
};
};

class Extended_Respawn_EventHandlers {
class CAManBase {
class ADDON {
Expand Down
14 changes: 14 additions & 0 deletions addons/medical_statemachine/XEH_postInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#include "script_component.hpp"

["ace_killed", { // global event
params ["_unit"];

// Prevent second ragdoll of uncon units when they're killed
if (
IS_UNCONSCIOUS(_unit) && !isAwake _unit // uncon and not ragdolling
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Funny that the isAwake _unit ain't lazy-evaled but isPlayer _unit is, like next to all (if not all) others in the mod.

&& {isPlayer _unit || {_unit getVariable [QGVAR(AIUnconsciousness), GVAR(AIUnconsciousness)]}}
) then {
_unit enableSimulation false;
[{_this enableSimulation true}, _unit, 2] call CBA_fnc_waitAndExecute;
};
}] call CBA_fnc_addEventHandler;
4 changes: 4 additions & 0 deletions addons/medical_status/functions/fnc_setDead.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,14 @@
params ["_unit", ["_reason", "#setDead"], ["_instigator", objNull]];
TRACE_3("setDead",_unit,_reason,_instigator);


// No heart rate or blood pressure to measure when dead
_unit setVariable [VAR_HEART_RATE, 0, true];
_unit setVariable [VAR_BLOOD_PRESS, [0, 0], true];

// Clear uncon variable just to be safe
_unit setVariable [VAR_UNCON, nil, true];

_unit setVariable [QEGVAR(medical,causeOfDeath), _reason, true];

// Send a local event before death
Expand Down