mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Move Ayers Rock patch to json

Browse Source
This commit is contained in:
Tulio Leao
2024-01-20 15:11:19 -03:00
parent acdeb89974
commit 43adebe815
2 changed files with 23 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
data/scenario_patches/Australasia - Ayers Rock.json Normal file
View File

@@ -0,0 +1,23 @@
{
"tiles": {
"type": "track",
"operations": [
{
"from": "flat_covered",
"to": "flat",
"coordinates": [
[ 123, 59 ], [ 123, 60 ], [ 123, 61 ],
[ 118, 69 ], [ 118, 70 ], [ 118, 71 ], [ 118, 72 ], [ 118, 73 ],
[ 112, 79 ], [ 112, 80 ], [ 112, 81 ], [ 112, 82 ]
]
},
{
"from": "flat",
"to": "flat_covered",
"coordinates": [
[ 123, 83 ], [ 123, 84 ], [ 123, 85 ], [123, 86 ]
]
}
]
}
}

55
src/openrct2/rct2/S6Importer.cpp
View File

@@ -511,7 +511,6 @@ namespace OpenRCT2::RCT2
// so for those cases (as well as for SFMM proper, we’ll have to check the filename.
RCT12::FetchAndApplyScenarioPatch(
_s6.ScenarioFilename != gScenarioFileName ? gScenarioFileName : _s6.ScenarioFilename, _isScenario);
FixAyersRockScenario();
ResearchDetermineFirstOfType();
UpdateConsolidatedPatrolAreas();
@@ -537,60 +536,6 @@ namespace OpenRCT2::RCT2
gameState.ScenarioDetails = RCT2StringToUTF8(gameState.ScenarioDetails, RCT2LanguageId::EnglishUK);
}
void FixAyersRockScenario() const
{
if (!_isScenario || !String::Equals(_s6.ScenarioFilename, "Australasia - Ayers Rock.SC6"))
return;
TileCoordsXY tilesToUncovered[] = {
{ 123, 59 }, { 123, 60 }, { 123, 61 }, { 118, 69 }, { 118, 70 }, { 118, 71 },
{ 118, 72 }, { 118, 73 }, { 112, 79 }, { 112, 80 }, { 112, 81 }, { 112, 82 },
};
for (const auto& tile : tilesToUncovered)
{
auto* tileElement = MapGetFirstElementAt(tile);
if (tileElement == nullptr)
continue;
do
{
if (tileElement->GetType() != TileElementType::Track)
continue;
auto* trackElement = tileElement->AsTrack();
if (trackElement->GetTrackType() != TrackElemType::FlatCovered)
continue;
trackElement->SetTrackType(TrackElemType::Flat);
} while (!(tileElement++)->IsLastForTile());
}
TileCoordsXY tilesToCovered[] = {
{ 123, 83 },
{ 123, 84 },
{ 123, 85 },
{ 123, 86 },
};
for (const auto& tile : tilesToCovered)
{
auto* tileElement = MapGetFirstElementAt(tile);
if (tileElement == nullptr)
continue;
do
{
if (tileElement->GetType() != TileElementType::Track)
continue;
auto* trackElement = tileElement->AsTrack();
if (trackElement->GetTrackType() != TrackElemType::Flat)
continue;
trackElement->SetTrackType(TrackElemType::FlatCovered);
} while (!(tileElement++)->IsLastForTile());
}
}
void ImportRides()
{
for (uint8_t index = 0; index < Limits::kMaxRidesInPark; index++)