Fix #370: Remove erroneously enabled WW/TT third remaps

ZeeMaji · web-flow · commit 273c220f1164 · 2025-04-18T09:28:39.000+02:00
diff --git a/objects/rct2tt/ride/rct2tt.ride.barnstrm.json b/objects/rct2tt/ride/rct2tt.ride.barnstrm.json
@@ -18,7 +18,7 @@
                 [
                     "light_blue",
                     "black",
-                    "bright_red"
+                    "yellow"
                 ]
             ],
             [
@@ -32,7 +32,7 @@
                 [
                     "bordeaux_red",
                     "white",
-                    "black"
+                    "yellow"
                 ]
             ]
         ],
@@ -53,7 +53,6 @@
                 "verticalSlopes": true,
                 "restraintAnimation": true
             },
-            "hasAdditionalColour2": true,
             "hasAdditionalColour1": true,
             "hasScreamingRiders": true,
             "loadingPositions": [
diff --git a/objects/rct2tt/ride/rct2tt.ride.battrram.json b/objects/rct2tt/ride/rct2tt.ride.battrram.json
@@ -16,14 +16,14 @@
                 [
                     "black",
                     "yellow",
-                    "bordeaux_red"
+                    "yellow"
                 ]
             ],
             [
                 [
                     "saturated_red",
                     "bright_red",
-                    "black"
+                    "yellow"
                 ]
             ],
             [
@@ -56,7 +56,6 @@
                 "flatToGentleSlopeWhileBankedTransitions": true,
                 "curvedLiftHill": true
             },
-            "hasAdditionalColour2": true,
             "hasAdditionalColour1": true,
             "hasScreamingRiders": true,
             "loadingPositions": [
diff --git a/objects/rct2tt/ride/rct2tt.ride.dragnfly.json b/objects/rct2tt/ride/rct2tt.ride.dragnfly.json
@@ -15,21 +15,21 @@
                 [
                     "black",
                     "light_orange",
-                    "black"
+                    "yellow"
                 ]
             ],
             [
                 [
                     "bright_red",
                     "yellow",
-                    "black"
+                    "yellow"
                 ]
             ],
             [
                 [
                     "dark_green",
                     "bright_red",
-                    "black"
+                    "yellow"
                 ]
             ]
         ],
@@ -50,7 +50,6 @@
                 "slopes8": 4,
                 "slopes16": 4
             },
-            "hasAdditionalColour2": true,
             "hasAdditionalColour1": true,
             "hasSwinging": true,
             "hasScreamingRiders": true,
diff --git a/objects/rct2tt/ride/rct2tt.ride.jetpackx.json b/objects/rct2tt/ride/rct2tt.ride.jetpackx.json
@@ -17,14 +17,14 @@
                 [
                     "bright_red",
                     "grey",
-                    "light_purple"
+                    "yellow"
                 ]
             ],
             [
                 [
                     "yellow",
                     "bordeaux_red",
-                    "bordeaux_red"
+                    "yellow"
                 ]
             ],
             [
@@ -51,7 +51,6 @@
                 "verticalSlopes": true,
                 "restraintAnimation": true
             },
-            "hasAdditionalColour2": true,
             "hasAdditionalColour1": true,
             "hasScreamingRiders": true,
             "loadingPositions": [
diff --git a/objects/rct2tt/ride/rct2tt.ride.pterodac.json b/objects/rct2tt/ride/rct2tt.ride.pterodac.json
@@ -18,14 +18,14 @@
                 [
                     "bright_red",
                     "yellow",
-                    "dark_purple"
+                    "yellow"
                 ]
             ],
             [
                 [
                     "teal",
                     "grey",
-                    "black"
+                    "yellow"
                 ]
             ]
         ],
@@ -55,7 +55,6 @@
                     "restraintAnimation": true
                 },
                 "hasInvertedSpriteSet": true,
-                "hasAdditionalColour2": true,
                 "spriteBoundsIncludeInvertedSet": true,
                 "hasAdditionalColour1": true,
                 "hasScreamingRiders": true,
@@ -91,7 +90,6 @@
                     "restraintAnimation": true
                 },
                 "hasInvertedSpriteSet": true,
