Skip to content

Commit a6c7887

Browse files
committed
remove extra tiles from RHW and Viaduct OSTs
for DLL-based slope fixes.
1 parent c4b2d50 commit a6c7887

2 files changed

Lines changed: 82 additions & 298 deletions

File tree

Controller/RUL0/5000_RHW/5300_Transitions.txt

Lines changed: 44 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -3340,15 +3340,14 @@ CopyFrom = 0x35331
33403340
[HighwayIntersectionInfo_0x00005332]
33413341
;Added by Tarkus 09.21.2012
33423342
;RHW FLEXSlope-L1
3343-
Piece = 48.0, 0.0, 1, 0, 0x5700001f
3343+
Piece = 32.0, 0.0, 1, 0, 0x5700001f
33443344
PreviewEffect = preview_ost_orth_alt_flex_001
33453345

33463346
CellLayout=........
3347-
CellLayout=..zba..<
3347+
CellLayout=..za...<
33483348
CellLayout=..^.....
33493349

33503350
CheckType = a - rail: 0x00040000 dirtroad: 0x00020002, 0x00000000 optional
3351-
CheckType = b - dirtroad: 0x00040004, 0x000000FF optional
33523351
CheckType = z - dirtroad: 0x00040004
33533352

33543353
ConsLayout=........
@@ -3362,36 +3361,12 @@ Costs = 600
33623361
[HighwayIntersectionInfo_0x00015332]
33633362
CopyFrom = 0x5332
33643363
Rotate = 1
3365-
33663364
[HighwayIntersectionInfo_0x00025332]
3367-
; RHW FLEXSlope-L1 (rotated by 180 degrees)
3368-
; Added by memo 2023-03-12
3369-
; Having a dedicated 180-degree rotation has the advantage that we can use an
3370-
; ordinary orthogonal tile on one side adjacent to the On-Slope Transition which
3371-
; overall behaves more intuitively than the 0x00040004 tile.
3372-
; Moreover, the use of 00-flags on the sides makes it easier to bulldoze parallel OSTs.
3373-
Piece = -48.0, 0.0, 3, 0, 0x5700001f
3374-
PreviewEffect = preview_ost_orth_alt_flex_001
3375-
3376-
CellLayout=........
3377-
CellLayout=..ba.z.<
3378-
CellLayout=.....^..
3379-
3380-
CheckType = a - rail: 0x00000004 dirtroad: 0x00020002, 0x00000000 optional
3381-
CheckType = b - dirtroad: 0x00040004, 0x000000FF optional
3382-
CheckType = z - dirtroad: 0x00040004
3383-
3384-
ConsLayout=........
3385-
ConsLayout=.....+.<
3386-
ConsLayout=.....^..
3387-
3388-
AutoTileBase = 0x55387000
3389-
PlaceQueryID = 0x5700001f
3390-
Costs = 600
3391-
3365+
CopyFrom = 0x5332
3366+
Rotate = 2
33923367
[HighwayIntersectionInfo_0x00035332]
3393-
CopyFrom = 0x25332
3394-
Rotate = 1
3368+
CopyFrom = 0x5332
3369+
Rotate = 3
33953370
[HighwayIntersectionInfo_0x00045332]
33963371
CopyFrom = 0x5332
33973372
[HighwayIntersectionInfo_0x00055332]
@@ -3405,15 +3380,14 @@ CopyFrom = 0x35332
34053380
[HighwayIntersectionInfo_0x00005345]
34063381
;Added by Tarkus 09.21.2012
34073382
;RHW FLEXSlope-L2
3408-
Piece = 48.0, 0.0, 1, 0, 0x5700002f
3383+
Piece = 32.0, 0.0, 1, 0, 0x5700002f
34093384
PreviewEffect = preview_ost_orth_alt_flex_002
34103385

34113386
CellLayout=........
3412-
CellLayout=..zba..<
3387+
CellLayout=..za...<
34133388
CellLayout=..^.....
34143389

34153390
CheckType = a - monorail: 0x00040000 dirtroad: 0x00020002, 0x00000000 optional
3416-
CheckType = b - dirtroad: 0x00040004, 0x000000FF optional
34173391
CheckType = z - dirtroad: 0x00040004
34183392

