From 88ee497e9ec5c33ead5a9e69a5cb9aa5892811b8 Mon Sep 17 00:00:00 2001
From: ZeeMaji <42477864+ZeeMaji@users.noreply.github.com>
Date: Thu, 9 Jan 2025 15:58:50 -0500
Subject: [PATCH] Fix RCT1 inverted train diagonal transitions

---
 .../rct1.ride.inverted_trains/object.json     | 36 ++++++------
 .../object.json                               | 54 +++++++++---------
 .../rct1ll.ride.face_off_cars/object.json     | 56 +++++++++----------
 3 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/objects/rct1/ride/rct1.ride.inverted_trains/object.json b/objects/rct1/ride/rct1.ride.inverted_trains/object.json
index 77defc077f..2101e33c92 100644
--- a/objects/rct1/ride/rct1.ride.inverted_trains/object.json
+++ b/objects/rct1/ride/rct1.ride.inverted_trains/object.json
@@ -174,21 +174,21 @@
         "$CSG[19386..19389]",
         "$CSG[19402..19405]",
         "$CSG[19110]",
-        "$CSG[19406]",
+        "$CSG[19422]",
         "$CSG[19111]",
-        "$CSG[19407]",
+        "$CSG[19423]",
         "$CSG[19112]",
-        "$CSG[19408]",
+        "$CSG[19424]",
         "$CSG[19113]",
-        "$CSG[19409]",
+        "$CSG[19425]",
         "$CSG[19114]",
-        "$CSG[19410]",
+        "$CSG[19426]",
         "$CSG[19115]",
-        "$CSG[19411]",
+        "$CSG[19427]",
         "$CSG[19116]",
-        "$CSG[19412]",
+        "$CSG[19428]",
         "$CSG[19117]",
-        "$CSG[19413]",
+        "$CSG[19429]",
         "$CSG[19078..19109]",
         "$CSG[19218..19221]",
         "$CSG[19238..19241]",
@@ -201,7 +201,7 @@
         "$CSG[19234..19237]",
         "$CSG[19254..19257]",
         "$CSG[19118..19133]",
-        "$CSG[19414..19429]",
+        "$CSG[19406..19421]",
         "$CSG[19258..19337]",
         "$CSG[19362]",
         "$CSG[19365]",
@@ -294,21 +294,21 @@
         "$CSG[19786..19789]",
         "$CSG[19802..19805]",
         "$CSG[19510]",
-        "$CSG[19806]",
+        "$CSG[19822]",
         "$CSG[19511]",
-        "$CSG[19807]",
+        "$CSG[19823]",
         "$CSG[19512]",
-        "$CSG[19808]",
+        "$CSG[19824]",
         "$CSG[19513]",
-        "$CSG[19809]",
+        "$CSG[19825]",
         "$CSG[19514]",
-        "$CSG[19810]",
+        "$CSG[19826]",
         "$CSG[19515]",
-        "$CSG[19811]",
+        "$CSG[19827]",
         "$CSG[19516]",
-        "$CSG[19812]",
+        "$CSG[19828]",
         "$CSG[19517]",
-        "$CSG[19813]",
+        "$CSG[19829]",
         "$CSG[19478..19509]",
         "$CSG[19618..19621]",
         "$CSG[19638..19641]",
@@ -321,7 +321,7 @@
         "$CSG[19634..19637]",
         "$CSG[19654..19657]",
         "$CSG[19518..19533]",
-        "$CSG[19814..19829]",
+        "$CSG[19806..19821]",
         "$CSG[19658..19737]",
         "$CSG[19762]",
         "$CSG[19765]",
diff --git a/objects/rct1/ride/rct1ll.ride.4_across_inverted_trains/object.json b/objects/rct1/ride/rct1ll.ride.4_across_inverted_trains/object.json
index 4386228c16..d82b92bc42 100644
--- a/objects/rct1/ride/rct1ll.ride.4_across_inverted_trains/object.json
+++ b/objects/rct1/ride/rct1ll.ride.4_across_inverted_trains/object.json
@@ -168,21 +168,21 @@
         "$CSG[20438..20441]",
         "$CSG[20454..20457]",
         "$CSG[20162]",
-        "$CSG[20458]",
+        "$CSG[20474]",
         "$CSG[20163]",
