mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-22 10:21:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Extras tab: add Tycoon park, keep competitions apart

Browse source
This commit is contained in:
ZeeMajora 2022-10-05 16:51:37 -04:00 committed by GitHub
parent 051ede1598
commit e6df43b7c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/language/en-GB.txt
View file

@ -3631,6 +3631,7 @@ STR_6523 :Decrease the priority of the selected asset pack.
STR_6524 :Increase the priority of the selected asset pack.
STR_6525 :Reload all assets in the game with the enabled asset packs.
STR_6526 :(base graphics, music and sound effects)
STR_6527 :Competitions
#############
# Scenarios #

1
distribution/changelog.txt
View file

@ -3,6 +3,7 @@
- Fix: [#14312] Research ride type message incorrect.
- Fix: [#18122] Ghosts count towards “Great scenery!” guest thought.
- Fix: [#18134] Underground on-ride photo section partially clips through adjacent terrain edge.
- Improved: [#18192, #18214] Tycoon Park has been added Extras tab, Competition scenarios have received their own section.
0.4.2 (2022-10-05)
------------------------------------------------------------------------

2
distribution/openrct2.d.ts vendored
View file

@ -2407,7 +2407,7 @@ declare global {
*/
interface ScenarioFile {
id: number;
category: "beginner" | "challenging" | "expert" | "real" | "other" | "dlc" | "build_your_own";
category: "beginner" | "challenging" | "expert" | "real" | "other" | "dlc" | "build_your_own" | "competitions";
sourceGame: "rct1" | "rct1_aa" | "rct1_ll" | "rct2" | "rct2_ww" | "rct2_tt" | "real" | "extras" | "other";
path: string;
internalName: string;

1
src/openrct2-ui/scripting/ScUi.hpp
View file

@ -48,6 +48,7 @@ namespace OpenRCT2::Scripting
{ "other", SCENARIO_CATEGORY_OTHER },
{ "dlc", SCENARIO_CATEGORY_DLC },
{ "build_your_own", SCENARIO_CATEGORY_BUILD_YOUR_OWN },
{ "competitions", SCENARIO_CATEGORY_COMPETITIONS },
});
static const DukEnumMap<ScenarioSource> ScenarioSourceMap({

2
src/openrct2/localisation/StringIds.h
View file

@ -3915,6 +3915,8 @@ enum : uint16_t
STR_RELOAD_ASSET_PACKS_TIP = 6525,
STR_BASE_GRAPHICS_MUSIC_SOUND = 6526,
STR_COMPETITIONS = 6527,
// 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
};

2
src/openrct2/scenario/Scenario.cpp
View file

@ -61,7 +61,7 @@
const StringId ScenarioCategoryStringIds[SCENARIO_CATEGORY_COUNT] = {
STR_BEGINNER_PARKS, STR_CHALLENGING_PARKS, STR_EXPERT_PARKS, STR_REAL_PARKS, STR_OTHER_PARKS,
STR_DLC_PARKS, STR_BUILD_YOUR_OWN_PARKS,
STR_DLC_PARKS, STR_BUILD_YOUR_OWN_PARKS, STR_COMPETITIONS,
};
SCENARIO_CATEGORY gScenarioCategory;

1
src/openrct2/scenario/Scenario.h
View file

@ -53,6 +53,7 @@ enum SCENARIO_CATEGORY
// OpenRCT2 categories
SCENARIO_CATEGORY_DLC,
SCENARIO_CATEGORY_BUILD_YOUR_OWN,
SCENARIO_CATEGORY_COMPETITIONS,
SCENARIO_CATEGORY_COUNT
};

27
src/openrct2/scenario/ScenarioSources.cpp
View file

@ -294,25 +294,26 @@ namespace ScenarioSources
{ SC_PCGW, "PC Gaming World", SCENARIO_CATEGORY_DLC },
{ SC_GAMEPLAY, "gameplay", SCENARIO_CATEGORY_DLC },
{ SC_UNIDENTIFIED, "Panda World", SCENARIO_CATEGORY_DLC },
{ SC_UNIDENTIFIED, "Competition Land 1", SCENARIO_CATEGORY_DLC },
{ SC_UNIDENTIFIED, "Competition Land 2", SCENARIO_CATEGORY_DLC },
{ SC_STEEL_TWISTER_COMPETITION, "Steel Twister Roller Coaster Competition", SCENARIO_CATEGORY_DLC },
{ SC_GO_KARTS_COMPETITION, "Go Karts Competition", SCENARIO_CATEGORY_DLC },
{ SC_STEEL_CORKSCREW_COMPETITION, "Steel Corkscrew Roller Coaster Competition", SCENARIO_CATEGORY_DLC },
{ SC_MINE_TRAIN_COMPETITION, "Mine Train Roller Coaster Competition", SCENARIO_CATEGORY_DLC },
{ SC_STEEL_ROLLER_COASTER_COMPETITION, "Steel Roller Coaster Competition", SCENARIO_CATEGORY_DLC },
{ SC_BOBSLED_COMPETITION, "Bobsled Roller Coaster Competition", SCENARIO_CATEGORY_DLC },
{ SC_INVERTED_ROLLER_COASTER_COMPETITION, "Inverted Roller Coaster Competition", SCENARIO_CATEGORY_DLC },
{ SC_SUSPENDED_ROLLER_COASTER_COMPETITION, "Suspended Roller Coaster Competition", SCENARIO_CATEGORY_DLC },
{ SC_STAND_UP_STEEL_ROLLER_COASTER_COMPETITION, "Stand-Up Steel Roller Coaster Competition", SCENARIO_CATEGORY_DLC },
{ SC_WOODEN_ROLLER_COASTER_COMPETITION, "Wooden Roller Coaster Competition", SCENARIO_CATEGORY_DLC },
{ SC_STEEL_MINI_ROLLER_COASTER_COMPETITION, "Steel Mini Roller Coaster Competition", SCENARIO_CATEGORY_DLC },
{ SC_UNIDENTIFIED, "Build your own Six Flags Belgium", SCENARIO_CATEGORY_BUILD_YOUR_OWN },
{ SC_UNIDENTIFIED, "Build your own Six Flags Great Adventure", SCENARIO_CATEGORY_BUILD_YOUR_OWN },
{ SC_UNIDENTIFIED, "Build your own Six Flags Holland", SCENARIO_CATEGORY_BUILD_YOUR_OWN },
{ SC_UNIDENTIFIED, "Build your own Six Flags Magic Mountain", SCENARIO_CATEGORY_BUILD_YOUR_OWN },
{ SC_UNIDENTIFIED, "Build your own Six Flags Park", SCENARIO_CATEGORY_BUILD_YOUR_OWN },
{ SC_UNIDENTIFIED, "Build your own Six Flags over Texas", SCENARIO_CATEGORY_BUILD_YOUR_OWN },
{ SC_UNIDENTIFIED, "Competition Land 1", SCENARIO_CATEGORY_COMPETITIONS },
{ SC_UNIDENTIFIED, "Competition Land 2", SCENARIO_CATEGORY_COMPETITIONS },
{ SC_BOBSLED_COMPETITION, "Bobsled Roller Coaster Competition", SCENARIO_CATEGORY_COMPETITIONS },
{ SC_GO_KARTS_COMPETITION, "Go Karts Competition", SCENARIO_CATEGORY_COMPETITIONS },
{ SC_INVERTED_ROLLER_COASTER_COMPETITION, "Inverted Roller Coaster Competition", SCENARIO_CATEGORY_COMPETITIONS },
{ SC_MINE_TRAIN_COMPETITION, "Mine Train Roller Coaster Competition", SCENARIO_CATEGORY_COMPETITIONS },
{ SC_STAND_UP_STEEL_ROLLER_COASTER_COMPETITION, "Stand-Up Steel Roller Coaster Competition", SCENARIO_CATEGORY_COMPETITIONS },
{ SC_STEEL_CORKSCREW_COMPETITION, "Steel Corkscrew Roller Coaster Competition", SCENARIO_CATEGORY_COMPETITIONS },
{ SC_STEEL_MINI_ROLLER_COASTER_COMPETITION, "Steel Mini Roller Coaster Competition", SCENARIO_CATEGORY_COMPETITIONS },
{ SC_STEEL_ROLLER_COASTER_COMPETITION, "Steel Roller Coaster Competition", SCENARIO_CATEGORY_COMPETITIONS },
{ SC_STEEL_TWISTER_COMPETITION, "Steel Twister Roller Coaster Competition", SCENARIO_CATEGORY_COMPETITIONS },
{ SC_SUSPENDED_ROLLER_COASTER_COMPETITION, "Suspended Roller Coaster Competition", SCENARIO_CATEGORY_COMPETITIONS },
{ SC_WOODEN_ROLLER_COASTER_COMPETITION, "Wooden Roller Coaster Competition", SCENARIO_CATEGORY_COMPETITIONS },
{ SC_UNIDENTIFIED, "Tycoon Park", SCENARIO_CATEGORY_OTHER },
};
#define DEFINE_SCENARIO_TITLE_DESC_GROUP(x) { std::size(x), x }