Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
f89efd5
refactoring: add a function for creating network exemplars
memo33 May 29, 2025
f0fd5f5
fix 8-th digit of NWM IIDs (5 vs 9)
memo33 May 29, 2025
8a062dd
remove redundant SamSingleSegResolver file
memo33 May 30, 2025
dcf20d3
fix NWM × HSR remapping after recent ID change
memo33 May 30, 2025
8b1669a
extend NWM ID scheme by new Avenue-based `Owr4m` network
memo33 May 30, 2025
fc6f1e6
adjust RHW rule generator to handle new Owr4m network
memo33 May 30, 2025
cde166c
adjust NWM paths for Owr4m network
memo33 May 30, 2025
2ebadee
refactoring: re-use `context.preprocess` mechanism for `withSharedDia…
memo33 May 31, 2025
b542b00
Merge commit '337b9a6d'
memo33 Jun 1, 2025
7030060
assign SC4PATH GID (2d or 3d) for generated NWM paths
memo33 May 31, 2025
2342d83
set max radius and asymmetry for generated NWM paths
memo33 May 31, 2025
ddfcbaf
Merge pull request #515 from NAMTeam/nwm-paths-radius
memo33 Jun 3, 2025
6702092
refactoring: create a generic CrossingGenerator for RHW/NMW/etc.
memo33 Jun 4, 2025
9f61d69
split off a separate `NwmRuleGenerator` from RHW metarules
memo33 Jun 4, 2025
ce30352
Merge branch 'staging' into owr4-avenue-based
memo33 Jun 4, 2025
dcac354
script: regenerate tile orientation cache
memo33 Jun 4, 2025
8b43bd1
fix SAM×Owr4m ID conflicts and bad adjacencies
memo33 Jun 5, 2025
4269dcc
fix RUL2 code after HSR×NWM ID change
memo33 Jun 5, 2025
44547aa
fix segment orientation checks for OWR-4 45° curve
memo33 Jun 5, 2025
aabdf57
enable CI on all branches and pull requests
memo33 Jun 5, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/scala.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ name: Scala CI

on:
push:
branches: [ "master", "staging" ]
pull_request:
branches: [ "master", "staging" ]

permissions:
contents: read
Expand Down
8 changes: 4 additions & 4 deletions Controller/INI/NetworkINI.ini
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@ Debug=0
6 = 0x51001800,0xFFF0FF00,0x71001800,0x000F00FF ;NWMxlightrail (Draggable GLR) Single-Tile
7 = 0x51001900,0xFFF0FF00,0x71001900,0x000F00FF ;NWMxlightrail (Draggable Rural GLR) Single-Tile
;8 = 0x51001F00,0xFFF0FF00,0x71001F00,0x000F00FF ;NWMxrail (STR)
8 = 0x51002700,0xFFF0FF00,0x71002700,0x000F00FF ;NWMxmonorail (HSR) Single-Tile
8 = 0x51001A00,0xFFF0FF00,0x71001A00,0x000F00FF ;NWMxmonorail (HSR) Single-Tile
9 = 0x51002000,0xFFF0FF00,0x71002000,0x000F00FF ;NWMxTLA-3 + Single-Tile
10 = 0x51102800,0xFFF0FF00,0x71102800,0x000F00FF ;NWMxTLA-5 + Single-Tile
11 = 0x51003800,0xFFF0FF00,0x71003800,0x000F00FF ;NWMxTLA-3 T Single-Tile
Expand Down Expand Up @@ -874,15 +874,15 @@ Debug=0
41 = 0x51101700,0xFFF0FF00,0x71101700,0x000F00FF ;NWMxmonorail Dual-Tile
42 = 0x51101800,0xFFF0FF00,0x71101800,0x000F00FF ;NWMxlightrail (Draggable GLR) Dual-Tile
43 = 0x51101900,0xFFF0FF00,0x71101900,0x000F00FF ;NWMxlightrail (Draggable Rural GLR) Dual-Tile
44 = 0x51102700,0xFFF0FF00,0x71102700,0x000F00FF ;NWMxmonorail (HSR) Dual-Tile
44 = 0x51101A00,0xFFF0FF00,0x71101A00,0x000F00FF ;NWMxmonorail (HSR) Dual-Tile
45 = 0x51102000,0xFFF0FF00,0x71102000,0x000F00FF ;NWMxTLA-3 + Dual-Tile
46 = 0x51103800,0xFFF0FF00,0x71103800,0x000F00FF ;NWMxTLA-3 T Dual-Tile
47 = 0x51201500,0xFFF0FF00,0x71201500,0x000F00FF ;NWMxrail Triple-Tile
48 = 0x51201600,0xFFF0FF00,0x71201600,0x000F00FF ;NWMxlightrail Triple-Tile
49 = 0x51201700,0xFFF0FF00,0x71201700,0x000F00FF ;NWMxmonorail Triple-Tile
50 = 0x51201800,0xFFF0FF00,0x71201800,0x000F00FF ;NWMxlightrail (Draggable GLR) Triple-Tile
51 = 0x51201900,0xFFF0FF00,0x71201900,0x000F00FF ;NWMxlightrail (Draggable Rural GLR) Triple-Tile
52 = 0x51202700,0xFFF0FF00,0x71202700,0x000F00FF ;NWMxmonorail (HSR) Triple-Tile
52 = 0x51201A00,0xFFF0FF00,0x71201A00,0x000F00FF ;NWMxmonorail (HSR) Triple-Tile
53 = 0x51202000,0xFFF0FF00,0x71202000,0x000F00FF ;NWMxTLA-3 + Triple-Tile
54 = 0x51005600,0xFFF0FF00,0x71005600,0x000F00FF ;NWMxdiagelrail Single-Tile
55 = 0x51005700,0xFFF0FF00,0x71005700,0x000F00FF ;NWMxdiagmonorail Single-Tile
Expand Down Expand Up @@ -2244,7 +2244,7 @@ rhw = 0x5700000E,0xFFF0000F,0x5700000A,0x000FFFF0
219 = 0x5ad00000, 0xFFFFF0F0, 0x5dd31500, 0x0000000F ;Highway overpasses
220 = 0x59dd0000, 0xFFFFF0F0, 0x5dd31500, 0x0000000F ;OWR overpasses
221 = 0x5ddee000, 0xFFFFF0F0, 0x5dd31500, 0x0000000F ;RHW overpasses
257 = 0x51002700, 0xFF00FFF0, 0x5dd31500, 0x0000000F ;NWM overpasses
257 = 0x51001A00, 0xFF00FFF0, 0x5dd31500, 0x0000000F ;NWM overpasses
;End Track
;Puzzle Pieces
222 = 0x5ddf0000, 0xFFFFFFF0, 0x5dd31500, 0x0000000F ;Starter
Expand Down
796 changes: 398 additions & 398 deletions Controller/RUL2/03_Turn_Lanes/Sec3d_FTL.txt

Large diffs are not rendered by default.

120 changes: 60 additions & 60 deletions Controller/RUL2/08_NWM/00_Orthogonal_NWM.txt
Original file line number Diff line number Diff line change
Expand Up @@ -251,10 +251,10 @@
0x51000000,3,0,0x510F1100,3,0=0x51000000,3,0,0x510F2000,3,0; missing_paths

;00 to 27 (HSR)
0x51000000,1,0,0x5DDD0200,0,0=0x51000000,1,0,0x51002700,0,0
0x51000000,3,0,0x5DDD0200,0,0=0x51000000,3,0,0x51002700,0,0
0x51000000,1,0,0x5DDD0200,2,0=0x51000000,1,0,0x51002700,2,0
0x51000000,3,0,0x5DDD0200,2,0=0x51000000,3,0,0x51002700,2,0
0x51000000,1,0,0x5DDD0200,0,0=0x51000000,1,0,0x51001A00,0,0
0x51000000,3,0,0x5DDD0200,0,0=0x51000000,3,0,0x51001A00,0,0
0x51000000,1,0,0x5DDD0200,2,0=0x51000000,1,0,0x51001A00,2,0
0x51000000,3,0,0x5DDD0200,2,0=0x51000000,3,0,0x51001A00,2,0

;00 to 28 (TLA-5)
0x51000000,1,0,0x51101100,3,0=0x51000000,1,0,0x51102000,3,0
Expand Down Expand Up @@ -3401,10 +3401,10 @@
0x51010000,3,0,0x51051100,3,0=0x51010000,3,0,0x51052100,3,0

;00 to 27 (HSR)
0x51010000,1,0,0x5DDD0200,0,0=0x51010000,1,0,0x51012700,0,0
0x51010000,3,0,0x5DDD0200,0,0=0x51010000,3,0,0x51012700,0,0
0x51010000,1,0,0x5DDD0200,2,0=0x51010000,1,0,0x51012700,2,0
0x51010000,3,0,0x5DDD0200,2,0=0x51010000,3,0,0x51012700,2,0
0x51010000,1,0,0x5DDD0200,0,0=0x51010000,1,0,0x51011A00,0,0
0x51010000,3,0,0x5DDD0200,0,0=0x51010000,3,0,0x51011A00,0,0
0x51010000,1,0,0x5DDD0200,2,0=0x51010000,1,0,0x51011A00,2,0
0x51010000,3,0,0x5DDD0200,2,0=0x51010000,3,0,0x51011A00,2,0

;00 to 28 (TLA-5)
0x51010000,1,0,0x51101100,3,0=0x51010000,1,0,0x51102100,3,0
Expand Down Expand Up @@ -6277,10 +6277,10 @@
0x51020000,3,0,0x51051100,3,0=0x51020000,3,0,0x51052200,3,0

;00 to 27 (HSR)
0x51020000,1,0,0x5DDD0200,0,0=0x51020000,1,0,0x51022700,0,0
0x51020000,3,0,0x5DDD0200,0,0=0x51020000,3,0,0x51022700,2,0
0x51020000,1,0,0x5DDD0200,2,0=0x51020000,1,0,0x51022700,0,0
0x51020000,3,0,0x5DDD0200,2,0=0x51020000,3,0,0x51022700,2,0
0x51020000,1,0,0x5DDD0200,0,0=0x51020000,1,0,0x51021A00,0,0
0x51020000,3,0,0x5DDD0200,0,0=0x51020000,3,0,0x51021A00,2,0
0x51020000,1,0,0x5DDD0200,2,0=0x51020000,1,0,0x51021A00,0,0
0x51020000,3,0,0x5DDD0200,2,0=0x51020000,3,0,0x51021A00,2,0

;00 to 28 (TLA-5)
0x51020000,1,0,0x51101100,3,0=0x51020000,1,0,0x51102200,1,1
Expand Down Expand Up @@ -9924,10 +9924,10 @@
0x51030000,3,0,0x51051200,3,0=0x51030000,3,0,0x51052300,3,0

;00 to 27 (HSR)
0x51030000,1,0,0x59DD0800,0,0=0x51030000,1,0,0x51032700,0,0; missing_paths
0x51030000,3,0,0x59DD0800,0,0=0x51030000,3,0,0x51032700,0,0; missing_paths
0x51030000,1,0,0x59DD0800,2,0=0x51030000,1,0,0x51032700,2,0; missing_paths
0x51030000,3,0,0x59DD0800,2,0=0x51030000,3,0,0x51032700,2,0; missing_paths
0x51030000,1,0,0x59DD0800,0,0=0x51030000,1,0,0x51031A00,0,0; missing_paths
0x51030000,3,0,0x59DD0800,0,0=0x51030000,3,0,0x51031A00,0,0; missing_paths
0x51030000,1,0,0x59DD0800,2,0=0x51030000,1,0,0x51031A00,2,0; missing_paths
0x51030000,3,0,0x59DD0800,2,0=0x51030000,3,0,0x51031A00,2,0; missing_paths

;00 to 28 (TLA-5)
0x51030000,1,0,0x51101200,3,0=0x51030000,1,0,0x51102300,3,0
Expand Down Expand Up @@ -12766,10 +12766,10 @@
0x51040000,3,0,0x51051200,3,0=0x51040000,3,0,0x51052400,3,0

;00 to 27 (HSR)
0x51040000,1,0,0x59DD0800,0,0=0x51040000,1,0,0x51042700,0,0; missing_paths
0x51040000,3,0,0x59DD0800,0,0=0x51040000,3,0,0x51042700,0,0; missing_paths
0x51040000,1,0,0x59DD0800,2,0=0x51040000,1,0,0x51042700,2,0; missing_paths
0x51040000,3,0,0x59DD0800,2,0=0x51040000,3,0,0x51042700,2,0; missing_paths
0x51040000,1,0,0x59DD0800,0,0=0x51040000,1,0,0x51041A00,0,0; missing_paths
0x51040000,3,0,0x59DD0800,0,0=0x51040000,3,0,0x51041A00,0,0; missing_paths
0x51040000,1,0,0x59DD0800,2,0=0x51040000,1,0,0x51041A00,2,0; missing_paths
0x51040000,3,0,0x59DD0800,2,0=0x51040000,3,0,0x51041A00,2,0; missing_paths

;00 to 28 (TLA-5)
0x51040000,1,0,0x51101200,3,0=0x51040000,1,0,0x51102400,3,0
Expand Down Expand Up @@ -15587,10 +15587,10 @@
0x51050000,3,0,0x51051100,3,0=0x51050000,3,0,0x51052500,2,0

;00 to 27 (HSR)
0x51050000,1,0,0x5DDD0200,0,0=0x51050000,1,0,0x51052700,0,0
0x51050000,3,0,0x5DDD0200,0,0=0x51050000,3,0,0x51052700,0,0
0x51050000,1,0,0x5DDD0200,2,0=0x51050000,1,0,0x51052700,2,0
0x51050000,3,0,0x5DDD0200,2,0=0x51050000,3,0,0x51052700,2,0
0x51050000,1,0,0x5DDD0200,0,0=0x51050000,1,0,0x51051A00,0,0
0x51050000,3,0,0x5DDD0200,0,0=0x51050000,3,0,0x51051A00,0,0
0x51050000,1,0,0x5DDD0200,2,0=0x51050000,1,0,0x51051A00,2,0
0x51050000,3,0,0x5DDD0200,2,0=0x51050000,3,0,0x51051A00,2,0

;00 to 28 (TLA-5)
0x51050000,1,0,0x51101100,3,0=0x51050000,1,0,0x51102500,3,0
Expand Down Expand Up @@ -18463,10 +18463,10 @@
;00 to 26

;00 to 27 (HSR)
0x51100000,1,0,0x5ddd0200,0,0=0x51100000,1,0,0x51102700,0,0
0x51100000,1,0,0x5ddd0200,2,0=0x51100000,1,0,0x51102700,0,0
0x51100000,3,0,0x5ddd0200,0,0=0x51100000,3,0,0x51102700,2,0
0x51100000,3,0,0x5ddd0200,2,0=0x51100000,3,0,0x51102700,2,0
0x51100000,1,0,0x5ddd0200,0,0=0x51100000,1,0,0x51101A00,0,0
0x51100000,1,0,0x5ddd0200,2,0=0x51100000,1,0,0x51101A00,0,0
0x51100000,3,0,0x5ddd0200,0,0=0x51100000,3,0,0x51101A00,2,0
0x51100000,3,0,0x5ddd0200,2,0=0x51100000,3,0,0x51101A00,2,0

;00 to 28 (TLA-5)
0x51100000,1,0,0x51101100,3,0=0x51100000,1,0,0x51102800,0,0
Expand Down Expand Up @@ -21863,10 +21863,10 @@
;00 to 26

;00 to 27 (HSR)
0x51110000,1,0,0x59dd0200,0,0=0x51110000,1,0,0x51112700,0,0
0x51110000,1,0,0x59dd0200,2,0=0x51110000,1,0,0x51112700,0,0
0x51110000,3,0,0x59dd0200,0,0=0x51110000,3,0,0x51112700,2,0
0x51110000,3,0,0x59dd0200,2,0=0x51110000,3,0,0x51112700,2,0
0x51110000,1,0,0x59dd0200,0,0=0x51110000,1,0,0x51111A00,0,0
0x51110000,1,0,0x59dd0200,2,0=0x51110000,1,0,0x51111A00,0,0
0x51110000,3,0,0x59dd0200,0,0=0x51110000,3,0,0x51111A00,2,0
0x51110000,3,0,0x59dd0200,2,0=0x51110000,3,0,0x51111A00,2,0

;00 to 28 (TLA-5)
0x51110000,1,0,0x51101200,3,0=0x51110000,1,0,0x51112800,0,0
Expand Down Expand Up @@ -25213,10 +25213,10 @@
;00 to 26

;00 to 27 (HSR)
0x51120000,1,0,0x59dd0200,0,0=0x51120000,1,0,0x51122700,0,0
0x51120000,1,0,0x59dd0200,2,0=0x51120000,1,0,0x51122700,0,0
0x51120000,3,0,0x59dd0200,0,0=0x51120000,3,0,0x51122700,2,0
0x51120000,3,0,0x59dd0200,2,0=0x51120000,3,0,0x51122700,2,0
0x51120000,1,0,0x59dd0200,0,0=0x51120000,1,0,0x51121A00,0,0
0x51120000,1,0,0x59dd0200,2,0=0x51120000,1,0,0x51121A00,0,0
0x51120000,3,0,0x59dd0200,0,0=0x51120000,3,0,0x51121A00,2,0
0x51120000,3,0,0x59dd0200,2,0=0x51120000,3,0,0x51121A00,2,0

;00 to 28 (TLA-5)
0x51120000,1,0,0x51101200,3,0=0x51120000,1,0,0x51122800,0,0
Expand Down Expand Up @@ -28572,10 +28572,10 @@
;00 to 26

;00 to 27 (HSR)
0x51130000,1,0,0x5ddd0200,0,0=0x51130000,1,0,0x51132700,0,0
0x51130000,1,0,0x5ddd0200,2,0=0x51130000,1,0,0x51132700,0,0
0x51130000,3,0,0x5ddd0200,0,0=0x51130000,3,0,0x51132700,2,0
0x51130000,3,0,0x5ddd0200,2,0=0x51130000,3,0,0x51132700,2,0
0x51130000,1,0,0x5ddd0200,0,0=0x51130000,1,0,0x51131A00,0,0
0x51130000,1,0,0x5ddd0200,2,0=0x51130000,1,0,0x51131A00,0,0
0x51130000,3,0,0x5ddd0200,0,0=0x51130000,3,0,0x51131A00,2,0
0x51130000,3,0,0x5ddd0200,2,0=0x51130000,3,0,0x51131A00,2,0

;00 to 28 (TLA-5)
0x51130000,1,0,0x51101100,3,0=0x51130000,1,0,0x51132800,0,0
Expand Down Expand Up @@ -31984,10 +31984,10 @@
;00 to 26

;00 to 27 (HSR)
0x51140000,1,0,0x5ddd0200,0,0=0x51140000,1,0,0x51142700,0,0
0x51140000,1,0,0x5ddd0200,2,0=0x51140000,1,0,0x51142700,0,0
0x51140000,3,0,0x5ddd0200,0,0=0x51140000,3,0,0x51142700,2,0
0x51140000,3,0,0x5ddd0200,2,0=0x51140000,3,0,0x51142700,2,0
0x51140000,1,0,0x5ddd0200,0,0=0x51140000,1,0,0x51141A00,0,0
0x51140000,1,0,0x5ddd0200,2,0=0x51140000,1,0,0x51141A00,0,0
0x51140000,3,0,0x5ddd0200,0,0=0x51140000,3,0,0x51141A00,2,0
0x51140000,3,0,0x5ddd0200,2,0=0x51140000,3,0,0x51141A00,2,0

;00 to 28 (TLA-5)
0x51140000,1,0,0x51101100,3,0=0x51140000,1,0,0x51142800,0,0
Expand Down Expand Up @@ -35369,10 +35369,10 @@
;00 to 26

;00 to 27 (HSR)
0x51200000,1,0,0x5ddd0200,0,0=0x51200000,1,0,0x51202700,0,0
0x51200000,1,0,0x5ddd0200,2,0=0x51200000,1,0,0x51202700,0,0
0x51200000,3,0,0x5ddd0200,0,0=0x51200000,3,0,0x51202700,2,0
0x51200000,3,0,0x5ddd0200,2,0=0x51200000,3,0,0x51202700,2,0
0x51200000,1,0,0x5ddd0200,0,0=0x51200000,1,0,0x51201A00,0,0
0x51200000,1,0,0x5ddd0200,2,0=0x51200000,1,0,0x51201A00,0,0
0x51200000,3,0,0x5ddd0200,0,0=0x51200000,3,0,0x51201A00,2,0
0x51200000,3,0,0x5ddd0200,2,0=0x51200000,3,0,0x51201A00,2,0

;00 to 28 (TLA-5)
0x51200000,1,0,0x51101100,3,0=0x51200000,1,0,0x51202800,0,0
Expand Down Expand Up @@ -38823,10 +38823,10 @@
;00 to 26

;00 to 27 (HSR)
0x51210000,1,0,0x59dd0200,0,0=0x51210000,1,0,0x51212700,0,0
0x51210000,1,0,0x59dd0200,2,0=0x51210000,1,0,0x51212700,0,0
0x51210000,3,0,0x59dd0200,0,0=0x51210000,3,0,0x51212700,2,0
0x51210000,3,0,0x59dd0200,2,0=0x51210000,3,0,0x51212700,2,0
0x51210000,1,0,0x59dd0200,0,0=0x51210000,1,0,0x51211A00,0,0
0x51210000,1,0,0x59dd0200,2,0=0x51210000,1,0,0x51211A00,0,0
0x51210000,3,0,0x59dd0200,0,0=0x51210000,3,0,0x51211A00,2,0
0x51210000,3,0,0x59dd0200,2,0=0x51210000,3,0,0x51211A00,2,0

;00 to 28 (TLA-5)
0x51210000,1,0,0x51101200,3,0=0x51210000,1,0,0x51212800,0,0; missing_paths
Expand Down Expand Up @@ -42349,10 +42349,10 @@
0x51200080,3,0,0x510F1100,3,0=0x51200080,3,0,0x510F2000,3,0; missing_paths

;00 to 27 (HSR)
0x51200080,1,0,0x5DDD0200,0,0=0x51200080,1,0,0x51202780,0,0
0x51200080,3,0,0x5DDD0200,0,0=0x51200080,3,0,0x51202780,0,0
0x51200080,1,0,0x5DDD0200,2,0=0x51200080,1,0,0x51202780,2,0
0x51200080,3,0,0x5DDD0200,2,0=0x51200080,3,0,0x51202780,2,0
0x51200080,1,0,0x5DDD0200,0,0=0x51200080,1,0,0x51201A80,0,0
0x51200080,3,0,0x5DDD0200,0,0=0x51200080,3,0,0x51201A80,0,0
0x51200080,1,0,0x5DDD0200,2,0=0x51200080,1,0,0x51201A80,2,0
0x51200080,3,0,0x5DDD0200,2,0=0x51200080,3,0,0x51201A80,2,0

;00 to 28 (TLA-5)
0x51200080,1,0,0x51101100,3,0=0x51200080,1,0,0x51202880,0,0
Expand Down Expand Up @@ -44706,10 +44706,10 @@
0x51210080,3,0,0x510F1100,3,0=0x51210080,3,0,0x510F2000,3,0; missing_paths

;00 to 27 (HSR)
0x51210080,1,0,0x5DDD0200,0,0=0x51210080,1,0,0x51212780,0,0
0x51210080,3,0,0x5DDD0200,0,0=0x51210080,3,0,0x51212780,0,0
0x51210080,1,0,0x5DDD0200,2,0=0x51210080,1,0,0x51212780,2,0
0x51210080,3,0,0x5DDD0200,2,0=0x51210080,3,0,0x51212780,2,0
0x51210080,1,0,0x5DDD0200,0,0=0x51210080,1,0,0x51211A80,0,0
0x51210080,3,0,0x5DDD0200,0,0=0x51210080,3,0,0x51211A80,0,0
0x51210080,1,0,0x5DDD0200,2,0=0x51210080,1,0,0x51211A80,2,0
0x51210080,3,0,0x5DDD0200,2,0=0x51210080,3,0,0x51211A80,2,0

;00 to 28 (TLA-5)
0x51210080,1,0,0x51101100,3,0=0x51210080,1,0,0x51212880,0,0
Expand Down
Loading