From fb771b6923e8a50098f49485ffba2a69e2a28ade Mon Sep 17 00:00:00 2001
From: Harry Hopkinson <63599884+Harry-Hopkinson@users.noreply.github.com>
Date: Sun, 1 Sep 2024 22:57:26 +0100
Subject: [PATCH] Fix #22653: Port water height fixes to parkpatch system
 (#22656)

---
 data/scenario_patches/17f0c69.parkpatch | 16 +++++++++++++++-
 data/scenario_patches/1ee9f4c.parkpatch | 12 ++++++++++++
 data/scenario_patches/2ca68df.parkpatch | 19 +++++++++++++++++++
 data/scenario_patches/41c7297.parkpatch | 12 ++++++++++++
 data/scenario_patches/47e5512.parkpatch | 10 +++++++++-
 data/scenario_patches/4b1cc0e.parkpatch | 12 ++++++++++++
 data/scenario_patches/7f38f1b.parkpatch | 10 +++++++++-
 data/scenario_patches/7ffdb44.parkpatch | 10 +++++++++-
 data/scenario_patches/aead175.parkpatch | 19 +++++++++++++++++++
 data/scenario_patches/bfbd61f.parkpatch | 12 ++++++++++++
 data/scenario_patches/c1d4056.parkpatch | 10 +++++++++-
 data/scenario_patches/c67e91e.parkpatch | 12 ++++++++++++
 data/scenario_patches/c82272a.parkpatch | 10 +++++++++-
 data/scenario_patches/ce24961.parkpatch | 12 ++++++++++++
 data/scenario_patches/d4307c3.parkpatch | 16 +++++++++++++++-
 data/scenario_patches/fd4c6ee.parkpatch | 10 +++++++++-
 data/scenario_patches/scenario_to_hash  | 16 ++++++++++++++++
 distribution/changelog.txt              |  1 +
 18 files changed, 211 insertions(+), 8 deletions(-)
 create mode 100644 data/scenario_patches/1ee9f4c.parkpatch
 create mode 100644 data/scenario_patches/2ca68df.parkpatch
 create mode 100644 data/scenario_patches/41c7297.parkpatch
 create mode 100644 data/scenario_patches/4b1cc0e.parkpatch
 create mode 100644 data/scenario_patches/aead175.parkpatch
 create mode 100644 data/scenario_patches/bfbd61f.parkpatch
 create mode 100644 data/scenario_patches/c67e91e.parkpatch
 create mode 100644 data/scenario_patches/ce24961.parkpatch

diff --git a/data/scenario_patches/17f0c69.parkpatch b/data/scenario_patches/17f0c69.parkpatch
index ec60ff4a52..7346e4606e 100644
--- a/data/scenario_patches/17f0c69.parkpatch
+++ b/data/scenario_patches/17f0c69.parkpatch
@@ -18,5 +18,19 @@
                 [ 106, 106 ], [ 106, 107 ]
             ]
         }
-    }
+    },
+    "water": [
+        {
+            "height": 112,
+            "coordinates": [
+                [ 66, 96 ], [ 65, 96 ], [ 65, 95 ], [ 64, 95 ], [ 63, 95 ], [ 62, 95 ], [ 61, 95 ], [ 61, 96 ], 
+                [ 60, 96 ], [ 59, 96 ], [ 58, 96 ], [ 58, 97 ], [ 57, 97 ], [ 56, 97 ], [ 56, 98 ], [ 55, 98 ], 
+                [ 55, 99 ], [ 54, 99 ], [ 53, 99 ], [ 52, 99 ], [ 52, 100 ], [ 51, 99 ], [ 50, 99 ], [ 50, 98 ], 
+                [ 49, 98 ], [ 49, 97 ], [ 48, 97 ], [ 47, 97 ], [ 47, 96 ], [ 46, 96 ], [ 46, 95 ], [ 45, 95 ], 
+                [ 45, 94 ], [ 44, 94 ], [ 43, 94 ], [ 43, 93 ], [ 42, 94 ], [ 41, 94 ], [ 41, 93 ], [ 40, 93 ], 
+                [ 40, 92 ], [ 39, 92 ], [ 39, 91 ], [ 38, 91 ], [ 37, 91 ], [ 37, 90 ], [ 36, 90 ], [ 35, 90 ], 
+                [ 35, 91 ], [ 34, 91 ], [ 33, 91 ]
+            ]
+        }
+    ]
 }
