*** MERGED source code from development trunk revision 4890 up to latest current revision 5105 ***

Development Trunk (now obsolete): https://ja2svn.dyndns.org/source/ja2/branches/Wanne/JA2%201.13%20MP
A detailed list of all the features (changes) is visible in the history log of the development trunk:

INFO: There will be no further development in the development source trunk, so is obsolete from now on!

This commit contains the following features (bugfixes are not listed):

- New Feature: Show merc ranks in Strategy Screen before merc name
o Toggle on/off in the ingame options screen
o For each experience level (0-10) there are defined rank names in the language specific text files
o Additional language text that is not translated yet is marked with // TODO.Translate

- New Feature: Faster Bobby Ray Shipments
o This feature is selectable in the ja2_options.ini
o When activated Bobby Ray shipments will be really fast
-> Overnight Express: 5 - 7 hours
-> Air Service: 10, 12 or 14 hours
-> Standard Service: 15, 18 or 21 hours
o In a multiplayer game, this feature is disabled (because shipment arrive immediately in the destination sector)

- New Feature: AP cost for manipulating the merc inventory
o This feature is selectable in the start new game screen
o For example, putting a weapon from hand in the backpack costs APs
o The AP costs are defined in the APBPConstants.ini
o In a multiplayer game, this feature is disabled

- New Feature: Added possibility to set individual Gear Kit names
o Set individual names in the optional new tag <mGearKitName> inside the <GEARKIT> root element (File: TableData\MercStartingGear.xml)

- New Feature: Externalized the maximum purchase amount (JA2 vanilla: 10) for Bobby Rays purchases per shipment
o Define the max. amount in the ja2_options.ini: BOBBY_RAY_MAX_PURCHASE_AMOUNT, Range: 10 - 100)
o Nice scrolling bars to scroll through all the purchases

- New Feature: Now it is possible to walk on "water" tiles or handle those tiles like "normal" tiles 
o (instead of showing the swimming animation and counting the APs for swimming), when the soldier is located on the second level (level > 0)

- New Feature: Externalized AIM Veterans laptop site
o Add maximum of 4 pages
o Add  new AIM to veterans page, and remove AIM from veterans page.
o New XML file: OldAIMArchive.xml (language specific XML files: *.OldAIMArchive.xml)

- New Feature: Added possibility to choose from 254 IMP faces
o Modified IMPPortraits.xml
o Added new GameDir folder "IMPFaces" which contains the IMP face portraits
o Moved IMP faces in the new "IMPFaces" folder

- New Feature: ARSP - All Resolution Support Project
o See here: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=298698&page=1
o Support any kind of screen resolution. This works by choosing the matching full supported resolution (640x480, 800x600, 1024x768) and then centering the graphics
o See ja2.ini for defining the screen resolution

- New Feature: AI Turn Speed Up (FF-MOD)
o see here: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=298699#Post298699
o When this feature is activated it allows fast enemy turns
o New entry in ja2.ini to enable this feature: HIGHSPEED_TIMER = TRUE
o Turn on/off auto fast turns in ingame options
o New ja2_options.ini settings for fine tuning: [Clock Settings] ini block

- New Feature: "Lock" / "Release" mouse cursor in tactical windowed mode, so the mouse can stay within window boundary
o This is very helpful for doing scrolling with the mouse (by moving the mouse to the window edge) in windowed mode
o You can toggle on/off the feature by pressing CTRL + Z. It is also possible to press CTRL + Y. So the user can decide which fits better :)
o Whenever you toggle on/off a screen message appears on the tactical log to notify the player

- New Feature: Weapon overheating
o Basically, every shot fired from a gun increases its temperature. On higher temperatures, the gun jams more frequently
o On/off toggle in the ingame options
o Graphical thermometer indication on the weapon picture
o New ja2_options.ini section with a few options, Section: [Tactical Weapon Overheating Settings]
o XML changes (New Tags)
--> AmmoTypes.xml: <temperatureModificator>
--> Items.xml: <barrel>, <usOverheatingCooldownFactor>
--> Weapons.xml: <usOverheatingJamThreshold>, <usOverheatingDamageThreshold>, <usOverheatingSingleShotTemperature>
o Added a few barells to Items.xml (end of the file)
o more infos: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=301059&page=1

- New Feature: Resting weapons on a surfaces
o You can now rest your weapon on crates, low walls, rocks, debris, open windows etc. while you are crouched. Resting will give yu the superior gun handling modifiers from PRONE position.
o A little 'A' on your gun indicates if you are resting it or not.
o Both settings can be turned on and off in Ja2_Options.ini under 'Tactical Gameplay Settings'

