From 6a677c1625e786775bf634ea886bb9d5716ad49b Mon Sep 17 00:00:00 2001 From: h3ndofry Date: Sun, 6 Nov 2022 21:25:59 +1100 Subject: [PATCH 01/14] adds E1 --- .../DirtroadAdvanced/RUL14_RHW_Advanced.rul | 140 ++++++++++++++++++ .../Sec7b_BaseNetwork/Ramp_2_R3_Branch.txt | 10 +- 2 files changed, 149 insertions(+), 1 deletion(-) diff --git a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul index dea13839d..76c8d254f 100644 --- a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul +++ b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul @@ -10557,6 +10557,146 @@ 3,24,0x57853f80,3,1 ;-----End Draggable Orthogonal Type D1 Wide Ramps----- +;-----Begin Draggable R3 Type E1 Ramps----- +; note: Top section only overrides here, look below this for bottom section overrides +; +1,2,2,0,2 +2,1,0,0,2,2 +2,3,0,2,0,2 +2,7,2,2,0,2 +2,8,0,2,2,2 +2,21,0,2,0,2 +2,22,11,2,0,13 +2,23,0,0,11,3 +3,0,0x57b12200,0,0 +3,1,0x57b12100,0,0 +3,3,0x57b12000,0,0 +3,7,0x57b12400,0,0 +3,8,0x57b12300,0,0 +3,21,0x57b12700,0,0 +3,22,0x57b12600,0,0 +3,23,0x57b12500,0,0 +; +1,0,2,2,2 +2,3,0,2,0,2 +2,5,2,0,0,2 +2,6,2,2,0,2 +2,7,0,2,2,2 +2,19,13,0,0,1 +2,20,0,2,13,11 +2,21,0,2,0,2 +3,0,0x57b12280,0,1 +3,3,0x57b12080,0,1 +3,5,0x57b12180,0,1 +3,6,0x57b12380,0,1 +3,7,0x57b12480,0,1 +3,19,0x57b12580,0,1 +3,20,0x57b12680,0,1 +3,21,0x57b12780,0,1 +; +1,2,2,2,0 +2,1,2,2,2,0 +2,2,2,0,2,2 +2,3,2,0,0,2 +2,5,2,0,2,0 +2,9,2,0,2,0 +2,10,13,11,2,0 +2,11,3,0,0,11 +3,0,0x57b12200,1,0 +3,1,0x57b12400,1,0 +3,2,0x57b12300,1,0 +3,3,0x57b12100,1,0 +3,5,0x57b12000,1,0 +3,9,0x57b12700,1,0 +3,10,0x57b12600,1,0 +3,11,0x57b12500,1,0 +; +1,2,2,2,0 +2,1,2,0,2,0 +2,3,0,0,2,2 +2,4,2,0,2,2 +2,5,2,2,2,0 +2,15,0,0,1,13 +2,16,2,13,11,0 +2,17,2,0,2,0 +3,0,0x57b12280,1,1 +3,1,0x57b12080,1,1 +3,3,0x57b12180,1,1 +3,4,0x57b12380,1,1 +3,5,0x57b12480,1,1 +3,15,0x57b12580,1,1 +3,16,0x57b12680,1,1 +3,17,0x57b12780,1,1 +; +1,0,2,2,2 +2,3,0,2,2,2 +2,4,2,2,0,2 +2,5,2,2,0,0 +2,7,0,2,0,2 +2,13,0,2,0,2 +2,14,0,13,11,2 +2,15,11,3,0,0 +3,0,0x57b12200,2,0 +3,3,0x57b12400,2,0 +3,4,0x57b12300,2,0 +3,5,0x57b12100,2,0 +3,7,0x57b12000,2,0 +3,13,0x57b12700,2,0 +3,14,0x57b12600,2,0 +3,15,0x57b12500,2,0 +; +1,2,2,0,2 +2,1,0,2,2,0 +2,2,0,2,2,2 +2,3,2,2,0,2 +2,7,0,2,0,2 +2,11,0,1,13,0 +2,12,13,11,0,2 +2,13,0,2,0,2 +3,0,0x57b12280,2,1 +3,1,0x57b12180,2,1 +3,2,0x57b12380,2,1 +3,3,0x57b12480,2,1 +3,7,0x57b12080,2,1 +3,11,0x57b12580,2,1 +3,12,0x57b12680,2,1 +3,13,0x57b12780,2,1 +; +1,2,0,2,2 +2,1,2,0,2,0 +2,5,2,0,2,2 +2,6,2,2,2,0 +2,7,0,2,2,0 +2,17,2,0,2,0 +2,18,2,0,13,11 +2,19,0,11,3,0 +3,0,0x57b12200,3,0 +3,1,0x57b12000,3,0 +3,5,0x57b12400,3,0 +3,6,0x57b12300,3,0 +3,7,0x57b12100,3,0 +3,17,0x57b12700,3,0 +3,18,0x57b12600,3,0 +3,19,0x57b12500,3,0 +; +1,2,0,2,2 +2,1,2,0,2,2 +2,5,2,0,2,0 +2,7,2,2,0,0 +2,8,2,2,2,0 +2,9,2,0,2,0 +2,23,1,13,0,0 +2,24,11,0,2,13 +3,0,0x57b12280,3,1 +3,1,0x57b12480,3,1 +3,5,0x57b12080,3,1 +3,7,0x57b12180,3,1 +3,8,0x57b12380,3,1 +3,9,0x57b12780,3,1 +3,23,0x57b12580,3,1 +3,24,0x57b12680,3,1 +;-----End Draggable R3 Type E1 Ramps----- + ;-----Begin Draggable R3 Type B1 Ramps----- ; note: this is a two stage override. ; Defaults to RHW-2. diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_2_R3_Branch.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_2_R3_Branch.txt index 64cbd89bc..3a1b1409c 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_2_R3_Branch.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_2_R3_Branch.txt @@ -26,4 +26,12 @@ 0x57B01A00,3,0,0x57906100,0,0=0x57926080,0,0,0x57926180,0,0 0x57B01A80,1,1,0x57906100,2,1=0x57926080,2,1,0x57926180,2,1 0x57B01A00,3,0,0x57906000,0,0=0x57B01A00,3,0,0x57926080,0,0 -0x57B01A80,1,1,0x57906000,2,1=0x57B01A80,1,1,0x57926080,2,1 \ No newline at end of file +0x57B01A80,1,1,0x57906000,2,1=0x57B01A80,1,1,0x57926080,2,1 +; +; I have no freaking idea where this needs to go +0x57B12600,3,0,0x57b00900,3,0=0x57B12600,3,0,0x57B12900,3,0 +0x57B12680,1,1,0x57b00980,1,1=0x57B12680,1,1,0x57B12980,1,1 +0x57B12500,3,0,0x57b00800,3,0=0x57B12500,3,0,0x57B12800,3,0 +0x57B12580,1,1,0x57b00880,1,1=0x57B12580,1,1,0x57B12880,1,1 +0x57B12800,3,0,0x57b00a00,3,0=0x57B12800,3,0,0x57B12a00,3,0 +0x57B12880,1,1,0x57b00a80,1,1=0x57B12880,1,1,0x57B12a80,1,1 \ No newline at end of file From 3bffb8e8cbab76a0932cb015e7a0417713930cb6 Mon Sep 17 00:00:00 2001 From: h3ndofry Date: Mon, 7 Nov 2022 01:38:51 +1100 Subject: [PATCH 02/14] added note about RHW E1 ramps --- Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_2_R3_Branch.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_2_R3_Branch.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_2_R3_Branch.txt index 3a1b1409c..5ee8d2d56 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_2_R3_Branch.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_2_R3_Branch.txt @@ -28,6 +28,7 @@ 0x57B01A00,3,0,0x57906000,0,0=0x57B01A00,3,0,0x57926080,0,0 0x57B01A80,1,1,0x57906000,2,1=0x57B01A80,1,1,0x57926080,2,1 ; +; R3 E1 ramp overrides ; I have no freaking idea where this needs to go 0x57B12600,3,0,0x57b00900,3,0=0x57B12600,3,0,0x57B12900,3,0 0x57B12680,1,1,0x57b00980,1,1=0x57B12680,1,1,0x57B12980,1,1 From e61e0e4d80d065f3091a01580e9d8e3997cbf1c3 Mon Sep 17 00:00:00 2001 From: h3ndofry Date: Tue, 15 Nov 2022 22:35:28 +1100 Subject: [PATCH 03/14] minor rename --- Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul | 8 ++++++++ .../{Ramp_2_R3_Branch.txt => R3_Ramps.txt} | 0 2 files changed, 8 insertions(+) rename Controller/RUL2/07_RHW/Sec7b_BaseNetwork/{Ramp_2_R3_Branch.txt => R3_Ramps.txt} (100%) diff --git a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul index 76c8d254f..4cca0868e 100644 --- a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul +++ b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul @@ -11038,6 +11038,7 @@ 2,11,0,1,13,0 2,12,13,1,3,2 2,13,3,0,0,1 +2,21,0,2,0,2 3,0,0x57b01800,0,0 3,1,0x57b01700,0,0 3,7,0x57b01900,0,0 @@ -11051,6 +11052,7 @@ 2,13,0,0,1,3 2,14,1,3,11,2 2,15,11,3,0,0 +2,21,0,2,0,2 3,0,0x57b01880,0,1 3,5,0x57b01780,0,1 3,7,0x57b01980,0,1 @@ -11061,6 +11063,7 @@ 2,3,0,0,11,3 2,4,11,0,2,0 2,5,0,0,1,3 +2,9,2,0,2,0 2,15,0,0,1,13 2,16,2,13,1,3 2,17,1,3,0,0 @@ -11077,6 +11080,7 @@ 2,9,0,1,3,0 2,10,3,11,2,1 2,11,3,0,0,11 +2,17,2,0,2,0 3,0,0x57b01880,1,1 3,3,0x57b01780,1,1 3,5,0x57b01980,1,1 @@ -11087,6 +11091,7 @@ 2,5,3,0,0,11 2,6,0,11,0,2 2,7,3,0,0,1 +2,13,0,2,0,2 2,19,13,0,0,1 2,20,3,2,13,1 2,21,0,1,3,0 @@ -11100,6 +11105,7 @@ 2,3,0,2,0,13 2,7,0,0,1,3 2,8,0,13,0,2 +2,13,0,2,0,2 2,21,1,3,0,0 2,22,11,2,1,3 2,23,0,0,11,3 @@ -11114,6 +11120,7 @@ 2,7,11,3,0,0 2,8,2,0,11,0 2,9,0,0,1,3 +2,17,2,0,2,0 2,23,1,13,0,0 2,24,1,3,2,13 3,0,0x57b01800,3,0 @@ -11126,6 +11133,7 @@ 2,5,0,1,3,0 2,6,13,0,2,0 2,7,0,1,13,0 +2,9,2,0,2,0 2,17,3,0,0,1 2,18,2,1,3,11 2,19,0,11,3,0 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_2_R3_Branch.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt similarity index 100% rename from Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_2_R3_Branch.txt rename to Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt From c182d4bf1069ccccc6cbfc4b2f7cb578477fa627 Mon Sep 17 00:00:00 2001 From: h3ndofry Date: Tue, 15 Nov 2022 23:35:05 +1100 Subject: [PATCH 04/14] adds notes about blend curve - this does not work correctly right now --- .../07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt | 53 +++++++++++-------- 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt index 5ee8d2d56..26dc98c1e 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt @@ -1,38 +1,49 @@ -;==Diagonal Tile and Adjacencies (R3 B1 Ramps)== +;==Diagonal Tile and Adjacencies (R3 Ramps)== ;----------------------- ;----L0 MIS (0x5702)---- ;----------------------- -;----Base Network---- -;02 to 02 (R3 Diag) +;----Base Network (RHW-2)---- +;02 to 02 (B1 R3 o -> Diag) 0x57B00A00,2,0,0x57000200,2,0=0x57B00A00,2,0,0x57020200,2,0 0x57B00A80,0,1,0x57000200,1,0=0x57B00A80,0,1,0x57020200,1,0 -;02 to 03 (R3 Diag Stub) +;02 to 03 (B1 R3 o -> Stub) 0x57B00A80,0,1,0x57000300,3,1=0x57B00A80,0,1,0x57020300,3,1 0x57B00A00,2,0,0x57000300,1,0=0x57B00A00,2,0,0x57020300,1,0 -;----Base Network---- -;00 to 00 (R3 Orth) +;00 to 00 (B1 R3 d -> Orth) 0x57B01A00,3,0,0x57000000,3,0=0x57B01A00,3,0,0x57020000,3,0 0x57B01A80,1,1,0x57000000,1,0=0x57B01A80,1,1,0x57020000,1,0 -;00 to 10 (R3 Stub) +;00 to 10 (B1 R3 d -> Stub) 0x57B01A00,3,0,0x57000100,1,0=0x57B01A00,3,0,0x57020100,3,1 0x57B01A80,1,1,0x57000100,1,0=0x57B01A80,1,1,0x57020100,1,0 -; Blends (Ramp <> MRC R3) -; MIS yellow line inside -0x57B01A00,3,0,0x57906100,2,1=0x57926000,2,1,0x57926100,2,1 -0x57B01A80,1,1,0x57906100,0,0=0x57926000,0,0,0x57926100,0,0 -0x57B01A00,3,0,0x57906000,2,1=0x57B01A00,3,0,0x57926000,2,1 -0x57B01A80,1,1,0x57906000,0,0=0x57B01A80,1,1,0x57926000,0,0 -; MIS yellow line outside -0x57B01A00,3,0,0x57906100,0,0=0x57926080,0,0,0x57926180,0,0 -0x57B01A80,1,1,0x57906100,2,1=0x57926080,2,1,0x57926180,2,1 -0x57B01A00,3,0,0x57906000,0,0=0x57B01A00,3,0,0x57926080,0,0 -0x57B01A80,1,1,0x57906000,2,1=0x57B01A80,1,1,0x57926080,2,1 +;; CURRENTLY DROPPED DUE TO COMPLICATIONS WITH RUL - THIS NEEDS +;; TO BE TESTED AND FIXED +; ; Blends (Ramp <> MRC R3) +; ; MIS yellow line inside +; 0x57B01A00,3,0,0x57906100,2,1=0x57926000,2,1,0x57926100,2,1 +; 0x57B01A80,1,1,0x57906100,0,0=0x57926000,0,0,0x57926100,0,0 +; 0x57B01A00,3,0,0x57906000,2,1=0x57B01A00,3,0,0x57926000,2,1 +; 0x57B01A80,1,1,0x57906000,0,0=0x57B01A80,1,1,0x57926000,0,0 +; ; MIS yellow line outside +; 0x57B01A00,3,0,0x57906100,0,0=0x57926080,0,0,0x57926180,0,0 +; 0x57B01A80,1,1,0x57906100,2,1=0x57926080,2,1,0x57926180,2,1 +; 0x57B01A00,3,0,0x57906000,0,0=0x57B01A00,3,0,0x57926080,0,0 +; 0x57B01A80,1,1,0x57906000,2,1=0x57B01A80,1,1,0x57926080,2,1 ; -; R3 E1 ramp overrides -; I have no freaking idea where this needs to go +;----Base Network (RHW-3)---- +; B1 d -> E1 d override of bottom section 0x57B12600,3,0,0x57b00900,3,0=0x57B12600,3,0,0x57B12900,3,0 0x57B12680,1,1,0x57b00980,1,1=0x57B12680,1,1,0x57B12980,1,1 0x57B12500,3,0,0x57b00800,3,0=0x57B12500,3,0,0x57B12800,3,0 0x57B12580,1,1,0x57b00880,1,1=0x57B12580,1,1,0x57B12880,1,1 0x57B12800,3,0,0x57b00a00,3,0=0x57B12800,3,0,0x57B12a00,3,0 -0x57B12880,1,1,0x57b00a80,1,1=0x57B12880,1,1,0x57B12a80,1,1 \ No newline at end of file +0x57B12880,1,1,0x57b00a80,1,1=0x57B12880,1,1,0x57B12a80,1,1 +;02 to 02 (E1 R3 o -> Diag) +0x57B12A00,2,0,0x57000200,2,0=0x57B12A00,2,0,0x57020200,2,0 +0x57B12A80,0,1,0x57000200,1,0=0x57B12A80,0,1,0x57020200,1,0 +;02 to 03 (E1 R3 o -> Stub) +0x57B12A80,0,1,0x57000300,3,1=0x57B12A80,0,1,0x57020300,3,1 +0x57B12A00,2,0,0x57000300,1,0=0x57B12A00,2,0,0x57020300,1,0 +;00 to 00 (E1 R3 d -> Orth) +;PLACEHOLDER +;00 to 10 (E1 R3 d -> Stub) +;PLACEHOLDER \ No newline at end of file From 63ed616faaeca8601b15a6dd6dc97e13d3ad8515 Mon Sep 17 00:00:00 2001 From: h3ndofry Date: Wed, 16 Nov 2022 00:43:43 +1100 Subject: [PATCH 05/14] update to E1 ramps, adds diagonal --- .../DirtroadAdvanced/RUL14_RHW_Advanced.rul | 285 ++++++++++++++++++ .../07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt | 6 +- 2 files changed, 289 insertions(+), 2 deletions(-) diff --git a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul index 4cca0868e..7a1a1ded7 100644 --- a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul +++ b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul @@ -11025,6 +11025,291 @@ 3,7,0x57b00880,3,1 3,8,0x57b00a80,3,1 +;---Type E1 (R3) Ramps (Diagonal) - outside --- +; bottom section +; +1,3,0,0,11 +2,1,0,11,3,0 +2,2,0,2,2,11 +2,3,2,1,3,0 +2,7,0,11,0,2 +2,11,0,1,13,0 +2,12,13,1,3,2 +2,13,3,0,0,1 +2,21,0,2,0,2 +3,0,0x57b13a00,0,0 +3,1,0x57b13900,0,0 +3,7,0x57b13b00,0,0 +3,21,0x57b13c00,0,0 +; +1,0,0,1,13 +2,3,1,3,2,0 +2,4,2,2,0,13 +2,5,1,13,0,0 +2,7,0,13,0,2 +2,13,0,0,1,3 +2,14,1,3,11,2 +2,15,11,3,0,0 +2,21,0,2,0,2 +3,0,0x57b13a80,0,1 +3,5,0x57b13980,0,1 +3,7,0x57b13b80,0,1 +3,21,0x57b13c80,0,1 +; +1,11,3,0,0 +2,1,2,0,11,0 +2,3,0,0,11,3 +2,4,11,0,2,2 +2,5,0,2,1,3 +2,9,2,0,2,0 +2,15,0,0,1,13 +2,16,2,13,1,3 +2,17,1,3,0,0 +3,0,0x57b13a00,1,0 +3,1,0x57b13b00,1,0 +3,3,0x57b13900,1,0 +3,9,0x57b13c00,1,0 +; +1,0,1,13,0 +2,1,3,2,0,1 +2,2,2,0,13,2 +2,3,13,0,0,1 +2,5,13,0,2,0 +2,9,0,1,3,0 +2,10,3,11,2,1 +2,11,3,0,0,11 +2,17,2,0,2,0 +3,0,0x57b13a80,1,1 +3,3,0x57b13980,1,1 +3,5,0x57b13b80,1,1 +3,17,0x57b13c80,1,1 +; +1,0,11,3,0 +2,3,0,2,0,11 +2,5,3,0,0,11 +2,6,2,11,0,2 +2,7,3,0,2,1 +2,13,0,2,0,2 +2,19,13,0,0,1 +2,20,3,2,13,1 +2,21,0,1,3,0 +3,0,0x57b13a00,2,0 +3,3,0x57b13b00,2,0 +3,5,0x57b13900,2,0 +3,13,0x57b13c00,2,0 +; +1,1,13,0,0 +2,1,0,0,1,13 +2,3,0,2,0,13 +2,7,2,0,1,3 +2,8,0,13,2,2 +2,13,0,2,0,2 +2,21,1,3,0,0 +2,22,11,2,1,3 +2,23,0,0,11,3 +3,0,0x57b13a80,2,1 +3,1,0x57b13980,2,1 +3,3,0x57b13b80,2,1 +3,13,0x57b13c80,2,1 +; +1,0,0,11,3 +2,1,1,3,0,2 +2,5,11,0,2,0 +2,7,11,3,0,0 +2,8,2,2,11,0 +2,9,0,0,1,3 +2,17,2,0,2,0 +2,23,1,13,0,0 +2,24,1,3,2,13 +3,0,0x57b13a00,3,0 +3,5,0x57b13b00,3,0 +3,7,0x57b13900,3,0 +3,17,0x57b13c00,3,0 +; +1,13,0,0,1 +2,1,2,0,13,0 +2,5,0,1,3,2 +2,6,13,2,2,0 +2,7,0,1,13,0 +2,9,2,0,2,0 +2,17,3,0,0,1 +2,18,2,1,3,11 +2,19,0,11,3,0 +3,0,0x57b13a80,3,1 +3,1,0x57b13b80,3,1 +3,7,0x57b13980,3,1 +3,9,0x57b13c80,3,1 +; +; Top section +; +1,13,1,3,2 +2,1,0,1,13,0 +2,2,0,1,3,1 +2,3,3,0,0,1 +2,5,3,0,0,1 +2,6,2,1,3,0 +2,7,0,2,2,11 +2,12,3,0,0,1 +2,18,3,0,0,1 +2,20,3,0,0,11 +2,21,0,11,3,0 +3,0,0x57b13400,0,0 +3,1,0x57b13300,0,0 +3,2,0x57b13100,0,0 +3,3,0x57b13200,0,0 +3,5,0x57b13500,0,0 +3,6,0x57b13700,0,0 +3,7,0x57b13600,0,0 +3,12,0x57b13000,0,0 +3,18,0x57b13800,0,0 +; +1,1,3,11,2 +2,1,0,0,1,3 +2,3,0,0,1,3 +2,4,1,3,0,3 +2,5,11,3,0,0 +2,7,2,2,0,13 +2,8,1,3,2,0 +2,14,0,0,1,3 +2,21,1,13,0,0 +2,22,0,0,1,13 +2,24,0,0,1,3 +3,0,0x57b13480,0,1 +3,1,0x57b13580,0,1 +3,3,0x57b13280,0,1 +3,4,0x57b13180,0,1 +3,5,0x57b13380,0,1 +3,7,0x57b13680,0,1 +3,8,0x57b13780,0,1 +3,14,0x57b13080,0,1 +3,24,0x57b13880,0,1 +; +1,2,13,1,3 +2,1,11,0,2,2 +2,3,0,0,1,13 +2,4,1,0,1,3 +2,5,1,3,0,0 +2,7,1,3,0,0 +2,8,0,2,1,3 +2,9,0,0,11,3 +2,16,1,3,0,0 +2,22,1,3,0,0 +2,24,11,3,0,0 +3,0,0x57b13400,1,0 +3,1,0x57b13600,1,0 +3,3,0x57b13300,1,0 +3,4,0x57b13100,1,0 +3,5,0x57b13200,1,0 +3,7,0x57b13500,1,0 +3,8,0x57b13700,1,0 +3,16,0x57b13000,1,0 +3,22,0x57b13800,1,0 +; +1,3,11,2,1 +2,1,0,1,3,0 +2,2,3,0,3,1 +2,3,3,0,0,11 +2,5,2,0,13,2 +2,6,3,2,0,1 +2,7,0,1,3,0 +2,10,0,1,3,0 +2,17,13,0,0,1 +2,18,0,1,13,0 +2,20,0,1,3,0 +3,0,0x57b13480,1,1 +3,1,0x57b13280,1,1 +3,2,0x57b13180,1,1 +3,3,0x57b13380,1,1 +3,5,0x57b13680,1,1 +3,6,0x57b13780,1,1 +3,7,0x57b13580,1,1 +3,10,0x57b13080,1,1 +3,20,0x57b13880,1,1 +; +1,3,2,13,1 +2,1,0,1,3,0 +2,2,3,0,2,1 +2,3,2,11,0,2 +2,5,13,0,0,1 +2,6,3,1,0,1 +2,7,0,1,3,0 +2,10,0,1,3,0 +2,12,0,11,3,0 +2,13,3,0,0,11 +2,20,0,1,3,0 +3,0,0x57b13400,2,0 +3,1,0x57b13500,2,0 +3,2,0x57b13700,2,0 +3,3,0x57b13600,2,0 +3,5,0x57b13300,2,0 +3,6,0x57b13100,2,0 +3,7,0x57b13200,2,0 +3,10,0x57b13800,2,0 +3,20,0x57b13000,2,0 +; +1,11,2,1,3 +2,1,0,0,11,3 +2,3,0,13,2,2 +2,4,2,0,1,3 +2,5,1,3,0,0 +2,7,1,3,0,0 +2,8,0,3,1,3 +2,13,0,0,1,13 +2,14,1,13,0,0 +2,16,1,3,0,0 +2,22,1,3,0,0 +3,0,0x57b13480,2,1 +3,1,0x57b13380,2,1 +3,3,0x57b13680,2,1 +3,4,0x57b13780,2,1 +3,5,0x57b13580,2,1 +3,7,0x57b13280,2,1 +3,8,0x57b13180,2,1 +3,16,0x57b13880,2,1 +3,22,0x57b13080,2,1 +; +1,1,3,2,13 +2,1,0,0,1,3 +2,3,0,0,1,3 +2,4,1,3,0,2 +2,5,2,2,11,0 +2,7,1,13,0,0 +2,8,1,3,1,0 +2,14,0,0,1,3 +2,16,0,0,11,3 +2,17,11,3,0,0 +2,24,0,0,1,3 +3,0,0x57b13400,3,0 +3,1,0x57b13200,3,0 +3,3,0x57b13500,3,0 +3,4,0x57b13700,3,0 +3,5,0x57b13600,3,0 +3,7,0x57b13300,3,0 +3,8,0x57b13100,3,0 +3,14,0x57b13800,3,0 +3,24,0x57b13000,3,0 +; +1,2,1,3,11 +2,1,13,2,2,0 +2,2,0,1,3,2 +2,3,3,0,0,1 +2,5,3,0,0,1 +2,6,3,1,3,0 +2,7,0,11,3,0 +2,9,0,1,13,0 +2,10,13,0,0,1 +2,12,3,0,0,1 +2,18,3,0,0,1 +3,0,0x57b13480,3,1 +3,1,0x57b13680,3,1 +3,2,0x57b13780,3,1 +3,3,0x57b13580,3,1 +3,5,0x57b13280,3,1 +3,6,0x57b13180,3,1 +3,7,0x57b13380,3,1 +3,12,0x57b13880,3,1 +3,18,0x57b13080,3,1 + ;---Type B1 (R3) Ramps (Diagonal) - Outside --- ; note: bottom section is first due to some interactions with other pieces ; diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt index 26dc98c1e..a0767a17e 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt @@ -44,6 +44,8 @@ 0x57B12A80,0,1,0x57000300,3,1=0x57B12A80,0,1,0x57020300,3,1 0x57B12A00,2,0,0x57000300,1,0=0x57B12A00,2,0,0x57020300,1,0 ;00 to 00 (E1 R3 d -> Orth) -;PLACEHOLDER +0x57B13C00,3,0,0x57000000,3,0=0x57B13C00,3,0,0x57020000,3,0 +0x57B13C80,1,1,0x57000000,1,0=0x57B13C80,1,1,0x57020000,1,0 ;00 to 10 (E1 R3 d -> Stub) -;PLACEHOLDER \ No newline at end of file +0x57B13C00,3,0,0x57000100,1,0=0x57B13C00,3,0,0x57020100,3,1 +0x57B13C80,1,1,0x57000100,1,0=0x57B13C80,1,1,0x57020100,1,0 \ No newline at end of file From a74b7d2973078e99f25d318fbc4216855c1dd808 Mon Sep 17 00:00:00 2001 From: h3ndofry Date: Tue, 29 Nov 2022 01:19:00 +1100 Subject: [PATCH 06/14] adds override for orth MIS outside B1 ramp --- .../07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt | 111 ++++++++++++++++-- 1 file changed, 98 insertions(+), 13 deletions(-) diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt index a0767a17e..ee12e416a 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt @@ -1,18 +1,26 @@ ;==Diagonal Tile and Adjacencies (R3 Ramps)== -;----------------------- -;----L0 MIS (0x5702)---- -;----------------------- -;----Base Network (RHW-2)---- +;--------------------------- +;----BASE RAMP OVERRIDES---- +;--------------------------- +; This section contains transitions from the +; base ramp pieces that allow the MIS override +; to persist through to either diagonal or +; orthogonal MIS network pieces. +; +; A1 - diagonal mainline, orthogonal exit +; B1 - orthogonal mainline, diagonal exit +; +;----A1/B1 R3 (RHW-2)---- ;02 to 02 (B1 R3 o -> Diag) 0x57B00A00,2,0,0x57000200,2,0=0x57B00A00,2,0,0x57020200,2,0 0x57B00A80,0,1,0x57000200,1,0=0x57B00A80,0,1,0x57020200,1,0 ;02 to 03 (B1 R3 o -> Stub) 0x57B00A80,0,1,0x57000300,3,1=0x57B00A80,0,1,0x57020300,3,1 0x57B00A00,2,0,0x57000300,1,0=0x57B00A00,2,0,0x57020300,1,0 -;00 to 00 (B1 R3 d -> Orth) +;00 to 00 (A1 R3 d -> Orth) 0x57B01A00,3,0,0x57000000,3,0=0x57B01A00,3,0,0x57020000,3,0 0x57B01A80,1,1,0x57000000,1,0=0x57B01A80,1,1,0x57020000,1,0 -;00 to 10 (B1 R3 d -> Stub) +;00 to 10 (A1 R3 d -> Stub) 0x57B01A00,3,0,0x57000100,1,0=0x57B01A00,3,0,0x57020100,3,1 0x57B01A80,1,1,0x57000100,1,0=0x57B01A80,1,1,0x57020100,1,0 ;; CURRENTLY DROPPED DUE TO COMPLICATIONS WITH RUL - THIS NEEDS @@ -29,23 +37,100 @@ ; 0x57B01A00,3,0,0x57906000,0,0=0x57B01A00,3,0,0x57926080,0,0 ; 0x57B01A80,1,1,0x57906000,2,1=0x57B01A80,1,1,0x57926080,2,1 ; -;----Base Network (RHW-3)---- -; B1 d -> E1 d override of bottom section +;----D1/E1 R3 (RHW-3)---- +; B1 o -> E1 o override of bottom section +; (this probably should be INRULed, but we will see how +; the overrides will behave :) ) 0x57B12600,3,0,0x57b00900,3,0=0x57B12600,3,0,0x57B12900,3,0 0x57B12680,1,1,0x57b00980,1,1=0x57B12680,1,1,0x57B12980,1,1 0x57B12500,3,0,0x57b00800,3,0=0x57B12500,3,0,0x57B12800,3,0 0x57B12580,1,1,0x57b00880,1,1=0x57B12580,1,1,0x57B12880,1,1 0x57B12800,3,0,0x57b00a00,3,0=0x57B12800,3,0,0x57B12a00,3,0 0x57B12880,1,1,0x57b00a80,1,1=0x57B12880,1,1,0x57B12a80,1,1 -;02 to 02 (E1 R3 o -> Diag) +;a0 -> Diag 02 0x57B12A00,2,0,0x57000200,2,0=0x57B12A00,2,0,0x57020200,2,0 0x57B12A80,0,1,0x57000200,1,0=0x57B12A80,0,1,0x57020200,1,0 -;02 to 03 (E1 R3 o -> Stub) +;a0 -> Diag Stub 0x57B12A80,0,1,0x57000300,3,1=0x57B12A80,0,1,0x57020300,3,1 0x57B12A00,2,0,0x57000300,1,0=0x57B12A00,2,0,0x57020300,1,0 -;00 to 00 (E1 R3 d -> Orth) +;3c -> Orth 0x57B13C00,3,0,0x57000000,3,0=0x57B13C00,3,0,0x57020000,3,0 0x57B13C80,1,1,0x57000000,1,0=0x57B13C80,1,1,0x57020000,1,0 -;00 to 10 (E1 R3 d -> Stub) +;3c -> Orth Stub 0x57B13C00,3,0,0x57000100,1,0=0x57B13C00,3,0,0x57020100,3,1 -0x57B13C80,1,1,0x57000100,1,0=0x57B13C80,1,1,0x57020100,1,0 \ No newline at end of file +0x57B13C80,1,1,0x57000100,1,0=0x57B13C80,1,1,0x57020100,1,0 +; +; ALL B1 RAMP PIECES WILL OVERRIDE FROM NORTH TO SOUTH. +;---------------------- +;----L0 MIS (0x57b2)--- +;---------------------- +; B1 RAMP +; Mainline +; Orth -> 00 +0x57020000,3,0,0x57b00000,3,0=0x57020000,3,0,0x57b20000,3,0 +0x57020000,1,0,0x57b00080,1,1=0x57020000,1,0,0x57b20080,1,1 +; 00 -> 02 +0x57b20000,3,0,0x57b00200,3,0=0x57b20000,3,0,0x57b20200,3,0 +0x57b20080,1,1,0x57b00280,1,1=0x57b20080,1,1,0x57b20280,1,1 +; 02 -> 04 +0x57b20200,3,0,0x57b00400,3,0=0x57b20200,3,0,0x57b20400,3,0 +0x57b20280,1,1,0x57b00480,1,1=0x57b20280,1,1,0x57b20480,1,1 +; 04 -> 07 +0x57b20400,3,0,0x57b00700,3,0=0x57b20400,3,0,0x57b20700,3,0 +0x57b20480,1,1,0x57b00780,1,1=0x57b20480,1,1,0x57b20780,1,1 +; 07 -> Orth (covers both 01/03 orientations of RHW-2) +0x57b20700,3,0,0x57000000,3,0=0x57b20700,3,0,0x57020000,3,0 +0x57b20780,1,1,0x57000000,3,0=0x57b20780,1,1,0x57020000,1,0 +0x57b20700,3,0,0x57000000,1,0=0x57b20700,3,0,0x57020000,3,0 +0x57b20780,1,1,0x57000000,1,0=0x57b20780,1,1,0x57020000,1,0 +; 07 -> Orth Stub +0x57B20700,3,0,0x57000100,1,0=0x57B20700,3,0,0x57020100,3,1 +0x57B20780,1,1,0x57000100,1,0=0x57B20780,1,1,0x57020100,1,0 +; Mainline -> Row 1 +; 02 -> 01 +0x57b20200,2,0,0x57b00100,2,0=0x57b20200,2,0,0x57b20100,2,0 +0x57b20280,0,1,0x57b00180,0,1=0x57b20280,0,1,0x57b20180,0,1 +; 04 -> 03 +0x57b20400,2,0,0x57b00300,2,0=0x57b20400,2,0,0x57b20300,2,0 +0x57b20480,0,1,0x57b00380,0,1=0x57b20480,0,1,0x57b20380,0,1 +; 07 -> 06 +0x57b20700,2,0,0x57b00600,2,0=0x57b20700,2,0,0x57b20600,2,0 +0x57b20780,0,1,0x57b00680,0,1=0x57b20780,0,1,0x57b20680,0,1 +; Row 1 +; 01 -> 03 +0x57b20100,3,0,0x57b00300,3,0=0x57b20100,3,0,0x57b20300,3,0 +0x57b20180,1,1,0x57b00380,1,1=0x57b20180,1,1,0x57b20380,1,1 +; 03 -> 06 +0x57b20300,3,0,0x57b00600,3,0=0x57b20300,3,0,0x57b20600,3,0 +0x57b20380,1,1,0x57b00680,1,1=0x57b20380,1,1,0x57b20680,1,1 +; 06 -> 09 +0x57b20600,3,0,0x57b00900,3,0=0x57b20600,3,0,0x57b20900,3,0 +0x57b20680,1,1,0x57b00980,1,1=0x57b20680,1,1,0x57b20980,1,1 +; Row 1 -> Row 2 +; 06 -> 05 +0x57b20600,2,0,0x57b00500,2,0=0x57b20600,2,0,0x57b20500,2,0 +0x57b20680,0,1,0x57b00580,0,1=0x57b20680,0,1,0x57b20580,0,1 +; 09 -> 08 +0x57b20900,2,0,0x57b00800,2,0=0x57b20900,2,0,0x57b20800,2,0 +0x57b20980,0,1,0x57b00880,0,1=0x57b20980,0,1,0x57b20880,0,1 +; Row 2 +; 05 -> 08 +0x57b20500,3,0,0x57b00800,3,0=0x57b20500,3,0,0x57b20800,3,0 +0x57b20580,1,1,0x57b00880,1,1=0x57b20580,1,1,0x57b20880,1,1 +; 08 -> 0a +0x57b20800,3,0,0x57b00a00,3,0=0x57b20800,3,0,0x57b20a00,3,0 +0x57b20880,1,1,0x57b00a80,1,1=0x57b20880,1,1,0x57b20a80,1,1 +; Row 2 -> Diagonal MIS +; 0a -> Diag +0x57B20A00,2,0,0x57000200,2,0=0x57B20A00,2,0,0x57020200,2,0 +0x57B20A80,0,1,0x57000200,1,0=0x57B20A80,0,1,0x57020200,1,0 +; 0a -> Stub +0x57B20A80,0,1,0x57000300,3,1=0x57B20A80,0,1,0x57020300,3,1 +0x57B20A00,2,0,0x57000300,1,0=0x57B20A00,2,0,0x57020300,1,0 + +; ; 1a -> Orth +; 0x57B21A00,3,0,0x57000000,3,0=0x57B21A00,3,0,0x57020000,3,0 +; 0x57B21A80,1,1,0x57000000,1,0=0x57B21A80,1,1,0x57020000,1,0 +; ; 1a -> Stub +; 0x57B21A00,3,0,0x57000100,1,0=0x57B21A00,3,0,0x57020100,3,1 +; 0x57B21A80,1,1,0x57000100,1,0=0x57B21A80,1,1,0x57020100,1,0 \ No newline at end of file From d6ac18bf0154f9b1079be8bc1e13517397d8c5e9 Mon Sep 17 00:00:00 2001 From: h3ndofry Date: Tue, 29 Nov 2022 10:43:56 +1100 Subject: [PATCH 07/14] adds stability for reverse direction --- .../07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt | 41 +++++++++++++++---- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt index ee12e416a..68b3fab33 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt @@ -47,10 +47,10 @@ 0x57B12580,1,1,0x57b00880,1,1=0x57B12580,1,1,0x57B12880,1,1 0x57B12800,3,0,0x57b00a00,3,0=0x57B12800,3,0,0x57B12a00,3,0 0x57B12880,1,1,0x57b00a80,1,1=0x57B12880,1,1,0x57B12a80,1,1 -;a0 -> Diag 02 +;2a -> Diag 02 0x57B12A00,2,0,0x57000200,2,0=0x57B12A00,2,0,0x57020200,2,0 0x57B12A80,0,1,0x57000200,1,0=0x57B12A80,0,1,0x57020200,1,0 -;a0 -> Diag Stub +;2a -> Diag Stub 0x57B12A80,0,1,0x57000300,3,1=0x57B12A80,0,1,0x57020300,3,1 0x57B12A00,2,0,0x57000300,1,0=0x57B12A00,2,0,0x57020300,1,0 ;3c -> Orth @@ -60,12 +60,13 @@ 0x57B13C00,3,0,0x57000100,1,0=0x57B13C00,3,0,0x57020100,3,1 0x57B13C80,1,1,0x57000100,1,0=0x57B13C80,1,1,0x57020100,1,0 ; -; ALL B1 RAMP PIECES WILL OVERRIDE FROM NORTH TO SOUTH. +; ALL B1 AND E1 RAMP PIECES OVERRIDE FROM NORTH TO SOUTH, WITH +; MAINLINE HAVING A SOUTH TO NORTH OVERRIDE FOR STABILITY. ;---------------------- ;----L0 MIS (0x57b2)--- ;---------------------- ; B1 RAMP -; Mainline +; Mainline North -> South ; Orth -> 00 0x57020000,3,0,0x57b00000,3,0=0x57020000,3,0,0x57b20000,3,0 0x57020000,1,0,0x57b00080,1,1=0x57020000,1,0,0x57b20080,1,1 @@ -86,7 +87,28 @@ ; 07 -> Orth Stub 0x57B20700,3,0,0x57000100,1,0=0x57B20700,3,0,0x57020100,3,1 0x57B20780,1,1,0x57000100,1,0=0x57B20780,1,1,0x57020100,1,0 -; Mainline -> Row 1 +; Mainline South -> North +; Orth -> 07 +0x57020000,1,0,0x57b00700,1,0=0x57020000,1,0,0x57b20700,1,0 +0x57020000,3,0,0x57b00780,3,1=0x57020000,3,0,0x57b20780,3,1 +; 07 -> 04 +0x57b20700,1,0,0x57b00400,1,0=0x57b20700,1,0,0x57b20400,1,0 +0x57b20780,3,1,0x57b00480,3,1=0x57b20780,3,1,0x57b20480,3,1 +; 04 -> 02 +0x57b20400,1,0,0x57b00200,1,0=0x57b20400,1,0,0x57b20200,1,0 +0x57b20480,3,1,0x57b00280,3,1=0x57b20480,3,1,0x57b20280,3,1 +; 02 -> 00 +0x57b20200,1,0,0x57b00000,1,0=0x57b20200,1,0,0x57b20000,1,0 +0x57b20280,3,1,0x57b00080,3,1=0x57b20280,3,1,0x57b20080,3,1 +; 00 -> Orth (covers both 01/03 orientations of RHW-2) +0x57b20000,1,0,0x57000000,3,0=0x57b20000,1,0,0x57020000,1,0 +0x57b20080,3,1,0x57000000,3,0=0x57b20080,3,1,0x57020000,3,0 +0x57b20000,1,0,0x57000000,1,0=0x57b20000,1,0,0x57020000,1,0 +0x57b20080,3,1,0x57000000,1,0=0x57b20080,3,1,0x57020000,3,0 +; 00 -> Orth Stub +0x57B20000,1,0,0x57000100,1,0=0x57B20000,1,0,0x57020100,1,0 +0x57B20080,3,1,0x57000100,1,0=0x57B20080,3,1,0x57020100,3,1 +; Mainline -> Col 1 ; 02 -> 01 0x57b20200,2,0,0x57b00100,2,0=0x57b20200,2,0,0x57b20100,2,0 0x57b20280,0,1,0x57b00180,0,1=0x57b20280,0,1,0x57b20180,0,1 @@ -96,7 +118,7 @@ ; 07 -> 06 0x57b20700,2,0,0x57b00600,2,0=0x57b20700,2,0,0x57b20600,2,0 0x57b20780,0,1,0x57b00680,0,1=0x57b20780,0,1,0x57b20680,0,1 -; Row 1 +; Col 1 ; 01 -> 03 0x57b20100,3,0,0x57b00300,3,0=0x57b20100,3,0,0x57b20300,3,0 0x57b20180,1,1,0x57b00380,1,1=0x57b20180,1,1,0x57b20380,1,1 @@ -106,21 +128,21 @@ ; 06 -> 09 0x57b20600,3,0,0x57b00900,3,0=0x57b20600,3,0,0x57b20900,3,0 0x57b20680,1,1,0x57b00980,1,1=0x57b20680,1,1,0x57b20980,1,1 -; Row 1 -> Row 2 +; Col 1 -> Col 2 ; 06 -> 05 0x57b20600,2,0,0x57b00500,2,0=0x57b20600,2,0,0x57b20500,2,0 0x57b20680,0,1,0x57b00580,0,1=0x57b20680,0,1,0x57b20580,0,1 ; 09 -> 08 0x57b20900,2,0,0x57b00800,2,0=0x57b20900,2,0,0x57b20800,2,0 0x57b20980,0,1,0x57b00880,0,1=0x57b20980,0,1,0x57b20880,0,1 -; Row 2 +; Col 2 ; 05 -> 08 0x57b20500,3,0,0x57b00800,3,0=0x57b20500,3,0,0x57b20800,3,0 0x57b20580,1,1,0x57b00880,1,1=0x57b20580,1,1,0x57b20880,1,1 ; 08 -> 0a 0x57b20800,3,0,0x57b00a00,3,0=0x57b20800,3,0,0x57b20a00,3,0 0x57b20880,1,1,0x57b00a80,1,1=0x57b20880,1,1,0x57b20a80,1,1 -; Row 2 -> Diagonal MIS +; Col 2 -> Diagonal MIS ; 0a -> Diag 0x57B20A00,2,0,0x57000200,2,0=0x57B20A00,2,0,0x57020200,2,0 0x57B20A80,0,1,0x57000200,1,0=0x57B20A80,0,1,0x57020200,1,0 @@ -128,6 +150,7 @@ 0x57B20A80,0,1,0x57000300,3,1=0x57B20A80,0,1,0x57020300,3,1 0x57B20A00,2,0,0x57000300,1,0=0x57B20A00,2,0,0x57020300,1,0 +; this one's for the diagonal when we get around to it ; ; 1a -> Orth ; 0x57B21A00,3,0,0x57000000,3,0=0x57B21A00,3,0,0x57020000,3,0 ; 0x57B21A80,1,1,0x57000000,1,0=0x57B21A80,1,1,0x57020000,1,0 From 101fd83caa236ce21ee910556fd50aa990691676 Mon Sep 17 00:00:00 2001 From: h3ndofry Date: Tue, 29 Nov 2022 16:40:34 +1100 Subject: [PATCH 08/14] switches E1 ramp to pure INRUL --- .../DirtroadAdvanced/RUL14_RHW_Advanced.rul | 116 +++++++++++++++++- .../07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt | 22 ++-- 2 files changed, 123 insertions(+), 15 deletions(-) diff --git a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul index 7a1a1ded7..e7f2eee66 100644 --- a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul +++ b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul @@ -10558,7 +10558,7 @@ ;-----End Draggable Orthogonal Type D1 Wide Ramps----- ;-----Begin Draggable R3 Type E1 Ramps----- -; note: Top section only overrides here, look below this for bottom section overrides +; Top section ; 1,2,2,0,2 2,1,0,0,2,2 @@ -10695,6 +10695,104 @@ 3,9,0x57b12780,3,1 3,23,0x57b12580,3,1 3,24,0x57b12680,3,1 +; +; Bottom section +; +1,1,13,0,0 +2,1,0,3,1,3 +2,2,0,0,11,3 +2,3,11,2,0,13 +2,4,0,2,0,2 +2,8,1,3,0,0 +2,13,0,2,2,2 +2,14,2,2,0,2 +3,0,0x57b12900,0,0 +3,1,0x57b12800,0,0 +3,8,0x57b12a00,0,0 +; +1,0,1,13,0 +2,2,0,1,3,0 +2,3,3,0,3,1 +2,4,3,0,0,11 +2,5,13,11,2,0 +2,6,2,0,2,0 +2,17,2,0,2,2 +2,18,2,2,2,0 +3,0,0x57b12900,1,0 +3,2,0x57b12a00,1,0 +3,3,0x57b12800,1,0 +; +1,0,0,1,13 +2,4,0,0,1,3 +2,5,1,3,0,3 +2,6,11,3,0,0 +2,7,0,13,11,2 +2,8,0,2,0,2 +2,21,2,2,0,2 +2,22,0,2,2,2 +3,0,0x57b12900,2,0 +3,4,0x57b12a00,2,0 +3,5,0x57b12800,2,0 +; +1,13,0,0,1 +2,1,2,0,13,11 +2,2,2,0,2,0 +2,6,3,0,0,1 +2,7,3,1,3,0 +2,8,0,11,3,0 +2,9,2,2,2,0 +2,10,2,0,2,2 +3,0,0x57b12900,3,0 +3,6,0x57b12a00,3,0 +3,7,0x57b12800,3,0 +; +1,0,11,3,0 +2,2,0,2,0,2 +2,3,0,2,13,11 +2,4,13,0,0,1 +2,5,3,1,0,1 +2,6,0,1,3,0 +2,12,0,2,2,2 +2,13,2,2,0,2 +3,0,0x57b12980,0,1 +3,5,0x57b12880,0,1 +3,6,0x57b12a80,0,1 +; +1,11,3,0,0 +2,1,2,13,11,0 +2,2,0,0,1,13 +2,3,1,0,1,3 +2,4,1,3,0,0 +2,8,2,0,2,0 +2,9,2,0,2,2 +2,24,2,2,2,0 +3,0,0x57b12980,1,1 +3,3,0x57b12880,1,1 +3,4,0x57b12a80,1,1 +; +1,3,0,0,11 +2,1,0,1,3,1 +2,2,3,0,0,1 +2,6,0,2,0,2 +2,7,13,11,0,2 +2,8,0,1,13,0 +2,20,2,2,0,2 +2,21,0,2,2,2 +3,0,0x57b12980,2,1 +3,1,0x57b12880,2,1 +3,2,0x57b12a80,2,1 +; +1,0,0,11,3 +2,4,2,0,2,0 +2,5,11,0,2,13 +2,6,1,13,0,0 +2,7,1,3,1,0 +2,8,0,0,1,3 +2,16,2,0,2,2 +2,17,2,2,2,0 +3,0,0x57b12980,3,1 +3,7,0x57b12880,3,1 +3,8,0x57b12a80,3,1 ;-----End Draggable R3 Type E1 Ramps----- ;-----Begin Draggable R3 Type B1 Ramps----- @@ -10951,6 +11049,8 @@ 2,3,11,2,0,13 2,4,0,2,0,2 2,8,1,3,0,0 +2,13,0,2,0,2 +2,14,0,2,0,2 3,0,0x57b00900,0,0 3,1,0x57b00800,0,0 3,8,0x57b00a00,0,0 @@ -10961,6 +11061,8 @@ 2,4,3,0,0,11 2,5,13,11,2,0 2,6,2,0,2,0 +2,17,2,0,2,0 +2,18,2,0,2,0 3,0,0x57b00900,1,0 3,2,0x57b00a00,1,0 3,3,0x57b00800,1,0 @@ -10971,6 +11073,8 @@ 2,6,11,3,0,0 2,7,0,13,11,2 2,8,0,2,0,2 +2,21,0,2,0,2 +2,22,0,2,0,2 3,0,0x57b00900,2,0 3,4,0x57b00a00,2,0 3,5,0x57b00800,2,0 @@ -10981,6 +11085,8 @@ 2,6,3,0,0,1 2,7,3,1,3,0 2,8,0,11,3,0 +2,9,2,0,2,0 +2,10,2,0,2,0 3,0,0x57b00900,3,0 3,6,0x57b00a00,3,0 3,7,0x57b00800,3,0 @@ -10991,6 +11097,8 @@ 2,4,13,0,0,1 2,5,3,1,0,1 2,6,0,1,3,0 +2,12,0,2,0,2 +2,13,0,2,0,2 3,0,0x57b00980,0,1 3,5,0x57b00880,0,1 3,6,0x57b00a80,0,1 @@ -11001,6 +11109,8 @@ 2,3,1,0,1,3 2,4,1,3,0,0 2,8,2,0,2,0 +2,9,2,0,2,0 +2,24,2,0,2,0 3,0,0x57b00980,1,1 3,3,0x57b00880,1,1 3,4,0x57b00a80,1,1 @@ -11011,6 +11121,8 @@ 2,6,0,2,0,2 2,7,13,11,0,2 2,8,0,1,13,0 +2,20,0,2,0,2 +2,21,0,2,0,2 3,0,0x57b00980,2,1 3,1,0x57b00880,2,1 3,2,0x57b00a80,2,1 @@ -11021,6 +11133,8 @@ 2,6,1,13,0,0 2,7,1,3,1,0 2,8,0,0,1,3 +2,16,2,0,2,0 +2,17,2,0,2,0 3,0,0x57b00980,3,1 3,7,0x57b00880,3,1 3,8,0x57b00a80,3,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt index 68b3fab33..127b920c6 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt @@ -11,16 +11,16 @@ ; B1 - orthogonal mainline, diagonal exit ; ;----A1/B1 R3 (RHW-2)---- -;02 to 02 (B1 R3 o -> Diag) +;0a -> Diag 02 0x57B00A00,2,0,0x57000200,2,0=0x57B00A00,2,0,0x57020200,2,0 0x57B00A80,0,1,0x57000200,1,0=0x57B00A80,0,1,0x57020200,1,0 -;02 to 03 (B1 R3 o -> Stub) +;0a -> Stub 03 0x57B00A80,0,1,0x57000300,3,1=0x57B00A80,0,1,0x57020300,3,1 0x57B00A00,2,0,0x57000300,1,0=0x57B00A00,2,0,0x57020300,1,0 -;00 to 00 (A1 R3 d -> Orth) +;1a -> Orth 00 0x57B01A00,3,0,0x57000000,3,0=0x57B01A00,3,0,0x57020000,3,0 0x57B01A80,1,1,0x57000000,1,0=0x57B01A80,1,1,0x57020000,1,0 -;00 to 10 (A1 R3 d -> Stub) +;1a -> Stub 10 0x57B01A00,3,0,0x57000100,1,0=0x57B01A00,3,0,0x57020100,3,1 0x57B01A80,1,1,0x57000100,1,0=0x57B01A80,1,1,0x57020100,1,0 ;; CURRENTLY DROPPED DUE TO COMPLICATIONS WITH RUL - THIS NEEDS @@ -38,15 +38,6 @@ ; 0x57B01A80,1,1,0x57906000,2,1=0x57B01A80,1,1,0x57926080,2,1 ; ;----D1/E1 R3 (RHW-3)---- -; B1 o -> E1 o override of bottom section -; (this probably should be INRULed, but we will see how -; the overrides will behave :) ) -0x57B12600,3,0,0x57b00900,3,0=0x57B12600,3,0,0x57B12900,3,0 -0x57B12680,1,1,0x57b00980,1,1=0x57B12680,1,1,0x57B12980,1,1 -0x57B12500,3,0,0x57b00800,3,0=0x57B12500,3,0,0x57B12800,3,0 -0x57B12580,1,1,0x57b00880,1,1=0x57B12580,1,1,0x57B12880,1,1 -0x57B12800,3,0,0x57b00a00,3,0=0x57B12800,3,0,0x57B12a00,3,0 -0x57B12880,1,1,0x57b00a80,1,1=0x57B12880,1,1,0x57B12a80,1,1 ;2a -> Diag 02 0x57B12A00,2,0,0x57000200,2,0=0x57B12A00,2,0,0x57020200,2,0 0x57B12A80,0,1,0x57000200,1,0=0x57B12A80,0,1,0x57020200,1,0 @@ -65,7 +56,7 @@ ;---------------------- ;----L0 MIS (0x57b2)--- ;---------------------- -; B1 RAMP +; ORTHOGONAL B1 RAMP ; Mainline North -> South ; Orth -> 00 0x57020000,3,0,0x57b00000,3,0=0x57020000,3,0,0x57b20000,3,0 @@ -149,6 +140,9 @@ ; 0a -> Stub 0x57B20A80,0,1,0x57000300,3,1=0x57B20A80,0,1,0x57020300,3,1 0x57B20A00,2,0,0x57000300,1,0=0x57B20A00,2,0,0x57020300,1,0 +; +; DIAGONAL A1 RAMP +; Mainline North -> East ; this one's for the diagonal when we get around to it ; ; 1a -> Orth From 2a8258ccf7b9a1d5ae335477fa5bcb7a824363cb Mon Sep 17 00:00:00 2001 From: h3ndofry Date: Tue, 29 Nov 2022 21:45:18 +1100 Subject: [PATCH 09/14] moves RHW-3 E1/D1 ramps to 57b14 and 57b15 respectively --- .../DirtroadAdvanced/RUL14_RHW_Advanced.rul | 384 +++++++++--------- .../07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt | 16 +- 2 files changed, 200 insertions(+), 200 deletions(-) diff --git a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul index e7f2eee66..1d8363bf7 100644 --- a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul +++ b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul @@ -10568,14 +10568,14 @@ 2,21,0,2,0,2 2,22,11,2,0,13 2,23,0,0,11,3 -3,0,0x57b12200,0,0 -3,1,0x57b12100,0,0 -3,3,0x57b12000,0,0 -3,7,0x57b12400,0,0 -3,8,0x57b12300,0,0 -3,21,0x57b12700,0,0 -3,22,0x57b12600,0,0 -3,23,0x57b12500,0,0 +3,0,0x57b14200,0,0 +3,1,0x57b14100,0,0 +3,3,0x57b14000,0,0 +3,7,0x57b14400,0,0 +3,8,0x57b14300,0,0 +3,21,0x57b14700,0,0 +3,22,0x57b14600,0,0 +3,23,0x57b14500,0,0 ; 1,0,2,2,2 2,3,0,2,0,2 @@ -10585,14 +10585,14 @@ 2,19,13,0,0,1 2,20,0,2,13,11 2,21,0,2,0,2 -3,0,0x57b12280,0,1 -3,3,0x57b12080,0,1 -3,5,0x57b12180,0,1 -3,6,0x57b12380,0,1 -3,7,0x57b12480,0,1 -3,19,0x57b12580,0,1 -3,20,0x57b12680,0,1 -3,21,0x57b12780,0,1 +3,0,0x57b14280,0,1 +3,3,0x57b14080,0,1 +3,5,0x57b14180,0,1 +3,6,0x57b14380,0,1 +3,7,0x57b14480,0,1 +3,19,0x57b14580,0,1 +3,20,0x57b14680,0,1 +3,21,0x57b14780,0,1 ; 1,2,2,2,0 2,1,2,2,2,0 @@ -10602,14 +10602,14 @@ 2,9,2,0,2,0 2,10,13,11,2,0 2,11,3,0,0,11 -3,0,0x57b12200,1,0 -3,1,0x57b12400,1,0 -3,2,0x57b12300,1,0 -3,3,0x57b12100,1,0 -3,5,0x57b12000,1,0 -3,9,0x57b12700,1,0 -3,10,0x57b12600,1,0 -3,11,0x57b12500,1,0 +3,0,0x57b14200,1,0 +3,1,0x57b14400,1,0 +3,2,0x57b14300,1,0 +3,3,0x57b14100,1,0 +3,5,0x57b14000,1,0 +3,9,0x57b14700,1,0 +3,10,0x57b14600,1,0 +3,11,0x57b14500,1,0 ; 1,2,2,2,0 2,1,2,0,2,0 @@ -10619,14 +10619,14 @@ 2,15,0,0,1,13 2,16,2,13,11,0 2,17,2,0,2,0 -3,0,0x57b12280,1,1 -3,1,0x57b12080,1,1 -3,3,0x57b12180,1,1 -3,4,0x57b12380,1,1 -3,5,0x57b12480,1,1 -3,15,0x57b12580,1,1 -3,16,0x57b12680,1,1 -3,17,0x57b12780,1,1 +3,0,0x57b14280,1,1 +3,1,0x57b14080,1,1 +3,3,0x57b14180,1,1 +3,4,0x57b14380,1,1 +3,5,0x57b14480,1,1 +3,15,0x57b14580,1,1 +3,16,0x57b14680,1,1 +3,17,0x57b14780,1,1 ; 1,0,2,2,2 2,3,0,2,2,2 @@ -10636,14 +10636,14 @@ 2,13,0,2,0,2 2,14,0,13,11,2 2,15,11,3,0,0 -3,0,0x57b12200,2,0 -3,3,0x57b12400,2,0 -3,4,0x57b12300,2,0 -3,5,0x57b12100,2,0 -3,7,0x57b12000,2,0 -3,13,0x57b12700,2,0 -3,14,0x57b12600,2,0 -3,15,0x57b12500,2,0 +3,0,0x57b14200,2,0 +3,3,0x57b14400,2,0 +3,4,0x57b14300,2,0 +3,5,0x57b14100,2,0 +3,7,0x57b14000,2,0 +3,13,0x57b14700,2,0 +3,14,0x57b14600,2,0 +3,15,0x57b14500,2,0 ; 1,2,2,0,2 2,1,0,2,2,0 @@ -10653,14 +10653,14 @@ 2,11,0,1,13,0 2,12,13,11,0,2 2,13,0,2,0,2 -3,0,0x57b12280,2,1 -3,1,0x57b12180,2,1 -3,2,0x57b12380,2,1 -3,3,0x57b12480,2,1 -3,7,0x57b12080,2,1 -3,11,0x57b12580,2,1 -3,12,0x57b12680,2,1 -3,13,0x57b12780,2,1 +3,0,0x57b14280,2,1 +3,1,0x57b14180,2,1 +3,2,0x57b14380,2,1 +3,3,0x57b14480,2,1 +3,7,0x57b14080,2,1 +3,11,0x57b14580,2,1 +3,12,0x57b14680,2,1 +3,13,0x57b14780,2,1 ; 1,2,0,2,2 2,1,2,0,2,0 @@ -10670,14 +10670,14 @@ 2,17,2,0,2,0 2,18,2,0,13,11 2,19,0,11,3,0 -3,0,0x57b12200,3,0 -3,1,0x57b12000,3,0 -3,5,0x57b12400,3,0 -3,6,0x57b12300,3,0 -3,7,0x57b12100,3,0 -3,17,0x57b12700,3,0 -3,18,0x57b12600,3,0 -3,19,0x57b12500,3,0 +3,0,0x57b14200,3,0 +3,1,0x57b14000,3,0 +3,5,0x57b14400,3,0 +3,6,0x57b14300,3,0 +3,7,0x57b14100,3,0 +3,17,0x57b14700,3,0 +3,18,0x57b14600,3,0 +3,19,0x57b14500,3,0 ; 1,2,0,2,2 2,1,2,0,2,2 @@ -10687,14 +10687,14 @@ 2,9,2,0,2,0 2,23,1,13,0,0 2,24,11,0,2,13 -3,0,0x57b12280,3,1 -3,1,0x57b12480,3,1 -3,5,0x57b12080,3,1 -3,7,0x57b12180,3,1 -3,8,0x57b12380,3,1 -3,9,0x57b12780,3,1 -3,23,0x57b12580,3,1 -3,24,0x57b12680,3,1 +3,0,0x57b14280,3,1 +3,1,0x57b14480,3,1 +3,5,0x57b14080,3,1 +3,7,0x57b14180,3,1 +3,8,0x57b14380,3,1 +3,9,0x57b14780,3,1 +3,23,0x57b14580,3,1 +3,24,0x57b14680,3,1 ; ; Bottom section ; @@ -10706,9 +10706,9 @@ 2,8,1,3,0,0 2,13,0,2,2,2 2,14,2,2,0,2 -3,0,0x57b12900,0,0 -3,1,0x57b12800,0,0 -3,8,0x57b12a00,0,0 +3,0,0x57b14900,0,0 +3,1,0x57b14800,0,0 +3,8,0x57b14a00,0,0 ; 1,0,1,13,0 2,2,0,1,3,0 @@ -10718,9 +10718,9 @@ 2,6,2,0,2,0 2,17,2,0,2,2 2,18,2,2,2,0 -3,0,0x57b12900,1,0 -3,2,0x57b12a00,1,0 -3,3,0x57b12800,1,0 +3,0,0x57b14900,1,0 +3,2,0x57b14a00,1,0 +3,3,0x57b14800,1,0 ; 1,0,0,1,13 2,4,0,0,1,3 @@ -10730,9 +10730,9 @@ 2,8,0,2,0,2 2,21,2,2,0,2 2,22,0,2,2,2 -3,0,0x57b12900,2,0 -3,4,0x57b12a00,2,0 -3,5,0x57b12800,2,0 +3,0,0x57b14900,2,0 +3,4,0x57b14a00,2,0 +3,5,0x57b14800,2,0 ; 1,13,0,0,1 2,1,2,0,13,11 @@ -10742,9 +10742,9 @@ 2,8,0,11,3,0 2,9,2,2,2,0 2,10,2,0,2,2 -3,0,0x57b12900,3,0 -3,6,0x57b12a00,3,0 -3,7,0x57b12800,3,0 +3,0,0x57b14900,3,0 +3,6,0x57b14a00,3,0 +3,7,0x57b14800,3,0 ; 1,0,11,3,0 2,2,0,2,0,2 @@ -10754,9 +10754,9 @@ 2,6,0,1,3,0 2,12,0,2,2,2 2,13,2,2,0,2 -3,0,0x57b12980,0,1 -3,5,0x57b12880,0,1 -3,6,0x57b12a80,0,1 +3,0,0x57b14980,0,1 +3,5,0x57b14880,0,1 +3,6,0x57b14a80,0,1 ; 1,11,3,0,0 2,1,2,13,11,0 @@ -10766,9 +10766,9 @@ 2,8,2,0,2,0 2,9,2,0,2,2 2,24,2,2,2,0 -3,0,0x57b12980,1,1 -3,3,0x57b12880,1,1 -3,4,0x57b12a80,1,1 +3,0,0x57b14980,1,1 +3,3,0x57b14880,1,1 +3,4,0x57b14a80,1,1 ; 1,3,0,0,11 2,1,0,1,3,1 @@ -10778,9 +10778,9 @@ 2,8,0,1,13,0 2,20,2,2,0,2 2,21,0,2,2,2 -3,0,0x57b12980,2,1 -3,1,0x57b12880,2,1 -3,2,0x57b12a80,2,1 +3,0,0x57b14980,2,1 +3,1,0x57b14880,2,1 +3,2,0x57b14a80,2,1 ; 1,0,0,11,3 2,4,2,0,2,0 @@ -10790,9 +10790,9 @@ 2,8,0,0,1,3 2,16,2,0,2,2 2,17,2,2,2,0 -3,0,0x57b12980,3,1 -3,7,0x57b12880,3,1 -3,8,0x57b12a80,3,1 +3,0,0x57b14980,3,1 +3,7,0x57b14880,3,1 +3,8,0x57b14a80,3,1 ;-----End Draggable R3 Type E1 Ramps----- ;-----Begin Draggable R3 Type B1 Ramps----- @@ -11151,10 +11151,10 @@ 2,12,13,1,3,2 2,13,3,0,0,1 2,21,0,2,0,2 -3,0,0x57b13a00,0,0 -3,1,0x57b13900,0,0 -3,7,0x57b13b00,0,0 -3,21,0x57b13c00,0,0 +3,0,0x57b15a00,0,0 +3,1,0x57b15900,0,0 +3,7,0x57b15b00,0,0 +3,21,0x57b15c00,0,0 ; 1,0,0,1,13 2,3,1,3,2,0 @@ -11165,10 +11165,10 @@ 2,14,1,3,11,2 2,15,11,3,0,0 2,21,0,2,0,2 -3,0,0x57b13a80,0,1 -3,5,0x57b13980,0,1 -3,7,0x57b13b80,0,1 -3,21,0x57b13c80,0,1 +3,0,0x57b15a80,0,1 +3,5,0x57b15980,0,1 +3,7,0x57b15b80,0,1 +3,21,0x57b15c80,0,1 ; 1,11,3,0,0 2,1,2,0,11,0 @@ -11179,10 +11179,10 @@ 2,15,0,0,1,13 2,16,2,13,1,3 2,17,1,3,0,0 -3,0,0x57b13a00,1,0 -3,1,0x57b13b00,1,0 -3,3,0x57b13900,1,0 -3,9,0x57b13c00,1,0 +3,0,0x57b15a00,1,0 +3,1,0x57b15b00,1,0 +3,3,0x57b15900,1,0 +3,9,0x57b15c00,1,0 ; 1,0,1,13,0 2,1,3,2,0,1 @@ -11193,10 +11193,10 @@ 2,10,3,11,2,1 2,11,3,0,0,11 2,17,2,0,2,0 -3,0,0x57b13a80,1,1 -3,3,0x57b13980,1,1 -3,5,0x57b13b80,1,1 -3,17,0x57b13c80,1,1 +3,0,0x57b15a80,1,1 +3,3,0x57b15980,1,1 +3,5,0x57b15b80,1,1 +3,17,0x57b15c80,1,1 ; 1,0,11,3,0 2,3,0,2,0,11 @@ -11207,10 +11207,10 @@ 2,19,13,0,0,1 2,20,3,2,13,1 2,21,0,1,3,0 -3,0,0x57b13a00,2,0 -3,3,0x57b13b00,2,0 -3,5,0x57b13900,2,0 -3,13,0x57b13c00,2,0 +3,0,0x57b15a00,2,0 +3,3,0x57b15b00,2,0 +3,5,0x57b15900,2,0 +3,13,0x57b15c00,2,0 ; 1,1,13,0,0 2,1,0,0,1,13 @@ -11221,10 +11221,10 @@ 2,21,1,3,0,0 2,22,11,2,1,3 2,23,0,0,11,3 -3,0,0x57b13a80,2,1 -3,1,0x57b13980,2,1 -3,3,0x57b13b80,2,1 -3,13,0x57b13c80,2,1 +3,0,0x57b15a80,2,1 +3,1,0x57b15980,2,1 +3,3,0x57b15b80,2,1 +3,13,0x57b15c80,2,1 ; 1,0,0,11,3 2,1,1,3,0,2 @@ -11235,10 +11235,10 @@ 2,17,2,0,2,0 2,23,1,13,0,0 2,24,1,3,2,13 -3,0,0x57b13a00,3,0 -3,5,0x57b13b00,3,0 -3,7,0x57b13900,3,0 -3,17,0x57b13c00,3,0 +3,0,0x57b15a00,3,0 +3,5,0x57b15b00,3,0 +3,7,0x57b15900,3,0 +3,17,0x57b15c00,3,0 ; 1,13,0,0,1 2,1,2,0,13,0 @@ -11249,10 +11249,10 @@ 2,17,3,0,0,1 2,18,2,1,3,11 2,19,0,11,3,0 -3,0,0x57b13a80,3,1 -3,1,0x57b13b80,3,1 -3,7,0x57b13980,3,1 -3,9,0x57b13c80,3,1 +3,0,0x57b15a80,3,1 +3,1,0x57b15b80,3,1 +3,7,0x57b15980,3,1 +3,9,0x57b15c80,3,1 ; ; Top section ; @@ -11267,15 +11267,15 @@ 2,18,3,0,0,1 2,20,3,0,0,11 2,21,0,11,3,0 -3,0,0x57b13400,0,0 -3,1,0x57b13300,0,0 -3,2,0x57b13100,0,0 -3,3,0x57b13200,0,0 -3,5,0x57b13500,0,0 -3,6,0x57b13700,0,0 -3,7,0x57b13600,0,0 -3,12,0x57b13000,0,0 -3,18,0x57b13800,0,0 +3,0,0x57b15400,0,0 +3,1,0x57b15300,0,0 +3,2,0x57b15100,0,0 +3,3,0x57b15200,0,0 +3,5,0x57b15500,0,0 +3,6,0x57b15700,0,0 +3,7,0x57b15600,0,0 +3,12,0x57b15000,0,0 +3,18,0x57b15800,0,0 ; 1,1,3,11,2 2,1,0,0,1,3 @@ -11288,15 +11288,15 @@ 2,21,1,13,0,0 2,22,0,0,1,13 2,24,0,0,1,3 -3,0,0x57b13480,0,1 -3,1,0x57b13580,0,1 -3,3,0x57b13280,0,1 -3,4,0x57b13180,0,1 -3,5,0x57b13380,0,1 -3,7,0x57b13680,0,1 -3,8,0x57b13780,0,1 -3,14,0x57b13080,0,1 -3,24,0x57b13880,0,1 +3,0,0x57b15480,0,1 +3,1,0x57b15580,0,1 +3,3,0x57b15280,0,1 +3,4,0x57b15180,0,1 +3,5,0x57b15380,0,1 +3,7,0x57b15680,0,1 +3,8,0x57b15780,0,1 +3,14,0x57b15080,0,1 +3,24,0x57b15880,0,1 ; 1,2,13,1,3 2,1,11,0,2,2 @@ -11309,15 +11309,15 @@ 2,16,1,3,0,0 2,22,1,3,0,0 2,24,11,3,0,0 -3,0,0x57b13400,1,0 -3,1,0x57b13600,1,0 -3,3,0x57b13300,1,0 -3,4,0x57b13100,1,0 -3,5,0x57b13200,1,0 -3,7,0x57b13500,1,0 -3,8,0x57b13700,1,0 -3,16,0x57b13000,1,0 -3,22,0x57b13800,1,0 +3,0,0x57b15400,1,0 +3,1,0x57b15600,1,0 +3,3,0x57b15300,1,0 +3,4,0x57b15100,1,0 +3,5,0x57b15200,1,0 +3,7,0x57b15500,1,0 +3,8,0x57b15700,1,0 +3,16,0x57b15000,1,0 +3,22,0x57b15800,1,0 ; 1,3,11,2,1 2,1,0,1,3,0 @@ -11330,15 +11330,15 @@ 2,17,13,0,0,1 2,18,0,1,13,0 2,20,0,1,3,0 -3,0,0x57b13480,1,1 -3,1,0x57b13280,1,1 -3,2,0x57b13180,1,1 -3,3,0x57b13380,1,1 -3,5,0x57b13680,1,1 -3,6,0x57b13780,1,1 -3,7,0x57b13580,1,1 -3,10,0x57b13080,1,1 -3,20,0x57b13880,1,1 +3,0,0x57b15480,1,1 +3,1,0x57b15280,1,1 +3,2,0x57b15180,1,1 +3,3,0x57b15380,1,1 +3,5,0x57b15680,1,1 +3,6,0x57b15780,1,1 +3,7,0x57b15580,1,1 +3,10,0x57b15080,1,1 +3,20,0x57b15880,1,1 ; 1,3,2,13,1 2,1,0,1,3,0 @@ -11351,15 +11351,15 @@ 2,12,0,11,3,0 2,13,3,0,0,11 2,20,0,1,3,0 -3,0,0x57b13400,2,0 -3,1,0x57b13500,2,0 -3,2,0x57b13700,2,0 -3,3,0x57b13600,2,0 -3,5,0x57b13300,2,0 -3,6,0x57b13100,2,0 -3,7,0x57b13200,2,0 -3,10,0x57b13800,2,0 -3,20,0x57b13000,2,0 +3,0,0x57b15400,2,0 +3,1,0x57b15500,2,0 +3,2,0x57b15700,2,0 +3,3,0x57b15600,2,0 +3,5,0x57b15300,2,0 +3,6,0x57b15100,2,0 +3,7,0x57b15200,2,0 +3,10,0x57b15800,2,0 +3,20,0x57b15000,2,0 ; 1,11,2,1,3 2,1,0,0,11,3 @@ -11372,15 +11372,15 @@ 2,14,1,13,0,0 2,16,1,3,0,0 2,22,1,3,0,0 -3,0,0x57b13480,2,1 -3,1,0x57b13380,2,1 -3,3,0x57b13680,2,1 -3,4,0x57b13780,2,1 -3,5,0x57b13580,2,1 -3,7,0x57b13280,2,1 -3,8,0x57b13180,2,1 -3,16,0x57b13880,2,1 -3,22,0x57b13080,2,1 +3,0,0x57b15480,2,1 +3,1,0x57b15380,2,1 +3,3,0x57b15680,2,1 +3,4,0x57b15780,2,1 +3,5,0x57b15580,2,1 +3,7,0x57b15280,2,1 +3,8,0x57b15180,2,1 +3,16,0x57b15880,2,1 +3,22,0x57b15080,2,1 ; 1,1,3,2,13 2,1,0,0,1,3 @@ -11393,15 +11393,15 @@ 2,16,0,0,11,3 2,17,11,3,0,0 2,24,0,0,1,3 -3,0,0x57b13400,3,0 -3,1,0x57b13200,3,0 -3,3,0x57b13500,3,0 -3,4,0x57b13700,3,0 -3,5,0x57b13600,3,0 -3,7,0x57b13300,3,0 -3,8,0x57b13100,3,0 -3,14,0x57b13800,3,0 -3,24,0x57b13000,3,0 +3,0,0x57b15400,3,0 +3,1,0x57b15200,3,0 +3,3,0x57b15500,3,0 +3,4,0x57b15700,3,0 +3,5,0x57b15600,3,0 +3,7,0x57b15300,3,0 +3,8,0x57b15100,3,0 +3,14,0x57b15800,3,0 +3,24,0x57b15000,3,0 ; 1,2,1,3,11 2,1,13,2,2,0 @@ -11414,15 +11414,15 @@ 2,10,13,0,0,1 2,12,3,0,0,1 2,18,3,0,0,1 -3,0,0x57b13480,3,1 -3,1,0x57b13680,3,1 -3,2,0x57b13780,3,1 -3,3,0x57b13580,3,1 -3,5,0x57b13280,3,1 -3,6,0x57b13180,3,1 -3,7,0x57b13380,3,1 -3,12,0x57b13880,3,1 -3,18,0x57b13080,3,1 +3,0,0x57b15480,3,1 +3,1,0x57b15680,3,1 +3,2,0x57b15780,3,1 +3,3,0x57b15580,3,1 +3,5,0x57b15280,3,1 +3,6,0x57b15180,3,1 +3,7,0x57b15380,3,1 +3,12,0x57b15880,3,1 +3,18,0x57b15080,3,1 ;---Type B1 (R3) Ramps (Diagonal) - Outside --- ; note: bottom section is first due to some interactions with other pieces diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt index 127b920c6..6ce80823c 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt @@ -39,17 +39,17 @@ ; ;----D1/E1 R3 (RHW-3)---- ;2a -> Diag 02 -0x57B12A00,2,0,0x57000200,2,0=0x57B12A00,2,0,0x57020200,2,0 -0x57B12A80,0,1,0x57000200,1,0=0x57B12A80,0,1,0x57020200,1,0 +0x57B14A00,2,0,0x57000200,2,0=0x57B14A00,2,0,0x57020200,2,0 +0x57B14A80,0,1,0x57000200,1,0=0x57B14A80,0,1,0x57020200,1,0 ;2a -> Diag Stub -0x57B12A80,0,1,0x57000300,3,1=0x57B12A80,0,1,0x57020300,3,1 -0x57B12A00,2,0,0x57000300,1,0=0x57B12A00,2,0,0x57020300,1,0 +0x57B14A80,0,1,0x57000300,3,1=0x57B14A80,0,1,0x57020300,3,1 +0x57B14A00,2,0,0x57000300,1,0=0x57B14A00,2,0,0x57020300,1,0 ;3c -> Orth -0x57B13C00,3,0,0x57000000,3,0=0x57B13C00,3,0,0x57020000,3,0 -0x57B13C80,1,1,0x57000000,1,0=0x57B13C80,1,1,0x57020000,1,0 +0x57B15C00,3,0,0x57000000,3,0=0x57B15C00,3,0,0x57020000,3,0 +0x57B15C80,1,1,0x57000000,1,0=0x57B15C80,1,1,0x57020000,1,0 ;3c -> Orth Stub -0x57B13C00,3,0,0x57000100,1,0=0x57B13C00,3,0,0x57020100,3,1 -0x57B13C80,1,1,0x57000100,1,0=0x57B13C80,1,1,0x57020100,1,0 +0x57B15C00,3,0,0x57000100,1,0=0x57B15C00,3,0,0x57020100,3,1 +0x57B15C80,1,1,0x57000100,1,0=0x57B15C80,1,1,0x57020100,1,0 ; ; ALL B1 AND E1 RAMP PIECES OVERRIDE FROM NORTH TO SOUTH, WITH ; MAINLINE HAVING A SOUTH TO NORTH OVERRIDE FOR STABILITY. From dfe61819ca4762039ae6e981e846502879989598 Mon Sep 17 00:00:00 2001 From: h3ndofry Date: Tue, 29 Nov 2022 22:52:31 +1100 Subject: [PATCH 10/14] adds B1 orth inside --- .../DirtroadAdvanced/RUL14_RHW_Advanced.rul | 245 +++++++++++++++++- 1 file changed, 242 insertions(+), 3 deletions(-) diff --git a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul index 1d8363bf7..30781d458 100644 --- a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul +++ b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul @@ -10558,6 +10558,7 @@ ;-----End Draggable Orthogonal Type D1 Wide Ramps----- ;-----Begin Draggable R3 Type E1 Ramps----- +;-----Begin Draggable R3 Type E1 Ramp - Outside----- ; Top section ; 1,2,2,0,2 @@ -10705,7 +10706,7 @@ 2,4,0,2,0,2 2,8,1,3,0,0 2,13,0,2,2,2 -2,14,2,2,0,2 +2,14,0,2,0,2 3,0,0x57b14900,0,0 3,1,0x57b14800,0,0 3,8,0x57b14a00,0,0 @@ -10793,7 +10794,7 @@ 3,0,0x57b14980,3,1 3,7,0x57b14880,3,1 3,8,0x57b14a80,3,1 -;-----End Draggable R3 Type E1 Ramps----- +;-----End Draggable R3 Type E1 Ramps - Outside----- ;-----Begin Draggable R3 Type B1 Ramps----- ; note: this is a two stage override. @@ -10801,6 +10802,244 @@ ; 80 - onramps - swap for LHD ; 00 - offramps - swap for LHD ; +;---Type B1 (R3) Ramps (Orthogonal) - Inside --- +; Top section +; +1,2,2,0,2 +2,1,0,0,2,2 +2,3,0,2,0,2 +2,7,0,2,0,2 +2,8,0,2,2,2 +2,21,0,2,0,2 +2,22,11,2,0,13 +2,23,0,0,11,3 +3,0,0x57b22200,0,0 +3,1,0x57b22100,0,0 +3,3,0x57b22000,0,0 +3,7,0x57b22400,0,0 +3,8,0x57b22300,0,0 +3,21,0x57b22700,0,0 +3,22,0x57b22600,0,0 +3,23,0x57b22500,0,0 +; +1,2,2,2,0 +2,1,2,0,2,0 +2,2,2,0,2,2 +2,3,2,0,0,2 +2,5,2,0,2,0 +2,9,2,0,2,0 +2,10,13,11,2,0 +2,11,3,0,0,11 +3,0,0x57b22200,1,0 +3,1,0x57b22400,1,0 +3,2,0x57b22300,1,0 +3,3,0x57b22100,1,0 +3,5,0x57b22000,1,0 +3,9,0x57b22700,1,0 +3,10,0x57b22600,1,0 +3,11,0x57b22500,1,0 +; +1,0,2,2,2 +2,3,0,2,0,2 +2,4,2,2,0,2 +2,5,2,2,0,0 +2,7,0,2,0,2 +2,13,0,2,0,2 +2,14,0,13,11,2 +2,15,11,3,0,0 +3,0,0x57b22200,2,0 +3,3,0x57b22400,2,0 +3,4,0x57b22300,2,0 +3,5,0x57b22100,2,0 +3,7,0x57b22000,2,0 +3,13,0x57b22700,2,0 +3,14,0x57b22600,2,0 +3,15,0x57b22500,2,0 +; +1,2,0,2,2 +2,1,2,0,2,0 +2,5,2,0,2,0 +2,6,2,2,2,0 +2,7,0,2,2,0 +2,17,2,0,2,0 +2,18,2,0,13,11 +2,19,0,11,3,0 +3,0,0x57b22200,3,0 +3,1,0x57b22000,3,0 +3,5,0x57b22400,3,0 +3,6,0x57b22300,3,0 +3,7,0x57b22100,3,0 +3,17,0x57b22700,3,0 +3,18,0x57b22600,3,0 +3,19,0x57b22500,3,0 +; +1,0,2,2,2 +2,3,0,2,0,2 +2,5,2,0,0,2 +2,6,2,2,0,2 +2,7,0,2,0,2 +2,19,13,0,0,1 +2,20,0,2,13,11 +2,21,0,2,0,2 +3,0,0x57b22280,0,1 +3,3,0x57b22080,0,1 +3,5,0x57b22180,0,1 +3,6,0x57b22380,0,1 +3,7,0x57b22480,0,1 +3,19,0x57b22580,0,1 +3,20,0x57b22680,0,1 +3,21,0x57b22780,0,1 +; +1,2,2,2,0 +2,1,2,0,2,0 +2,3,0,0,2,2 +2,4,2,0,2,2 +2,5,2,0,2,0 +2,15,0,0,1,13 +2,16,2,13,11,0 +2,17,2,0,2,0 +3,0,0x57b22280,1,1 +3,1,0x57b22080,1,1 +3,3,0x57b22180,1,1 +3,4,0x57b22380,1,1 +3,5,0x57b22480,1,1 +3,15,0x57b22580,1,1 +3,16,0x57b22680,1,1 +3,17,0x57b22780,1,1 +; +1,2,2,0,2 +2,1,0,2,2,0 +2,2,0,2,2,2 +2,3,0,2,0,2 +2,7,0,2,0,2 +2,11,0,1,13,0 +2,12,13,11,0,2 +2,13,0,2,0,2 +3,0,0x57b22280,2,1 +3,1,0x57b22180,2,1 +3,2,0x57b22380,2,1 +3,3,0x57b22480,2,1 +3,7,0x57b22080,2,1 +3,11,0x57b22580,2,1 +3,12,0x57b22680,2,1 +3,13,0x57b22780,2,1 +; +1,2,0,2,2 +2,1,2,0,2,0 +2,5,2,0,2,0 +2,7,2,2,0,0 +2,8,2,2,2,0 +2,9,2,0,2,0 +2,23,1,13,0,0 +2,24,11,0,2,13 +3,0,0x57b22280,3,1 +3,1,0x57b22480,3,1 +3,5,0x57b22080,3,1 +3,7,0x57b22180,3,1 +3,8,0x57b22380,3,1 +3,9,0x57b22780,3,1 +3,23,0x57b22580,3,1 +3,24,0x57b22680,3,1 + +; bottom section +; +1,1,13,0,0 +2,1,0,3,1,3 +2,2,0,0,11,3 +2,3,11,2,0,13 +2,4,0,2,0,2 +2,8,1,3,0,0 +2,13,0,2,2,2 +2,14,0,2,0,2 +3,0,0x57b22900,0,0 +3,1,0x57b22800,0,0 +3,8,0x57b22a00,0,0 +; +1,0,1,13,0 +2,2,0,1,3,0 +2,3,3,0,3,1 +2,4,3,0,0,11 +2,5,13,11,2,0 +2,6,2,0,2,0 +2,17,2,0,2,2 +2,18,2,0,2,0 +3,0,0x57b22900,1,0 +3,2,0x57b22a00,1,0 +3,3,0x57b22800,1,0 +; +1,0,0,1,13 +2,4,0,0,1,3 +2,5,1,3,0,3 +2,6,11,3,0,0 +2,7,0,13,11,2 +2,8,0,2,0,2 +2,21,2,2,0,2 +2,22,0,2,0,2 +3,0,0x57b22900,2,0 +3,4,0x57b22a00,2,0 +3,5,0x57b22800,2,0 +; +1,13,0,0,1 +2,1,2,0,13,11 +2,2,2,0,2,0 +2,6,3,0,0,1 +2,7,3,1,3,0 +2,8,0,11,3,0 +2,9,2,2,2,0 +2,10,2,0,2,0 +3,0,0x57b22900,3,0 +3,6,0x57b22a00,3,0 +3,7,0x57b22800,3,0 +; +1,0,11,3,0 +2,2,0,2,0,2 +2,3,0,2,13,11 +2,4,13,0,0,1 +2,5,3,1,0,1 +2,6,0,1,3,0 +2,12,0,2,0,2 +2,13,2,2,0,2 +3,0,0x57b22980,0,1 +3,5,0x57b22880,0,1 +3,6,0x57b22a80,0,1 +; +1,11,3,0,0 +2,1,2,13,11,0 +2,2,0,0,1,13 +2,3,1,0,1,3 +2,4,1,3,0,0 +2,8,2,0,2,0 +2,9,2,0,2,2 +2,24,2,0,2,0 +3,0,0x57b22980,1,1 +3,3,0x57b22880,1,1 +3,4,0x57b22a80,1,1 +; +1,3,0,0,11 +2,1,0,1,3,1 +2,2,3,0,0,1 +2,6,0,2,0,2 +2,7,13,11,0,2 +2,8,0,1,13,0 +2,20,0,2,0,2 +2,21,0,2,2,2 +3,0,0x57b22980,2,1 +3,1,0x57b22880,2,1 +3,2,0x57b22a80,2,1 +; +1,0,0,11,3 +2,4,2,0,2,0 +2,5,11,0,2,13 +2,6,1,13,0,0 +2,7,1,3,1,0 +2,8,0,0,1,3 +2,16,2,0,2,0 +2,17,2,2,2,0 +3,0,0x57b22980,3,1 +3,7,0x57b22880,3,1 +3,8,0x57b22a80,3,1 +; + ;---Type B1 (R3) Ramps (Orthogonal) - Outside --- ; Top section dual ; @@ -11139,7 +11378,7 @@ 3,7,0x57b00880,3,1 3,8,0x57b00a80,3,1 -;---Type E1 (R3) Ramps (Diagonal) - outside --- +;---Type E1 (R3) Ramps (Diagonal) - Outside --- ; bottom section ; 1,3,0,0,11 From 7ada7f923ddf2c364e25857142dad6458a4322d4 Mon Sep 17 00:00:00 2001 From: h3ndofry Date: Tue, 29 Nov 2022 23:16:37 +1100 Subject: [PATCH 11/14] fixes error with INRUL --- Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul index 30781d458..7f3e924e6 100644 --- a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul +++ b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul @@ -10706,7 +10706,7 @@ 2,4,0,2,0,2 2,8,1,3,0,0 2,13,0,2,2,2 -2,14,0,2,0,2 +2,14,2,2,0,2 3,0,0x57b14900,0,0 3,1,0x57b14800,0,0 3,8,0x57b14a00,0,0 From 5540a01dd33724409b48206b564b17ae499c63f8 Mon Sep 17 00:00:00 2001 From: h3ndofry Date: Wed, 4 Jan 2023 21:09:48 +1100 Subject: [PATCH 12/14] adds some dev notes for R3 --- .../DirtroadAdvanced/RUL14_RHW_Advanced.rul | 88 +++++++++++++++---- .../07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt | 2 +- 2 files changed, 73 insertions(+), 17 deletions(-) diff --git a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul index 7f3e924e6..c5beaf3cd 100644 --- a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul +++ b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul @@ -10557,8 +10557,39 @@ 3,24,0x57853f80,3,1 ;-----End Draggable Orthogonal Type D1 Wide Ramps----- -;-----Begin Draggable R3 Type E1 Ramps----- -;-----Begin Draggable R3 Type E1 Ramp - Outside----- +;-----------------; +; R 3 R A M P S ; +;-----------------; +; RRRR 333333 ; +; R R 3 ; +; RRR 3333 ; +; R R 3 ; +; R R 33333 ; +;-----------------; + +; Most R3 ramps are a two stage override. +; 00 - offramps - swap for LHD +; 80 - onramps - swap for LHD + +; TABLE OF CONTENTS +; ----------------- +; Last update: 2023-01-03 by Shadow Assassin +; +; E1 orthogonal INSIDE (RHW-4 --> MIS / MIS) -- TBD +; E1 orthogonal OUTSIDE (RHW-3 --> MIS / RHW-2) -- DONE +; B1 orthogonal INSIDE (MIS --> MIS / MIS) -- DONE +; B1 orthogonal OUTSIDE (RHW-2 --> MIS / RHW-2) -- DONE +; D1 diagonal INSIDE (RHW-4 --> MIS / MIS) -- TBD +; D1 diagonal OUTSIDE (RHW-3 --> MIS / RHW-2) -- DONE +; A1 diagonal INSIDE (MIS --> MIS / MIS) -- TBD +; A1 diagonal OUTSIDE (RHW-2 --> MIS / RHW-2) -- DONE + + +;-----Begin Draggable R3 E1 orthogonal INSIDE (RHW-4 --> MIS / MIS)----- +;-----End Draggable R3 E1 orthogonal INSIDE (RHW-4 --> MIS / MIS)----- + + +;-----Begin Draggable R3 E1 orthogonal OUTSIDE (RHW-3 --> MIS / RHW-2)----- ; Top section ; 1,2,2,0,2 @@ -10794,15 +10825,11 @@ 3,0,0x57b14980,3,1 3,7,0x57b14880,3,1 3,8,0x57b14a80,3,1 -;-----End Draggable R3 Type E1 Ramps - Outside----- +;-----End Draggable R3 E1 orthogonal OUTSIDE (RHW-3 --> MIS / RHW-2)----- -;-----Begin Draggable R3 Type B1 Ramps----- -; note: this is a two stage override. -; Defaults to RHW-2. -; 80 - onramps - swap for LHD -; 00 - offramps - swap for LHD -; -;---Type B1 (R3) Ramps (Orthogonal) - Inside --- + +;-----Begin Draggable R3 B1 orthogonal INSIDE (MIS --> MIS / MIS)----- +; Defaults to RHW-MIS (0x57b2) ; Top section ; 1,2,2,0,2 @@ -11039,9 +11066,11 @@ 3,7,0x57b22880,3,1 3,8,0x57b22a80,3,1 ; +;-----End Draggable R3 B1 orthogonal INSIDE (MIS --> MIS / MIS)----- -;---Type B1 (R3) Ramps (Orthogonal) - Outside --- -; Top section dual + +;---Begin Draggable R3 B1 orthogonal OUTSIDE (RHW-2 --> MIS / RHW-2)--- +; Top section dual ramp ; 1,2,2,2,2 2,1,0,0,2,2 @@ -11143,7 +11172,8 @@ 3,18,0x57b00600,3,0 3,19,0x57b00500,3,0 -; Top section single +; Top section single ramp +; 1,2,2,0,2 2,1,0,0,2,2 2,3,0,2,0,2 @@ -11378,7 +11408,14 @@ 3,7,0x57b00880,3,1 3,8,0x57b00a80,3,1 -;---Type E1 (R3) Ramps (Diagonal) - Outside --- +;-----End Draggable R3 B1 orthogonal OUTSIDE (RHW-2 --> MIS / RHW-2)----- + + +;-----Begin Draggable R3 D1 diagonal INSIDE (RHW-4 --> MIS / MIS)----- +;-----End Draggable R3 D1 diagonal INSIDE (RHW-4 --> MIS / MIS)----- + + +;-----Begin D1 diagonal OUTSIDE (RHW-3 --> MIS / RHW-2)----- ; bottom section ; 1,3,0,0,11 @@ -11663,7 +11700,14 @@ 3,12,0x57b15880,3,1 3,18,0x57b15080,3,1 -;---Type B1 (R3) Ramps (Diagonal) - Outside --- +;-----End Draggable R3 D1 diagonal OUTSIDE (RHW-3 --> MIS / RHW-2)----- + + +;-----Begin Draggable R3 A1 diagonal INSIDE (MIS --> MIS / MIS)----- +;-----End Draggable R3 A1 diagonal INSIDE (MIS --> MIS / MIS)----- + + +;-----Begin Draggable R3 A1 diagonal OUTSIDE (RHW-2 --> MIS / RHW-2)----- ; note: bottom section is first due to some interactions with other pieces ; ; Bottom section @@ -11918,7 +11962,19 @@ 3,6,0x57b01080,3,1 3,7,0x57b01280,3,1 -;-----End Draggable R3 Type B1 Ramps----- +;-----End Draggable R3 A1 diagonal OUTSIDE (RHW-2 --> MIS / RHW-2)----- + +;-----------------; +; R 3 R A M P S ; +;-----------------; +; RRRR 333333 ; +; R R 3 ; +; RRR 3333 ; +; R R 3 ; +; R R 33333 ; +;-----------------; + +;---- END R3 RAMPS ---- ;-----Begin Draggable Orthogonal Type B1 Ramps----- ;---RHW-2--- diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt index 6ce80823c..427b019fa 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/R3_Ramps.txt @@ -56,7 +56,7 @@ ;---------------------- ;----L0 MIS (0x57b2)--- ;---------------------- -; ORTHOGONAL B1 RAMP +; ORTHOGONAL B1 RAMP (OUTSIDE) ; Mainline North -> South ; Orth -> 00 0x57020000,3,0,0x57b00000,3,0=0x57020000,3,0,0x57b20000,3,0 From 47dba988e35a79d820a3faf30450e584adbc8891 Mon Sep 17 00:00:00 2001 From: h3ndofry Date: Wed, 4 Jan 2023 23:23:28 +1100 Subject: [PATCH 13/14] adds E1 orth inside --- .../DirtroadAdvanced/RUL14_RHW_Advanced.rul | 259 +++++++++++++++++- 1 file changed, 257 insertions(+), 2 deletions(-) diff --git a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul index c5beaf3cd..2d742ffde 100644 --- a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul +++ b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul @@ -10573,9 +10573,9 @@ ; TABLE OF CONTENTS ; ----------------- -; Last update: 2023-01-03 by Shadow Assassin +; Last update: 2023-01-04 by Shadow Assassin ; -; E1 orthogonal INSIDE (RHW-4 --> MIS / MIS) -- TBD +; E1 orthogonal INSIDE (RHW-4 --> MIS / MIS) -- DONE ; E1 orthogonal OUTSIDE (RHW-3 --> MIS / RHW-2) -- DONE ; B1 orthogonal INSIDE (MIS --> MIS / MIS) -- DONE ; B1 orthogonal OUTSIDE (RHW-2 --> MIS / RHW-2) -- DONE @@ -10584,8 +10584,263 @@ ; A1 diagonal INSIDE (MIS --> MIS / MIS) -- TBD ; A1 diagonal OUTSIDE (RHW-2 --> MIS / RHW-2) -- DONE +; E2 orthogonal INSIDE ?? +; E2 orthogonal OUTSIDE +; B2 orthogonal INSIDE +; B2 orthogonal OUTSIDE ;-----Begin Draggable R3 E1 orthogonal INSIDE (RHW-4 --> MIS / MIS)----- +; Top section +; +1,2,2,2,2 +2,1,0,0,2,2 +2,3,0,2,0,2 +2,7,2,2,0,2 +2,8,0,2,2,2 +2,21,0,2,0,2 +2,22,11,2,0,13 +2,23,0,0,11,3 +3,0,0x57b36200,0,0 +3,1,0x57b36100,0,0 +3,3,0x57b36000,0,0 +3,7,0x57b36400,0,0 +3,8,0x57b36300,0,0 +3,21,0x57b36700,0,0 +3,23,0x57b36500,0,0 +; +1,2,2,2,2 +2,1,2,2,2,0 +2,2,2,0,2,2 +2,3,2,0,0,2 +2,5,2,0,2,0 +2,9,2,0,2,0 +2,10,13,11,2,0 +2,11,3,0,0,11 +3,0,0x57b36200,1,0 +3,1,0x57b36400,1,0 +3,2,0x57b36300,1,0 +3,3,0x57b36100,1,0 +3,5,0x57b36000,1,0 +3,9,0x57b36700,1,0 +3,11,0x57b36500,1,0 +; +1,2,2,2,2 +2,3,0,2,2,2 +2,4,2,2,0,2 +2,5,2,2,0,0 +2,7,0,2,0,2 +2,13,0,2,0,2 +2,14,0,13,11,2 +2,15,11,3,0,0 +3,0,0x57b36200,2,0 +3,3,0x57b36400,2,0 +3,4,0x57b36300,2,0 +3,5,0x57b36100,2,0 +3,7,0x57b36000,2,0 +3,13,0x57b36700,2,0 +3,15,0x57b36500,2,0 +; +1,2,2,2,2 +2,1,2,0,2,0 +2,5,2,0,2,2 +2,6,2,2,2,0 +2,7,0,2,2,0 +2,17,2,0,2,0 +2,18,2,0,13,11 +2,19,0,11,3,0 +3,0,0x57b36200,3,0 +3,1,0x57b36000,3,0 +3,5,0x57b36400,3,0 +3,6,0x57b36300,3,0 +3,7,0x57b36100,3,0 +3,17,0x57b36700,3,0 +3,19,0x57b36500,3,0 +; +1,2,2,2,2 +2,3,0,2,0,2 +2,5,2,0,0,2 +2,6,2,2,0,2 +2,7,0,2,2,2 +2,19,13,0,0,1 +2,20,0,2,13,11 +2,21,0,2,0,2 +3,0,0x57b36280,0,1 +3,3,0x57b36080,0,1 +3,5,0x57b36180,0,1 +3,6,0x57b36380,0,1 +3,7,0x57b36480,0,1 +3,19,0x57b36580,0,1 +3,21,0x57b36780,0,1 +; +1,2,2,2,2 +2,1,2,0,2,0 +2,3,0,0,2,2 +2,4,2,0,2,2 +2,5,2,2,2,0 +2,15,0,0,1,13 +2,16,2,13,11,0 +2,17,2,0,2,0 +3,0,0x57b36280,1,1 +3,1,0x57b36080,1,1 +3,3,0x57b36180,1,1 +3,4,0x57b36380,1,1 +3,5,0x57b36480,1,1 +3,15,0x57b36580,1,1 +3,17,0x57b36780,1,1 +; +1,2,2,2,2 +2,1,0,2,2,0 +2,2,0,2,2,2 +2,3,2,2,0,2 +2,7,0,2,0,2 +2,11,0,1,13,0 +2,12,13,11,0,2 +2,13,0,2,0,2 +3,0,0x57b36280,2,1 +3,1,0x57b36180,2,1 +3,2,0x57b36380,2,1 +3,3,0x57b36480,2,1 +3,7,0x57b36080,2,1 +3,11,0x57b36580,2,1 +3,13,0x57b36780,2,1 +; +1,2,2,2,2 +2,1,2,0,2,2 +2,5,2,0,2,0 +2,7,2,2,0,0 +2,8,2,2,2,0 +2,9,2,0,2,0 +2,23,1,13,0,0 +2,24,11,0,2,13 +3,0,0x57b36280,3,1 +3,1,0x57b36480,3,1 +3,5,0x57b36080,3,1 +3,7,0x57b36180,3,1 +3,8,0x57b36380,3,1 +3,9,0x57b36780,3,1 +3,23,0x57b36580,3,1 +; +; Bottom section +; +1,11,2,0,13 +2,1,0,0,11,3 +2,3,0,2,2,2 +2,4,2,2,0,2 +2,5,0,2,0,2 +2,7,1,13,0,0 +2,8,0,3,1,3 +2,13,0,0,2,2 +2,14,2,2,2,2 +2,22,1,3,0,0 +3,0,0x57b36600,0,0 +3,7,0x57b36900,0,0 +3,8,0x57b36800,0,0 +3,22,0x57b36a00,0,0 +; +1,13,11,2,0 +2,1,0,1,13,0 +2,2,3,0,3,1 +2,3,3,0,0,11 +2,5,2,0,2,2 +2,6,2,2,2,0 +2,7,2,0,2,0 +2,10,0,1,3,0 +2,17,2,0,0,2 +2,18,2,2,2,2 +3,0,0x57b36600,1,0 +3,1,0x57b36900,1,0 +3,2,0x57b36800,1,0 +3,10,0x57b36a00,1,0 +; +1,0,13,11,2 +2,1,0,2,0,2 +2,3,0,0,1,13 +2,4,1,3,0,3 +2,5,11,3,0,0 +2,7,2,2,0,2 +2,8,0,2,2,2 +2,14,0,0,1,3 +2,21,2,2,0,0 +2,22,2,2,2,2 +3,0,0x57b36600,2,0 +3,3,0x57b36900,2,0 +3,4,0x57b36800,2,0 +3,14,0x57b36a00,2,0 +; +1,2,0,13,11 +2,1,2,2,2,0 +2,2,2,0,2,2 +2,3,2,0,2,0 +2,5,13,0,0,1 +2,6,3,1,3,0 +2,7,0,11,3,0 +2,9,0,2,2,0 +2,10,2,2,2,2 +2,18,3,0,0,1 +3,0,0x57b36600,3,0 +3,5,0x57b36900,3,0 +3,6,0x57b36800,3,0 +3,18,0x57b36a00,3,0 +; +1,0,2,13,11 +2,1,0,2,0,2 +2,2,0,2,2,2 +2,3,2,2,0,2 +2,5,13,0,0,1 +2,6,3,1,0,1 +2,7,0,11,3,0 +2,12,2,2,2,2 +2,13,2,0,0,2 +2,20,0,1,3,0 +3,0,0x57b36680,0,1 +3,6,0x57b36880,0,1 +3,7,0x57b36980,0,1 +3,20,0x57b36a80,0,1 +; +1,2,13,11,0 +2,1,2,0,2,2 +2,3,0,0,1,13 +2,4,1,0,1,3 +2,5,11,3,0,0 +2,7,2,0,2,0 +2,8,2,2,2,0 +2,9,0,0,2,2 +2,16,1,3,0,0 +2,24,2,2,2,2 +3,0,0x57b36680,1,1 +3,4,0x57b36880,1,1 +3,5,0x57b36980,1,1 +3,16,0x57b36a80,1,1 +; +1,13,11,0,2 +2,1,0,1,13,0 +2,2,0,1,3,1 +2,3,3,0,0,11 +2,5,0,2,0,2 +2,6,2,2,0,2 +2,7,0,2,2,2 +2,12,3,0,0,1 +2,20,2,2,2,2 +2,21,0,2,2,0 +3,0,0x57b36680,2,1 +3,2,0x57b36880,2,1 +3,3,0x57b36980,2,1 +3,12,0x57b36a80,2,1 +; +1,11,0,2,13 +2,1,0,0,11,3 +2,3,2,0,2,0 +2,4,2,0,2,2 +2,5,2,2,2,0 +2,7,1,13,0,0 +2,8,1,3,1,0 +2,16,2,2,2,2 +2,17,2,2,0,0 +2,24,0,0,1,3 +3,0,0x57b36680,3,1 +3,1,0x57b36980,3,1 +3,8,0x57b36880,3,1 +3,24,0x57b36a80,3,1 ;-----End Draggable R3 E1 orthogonal INSIDE (RHW-4 --> MIS / MIS)----- From de971ee27e296f2e758f15862fe7fc2ec5822bbe Mon Sep 17 00:00:00 2001 From: h3ndofry Date: Fri, 17 May 2024 23:03:44 +1000 Subject: [PATCH 14/14] adds updated INRULs --- .../DirtroadAdvanced/RUL14_RHW_Advanced.rul | 470 +++++++++--------- 1 file changed, 235 insertions(+), 235 deletions(-) diff --git a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul index ca86cacc6..93022157c 100644 --- a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul +++ b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul @@ -10883,7 +10883,7 @@ ; A1 diagonal INSIDE (MIS --> MIS / MIS) -- TBD ; A1 diagonal OUTSIDE (RHW-2 --> MIS / RHW-2) -- DONE -; E2 orthogonal INSIDE ?? +; E2 orthogonal INSIDE ; E2 orthogonal OUTSIDE ; B2 orthogonal INSIDE ; B2 orthogonal OUTSIDE @@ -11626,105 +11626,105 @@ ;---Begin Draggable R3 B1 orthogonal OUTSIDE (RHW-2 --> MIS / RHW-2)--- ; Top section dual ramp ; -;1,2,2,2,2 -;2,1,0,0,2,2 -;2,3,0,2,0,2 -;2,5,2,0,0,2 -;2,6,0,2,0,2 -;2,7,0,2,0,2 -;2,8,0,2,0,2 -;2,19,13,0,0,1 -;2,20,0,2,13,11 -;2,21,0,2,0,2 -;2,22,11,2,0,13 -;2,23,0,0,11,3 -;3,0,0x57b00c00,0,0 -;3,1,0x57b00100,0,0 -;3,3,0x57b00b00,0,0 -;3,5,0x57b00180,0,1 -;3,6,0x57b00380,0,1 -;3,7,0x57b00d00,0,0 -;3,8,0x57b00300,0,0 -;3,19,0x57b00580,0,1 -;3,20,0x57b00680,0,1 -;3,21,0x57b00e00,0,0 -;3,22,0x57b00600,0,0 -;3,23,0x57b00500,0,0 -; -;1,2,2,2,2 -;2,1,2,0,2,0 -;2,2,2,0,2,0 -;2,3,2,0,0,2 -;2,5,2,0,2,0 -;2,7,2,2,0,0 -;2,8,2,0,2,0 -;2,9,2,0,2,0 -;2,10,13,11,2,0 -;2,11,3,0,0,11 -;2,23,1,13,0,0 -;2,24,11,0,2,13 -;3,0,0x57b00c00,1,0 -;3,1,0x57b00d00,1,0 -;3,2,0x57b00300,1,0 -;3,3,0x57b00100,1,0 -;3,5,0x57b00b00,1,0 -;3,7,0x57b00180,3,1 -;3,8,0x57b00380,3,1 -;3,9,0x57b00e00,1,0 -;3,10,0x57b00600,1,0 -;3,11,0x57b00500,1,0 -;3,23,0x57b00580,3,1 -;3,24,0x57b00680,3,1 -; -;1,2,2,2,2 -;2,1,0,2,2,0 -;2,2,0,2,0,2 -;2,3,0,2,0,2 -;2,4,0,2,0,2 -;2,5,2,2,0,0 -;2,7,0,2,0,2 -;2,11,0,1,13,0 -;2,12,13,11,0,2 -;2,13,0,2,0,2 -;2,14,0,13,11,2 -;2,15,11,3,0,0 -;3,0,0x57b00c00,2,0 -;3,1,0x57b00180,2,1 -;3,2,0x57b00380,2,1 -;3,3,0x57b00d00,2,0 -;3,4,0x57b00300,2,0 -;3,5,0x57b00100,2,0 -;3,7,0x57b00b00,2,0 -;3,11,0x57b00580,2,1 -;3,12,0x57b00680,2,1 -;3,13,0x57b00e00,2,0 -;3,14,0x57b00600,2,0 -;3,15,0x57b00500,2,0 -; -;1,2,2,2,2 -;2,1,2,0,2,0 -;2,3,0,0,2,2 -;2,4,2,0,2,0 -;2,5,2,0,2,0 -;2,6,2,0,2,0 -;2,7,0,2,2,0 -;2,15,0,0,1,13 -;2,16,2,13,11,0 -;2,17,2,0,2,0 -;2,18,2,0,13,11 -;2,19,0,11,3,0 -;3,0,0x57b00c00,3,0 -;3,1,0x57b00b00,3,0 -;3,3,0x57b00180,1,1 -;3,4,0x57b00380,1,1 -;3,5,0x57b00d00,3,0 -;3,6,0x57b00300,3,0 -;3,7,0x57b00100,3,0 -;3,15,0x57b00580,1,1 -;3,16,0x57b00680,1,1 -;3,17,0x57b00e00,3,0 -;3,18,0x57b00600,3,0 -;3,19,0x57b00500,3,0 +1,2,2,2,2 +2,1,0,0,2,2 +2,3,0,2,0,2 +2,5,2,0,0,2 +2,6,0,2,0,2 +2,7,0,2,0,2 +2,8,0,2,0,2 +2,19,13,0,0,1 +2,20,0,2,13,11 +2,21,0,2,0,2 +2,22,11,2,0,13 +2,23,0,0,11,3 +3,0,0x57b00c00,0,0 +3,1,0x57b00100,0,0 +3,3,0x57b00b00,0,0 +3,5,0x57b00180,0,1 +3,6,0x57b00380,0,1 +3,7,0x57b00d00,0,0 +3,8,0x57b00300,0,0 +3,19,0x57b00580,0,1 +3,20,0x57b00680,0,1 +3,21,0x57b00e00,0,0 +3,22,0x57b00600,0,0 +3,23,0x57b00500,0,0 +; +1,2,2,2,2 +2,1,2,0,2,0 +2,2,2,0,2,0 +2,3,2,0,0,2 +2,5,2,0,2,0 +2,7,2,2,0,0 +2,8,2,0,2,0 +2,9,2,0,2,0 +2,10,13,11,2,0 +2,11,3,0,0,11 +2,23,1,13,0,0 +2,24,11,0,2,13 +3,0,0x57b00c00,1,0 +3,1,0x57b00d00,1,0 +3,2,0x57b00300,1,0 +3,3,0x57b00100,1,0 +3,5,0x57b00b00,1,0 +3,7,0x57b00180,3,1 +3,8,0x57b00380,3,1 +3,9,0x57b00e00,1,0 +3,10,0x57b00600,1,0 +3,11,0x57b00500,1,0 +3,23,0x57b00580,3,1 +3,24,0x57b00680,3,1 +; +1,2,2,2,2 +2,1,0,2,2,0 +2,2,0,2,0,2 +2,3,0,2,0,2 +2,4,0,2,0,2 +2,5,2,2,0,0 +2,7,0,2,0,2 +2,11,0,1,13,0 +2,12,13,11,0,2 +2,13,0,2,0,2 +2,14,0,13,11,2 +2,15,11,3,0,0 +3,0,0x57b00c00,2,0 +3,1,0x57b00180,2,1 +3,2,0x57b00380,2,1 +3,3,0x57b00d00,2,0 +3,4,0x57b00300,2,0 +3,5,0x57b00100,2,0 +3,7,0x57b00b00,2,0 +3,11,0x57b00580,2,1 +3,12,0x57b00680,2,1 +3,13,0x57b00e00,2,0 +3,14,0x57b00600,2,0 +3,15,0x57b00500,2,0 +; +1,2,2,2,2 +2,1,2,0,2,0 +2,3,0,0,2,2 +2,4,2,0,2,0 +2,5,2,0,2,0 +2,6,2,0,2,0 +2,7,0,2,2,0 +2,15,0,0,1,13 +2,16,2,13,11,0 +2,17,2,0,2,0 +2,18,2,0,13,11 +2,19,0,11,3,0 +3,0,0x57b00c00,3,0 +3,1,0x57b00b00,3,0 +3,3,0x57b00180,1,1 +3,4,0x57b00380,1,1 +3,5,0x57b00d00,3,0 +3,6,0x57b00300,3,0 +3,7,0x57b00100,3,0 +3,15,0x57b00580,1,1 +3,16,0x57b00680,1,1 +3,17,0x57b00e00,3,0 +3,18,0x57b00600,3,0 +3,19,0x57b00500,3,0 ; Top section single ramp ; @@ -12380,141 +12380,141 @@ ; Top section ; -;1,13,1,3,2 -;2,1,0,1,13,0 -;2,2,0,1,3,1 -;2,3,3,0,0,1 -;2,5,3,0,0,1 -;2,6,0,1,3,0 -;2,7,0,2,0,11 -;2,20,3,0,0,11 -;2,21,0,11,3,0 -;3,0,0x57b01300,0,0 -;3,1,0x57b01200,0,0 -;3,2,0x57b01000,0,0 -;3,3,0x57b01100,0,0 -;3,5,0x57b01400,0,0 -;3,6,0x57b01600,0,0 -;3,7,0x57b01500,0,0 -; -;1,1,3,11,2 -;2,1,0,0,1,3 -;2,3,0,0,1,3 -;2,4,1,3,0,3 -;2,5,11,3,0,0 -;2,7,0,2,0,13 -;2,8,1,3,0,0 -;2,21,1,13,0,0 -;2,22,0,0,1,13 -;3,0,0x57b01380,0,1 -;3,1,0x57b01480,0,1 -;3,3,0x57b01180,0,1 -;3,4,0x57b01080,0,1 -;3,5,0x57b01280,0,1 -;3,7,0x57b01580,0,1 -;3,8,0x57b01680,0,1 -; -;1,2,13,1,3 -;2,1,11,0,2,0 -;2,3,0,0,1,13 -;2,4,1,0,1,3 -;2,5,1,3,0,0 -;2,7,1,3,0,0 -;2,8,0,0,1,3 -;2,9,0,0,11,3 -;2,24,11,3,0,0 -;3,0,0x57b01300,1,0 -;3,1,0x57b01500,1,0 -;3,3,0x57b01200,1,0 -;3,4,0x57b01000,1,0 -;3,5,0x57b01100,1,0 -;3,7,0x57b01400,1,0 -;3,8,0x57b01600,1,0 -; -;1,3,11,2,1 -;2,1,0,1,3,0 -;2,2,3,0,3,1 -;2,3,3,0,0,11 -;2,5,2,0,13,0 -;2,6,3,0,0,1 -;2,7,0,1,3,0 -;2,17,13,0,0,1 -;2,18,0,1,13,0 -;3,0,0x57b01380,1,1 -;3,1,0x57b01180,1,1 -;3,2,0x57b01080,1,1 -;3,3,0x57b01280,1,1 -;3,5,0x57b01580,1,1 -;3,6,0x57b01680,1,1 -;3,7,0x57b01480,1,1 -; -;1,3,2,13,1 -;2,1,0,1,3,0 -;2,2,3,0,0,1 -;2,3,0,11,0,2 -;2,5,13,0,0,1 -;2,6,3,1,0,1 -;2,7,0,1,3,0 -;2,12,0,11,3,0 -;2,13,3,0,0,11 -;3,0,0x57b01300,2,0 -;3,1,0x57b01400,2,0 -;3,2,0x57b01600,2,0 -;3,3,0x57b01500,2,0 -;3,5,0x57b01200,2,0 -;3,6,0x57b01000,2,0 -;3,7,0x57b01100,2,0 -; -;1,11,2,1,3 -;2,1,0,0,11,3 -;2,3,0,13,0,2 -;2,4,0,0,1,3 -;2,5,1,3,0,0 -;2,7,1,3,0,0 -;2,8,0,3,1,3 -;2,13,0,0,1,13 -;2,14,1,13,0,0 -;3,0,0x57b01380,2,1 -;3,1,0x57b01280,2,1 -;3,3,0x57b01580,2,1 -;3,4,0x57b01680,2,1 -;3,5,0x57b01480,2,1 -;3,7,0x57b01180,2,1 -;3,8,0x57b01080,2,1 -; -;1,1,3,2,13 -;2,1,0,0,1,3 -;2,3,0,0,1,3 -;2,4,1,3,0,0 -;2,5,2,0,11,0 -;2,7,1,13,0,0 -;2,8,1,3,1,0 -;2,16,0,0,11,3 -;2,17,11,3,0,0 -;3,0,0x57b01300,3,0 -;3,1,0x57b01100,3,0 -;3,3,0x57b01400,3,0 -;3,4,0x57b01600,3,0 -;3,5,0x57b01500,3,0 -;3,7,0x57b01200,3,0 -;3,8,0x57b01000,3,0 -; -;1,2,1,3,11 -;2,1,13,0,2,0 -;2,2,0,1,3,0 -;2,3,3,0,0,1 -;2,5,3,0,0,1 -;2,6,3,1,3,0 -;2,7,0,11,3,0 -;2,9,0,1,13,0 -;2,10,13,0,0,1 -;3,0,0x57b01380,3,1 -;3,1,0x57b01580,3,1 -;3,2,0x57b01680,3,1 -;3,3,0x57b01480,3,1 -;3,5,0x57b01180,3,1 -;3,6,0x57b01080,3,1 -;3,7,0x57b01280,3,1 +1,13,1,3,2 +2,1,0,1,13,0 +2,2,0,1,3,1 +2,3,3,0,0,1 +2,5,3,0,0,1 +2,6,0,1,3,0 +2,7,0,2,0,11 +2,20,3,0,0,11 +2,21,0,11,3,0 +3,0,0x57b01300,0,0 +3,1,0x57b01200,0,0 +3,2,0x57b01000,0,0 +3,3,0x57b01100,0,0 +3,5,0x57b01400,0,0 +3,6,0x57b01600,0,0 +3,7,0x57b01500,0,0 +; +1,1,3,11,2 +2,1,0,0,1,3 +2,3,0,0,1,3 +2,4,1,3,0,3 +2,5,11,3,0,0 +2,7,0,2,0,13 +2,8,1,3,0,0 +2,21,1,13,0,0 +2,22,0,0,1,13 +3,0,0x57b01380,0,1 +3,1,0x57b01480,0,1 +3,3,0x57b01180,0,1 +3,4,0x57b01080,0,1 +3,5,0x57b01280,0,1 +3,7,0x57b01580,0,1 +3,8,0x57b01680,0,1 +; +1,2,13,1,3 +2,1,11,0,2,0 +2,3,0,0,1,13 +2,4,1,0,1,3 +2,5,1,3,0,0 +2,7,1,3,0,0 +2,8,0,0,1,3 +2,9,0,0,11,3 +2,24,11,3,0,0 +3,0,0x57b01300,1,0 +3,1,0x57b01500,1,0 +3,3,0x57b01200,1,0 +3,4,0x57b01000,1,0 +3,5,0x57b01100,1,0 +3,7,0x57b01400,1,0 +3,8,0x57b01600,1,0 +; +1,3,11,2,1 +2,1,0,1,3,0 +2,2,3,0,3,1 +2,3,3,0,0,11 +2,5,2,0,13,0 +2,6,3,0,0,1 +2,7,0,1,3,0 +2,17,13,0,0,1 +2,18,0,1,13,0 +3,0,0x57b01380,1,1 +3,1,0x57b01180,1,1 +3,2,0x57b01080,1,1 +3,3,0x57b01280,1,1 +3,5,0x57b01580,1,1 +3,6,0x57b01680,1,1 +3,7,0x57b01480,1,1 +; +1,3,2,13,1 +2,1,0,1,3,0 +2,2,3,0,0,1 +2,3,0,11,0,2 +2,5,13,0,0,1 +2,6,3,1,0,1 +2,7,0,1,3,0 +2,12,0,11,3,0 +2,13,3,0,0,11 +3,0,0x57b01300,2,0 +3,1,0x57b01400,2,0 +3,2,0x57b01600,2,0 +3,3,0x57b01500,2,0 +3,5,0x57b01200,2,0 +3,6,0x57b01000,2,0 +3,7,0x57b01100,2,0 +; +1,11,2,1,3 +2,1,0,0,11,3 +2,3,0,13,0,2 +2,4,0,0,1,3 +2,5,1,3,0,0 +2,7,1,3,0,0 +2,8,0,3,1,3 +2,13,0,0,1,13 +2,14,1,13,0,0 +3,0,0x57b01380,2,1 +3,1,0x57b01280,2,1 +3,3,0x57b01580,2,1 +3,4,0x57b01680,2,1 +3,5,0x57b01480,2,1 +3,7,0x57b01180,2,1 +3,8,0x57b01080,2,1 +; +1,1,3,2,13 +2,1,0,0,1,3 +2,3,0,0,1,3 +2,4,1,3,0,0 +2,5,2,0,11,0 +2,7,1,13,0,0 +2,8,1,3,1,0 +2,16,0,0,11,3 +2,17,11,3,0,0 +3,0,0x57b01300,3,0 +3,1,0x57b01100,3,0 +3,3,0x57b01400,3,0 +3,4,0x57b01600,3,0 +3,5,0x57b01500,3,0 +3,7,0x57b01200,3,0 +3,8,0x57b01000,3,0 +; +1,2,1,3,11 +2,1,13,0,2,0 +2,2,0,1,3,0 +2,3,3,0,0,1 +2,5,3,0,0,1 +2,6,3,1,3,0 +2,7,0,11,3,0 +2,9,0,1,13,0 +2,10,13,0,0,1 +3,0,0x57b01380,3,1 +3,1,0x57b01580,3,1 +3,2,0x57b01680,3,1 +3,3,0x57b01480,3,1 +3,5,0x57b01180,3,1 +3,6,0x57b01080,3,1 +3,7,0x57b01280,3,1 ;-----End Draggable R3 A1 diagonal OUTSIDE (RHW-2 --> MIS / RHW-2)-----