Skip to content

Commit 22654ce

Browse files
memo33memo33
authored
Merge pull request NAMTeam#535 from memo33/str-diag
fix IID of diagonal STR (RAM vs RRW)
2 parents 3685058 + f18aae3 commit 22654ce

9 files changed

Lines changed: 2749 additions & 1309 deletions

File tree

‎Controller/RUL1/02_Rail/04_Rail_Street.txt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -132,25 +132,25 @@ TYPE4b=0x00020000,0x00000101,0x5d300000,1,0
132132
TYPE4c=0x00000200,0x00000101,0x5d300000,2,0
133133
TYPE4d=0x00000002,0x00000101,0x5d300000,3,0
134134
;diagonal RAM Set 1 starter
135-
TYPE1=0x03010000,0x00000101,0x5d302000,0,0
136-
TYPE2=0x00030100,0x01000001,0x5d302000,3,0
137-
TYPE3=0x00000301,0x01010000,0x5d302000,2,0
138-
TYPE4=0x01000003,0x00010100,0x5d302000,1,0
135+
TYPE1=0x03010000,0x00000101,0x5d500100,0,0
136+
TYPE2=0x00030100,0x01000001,0x5d500100,3,0
137+
TYPE3=0x00000301,0x01010000,0x5d500100,2,0
138+
TYPE4=0x01000003,0x00010100,0x5d500100,1,0
139139
;flip
140-
TYPE1=0x03010000,0x00000303,0x5d302000,0,0
141-
TYPE2=0x00030100,0x03000003,0x5d302000,3,0
142-
TYPE3=0x00000301,0x03030000,0x5d302000,2,0
143-
TYPE4=0x01000003,0x00030300,0x5d302000,1,0
140+
TYPE1=0x03010000,0x00000303,0x5d500100,0,0
141+
TYPE2=0x00030100,0x03000003,0x5d500100,3,0
142+
TYPE3=0x00000301,0x03030000,0x5d500100,2,0
143+
TYPE4=0x01000003,0x00030300,0x5d500100,1,0
144144
;Stub
145-
TYPE1=0x00010000,0x00000101,0x5d302000,0,0
146-
TYPE2=0x00000100,0x01000001,0x5d302000,3,0
147-
TYPE3=0x00000001,0x01010000,0x5d302000,2,0
148-
TYPE4=0x01000000,0x00010100,0x5d302000,1,0
145+
TYPE1=0x00010000,0x00000101,0x5d500100,0,0
146+
TYPE2=0x00000100,0x01000001,0x5d500100,3,0
147+
TYPE3=0x00000001,0x01010000,0x5d500100,2,0
148+
TYPE4=0x01000000,0x00010100,0x5d500100,1,0
149149
;flip stub
150-
TYPE1=0x00000003,0x00030300,0x5d302000,1,0
151-
TYPE2=0x00000300,0x03030000,0x5d302000,2,0
152-
TYPE3=0x00030000,0x03000003,0x5d302000,3,0
153-
TYPE1=0x03000000,0x00000303,0x5d302000,0,0
150+
TYPE1=0x00000003,0x00030300,0x5d500100,1,0
151+
TYPE2=0x00000300,0x03030000,0x5d500100,2,0
152+
TYPE3=0x00030000,0x03000003,0x5d500100,3,0
153+
TYPE1=0x03000000,0x00000303,0x5d500100,0,0
154154

155155
;Added 31-Dec-10 - Tarkus
156156
;Updated 18-Mar-11 to add Diagonal Starter

