Skip to content

Rhw nwm paths #530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TarkusSC4 merged 14 commits into from
Aug 27, 2025
Merged

Rhw nwm paths #530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
82d42e5
add GlrRuleGenerator for crosslinks with RHW and NWM
memo33 Jun 6, 2025
de1d87b
remove handwritten GLR×RHW crosslinks
memo33 Jul 6, 2025
c0e150d
script: add metarule-generated GLR RUL2 file
memo33 Jul 6, 2025
f237dca
remove L2 RHW × Lightrail rules
memo33 Jul 6, 2025
c2164b1
disable orthogonal/diagonal GLR metarules
memo33 Jul 6, 2025
a094c17
add extra rotations for orthogonal GLR in MiscResolver
memo33 Jul 6, 2025
3388115
add Lua file to show advisor message about DLL version incompatibility
memo33 Jul 13, 2025
b3d556e
synchronize .po files
memo33 Jul 13, 2025
f55c7b9
Merge pull request #518 from NAMTeam/dll-advisor-message
TarkusSC4 Jul 16, 2025
6d4d5f4
Merge pull request #517 from memo33/meta-glr-rhw-crosslinks
TarkusSC4 Jul 16, 2025
123c223
update to NAM DLL 1.1.1
memo33 Jul 28, 2025
fce2c28
Merge pull request #522 from memo33/nam-dll
TarkusSC4 Jul 30, 2025
9179447
add RHW networks to NWM turn paths generating script
memo33 Aug 27, 2025
28c02df
Merge branch 'nwm-diag-phase2a' into rhw-nwm-paths
TarkusSC4 Aug 27, 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
8 changes: 8 additions & 0 deletions Controller/INRULs/RULConfig.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,3 +333,11 @@ Source: AvenueAdvanced/WideRadiusCurves.rul
Source: AvenueAdvanced/Roundabouts.rul
Source: AvenueAdvanced/TurningLanes.rul
Source: AvenueAdvanced/Intersections.rul

########################################################

File: NetworkAddonMod_Advice.dat

TGI: 0xCA63E2A3 0x4A5E8EF6 0x2A504B00
Compressed: 1
Source: ../../lua/adv_nam_dll.lua
288 changes: 0 additions & 288 deletions Controller/RUL2/07_RHW/Sec7b_BaseNetwork/00_Orthogonal.txt
View file
Open in desktop

Large diffs are not rendered by default.

200 changes: 0 additions & 200 deletions Controller/RUL2/07_RHW/Sec7b_BaseNetwork/02_Diagonal.txt
View file
Open in desktop

Large diffs are not rendered by default.

