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

Added: Ctrl+Shift+E now fill LBE items in sector with other items and places them in vehicles first.

Browse Source 
Added: Right-Click on remove attachments button on sector inventory screen will not empty LBE items in sector
Changed: SLAY_STAYS_FOREVER disables Slay's hourly chance to leave when unattended
Added: SLAY_HOURLY_CHANCE_TO_LEAVE setting to Ja2_Options.ini
Fixed: a bunch of array index out of bounds bugs
Fixed: a bunch of typos in if contitions
Fixed: BuildListFile() function loading items from index 1 instead 0
Added translation: Polish text for some map inventory screen items
Added translation: English texts for new functionality for other language files
Cleaned up some old TODOs

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8404 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
TheBob
2017-05-19 13:40:34 +00:00
parent dc350d724d
commit b60a94afc5
39 changed files with 565 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/_ChineseText.cpp
+8 -1
View File
@@ -4323,7 +4323,7 @@ STR16 pMapScreenInvenButtonHelpText[] =
L"合并堆叠同类的物品", // HEADROCK HAM 5: Stack and Merge
L"|鼠|标|左|击: 将子弹分类装入弹箱 \n|鼠|标|右|击: 将子弹分类装入纸盒 ", //L"|L|e|f|t |C|l|i|c|k: 将子弹分类装入弹箱\n|R|i|g|h|t |C|l|i|c|k: 将子弹分类装入纸盒", HEADROCK HAM 5: Sort ammo
// 6 - 10
L"移除所有物品的附件", // HEADROCK HAM 5: Separate Attachments
L"|鼠|标|左|击: 移除所有物品的附件\n|鼠|标|右|击: empty LBE in sector", // HEADROCK HAM 5: Separate Attachments
L"退出所有武器的子弹", //HEADROCK HAM 5: Eject Ammo
L"|鼠|标|左|击: 显示全部物品 \n|鼠|标|右|击: 隐藏全部物品 ", // HEADROCK HAM 5: Filter Button
L"|鼠|标|左|击: 切换显示武器 \n|鼠|标|右|击: 只显示武器 ", // HEADROCK HAM 5: Filter Button
@@ -8637,6 +8637,13 @@ STR16 gzMapInventorySortingMessage[] =
L"已完成 移除所有物品上的附件 在区域 %c%d.",
L"已完成 退出所有武器里的子弹 在区域 %c%d.",
L"已完成 合并后堆叠了所有物品 在区域 %c%d.",
// Bob: new strings for emptying LBE items
L"Finished emptying LBE items in sector %c%d.",
L"Dropped %i item(s) from %s", // Bunch of stuff removed from LBE item %s
L"No droppable items in %s!", // LBE item %s had a LBENode assigned but it contained no items (error!)
L"%s is now empty.", // LBE item %s contained stuff and was emptied
L"Cannot empty %s!", // Removed everything we could from LBE item %s but it's still not marked as empty (error!)
L"%s contents lost!", // LBE item %s not marked as empty but LBENode not found (error!!!)
};
STR16 gzMapInventoryFilterOptions[] =
Utils/_DutchText.cpp
+8 -1
View File
@@ -4328,7 +4328,7 @@ STR16 pMapScreenInvenButtonHelpText[] =
L"Stack and merge items", // HEADROCK HAM 5: Stack and Merge
L"|L|e|f|t |C|l|i|c|k: Sort ammo into crates\n|R|i|g|h|t |C|l|i|c|k: Sort ammo into boxes", // HEADROCK HAM 5: Sort ammo
// 6 - 10
L"Remove all item attachments", // HEADROCK HAM 5: Separate Attachments
L"|L|e|f|t |C|l|i|c|k: Remove all item attachments\n|R|i|g|h|t |C|l|i|c|k: empty LBE in sector", // HEADROCK HAM 5: Separate Attachments; Bob: empty LBE items
L"Eject ammo from all weapons", //HEADROCK HAM 5: Eject Ammo
L"|L|e|f|t |C|l|i|c|k: Show all items\n|R|i|g|h|t |C|l|i|c|k: Hide all items", // HEADROCK HAM 5: Filter Button
L"|L|e|f|t |C|l|i|c|k: Toggle Guns\n|R|i|g|h|t |C|l|i|c|k|: Show only Guns", // HEADROCK HAM 5: Filter Button
@@ -8655,6 +8655,13 @@ STR16 gzMapInventorySortingMessage[] =
L"Finished removing attachments from items in sector %c%d.",
L"Finished ejecting ammo from weapons in sector %c%d.",
L"Finished stacking and merging all items in sector %c%d.",
// Bob: new strings for emptying LBE items
L"Finished emptying LBE items in sector %c%d.",
L"Dropped %i item(s) from %s", // Bunch of stuff removed from LBE item %s
L"No droppable items in %s!", // LBE item %s had a LBENode assigned but it contained no items (error!)
L"%s is now empty.", // LBE item %s contained stuff and was emptied
L"Cannot empty %s!", // Removed everything we could from LBE item %s but it's still not marked as empty (error!)
L"%s contents lost!", // LBE item %s not marked as empty but LBENode not found (error!!!)
};
STR16 gzMapInventoryFilterOptions[] =
Utils/_EnglishText.cpp
+9 -2
View File
@@ -4324,7 +4324,7 @@ STR16 pMapScreenInvenButtonHelpText[] =
L"Stack and merge items", // HEADROCK HAM 5: Stack and Merge
L"|L|e|f|t |C|l|i|c|k: Sort ammo into crates\n|R|i|g|h|t |C|l|i|c|k: Sort ammo into boxes", // HEADROCK HAM 5: Sort ammo
// 6 - 10
L"Remove all item attachments", // HEADROCK HAM 5: Separate Attachments
L"|L|e|f|t |C|l|i|c|k: Remove all item attachments\n|R|i|g|h|t |C|l|i|c|k: empty LBE in sector", // HEADROCK HAM 5: Separate Attachments; Bob: empty LBE items
L"Eject ammo from all weapons", //HEADROCK HAM 5: Eject Ammo
L"|L|e|f|t |C|l|i|c|k: Show all items\n|R|i|g|h|t |C|l|i|c|k: Hide all items", // HEADROCK HAM 5: Filter Button
L"|L|e|f|t |C|l|i|c|k: Toggle Guns\n|R|i|g|h|t |C|l|i|c|k|: Show only Guns", // HEADROCK HAM 5: Filter Button
@@ -8638,7 +8638,14 @@ STR16 gzMapInventorySortingMessage[] =
L"Finished sorting ammo into crates in sector %c%d.",
L"Finished removing attachments from items in sector %c%d.",
L"Finished ejecting ammo from weapons in sector %c%d.",
L"Finished stacking and merging all items in sector %c%d.",
L"Finished stacking and merging all items in sector %c%d.",
// Bob: new strings for emptying LBE items
L"Finished emptying LBE items in sector %c%d.",
L"Dropped %i item(s) from %s", // Bunch of stuff removed from LBE item %s
L"No droppable items in %s!", // LBE item %s had a LBENode assigned but it contained no items (error!)
L"%s is now empty.", // LBE item %s contained stuff and was emptied
L"Cannot empty %s!", // Removed everything we could from LBE item %s but it's still not marked as empty (error!)
L"%s contents lost!", // LBE item %s not marked as empty but LBENode not found (error!!!)
};
STR16 gzMapInventoryFilterOptions[] =
Utils/_FrenchText.cpp
+8 -1
View File
@@ -4331,7 +4331,7 @@ STR16 pMapScreenInvenButtonHelpText[] =
L"Empiler les mêmes objets", // HEADROCK HAM 5: Stack and Merge
L"|C|l|i|c |G|. : Trier munitions par caisse\n|C|l|i|c |D|. : Trier munitions par boîte", // HEADROCK HAM 5: Sort ammo
// 6 - 10
L"Ôter tous les accessoires des objets", // HEADROCK HAM 5: Separate Attachments
L"|C|l|i|c |G|. : Ôter tous les accessoires des objets\n|C|l|i|c |D|. : empty LBE in sector", // HEADROCK HAM 5: Separate Attachments
L"Décharger toutes les armes", //HEADROCK HAM 5: Eject Ammo
L"|C|l|i|c |G|. : Voir tous les objets\n|C|l|i|c |D|. : Cacher tous les objets", // HEADROCK HAM 5: Filter Button
L"|C|l|i|c |G|. : Avec/sans armes\n|C|l|i|c |D|. : Voir que les armes", // HEADROCK HAM 5: Filter Button
@@ -8640,6 +8640,13 @@ STR16 gzMapInventorySortingMessage[] =
L"Fin du démontage de tous les accessoires au secteur %c%d.",
L"Fin du déchargement des armes au secteur %c%d.",
L"Fin du classement et de l'empilage par type au secteur %c%d.",
// Bob: new strings for emptying LBE items
L"Finished emptying LBE items in sector %c%d.",
L"Dropped %i item(s) from %s", // Bunch of stuff removed from LBE item %s
L"No droppable items in %s!", // LBE item %s had a LBENode assigned but it contained no items (error!)
L"%s is now empty.", // LBE item %s contained stuff and was emptied
L"Cannot empty %s!", // Removed everything we could from LBE item %s but it's still not marked as empty (error!)
L"%s contents lost!", // LBE item %s not marked as empty but LBENode not found (error!!!)
};
STR16 gzMapInventoryFilterOptions[] =
Utils/_GermanText.cpp
+8 -1
View File
@@ -4317,7 +4317,7 @@ STR16 pMapScreenInvenButtonHelpText[] =
L"Gegenstände stapeln und verbinden", // HEADROCK HAM 5: Stack and Merge
L"|L|i|n|k|e|r |K|l|i|c|k: Munition in Kisten sortieren\n|R|e|c|h|t|e|r |K|l|i|c|k: Munition in Boxen sortieren", // HEADROCK HAM 5: Sort ammo
// 6 - 10
L"Alle Gegenstandsanbauten entfernen", // HEADROCK HAM 5: Separate Attachments
L"|L|i|n|k|e|r |K|l|i|c|k: Alle Gegenstandsanbauten entfernen\n|R|e|c|h|t|e|r |K|l|i|c|k: empty LBE in sector", // HEADROCK HAM 5: Separate Attachments
L"Munition aus allen Waffen entfernen", //HEADROCK HAM 5: Eject Ammo
L"|L|i|n|k|e|r |K|l|i|c|k: Alle Gegenstände anzeigen\n|R|e|c|h|t|e|r |K|l|i|c|k: Alle Gegenstände ausblenden", // HEADROCK HAM 5: Filter Button
L"|L|i|n|k|e|r |K|l|i|c|k: Ein-/Ausblenden von Waffen\n|R|e|c|h|t|e|r |K|l|i|c|k: Nur Waffen anzeigen", // HEADROCK HAM 5: Filter Button
@@ -8470,6 +8470,13 @@ STR16 gzMapInventorySortingMessage[] =
L"Das Entfernen von Gegenstandsanbauten im Sektor %c%d wurde fertiggestellt.",
L"Das Entfernen von Munition der Waffen im Sektor %c%d wurde fertiggestellt.",
L"Das Stapeln und Zusammenführen von Gegenständen im Sektor %c%d wurde fertiggestellt.",
// Bob: new strings for emptying LBE items
L"Finished emptying LBE items in sector %c%d.",
L"Dropped %i item(s) from %s", // Bunch of stuff removed from LBE item %s
L"No droppable items in %s!", // LBE item %s had a LBENode assigned but it contained no items (error!)
L"%s is now empty.", // LBE item %s contained stuff and was emptied
L"Cannot empty %s!", // Removed everything we could from LBE item %s but it's still not marked as empty (error!)
L"%s contents lost!", // LBE item %s not marked as empty but LBENode not found (error!!!)
};
STR16 gzMapInventoryFilterOptions[] =
Utils/_ItalianText.cpp
+8 -1
View File
@@ -4322,7 +4322,7 @@ STR16 pMapScreenInvenButtonHelpText[] =
L"Stack and merge items", // HEADROCK HAM 5: Stack and Merge
L"|L|e|f|t |C|l|i|c|k: Sort ammo into crates\n|R|i|g|h|t |C|l|i|c|k: Sort ammo into boxes", // HEADROCK HAM 5: Sort ammo
// 6 - 10
L"Remove all item attachments", // HEADROCK HAM 5: Separate Attachments
L"|L|e|f|t |C|l|i|c|k: Remove all item attachments\n|R|i|g|h|t |C|l|i|c|k: empty LBE in sector", // HEADROCK HAM 5: Separate Attachments; Bob: empty LBE items
L"Eject ammo from all weapons", //HEADROCK HAM 5: Eject Ammo
L"|L|e|f|t |C|l|i|c|k: Show all items\n|R|i|g|h|t |C|l|i|c|k: Hide all items", // HEADROCK HAM 5: Filter Button
L"|L|e|f|t |C|l|i|c|k: Toggle Guns\n|R|i|g|h|t |C|l|i|c|k|: Show only Guns", // HEADROCK HAM 5: Filter Button
@@ -8645,6 +8645,13 @@ STR16 gzMapInventorySortingMessage[] =
L"Finished removing attachments from items in sector %c%d.",
L"Finished ejecting ammo from weapons in sector %c%d.",
L"Finished stacking and merging all items in sector %c%d.",
// Bob: new strings for emptying LBE items
L"Finished emptying LBE items in sector %c%d.",
L"Dropped %i item(s) from %s", // Bunch of stuff removed from LBE item %s
L"No droppable items in %s!", // LBE item %s had a LBENode assigned but it contained no items (error!)
L"%s is now empty.", // LBE item %s contained stuff and was emptied
L"Cannot empty %s!", // Removed everything we could from LBE item %s but it's still not marked as empty (error!)
L"%s contents lost!", // LBE item %s not marked as empty but LBENode not found (error!!!)
};
STR16 gzMapInventoryFilterOptions[] =
Utils/_PolishText.cpp
+12 -5
View File
@@ -4333,7 +4333,7 @@ STR16 pMapScreenInvenButtonHelpText[] =
L"Stack and merge items", // HEADROCK HAM 5: Stack and Merge
L"|L|e|f|t |C|l|i|c|k: Sort ammo into crates\n|R|i|g|h|t |C|l|i|c|k: Sort ammo into boxes", // HEADROCK HAM 5: Sort ammo
// 6 - 10
L"Remove all item attachments", // HEADROCK HAM 5: Separate Attachments
L"|L|e|f|t |C|l|i|c|k: Remove all item attachments\n|R|i|g|h|t |C|l|i|c|k: empty LBE in sector", // HEADROCK HAM 5: Separate Attachments; Bob: empty LBE items
L"Eject ammo from all weapons", //HEADROCK HAM 5: Eject Ammo
L"|L|e|f|t |C|l|i|c|k: Show all items\n|R|i|g|h|t |C|l|i|c|k: Hide all items", // HEADROCK HAM 5: Filter Button
L"|L|e|f|t |C|l|i|c|k: Toggle Guns\n|R|i|g|h|t |C|l|i|c|k|: Show only Guns", // HEADROCK HAM 5: Filter Button
@@ -8653,10 +8653,17 @@ STR16 gzNCTHlabels[]=
// HEADROCK HAM 5: Screen messages for sector inventory sorting reports.
STR16 gzMapInventorySortingMessage[] =
{
L"Finished sorting ammo into crates in sector %c%d.",
L"Finished removing attachments from items in sector %c%d.",
L"Finished ejecting ammo from weapons in sector %c%d.",
L"Finished stacking and merging all items in sector %c%d.",
L"Spakowano amunicję do skrzyń w sektorze %c%d.",
L"Usunięto dodatki z przedmiotów w sektorze %c%d.",
L"Rozładowano amunicję z broni w sektorze %c%d.",
L"Poukładano i scalono przedmioty w sektorze %c%d.",
// Bob: new strings for emptying LBE items
L"Rozładowano LBE w sektorze %c%d.",
L"Wyrzucono %i przedmiot(ów) z %s", // Bunch of stuff removed from LBE item %s
L"Nie można nic wyjąć z %s!", // LBE item %s had a LBENode assigned but it contained no items (error!)
L"Rozładowano %s.", // LBE item %s contained stuff and was emptied
L"Nie udało się rozładować %s!", // Removed everything we could from LBE item %s but it's still not marked as empty (error!)
L"Utracona zawartość %s!", // LBE item %s not marked as empty but LBENode not found (error!!!)
};
STR16 gzMapInventoryFilterOptions[] =
Utils/_RussianText.cpp
+8 -1
View File
@@ -4324,7 +4324,7 @@ STR16 pMapScreenInvenButtonHelpText[] =
L"Сложить и объединить предметы", // HEADROCK HAM 5: Stack and Merge
L"|Л|е|в|ы|й| |щ|е|л|ч|о|к|: Собрать патроны в ящики\n|П|р|а|в|ы|й| |щ|е|л|ч|о|к|: Собрать патроны в коробки", // HEADROCK HAM 5: Sort ammo
// 6 - 10
L"Снять всю навеску \nс предметов", // HEADROCK HAM 5: Separate Attachments
L"|Л|е|в|ы|й| |щ|е|л|ч|о|к|: Снять всю навеску \nс предметов\n|П|р|а|в|ы|й| |щ|е|л|ч|о|к|: empty LBE in sector", // HEADROCK HAM 5: Separate Attachments
L"Разрядить всё оружие", //HEADROCK HAM 5: Eject Ammo
L"|Л|е|в|ы|й| |щ|е|л|ч|о|к|: Показать все предметы\n|П|р|а|в|ы|й| |щ|е|л|ч|о|к|: Скрыть все предметы", // HEADROCK HAM 5: Filter Button
L"|Л|е|в|ы|й| |щ|е|л|ч|о|к|: Скрыть оружие\n|П|р|а|в|ы|й| |щ|е|л|ч|о|к|: Показать оружие", // HEADROCK HAM 5: Filter Button
@@ -8639,6 +8639,13 @@ STR16 gzMapInventorySortingMessage[] =
L"С предметов в секторе %c%d снята вся навеска.",
L"В секторе %c%d всё оружие разряжено.",
L"В секторе %c%d все вещи сгруппированы и объединены.",
// Bob: new strings for emptying LBE items
L"Finished emptying LBE items in sector %c%d.",
L"Dropped %i item(s) from %s", // Bunch of stuff removed from LBE item %s
L"No droppable items in %s!", // LBE item %s had a LBENode assigned but it contained no items (error!)
L"%s is now empty.", // LBE item %s contained stuff and was emptied
L"Cannot empty %s!", // Removed everything we could from LBE item %s but it's still not marked as empty (error!)
L"%s contents lost!", // LBE item %s not marked as empty but LBENode not found (error!!!)
};
STR16 gzMapInventoryFilterOptions[] =