1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-19 14:20:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

The total weight of the equipment carried by a merc is now displayed in a tooltip.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8427 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2017-07-25 17:28:39 +00:00
parent 57c9e16523
commit 60233d2f8d
11 changed files with 109 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/Text.h
+1 -1
View File
@@ -734,7 +734,7 @@ extern CHAR16 gWeaponStatsDesc[][ 20 ];
// HEADROCK: Added externs for Item Description Box icon and stat tooltips
// Note that I've inflated some of these to 20 to avoid issues.
extern STR16 gzWeaponStatsFasthelpTactical[ 33 ];
extern STR16 gzMiscItemStatsFasthelp[ 35 ];
extern STR16 gzMiscItemStatsFasthelp[];
// HEADROCK HAM 4: New tooltip texts
extern STR16 gzUDBButtonTooltipText[ 3 ];
extern STR16 gzUDBHeaderTooltipText[ 4 ];
Utils/_ChineseText.cpp
+10 -1
View File
@@ -2783,6 +2783,9 @@ STR16 pMilitiaControlMenuStrings[] =
//Flugente
STR16 pTraitSkillsMenuStrings[] =
{
// sniper
L"Focus", // TODO.Translate
// radio operator
L"火炮攻击", //L"Artillery Strike",
L"通讯干扰", //L"Jam communications",
@@ -2798,6 +2801,9 @@ STR16 pTraitSkillsMenuStrings[] =
//Flugente: short description of the above skills for the skill selection menu
STR16 pTraitSkillsMenuDescStrings[] =
{
// sniper
L"Increase interrupt modifier (malus outside of area)", // TODO.Translate
// radio operator
L"命令某分区发动火炮攻击。", //L"Order an artillery strike from sector...",
L"所有通讯频率加入空白噪音，阻断正常通讯。", //L"Fill all radio frequencies with white noise, making communications impossible.",
@@ -3560,7 +3566,7 @@ STR16 gzWeaponStatsFasthelpTactical[ 33 ] =
L"|维|修|难|度\n \n决定了修理难度以及谁可以完全修复其损坏值\n \n绿色 = 任何人都可以修理\n \n黄色 = 只有特殊NPC可以修复损坏值\n \n红色 = 这个物品不能被修理\n \n 越高越好", //L"|R|e|p|a|i|r |E|a|s|e\n \nDetermines how difficult it is to repair\nthis weapon and who can fully repair it.\n \ngreen = Anybody can repair it.\n \nyellow = Only special NPCs can\nrepair it beyond repair threshold.\n \nred = This item can't be repaired.\n \nHigher is better.",
};
STR16 gzMiscItemStatsFasthelp[ 35 ] =
STR16 gzMiscItemStatsFasthelp[] =
{
L"物品大小修正（越低越好）", // 0
L"可靠性修正",
@@ -3597,6 +3603,7 @@ STR16 gzMiscItemStatsFasthelp[ 35 ] =
L"隧道视野百分比（越低越好）",
L"精瞄加成所需最小距离",
L"按住 |C|t|r|l 点击装备物品", //L"Hold |C|t|r|l to compare items", item compare help text
L"Equipment weight: %4.1f kg", // 35 // TODO.Translate
};
// HEADROCK: End new tooltip text
@@ -4337,6 +4344,8 @@ STR16 pMapScreenInvenButtonHelpText[] =
// 16 - 20
L"|鼠|标|左|击: 切换显示杂项物品 \n|鼠|标|右|击: 只显示杂项物品 ", // HEADROCK HAM 5: Filter Button
L"切换搬运中的物品", // Flugente: move item display
L"Save Gear Template", // TODO.Translate
L"Load Gear Template...",
};
STR16 pMapScreenBottomFastHelp[] =
Utils/_DutchText.cpp
+10 -1
View File
@@ -2782,6 +2782,9 @@ STR16 pMilitiaControlMenuStrings[] =
//Flugente
STR16 pTraitSkillsMenuStrings[] = // TODO.Translate
{
// sniper
L"Focus", // TODO.Translate
// radio operator
L"Artillery Strike",
L"Jam communications",
@@ -2797,6 +2800,9 @@ STR16 pTraitSkillsMenuStrings[] = // TODO.Translate
//Flugente: short description of the above skills for the skill selection menu
STR16 pTraitSkillsMenuDescStrings[] =
{
// sniper
L"Increase interrupt modifier (malus outside of area)", // TODO.Translate
// radio operator
L"Order an artillery strike from sector...",
L"Fill all radio frequencies with white noise, making communications impossible.",
@@ -3561,7 +3567,7 @@ STR16 gzWeaponStatsFasthelpTactical[ 33 ] =
L"|R|e|p|a|i|r |E|a|s|e\n \nDetermines how difficult it is to repair\nthis weapon and who can fully repair it.\n \ngreen = Anybody can repair it.\n \nyellow = Only special NPCs can\nrepair it beyond repair threshold.\n \nred = This item can't be repaired.\n \nHigher is better.",
};
STR16 gzMiscItemStatsFasthelp[ 35 ] =
STR16 gzMiscItemStatsFasthelp[] =
{
L"Item Size Modifier (Lower is better)", // 0
L"Reliability Modifier",
@@ -3598,6 +3604,7 @@ STR16 gzMiscItemStatsFasthelp[ 35 ] =
L"Tunnel Vision Percentage (Lower is better)",
L"Minimum Range for Aiming Bonus",
L"Hold |C|t|r|l to compare items", // item compare help text
L"Equipment weight: %4.1f kg", // 35 // TODO.Translate
};
// HEADROCK: End new tooltip text
@@ -4342,6 +4349,8 @@ STR16 pMapScreenInvenButtonHelpText[] =
// 16 - 20
L"|L|e|f|t |C|l|i|c|k: Toggle Misc. Items\n|R|i|g|h|t |C|l|i|c|k: Show only Misc. Items", // HEADROCK HAM 5: Filter Button
L"Toggle Get Item Display", // Flugente: move item display // TODO.Translate
L"Save Gear Template", // TODO.Translate
L"Load Gear Template...",
};
STR16 pMapScreenBottomFastHelp[] =
Utils/_EnglishText.cpp
+6 -1
View File
@@ -2793,6 +2793,7 @@ STR16 pTraitSkillsMenuStrings[] =
// various
L"Spotter",
L"Focus",
};
//Flugente: short description of the above skills for the skill selection menu
@@ -2808,6 +2809,7 @@ STR16 pTraitSkillsMenuDescStrings[] =
// various
L"Observe an area, granting allied snipers a bonus to cth on anything you see.",
L"Increase interrupt modifier (penalty outside of area)",
};
STR16 pTraitSkillsDenialStrings[] =
@@ -3560,7 +3562,7 @@ STR16 gzWeaponStatsFasthelpTactical[ 33 ] =
L"|R|e|p|a|i|r |E|a|s|e\n \nDetermines how difficult it is to repair\nthis weapon and who can fully repair it.\n \ngreen = Anybody can repair it.\n \nyellow = Only special NPCs can\nrepair it beyond repair threshold.\n \nred = This item can't be repaired.\n \nHigher is better.",
};
STR16 gzMiscItemStatsFasthelp[ 35 ] =
STR16 gzMiscItemStatsFasthelp[] =
{
L"Item Size Modifier (Lower is better)", // 0
L"Reliability Modifier",
@@ -3597,6 +3599,7 @@ STR16 gzMiscItemStatsFasthelp[ 35 ] =
L"Tunnel Vision Percentage (Lower is better)",
L"Minimum Range for Aiming Bonus",
L"Hold |C|t|r|l to compare items", // item compare help text
L"Equipment weight: %4.1f kg", // 35
};
// HEADROCK: End new tooltip text
@@ -4338,6 +4341,8 @@ STR16 pMapScreenInvenButtonHelpText[] =
// 16 - 20
L"|L|e|f|t |C|l|i|c|k: Toggle Misc. Items\n|R|i|g|h|t |C|l|i|c|k: Show only Misc. Items", // HEADROCK HAM 5: Filter Button
L"Toggle Get Item Display", // Flugente: move item display
L"Save Gear Template",
L"Load Gear Template...",
};
STR16 pMapScreenBottomFastHelp[] =
Utils/_FrenchText.cpp
+10 -1
View File
@@ -2791,6 +2791,9 @@ STR16 pMilitiaControlMenuStrings[] =
//Flugente
STR16 pTraitSkillsMenuStrings[] =
{
// sniper
L"Focus", // TODO.Translate
// radio operator
L"Tir d'artillerie",
L"Brouiller les communications",
@@ -2806,6 +2809,9 @@ STR16 pTraitSkillsMenuStrings[] =
//Flugente: short description of the above skills for the skill selection menu
STR16 pTraitSkillsMenuDescStrings[] =
{
// sniper
L"Increase interrupt modifier (malus outside of area)", // TODO.Translate
// radio operator
L"Ordonner un tir d'artillerie au secteur...",
L"Brouiller toutes les fréquences radios pour rendre les communications impossibles.",
@@ -3566,7 +3572,7 @@ STR16 gzWeaponStatsFasthelpTactical[ 33 ] =
L"|F|a|c|i|l|i|t|é |d|e |r|é|p|a|r|a|t|i|o|n\n \nDétermine la difficulté à réparer une arme\net qui peut la réparer complètement.\n \nVert = N'importe qui peut la réparer.\n \nJaune = Seuls des PNJ spécialisés peuvent la\nréparer au-delà du seuil de réparation.\n \nRouge = L'arme ne peut pas être réparée.\n \nValeur élevée recommandée.",
};
STR16 gzMiscItemStatsFasthelp[ 35 ] =
STR16 gzMiscItemStatsFasthelp[] =
{
L"Facteur d'encombrement (Valeur faible recommandée)", // 0
L"Facteur de fiabilité",
@@ -3603,6 +3609,7 @@ STR16 gzMiscItemStatsFasthelp[ 35 ] =
L"Pourcentage d'effet tunnel (Valeur faible recommandée)",
L"Portée minimale pour bonus de visée",
L"Maintenez |C|T|R|L pour comparer les objets", // item compare help text
L"Equipment weight: %4.1f kg", // 35 // TODO.Translate
};
// HEADROCK: End new tooltip text
@@ -4345,6 +4352,8 @@ STR16 pMapScreenInvenButtonHelpText[] =
// 16 - 20
L"|C|l|i|c |G|. : Avec/sans objets divers\n|C|l|i|c |D|. : Voir que les objets divers", // HEADROCK HAM 5: Filter Button
L"Pour afficher ou non les objets déplacés.", // Flugente: move item display
L"Save Gear Template", // TODO.Translate
L"Load Gear Template...",
};
STR16 pMapScreenBottomFastHelp[] =
Utils/_GermanText.cpp
+11 -2
View File
@@ -2786,6 +2786,9 @@ STR16 pMilitiaControlMenuStrings[] =
//Flugente
STR16 pTraitSkillsMenuStrings[] =
{
// sniper
L"Fokus",
// radio operator
L"Artillerie befehligen",
L"Kommunikation stören",
@@ -2801,8 +2804,11 @@ STR16 pTraitSkillsMenuStrings[] =
//Flugente: short description of the above skills for the skill selection menu
STR16 pTraitSkillsMenuDescStrings[] =
{
// sniper
L"Increase interrupt modifier (malus outside of area)", // TODO.Translate
// radio operator
L"Artillerieanschlag befehligen von einem Sektor...",
L"Artillerieschlag befehligen von einem Sektor...",
L"Alle Funkfrequenzen mit weißem Rauschen füllen, sodass eine Kommunikation nicht mehr möglich ist.",
L"Nach Störsignalen scannen.",
L"Das Radiogerät verwenden, um feindliche Bewegungen zu orten.",
@@ -3570,7 +3576,7 @@ STR16 gzWeaponStatsFasthelpTactical[ 33 ] =
L"|R|e|p|a|r|a|t|u|r|l|e|i|c|h|t|i|g|k|e|i|t\n \nBestimmt, wie schwierig es ist, die Waffe\nzu reparieren und wer sie vollständig reparieren kann.\n \ngrün = Jeder kann sie reparieren.\n \ngelb = Nur spezielle NPCs können\nsie über die Reparaturschwelle hinaus reparieren.\n \nrot = Dieser Gegenstand kann nicht repariert werden.\n \nHöher ist besser.",
};
STR16 gzMiscItemStatsFasthelp[ 35 ] =
STR16 gzMiscItemStatsFasthelp[] =
{
L"Gegenstandsgrößen-Modifikator (Niedriger ist besser)",
L"Zuverlässigkeits-Modifikator",
@@ -3607,6 +3613,7 @@ STR16 gzMiscItemStatsFasthelp[ 35 ] =
L"Tunnelblick-Modifikator (Niedriger ist besser)",
L"Minimale Reichweite für Zielbonus",
L"Hold |C|t|r|l to compare items", // item compare help text // TODO.Translate
L"Gesamtgewicht: %4.1f kg", // 35
};
// HEADROCK: End new tooltip text
@@ -4331,6 +4338,8 @@ STR16 pMapScreenInvenButtonHelpText[] =
// 16 - 20
L"|L|i|n|k|e|r |K|l|i|c|k: Ein-/Ausblenden von anderen Gegenständen\n|R|e|c|h|t|e|r |K|l|i|c|k: Nur andere Gegenstände anzeigen", // HEADROCK HAM 5: Filter Button
L"Ein-/Ausblenden von zu bewegenden Gegenständen", // Flugente: move item display
L"Save Gear Template", // TODO.Translate
L"Load Gear Template...",
};
STR16 pMapScreenBottomFastHelp[] =
Utils/_ItalianText.cpp
+10 -1
View File
@@ -2777,6 +2777,9 @@ STR16 pMilitiaControlMenuStrings[] =
//Flugente
STR16 pTraitSkillsMenuStrings[] = // TODO.Translate
{
// sniper
L"Focus", // TODO.Translate
// radio operator
L"Artillery Strike",
L"Jam communications",
@@ -2792,6 +2795,9 @@ STR16 pTraitSkillsMenuStrings[] = // TODO.Translate
//Flugente: short description of the above skills for the skill selection menu
STR16 pTraitSkillsMenuDescStrings[] =
{
// sniper
L"Increase interrupt modifier (malus outside of area)", // TODO.Translate
// radio operator
L"Order an artillery strike from sector...",
L"Fill all radio frequencies with white noise, making communications impossible.",
@@ -3556,7 +3562,7 @@ STR16 gzWeaponStatsFasthelpTactical[ 33 ] =
L"|R|e|p|a|i|r |E|a|s|e\n \nDetermines how difficult it is to repair\nthis weapon and who can fully repair it.\n \ngreen = Anybody can repair it.\n \nyellow = Only special NPCs can\nrepair it beyond repair threshold.\n \nred = This item can't be repaired.\n \nHigher is better.",
};
STR16 gzMiscItemStatsFasthelp[ 35 ] =
STR16 gzMiscItemStatsFasthelp[] =
{
L"Item Size Modifier (Lower is better)", // 0
L"Reliability Modifier",
@@ -3593,6 +3599,7 @@ STR16 gzMiscItemStatsFasthelp[ 35 ] =
L"Tunnel Vision Percentage (Lower is better)",
L"Minimum Range for Aiming Bonus",
L"Hold |C|t|r|l to compare items", // item compare help text
L"Equipment weight: %4.1f kg", // 35 // TODO.Translate
};
// HEADROCK: End new tooltip text
@@ -4336,6 +4343,8 @@ STR16 pMapScreenInvenButtonHelpText[] =
// 16 - 20
L"|L|e|f|t |C|l|i|c|k: Toggle Misc. Items\n|R|i|g|h|t |C|l|i|c|k: Show only Misc. Items", // HEADROCK HAM 5: Filter Button
L"Toggle Get Item Display", // Flugente: move item display // TODO.Translate
L"Save Gear Template", // TODO.Translate
L"Load Gear Template...",
};
STR16 pMapScreenBottomFastHelp[] =
Utils/_PolishText.cpp
+10 -1
View File
@@ -2789,6 +2789,9 @@ STR16 pMilitiaControlMenuStrings[] =
//Flugente
STR16 pTraitSkillsMenuStrings[] = // TODO.Translate
{
// sniper
L"Focus", // TODO.Translate
// radio operator
L"Artillery Strike",
L"Jam communications",
@@ -2804,6 +2807,9 @@ STR16 pTraitSkillsMenuStrings[] = // TODO.Translate
//Flugente: short description of the above skills for the skill selection menu
STR16 pTraitSkillsMenuDescStrings[] =
{
// sniper
L"Increase interrupt modifier (malus outside of area)", // TODO.Translate
// radio operator
L"Order an artillery strike from sector...",
L"Fill all radio frequencies with white noise, making communications impossible.",
@@ -3566,7 +3572,7 @@ STR16 gzWeaponStatsFasthelpTactical[ 33 ] =
L"|R|e|p|a|i|r |E|a|s|e\n \nDetermines how difficult it is to repair\nthis weapon and who can fully repair it.\n \ngreen = Anybody can repair it.\n \nyellow = Only special NPCs can\nrepair it beyond repair threshold.\n \nred = This item can't be repaired.\n \nHigher is better.",
};
STR16 gzMiscItemStatsFasthelp[ 35 ] =
STR16 gzMiscItemStatsFasthelp[] =
{
L"Modyf. rozmiaru (mniej - lepiej)", // 0
L"Modyf. sprawności",
@@ -3603,6 +3609,7 @@ STR16 gzMiscItemStatsFasthelp[ 35 ] =
L"Widzenie tunelowe w % (mniej - lepiej)",
L"Min. zasg. dla bonusu cel.",
L"Hold |C|t|r|l to compare items", // item compare help text // TODO.Translate
L"Equipment weight: %4.1f kg", // 35 // TODO.Translate
};
// HEADROCK: End new tooltip text
@@ -4347,6 +4354,8 @@ STR16 pMapScreenInvenButtonHelpText[] =
// 16 - 20
L"|L|e|f|t |C|l|i|c|k: Toggle Misc. Items\n|R|i|g|h|t |C|l|i|c|k: Show only Misc. Items", // HEADROCK HAM 5: Filter Button
L"Toggle Get Item Display", // Flugente: move item display // TODO.Translate
L"Save Gear Template", // TODO.Translate
L"Load Gear Template...",
};
STR16 pMapScreenBottomFastHelp[] =
Utils/_RussianText.cpp
+10 -1
View File
@@ -2783,6 +2783,9 @@ STR16 pMilitiaControlMenuStrings[] =
//Flugente
STR16 pTraitSkillsMenuStrings[] =
{
// sniper
L"Focus", // TODO.Translate
// radio operator
L"Артналет",
L"Постановка помех",
@@ -2798,6 +2801,9 @@ STR16 pTraitSkillsMenuStrings[] =
//Flugente: short description of the above skills for the skill selection menu
STR16 pTraitSkillsMenuDescStrings[] =
{
// sniper
L"Increase interrupt modifier (malus outside of area)", // TODO.Translate
// radio operator
L"Вызвать артиллерийский удар из сектора...",
L"Заполнить эфир помехами, чтобы сделать невозможным использование средств связи.",
@@ -3560,7 +3566,7 @@ STR16 gzWeaponStatsFasthelpTactical[ 33 ] =
L"|Л|ё|г|к|о|с|т|ь |п|о|ч|и|н|к|и\n \nОпределяет сложность починки этого оружия,\nа также то, кто сможет полностью починить его.\nЗеленый - может починить кто угодно.\n \nЖелтый - только некоторые NPC\nмогут починить его свыше порога ремонта.\n \nКрасный - эту вещь починить невозможно.\n \nБольше - лучше.",
};
STR16 gzMiscItemStatsFasthelp[ 35 ] =
STR16 gzMiscItemStatsFasthelp[] =
{
L"Модификатор размера предмета\n(меньше - лучше)", //0
L"Модификатор надёжности",
@@ -3597,6 +3603,7 @@ STR16 gzMiscItemStatsFasthelp[ 35 ] =
L"Туннельное зрение\n(меньше - лучше)",
L"Минимальное расстояние\nдля бонуса при прицеливании",
L"Зажмите |C|t|r|l для сравнения предметов", // item compare help text
L"Equipment weight: %4.1f kg", // 35 // TODO.Translate
};
// HEADROCK: End new tooltip text
@@ -4338,6 +4345,8 @@ STR16 pMapScreenInvenButtonHelpText[] =
// 16 - 20
L"|Л|е|в|ы|й| |щ|е|л|ч|о|к|: Скрыть прочие предметы\n|П|р|а|в|ы|й| |щ|е|л|ч|о|к|: Показать прочие предметы", // HEADROCK HAM 5: Filter Button
L"Переключить отображение перемещения предметов", // Flugente: move item display
L"Save Gear Template", // TODO.Translate
L"Load Gear Template...",
};
STR16 pMapScreenBottomFastHelp[] =