48 changes: 0 additions & 48 deletions Controller/RUL2/07_RHW/Sec7b_BaseNetwork/17-2_ELR_OxO.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,131 +352,83 @@
;still need DRIs
;----Base Network----
;00 to 00 (Orth)
;0x57201720,1,0,0x57000000,1,0=0x57201720,1,0,0x57200000,1,0
;0x57201720,1,0,0x57000000,3,0=0x57201720,1,0,0x57200000,3,0
;0x57201720,3,0,0x57000000,1,0=0x57201720,3,0,0x57200000,1,0
;0x57201720,3,0,0x57000000,3,0=0x57201720,3,0,0x57200000,3,0
;---END L2 RHW-2---
;------------------
;-------------------------
;----L2 RHW-3 (0x5721)----
;-------------------------
;----Base Network----
;00 to 00 (Orth)
;0x57211720,1,0,0x57000000,1,0=0x57211720,1,0,0x57210000,1,0
;0x57211720,1,0,0x57000000,3,0=0x57211720,1,0,0x57210000,1,0
;0x57211720,3,0,0x57000000,1,0=0x57211720,3,0,0x57210000,3,0
;0x57211720,3,0,0x57000000,3,0=0x57211720,3,0,0x57210000,3,0
;---END L2 RHW-3---
;------------------
;-----------------------
;----L2 MIS (0x5722)----
;-----------------------
;----Base Network----
;00 to 00 (Orth)
;0x57221720,1,0,0x57000000,1,0=0x57221720,1,0,0x57220000,1,0
;0x57221720,1,0,0x57000000,3,0=0x57221720,1,0,0x57220000,1,0
;0x57221720,3,0,0x57000000,1,0=0x57221720,3,0,0x57220000,3,0
;0x57221720,3,0,0x57000000,3,0=0x57221720,3,0,0x57220000,3,0
;----END L1 MIS----
;------------------
;-------------------------
;----L2 RHW-4 (0x5723)----
;-------------------------
;----Base Network----
;00 to 00 (Orth)
;0x57231720,1,0,0x57000000,1,0=0x57231720,1,0,0x57230000,1,0
;0x57231720,1,0,0x57000000,3,0=0x57231720,1,0,0x57230000,1,0
;0x57231720,3,0,0x57000000,1,0=0x57231720,3,0,0x57230000,3,0
;0x57231720,3,0,0x57000000,3,0=0x57231720,3,0,0x57230000,3,0
;---END L2 RHW-4---
;------------------
;--------------------------
;----L2 RHW-6S (0x5724)----
;--------------------------
;----Base Network----
;00 to 00 (Orth)
;0x57241720,1,0,0x57000000,1,0=0x57241720,1,0,0x57240000,1,0
;0x57241720,1,0,0x57000000,3,0=0x57241720,1,0,0x57240000,1,0
;0x57241720,3,0,0x57000000,1,0=0x57241720,3,0,0x57240000,3,0
;0x57241720,3,0,0x57000000,3,0=0x57241720,3,0,0x57240000,3,0
;---END L2 RHW-6S---
;-------------------
;----------------------------------
;----L2 RHW-S INNER (0x5725-80)----
;----------------------------------
;----Base Network----
;00 to 00 (Orth)
;0x572517A0,1,0,0x57000000,1,0=0x572517A0,1,0,0x57250080,1,0
;0x572517A0,1,0,0x57000000,3,0=0x572517A0,1,0,0x57250080,1,0
;0x572517A0,3,0,0x57000000,1,0=0x572517A0,3,0,0x57250080,3,0
;0x572517A0,3,0,0x57000000,3,0=0x572517A0,3,0,0x57250080,3,0
;---END L2 RHW-S INNER---
;------------------------
;--------------------------
;----L2 RHW-8S (0x5725)----
;--------------------------
;----Base Network----
;00 to 00 (Orth)
;0x57251720,1,0,0x57000000,1,0=0x57251720,1,0,0x57250000,1,0
;0x57251720,1,0,0x57000000,3,0=0x57251720,1,0,0x57250000,1,0
;0x57251720,3,0,0x57000000,1,0=0x57251720,3,0,0x57250000,3,0
;0x57251720,3,0,0x57000000,3,0=0x57251720,3,0,0x57250000,3,0
;---END L2 RHW-8S---
;-------------------
;---------------------------
;----L2 RHW-10S (0x5726)----
;---------------------------
;----Base Network----
;00 to 00 (Orth)
;0x57261720,1,0,0x57000000,1,0=0x57261720,1,0,0x57260000,1,0
;0x57261720,1,0,0x57000000,3,0=0x57261720,1,0,0x57260000,1,0
;0x57261720,3,0,0x57000000,1,0=0x57261720,3,0,0x57260000,3,0
;0x57261720,3,0,0x57000000,3,0=0x57261720,3,0,0x57260000,3,0
;---END L2 RHW-10S---
;--------------------
;---------------------------
;----L2 RHW-12S (0x5727)----
;---------------------------
;----Base Network----
;00 to 00 (Orth)
;0x57271720,1,0,0x57000000,1,0=0x57271720,1,0,0x57270000,1,0
;0x57271720,1,0,0x57000000,3,0=0x57271720,1,0,0x57270000,1,0
;0x57271720,3,0,0x57000000,1,0=0x57271720,3,0,0x57270000,3,0
;0x57271720,3,0,0x57000000,3,0=0x57271720,3,0,0x57270000,3,0
;---END L2 RHW-12S---
;--------------------
;----------------------------------
;----L2 RHW-C INNER (0x5728-80)----
;----------------------------------
;----Base Network----
;00 to 00 (Orth)
;0x572817A0,1,0,0x57000000,1,0=0x572817A0,1,0,0x57280080,1,0
;0x572817A0,1,0,0x57000000,3,0=0x572817A0,1,0,0x57280080,3,0
;0x572817A0,3,0,0x57000000,1,0=0x572817A0,3,0,0x57280080,1,0
;0x572817A0,3,0,0x57000000,3,0=0x572817A0,3,0,0x57280080,3,0
;---END L2 RHW-C INNER---
;------------------------
;--------------------------
;----L2 RHW-6C (0x5728)----
;--------------------------
;----Base Network----
;00 to 00 (Orth)
;0x57281720,1,0,0x57000000,1,0=0x57281720,1,0,0x57280000,1,0
;0x57281720,1,0,0x57000000,3,0=0x57281720,1,0,0x57280000,1,0
;0x57281720,3,0,0x57000000,1,0=0x57281720,3,0,0x57280000,3,0
;0x57281720,3,0,0x57000000,3,0=0x57281720,3,0,0x57280000,3,0
;---END L2 RHW-6C---
;-------------------
;--------------------------
;----L2 RHW-8C (0x5729)----
;--------------------------
;----Base Network----
;00 to 00 (Orth)
;0x57291720,1,0,0x57000000,1,0=0x57291720,1,0,0x57290000,1,0
;0x57291720,1,0,0x57000000,3,0=0x57291720,1,0,0x57290000,1,0
;0x57291720,3,0,0x57000000,1,0=0x57291720,3,0,0x57290000,3,0
;0x57291720,3,0,0x57000000,3,0=0x57291720,3,0,0x57290000,3,0
;---END L2 RHW-8C---
;-------------------
;---------------------------
Expand Down
131 changes: 0 additions & 131 deletions Controller/RUL2/07_RHW/Sec7b_BaseNetwork/17-2_ELR_OxO_FLEX-WT-In.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,83 +158,6 @@

