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

Revert "Implemented 'showPainInMenu' logic"

Browse Source 
This reverts commit 964711a38b.
This commit is contained in:
ulteq 2016-12-14 21:23:26 +01:00
parent 0d0cf38028
commit 8146cb427e
4 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/medical/ACE_Settings.hpp
View File

@ -79,8 +79,9 @@ class ACE_Settings {
category = CSTRING(Category_Medical);
displayName = CSTRING(MedicalSettings_showPainInMenu_DisplayName);
description = CSTRING(MedicalSettings_showPainInMenu_Description);
typeName = "BOOL";
value = 1;
typeName = "SCALAR";
value = 0;
values[] = {"Anyone", "Medics only", "Doctors only"};
};
class GVAR(playerDamageThreshold) {
category = CSTRING(Category_Medical);

20
addons/medical/functions/fnc_displayPatientInformation.sqf
View File

@ -60,19 +60,17 @@ if (_show == 1) then {
if (((_target getVariable [QEGVAR(medical,tourniquets), [0,0,0,0,0,0]]) select _selectionN) > 0) then {
_genericMessages pushback [localize ELSTRING(medical,Status_Tourniquet_Applied), [0.77, 0.51, 0.08, 1]];
};
if (GVAR(showPainInMenu)) then {
private _painLevel = _target call EFUNC(medical,getPainLevel);
if (_painLevel > 0) then {
private _painText = localize ELSTRING(medical,Status_Pain);
if (_painLevel < 0.1) then {
_painText = localize ELSTRING(medical,Status_MildPain);
} else {
if (_painLevel > 0.5) then {
_painText = localize ELSTRING(medical,Status_SeverePain);
};
private _painLevel = _target call EFUNC(medical,getPainLevel);
if (_painLevel > 0) then {
private _painText = localize ELSTRING(medical,Status_Pain);
if (_painLevel < 0.1) then {
_painText = localize ELSTRING(medical,Status_MildPain);
} else {
if (_painLevel > 0.5) then {
_painText = localize ELSTRING(medical,Status_SeverePain);
};
_genericMessages pushback [_painText, [1, 1, 1, 1]];
};
_genericMessages pushback [_painText, [1, 1, 1, 1]];
};
private _totalIvVolume = 0;

2
addons/medical/stringtable.xml
View File

@ -2774,7 +2774,7 @@
<English>Show pain</English>
</Key>
<Key ID="STR_ACE_Medical_MedicalSettings_showPainInMenu_Description">
<English>Show pain status in the medical menu</English>
<English>Who can see the pain status in the medical menu</English>
</Key>
<Key ID="STR_ACE_Medical_MedicalSettings_playerDamageThreshold_DisplayName">
<English>Player Damage</English>

21
addons/medical_menu/functions/fnc_updateUIInfo.sqf
View File

@ -39,20 +39,17 @@ if (((_target getVariable [QEGVAR(medical,tourniquets), [0, 0, 0, 0, 0, 0]]) sel
_genericMessages pushBack [localize ELSTRING(medical,Status_Tourniquet_Applied), [0.77, 0.51, 0.08, 1]];
};
if (EGVAR(medical,showPainInMenu)) then {
private _painLevel = _target call EFUNC(medical,getPainLevel);
if (_painLevel > 0) then {
private _painText = localize ELSTRING(medical,Status_Pain);
if (_painLevel < 0.1) then {
_painText = localize ELSTRING(medical,Status_MildPain);
} else {
if (_painLevel > 0.5) then {
_painText = localize ELSTRING(medical,Status_SeverePain);
};
private _painLevel = _target call EFUNC(medical,getPainLevel);
if (_painLevel > 0) then {
private _painText = localize ELSTRING(medical,Status_Pain);
if (_painLevel < 0.1) then {
_painText = localize ELSTRING(medical,Status_MildPain);
} else {
if (_painLevel > 0.5) then {
_painText = localize ELSTRING(medical,Status_SeverePain);
};
_genericMessages pushback [_painText, [1, 1, 1, 1]];
};
_genericMessages pushback [_painText, [1, 1, 1, 1]];
};
private _totalIvVolume = 0;