Skip to content

Commit 881be1d

Browse files
authored
Merge pull request #530 from NAMTeam/rhw-nwm-paths
Rhw nwm paths
2 parents 35e914e + 28c02df commit 881be1d

37 files changed

Lines changed: 21901 additions & 1554 deletions

Controller/INRULs/RULConfig.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,3 +333,11 @@ Source: AvenueAdvanced/WideRadiusCurves.rul
333333
Source: AvenueAdvanced/Roundabouts.rul
334334
Source: AvenueAdvanced/TurningLanes.rul
335335
Source: AvenueAdvanced/Intersections.rul
336+
337+
########################################################
338+
339+
File: NetworkAddonMod_Advice.dat
340+
341+
TGI: 0xCA63E2A3 0x4A5E8EF6 0x2A504B00
342+
Compressed: 1
343+
Source: ../../lua/adv_nam_dll.lua

Controller/RUL2/07_RHW/Sec7b_BaseNetwork/00_Orthogonal.txt

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

Controller/RUL2/07_RHW/Sec7b_BaseNetwork/02_Diagonal.txt

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

Controller/RUL2/07_RHW/Sec7b_BaseNetwork/17-2_ELR_OxO.txt

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -352,131 +352,83 @@
352352
;still need DRIs
353353
;----Base Network----
354354
;00 to 00 (Orth)
355-
;0x57201720,1,0,0x57000000,1,0=0x57201720,1,0,0x57200000,1,0
356-
;0x57201720,1,0,0x57000000,3,0=0x57201720,1,0,0x57200000,3,0
357-
;0x57201720,3,0,0x57000000,1,0=0x57201720,3,0,0x57200000,1,0
358-
;0x57201720,3,0,0x57000000,3,0=0x57201720,3,0,0x57200000,3,0
359355
;---END L2 RHW-2---
360356
;------------------
361357
;-------------------------
362358
;----L2 RHW-3 (0x5721)----
363359
;-------------------------
364360
;----Base Network----
365361
;00 to 00 (Orth)
366-
;0x57211720,1,0,0x57000000,1,0=0x57211720,1,0,0x57210000,1,0
367-
;0x57211720,1,0,0x57000000,3,0=0x57211720,1,0,0x57210000,1,0
368-
;0x57211720,3,0,0x57000000,1,0=0x57211720,3,0,0x57210000,3,0
369-
;0x57211720,3,0,0x57000000,3,0=0x57211720,3,0,0x57210000,3,0
370362
;---END L2 RHW-3---
371363
;------------------
372364
;-----------------------
373365
;----L2 MIS (0x5722)----
374366
;-----------------------
375367
;----Base Network----
376368
;00 to 00 (Orth)
377-
;0x57221720,1,0,0x57000000,1,0=0x57221720,1,0,0x57220000,1,0
378-
;0x57221720,1,0,0x57000000,3,0=0x57221720,1,0,0x57220000,1,0
379-
;0x57221720,3,0,0x57000000,1,0=0x57221720,3,0,0x57220000,3,0
380-
;0x57221720,3,0,0x57000000,3,0=0x57221720,3,0,0x57220000,3,0
381369
;----END L1 MIS----
382370
;------------------
383371
;-------------------------
384372
;----L2 RHW-4 (0x5723)----
385373
;-------------------------
386374
;----Base Network----
387375
;00 to 00 (Orth)
388-
;0x57231720,1,0,0x57000000,1,0=0x57231720,1,0,0x57230000,1,0
389-
;0x57231720,1,0,0x57000000,3,0=0x57231720,1,0,0x57230000,1,0
390-
;0x57231720,3,0,0x57000000,1,0=0x57231720,3,0,0x57230000,3,0
391-
;0x57231720,3,0,0x57000000,3,0=0x57231720,3,0,0x57230000,3,0
392376
;---END L2 RHW-4---
393377
;------------------
394378
;--------------------------
395379
;----L2 RHW-6S (0x5724)----
396380
;--------------------------
397381
;----Base Network----
398382
;00 to 00 (Orth)
399-
;0x57241720,1,0,0x57000000,1,0=0x57241720,1,0,0x57240000,1,0
400-
;0x57241720,1,0,0x57000000,3,0=0x57241720,1,0,0x57240000,1,0
401-
;0x57241720,3,0,0x57000000,1,0=0x57241720,3,0,0x57240000,3,0
402-
;0x57241720,3,0,0x57000000,3,0=0x57241720,3,0,0x57240000,3,0
403383
;---END L2 RHW-6S---
404384
;-------------------
405385
;----------------------------------
406386
;----L2 RHW-S INNER (0x5725-80)----
407387
;----------------------------------
408388
;----Base Network----
409389
;00 to 00 (Orth)
410-
;0x572517A0,1,0,0x57000000,1,0=0x572517A0,1,0,0x57250080,1,0
411-
;0x572517A0,1,0,0x57000000,3,0=0x572517A0,1,0,0x57250080,1,0
412-
;0x572517A0,3,0,0x57000000,1,0=0x572517A0,3,0,0x57250080,3,0
413-
;0x572517A0,3,0,0x57000000,3,0=0x572517A0,3,0,0x57250080,3,0
414390
;---END L2 RHW-S INNER---
415391
;------------------------
416392
;--------------------------
417393
;----L2 RHW-8S (0x5725)----
418394
;--------------------------
419395
;----Base Network----
420396
;00 to 00 (Orth)
421-
;0x57251720,1,0,0x57000000,1,0=0x57251720,1,0,0x57250000,1,0
422-
;0x57251720,1,0,0x57000000,3,0=0x57251720,1,0,0x57250000,1,0
423-
;0x57251720,3,0,0x57000000,1,0=0x57251720,3,0,0x57250000,3,0
424-
;0x57251720,3,0,0x57000000,3,0=0x57251720,3,0,0x57250000,3,0
425397
;---END L2 RHW-8S---
426398
;-------------------
427399
;---------------------------
428400
;----L2 RHW-10S (0x5726)----
429401
;---------------------------
430402
;----Base Network----
431403
;00 to 00 (Orth)
432-
;0x57261720,1,0,0x57000000,1,0=0x57261720,1,0,0x57260000,1,0
433-
;0x57261720,1,0,0x57000000,3,0=0x57261720,1,0,0x57260000,1,0
434-
;0x57261720,3,0,0x57000000,1,0=0x57261720,3,0,0x57260000,3,0
435-
;0x57261720,3,0,0x57000000,3,0=0x57261720,3,0,0x57260000,3,0
436404
;---END L2 RHW-10S---
437405
;--------------------
438406
;---------------------------
439407
;----L2 RHW-12S (0x5727)----
440408
;---------------------------
441409
;----Base Network----
442410
;00 to 00 (Orth)
443-
;0x57271720,1,0,0x57000000,1,0=0x57271720,1,0,0x57270000,1,0
444-
;0x57271720,1,0,0x57000000,3,0=0x57271720,1,0,0x57270000,1,0
445-
;0x57271720,3,0,0x57000000,1,0=0x57271720,3,0,0x57270000,3,0
446-
;0x57271720,3,0,0x57000000,3,0=0x57271720,3,0,0x57270000,3,0
447411
;---END L2 RHW-12S---
448412
;--------------------
449413
;----------------------------------
450414
;----L2 RHW-C INNER (0x5728-80)----
451415
;----------------------------------
452416
;----Base Network----
453417
;00 to 00 (Orth)
454-
;0x572817A0,1,0,0x57000000,1,0=0x572817A0,1,0,0x57280080,1,0
455-
;0x572817A0,1,0,0x57000000,3,0=0x572817A0,1,0,0x57280080,3,0
456-
;0x572817A0,3,0,0x57000000,1,0=0x572817A0,3,0,0x57280080,1,0
457-
;0x572817A0,3,0,0x57000000,3,0=0x572817A0,3,0,0x57280080,3,0
458418
;---END L2 RHW-C INNER---
459419
;------------------------
460420
;--------------------------
461421
;----L2 RHW-6C (0x5728)----
462422
;--------------------------
463423
;----Base Network----
464424
;00 to 00 (Orth)
465-
;0x57281720,1,0,0x57000000,1,0=0x57281720,1,0,0x57280000,1,0
466-
;0x57281720,1,0,0x57000000,3,0=0x57281720,1,0,0x57280000,1,0
467-
;0x57281720,3,0,0x57000000,1,0=0x57281720,3,0,0x57280000,3,0
468-
;0x57281720,3,0,0x57000000,3,0=0x57281720,3,0,0x57280000,3,0
469425
;---END L2 RHW-6C---
470426
;-------------------
471427
;--------------------------
472428
;----L2 RHW-8C (0x5729)----
473429
;--------------------------
474430
;----Base Network----
475431
;00 to 00 (Orth)
476-
;0x57291720,1,0,0x57000000,1,0=0x57291720,1,0,0x57290000,1,0
477-
;0x57291720,1,0,0x57000000,3,0=0x57291720,1,0,0x57290000,1,0
478-
;0x57291720,3,0,0x57000000,1,0=0x57291720,3,0,0x57290000,3,0
479-
;0x57291720,3,0,0x57000000,3,0=0x57291720,3,0,0x57290000,3,0
480432
;---END L2 RHW-8C---
481433
;-------------------
482434
;---------------------------

