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

Split setUnconscious func, add spontaneousWakeUpChance setting (#5114)

Browse Source
This commit is contained in:
PabstMirror 2017-06-05 11:42:46 -05:00 committed by GitHub
parent f369ffaa04
commit f98b268419
13 changed files with 136 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/gforces/functions/fnc_pfhUpdateGForces.sqf
View File

@ -69,7 +69,7 @@ private _gBlackOut = MAXVIRTUALG / _classCoef + MAXVIRTUALG / _suitCoef - MAXVIR
// Unconsciousness
if ((_average > _gBlackOut) and {isClass (configFile >> "CfgPatches" >> "ACE_Medical") and {!(ACE_player getVariable ["ACE_isUnconscious", false])}}) then {
[ACE_player, true, (10 + floor(random 5))] call EFUNC(medical,setUnconscious);
[ACE_player, true, (10 + floor(random 5)), true] call EFUNC(medical,setUnconscious);
};
GVAR(GForces_CC) ppEffectAdjust [1,1,0,[0,0,0,1],[0,0,0,0],[1,1,1,1],[10,10,0,0,0,0.1,0.5]];

12
addons/medical/ACE_Medical_StateMachine.hpp
View File

@ -10,7 +10,11 @@ class ACE_Medical_StateMachine {
};
class CriticalInjuryOrVitals {
targetState = "Unconscious";
events[] = {QGVAR(CriticalInjury), QGVAR(CriticalVitals)};
events[] = {QGVAR(CriticalInjury), QGVAR(CriticalVitals), QGVAR(knockOut)};
};
class FatalVitals {
targetState = "CardiacArrest";
events[] = {QGVAR(FatalVitals)};
};
class FatalInjury {
targetState = "FatalInjury";
@ -25,7 +29,7 @@ class ACE_Medical_StateMachine {
};
class CriticalInjuryOrVitals {
targetState = "Unconscious";
events[] = {QGVAR(CriticalInjury), QGVAR(CriticalVitals)};
events[] = {QGVAR(CriticalInjury), QGVAR(CriticalVitals), QGVAR(knockOut)};
};
class FatalVitals {
targetState = "CardiacArrest";
@ -38,12 +42,12 @@ class ACE_Medical_StateMachine {
};
class Unconscious {
onState = QUOTE(DFUNC(handleStateUnconscious));
onStateEntered = QUOTE([ARR_2(_this,(true))] call FUNC(setUnconscious));
onStateEntered = QUOTE([ARR_2(_this,(true))] call FUNC(setUnconsciousStatemachine));
class WakeUp {
targetState = "Injured";
condition = QUOTE(_this call FUNC(hasStableVitals));
events[] = {QGVAR(WakeUp)};
onTransition = QUOTE([ARR_2(_this,(false))] call FUNC(setUnconscious));
onTransition = QUOTE([ARR_2(_this,(false))] call FUNC(setUnconsciousStatemachine));
};
class FatalTransitions {
targetState = "CardiacArrest";

7
addons/medical/ACE_Settings.hpp
View File

@ -251,4 +251,11 @@ class ACE_Settings {
value = 0;
values[] = {"No", "Yes"};
};
class GVAR(spontaneousWakeUpChance) {
category = CSTRING(Category_Medical);
displayName = CSTRING(MedicalSettings_spontaneousWakeUpChance_DisplayName);
description = CSTRING(MedicalSettings_spontaneousWakeUpChance_Description);
typeName = "SCALAR";
value = 0;
};
};

6
addons/medical/CfgVehicles.hpp
View File

@ -452,6 +452,12 @@ class CfgVehicles {
};
};
};
class spontaneousWakeUpChance {
displayName = CSTRING(MedicalSettings_spontaneousWakeUpChance_DisplayName);
description = CSTRING(MedicalSettings_spontaneousWakeUpChance_Description);
typeName = "SCALAR";
defaultValue = 0;
};
};
};
class MapBoard_altis_F;

