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

Merge alive and Zeus conditions

Browse Source
This commit is contained in:
KoffeinFlummi 2015-02-10 23:13:52 +01:00
parent 4ec19429ae
commit faa7e1fb63
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
addons/medical/XEH_postInit.sqf
View File

@ -30,6 +30,7 @@ GVAR(effectUnconsciousCC) = [
4201, 4201,
[1,1,0, [0,0,0,1], [0,0,0,0], [1,1,1,1], [0.4,0.4,0,0,0,0.1,0.3]] [1,1,0, [0,0,0,1], [0,0,0,0], [1,1,1,1], [0.4,0.4,0,0,0,0.1,0.3]]
] call _fnc_createEffect; ] call _fnc_createEffect;
GVAR(effectUnconsciousRB) = [ GVAR(effectUnconsciousRB) = [
"RadialBlur", "RadialBlur",
4202, 4202,
@ -53,6 +54,7 @@ GVAR(effectPainCA) = [
4205, 4205,
[0, 0, false] [0, 0, false]
] call _fnc_createEffect; ] call _fnc_createEffect;
GVAR(effectPainCC) = [ GVAR(effectPainCC) = [
"ColorCorrections", "ColorCorrections",
4206, 4206,
@ -66,20 +68,9 @@ GVAR(effectUnconsciousUnit) = objNull;
GVAR(effectBlind) = false; GVAR(effectBlind) = false;
GVAR(effectTimeBlood) = time; GVAR(effectTimeBlood) = time;
// TODO add settings to allow modification of what is being displayed.
[{ [{
// Zeus interface is open; disable everything // Zeus interface is open or player is dead; disable everything
if (!isNull (findDisplay 312)) exitWith { if (!(isNull (findDisplay 312)) or !(alive ACE_player)) exitWith {
GVAR(effectUnconsciousCC) ppEffectEnable false;
GVAR(effectUnconsciousRB) ppEffectEnable false;
GVAR(effectBlindingCC) ppEffectEnable false;
GVAR(effectBloodVolumeCC) ppEffectEnable false;
GVAR(effectPainCA) ppEffectEnable false;
GVAR(effectPainCC) ppEffectEnable false;
};
// Player is dead; disable everything and reenable input
if (!alive ACE_player) exitWith {
GVAR(effectUnconsciousCC) ppEffectEnable false; GVAR(effectUnconsciousCC) ppEffectEnable false;
GVAR(effectUnconsciousRB) ppEffectEnable false; GVAR(effectUnconsciousRB) ppEffectEnable false;
GVAR(effectBlindingCC) ppEffectEnable false; GVAR(effectBlindingCC) ppEffectEnable false;
@ -89,8 +80,6 @@ GVAR(effectTimeBlood) = time;
[false] call EFUNC(common,disableUserInput); // @todo, only when disabled? [false] call EFUNC(common,disableUserInput); // @todo, only when disabled?
}; };
// @todo: merge the above?
// Unconsciousness effect // Unconsciousness effect
if (ACE_player getVariable [QGVAR(isUnconscious), false]) then { if (ACE_player getVariable [QGVAR(isUnconscious), false]) then {
GVAR(effectUnconsciousCC) ppEffectEnable true; GVAR(effectUnconsciousCC) ppEffectEnable true;