diff --git a/data/scenario_patches/1ee9f4c.parkpatch b/data/scenario_patches/1ee9f4c.parkpatch
new file mode 100644
index 0000000000..71e7c336ca
--- /dev/null
+++ b/data/scenario_patches/1ee9f4c.parkpatch
@@ -0,0 +1,12 @@
+{
+    "scenario_name": "Geoffrey Gardens",
+    "sha256": "1ee9f4c0520ff48c866df90931d431694d3727f9f772ffbe680c9f857f0dca2e",
+    "water": [
+        {
+            "height": 96,
+            "coordinates": [
+                [ 60, 1 ], [ 60, 2 ]
+            ]
+        }
+    ]
+}
diff --git a/data/scenario_patches/2ca68df.parkpatch b/data/scenario_patches/2ca68df.parkpatch
new file mode 100644
index 0000000000..ee2702be41
--- /dev/null
+++ b/data/scenario_patches/2ca68df.parkpatch
@@ -0,0 +1,19 @@
+{
+    "scenario_name": "Botany Breakers (.sea)",
+    "sha256": "2ca68dfb708fb0a6fdc18e3f4199d8e31355ead83808e9a4de52b7fff9b7ba4f",
+    "water": [
+        {
+            "height": 96,
+            "coordinates": [
+                [ 39, 50 ], [ 39, 51 ], [ 39, 52 ], [ 39, 53 ], [ 39, 54 ], [ 39, 55 ], 
+                [ 40, 51 ], [ 40, 52 ], [ 40, 53 ], [ 40, 54 ], 
+                [ 41, 52 ], [ 41, 53 ], [ 41, 54 ], [ 41, 55 ], 
+                [ 42, 51 ], [ 42, 52 ], [ 42, 53 ], [ 42, 54 ], [ 42, 55 ], 
+                [ 43, 50 ], [ 43, 51 ], [ 43, 52 ], [ 43, 53 ], [ 43, 54 ], [ 43, 55 ], 
+                [ 44, 50 ], [ 44, 51 ], [ 44, 52 ], [ 44, 54 ], [ 44, 55 ], [ 44, 56 ], 
+                [ 45, 55 ], [ 45, 56 ], [ 45, 57 ], 
+                [ 46, 55 ], [ 46, 56 ], [ 46, 57 ]
+            ]
+        }
+    ]
+}
diff --git a/data/scenario_patches/41c7297.parkpatch b/data/scenario_patches/41c7297.parkpatch
new file mode 100644
index 0000000000..9a84c12941
--- /dev/null
+++ b/data/scenario_patches/41c7297.parkpatch
@@ -0,0 +1,12 @@
+{
+    "scenario_name": "Geoffrey Gardens (.sea)",
+    "sha256": "41c72970dece69028735a101430e16cad8cb768269184e5fd62cb260edaf05ff",
+    "water": [
+        {
+            "height": 96,
+            "coordinates": [
+                [ 60, 1 ], [ 60, 2 ]
+            ]
+        }
+    ]
+}
diff --git a/data/scenario_patches/47e5512.parkpatch b/data/scenario_patches/47e5512.parkpatch
index 667eeab901..4c67385af3 100644
--- a/data/scenario_patches/47e5512.parkpatch
+++ b/data/scenario_patches/47e5512.parkpatch
@@ -7,5 +7,13 @@
                 [ 53, 79 ]
             ]
         }