‎Controller/RUL2/06_Road_Viaducts/Sec6a_L1.txt‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19665,8 +19665,6 @@
1966519665
;> L0 RHW-8C
1966619666
;> L1 MIS
1966719667
;from STR side
19668-
0x5D302000,0,0,0x5C004500,2,1=0x5D302000,0,0,0x5C004505,2,1
19669-
0x5D302000,3,0,0x5C004500,0,0=0x5D302000,3,0,0x5C004505,0,0
1967019668
0x5D500100,0,0,0x5C004500,2,1=0x5D500100,0,0,0x5C004505,2,1
1967119669
0x5D500100,3,0,0x5C004500,0,0=0x5D500100,3,0,0x5C004505,0,0
1967219670
;
@@ -19675,8 +19673,8 @@
1967519673
;
1967619674
0x5C004505,2,0,0x5D540100,1,0=0x5C004505,2,0,0x5D500100,1,0
1967719675
0x5C004505,0,1,0x5D540100,2,0=0x5C004505,0,1,0x5D500100,2,0
19678-
0x5C004505,2,0,0x03001A00,1,0=0x5C004505,2,0,0x5D302000,1,0
19679-
0x5C004505,0,1,0x03001A00,2,0=0x5C004505,0,1,0x5D302000,2,0
19676+
0x5C004505,2,0,0x03001A00,1,0=0x5C004505,2,0,0x5D500100,1,0
19677+
0x5C004505,0,1,0x03001A00,2,0=0x5C004505,0,1,0x5D500100,2,0
1968019678
;----Light Rail (47)----
1968119679
;Elevated Light Rail (47-2)
1968219680
0x5C000000,1,0,0x08DD1600,1,1=0x5C000000,1,0,0x5C004720,3,0
@@ -23154,8 +23152,6 @@
2315423152
;> L0 RHW-8C
2315523153
;> L1 MIS
2315623154
;from STR side
23157-
0x5D302000,0,0,0x5C014500,2,1=0x5D302000,0,0,0x5C014505,2,1
23158-
0x5D302000,3,0,0x5C014500,0,0=0x5D302000,3,0,0x5C014505,0,0
2315923155
0x5D500100,0,0,0x5C014500,2,1=0x5D500100,0,0,0x5C014505,2,1
2316023156
0x5D500100,3,0,0x5C014500,0,0=0x5D500100,3,0,0x5C014505,0,0
2316123157
;
@@ -23164,8 +23160,8 @@
2316423160
;
2316523161
0x5C014505,2,0,0x5D540100,1,0=0x5C014505,2,0,0x5D500100,1,0
2316623162
0x5C014505,0,1,0x5D540100,2,0=0x5C014505,0,1,0x5D500100,2,0
23167-
0x5C014505,2,0,0x09301A00,1,0=0x5C014505,2,0,0x5D302000,1,0; missing_paths
23168-
0x5C014505,0,1,0x09301A00,2,0=0x5C014505,0,1,0x5D302000,2,0; missing_paths
23163+
0x5C014505,2,0,0x09301A00,1,0=0x5C014505,2,0,0x5D500100,1,0; missing_paths
23164+
0x5C014505,0,1,0x09301A00,2,0=0x5C014505,0,1,0x5D500100,2,0; missing_paths
2316923165
;----Light Rail (47)----
2317023166
;Elevated Light Rail (47-2)
2317123167
0x5C010000,1,0,0x091D1600,1,1=0x5C010000,1,0,0x5C014720,3,0
@@ -27551,10 +27547,10 @@
2755127547
0x5C024505,3,1,0x57127389,0,0=0x5C024505,3,1,0x5712739A,0,0; missing_paths
2755227548
0x5C024505,1,0,0x57127389,2,1=0x5C024505,1,0,0x5712739A,2,1; missing_paths
2755327549
;-STR Side-
27554-
0x5d302000,0,0,0x5C024500,2,1=0x5d302000,0,0,0x5C024505,2,1
27555-
0x5d302000,3,0,0x5C024500,0,0=0x5d302000,3,0,0x5C024505,0,0
27556-
0x5d302000,0,0,0x5C024580,0,1=0x5d302000,0,0,0x5C024585,0,1
27557-
0x5d302000,3,0,0x5C024580,2,0=0x5d302000,3,0,0x5C024585,2,0
27550+
0x5d500100,0,0,0x5C024500,2,1=0x5d500100,0,0,0x5C024505,2,1
27551+
0x5d500100,3,0,0x5C024500,0,0=0x5d500100,3,0,0x5C024505,0,0
27552+
0x5d500100,0,0,0x5C024580,0,1=0x5d500100,0,0,0x5C024585,0,1
27553+
0x5d500100,3,0,0x5C024580,2,0=0x5d500100,3,0,0x5C024585,2,0
2755827554
;Tile 2/4
2755927555
0x5C024505,1,1,0x5C024580,1,1=0x5C024505,1,1,0x5C024585,1,1
2756027556
0x5C024505,3,0,0x5C024580,3,0=0x5C024505,3,0,0x5C024585,3,0
@@ -27564,10 +27560,10 @@
2756427560
0x5C024585,2,1,0x5C024580,0,1=0x5C024585,2,1,0x5C024585,0,1
2756527561
0x5C024585,0,0,0x5C024580,2,0=0x5C024585,0,0,0x5C024585,2,0
2756627562
;Diag
27567-
0x5C024505,2,0,0x03001a00,1,0=0x5C024505,2,0,0x5d302000,1,0
27568-
0x5C024505,2,0,0x5d540200,1,0=0x5C024505,2,0,0x5d302000,1,0
27569-
0x5C024505,0,1,0x03001a00,2,0=0x5C024505,0,1,0x5d302000,2,0
27570-
0x5C024505,0,1,0x5d540200,2,0=0x5C024505,0,1,0x5d302000,2,0
27563+
0x5C024505,2,0,0x03001a00,1,0=0x5C024505,2,0,0x5d500100,1,0
27564+
0x5C024505,2,0,0x5d540200,1,0=0x5C024505,2,0,0x5d500100,1,0
27565+
0x5C024505,0,1,0x03001a00,2,0=0x5C024505,0,1,0x5d500100,2,0
27566+
0x5C024505,0,1,0x5d540200,2,0=0x5C024505,0,1,0x5d500100,2,0
2757127567
;--Ground Light Rail 1 (47a)--
2757227568
0x5C020000,1,0,0x5f882100,1,0=0x5C020000,1,0,0x5C024780,1,0
2757327569
0x5C020000,3,0,0x5f882100,3,1=0x5C020000,3,0,0x5C024780,3,1
@@ -31886,9 +31882,9 @@
3188631882
;-STR Side-
3188731883
0x5D500100,3,0,0x5C02A500,1,0=0x5D500100,3,0,0x5C02A505,1,0
3188831884
0x5D500100,0,0,0x5C02A500,3,1=0x5D500100,0,0,0x5C02A505,3,1
31889-
0x5C02A505,3,0,0x03001a00,1,0=0x5C02A505,3,0,0x5d302000,1,0
31885+
0x5C02A505,3,0,0x03001a00,1,0=0x5C02A505,3,0,0x5d500100,1,0
3189031886
0x5C02A505,3,0,0x5d540100,1,0=0x5C02A505,3,0,0x5d500100,1,0
31891-
0x5C02A505,1,1,0x03001a00,2,0=0x5C02A505,1,1,0x5d302000,2,0
31887+
0x5C02A505,1,1,0x03001a00,2,0=0x5C02A505,1,1,0x5d500100,2,0
3189231888
0x5C02A505,1,1,0x5d540100,2,0=0x5C02A505,1,1,0x5d500100,2,0
3189331889
;--Ground Light Rail (A7a)--
3189431890
0x5C020200,0,0,0x5f882600,3,0=0x5C020200,0,0,0x5C02A780,0,0

