Skip to content

Commit a2fd95e

Browse files
committed
Adds mirrored versions of select OWR and AVE Ts to mitigate RUL2 conflicts.
1 parent ceef94b commit a2fd95e

6 files changed

Lines changed: 92 additions & 84 deletions

File tree

Controller/RUL1/01_Road/05_Road_Avenue.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,10 +223,10 @@ TYPE0=0x00000300,0x04020002,0x5F473200,0,0
223223
TYPE1=0x00030000,0x02000204,0x5F473200,1,0
224224
TYPE2=0x03000000,0x00020402,0x5F473200,2,0
225225
TYPE3=0x00000003,0x02040200,0x5F473200,3,0
226-
TYPE4=0x00000100,0x04020002,0x5F473200,0,1
227-
TYPE5=0x00010000,0x02000204,0x5F473200,3,1
228-
TYPE6=0x01000000,0x00020402,0x5F473200,2,1
229-
TYPE7=0x00000001,0x02040200,0x5F473200,1,1
226+
TYPE4=0x00000100,0x04020002,0x7F473200,0,1
227+
TYPE5=0x00010000,0x02000204,0x7F473200,3,1
228+
TYPE6=0x01000000,0x00020402,0x7F473200,2,1
229+
TYPE7=0x00000001,0x02040200,0x7F473200,1,1
230230
;orthogonal road into orthogonal avenue corner ~ corner edge tile
231231
TYPE1=0x02000200,0x04000004,0x5F072000,0,0
232232
TYPE2=0x00020002,0x00000404,0x5F072000,1,0

Controller/RUL2/01_Maxis_Misc/Sec1e_Rd_Misc.txt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,33 +30,33 @@
3030

3131
;One-Way Road Diag x Road Orth
3232
0x09000a00,0,0,0x09803900,3,0=0x09803c00,3,0,0x09803a00,3,0
33-
0x09000a00,3,0,0x09803900,1,1=0x09803c00,1,1,0x09803a00,1,1
33+
0x09000a00,3,0,0x09803900,1,1=0x49803c00,1,1,0x49803a00,1,1
3434
0x09803900,1,0,0x09000a00,2,0=0x09803a00,1,0,0x09803c00,1,0
35-
0x09803900,3,1,0x09000a00,1,0=0x09803a00,3,1,0x09803c00,3,1
35+
0x09803900,3,1,0x09000a00,1,0=0x49803a00,3,1,0x49803c00,3,1
3636
;Stability
3737
0x09000a00,0,0,0x09803a00,3,0=0x09803c00,3,0,0x09803a00,3,0
38-
0x09000a00,3,0,0x09803a00,1,1=0x09803c00,1,1,0x09803a00,1,1
38+
0x09000a00,3,0,0x49803a00,1,1=0x49803c00,1,1,0x49803a00,1,1
3939
0x09803a00,1,0,0x09000a00,2,0=0x09803a00,1,0,0x09803c00,1,0
40-
0x09803a00,3,1,0x09000a00,1,0=0x09803a00,3,1,0x09803c00,3,1
40+
0x49803a00,3,1,0x09000a00,1,0=0x49803a00,3,1,0x49803c00,3,1
4141
0x09803c00,3,0,0x09803900,3,0=0x09803c00,3,0,0x09803a00,3,0
42-
0x09803c00,1,1,0x09803900,1,1=0x09803c00,1,1,0x09803a00,1,1
42+
0x49803c00,1,1,0x09803900,1,1=0x49803c00,1,1,0x49803a00,1,1
4343
0x09803900,1,0,0x09803c00,1,0=0x09803a00,1,0,0x09803c00,1,0
44-
0x09803900,3,1,0x09803c00,3,1=0x09803a00,3,1,0x09803c00,3,1
44+
0x09803900,3,1,0x49803c00,3,1=0x49803a00,3,1,0x49803c00,3,1
4545

