Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clarify the allowDeathMode setting

Browse Source
This commit is contained in:
SilentSpike 2016-11-13 21:27:40 +00:00
parent b4569f0a96
commit 27728172ed
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/medical/ACE_Medical_StateMachine.hpp
View File

@ -67,7 +67,7 @@ class ACE_Medical_StateMachine {
class SecondChance {
events[] = {QGVAR(FatalInjuryInstantTransition)};
targetState = "CardiacArrest";
condition = QUOTE(GVAR(allowDeathMode) > 0);
condition = QUOTE(GVAR(fatalInjuryCondition) > 0);
onTransition = QUOTE(DFUNC(transitionSecondChance));
};
class Death {

6
addons/medical/XEH_preInit.sqf
View File

@ -38,13 +38,13 @@ GVAR(STATE_MACHINE) = (configFile >> "ACE_Medical_StateMachine") call CBA_statem
] call CBA_Settings_fnc_init;
[
QGVAR(allowDeathMode),
QGVAR(fatalInjuryCondition),
"LIST",
["Kill unit after", ""], //@todo
["Allow Fatal Injury", "Governs when a fatal injury can occur."], //@todo
"ACE Medical", // @todo
[
[0, 1, 2],
["Fatal wound", "Second chance after fatal wound", "Only cardiac arrest time expiration"],
["Always", "In Cardiac Arrest", "Never"],
0
],
true

2
addons/medical/functions/fnc_conditionExecutionDeath.sqf
View File

@ -13,4 +13,4 @@
#include "script_component.hpp"
params ["_unit"];
(GVAR(allowDeathMode) < 2) && {!(_unit getVariable [QGVAR(deathBlocked), false])}
(GVAR(fatalInjuryCondition) < 2) && {!(_unit getVariable [QGVAR(deathBlocked), false])}