‎Controller/RUL2/06_Road_Viaducts/Sec6b_L2.txt‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11497,8 +11497,6 @@
1149711497
;> L0 RHW-8C
1149811498
;> L1 MIS
1149911499
;from STR side
11500-
0x5D302000,0,0,0x5C034500,2,1=0x5D302000,0,0,0x5C034505,2,1
11501-
0x5D302000,3,0,0x5C034500,0,0=0x5D302000,3,0,0x5C034505,0,0
1150211500
0x5D500100,0,0,0x5C034500,2,1=0x5D500100,0,0,0x5C034505,2,1
1150311501
0x5D500100,3,0,0x5C034500,0,0=0x5D500100,3,0,0x5C034505,0,0
1150411502
;
@@ -11507,8 +11505,8 @@
1150711505
;
1150811506
0x5C034505,2,0,0x5D540100,1,0=0x5C034505,2,0,0x5D500100,1,0
1150911507
0x5C034505,0,1,0x5D540100,2,0=0x5C034505,0,1,0x5D500100,2,0
11510-
0x5C034505,2,0,0x03001A00,1,0=0x5C034505,2,0,0x5D302000,1,0
11511-
0x5C034505,0,1,0x03001A00,2,0=0x5C034505,0,1,0x5D302000,2,0
11508+
0x5C034505,2,0,0x03001A00,1,0=0x5C034505,2,0,0x5D500100,1,0
11509+
0x5C034505,0,1,0x03001A00,2,0=0x5C034505,0,1,0x5D500100,2,0
1151211510
;----Light Rail (47)----
1151311511
;Elevated Light Rail (47-2)
1151411512
0x5C030000,1,0,0x08DD1600,1,1=0x5C030000,1,0,0x5C034720,3,0
@@ -15136,8 +15134,6 @@
1513615134
;> L0 RHW-8C
1513715135
;> L1 MIS
1513815136
;from STR side
15139-
0x5D302000,0,0,0x5C044500,2,1=0x5D302000,0,0,0x5C044505,2,1
15140-
0x5D302000,3,0,0x5C044500,0,0=0x5D302000,3,0,0x5C044505,0,0
1514115137
0x5D500100,0,0,0x5C044500,2,1=0x5D500100,0,0,0x5C044505,2,1
1514215138
0x5D500100,3,0,0x5C044500,0,0=0x5D500100,3,0,0x5C044505,0,0
1514315139
;
@@ -15146,8 +15142,8 @@
1514615142
;
1514715143
0x5C044505,2,0,0x5D540100,1,0=0x5C044505,2,0,0x5D500100,1,0
1514815144
0x5C044505,0,1,0x5D540100,2,0=0x5C044505,0,1,0x5D500100,2,0
15149-
0x5C044505,2,0,0x09301A00,1,0=0x5C044505,2,0,0x5D302000,1,0; missing_paths
15150-
0x5C044505,0,1,0x09301A00,2,0=0x5C044505,0,1,0x5D302000,2,0; missing_paths
15145+
0x5C044505,2,0,0x09301A00,1,0=0x5C044505,2,0,0x5D500100,1,0; missing_paths
15146+
0x5C044505,0,1,0x09301A00,2,0=0x5C044505,0,1,0x5D500100,2,0; missing_paths
1515115147
;----Light Rail (47)----
1515215148
;Elevated Light Rail (47-2)
1515315149
0x5C040000,1,0,0x091D1600,1,1=0x5C040000,1,0,0x5C044720,3,0
@@ -19549,10 +19545,10 @@
1954919545
0x5C054505,3,1,0x57227389,0,0=0x5C054505,3,1,0x572273AA,0,0; missing_paths
1955019546
0x5C054505,1,0,0x57227389,2,1=0x5C054505,1,0,0x572273AA,2,1; missing_paths
1955119547
;-STR Side-
19552-
0x5d302000,0,0,0x5C054500,2,1=0x5d302000,0,0,0x5C054505,2,1
19553-
0x5d302000,3,0,0x5C054500,0,0=0x5d302000,3,0,0x5C054505,0,0
19554-
0x5d302000,0,0,0x5C054580,0,1=0x5d302000,0,0,0x5C054585,0,1
19555-
0x5d302000,3,0,0x5C054580,2,0=0x5d302000,3,0,0x5C054585,2,0
19548+
0x5d500100,0,0,0x5C054500,2,1=0x5d500100,0,0,0x5C054505,2,1
19549+
0x5d500100,3,0,0x5C054500,0,0=0x5d500100,3,0,0x5C054505,0,0
19550+
0x5d500100,0,0,0x5C054580,0,1=0x5d500100,0,0,0x5C054585,0,1
19551+
0x5d500100,3,0,0x5C054580,2,0=0x5d500100,3,0,0x5C054585,2,0
1955619552
;Tile 2/4
1955719553
0x5C054505,1,1,0x5C054580,1,1=0x5C054505,1,1,0x5C054585,1,1
1955819554
0x5C054505,3,0,0x5C054580,3,0=0x5C054505,3,0,0x5C054585,3,0
@@ -19562,10 +19558,10 @@
1956219558
0x5C054585,2,1,0x5C054580,0,1=0x5C054585,2,1,0x5C054585,0,1
1956319559
0x5C054585,0,0,0x5C054580,2,0=0x5C054585,0,0,0x5C054585,2,0
1956419560
;Diag
19565-
0x5C054505,2,0,0x03001a00,1,0=0x5C054505,2,0,0x5d302000,1,0
19566-
0x5C054505,2,0,0x5d540200,1,0=0x5C054505,2,0,0x5d302000,1,0
19567-
0x5C054505,0,1,0x03001a00,2,0=0x5C054505,0,1,0x5d302000,2,0
19568-
0x5C054505,0,1,0x5d540200,2,0=0x5C054505,0,1,0x5d302000,2,0
19561+
0x5C054505,2,0,0x03001a00,1,0=0x5C054505,2,0,0x5d500100,1,0
19562+
0x5C054505,2,0,0x5d540200,1,0=0x5C054505,2,0,0x5d500100,1,0
19563+
0x5C054505,0,1,0x03001a00,2,0=0x5C054505,0,1,0x5d500100,2,0
19564+
0x5C054505,0,1,0x5d540200,2,0=0x5C054505,0,1,0x5d500100,2,0
1956919565
;--Ground Light Rail 1 (47a)--
1957019566
0x5C050000,1,0,0x5f882100,1,0=0x5C050000,1,0,0x5C054780,1,0
1957119567
0x5C050000,3,0,0x5f882100,3,1=0x5C050000,3,0,0x5C054780,3,1
@@ -23936,9 +23932,9 @@
2393623932
;-STR Side-
2393723933
0x5D500100,3,0,0x5C05A500,1,0=0x5D500100,3,0,0x5C05A505,1,0
2393823934
0x5D500100,0,0,0x5C05A500,3,1=0x5D500100,0,0,0x5C05A505,3,1
23939-
0x5C05A505,3,0,0x03001a00,1,0=0x5C05A505,3,0,0x5d302000,1,0
23935+
0x5C05A505,3,0,0x03001a00,1,0=0x5C05A505,3,0,0x5d500100,1,0
2394023936
0x5C05A505,3,0,0x5d540100,1,0=0x5C05A505,3,0,0x5d500100,1,0
23941-
0x5C05A505,1,1,0x03001a00,2,0=0x5C05A505,1,1,0x5d302000,2,0
23937+
0x5C05A505,1,1,0x03001a00,2,0=0x5C05A505,1,1,0x5d500100,2,0
2394223938
0x5C05A505,1,1,0x5d540100,2,0=0x5C05A505,1,1,0x5d500100,2,0
2394323939
;--Ground Light Rail (A7a)--
2394423940
0x5C050200,0,0,0x5f882600,3,0=0x5C050200,0,0,0x5C05A780,0,0

0 commit comments

Comments
 (0)