From 046ded718cea2f0be3758d1a09bc507a897a4c85 Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Sun, 25 Feb 2024 16:23:19 -0300 Subject: [PATCH] Add .parkpatch files for .sea scenarios --- data/scenario_patches/081feb1.parkpatch | 23 ++++++++ data/scenario_patches/0d53bdc.parkpatch | 33 +++++++++++ data/scenario_patches/143e51a.parkpatch | 11 ++++ data/scenario_patches/3735942.parkpatch | 11 ++++ data/scenario_patches/5429ba0.parkpatch | 11 ++++ data/scenario_patches/59aea26.parkpatch | 22 +++++++ data/scenario_patches/60cf30e.parkpatch | 11 ++++ data/scenario_patches/70ce3e1.parkpatch | 26 +++++++++ data/scenario_patches/72cf3d2.parkpatch | 31 ++++++++++ data/scenario_patches/73d0921.parkpatch | 2 +- data/scenario_patches/7f38f1b.parkpatch | 18 ++++++ data/scenario_patches/82c619d.parkpatch | 11 ++++ data/scenario_patches/8965a5c.parkpatch | 26 +++++++++ ...eat Wall of China Tourism Enhancement.json | 11 ---- data/scenario_patches/WW Africa - Oasis.json | 16 ------ .../WW Asia - Japanese Coastal Reclaim.json | 57 ------------------- data/scenario_patches/a0b4362.parkpatch | 11 ++++ data/scenario_patches/adffe2f.parkpatch | 12 ++++ data/scenario_patches/b43b07e.parkpatch | 17 ++++++ ...tie's dreamland.json => b8b572d.parkpatch} | 4 +- data/scenario_patches/bfaf504.parkpatch | 11 ++++ data/scenario_patches/c1d4056.parkpatch | 14 +++++ data/scenario_patches/d4307c3.parkpatch | 22 +++++++ data/scenario_patches/ed85bec.parkpatch | 11 ++++ data/scenario_patches/ffce0f2.parkpatch | 16 ++++++ data/scenario_patches/scenario_to_hash | 48 +++++++++++++++- src/openrct2/rct1/S4Importer.cpp | 1 - 27 files changed, 398 insertions(+), 89 deletions(-) create mode 100644 data/scenario_patches/081feb1.parkpatch create mode 100644 data/scenario_patches/0d53bdc.parkpatch create mode 100644 data/scenario_patches/143e51a.parkpatch create mode 100644 data/scenario_patches/3735942.parkpatch create mode 100644 data/scenario_patches/5429ba0.parkpatch create mode 100644 data/scenario_patches/59aea26.parkpatch create mode 100644 data/scenario_patches/60cf30e.parkpatch create mode 100644 data/scenario_patches/70ce3e1.parkpatch create mode 100644 data/scenario_patches/72cf3d2.parkpatch create mode 100644 data/scenario_patches/7f38f1b.parkpatch create mode 100644 data/scenario_patches/82c619d.parkpatch create mode 100644 data/scenario_patches/8965a5c.parkpatch delete mode 100644 data/scenario_patches/Great Wall of China Tourism Enhancement.json delete mode 100644 data/scenario_patches/WW Africa - Oasis.json delete mode 100644 data/scenario_patches/WW Asia - Japanese Coastal Reclaim.json create mode 100644 data/scenario_patches/a0b4362.parkpatch create mode 100644 data/scenario_patches/adffe2f.parkpatch create mode 100644 data/scenario_patches/b43b07e.parkpatch rename data/scenario_patches/{katie's dreamland.json => b8b572d.parkpatch} (69%) create mode 100644 data/scenario_patches/bfaf504.parkpatch create mode 100644 data/scenario_patches/c1d4056.parkpatch create mode 100644 data/scenario_patches/d4307c3.parkpatch create mode 100644 data/scenario_patches/ed85bec.parkpatch create mode 100644 data/scenario_patches/ffce0f2.parkpatch diff --git a/data/scenario_patches/081feb1.parkpatch b/data/scenario_patches/081feb1.parkpatch new file mode 100644 index 0000000000..a748b30825 --- /dev/null +++ b/data/scenario_patches/081feb1.parkpatch @@ -0,0 +1,23 @@ +{ + "scenario_name": "Dark Age - Castle (.sea)", + "sha256": "081feb17ca7a7d0df50057169dcd78942ce96e472bf29f19665ff1811c514d43", + "land_ownership": { + "owned": { + "coordinates": [ + [ 61, 15 ], + [ 62, 16 ], + [ 34, 51 ], [ 35, 51 ], [ 35, 50 ], + [ 34, 72 ], [ 35, 72 ], [ 35, 73 ], + [ 66, 19 ], [ 66, 20 ], [ 67, 20 ], + [ 75, 85 ], [ 76, 85 ], [ 76, 86 ], + [ 59, 18 ], [ 60, 18 ], [ 60, 17 ], [ 61, 17 ] + ] + }, + "construction_rights_owned": { + "cannot_downgrade": true, + "coordinates": [ + [ 86, 69 ], [ 86, 70 ] + ] + } + } +} diff --git a/data/scenario_patches/0d53bdc.parkpatch b/data/scenario_patches/0d53bdc.parkpatch new file mode 100644 index 0000000000..977e0f2336 --- /dev/null +++ b/data/scenario_patches/0d53bdc.parkpatch @@ -0,0 +1,33 @@ +{ + "scenario_name": "Roaring Twenties - Schneider Cup (.sea)", + "sha256": "0d53bdc076d75d86b31b6b3e6948e3d45671cf5aeff6b2b3c07a7618923223f5", + "land_ownership": { + "construction_rights_available": { + "cannot_downgrade": true, + "coordinates": [ + [ 147, 132 ], + [ 82, 110 ], [ 83, 110 ], + [ 120, 86 ], [ 121, 86 ], + [ 143, 130 ], [ 144, 130 ], + [ 98, 2 ], [ 99, 2 ], [ 100, 2 ], + [ 65, 120 ], [ 65, 121 ], [ 65, 122 ], [ 65, 123 ], + [ 156, 139 ], [ 156, 140 ], [ 156, 141 ], [ 157, 139 ], [ 157, 140 ], [ 157, 141 ], + [ 105, 88 ], [ 106, 86 ], [ 106, 87 ], [ 106, 88 ], [ 107, 86 ], [ 107, 87 ], [ 107, 88 ], + [ 148, 95 ], [ 148, 96 ], [ 148, 97 ], [ 148, 98 ], [ 148, 99 ], [ 149, 97 ], [ 149, 98 ], [ 149, 99 ], [ 150, 97 ], [ 150, 98 ], [ 150, 99 ], + [ 148, 94 ], + [ 84, 111 ], [ 85, 111 ], [ 85, 112 ], [ 85, 113 ], [ 85, 114 ], [ 86, 111 ], [ 86, 112 ], [ 86, 113 ], [ 86, 114 ], [ 87, 111 ], [ 87, 112 ], + [ 87, 113 ], [ 87, 114 ], [ 88, 111 ], [ 88, 112 ], [ 88, 113 ], [ 88, 114 ], [ 88, 115 ], [ 88, 116 ], [ 88, 117 ], [ 89, 111 ], [ 89, 112 ], + [ 89, 113 ], [ 89, 114 ], [ 89, 115 ], [ 89, 116 ], [ 89, 117 ], [ 89, 118 ], [ 89, 119 ], [ 89, 120 ], [ 89, 121 ], [ 90, 113 ], [ 90, 114 ], + [ 90, 115 ], [ 90, 116 ], [ 90, 117 ], [ 90, 118 ], [ 90, 119 ], [ 90, 120 ], [ 90, 121 ], [ 91, 115 ], [ 91, 116 ], [ 91, 117 ], [ 91, 118 ], + [ 91, 119 ], [ 91, 120 ], [ 91, 121 ], [ 92, 115 ], [ 92, 118 ], [ 92, 119 ], [ 92, 120 ], [ 92, 121 ] + ] + }, + "available": { + "cannot_downgrade": true, + "coordinates": [ + [ 45, 151 ], + [ 55, 137 ] + ] + } + } +} diff --git a/data/scenario_patches/143e51a.parkpatch b/data/scenario_patches/143e51a.parkpatch new file mode 100644 index 0000000000..3b14817fa0 --- /dev/null +++ b/data/scenario_patches/143e51a.parkpatch @@ -0,0 +1,11 @@ +{ + "scenario_name": "Pleasure Island (.sea)", + "sha256": "143e51ac96ee8250884b1c1d5f98e8621e8ee9ef59e2075da18e4beb6abaf344", + "land_ownership": { + "construction_rights_owned": { + "coordinates": [ + [ 37, 66 ] + ] + } + } +} diff --git a/data/scenario_patches/3735942.parkpatch b/data/scenario_patches/3735942.parkpatch new file mode 100644 index 0000000000..c3beadc154 --- /dev/null +++ b/data/scenario_patches/3735942.parkpatch @@ -0,0 +1,11 @@ +{ + "scenario_name": "Grand Glacier (.sea)", + "sha256": "3735942571f79464eb07fe8cac38e6ae670d9d87a917cec8e37857228690f7ff", + "land_ownership": { + "owned": { + "coordinates": [ + [ 99, 58 ] + ] + } + } +} diff --git a/data/scenario_patches/5429ba0.parkpatch b/data/scenario_patches/5429ba0.parkpatch new file mode 100644 index 0000000000..a8604e4eee --- /dev/null +++ b/data/scenario_patches/5429ba0.parkpatch @@ -0,0 +1,11 @@ +{ + "scenario_name": "Trinity Islands (.sea)", + "sha256": "5429ba0336e9937173d012a7f7b9a4c7924a7d7c6841f63e183d7a81edb4ef25", + "land_ownership": { + "construction_rights_owned": { + "coordinates": [ + [ 80, 60 ] + ] + } + } +} diff --git a/data/scenario_patches/59aea26.parkpatch b/data/scenario_patches/59aea26.parkpatch new file mode 100644 index 0000000000..97ff1860b5 --- /dev/null +++ b/data/scenario_patches/59aea26.parkpatch @@ -0,0 +1,22 @@ +{ + "scenario_name": "Asia - Maharaja Palace (.sea)", + "sha256": "59aea26b8fe26a4154114be8514ee70a6f31d981c5b07429572021d6ce5e69ad", + "land_ownership": { + "available": { + "cannot_downgrade": true, + "coordinates": [ + [ 43, 65 ], + [ 69, 41 ], + [ 74, 2 ], + [ 90, 19 ], [ 90, 20 ], + [ 65, 40 ], [ 66, 40 ], [ 67, 40 ], + [ 62, 24 ], [ 63, 24 ], [ 64, 24 ], [ 65, 24 ], [ 65, 25 ], + [ 98, 19 ], [ 98, 20 ], [ 98, 21 ], [ 99, 19 ], [ 99, 20 ], [ 99, 21 ], + [ 51, 28 ], [ 52, 28 ], [ 53, 28 ], [ 54, 28 ], [ 55, 28 ], [ 56, 28 ], [ 51, 29 ], [ 52, 29 ], [ 53, 29 ], [ 54, 29 ], + [ 37, 27 ], [ 37, 28 ], [ 37, 29 ], [ 38, 26 ], [ 38, 27 ], [ 38, 28 ], [ 38, 29 ], [ 39, 26 ], [ 39, 27 ], [ 39, 28 ], [ 39, 29 ], + [ 40, 26 ], [ 40, 27 ], [ 40, 28 ], [ 40, 29 ], [ 40, 30 ], [ 41, 26 ], [ 41, 27 ], [ 41, 28 ], [ 41, 29 ], [ 42, 26 ], [ 42, 27 ], + [ 42, 28 ], [ 42, 29 ], [ 43, 25 ], [ 43, 26 ], [ 43, 27 ], [ 43, 28 ], [ 43, 29 ] + ] + } + } +} diff --git a/data/scenario_patches/60cf30e.parkpatch b/data/scenario_patches/60cf30e.parkpatch new file mode 100644 index 0000000000..712f4504c4 --- /dev/null +++ b/data/scenario_patches/60cf30e.parkpatch @@ -0,0 +1,11 @@ +{ + "scenario_name": "Coaster Canyon (.sea)", + "sha256": "60cf30e881a5b43b696ace9c07597c21b55cec137e3b268621a7ec46312de538", + "land_ownership": { + "owned": { + "coordinates": [ + [ 21, 55 ] + ] + } + } +} diff --git a/data/scenario_patches/70ce3e1.parkpatch b/data/scenario_patches/70ce3e1.parkpatch new file mode 100644 index 0000000000..d4af512359 --- /dev/null +++ b/data/scenario_patches/70ce3e1.parkpatch @@ -0,0 +1,26 @@ +{ + "scenario_name": "South America - Inca Lost City (.sea)", + "sha256": "70ce3e11f1dd59929a6d82d0f6f88897c95b94d1f9d4efd6ef3a0c6c449f966f", + "land_ownership": { + "unowned": { + "coordinates": [ + [ 15, 59 ] + ] + }, + "construction_rights_owned": { + "cannot_downgrade": true, + "coordinates": [ + [ 11, 64 ], [ 11, 65 ], [ 11, 66 ], + [ 13, 68 ], [ 13, 69 ], + [ 14, 69 ], + [ 15, 59 ], + [ 55, 60 ], + [ 61, 6 ], + [ 86, 63 ], + [ 84, 22 ], [ 84, 23 ], + [ 83, 77 ], [ 84, 77 ], [ 84, 78 ], + [ 44, 61 ], [ 45, 61 ], [ 46, 61 ], [ 45, 62 ] + ] + } + } +} diff --git a/data/scenario_patches/72cf3d2.parkpatch b/data/scenario_patches/72cf3d2.parkpatch new file mode 100644 index 0000000000..8fa7f788b2 --- /dev/null +++ b/data/scenario_patches/72cf3d2.parkpatch @@ -0,0 +1,31 @@ +{ + "scenario_name": "N America - Extreme Hawaiian Island (.sea)", + "sha256": "72cf3d220740fd64f7681d3533320598cf6d3b71dff484bc43045e8d9d7a1a4b", + "land_ownership": { + "owned": { + "coordinates": [ + [ 132, 124 ], + [ 133, 124 ], + [ 133, 125 ], + [ 133, 126 ], + [ 119, 35 ], + [ 132, 62 ], + [ 133, 66 ], + [ 133, 67 ], + [ 136, 71 ], + [ 87, 33 ], + [ 87, 34 ], + [ 90, 36 ], + [ 91, 36 ] + ] + }, + "available": { + "cannot_downgrade": true, + "coordinates": [ + [ 49, 99 ], + [ 50, 99 ], + [ 88, 110 ] + ] + } + } +} diff --git a/data/scenario_patches/73d0921.parkpatch b/data/scenario_patches/73d0921.parkpatch index 0fba7f53fa..7f09f04bc3 100644 --- a/data/scenario_patches/73d0921.parkpatch +++ b/data/scenario_patches/73d0921.parkpatch @@ -1,5 +1,5 @@ { - "scenario_name": "katie's dreamland - s4", + "scenario_name": "katie's dreamland", "sha256": "73d0921f1d49388ffb4deb300c6ebb3920564410c2239580a7d1145fa54c2d4a", "land_ownership": { "available": { diff --git a/data/scenario_patches/7f38f1b.parkpatch b/data/scenario_patches/7f38f1b.parkpatch new file mode 100644 index 0000000000..beb04fecd5 --- /dev/null +++ b/data/scenario_patches/7f38f1b.parkpatch @@ -0,0 +1,18 @@ +{ + "scenario_name": "Build your own Six Flags Magic Mountain (.sea)", + "sha256": "7f38f1bf88c2d583aa795f0d0abbbe6cf9cccb7872ff8017f1c5d83ad95886df", + "land_ownership": { + "available": { + "cannot_downgrade": true, + "coordinates": [ + [ 104, 190 ], [ 105, 190 ], [ 108, 197 ], + [ 75, 167 ], + [ 61, 92 ], [ 61, 93 ], [ 61, 94 ], [ 61, 95 ], [ 62, 90 ], [ 62, 91 ], [ 62, 92 ], [ 62, 93 ], [ 62, 94 ], + [ 92, 57 ], [ 93, 57 ], + [ 89, 40 ], [ 89, 41 ], [ 89, 42 ], [ 88, 42 ], + [ 168, 20 ], [ 169, 20 ], + [ 46, 51 ], [ 58, 159 ], [ 71, 201 ], [ 126, 15 ], [ 190, 6 ] + ] + } + } +} diff --git a/data/scenario_patches/82c619d.parkpatch b/data/scenario_patches/82c619d.parkpatch new file mode 100644 index 0000000000..c1996e5ccb --- /dev/null +++ b/data/scenario_patches/82c619d.parkpatch @@ -0,0 +1,11 @@ +{ + "scenario_name": "Woodworm Park (.sea)", + "sha256": "82c619d167ef7472b990066e28372ed3a02218aea03d03c45f5269759d8367ee", + "land_ownership": { + "owned": { + "coordinates": [ + [ 62, 105 ], [ 101, 55 ] + ] + } + } +} diff --git a/data/scenario_patches/8965a5c.parkpatch b/data/scenario_patches/8965a5c.parkpatch new file mode 100644 index 0000000000..892d9716af --- /dev/null +++ b/data/scenario_patches/8965a5c.parkpatch @@ -0,0 +1,26 @@ +{ + "scenario_name": "Six Flags Holland (.sea)", + "sha256": "8965a5c3b498dec016e6ac317616426ed84b0e9145f6c1d752c9942479758cce", + "land_ownership": { + "available": { + "cannot_downgrade": true, + "coordinates": [ + [ 104, 190 ], [ 105, 190 ], [ 108, 197 ], + [ 75, 167 ], + [ 61, 92 ], [ 61, 93 ], [ 61, 94 ], [ 61, 95 ], [ 62, 90 ], [ 62, 91 ], [ 62, 92 ], [ 62, 93 ], [ 62, 94 ], + [ 92, 57 ], [ 93, 57 ], + [ 89, 40 ], [ 89, 41 ], [ 89, 42 ], [ 88, 42 ], + [ 168, 20 ], [ 169, 20 ], + [ 46, 51 ], [ 58, 159 ], [ 71, 201 ], [ 126, 15 ], [ 190, 6 ] + ] + } + }, + "water": [ + { + "height": 96, + "coordinates": [ + [ 126, 73 ] + ] + } + ] +} diff --git a/data/scenario_patches/Great Wall of China Tourism Enhancement.json b/data/scenario_patches/Great Wall of China Tourism Enhancement.json deleted file mode 100644 index bad593f110..0000000000 --- a/data/scenario_patches/Great Wall of China Tourism Enhancement.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "scenario_name": "Great Wall of China Tourism Enhancement", - "sha256": "e72d720a27ad13d07bb017b8f6da1b73c77fee00f648c65e3f593c8a60f0e236", - "land_ownership": { - "owned": { - "coordinates": [ - [ 127, 31 ] - ] - } - } -} diff --git a/data/scenario_patches/WW Africa - Oasis.json b/data/scenario_patches/WW Africa - Oasis.json deleted file mode 100644 index 461340a67f..0000000000 --- a/data/scenario_patches/WW Africa - Oasis.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "scenario_name": "WW Africa - Oasis", - "sha256": "2696a059c2c1b23c60cbfcc293fd29cfec45d7e3da7f3b38bc2b52aff834fd34", - "land_ownership": { - "unowned": { - "coordinates": [ - [ 61, 35 ] - ] - }, - "owned": { - "coordinates": [ - [ 46, 87 ] - ] - } - } -} diff --git a/data/scenario_patches/WW Asia - Japanese Coastal Reclaim.json b/data/scenario_patches/WW Asia - Japanese Coastal Reclaim.json deleted file mode 100644 index 89d5992442..0000000000 --- a/data/scenario_patches/WW Asia - Japanese Coastal Reclaim.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "scenario_name": "WW Asia - Japanese Coastal Reclaim", - "sha256": "810829891e1bafa33b9ccc6c296bcfb1fc86b6d812c1fea28899b5e47c048628", - "land_ownership": { - "owned": { - "coordinates": [ - [ 7, 29 ], - [ 24, 14 ], [ 24, 15 ], [ 24, 16 ], - [ 25, 13 ], [ 25, 14 ], [ 25, 15 ], [ 25, 16 ], [ 25, 17 ], - [ 26, 12 ], [ 26, 13 ], [ 26, 14 ], [ 26, 15 ], [ 26, 16 ], [ 26, 17 ], [ 26, 18 ], [ 26, 19 ], [ 26, 20 ], - [ 27, 11 ], [ 27, 12 ], [ 27, 13 ], [ 27, 14 ], [ 27, 15 ], [ 27, 16 ], [ 27, 17 ], [ 27, 18 ], [ 27, 19 ], [ 27, 20 ], [ 27, 21 ], - [ 28, 8 ], [ 28, 9 ], [ 28, 10 ], [ 28, 11 ], [ 28, 12 ], [ 28, 13 ], [ 28, 14 ], [ 28, 15 ], [ 28, 16 ], [ 28, 17 ], [ 28, 18 ], [ 28, 19 ], [ 28, 20 ], [ 28, 21 ], - [ 29, 6 ], [ 29, 7 ], [ 29, 8 ], [ 29, 9 ], [ 29, 10 ], [ 29, 11 ], [ 29, 12 ], [ 29, 13 ], [ 29, 14 ], [ 29, 15 ], [ 29, 16 ], [ 29, 17 ], [ 29, 18 ], [ 29, 19 ], [ 29, 20 ], [ 29, 21 ], - [ 30, 2 ], [ 30, 3 ], [ 30, 4 ], [ 30, 5 ], [ 30, 6 ], [ 30, 7 ], [ 30, 8 ], [ 30, 9 ], [ 30, 10 ], [ 30, 11 ], [ 30, 12 ], [ 30, 17 ], [ 30, 18 ], [ 30, 19 ], [ 30, 20 ], [ 30, 21 ], - [ 31, 2 ], [ 31, 3 ], [ 31, 4 ], [ 31, 5 ], [ 31, 6 ], [ 31, 7 ], [ 31, 8 ], [ 31, 9 ], [ 31, 10 ], [ 31, 11 ], [ 31, 19 ], [ 31, 20 ], [ 31, 21 ], - [ 32, 2 ], [ 32, 3 ], [ 32, 4 ], [ 32, 5 ], [ 32, 6 ], [ 32, 7 ], [ 32, 8 ], [ 32, 20 ], [ 32, 21 ], - [ 33, 2 ], [ 33, 3 ], [ 33, 4 ], [ 33, 5 ], [ 33, 6 ], [ 33, 7 ], [ 33, 20 ], [ 33, 21 ], - [ 34, 2 ], [ 34, 3 ], [ 34, 4 ], [ 34, 20 ], [ 34, 21 ], - [ 35, 21 ] - ] - }, - "construction_rights_owned": { - "cannot_downgrade": true, - "coordinates": [ - [ 2, 30 ], [ 3, 30 ], [ 4, 30 ], - [ 25, 23 ] - ] - }, - "construction_rights_available": { - "cannot_downgrade": true, - "coordinates": [ - [ 26, 116 ], - [ 61, 110 ], - [ 64, 113 ], [ 64, 114 ], [ 64, 115 ] - ] - }, - "available": { - "cannot_downgrade": true, - "coordinates": [ - [ 6, 100 ], [ 7, 100 ], [ 8, 100 ], [ 9, 100 ], [ 10, 100 ], [ 15, 100 ], [ 16, 100 ], - [ 6, 101 ], [ 7, 101 ], [ 8, 101 ], [ 9, 101 ], [ 10, 101 ], [ 15, 101 ], [ 16, 101 ], - [ 6, 102 ], [ 7, 102 ], [ 8, 102 ], [ 9, 102 ], [ 10, 102 ], [ 14, 102 ], [ 15, 102 ], [ 16, 102 ], - [ 6, 103 ], [ 7, 103 ], [ 8, 103 ], [ 9, 103 ], [ 10, 103 ], [ 12, 103 ], [ 14, 103 ], [ 15, 103 ], [ 16, 103 ], - [ 6, 104 ], [ 7, 104 ], [ 8, 104 ], [ 9, 104 ], [ 10, 104 ], [ 14, 104 ], [ 15, 104 ], [ 16, 104 ], - [ 6, 105 ], [ 7, 105 ], [ 8, 105 ], [ 9, 105 ], [ 10, 105 ], [ 11, 105 ], [ 12, 105 ], [ 13, 105 ], [ 14, 105 ], [ 15, 105 ], [ 16, 105 ], - [ 122, 78 ], [ 122, 79 ], - [ 111, 122 ], [ 112, 122 ], [ 113, 122 ], - [ 120, 15 ], [ 121, 15 ], [ 122, 15 ], - [ 58, 101 ], [ 59, 101 ], [ 59, 102 ], [ 59, 103 ], [ 59, 104 ], [ 59, 105 ], [ 59, 106 ], [ 59, 107 ], [ 60, 104 ], [ 60, 105 ], - [ 60, 106 ], [ 61, 104 ], [ 61, 105 ], - [ 121, 105 ], [ 121, 106 ], [ 121, 107 ], [ 122, 99 ], [ 122, 100 ], [ 122, 101 ], [ 122, 102 ], [ 122, 103 ], [ 122, 104 ], [ 122, 105 ], - [ 122, 106 ], [ 122, 107 ], [ 122, 108 ], [ 122, 109 ], [ 122, 110 ], [ 122, 111 ], [ 122, 112 ], [ 122, 113 ], [ 122, 114 ], [ 122, 115 ], - [ 122, 116 ], [ 122, 117 ], [ 122, 118 ] - ] - } - } -} diff --git a/data/scenario_patches/a0b4362.parkpatch b/data/scenario_patches/a0b4362.parkpatch new file mode 100644 index 0000000000..259023a7d0 --- /dev/null +++ b/data/scenario_patches/a0b4362.parkpatch @@ -0,0 +1,11 @@ +{ + "scenario_name": "Rotting Heights (.sea)", + "sha256": "a0b4362535bad4fcc7bead0d62be1498ce0388dbbcb82d1c8407c8a0ce246483", + "land_ownership": { + "owned": { + "coordinates": [ + [ 35, 20 ] + ] + } + } +} diff --git a/data/scenario_patches/adffe2f.parkpatch b/data/scenario_patches/adffe2f.parkpatch new file mode 100644 index 0000000000..7c11654dcb --- /dev/null +++ b/data/scenario_patches/adffe2f.parkpatch @@ -0,0 +1,12 @@ +{ + "scenario_name": "Infernal Views (.sea)", + "sha256": "adffe2ff1e06ebeb821bbf01263125dc40311a8350722c62908be8d1c8852259", + "water": [ + { + "height": 96, + "coordinates": [ + [ 45, 62 ] + ] + } + ] +} diff --git a/data/scenario_patches/b43b07e.parkpatch b/data/scenario_patches/b43b07e.parkpatch new file mode 100644 index 0000000000..f39d6f16be --- /dev/null +++ b/data/scenario_patches/b43b07e.parkpatch @@ -0,0 +1,17 @@ +{ + "scenario_name": "Prehistoric - Stone Age (.sea)", + "sha256": "b43b07e47f2e6cb762a86760ac0242595617aa59bfd9811cec7e2dcc121ae367", + "land_ownership": { + "available": { + "cannot_downgrade": true, + "coordinates": [ + [ 58, 77 ], + [ 62, 81 ], [ 63, 81 ], [ 64, 81 ], + [ 59, 36 ], [ 60, 36 ], [ 61, 36 ], [ 60, 37 ], [ 61, 37 ], + [ 73, 78 ], [ 73, 79 ], [ 73, 80 ], [ 73, 81 ], [ 73, 82 ], [ 74, 79 ], [ 74, 80 ], [ 74, 81 ], [ 74, 82 ], [ 74, 83 ], + [ 75, 79 ], [ 75, 80 ], [ 75, 81 ], [ 75, 82 ], [ 75, 83 ], [ 76, 79 ], [ 76, 80 ], [ 76, 81 ], [ 76, 82 ], [ 76, 83 ], + [ 77, 79 ], [ 77, 80 ], [ 77, 81 ], [ 77, 82 ], [ 78, 79 ], [ 79, 79 ], [ 80, 79 ], [ 73, 77 ] + ] + } + } +} diff --git a/data/scenario_patches/katie's dreamland.json b/data/scenario_patches/b8b572d.parkpatch similarity index 69% rename from data/scenario_patches/katie's dreamland.json rename to data/scenario_patches/b8b572d.parkpatch index d6419084be..903e9f1649 100644 --- a/data/scenario_patches/katie's dreamland.json +++ b/data/scenario_patches/b8b572d.parkpatch @@ -1,6 +1,6 @@ { - "scenario_name": "katie's dreamland", - "sha256": "73d0921f1d49388ffb4deb300c6ebb3920564410c2239580a7d1145fa54c2d4a", + "scenario_name": "katie's dreamland (.sea)", + "sha256": "b8b572d394b145535cdb20f66b0bee9a497683a5885e4d78af6773c5bc0323ff", "land_ownership": { "construction_rights_owned": { "coordinates": [ diff --git a/data/scenario_patches/bfaf504.parkpatch b/data/scenario_patches/bfaf504.parkpatch new file mode 100644 index 0000000000..0100ec4692 --- /dev/null +++ b/data/scenario_patches/bfaf504.parkpatch @@ -0,0 +1,11 @@ +{ + "scenario_name": "Mel's World (.sea)", + "sha256": "bfaf5045f8176a9928e118ece27a8dbf311466708c62cf1df976a926c900d639", + "land_ownership": { + "owned": { + "coordinates": [ + [ 93, 76 ], [ 93, 77 ] + ] + } + } +} diff --git a/data/scenario_patches/c1d4056.parkpatch b/data/scenario_patches/c1d4056.parkpatch new file mode 100644 index 0000000000..dd3797c994 --- /dev/null +++ b/data/scenario_patches/c1d4056.parkpatch @@ -0,0 +1,14 @@ +{ + "scenario_name": "Six Flags Magic Mountain (.sea)", + "sha256": "c1d405642b698e0af9d23d3a23afe42f0c7d138c1398254a1c581608f79a3db3", + "land_ownership": { + "available": { + "cannot_downgrade": true, + "coordinates": [ + [ 112, 33 ], [ 112, 34 ], + [ 113, 117 ], [ 114, 117 ], [ 115, 117 ], [ 116, 117 ], [ 117, 117 ], + [ 114, 118 ], [ 115, 118 ], [ 116, 118 ], [ 117, 118 ] + ] + } + } +} diff --git a/data/scenario_patches/d4307c3.parkpatch b/data/scenario_patches/d4307c3.parkpatch new file mode 100644 index 0000000000..514337a760 --- /dev/null +++ b/data/scenario_patches/d4307c3.parkpatch @@ -0,0 +1,22 @@ +{ + "scenario_name": "Antarctic - Ecological Salvage (.sea)", + "sha256": "d4307c36d1065037decbe9b75be1342638a2581e230a3ba3cd08cab5c25175e5", + "land_ownership": { + "unowned": { + "coordinates": [ + [ 83, 117 ], [ 84, 117 ], + [ 106, 106 ], [ 106, 107 ] + ] + }, + "available": { + "cannot_downgrade": true, + "coordinates": [ + [ 90, 8 ], + [ 2, 26 ], [ 2, 27 ], + [ 83, 117 ], [ 84, 117 ], + [ 96, 2 ], [ 97, 2 ], + [ 106, 106 ], [ 106, 107 ] + ] + } + } +} diff --git a/data/scenario_patches/ed85bec.parkpatch b/data/scenario_patches/ed85bec.parkpatch new file mode 100644 index 0000000000..6979acc4eb --- /dev/null +++ b/data/scenario_patches/ed85bec.parkpatch @@ -0,0 +1,11 @@ +{ + "scenario_name": "White Water Park (.sea)", + "sha256": "ed85becf8aeed8cbde47583cfe86c6fa621f1b8f0a3734acfb960277939e7699", + "land_ownership": { + "construction_rights_owned": { + "coordinates": [ + [ 42, 85 ], [ 89, 42 ] + ] + } + } +} diff --git a/data/scenario_patches/ffce0f2.parkpatch b/data/scenario_patches/ffce0f2.parkpatch new file mode 100644 index 0000000000..3cbe81dbd8 --- /dev/null +++ b/data/scenario_patches/ffce0f2.parkpatch @@ -0,0 +1,16 @@ +{ + "scenario_name": "Three Monkeys Park (.sea)", + "sha256": "ffce0f25ddcf6b788b7d260db4843740e2877240f4b03b77728ac1e232f5eb32", + "land_ownership": { + "owned": { + "coordinates": [ + [ 46, 22 ] + ] + }, + "unowned": { + "coordinates": [ + [ 89, 92 ] + ] + } + } +} diff --git a/data/scenario_patches/scenario_to_hash b/data/scenario_patches/scenario_to_hash index 4d295b5bad..47f911d5e4 100644 --- a/data/scenario_patches/scenario_to_hash +++ b/data/scenario_patches/scenario_to_hash @@ -104,4 +104,50 @@ 'Woodworm Park': ['66ab5d1', '66ab5d1e8412c94cd6bfa40a664167df7df651d67b90da2a612108212ebc98d3'], 'White Water Park': ['ba94426', - 'ba94426ecde1d6b375f566b155573e8a1471dcf62c651bafcb751f04f542cd5c'] \ No newline at end of file + 'ba94426ecde1d6b375f566b155573e8a1471dcf62c651bafcb751f04f542cd5c'] + +// RCTC - RCT1 Scenario names to hashes + 'coaster canyon': ['60cf30e', + '60cf30e881a5b43b696ace9c07597c21b55cec137e3b268621a7ec46312de538'], + 'grand glacier': ['3735942', + '3735942571f79464eb07fe8cac38e6ae670d9d87a917cec8e37857228690f7ff'], + "katie's dreamland": ['b8b572d', + 'b8b572d394b145535cdb20f66b0bee9a497683a5885e4d78af6773c5bc0323ff'], + "mel's world": ['bfaf504', + 'bfaf5045f8176a9928e118ece27a8dbf311466708c62cf1df976a926c900d639'], + 'pleasure island': ['143e51a', + '143e51ac96ee8250884b1c1d5f98e8621e8ee9ef59e2075da18e4beb6abaf344'], + 'rotting heights': ['a0b4362', + 'a0b4362535bad4fcc7bead0d62be1498ce0388dbbcb82d1c8407c8a0ce246483'], + 'three monkeys park': ['ffce0f2', + 'ffce0f25ddcf6b788b7d260db4843740e2877240f4b03b77728ac1e232f5eb32'], + 'trinity islands': ['5429ba0', + '5429ba0336e9937173d012a7f7b9a4c7924a7d7c6841f63e183d7a81edb4ef25'], + 'white water park': ['ed85bec', + 'ed85becf8aeed8cbde47583cfe86c6fa621f1b8f0a3734acfb960277939e7699'], + 'woodworm park': ['82c619d', + '82c619d167ef7472b990066e28372ed3a02218aea03d03c45f5269759d8367ee'] + +// RCTC - RCT2 Scenario names to hashes + 'antarctic - ecological salvage': ['d4307c3', + 'd4307c36d1065037decbe9b75be1342638a2581e230a3ba3cd08cab5c25175e5'], + 'asia - maharaja palace': ['59aea26', + '59aea26b8fe26a4154114be8514ee70a6f31d981c5b07429572021d6ce5e69ad'], + 'build your own six flags magic mountain': ['7f38f1b', + '7f38f1bf88c2d583aa795f0d0abbbe6cf9cccb7872ff8017f1c5d83ad95886df'], + 'dark age - castle': ['081feb1', + '081feb17ca7a7d0df50057169dcd78942ce96e472bf29f19665ff1811c514d43'], + 'infernal views': ['adffe2f', + 'adffe2ff1e06ebeb821bbf01263125dc40311a8350722c62908be8d1c8852259'], + 'n america - extreme hawaiian island': ['72cf3d2', + '72cf3d220740fd64f7681d3533320598cf6d3b71dff484bc43045e8d9d7a1a4b'], + 'prehistoric - stone age': ['b43b07e', + 'b43b07e47f2e6cb762a86760ac0242595617aa59bfd9811cec7e2dcc121ae367'], + 'roaring twenties - schneider cup': ['0d53bdc', + '0d53bdc076d75d86b31b6b3e6948e3d45671cf5aeff6b2b3c07a7618923223f5'], + 'six flags holland': ['8965a5c', + '8965a5c3b498dec016e6ac317616426ed84b0e9145f6c1d752c9942479758cce'], + 'six flags magic mountain': ['c1d4056', + 'c1d405642b698e0af9d23d3a23afe42f0c7d138c1398254a1c581608f79a3db3'], + 'south america - inca lost city': ['70ce3e1', + '70ce3e11f1dd59929a6d82d0f6f88897c95b94d1f9d4efd6ef3a0c6c449f966f'], diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 9245d571f2..f29a763531 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -193,7 +193,6 @@ namespace OpenRCT2::RCT1 ImportScenarioObjective(gameState); ImportSavedView(); - // TODO: investigate why Katie's Dreamland.s4 and .sea have different patches RCT12::FetchAndApplyScenarioPatch(_s4Path, _isScenario); FixNextGuestNumber(gameState); CountBlockSections();