Merged revision(s) 6894 from branches/ja2_source_official_2014:

Fixes (by Buggler)
- IMPPrejudice page not showing when reviewing in finish mode
- Added message when minor traits are unselectable due to all IMP available slots taken up by major traits
- Display message when pressing hotkey 'G' to toggle artificial merc light
- refactor hotkey weapon switching and make function available in OIV too
- hold ALT key to swap item instead of opening description box for valid attachment on cursor

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6895 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-02-10 00:28:04 +00:00
parent 8d07ebccc0
commit cb3304e93f
17 changed files with 151 additions and 139 deletions
+5 -5
View File
@@ -3953,8 +3953,9 @@ STR16 pImpPopUpStrings[] =
L"Cannot load I.M.P. character from disk.",
L"You have already reached the maximum number of I.M.P. characters.",
L"You have already the maximum number of I.M.P characters with that gender on your team.",
L"You cannot afford the I.M.P character.",
L"You cannot afford the I.M.P character.", // 10
L"The new I.M.P character has joined your team.",
L"You have already selected the maximum number of traits.",
};
@@ -5968,7 +5969,7 @@ STR16 pMessageStrings[] =
L"Grenade Bursts use Targeting Cursor (Spread fire enabled)",
L"Grenade Bursts use Trajectory Cursor (Spread fire disabled)",
L"Enabled Soldier Tooltips", // Changed from Drop All On - SANDRO
L"Disabled Soldier Tooltips", // Changed from Drop All Off - SANDRO
L"Disabled Soldier Tooltips", // 80 // Changed from Drop All Off - SANDRO
L"Grenade Launchers fire at standard angles",
L"Grenade Launchers fire at higher angles",
// forced turn mode strings
@@ -5979,11 +5980,8 @@ STR16 pMessageStrings[] =
L"Successfully Saved the Game into the End Turn Auto Save slot.",
L"..\\SavedGames\\MP_SavedGames", //The name of the directory where games are saved.
L"Client",
// TODO.Translate
L"You cannot use the Old Inventory and the New Attachment System at the same time.",
// TODO.Translate
L"Auto Save #", //91 // Text des Auto Saves im Load Screen mit ID
L"This Slot is reserved for Auto Saves, which can be enabled/disabled (AUTO_SAVE_EVERY_N_HOURS) in the ja2_options.ini.", //92 // The text, when the user clicks on the save screen on an auto save
L"Empty Auto Save Slot #", //93 // The text, when the auto save slot (1 - 5) is empty (not saved yet)
@@ -6003,6 +6001,8 @@ STR16 pMessageStrings[] =
L"Release mouse cursor from game window boundary.", // 105
L"Move in Formation ON",
L"Move in Formation OFF",
L"Artificial Merc Light ON",
L"Artificial Merc Light OFF",
};