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

Moved GUI functionality to medical

Browse Source
This commit is contained in:
Thomas Kooi 2015-01-24 16:34:39 +01:00
parent 5234bb984f
commit e06c5010bb
12 changed files with 83 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
addons/gui/UI/RscTitles.hpp
View File

@ -176,76 +176,4 @@ class RscTitles {
};
};
class GVAR(ScreenEffectsBlack) {
duration = 10e10;
idd = 1111;
movingenable = 0;
onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QUOTE(GVAR(ScreenEffectsBlack))), _this select 0)]);
class controlsBackground {
class blackScreen: ACE_gui_backgroundBase {
text = QUOTE(PATHTOF(data\black_out.paa));
colorText[] = {0.0, 0.0, 0.0, 0.0};
idc = 11112;
x = safezoneX;
y = safezoneY;
w = safezoneW;
h = safezoneH;
};
};
};
class GVAR(ScreenEffectsBleeding) {
duration = 1;
idd = 1111;
movingenable = 0;
onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QUOTE(GVAR(ScreenEffectsBleeding))), _this select 0)]);
class controlsBackground {
class bleedingScreen: ACE_gui_backgroundBase {
text = QUOTE(PATHTOF(data\bleeding.paa));
colorText[] = {0.9, 0.2, 0.2, 0.6};
idc = 11113;
x = safezoneX;
y = safezoneY;
w = safezoneW;
h = safezoneH;
};
};
};
class GVAR(ScreenEffectsHit) {
duration = 1.1;
idd = 1111;
movingenable = 0;
onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QUOTE(GVAR(ScreenEffectsHit))), _this select 0)]);
class controlsBackground {
class effectHit: ACE_gui_backgroundBase {
text = QUOTE(PATHTOF(data\hit.paa));
colorText[] = {0.7, 0.2, 0.2, 0.4};
idc = 11113;
x = safezoneX;
y = safezoneY;
w = safezoneW;
h = safezoneH;
};
};
};
class GVAR(ScreenEffectsPain) {
duration = 1;
idd = 1111;
movingenable = 0;
onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QUOTE(GVAR(ScreenEffectsPain))), _this select 0)]);
class controlsBackground {
class painScreen: ACE_gui_backgroundBase {
text = QUOTE(PATHTOF(data\painScreen.paa));
colorText[] = {1, 1, 1, 0.5};
idc = 11115;
x = safezoneX;
y = safezoneY;
w = safezoneW;
h = safezoneH;
};
};
};
};

3
addons/gui/XEH_preInit.sqf
View File

@ -17,9 +17,6 @@ PREP(displayInformation);
PREP(displayMessage);
PREP(blurScreen);
PREP(displayIcon);
PREP(effectPain);
PREP(effectBleeding);
PREP(effectBlackOut);
PREP(sendHintTo);
PREP(sendMessageTo);
PREP(sendDisplayInformationTo);

4
addons/medical/XEH_preInit.sqf
View File

@ -37,6 +37,10 @@ PREP(determineIfFatal);
PREP(determineIfUnconscious);
PREP(fromNumberToBodyPart);
PREP(effectPain);
PREP(effectBleeding);
PREP(effectBlackOut);
PREP(getActivityLog);
PREP(getBloodLoss);
PREP(getBloodPressure);

0
addons/gui/data/bleeding.paa → addons/medical/data/bleeding.paa
View File

0
addons/gui/data/hit.paa → addons/medical/data/hit.paa
View File

0
addons/gui/data/painScreen.paa → addons/medical/data/painScreen.paa
View File

0
addons/gui/functions/fnc_effectBlackOut.sqf → addons/medical/functions/fnc_effectBlackOut.sqf
View File

0
addons/gui/functions/fnc_effectBleeding.sqf → addons/medical/functions/fnc_effectBleeding.sqf
View File

0
addons/gui/functions/fnc_effectPain.sqf → addons/medical/functions/fnc_effectPain.sqf
View File

6
addons/medical/functions/fnc_handleDisplayEffects.sqf
View File