Controller/RUL2/07_RHW/Sec7b_BaseNetwork/17-2_ELR_OxO_FLEX-WT-In.txt

Lines changed: 0 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -158,83 +158,6 @@
158158

159159
;L2
160160
;S-to-S and C-to-C
161-
;0x57231720,3,0,0x57710400,3,0=0x57231720,3,0,0x57732429,3,0
162-
;0x57231720,1,0,0x57701400,1,1=0x57231720,1,0,0x57723429,1,1
163-
164-
;0x57241720,3,0,0x57710400,3,0=0x57241720,3,0,0x57743429,3,0
165-
;0x57241720,1,0,0x57701400,1,1=0x57241720,1,0,0x57734429,1,1
166-
167-
;0x57251720,3,0,0x57710400,3,0=0x57251720,3,0,0x57754429,3,0
168-
;0x57251720,1,0,0x57701400,1,1=0x57251720,1,0,0x57745429,1,1
169-
170-
;0x57261720,3,0,0x57710400,3,0=0x57261720,3,0,0x57765429,3,0
171-
;0x57261720,1,0,0x57701400,1,1=0x57261720,1,0,0x57756429,1,1
172-
173-
;0x57271720,3,0,0x57710400,3,0=0x57271720,3,0,0x57776429,3,0
174-
;0x57271720,1,0,0x57701400,1,1=0x57271720,1,0,0x57767429,1,1
175-
176-
;0x57291720,3,0,0x57710400,3,0=0x57291720,3,0,0x57798429,3,0
177-
;0x57291720,1,0,0x57701400,1,1=0x57291720,1,0,0x57789429,1,1
178-
179-
;0x572A1720,3,0,0x57710400,3,0=0x572A1720,3,0,0x577A9429,3,0; missing_paths
180-
;0x572A1720,1,0,0x57701400,1,1=0x572A1720,1,0,0x5779A429,1,1; missing_paths
181-
182-
;S-to-C Downward
183-
;0x57201720,3,0,0x57731720,3,0=0x57201720,3,0,0x57730019,3,0; missing_paths
184-
;0x57201720,1,0,0x57731720,3,0=0x57201720,1,0,0x57730019,3,0; missing_paths
185-
;0x57201720,3,0,0x57731720,1,1=0x57201720,3,0,0x57730019,1,1; missing_paths
186-
;0x57201720,1,0,0x57731720,1,1=0x57201720,1,0,0x57730019,1,1; missing_paths
187-
;0x57201720,1,0,0x57730600,3,0=0x57201720,1,0,0x57730619,3,0; missing_paths
188-
;0x57201720,3,0,0x57730600,3,0=0x57201720,3,0,0x57730619,1,1; missing_paths
189-
190-
;0x57211720,3,0,0x57731720,3,0=0x57211720,3,0,0x57731019,3,0; missing_paths
191-
;0x57211720,1,0,0x57731720,3,0=0x57211720,1,0,0x57731A19,3,0; missing_paths
192-
;0x57211720,3,0,0x57731720,1,1=0x57211720,3,0,0x57731A19,1,1; missing_paths
193-
;0x57211720,1,0,0x57731720,1,1=0x57211720,1,0,0x57731019,1,1; missing_paths
194-
;0x57211720,1,0,0x57730600,3,0=0x57211720,1,0,0x57731619,3,0; missing_paths
195-
;0x57211720,3,0,0x57730600,3,0=0x57211720,3,0,0x57731619,1,1; missing_paths
196-
197-
;0x57281720,3,0,0x57783000,3,0=0x57281720,3,0,0x57783019,3,0
198-
;0x57281720,1,0,0x57783000,1,1=0x57281720,1,0,0x57783019,1,1
199-
;0x572817A0,3,0,0x57783080,3,0=0x572817A0,3,0,0x57783099,3,0
200-
;0x572817A0,1,0,0x57783080,1,1=0x572817A0,1,0,0x57783099,1,1
201-
;0x57281720,1,0,0x57783100,3,0=0x57281720,1,0,0x57783119,3,0
202-
;0x57281720,3,0,0x57783100,1,1=0x57281720,3,0,0x57783119,1,1
203-
204-
;0x57291720,3,0,0x57783000,3,0=0x57291720,3,0,0x57794019,3,0
205-
;0x57291720,1,0,0x57783000,1,1=0x57291720,1,0,0x57794019,1,1
206-
;0x57291720,1,0,0x57783100,3,0=0x57291720,1,0,0x57794119,3,0
207-
;0x57291720,3,0,0x57783100,1,1=0x57291720,3,0,0x57794119,1,1
208-
209-
;0x57291720,3,0,0x57784000,3,0=0x57291720,3,0,0x57794019,3,0; missing_paths
210-
;0x57291720,1,0,0x57784000,1,1=0x57291720,1,0,0x57794019,1,1; missing_paths
211-
;0x57291720,1,0,0x57784100,3,0=0x57291720,1,0,0x57794119,3,0; missing_paths
212-
;0x57291720,3,0,0x57784100,1,1=0x57291720,3,0,0x57794119,1,1; missing_paths
213-
214-
;0x57291720,3,0,0x57785000,3,0=0x57291720,3,0,0x57795019,3,0; missing_paths
215-
;0x57291720,1,0,0x57785000,1,1=0x57291720,1,0,0x57795019,1,1; missing_paths
216-
;0x57291720,1,0,0x57785100,3,0=0x57291720,1,0,0x57795119,3,0; missing_paths
217-
;0x57291720,3,0,0x57785100,1,1=0x57291720,3,0,0x57795119,1,1; missing_paths
218-
219-
;0x572A1720,3,0,0x57783000,3,0=0x572A1720,3,0,0x577A5019,3,0; missing_paths
220-
;0x572A1720,1,0,0x57783000,1,1=0x572A1720,1,0,0x577A5019,1,1; missing_paths
221-
;0x572A1720,1,0,0x57783100,3,0=0x572A1720,1,0,0x577A5119,3,0; missing_paths
222-
;0x572A1720,3,0,0x57783100,1,1=0x572A1720,3,0,0x577A5119,1,1; missing_paths
223-
224-
;0x572A1720,3,0,0x57785000,3,0=0x572A1720,3,0,0x577A5019,3,0; missing_paths
225-
;0x572A1720,1,0,0x57785000,1,1=0x572A1720,1,0,0x577A5019,1,1; missing_paths
226-
;0x572A1720,1,0,0x57785100,3,0=0x572A1720,1,0,0x577A5119,3,0; missing_paths
227-
;0x572A1720,3,0,0x57785100,1,1=0x572A1720,3,0,0x577A5119,1,1; missing_paths
228-
229-
;0x572A1720,3,0,0x57795000,3,0=0x572A1720,3,0,0x577A5019,3,0; missing_paths
230-
;0x572A1720,1,0,0x57795000,1,1=0x572A1720,1,0,0x577A5019,1,1; missing_paths
231-
;0x572A1720,1,0,0x57795100,3,0=0x572A1720,1,0,0x577A5119,3,0; missing_paths
232-
;0x572A1720,3,0,0x57795100,1,1=0x572A1720,3,0,0x577A5119,1,1; missing_paths
233-
234-
;0x572A1720,3,0,0x57796000,3,0=0x572A1720,3,0,0x577A6019,3,0; missing_paths
235-
;0x572A1720,1,0,0x57796000,1,1=0x572A1720,1,0,0x577A6019,1,1; missing_paths
236-
;0x572A1720,1,0,0x57796100,3,0=0x572A1720,1,0,0x577A6119,3,0; missing_paths
237-
;0x572A1720,3,0,0x57796100,1,1=0x572A1720,3,0,0x577A6119,1,1; missing_paths
238161

