Skip to content

Commit 6a72ab6

Browse files
authored
Merge pull request NAMTeam#516 from NAMTeam/owr4-avenue-based
Avenue-based OWR-4 and other NWM metarules
2 parents e418b57 + aabdf57 commit 6a72ab6

34 files changed

Lines changed: 1167 additions & 1135 deletions

.github/workflows/scala.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ name: Scala CI
77

88
on:
99
push:
10-
branches: [ "master", "staging" ]
1110
pull_request:
12-
branches: [ "master", "staging" ]
1311

1412
permissions:
1513
contents: read

Controller/INI/NetworkINI.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,7 @@ Debug=0
838838
6 = 0x51001800,0xFFF0FF00,0x71001800,0x000F00FF ;NWMxlightrail (Draggable GLR) Single-Tile
839839
7 = 0x51001900,0xFFF0FF00,0x71001900,0x000F00FF ;NWMxlightrail (Draggable Rural GLR) Single-Tile
840840
;8 = 0x51001F00,0xFFF0FF00,0x71001F00,0x000F00FF ;NWMxrail (STR)
841-
8 = 0x51002700,0xFFF0FF00,0x71002700,0x000F00FF ;NWMxmonorail (HSR) Single-Tile
841+
8 = 0x51001A00,0xFFF0FF00,0x71001A00,0x000F00FF ;NWMxmonorail (HSR) Single-Tile
842842
9 = 0x51002000,0xFFF0FF00,0x71002000,0x000F00FF ;NWMxTLA-3 + Single-Tile
843843
10 = 0x51102800,0xFFF0FF00,0x71102800,0x000F00FF ;NWMxTLA-5 + Single-Tile
844844
11 = 0x51003800,0xFFF0FF00,0x71003800,0x000F00FF ;NWMxTLA-3 T Single-Tile
@@ -874,15 +874,15 @@ Debug=0
874874
41 = 0x51101700,0xFFF0FF00,0x71101700,0x000F00FF ;NWMxmonorail Dual-Tile
875875
42 = 0x51101800,0xFFF0FF00,0x71101800,0x000F00FF ;NWMxlightrail (Draggable GLR) Dual-Tile
876876
43 = 0x51101900,0xFFF0FF00,0x71101900,0x000F00FF ;NWMxlightrail (Draggable Rural GLR) Dual-Tile
877-
44 = 0x51102700,0xFFF0FF00,0x71102700,0x000F00FF ;NWMxmonorail (HSR) Dual-Tile
877+
44 = 0x51101A00,0xFFF0FF00,0x71101A00,0x000F00FF ;NWMxmonorail (HSR) Dual-Tile
878878
45 = 0x51102000,0xFFF0FF00,0x71102000,0x000F00FF ;NWMxTLA-3 + Dual-Tile
879879
46 = 0x51103800,0xFFF0FF00,0x71103800,0x000F00FF ;NWMxTLA-3 T Dual-Tile
880880
47 = 0x51201500,0xFFF0FF00,0x71201500,0x000F00FF ;NWMxrail Triple-Tile
881881
48 = 0x51201600,0xFFF0FF00,0x71201600,0x000F00FF ;NWMxlightrail Triple-Tile
882882
49 = 0x51201700,0xFFF0FF00,0x71201700,0x000F00FF ;NWMxmonorail Triple-Tile
883883
50 = 0x51201800,0xFFF0FF00,0x71201800,0x000F00FF ;NWMxlightrail (Draggable GLR) Triple-Tile
884884
51 = 0x51201900,0xFFF0FF00,0x71201900,0x000F00FF ;NWMxlightrail (Draggable Rural GLR) Triple-Tile
885-
52 = 0x51202700,0xFFF0FF00,0x71202700,0x000F00FF ;NWMxmonorail (HSR) Triple-Tile
885+
52 = 0x51201A00,0xFFF0FF00,0x71201A00,0x000F00FF ;NWMxmonorail (HSR) Triple-Tile
886886
53 = 0x51202000,0xFFF0FF00,0x71202000,0x000F00FF ;NWMxTLA-3 + Triple-Tile
887887
54 = 0x51005600,0xFFF0FF00,0x71005600,0x000F00FF ;NWMxdiagelrail Single-Tile
888888
55 = 0x51005700,0xFFF0FF00,0x71005700,0x000F00FF ;NWMxdiagmonorail Single-Tile
@@ -2244,7 +2244,7 @@ rhw = 0x5700000E,0xFFF0000F,0x5700000A,0x000FFFF0
22442244
219 = 0x5ad00000, 0xFFFFF0F0, 0x5dd31500, 0x0000000F ;Highway overpasses
22452245
220 = 0x59dd0000, 0xFFFFF0F0, 0x5dd31500, 0x0000000F ;OWR overpasses
22462246
221 = 0x5ddee000, 0xFFFFF0F0, 0x5dd31500, 0x0000000F ;RHW overpasses
2247-
257 = 0x51002700, 0xFF00FFF0, 0x5dd31500, 0x0000000F ;NWM overpasses
2247+
257 = 0x51001A00, 0xFF00FFF0, 0x5dd31500, 0x0000000F ;NWM overpasses
22482248
;End Track
22492249
;Puzzle Pieces
22502250
222 = 0x5ddf0000, 0xFFFFFFF0, 0x5dd31500, 0x0000000F ;Starter