1
addons/medical/XEH_PREP.hpp
View File

@ -41,6 +41,7 @@ PREP(serverRemoveBody);
PREP(setCardiacArrest);
PREP(setDead);
PREP(setUnconscious);
PREP(setUnconsciousStatemachine);
PREP(transitionSecondChance);
PREP(updateHeartRate);
PREP(updatePainSuppress);

24
addons/medical/functions/fnc_handleStateUnconscious.sqf
View File

@ -1,4 +1,5 @@
#define DEBUG_MODE_FULL
#include "script_component.hpp"
params ["_unit", "_stateName"];
@ -21,16 +22,19 @@ if (_painLevel > 0) then {
};
// Handle spontaneous wakeup from unconsciousness
if (_unit call FUNC(hasStableVitals)) then {
private _lastWakeUpCheck = _unit getVariable [QGVAR(lastWakeUpCheck), CBA_missionTime];
if (CBA_missionTime - _lastWakeUpCheck > SPONTANEOUS_WAKE_UP_INTERVAL) then {
_unit setVariable [QGVAR(lastWakeUpCheck), CBA_missionTime];
if ((random 1) < SPONTANEOUS_WAKE_UP_CHANCE) then {
TRACE_1("spontaneous wake up",_unit);
[QGVAR(WakeUp), _unit] call CBA_fnc_localEvent;
if (GVAR(spontaneousWakeUpChance) > 0) then {
if (_unit call FUNC(hasStableVitals)) then {
private _lastWakeUpCheck = _unit getVariable [QGVAR(lastWakeUpCheck), CBA_missionTime];
if (CBA_missionTime - _lastWakeUpCheck > SPONTANEOUS_WAKE_UP_INTERVAL) then {
TRACE_2("Checking for wake up",_unit,GVAR(spontaneousWakeUpChance));
_unit setVariable [QGVAR(lastWakeUpCheck), CBA_missionTime];
if ((random 1) < GVAR(spontaneousWakeUpChance)) then {
TRACE_1("Spontaneous wake up!",_unit);
[QGVAR(WakeUp), _unit] call CBA_fnc_localEvent;
};
};
} else {
// Unstable vitals, procrastinate the next wakeup check
_unit setVariable [QGVAR(lastWakeUpCheck), CBA_missionTime];
};
} else {
// Unstable vitals, procrastinate the next wakeup check
_unit setVariable [QGVAR(lastWakeUpCheck), CBA_missionTime];
};

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

@ -54,6 +54,8 @@ if !(_activated) exitWith {};
[_logic, QGVAR(ivFlowRate), "ivFlowRate"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(allowSelfIV), "allowSelfIV"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(spontaneousWakeUpChance), "spontaneousWakeUpChance"] call EFUNC(common,readSettingFromModule);
//[_logic, QGVAR(allowLitterCreation), "allowLitterCreation"] call EFUNC(common,readSettingFromModule);
//[_logic, QGVAR(litterCleanUpDelay), "litterCleanUpDelay"] call EFUNC(common,readSettingFromModule);

4
addons/medical/functions/fnc_setCardiacArrest.sqf
View File

@ -23,8 +23,8 @@ _unit setVariable [QGVAR(heartRate), 0, true];
["ace_cardiacArrestEntered", [_unit]] call CBA_fnc_localEvent;
[_unit, true] call FUNC(setUnconscious);
[QEGVAR(medical,InjuryCritical), _unit] call CBA_fnc_localEvent;
[_unit, true] call FUNC(setUnconsciousStatemachine);
private _timeInCardiacArrest = 120 + round(random(600));
[{

62
addons/medical/functions/fnc_setUnconscious.sqf
View File

@ -1,19 +1,24 @@
/*
* Author: Glowbal
* Sets a unit in the unconscious state.
* For Public Use
*
* Arguments:
* 0: The unit that will be put in an unconscious state <OBJECT>
* 1: Set unconsciouns <BOOL> (default: true)
* 2: Minimum unconscious time (set to 0 to ignore) <NUMBER><OPTIONAL> (default: 0)
* 3: Force wakeup at given time if vitals are stable <BOOL><OPTIONAL> (default: false)
*
* ReturnValue:
* Success? <BOOLEAN>
*
* Example:
* [bob, true] call ace_medical_fnc_setUnconscious;
* [player, true, 5, true] call ace_medical_fnc_setUnconscious;
*
* Public: yes
*/
#define DEBUG_MODE_FULL
#include "script_component.hpp"
// only run this after the settings are initialized
@ -21,41 +26,50 @@ if !(EGVAR(common,settingsInitFinished)) exitWith {
EGVAR(common,runAtSettingsInitialized) pushBack [FUNC(setUnconscious), _this];
};
params ["_unit", ["_knockOut", true]];
if (isNull _unit || {!(_unit isKindOf "CAManBase")}) exitWith {false};
params ["_unit", ["_knockOut", true, [false]], ["_minWaitingTime", 0, [0]], ["_forcedWakup", false, [false]]];
TRACE_4("setUnconscious",_unit,_knockOut,_minWaitingTime,_forcedWakup);
if ((isNull _unit) || {!alive _unit} || {!(_unit isKindOf "CAManBase")}) exitWith {
ERROR_3("Bad Unit %1 [Type: %2] [Alive: %3]",_unit,typeOf _unit,alive _unit);
false
};
if (!local _unit) exitWith {
[QGVAR(setUnconscious), [_unit, _knockOut], _unit] call CBA_fnc_targetEvent;
true
};
if (_knockOut isEqualTo (_unit getVariable [QGVAR(isUnconscious), false])) exitWith {false};
// --- wake up
if !(_knockOut) exitWith {
_unit setVariable [QGVAR(isUnconscious), false, true];
[_unit, false] call EFUNC(medical_engine,setUnconsciousAnim);
["ace_unconscious", [_unit, false]] call CBA_fnc_globalEvent;
true
if (_knockOut isEqualTo (_unit getVariable [QGVAR(isUnconscious), false])) exitWith {
WARNING_2("setUnconscious called with no change [Unit %1] [State [%2]", _unit, _knockOut);
false
};
// --- knock out
_unit setVariable [QGVAR(isUnconscious), true, true];
_unit setVariable [QGVAR(lastWakeUpCheck), CBA_missiontime];
private _beforeState = [_unit, GVAR(STATE_MACHINE)] call CBA_statemachine_fnc_getCurrentState;
if (_unit == ACE_player) then {
if (visibleMap) then {openMap false};
while {dialog} do {
closeDialog 0;
if (_knockOut) then {
if (_minWaitingTime > 0) then {
if (_forcedWakup) then {
// If unit still has stable vitals at min waiting time, then force wake up
[{
params [["_unit", objNull]];
if ((alive _unit) && {_unit call FUNC(hasStableVitals)}) then {
TRACE_1("Doing delay wakeup",_unit);
[QGVAR(WakeUp), _unit] call CBA_fnc_localEvent;
} else {
TRACE_1("Skipping delay wakeup",_unit);
};
}, [_unit], _minWaitingTime] call CBA_fnc_waitAndExecute;
};
if (GVAR(spontaneousWakeUpChance) > 0) then {
_unit setVariable [QGVAR(lastWakeUpCheck), CBA_missionTime + _minWaitingTime - SPONTANEOUS_WAKE_UP_INTERVAL];
};
};
[QGVAR(knockOut), _unit] call CBA_fnc_localEvent;
} else {
[QGVAR(WakeUp), _unit] call CBA_fnc_localEvent;
};
[_unit, true] call EFUNC(medical_engine,setUnconsciousAnim);
[QGVAR(Unconscious), _unit] call CBA_fnc_localEvent;
["ace_unconscious", [_unit, true]] call CBA_fnc_globalEvent;
private _afterState = [_unit, GVAR(STATE_MACHINE)] call CBA_statemachine_fnc_getCurrentState;
TRACE_2("state change",_beforeState,_afterState);
true

50
addons/medical/functions/fnc_setUnconsciousStatemachine.sqf Normal file
View File

@ -0,0 +1,50 @@
/*
* Author: Glowbal
* Sets a unit in the unconscious state.
* For Internal Use: Called from the state machine.
*
* Arguments:
* 0: The unit that will be put in an unconscious state <OBJECT>
* 1: Set unconsciouns <BOOL>
*
* ReturnValue:
* Success? <BOOLEAN>
*
* Example:
* [bob, true] call ace_medical_fnc_setUnconsciousStatemachine
*
* Public: No
*/
#define DEBUG_MODE_FULL
#include "script_component.hpp"
params ["_unit", "_knockOut"];
TRACE_2("setUnconsciousStatemachine",_unit,_knockOut);
if (_knockOut isEqualTo (_unit getVariable [QGVAR(isUnconscious), false])) exitWith {TRACE_1("No Change - Exiting",_knockOut);};
_unit setVariable [QGVAR(isUnconscious), _knockOut, true];
["ace_unconscious", [_unit, _knockOut]] call CBA_fnc_globalEvent;
[_unit, _knockOut] call EFUNC(medical_engine,setUnconsciousAnim);
if (_knockOut) then {
// --- knock out
if (GVAR(spontaneousWakeUpChance) > 0) then { // Don't bother setting this if not used
private _lastWakeUpCheck = CBA_missiontime max (_unit getVariable [QGVAR(lastWakeUpCheck), 0]);
TRACE_2("setting lastWakeUpCheck",_lastWakeUpCheck,(_lastWakeUpCheck - CBA_missiontime));
_unit setVariable [QGVAR(lastWakeUpCheck), _lastWakeUpCheck];
};
if (_unit == ACE_player) then {
if (visibleMap) then {openMap false};
while {dialog} do {
closeDialog 0;
};
};
[QGVAR(Unconscious), _unit] call CBA_fnc_localEvent;
} else {
// --- wake up
_unit setVariable [QGVAR(lastWakeUpCheck), nil]; // clear this now (min wait time could be set to a very high value)
};

1
addons/medical/script_macros_medical.hpp
View File

@ -45,7 +45,6 @@
#define PAIN_SUPPRESSION_FADE_TIME 1800
// Chance to wake up when vitals are stable (checked once every SPONTANEOUS_WAKE_UP_INTERVAL seconds)
#define SPONTANEOUS_WAKE_UP_CHANCE 0.2
#define SPONTANEOUS_WAKE_UP_INTERVAL 15
#define LETHAL_HEAD_DAMAGE_THRESHOLD 1.0

6
addons/medical/stringtable.xml
View File

@ -4055,5 +4055,11 @@
<Key ID="STR_ACE_Medical_MedicalSettings_allowUnconsciousAnimationOnTreatment_Description">
<English>Allow Unconscious Animation on Treatment.</English>
</Key>
<Key ID="STR_ACE_Medical_MedicalSettings_spontaneousWakeUpChance_DisplayName">
<English>Unconscious Wake Up Chance</English>
</Key>
<Key ID="STR_ACE_Medical_MedicalSettings_spontaneousWakeUpChance_Description">
<English>Probablity that a unit with stable vitals will wake up from unconscious [Checked every 15 sec]</English>
</Key>
</Package>
</Project>

2
addons/zeus/functions/fnc_moduleUnconscious.sqf
View File

@ -38,7 +38,7 @@ if (isNil QEFUNC(medical,setUnconscious)) then {
} else {
_conscious = GETVAR(_unit,ACE_isUnconscious,false);
// Function handles locality for me
[_unit, !_conscious, 10e10, true] call EFUNC(medical,setUnconscious);
[_unit, !_conscious, 10e10] call EFUNC(medical,setUnconscious);
};
};
};