Skip to content

Commit 28c02df

Browse files
TarkusSC4TarkusSC4
committed
Merge branch 'nwm-diag-phase2a' into rhw-nwm-paths
2 parents 9179447 + 35e914e commit 28c02df

498 files changed

Lines changed: 190574 additions & 412606 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎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

‎Controller/INRULs/AvenueAdvanced/Intersections.rul‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,103 @@
1+
;Orth to Diag T 35 alt
2+
;moved from Basic INRUL to avoid Transmogrify-created mirroring issues - Tarkus 20250812
3+
1,0,0,1,3
4+
2,5,1,3,1,3
5+
2,6,2,3,2,4
6+
2,7,2,3,2,4
7+
3,0,0x04000200,1,0
8+
;
9+
1,3,0,0,1
10+
2,1,4,2,3,2
11+
2,7,3,1,3,1
12+
2,8,4,2,3,2
13+
3,0,0x04000200,2,0
14+
;
15+
1,1,3,0,0
16+
2,1,1,3,1,3
17+
2,2,2,4,2,3
18+
2,3,2,4,2,3
19+
3,0,0x04000200,3,0
20+
;
21+
1,0,1,3,0
22+
2,3,3,1,3,1
23+
2,4,3,2,4,2
24+
2,5,3,2,4,2
25+
3,0,0x04000200,0,0
26+
;
27+
1,3,0,0,1
28+
2,1,3,1,3,1
29+
2,7,2,1,2,4
30+
2,8,2,1,2,4
31+
3,0,0x04000200,2,0
32+
;
33+
1,0,0,1,3
34+
2,5,1,2,4,2
35+
2,6,1,2,4,2
36+
2,7,1,3,1,3
37+
3,0,0x04000200,1,0
38+
;
39+
1,0,1,3,0
40+
2,3,2,4,2,1
41+
2,4,2,4,2,1
42+
2,5,3,1,3,1
43+
3,0,0x04000200,0,0
44+
;
45+
1,1,3,0,0
46+
2,1,4,2,1,2
47+
2,2,4,2,1,2
48+
2,3,1,3,1,3
49+
3,0,0x04000200,3,0
50+
51+
;Orth to Diag T 38 alt
52+
;moved from Basic INRUL to avoid Transmogrify-created mirroring issues - Tarkus 20250812
53+
1,1,3,1,3
54+
2,1,0,0,1,3
55+
2,7,2,3,2,4
56+
2,8,2,3,2,4
57+
3,0,0x04003800,1,0
58+
;
59+
1,3,1,3,1
60+
2,1,4,2,3,2
61+
2,2,4,2,3,2
62+
2,3,3,0,0,1
63+
3,0,0x04003800,0,0
64+
;
65+
1,1,3,1,3
66+
2,3,2,4,2,3
67+
2,4,2,4,2,3
68+
2,5,1,3,0,0
69+
3,0,0x04003800,1,0
70+
;
71+
1,3,1,3,1
72+
2,5,3,2,4,2
73+
2,6,3,2,4,2
74+
2,7,0,1,3,0
75+
3,0,0x04003800,0,0
76+
;
77+
1,3,1,3,1
78+
2,5,3,0,0,1
79+
2,6,2,1,2,4
80+
2,7,2,1,2,4
81+
3,0,0x04003800,0,0
82+
;
83+
1,1,3,1,3
84+
2,3,0,0,1,3
85+
2,4,1,2,4,2
86+
2,5,1,2,4,2
87+
3,0,0x04003800,1,0
88+
;
89+
1,3,1,3,1
90+
2,1,0,1,3,0
91+
2,2,2,4,2,1
92+
2,3,2,4,2,1
93+
3,0,0x04003800,0,0
94+
;
95+
1,1,3,1,3
96+
2,1,4,2,1,2
97+
2,7,1,3,0,0
98+
2,8,4,2,1,2
99+
3,0,0x04003800,1,0
100+
1101
;Orth to Diag T 53 ~ modified due to issue ~ Tropod 091905.
2102
1,0,2,4,2
3103
2,5,4,2,0,2

‎Controller/INRULs/AvenueBasic/RUL0D_Avenue_Basic.rul‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,18 +1256,20 @@
12561256
3,0,0x04009300,3,0
12571257

12581258
;Orth to Diag T 35 alt
1259-
1,0,0,1,3
1260-
2,5,1,3,1,3
1261-
2,6,2,3,2,4
1262-
2,7,2,3,2,4
1263-
3,0,0x04003500,1,0
1259+
;moved to Advanced INRUL to avoid Transmogrify-created mirroring issues - Tarkus 20250812
1260+
;1,0,0,1,3
1261+
;2,5,1,3,1,3
1262+
;2,6,2,3,2,4
1263+
;2,7,2,3,2,4
1264+
;3,0,0x04000200,1,0
12641265

