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

Fix and use hemorrhage stringtable descriptions (#6472)

Browse Source 
* Fix hemorrhage stringtable descriptions
* Use hemorrhage descriptions always
This commit is contained in:
SilentSpike 2018-07-25 18:42:53 +01:00 committed by GitHub
parent 873ed90cc1
commit 9349179213
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
addons/medical_gui/functions/fnc_displayPatientInformation.sqf
View File

@ -56,24 +56,20 @@ if (_show == 1) then {
_genericMessages pushback [localize LSTRING(Status_Bleeding), [1, 0.1, 0.1, 1]];
};
// Show more information if advancedDiagnose is enabled
if (EGVAR(medical,advancedDiagnose)) then {
switch (GET_HEMORRHAGE(_target)) do {
case 1;
case 2: {
_genericMessages pushBack [LLSTRING(Lost_Blood2), [1, 0.1, 0.1, 1]];
};
case 3: {
_genericMessages pushBack [LLSTRING(Lost_Blood3), [1, 0.1, 0.1, 1]];
};
case 4: {
_genericMessages pushBack [LLSTRING(Lost_Blood4), [1, 0.1, 0.1, 1]];
};
};
} else {
if (GET_HEMORRHAGE(_target) > 0) then {
// Give a qualitative description of the blood volume lost
switch (GET_HEMORRHAGE(_target)) do {
case 1: {
_genericMessages pushBack [LLSTRING(Lost_Blood1), [1, 0.1, 0.1, 1]];
};
case 2: {
_genericMessages pushBack [LLSTRING(Lost_Blood2), [1, 0.1, 0.1, 1]];
};
case 3: {
_genericMessages pushBack [LLSTRING(Lost_Blood3), [1, 0.1, 0.1, 1]];
};
case 4: {
_genericMessages pushBack [LLSTRING(Lost_Blood4), [1, 0.1, 0.1, 1]];
};
};
if (((_target getVariable [QEGVAR(medical,tourniquets), [0,0,0,0,0,0]]) select _selectionN) > 0) then {

28
addons/medical_gui/functions/fnc_updateUIInfo.sqf
View File

@ -31,24 +31,20 @@ if IS_BLEEDING(_target) then {
_genericMessages pushBack [localize ELSTRING(medical,Status_Bleeding), [1, 0.1, 0.1, 1]];
};
// Show more information if advancedDiagnose is enabled
if (EGVAR(medical,advancedDiagnose)) then {
switch (GET_HEMORRHAGE(_target)) do {
case 1;
case 2: {
_genericMessages pushBack [LLSTRING(Lost_Blood2), [1, 0.1, 0.1, 1]];
};
case 3: {
_genericMessages pushBack [LLSTRING(Lost_Blood3), [1, 0.1, 0.1, 1]];
};
case 4: {
_genericMessages pushBack [LLSTRING(Lost_Blood4), [1, 0.1, 0.1, 1]];
};
};
} else {
if (GET_HEMORRHAGE(_target) > 0) then {
// Give a qualitative description of the blood volume lost
switch (GET_HEMORRHAGE(_target)) do {
case 1: {
_genericMessages pushBack [LLSTRING(Lost_Blood1), [1, 0.1, 0.1, 1]];
};
case 2: {
_genericMessages pushBack [LLSTRING(Lost_Blood2), [1, 0.1, 0.1, 1]];
};
case 3: {
_genericMessages pushBack [LLSTRING(Lost_Blood3), [1, 0.1, 0.1, 1]];
};
case 4: {
_genericMessages pushBack [LLSTRING(Lost_Blood4), [1, 0.1, 0.1, 1]];
};
};
if (((_target getVariable [QEGVAR(medical,tourniquets), [0, 0, 0, 0, 0, 0]]) select _selectionN) > 0) then {

14
addons/medical_gui/stringtable.xml
View File

@ -845,10 +845,13 @@
<Chinese>大量失血</Chinese>
</Key>
<!--
Strings above and below this seem to differ in some languages, determine which is best to use
Strings above match Blood2 but seem to differ in some languages, determine which is best to use
-->
<Key ID="STR_ACE_Medical_GUI_Lost_Blood1">
<English>Lost a lot of Blood</English>
<English>Lost some blood</English>
</Key>
<Key ID="STR_ACE_Medical_GUI_Lost_Blood2">
<English>Lost a lot of blood</English>
<German>Hat eine große Menge Blut verloren</German>
<Russian>Большая кровопотеря</Russian>
<Spanish>Mucha sangre perdida</Spanish>
@ -863,14 +866,11 @@
<Chinesesimp>大量失血中</Chinesesimp>
<Chinese>大量失血中</Chinese>
</Key>
<Key ID="STR_ACE_Medical_GUI_Lost_Blood2">
<English>Lost some blood</English>
</Key>
<Key ID="STR_ACE_Medical_GUI_Lost_Blood3">
<English>Lost a lot of blood</English>
<English>Lost a large amount of blood</English>
</Key>
<Key ID="STR_ACE_Medical_GUI_Lost_Blood4">
<English>Lost a large amount of blood</English>
<English>Lost a fatal amount of blood</English>
</Key>
<Key ID="STR_ACE_Medical_GUI_STATUS_TOURNIQUET_APPLIED">
<English>Tourniquet [CAT]</English>