Skip to content

Commit 2cc197d

Browse files
committed
Adds support (via RUL1 and RUL2 supplement) for RHW-2 Diag Ts that were not previously supported.
1 parent 73faef4 commit 2cc197d

4 files changed

Lines changed: 138 additions & 58 deletions

File tree

Controller/RUL1/01_Road/09_Road_Dirtroad.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -192,15 +192,15 @@ TYPE2=0x02000200,0x00040004,0x57001100,1,0
192192
7=0X00020002,0X01000003,0x57007100,0,1
193193
8=0X02000200,0X03010000,0x57007100,1,1
194194
;t version
195-
1=0X00020000,0X00000301,0x57007100,2,0
196-
2=0X00000200,0X00030100,0x57007100,3,0
197-
3=0X00000002,0X03010000,0x57007100,0,0
198-
4=0X02000000,0X01000003,0x57007100,1,0
195+
1=0X00020000,0X00000301,0x57604109,2,0
196+
2=0X00000200,0X00030100,0x57604109,3,0
197+
3=0X00000002,0X03010000,0x57604109,0,0
198+
4=0X02000000,0X01000003,0x57604109,1,0
199199
;duplicates disabled ~ memo
200-
;5=0X00020002,0X00030100,0x57007100,2,1
201-
;6=0X02000200,0X00000301,0x57007100,3,1
202-
;7=0X00020002,0X01000003,0x57007100,0,1
203-
;8=0X02000200,0X03010000,0x57007100,1,1
200+
5=0X00020002,0X00030100,0x57604109,2,1
201+
6=0X02000200,0X00000301,0x57604109,3,1
202+
7=0X00020002,0X01000003,0x57604109,0,1
203+
8=0X02000200,0X03010000,0x57604109,1,1
204204
;
205205
;diagonal rhw t, straight road
206206
1=0X00020002,0X00000300,0x57605100,3,1

Controller/RUL1/04_Street/09_Street_Dirtroad.txt

