Merge pull request #532 from NAMTeam/onslope-dll-prep

DLL-ready Onslope Transitions

Author: TarkusSC4

Controller/INI/NetworkINI.ini

@@ -2359,6 +2359,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
@@ -2389,6 +2397,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)
@@ -3323,6 +3339,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/RUL0/5000_RHW/5300_Transitions.txt

@@ -3340,15 +3340,14 @@ CopyFrom	=	0x35331
 [HighwayIntersectionInfo_0x00005332]
 ;Added by Tarkus 09.21.2012
 ;RHW FLEXSlope-L1
-Piece = 48.0, 0.0, 1, 0, 0x5700001f
+Piece = 32.0, 0.0, 1, 0, 0x5700001f
 PreviewEffect = preview_ost_orth_alt_flex_001
 
 CellLayout=........
-CellLayout=..zba..<
+CellLayout=..za...<
 CellLayout=..^.....
 
 CheckType = a - rail: 0x00040000 dirtroad: 0x00020002, 0x00000000 optional
-CheckType = b - dirtroad: 0x00040004, 0x000000FF optional
 CheckType = z - dirtroad: 0x00040004
 
 ConsLayout=........
@@ -3362,36 +3361,12 @@ Costs = 600
 [HighwayIntersectionInfo_0x00015332]
 CopyFrom	=	0x5332
 Rotate	=	1
-
 [HighwayIntersectionInfo_0x00025332]
-; RHW FLEXSlope-L1 (rotated by 180 degrees)
-; Added by memo 2023-03-12
-; Having a dedicated 180-degree rotation has the advantage that we can use an
-; ordinary orthogonal tile on one side adjacent to the On-Slope Transition which
-; overall behaves more intuitively than the 0x00040004 tile.
-; Moreover, the use of 00-flags on the sides makes it easier to bulldoze parallel OSTs.
-Piece = -48.0, 0.0, 3, 0, 0x5700001f
-PreviewEffect = preview_ost_orth_alt_flex_001
-
-CellLayout=........
-CellLayout=..ba.z.<
-CellLayout=.....^..
-
-CheckType = a - rail: 0x00000004 dirtroad: 0x00020002, 0x00000000 optional
-CheckType = b - dirtroad: 0x00040004, 0x000000FF optional
-CheckType = z - dirtroad: 0x00040004
-
-ConsLayout=........
-ConsLayout=.....+.<
-ConsLayout=.....^..
-
-AutoTileBase = 0x55387000
-PlaceQueryID = 0x5700001f
-Costs = 600
-
+CopyFrom	=	0x5332
+Rotate	=	2
 [HighwayIntersectionInfo_0x00035332]
-CopyFrom	=	0x25332
-Rotate	=	1
+CopyFrom	=	0x5332
+Rotate	=	3
 [HighwayIntersectionInfo_0x00045332]
 CopyFrom	=	0x5332
 [HighwayIntersectionInfo_0x00055332]
@@ -3405,15 +3380,14 @@ CopyFrom	=	0x35332
 [HighwayIntersectionInfo_0x00005345]
 ;Added by Tarkus 09.21.2012
 ;RHW FLEXSlope-L2
-Piece = 48.0, 0.0, 1, 0, 0x5700002f
+Piece = 32.0, 0.0, 1, 0, 0x5700002f
 PreviewEffect = preview_ost_orth_alt_flex_002
 
 CellLayout=........
-CellLayout=..zba..<
+CellLayout=..za...<
 CellLayout=..^.....
 
 CheckType = a - monorail: 0x00040000 dirtroad: 0x00020002, 0x00000000 optional
-CheckType = b - dirtroad: 0x00040004, 0x000000FF optional
 CheckType = z - dirtroad: 0x00040004
 
 ConsLayout=........
@@ -3429,34 +3403,11 @@ CopyFrom	=	0x5345
 Rotate	=	1
 
 [HighwayIntersectionInfo_0x00025345]
-; RHW FLEXSlope-L2 (rotated by 180 degrees)
-; Added by memo 2023-03-12
-; Having a dedicated 180-degree rotation has the advantage that we can use an
-; ordinary orthogonal tile on one side adjacent to the On-Slope Transition which
-; overall behaves more intuitively than the 0x00040004 tile.
-; Moreover, the use of 00-flags on the sides makes it easier to bulldoze parallel OSTs.
-Piece = -48.0, 0.0, 3, 0, 0x5700002f
-PreviewEffect = preview_ost_orth_alt_flex_002
-
-CellLayout=........
-CellLayout=..ba.z.<
-CellLayout=.....^..
-
-CheckType = a - monorail: 0x00000004 dirtroad: 0x00020002, 0x00000000 optional
-CheckType = b - dirtroad: 0x00040004, 0x000000FF optional
-CheckType = z - dirtroad: 0x00040004
-
-ConsLayout=........
-ConsLayout=.....+.<
-ConsLayout=.....^..
-
-AutoTileBase = 0x55387000
-PlaceQueryID = 0x5700002f
-Costs = 600
-
+CopyFrom	=	0x5345
+Rotate	=	2
 [HighwayIntersectionInfo_0x00035345]
-CopyFrom	=	0x25345
-Rotate	=	1
+CopyFrom	=	0x5345
+Rotate	=	3
 [HighwayIntersectionInfo_0x00045345]
 CopyFrom	=	0x5345
 [HighwayIntersectionInfo_0x00055345]
