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

Refactored 'showPainInMenu' setting

Browse Source 
* showPainInMenu -> on/off switch
* medicSetting_PainVisualization -> 3 way switch on who can see it
This commit is contained in:
ulteq 2016-12-15 14:45:58 +01:00
parent cc19499e8f
commit 70a2dc30e7
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/medical/ACE_Settings.hpp
View File

@ -86,9 +86,8 @@ class ACE_Settings {
category = CSTRING(Category_Medical);
displayName = CSTRING(MedicalSettings_showPainInMenu_DisplayName);
description = CSTRING(MedicalSettings_showPainInMenu_Description);
typeName = "SCALAR";
typeName = "BOOL";
value = 0;
values[] = {"Anyone", "Medics only", "Doctors only"};
};
class GVAR(playerDamageThreshold) {
category = CSTRING(Category_Medical);
@ -119,6 +118,14 @@ class ACE_Settings {
value = 30;
typeName = "SCALAR";
};
class GVAR(medicSetting_PainVisualization) {
category = CSTRING(Category_Medical);
displayName = CSTRING(MedicalSettings_medicSetting_PainVisualization_DisplayName);
description = CSTRING(MedicalSettings_medicSetting_PainVisualization_Description);
typeName = "SCALAR";
value = 0;
values[] = {"Anyone", "Medics only", "Doctors only"};
};
class GVAR(medicSetting_Epi) {
category = CSTRING(Category_Medical);
displayName = CSTRING(BasicMedicalSettings_medicSetting_Epi_DisplayName);

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

@ -60,7 +60,7 @@ 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 ([ACE_player, EGVAR(medical,showPainInMenu)] call EFUNC(medical,isMedic)) then {
if (EGVAR(medical,showPainInMenu) && {[ACE_player, EGVAR(medical,medicSetting_PainVisualization)] call EFUNC(medical,isMedic)}) then {
private _painLevel = _target call EFUNC(medical,getPainLevel);
if (_painLevel > 0) then {
private _painText = localize ELSTRING(medical,Status_Pain);

8
addons/medical/stringtable.xml
View File

@ -2774,7 +2774,7 @@
<English>Show pain</English>
</Key>
<Key ID="STR_ACE_Medical_MedicalSettings_showPainInMenu_Description">
<English>Who can see the pain status in the medical menu</English>
<English>Show pain status in the medical menu</English>
</Key>
<Key ID="STR_ACE_Medical_MedicalSettings_playerDamageThreshold_DisplayName">
<English>Player Damage</English>
@ -3064,6 +3064,12 @@
<Italian>Le unità sostengono danni da incidenti con veicoli?</Italian>
<Japanese>ユニットは車両の衝突による損傷を受けるようにしますか？</Japanese>
</Key>
<Key ID="STR_ACE_Medical_BasicMedicalSettings_medicSetting_PainVisualization_DisplayName">
<English>Allow Pain visualization</English>
</Key>
<Key ID="STR_ACE_Medical_BasicMedicalSettings_medicSetting_PainVisualization_Description">
<English>Who can see pain in the menu?</English>
</Key>
<Key ID="STR_ACE_Medical_BasicMedicalSettings_medicSetting_Epi_DisplayName">
<English>Allow Epinephrine</English>
<German>Erlaube Epiniphrin</German>

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

@ -39,7 +39,7 @@ 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 ([ACE_player, EGVAR(medical,showPainInMenu)] call EFUNC(medical,isMedic)) then {
if (EGVAR(medical,showPainInMenu) && {[ACE_player, EGVAR(medical,medicSetting_PainVisualization)] call EFUNC(medical,isMedic)}) then {
private _painLevel = _target call EFUNC(medical,getPainLevel);
if (_painLevel > 0) then {
private _painText = localize ELSTRING(medical,Status_Pain);