12651266
;Orth to Diag T 38 alt
1266-
1,1,3,1,3
1267-
2,7,2,3,2,4
1268-
2,8,2,3,2,4
1269-
2,1,0,0,1,3
1270-
3,0,0x04003800,1,0
1267+
;moved to Advanced INRUL to avoid Transmogrify-created mirroring issues - Tarkus 20250812
1268+
;1,1,3,1,3
1269+
;2,7,2,3,2,4
1270+
;2,8,2,3,2,4
1271+
;2,1,0,0,1,3
1272+
;3,0,0x04003800,1,0
12711273

12721274
; 0x90A3
12731275
1,3,1,2,2

‎Controller/RUL0/5000_RHW/5000_Starters.txt‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ AddTypes = 5005, 15005, 25005, 35005, 45005, 55005, 65005, 75005 ;RHW-8S St
1616
AddTypes = 5006, 15006, 25006, 35006, 45006, 55006, 65006, 75006 ;RHW-8C Starter
1717
AddTypes = 85006, 95006, A5006, B5006, C5006, D5006, E5006, F5006 ;RHW-7C Starter
1818
AddTypes = 5007, 15007, 25007, 35007, 45007, 55007, 65007, 75007 ;RHW-10S Starter
19-
;AddTypes = 5008, 15008, 25008, 35008, 45008, 55008, 65008, 75008 ;RHW-10C Starter
19+
AddTypes = 5008, 15008, 25008, 35008, 45008, 55008, 65008, 75008 ;RHW-10C Starter
2020
AddTypes = 5009, 15009, 25009, 35009, 45009, 55009, 65009, 75009 ;RHW-12S Starter
2121
;---L1 Starters---
2222
AddTypes = 500A, 1500A, 2500A, 3500A, 4500A, 5500A, 6500A, 7500A ;L1 RHW-2 Starter
@@ -29,7 +29,7 @@ AddTypes = 5010, 15010, 25010, 35010, 45010, 55010, 65010, 75010 ;L1 RHW-8S
2929
AddTypes = 5011, 15011, 25011, 35011, 45011, 55011, 65011, 75011 ;L1 RHW-8C Starter
3030
AddTypes = 85011, 95011, A5011, B5011, C5011, D5011, E5011, F5011 ;L1 RHW-7C Starter
3131
AddTypes = 5012, 15012, 25012, 35012, 45012, 55012, 65012, 75012 ;L1 RHW-10S Starter
32-
;AddTypes = 5026, 15026, 25026, 35026, 45026, 55026, 65026, 75026 ;L1 RHW-10C Starter
32+
AddTypes = 5026, 15026, 25026, 35026, 45026, 55026, 65026, 75026 ;L1 RHW-10C Starter
3333
AddTypes = 5027, 15027, 25027, 35027, 45027, 55027, 65027, 75027 ;L1 RHW-12S Starter
3434

3535
;---L2 Starters---
@@ -43,7 +43,7 @@ AddTypes = 5019, 15019, 25019, 35019, 45019, 55019, 65019, 75019 ;L2 RHW-8S
4343
AddTypes = 501A, 1501A, 2501A, 3501A, 4501A, 5501A, 6501A, 7501A ;L2 RHW-8C Starter
4444
AddTypes = 8501A, 9501A, A501A, B501A, C501A, D501A, E501A, F501A ;L2 RHW-7C Starter
4545
AddTypes = 501B, 1501B, 2501B, 3501B, 4501B, 5501B, 6501B, 7501B ;L2 RHW-10S Starter
46-
;AddTypes = 5028, 15028, 25028, 35028, 45028, 55028, 65028, 75028 ;L2 RHW-10C Starter
46+
AddTypes = 5028, 15028, 25028, 35028, 45028, 55028, 65028, 75028 ;L2 RHW-10C Starter
4747
AddTypes = 5029, 15029, 25029, 35029, 45029, 55029, 65029, 75029 ;L2 RHW-12S Starter
4848

4949
;---L3 Starters---
@@ -668,9 +668,9 @@ CellLayout =..cba...
668668
CellLayout =...d.<..
669669
CellLayout =...^....
670670

671-
CheckType = a - dirtroad: 0x02000200 Street: 0x03000003, 0xffffffff optional
672-
CheckType = b - dirtroad: 0x02000200 Road: 0x00030300, 0xffffffff optional
673-
CheckType = c - dirtroad: 0x02000200 Street: 0x00030300, 0xffffffff optional
671+
CheckType = a - dirtroad: 0x02000200 onewayroad: 0x04040200, 0xffffffff optional
672+
CheckType = b - dirtroad: 0x02000200 road: 0x00030300, 0xffffffff optional
673+
CheckType = c - dirtroad: 0x02000200 onewayroad: 0x02000404, 0xffffffff optional
674674
CheckType = d - dirtroad: 0x02000200
675675

676676
ConsLayout = ........
@@ -1127,7 +1127,7 @@ CopyFrom = 0x3500F
11271127