Controller/RUL2/03_Turn_Lanes/Sec3d_FTL.txt

Lines changed: 398 additions & 398 deletions
Large diffs are not rendered by default.

Controller/RUL2/08_NWM/00_Orthogonal_NWM.txt

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,10 @@
251251
0x51000000,3,0,0x510F1100,3,0=0x51000000,3,0,0x510F2000,3,0; missing_paths
252252

253253
;00 to 27 (HSR)
254-
0x51000000,1,0,0x5DDD0200,0,0=0x51000000,1,0,0x51002700,0,0
255-
0x51000000,3,0,0x5DDD0200,0,0=0x51000000,3,0,0x51002700,0,0
256-
0x51000000,1,0,0x5DDD0200,2,0=0x51000000,1,0,0x51002700,2,0
257-
0x51000000,3,0,0x5DDD0200,2,0=0x51000000,3,0,0x51002700,2,0
254+
0x51000000,1,0,0x5DDD0200,0,0=0x51000000,1,0,0x51001A00,0,0
255+
0x51000000,3,0,0x5DDD0200,0,0=0x51000000,3,0,0x51001A00,0,0
256+
0x51000000,1,0,0x5DDD0200,2,0=0x51000000,1,0,0x51001A00,2,0
257+
0x51000000,3,0,0x5DDD0200,2,0=0x51000000,3,0,0x51001A00,2,0
258258

259259
;00 to 28 (TLA-5)
260260
0x51000000,1,0,0x51101100,3,0=0x51000000,1,0,0x51102000,3,0
@@ -3401,10 +3401,10 @@
34013401
0x51010000,3,0,0x51051100,3,0=0x51010000,3,0,0x51052100,3,0
34023402

34033403
;00 to 27 (HSR)
3404-
0x51010000,1,0,0x5DDD0200,0,0=0x51010000,1,0,0x51012700,0,0
3405-
0x51010000,3,0,0x5DDD0200,0,0=0x51010000,3,0,0x51012700,0,0
3406-
0x51010000,1,0,0x5DDD0200,2,0=0x51010000,1,0,0x51012700,2,0
3407-
0x51010000,3,0,0x5DDD0200,2,0=0x51010000,3,0,0x51012700,2,0
3404+
0x51010000,1,0,0x5DDD0200,0,0=0x51010000,1,0,0x51011A00,0,0
3405+
0x51010000,3,0,0x5DDD0200,0,0=0x51010000,3,0,0x51011A00,0,0
3406+
0x51010000,1,0,0x5DDD0200,2,0=0x51010000,1,0,0x51011A00,2,0
3407+
0x51010000,3,0,0x5DDD0200,2,0=0x51010000,3,0,0x51011A00,2,0
34083408

34093409
;00 to 28 (TLA-5)
34103410
0x51010000,1,0,0x51101100,3,0=0x51010000,1,0,0x51102100,3,0
@@ -6277,10 +6277,10 @@
62776277
0x51020000,3,0,0x51051100,3,0=0x51020000,3,0,0x51052200,3,0
62786278

