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.

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

Medical GUI - Localize partial wound, fix injury list color flashing #7196

Merged
merged 1 commit into from
Sep 28, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 6 additions & 5 deletions addons/medical_gui/functions/fnc_updateInjuryList.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ switch (GET_FRACTURES(_target) select _selectionN) do {
};

// Indicate the amount of pain the unit is in
if ([_target] call EFUNC(common,isAwake)) then {
if (_target call EFUNC(common,isAwake)) then {
private _pain = GET_PAIN_PERCEIVED(_target);
if (_pain > 0) then {
private _painText = switch (true) do {
Expand Down Expand Up @@ -113,7 +113,7 @@ private _fnc_getWoundDescription = {
if (_amountOf >= 1) then {
format ["%1x %2", ceil _amountOf, _woundName];
} else {
format ["Partial %1", _woundName];
format [localize LSTRING(PartialX), _woundName];
};
};

Expand Down Expand Up @@ -156,7 +156,8 @@ lbClear _ctrl;

{
_x params ["_text", "_color"];
private _index = _ctrl lbAdd _text;
_ctrl lbSetColor [_index, _color];
_ctrl lbSetSelectColor [_index, _color];

_ctrl lbSetColor [_ctrl lbAdd _text, _color];
} forEach _entries;

_ctrl lbSetCurSel -1;
3 changes: 3 additions & 0 deletions addons/medical_gui/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -916,5 +916,8 @@
<Chinesesimp>检伤分类卡</Chinesesimp>
<Chinese>檢傷分類卡</Chinese>
</Key>
<Key ID="STR_ACE_Medical_GUI_PartialX">
<English>Partial %1</English>
</Key>
</Package>
</Project>