diff --git a/CMakeLists.txt b/CMakeLists.txt index 57f4b6112a..76a17f2438 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,9 +64,9 @@ set(TITLE_SEQUENCE_VERSION "0.4.0") set(TITLE_SEQUENCE_URL "https://github.com/OpenRCT2/title-sequences/releases/download/v${TITLE_SEQUENCE_VERSION}/title-sequences.zip") set(TITLE_SEQUENCE_SHA1 "4ab0065e5a4d9f9c77d94718bbdfcfcd5a389da0") -set(OBJECTS_VERSION "1.3.6") +set(OBJECTS_VERSION "1.3.7") set(OBJECTS_URL "https://github.com/OpenRCT2/objects/releases/download/v${OBJECTS_VERSION}/objects.zip") -set(OBJECTS_SHA1 "20e0eb1389918ea1a90ec891f46ef03100b3e935") +set(OBJECTS_SHA1 "82930d549e0b3c3bce29718d5390c5cd474d0f28") set(OPENSFX_VERSION "1.0.1") set(OPENSFX_URL "https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v${OPENSFX_VERSION}/opensound.zip") diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index 52fe34afbd..d3da29a7eb 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -4087,30 +4087,6 @@ STR_DTLS : [TTPIRF05] STR_NAME :Roof -[TTRFWD01] -STR_NAME :Roof - -[TTRFWD02] -STR_NAME :Roof - -[TTRFWD03] -STR_NAME :Roof - -[TTRFWD04] -STR_NAME :Roof - -[TTRFWD05] -STR_NAME :Roof - -[TTRFWD06] -STR_NAME :Roof - -[TTRFWD07] -STR_NAME :Roof - -[TTRFWD08] -STR_NAME :Roof - ## End OpenRCT2 Official ############################################################################### diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 1325a2d26f..e7ec306bf7 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -2,9 +2,11 @@ ------------------------------------------------------------------------ - Feature: [#17782] The Flying Coaster now has access to boosters and can draw outside loops. - Feature: [#18312, objects#220, OpenSFX#13] New sound effects for the Hybrid and Single Rail roller coasters. +- Feature: [objects#173] Add alpine coaster vehicle. - Feature: [objects#221] Add two extra jungle walls. +- Feature: [objects#225] Add log cabin roofs. - Feature: [OpenMusic#14, OpenMusic#15, OpenMusic#18] Added Galaxy, Acid and Dodgems ride music styles. -- Improved: [#18013, #18016, #18018, #18019, #18514] Added colour presets to Spiral Slide, Dodgems, Boat Hire, Flying Saucers, and Car Ride. +- Improved: [#18013, #18016, #18018, #18019, #18514, objects#224] Added colour presets to Spiral Slide, Dodgems, Boat Hire, Flying Saucers, and Car Ride. - Improved: [#18192] Tycoon Park has been added to the Extras tab. - Improved: [#18214] Competition scenarios have received their own section. - Improved: [#18250] Added modern style file and folder pickers on Windows. diff --git a/openrct2.proj b/openrct2.proj index 7d5f6588ea..87bae6926c 100644 --- a/openrct2.proj +++ b/openrct2.proj @@ -45,8 +45,8 @@ f3a03c2e7b610fefa28d6962da10144f6324078d https://github.com/OpenRCT2/title-sequences/releases/download/v0.4.0/title-sequences.zip 4ab0065e5a4d9f9c77d94718bbdfcfcd5a389da0 - https://github.com/OpenRCT2/objects/releases/download/v1.3.6/objects.zip - 20e0eb1389918ea1a90ec891f46ef03100b3e935 + https://github.com/OpenRCT2/objects/releases/download/v1.3.7/objects.zip + 82930d549e0b3c3bce29718d5390c5cd474d0f28 https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v1.0.1/opensound.zip 8f04aea33f8034131c3069f6accacce0d94f80c1 https://github.com/OpenRCT2/OpenMusic/releases/download/v1.0.1/openmusic.zip diff --git a/shell.nix b/shell.nix index 8a5bceb0c5..c74d360ca6 100644 --- a/shell.nix +++ b/shell.nix @@ -15,8 +15,8 @@ let objects-src = pkgs.fetchFromGitHub { owner = "OpenRCT2"; repo = "objects"; - rev = "v1.3.6"; - sha256 = "db9c3806a09cf2031f62f8e75cdc014376ec91d3c97e5764f747a88c8d8faf40"; + rev = "v1.3.7"; + sha256 = "d6be9743c68f233674f5549204637b1f0304d7567a816d18e3f1576500a51d38"; }; title-sequences-src = pkgs.fetchFromGitHub { diff --git a/src/openrct2/object/SmallSceneryObject.cpp b/src/openrct2/object/SmallSceneryObject.cpp index c1c9e55237..586e40329b 100644 --- a/src/openrct2/object/SmallSceneryObject.cpp +++ b/src/openrct2/object/SmallSceneryObject.cpp @@ -175,29 +175,6 @@ void SmallSceneryObject::PerformFixes() static const auto& scgPirat = GetScgPiratHeader(); SetPrimarySceneryGroup(scgPirat); } - - // ToonTowner's wooden roofs. Make them show up in the Mine Theming. - if (identifier == "TTRFWD01" || - identifier == "TTRFWD02" || - identifier == "TTRFWD03" || - identifier == "TTRFWD04" || - identifier == "TTRFWD05" || - identifier == "TTRFWD06" || - identifier == "TTRFWD07" || - identifier == "TTRFWD08") - { - static const auto& scgMine = GetScgMineHeader(); - SetPrimarySceneryGroup(scgMine); - } - - // ToonTowner's glass roofs. Make them show up in the Abstract Theming. - if (identifier == "TTRFGL01" || - identifier == "TTRFGL02" || - identifier == "TTRFGL03") - { - static const auto& scgAbstr = GetScgAbstrHeader(); - SetPrimarySceneryGroup(scgAbstr); - } } // clang-format on @@ -206,16 +183,6 @@ ObjectEntryDescriptor SmallSceneryObject::GetScgPiratHeader() const return ObjectEntryDescriptor("rct2.scenery_group.scgpirat"); } -ObjectEntryDescriptor SmallSceneryObject::GetScgMineHeader() const -{ - return ObjectEntryDescriptor("rct2.scgmine"); -} - -ObjectEntryDescriptor SmallSceneryObject::GetScgAbstrHeader() const -{ - return ObjectEntryDescriptor("rct2.scenery_group.scgabstr"); -} - void SmallSceneryObject::ReadJson(IReadObjectContext* context, json_t& root) { Guard::Assert(root.is_object(), "SmallSceneryObject::ReadJson expects parameter root to be object"); diff --git a/src/openrct2/object/SmallSceneryObject.h b/src/openrct2/object/SmallSceneryObject.h index fcaadba643..884c3d0d2f 100644 --- a/src/openrct2/object/SmallSceneryObject.h +++ b/src/openrct2/object/SmallSceneryObject.h @@ -38,6 +38,4 @@ private: static std::vector ReadJsonFrameOffsets(json_t& jFrameOffsets); void PerformFixes(); ObjectEntryDescriptor GetScgPiratHeader() const; - ObjectEntryDescriptor GetScgMineHeader() const; - ObjectEntryDescriptor GetScgAbstrHeader() const; }; diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp index dcfc28dba1..d964800b4c 100644 --- a/src/openrct2/park/ParkFile.cpp +++ b/src/openrct2/park/ParkFile.cpp @@ -338,6 +338,13 @@ namespace OpenRCT2 identifier = "openrct2.ride.single_rail_coaster"; } } + else if (version <= 14) + { + if (identifier == "openrct2.ride.alp1") + { + identifier = "openrct2.ride.alpine_coaster"; + } + } desc.Identifier = identifier; desc.Version = cs.Read(); diff --git a/src/openrct2/park/ParkFile.h b/src/openrct2/park/ParkFile.h index d0c172a532..5594368119 100644 --- a/src/openrct2/park/ParkFile.h +++ b/src/openrct2/park/ParkFile.h @@ -8,7 +8,7 @@ struct ObjectRepositoryItem; namespace OpenRCT2 { // Current version that is saved. - constexpr uint32_t PARK_FILE_CURRENT_VERSION = 14; + constexpr uint32_t PARK_FILE_CURRENT_VERSION = 15; // The minimum version that is forwards compatible with the current version. constexpr uint32_t PARK_FILE_MIN_VERSION = 14;