4646
;One-Way Road Diag x One-Way Road Orth
4747
0x09000a00,0,0,0x09003900,3,0=0x09003c00,3,0,0x09003a00,3,0
48-
0x09000a00,3,0,0x09003900,1,1=0x09003c00,1,1,0x09003a00,1,1
48+
0x09000a00,3,0,0x09003900,1,1=0x49003c00,1,1,0x49003a00,1,1
4949
0x09003900,1,0,0x09000a00,2,0=0x09003a00,1,0,0x09003c00,1,0
50-
0x09003900,3,1,0x09000a00,1,0=0x09003a00,3,1,0x09003c00,3,1
50+
0x09003900,3,1,0x09000a00,1,0=0x49003a00,3,1,0x49003c00,3,1
5151
;Stability
5252
0x09000a00,0,0,0x09003a00,3,0=0x09003c00,3,0,0x09003a00,3,0
53-
0x09000a00,3,0,0x09003a00,1,1=0x09003c00,1,1,0x09003a00,1,1
53+
0x09000a00,3,0,0x49003a00,1,1=0x49003c00,1,1,0x49003a00,1,1
5454
0x09003a00,1,0,0x09000a00,2,0=0x09003a00,1,0,0x09003c00,1,0
55-
0x09003a00,3,1,0x09000a00,1,0=0x09003a00,3,1,0x09003c00,3,1
55+
0x49003A00,3,1,0x09000a00,1,0=0x49003a00,3,1,0x49003c00,3,1
5656
0x09003c00,3,0,0x09003900,3,0=0x09003c00,3,0,0x09003a00,3,0
57-
0x09003c00,1,1,0x09003900,1,1=0x09003c00,1,1,0x09003a00,1,1
57+
0x49003C00,1,1,0x09003900,1,1=0x49003c00,1,1,0x49003a00,1,1
5858
0x09003900,1,0,0x09003c00,1,0=0x09003a00,1,0,0x09003c00,1,0
59-
0x09003900,3,1,0x09003c00,3,1=0x09003a00,3,1,0x09003c00,3,1
59+
0x09003900,3,1,0x49003c00,3,1=0x49003a00,3,1,0x49003c00,3,1
6060

6161
;Road Diag (Thru) x Avenue Orth (End)
6262
0x5F077900,2,0,0x04001300,1,0=0x5F077900,2,0,0x5F077B00,2,0
@@ -105,6 +105,6 @@
105105

106106
;One-Way Road x One-Way Road
107107
0x09002e00,0,0,0x09000a00,2,0=0x09002e00,0,0,0x09002f00,0,0
108-
0x09002e00,2,1,0x09000a00,1,0=0x09002e00,2,1,0x09002f00,2,1
108+
0x49002e00,2,1,0x09000a00,1,0=0x49002e00,2,1,0x49002f00,2,1
109109
0x09000a00,0,0,0x09002e00,2,0=0x09002f00,2,0,0x09002e00,2,0
110-
0x09000a00,3,0,0x09002e00,0,1=0x09002f00,0,1,0x09002e00,0,1
110+
0x09000a00,3,0,0x49002e00,0,1=0x49002f00,0,1,0x49002e00,0,1

Controller/RUL2/01_Maxis_Misc/Sec1f_Avenue_Misc.txt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
;----Diagonal Road x Orth Avenue-Short Fix----
4141
0x00000A00,3,0,0x5F473200,3,0=0x00000C00,3,0,0x5F473200,3,0
42-
0x00000A00,0,0,0x5F473200,1,1=0x00000C00,1,1,0x5F473200,1,1
42+
0x00000A00,0,0,0x7F473200,1,1=0x00000C00,1,1,0x7F473200,1,1
4343

4444
;----Diagonal Road x Diag Avenue-Short Fix (T74)----
4545
0x5F077400,3,0,0x04003800,0,0=0x5F077400,3,0,0x5F077409,0,0
@@ -51,4 +51,12 @@
5151
0x5F977400,3,0,0x04003800,0,0=0x5F977400,3,0,0x5F977409,0,0
5252
0x5F977400,1,1,0x04003800,1,0=0x5F977400,1,1,0x5F977409,2,1
5353
0x5F977400,3,0,0x04003800,2,0=0x5F977400,3,0,0x5F977409,0,0
54-
0x5F977400,1,1,0x04003800,3,0=0x5F977400,1,1,0x5F977409,2,1
54+
0x5F977400,1,1,0x04003800,3,0=0x5F977400,1,1,0x5F977409,2,1
55+
56+
;---AVE x AVE OXO MIRROR FIX---
57+
;0x04009000,0,0,0x04009000,0,1=0x04009000,0,0,0x04009000,3,0
58+
;0x04009000,2,1,0x04009000,2,0=0x04009000,1,0,0x04009000,2,0
59+
60+
0x51112700,0,0,0x04009000,1,1=0x51112700,0,0,0x51112900,1,0
61+
0x51152700,0,0,0x04009000,1,1=0x51152700,0,0,0x51112700,0,1
62+
0x51112900,0,0,0x04009000,1,1=0x51112700,0,0,0x51112700,1,0