62796279
;00 to 27 (HSR)
6280-
0x51020000,1,0,0x5DDD0200,0,0=0x51020000,1,0,0x51022700,0,0
6281-
0x51020000,3,0,0x5DDD0200,0,0=0x51020000,3,0,0x51022700,2,0
6282-
0x51020000,1,0,0x5DDD0200,2,0=0x51020000,1,0,0x51022700,0,0
6283-
0x51020000,3,0,0x5DDD0200,2,0=0x51020000,3,0,0x51022700,2,0
6280+
0x51020000,1,0,0x5DDD0200,0,0=0x51020000,1,0,0x51021A00,0,0
6281+
0x51020000,3,0,0x5DDD0200,0,0=0x51020000,3,0,0x51021A00,2,0
6282+
0x51020000,1,0,0x5DDD0200,2,0=0x51020000,1,0,0x51021A00,0,0
6283+
0x51020000,3,0,0x5DDD0200,2,0=0x51020000,3,0,0x51021A00,2,0
62846284

62856285
;00 to 28 (TLA-5)
62866286
0x51020000,1,0,0x51101100,3,0=0x51020000,1,0,0x51102200,1,1
@@ -9924,10 +9924,10 @@
99249924
0x51030000,3,0,0x51051200,3,0=0x51030000,3,0,0x51052300,3,0
99259925

99269926
;00 to 27 (HSR)
9927-
0x51030000,1,0,0x59DD0800,0,0=0x51030000,1,0,0x51032700,0,0; missing_paths
9928-
0x51030000,3,0,0x59DD0800,0,0=0x51030000,3,0,0x51032700,0,0; missing_paths
9929-
0x51030000,1,0,0x59DD0800,2,0=0x51030000,1,0,0x51032700,2,0; missing_paths
9930-
0x51030000,3,0,0x59DD0800,2,0=0x51030000,3,0,0x51032700,2,0; missing_paths
9927+
0x51030000,1,0,0x59DD0800,0,0=0x51030000,1,0,0x51031A00,0,0; missing_paths
9928+
0x51030000,3,0,0x59DD0800,0,0=0x51030000,3,0,0x51031A00,0,0; missing_paths
9929+
0x51030000,1,0,0x59DD0800,2,0=0x51030000,1,0,0x51031A00,2,0; missing_paths
9930+
0x51030000,3,0,0x59DD0800,2,0=0x51030000,3,0,0x51031A00,2,0; missing_paths
99319931

99329932
;00 to 28 (TLA-5)
99339933
0x51030000,1,0,0x51101200,3,0=0x51030000,1,0,0x51102300,3,0
@@ -12766,10 +12766,10 @@
1276612766
0x51040000,3,0,0x51051200,3,0=0x51040000,3,0,0x51052400,3,0
1276712767

1276812768
;00 to 27 (HSR)
12769-
0x51040000,1,0,0x59DD0800,0,0=0x51040000,1,0,0x51042700,0,0; missing_paths
12770-
0x51040000,3,0,0x59DD0800,0,0=0x51040000,3,0,0x51042700,0,0; missing_paths
12771-
0x51040000,1,0,0x59DD0800,2,0=0x51040000,1,0,0x51042700,2,0; missing_paths
12772-
0x51040000,3,0,0x59DD0800,2,0=0x51040000,3,0,0x51042700,2,0; missing_paths
12769+
0x51040000,1,0,0x59DD0800,0,0=0x51040000,1,0,0x51041A00,0,0; missing_paths
12770+
0x51040000,3,0,0x59DD0800,0,0=0x51040000,3,0,0x51041A00,0,0; missing_paths
12771+
0x51040000,1,0,0x59DD0800,2,0=0x51040000,1,0,0x51041A00,2,0; missing_paths
12772+
0x51040000,3,0,0x59DD0800,2,0=0x51040000,3,0,0x51041A00,2,0; missing_paths
1277312773

1277412774
;00 to 28 (TLA-5)
1277512775
0x51040000,1,0,0x51101200,3,0=0x51040000,1,0,0x51102400,3,0
@@ -15587,10 +15587,10 @@
1558715587
0x51050000,3,0,0x51051100,3,0=0x51050000,3,0,0x51052500,2,0
1558815588

