diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index ac017e7b0d..e48cf5065f 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -2201,7 +2201,7 @@ STR_3188 :Path Signs STR_3189 :Legacy footpaths STR_3190 :Path Extras STR_3191 :Scenery Groups -STR_3192 :Park Entrance +STR_3192 :Park Entrances STR_3193 :Water STR_3195 :Invention List STR_3196 :{WINDOW_COLOUR_2}Research Group: {BLACK}{STRINGID} @@ -3787,3 +3787,4 @@ STR_6720 :At least one handyman peep animations object must be selected STR_6721 :At least one mechanic peep animations object must be selected STR_6722 :At least one security peep animations object must be selected STR_6723 :At least one entertainer peep animations object must be selected +STR_6724 :Scenario Texts diff --git a/src/openrct2-ui/UiStringIds.h b/src/openrct2-ui/UiStringIds.h index 46eb01e308..5ce128929e 100644 --- a/src/openrct2-ui/UiStringIds.h +++ b/src/openrct2-ui/UiStringIds.h @@ -509,24 +509,8 @@ namespace OpenRCT2 STR_OBJECT_SELECTION_ALL_SOURCES_SHOWN = 6653, STR_OBJECT_SELECTION_COMPAT_OBJECT_DESCRIPTION = 6550, STR_OBJECT_SELECTION_FALLBACK_IMAGES_WARNING = 6516, - STR_OBJECT_SELECTION_FOOTPATHS = 3189, - STR_OBJECT_SELECTION_FOOTPATH_RAILINGS = 6445, - STR_OBJECT_SELECTION_FOOTPATH_SURFACES = 6444, - STR_OBJECT_SELECTION_LARGE_SCENERY = 3186, - STR_OBJECT_SELECTION_MUSIC = 6273, STR_OBJECT_SELECTION_ONLY_STRINGID = 6655, - STR_OBJECT_SELECTION_PATH_EXTRAS = 3190, - STR_OBJECT_SELECTION_PATH_SIGNS = 3188, - STR_OBJECT_SELECTION_PEEP_NAMES = 6675, - STR_OBJECT_SELECTION_RIDE_VEHICLES_ATTRACTIONS = 3184, - STR_OBJECT_SELECTION_SCENERY_GROUPS = 3191, STR_OBJECT_SELECTION_SELECTION_SIZE = 3164, - STR_OBJECT_SELECTION_SMALL_SCENERY = 3185, - STR_OBJECT_SELECTION_STATIONS = 6272, - STR_OBJECT_SELECTION_TERRAIN_EDGES = 6271, - STR_OBJECT_SELECTION_TERRAIN_SURFACES = 6270, - STR_OBJECT_SELECTION_WALLS_FENCES = 3187, - STR_OBJECT_SELECTION_WATER = 3193, STR_OBJECT_SELECTION_SHOWING_N_SOURCES = 6654, STR_OBJECT_USES_FALLBACK_IMAGES = 6515, STR_RELOAD_OBJECT_TIP = 6613, @@ -1074,7 +1058,6 @@ namespace OpenRCT2 STR_OBJECT_ERROR_WINDOW_FILE = 6127, STR_OBJECT_LOAD_ERROR_TITLE = 6123, STR_OBJECT_NAME = 6124, - STR_OBJECT_SELECTION_PARK_ENTRANCE = 3192, STR_OBJECT_SOURCE = 6131, STR_OBJECT_TYPE = 6125, diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp index 6a885d46a1..148cb79e98 100644 --- a/src/openrct2/interface/InteractiveConsole.cpp +++ b/src/openrct2/interface/InteractiveConsole.cpp @@ -45,6 +45,7 @@ #include "../interface/Colour.h" #include "../interface/Window_internal.h" #include "../localisation/Formatting.h" +#include "../localisation/StringIds.h" #include "../management/Finance.h" #include "../management/NewsItem.h" #include "../management/Research.h" @@ -1147,28 +1148,28 @@ static void ConsoleCommandLoadObject(InteractiveConsole& console, const argument } } -constexpr std::array _objectTypeNames = { - "Rides", - "Small Scenery", - "Large Scenery", - "Walls", - "Banners", - "Paths", - "Path Additions", - "Scenery groups", - "Park entrances", - "Water", - "Scenario Text", - "Terrain Surface", - "Terrain Edges", - "Stations", - "Music", - "Footpath Surface", - "Footpath Railings", - "Audio", - "Peep Names", - "Peep Animations", -}; +constexpr auto _objectTypeNames = std::to_array({ + STR_OBJECT_SELECTION_RIDE_VEHICLES_ATTRACTIONS, + STR_OBJECT_SELECTION_SMALL_SCENERY, + STR_OBJECT_SELECTION_LARGE_SCENERY, + STR_OBJECT_SELECTION_WALLS_FENCES, + STR_OBJECT_SELECTION_PATH_SIGNS, + STR_OBJECT_SELECTION_FOOTPATHS, + STR_OBJECT_SELECTION_PATH_EXTRAS, + STR_OBJECT_SELECTION_SCENERY_GROUPS, + STR_OBJECT_SELECTION_PARK_ENTRANCE, + STR_OBJECT_SELECTION_WATER, + STR_OBJECT_SELECTION_SCENARIO_TEXTS, + STR_OBJECT_SELECTION_TERRAIN_SURFACES, + STR_OBJECT_SELECTION_TERRAIN_EDGES, + STR_OBJECT_SELECTION_STATIONS, + STR_OBJECT_SELECTION_MUSIC, + STR_OBJECT_SELECTION_FOOTPATH_SURFACES, + STR_OBJECT_SELECTION_FOOTPATH_RAILINGS, + STR_OBJECT_SELECTION_MUSIC, + STR_OBJECT_SELECTION_PEEP_NAMES, + STR_OBJECT_SELECTION_PEEP_ANIMATIONS, +}); static_assert(_objectTypeNames.size() == EnumValue(ObjectType::Count)); static void ConsoleCommandCountObjects(InteractiveConsole& console, [[maybe_unused]] const arguments_t& argv) @@ -1183,8 +1184,11 @@ static void ConsoleCommandCountObjects(InteractiveConsole& console, [[maybe_unus break; } } - console.WriteFormatLine( - "%s: %d/%d", _objectTypeNames[EnumValue(objectType)], entryGroupIndex, getObjectEntryGroupCount(objectType)); + + const auto objectStringId = _objectTypeNames[EnumValue(objectType)]; + const auto* objectString = LanguageGetString(objectStringId); + + console.WriteFormatLine("%s: %d/%d", objectString, entryGroupIndex, getObjectEntryGroupCount(objectType)); } } diff --git a/src/openrct2/localisation/StringIds.h b/src/openrct2/localisation/StringIds.h index 7eabb2768e..181130dcad 100644 --- a/src/openrct2/localisation/StringIds.h +++ b/src/openrct2/localisation/StringIds.h @@ -1205,6 +1205,16 @@ enum : StringId STR_INVALID_SELECTION_OF_OBJECTS = 3180, STR_PARK_ENTRANCE_TYPE_MUST_BE_SELECTED = 3182, STR_WATER_TYPE_MUST_BE_SELECTED = 3183, + STR_OBJECT_SELECTION_RIDE_VEHICLES_ATTRACTIONS = 3184, + STR_OBJECT_SELECTION_SMALL_SCENERY = 3185, + STR_OBJECT_SELECTION_LARGE_SCENERY = 3186, + STR_OBJECT_SELECTION_WALLS_FENCES = 3187, + STR_OBJECT_SELECTION_PATH_SIGNS = 3188, + STR_OBJECT_SELECTION_FOOTPATHS = 3189, + STR_OBJECT_SELECTION_PATH_EXTRAS = 3190, + STR_OBJECT_SELECTION_SCENERY_GROUPS = 3191, + STR_OBJECT_SELECTION_PARK_ENTRANCE = 3192, + STR_OBJECT_SELECTION_WATER = 3193, STR_CANT_DECREASE_MAP_SIZE_ANY_FURTHER = 3213, STR_CANT_INCREASE_MAP_SIZE_ANY_FURTHER = 3214, @@ -1511,6 +1521,10 @@ enum : StringId STR_INVALID_CLIMATE_ID = 6269, + STR_OBJECT_SELECTION_TERRAIN_SURFACES = 6270, + STR_OBJECT_SELECTION_TERRAIN_EDGES = 6271, + STR_OBJECT_SELECTION_STATIONS = 6272, + STR_OBJECT_SELECTION_MUSIC = 6273, STR_CANT_SET_COLOUR_SCHEME = 6274, STR_GUESTS_GETTING_STUCK_ON_RIDE = 6276, @@ -1576,6 +1590,8 @@ enum : StringId STR_AT_LEAST_ONE_FOOTPATH_NON_QUEUE_SURFACE_OBJECT_MUST_BE_SELECTED = 6441, STR_AT_LEAST_ONE_FOOTPATH_QUEUE_SURFACE_OBJECT_MUST_BE_SELECTED = 6442, STR_AT_LEAST_ONE_FOOTPATH_RAILING_OBJECT_MUST_BE_SELECTED = 6443, + STR_OBJECT_SELECTION_FOOTPATH_SURFACES = 6444, + STR_OBJECT_SELECTION_FOOTPATH_RAILINGS = 6445, STR_UNSUPPORTED_OBJECT_FORMAT = 6448, @@ -1694,6 +1710,7 @@ enum : StringId STR_DATE_FORMAT_MY_SENTENCE = 6674, + STR_OBJECT_SELECTION_PEEP_NAMES = 6675, STR_AT_LEAST_ONE_PEEP_NAMES_OBJECT_MUST_BE_SELECTED = 6676, STR_OBJECT_SELECTION_PEEP_ANIMATIONS = 6718, @@ -1702,6 +1719,7 @@ enum : StringId STR_AT_LEAST_ONE_MECHANIC_PEEP_ANIMATIONS_OBJECT_MUST_BE_SELECTED = 6721, STR_AT_LEAST_ONE_SECURITY_PEEP_ANIMATIONS_OBJECT_MUST_BE_SELECTED = 6722, STR_AT_LEAST_ONE_ENTERTAINER_PEEP_ANIMATIONS_OBJECT_MUST_BE_SELECTED = 6723, + STR_OBJECT_SELECTION_SCENARIO_TEXTS = 6724, // Have to include resource strings (from scenarios and objects) for the time being now that language is partially working /* MAX_STR_COUNT = 32768 */ // MAX_STR_COUNT - upper limit for number of strings, not the current count strings