@ -11,7 +11,7 @@
#include "script_component.hpp"
if (!hasInterface) exitwith{};
45 cutRsc [QEGVAR(gui,ScreenEffectsBlack),"PLAIN"];
45 cutRsc [QGVAR(ScreenEffectsBlack),"PLAIN"];
FUNC(hb_effect) = {
_heartRate = _this select 0;
@ -56,11 +56,11 @@ GVAR(BloodLevel_CC) ppEffectCommit 0;
if ([_unit] call EFUNC(common,isAwake) && false) then {
_bloodLoss = _unit call FUNC(getBloodLoss);
if (_bloodLoss >0) then {
[_bloodLoss] call EFUNC(gui,effectBleeding);
[_bloodLoss] call FUNC(effectBleeding);
};
[{
[((_this select 0) getvariable[QGVAR(amountOfPain), 0])] call EFUNC(gui,effectPain);
[((_this select 0) getvariable[QGVAR(amountOfPain), 0])] call FUNC(effectPain);
}, [_unit], 0.25, 0.25] call EFUNC(common,waitAndExecute);
[(_unit getvariable[QGVAR(heartRate), 70])] call FUNC(hb_effect);

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

@ -39,13 +39,13 @@ if (_amountOfDamage > 0.2) then {
};
};
if (isPlayer _unit) then {
76 cutRsc [QEGVAR(gui,ScreenEffectsHit),"PLAIN"];
76 cutRsc [QGVAR(ScreenEffectsHit),"PLAIN"];
addCamShake [3, 5, _amountOfDamage + random 10];
};
} else {
if (_amountOfDamage > 0) then {
if (isPlayer _unit) then {
76 cutRsc [QEGVAR(gui,ScreenEffectsHit),"PLAIN"];
76 cutRsc [QGVAR(ScreenEffectsHit),"PLAIN"];
};
};
};

74
addons/medical/ui/RscTitles.hpp Normal file
View File

@ -0,0 +1,74 @@
class Rsctitles {
class GVAR(ScreenEffectsBlack) {
duration = 10e10;
idd = 1111;
movingenable = 0;
onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QUOTE(GVAR(ScreenEffectsBlack))), _this select 0)]);
class controlsBackground {
class blackScreen: ACE_gui_backgroundBase {
text = QUOTE(PATHTOF(data\black_out.paa));
colorText[] = {0.0, 0.0, 0.0, 0.0};
idc = 11112;
x = safezoneX;
y = safezoneY;
w = safezoneW;
h = safezoneH;
};
};
};
class GVAR(ScreenEffectsBleeding) {
duration = 1;
idd = 1111;
movingenable = 0;
onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QUOTE(GVAR(ScreenEffectsBleeding))), _this select 0)]);
class controlsBackground {
class bleedingScreen: ACE_gui_backgroundBase {
text = QUOTE(PATHTOF(data\bleeding.paa));
colorText[] = {0.9, 0.2, 0.2, 0.6};
idc = 11113;
x = safezoneX;
y = safezoneY;
w = safezoneW;
h = safezoneH;
};
};
};
class GVAR(ScreenEffectsHit) {
duration = 1.1;
idd = 1111;
movingenable = 0;
onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QUOTE(GVAR(ScreenEffectsHit))), _this select 0)]);
class controlsBackground {
class effectHit: ACE_gui_backgroundBase {
text = QUOTE(PATHTOF(data\hit.paa));
colorText[] = {0.7, 0.2, 0.2, 0.4};
idc = 11113;
x = safezoneX;
y = safezoneY;
w = safezoneW;
h = safezoneH;
};
};
};
class GVAR(ScreenEffectsPain) {
duration = 1;
idd = 1111;
movingenable = 0;
onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QUOTE(GVAR(ScreenEffectsPain))), _this select 0)]);
class controlsBackground {
class painScreen: ACE_gui_backgroundBase {
text = QUOTE(PATHTOF(data\painScreen.paa));
colorText[] = {1, 1, 1, 0.5};
idc = 11115;
x = safezoneX;
y = safezoneY;
w = safezoneW;
h = safezoneH;
};
};
};
};