1558915589
;00 to 27 (HSR)
15590-
0x51050000,1,0,0x5DDD0200,0,0=0x51050000,1,0,0x51052700,0,0
15591-
0x51050000,3,0,0x5DDD0200,0,0=0x51050000,3,0,0x51052700,0,0
15592-
0x51050000,1,0,0x5DDD0200,2,0=0x51050000,1,0,0x51052700,2,0
15593-
0x51050000,3,0,0x5DDD0200,2,0=0x51050000,3,0,0x51052700,2,0
15590+
0x51050000,1,0,0x5DDD0200,0,0=0x51050000,1,0,0x51051A00,0,0
15591+
0x51050000,3,0,0x5DDD0200,0,0=0x51050000,3,0,0x51051A00,0,0
15592+
0x51050000,1,0,0x5DDD0200,2,0=0x51050000,1,0,0x51051A00,2,0
15593+
0x51050000,3,0,0x5DDD0200,2,0=0x51050000,3,0,0x51051A00,2,0
1559415594

1559515595
;00 to 28 (TLA-5)
1559615596
0x51050000,1,0,0x51101100,3,0=0x51050000,1,0,0x51102500,3,0
@@ -18463,10 +18463,10 @@
1846318463
;00 to 26
1846418464

1846518465
;00 to 27 (HSR)
18466-
0x51100000,1,0,0x5ddd0200,0,0=0x51100000,1,0,0x51102700,0,0
18467-
0x51100000,1,0,0x5ddd0200,2,0=0x51100000,1,0,0x51102700,0,0
18468-
0x51100000,3,0,0x5ddd0200,0,0=0x51100000,3,0,0x51102700,2,0
18469-
0x51100000,3,0,0x5ddd0200,2,0=0x51100000,3,0,0x51102700,2,0
18466+
0x51100000,1,0,0x5ddd0200,0,0=0x51100000,1,0,0x51101A00,0,0
18467+
0x51100000,1,0,0x5ddd0200,2,0=0x51100000,1,0,0x51101A00,0,0
18468+
0x51100000,3,0,0x5ddd0200,0,0=0x51100000,3,0,0x51101A00,2,0
18469+
0x51100000,3,0,0x5ddd0200,2,0=0x51100000,3,0,0x51101A00,2,0
1847018470

1847118471
;00 to 28 (TLA-5)
1847218472
0x51100000,1,0,0x51101100,3,0=0x51100000,1,0,0x51102800,0,0
@@ -21863,10 +21863,10 @@
2186321863
;00 to 26
2186421864

2186521865
;00 to 27 (HSR)
21866-
0x51110000,1,0,0x59dd0200,0,0=0x51110000,1,0,0x51112700,0,0
21867-
0x51110000,1,0,0x59dd0200,2,0=0x51110000,1,0,0x51112700,0,0
21868-
0x51110000,3,0,0x59dd0200,0,0=0x51110000,3,0,0x51112700,2,0
21869-
0x51110000,3,0,0x59dd0200,2,0=0x51110000,3,0,0x51112700,2,0
21866+
0x51110000,1,0,0x59dd0200,0,0=0x51110000,1,0,0x51111A00,0,0
21867+
0x51110000,1,0,0x59dd0200,2,0=0x51110000,1,0,0x51111A00,0,0
21868+
0x51110000,3,0,0x59dd0200,0,0=0x51110000,3,0,0x51111A00,2,0
21869+
0x51110000,3,0,0x59dd0200,2,0=0x51110000,3,0,0x51111A00,2,0
2187021870

2187121871
;00 to 28 (TLA-5)
2187221872
0x51110000,1,0,0x51101200,3,0=0x51110000,1,0,0x51112800,0,0
@@ -25213,10 +25213,10 @@
2521325213
;00 to 26
2521425214

2521525215
;00 to 27 (HSR)
25216-
0x51120000,1,0,0x59dd0200,0,0=0x51120000,1,0,0x51122700,0,0
25217-
0x51120000,1,0,0x59dd0200,2,0=0x51120000,1,0,0x51122700,0,0
25218-
0x51120000,3,0,0x59dd0200,0,0=0x51120000,3,0,0x51122700,2,0
25219-
0x51120000,3,0,0x59dd0200,2,0=0x51120000,3,0,0x51122700,2,0
25216+
0x51120000,1,0,0x59dd0200,0,0=0x51120000,1,0,0x51121A00,0,0
25217+
0x51120000,1,0,0x59dd0200,2,0=0x51120000,1,0,0x51121A00,0,0
25218+
0x51120000,3,0,0x59dd0200,0,0=0x51120000,3,0,0x51121A00,2,0
25219+
0x51120000,3,0,0x59dd0200,2,0=0x51120000,3,0,0x51121A00,2,0
2522025220