-    }
+    },
+    "water": [
+        {
+            "height": 288,
+            "coordinates": [
+                [ 86, 24 ], [ 86, 25 ], [ 87, 23 ], [ 87, 24 ], [ 87, 25 ], [ 88, 22 ], [ 88, 23 ], [ 88, 24 ], [ 89, 22 ], [ 89, 23 ]
+            ]
+        }
+    ]
 }
diff --git a/data/scenario_patches/4b1cc0e.parkpatch b/data/scenario_patches/4b1cc0e.parkpatch
new file mode 100644
index 0000000000..715a2d92bb
--- /dev/null
+++ b/data/scenario_patches/4b1cc0e.parkpatch
@@ -0,0 +1,12 @@
+{
+    "scenario_name": "Crumbly Woods (.sea)",
+    "sha256": "4b1cc0eefa657a801382fd27203582efff3a5017db440d5fd25cad43a601c78f",
+    "water": [
+        {
+            "height": 96,
+            "coordinates": [
+                [ 13, 83 ]
+            ]
+        }
+    ]
+}
diff --git a/data/scenario_patches/7f38f1b.parkpatch b/data/scenario_patches/7f38f1b.parkpatch
index beb04fecd5..0220253bfc 100644
--- a/data/scenario_patches/7f38f1b.parkpatch
+++ b/data/scenario_patches/7f38f1b.parkpatch
@@ -14,5 +14,13 @@
                 [ 46, 51 ], [ 58, 159 ], [ 71, 201 ], [ 126, 15 ], [ 190, 6 ]
             ]
         }
-    }
+    },
+    "water": [
+        {
+            "height": 112,
+            "coordinates": [
+                [ 103, 76 ], [ 104, 76 ]
+            ]
+        }
+    ]
 }
diff --git a/data/scenario_patches/7ffdb44.parkpatch b/data/scenario_patches/7ffdb44.parkpatch
index 084f71387e..b5b15e9752 100644
--- a/data/scenario_patches/7ffdb44.parkpatch
+++ b/data/scenario_patches/7ffdb44.parkpatch
@@ -14,5 +14,13 @@
                 [ 46, 51 ], [ 58, 159 ], [ 71, 201 ], [ 126, 15 ], [ 190, 6 ]
             ]
         }
-    }
+    },
+    "water": [
+        {
+            "height": 112,
+            "coordinates": [
+                [ 103, 76 ], [ 104, 76 ]
+            ]
+        }
+    ]
 }
diff --git a/data/scenario_patches/aead175.parkpatch b/data/scenario_patches/aead175.parkpatch
new file mode 100644
index 0000000000..2ddf061e99
--- /dev/null
+++ b/data/scenario_patches/aead175.parkpatch
@@ -0,0 +1,19 @@
+{
+    "scenario_name": "Botany Breakers",
+    "sha256": "aead175fbe37f3c98321080482689e30092cde7474de7266b01d288656cc516d",
+    "water": [
+        {
+            "height": 96,
+            "coordinates": [
+                [ 39, 50 ], [ 39, 51 ], [ 39, 52 ], [ 39, 53 ], [ 39, 54 ], [ 39, 55 ], 
+                [ 40, 51 ], [ 40, 52 ], [ 40, 53 ], [ 40, 54 ], 
+                [ 41, 52 ], [ 41, 53 ], [ 41, 54 ], [ 41, 55 ], 
+                [ 42, 51 ], [ 42, 52 ], [ 42, 53 ], [ 42, 54 ], [ 42, 55 ], 
+                [ 43, 50 ], [ 43, 51 ], [ 43, 52 ], [ 43, 53 ], [ 43, 54 ], [ 43, 55 ], 
+                [ 44, 50 ], [ 44, 51 ], [ 44, 52 ], [ 44, 54 ], [ 44, 55 ], [ 44, 56 ], 
+                [ 45, 55 ], [ 45, 56 ], [ 45, 57 ], 
+                [ 46, 55 ], [ 46, 56 ], [ 46, 57 ]
+            ]
+        }
+    ]
+}
diff --git a/data/scenario_patches/bfbd61f.parkpatch b/data/scenario_patches/bfbd61f.parkpatch
new file mode 100644
index 0000000000..0894d9bbe6
--- /dev/null
+++ b/data/scenario_patches/bfbd61f.parkpatch
@@ -0,0 +1,12 @@
+{
+    "scenario_name": "Hydro Hills",
+    "sha256": "bfbd61f6d22cdc5f2e017935f4e9e5969dece159218a08c695bfd727382cc717",
+    "water": [
+        {
+            "height": 288,
+            "coordinates": [
+                [ 81, 8 ], [ 82, 7 ], [ 82, 8 ], [ 82, 9 ], [ 83, 8 ], [ 83, 9 ]
+            ]
+        }
+    ]
+}
diff --git a/data/scenario_patches/c1d4056.parkpatch b/data/scenario_patches/c1d4056.parkpatch
index 0d2e6cff5f..dbfa0437f3 100644
--- a/data/scenario_patches/c1d4056.parkpatch
+++ b/data/scenario_patches/c1d4056.parkpatch
@@ -14,5 +14,13 @@
                 [ 46, 51 ], [ 58, 159 ], [ 71, 201 ], [ 126, 15 ], [ 190, 6 ]
             ]
         }
