Skip to content

Commit 9630880

Browse files
SupSuperSupSuper
committed
Cleaning up Options text.
1 parent 4de3506 commit 9630880

3 files changed

Lines changed: 36 additions & 32 deletions

File tree

‎bin/data/Language/en-GB.yml‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1123,29 +1123,31 @@ en-GB:
11231123
STR_ALLOWAUTOSELLPRODUCTION: "Manufacture auto-sale"
11241124
STR_ALLOWAUTOSELLPRODUCTION_DESC: "Right-click the increase button on a manufacturing project's \"total to produce\" to auto-sell."
11251125
STR_ALLOWBUILDINGQUEUE: "Allow building queue"
1126-
STR_ALLOWBUILDINGQUEUE_DESC: "Unfinished facilities act as links to the access lift when new facilities are placed."
1126+
STR_ALLOWBUILDINGQUEUE_DESC: "New facilities can be placed next to unfinished ones."
11271127
STR_BATTLEAUTOEND: "Auto-end battle"
11281128
STR_BATTLEAUTOEND_DESC: "Battles automatically end when the last living enemy is neutralized."
11291129
STR_BATTLEINSTANTGRENADE: "Instant grenades"
11301130
STR_BATTLEINSTANTGRENADE_DESC: "Grenades primed to go off in 0 turns will explode immediately when thrown, instead of at the end of the turn."
11311131
STR_BATTLEUFOEXTENDERACCURACY: "UFO Extender accuracy"
11321132
STR_BATTLEUFOEXTENDERACCURACY_DESC: "Accuracy of shots drops off after a certain distance, according to shot type. Adjusted accuracy will be displayed on the cursor."
1133-
STR_CANMANUFACTUREMOREITEMSPERHOUR: "Sub-hour manufacture"
1134-
STR_CANMANUFACTUREMOREITEMSPERHOUR_DESC: "Allows manufacturing projects to produce more than one item per hour, like in Terror From The Deep."
1133+
STR_CANMANUFACTUREMOREITEMSPERHOUR: "TFTD manufacture rules"
1134+
STR_CANMANUFACTUREMOREITEMSPERHOUR_DESC: "Allows manufacturing projects to produce multiple items per hour, as opposed to X-COM: UFO Defense's one item limit."
11351135
STR_CANTRANSFERCRAFTSWHILEAIRBORNE: "Airborne transfers"
1136-
STR_CANTRANSFERCRAFTSWHILEAIRBORNE_DESC: "Aircraft currently in-flight can be transferred."
1137-
STR_CRAFTLAUNCHALWAYS: "Force aircraft launch"
1138-
STR_CRAFTLAUNCHALWAYS_DESC: "You may force your aircraft into flight, overriding the need to completely refuel and rearm."
1136+
STR_CANTRANSFERCRAFTSWHILEAIRBORNE_DESC: "Craft currently in-flight can be transferred."
1137+
STR_CRAFTLAUNCHALWAYS: "Force craft launch"
1138+
STR_CRAFTLAUNCHALWAYS_DESC: "Craft can be launched even when they aren't ready, overriding the need for maintenance."
11391139
STR_CUSTOMINITIALBASE: "Custom initial base"
11401140
STR_CUSTOMINITIALBASE_DESC: "When starting a new game, you can manually place your starting facilities instead of using the default layout."
1141+
STR_GLOBESEASONS: "Globe realistic lighting"
1142+
STR_GLOBESEASONS_DESC: "Uses more realistic projection of sunlight on the Geoscape according to Earth's axial tilt."
11411143
STR_PLAYINTRO: "Play intro"
11421144
STR_PLAYINTRO_DESC: "Show the intro cinematic on startup."
1143-
STR_SHOWMORESTATSININVENTORYVIEW: "Inventory stats"
1145+
STR_SHOWMORESTATSININVENTORYVIEW: "Inventory extra stats"
11441146
STR_SHOWMORESTATSININVENTORYVIEW_DESC: "Show extra information on the selected soldier in the inventory screen."
11451147
STR_SNEAKYAI: "Sneaky AI"
11461148
STR_SNEAKYAI_DESC: "AI avoids exposing themselves to the player whenever possible."
1147-
STR_STRAFE: "Strafe setting"
1148-
STR_STRAFE_DESC: "Enable strafing, running, and independent tank turret movement. Hold CTRL to use alternate movement methods."
1149+
STR_STRAFE: "Alternate movement methods"
1150+
STR_STRAFE_DESC: "Enables strafing, running, and independent tank turret movement when holding CTRL."
11491151
STR_BATTLEEXPLOSIONHEIGHT: "Explosion height"
11501152
STR_BATTLEEXPLOSIONHEIGHT_DESC: "Change how far height-wise explosions may spread.{NEWLINE}(Flat: 0, Round: 3)"
11511153
STR_AUTOSAVE: "Autosave mode"
@@ -1159,8 +1161,8 @@ en-GB:
11591161
STR_NOT_ENOUGH_SPACE: "Not Enough Space!"
11601162
STR_WEAPONSELFDESTRUCTION: "Alien weapon self destruction"
11611163
STR_WEAPONSELFDESTRUCTION_DESC: "Weapons carried by aliens will self destruct if their owner is killed, like in XCOM 2012."
1162-
STR_SPENDRESEARCHEDITEMS: "Spend Researched items"
1163-
STR_SPENDRESEARCHEDITEMS_DESC: "Researched items are removed from your stores and will be disassembled, like in XCOM 2012. After \"researching\" living aliens, the body will be returned to the base stores."
1164+
STR_SPENDRESEARCHEDITEMS: "Spend researched items"
1165+
STR_SPENDRESEARCHEDITEMS_DESC: "Researched items are disassembled and removed from your stores, like in XCOM 2012. After \"researching\" living aliens, the body will be returned to the base stores."
11641166
STR_SAVE_VOXEL_VIEW: "Save First-Person Screenshot"
11651167
STR_TIME_UNITS_RESERVED_FOR_KNEELING: "Time Units reserved for Kneeling"
11661168
STR_TIME_UNITS_RESERVED_FOR_KNEELING_AND_FIRING: "TUs reserved for Kneeling and Firing"
@@ -1251,7 +1253,7 @@ en-GB:
12511253
STR_GLOBE_FLIGHT_PATHS: "Flight Paths"
12521254
STR_GLOBE_FLIGHT_PATHS_DESC: "Shows craft flight paths on the globe."
12531255
STR_CONTROLS_DESC: "Left-click a shortcut and press a key to change it.{NEWLINE}Right-click a shortcut to disable it."
1254-
STR_MODS_DESC: "NOTE: Enabled mods immediately take effect on every game played. Be careful when changing mods of existing savegames, as missing content may cause instability and crashes."
1256+
STR_MODS_DESC: "Changing mods will trigger a game restart. Enabled mods automatically take effect on every new and old game."
12551257
STR_EDGE_SCROLL: "Edge Scroll"
12561258
STR_EDGE_SCROLL_DESC: "Trigger: Scroll map when the left mouse button is held down on a screen edge.{NEWLINE}Auto: Scroll map when the cursor is over a screen edge."
12571259
STR_TRIGGER_SCROLL: "Trigger"
@@ -1300,10 +1302,10 @@ en-GB:
13001302
STR_DISPLAY_OPTIONS_CONFIRM: "Do you want to keep the current display options?"
13011303
STR_DISPLAY_OPTIONS_REVERT: "Reverting in 0:{0}"
13021304
STR_MISSING_CONTENT_PROMPT: "WARNING:{SMALLLINE}This save relies on mods that are unavailable. Missing content will be removed, and it may fail to load.{NEWLINE}Continue?"
1303-
STR_INCLUDE_PRIMESTATE_IN_SAVED_LAYOUT: "Include prime-state in the saved equipment-layout"
1304-
STR_INCLUDE_PRIMESTATE_IN_SAVED_LAYOUT_DESC: "Save and load back the prime-states of the grenades in the equipment-layouts along with the items."
1305+
STR_INCLUDE_PRIMESTATE_IN_SAVED_LAYOUT: "Save pre-primed grenades"
1306+
STR_INCLUDE_PRIMESTATE_IN_SAVED_LAYOUT_DESC: "Saves grenades primed during pre-battle inventory in the soldier's equipment layout."
13051307
STR_NEWSEEDONLOAD: "Save scumming"
1306-
STR_NEWSEEDONLOAD_DESC: "Loading a game will reset the random number seed, so taking the same action can yield different results."
1308+
STR_NEWSEEDONLOAD_DESC: "Loading a game will reset the random number seed, so taking the same action can yield different results. Doesn't affect Ironman Mode."
13071309
STR_CHANGEVALUEBYMOUSEWHEEL: "Change values with mouse wheel"
13081310
STR_CHANGEVALUEBYMOUSEWHEEL_DESC: "Allows you to use the mouse wheel to increase/decrease values by this amount."
13091311
STR_BATTLEHAIRBLEACH: "Enhanced soldier sprites"