-                "hasAdditionalColour2": true,
                 "hasAdditionalColour1": true,
                 "hasScreamingRiders": true,
                 "loadingPositions": [
diff --git a/objects/rct2ww/ride/rct2ww.ride.bomerang.json b/objects/rct2ww/ride/rct2ww.ride.bomerang.json
@@ -21,21 +21,21 @@
                 [
                     "bright_red",
                     "bright_yellow",
-                    "black"
+                    "yellow"
                 ]
             ],
             [
                 [
                     "light_blue",
                     "bright_red",
-                    "black"
+                    "yellow"
                 ]
             ],
             [
                 [
                     "yellow",
                     "bright_red",
-                    "black"
+                    "yellow"
                 ]
             ]
         ],
@@ -57,7 +57,6 @@
                     "flatBanked": true,
                     "restraintAnimation": true
                 },
-                "hasAdditionalColour2": true,
                 "hasAdditionalColour1": true,
                 "hasScreamingRiders": true,
                 "loadingPositions": [
@@ -79,7 +78,6 @@
                     "verticalSlopes": true,
                     "flatBanked": true
                 },
-                "hasAdditionalColour2": true,
                 "hasAdditionalColour1": true,
                 "hasScreamingRiders": true
             }
diff --git a/objects/rct2ww/ride/rct2ww.ride.congaeel.json b/objects/rct2ww/ride/rct2ww.ride.congaeel.json
@@ -39,7 +39,7 @@
                 [
                     "white",
                     "bordeaux_red",
-                    "bordeaux_red"
+                    "yellow"
                 ]
             ]
         ],
@@ -65,7 +65,6 @@
                     "corkscrews": true,
                     "restraintAnimation": true
                 },
-                "hasAdditionalColour2": true,
                 "hasAdditionalColour1": true,
                 "hasScreamingRiders": true,
                 "loadingPositions": [
@@ -96,7 +95,6 @@
                     "corkscrews": true,
                     "restraintAnimation": true
                 },
-                "hasAdditionalColour2": true,
                 "hasAdditionalColour1": true,
                 "hasScreamingRiders": true,
                 "loadingPositions": [
diff --git a/objects/rct2ww/ride/rct2ww.ride.football.json b/objects/rct2ww/ride/rct2ww.ride.football.json
@@ -23,14 +23,14 @@
                 [
                     "dark_green",
                     "dark_purple",
-                    "white"
+                    "yellow"
                 ]
             ],
             [
                 [
                     "white",
                     "grey",
-                    "bright_red"
+                    "yellow"
                 ]
             ]
         ],
@@ -51,7 +51,6 @@
                 "diagonalSlopes": true,
                 "restraintAnimation": true
             },
-            "hasAdditionalColour2": true,
             "hasAdditionalColour1": true,
             "hasSwinging": true,
             "hasScreamingRiders": true,
diff --git a/objects/rct2ww/ride/rct2ww.ride.rocket.json b/objects/rct2ww/ride/rct2ww.ride.rocket.json
@@ -24,14 +24,14 @@
                 [
                     "dark_green",
                     "dark_purple",
-                    "white"
+                    "yellow"
                 ]
             ],
             [
                 [
                     "white",
                     "grey",
-                    "bright_red"
+                    "yellow"
                 ]
             ]
         ],
@@ -52,7 +52,6 @@
                 "diagonalSlopes": true,
                 "restraintAnimation": true
             },
-            "hasAdditionalColour2": true,
             "hasAdditionalColour1": true,
             "hasSwinging": true,
             "hasScreamingRiders": true,
diff --git a/objects/rct2ww/ride/rct2ww.ride.sloth.json b/objects/rct2ww/ride/rct2ww.ride.sloth.json
@@ -23,14 +23,14 @@
                 [
                     "dark_green",
                     "dark_purple",
-                    "white"
+                    "yellow"
                 ]
             ],
             [
                 [
                     "white",
                     "grey",
-                    "bright_red"
+                    "yellow"
                 ]
             ]
         ],
@@ -51,7 +51,6 @@
                 "diagonalSlopes": true,
                 "restraintAnimation": true
             },
-            "hasAdditionalColour2": true,
             "hasAdditionalColour1": true,
             "hasSwinging": true,
             "hasScreamingRiders": true,

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`[`
`19`	`19`	`"light_blue",`
`20`	`20`	`"black",`
`21`		`- "bright_red"`
	`21`	`+ "yellow"`
`22`	`22`	`]`
`23`	`23`	`],`
`24`	`24`	`[`
`@@ -32,7 +32,7 @@`
`32`	`32`	`[`
`33`	`33`	`"bordeaux_red",`
`34`	`34`	`"white",`
`35`		`- "black"`
	`35`	`+ "yellow"`