-    }
+    },
+    "water": [
+        {
+            "height": 112,
+            "coordinates": [
+                [ 103, 76 ], [ 104, 76 ]
+            ]
+        }
+    ]
 }
diff --git a/data/scenario_patches/c67e91e.parkpatch b/data/scenario_patches/c67e91e.parkpatch
new file mode 100644
index 0000000000..b974f32634
--- /dev/null
+++ b/data/scenario_patches/c67e91e.parkpatch
@@ -0,0 +1,12 @@
+{
+    "scenario_name": "Crumbly Woods",
+    "sha256": "c67e91ee0fac0b377b81f73d3b41eadaf4bfdabd277344091d5b83a4ef4b2b3a",
+    "water": [
+        {
+            "height": 96,
+            "coordinates": [
+                [ 13, 83 ]
+            ]
+        }
+    ]
+}
diff --git a/data/scenario_patches/c82272a.parkpatch b/data/scenario_patches/c82272a.parkpatch
index 37c4b006c9..7d8c7eda46 100644
--- a/data/scenario_patches/c82272a.parkpatch
+++ b/data/scenario_patches/c82272a.parkpatch
@@ -14,5 +14,13 @@
                 [ 46, 51 ], [ 58, 159 ], [ 71, 201 ], [ 126, 15 ], [ 190, 6 ]
             ]
         }
-    }
+    },
+    "water": [
+        {
+            "height": 112,
+            "coordinates": [
+                [ 103, 76 ], [ 104, 76 ]
+            ]
+        }
+    ]
 }
diff --git a/data/scenario_patches/ce24961.parkpatch b/data/scenario_patches/ce24961.parkpatch
new file mode 100644
index 0000000000..7a1ce0c8b4
--- /dev/null
+++ b/data/scenario_patches/ce24961.parkpatch
@@ -0,0 +1,12 @@
+{
+    "scenario_name": "Hydro Hills (.sea)",
+    "sha256": "ce249614e735c560c5019318bc6fa8603ba6630576f7fb038def0bdac3e143ef",
+    "water": [
+        {
+            "height": 288,
+            "coordinates": [
+                [ 81, 8 ], [ 82, 7 ], [ 82, 8 ], [ 82, 9 ], [ 83, 8 ], [ 83, 9 ]
+            ]
+        }
+    ]
+}
diff --git a/data/scenario_patches/d4307c3.parkpatch b/data/scenario_patches/d4307c3.parkpatch
index 0c658ef9ac..d5f0e38670 100644
--- a/data/scenario_patches/d4307c3.parkpatch
+++ b/data/scenario_patches/d4307c3.parkpatch
@@ -18,5 +18,19 @@
                 [ 106, 106 ], [ 106, 107 ]
             ]
         }