- New Feature: Externalized option on whether mercs can exit sector using grid exit in turn based mode
o new ja2_options.ini property: GRID_EXIT_IN_TURNBASED
o This ini setting does not affect leaving sectors on map edges

- Rework/Update: Ammo boxes and Ammo crates
o Ammo crate items added for remaining calibers.  Tweaked prices to correspond to magazines, tweaked capacities and weights to be reasonable (~800 or less).
o Shift-R reload now looks at both boxes and crates in sector items and merc's inventory to reload, and tops off magazines in inventory as well.  Only possible outside of combat.
o Ctrl-Shift-A still creates crates as per usual, with some fixes to ensure all ammo is caught on the first press.
o Shift-A now creates ammo boxes in the same loop.  They mostly behave like crates, but fit in mercs inventories.
o Ammo boxes are available to purchase at BR and tony, sam, etc.  Individual magazines/drums/etc are no longer available.
o Removed ammo crate xml tag.  Added ubMagType tag to Magazines array.  This allows us to differentiate between magazines, bullets, boxes and crates.
o Changed ammo filtering in BR's to display boxes appropriately.  Added back the "Mag:" display (changed text to "Size:")
o Added ja2set.dat.xml file (WF map version in WF maps folder) to be used instead of ja2set.dat file (ja2.ini setting added) For now, if you want to play vanilla instead, just change the setting in the ini (see comments in file).
o Added P4-P9Items image files (up to 5k images each) and tileslots.  1.13 core items will continue to use Guns and P1-P3Items for the foreseeable future.  P4-P9 can be used by customizers/modders to avoid conflicts with Guns/P1-P3 items.  TODO: Need to discuss a strategy for this in the forums.
o Added in Ambient/0.bad and 32.bad to avoid an exception in the code.
o Updated the XML Editor
o Standardized the text on all the ammo items.

- New Multiplayer Feature: Sharing same FOV (field of view) in a coop/team-dm (for friendly teams) game
o You will also see enemies, that your teammate sees

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5108 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Utils/_ChineseText.cpp

@@ -254,13 +254,13 @@ STR16	pEncyclopediaShortInventoryText[] =
 	L"枪械",
 	L"弹药",
 	L"携行具",
-	L"附件",
+	L"杂项",
 	
 	L"全部", //5
 	L"枪械",
 	L"弹药",
 	L"携行具",
-	L"附件",
+	L"杂项",
 };
 
 STR16			BoxFilter[] =
@@ -290,7 +290,7 @@ STR16			BoxFilter[] =
 	L"枪械",
 	L"护甲",
 	L"携行具",
-	L"附件", //20
+	L"杂项", //20
 
 	// Armour
 	L"头盔",
@@ -308,7 +308,7 @@ STR16			BoxFilter[] =
 	L"工具",
 	L"通讯等",
 	L"携行具",
-	L"附件", //34
+	L"杂项", //34
 };
 //-----------
 
@@ -2873,6 +2873,7 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
 	L"前往分区",
 	L"前往地图",
 	L"你不能从这边离开这个分区。",
+	L"You can't leave in turn based mode.",	// TODO.Translate
 	L"%s太远了。",
 	L"不显示树冠",
 	L"显示树冠",
@@ -4400,9 +4401,9 @@ STR16			BobbyRFilter[] =
 	L"炸药", //"Bombs",
 	L"医疗用品", //"Med. Kits",
 	L"工具套装", //"Kits",
-	L"通讯/夜视", //"Face Items",
+	L"头部装备", //"Face Items",
 	L"携行具", //"LBE Gear",
-	L"附件/瞄准具", //"Misc.",
+	L"杂项", //"Misc.",
 };
 
 
@@ -4451,7 +4452,8 @@ STR16			BobbyRText[] =
 
 	//Popup that tells the player that they can only order 10 items at a time
 
-	L"靠!  我们这里的在线订单一次只接受10件物品的订购。如果你想要订购更多东西（我们希望如此），请接受我们的歉意，再开一份订单。",
+	L"靠!  我们这里的在线订单一次只接受" ,//First part
+	L"件物品的订购。如果你想要订购更多东西（我们希望如此），请接受我们的歉意，再开一份订单。",
 
 	// A popup that tells the user that they are trying to order more items then the store has in stock
 