`36`	`36`	`]`
`37`	`37`	`]`
`38`	`38`	`],`
`@@ -53,7 +53,6 @@`
`53`	`53`	`"verticalSlopes": true,`
`54`	`54`	`"restraintAnimation": true`
`55`	`55`	`},`
`56`		`- "hasAdditionalColour2": true,`
`57`	`56`	`"hasAdditionalColour1": true,`
`58`	`57`	`"hasScreamingRiders": true,`
`59`	`58`	`"loadingPositions": [`
Original file line number	Diff line number	Diff line change
`@@ -16,14 +16,14 @@`
`16`	`16`	`[`
`17`	`17`	`"black",`
`18`	`18`	`"yellow",`
`19`		`- "bordeaux_red"`
	`19`	`+ "yellow"`
`20`	`20`	`]`
`21`	`21`	`],`
`22`	`22`	`[`
`23`	`23`	`[`
`24`	`24`	`"saturated_red",`
`25`	`25`	`"bright_red",`
`26`		`- "black"`
	`26`	`+ "yellow"`
`27`	`27`	`]`
`28`	`28`	`],`
`29`	`29`	`[`
`@@ -56,7 +56,6 @@`
`56`	`56`	`"flatToGentleSlopeWhileBankedTransitions": true,`
`57`	`57`	`"curvedLiftHill": true`
`58`	`58`	`},`
`59`		`- "hasAdditionalColour2": true,`
`60`	`59`	`"hasAdditionalColour1": true,`
`61`	`60`	`"hasScreamingRiders": true,`
`62`	`61`	`"loadingPositions": [`
Original file line number	Diff line number	Diff line change
`@@ -15,21 +15,21 @@`
`15`	`15`	`[`
`16`	`16`	`"black",`
`17`	`17`	`"light_orange",`
`18`		`- "black"`
	`18`	`+ "yellow"`
`19`	`19`	`]`
`20`	`20`	`],`
`21`	`21`	`[`
`22`	`22`	`[`
`23`	`23`	`"bright_red",`
`24`	`24`	`"yellow",`
`25`		`- "black"`
	`25`	`+ "yellow"`
`26`	`26`	`]`
`27`	`27`	`],`
`28`	`28`	`[`
`29`	`29`	`[`
`30`	`30`	`"dark_green",`
`31`	`31`	`"bright_red",`
`32`		`- "black"`
	`32`	`+ "yellow"`
`33`	`33`	`]`
`34`	`34`	`]`
`35`	`35`	`],`
`@@ -50,7 +50,6 @@`
`50`	`50`	`"slopes8": 4,`
`51`	`51`	`"slopes16": 4`
`52`	`52`	`},`
`53`		`- "hasAdditionalColour2": true,`
`54`	`53`	`"hasAdditionalColour1": true,`
`55`	`54`	`"hasSwinging": true,`
`56`	`55`	`"hasScreamingRiders": true,`
Original file line number	Diff line number	Diff line change
`@@ -17,14 +17,14 @@`
`17`	`17`	`[`
`18`	`18`	`"bright_red",`
`19`	`19`	`"grey",`
`20`		`- "light_purple"`
	`20`	`+ "yellow"`
`21`	`21`	`]`
`22`	`22`	`],`
`23`	`23`	`[`
`24`	`24`	`[`
`25`	`25`	`"yellow",`
`26`	`26`	`"bordeaux_red",`
`27`		`- "bordeaux_red"`
	`27`	`+ "yellow"`
`28`	`28`	`]`
`29`	`29`	`],`
`30`	`30`	`[`
`@@ -51,7 +51,6 @@`
`51`	`51`	`"verticalSlopes": true,`
`52`	`52`	`"restraintAnimation": true`
`53`	`53`	`},`
`54`		`- "hasAdditionalColour2": true,`
`55`	`54`	`"hasAdditionalColour1": true,`
`56`	`55`	`"hasScreamingRiders": true,`
`57`	`56`	`"loadingPositions": [`
Original file line number	Diff line number	Diff line change
`@@ -18,14 +18,14 @@`
`18`	`18`	`[`
`19`	`19`	`"bright_red",`
`20`	`20`	`"yellow",`
`21`		`- "dark_purple"`
	`21`	`+ "yellow"`
`22`	`22`	`]`
`23`	`23`	`],`
`24`	`24`	`[`
`25`	`25`	`[`
`26`	`26`	`"teal",`
`27`	`27`	`"grey",`
`28`		`- "black"`
	`28`	`+ "yellow"`
