Skip to content

Commit 96d0fda

Browse files
TarkusSC4TarkusSC4
committed
Shadow updates for NWM and RHW crossings.
1 parent 95cc6fc commit 96d0fda

1 file changed

Lines changed: 76 additions & 9 deletions

File tree

‎Controller/INI/NetworkINI.ini‎

Lines changed: 76 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1387,10 +1387,15 @@ ERRW L1 = 0x5d600000,0xFFF00000,0x7d600000,0x000FFFFF
13871387
ERRW L2 = 0x5d700000,0xFFF00000,0x7d600000,0x000FFFFF
13881388

13891389
;9 and E fixes
1390-
nwm = 0x51000009,0xFF00000F,0x51000005,0x00FFFFF0
1391-
nwm = 0x5100000E,0xFF00000F,0x5100000A,0x00FFFFF0
1392-
rhw = 0x57000009,0xFFF0000F,0x57000005,0x000FFFF0
1393-
rhw = 0x5700000E,0xFFF0000F,0x5700000A,0x000FFFF0
1390+
;not functional
1391+
nwmZ1 = 0x51000005,0xFF000000,0x51000005,0x00FFFFF0
1392+
nwmZ2 = 0x51000006,0xFF000000,0x51000006,0x00FFFFF0
1393+
nwmZ3 = 0x51000007,0xFF000000,0x51000007,0x00FFFFF0
1394+
nwmZ4 = 0x51000008,0xFF000000,0x51000008,0x00FFFFF0
1395+
nwmZ5 = 0x51000009,0xFF000000,0x51000009,0x00FFFFF0
1396+
;nwm = 0x5100000E,0xFF0000F0,0x5100000E,0x00FFFF0F
1397+
;rhw = 0x57000009,0xFFF0000F,0x57000009,0x000FFFF0
1398+
;rhw = 0x5700000E,0xFFF0000F,0x5700000E,0x000FFFF0
13941399

13951400

13961401
[Shadow remapping]
@@ -2288,6 +2293,62 @@ rhw = 0x5700000E,0xFFF0000F,0x5700000A,0x000FFFF0
22882293
;End Puzzle Pieces
22892294
;End HSR
22902295