239162
;L3
240163
;S-to-S and C-to-C
@@ -395,60 +318,6 @@
395318

396319
;L2
397320
;S-to-S and C-to-C
398-
;0x57221720,1,0,0x57710700,1,0=0x57221720,1,0,0x57221720,1,0
399-
;0x57221720,3,0,0x57701700,3,1=0x57221720,3,0,0x57221720,3,0
400-
401-
;0x57231720,1,0,0x57710700,1,0=0x57231720,1,0,0x57743729,1,0
402-
;0x57231720,3,0,0x57701700,3,1=0x57231720,3,0,0x57734729,3,1
403-
404-
;0x57241720,1,0,0x57710700,1,0=0x57231720,1,0,0x57754780,1,0
405-
;0x57241720,3,0,0x57701700,3,1=0x57231720,3,0,0x57745780,3,1
406-
407-
;0x57251720,1,0,0x57710700,1,0=0x57251720,1,0,0x57765729,1,0
408-
;0x57251720,3,0,0x57701700,3,1=0x57251720,3,0,0x57756729,3,1
409-
410-
;0x57261720,1,0,0x57710700,1,0=0x57261720,1,0,0x57776729,1,0
411-
;0x57261720,3,0,0x57701700,3,1=0x57261720,3,0,0x57767729,3,1
412-
413-
;0x57281720,1,0,0x57710700,1,0=0x57281720,1,0,0x57798729,1,0
414-
;0x57281720,3,0,0x57701700,3,1=0x57281720,3,0,0x57789729,3,1
415-
416-
;0x57291720,1,0,0x57710700,1,0=0x57291720,1,0,0x577A9729,1,0; missing_paths
417-
;0x57291720,3,0,0x57701700,3,1=0x57291720,3,0,0x5779A729,3,1; missing_paths
418-
419-
;S-to-C
420-
;0x57231720,1,0,0x57730500,1,0=0x57231720,1,0,0x57730529,1,0; missing_paths
421-
;0x57231720,3,0,0x57730580,1,0=0x57231720,3,0,0x577305A9,1,0; missing_paths
422-
;0x57231720,3,0,0x57730500,3,1=0x57231720,3,0,0x57730529,3,1; missing_paths
423-
;0x57231720,1,0,0x57703580,3,1=0x57231720,1,0,0x577035A9,3,1; missing_paths
424-
425-
426-
427-
;0x57251720,1,0,0x57783A00,1,0=0x57251720,1,0,0x57785A29,1,0
428-
;0x57251720,3,0,0x57783B00,1,0=0x57251720,3,0,0x57785B29,1,0
429-
;0x57251720,3,0,0x57783A00,3,1=0x57251720,3,0,0x57758A29,3,1
430-
;0x57251720,1,0,0x57783B00,3,1=0x57251720,1,0,0x57758B29,3,1
431-
432-
433-
;0x57261720,1,0,0x57783A00,1,0=0x57261720,1,0,0x57796A29,1,0
434-
;0x57261720,3,0,0x57783B00,1,0=0x57261720,3,0,0x57796B29,1,0
435-
;0x57261720,3,0,0x57783A00,3,1=0x57261720,3,0,0x57769A29,3,1
436-
;0x57261720,1,0,0x57783B00,3,1=0x57261720,1,0,0x57769B29,3,1
437-
438-
;0x57261720,1,0,0x57794A00,1,0=0x57261720,1,0,0x57796A29,1,0
439-
;0x57261720,3,0,0x57794B00,1,0=0x57261720,3,0,0x57796B29,1,0
440-
;0x57261720,3,0,0x57794A00,3,1=0x57261720,3,0,0x57769A29,3,1
441-
;0x57261720,1,0,0x57794B00,3,1=0x57261720,1,0,0x57769B29,3,1
442-
443-
;0x57271720,1,0,0x57783A00,1,0=0x57271720,1,0,0x57797A29,1,0; missing_paths
444-
;0x57271720,3,0,0x57783B00,1,0=0x57271720,3,0,0x57797B29,1,0; missing_paths
445-
;0x57271720,3,0,0x57783A00,3,1=0x57271720,3,0,0x57779A29,3,1; missing_paths
446-
;0x57271720,1,0,0x57783B00,3,1=0x57271720,1,0,0x57779B29,3,1; missing_paths
447-
448-
;0x57271720,1,0,0x57794A00,1,0=0x57271720,1,0,0x57797A29,1,0; missing_paths
449-
;0x57271720,3,0,0x57794B00,1,0=0x57271720,3,0,0x57797B29,1,0; missing_paths
450-
;0x57271720,3,0,0x57794A00,3,1=0x57271720,3,0,0x57767A29,3,1; missing_paths
451-
;0x57271720,1,0,0x57794B00,3,1=0x57271720,1,0,0x57767B29,3,1; missing_paths
452321

453322
;L3
454323
;S-to-S and C-to-C

0 commit comments

Comments
 (0)