2522125221
;00 to 28 (TLA-5)
2522225222
0x51120000,1,0,0x51101200,3,0=0x51120000,1,0,0x51122800,0,0
@@ -28572,10 +28572,10 @@
2857228572
;00 to 26
2857328573

2857428574
;00 to 27 (HSR)
28575-
0x51130000,1,0,0x5ddd0200,0,0=0x51130000,1,0,0x51132700,0,0
28576-
0x51130000,1,0,0x5ddd0200,2,0=0x51130000,1,0,0x51132700,0,0
28577-
0x51130000,3,0,0x5ddd0200,0,0=0x51130000,3,0,0x51132700,2,0
28578-
0x51130000,3,0,0x5ddd0200,2,0=0x51130000,3,0,0x51132700,2,0
28575+
0x51130000,1,0,0x5ddd0200,0,0=0x51130000,1,0,0x51131A00,0,0
28576+
0x51130000,1,0,0x5ddd0200,2,0=0x51130000,1,0,0x51131A00,0,0
28577+
0x51130000,3,0,0x5ddd0200,0,0=0x51130000,3,0,0x51131A00,2,0
28578+
0x51130000,3,0,0x5ddd0200,2,0=0x51130000,3,0,0x51131A00,2,0
2857928579

2858028580
;00 to 28 (TLA-5)
2858128581
0x51130000,1,0,0x51101100,3,0=0x51130000,1,0,0x51132800,0,0
@@ -31984,10 +31984,10 @@
3198431984
;00 to 26
3198531985

3198631986
;00 to 27 (HSR)
31987-
0x51140000,1,0,0x5ddd0200,0,0=0x51140000,1,0,0x51142700,0,0
31988-
0x51140000,1,0,0x5ddd0200,2,0=0x51140000,1,0,0x51142700,0,0
31989-
0x51140000,3,0,0x5ddd0200,0,0=0x51140000,3,0,0x51142700,2,0
31990-
0x51140000,3,0,0x5ddd0200,2,0=0x51140000,3,0,0x51142700,2,0
31987+
0x51140000,1,0,0x5ddd0200,0,0=0x51140000,1,0,0x51141A00,0,0
31988+
0x51140000,1,0,0x5ddd0200,2,0=0x51140000,1,0,0x51141A00,0,0
31989+
0x51140000,3,0,0x5ddd0200,0,0=0x51140000,3,0,0x51141A00,2,0
31990+
0x51140000,3,0,0x5ddd0200,2,0=0x51140000,3,0,0x51141A00,2,0
3199131991

3199231992
;00 to 28 (TLA-5)
3199331993
0x51140000,1,0,0x51101100,3,0=0x51140000,1,0,0x51142800,0,0
@@ -35369,10 +35369,10 @@
3536935369
;00 to 26
3537035370

3537135371
;00 to 27 (HSR)
35372-
0x51200000,1,0,0x5ddd0200,0,0=0x51200000,1,0,0x51202700,0,0
35373-
0x51200000,1,0,0x5ddd0200,2,0=0x51200000,1,0,0x51202700,0,0
35374-
0x51200000,3,0,0x5ddd0200,0,0=0x51200000,3,0,0x51202700,2,0
35375-
0x51200000,3,0,0x5ddd0200,2,0=0x51200000,3,0,0x51202700,2,0
35372+
0x51200000,1,0,0x5ddd0200,0,0=0x51200000,1,0,0x51201A00,0,0
35373+
0x51200000,1,0,0x5ddd0200,2,0=0x51200000,1,0,0x51201A00,0,0
35374+
0x51200000,3,0,0x5ddd0200,0,0=0x51200000,3,0,0x51201A00,2,0
35375+
0x51200000,3,0,0x5ddd0200,2,0=0x51200000,3,0,0x51201A00,2,0
3537635376