-        "$CSG[20459]",
+        "$CSG[20475]",
         "$CSG[20164]",
-        "$CSG[20460]",
+        "$CSG[20476]",
         "$CSG[20165]",
-        "$CSG[20461]",
+        "$CSG[20477]",
         "$CSG[20166]",
-        "$CSG[20462]",
+        "$CSG[20478]",
         "$CSG[20167]",
-        "$CSG[20463]",
+        "$CSG[20479]",
         "$CSG[20168]",
-        "$CSG[20464]",
+        "$CSG[20480]",
         "$CSG[20169]",
-        "$CSG[20465]",
+        "$CSG[20481]",
         "$CSG[20130..20161]",
         "$CSG[20270..20273]",
         "$CSG[20290..20293]",
@@ -195,7 +195,7 @@
         "$CSG[20286..20289]",
         "$CSG[20306..20309]",
         "$CSG[20170..20185]",
-        "$CSG[20466..20481]",
+        "$CSG[20458..20473]",
         "$CSG[20310..20389]",
         "$CSG[20414]",
         "$CSG[20417]",
@@ -288,21 +288,21 @@
         "$CSG[20838..20841]",
         "$CSG[20854..20857]",
         "$CSG[20562]",
-        "$CSG[20858]",
+        "$CSG[20874]",
         "$CSG[20563]",
-        "$CSG[20859]",
+        "$CSG[20875]",
         "$CSG[20564]",
-        "$CSG[20860]",
+        "$CSG[20876]",
         "$CSG[20565]",
-        "$CSG[20861]",
+        "$CSG[20877]",
         "$CSG[20566]",
-        "$CSG[20862]",
+        "$CSG[20878]",
         "$CSG[20567]",
-        "$CSG[20863]",
+        "$CSG[20879]",
         "$CSG[20568]",
-        "$CSG[20864]",
+        "$CSG[20880]",
         "$CSG[20569]",
-        "$CSG[20865]",
+        "$CSG[20881]",
         "$CSG[20530..20561]",
         "$CSG[20670..20673]",
         "$CSG[20690..20693]",
@@ -315,7 +315,7 @@
         "$CSG[20686..20689]",
         "$CSG[20706..20709]",
         "$CSG[20570..20585]",
-        "$CSG[20866..20881]",
+        "$CSG[20858..20873]",
         "$CSG[20710..20789]",
         "$CSG[20814]",
         "$CSG[20817]",
@@ -408,21 +408,21 @@
         "$CSG[21238..21241]",
         "$CSG[21254..21257]",
         "$CSG[20962]",
-        "$CSG[21258]",
+        "$CSG[21274]",
         "$CSG[20963]",
-        "$CSG[21259]",
+        "$CSG[21275]",
         "$CSG[20964]",
-        "$CSG[21260]",
+        "$CSG[21276]",
         "$CSG[20965]",
-        "$CSG[21261]",
+        "$CSG[21277]",
         "$CSG[20966]",
-        "$CSG[21262]",
+        "$CSG[21278]",
         "$CSG[20967]",
-        "$CSG[21263]",
+        "$CSG[21279]",
         "$CSG[20968]",
-        "$CSG[21264]",
+        "$CSG[21280]",
         "$CSG[20969]",
-        "$CSG[21265]",
+        "$CSG[21281]",
         "$CSG[20930..20961]",
         "$CSG[21070..21073]",
         "$CSG[21090..21093]",
@@ -435,7 +435,7 @@
         "$CSG[21086..21089]",
         "$CSG[21106..21109]",
         "$CSG[20970..20985]",
-        "$CSG[21266..21281]",
+        "$CSG[21258..21273]",
         "$CSG[21110..21189]",
         "$CSG[21214]",
         "$CSG[21217]",
