Merge branch 'staging' into nwm-diag-phase2a

Author: TarkusSC4

Controller/INI/NetworkINI.ini

@@ -2420,6 +2420,14 @@ L1Dtr_OxD_Helper = 0x5d67d100, 0xFFFFFF00, 0x5d640000, 0x0000000F
 LtDtr_DxO_Helper = 0x5d67d200, 0xFFFFFF00, 0x5d640100, 0x0000000F
 L1Dtr_DxD_Helper = 0x5d67d300, 0xFFFFFF00, 0x5d640100, 0x0000000F
 ;
+;L1 diagonal OST (Yuck!)
+;
+L1Dtr_OST_diag = 0x5d6f020e, 0xFFFFFFFF, 0x5d6f010e, 0x00000000, 2,0
+L1Dtr_OST_diag = 0x5d6f020f, 0xFFFFFFFF, 0x5d6f010f, 0x00000000, 2,0
+L1Dtr_OST_diag = 0x5d6f0210, 0xFFFFFFFF, 0x5d6f0110, 0x00000000, 2,0
+L1Dtr_OST_diag = 0x5d6f0211, 0xFFFFFFFF, 0x5d6f0111, 0x00000000, 2,0
+L1Dtr_OST_diag = 0x5d6f0212, 0xFFFFFFFF, 0x5d6f0112, 0x00000000, 2,0
+;
 ;L2 Network DTR-Base
 ;
 L2Dtr_Orth = 0x5d740000, 0xFFFF0000, 0x5d640000, 0x0000FFFF
@@ -2450,6 +2458,14 @@ L2Dtr_OxD_Helper = 0x5d77d100, 0xFFFFFF00, 0x5d640000, 0x0000000F
 L2Dtr_DxO_Helper = 0x5d77d200, 0xFFFFFF00, 0x5d640100, 0x0000000F
 L2Dtr_DxD_Helper = 0x5d77d300, 0xFFFFFF00, 0x5d640100, 0x0000000F
 ;
+;L2 diagonal OST (Sigh!)
+;
+L2Dtr_OST_diag = 0x5d7f020e, 0xFFFFFFFF, 0x5d7f010e, 0x00000000, 2,0
+L2Dtr_OST_diag = 0x5d7f020f, 0xFFFFFFFF, 0x5d7f010f, 0x00000000, 2,0
+L2Dtr_OST_diag = 0x5d7f0210, 0xFFFFFFFF, 0x5d7f0110, 0x00000000, 2,0
+L2Dtr_OST_diag = 0x5d7f0211, 0xFFFFFFFF, 0x5d7f0111, 0x00000000, 2,0
+L2Dtr_OST_diag = 0x5d7f0212, 0xFFFFFFFF, 0x5d7f0112, 0x00000000, 2,0
+;
 ;end Elevated RealRailway DTR
 ;
 ;Elevated RealRailway (STR)
@@ -3384,6 +3400,11 @@ L2Dtr_DxD_Helper = 0x5d77d300, 0xFFFFFF00, 0x5d640100, 0x0000000F
 512    =0x5dace600, 0xFFFFFFF0, 0x5dac0000, 0x0000000F ;-Orthogonal FlexHT
 513    =0x5dace700, 0xFFFFFFF0, 0x5dac0000, 0x0000000F ;-Orthogonal FlexHT
 513    =0x5dace800, 0xFFFFFFF0, 0x5dac0000, 0x0000000F ;-Orthogonal FlexHT
+514    =0x5dac0305, 0xFFFFFFFF, 0x5dac0000, 0x00000000 ;-Orthogonal OST L1-L2
+514    =0x5dac0306, 0xFFFFFFFF, 0x5dac0001, 0x00000000 ;-Orthogonal OST L1-L2
+514    =0x5dac0307, 0xFFFFFFFF, 0x5dac0002, 0x00000000 ;-Orthogonal OST L1-L2
+514    =0x5dac0308, 0xFFFFFFFF, 0x5dac0003, 0x00000000 ;-Orthogonal OST L1-L2
+514    =0x5dac0309, 0xFFFFFFFF, 0x5dac0004, 0x00000000 ;-Orthogonal OST L1-L2
 ;
 ;Elevated Hybrid Rail (E-HR) Texture Remapping
 ;

Controller/INRULs/AvenueAdvanced/Intersections.rul

@@ -408,3 +408,52 @@
 2,3,1,0,0,3
 3,0,0x04001000,3,1
 3,3,0x04004200,0,0
+
+; Avenue FLEX-OST (adjacent tile)
+1,4,4,4,0
+3,0,0x04006100,3,0
+1,0,4,4,4
+3,0,0x04006100,0,0
+1,4,0,4,4
+3,0,0x04006100,1,0
+1,4,4,0,4
+3,0,0x04006100,2,0
+;
+; OxO crossing adjacent to Avenue FLEX-OST
+;
+1,4,4,4,2
+2,3,4,2,4,4
+2,4,4,2,2,4
+2,5,4,4,2,2
+3,0,0x04009000,0,0
+3,3,0x04009000,1,0
+3,4,0x04009000,2,0
+3,5,0x04009000,3,0
+;
+1,2,4,4,4
+2,5,4,4,2,4
+2,6,4,4,2,2
+2,7,2,4,4,2
+3,0,0x04009000,1,0
+3,5,0x04009000,2,0
+3,6,0x04009000,3,0
+3,7,0x04009000,0,0
+;
+1,4,2,4,4
+2,1,2,2,4,4
+2,7,4,4,4,2
+2,8,2,4,4,2
+3,0,0x04009000,2,0
+3,1,0x04009000,1,0
+3,7,0x04009000,3,0
+3,8,0x04009000,0,0
+;
+1,4,4,2,4
+2,1,2,4,4,4
+2,2,2,2,4,4
+2,3,4,2,2,4
+3,0,0x04009000,3,0
+3,1,0x04009000,0,0
+3,2,0x04009000,1,0
+3,3,0x04009000,2,0
+;

Controller/INRULs/OnewayroadBasic/RUL11_OWR_Basic.rul

@@ -828,4 +828,14 @@
 3,0,0x00000100,0,0
 1,4,0,0,0
 3,0,0x00000100,1,0
+;
+; tiles adjacent to on-slope transitions
+1,0,4,0,4
+3,0,0x09004B00,0,0
+1,4,0,4,0
+3,0,0x09004B00,1,0
+1,2,4,2,4
+3,0,0x09020700,0,0
+1,4,2,4,2
+3,0,0x09020700,0,0
 ;

Controller/INRULs/OnewayroadBasic/RUL11_OWR_Basic_memoOWRArrowReduction.rul

@@ -851,3 +851,14 @@
 3,0,0x09040E00,0,1
 1,13,13,13,13
 3,0,0x09040D00,0,1
+;
+; tiles adjacent to on-slope transitions
+1,0,4,0,4
+3,0,0x09004B00,0,0
+1,4,0,4,0
+3,0,0x09004B00,1,0
+1,2,4,2,4
+3,0,0x09020700,0,0
+1,4,2,4,2
+3,0,0x09020700,0,0
+;

Controller/INRULs/RoadBasic/RUL07_Road_Basic.rul

@@ -1266,3 +1266,9 @@
 3,0,0x5f098B00,1,1
 
 
+; crossing adjacent to road on-slope transition
+1,02,04,02,04
+3,0,0x00020700,0,0
+1,04,02,04,02
+3,0,0x00020700,0,0
+;