‎bin/data/Language/en-US.yml‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1123,29 +1123,31 @@ en-US:
11231123
STR_ALLOWAUTOSELLPRODUCTION: "Manufacture auto-sale"
11241124
STR_ALLOWAUTOSELLPRODUCTION_DESC: "Right-click the increase button on a manufacturing project's \"total to produce\" to auto-sell."
11251125
STR_ALLOWBUILDINGQUEUE: "Allow building queue"
1126-
STR_ALLOWBUILDINGQUEUE_DESC: "Unfinished facilities act as links to the access lift when new facilities are placed."
1126+
STR_ALLOWBUILDINGQUEUE_DESC: "New facilities can be placed next to unfinished ones."
11271127
STR_BATTLEAUTOEND: "Auto-end battle"
11281128
STR_BATTLEAUTOEND_DESC: "Battles automatically end when the last living enemy is neutralized."
11291129
STR_BATTLEINSTANTGRENADE: "Instant grenades"
11301130
STR_BATTLEINSTANTGRENADE_DESC: "Grenades primed to go off in 0 turns will explode immediately when thrown, instead of at the end of the turn."
11311131
STR_BATTLEUFOEXTENDERACCURACY: "UFO Extender accuracy"
11321132
STR_BATTLEUFOEXTENDERACCURACY_DESC: "Accuracy of shots drops off after a certain distance, according to shot type. Adjusted accuracy will be displayed on the cursor."
1133-
STR_CANMANUFACTUREMOREITEMSPERHOUR: "Sub-hour manufacture"
1134-
STR_CANMANUFACTUREMOREITEMSPERHOUR_DESC: "Allows manufacturing projects to produce more than one item per hour, like in Terror From The Deep."
1133+
STR_CANMANUFACTUREMOREITEMSPERHOUR: "TFTD manufacture rules"
1134+
STR_CANMANUFACTUREMOREITEMSPERHOUR_DESC: "Allows manufacturing projects to produce multiple items per hour, as opposed to X-COM: UFO Defense's one item limit."
11351135
STR_CANTRANSFERCRAFTSWHILEAIRBORNE: "Airborne transfers"
1136-
STR_CANTRANSFERCRAFTSWHILEAIRBORNE_DESC: "Aircraft currently in-flight can be transferred."
1137-
STR_CRAFTLAUNCHALWAYS: "Force aircraft launch"
1138-
STR_CRAFTLAUNCHALWAYS_DESC: "You may force your aircraft into flight, overriding the need to completely refuel and rearm."
1136+
STR_CANTRANSFERCRAFTSWHILEAIRBORNE_DESC: "Craft currently in-flight can be transferred."
1137+
STR_CRAFTLAUNCHALWAYS: "Force craft launch"
1138+
STR_CRAFTLAUNCHALWAYS_DESC: "Craft can be launched even when they aren't ready, overriding the need for maintenance."
11391139
STR_CUSTOMINITIALBASE: "Custom initial base"
11401140
STR_CUSTOMINITIALBASE_DESC: "When starting a new game, you can manually place your starting facilities instead of using the default layout."
1141+
STR_GLOBESEASONS: "Globe realistic lighting"
1142+
STR_GLOBESEASONS_DESC: "Uses more realistic projection of sunlight on the Geoscape according to Earth's axial tilt."
11411143
STR_PLAYINTRO: "Play intro"
11421144
STR_PLAYINTRO_DESC: "Show the intro cinematic on startup."
1143-
STR_SHOWMORESTATSININVENTORYVIEW: "Inventory stats"
1145+
STR_SHOWMORESTATSININVENTORYVIEW: "Inventory extra stats"
11441146
STR_SHOWMORESTATSININVENTORYVIEW_DESC: "Show extra information on the selected soldier in the inventory screen."
11451147
STR_SNEAKYAI: "Sneaky AI"
11461148
STR_SNEAKYAI_DESC: "AI avoids exposing themselves to the player whenever possible."
1147-
STR_STRAFE: "Strafe setting"
1148-
STR_STRAFE_DESC: "Enable strafing, running, and independent tank turret movement. Hold CTRL to use alternate movement methods."
1149+
STR_STRAFE: "Alternate movement methods"
1150+
STR_STRAFE_DESC: "Enables strafing, running, and independent tank turret movement when holding CTRL."
11491151
STR_BATTLEEXPLOSIONHEIGHT: "Explosion height"
11501152
STR_BATTLEEXPLOSIONHEIGHT_DESC: "Change how far height-wise explosions may spread.{NEWLINE}(Flat: 0, Round: 3)"
11511153
STR_AUTOSAVE: "Autosave mode"
@@ -1159,8 +1161,8 @@ en-US:
11591161
STR_NOT_ENOUGH_SPACE: "Not Enough Space!"
11601162
STR_WEAPONSELFDESTRUCTION: "Alien weapon self destruction"
11611163
STR_WEAPONSELFDESTRUCTION_DESC: "Weapons carried by aliens will self destruct if their owner is killed, like in XCOM 2012."
1162-
STR_SPENDRESEARCHEDITEMS: "Spend Researched items"
1163-
STR_SPENDRESEARCHEDITEMS_DESC: "Researched items are removed from your stores and will be disassembled, like in XCOM 2012. After \"researching\" living aliens, the body will be returned to the base stores."
1164+
STR_SPENDRESEARCHEDITEMS: "Spend researched items"
1165+
STR_SPENDRESEARCHEDITEMS_DESC: "Researched items are disassembled and removed from your stores, like in XCOM 2012. After \"researching\" living aliens, the body will be returned to the base stores."
11641166
STR_SAVE_VOXEL_VIEW: "Save First-Person Screenshot"
11651167
STR_TIME_UNITS_RESERVED_FOR_KNEELING: "Time Units reserved for Kneeling"
11661168
STR_TIME_UNITS_RESERVED_FOR_KNEELING_AND_FIRING: "TUs reserved for Kneeling and Firing"
@@ -1251,7 +1253,7 @@ en-US:
12511253
STR_GLOBE_FLIGHT_PATHS: "Flight Paths"
12521254
STR_GLOBE_FLIGHT_PATHS_DESC: "Shows craft flight paths on the globe."
12531255
STR_CONTROLS_DESC: "Left-click a shortcut and press a key to change it.{NEWLINE}Right-click a shortcut to disable it."
1254-
STR_MODS_DESC: "NOTE: Enabled mods immediately take effect on every game played. Be careful when changing mods of existing savegames, as missing content may cause instability and crashes."
1256+
STR_MODS_DESC: "Changing mods will trigger a game restart. Enabled mods automatically take effect on every new and old game."
12551257
STR_EDGE_SCROLL: "Edge Scroll"
12561258
STR_EDGE_SCROLL_DESC: "Trigger: Scroll map when the left mouse button is held down on a screen edge.{NEWLINE}Auto: Scroll map when the cursor is over a screen edge."
12571259
STR_TRIGGER_SCROLL: "Trigger"
@@ -1300,10 +1302,10 @@ en-US:
13001302
STR_DISPLAY_OPTIONS_CONFIRM: "Do you want to keep the current display options?"
13011303
STR_DISPLAY_OPTIONS_REVERT: "Reverting in 0:{0}"
13021304
STR_MISSING_CONTENT_PROMPT: "WARNING:{SMALLLINE}This save relies on mods that are unavailable. Missing content will be removed, and it may fail to load.{NEWLINE}Continue?"
1303-
STR_INCLUDE_PRIMESTATE_IN_SAVED_LAYOUT: "Include prime-state in the saved equipment-layout"
1304-
STR_INCLUDE_PRIMESTATE_IN_SAVED_LAYOUT_DESC: "Save and load back the prime-states of the grenades in the equipment-layouts along with the items."
1305+
STR_INCLUDE_PRIMESTATE_IN_SAVED_LAYOUT: "Save pre-primed grenades"
1306+
STR_INCLUDE_PRIMESTATE_IN_SAVED_LAYOUT_DESC: "Saves grenades primed during pre-battle inventory in the soldier's equipment layout."
13051307
STR_NEWSEEDONLOAD: "Save scumming"
1306-
STR_NEWSEEDONLOAD_DESC: "Loading a game will reset the random number seed, so taking the same action can yield different results."
1308+
STR_NEWSEEDONLOAD_DESC: "Loading a game will reset the random number seed, so taking the same action can yield different results. Doesn't affect Ironman Mode."
13071309
STR_CHANGEVALUEBYMOUSEWHEEL: "Change values with mouse wheel"
13081310
STR_CHANGEVALUEBYMOUSEWHEEL_DESC: "Allows you to use the mouse wheel to increase/decrease values by this amount."
13091311
STR_BATTLEHAIRBLEACH: "Enhanced soldier sprites"