diff --git a/objects/rct1/ride/rct1ll.ride.face_off_cars/object.json b/objects/rct1/ride/rct1ll.ride.face_off_cars/object.json
index 6edfbcd0b1..1836cfeeeb 100644
--- a/objects/rct1/ride/rct1ll.ride.face_off_cars/object.json
+++ b/objects/rct1/ride/rct1ll.ride.face_off_cars/object.json
@@ -12,7 +12,7 @@
     "properties": {
         "type": "compact_inverted_rc",
         "category": "rollercoaster",
-        "limitAirT imeBonus": true,
+        "limitAirTimeBonus": true,
         "minCarsPerTrain": 2,
         "maxCarsPerTrain": 7,
         "ratingMultipler": {
@@ -170,21 +170,21 @@
         "$CSG[21638..21641]",
         "$CSG[21654..21657]",
         "$CSG[21362]",
-        "$CSG[21658]",
+        "$CSG[21674]",
         "$CSG[21363]",
-        "$CSG[21659]",
+        "$CSG[21675]",
         "$CSG[21364]",
-        "$CSG[21660]",
+        "$CSG[21676]",
         "$CSG[21365]",
-        "$CSG[21661]",
+        "$CSG[21677]",
         "$CSG[21366]",
-        "$CSG[21662]",
+        "$CSG[21678]",
         "$CSG[21367]",
-        "$CSG[21663]",
+        "$CSG[21679]",
         "$CSG[21368]",
-        "$CSG[21664]",
+        "$CSG[21680]",
         "$CSG[21369]",
-        "$CSG[21665]",
+        "$CSG[21681]",
         "$CSG[21330..21361]",
         "$CSG[21470..21473]",
         "$CSG[21490..21493]",
@@ -197,7 +197,7 @@
         "$CSG[21486..21489]",
         "$CSG[21506..21509]",
         "$CSG[21370..21385]",
-        "$CSG[21666..21681]",
+        "$CSG[21658..21673]",
         "$CSG[21510..21589]",
         "$CSG[21614]",
         "$CSG[21617]",
@@ -290,21 +290,21 @@
         "$CSG[22038..22041]",
         "$CSG[22054..22057]",
         "$CSG[21762]",
-        "$CSG[22058]",
+        "$CSG[22074]",
         "$CSG[21763]",
-        "$CSG[22059]",
+        "$CSG[22075]",
         "$CSG[21764]",
-        "$CSG[22060]",
+        "$CSG[22076]",
         "$CSG[21765]",
-        "$CSG[22061]",
+        "$CSG[22077]",
         "$CSG[21766]",
-        "$CSG[22062]",
+        "$CSG[22078]",
         "$CSG[21767]",
-        "$CSG[22063]",
+        "$CSG[22079]",
         "$CSG[21768]",
-        "$CSG[22064]",
+        "$CSG[22080]",
         "$CSG[21769]",
-        "$CSG[22065]",
+        "$CSG[22081]",
         "$CSG[21730..21761]",
         "$CSG[21870..21873]",
         "$CSG[21890..21893]",
@@ -317,7 +317,7 @@
         "$CSG[21886..21889]",
         "$CSG[21906..21909]",
         "$CSG[21770..21785]",
-        "$CSG[22066..22081]",
+        "$CSG[22058..22073]",
         "$CSG[21910..21989]",
         "$CSG[22014]",
         "$CSG[22017]",
@@ -410,21 +410,21 @@
         "$CSG[22438..22441]",
         "$CSG[22454..22457]",
         "$CSG[22162]",
-        "$CSG[22458]",
+        "$CSG[22474]",
         "$CSG[22163]",
-        "$CSG[22459]",
+        "$CSG[22475]",
         "$CSG[22164]",
-        "$CSG[22460]",
+        "$CSG[22476]",
         "$CSG[22165]",
-        "$CSG[22461]",
+        "$CSG[22477]",
         "$CSG[22166]",
-        "$CSG[22462]",
+        "$CSG[22478]",
         "$CSG[22167]",
-        "$CSG[22463]",
+        "$CSG[22479]",
         "$CSG[22168]",
-        "$CSG[22464]",
+        "$CSG[22480]",
         "$CSG[22169]",
-        "$CSG[22465]",
+        "$CSG[22481]",
         "$CSG[22130..22161]",
         "$CSG[22270..22273]",
         "$CSG[22290..22293]",
@@ -437,7 +437,7 @@
         "$CSG[22286..22289]",
         "$CSG[22306..22309]",
         "$CSG[22170..22185]",
-        "$CSG[22466..22481]",
+        "$CSG[22458..22473]",
         "$CSG[22310..22389]",
         "$CSG[22414]",
         "$CSG[22417]",