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

Locailzation, tweak fast heart rate

Browse Source
This commit is contained in:
PabstMirror 2017-03-18 11:53:57 -05:00
parent e3af1b55a5
commit 2e61cc32e1
7 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/medical_ui/XEH_PREP.hpp
View File

@ -1,3 +1,5 @@
TRACE_1("",QUOTE(ADDON));
PREP(effectBleeding); PREP(effectBleeding);
PREP(effectBloodVolume); PREP(effectBloodVolume);
PREP(effectHeartBeat); PREP(effectHeartBeat);

1
addons/medical_ui/XEH_postInit.sqf
View File

@ -2,6 +2,7 @@
if (!hasInterface) exitWith {}; if (!hasInterface) exitWith {};
GVAR(nextFadeIn) = 0;
GVAR(heartBeatEffectRunning) = false; GVAR(heartBeatEffectRunning) = false;
[false] call FUNC(initEffects); [false] call FUNC(initEffects);

4
addons/medical_ui/XEH_preInit.sqf
View File

@ -2,7 +2,9 @@
ADDON = false; ADDON = false;
PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END;
[ [
QGVAR(painEffectType), QGVAR(painEffectType),
@ -11,7 +13,7 @@ ADDON = false;
"ACE Medical", // @todo "ACE Medical", // @todo
[ [
[0, 1], [0, 1],
["White flashing", "Pulsing blur"], [localize LSTRING(painEffectType_whiteFlashing), localize LSTRING(painEffectType_pulsingBlur)],
0 0
], ],
false, false,

1
addons/medical_ui/functions/fnc_effectBleeding.sqf
View File

@ -26,6 +26,7 @@ if (!_enable) exitWith {
// Initialize controls // Initialize controls
if (isNull _blood1) then { if (isNull _blood1) then {
TRACE_1("Creating Blood Controls",_controls);
_blood1 = findDisplay 46 ctrlCreate ["RscPicture", -1]; _blood1 = findDisplay 46 ctrlCreate ["RscPicture", -1];
_blood2 = findDisplay 46 ctrlCreate ["RscPicture", -1]; _blood2 = findDisplay 46 ctrlCreate ["RscPicture", -1];

13
addons/medical_ui/functions/fnc_effectHeartBeat.sqf
View File

@ -11,13 +11,18 @@
#include "script_component.hpp" #include "script_component.hpp"
private _heartRate = ACE_player getVariable [QEGVAR(medical,heartRate), DEFAULT_HEART_RATE]; private _heartRate = ACE_player getVariable [QEGVAR(medical,heartRate), DEFAULT_HEART_RATE];
if (_heartRate == 0) exitWith {GVAR(heartBeatEffectRunning) = false;}; if (_heartRate == 0) exitWith {
TRACE_1("Ending heart beat effect - zero",_heartRate);
GVAR(heartBeatEffectRunning) = false;
};
private _waitTime = 60 / _heartRate; private _waitTime = 60 / _heartRate;
// TRACE_2("",_heartRate,_waitTime);
switch (true) do { switch (true) do {
case (_heartRate > 160): { case (_heartRate > 160): {
playSound SND_HEARBEAT_FAST; // playSound SND_HEARBEAT_FAST; // Array doesn't blend together well, just play one file consistently
playSound "ACE_heartbeat_fast_1";
[DFUNC(effectHeartBeat), [], _waitTime] call CBA_fnc_waitAndExecute; [DFUNC(effectHeartBeat), [], _waitTime] call CBA_fnc_waitAndExecute;
}; };
case (_heartRate < 60): { case (_heartRate < 60): {
@ -26,7 +31,7 @@ switch (true) do {
}; };
default { default {
TRACE_1("Ending heart beat effect",_heartRate); TRACE_1("Ending heart beat effect - normal",_heartRate);
GVAR(heartBeatEffectRunning) = false; GVAR(heartBeatEffectRunning) = false;
}; };
}; };

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

@ -18,9 +18,10 @@ if (EGVAR(common,OldIsCamera) || {!alive ACE_player}) exitWith {
[false] call FUNC(effectBleeding); [false] call FUNC(effectBleeding);
}; };
BEGIN_COUNTER(handleEffects);
// - Current state info ------------------------------------------------------- // - Current state info -------------------------------------------------------
private _bleedingStrength = [ACE_player] call EFUNC(medical,getBloodloss); private _bleedingStrength = [ACE_player] call EFUNC(medical,getBloodloss);
// private _bleeding = _bleedingStrength > 0;
private _bloodVolume = ACE_player getVariable [QEGVAR(medical,bloodVolume), DEFAULT_BLOOD_VOLUME]; private _bloodVolume = ACE_player getVariable [QEGVAR(medical,bloodVolume), DEFAULT_BLOOD_VOLUME];
private _unconscious = ACE_player getVariable [QEGVAR(medical,isUnconscious), false]; private _unconscious = ACE_player getVariable [QEGVAR(medical,isUnconscious), false];
private _heartRate = ACE_player getVariable [QEGVAR(medical,heartRate), DEFAULT_HEART_RATE]; private _heartRate = ACE_player getVariable [QEGVAR(medical,heartRate), DEFAULT_HEART_RATE];
@ -43,3 +44,5 @@ if (!_unconscious) then {
}; };
[true, _bleedingStrength] call FUNC(effectBleeding); [true, _bleedingStrength] call FUNC(effectBleeding);
END_COUNTER(handleEffects);

6
addons/medical_ui/stringtable.xml
View File

@ -15,5 +15,11 @@
<Japanese>痛みの種類</Japanese> <Japanese>痛みの種類</Japanese>
<Korean>고통 효과 종류</Korean> <Korean>고통 효과 종류</Korean>
</Key> </Key>
<Key ID="STR_ACE_Medical_ui_painEffectType_whiteFlashing">
<English>White flashing</English>
</Key>
<Key ID="STR_ACE_Medical_ui_painEffectType_pulsingBlur">
<English>Pulsing blur</English>
</Key>
</Package> </Package>
</Project> </Project>