34193393
ConsLayout=........
@@ -3429,34 +3403,11 @@ CopyFrom = 0x5345
34293403
Rotate = 1
34303404

34313405
[HighwayIntersectionInfo_0x00025345]
3432-
; RHW FLEXSlope-L2 (rotated by 180 degrees)
3433-
; Added by memo 2023-03-12
3434-
; Having a dedicated 180-degree rotation has the advantage that we can use an
3435-
; ordinary orthogonal tile on one side adjacent to the On-Slope Transition which
3436-
; overall behaves more intuitively than the 0x00040004 tile.
3437-
; Moreover, the use of 00-flags on the sides makes it easier to bulldoze parallel OSTs.
3438-
Piece = -48.0, 0.0, 3, 0, 0x5700002f
3439-
PreviewEffect = preview_ost_orth_alt_flex_002
3440-
3441-
CellLayout=........
3442-
CellLayout=..ba.z.<
3443-
CellLayout=.....^..
3444-
3445-
CheckType = a - monorail: 0x00000004 dirtroad: 0x00020002, 0x00000000 optional
3446-
CheckType = b - dirtroad: 0x00040004, 0x000000FF optional
3447-
CheckType = z - dirtroad: 0x00040004
3448-
3449-
ConsLayout=........
3450-
ConsLayout=.....+.<
3451-
ConsLayout=.....^..
3452-
3453-
AutoTileBase = 0x55387000
3454-
PlaceQueryID = 0x5700002f
3455-
Costs = 600
3456-
3406+
CopyFrom = 0x5345
3407+
Rotate = 2
34573408
[HighwayIntersectionInfo_0x00035345]
3458-
CopyFrom = 0x25345
3459-
Rotate = 1
3409+
CopyFrom = 0x5345
3410+
Rotate = 3
34603411
[HighwayIntersectionInfo_0x00045345]
34613412
CopyFrom = 0x5345
34623413
[HighwayIntersectionInfo_0x00055345]
@@ -5350,23 +5301,18 @@ CopyFrom = 0x75343
53505301
[HighwayIntersectionInfo_0x00005346]
53515302
;Added by eggman121 27 Jan 2017
53525303
;RHW FLEX-diagonal-OST 1-LEVEL
5353-
Piece = 16.0, -16.0, 0, 0, 0x5750001f
5304+
Piece = 16.0, 0.0, 0, 0, 0x5750001f
53545305
PreviewEffect = preview_ost_diag_alt_flex_001
53555306

53565307
CellLayout=....
5357-
CellLayout=..af
5358-
CellLayout=.ec.
5359-
CellLayout=.b.<
5308+
CellLayout=..a.
5309+
CellLayout=.bc<
53605310
CellLayout=.^..
53615311

53625312
CheckType = a - rail: 0x04040400 dirtroad: 0x04010000, 0xFFFFFFFF optional
5363-
CheckType = b - dirtroad: 0x00000000
5313+
CheckType = b - dirtroad: 0x03010000
53645314
CheckType = c - rail: 0x00000004 dirtroad: 0x00000401, 0xFFFFFFFF optional
5365-
;CheckType = d - dirtroad: 0x04000404, 0x0000FF00 optional
5366-
CheckType = e - dirtroad: 0x04040400, 0xFF000000 optional
5367-
CheckType = f - dirtroad: 0x02000202, 0xFF00FFFF optional
53685315

5369-
ConsLayout=....
53705316
ConsLayout=....
53715317
ConsLayout=....
53725318
ConsLayout=.+.<
@@ -5378,24 +5324,25 @@ Costs = 600
53785324