2296+
;Crossings over NWM
2297+
;Elevated Rail
2298+
262= 0x51001600, 0xFFF0FFF0, 0x08031500, 0x0000000F ;Elevated Rail over Single-Tile NWM OxO
2299+
263= 0x51101600, 0xFFF0FFF0, 0x08031500, 0x0000000F ;Elevated Rail over Dual-Tile NWM OxO
2300+
264= 0x51201600, 0xFFF0FFF0, 0x08031500, 0x0000000F ;Elevated Rail over Triple-Tile NWM OxO
2301+
265a= 0x51005600, 0xFFF0FFF0, 0x08001a00, 0x0000000F,1,0 ;Elevated Rail over Single-Tile NWM OxD 1
2302+
265b= 0x51005680, 0xFFF0FFF0, 0x08001a00, 0x0000000F,1,0 ;Elevated Rail over Single-Tile NWM OxD 2
2303+
266a= 0x51105600, 0xFFF0FFF0, 0x08001a00, 0x0000000F,1,0 ;Elevated Rail over Dual-Tile NWM OxD 1
2304+
266b= 0x51105680, 0xFFF0FFF0, 0x08001a00, 0x0000000F,1,0 ;Elevated Rail over Dual-Tile NWM OxD 2
2305+
267a= 0x51205600, 0xFFF0FFF0, 0x08001a00, 0x0000000F,1,0 ;Elevated Rail over Triple-Tile NWM OxD 1
2306+
267b= 0x51205680, 0xFFF0FFF0, 0x08001a00, 0x0000000F,1,0 ;Elevated Rail over Triple-Tile NWM OxD 2
2307+
268a= 0x51007600, 0xFFF0FFF0, 0x08031500, 0x0000000F,1,0 ;Elevated Rail over Single-Tile NWM DxO 1
2308+
268b= 0x51007680, 0xFFF0FFF0, 0x08031500, 0x0000000F,1,0 ;Elevated Rail over Single-Tile NWM DxO 2
2309+
269a= 0x51107600, 0xFFF0FFF0, 0x08031500, 0x0000000F,1,0 ;Elevated Rail over Dual-Tile NWM DxO 1
2310+
269b= 0x51107680, 0xFFF0FFF0, 0x08031500, 0x0000000F,1,0 ;Elevated Rail over Dual-Tile NWM DxO 2
2311+
270a= 0x51207600, 0xFFF0FFF0, 0x08031500, 0x0000000F,1,0 ;Elevated Rail over Triple-Tile NWM DxO 1
2312+
270b= 0x51207680, 0xFFF0FFF0, 0x08031500, 0x0000000F,1,0 ;Elevated Rail over Triple-Tile NWM DxO 2
2313+
271a= 0x51008600, 0xFFF0FFF0, 0x08001a00, 0x0000000F,1,0 ;Elevated Rail over Single-Tile NWM DxD 1
2314+
271b= 0x51008680, 0xFFF0FFF0, 0x08001a00, 0x0000000F,1,0 ;Elevated Rail over Single-Tile NWM DxD 2
2315+
272a= 0x51108600, 0xFFF0FFF0, 0x08001a00, 0x0000000F,1,0 ;Elevated Rail over Dual-Tile NWM DxD 1
2316+
272b= 0x51108680, 0xFFF0FFF0, 0x08001a00, 0x0000000F,1,0 ;Elevated Rail over Dual-Tile NWM DxD 2
2317+
273a= 0x51208600, 0xFFF0FFF0, 0x08001a00, 0x0000000F,1,0 ;Elevated Rail over Triple-Tile NWM DxD 1
2318+
273b= 0x51208680, 0xFFF0FFF0, 0x08001a00, 0x0000000F,1,0 ;Elevated Rail over Triple-Tile NWM DxD 2
2319+
;Monorail - already covered otherwise
2320+
2321+
;Crossings over RHW
2322+
;Elevated Rail
2323+
274a= 0x57001720, 0xFFF0FFF0, 0x08031500, 0x0000000F,1,0 ;Elevated Rail over L0 RHW OxO 1
2324+
274b= 0x570017A0, 0xFFF0FFF0, 0x08031500, 0x0000000F,1,0 ;Elevated Rail over L0 RHW OxO 2
2325+
275a= 0x57004720, 0xFFF0FFF0, 0x08001a00, 0x0000000F,1,0 ;Elevated Rail over L0 RHW OxD 1
2326+
275a= 0x57004760, 0xFFF0FFF0, 0x08001a00, 0x0000000F,1,0 ;Elevated Rail over L0 RHW OxD 2
2327+
275b= 0x570047A0, 0xFFF0FFF0, 0x08001a00, 0x0000000F,1,0 ;Elevated Rail over L0 RHW OxD 3
2328+
275b= 0x570047E0, 0xFFF0FFF0, 0x08001a00, 0x0000000F,1,0 ;Elevated Rail over L0 RHW OxD 4
2329+
276a= 0x57007720, 0xFFF0FFF0, 0x08031500, 0x0000000F,1,0 ;Elevated Rail over L0 RHW DxO 1
2330+
276a= 0x57007760, 0xFFF0FFF0, 0x08031500, 0x0000000F,1,0 ;Elevated Rail over L0 RHW DxO 2
2331+
276b= 0x570077A0, 0xFFF0FFF0, 0x08031500, 0x0000000F,1,0 ;Elevated Rail over L0 RHW DxO 3
2332+
276b= 0x570077E0, 0xFFF0FFF0, 0x08031500, 0x0000000F,1,0 ;Elevated Rail over L0 RHW DxO 4
2333+
277a= 0x5700A720, 0xFFF0FFF0, 0x08001a00, 0x0000000F,1,0 ;Elevated Rail over L0 RHW DxD 1
2334+
277a= 0x5700A760, 0xFFF0FFF0, 0x08001a00, 0x0000000F,1,0 ;Elevated Rail over L0 RHW DxD 2
2335+
277b= 0x5700A7A0, 0xFFF0FFF0, 0x08001a00, 0x0000000F,1,0 ;Elevated Rail over L0 RHW DxD 3
2336+
277b= 0x5700A7E0, 0xFFF0FFF0, 0x08001a00, 0x0000000F,1,0 ;Elevated Rail over L0 RHW DxD 4
2337+
2338+
;Maxis Highway - already covered otherwise
2339+
270aZ0 = 0x51107425, 0xFFF0FFFF, 0x02001500, 0x00000000,2,0 ;Highway over Dual-Tile NWM DxO 1
2340+
270aZ1 = 0x51107426, 0xFFF0FFFF, 0x02001501, 0x00000000,2,0 ;Highway over Dual-Tile NWM DxO 1
2341+
270aZ2 = 0x51107427, 0xFFF0FFFF, 0x02001502, 0x00000000,2,0 ;Highway over Dual-Tile NWM DxO 1
2342+
270aZ3 = 0x51107428, 0xFFF0FFFF, 0x02001503, 0x00000000,2,0 ;Highway over Dual-Tile NWM DxO 1
2343+
270aZ4 = 0x51107429, 0xFFF0FFFF, 0x02001504, 0x00000000,2,0 ;Highway over Dual-Tile NWM DxO 1
2344+
2345+
270bZ0 = 0x511074A5, 0xFFF0FFFF, 0x02001500, 0x00000000,2,0 ;Highway over Dual-Tile NWM DxO 2
2346+
270bZ1 = 0x511074A6, 0xFFF0FFFF, 0x02001501, 0x00000000,2,0 ;Highway over Dual-Tile NWM DxO 2
2347+
270bZ2 = 0x511074A7, 0xFFF0FFFF, 0x02001502, 0x00000000,2,0 ;Highway over Dual-Tile NWM DxO 2
2348+
270bZ3 = 0x511074A8, 0xFFF0FFFF, 0x02001503, 0x00000000,2,0 ;Highway over Dual-Tile NWM DxO 2
2349+
270bZ4 = 0x511074A9, 0xFFF0FFFF, 0x02001504, 0x00000000,2,0 ;Highway over Dual-Tile NWM DxO 2
2350+
2351+
22912352
; shadow fixes smoncrie 021006
22922353
301 = 0x58450000, 0xFFFFF8E0, 0x08031500, 0x0000000F ;High Elevated Rail over Flat Networks
22932354
302 = 0x58450c00, 0xFFFFFCE0, 0x08031500, 0x0000000F ;High Elevated Rail over Viaducts
@@ -2558,7 +2619,7 @@ L2Dtr_DxD_Helper = 0x5d77d300, 0xFFFFFF00, 0x5d640100, 0x0000000F
25582619
513 =0x5d637305, 0xFFFFFFF0, 0x5d600100, 0x0000000F ;-DxO Ave L1 viaduct
25592620
513 =0x5d63730a, 0xFFFFFFF0, 0x5d600100, 0x0000000F ;-DxO Ave L2 viaduct
25602621
514 =0x5d637400, 0xFFFFFFF0, 0x5d600100, 0x0000000F ;-DxO Maxis Ground Hwy
2561-
514 =0x5d637420, 0xFFFFFFF0, 0x5d600100, 0x0000000F ;-DxO Maxis El Hwy
2622+
;514 =0x5d637420, 0xFFFFFFF0, 0x5d600100, 0x0000000F ;-DxO Maxis El Hwy
25622623
515 =0x5d637500, 0xFFFFFFF0, 0x5d600100, 0x0000000F ;-DxO DTR
25632624
515 =0x5d637505, 0xFFFFFFF0, 0x5d600100, 0x0000000F ;-DxO STR
25642625
516 =0x5d637600, 0xFFFFFFF0, 0x5d600100, 0x0000000F ;-DxO TTR/QTR
@@ -2864,7 +2925,7 @@ L2Dtr_DxD_Helper = 0x5d77d300, 0xFFFFFF00, 0x5d640100, 0x0000000F
28642925
513 =0x5d737305, 0xFFFFFFF0, 0x5d600100, 0x0000000F ;-DxO Ave L1 viaduct
28652926
513 =0x5d73730a, 0xFFFFFFF0, 0x5d600100, 0x0000000F ;-DxO Ave L2 viaduct
28662927
514 =0x5d737400, 0xFFFFFFF0, 0x5d600100, 0x0000000F ;-DxO Maxis Ground Hwy
2867-
514 =0x5d737420, 0xFFFFFFF0, 0x5d600100, 0x0000000F ;-DxO Maxis El Hwy
2928+
;514 =0x5d737420, 0xFFFFFFF0, 0x5d600100, 0x0000000F ;-DxO Maxis El Hwy
28682929
515 =0x5d737500, 0xFFFFFFF0, 0x5d600100, 0x0000000F ;-DxO DTR
28692930
515 =0x5d737505, 0xFFFFFFF0, 0x5d600100, 0x0000000F ;-DxO STR
28702931
516 =0x5d737600, 0xFFFFFFF0, 0x5d600100, 0x0000000F ;-DxO TTR/QTR
@@ -3175,7 +3236,7 @@ L2Dtr_DxD_Helper = 0x5d77d300, 0xFFFFFF00, 0x5d640100, 0x0000000F
31753236
513 =0x5dac7305, 0xFFFFFFF0, 0x5dac0100, 0x0000000F ;-DxO Ave L1 viaduct
31763237
513 =0x5dac730a, 0xFFFFFFF0, 0x5dac0100, 0x0000000F ;-DxO Ave L2 viaduct
31773238
514 =0x5dac7400, 0xFFFFFFF0, 0x5dac0100, 0x0000000F ;-DxO Maxis Ground Hwy
3178-
514 =0x5dac7420, 0xFFFFFFF0, 0x5dac0100, 0x0000000F ;-DxO Maxis El Hwy
3239+
;514 =0x5dac7420, 0xFFFFFFF0, 0x5dac0100, 0x0000000F ;-DxO Maxis El Hwy
31793240
515 =0x5dac7500, 0xFFFFFFF0, 0x5dac0100, 0x0000000F ;-DxO DTR
31803241
515 =0x5dac7505, 0xFFFFFFF0, 0x5dac0100, 0x0000000F ;-DxO STR
31813242
516 =0x5dac7600, 0xFFFFFFF0, 0x5dac0100, 0x0000000F ;-DxO TTR/QTR
@@ -3494,7 +3555,7 @@ L2Dtr_DxD_Helper = 0x5d77d300, 0xFFFFFF00, 0x5d640100, 0x0000000F
34943555
513 =0x5dae7305, 0xFFFFFFF0, 0x5dac0100, 0x0000000F ;-DxO Ave L1 viaduct
34953556
513 =0x5dae730a, 0xFFFFFFF0, 0x5dac0100, 0x0000000F ;-DxO Ave L2 viaduct
34963557
514 =0x5dae7400, 0xFFFFFFF0, 0x5dac0100, 0x0000000F ;-DxO Maxis Ground Hwy
3497-
514 =0x5dae7420, 0xFFFFFFF0, 0x5dac0100, 0x0000000F ;-DxO Maxis El Hwy
3558+
;514 =0x5dae7420, 0xFFFFFFF0, 0x5dac0100, 0x0000000F ;-DxO Maxis El Hwy
34983559
515 =0x5dae7500, 0xFFFFFFF0, 0x5dac0100, 0x0000000F ;-DxO DTR
34993560
515 =0x5dae7505, 0xFFFFFFF0, 0x5dac0100, 0x0000000F ;-DxO STR
35003561
516 =0x5dae7600, 0xFFFFFFF0, 0x5dac0100, 0x0000000F ;-DxO TTR/QTR
@@ -3984,7 +4045,13 @@ modiag = monorail, 03010000, 0D001A00, 0000000F, 0, 0
39844045
modiag = monorail, 01000003, 0D001A00, 0000000F, 1, 0
39854046
modiag = monorail, 00000301, 0D001A00, 0000000F, 2, 0
39864047
modiag = monorail, 00030100, 0D001A00, 0000000F, 3, 0
3987-
4048+
; below experiment commented out due to causing Immortal Shadow Syndrome on GLR Starter VCLs
4049+
;lrstraight = lightrail, 02000200, 08031500, 0000000F, 0, 0
4050+
;lrstraight = lightrail, 00020002, 08031500, 0000000F, 1, 0
4051+
;lrdiag = lightrail, 03010000, 08001A00, 0000000F, 0, 0
4052+
;lrdiag = lightrail, 01000003, 08001A00, 0000000F, 1, 0
4053+
;lrdiag = lightrail, 00000301, 08001A00, 0000000F, 2, 0
4054+
;lrdiag = lightrail, 00030100, 08001A00, 0000000F, 3, 0
39884055

39894056
[PowerPoles]
39904057
; 0x088E1962

0 commit comments

Comments
 (0)