From 43b9ffb2b874d481ea53332cfd0892ff2a33b837 Mon Sep 17 00:00:00 2001 From: HtotheTML <108596959+HtotheTML@users.noreply.github.com> Date: Fri, 2 Feb 2024 02:54:27 -0800 Subject: [PATCH] Fix park boundaries for out-of-bounds monorails in Africa - Oasis & Blackpool Pleasure Beach (#21309) --- distribution/changelog.txt | 1 + src/openrct2/rct1/S4Importer.cpp | 15 +++++++++++++++ src/openrct2/rct2/S6Importer.cpp | 6 ++++++ 3 files changed, 22 insertions(+) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 339ab10294..98f7b8ab41 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -24,6 +24,7 @@ - Fix: [#21198] [Plugin] Setting brake or booster speeds on a tile element doesn’t work. - Fix: [#21290] Sound keeps playing when paused from fast-forward mode. - Fix: [#21291] Hungry guests heading to any flat ride do not count for warning threshold (original bug). +- Fix: [#21309] Africa - Oasis & Blackpool Pleasure Beach’s monorails are built outside the park’s land rights. - Fix: [#21316] Isolated land for sale tile on Extreme Hawaiian Island. 0.4.7 (2023-12-31) diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 8a0066e14f..43b18981bb 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -2550,6 +2550,21 @@ namespace RCT1 case SC_ALTON_TOWERS: FixLandOwnershipTilesWithOwnership({ { 11, 31 }, { 68, 112 }, { 72, 118 } }, OWNERSHIP_OWNED); break; + case SC_BLACKPOOL_PLEASURE_BEACH: + FixLandOwnershipTilesWithOwnership( + { { 93, 23 }, + { 94, 23 }, + { 95, 23 }, + { 95, 24 }, + { 96, 24 }, + { 96, 25 }, + { 97, 25 }, + { 97, 26 }, + { 97, 27 }, + { 96, 28 } }, + OWNERSHIP_OWNED); + FixLandOwnershipTilesWithOwnership({ { 94, 24 }, { 95, 25 } }, OWNERSHIP_CONSTRUCTION_RIGHTS_OWNED); + break; case SC_FORT_ANACHRONISM: FixLandOwnershipTiles({ { 36, 87 }, { 54, 29 }, { 53, 88 } }); break; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 3797db598a..6abbad9bc7 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -873,6 +873,12 @@ namespace RCT2 { 46, 87 }, }, OWNERSHIP_OWNED); + FixLandOwnershipTilesWithOwnership( + { + { 140, 58 }, { 141, 58 }, { 142, 58 }, { 143, 58 }, { 144, 58 }, { 145, 58 }, { 146, 58 }, { 147, 58 }, + { 140, 74 }, { 141, 74 }, { 142, 74 }, { 143, 74 }, { 144, 74 }, { 145, 74 }, { 146, 74 }, { 147, 74 }, + }, + OWNERSHIP_CONSTRUCTION_RIGHTS_OWNED, true); // clang-format on } else if (