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

Merged revision(s) 6894 from branches/ja2_source_official_2014:

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
Utils/Text.h
+4 -2
View File
@@ -415,8 +415,8 @@ enum
MSG_ENTERING_LEVEL,
MSG_LEAVING_BASEMENT,
MSG_DASH_S, // the old 's
MSG_TACKING_MODE_OFF,
MSG_TACKING_MODE_ON,
MSG_TRACKING_MODE_OFF,
MSG_TRACKING_MODE_ON,
MSG_3DCURSOR_OFF,
MSG_3DCURSOR_ON,
MSG_SQUAD_ACTIVE,
@@ -461,6 +461,8 @@ enum
MSG_WINDOWED_MODE_RELEASE_MOUSE, // 105
MSG_FORMATIONS_ON, // 106
MSG_FORMATIONS_OFF, // 107
MSG_MERC_CASTS_LIGHT_ON,
MSG_MERC_CASTS_LIGHT_OFF,
TEXT_NUM_MSG,
};
Utils/_ChineseText.cpp
+6 -3
View File
@@ -3950,8 +3950,9 @@ STR16 pImpPopUpStrings[] =
L"无法从磁盘上读入I.M.P.人物数据。",
L"你已经达到I.M.P.人物上限。",
L"你已经达到I.M.P.该性别人物上限。",
L"你无法支付此I.M.P.人物的费用。",
L"你无法支付此I.M.P.人物的费用。", // 10
L"新的I.M.P.人物加入了你的队伍。",
L"You have already selected the maximum number of traits.", // TODO.Translate
};
@@ -5961,7 +5962,7 @@ STR16 pMessageStrings[] =
L"榴弹发射器点射时使用准星光标（可以扫射）",
L"榴弹发射器连发时使用弹道光标(不可以扫射", //"Grenade Bursts use Trajectory Cursor (Spread fire disabled)",
L"开启敌兵装备提示", // Changed from Drop All On - SANDRO
L"关闭敌兵装备提示", // Changed from Drop All Off - SANDRO
L"关闭敌兵装备提示", // 80 // Changed from Drop All Off - SANDRO
L"榴弹发射器以正常仰角发射榴弹", //"Grenade Launchers fire at standard angles",
L"榴弹发射器以较高仰角发射榴弹", //L"Grenade Launchers fire at higher angles",
// forced turn mode strings
@@ -5970,7 +5971,7 @@ STR16 pMessageStrings[] =
L"离开战斗",
L"强制回合制模式启动，进入战斗",
L"自动储存成功。",
L"..\\SavedGames\\MP_SavedGames", //The name of the directory where games are saved.//84
L"..\\SavedGames\\MP_SavedGames", //The name of the directory where games are saved
L"客户端", //"Client",
L"旧携行系统不能与新附件系统同时使用.",
@@ -5993,6 +5994,8 @@ STR16 pMessageStrings[] =
L"鼠标已释放，鼠标移动范围不再受限于游戏窗口内部区域。", // 105
L"保持佣兵间距开启",
L"保持佣兵间距关闭",
L"Artificial Merc Light ON", // TODO.Translate
L"Artificial Merc Light OFF",
};
Utils/_DutchText.cpp
+5 -2
View File
@@ -3946,8 +3946,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 three I.M.P characters with the same 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.", // TODO.Translate
};
@@ -5966,7 +5967,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"Granade Launchers fire at standard angles",
L"Grenade Launchers fire at higher angles",
// forced turn mode strings
@@ -6001,6 +6002,8 @@ STR16 pMessageStrings[] =
L"Release mouse cursor from game window boundary.", // 105
L"Move in Formation ON", // TODO.Translate
L"Move in Formation OFF",
L"Artificial Merc Light ON", // TODO.Translate
L"Artificial Merc Light OFF",
};
Utils/_EnglishText.cpp
+6 -3
View File
@@ -3949,8 +3949,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.",
};
@@ -5960,7 +5961,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
@@ -5969,7 +5970,7 @@ STR16 pMessageStrings[] =
L"Exit combat mode",
L"Forced Turn Mode Active, Entering Combat",
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.//84
L"..\\SavedGames\\MP_SavedGames", //The name of the directory where games are saved
L"Client",
L"You cannot use the Old Inventory and the New Attachment System at the same time.", // 90
@@ -5992,6 +5993,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",
};
Utils/_FrenchText.cpp
+5 -2
View File
@@ -3950,8 +3950,9 @@ STR16 pImpPopUpStrings[] =
L"Impossible de charger le profil.",
L"Vous avez déjà atteint le nombre maximum d'IMP.",
L"Vous avez déjà trois IMP du même sexe dans l'escouade.",
L"Vous n'avez pas les moyens.",
L"Vous n'avez pas les moyens.", // 10
L"Le nouvel IMP a rejoint votre escouade.",
L"You have already selected the maximum number of traits.", // TODO.Translate
};
@@ -5965,7 +5966,7 @@ STR16 pMessageStrings[] =
L"Curseur de visée pour raf. gre. (Dispersion activée).",
L"Curseur de trajectoire raf. gre. (Dispersion desact.).",
L"Infobulle soldat activée", // Changed from Drop All On - SANDRO
L"Infobulle soldat désactivée", // Changed from Drop All Off - SANDRO
L"Infobulle soldat désactivée", // 80 // Changed from Drop All Off - SANDRO
L"Petit angle pour lance-grenades",
L"Grand angle pour lance-grenades",
// forced turn mode strings
@@ -5998,6 +5999,8 @@ STR16 pMessageStrings[] =
L"Libérer le curseur pour qu'il se déplace hors de la fenêtre.", // 105
L"Déplacement tactique activé",
L"Déplacement tactique désactivé",
L"Artificial Merc Light ON", // TODO.Translate
L"Artificial Merc Light OFF",
};
Utils/_GermanText.cpp
+6 -3
View File
@@ -3902,8 +3902,9 @@ STR16 pImpPopUpStrings[] =
L"Fehler beim Laden des B.S.E.-Charakters.",
L"Sie haben bereits die maximale Anzahl an B.S.E.-Charakteren.",
L"Sie haben bereits drei B.S.E.-Charaktere mit dem gleichen Geschlecht.",
L"Sie können sich den B.S.E.-Charakter nicht leisten.",
L"Sie können sich den B.S.E.-Charakter nicht leisten.", // 10
L"Der neue B.S.E.-Charakter ist nun in ihrem Team.",
L"You have already selected the maximum number of traits.", // TODO.Translate
};
// button labels used on the IMP site
@@ -5799,7 +5800,7 @@ STR16 pMessageStrings[] =
L"Granatenwerfer-Feuerstöße verwenden Ziel-Cursor (Sperrfeuer aktiviert).",
L"Granatenwerfer-Feuerstöße verwenden Flugbahn-Cursor (Sperrfeuer deaktiviert).",
L"Soldaten-Kurzinfo (\"Tooltips\") aktiviert", // Changed from Drop All On - SANDRO
L"Soldaten-Kurzinfo (\"Tooltips\") deaktiviert", // Changed from Drop All Off - SANDRO
L"Soldaten-Kurzinfo (\"Tooltips\") deaktiviert", // 80 // Changed from Drop All Off - SANDRO
L"Granatwerfer schießen in flachem Winkel.",
L"Granatwerfer schießen in steilem Winkel.",
// forced turn mode strings
@@ -5807,7 +5808,7 @@ STR16 pMessageStrings[] =
L"Normaler Rundenmodus",
L"Verlasse Kampfmodus",
L"Erzwungener Rundenmodus ist aktiv, gehe in Kampfmodus",
L"Spiel erfolgreich in Position End Turn Auto Save gespeichert.", // 83
L"Spiel erfolgreich in Position End Turn Auto Save gespeichert.",
L"..\\Spielstände\\MP_Spielstände", //The name of the directory where games are saved.
L"Client",
@@ -5831,6 +5832,8 @@ STR16 pMessageStrings[] =
L"Mausbereich wieder freigeben, um uneingeschränkte Mausbewebung zu erhalten.", // 105
L"In Formation bewegen - EINGESCHALTET",
L"In Formation bewegen - AUSGESCHALTET",
L"Artificial Merc Light ON", // TODO.Translate
L"Artificial Merc Light OFF",
};
CHAR16 ItemPickupHelpPopup[][40] =
Utils/_ItalianText.cpp
+5 -2
View File
@@ -3940,8 +3940,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 three I.M.P characters with the same 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.", // TODO.Translate
};
@@ -5951,7 +5952,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
@@ -5986,6 +5987,8 @@ STR16 pMessageStrings[] =
L"Release mouse cursor from game window boundary.", // 105
L"Move in Formation ON", // TODO.Translate
L"Move in Formation OFF",
L"Artificial Merc Light ON", // TODO.Translate
L"Artificial Merc Light OFF",
};
Utils/_PolishText.cpp
+5 -2
View File
@@ -3959,8 +3959,9 @@ STR16 pImpPopUpStrings[] =
L"Nie można załadować postaci I.M.P. z dysku.",
L"Wykorzystałeś już maksymalną liczbę postaci I.M.P.",
L"Masz już w oddziale trzy postacie I.M.P. tej samej płci.", //L"You have already the maximum number of I.M.P characters with that gender on your team.", BYŁo ->>L"You have already three I.M.P characters with the same gender on your team.",
L"Nie stać cię na postać I.M.P.",
L"Nie stać cię na postać I.M.P.", // 10
L"Nowa postać I.M.P. dołączyła do oddziału.",
L"You have already selected the maximum number of traits.", // TODO.Translate
};
@@ -5973,7 +5974,7 @@ STR16 pMessageStrings[] =
L"Seria z granatnika używa kursora celowania (dostępny ogień rozproszony)", //L"Grenade Bursts use Targeting Cursor (Spread fire enabled)", BYŁO -->>L"Grenade Bursts - Using Targeting Cursor (Spread fire enabled)",
L"Seria z granatnika używa kursora trajektorii (dostępny ogień rozproszony)", //L"Grenade Bursts use Trajectory Cursor (Spread fire disabled)", BYŁO -->L"Grenade Bursts - Using 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"Granatniki strzelają pod standardowymi kątami", //L"Grenade Launchers fire at standard angles", BYŁo->>L"Grenade Launchers - Fire at standard angles",
L"Granatniki strzelają pod wysokimi kątami", //L"Grenade Launchers fire at higher angles", BYŁo-->>L"Grenade Launchers - Fire at high angles",
// forced turn mode strings
@@ -6007,6 +6008,8 @@ STR16 pMessageStrings[] =
L"Release mouse cursor from game window boundary.", // 105
L"Move in Formation ON", // TODO.Translate
L"Move in Formation OFF",
L"Artificial Merc Light ON", // TODO.Translate
L"Artificial Merc Light OFF",
};
Utils/_RussianText.cpp
+5 -2
View File
@@ -3948,8 +3948,9 @@ STR16 pImpPopUpStrings[] =
L"Не могу загрузить I.M.P.-персонаж с диска.",
L"Вы достигли максимального количества I.M.P.-персонажей.",
L"У вас в команде уже есть три I.M.P.-персонажа того же пола.",
L"Вы не можете позволить себе такой I.M.P.-персонаж.",
L"Вы не можете позволить себе такой I.M.P.-персонаж.", // 10
L"Новый I.M.P.-персонаж присоединился к команде.",
L"You have already selected the maximum number of traits.", // TODO.Translate
};
@@ -5959,7 +5960,7 @@ STR16 pMessageStrings[] =
L"Очереди из гранат используют курсор стрельбы очередями (стрельба по площадям возможна)",
L"Очереди из гранат используют курсор метания (стрельба по площадям не возможна)",
L"Включены подписи к солдатам", // Changed from Drop All On (Enabled Soldier Tooltips)
L"Отключены подписи к солдатам", // Changed from Drop All Off (Disabled Soldier Tooltips)
L"Отключены подписи к солдатам", // 80 // Changed from Drop All Off (Disabled Soldier Tooltips)
L"Гранатометы стреляют под обычным углом",
L"Гранатометы стреляют навесом",
// forced turn mode strings
@@ -5991,6 +5992,8 @@ STR16 pMessageStrings[] =
L"Release mouse cursor from game window boundary.", // 105
L"Move in Formation ON", // TODO.Translate
L"Move in Formation OFF",
L"Artificial Merc Light ON", // TODO.Translate
L"Artificial Merc Light OFF",
};
Utils/_TaiwaneseText.cpp
+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",
};