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

localizations and event

Browse Source
This commit is contained in:
PabstMirror 2019-04-25 23:16:43 -05:00
parent 80aa05e6e6
commit da6876441e
9 changed files with 63 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/medical/initSettings.sqf
View File

@ -15,9 +15,9 @@ private _categoryArray = [LELSTRING(medical,Category_DisplayName), "?"];
[
QEGVAR(medical,limping), "LIST",
["limping"],//LSTRING(limping_DisplayName), LSTRING(limping_Description)],
LSTRING(setting_limping_DisplayName), LSTRING(setting_limping_Description)],
_categoryArray,
[[0,1,2],["Disabled", "Limp on open wound", "Limp on open or bandaged wound"], 1], // [values, titles, defaultIndex]
[[0,1,2],[LELSTRING(common,disabled), LLSTRING(setting_limping_limpOnOpenWounds), LLSTRING(setting_limping_limpRequiresStitching)], 1], // [values, titles, defaultIndex]
true, // isGlobal
{[QEGVAR(medical,limping), _this] call EFUNC(common,cbaSettings_settingChanged)},
true // Needs mission restart
@ -25,9 +25,9 @@ private _categoryArray = [LELSTRING(medical,Category_DisplayName), "?"];
[
QEGVAR(medical,fractures), "LIST",
["fractures"],//LSTRING(limping_DisplayName), LSTRING(limping_Description)],
LSTRING(setting_fractures_DisplayName), LSTRING(setting_fractures_Description)],
_categoryArray,
[[0,1,2],["Disabled", "Splints fully heal", "Splints heal (but cannot sprint)"], 1], // [values, titles, defaultIndex]
[[0,1,2],[LELSTRING(common,disabled), LLSTRING(setting_fractures_splintHealsFully), LLSTRING(setting_fractures_splintHasEffects)]"Splints fully heal", "Splints heal (but cannot sprint)"], 1], // [values, titles, defaultIndex]
true, // isGlobal
{[QEGVAR(medical,fractures), _this] call EFUNC(common,cbaSettings_settingChanged)},
true // Needs mission restart

24
addons/medical/stringtable.xml
View File

@ -481,5 +481,29 @@
<Korean>뚜껑 닫기</Korean>
<Polish>Zamknij pokrywę</Polish>
</Key>
<Key ID="STR_ACE_Medical_setting_limping_DisplayName">
<English>Limping</English>
</Key>
<Key ID="STR_ACE_Medical_setting_limping_Description">
<English>Limp when unit has leg wounds...(todo)</English>
</Key>
<Key ID="STR_ACE_Medical_setting_limping_limpOnOpenWounds">
<English>Limp on open wounds</English>
</Key>
<Key ID="STR_ACE_Medical_setting_limping_limpRequiresStitching">
<English>Limp on open or bandaged wounds</English>
</Key>
<Key ID="STR_ACE_Medical_setting_fractures_DisplayName">
<English>Fractues</English>
</Key>
<Key ID="STR_ACE_Medical_setting_fractures_Description">
<English>Limp fractures... (todo)</English>
</Key>
<Key ID="STR_ACE_Medical_setting_fractures_splintHealsFully">
<English>Splints fully heal fractures</English>
</Key>
<Key ID="STR_ACE_Medical_setting_fractures_splintHasEffects">
<English>Splints heal (but cannot sprint)</English>
</Key>
</Package>
</Project>

1
addons/medical_damage/functions/fnc_woundsHandlerSQF.sqf
View File