;L2
;S-to-S and C-to-C
;0x57231720,3,0,0x57710400,3,0=0x57231720,3,0,0x57732429,3,0
;0x57231720,1,0,0x57701400,1,1=0x57231720,1,0,0x57723429,1,1

;0x57241720,3,0,0x57710400,3,0=0x57241720,3,0,0x57743429,3,0
;0x57241720,1,0,0x57701400,1,1=0x57241720,1,0,0x57734429,1,1

;0x57251720,3,0,0x57710400,3,0=0x57251720,3,0,0x57754429,3,0
;0x57251720,1,0,0x57701400,1,1=0x57251720,1,0,0x57745429,1,1

;0x57261720,3,0,0x57710400,3,0=0x57261720,3,0,0x57765429,3,0
;0x57261720,1,0,0x57701400,1,1=0x57261720,1,0,0x57756429,1,1

;0x57271720,3,0,0x57710400,3,0=0x57271720,3,0,0x57776429,3,0
;0x57271720,1,0,0x57701400,1,1=0x57271720,1,0,0x57767429,1,1

;0x57291720,3,0,0x57710400,3,0=0x57291720,3,0,0x57798429,3,0
;0x57291720,1,0,0x57701400,1,1=0x57291720,1,0,0x57789429,1,1

;0x572A1720,3,0,0x57710400,3,0=0x572A1720,3,0,0x577A9429,3,0; missing_paths
;0x572A1720,1,0,0x57701400,1,1=0x572A1720,1,0,0x5779A429,1,1; missing_paths

;S-to-C Downward
;0x57201720,3,0,0x57731720,3,0=0x57201720,3,0,0x57730019,3,0; missing_paths
;0x57201720,1,0,0x57731720,3,0=0x57201720,1,0,0x57730019,3,0; missing_paths
;0x57201720,3,0,0x57731720,1,1=0x57201720,3,0,0x57730019,1,1; missing_paths
;0x57201720,1,0,0x57731720,1,1=0x57201720,1,0,0x57730019,1,1; missing_paths
;0x57201720,1,0,0x57730600,3,0=0x57201720,1,0,0x57730619,3,0; missing_paths
;0x57201720,3,0,0x57730600,3,0=0x57201720,3,0,0x57730619,1,1; missing_paths

;0x57211720,3,0,0x57731720,3,0=0x57211720,3,0,0x57731019,3,0; missing_paths
;0x57211720,1,0,0x57731720,3,0=0x57211720,1,0,0x57731A19,3,0; missing_paths
;0x57211720,3,0,0x57731720,1,1=0x57211720,3,0,0x57731A19,1,1; missing_paths
;0x57211720,1,0,0x57731720,1,1=0x57211720,1,0,0x57731019,1,1; missing_paths
;0x57211720,1,0,0x57730600,3,0=0x57211720,1,0,0x57731619,3,0; missing_paths
;0x57211720,3,0,0x57730600,3,0=0x57211720,3,0,0x57731619,1,1; missing_paths

