From c2c598e4c2e5c65e1d67406983e2f7cfacf76c1d Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Thu, 13 Mar 2025 16:25:25 +0100 Subject: [PATCH] Add new window titles and tooltips --- data/language/en-GB.txt | 22 ++++++++----------- src/openrct2-ui/UiStringIds.h | 16 ++++++++------ .../windows/EditorScenarioOptions.cpp | 18 +++++++-------- 3 files changed, 27 insertions(+), 29 deletions(-) diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index 8fda3ff305..e0b74bdbc7 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -2236,12 +2236,10 @@ STR_3228 :Set starting positions for people STR_3229 :Block Brakes cannot be used directly after station STR_3230 :Block Brakes cannot be used directly after each other STR_3231 :Block Brakes cannot be used directly after the top of this lift hill -STR_3232 :Options - Financial -STR_3233 :Options - Guests -STR_3234 :Options - Park +STR_3232 :Scenario options - Financial +STR_3233 :Scenario options - Guests STR_3235 :Show financial options STR_3236 :Show guest options -STR_3237 :Show park options STR_3238 :No Money STR_3239 :Make this park a ‘no money’ park with no financial restrictions STR_3240 :{WINDOW_COLOUR_2}Initial cash: @@ -2282,18 +2280,10 @@ STR_3278 :{WINDOW_COLOUR_2}Cost to buy construction rights: STR_3279 :Free park entry / Pay per ride STR_3280 :Pay to enter park / Free rides STR_3281 :{WINDOW_COLOUR_2}Entry price: -STR_3282 :Select objective and park name STR_3283 :Select rides to be preserved -STR_3284 :Objective Selection -STR_3285 :Preserved Rides +STR_3285 :Scenario options - Preserved Rides STR_3286 :Select objective for this scenario STR_3287 :{WINDOW_COLOUR_2}Objective: -STR_3288 :Select climate -STR_3289 :{WINDOW_COLOUR_2}Climate: -STR_3290 :Cool and wet -STR_3291 :Warm -STR_3292 :Hot and dry -STR_3293 :Cold STR_3294 :Change… STR_3295 :Change name of park STR_3296 :Change name of scenario @@ -3806,3 +3796,9 @@ STR_6748 :Only less intense rides STR_6749 :Only more intense rides STR_6750 :Select what kind of ride intensity newly spawned guests prefer. STR_6751 :Queue paths cannot be used for level crossings! +STR_6752 :Scenario options - Objective +STR_6753 :Scenario options - Scenario Details +STR_6754 :Scenario options - Land Restrictions +STR_6755 :Show objective options +STR_6756 :Show scenario details options +STR_6757 :Show land restriction options diff --git a/src/openrct2-ui/UiStringIds.h b/src/openrct2-ui/UiStringIds.h index 681844dd29..9dc207ec48 100644 --- a/src/openrct2-ui/UiStringIds.h +++ b/src/openrct2-ui/UiStringIds.h @@ -579,8 +579,7 @@ namespace OpenRCT2 STR_OBJECTIVE_DROPDOWN_NUMBER_OF_GUESTS_IN_PARK = STR_OBJECTIVE_DROPDOWN_NONE + 6, STR_OBJECTIVE_DROPDOWN_PARK_VALUE_AT_A_GIVEN_DATE = STR_OBJECTIVE_DROPDOWN_NONE + 2, STR_OBJECTIVE_DROPDOWN_REPAY_LOAN_AND_ACHIEVE_A_GIVEN_PARK_VALUE = STR_OBJECTIVE_DROPDOWN_NONE + 10, - STR_OBJECTIVE_SELECTION = 3284, - STR_OBJECTIVE_WINDOW = 3287, + STR_OBJECTIVE_DROPDOWN_LABEL = 3287, STR_PAID_ENTRY_PAID_RIDES = 6153, STR_PARK_SCENARIO_DETAILS = 3315, STR_PAY_FOR_PARK_PAY_FOR_RIDES_TIP = 3266, @@ -594,12 +593,15 @@ namespace OpenRCT2 STR_SCENARIO_OPTIONS_FINANCIAL_TIP = 3235, STR_SCENARIO_OPTIONS_GUESTS = 3233, STR_SCENARIO_OPTIONS_GUESTS_TIP = 3236, - STR_SCENARIO_OPTIONS_PARK = 3234, - STR_SCENARIO_OPTIONS_PARK_TIP = 3237, - STR_SELECT_CLIMATE_TIP = 3288, - STR_SELECT_OBJECTIVE_AND_PARK_NAME_TIP = 3282, + STR_SCENARIO_OPTIONS_LAND_RESTRICTIONS = 6754, + STR_SCENARIO_OPTIONS_LAND_RESTRICTIONS_TIP = 6757, + STR_SCENARIO_OPTIONS_OBJECTIVE = 6752, + STR_SCENARIO_OPTIONS_OBJECTIVE_TIP = 6755, + STR_SCENARIO_OPTIONS_PRESERVED_RIDES = 3285, + STR_SCENARIO_OPTIONS_PRESERVED_RIDES_TIP = 3285, + STR_SCENARIO_OPTIONS_SCENARIO_DETAILS = 6753, + STR_SCENARIO_OPTIONS_SCENARIO_DETAILS_TIP = 6756, STR_SELECT_OBJECTIVE_FOR_THIS_SCENARIO_TIP = 3286, - STR_SELECT_RIDES_TO_BE_PRESERVED_TIP = 3283, STR_SELECT_WHICH_GROUP_THIS_SCENARIO_APPEARS_IN = 3318, STR_WINDOW_COLOUR_2_LENGTH = 3310, STR_WINDOW_OBJECTIVE_DATE = 3301, diff --git a/src/openrct2-ui/windows/EditorScenarioOptions.cpp b/src/openrct2-ui/windows/EditorScenarioOptions.cpp index 5e49692f3b..60239e5b90 100644 --- a/src/openrct2-ui/windows/EditorScenarioOptions.cpp +++ b/src/openrct2-ui/windows/EditorScenarioOptions.cpp @@ -196,15 +196,15 @@ namespace OpenRCT2::Ui::Windows #define MAIN_OPTIONS_WIDGETS(TITLE, WIDTH, HEIGHT) \ WINDOW_SHIM(TITLE, WIDTH, HEIGHT), \ MakeWidget({ 0, 43}, { WIDTH, 106 }, WindowWidgetType::Resize, WindowColour::Secondary), \ - MakeTab ({ 3, 17}, STR_SELECT_OBJECTIVE_AND_PARK_NAME_TIP ), \ - MakeTab ({ 34, 17}, STR_SELECT_OBJECTIVE_AND_PARK_NAME_TIP ), \ + MakeTab ({ 3, 17}, STR_SCENARIO_OPTIONS_OBJECTIVE_TIP ), \ + MakeTab ({ 34, 17}, STR_SCENARIO_OPTIONS_SCENARIO_DETAILS_TIP ), \ MakeTab ({ 65, 17}, STR_SCENARIO_OPTIONS_FINANCIAL_TIP ), \ MakeTab ({ 96, 17}, STR_SCENARIO_OPTIONS_GUESTS_TIP ), \ - MakeTab ({127, 17}, STR_SCENARIO_OPTIONS_PARK_TIP ), \ - MakeTab ({158, 17}, STR_SELECT_RIDES_TO_BE_PRESERVED_TIP ) + MakeTab ({127, 17}, STR_SCENARIO_OPTIONS_LAND_RESTRICTIONS_TIP ), \ + MakeTab ({158, 17}, STR_SCENARIO_OPTIONS_PRESERVED_RIDES_TIP ) static constexpr Widget window_editor_scenario_options_objective_widgets[] = { - MAIN_OPTIONS_WIDGETS(STR_OBJECTIVE_SELECTION, WW_OBJECTIVE, WH_OBJECTIVE), + MAIN_OPTIONS_WIDGETS(STR_SCENARIO_OPTIONS_OBJECTIVE, WW_OBJECTIVE, WH_OBJECTIVE), MakeWidget ({ 98, 48}, {344, 12}, WindowWidgetType::DropdownMenu, WindowColour::Secondary, kStringIdNone, STR_SELECT_OBJECTIVE_FOR_THIS_SCENARIO_TIP ), MakeWidget ({430, 49}, { 11, 10}, WindowWidgetType::Button, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_SELECT_OBJECTIVE_FOR_THIS_SCENARIO_TIP ), MakeSpinnerWidgets({158, 65}, {120, 12}, WindowWidgetType::Button, WindowColour::Secondary ), // NB: 3 widgets @@ -212,7 +212,7 @@ namespace OpenRCT2::Ui::Windows }; static constexpr Widget window_editor_scenario_options_scenario_details_widgets[] = { - MAIN_OPTIONS_WIDGETS(STR_OBJECTIVE_SELECTION, WW_SCENARIO_DETAILS, WH_SCENARIO_DETAILS), + MAIN_OPTIONS_WIDGETS(STR_SCENARIO_OPTIONS_SCENARIO_DETAILS, WW_SCENARIO_DETAILS, WH_SCENARIO_DETAILS), MakeWidget ({370, 48}, { 75, 12}, WindowWidgetType::Button, WindowColour::Secondary, STR_CHANGE, STR_CHANGE_NAME_OF_PARK_TIP ), MakeWidget ({370, 65}, { 75, 12}, WindowWidgetType::Button, WindowColour::Secondary, STR_CHANGE, STR_CHANGE_NAME_OF_SCENARIO_TIP ), MakeWidget ({ 98, 82}, {180, 12}, WindowWidgetType::DropdownMenu, WindowColour::Secondary, kStringIdNone, STR_SELECT_WHICH_GROUP_THIS_SCENARIO_APPEARS_IN), @@ -248,7 +248,7 @@ namespace OpenRCT2::Ui::Windows }; static constexpr Widget window_editor_scenario_options_park_widgets[] = { - MAIN_OPTIONS_WIDGETS(STR_SCENARIO_OPTIONS_PARK, WW_PARK, WH_PARK), + MAIN_OPTIONS_WIDGETS(STR_SCENARIO_OPTIONS_LAND_RESTRICTIONS, WW_PARK, WH_PARK), MakeSpinnerWidgets({188, 48}, { 70, 12}, WindowWidgetType::Spinner, WindowColour::Secondary ), // NB: 3 widgets MakeSpinnerWidgets({188, 65}, { 70, 12}, WindowWidgetType::Spinner, WindowColour::Secondary ), // NB: 3 widgets MakeWidget ({ 8, 82}, {WW_PARK - 16, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_FORBID_TREE_REMOVAL, STR_FORBID_TREE_REMOVAL_TIP ), @@ -257,7 +257,7 @@ namespace OpenRCT2::Ui::Windows }; static constexpr Widget window_editor_scenario_options_rides_widgets[] = { - MAIN_OPTIONS_WIDGETS(STR_OBJECTIVE_SELECTION, WW_OBJECTIVE, WH_OBJECTIVE), + MAIN_OPTIONS_WIDGETS(STR_SCENARIO_OPTIONS_PRESERVED_RIDES, WW_OBJECTIVE, WH_OBJECTIVE), MakeWidget({ 3, 60}, {374, 161}, WindowWidgetType::Scroll, WindowColour::Secondary, SCROLL_VERTICAL), }; @@ -1020,7 +1020,7 @@ namespace OpenRCT2::Ui::Windows // Objective label auto screenCoords = windowPos + ScreenCoordsXY{ 8, widgets[WIDX_OBJECTIVE].top }; - DrawTextBasic(dpi, screenCoords, STR_OBJECTIVE_WINDOW); + DrawTextBasic(dpi, screenCoords, STR_OBJECTIVE_DROPDOWN_LABEL); // Objective value screenCoords = windowPos + ScreenCoordsXY{ widgets[WIDX_OBJECTIVE].left + 1, widgets[WIDX_OBJECTIVE].top };