Lines changed: 45 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,27 @@ RWNSSE=0X00020000,0X02000202,0x5760B000,0,0
9696
7=0X00000002,0X01000000,0x5EAA1100,2,1
9797
8=0X02000000,0X00010000,0x5EAA1100,3,1
9898
;;diagonal road, straight street t
99-
1=0X00020000,0X00000301,0x57007000,2,0
100-
2=0X00000002,0X00030100,0x57007000,2,1
101-
3=0X00000002,0X03010000,0x57007000,0,0
102-
4=0X00020000,0X01000003,0x57007000,0,1
103-
5=0X02000000,0X00030100,0x57007000,3,0
104-
6=0X02000000,0X00000301,0x57007000,3,1
105-
7=0X00000200,0X01000003,0x57007000,1,0
106-
8=0X00000200,0X03010000,0x57007000,1,1
99+
;t version
100+
1=0X00020000,0X00000301,0x57604009,2,0
101+
2=0X00000200,0X00030100,0x57604009,3,0
102+
3=0X00000002,0X03010000,0x57604009,0,0
103+
4=0X02000000,0X01000003,0x57604009,1,0
104+
;duplicates disabled ~ memo
105+
5=0X00020002,0X00030100,0x57604009,2,1
106+
6=0X02000200,0X00000301,0x57604009,3,1
107+
7=0X00020002,0X01000003,0x57604009,0,1
108+
8=0X02000200,0X03010000,0x57604009,1,1
109+
;diagonal rhw t, straight street
110+
;
111+
1=0X00020002,0X00000300,0x57605000,3,1
112+
2=0X02000200,0X00030000,0x57605000,2,1
113+
3=0X00020002,0X03000000,0x57605000,1,1
114+
4=0X02000200,0X00000003,0x57605000,0,1
115+
5=0X00020002,0X00000100,0x57605000,3,0
116+
6=0X02000200,0X00000001,0x57605000,2,0
117+
7=0X00020002,0X01000000,0x57605000,1,0
118+
8=0X02000200,0X00010000,0x57605000,0,0
119+
107120
;
108121
;Dummy for Transitions
109122
;1=0x00000000,0x02000200,0x5E00FF00,0,0
@@ -126,23 +139,23 @@ TYPE6=0x00010000,0x03000000,0x5F502000,1,1
126139
TYPE7=0x00000100,0x00030000,0x5F502000,2,1
127140
TYPE8=0x00000001,0x00000300,0x5F502000,3,1
128141
;orth road, single diag street (T)
129-
;TYPE1=0x00010000,0x02000200,0x5F502100,0,0
130-
;TYPE2=0x01000000,0x00020002,0x5F502100,1,0
131-
;TYPE3=0x00000001,0x02000200,0x5F502100,2,0
132-
;TYPE4=0x00000100,0x00020002,0x5F502100,3,0
133-
;TYPE5=0x00000003,0x02000200,0x5F502100,0,1
134-
;TYPE6=0x03000000,0x00020002,0x5F502100,1,1
135-
;TYPE7=0x00030000,0x02000200,0x5F502100,2,1
136-
;TYPE8=0x00000300,0x00020002,0x5F502100,3,1
142+
TYPE1=0x00010000,0x02000200,0x57602000,0,0
143+
TYPE2=0x01000000,0x00020002,0x57602000,1,0
144+
TYPE3=0x00000001,0x02000200,0x57602000,2,0
145+
TYPE4=0x00000100,0x00020002,0x57602000,3,0
146+
TYPE5=0x00000003,0x02000200,0x57602000,0,1
147+
TYPE6=0x03000000,0x00020002,0x57602000,1,1
148+
TYPE7=0x00030000,0x02000200,0x57602000,2,1
149+
TYPE8=0x00000300,0x00020002,0x57602000,3,1
137150
;
138-
TYPE1=0x00010000,0x02000200,0x57004000,2,0
139-
TYPE2=0x01000000,0x00020002,0x57004000,3,0
140-
TYPE3=0x00000001,0x02000200,0x57004000,0,0
141-
TYPE4=0x00000100,0x00020002,0x57004000,1,0
142-
TYPE5=0x00000003,0x02000200,0x57004000,2,1
143-
TYPE6=0x03000000,0x00020002,0x57004000,3,1
144-
TYPE7=0x00030000,0x02000200,0x57004000,0,1
145-
TYPE8=0x00000300,0x00020002,0x57004000,1,1
151+
;TYPE1=0x00010000,0x02000200,0x57004000,2,0
152+
;TYPE2=0x01000000,0x00020002,0x57004000,3,0
153+
;TYPE3=0x00000001,0x02000200,0x57004000,0,0
154+
;TYPE4=0x00000100,0x00020002,0x57004000,1,0
155+
;TYPE5=0x00000003,0x02000200,0x57004000,2,1
156+
;TYPE6=0x03000000,0x00020002,0x57004000,3,1
157+
;TYPE7=0x00030000,0x02000200,0x57004000,0,1
158+
;TYPE8=0x00000300,0x00020002,0x57004000,1,1
146159
;OnSlope
147160
TYPE1=0x00010000,0x04000400,0x57004000,2,0
148161
TYPE2=0x01000000,0x00040004,0x57004000,3,0
@@ -155,14 +168,14 @@ TYPE8=0x00000300,0x00040004,0x57004000,1,1
155168

156169
;ortho rhw x diagonal cross network
157170
;
158-
TYPE1=0x00030100,0x02000000,0x57004000,2,0
159-
TYPE2=0x03010000,0x00000002,0x57004000,3,0
160-
TYPE3=0x01000003,0x00000200,0x57004000,0,0
161-
TYPE4=0x00000301,0x00020000,0x57004000,1,0
162-
TYPE5=0x00000301,0x02000000,0x57004000,2,1
163-
TYPE6=0x00030100,0x00000002,0x57004000,1,1
164-
TYPE7=0x03010000,0x00000200,0x57004000,0,1
165-
TYPE8=0x01000003,0x00020000,0x57004000,3,1
171+
TYPE1=0x00030100,0x02000000,0x57003000,2,0
172+
TYPE2=0x03010000,0x00000002,0x57003000,3,0
173+
TYPE3=0x01000003,0x00000200,0x57003000,0,0
174+
TYPE4=0x00000301,0x00020000,0x57003000,1,0
175+
TYPE5=0x00000301,0x02000000,0x57003000,2,1
176+
TYPE6=0x00030100,0x00000002,0x57003000,1,1
177+
TYPE7=0x03010000,0x00000200,0x57003000,0,1
178+
TYPE8=0x01000003,0x00020000,0x57003000,3,1
166179
;
167180
TYPE1=0x00030100,0x02000200,0x57004000,2,0
168181
TYPE2=0x03010000,0x00020002,0x57004000,3,0