Controller/RUL2/03_Turn_Lanes/Sec3c_OWR_SITAP.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1988,7 +1988,7 @@
19881988
;Durfsurn 12072015
19891989
;need to change to keep the diagonal road T from converting
19901990
;;0x00006300,2,1,0x00000C00,1,0=0x5B04010E,0,1,0x5F390000,1,0
1991-
;;0x5F473200,3,1,0x5F390000,2,0=0x5B04050E,2,0,0x5B04000E,2,0
1991+
;;0x7F473200,3,1,0x5F390000,2,0=0x5B04050E,2,0,0x5B04000E,2,0
19921992
;;0x5F390000,3,0,0x00006300,0,1=0x5B04000E,3,0,0x5B04010E,3,0
19931993
;placeholder fix
19941994
;;0x5F390000,0,0,0x00000a00,2,0=0x00000c00,0,0,0x00000a00,2,0

Controller/RUL2/08_NWM/00_Orthogonal_NWM.txt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2854,8 +2854,8 @@
28542854
;One-Way Road (A7)
28552855
0x51000000,1,0,0x09803A00,1,0=0x51000000,1,0,0x5100A700,3,0
28562856
0x51000000,3,0,0x09803A00,1,0=0x51000000,3,0,0x5100A700,3,0
2857-
0x51000000,1,0,0x09803A00,3,1=0x51000000,1,0,0x7100A700,1,1
2858-
0x51000000,3,0,0x09803A00,3,1=0x51000000,3,0,0x7100A700,1,1
2857+
0x51000000,1,0,0x49803A00,3,1=0x51000000,1,0,0x7100A700,1,1
2858+
0x51000000,3,0,0x49803A00,3,1=0x51000000,3,0,0x7100A700,1,1
28592859
;Tile 2 End-T
28602860
0x5100A700,3,0,0x09803C00,1,0=0x5100A700,3,0,0x5100A709,1,0
28612861
0x7100A700,1,1,0x09803C00,3,1=0x7100A700,1,1,0x7100A709,3,1
@@ -5688,8 +5688,8 @@
56885688
;One-Way Road (A7)
56895689
0x51010000,1,0,0x09803A00,1,0=0x51010000,1,0,0x5101A700,3,0
56905690
0x51010000,3,0,0x09803A00,1,0=0x51010000,3,0,0x5101A700,3,0
5691-
0x51010000,1,0,0x09803A00,3,1=0x51010000,1,0,0x5101A700,1,1
5692-
0x51010000,3,0,0x09803A00,3,1=0x51010000,3,0,0x5101A700,1,1
5691+
0x51010000,1,0,0x49803A00,3,1=0x51010000,1,0,0x5101A700,1,1
5692+
0x51010000,3,0,0x49803A00,3,1=0x51010000,3,0,0x5101A700,1,1
56935693
;Tile 2 End-T
56945694
0x5101A700,3,0,0x09803C00,1,0=0x5101A700,3,0,0x5101A709,1,0
56955695
0x5101A700,1,1,0x09803C00,3,1=0x5101A700,1,1,0x5101A709,3,1
@@ -9261,8 +9261,8 @@
92619261
;One-Way Road (A7)
92629262
0x51020000,1,0,0x09803A00,1,0=0x51020000,1,0,0x5102A700,3,0
92639263
0x51020000,3,0,0x09803A00,1,0=0x51020000,3,0,0x5102A780,3,0
9264-
0x51020000,1,0,0x09803A00,3,1=0x51020000,1,0,0x7102A780,1,1
9265-
0x51020000,3,0,0x09803A00,3,1=0x51020000,3,0,0x7102A700,1,1
9264+
0x51020000,1,0,0x49803A00,3,1=0x51020000,1,0,0x7102A780,1,1
9265+
0x51020000,3,0,0x49803A00,3,1=0x51020000,3,0,0x7102A700,1,1
92669266
;Tile 2 End-T
92679267
0x5102A700,3,0,0x09803C00,1,0=0x5102A700,3,0,0x5102A709,1,0
92689268
0x7102A700,1,1,0x09803C00,3,1=0x7102A700,1,1,0x7102A709,3,1
@@ -12040,13 +12040,13 @@
1204012040
;One-Way Road (A7)
1204112041
0x51030000,1,0,0x09003A00,1,0=0x51030000,1,0,0x5103A700,3,0
1204212042
0x51030000,3,0,0x09003A00,1,0=0x51030000,3,0,0x5103A700,3,0
12043-
0x51030000,1,0,0x09003A00,3,1=0x51030000,1,0,0x5103A700,1,1
12044-
0x51030000,3,0,0x09003A00,3,1=0x51030000,3,0,0x5103A700,1,1
12043+
0x51030000,1,0,0x49003A00,3,1=0x51030000,1,0,0x5103A700,1,1
12044+
0x51030000,3,0,0x49003A00,3,1=0x51030000,3,0,0x5103A700,1,1
1204512045
;Tile 2 End-T
1204612046
0x5103A700,3,0,0x09003C00,1,0=0x5103A700,3,0,0x5103A709,1,0
12047-
0x5103A700,1,1,0x09003C00,3,1=0x5103A700,1,1,0x5103A709,3,1
12047+
0x5103A700,1,1,0x49003C00,3,1=0x5103A700,1,1,0x5103A709,3,1
1204812048
0x51035200,3,0,0x09003C00,1,0=0x5103A700,3,0,0x5103A709,1,0
12049-
0x51035200,1,1,0x09003C00,3,1=0x5103A700,1,1,0x5103A709,3,1
12049+
0x51035200,1,1,0x49003C00,3,1=0x5103A700,1,1,0x5103A709,3,1
1205012050
0x5103A700,3,0,0x09000A00,2,0=0x5103A700,3,0,0x5103A709,1,0
1205112051
0x5103A700,1,1,0x09000A00,1,0=0x5103A700,1,1,0x5103A709,3,1
1205212052
0x51035200,3,0,0x09000A00,2,0=0x5103A700,3,0,0x5103A709,1,0
@@ -14826,13 +14826,13 @@
1482614826
;fails lane math--dummy intersection to support intersections with OWR-3 and wider
1482714827
0x51040000,1,0,0x09003A00,1,0=0x51040000,1,0,0x5104A700,3,0
1482814828
0x51040000,3,0,0x09003A00,1,0=0x51040000,3,0,0x5104A700,3,0
14829-
0x51040000,1,0,0x09003A00,3,1=0x51040000,1,0,0x7104A700,1,1
14830-
0x51040000,3,0,0x09003A00,3,1=0x51040000,3,0,0x7104A700,1,1
14829+
0x51040000,1,0,0x49003A00,3,1=0x51040000,1,0,0x7104A700,1,1
14830+
0x51040000,3,0,0x49003A00,3,1=0x51040000,3,0,0x7104A700,1,1
1483114831
;Tile 2 End-T
1483214832
0x5104A700,3,0,0x09003C00,1,0=0x5104A700,3,0,0x5104A709,1,0
14833-
0x7104A700,1,1,0x09003C00,3,1=0x7104A700,1,1,0x7104A709,3,1
14833+
0x7104A700,1,1,0x49003C00,3,1=0x7104A700,1,1,0x7104A709,3,1
1483414834
0x51045200,3,0,0x09003C00,1,0=0x5104A700,3,0,0x5104A709,1,0
14835-
0x51045200,1,1,0x09003C00,3,1=0x7104A700,1,1,0x7104A709,3,1
14835+
0x51045200,1,1,0x49003C00,3,1=0x7104A700,1,1,0x7104A709,3,1
1483614836
0x5104A700,3,0,0x09000A00,2,0=0x5104A700,3,0,0x5104A709,1,0
1483714837
0x7104A700,1,1,0x09000A00,1,0=0x7104A700,1,1,0x7104A709,3,1
1483814838
0x51045200,3,0,0x09000A00,2,0=0x5104A700,3,0,0x5104A709,1,0
@@ -17605,8 +17605,8 @@
1760517605
;One-Way Road (A7)
1760617606
0x51050000,1,0,0x09803A00,1,0=0x51050000,1,0,0x5105A700,3,0
1760717607
0x51050000,3,0,0x09803A00,1,0=0x51050000,3,0,0x5105A700,3,0
17608-
0x51050000,1,0,0x09803A00,3,1=0x51050000,1,0,0x7105A700,1,1
17609-
0x51050000,3,0,0x09803A00,3,1=0x51050000,3,0,0x7105A700,1,1
17608+
0x51050000,1,0,0x49803A00,3,1=0x51050000,1,0,0x7105A700,1,1
17609+
0x51050000,3,0,0x49803A00,3,1=0x51050000,3,0,0x7105A700,1,1
1761017610
;Tile 2 End-T
1761117611
0x5105A700,3,0,0x09803C00,1,0=0x5105A700,3,0,0x5105A709,1,0
1761217612
0x7105A700,1,1,0x09803C00,3,1=0x7105A700,1,1,0x7105A709,3,1

0 commit comments

Comments
 (0)