-    }
+    },
+    "water": [
+        {
+            "height": 112,
+            "coordinates": [
+                [ 66, 96 ], [ 65, 96 ], [ 65, 95 ], [ 64, 95 ], [ 63, 95 ], [ 62, 95 ], [ 61, 95 ], [ 61, 96 ], 
+                [ 60, 96 ], [ 59, 96 ], [ 58, 96 ], [ 58, 97 ], [ 57, 97 ], [ 56, 97 ], [ 56, 98 ], [ 55, 98 ], 
+                [ 55, 99 ], [ 54, 99 ], [ 53, 99 ], [ 52, 99 ], [ 52, 100 ], [ 51, 99 ], [ 50, 99 ], [ 50, 98 ], 
+                [ 49, 98 ], [ 49, 97 ], [ 48, 97 ], [ 47, 97 ], [ 47, 96 ], [ 46, 96 ], [ 46, 95 ], [ 45, 95 ], 
+                [ 45, 94 ], [ 44, 94 ], [ 43, 94 ], [ 43, 93 ], [ 42, 94 ], [ 41, 94 ], [ 41, 93 ], [ 40, 93 ], 
+                [ 40, 92 ], [ 39, 92 ], [ 39, 91 ], [ 38, 91 ], [ 37, 91 ], [ 37, 90 ], [ 36, 90 ], [ 35, 90 ], 
+                [ 35, 91 ], [ 34, 91 ], [ 33, 91 ]
+            ]
+        }
+    ]
 }
diff --git a/data/scenario_patches/fd4c6ee.parkpatch b/data/scenario_patches/fd4c6ee.parkpatch
index 8790332f0f..cb971f7fb2 100644
--- a/data/scenario_patches/fd4c6ee.parkpatch
+++ b/data/scenario_patches/fd4c6ee.parkpatch
@@ -12,5 +12,13 @@
                 [ 53, 79 ]
             ]
         }
-    }
+    },
+    "water": [
+        {
+            "height": 288,
+            "coordinates": [
+                [ 86, 24 ], [ 86, 25 ], [ 87, 23 ], [ 87, 24 ], [ 87, 25 ], [ 88, 22 ], [ 88, 23 ], [ 88, 24 ], [ 89, 22 ], [ 89, 23 ]
+            ]
+        }
+    ]
 }
diff --git a/data/scenario_patches/scenario_to_hash b/data/scenario_patches/scenario_to_hash
index c687daa473..6d352dc211 100644
--- a/data/scenario_patches/scenario_to_hash
+++ b/data/scenario_patches/scenario_to_hash
@@ -7,6 +7,8 @@
                      '8cd8484dd39c03485cdbd490509e19b252478810fb1fbce55582a2e22f9b69f6'],
  'Beach Barbecue Blast': ['1340eef',
                           '1340eefc16e867a39eb597febabf12a9207146615fb419de20f486e2f06242de'],
+ 'Botany Breakers': ['aead175',
+                     'aead175fbe37f3c98321080482689e30092cde7474de7266b01d288656cc516d'],
  'Build your own Six Flags Holland': ['3ff5604',
                                       '3ff5604c8b905bdfa3b4b8459f0050d87468bf58b2c9105726827b7428791622'],
  'Build your own Six Flags Magic Mountain': ['7ffdb44',
@@ -71,14 +73,20 @@
                               '608cd8a781cde0ae3604fc291f027f14354396700bc5f22292e3de0272f6fe05'],
  'Coaster Canyon': ['68a69f3',
                     '68a69f3c7db661430ce94e23caba7e31d14e822ea13f4ad32e5455c3c26354fa'],