53795325
[HighwayIntersectionInfo_0x00015346]
53805326
CopyFrom = 0x5346
5381-
Rotate = 1
5327+
Rotate = 1
5328+
Transpose = 1
53825329
[HighwayIntersectionInfo_0x00025346]
53835330
CopyFrom = 0x5346
5384-
Rotate = 2
5331+
Rotate = 1
53855332
[HighwayIntersectionInfo_0x00035346]
5386-
CopyFrom = 0x5346
5387-
Rotate = 3
5333+
CopyFrom = 0x15346
5334+
Rotate = 1
53885335
[HighwayIntersectionInfo_0x00045346]
5389-
CopyFrom = 0x25346
5390-
Transpose = 1
5336+
CopyFrom = 0x5346
5337+
Rotate = 2
53915338
[HighwayIntersectionInfo_0x00055346]
5392-
CopyFrom = 0x45346
5393-
Rotate = 1
5394-
[HighwayIntersectionInfo_0x00065346]
5395-
CopyFrom = 0x45346
5339+
CopyFrom = 0x15346
53965340
Rotate = 2
5341+
[HighwayIntersectionInfo_0x00065346]
5342+
CopyFrom = 0x5346
5343+
Rotate = 3
53975344
[HighwayIntersectionInfo_0x00075346]
5398-
CopyFrom = 0x45346
5345+
CopyFrom = 0x15346
53995346
Rotate = 3
54005347
[HighwayIntersectionInfo_0x00085346]
54015348
CopyFrom = 0x5346
@@ -5418,24 +5365,18 @@ CopyFrom = 0x75346
54185365
[HighwayIntersectionInfo_0x00005347]
54195366
;Added by eggman121 27 Jan 2017
54205367
;RHW FLEX-diagonal-OST 2-LEVEL
5421-
Piece = 16.0, -16.0, 0, 0, 0x5750002f
5368+
Piece = 16.0, 0.0, 0, 0, 0x5750002f
54225369
PreviewEffect = preview_ost_diag_alt_flex_002
54235370

54245371
CellLayout=....
5425-
CellLayout=..af
5426-
CellLayout=.ec.
5427-
CellLayout=.b.<
5372+
CellLayout=..a.
5373+
CellLayout=.bc<
54285374
CellLayout=.^..
54295375

54305376
CheckType = a - rail: 0x00040004 dirtroad: 0x04010000, 0xFFFFFFFF optional
5431-
CheckType = b - dirtroad: 0x00000000
5377+
CheckType = b - dirtroad: 0x03010000
54325378
CheckType = c - rail: 0x00040000 dirtroad: 0x00000401, 0xFFFFFFFF optional
5433-
;CheckType = d - dirtroad: 0x04000404, 0x0000FF00 optional
5434-
CheckType = e - dirtroad: 0x04040400, 0xFF000000 optional
5435-
CheckType = f - dirtroad: 0x02000202, 0xFF00FFFF optional
5436-
54375379

5438-
ConsLayout=....
54395380
ConsLayout=....
54405381
ConsLayout=....
54415382
ConsLayout=.+.<
@@ -5447,24 +5388,25 @@ Costs = 600
54475388

54485389
[HighwayIntersectionInfo_0x00015347]
54495390
CopyFrom = 0x5347
5450-
Rotate = 1
5391+
Rotate = 1
5392+
Transpose = 1
54515393
[HighwayIntersectionInfo_0x00025347]
54525394
CopyFrom = 0x5347
5453-
Rotate = 2
5395+
Rotate = 1
54545396
[HighwayIntersectionInfo_0x00035347]
5455-
CopyFrom = 0x5347
5456-
Rotate = 3
5397+
CopyFrom = 0x15347
5398+
Rotate = 1
54575399
[HighwayIntersectionInfo_0x00045347]
5458-
CopyFrom = 0x25347
5459-
Transpose = 1
5400+
CopyFrom = 0x5347
5401+
Rotate = 2
54605402
[HighwayIntersectionInfo_0x00055347]
5461-
CopyFrom = 0x45347
5462-
Rotate = 1
5463-
[HighwayIntersectionInfo_0x00065347]
5464-
CopyFrom = 0x45347
5403+
CopyFrom = 0x15347
54655404
Rotate = 2
5405+
[HighwayIntersectionInfo_0x00065347]
5406+
CopyFrom = 0x5347
5407+
Rotate = 3
54665408
[HighwayIntersectionInfo_0x00075347]
5467-
CopyFrom = 0x45347
5409+
CopyFrom = 0x15347
54685410
Rotate = 3
54695411
[HighwayIntersectionInfo_0x00085347]
54705412
CopyFrom = 0x5347

0 commit comments

Comments
 (0)