Controller/RUL1/08_OneWayRoad/09_OneWayRoad_Dirtroad.txt

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,16 @@ TYPE8=0x00010000,0x01000003,0x5700A200,0,1
5050

5151
;
5252
;piece 39
53-
; fixed the flags ~ memo 2014/01/24
54-
1=0X00020000,0X00000301,0x57007200,2,0
55-
2=0X02000000,0X00030100,0x57007200,3,0
56-
3=0X00000002,0X03010000,0x57007200,0,0
57-
4=0X00000200,0X01000003,0x57007200,1,0
58-
5=0X00000002,0X00030100,0x57007200,2,1
59-
6=0X02000000,0X00000301,0x57007200,3,1
60-
7=0X00020000,0X01000003,0x57007200,0,1
61-
8=0X00000200,0X03010000,0x57007200,1,1
53+
;t version
54+
1=0X00020000,0X00000301,0x57604209,2,0
55+
2=0X00000200,0X00030100,0x57604209,3,0
56+
3=0X00000002,0X03010000,0x57604209,0,0
57+
4=0X02000000,0X01000003,0x57604209,1,0
58+
;duplicates disabled ~ memo
59+
5=0X00020002,0X00030100,0x57604209,2,1
60+
6=0X02000200,0X00000301,0x57604209,3,1
61+
7=0X00020002,0X01000003,0x57604209,0,1
62+
8=0X02000200,0X03010000,0x57604209,1,1
6263
;
6364
;TYPE1=0x02000000,0x00030100,0x57007200,0,0
6465
;TYPE2=0x00000002,0x03010000,0x57007200,1,0
@@ -176,16 +177,27 @@ TYPE7=0x03010000,0x04000400,0x57004200,0,1
176177
TYPE8=0x01000003,0x00040004,0x57004200,3,1
177178

178179
;
179-
;diagonal one-way road t, straight road
180+
;diagonal rhw t, straight onewayroad
180181
;
181-
;1=0X00020002,0X00000300,0x5E906300,0,0
182-
;2=0X02000200,0X00030000,0x5E906300,1,0
183-
;3=0X00020002,0X03000000,0x5E906300,1,1
184-
;4=0X02000200,0X00000003,0x5E906300,3,0
185-
;5=0X00020002,0X00000100,0x5E906300,0,1
186-
;6=0X02000200,0X00000001,0x5E906300,1,1
187-
;7=0X00020002,0X01000000,0x5E906300,2,1
188-
;8=0X02000200,0X00010000,0x5E906300,3,1
182+
1=0X00020002,0X00000300,0x57605200,3,1
183+
2=0X02000200,0X00030000,0x57605200,2,1
184+
3=0X00020002,0X03000000,0x57605200,1,1
185+
4=0X02000200,0X00000003,0x57605200,0,1
186+
5=0X00020002,0X00000100,0x57605200,3,0
187+
6=0X02000200,0X00000001,0x57605200,2,0
188+
7=0X00020002,0X01000000,0x57605200,1,0
189+
8=0X02000200,0X00010000,0x57605200,0,0
190+
191+
;diagonal onewayroad t, straight rhw
192+
1=0X00000300,0X00020002,0x57602200,3,1
193+
2=0X00030000,0X02000200,0x57602200,2,1
194+
3=0X03000000,0X00020002,0x57602200,1,1
195+
4=0X00000003,0X02000200,0x57602200,0,1
196+
5=0X00000100,0X00020002,0x57602200,3,0
197+
6=0X00000001,0X02000200,0x57602200,2,0
198+
7=0X01000000,0X00020002,0x57602200,1,0
199+
8=0X00010000,0X02000200,0x57602200,0,0
200+
189201
;
190202
;Added 010107 ~ memo
191203
;diagonal DirtRoad ending in orth OneWayRoad

Controller/RUL2/07_RHW/Sec7a_Initial/Sec7a1_RHW-2_Initial.txt

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,61 @@
3232
0x57000200,0,0,0x5702AA80,3,1=0x5760D500,0,0,0x5702AA80,3,1
3333
0x57000200,3,0,0x5702AA80,1,0=0x5760D500,2,1,0x5702AA80,1,0
3434

