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

Tweaked pain effect (longer flashes/pulses)

Browse Source
This commit is contained in:
BaerMitUmlaut 2016-12-09 19:15:44 +01:00
parent 13ef6b0d29
commit 26627a451e
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/medical_ui/functions/fnc_effectPain.sqf
View File

@ -17,6 +17,11 @@ if (!_enable) exitWith {
}; };
GVAR(ppPain) ppEffectEnable true; GVAR(ppPain) ppEffectEnable true;
// Trigger effect every 2s
private _showNextTick = ACE_player getVariable [QGVAR(showPainNextTick), true];
ACE_player setVariable [QGVAR(showPainNextTick), !_showNextTick];
if (_showNextTick) exitWith {};
private _initialAdjust = []; private _initialAdjust = [];
private _delayedAdjust = []; private _delayedAdjust = [];
@ -31,8 +36,8 @@ if (GVAR(painEffectType) == 0) then {
}; };
GVAR(ppPain) ppEffectAdjust _initialAdjust; GVAR(ppPain) ppEffectAdjust _initialAdjust;
GVAR(ppPain) ppEffectCommit 0.2; GVAR(ppPain) ppEffectCommit FX_PAIN_FADE_IN;
[{ [{
GVAR(ppPain) ppEffectAdjust _this; GVAR(ppPain) ppEffectAdjust _this;
GVAR(ppPain) ppEffectCommit 0.5; GVAR(ppPain) ppEffectCommit FX_PAIN_FADE_OUT;
}, _delayedAdjust, 0.2] call CBA_fnc_waitAndExecute; }, _delayedAdjust, FX_PAIN_FADE_IN] call CBA_fnc_waitAndExecute;

5
addons/medical_ui/functions/fnc_handleEffects.sqf
View File

@ -27,7 +27,10 @@ private _pain = ACE_player getVariable [QEGVAR(medical,pain), 0];
// - Visual effects ----------------------------------------------------------- // - Visual effects -----------------------------------------------------------
[_unconscious, _unconscious] call FUNC(effectUnconscious); [_unconscious, _unconscious] call FUNC(effectUnconscious);
[true, _pain] call FUNC(effectPain);
[ [
true, linearConversion [BLOOD_VOLUME_CLASS_2_HEMORRHAGE, BLOOD_VOLUME_CLASS_4_HEMORRHAGE, _bloodVolume, 0, 1, true] true, linearConversion [BLOOD_VOLUME_CLASS_2_HEMORRHAGE, BLOOD_VOLUME_CLASS_4_HEMORRHAGE, _bloodVolume, 0, 1, true]
] call FUNC(effectBloodVolume); ] call FUNC(effectBloodVolume);
if (!_unconscious) then {
[true, _pain] call FUNC(effectPain);
};

2
addons/medical_ui/script_component.hpp
View File

@ -17,3 +17,5 @@
#include "\z\ace\addons\main\script_macros.hpp" #include "\z\ace\addons\main\script_macros.hpp"
#include "\z\ace\addons\medical\script_macros_medical.hpp" #include "\z\ace\addons\medical\script_macros_medical.hpp"
#define FX_PAIN_FADE_IN 0.3
#define FX_PAIN_FADE_OUT 0.7