@ -139,6 +139,7 @@ private _bodyPartVisParams = [_unit, false, false, false, false]; // params arra
private _fractures = _unit getVariable [QEGVAR(medical,fractures), [0,0,0,0,0,0]];
_fractures set [_bodyPartNToAdd, 1];
_unit setVariable [QEGVAR(medical,fractures), _fractures, true];
[QEGVAR(medical,fracture), [_unit, _bodyPartNToAdd]] call CBA_fnc_localEvent; // local event for fracture
_updateDamageEffects = true;
};
case (_causeLimping && {EGVAR(medical,limping) > 0} && {_bodyPartNToAdd > 3} && {_woundDamage > LIMPING_DAMAGE_THRESHOLD}): {

7
addons/medical_gui/functions/fnc_updateBodyImage.sqf
View File

@ -42,14 +42,19 @@ private _bodyPartBloodLoss = [0, 0, 0, 0, 0, 0];
if (_fractureIDC != -1) then {
private _ctrlBone = _ctrlGroup controlsGroupCtrl _fractureIDC;
switch (_fractures select _forEachIndex) do {
case (0): {_ctrlBone ctrlShow false;};
case (0): {
_ctrlBone ctrlShow false;
};
case (1): {
_ctrlBone ctrlShow true;
_ctrlBone ctrlSetTextColor [1, 0, 0, 1];
};
case (-1): {
if (EGVAR(medical,fractures) == 2) then {
_ctrlBone ctrlShow true;
_ctrlBone ctrlSetTextColor [0, 0, 1, 1];
} else {
_ctrlBone ctrlShow false;
};
};
};

8
addons/medical_gui/functions/fnc_updateInjuryList.sqf
View File

@ -59,8 +59,12 @@ if (HAS_TOURNIQUET_APPLIED_ON(_target,_selectionN)) then {
_entries pushBack [localize LSTRING(Status_Tourniquet_Applied), [0.77, 0.51, 0.08, 1]];
};
switch ((_target getVariable [QEGVAR(medical,fractures), [0,0,0,0,0,0]]) select _selectionN) do {
case (1): {_entries pushBack ["fracture!", [1, 0, 0, 1]];};
case (-1): {_entries pushBack ["splinted", [1, 1, 1, 1]];};
case (1): {_entries pushBack [localize LSTRING(Status_Fractured), [1, 0, 0, 1]];};
case (-1): {
if (EGVAR(medical,fractures) == 2) then { // Ignore if the split has no effect
_entries pushBack [localize LSTRING(Status_SplintApplied), [1, 1, 1, 1]];
};
};
};
// Indicate the amount of pain the unit is in

6
addons/medical_gui/stringtable.xml
View File

@ -775,6 +775,12 @@
<Chinesesimp>大量失血</Chinesesimp>
<Chinese>大量失血</Chinese>
</Key>
<Key ID="STR_ACE_Medical_GUI_Status_Fractured">
<English>Fractured</English>
</Key>
<Key ID="STR_ACE_Medical_GUI_Status_SplintApplied">
<English>Splint Applied</English>
</Key>
<!--
Strings above match Blood2 but seem to differ in some languages, determine which is best to use
-->

4
addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp
View File

@ -85,8 +85,8 @@ class GVAR(Actions) {
};
// --- splint
class Splint: BasicBandage {
displayName = "Splint"; // CSTRING(Apply_Tourniquet);
displayNameProgress = "Splinting"; // CSTRING(Applying_Tourniquet);
displayName = CSTRING(Apply_Splint);
displayNameProgress = CSTRING(Applying_Splint);
category = "bandage";
icon = QPATHTOEF(medical_gui,ui\splint.paa);
allowedSelections[] = {"LeftArm", "RightArm", "LeftLeg", "RightLeg"};

5
addons/medical_treatment/CfgWeapons.hpp
View File

@ -73,11 +73,10 @@ class CfgWeapons {
class ACE_splint: ACE_ItemCore {
scope = 2;
author = ECSTRING(common,ACETeam);
displayName = "splint";
displayName = CSTRING(splint_Display);
picture = QPATHTOF(ui\items\tourniquet_x_ca.paa);
model = QPATHTOF(data\tourniquet.p3d);
// descriptionShort = CSTRING(Tourniquet_Desc_Short);
// descriptionUse = CSTRING(Tourniquet_Desc_Use);
descriptionShort = CSTRING(splint_Desc_Short);
class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 2;
};

12
addons/medical_treatment/stringtable.xml
View File

@ -765,6 +765,12 @@
<Chinesesimp>用于压迫静脉与动脉的血液流动, 达到减缓失血速度的目的</Chinesesimp>
<Chinese>用於壓迫靜脈與動脈的血液流動, 達到減緩失血速度的目的</Chinese>
</Key>
<Key ID="STR_ACE_Medical_treatment_splint_Display">
<English>Splint</English>
</Key>
<Key ID="STR_ACE_Medical_treatment_splint_Desc_Short">
<English>Stabilizes a fractured limb</English>
</Key>
<Key ID="STR_ACE_Medical_treatment_Morphine_Display">
<English>Morphine autoinjector</English>
<German>Morphium-Autoinjektor</German>
@ -1960,6 +1966,12 @@
<Chinesesimp>移除军用止血带</Chinesesimp>
<Chinese>移除軍用止血帶</Chinese>
</Key>
<Key ID="STR_ACE_Medical_treatment_Apply_Splint">
<English>Apply Splint</English>
</Key>
<Key ID="STR_ACE_Medical_treatment_Applying_Splint">
<English>Applying Splint...</English>
</Key>
<Key ID="STR_ACE_Medical_treatment_Actions_Diagnose">
<English>Diagnose</English>
<German>Diagnose</German>