35+
;----Diagonal Street x Ortho RHW-2 Fix (T20)----
36+
0x5F500200,0,0,0x57602000,2,0=0x5F500400,1,1,0x57602000,2,0
37+
0x5F500200,3,0,0x57602000,0,1=0x5F500400,3,0,0x57602000,0,1
38+
39+
;----Diagonal Road x Ortho RHW-2 Fix (T21)----
40+
0x00000a00,0,0,0x57602100,2,0=0x00000c00,1,1,0x57602100,2,0
41+
0x00000a00,3,0,0x57602100,0,1=0x00000c00,3,0,0x57602100,0,1
42+
43+
;----Diagonal Road x Ortho RHW-2 Fix (T22)----
44+
0x09000a00,0,0,0x57602200,2,0=0x09000c00,1,1,0x57602200,2,0
45+
0x09000a00,3,0,0x57602200,0,1=0x09000c00,3,0,0x57602200,0,1
46+
47+
;----Orthogonal RHW-2 x Diagonal Street Fix (T30)----
48+
0x57004000,3,0,0x5F500200,2,0=0x57603000,3,0,0x57603009,3,0
49+
0x57004000,1,1,0x5F500200,1,0=0x57603000,1,1,0x57603009,1,1
50+
51+
;----Orthogonal RHW-2 x Diagonal Road Fix (T31)----
52+
0x57004100,3,0,0x00000a00,2,0=0x57603100,3,0,0x57603109,3,0
53+
0x57004100,1,1,0x00000a00,1,0=0x57603100,1,1,0x57603109,1,1
54+
55+
;----Orthogonal RHW-2 x Diagonal One-Way Road Fix (T32)----
56+
0x57004200,3,0,0x09000a00,2,0=0x57603200,3,0,0x57603209,3,0
57+
0x57004200,1,1,0x09000a00,1,0=0x57603200,1,1,0x57603209,1,1
58+
59+
;----Orthogonal Street x Diagonal RHW-2 Fix (T40)----
60+
0x57007000,0,0,0x57000200,2,0=0x57604000,0,0,0x57604009,2,0
61+
0x57007000,2,1,0x57000200,1,0=0x57604000,2,1,0x57604009,0,1
62+
0x57604000,0,0,0x57000200,2,0=0x57604000,0,0,0x57604009,2,0
63+
0x57604000,2,1,0x57000200,1,0=0x57604000,2,1,0x57604009,0,1
64+
65+
;----Orthogonal Road x Diagonal RHW-2 Fix (T41)----
66+
0x57007100,0,0,0x57000200,2,0=0x57604100,0,0,0x57604109,2,0
67+
0x57007100,2,1,0x57000200,1,0=0x57604100,2,1,0x57604109,0,1
68+
0x57604100,0,0,0x57000200,2,0=0x57604100,0,0,0x57604109,2,0
69+
0x57604100,2,1,0x57000200,1,0=0x57604100,2,1,0x57604109,0,1
70+
71+
;----Orthogonal One-Way Road x Diagonal RHW-2 Fix (T42)----
72+
0x57007200,0,0,0x57000200,2,0=0x57604200,0,0,0x57604209,2,0
73+
0x57007200,2,1,0x57000200,1,0=0x57604200,2,1,0x57604209,0,1
74+
0x57604200,0,0,0x57000200,2,0=0x57604200,0,0,0x57604209,2,0
75+
0x57604200,2,1,0x57000200,1,0=0x57604200,2,1,0x57604209,0,1
76+
77+
78+
;----Diagonal RHW-2 x Ortho Street Fix (T50)----
79+
0x57000200,0,0,0x57605000,2,0=0x57000500,1,1,0x57605000,2,0
80+
0x57000200,3,0,0x57605000,0,1=0x57000500,3,0,0x57605000,0,1
81+
82+
;----Diagonal RHW-2 x Ortho Street Fix (T51)----
83+
0x57000200,0,0,0x57605100,2,0=0x57000500,1,1,0x57605100,2,0
84+
0x57000200,3,0,0x57605100,0,1=0x57000500,3,0,0x57605100,0,1
85+
86+
;----Diagonal RHW-2 x Ortho Street Fix (T52)----
87+
0x57000200,0,0,0x57605200,2,0=0x57000500,1,1,0x57605200,2,0
88+
0x57000200,3,0,0x57605200,0,1=0x57000500,3,0,0x57605200,0,1
89+
3590
;----Diagonal RHW-2 x Ortho Avenue Fix (T53)----
3691
0x57007300,0,0,0x57605309,1,1=0x57605300,1,1,0x57605309,1,1
3792
0x57007300,2,1,0x57605309,3,0=0x57605300,3,0,0x57605309,3,0

0 commit comments

Comments
 (0)