From f8387399757cf0915699e8e8a158e0a705c129b7 Mon Sep 17 00:00:00 2001 From: oiad Date: Sun, 28 Aug 2016 00:02:27 +1200 Subject: [PATCH] Supply crate localization fixes Extends the displayName RSC width to the same as the description (Not sure why this was so small, it truncated longer display names) Added localization strings for all the supply crates so they were easier to distinguish in the gear menu. --- .../Configs/CfgMagazines/DZE/Bulk.hpp | 20 ++- .../Configs/RscDisplay/RscDisplayGear.hpp | 5 +- SQF/dayz_code/stringtable.xml | 163 ++++++++++++------ 3 files changed, 129 insertions(+), 59 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgMagazines/DZE/Bulk.hpp b/SQF/dayz_code/Configs/CfgMagazines/DZE/Bulk.hpp index 3e72c4fce..73492c1e0 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Bulk.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Bulk.hpp @@ -9,6 +9,7 @@ class bulk: CA_Magazine { weight = 5; }; class bulk_empty: bulk { + displayName = $STR_EPOCH_BULK_DISP_EMPTY; descriptionShort = $STR_EPOCH_BULK_DESC_EMPTY; weight = 5; class ItemActions { @@ -65,6 +66,7 @@ class bulk_empty: bulk { }; class bulk_ItemSodaCoke: bulk { + displayName = $STR_EPOCH_BULK_DISP_SODACOKE_HALF; descriptionShort = $STR_EPOCH_BULK_DESC_SODACOKE_HALF; weight = 6; class ItemActions { @@ -84,6 +86,7 @@ class bulk_ItemSodaCoke: bulk { }; }; class bulk_ItemSodaCokeFull: bulk { + displayName = $STR_EPOCH_BULK_DISP_SODACOKE_FULL; descriptionShort = $STR_EPOCH_BULK_DESC_SODACOKE_FULL; weight = 7; class ItemActions { @@ -96,6 +99,7 @@ class bulk_ItemSodaCokeFull: bulk { }; class bulk_ItemSodaPepsi: bulk { + displayName = $STR_EPOCH_BULK_DISP_SODAPEPSI_HALF; descriptionShort = $STR_EPOCH_BULK_DESC_SODAPEPSI_HALF; weight = 6; class ItemActions { @@ -115,6 +119,7 @@ class bulk_ItemSodaPepsi: bulk { }; }; class bulk_ItemSodaPepsiFull: bulk { + displayName = $STR_EPOCH_BULK_DISP_SODAPEPSI_FULL; descriptionShort = $STR_EPOCH_BULK_DESC_SODAPEPSI_FULL; weight = 7; class ItemActions { @@ -127,6 +132,7 @@ class bulk_ItemSodaPepsiFull: bulk { }; class bulk_FoodbaconCooked: bulk { + displayName = $STR_EPOCH_BULK_DISP_BACON_HALF; descriptionShort = $STR_EPOCH_BULK_DESC_BACON_HALF; weight = 5; class ItemActions { @@ -146,6 +152,7 @@ class bulk_FoodbaconCooked: bulk { }; }; class bulk_FoodbaconCookedFull: bulk { + displayName = $STR_EPOCH_BULK_DISP_BACON_FULL; descriptionshort = $STR_EPOCH_BULK_DESC_BACON_FULL; weight = 5; class ItemActions { @@ -159,6 +166,7 @@ class bulk_FoodbaconCookedFull: bulk { // Ammo class bulk_17Rnd_9x19_glock17: bulk { + displayName = $STR_EPOCH_BULK_DISP_G17; descriptionShort = $STR_EPOCH_BULK_DESC_G17; weight = 17; class ItemActions { @@ -170,6 +178,7 @@ class bulk_17Rnd_9x19_glock17: bulk { }; }; class bulk_15Rnd_9x19_M9SD: bulk { + displayName = $STR_EPOCH_BULK_DISP_M9SD; descriptionShort = $STR_EPOCH_BULK_DESC_M9SD; weight = 17; class ItemActions { @@ -181,6 +190,7 @@ class bulk_15Rnd_9x19_M9SD: bulk { }; }; class bulk_30Rnd_9x19_MP5SD: bulk { + displayName = $STR_EPOCH_BULK_DISP_MP5SD; descriptionShort = $STR_EPOCH_BULK_DESC_MP5SD; weight = 18; class ItemActions { @@ -192,6 +202,7 @@ class bulk_30Rnd_9x19_MP5SD: bulk { }; }; class bulk_30Rnd_556x45_StanagSD: bulk { + displayName = $STR_EPOCH_BULK_DISP_STANAGSD; descriptionShort = $STR_EPOCH_BULK_DESC_STANAGSD; weight = 20; class ItemActions { @@ -204,6 +215,7 @@ class bulk_30Rnd_556x45_StanagSD: bulk { }; class bulk_ItemSandbag: bulk { + displayName = $STR_EPOCH_BULK_DISP_SANDBAG; descriptionShort = $STR_EPOCH_BULK_DESC_SANDBAG; weight = 60; class ItemActions { @@ -216,6 +228,7 @@ class bulk_ItemSandbag: bulk { }; class bulk_ItemTankTrap: bulk { + displayName = $STR_EPOCH_BULK_DISP_TANKTRAP_FULL; descriptionShort = $STR_EPOCH_BULK_DESC_TANKTRAP_FULL; weight = 25; class ItemActions { @@ -227,6 +240,7 @@ class bulk_ItemTankTrap: bulk { }; }; class bulk_ItemTankTrapHalf: bulk { + displayName = $STR_EPOCH_BULK_DISP_TANKTRAP_HALF; descriptionShort = $STR_EPOCH_BULK_DESC_TANKTRAP_HALF; weight = 12.5; class ItemActions { @@ -247,6 +261,7 @@ class bulk_ItemTankTrapHalf: bulk { }; class bulk_ItemWire: bulk { + displayName = $STR_EPOCH_BULK_DISP_WIREKIT_FULL; descriptionShort = $STR_EPOCH_BULK_DESC_WIREKIT_FULL; weight = 25; class ItemActions { @@ -258,6 +273,7 @@ class bulk_ItemWire: bulk { }; }; class bulk_ItemWireHalf: bulk { + displayName = $STR_EPOCH_BULK_DISP_WIREKIT_HALF; descriptionShort = $STR_EPOCH_BULK_DESC_WIREKIT_HALF; weight = 12.5; class ItemActions { @@ -278,6 +294,7 @@ class bulk_ItemWireHalf: bulk { }; class bulk_PartGeneric: bulk { + displayName = $STR_EPOCH_BULK_DISP_GENERIC_FULL; descriptionShort = $STR_EPOCH_BULK_DESC_GENERIC_FULL; weight = 60; class ItemActions { @@ -289,6 +306,7 @@ class bulk_PartGeneric: bulk { }; }; class bulk_PartGenericHalf: bulk { + displayName = $STR_EPOCH_BULK_DISP_GENERIC_HALF; descriptionShort = $STR_EPOCH_BULK_DESC_GENERIC_HALF; weight = 30; class ItemActions { @@ -306,4 +324,4 @@ class bulk_PartGenericHalf: bulk { input[] = {{"bulk_PartGenericHalf",1},{"PartGeneric",6}}; }; }; -}; \ No newline at end of file +}; diff --git a/SQF/dayz_code/Configs/RscDisplay/RscDisplayGear.hpp b/SQF/dayz_code/Configs/RscDisplay/RscDisplayGear.hpp index 0b133099d..3ef106199 100644 --- a/SQF/dayz_code/Configs/RscDisplay/RscDisplayGear.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/RscDisplayGear.hpp @@ -235,19 +235,20 @@ class RscDisplayGear shadow = 0; }; - class CA_ItemName : RscText + class CA_ItemName : RscText // This is the RSC for the DisplayName under the list box. { idc = 1101; //x = -0.039; x = -0.051; //y = 0.627; y = 0.668; + w = 0.458; colorText[] = {0.32,0.24,0.09,1}; shadow = 0; text = "Gear of the unit:"; }; - class CA_CustomDescription : RscStructuredText + class CA_CustomDescription : RscStructuredText // This is the RSC for the descriptionShort under the list box. { idc = 1106; //x = -0.039; diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index d628a5f0e..a9ea1a196 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -13547,8 +13547,8 @@ Bedna zásob - 12 x Random Item - 12 x Zufällige Gegenstände + 12x Random Item + 12x Zufällige Gegenstände Какой-то предмет (12x) 12x Náhodných předmětů @@ -13558,96 +13558,150 @@ Пустой ящик Prázdná bedna + + Supply Crate (Empty) + - 6 x Soda (Coke) - 6 x Dose (Coke) - 6 x Газировка (Кола) + 6x Soda (Coke) + 6x Dose (Coke) + 6x Газировка (Кола) 6x Soda s kolovou příchutí + + Supply Crate (6x Coke) + - 12 x Soda (Coke) - 12 x Dose (Coke) - 12 x Газировка (Кола) + 12x Soda (Coke) + 12x Dose (Coke) + 12x Газировка (Кола) 12x Soda s kolovou příchutí + + Supply Crate (12x Coke) + - 6 x Soda (Pepsi) - 6 x Dose (Pepsi) - 6 x Газировка (Пепси) + 6x Soda (Pepsi) + 6x Dose (Pepsi) + 6x Газировка (Пепси) 6x Pepsi + + Supply Crate (6x Pepsi) + - 12 x Soda (Pepsi) - 12 x Dose (Pepsi) - 12 x Газировка (Пепси) + 12x Soda (Pepsi) + 12x Dose (Pepsi) + 12x Газировка (Пепси) 12x Pepsi + + Supply Crate (12x Pepsi) + - 6 x Bacon - 6 x Gebratener Speck - 6 x Готовый бекон + 6x Bacon + 6x Gebratener Speck + 6x Готовый бекон 6x Vepřové + + Supply Crate (6x Bacon) + - 12 x Bacon - 12 x Gebratener Speck - 12 x Готовый бекон + 12x Bacon + 12x Gebratener Speck + 12x Готовый бекон 12x Vepřové + + Supply Crate (12x Bacon) + - 12 x 17Rnd_9x19_glock17 - 12x 17Rnd_9x19_glock17 + 12x 17Rnd_9x19_glock17 + + + Supply Crate (12x G17) - 12 x 15Rnd_9x19_M9SD - 12x 15Rnd_9x19_M9SD + 12x 15Rnd_9x19_M9SD + + + Supply Crate (12x M9SD) - 12 x 30Rnd_9x19_MP5SD - 12x 30Rnd_9x19_MP5SD + 12x 30Rnd_9x19_MP5SD + + + Supply Crate (12x MP5SD) + + + 12x 30Rnd_556x45_StanagSD + + + Supply Crate (12x StanagSD) - 12 x SandBag - 12 x Sandsack - 12 x Мешок с песком + 12x SandBag + 12x Sandsack + 12x Мешок с песком 12 Pytlů s pískem - - 6 x Tank Trap - 6 x Panzersperre - 6 x Противотанковый ёж - 6 Zátaras + + Supply Crate (12x Sandbag) - 12 x Tank Trap - 12 x Panzersperre - 12 x Противотанковый ёж + 12x Tank Trap + 12x Panzersperre + 12x Противотанковый ёж 12 Zátaras - - 6 x Wire Kit - 6 x Stacheldraht - 6 x Колючая проволока - 6 Drátů + + Supply Crate (12x Tank Trap) + + + 6x Tank Trap + 6x Panzersperre + 6x Противотанковый ёж + 6 Zátaras + + + Supply Crate (6x Tank Trap) - 12 x Wire Kit - 12 x Stacheldraht - 12 x Колючая проволока + 12x Wire Kit + 12x Stacheldraht + 12x Колючая проволока 12 Drátů - - 6 x Scrap Metal - 6 x Metallteile - 6 x Металлолом - 6x Železný šrot + + Supply Crate (12x Wire Kit) + + + 6x Wire Kit + 6x Stacheldraht + 6x Колючая проволока + 6 Drátů + + + Supply Crate (6x Wire Kit) - 12 x Scrap Metal - 12 x Metallteile - 12 x Металлолом + 12x Scrap Metal + 12x Metallteile + 12x Металлолом 12x Železný šrot + + Supply Crate (12x Scrap Metal) + + + 6x Scrap Metal + 6x Metallteile + 6x Металлолом + 6x Železný šrot + + + Supply Crate (6x Scrap Metal) + Safe Safe @@ -13833,9 +13887,6 @@ Bio Meat Bio-Fleisch Органическое мясо - Bio Meat - Bio Meat - Bio Meat Bio Meat: A very good source of nutrition, and a very high chance of infection. Eat at own risk.