3537735377
;00 to 28 (TLA-5)
3537835378
0x51200000,1,0,0x51101100,3,0=0x51200000,1,0,0x51202800,0,0
@@ -38823,10 +38823,10 @@
3882338823
;00 to 26
3882438824

3882538825
;00 to 27 (HSR)
38826-
0x51210000,1,0,0x59dd0200,0,0=0x51210000,1,0,0x51212700,0,0
38827-
0x51210000,1,0,0x59dd0200,2,0=0x51210000,1,0,0x51212700,0,0
38828-
0x51210000,3,0,0x59dd0200,0,0=0x51210000,3,0,0x51212700,2,0
38829-
0x51210000,3,0,0x59dd0200,2,0=0x51210000,3,0,0x51212700,2,0
38826+
0x51210000,1,0,0x59dd0200,0,0=0x51210000,1,0,0x51211A00,0,0
38827+
0x51210000,1,0,0x59dd0200,2,0=0x51210000,1,0,0x51211A00,0,0
38828+
0x51210000,3,0,0x59dd0200,0,0=0x51210000,3,0,0x51211A00,2,0
38829+
0x51210000,3,0,0x59dd0200,2,0=0x51210000,3,0,0x51211A00,2,0
3883038830

3883138831
;00 to 28 (TLA-5)
3883238832
0x51210000,1,0,0x51101200,3,0=0x51210000,1,0,0x51212800,0,0; missing_paths
@@ -42349,10 +42349,10 @@
4234942349
0x51200080,3,0,0x510F1100,3,0=0x51200080,3,0,0x510F2000,3,0; missing_paths
4235042350

4235142351
;00 to 27 (HSR)
42352-
0x51200080,1,0,0x5DDD0200,0,0=0x51200080,1,0,0x51202780,0,0
42353-
0x51200080,3,0,0x5DDD0200,0,0=0x51200080,3,0,0x51202780,0,0
42354-
0x51200080,1,0,0x5DDD0200,2,0=0x51200080,1,0,0x51202780,2,0
42355-
0x51200080,3,0,0x5DDD0200,2,0=0x51200080,3,0,0x51202780,2,0
42352+
0x51200080,1,0,0x5DDD0200,0,0=0x51200080,1,0,0x51201A80,0,0
42353+
0x51200080,3,0,0x5DDD0200,0,0=0x51200080,3,0,0x51201A80,0,0
42354+
0x51200080,1,0,0x5DDD0200,2,0=0x51200080,1,0,0x51201A80,2,0
42355+
0x51200080,3,0,0x5DDD0200,2,0=0x51200080,3,0,0x51201A80,2,0
4235642356

4235742357
;00 to 28 (TLA-5)
4235842358
0x51200080,1,0,0x51101100,3,0=0x51200080,1,0,0x51202880,0,0
@@ -44706,10 +44706,10 @@
4470644706
0x51210080,3,0,0x510F1100,3,0=0x51210080,3,0,0x510F2000,3,0; missing_paths
4470744707

4470844708
;00 to 27 (HSR)
44709-
0x51210080,1,0,0x5DDD0200,0,0=0x51210080,1,0,0x51212780,0,0
44710-
0x51210080,3,0,0x5DDD0200,0,0=0x51210080,3,0,0x51212780,0,0
44711-
0x51210080,1,0,0x5DDD0200,2,0=0x51210080,1,0,0x51212780,2,0
44712-
0x51210080,3,0,0x5DDD0200,2,0=0x51210080,3,0,0x51212780,2,0
44709+
0x51210080,1,0,0x5DDD0200,0,0=0x51210080,1,0,0x51211A80,0,0
44710+
0x51210080,3,0,0x5DDD0200,0,0=0x51210080,3,0,0x51211A80,0,0
44711+
0x51210080,1,0,0x5DDD0200,2,0=0x51210080,1,0,0x51211A80,2,0
44712+
0x51210080,3,0,0x5DDD0200,2,0=0x51210080,3,0,0x51211A80,2,0
4471344713

4471444714
;00 to 28 (TLA-5)
4471544715
0x51210080,1,0,0x51101100,3,0=0x51210080,1,0,0x51212880,0,0

0 commit comments

Comments
 (0)