;0x57281720,3,0,0x57783000,3,0=0x57281720,3,0,0x57783019,3,0
;0x57281720,1,0,0x57783000,1,1=0x57281720,1,0,0x57783019,1,1
;0x572817A0,3,0,0x57783080,3,0=0x572817A0,3,0,0x57783099,3,0
;0x572817A0,1,0,0x57783080,1,1=0x572817A0,1,0,0x57783099,1,1
;0x57281720,1,0,0x57783100,3,0=0x57281720,1,0,0x57783119,3,0
;0x57281720,3,0,0x57783100,1,1=0x57281720,3,0,0x57783119,1,1

;0x57291720,3,0,0x57783000,3,0=0x57291720,3,0,0x57794019,3,0
;0x57291720,1,0,0x57783000,1,1=0x57291720,1,0,0x57794019,1,1
;0x57291720,1,0,0x57783100,3,0=0x57291720,1,0,0x57794119,3,0
;0x57291720,3,0,0x57783100,1,1=0x57291720,3,0,0x57794119,1,1

;0x57291720,3,0,0x57784000,3,0=0x57291720,3,0,0x57794019,3,0; missing_paths
;0x57291720,1,0,0x57784000,1,1=0x57291720,1,0,0x57794019,1,1; missing_paths
;0x57291720,1,0,0x57784100,3,0=0x57291720,1,0,0x57794119,3,0; missing_paths
;0x57291720,3,0,0x57784100,1,1=0x57291720,3,0,0x57794119,1,1; missing_paths

;0x57291720,3,0,0x57785000,3,0=0x57291720,3,0,0x57795019,3,0; missing_paths
;0x57291720,1,0,0x57785000,1,1=0x57291720,1,0,0x57795019,1,1; missing_paths
;0x57291720,1,0,0x57785100,3,0=0x57291720,1,0,0x57795119,3,0; missing_paths
;0x57291720,3,0,0x57785100,1,1=0x57291720,3,0,0x57795119,1,1; missing_paths

;0x572A1720,3,0,0x57783000,3,0=0x572A1720,3,0,0x577A5019,3,0; missing_paths
;0x572A1720,1,0,0x57783000,1,1=0x572A1720,1,0,0x577A5019,1,1; missing_paths
;0x572A1720,1,0,0x57783100,3,0=0x572A1720,1,0,0x577A5119,3,0; missing_paths
;0x572A1720,3,0,0x57783100,1,1=0x572A1720,3,0,0x577A5119,1,1; missing_paths

;0x572A1720,3,0,0x57785000,3,0=0x572A1720,3,0,0x577A5019,3,0; missing_paths
;0x572A1720,1,0,0x57785000,1,1=0x572A1720,1,0,0x577A5019,1,1; missing_paths
;0x572A1720,1,0,0x57785100,3,0=0x572A1720,1,0,0x577A5119,3,0; missing_paths
;0x572A1720,3,0,0x57785100,1,1=0x572A1720,3,0,0x577A5119,1,1; missing_paths

;0x572A1720,3,0,0x57795000,3,0=0x572A1720,3,0,0x577A5019,3,0; missing_paths
;0x572A1720,1,0,0x57795000,1,1=0x572A1720,1,0,0x577A5019,1,1; missing_paths
;0x572A1720,1,0,0x57795100,3,0=0x572A1720,1,0,0x577A5119,3,0; missing_paths
;0x572A1720,3,0,0x57795100,1,1=0x572A1720,3,0,0x577A5119,1,1; missing_paths

;0x572A1720,3,0,0x57796000,3,0=0x572A1720,3,0,0x577A6019,3,0; missing_paths
;0x572A1720,1,0,0x57796000,1,1=0x572A1720,1,0,0x577A6019,1,1; missing_paths
;0x572A1720,1,0,0x57796100,3,0=0x572A1720,1,0,0x577A6119,3,0; missing_paths
;0x572A1720,3,0,0x57796100,1,1=0x572A1720,3,0,0x577A6119,1,1; missing_paths

;L3
;S-to-S and C-to-C
Expand Down Expand Up @@ -395,60 +318,6 @@

