localizations and event

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

View File

@ -15,9 +15,9 @@ private _categoryArray = [LELSTRING(medical,Category_DisplayName), "?"];
[ [
QEGVAR(medical,limping), "LIST", QEGVAR(medical,limping), "LIST",
["limping"],//LSTRING(limping_DisplayName), LSTRING(limping_Description)], LSTRING(setting_limping_DisplayName), LSTRING(setting_limping_Description)],
_categoryArray, _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 true, // isGlobal
{[QEGVAR(medical,limping), _this] call EFUNC(common,cbaSettings_settingChanged)}, {[QEGVAR(medical,limping), _this] call EFUNC(common,cbaSettings_settingChanged)},
true // Needs mission restart true // Needs mission restart
@ -25,9 +25,9 @@ private _categoryArray = [LELSTRING(medical,Category_DisplayName), "?"];
[ [
QEGVAR(medical,fractures), "LIST", QEGVAR(medical,fractures), "LIST",
["fractures"],//LSTRING(limping_DisplayName), LSTRING(limping_Description)], LSTRING(setting_fractures_DisplayName), LSTRING(setting_fractures_Description)],
_categoryArray, _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 true, // isGlobal
{[QEGVAR(medical,fractures), _this] call EFUNC(common,cbaSettings_settingChanged)}, {[QEGVAR(medical,fractures), _this] call EFUNC(common,cbaSettings_settingChanged)},
true // Needs mission restart true // Needs mission restart

View File

@ -481,5 +481,29 @@
<Korean>뚜껑 닫기</Korean> <Korean>뚜껑 닫기</Korean>
<Polish>Zamknij pokrywę</Polish> <Polish>Zamknij pokrywę</Polish>
</Key> </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> </Package>
</Project> </Project>

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]]; private _fractures = _unit getVariable [QEGVAR(medical,fractures), [0,0,0,0,0,0]];
_fractures set [_bodyPartNToAdd, 1]; _fractures set [_bodyPartNToAdd, 1];
_unit setVariable [QEGVAR(medical,fractures), _fractures, true]; _unit setVariable [QEGVAR(medical,fractures), _fractures, true];
[QEGVAR(medical,fracture), [_unit, _bodyPartNToAdd]] call CBA_fnc_localEvent; // local event for fracture
_updateDamageEffects = true; _updateDamageEffects = true;
}; };
case (_causeLimping && {EGVAR(medical,limping) > 0} && {_bodyPartNToAdd > 3} && {_woundDamage > LIMPING_DAMAGE_THRESHOLD}): { case (_causeLimping && {EGVAR(medical,limping) > 0} && {_bodyPartNToAdd > 3} && {_woundDamage > LIMPING_DAMAGE_THRESHOLD}): {

View File

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

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]]; _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 { 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 [localize LSTRING(Status_Fractured), [1, 0, 0, 1]];};
case (-1): {_entries pushBack ["splinted", [1, 1, 1, 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 // Indicate the amount of pain the unit is in

View File

@ -775,6 +775,12 @@
<Chinesesimp>大量失血</Chinesesimp> <Chinesesimp>大量失血</Chinesesimp>
<Chinese>大量失血</Chinese> <Chinese>大量失血</Chinese>
</Key> </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 Strings above match Blood2 but seem to differ in some languages, determine which is best to use
--> -->

View File

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

View File

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

View File

@ -765,6 +765,12 @@
<Chinesesimp>用于压迫静脉与动脉的血液流动, 达到减缓失血速度的目的</Chinesesimp> <Chinesesimp>用于压迫静脉与动脉的血液流动, 达到减缓失血速度的目的</Chinesesimp>
<Chinese>用於壓迫靜脈與動脈的血液流動, 達到減緩失血速度的目的</Chinese> <Chinese>用於壓迫靜脈與動脈的血液流動, 達到減緩失血速度的目的</Chinese>
</Key> </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"> <Key ID="STR_ACE_Medical_treatment_Morphine_Display">
<English>Morphine autoinjector</English> <English>Morphine autoinjector</English>
<German>Morphium-Autoinjektor</German> <German>Morphium-Autoinjektor</German>
@ -1960,6 +1966,12 @@
<Chinesesimp>移除军用止血带</Chinesesimp> <Chinesesimp>移除军用止血带</Chinesesimp>
<Chinese>移除軍用止血帶</Chinese> <Chinese>移除軍用止血帶</Chinese>
</Key> </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"> <Key ID="STR_ACE_Medical_treatment_Actions_Diagnose">
<English>Diagnose</English> <English>Diagnose</English>
<German>Diagnose</German> <German>Diagnose</German>