@@ -5062,10 +5064,13 @@ STR16		zOptionsToggleText[] =
 	L"属性进度条",	//L"Stat Progress Bars", // Show progress towards stat increase //ham3.6
 	L"替代战略地图颜色", // Change color scheme of Strategic Map
 	L"替代子弹图像", // Show alternate bullet graphics (tracers)
-	L"开启新的瞄准系统(NCTH)",				// use NCTH
+	//L"开启新的瞄准系统(NCTH)",				// use NCTH
+	L"显示佣兵军衔",	// shows mercs ranks
 	L"显示脸部装备图",				
 	L"显示脸部装备图标",
 	L"禁止光标切换",		            // Disable Cursor Swap
+	L"自动加速敌军回合",			// Automatic fast forward through AI turns
+	//L"武器过热",
 	L"--作弊模式选项--",				// TOPTION_CHEAT_MODE_OPTIONS_HEADER,
 	L"强制 Bobby Ray 送货",			// force all pending Bobby Ray shipments
 	L"-----------------",					// TOPTION_CHEAT_MODE_OPTIONS_END
@@ -5167,10 +5172,12 @@ STR16	zOptionsScreenHelpText[] =
 	L"打开时，显示各属性的增长进度。", // L"When ON, shows character progress towards gaining levels.", //ham3.6
 	L"打开时, 战略地图将会根据探索状态显示不同的着色。",
 	L"打开时, 当你射击时会显示间隔子弹图像。",
-	L"打开时, 使用新命中率系统（NCTH）和光标。",
+	//L"打开时, 使用新命中率系统（NCTH）和光标。",
+	L"打开时，在战略界面的佣兵名旁显示军衔。",
 	L"打开时, 显示佣兵脸部装备图。",
 	L"打开时, 佣兵肖像右下角显示脸部装备图标",
-	L"打开时，在交换位置和其它动作时光标不切换。键入 |x 可以快速切换。", // L"When ON, the cursor will not toggle between exchange position and other actions. Press |x to initiate quick exchange.",
+	L"打开时，在交换位置和其它动作时光标不切换。键入 |x 可以快速切换。",
+	//L"打开时，武器连续射击时温度逐渐升高引起过热。",
 	L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
 	L"强制 Bobby Ray 出货",
 	L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",
@@ -5268,6 +5275,12 @@ STR16	gzGIOScreenText[] =
 	L"6",
 	L"8",
 	L"10",
+	//L"Bobby Ray 快速出货", //L"Faster Bobby Ray Shipments",
+	L"战斗时取放物品消耗AP", //L"Inventory Manipulation Costs AP",
+	// TODO: Translate
+	L"新命中率系统（NCTH）", //L"New Chance to Hit System",
+	L"改进的中断系统（IIS）", //L"Improved Interrupt System",
+	L"武器过热", //L"Weapon Overheating",
 };
 
 STR16	gzMPJScreenText[] =
@@ -5585,6 +5598,9 @@ STR16 pMessageStrings[] =
 	L"AutoSaveGame%02d.sav",	// 101
 	L"Auto%02d.sav",	// 102
 	L"SaveGame%02d.sav", //103
+	// Lock / release mouse in windowed mode (window boundary)
+	L"鼠标已锁定，鼠标移动范围强制限制在游戏窗口内部区域。",			// 104
+	L"鼠标已释放，鼠标移动范围不再受限于游戏窗口内部区域。",			// 105
 };
 
 
@@ -5650,7 +5666,7 @@ STR16 gzLaptopHelpText[] =
 	L"McGillicutty公墓",
 	L"联合花卉服务公司",
 	L"A.I.M指定保险代理人",
-	//New Bookmarks				// TODO.Translate
+	//New Bookmarks
 	L"",
 	L"百科全书",
 	L"简报室",
@@ -5964,7 +5980,7 @@ STR16 gzLateLocalizedString[] =
 	L"%s多打了%d发子弹！",	//"%s fires %d more rounds than intended!",
 	L"%s多打了1发子弹！",	//"%s fires %d more round than intended!",
 
-	L"You need to close the item description box first!",	// TODO.Translate
+	L"你得先关闭物品信息界面！",
 };
 
 // HEADROCK HAM 3.5: Added sector name
@@ -6069,7 +6085,8 @@ STR16 New113Message[] =
 	L"%s 命根子中弹，痛苦的倒下了！",// L"%s is hit to groin and falls down in pain!",	
 	//////////////////////////////////////////////////////////////////////////////////////
 	L"注意: 敌人尸体被发现!!!",
