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

repair and dirt system change:

Browse Source 
Dirt is now part of gun status. The original dirt system has been removed. For details see:
http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20198&goto=347370&#msg_347370


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8325 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
silversurfer
2016-10-19 15:58:02 +00:00
parent e9a1f4b352
commit 372adc37b8
30 changed files with 716 additions and 806 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/Animated ProgressBar.cpp
+1 -1
View File
@@ -291,7 +291,7 @@ void SetNewLoadScreenHint()
fShow = TRUE;
else if ( zLoadScreenHint[cnt].usFlags & LOADSCREEN_ZOMBIE && gGameSettings.fOptions[TOPTION_ZOMBIES] )
fShow = TRUE;
else if ( zLoadScreenHint[cnt].usFlags & LOADSCREEN_OVERHEAT_DIRT && (gGameExternalOptions.fWeaponOverheating || gGameExternalOptions.fDirtSystem) )
else if ( zLoadScreenHint[cnt].usFlags & LOADSCREEN_OVERHEAT && gGameExternalOptions.fWeaponOverheating )
fShow = TRUE;
else if ( zLoadScreenHint[cnt].usFlags & LOADSCREEN_NCTH && UsingNewCTHSystem() )
fShow = TRUE;
Utils/Animated ProgressBar.h
+1 -1
View File
@@ -61,7 +61,7 @@ void ShowLoadScreenHintInTacticalLog();
#define LOADSCREEN_FOOD 0x00000010 //16 // food tips
#define LOADSCREEN_ZOMBIE 0x00000020 //32 // zombie tips
#define LOADSCREEN_OVERHEAT_DIRT 0x00000040 //64 // tips on overheating & dirt
#define LOADSCREEN_OVERHEAT 0x00000040 //64 // tips on overheating
#define LOADSCREEN_NCTH 0x00000080 //128 // tips on using NCTH
#define LOADSCREEN_COVERTOPS 0x00000100 //256 // tips on using the covert ops trait
Utils/Text.h
+3
View File
@@ -600,6 +600,9 @@ enum
STR_REPAIRED_PARTIAL,
STR_REPAIRED_PARTIAL_FOR_OWNER,
STR_CLEANED,
STR_CLEANED_FOR_OWNER,
TEXT_NUM_STR_MESSAGE,
};
Utils/_ChineseText.cpp
+6 -2
View File
@@ -2358,6 +2358,9 @@ CHAR16 Message[][STRING_LENGTH] =
L"%s竭尽可能地修理了%s。",
L"%s竭尽可能地修理了%s的%s。",
L"%s has cleaned the %s.", // TODO.Translate
L"%s has cleaned %s's %s.",
};
// the country and its noun in the game
@@ -2703,7 +2706,7 @@ STR16 pUpperLeftMapScreenStrings[] =
STR16 pTrainingStrings[] =
{
L"锻炼", // tell merc to train self
L"民兵",// tell merc to train town
L"民兵",// tell merc to train town
L"教练", // tell merc to act as trainer
L"学员", // tell merc to be train by other
};
@@ -7069,6 +7072,7 @@ STR16 sRepairsDoneString[] =
L"%s 修复所有人携带的中型物品",//L"%s finished repairing everyone's medium carried items",
L"%s 修复所有人携带的小型物品",//L"%s finished repairing everyone's small carried items",
L"%s 修复所有人的携行具",//L"%s finished repairing everyone's LBE gear",
L"%s finished cleaning everyone's guns.", // TODO.Translate
};
STR16 zGioDifConfirmText[]=
@@ -7968,7 +7972,7 @@ STR16 Additional113Text[]=
{
L"铁血联盟2 v1.13 窗口模式需要一个16bpp的颜色深度。",
L"铁血联盟2 v1.13 全屏模式(%d x %d)不支持你的显示屏分辨率。\n请改变游戏分辨率或使用16bpp窗口模式。", //L"Jagged Alliance 2 v1.13 fullscreen mode (%d x %d) is not supported by your primary screen.\nPlease either change the game resolution or use 16bpp windowed mode.",
L"存盘文件内部读取错误：存盘文件的“%s”数量跟 Ja2_Options.ini 设置的（$d）不一致。", //L"Internal error in reading %s slots from Savegame: Number of slots in Savegame (%d) differs from defined slots in ja2_options.ini settings (%d)",
L"存盘文件内部读取错误：存盘文件的“%s”数量跟 Ja2_Options.ini 设置的（$d）不一致。", //L"Internal error in reading %s slots from Savegame: Number of slots in Savegame (%d) differs from defined slots in ja2_options.ini settings (%d)",
// WANNE: Savegame slots validation against INI file
L"佣兵 (MAX_NUMBER_PLAYER_MERCS) / 交通工具 (MAX_NUMBER_PLAYER_VEHICLES)",
L"敌人 (MAX_NUMBER_ENEMIES_IN_TACTICAL)",
Utils/_DutchText.cpp
+11 -7
View File
@@ -2357,6 +2357,9 @@ CHAR16 Message[][STRING_LENGTH] =
L"%s has repaired the %s as much as possible.", // TODO.Translate
L"%s has repaired %s's %s as much as possible.",
L"%s has cleaned the %s.", // TODO.Translate
L"%s has cleaned %s's %s.",
};
// the country and its noun in the game
@@ -7079,13 +7082,14 @@ STR16 gzCreditNameFunny[]=
STR16 sRepairsDoneString[] =
{
L"%s is klaar met reparatie van eigen items",
L"%s is klaar met reparatie van ieders wapens en bepantering",
L"%s is klaar met reparatie van ieders uitrusting",
L"%s finished repairing everyone's large carried items",
L"%s finished repairing everyone's medium carried items",
L"%s finished repairing everyone's small carried items",
L"%s finished repairing everyone's LBE gear",
L"%s is klaar met reparatie van eigen items.",
L"%s is klaar met reparatie van ieders wapens en bepantering.",
L"%s is klaar met reparatie van ieders uitrusting.",
L"%s finished repairing everyone's large carried items.",
L"%s finished repairing everyone's medium carried items.",
L"%s finished repairing everyone's small carried items.",
L"%s finished repairing everyone's LBE gear.",
L"%s finished cleaning everyone's guns.", // TODO.Translate
};
STR16 zGioDifConfirmText[]=
Utils/_EnglishText.cpp
+11 -7
View File
@@ -2358,6 +2358,9 @@ CHAR16 Message[][STRING_LENGTH] =
L"%s has repaired the %s as much as possible.",
L"%s has repaired %s's %s as much as possible.",
L"%s has cleaned the %s.",
L"%s has cleaned %s's %s.",
};
// the country and its noun in the game
@@ -7063,13 +7066,14 @@ STR16 gzCreditNameFunny[]=
// HEADROCK: Adjusted strings for better feedback, and added new string for LBE repair.
STR16 sRepairsDoneString[] =
{
L"%s finished repairing own items",
L"%s finished repairing everyone's guns & armor",
L"%s finished repairing everyone's equipped items",
L"%s finished repairing everyone's large carried items",
L"%s finished repairing everyone's medium carried items",
L"%s finished repairing everyone's small carried items",
L"%s finished repairing everyone's LBE gear",
L"%s finished repairing own items.",
L"%s finished repairing everyone's guns & armor.",
L"%s finished repairing everyone's equipped items.",
L"%s finished repairing everyone's large carried items.",
L"%s finished repairing everyone's medium carried items.",
L"%s finished repairing everyone's small carried items.",
L"%s finished repairing everyone's LBE gear.",
L"%s finished cleaning everyone's guns.",
};
STR16 zGioDifConfirmText[]=
Utils/_FrenchText.cpp
+11 -7
View File
@@ -2366,6 +2366,9 @@ CHAR16 Message[][STRING_LENGTH] =
L"%s a réparé au mieux : %s.",
L"%s a aidé %s pour réparer au mieux : %s.",
L"%s has cleaned the %s.", // TODO.Translate
L"%s has cleaned %s's %s.",
};
// the country and its noun in the game // TODO.Translate
@@ -7076,13 +7079,14 @@ STR16 gzCreditNameFunny[]=
STR16 sRepairsDoneString[] =
{
L"%s a terminé la réparation de ses objets",
L"%s a terminé la réparation des armes & protections",
L"%s a terminé la réparation des objets portés",
L"%s a fini de réparer les grands objets portés par chacun",
L"%s a fini de réparer les moyens objets portés par chacun",
L"%s a fini de réparer les petits objets portés par chacun",
L"%s a fini de réparer le mécanisme LBE de chacun",
L"%s a terminé la réparation de ses objets.",
L"%s a terminé la réparation des armes & protections.",
L"%s a terminé la réparation des objets portés.",
L"%s a fini de réparer les grands objets portés par chacun.",
L"%s a fini de réparer les moyens objets portés par chacun.",
L"%s a fini de réparer les petits objets portés par chacun.",
L"%s a fini de réparer le mécanisme LBE de chacun.",
L"%s finished cleaning everyone's guns.", // TODO.Translate
};
STR16 zGioDifConfirmText[]=
Utils/_GermanText.cpp
+17 -13
View File
@@ -2372,8 +2372,11 @@ CHAR16 Message[][STRING_LENGTH] =
L"%s passt in keine freie Einbaustelle.",
L"Für diese Tasche ist nicht mehr genug Platz.",
L"%s has repaired the %s as much as possible.", // TODO.Translate
L"%s has repaired %s's %s as much as possible.",
L"%s hat %s so gut wie möglich repariert.",
L"%s hat %s's %s so gut wie möglich repariert.",
L"%s hat %s gereinigt.",
L"%s hat %s's %s gereinigt.",
};
// the country and its noun in the game
@@ -6908,13 +6911,14 @@ STR16 gzCreditNameFunny[]=
STR16 sRepairsDoneString[] =
{
L"%s hat seine eigenen Gegenstände repariert",
L"%s hat die Waffen und Rüstungen aller Teammitglieder repariert",
L"%s hat die aktivierten Gegenstände aller Teammitglieder repariert",
L"%s hat die großen mitgeführten Gegenstände aller Teammitglieder repariert",
L"%s hat die mittelgroßen mitgeführten Gegenstände aller Teammitglieder repariert",
L"%s hat die kleinen mitgeführten Gegenstände aller Teammitglieder repariert",
L"%s hat die Trageausrüstung aller Teammitglieder repariert",
L"%s hat seine eigenen Gegenstände repariert.",
L"%s hat die Waffen und Rüstungen aller Teammitglieder repariert.",
L"%s hat die aktivierten Gegenstände aller Teammitglieder repariert.",
L"%s hat die großen mitgeführten Gegenstände aller Teammitglieder repariert.",
L"%s hat die mittelgroßen mitgeführten Gegenstände aller Teammitglieder repariert.",
L"%s hat die kleinen mitgeführten Gegenstände aller Teammitglieder repariert.",
L"%s hat die Trageausrüstung aller Teammitglieder repariert.",
L"%s hat die Waffen aller Teammitglieder gereinigt.",
};
STR16 zGioDifConfirmText[]=
@@ -7261,10 +7265,10 @@ STR16 gzTransformationMessage[] =
L"%s wurde aufgeteilt in %d Magazine, wobei jedes davon %d Schuss enthält.",
L"%s wurde aufgeteilt in %s's Inventar.",
L"Es ist nicht genügend Platz in %s's Inventar um die Magazine dieses Kalibers abzulegen!",
L"Instant mode", // TODO.Translate
L"Delayed mode",
L"Instant mode (%d AP)",
L"Delayed mode (%d AP)",
L"Sofortmodus",
L"Verzögerter Modus",
L"Sofortmodus (%d AP)",
L"Verzögerter Modus (%d AP)",
};
// WANNE: These are the email texts Speck sends when one of the 4 new 1.13 MERC mercs have levelled up
Utils/_ItalianText.cpp
+11 -7
View File
@@ -2352,6 +2352,9 @@ CHAR16 Message[][STRING_LENGTH] =
L"%s has repaired the %s as much as possible.", // TODO.Translate
L"%s has repaired %s's %s as much as possible.",
L"%s has cleaned the %s.", // TODO.Translate
L"%s has cleaned %s's %s.",
};
// the country and its noun in the game
@@ -7063,13 +7066,14 @@ STR16 gzCreditNameFunny[]=
STR16 sRepairsDoneString[] =
{
L"%s ha finito di riparare gli oggetti",
L"%s ha finito di riparare le armi e i giubbotti antiproiettile di tutti",
L"%s ha finito di riparare gli oggetti dell'equipaggiamento di tutti",
L"%s finished repairing everyone's large carried items",
L"%s finished repairing everyone's medium carried items",
L"%s finished repairing everyone's small carried items",
L"%s finished repairing everyone's LBE gear",
L"%s ha finito di riparare gli oggetti.",
L"%s ha finito di riparare le armi e i giubbotti antiproiettile di tutti.",
L"%s ha finito di riparare gli oggetti dell'equipaggiamento di tutti.",
L"%s finished repairing everyone's large carried items.",
L"%s finished repairing everyone's medium carried items.",
L"%s finished repairing everyone's small carried items.",
L"%s finished repairing everyone's LBE gear.",
L"%s finished cleaning everyone's guns.", // TODO.Translate
};
STR16 zGioDifConfirmText[]=
Utils/_PolishText.cpp
+4
View File
@@ -2364,6 +2364,9 @@ CHAR16 Message[][STRING_LENGTH] =
L"%s has repaired the %s as much as possible.", // TODO.Translate
L"%s has repaired %s's %s as much as possible.",
L"%s has cleaned the %s.", // TODO.Translate
L"%s has cleaned %s's %s.",
};
// the country and its noun in the game
@@ -7084,6 +7087,7 @@ STR16 sRepairsDoneString[] =
L"%s skończył(a) naprawiać średnie wyposażenie wszystkich członków oddziału",
L"%s skończył(a) naprawiać lekkie wyposażenie wszystkich członków oddziału",
L"%s skończył(a) naprawiać strój LBE wszystkich członków oddziału",
L"%s finished cleaning everyone's guns.", // TODO.Translate
};
STR16 zGioDifConfirmText[]=
Utils/_RussianText.cpp
+4
View File
@@ -2358,6 +2358,9 @@ CHAR16 Message[][STRING_LENGTH] =
L"%s отремонтировал(а) %s, насколько это было возможно.",
L"%s отремонтировал(а) у наёмника %s предмет %s, насколько это было возможно.",
L"%s has cleaned the %s.", // TODO.Translate
L"%s has cleaned %s's %s.",
};
// the country and its noun in the game
@@ -7070,6 +7073,7 @@ STR16 sRepairsDoneString[] =
L"%s: завершён ремонт всех малых вещей отряда.",
L"%s: завершён ремонт всех мелких вещей отряда.",
L"%s: завершён ремонт разгрузочных систем отряда.",
L"%s finished cleaning everyone's guns.", // TODO.Translate
};
STR16 zGioDifConfirmText[]=