;L2
;S-to-S and C-to-C
;0x57221720,1,0,0x57710700,1,0=0x57221720,1,0,0x57221720,1,0
;0x57221720,3,0,0x57701700,3,1=0x57221720,3,0,0x57221720,3,0

;0x57231720,1,0,0x57710700,1,0=0x57231720,1,0,0x57743729,1,0
;0x57231720,3,0,0x57701700,3,1=0x57231720,3,0,0x57734729,3,1

;0x57241720,1,0,0x57710700,1,0=0x57231720,1,0,0x57754780,1,0
;0x57241720,3,0,0x57701700,3,1=0x57231720,3,0,0x57745780,3,1

;0x57251720,1,0,0x57710700,1,0=0x57251720,1,0,0x57765729,1,0
;0x57251720,3,0,0x57701700,3,1=0x57251720,3,0,0x57756729,3,1

;0x57261720,1,0,0x57710700,1,0=0x57261720,1,0,0x57776729,1,0
;0x57261720,3,0,0x57701700,3,1=0x57261720,3,0,0x57767729,3,1

;0x57281720,1,0,0x57710700,1,0=0x57281720,1,0,0x57798729,1,0
;0x57281720,3,0,0x57701700,3,1=0x57281720,3,0,0x57789729,3,1

;0x57291720,1,0,0x57710700,1,0=0x57291720,1,0,0x577A9729,1,0; missing_paths
;0x57291720,3,0,0x57701700,3,1=0x57291720,3,0,0x5779A729,3,1; missing_paths

;S-to-C
;0x57231720,1,0,0x57730500,1,0=0x57231720,1,0,0x57730529,1,0; missing_paths
;0x57231720,3,0,0x57730580,1,0=0x57231720,3,0,0x577305A9,1,0; missing_paths
;0x57231720,3,0,0x57730500,3,1=0x57231720,3,0,0x57730529,3,1; missing_paths
;0x57231720,1,0,0x57703580,3,1=0x57231720,1,0,0x577035A9,3,1; missing_paths



;0x57251720,1,0,0x57783A00,1,0=0x57251720,1,0,0x57785A29,1,0
;0x57251720,3,0,0x57783B00,1,0=0x57251720,3,0,0x57785B29,1,0
;0x57251720,3,0,0x57783A00,3,1=0x57251720,3,0,0x57758A29,3,1
;0x57251720,1,0,0x57783B00,3,1=0x57251720,1,0,0x57758B29,3,1


;0x57261720,1,0,0x57783A00,1,0=0x57261720,1,0,0x57796A29,1,0
;0x57261720,3,0,0x57783B00,1,0=0x57261720,3,0,0x57796B29,1,0
;0x57261720,3,0,0x57783A00,3,1=0x57261720,3,0,0x57769A29,3,1
;0x57261720,1,0,0x57783B00,3,1=0x57261720,1,0,0x57769B29,3,1

;0x57261720,1,0,0x57794A00,1,0=0x57261720,1,0,0x57796A29,1,0
;0x57261720,3,0,0x57794B00,1,0=0x57261720,3,0,0x57796B29,1,0
;0x57261720,3,0,0x57794A00,3,1=0x57261720,3,0,0x57769A29,3,1
;0x57261720,1,0,0x57794B00,3,1=0x57261720,1,0,0x57769B29,3,1

;0x57271720,1,0,0x57783A00,1,0=0x57271720,1,0,0x57797A29,1,0; missing_paths
;0x57271720,3,0,0x57783B00,1,0=0x57271720,3,0,0x57797B29,1,0; missing_paths
;0x57271720,3,0,0x57783A00,3,1=0x57271720,3,0,0x57779A29,3,1; missing_paths
;0x57271720,1,0,0x57783B00,3,1=0x57271720,1,0,0x57779B29,3,1; missing_paths

;0x57271720,1,0,0x57794A00,1,0=0x57271720,1,0,0x57797A29,1,0; missing_paths
;0x57271720,3,0,0x57794B00,1,0=0x57271720,3,0,0x57797B29,1,0; missing_paths
;0x57271720,3,0,0x57794A00,3,1=0x57271720,3,0,0x57767A29,3,1; missing_paths
;0x57271720,1,0,0x57794B00,3,1=0x57271720,1,0,0x57767B29,3,1; missing_paths

;L3
;S-to-S and C-to-C
Expand Down
Loading
Loading