+ 'Crumbly Woods': [ 'c67e91e',
+                    'c67e91ee0fac0b377b81f73d3b41eadaf4bfdabd277344091d5b83a4ef4b2b3a'],
  'Dynamite Dunes': ['287e87d',
                     '287e87db95f51dd1594b7568bbdd22cadece87749216d2f65a6ff3b506018eb3'],
  'Fort Anachronism': ['e93677f',
                       'e93677fc42c8b657fddb3c92bfeebcda868c7dd2d2a352f719302778a1c676bd'],
+ 'Geoffrey Gardens': [ '1ee9f4c',
+                       '1ee9f4c0520ff48c866df90931d431694d3727f9f772ffbe680c9f857f0dca2e'],
  'Grand Glacier': ['92f4b50',
                    '92f4b50037a2f85d3fb05ce6a07e27d73c6e61ab2cb5f8b00f5c2f98e95b356c'],
  'Haunted Harbour': ['102a1c5',
                      '102a1c52853e77b6efd448a44572a862fa440615b4ea9ae5d7fb31c48c96aac9'],
+ 'Hydro Hills': ['bfbd61f',
+                 'bfbd61f6d22cdc5f2e017935f4e9e5969dece159218a08c695bfd727382cc717'],
  'katie\'s dreamland': ['73d0921',
                         '73d0921f1d49388ffb4deb300c6ebb3920564410c2239580a7d1145fa54c2d4a'],
  'Leafy Lake': ['83bd798',
@@ -113,10 +121,16 @@
 // RCTC - RCT1 Scenario names to hashes
  'coaster canyon': ['60cf30e',
                     '60cf30e881a5b43b696ace9c07597c21b55cec137e3b268621a7ec46312de538'],
+ 'crumbly woods': ['4b1cc0e',
+                   '4b1cc0eefa657a801382fd27203582efff3a5017db440d5fd25cad43a601c78f'],
+ 'geoffrey gardens': ['41c7297',
+                      '41c72970dece69028735a101430e16cad8cb768269184e5fd62cb260edaf05ff'],
  'grand glacier': ['3735942',
                    '3735942571f79464eb07fe8cac38e6ae670d9d87a917cec8e37857228690f7ff'],
  'Haunted Harbour': ['b2cebe1',
                       'b2cebe149b2330e071a028d079f6632af144fb44e076a5eca89780eb4007e136'],
+ 'hydro hills': ['ce24961',
+                 'ce249614e735c560c5019318bc6fa8603ba6630576f7fb038def0bdac3e143ef']
  'katie\'s dreamland': ['b8b572d',
                         'b8b572d394b145535cdb20f66b0bee9a497683a5885e4d78af6773c5bc0323ff'],
  'mel\'s world': ['bfaf504',
@@ -149,6 +163,8 @@
                      '1be4b0b2a37669bfae985a73b3c05f7e0a3ace80fb45efbcd7ccfbd9cc99c31f'],
  'Beach Barbecue Blast': ['b4728d2',
                           'b4728d2af7c6947178fbb8faaba883b1670f9741c59795687f55600832eaf1d0'],
+ 'botany breakers': ['2ca68df',
+                     '2ca68dfb708fb0a6fdc18e3f4199d8e31355ead83808e9a4de52b7fff9b7ba4f'],
  'Build your own Six Flags Holland': ['d18eca1',
                                       'd18eca150bd642ebe279bd6700e4914b63a2b589f0c37ba346de54adbbbb8055'],
  'build your own six flags magic mountain': ['7f38f1b',
diff --git a/distribution/changelog.txt b/distribution/changelog.txt
index ac5768eed2..708ca31ca7 100644
--- a/distribution/changelog.txt
+++ b/distribution/changelog.txt
@@ -1,5 +1,6 @@
 0.4.15 (in development)
 ------------------------------------------------------------------------
+- Fix: [#22653] Add several .parkpatch files for missing water tiles in RCT1 and RCT2 scenarios.
 
 0.4.14 (2024-09-01)
 ------------------------------------------------------------------------