- Fixed Tixa & Orta location not shown on NPC quote trigger (by Buggler)

- Fixed Merc Formation text positioning and other minor text tweaks in option screen (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6474 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-10-08 16:08:50 +00:00
parent 48ceea04ee
commit c14e76622a
13 changed files with 158 additions and 150 deletions
+25 -25
View File
@@ -5138,12 +5138,12 @@ STR16 zOptionsToggleText[] =
L"Pause Text Dialogue",
L"Animate Smoke",
L"Blood & Gore",
L"Never move my Mouse",
L"Old selection Method",
L"Never Move my Mouse",
L"Old Selection Method",
L"Show Movement Path",
L"Show Misses",
L"Real Time Confirmation",
L"Display sleep/wake Notifications",
L"Display Sleep/Wake Notifications",
L"Use Metric System",
L"Merc Lights during Movement",
L"Snap Cursor to Mercs",
@@ -5155,9 +5155,9 @@ STR16 zOptionsToggleText[] =
L"Show Chance to Hit on Cursor",
L"GL Burst uses Burst Cursor",
L"Allow Enemy Taunts", // Changed from "Enemies Drop all Items" - SANDRO
L"High angle Grenade Launching",
L"High-Angle Grenade Launching",
L"Allow Real Time Sneaking", // Changed from "Restrict extra Aim Levels" - SANDRO
L"Space selects next Squad",
L"Space Selects next Squad",
L"Show Item Shadow",
L"Show Weapon Ranges in Tiles",
L"Tracer Effect for Single Shot",
@@ -5182,15 +5182,15 @@ STR16 zOptionsToggleText[] =
#ifdef ENABLE_ZOMBIES
L"Allow Zombies", // Flugente Zombies 1.0
#endif
L"Enable inventory popups", // the_bob : enable popups for picking items from sector inv
L"Enable Inventory Popups", // the_bob : enable popups for picking items from sector inv
L"Mark Remaining Hostiles",
L"Show LBE Content",
L"Invert mouse wheel",
L"Invert Mouse Wheel",
L"Formation Movement", // when multiple mercs are selected, they will try to keep their relative distances
L"--Cheat Mode Options--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"Force Bobby Ray shipments", // force all pending Bobby Ray shipments
L"Force Bobby Ray Shipments", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
L"--DEBUG OPTIONS--", // an example options screen options header (pure text)
L"Walk in formations", // when multiple mercs are selected, they will try to keep their relative distances
L"Report Miss Offsets", // Screen messages showing amount and direction of shot deviation.
L"Reset ALL game options", // failsafe show/hide option to reset all options
L"Do you really want to reset?", // a do once and reset self option (button like effect)
@@ -5233,7 +5233,7 @@ STR16 zOptionsScreenHelpText[] =
L"Turn this ON for character selection to work as in previous JAGGED ALLIANCE games (which is the opposite of how it works otherwise).",
//Show movement path
L"Turn this ON to display movement paths in Real-time (or leave it off and use the |S|H|I|F|T key when you do want them displayed).",
L"Turn this ON to display movement paths in Real-time (or leave it off and use the |S|h|i|f|t key when you do want them displayed).",
//show misses
L"Turn ON to have the game show you where your bullets ended up when you \"miss\".",
@@ -5265,49 +5265,49 @@ STR16 zOptionsScreenHelpText[] =
//toggle wireframe
L"When ON, displays |Wireframes for obscured walls.",
L"When ON, the movement cursor is shown in 3D. ( |Home )",
L"When ON, the movement cursor is shown in 3D. (|H|o|m|e)",
// Options for 1.13
L"When ON, the chance to hit is shown on the cursor.",
L"When ON, GL burst uses burst cursor.",
L"When ON, enemies will occasionally comment certain actions.", // Changed from Enemies Drop All Items - SANDRO
L"When ON, grenade launchers fire grenades at higher angles (|Q).",
L"When ON, the turn based mode will not be entered when sneaking unnoticed and seeing an enemy unless pressing |C|t|r+|X.", // Changed from Restrict Extra Aim Levels - SANDRO
L"When ON, grenade launchers fire grenades at higher angles. (|Q)",
L"When ON, will not enter turn-based mode when sneaking unnoticed and seeing an enemy unless |C|t|r|l+|X is pressed. (|C|t|r|l+|S|h|i|f|t+|X)", // Changed from Restrict Extra Aim Levels - SANDRO
L"When ON, |S|p|a|c|e selects next squad automatically.",
L"When ON, item shadows will be shown.",
L"When ON, weapon ranges will be shown in tiles.",
L"When ON, tracer effect will be shown for single shots.",
L"When ON, you will hear rain noises when it is raining.",
L"When ON, the crows are present in game.",
L"When ON, the crows will be present in game.",
L"When ON, a tooltip window is shown when pressing |A|l|t and hovering cursor over an enemy.",
L"When ON, game will be saved in 2 alternate save slots after each player's turn.",
L"When ON, Skyrider will not talk anymore.",
L"When ON, enhanced descriptions will be shown for items and weapons.",
L"When ON and enemy present, turn base mode persists untill sector is free (|C|t|r|l+|S|h|i|f|t+|A|l|t+|T).", // add forced turn mode
L"When ON and enemy present, turn base mode persists untill sector is free. (|C|t|r|l+|S|h|i|f|t+|A|l|t+|T)", // add forced turn mode
L"When ON, shows character progress towards gaining levels.",
L"When ON, the strategic map will be colored differently based on exploration.",
L"When ON, alternate bullet graphics will be shown when you shoot.",
L"When ON, ranks will be displayed before merc names in the strategic view.",
L"When ON, you will see the equipped face gear on the merc portraits.",
L"When ON, you will see icons for the equipped face gear on the merc portraits in the lower right corner.",
L"When ON, the cursor will not toggle between exchange position and other actions. Press |x to initiate quick exchange.",
L"When ON, equipped face gear will be shown on the merc portraits.",
L"When ON, icons for the equipped face gear will be shown on the merc portraits in the lower right corner.",
L"When ON, the cursor will not toggle between exchange position and other actions. Press |X to initiate quick exchange.",
L"When ON, mercs will not report progress during training.",
L"When ON, mercs will not report progress during repairing.",
L"When ON, mercs will not report progress during doctoring.",
L"When ON, AI turns will be much faster.",
#ifdef ENABLE_ZOMBIES
L"When ON, zombies will spawn. Be aware!", // allow zombies
L"When ON, zombies will spawn. Beware!", // allow zombies
#endif
L"When ON, enables popup boxes that appear when you left click on empty merc inventory slots while viewing sector inventory in mapscreen.",
L"When ON, approximate locations of the last enemies in the sector are highlighted.",
L"When ON, show the contents of an LBE item, otherwise show the regular NAS interface.",
L"When ON, enables popup boxes that appear when left-click on empty merc inventory slots in mapscreen sector inventory.",
L"When ON, approximate locations of the last enemies in the sector will be highlighted.",
L"When ON, will show the contents of an LBE item; otherwise, regular NAS interface will be shown.",
L"When ON, inverts mouse wheel directions.",
L"When multiple mercs are selected, they will try to keep their relative distances while moving. (|C|t|r|l+|S|h|i|f|t+|G)",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
L"Force all pending Bobby Ray shipments",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",
L"(text not rendered)TOPTION_DEBUG_MODE_OPTIONS_HEADER", // an example options screen options header (pure text)
L"When multiple mercs are selected, they will try to keep their relative distances",
L"|H|A|M |4 |D|e|b|u|g: When ON, will report the distance each bullet deviates from the\ncenter of the target, taking all NCTH factors into account.",
L"Click me to fix corrupt game settings", // failsafe show/hide option to reset all options
L"Click me to fix corrupt game settings", // a do once and reset self option (button like effect)
@@ -5728,8 +5728,8 @@ STR16 pMessageStrings[] =
// Lock / release mouse in windowed mode (window boundary)
L"Locking mouse cursor to stay within window boundary.", // 104
L"Releasing mouse cursor to move outside window boundary.", // 105
L"Mercenaries walk in formations",
L"Mercenaries stop walking in formations",
L"Mercs will move in formation",
L"Mercs will gather at destination",
};