‎src/Engine/Options.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ void create()
102102
_info.push_back(OptionInfo("battleAlienSpeed", &battleAlienSpeed, 30));
103103
_info.push_back(OptionInfo("battleNewPreviewPath", (int*)&battleNewPreviewPath, PATH_NONE)); // requires double-click to confirm moves
104104
_info.push_back(OptionInfo("fpsCounter", &fpsCounter, false));
105-
_info.push_back(OptionInfo("globeSeasons", &globeSeasons, false));
106105
_info.push_back(OptionInfo("globeDetail", &globeDetail, true));
107106
_info.push_back(OptionInfo("globeRadarLines", &globeRadarLines, true));
108107
_info.push_back(OptionInfo("globeFlightPaths", &globeFlightPaths, true));
@@ -129,7 +128,6 @@ void create()
129128
_info.push_back(OptionInfo("globeScrollDragButton", &globeScrollDragButton, SDL_BUTTON_MIDDLE));
130129

131130
// advanced options
132-
_info.push_back(OptionInfo("includePrimeStateInSavedLayout", &includePrimeStateInSavedLayout, false, "STR_INCLUDE_PRIMESTATE_IN_SAVED_LAYOUT", "STR_BATTLESCAPE"));
133131
_info.push_back(OptionInfo("playIntro", &playIntro, true, "STR_PLAYINTRO", "STR_GENERAL"));
134132
_info.push_back(OptionInfo("autosave", &autosave, 0, "STR_AUTOSAVE", "STR_GENERAL"));
135133
_info.push_back(OptionInfo("newSeedOnLoad", &newSeedOnLoad, false, "STR_NEWSEEDONLOAD", "STR_GENERAL"));
@@ -144,6 +142,7 @@ void create()
144142
_info.push_back(OptionInfo("alienContainmentLimitEnforced", &alienContainmentLimitEnforced, false, "STR_ALIENCONTAINMENTLIMITENFORCED", "STR_GEOSCAPE"));
145143
_info.push_back(OptionInfo("canSellLiveAliens", &canSellLiveAliens, false, "STR_CANSELLLIVEALIENS", "STR_GEOSCAPE"));
146144
_info.push_back(OptionInfo("anytimePsiTraining", &anytimePsiTraining, false, "STR_ANYTIMEPSITRAINING", "STR_GEOSCAPE"));
145+
_info.push_back(OptionInfo("globeSeasons", &globeSeasons, false, "STR_GLOBESEASONS", "STR_GEOSCAPE"));
147146
_info.push_back(OptionInfo("psiStrengthEval", &psiStrengthEval, false, "STR_PSISTRENGTHEVAL", "STR_GEOSCAPE"));
148147
_info.push_back(OptionInfo("canTransferCraftsWhileAirborne", &canTransferCraftsWhileAirborne, false, "STR_CANTRANSFERCRAFTSWHILEAIRBORNE", "STR_GEOSCAPE")); // When the craft can reach the destination base with its fuel
149148
_info.push_back(OptionInfo("canManufactureMoreItemsPerHour", &canManufactureMoreItemsPerHour, false, "STR_CANMANUFACTUREMOREITEMSPERHOUR", "STR_GEOSCAPE"));
@@ -154,6 +153,7 @@ void create()
154153
_info.push_back(OptionInfo("showMoreStatsInInventoryView", &showMoreStatsInInventoryView, false, "STR_SHOWMORESTATSININVENTORYVIEW", "STR_BATTLESCAPE"));
155154
_info.push_back(OptionInfo("battleHairBleach", &battleHairBleach, true, "STR_BATTLEHAIRBLEACH", "STR_BATTLESCAPE"));
156155
_info.push_back(OptionInfo("battleInstantGrenade", &battleInstantGrenade, false, "STR_BATTLEINSTANTGRENADE", "STR_BATTLESCAPE"));
156+
_info.push_back(OptionInfo("includePrimeStateInSavedLayout", &includePrimeStateInSavedLayout, false, "STR_INCLUDE_PRIMESTATE_IN_SAVED_LAYOUT", "STR_BATTLESCAPE"));
157157
_info.push_back(OptionInfo("battleExplosionHeight", &battleExplosionHeight, 0, "STR_BATTLEEXPLOSIONHEIGHT", "STR_BATTLESCAPE"));
158158
_info.push_back(OptionInfo("battleAutoEnd", &battleAutoEnd, false, "STR_BATTLEAUTOEND", "STR_BATTLESCAPE"));
159159
_info.push_back(OptionInfo("battleSmoothCamera", &battleSmoothCamera, false, "STR_BATTLESMOOTHCAMERA", "STR_BATTLESCAPE"));

0 commit comments

Comments
 (0)