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

Medical - Move GUI and Feedback settings to separate category (#9537)

Browse Source 
* Move medical interface settings to separate category

* Add translations from `str_3den_display3den_menubar_interface_text`

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
This commit is contained in:
amsteadrayle 2023-10-19 20:37:58 -04:00 committed by GitHub
parent 55566fd60f
commit 5d49a57bd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/medical/stringtable.xml
View File

@ -18,6 +18,22 @@
<Turkish>ACE Medikal</Turkish> <Turkish>ACE Medikal</Turkish>
<Japanese>ACE 医療</Japanese> <Japanese>ACE 医療</Japanese>
</Key> </Key>
<Key ID="STR_ACE_Medical_Interface_Category">
<English>ACE Medical Interface</English>
<Russian>ACE Медицина Интерфейс</Russian>
<Polish>ACE Opcje medyczne Interfejs</Polish>
<Spanish>Médico ACE Interfaz</Spanish>
<German>ACE-Medicsystem Interface</German>
<Czech>ACE Zdravotnické Rozhraní</Czech>
<Portuguese>ACE Médico Interface</Portuguese>
<French>ACE Médical Interface</French>
<Italian>ACE Medical Interfaccia</Italian>
<Korean>ACE 의료 인터페이스</Korean>
<Chinesesimp>ACE 医疗 界面</Chinesesimp>
<Chinese>ACE 醫療系統 介面</Chinese>
<Turkish>ACE Medikal Arayüz</Turkish>
<Japanese>ACE 医療 インターフェイス</Japanese>
</Key>
<Key ID="STR_ACE_Medical_SpontaneousWakeUpChance_DisplayName"> <Key ID="STR_ACE_Medical_SpontaneousWakeUpChance_DisplayName">
<English>Unconscious Wake Up Chance</English> <English>Unconscious Wake Up Chance</English>
<German>Wahrscheinlichkeit um aufzuwachen</German> <German>Wahrscheinlichkeit um aufzuwachen</German>

6
addons/medical_feedback/initSettings.sqf
View File

@ -2,7 +2,7 @@
QGVAR(painEffectType), QGVAR(painEffectType),
"LIST", "LIST",
[LSTRING(PainEffectType_DisplayName), LSTRING(PainEffectType_Description)], [LSTRING(PainEffectType_DisplayName), LSTRING(PainEffectType_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory)], [ELSTRING(medical,Interface_Category), LSTRING(SubCategory)],
[ [
[FX_PAIN_WHITE_FLASH, FX_PAIN_PULSATING_BLUR, FX_PAIN_CHROMATIC_ABERRATION, FX_PAIN_ONLY_BASE], [FX_PAIN_WHITE_FLASH, FX_PAIN_PULSATING_BLUR, FX_PAIN_CHROMATIC_ABERRATION, FX_PAIN_ONLY_BASE],
[LSTRING(painEffectType_whiteFlashing), LSTRING(painEffectType_pulsingBlur), LSTRING(painEffectType_chromAberration), LSTRING(painEffectType_onlyBase)], [LSTRING(painEffectType_whiteFlashing), LSTRING(painEffectType_pulsingBlur), LSTRING(painEffectType_chromAberration), LSTRING(painEffectType_onlyBase)],
@ -23,7 +23,7 @@
QGVAR(bloodVolumeEffectType), QGVAR(bloodVolumeEffectType),
"LIST", "LIST",
[LSTRING(BloodVolumeEffectType_DisplayName), LSTRING(BloodVolumeEffectType_Description)], [LSTRING(BloodVolumeEffectType_DisplayName), LSTRING(BloodVolumeEffectType_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory)], [ELSTRING(medical,Interface_Category), LSTRING(SubCategory)],
[ [
[FX_BLOODVOLUME_COLOR_CORRECTION, FX_BLOODVOLUME_ICON, FX_BLOODVOLUME_BOTH], [FX_BLOODVOLUME_COLOR_CORRECTION, FX_BLOODVOLUME_ICON, FX_BLOODVOLUME_BOTH],
[LSTRING(BloodVolumeEffectType_colorCorrection), LSTRING(BloodVolumeEffectType_icon), LSTRING(BloodVolumeEffectType_both)], [LSTRING(BloodVolumeEffectType_colorCorrection), LSTRING(BloodVolumeEffectType_icon), LSTRING(BloodVolumeEffectType_both)],
@ -44,7 +44,7 @@
QGVAR(enableHUDIndicators), QGVAR(enableHUDIndicators),
"CHECKBOX", "CHECKBOX",
[LSTRING(EnableHUDIndicators_DisplayName), LSTRING(EnableHUDIndicators_Description)], [LSTRING(EnableHUDIndicators_DisplayName), LSTRING(EnableHUDIndicators_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory)], [ELSTRING(medical,Interface_Category), LSTRING(SubCategory)],
true, true,
false, false,
{ {

28
addons/medical_gui/initSettings.sqf
View File

@ -2,7 +2,7 @@
QGVAR(enableActions), QGVAR(enableActions),
"LIST", "LIST",
[LSTRING(EnableActions_DisplayName), LSTRING(EnableActions_Description)], [LSTRING(EnableActions_DisplayName), LSTRING(EnableActions_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory)], [ELSTRING(medical,Interface_Category), LSTRING(SubCategory)],
[[0, 1, 2], [LSTRING(Selections3D), LSTRING(Radial), ELSTRING(common,Disabled)], 0], [[0, 1, 2], [LSTRING(Selections3D), LSTRING(Radial), ELSTRING(common,Disabled)], 0],
false false
] call CBA_fnc_addSetting; ] call CBA_fnc_addSetting;
@ -11,7 +11,7 @@
QGVAR(enableSelfActions), QGVAR(enableSelfActions),
"CHECKBOX", "CHECKBOX",
[LSTRING(EnableSelfActions_DisplayName), LSTRING(EnableSelfActions_Description)], [LSTRING(EnableSelfActions_DisplayName), LSTRING(EnableSelfActions_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory)], [ELSTRING(medical,Interface_Category), LSTRING(SubCategory)],
true, true,
false false
] call CBA_fnc_addSetting; ] call CBA_fnc_addSetting;
@ -20,7 +20,7 @@
QGVAR(enableMedicalMenu), QGVAR(enableMedicalMenu),
"LIST", "LIST",
[LSTRING(EnableMedicalMenu_DisplayName), LSTRING(EnableMedicalMenu_Description)], [LSTRING(EnableMedicalMenu_DisplayName), LSTRING(EnableMedicalMenu_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory)], [ELSTRING(medical,Interface_Category), LSTRING(SubCategory)],
[[0, 1, 2], [ELSTRING(common,Disabled), ELSTRING(common,Enabled), ELSTRING(common,VehiclesOnly)], 1], [[0, 1, 2], [ELSTRING(common,Disabled), ELSTRING(common,Enabled), ELSTRING(common,VehiclesOnly)], 1],
false false
] call CBA_fnc_addSetting; ] call CBA_fnc_addSetting;
@ -29,7 +29,7 @@
QGVAR(openAfterTreatment), QGVAR(openAfterTreatment),
"CHECKBOX", "CHECKBOX",
[LSTRING(OpenAfterTreatment_DisplayName), LSTRING(OpenAfterTreatment_Description)], [LSTRING(OpenAfterTreatment_DisplayName), LSTRING(OpenAfterTreatment_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory)], [ELSTRING(medical,Interface_Category), LSTRING(SubCategory)],
true, true,
false false
] call CBA_fnc_addSetting; ] call CBA_fnc_addSetting;
@ -38,7 +38,7 @@
QGVAR(maxDistance), QGVAR(maxDistance),
"SLIDER", "SLIDER",
[LSTRING(MaxDistance_DisplayName), LSTRING(MaxDistance_Description)], [LSTRING(MaxDistance_DisplayName), LSTRING(MaxDistance_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory)], [ELSTRING(medical,Interface_Category), LSTRING(SubCategory)],
[0, 10, 3, 1], [0, 10, 3, 1],
true true
] call CBA_fnc_addSetting; ] call CBA_fnc_addSetting;
@ -47,7 +47,7 @@
QGVAR(interactionMenuShowTriage), QGVAR(interactionMenuShowTriage),
"LIST", "LIST",
[LSTRING(InteractionMenuShowTriage_DisplayName), LSTRING(InteractionMenuShowTriage_Description)], [LSTRING(InteractionMenuShowTriage_DisplayName), LSTRING(InteractionMenuShowTriage_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory)], [ELSTRING(medical,Interface_Category), LSTRING(SubCategory)],
[[0, 1, 2], [ELSTRING(common,Disabled), ELSTRING(Medical_Treatment,Anyone), ELSTRING(Medical_Treatment,Medics)], 1], [[0, 1, 2], [ELSTRING(common,Disabled), ELSTRING(Medical_Treatment,Anyone), ELSTRING(Medical_Treatment,Medics)], 1],
false false
] call CBA_fnc_addSetting; ] call CBA_fnc_addSetting;
@ -86,7 +86,7 @@ private _damageColors = [
[0.00, 0.00, 1.00, 1] [0.00, 0.00, 1.00, 1]
]; ];
private _categoryColors = [ELSTRING(medical,Category), format ["| %1 |", LELSTRING(common,subcategory_colors)]]; private _categoryColors = [ELSTRING(medical,Interface_Category), format ["| %1 |", LELSTRING(common,subcategory_colors)]];
{ {
[ [
format ["%1_%2", QGVAR(bloodLossColor), _forEachIndex], format ["%1_%2", QGVAR(bloodLossColor), _forEachIndex],
@ -113,7 +113,7 @@ private _categoryColors = [ELSTRING(medical,Category), format ["| %1 |", LELSTRI
QGVAR(showDamageEntry), QGVAR(showDamageEntry),
"CHECKBOX", "CHECKBOX",
[LSTRING(showDamageEntry_DisplayName), LSTRING(showDamageEntry_Description)], [LSTRING(showDamageEntry_DisplayName), LSTRING(showDamageEntry_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory)], [ELSTRING(medical,Interface_Category), LSTRING(SubCategory)],
false, false,
true true
] call CBA_fnc_addSetting; ] call CBA_fnc_addSetting;
@ -122,7 +122,7 @@ private _categoryColors = [ELSTRING(medical,Category), format ["| %1 |", LELSTRI
QGVAR(showBloodlossEntry), QGVAR(showBloodlossEntry),
"CHECKBOX", "CHECKBOX",
[LSTRING(ShowBloodlossEntry_DisplayName), LSTRING(ShowBloodlossEntry_Description)], [LSTRING(ShowBloodlossEntry_DisplayName), LSTRING(ShowBloodlossEntry_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory)], [ELSTRING(medical,Interface_Category), LSTRING(SubCategory)],
true, true,
true // isGlobal true // isGlobal
] call CBA_fnc_addSetting; ] call CBA_fnc_addSetting;
@ -131,7 +131,7 @@ private _categoryColors = [ELSTRING(medical,Category), format ["| %1 |", LELSTRI
QGVAR(bodyPartOutlineColor), QGVAR(bodyPartOutlineColor),
"COLOR", "COLOR",
[LSTRING(bodyPartOutlineColor_DisplayName), LSTRING(bodyPartOutlineColor_Description)], [LSTRING(bodyPartOutlineColor_DisplayName), LSTRING(bodyPartOutlineColor_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory)], [ELSTRING(medical,Interface_Category), LSTRING(SubCategory)],
[1.00, 1.00, 1.00, 1], [1.00, 1.00, 1.00, 1],
false false
] call CBA_fnc_addSetting; ] call CBA_fnc_addSetting;
@ -140,7 +140,7 @@ private _categoryColors = [ELSTRING(medical,Category), format ["| %1 |", LELSTRI
QGVAR(peekMedicalInfoReleaseDelay), QGVAR(peekMedicalInfoReleaseDelay),
"TIME", "TIME",
[LSTRING(PeekMedicalInfoReleaseDelay_DisplayName), LSTRING(PeekMedicalInfoReleaseDelay_Description)], [LSTRING(PeekMedicalInfoReleaseDelay_DisplayName), LSTRING(PeekMedicalInfoReleaseDelay_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory)], [ELSTRING(medical,Interface_Category), LSTRING(SubCategory)],
[0, 5, 1], [0, 5, 1],
false false
] call CBA_fnc_addSetting; ] call CBA_fnc_addSetting;
@ -149,7 +149,7 @@ private _categoryColors = [ELSTRING(medical,Category), format ["| %1 |", LELSTRI
QGVAR(peekMedicalOnHit), QGVAR(peekMedicalOnHit),
"CHECKBOX", "CHECKBOX",
[LSTRING(PeekMedicalOnHit_DisplayName), LSTRING(PeekMedicalOnHit_Description)], [LSTRING(PeekMedicalOnHit_DisplayName), LSTRING(PeekMedicalOnHit_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory)], [ELSTRING(medical,Interface_Category), LSTRING(SubCategory)],
false, false,
false // isGlobal false // isGlobal
] call CBA_fnc_addSetting; ] call CBA_fnc_addSetting;
@ -158,7 +158,7 @@ private _categoryColors = [ELSTRING(medical,Category), format ["| %1 |", LELSTRI
QGVAR(peekMedicalOnHitDuration), QGVAR(peekMedicalOnHitDuration),
"TIME", "TIME",
[LSTRING(PeekMedicalOnHitDuration_DisplayName), LSTRING(PeekMedicalOnHitDuration_Description)], [LSTRING(PeekMedicalOnHitDuration_DisplayName), LSTRING(PeekMedicalOnHitDuration_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory)], [ELSTRING(medical,Interface_Category), LSTRING(SubCategory)],
[0, 5, 1], [0, 5, 1],
false false
] call CBA_fnc_addSetting; ] call CBA_fnc_addSetting;
@ -167,7 +167,7 @@ private _categoryColors = [ELSTRING(medical,Category), format ["| %1 |", LELSTRI
QGVAR(tourniquetWarning), QGVAR(tourniquetWarning),
"CHECKBOX", "CHECKBOX",
[LSTRING(TourniquetWarning_DisplayName), LSTRING(TourniquetWarning_Description)], [LSTRING(TourniquetWarning_DisplayName), LSTRING(TourniquetWarning_Description)],
[ELSTRING(medical,Category), LSTRING(SubCategory)], [ELSTRING(medical,Interface_Category), LSTRING(SubCategory)],
false, false,
false false
] call CBA_fnc_addSetting; ] call CBA_fnc_addSetting;