-	L"%s [%d rnds]\n%s %1.1f %s",
+	L"%s [%d rnds]\n%s %1.1f %s",		
+	L"AP不够！需要%d，你只有%d。",	//L"Insufficient AP Points! Cost %d, you have %d.",
 };
 
 STR16 New113HAMMessage[] = 
@@ -6306,10 +6323,10 @@ STR16 MPClientMessage[] =
 	L"点击 '准备' 进入战术画面。",//	L"Press 'Ready' to enter tactical screen.",
 	L"不能连接到服务器，因为你的版本 %S 和服务器端的版本 %S 不同。",
 	L"你击毙了一个敌人。",
-	L"无法启动游戏，因为所有小队都一样。",	//L"Cannot start the game, because all teams are the same.",    // TODO.Translate
+	L"无法启动游戏，因为所有小队都一样。",	//L"Cannot start the game, because all teams are the same.",
 	L"The server has choosen New Inventory (NIV), but your screen resolution does not support NIV.",
-	// 70	// TODO.Translate
-	L"Could not save received file '%S'",
+	// 70	
+	L"Could not save received file '%S'",		// TODO.Translate
 	L"%s's bomb was disarmed by %s",
 	L"You loose, what a shame",	// All over red rover
 	L"Spectator mode disabled",
@@ -6319,7 +6336,7 @@ STR16 MPClientMessage[] =
 	L"Client failed to start. Terminating.",
 	L"Client disconnected and shutdown.",
 	L"Client is not running.",
-	L"INFO: If the game is stuck (the opponents progress bar is not moving), notify the server to press ALT + E to give the turn back to you!",	// TODO.Translate
+	L"INFO: If the game is stuck (the opponents progress bar is not moving), notify the server to press ALT + E to give the turn back to you!",
 };
 
 STR16 gszMPEdgesText[] =
@@ -6843,6 +6860,7 @@ STR16 szUDBGenAmmoStatsTooltipText[]=
 	L"|侵|彻|力|（|穿|甲|弹|）",
 	L"|翻|搅|力|（|开|花|弹|）",
 	L"|爆|炸|力|（|炸|子|儿|）",
+	L"\n \nA multiplier to the bullet's heat.\n \nLower is better.",		// TODO.Translate
 };
 
 STR16 szUDBGenAmmoStatsExplanationsTooltipText[]=
@@ -6850,6 +6868,7 @@ STR16 szUDBGenAmmoStatsExplanationsTooltipText[]=
 	L"\n \n即子弹穿透目标护甲的能力。\n \n该值大于1时，被子弹命中的护甲的防护值会成比例减少。\n \n反之，当该值小于1时，\n则增加了目标护甲的防护值。\n \n该数值越高越好。",
 	L"\n \n该值决定子弹打穿护甲击中身体时的伤害力\n加成。\n \n该值大于1时，子弹在穿过护甲后会增加伤害。\n \n当该值小于1时，子弹穿过护甲后会减少伤害。\n \n该数值越高越好。",
 	L"\n \n该值是子弹在击中目标前已经造成的潜在伤害的倍率。\n \n大于1的数值可以增加伤害，\n反之则减少伤害。\n \n该数值越高越好。",
+	L"\n \n子弹温度系数。\n \n该数值越低越好。",
 };
 
 STR16 szUDBGenExplosiveStatsTooltipText[]=
@@ -7006,6 +7025,14 @@ STR16 szUDBAdvStatsTooltipText[]=
 	L"|制|退|力|频|次",
 	L"|命|中|率|修|正",
 	L"|精|瞄|修|正",
+	L"|单|发|射|击|温|度",
+	L"|冷|却|参|数",
+	L"|卡|壳|阈|值",
+	L"|损|坏|阈|值",
+	L"|T|e|m|p|e|r|a|t|u|r|e |M|o|d|i|f|i|c|a|t|o|r",		// TODO.Translate
+	L"|C|o|o|l|d|o|w|n |M|o|d|i|f|i|c|a|t|o|r",
+	L"|J|a|m |T|r|e|s|h|o|l|d |M|o|d|i|f|i|c|a|t|o|r",
+	L"|D|a|m|a|g|e |T|r|e|s|h|o|l|d |M|o|d|i|f|i|c|a|t|o|r",
 };
 
 // Alternate tooltip text for weapon Advanced Stats. Just different wording, nothing spectacular.