@@ -5350,23 +5301,18 @@ CopyFrom	=	0x75343
 [HighwayIntersectionInfo_0x00005346]
 ;Added by eggman121 27 Jan 2017
 ;RHW FLEX-diagonal-OST 1-LEVEL
-Piece = 16.0, -16.0, 0, 0, 0x5750001f
+Piece = 16.0, 0.0, 0, 0, 0x5750001f
 PreviewEffect = preview_ost_diag_alt_flex_001
 
 CellLayout=....
-CellLayout=..af
-CellLayout=.ec.
-CellLayout=.b.<
+CellLayout=..a.
+CellLayout=.bc<
 CellLayout=.^..
 
 CheckType = a - rail: 0x04040400 dirtroad: 0x04010000, 0xFFFFFFFF optional
-CheckType = b - dirtroad: 0x00000000
+CheckType = b - dirtroad: 0x03010000
 CheckType = c - rail: 0x00000004 dirtroad: 0x00000401, 0xFFFFFFFF optional
-;CheckType = d - dirtroad: 0x04000404, 0x0000FF00 optional
-CheckType = e - dirtroad: 0x04040400, 0xFF000000 optional
-CheckType = f - dirtroad: 0x02000202, 0xFF00FFFF optional
 
-ConsLayout=....
 ConsLayout=....
 ConsLayout=....
 ConsLayout=.+.<
@@ -5378,24 +5324,25 @@ Costs = 600
 
 [HighwayIntersectionInfo_0x00015346]
 CopyFrom	=	0x5346
-Rotate	=	1
+Rotate = 1
+Transpose = 1
 [HighwayIntersectionInfo_0x00025346]
 CopyFrom	=	0x5346
-Rotate	=	2
+Rotate	=	1
 [HighwayIntersectionInfo_0x00035346]
-CopyFrom	=	0x5346
-Rotate	=	3
+CopyFrom	=	0x15346
+Rotate	=	1
 [HighwayIntersectionInfo_0x00045346]
-CopyFrom	=	0x25346
-Transpose = 1
+CopyFrom	=	0x5346
+Rotate	=	2
 [HighwayIntersectionInfo_0x00055346]
-CopyFrom	=	0x45346
-Rotate	=	1
-[HighwayIntersectionInfo_0x00065346]
-CopyFrom	=	0x45346
+CopyFrom	=	0x15346
 Rotate	=	2
+[HighwayIntersectionInfo_0x00065346]
+CopyFrom	=	0x5346
+Rotate	=	3
 [HighwayIntersectionInfo_0x00075346]
-CopyFrom	=	0x45346
+CopyFrom	=	0x15346
 Rotate	=	3
 [HighwayIntersectionInfo_0x00085346]
 CopyFrom	=	0x5346
@@ -5418,24 +5365,18 @@ CopyFrom	=	0x75346
 [HighwayIntersectionInfo_0x00005347]
 ;Added by eggman121 27 Jan 2017
 ;RHW FLEX-diagonal-OST 2-LEVEL
-Piece = 16.0, -16.0, 0, 0, 0x5750002f
+Piece = 16.0, 0.0, 0, 0, 0x5750002f
 PreviewEffect = preview_ost_diag_alt_flex_002
 
 CellLayout=....
-CellLayout=..af
-CellLayout=.ec.
-CellLayout=.b.<
+CellLayout=..a.
+CellLayout=.bc<
 CellLayout=.^..
 
 CheckType = a - rail: 0x00040004 dirtroad: 0x04010000, 0xFFFFFFFF optional
-CheckType = b - dirtroad: 0x00000000
+CheckType = b - dirtroad: 0x03010000
 CheckType = c - rail: 0x00040000 dirtroad: 0x00000401, 0xFFFFFFFF optional
-;CheckType = d - dirtroad: 0x04000404, 0x0000FF00 optional
-CheckType = e - dirtroad: 0x04040400, 0xFF000000 optional
-CheckType = f - dirtroad: 0x02000202, 0xFF00FFFF optional
-
 
-ConsLayout=....
 ConsLayout=....
 ConsLayout=....
 ConsLayout=.+.<
@@ -5447,24 +5388,25 @@ Costs = 600
 
 [HighwayIntersectionInfo_0x00015347]
 CopyFrom	=	0x5347
-Rotate	=	1
+Rotate = 1
+Transpose = 1
 [HighwayIntersectionInfo_0x00025347]
 CopyFrom	=	0x5347
-Rotate	=	2
+Rotate	=	1
 [HighwayIntersectionInfo_0x00035347]
-CopyFrom	=	0x5347
-Rotate	=	3
+CopyFrom	=	0x15347
+Rotate	=	1
 [HighwayIntersectionInfo_0x00045347]
-CopyFrom	=	0x25347
-Transpose = 1
+CopyFrom	=	0x5347
+Rotate	=	2
 [HighwayIntersectionInfo_0x00055347]
-CopyFrom	=	0x45347
-Rotate	=	1
-[HighwayIntersectionInfo_0x00065347]
-CopyFrom	=	0x45347
+CopyFrom	=	0x15347
 Rotate	=	2
+[HighwayIntersectionInfo_0x00065347]
+CopyFrom	=	0x5347
+Rotate	=	3
 [HighwayIntersectionInfo_0x00075347]
-CopyFrom	=	0x45347
+CopyFrom	=	0x15347
 Rotate	=	3
 [HighwayIntersectionInfo_0x00085347]
 CopyFrom	=	0x5347