Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix and use hemorrhage stringtable descriptions #6472

Merged
merged 2 commits into from
Jul 25, 2018
Merged

Fix and use hemorrhage stringtable descriptions #6472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08814b9
Fix hemorrhage stringtable descriptions
kymckay Jul 25, 2018
6feffb2
Use hemorrhage descriptons always
kymckay Jul 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 12 additions & 16 deletions addons/medical_gui/functions/fnc_displayPatientInformation.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
28 changes: 12 additions & 16 deletions addons/medical_gui/functions/fnc_updateUIInfo.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
14 changes: 7 additions & 7 deletions addons/medical_gui/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down