@@ -7059,6 +7086,14 @@ STR16 szUDBAdvStatsExplanationsTooltipText[]=
 	L"\n \n这是射手在点射或者连发时，频繁评估\n制退力大小以应对后坐力的能力。\n \n较高的频率使连发的总体精度更高，此外，由于射手能\n正确制退后坐力，其长点射也更\n加准确。\n \n该数值越低越好。",
 	L"\n \n当安装于远程武器上时，该物品修正武器的命\n中率。\n \n命中率的提高使该武器在精瞄时更容易命中\n目标。\n \n该数值越高越好。",
 	L"\n \n当安装于远程武器上时，该物品修正武器的精\n瞄加成。\n \n精瞄加成的提高使该武器在精瞄时更容易命\n中远距离的目标。\n \n该数值越高越好。",
+	L"\n \nA single shot causes this much heat.\nAmmunition types and attachments can\naffect this value.\n \nLower is better.",			// TODO.Translate
+	L"\n \nEvery turn, the temperature is lowered\nby this amount.\n \nHigher is better.",
+	L"\n \nIf an item's temperature is above this,\nit will jam more frequently.\n \nHigher is better.",
+	L"\n \nIf an item's temperature is above this,\nit will be damaged more easily.\n \nHigher is better.",
+	L"\n \nA gun's single shot temperature is\nincreased by this percentage.\n \nLower is better.",
+	L"\n \nA gun's cooldown factor is\nincreased by this percentage.\n \nHigher is better.",
+	L"\n \nA gun's jam threshold is\nincreased by this percentage.\n \nHigher is better.",
+	L"\n \nA gun's damage threshold is\nincreased by this percentage.\n \nHigher is better.",
 };
 
 STR16 szUDBAdvStatsExplanationsTooltipTextForWeapons[]=
@@ -7111,6 +7146,11 @@ STR16 szUDBAdvStatsExplanationsTooltipTextForWeapons[]=
 	L"\n \n这是射手频繁估量制退力大小以应对后坐力的能力。\n \n如果武器缺乏点射和连发功能，则此能力无\n效。\n \n低修正值能提高连发的总体精度，此外，由于射手能\n正确制退后坐力，其长点射也更\n加准确。\n \n该数值越低越好。",
 	L"\n \n由于所装的附件，弹药或其内置特性，这件武\n器的命中率得到了修正。\n \n命中率的提高使该武器在精瞄时\n更容易命中目标。\n \n该数值越高越好。",
 	L"\n \n由于所装的附件，弹药或其内置特性，这件武\n器的精瞄加成得到了修正。\n \n精瞄加成的提高能够使该武器在精瞄时更容易命\n中远距离的目标。\n \n该数值越高越好。",
+	L"\n \n单发射击所造成的温度。\n所使用的子弹类型对本值有影响。",
+	L"\n \n每回合自动冷却所降低的温度值。",
+	L"\n \n当武器温度超过卡壳阈值时，\n卡壳将更容易发生。",
+	L"\n \n当武器温度超过损坏阈值时，\n武器将更容易损坏。",
+
 };
 
 // HEADROCK HAM 4: Text for the new CTH indicator.
@@ -7123,6 +7163,37 @@ STR16 gzNCTHlabels[]=
 // HEADROCK HAM 4: End new UDB texts and tooltips
 //////////////////////////////////////////////////////
 
+// Flugente FTW 1: Temperature-based text similar to HAM 4's condition-based text.
+STR16 gTemperatureDesc[] =
+{
+	L"当前温度为: ",
+	L"很低",
+	L"低",
+	L"中等",
+	L"高",
+	L"很高",
+	L"危险",
+	L"很危险",
+	L"致命",
+	L"未知",
+	L"."
+};
+
+
+CHAR16* ranks[] = 
+{	L"",			//ExpLevel 0
+	L"列兵 ",	//L"Pvt. ",		//ExpLevel 1
+	L"下士 ",	//L"Pfc. ",		//ExpLevel 2
+	L"中士 ",	//L"Cpl. "		//ExpLevel 3
+	L"上士 ",	//L"Sgt. ",		//ExpLevel 4
+	L"少尉 ",	//L"Lt. ",		//ExpLevel 5
+	L"中尉 ",	//L"Cpt. ",		//ExpLevel 6
+	L"上尉 ",	//L"Maj. ",		//ExpLevel 7
+	L"少校 ",	//L"Lt.Col. ",	//ExpLevel 8
+	L"上校 ",	//L"Col. ",		//ExpLevel 9
+	L"将军 "	//L"Gen. "		//ExpLevel 10
+};
+
 
 STR16	gzNewLaptopMessages[]=
 {