`29`	`29`	`]`
`30`	`30`	`]`
`31`	`31`	`],`
`@@ -55,7 +55,6 @@`
`55`	`55`	`"restraintAnimation": true`
`56`	`56`	`},`
`57`	`57`	`"hasInvertedSpriteSet": true,`
`58`		`- "hasAdditionalColour2": true,`
`59`	`58`	`"spriteBoundsIncludeInvertedSet": true,`
`60`	`59`	`"hasAdditionalColour1": true,`
`61`	`60`	`"hasScreamingRiders": true,`
`@@ -91,7 +90,6 @@`
`91`	`90`	`"restraintAnimation": true`
`92`	`91`	`},`
`93`	`92`	`"hasInvertedSpriteSet": true,`
`94`		`- "hasAdditionalColour2": true,`
`95`	`93`	`"hasAdditionalColour1": true,`
`96`	`94`	`"hasScreamingRiders": true,`
`97`	`95`	`"loadingPositions": [`
Original file line number	Diff line number	Diff line change
`@@ -21,21 +21,21 @@`
`21`	`21`	`[`
`22`	`22`	`"bright_red",`
`23`	`23`	`"bright_yellow",`
`24`		`- "black"`
	`24`	`+ "yellow"`
`25`	`25`	`]`
`26`	`26`	`],`
`27`	`27`	`[`
`28`	`28`	`[`
`29`	`29`	`"light_blue",`
`30`	`30`	`"bright_red",`
`31`		`- "black"`
	`31`	`+ "yellow"`
`32`	`32`	`]`
`33`	`33`	`],`
`34`	`34`	`[`
`35`	`35`	`[`
`36`	`36`	`"yellow",`
`37`	`37`	`"bright_red",`
`38`		`- "black"`
	`38`	`+ "yellow"`
`39`	`39`	`]`
`40`	`40`	`]`
`41`	`41`	`],`
`@@ -57,7 +57,6 @@`
`57`	`57`	`"flatBanked": true,`
`58`	`58`	`"restraintAnimation": true`
`59`	`59`	`},`
`60`		`- "hasAdditionalColour2": true,`
`61`	`60`	`"hasAdditionalColour1": true,`
`62`	`61`	`"hasScreamingRiders": true,`
`63`	`62`	`"loadingPositions": [`
`@@ -79,7 +78,6 @@`
`79`	`78`	`"verticalSlopes": true,`
`80`	`79`	`"flatBanked": true`
`81`	`80`	`},`
`82`		`- "hasAdditionalColour2": true,`
`83`	`81`	`"hasAdditionalColour1": true,`
`84`	`82`	`"hasScreamingRiders": true`
`85`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,14 +23,14 @@`
`23`	`23`	`[`
`24`	`24`	`"dark_green",`
`25`	`25`	`"dark_purple",`
`26`		`- "white"`
	`26`	`+ "yellow"`
`27`	`27`	`]`
`28`	`28`	`],`
`29`	`29`	`[`
`30`	`30`	`[`
`31`	`31`	`"white",`
`32`	`32`	`"grey",`
`33`		`- "bright_red"`
	`33`	`+ "yellow"`
`34`	`34`	`]`
`35`	`35`	`]`
`36`	`36`	`],`
`@@ -51,7 +51,6 @@`
`51`	`51`	`"diagonalSlopes": true,`
`52`	`52`	`"restraintAnimation": true`
`53`	`53`	`},`
`54`		`- "hasAdditionalColour2": true,`
`55`	`54`	`"hasAdditionalColour1": true,`
`56`	`55`	`"hasSwinging": true,`
`57`	`56`	`"hasScreamingRiders": true,`
Original file line number	Diff line number	Diff line change
`@@ -24,14 +24,14 @@`
`24`	`24`	`[`
`25`	`25`	`"dark_green",`
`26`	`26`	`"dark_purple",`
`27`		`- "white"`
	`27`	`+ "yellow"`
`28`	`28`	`]`
`29`	`29`	`],`
`30`	`30`	`[`
`31`	`31`	`[`
`32`	`32`	`"white",`
`33`	`33`	`"grey",`
`34`		`- "bright_red"`
	`34`	`+ "yellow"`
`35`	`35`	`]`
`36`	`36`	`]`
`37`	`37`	`],`
`@@ -52,7 +52,6 @@`
`52`	`52`	`"diagonalSlopes": true,`
`53`	`53`	`"restraintAnimation": true`
`54`	`54`	`},`
`55`		`- "hasAdditionalColour2": true,`
`56`	`55`	`"hasAdditionalColour1": true,`
`57`	`56`	`"hasSwinging": true,`
`58`	`57`	`"hasScreamingRiders": true,`