11281128
[HighwayIntersectionInfo_0x00005010]
11291129
;Added by Tarkus 05/24/2008.
1130-
;L1 RHW-8 Starter Piece
1130+
;L1 RHW-8S Starter Piece
11311131
Piece = 0.0, 0.0, 0, 0, 0x57F15005
11321132
PreviewEffect = preview_starter_l1rhw8s_000
11331133

@@ -2548,17 +2548,17 @@ CopyFrom = 0x35025
25482548
[HighwayIntersectionInfo_0x00005026]
25492549
;Added by Tarkus 2023/01/16
25502550
;L1 RHW-10C Starter Piece
2551-
Piece = 0.0, 0.0, 0, 0, 0x57F0A005
2552-
PreviewEffect = preview_starter_l0rhw10c000
2551+
Piece = 0.0, 0.0, 0, 0, 0x57F1A005
2552+
PreviewEffect = preview_starter_l1rhw10c000
25532553

25542554
CellLayout =........
25552555
CellLayout =..cba...
25562556
CellLayout =...d.<..
25572557
CellLayout =...^....
25582558

2559-
CheckType = a - dirtroad: 0x02000200 Street: 0x03000003, 0xffffffff optional
2559+
CheckType = a - dirtroad: 0x02000200 onewayroad: 0x04040200, 0xffffffff optional
25602560
CheckType = b - dirtroad: 0x02000200 highway: 0x00040001, 0xffffffff optional
2561-
CheckType = c - dirtroad: 0x02000200 Street: 0x00030300, 0xffffffff optional
2561+
CheckType = c - dirtroad: 0x02000200 onewayroad: 0x02000404, 0xffffffff optional
25622562
CheckType = d - dirtroad: 0x02000200
25632563

25642564
ConsLayout = ........
@@ -2662,17 +2662,17 @@ Rotate = 3
26622662
[HighwayIntersectionInfo_0x00005028]
26632663
;Added by Tarkus 2023/01/16
26642664
;L2 RHW-10C Starter Piece
2665-
Piece = 0.0, 0.0, 0, 0, 0x57F0A005
2666-
PreviewEffect = preview_starter_l0rhw10c000
2665+
Piece = 0.0, 0.0, 0, 0, 0x57F2A005
2666+
PreviewEffect = preview_starter_l2rhw10c000
26672667

26682668
CellLayout =........
26692669
CellLayout =..cba...
26702670
CellLayout =...d.<..
26712671
CellLayout =...^....
26722672

2673-
CheckType = a - dirtroad: 0x02000200 Street: 0x03000003, 0xffffffff optional
2673+
CheckType = a - dirtroad: 0x02000200 onewayroad: 0x04040200, 0xffffffff optional
26742674
CheckType = b - dirtroad: 0x02000200 highway: 0x00040004, 0xffffffff optional
2675-
CheckType = c - dirtroad: 0x02000200 Street: 0x00030300, 0xffffffff optional
2675+
CheckType = c - dirtroad: 0x02000200 onewayroad: 0x02000404, 0xffffffff optional
26762676
CheckType = d - dirtroad: 0x02000200
26772677

26782678
ConsLayout = ........

‎Controller/RUL0/5000_RHW/5900_FLEX_Turn_Lanes.txt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -754,17 +754,18 @@ PreviewEffect = preview_starter_rhwsitap007
754754
CellLayout =.......
755755
CellLayout =...Z..<
756756
CellLayout =...bb..
757-
CellLayout =...aa..
757+
CellLayout =...af..
758758
CellLayout =...dd..
759759
CellLayout =.......
760760
CellLayout =...^...
761761

762762
CheckType = Z - dirtroad: 0x02000200
763-
CheckType = a - road: 0x02020202, 0xffffffff optional
763+
CheckType = a - road: 0x02020202 dirtroad: 0x04030000, 0xffffffff optional
764764
CheckType = b - dirtroad: 0x02000000, 0xffffffff optional
765765
CheckType = c - road: 0x00020000, 0xffffffff optional
766766
CheckType = d - dirtroad: 0x00000200, 0xffffffff optional
767767
CheckType = e - road: 0x00000002, 0xffffffff optional
768+
CheckType = f - road: 0x02020202 dirtroad: 0x00000403, 0xffffffff optional
768769

769770
ConsLayout =.......
770771
ConsLayout =...|..<
@@ -805,9 +806,9 @@ CellLayout =.......
805806
CellLayout =...^...
806807

807808
CheckType = Z - dirtroad: 0x02000200
808-
CheckType = a - road: 0x02020200, 0xffffffff optional
809+
CheckType = a - road: 0x02020200 dirtroad: 0x04030000, 0xffffffff optional
809810
CheckType = b - dirtroad: 0x02000000, 0xffffffff optional
810-
CheckType = c - road: 0x02020202, 0xffffffff optional
811+
CheckType = c - road: 0x02020202 dirtroad: 0x00000403, 0xffffffff optional
811812
CheckType = d - dirtroad: 0x00000200, 0xffffffff optional
812813
CheckType = e - dirtroad: 0x00000002, 0xffffffff optional
813814

0 commit comments

Comments
 (0)