diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_A1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_A1_Branch_RHD.txt index cce7f3b04..86a2b1b48 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_A1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_A1_Branch_RHD.txt @@ -858,10 +858,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57860380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57860380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57860300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57860300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57860380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57860380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57860300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57860300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57860380,1,1,0x57602400,3,0=0x57860380,1,1,0x5702D000,1,1 @@ -1789,10 +1789,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57860399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57860399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57860319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57860319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57860399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57860399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57860319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57860319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57860399,1,1,0x57602400,3,0=0x57860399,1,1,0x5712D000,1,1 @@ -2753,10 +2753,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578603A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x578603A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57860329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57860329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x578603A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x578603A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57860329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57860329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x578603A9,1,1,0x57602400,3,0=0x578603A9,1,1,0x5722D000,1,1 @@ -3748,10 +3748,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578603B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x578603B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57860339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57860339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x578603B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x578603B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57860339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57860339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x578603B9,1,1,0x57602400,3,0=0x578603B9,1,1,0x5732D000,1,1 @@ -4747,10 +4747,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578603C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x578603C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57860349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57860349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x578603C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x578603C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57860349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57860349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x578603C9,1,1,0x57602400,3,0=0x578603C9,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_A3_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_A3_Branch_RHD.txt index 266c12654..e8c4c65f0 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_A3_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_A3_Branch_RHD.txt @@ -1,13 +1,13 @@ ;RHW-8S Type A3 Branch Continuation Adjacency Code ;RHD Version -0x57460880,1,1,0x57000000,1,0=0x57460880,1,1,0x57040000,1,0; conflicting-override -0x57460880,1,1,0x57000000,3,0=0x57460880,1,1,0x57040000,1,0; conflicting-override -0x57460800,3,0,0x57000000,1,0=0x57460800,3,0,0x57040000,3,0; conflicting-override -0x57460800,3,0,0x57000000,3,0=0x57460800,3,0,0x57040000,3,0; conflicting-override -0x57460880,1,1,0x57000000,1,1=0x57460880,1,1,0x57040000,1,0; conflicting-override -0x57460880,1,1,0x57000000,3,1=0x57460880,1,1,0x57040000,1,0; conflicting-override -0x57460800,3,0,0x57000000,1,1=0x57460800,3,0,0x57040000,3,0; conflicting-override -0x57460800,3,0,0x57000000,3,1=0x57460800,3,0,0x57040000,3,0; conflicting-override +0x57460880,1,1,0x57000000,1,0=0x57460880,1,1,0x57040000,1,0 +0x57460880,1,1,0x57000000,3,0=0x57460880,1,1,0x57040000,1,0 +0x57460800,3,0,0x57000000,1,0=0x57460800,3,0,0x57040000,3,0 +0x57460800,3,0,0x57000000,3,0=0x57460800,3,0,0x57040000,3,0 +0x57460880,1,1,0x57000000,1,1=0x57460880,1,1,0x57040000,1,0 +0x57460880,1,1,0x57000000,3,1=0x57460880,1,1,0x57040000,1,0 +0x57460800,3,0,0x57000000,1,1=0x57460800,3,0,0x57040000,3,0 +0x57460800,3,0,0x57000000,3,1=0x57460800,3,0,0x57040000,3,0 0x57460880,1,1,0x57000100,1,0=0x57460880,1,1,0x57040100,1,0 0x57460800,3,0,0x57000100,1,0=0x57460800,3,0,0x57040100,3,1 0x57460880,1,1,0x57000400,3,0=0x57460880,1,1,0x57040B00,3,0 @@ -348,14 +348,14 @@ 0x57460880,1,1,0x5700FA00,3,0=0x57460880,1,1,0x5704FA00,1,0 0x57460800,3,0,0x5700FA00,1,0=0x57460800,3,0,0x5704FA00,3,0 0x57460800,3,0,0x5700FA00,3,0=0x57460800,3,0,0x5704FA00,3,0 -0x57460899,1,1,0x57000000,1,0=0x57460899,1,1,0x57140000,1,0; conflicting-override -0x57460899,1,1,0x57000000,3,0=0x57460899,1,1,0x57140000,1,0; conflicting-override -0x57460819,3,0,0x57000000,1,0=0x57460819,3,0,0x57140000,3,0; conflicting-override -0x57460819,3,0,0x57000000,3,0=0x57460819,3,0,0x57140000,3,0; conflicting-override -0x57460899,1,1,0x57000000,1,1=0x57460899,1,1,0x57140000,1,0; conflicting-override -0x57460899,1,1,0x57000000,3,1=0x57460899,1,1,0x57140000,1,0; conflicting-override -0x57460819,3,0,0x57000000,1,1=0x57460819,3,0,0x57140000,3,0; conflicting-override -0x57460819,3,0,0x57000000,3,1=0x57460819,3,0,0x57140000,3,0; conflicting-override +0x57460899,1,1,0x57000000,1,0=0x57460899,1,1,0x57140000,1,0 +0x57460899,1,1,0x57000000,3,0=0x57460899,1,1,0x57140000,1,0 +0x57460819,3,0,0x57000000,1,0=0x57460819,3,0,0x57140000,3,0 +0x57460819,3,0,0x57000000,3,0=0x57460819,3,0,0x57140000,3,0 +0x57460899,1,1,0x57000000,1,1=0x57460899,1,1,0x57140000,1,0 +0x57460899,1,1,0x57000000,3,1=0x57460899,1,1,0x57140000,1,0 +0x57460819,3,0,0x57000000,1,1=0x57460819,3,0,0x57140000,3,0 +0x57460819,3,0,0x57000000,3,1=0x57460819,3,0,0x57140000,3,0 0x57460899,1,1,0x57000100,1,0=0x57460899,1,1,0x57140100,1,0 0x57460819,3,0,0x57000100,1,0=0x57460819,3,0,0x57140100,3,1 0x57460899,1,1,0x57000400,3,0=0x57460899,1,1,0x57140B00,3,0 @@ -914,14 +914,14 @@ 0x574608A9,1,1,0x5E600B00,3,0=0x574608A9,1,1,0x5E600B29,3,0 0x57460829,3,0,0x5E600B00,1,0=0x57460829,3,0,0x5E600B29,1,0 0x57460829,3,0,0x5E600B00,3,0=0x57460829,3,0,0x5E600B29,3,0 -0x574608A9,1,1,0x57000000,1,0=0x574608A9,1,1,0x57240000,1,0; conflicting-override -0x574608A9,1,1,0x57000000,3,0=0x574608A9,1,1,0x57240000,1,0; conflicting-override -0x57460829,3,0,0x57000000,1,0=0x57460829,3,0,0x57240000,3,0; conflicting-override -0x57460829,3,0,0x57000000,3,0=0x57460829,3,0,0x57240000,3,0; conflicting-override -0x574608A9,1,1,0x57000000,1,1=0x574608A9,1,1,0x57240000,1,0; conflicting-override -0x574608A9,1,1,0x57000000,3,1=0x574608A9,1,1,0x57240000,1,0; conflicting-override -0x57460829,3,0,0x57000000,1,1=0x57460829,3,0,0x57240000,3,0; conflicting-override -0x57460829,3,0,0x57000000,3,1=0x57460829,3,0,0x57240000,3,0; conflicting-override +0x574608A9,1,1,0x57000000,1,0=0x574608A9,1,1,0x57240000,1,0 +0x574608A9,1,1,0x57000000,3,0=0x574608A9,1,1,0x57240000,1,0 +0x57460829,3,0,0x57000000,1,0=0x57460829,3,0,0x57240000,3,0 +0x57460829,3,0,0x57000000,3,0=0x57460829,3,0,0x57240000,3,0 +0x574608A9,1,1,0x57000000,1,1=0x574608A9,1,1,0x57240000,1,0 +0x574608A9,1,1,0x57000000,3,1=0x574608A9,1,1,0x57240000,1,0 +0x57460829,3,0,0x57000000,1,1=0x57460829,3,0,0x57240000,3,0 +0x57460829,3,0,0x57000000,3,1=0x57460829,3,0,0x57240000,3,0 0x574608A9,1,1,0x57000100,1,0=0x574608A9,1,1,0x57240100,1,0 0x57460829,3,0,0x57000100,1,0=0x57460829,3,0,0x57240100,3,1 0x574608A9,1,1,0x57000400,3,0=0x574608A9,1,1,0x57240B00,3,0 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_D1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_D1_Branch_RHD.txt index a9beafe4b..dc4ce4bc0 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_D1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_D1_Branch_RHD.txt @@ -858,10 +858,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57863380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57863380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57863300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57863300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57863380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57863380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57863300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57863300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57863380,1,1,0x57602400,3,0=0x57863380,1,1,0x5702D000,1,1 @@ -1789,10 +1789,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57863399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57863399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57863319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57863319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57863399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57863399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57863319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57863319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57863399,1,1,0x57602400,3,0=0x57863399,1,1,0x5712D000,1,1 @@ -2753,10 +2753,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578633A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x578633A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57863329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57863329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x578633A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x578633A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57863329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57863329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x578633A9,1,1,0x57602400,3,0=0x578633A9,1,1,0x5722D000,1,1 @@ -3748,10 +3748,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578633B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x578633B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57863339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57863339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x578633B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x578633B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57863339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57863339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x578633B9,1,1,0x57602400,3,0=0x578633B9,1,1,0x5732D000,1,1 @@ -4747,10 +4747,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578633C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x578633C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57863349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57863349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x578633C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x578633C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57863349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57863349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x578633C9,1,1,0x57602400,3,0=0x578633C9,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_D3_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_D3_Branch_RHD.txt index c5550096e..403276e41 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_D3_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_D3_Branch_RHD.txt @@ -1,13 +1,13 @@ ;RHW-8S Type D3 Branch Continuation Adjacency Code ;RHD Version -0x57463880,1,1,0x57000000,1,0=0x57463880,1,1,0x57040000,1,0; conflicting-override -0x57463880,1,1,0x57000000,3,0=0x57463880,1,1,0x57040000,1,0; conflicting-override -0x57463800,3,0,0x57000000,1,0=0x57463800,3,0,0x57040000,3,0; conflicting-override -0x57463800,3,0,0x57000000,3,0=0x57463800,3,0,0x57040000,3,0; conflicting-override -0x57463880,1,1,0x57000000,1,1=0x57463880,1,1,0x57040000,1,0; conflicting-override -0x57463880,1,1,0x57000000,3,1=0x57463880,1,1,0x57040000,1,0; conflicting-override -0x57463800,3,0,0x57000000,1,1=0x57463800,3,0,0x57040000,3,0; conflicting-override -0x57463800,3,0,0x57000000,3,1=0x57463800,3,0,0x57040000,3,0; conflicting-override +0x57463880,1,1,0x57000000,1,0=0x57463880,1,1,0x57040000,1,0 +0x57463880,1,1,0x57000000,3,0=0x57463880,1,1,0x57040000,1,0 +0x57463800,3,0,0x57000000,1,0=0x57463800,3,0,0x57040000,3,0 +0x57463800,3,0,0x57000000,3,0=0x57463800,3,0,0x57040000,3,0 +0x57463880,1,1,0x57000000,1,1=0x57463880,1,1,0x57040000,1,0 +0x57463880,1,1,0x57000000,3,1=0x57463880,1,1,0x57040000,1,0 +0x57463800,3,0,0x57000000,1,1=0x57463800,3,0,0x57040000,3,0 +0x57463800,3,0,0x57000000,3,1=0x57463800,3,0,0x57040000,3,0 0x57463880,1,1,0x57000100,1,0=0x57463880,1,1,0x57040100,1,0 0x57463800,3,0,0x57000100,1,0=0x57463800,3,0,0x57040100,3,1 0x57463880,1,1,0x57000400,3,0=0x57463880,1,1,0x57040B00,3,0 @@ -348,14 +348,14 @@ 0x57463880,1,1,0x5700FA00,3,0=0x57463880,1,1,0x5704FA00,1,0 0x57463800,3,0,0x5700FA00,1,0=0x57463800,3,0,0x5704FA00,3,0 0x57463800,3,0,0x5700FA00,3,0=0x57463800,3,0,0x5704FA00,3,0 -0x57463899,1,1,0x57000000,1,0=0x57463899,1,1,0x57140000,1,0; conflicting-override -0x57463899,1,1,0x57000000,3,0=0x57463899,1,1,0x57140000,1,0; conflicting-override -0x57463819,3,0,0x57000000,1,0=0x57463819,3,0,0x57140000,3,0; conflicting-override -0x57463819,3,0,0x57000000,3,0=0x57463819,3,0,0x57140000,3,0; conflicting-override -0x57463899,1,1,0x57000000,1,1=0x57463899,1,1,0x57140000,1,0; conflicting-override -0x57463899,1,1,0x57000000,3,1=0x57463899,1,1,0x57140000,1,0; conflicting-override -0x57463819,3,0,0x57000000,1,1=0x57463819,3,0,0x57140000,3,0; conflicting-override -0x57463819,3,0,0x57000000,3,1=0x57463819,3,0,0x57140000,3,0; conflicting-override +0x57463899,1,1,0x57000000,1,0=0x57463899,1,1,0x57140000,1,0 +0x57463899,1,1,0x57000000,3,0=0x57463899,1,1,0x57140000,1,0 +0x57463819,3,0,0x57000000,1,0=0x57463819,3,0,0x57140000,3,0 +0x57463819,3,0,0x57000000,3,0=0x57463819,3,0,0x57140000,3,0 +0x57463899,1,1,0x57000000,1,1=0x57463899,1,1,0x57140000,1,0 +0x57463899,1,1,0x57000000,3,1=0x57463899,1,1,0x57140000,1,0 +0x57463819,3,0,0x57000000,1,1=0x57463819,3,0,0x57140000,3,0 +0x57463819,3,0,0x57000000,3,1=0x57463819,3,0,0x57140000,3,0 0x57463899,1,1,0x57000100,1,0=0x57463899,1,1,0x57140100,1,0 0x57463819,3,0,0x57000100,1,0=0x57463819,3,0,0x57140100,3,1 0x57463899,1,1,0x57000400,3,0=0x57463899,1,1,0x57140B00,3,0 @@ -914,14 +914,14 @@ 0x574638A9,1,1,0x5E600B00,3,0=0x574638A9,1,1,0x5E600B29,3,0 0x57463829,3,0,0x5E600B00,1,0=0x57463829,3,0,0x5E600B29,1,0 0x57463829,3,0,0x5E600B00,3,0=0x57463829,3,0,0x5E600B29,3,0 -0x574638A9,1,1,0x57000000,1,0=0x574638A9,1,1,0x57240000,1,0; conflicting-override -0x574638A9,1,1,0x57000000,3,0=0x574638A9,1,1,0x57240000,1,0; conflicting-override -0x57463829,3,0,0x57000000,1,0=0x57463829,3,0,0x57240000,3,0; conflicting-override -0x57463829,3,0,0x57000000,3,0=0x57463829,3,0,0x57240000,3,0; conflicting-override -0x574638A9,1,1,0x57000000,1,1=0x574638A9,1,1,0x57240000,1,0; conflicting-override -0x574638A9,1,1,0x57000000,3,1=0x574638A9,1,1,0x57240000,1,0; conflicting-override -0x57463829,3,0,0x57000000,1,1=0x57463829,3,0,0x57240000,3,0; conflicting-override -0x57463829,3,0,0x57000000,3,1=0x57463829,3,0,0x57240000,3,0; conflicting-override +0x574638A9,1,1,0x57000000,1,0=0x574638A9,1,1,0x57240000,1,0 +0x574638A9,1,1,0x57000000,3,0=0x574638A9,1,1,0x57240000,1,0 +0x57463829,3,0,0x57000000,1,0=0x57463829,3,0,0x57240000,3,0 +0x57463829,3,0,0x57000000,3,0=0x57463829,3,0,0x57240000,3,0 +0x574638A9,1,1,0x57000000,1,1=0x574638A9,1,1,0x57240000,1,0 +0x574638A9,1,1,0x57000000,3,1=0x574638A9,1,1,0x57240000,1,0 +0x57463829,3,0,0x57000000,1,1=0x57463829,3,0,0x57240000,3,0 +0x57463829,3,0,0x57000000,3,1=0x57463829,3,0,0x57240000,3,0 0x574638A9,1,1,0x57000100,1,0=0x574638A9,1,1,0x57240100,1,0 0x57463829,3,0,0x57000100,1,0=0x57463829,3,0,0x57240100,3,1 0x574638A9,1,1,0x57000400,3,0=0x574638A9,1,1,0x57240B00,3,0 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_E1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_E1_Branch_RHD.txt index 31b1db13e..db7df9311 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_E1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_E1_Branch_RHD.txt @@ -836,8 +836,8 @@ ;02 to R3 0x57864500,2,0,0x57906800,1,0=0x57864500,2,0,0x57926800,1,0 0x57864580,0,1,0x57906800,3,1=0x57864580,0,1,0x57926800,3,1 -0x57864E00,2,0,0x57906800,1,0=0x57864500,2,0,0x57926880,1,0; conflicting-override -0x57864E80,0,1,0x57906800,3,1=0x57864580,0,1,0x57926880,3,1; conflicting-override +0x57864E00,2,0,0x57906800,1,0=0x57864500,2,0,0x57926880,1,0 +0x57864E80,0,1,0x57906800,3,1=0x57864580,0,1,0x57926880,3,1 ;02 to R4 0x57864E80,0,1,0x57907b00,2,0=0x57864E80,0,1,0x57927b00,2,0 0x57864E00,2,0,0x57907b00,0,1=0x57864E00,2,0,0x57927b00,0,1 @@ -1723,8 +1723,8 @@ ;02 to R3 0x57864519,2,0,0x57906800,1,0=0x57864519,2,0,0x57926815,1,0 0x57864599,0,1,0x57906800,3,1=0x57864599,0,1,0x57926815,3,1 -0x57864E19,2,0,0x57906800,1,0=0x57864519,2,0,0x57926895,1,0; conflicting-override -0x57864E99,0,1,0x57906800,3,1=0x57864599,0,1,0x57926895,3,1; conflicting-override +0x57864E19,2,0,0x57906800,1,0=0x57864519,2,0,0x57926895,1,0 +0x57864E99,0,1,0x57906800,3,1=0x57864599,0,1,0x57926895,3,1 ;02 to R4 0x57864E99,0,1,0x57907b00,2,0=0x57864E99,0,1,0x57927b15,2,0 0x57864E19,2,0,0x57907b00,0,1=0x57864E19,2,0,0x57927b15,0,1 @@ -2590,8 +2590,8 @@ ;02 to R3 0x57864529,2,0,0x57906800,1,0=0x57864529,2,0,0x57926825,1,0 0x578645A9,0,1,0x57906800,3,1=0x578645A9,0,1,0x57926825,3,1 -0x57864E29,2,0,0x57906800,1,0=0x57864529,2,0,0x579268A5,1,0; conflicting-override -0x57864EA9,0,1,0x57906800,3,1=0x578645A9,0,1,0x579268A5,3,1; conflicting-override +0x57864E29,2,0,0x57906800,1,0=0x57864529,2,0,0x579268A5,1,0 +0x57864EA9,0,1,0x57906800,3,1=0x578645A9,0,1,0x579268A5,3,1 ;02 to R4 0x57864EA9,0,1,0x57907b00,2,0=0x57864EA9,0,1,0x57927b25,2,0 0x57864E29,2,0,0x57907b00,0,1=0x57864E29,2,0,0x57927b25,0,1 @@ -3488,8 +3488,8 @@ ;02 to R3 0x57864539,2,0,0x57906800,1,0=0x57864539,2,0,0x57926835,1,0 0x578645B9,0,1,0x57906800,3,1=0x578645B9,0,1,0x57926835,3,1 -0x57864E39,2,0,0x57906800,1,0=0x57864539,2,0,0x579268B5,1,0; conflicting-override -0x57864EB9,0,1,0x57906800,3,1=0x578645B9,0,1,0x579268B5,3,1; conflicting-override +0x57864E39,2,0,0x57906800,1,0=0x57864539,2,0,0x579268B5,1,0 +0x57864EB9,0,1,0x57906800,3,1=0x578645B9,0,1,0x579268B5,3,1 ;02 to R4 0x57864EB9,0,1,0x57907b00,2,0=0x57864EB9,0,1,0x57927b35,2,0 0x57864E39,2,0,0x57907b00,0,1=0x57864E39,2,0,0x57927b35,0,1 @@ -4386,8 +4386,8 @@ ;02 to R3 0x57864549,2,0,0x57906800,1,0=0x57864549,2,0,0x57926845,1,0 0x578645C9,0,1,0x57906800,3,1=0x578645C9,0,1,0x57926845,3,1 -0x57864E49,2,0,0x57906800,1,0=0x57864549,2,0,0x579268C5,1,0; conflicting-override -0x57864EC9,0,1,0x57906800,3,1=0x578645C9,0,1,0x579268C5,3,1; conflicting-override +0x57864E49,2,0,0x57906800,1,0=0x57864549,2,0,0x579268C5,1,0 +0x57864EC9,0,1,0x57906800,3,1=0x578645C9,0,1,0x579268C5,3,1 ;02 to R4 0x57864EC9,0,1,0x57907b00,2,0=0x57864EC9,0,1,0x57927b45,2,0 0x57864E49,2,0,0x57907b00,0,1=0x57864E49,2,0,0x57927b45,0,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_12S_A1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_12S_A1_Branch_RHD.txt index 82ecaecc6..786f2beec 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_12S_A1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_12S_A1_Branch_RHD.txt @@ -858,10 +858,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57870380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57870380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57870300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57870300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57870380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57870380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57870300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57870300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57870380,1,1,0x57602400,3,0=0x57870380,1,1,0x5702D000,1,1 @@ -1789,10 +1789,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57870399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57870399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57870319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57870319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57870399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57870399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57870319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57870319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57870399,1,1,0x57602400,3,0=0x57870399,1,1,0x5712D000,1,1 @@ -2753,10 +2753,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578703A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x578703A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57870329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57870329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x578703A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x578703A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57870329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57870329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x578703A9,1,1,0x57602400,3,0=0x578703A9,1,1,0x5722D000,1,1 @@ -3748,10 +3748,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578703B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x578703B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57870339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57870339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x578703B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x578703B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57870339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57870339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x578703B9,1,1,0x57602400,3,0=0x578703B9,1,1,0x5732D000,1,1 @@ -4747,10 +4747,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578703C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x578703C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57870349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57870349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x578703C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x578703C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57870349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57870349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x578703C9,1,1,0x57602400,3,0=0x578703C9,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_12S_A3_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_12S_A3_Branch_RHD.txt index cc5cf21f5..d3fba0a10 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_12S_A3_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_12S_A3_Branch_RHD.txt @@ -1,13 +1,13 @@ ;RHW-8S Type A3 Branch Continuation Adjacency Code ;RHD Version -0x57470880,1,1,0x57000000,1,0=0x57470880,1,1,0x57040000,1,0; conflicting-override -0x57470880,1,1,0x57000000,3,0=0x57470880,1,1,0x57040000,1,0; conflicting-override -0x57470800,3,0,0x57000000,1,0=0x57470800,3,0,0x57040000,3,0; conflicting-override -0x57470800,3,0,0x57000000,3,0=0x57470800,3,0,0x57040000,3,0; conflicting-override -0x57470880,1,1,0x57000000,1,1=0x57470880,1,1,0x57040000,1,0; conflicting-override -0x57470880,1,1,0x57000000,3,1=0x57470880,1,1,0x57040000,1,0; conflicting-override -0x57470800,3,0,0x57000000,1,1=0x57470800,3,0,0x57040000,3,0; conflicting-override -0x57470800,3,0,0x57000000,3,1=0x57470800,3,0,0x57040000,3,0; conflicting-override +0x57470880,1,1,0x57000000,1,0=0x57470880,1,1,0x57040000,1,0 +0x57470880,1,1,0x57000000,3,0=0x57470880,1,1,0x57040000,1,0 +0x57470800,3,0,0x57000000,1,0=0x57470800,3,0,0x57040000,3,0 +0x57470800,3,0,0x57000000,3,0=0x57470800,3,0,0x57040000,3,0 +0x57470880,1,1,0x57000000,1,1=0x57470880,1,1,0x57040000,1,0 +0x57470880,1,1,0x57000000,3,1=0x57470880,1,1,0x57040000,1,0 +0x57470800,3,0,0x57000000,1,1=0x57470800,3,0,0x57040000,3,0 +0x57470800,3,0,0x57000000,3,1=0x57470800,3,0,0x57040000,3,0 0x57470880,1,1,0x57000100,1,0=0x57470880,1,1,0x57040100,1,0 0x57470800,3,0,0x57000100,1,0=0x57470800,3,0,0x57040100,3,1 0x57470880,1,1,0x57000400,3,0=0x57470880,1,1,0x57040B00,3,0 @@ -348,14 +348,14 @@ 0x57470880,1,1,0x5700FA00,3,0=0x57470880,1,1,0x5704FA00,1,0 0x57470800,3,0,0x5700FA00,1,0=0x57470800,3,0,0x5704FA00,3,0 0x57470800,3,0,0x5700FA00,3,0=0x57470800,3,0,0x5704FA00,3,0 -0x57470899,1,1,0x57000000,1,0=0x57470899,1,1,0x57140000,1,0; conflicting-override -0x57470899,1,1,0x57000000,3,0=0x57470899,1,1,0x57140000,1,0; conflicting-override -0x57470819,3,0,0x57000000,1,0=0x57470819,3,0,0x57140000,3,0; conflicting-override -0x57470819,3,0,0x57000000,3,0=0x57470819,3,0,0x57140000,3,0; conflicting-override -0x57470899,1,1,0x57000000,1,1=0x57470899,1,1,0x57140000,1,0; conflicting-override -0x57470899,1,1,0x57000000,3,1=0x57470899,1,1,0x57140000,1,0; conflicting-override -0x57470819,3,0,0x57000000,1,1=0x57470819,3,0,0x57140000,3,0; conflicting-override -0x57470819,3,0,0x57000000,3,1=0x57470819,3,0,0x57140000,3,0; conflicting-override +0x57470899,1,1,0x57000000,1,0=0x57470899,1,1,0x57140000,1,0 +0x57470899,1,1,0x57000000,3,0=0x57470899,1,1,0x57140000,1,0 +0x57470819,3,0,0x57000000,1,0=0x57470819,3,0,0x57140000,3,0 +0x57470819,3,0,0x57000000,3,0=0x57470819,3,0,0x57140000,3,0 +0x57470899,1,1,0x57000000,1,1=0x57470899,1,1,0x57140000,1,0 +0x57470899,1,1,0x57000000,3,1=0x57470899,1,1,0x57140000,1,0 +0x57470819,3,0,0x57000000,1,1=0x57470819,3,0,0x57140000,3,0 +0x57470819,3,0,0x57000000,3,1=0x57470819,3,0,0x57140000,3,0 0x57470899,1,1,0x57000100,1,0=0x57470899,1,1,0x57140100,1,0 0x57470819,3,0,0x57000100,1,0=0x57470819,3,0,0x57140100,3,1 0x57470899,1,1,0x57000400,3,0=0x57470899,1,1,0x57140B00,3,0 @@ -914,14 +914,14 @@ 0x574708A9,1,1,0x5E600B00,3,0=0x574708A9,1,1,0x5E600B29,3,0 0x57470829,3,0,0x5E600B00,1,0=0x57470829,3,0,0x5E600B29,1,0 0x57470829,3,0,0x5E600B00,3,0=0x57470829,3,0,0x5E600B29,3,0 -0x574708A9,1,1,0x57000000,1,0=0x574708A9,1,1,0x57240000,1,0; conflicting-override -0x574708A9,1,1,0x57000000,3,0=0x574708A9,1,1,0x57240000,1,0; conflicting-override -0x57470829,3,0,0x57000000,1,0=0x57470829,3,0,0x57240000,3,0; conflicting-override -0x57470829,3,0,0x57000000,3,0=0x57470829,3,0,0x57240000,3,0; conflicting-override -0x574708A9,1,1,0x57000000,1,1=0x574708A9,1,1,0x57240000,1,0; conflicting-override -0x574708A9,1,1,0x57000000,3,1=0x574708A9,1,1,0x57240000,1,0; conflicting-override -0x57470829,3,0,0x57000000,1,1=0x57470829,3,0,0x57240000,3,0; conflicting-override -0x57470829,3,0,0x57000000,3,1=0x57470829,3,0,0x57240000,3,0; conflicting-override +0x574708A9,1,1,0x57000000,1,0=0x574708A9,1,1,0x57240000,1,0 +0x574708A9,1,1,0x57000000,3,0=0x574708A9,1,1,0x57240000,1,0 +0x57470829,3,0,0x57000000,1,0=0x57470829,3,0,0x57240000,3,0 +0x57470829,3,0,0x57000000,3,0=0x57470829,3,0,0x57240000,3,0 +0x574708A9,1,1,0x57000000,1,1=0x574708A9,1,1,0x57240000,1,0 +0x574708A9,1,1,0x57000000,3,1=0x574708A9,1,1,0x57240000,1,0 +0x57470829,3,0,0x57000000,1,1=0x57470829,3,0,0x57240000,3,0 +0x57470829,3,0,0x57000000,3,1=0x57470829,3,0,0x57240000,3,0 0x574708A9,1,1,0x57000100,1,0=0x574708A9,1,1,0x57240100,1,0 0x57470829,3,0,0x57000100,1,0=0x57470829,3,0,0x57240100,3,1 0x574708A9,1,1,0x57000400,3,0=0x574708A9,1,1,0x57240B00,3,0 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_12S_D1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_12S_D1_Branch_RHD.txt index 89fce42d7..5d819a5e8 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_12S_D1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_12S_D1_Branch_RHD.txt @@ -858,10 +858,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57873380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57873380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57873300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57873300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57873380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57873380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57873300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57873300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57873380,1,1,0x57602400,3,0=0x57873380,1,1,0x5702D000,1,1 @@ -1789,10 +1789,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57873399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57873399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57873319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57873319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57873399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57873399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57873319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57873319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57873399,1,1,0x57602400,3,0=0x57873399,1,1,0x5712D000,1,1 @@ -2753,10 +2753,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578733A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x578733A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57873329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57873329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x578733A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x578733A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57873329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57873329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x578733A9,1,1,0x57602400,3,0=0x578733A9,1,1,0x5722D000,1,1 @@ -3748,10 +3748,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578733B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x578733B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57873339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57873339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x578733B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x578733B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57873339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57873339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x578733B9,1,1,0x57602400,3,0=0x578733B9,1,1,0x5732D000,1,1 @@ -4747,10 +4747,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578733C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x578733C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57873349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57873349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x578733C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x578733C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57873349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57873349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x578733C9,1,1,0x57602400,3,0=0x578733C9,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_12S_D3_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_12S_D3_Branch_RHD.txt index 47c34dd19..d2a38d434 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_12S_D3_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_12S_D3_Branch_RHD.txt @@ -1,13 +1,13 @@ ;RHW-8S Type D3 Branch Continuation Adjacency Code ;RHD Version -0x57473880,1,1,0x57000000,1,0=0x57473880,1,1,0x57040000,1,0; conflicting-override -0x57473880,1,1,0x57000000,3,0=0x57473880,1,1,0x57040000,1,0; conflicting-override -0x57473800,3,0,0x57000000,1,0=0x57473800,3,0,0x57040000,3,0; conflicting-override -0x57473800,3,0,0x57000000,3,0=0x57473800,3,0,0x57040000,3,0; conflicting-override -0x57473880,1,1,0x57000000,1,1=0x57473880,1,1,0x57040000,1,0; conflicting-override -0x57473880,1,1,0x57000000,3,1=0x57473880,1,1,0x57040000,1,0; conflicting-override -0x57473800,3,0,0x57000000,1,1=0x57473800,3,0,0x57040000,3,0; conflicting-override -0x57473800,3,0,0x57000000,3,1=0x57473800,3,0,0x57040000,3,0; conflicting-override +0x57473880,1,1,0x57000000,1,0=0x57473880,1,1,0x57040000,1,0 +0x57473880,1,1,0x57000000,3,0=0x57473880,1,1,0x57040000,1,0 +0x57473800,3,0,0x57000000,1,0=0x57473800,3,0,0x57040000,3,0 +0x57473800,3,0,0x57000000,3,0=0x57473800,3,0,0x57040000,3,0 +0x57473880,1,1,0x57000000,1,1=0x57473880,1,1,0x57040000,1,0 +0x57473880,1,1,0x57000000,3,1=0x57473880,1,1,0x57040000,1,0 +0x57473800,3,0,0x57000000,1,1=0x57473800,3,0,0x57040000,3,0 +0x57473800,3,0,0x57000000,3,1=0x57473800,3,0,0x57040000,3,0 0x57473880,1,1,0x57000100,1,0=0x57473880,1,1,0x57040100,1,0 0x57473800,3,0,0x57000100,1,0=0x57473800,3,0,0x57040100,3,1 0x57473880,1,1,0x57000400,3,0=0x57473880,1,1,0x57040B00,3,0 @@ -348,14 +348,14 @@ 0x57473880,1,1,0x5700FA00,3,0=0x57473880,1,1,0x5704FA00,1,0 0x57473800,3,0,0x5700FA00,1,0=0x57473800,3,0,0x5704FA00,3,0 0x57473800,3,0,0x5700FA00,3,0=0x57473800,3,0,0x5704FA00,3,0 -0x57473899,1,1,0x57000000,1,0=0x57473899,1,1,0x57140000,1,0; conflicting-override -0x57473899,1,1,0x57000000,3,0=0x57473899,1,1,0x57140000,1,0; conflicting-override -0x57473819,3,0,0x57000000,1,0=0x57473819,3,0,0x57140000,3,0; conflicting-override -0x57473819,3,0,0x57000000,3,0=0x57473819,3,0,0x57140000,3,0; conflicting-override -0x57473899,1,1,0x57000000,1,1=0x57473899,1,1,0x57140000,1,0; conflicting-override -0x57473899,1,1,0x57000000,3,1=0x57473899,1,1,0x57140000,1,0; conflicting-override -0x57473819,3,0,0x57000000,1,1=0x57473819,3,0,0x57140000,3,0; conflicting-override -0x57473819,3,0,0x57000000,3,1=0x57473819,3,0,0x57140000,3,0; conflicting-override +0x57473899,1,1,0x57000000,1,0=0x57473899,1,1,0x57140000,1,0 +0x57473899,1,1,0x57000000,3,0=0x57473899,1,1,0x57140000,1,0 +0x57473819,3,0,0x57000000,1,0=0x57473819,3,0,0x57140000,3,0 +0x57473819,3,0,0x57000000,3,0=0x57473819,3,0,0x57140000,3,0 +0x57473899,1,1,0x57000000,1,1=0x57473899,1,1,0x57140000,1,0 +0x57473899,1,1,0x57000000,3,1=0x57473899,1,1,0x57140000,1,0 +0x57473819,3,0,0x57000000,1,1=0x57473819,3,0,0x57140000,3,0 +0x57473819,3,0,0x57000000,3,1=0x57473819,3,0,0x57140000,3,0 0x57473899,1,1,0x57000100,1,0=0x57473899,1,1,0x57140100,1,0 0x57473819,3,0,0x57000100,1,0=0x57473819,3,0,0x57140100,3,1 0x57473899,1,1,0x57000400,3,0=0x57473899,1,1,0x57140B00,3,0 @@ -914,14 +914,14 @@ 0x574738A9,1,1,0x5E600B00,3,0=0x574738A9,1,1,0x5E600B29,3,0 0x57473829,3,0,0x5E600B00,1,0=0x57473829,3,0,0x5E600B29,1,0 0x57473829,3,0,0x5E600B00,3,0=0x57473829,3,0,0x5E600B29,3,0 -0x574738A9,1,1,0x57000000,1,0=0x574738A9,1,1,0x57240000,1,0; conflicting-override -0x574738A9,1,1,0x57000000,3,0=0x574738A9,1,1,0x57240000,1,0; conflicting-override -0x57473829,3,0,0x57000000,1,0=0x57473829,3,0,0x57240000,3,0; conflicting-override -0x57473829,3,0,0x57000000,3,0=0x57473829,3,0,0x57240000,3,0; conflicting-override -0x574738A9,1,1,0x57000000,1,1=0x574738A9,1,1,0x57240000,1,0; conflicting-override -0x574738A9,1,1,0x57000000,3,1=0x574738A9,1,1,0x57240000,1,0; conflicting-override -0x57473829,3,0,0x57000000,1,1=0x57473829,3,0,0x57240000,3,0; conflicting-override -0x57473829,3,0,0x57000000,3,1=0x57473829,3,0,0x57240000,3,0; conflicting-override +0x574738A9,1,1,0x57000000,1,0=0x574738A9,1,1,0x57240000,1,0 +0x574738A9,1,1,0x57000000,3,0=0x574738A9,1,1,0x57240000,1,0 +0x57473829,3,0,0x57000000,1,0=0x57473829,3,0,0x57240000,3,0 +0x57473829,3,0,0x57000000,3,0=0x57473829,3,0,0x57240000,3,0 +0x574738A9,1,1,0x57000000,1,1=0x574738A9,1,1,0x57240000,1,0 +0x574738A9,1,1,0x57000000,3,1=0x574738A9,1,1,0x57240000,1,0 +0x57473829,3,0,0x57000000,1,1=0x57473829,3,0,0x57240000,3,0 +0x57473829,3,0,0x57000000,3,1=0x57473829,3,0,0x57240000,3,0 0x574738A9,1,1,0x57000100,1,0=0x574738A9,1,1,0x57240100,1,0 0x57473829,3,0,0x57000100,1,0=0x57473829,3,0,0x57240100,3,1 0x574738A9,1,1,0x57000400,3,0=0x574738A9,1,1,0x57240B00,3,0 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_12S_E1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_12S_E1_Branch_RHD.txt index 33aa21f09..08d43c3dc 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_12S_E1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_12S_E1_Branch_RHD.txt @@ -836,8 +836,8 @@ ;02 to R3 0x57874500,2,0,0x57906800,1,0=0x57874500,2,0,0x57926800,1,0 0x57874580,0,1,0x57906800,3,1=0x57874580,0,1,0x57926800,3,1 -0x57874E00,2,0,0x57906800,1,0=0x57874500,2,0,0x57926880,1,0; conflicting-override -0x57874E80,0,1,0x57906800,3,1=0x57874580,0,1,0x57926880,3,1; conflicting-override +0x57874E00,2,0,0x57906800,1,0=0x57874500,2,0,0x57926880,1,0 +0x57874E80,0,1,0x57906800,3,1=0x57874580,0,1,0x57926880,3,1 ;02 to R4 0x57874E80,0,1,0x57907b00,2,0=0x57874E80,0,1,0x57927b00,2,0 0x57874E00,2,0,0x57907b00,0,1=0x57874E00,2,0,0x57927b00,0,1 @@ -1723,8 +1723,8 @@ ;02 to R3 0x57874519,2,0,0x57906800,1,0=0x57874519,2,0,0x57926815,1,0 0x57874599,0,1,0x57906800,3,1=0x57874599,0,1,0x57926815,3,1 -0x57874E19,2,0,0x57906800,1,0=0x57874519,2,0,0x57926895,1,0; conflicting-override -0x57874E99,0,1,0x57906800,3,1=0x57874599,0,1,0x57926895,3,1; conflicting-override +0x57874E19,2,0,0x57906800,1,0=0x57874519,2,0,0x57926895,1,0 +0x57874E99,0,1,0x57906800,3,1=0x57874599,0,1,0x57926895,3,1 ;02 to R4 0x57874E99,0,1,0x57907b00,2,0=0x57874E99,0,1,0x57927b15,2,0 0x57874E19,2,0,0x57907b00,0,1=0x57874E19,2,0,0x57927b15,0,1 @@ -2590,8 +2590,8 @@ ;02 to R3 0x57874529,2,0,0x57906800,1,0=0x57874529,2,0,0x57926825,1,0 0x578745A9,0,1,0x57906800,3,1=0x578745A9,0,1,0x57926825,3,1 -0x57874E29,2,0,0x57906800,1,0=0x57874529,2,0,0x579268A5,1,0; conflicting-override -0x57874EA9,0,1,0x57906800,3,1=0x578745A9,0,1,0x579268A5,3,1; conflicting-override +0x57874E29,2,0,0x57906800,1,0=0x57874529,2,0,0x579268A5,1,0 +0x57874EA9,0,1,0x57906800,3,1=0x578745A9,0,1,0x579268A5,3,1 ;02 to R4 0x57874EA9,0,1,0x57907b00,2,0=0x57874EA9,0,1,0x57927b25,2,0 0x57874E29,2,0,0x57907b00,0,1=0x57874E29,2,0,0x57927b25,0,1 @@ -3488,8 +3488,8 @@ ;02 to R3 0x57874539,2,0,0x57906800,1,0=0x57874539,2,0,0x57926835,1,0 0x578745B9,0,1,0x57906800,3,1=0x578745B9,0,1,0x57926835,3,1 -0x57874E39,2,0,0x57906800,1,0=0x57874539,2,0,0x579268B5,1,0; conflicting-override -0x57874EB9,0,1,0x57906800,3,1=0x578745B9,0,1,0x579268B5,3,1; conflicting-override +0x57874E39,2,0,0x57906800,1,0=0x57874539,2,0,0x579268B5,1,0 +0x57874EB9,0,1,0x57906800,3,1=0x578745B9,0,1,0x579268B5,3,1 ;02 to R4 0x57874EB9,0,1,0x57907b00,2,0=0x57874EB9,0,1,0x57927b35,2,0 0x57874E39,2,0,0x57907b00,0,1=0x57874E39,2,0,0x57927b35,0,1 @@ -4386,8 +4386,8 @@ ;02 to R3 0x57874549,2,0,0x57906800,1,0=0x57874549,2,0,0x57926845,1,0 0x578745C9,0,1,0x57906800,3,1=0x578745C9,0,1,0x57926845,3,1 -0x57874E49,2,0,0x57906800,1,0=0x57874549,2,0,0x579268C5,1,0; conflicting-override -0x57874EC9,0,1,0x57906800,3,1=0x578745C9,0,1,0x579268C5,3,1; conflicting-override +0x57874E49,2,0,0x57906800,1,0=0x57874549,2,0,0x579268C5,1,0 +0x57874EC9,0,1,0x57906800,3,1=0x578745C9,0,1,0x579268C5,3,1 ;02 to R4 0x57874EC9,0,1,0x57907b00,2,0=0x57874EC9,0,1,0x57927b45,2,0 0x57874E49,2,0,0x57907b00,0,1=0x57874E49,2,0,0x57927b45,0,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_2_A1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_2_A1_Branch_RHD.txt index 7920a4a3c..d5a7a0049 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_2_A1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_2_A1_Branch_RHD.txt @@ -858,10 +858,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57800380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57800380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57800300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57800300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57800380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57800380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57800300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57800300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57800380,1,1,0x57602400,3,0=0x57800380,1,1,0x5702D000,1,1 @@ -1789,10 +1789,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57800399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57800399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57800319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57800319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57800399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57800399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57800319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57800319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57800399,1,1,0x57602400,3,0=0x57800399,1,1,0x5712D000,1,1 @@ -2753,10 +2753,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578003A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x578003A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57800329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57800329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x578003A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x578003A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57800329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57800329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x578003A9,1,1,0x57602400,3,0=0x578003A9,1,1,0x5722D000,1,1 @@ -3748,10 +3748,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578003B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x578003B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57800339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57800339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x578003B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x578003B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57800339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57800339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x578003B9,1,1,0x57602400,3,0=0x578003B9,1,1,0x5732D000,1,1 @@ -4747,10 +4747,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578003C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x578003C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57800349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57800349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x578003C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x578003C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57800349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57800349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x578003C9,1,1,0x57602400,3,0=0x578003C9,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_2_D1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_2_D1_Branch_RHD.txt index ff767aa48..336fd1355 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_2_D1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_2_D1_Branch_RHD.txt @@ -858,10 +858,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57803380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57803380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57803300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57803300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57803380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57803380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57803300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57803300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57803380,1,1,0x57602400,3,0=0x57803380,1,1,0x5702D000,1,1 @@ -1789,10 +1789,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57803399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57803399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57803319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57803319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57803399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57803399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57803319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57803319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57803399,1,1,0x57602400,3,0=0x57803399,1,1,0x5712D000,1,1 @@ -2753,10 +2753,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578033A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x578033A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57803329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57803329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x578033A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x578033A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57803329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57803329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x578033A9,1,1,0x57602400,3,0=0x578033A9,1,1,0x5722D000,1,1 @@ -3748,10 +3748,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578033B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x578033B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57803339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57803339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x578033B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x578033B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57803339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57803339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x578033B9,1,1,0x57602400,3,0=0x578033B9,1,1,0x5732D000,1,1 @@ -4747,10 +4747,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578033C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x578033C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57803349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57803349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x578033C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x578033C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57803349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57803349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x578033C9,1,1,0x57602400,3,0=0x578033C9,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_2_DiagA1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_2_DiagA1_Branch_RHD.txt index ae7643a3e..a7d3b0bdf 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_2_DiagA1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_2_DiagA1_Branch_RHD.txt @@ -863,10 +863,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57806480,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57806480,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57806400,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57806400,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57806480,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57806480,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57806400,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57806400,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57806480,1,1,0x57602400,3,0=0x57806480,1,1,0x5702D000,1,1 @@ -977,8 +977,8 @@ 0x57806499,1,1,0x57000100,1,0=0x57121100,1,0,0x57120100,1,0 0x57806419,3,0,0x57000100,1,0=0x57806419,3,0,0x57120100,3,1 ;00 to 04 (Orth-Diag) -0x57806499,1,1,0x57000400,3,0=0x57121100,1,0,0x57120B00,3,0; conflicting-override -0x57806499,1,1,0x57000400,1,1=0x57121100,1,0,0x57120400,1,1; conflicting-override +0x57806499,1,1,0x57000400,3,0=0x57121100,1,0,0x57120B00,3,0 +0x57806499,1,1,0x57000400,1,1=0x57121100,1,0,0x57120400,1,1 0x57806419,3,0,0x57000400,3,0=0x57806419,3,0,0x57120400,3,0 0x57806419,3,0,0x57000400,1,1=0x57806419,3,0,0x57120B00,1,1 ;00 to 08 (Orth 90-Curve) @@ -1315,119 +1315,119 @@ 0x57806419,3,0,0x5E600B00,3,0=0x57806419,3,0,0x5E602B19,3,0 ;----OxD Crossings---- ;00 to 40 (Street OxD) -0x57806499,1,1,0x57004000,3,0=0x57121100,1,0,0x57124080,3,0; conflicting-override +0x57806499,1,1,0x57004000,3,0=0x57121100,1,0,0x57124080,3,0 0x57806419,3,0,0x57004000,3,0=0x57806419,3,0,0x57124000,3,0 -0x57806499,1,1,0x57004000,1,1=0x57121100,1,0,0x57124000,1,1; conflicting-override +0x57806499,1,1,0x57004000,1,1=0x57121100,1,0,0x57124000,1,1 0x57806419,3,0,0x57004000,1,1=0x57806419,3,0,0x57124080,1,1 ;00 to 41 (Road OxD) -0x57806499,1,1,0x57004100,3,0=0x57121100,1,0,0x57124180,3,0; conflicting-override +0x57806499,1,1,0x57004100,3,0=0x57121100,1,0,0x57124180,3,0 0x57806419,3,0,0x57004100,3,0=0x57806419,3,0,0x57124100,3,0 -0x57806499,1,1,0x57004100,1,1=0x57121100,1,0,0x57124100,1,1; conflicting-override +0x57806499,1,1,0x57004100,1,1=0x57121100,1,0,0x57124100,1,1 0x57806419,3,0,0x57004100,1,1=0x57806419,3,0,0x57124180,1,1 ;00 to 41-1 (L1 Road OxD) -0x57806499,1,1,0x57004115,3,0=0x57121100,1,0,0x57124195,3,0; conflicting-override +0x57806499,1,1,0x57004115,3,0=0x57121100,1,0,0x57124195,3,0 0x57806419,3,0,0x57004115,3,0=0x57806419,3,0,0x57124115,3,0 -0x57806499,1,1,0x57004115,1,1=0x57121100,1,0,0x57124115,1,1; conflicting-override +0x57806499,1,1,0x57004115,1,1=0x57121100,1,0,0x57124115,1,1 0x57806419,3,0,0x57004115,1,1=0x57806419,3,0,0x57124195,1,1 ;00 to 41-2 (L2 Road OxD) -0x57806499,1,1,0x57004125,3,0=0x57121100,1,0,0x571241A5,3,0; conflicting-override +0x57806499,1,1,0x57004125,3,0=0x57121100,1,0,0x571241A5,3,0 0x57806419,3,0,0x57004125,3,0=0x57806419,3,0,0x57124125,3,0 -0x57806499,1,1,0x57004125,1,1=0x57121100,1,0,0x57124125,1,1; conflicting-override +0x57806499,1,1,0x57004125,1,1=0x57121100,1,0,0x57124125,1,1 0x57806419,3,0,0x57004125,1,1=0x57806419,3,0,0x571241A5,1,1 ;00 to 42 (One-Way Road OxD) -0x57806499,1,1,0x57004200,3,0=0x57121100,1,0,0x57124280,3,0; conflicting-override +0x57806499,1,1,0x57004200,3,0=0x57121100,1,0,0x57124280,3,0 0x57806419,3,0,0x57004200,3,0=0x57806419,3,0,0x57124200,3,0 -0x57806499,1,1,0x57004200,1,1=0x57121100,1,0,0x57124200,1,1; conflicting-override +0x57806499,1,1,0x57004200,1,1=0x57121100,1,0,0x57124200,1,1 0x57806419,3,0,0x57004200,1,1=0x57806419,3,0,0x57124280,1,1 ;00 to 42-1 (L1 One-Way Road OxD) -0x57806499,1,1,0x57004215,3,0=0x57121100,1,0,0x57124295,3,0; conflicting-override +0x57806499,1,1,0x57004215,3,0=0x57121100,1,0,0x57124295,3,0 0x57806419,3,0,0x57004215,3,0=0x57806419,3,0,0x57124215,3,0 -0x57806499,1,1,0x57004215,1,1=0x57121100,1,0,0x57124215,1,1; conflicting-override +0x57806499,1,1,0x57004215,1,1=0x57121100,1,0,0x57124215,1,1 0x57806419,3,0,0x57004215,1,1=0x57806419,3,0,0x57124295,1,1 ;00 to 42-2 (L2 One-Way Road OxD) -0x57806499,1,1,0x57004225,3,0=0x57121100,1,0,0x571242A5,3,0; conflicting-override +0x57806499,1,1,0x57004225,3,0=0x57121100,1,0,0x571242A5,3,0 0x57806419,3,0,0x57004225,3,0=0x57806419,3,0,0x57124225,3,0 -0x57806499,1,1,0x57004225,1,1=0x57121100,1,0,0x57124225,1,1; conflicting-override +0x57806499,1,1,0x57004225,1,1=0x57121100,1,0,0x57124225,1,1 0x57806419,3,0,0x57004225,1,1=0x57806419,3,0,0x571242A5,1,1 ;00 to 43 (Avenue OxD) -0x57806499,1,1,0x57004300,3,0=0x57121100,1,0,0x57124380,3,0; conflicting-override +0x57806499,1,1,0x57004300,3,0=0x57121100,1,0,0x57124380,3,0 0x57806419,3,0,0x57004300,3,0=0x57806419,3,0,0x57124300,3,0 -0x57806499,1,1,0x57004300,1,1=0x57121100,1,0,0x57124300,1,1; conflicting-override +0x57806499,1,1,0x57004300,1,1=0x57121100,1,0,0x57124300,1,1 0x57806419,3,0,0x57004300,1,1=0x57806419,3,0,0x57124380,1,1 ;00 to 43-1 (L1 Avenue OxD) -0x57806499,1,1,0x57004315,3,0=0x57121100,1,0,0x57124395,3,0; conflicting-override +0x57806499,1,1,0x57004315,3,0=0x57121100,1,0,0x57124395,3,0 0x57806419,3,0,0x57004315,3,0=0x57806419,3,0,0x57124315,3,0 -0x57806499,1,1,0x57004315,1,1=0x57121100,1,0,0x57124315,1,1; conflicting-override +0x57806499,1,1,0x57004315,1,1=0x57121100,1,0,0x57124315,1,1 0x57806419,3,0,0x57004315,1,1=0x57806419,3,0,0x57124395,1,1 ;00 to 43-2 (L2 Avenue OxD) -0x57806499,1,1,0x57004325,3,0=0x57121100,1,0,0x571243A5,3,0; conflicting-override +0x57806499,1,1,0x57004325,3,0=0x57121100,1,0,0x571243A5,3,0 0x57806419,3,0,0x57004325,3,0=0x57806419,3,0,0x57124325,3,0 -0x57806499,1,1,0x57004325,1,1=0x57121100,1,0,0x57124325,1,1; conflicting-override +0x57806499,1,1,0x57004325,1,1=0x57121100,1,0,0x57124325,1,1 0x57806419,3,0,0x57004325,1,1=0x57806419,3,0,0x571243A5,1,1 ;00 to 44 (L0 MHW OxD) -0x57806499,1,1,0x57004400,3,0=0x57121100,1,0,0x57124480,3,0; conflicting-override +0x57806499,1,1,0x57004400,3,0=0x57121100,1,0,0x57124480,3,0 0x57806419,3,0,0x57004400,3,0=0x57806419,3,0,0x57124400,3,0 -0x57806499,1,1,0x57004400,1,1=0x57121100,1,0,0x57124400,1,1; conflicting-override +0x57806499,1,1,0x57004400,1,1=0x57121100,1,0,0x57124400,1,1 0x57806419,3,0,0x57004400,1,1=0x57806419,3,0,0x57124480,1,1 ;00 to 44-2 (L2 MHW OxD) -0x57806499,1,1,0x57004420,3,0=0x57121100,1,0,0x571244A0,3,0; conflicting-override +0x57806499,1,1,0x57004420,3,0=0x57121100,1,0,0x571244A0,3,0 0x57806419,3,0,0x57004420,3,0=0x57806419,3,0,0x57124420,3,0 -0x57806499,1,1,0x57004420,1,1=0x57121100,1,0,0x57124420,1,1; conflicting-override +0x57806499,1,1,0x57004420,1,1=0x57121100,1,0,0x57124420,1,1 0x57806419,3,0,0x57004420,1,1=0x57806419,3,0,0x571244A0,1,1 ;00 to 45a (Rail DTR OxD) -0x57806499,1,1,0x57004500,3,0=0x57121100,1,0,0x57124580,3,0; conflicting-override +0x57806499,1,1,0x57004500,3,0=0x57121100,1,0,0x57124580,3,0 0x57806419,3,0,0x57004500,3,0=0x57806419,3,0,0x57124500,3,0 -0x57806499,1,1,0x57004500,1,1=0x57121100,1,0,0x57124500,1,1; conflicting-override +0x57806499,1,1,0x57004500,1,1=0x57121100,1,0,0x57124500,1,1 0x57806419,3,0,0x57004500,1,1=0x57806419,3,0,0x57124580,1,1 ;00 to 45-2a (L2 Rail DTR OxD) -0x57806499,1,1,0x5D777A00,1,0=0x57121100,1,0,0x5D777C90,1,0; conflicting-override +0x57806499,1,1,0x5D777A00,1,0=0x57121100,1,0,0x5D777C90,1,0 0x57806419,3,0,0x5D777A00,1,0=0x57806419,3,0,0x5D777C10,1,0 -0x57806499,1,1,0x5D777A00,3,1=0x57121100,1,0,0x5D777C10,3,1; conflicting-override +0x57806499,1,1,0x5D777A00,3,1=0x57121100,1,0,0x5D777C10,3,1 0x57806419,3,0,0x5D777A00,3,1=0x57806419,3,0,0x5D777C90,3,1 ;00 to 45b (Rail STR OxD) -0x57806499,1,1,0x57004509,3,0=0x57121100,1,0,0x57124585,3,0; conflicting-override +0x57806499,1,1,0x57004509,3,0=0x57121100,1,0,0x57124585,3,0 0x57806419,3,0,0x57004509,3,0=0x57806419,3,0,0x57124505,3,0 -0x57806499,1,1,0x57004509,1,1=0x57121100,1,0,0x57124505,1,1; conflicting-override +0x57806499,1,1,0x57004509,1,1=0x57121100,1,0,0x57124505,1,1 0x57806419,3,0,0x57004509,1,1=0x57806419,3,0,0x57124585,1,1 ;00 to 47a (GLR 1 OxD) -0x57806499,1,1,0x57004700,3,0=0x57121100,1,0,0x57124780,3,0; conflicting-override +0x57806499,1,1,0x57004700,3,0=0x57121100,1,0,0x57124780,3,0 0x57806419,3,0,0x57004700,3,0=0x57806419,3,0,0x57124700,3,0 -0x57806499,1,1,0x57004700,1,1=0x57121100,1,0,0x57124700,1,1; conflicting-override +0x57806499,1,1,0x57004700,1,1=0x57121100,1,0,0x57124700,1,1 0x57806419,3,0,0x57004700,1,1=0x57806419,3,0,0x57124780,1,1 ;00 to 47b (GLR 2 OxD) -0x57806499,1,1,0x57004709,3,0=0x57121100,1,0,0x57124785,3,0; conflicting-override +0x57806499,1,1,0x57004709,3,0=0x57121100,1,0,0x57124785,3,0 0x57806419,3,0,0x57004709,3,0=0x57806419,3,0,0x57124705,3,0 -0x57806499,1,1,0x57004709,1,1=0x57121100,1,0,0x57124705,1,1; conflicting-override +0x57806499,1,1,0x57004709,1,1=0x57121100,1,0,0x57124705,1,1 0x57806419,3,0,0x57004709,1,1=0x57806419,3,0,0x57124785,1,1 ;00 to 47-2 (ELR OxD) -0x57806499,1,1,0x57004720,3,0=0x57121100,1,0,0x571247A0,3,0; conflicting-override +0x57806499,1,1,0x57004720,3,0=0x57121100,1,0,0x571247A0,3,0 0x57806419,3,0,0x57004720,3,0=0x57806419,3,0,0x57124720,3,0 -0x57806499,1,1,0x57004720,1,1=0x57121100,1,0,0x57124720,1,1; conflicting-override +0x57806499,1,1,0x57004720,1,1=0x57121100,1,0,0x57124720,1,1 0x57806419,3,0,0x57004720,1,1=0x57806419,3,0,0x571247A0,1,1 ;00 to 48a (GLR 3 OxD) -0x57806499,1,1,0x57004800,3,0=0x57121100,1,0,0x57124880,3,0; conflicting-override +0x57806499,1,1,0x57004800,3,0=0x57121100,1,0,0x57124880,3,0 0x57806419,3,0,0x57004800,3,0=0x57806419,3,0,0x57124800,3,0 -0x57806499,1,1,0x57004800,1,1=0x57121100,1,0,0x57124800,1,1; conflicting-override +0x57806499,1,1,0x57004800,1,1=0x57121100,1,0,0x57124800,1,1 0x57806419,3,0,0x57004800,1,1=0x57806419,3,0,0x57124880,1,1 ;00 to 48b (GLR 4 OxD) -0x57806499,1,1,0x57004809,3,0=0x57121100,1,0,0x57124885,3,0; conflicting-override +0x57806499,1,1,0x57004809,3,0=0x57121100,1,0,0x57124885,3,0 0x57806419,3,0,0x57004809,3,0=0x57806419,3,0,0x57124805,3,0 -0x57806499,1,1,0x57004809,1,1=0x57121100,1,0,0x57124805,1,1; conflicting-override +0x57806499,1,1,0x57004809,1,1=0x57121100,1,0,0x57124805,1,1 0x57806419,3,0,0x57004809,1,1=0x57806419,3,0,0x57124885,1,1 ;00 to 49b (GHSR OxD) -0x57806499,1,1,0x57004705,3,0=0x57121100,1,0,0x57124785,3,0; conflicting-override +0x57806499,1,1,0x57004705,3,0=0x57121100,1,0,0x57124785,3,0 0x57806419,3,0,0x57004705,3,0=0x57806419,3,0,0x57124705,3,0 -0x57806499,1,1,0x57004705,1,1=0x57121100,1,0,0x57124705,1,1; conflicting-override +0x57806499,1,1,0x57004705,1,1=0x57121100,1,0,0x57124705,1,1 0x57806419,3,0,0x57004705,1,1=0x57806419,3,0,0x57124785,1,1 ;00 to 49-2a (ELR OxD) -0x57806499,1,1,0x57004720,3,0=0x57121100,1,0,0x571247A0,3,0; conflicting-override +0x57806499,1,1,0x57004720,3,0=0x57121100,1,0,0x571247A0,3,0 0x57806419,3,0,0x57004720,3,0=0x57806419,3,0,0x57124720,3,0 -0x57806499,1,1,0x57004720,1,1=0x57121100,1,0,0x57124720,1,1; conflicting-override +0x57806499,1,1,0x57004720,1,1=0x57121100,1,0,0x57124720,1,1 0x57806419,3,0,0x57004720,1,1=0x57806419,3,0,0x571247A0,1,1 ;00 to 49-2b (HSR OxD) -0x57806499,1,1,0x57004725,3,0=0x57121100,1,0,0x571247A5,3,0; conflicting-override +0x57806499,1,1,0x57004725,3,0=0x57121100,1,0,0x571247A5,3,0 0x57806419,3,0,0x57004725,3,0=0x57806419,3,0,0x57124725,3,0 -0x57806499,1,1,0x57004725,1,1=0x57121100,1,0,0x57124725,1,1; conflicting-override +0x57806499,1,1,0x57004725,1,1=0x57121100,1,0,0x57124725,1,1 0x57806419,3,0,0x57004725,1,1=0x57806419,3,0,0x571247A5,1,1 ;RHW x RHW Crossings handled by Meta Code ;00 to 57 (TLA-3 OxD) @@ -1619,54 +1619,54 @@ ;0x57120000,3,0,0x57006A25,1,1=0x57120000,3,0,0x57126AA5,1,1 ;00 to 0x5E62x100 (SAM 1 OxD) ;00 to 0x5E62x200 (SAM 2 OxD) -0x57806499,1,1,0x5E620200,3,0=0x57121100,1,0,0x5E622299,3,0; conflicting-override +0x57806499,1,1,0x5E620200,3,0=0x57121100,1,0,0x5E622299,3,0 0x57806419,3,0,0x5E620200,3,0=0x57806419,3,0,0x5E622219,3,0 -0x57806499,1,1,0x5E620200,1,1=0x57121100,1,0,0x5E622219,1,1; conflicting-override +0x57806499,1,1,0x5E620200,1,1=0x57121100,1,0,0x5E622219,1,1 0x57806419,3,0,0x5E620200,1,1=0x57806419,3,0,0x5E622299,1,1 ;00 to 0x5E62x300 (SAM 3 OxD) -0x57806499,1,1,0x5E620300,3,0=0x57121100,1,0,0x5E622399,3,0; conflicting-override +0x57806499,1,1,0x5E620300,3,0=0x57121100,1,0,0x5E622399,3,0 0x57806419,3,0,0x5E620300,3,0=0x57806419,3,0,0x5E622319,3,0 -0x57806499,1,1,0x5E620300,1,1=0x57121100,1,0,0x5E622319,1,1; conflicting-override +0x57806499,1,1,0x5E620300,1,1=0x57121100,1,0,0x5E622319,1,1 0x57806419,3,0,0x5E620300,1,1=0x57806419,3,0,0x5E622399,1,1 ;00 to 0x5E62x400 (SAM 4 OxD) -0x57806499,1,1,0x5E620400,3,0=0x57121100,1,0,0x5E622499,3,0; conflicting-override +0x57806499,1,1,0x5E620400,3,0=0x57121100,1,0,0x5E622499,3,0 0x57806419,3,0,0x5E620400,3,0=0x57806419,3,0,0x5E622419,3,0 -0x57806499,1,1,0x5E620400,1,1=0x57121100,1,0,0x5E622419,1,1; conflicting-override +0x57806499,1,1,0x5E620400,1,1=0x57121100,1,0,0x5E622419,1,1 0x57806419,3,0,0x5E620400,1,1=0x57806419,3,0,0x5E622499,1,1 ;00 to 0x5E62x500 (SAM 5 OxD) -0x57806499,1,1,0x5E620500,3,0=0x57121100,1,0,0x5E622599,3,0; conflicting-override +0x57806499,1,1,0x5E620500,3,0=0x57121100,1,0,0x5E622599,3,0 0x57806419,3,0,0x5E620500,3,0=0x57806419,3,0,0x5E622519,3,0 -0x57806499,1,1,0x5E620500,1,1=0x57121100,1,0,0x5E622519,1,1; conflicting-override +0x57806499,1,1,0x5E620500,1,1=0x57121100,1,0,0x5E622519,1,1 0x57806419,3,0,0x5E620500,1,1=0x57806419,3,0,0x5E622599,1,1 ;00 to 0x5E62x600 (SAM 6 OxD) -0x57806499,1,1,0x5E620600,3,0=0x57121100,1,0,0x5E622699,3,0; conflicting-override +0x57806499,1,1,0x5E620600,3,0=0x57121100,1,0,0x5E622699,3,0 0x57806419,3,0,0x5E620600,3,0=0x57806419,3,0,0x5E622619,3,0 -0x57806499,1,1,0x5E620600,1,1=0x57121100,1,0,0x5E622619,1,1; conflicting-override +0x57806499,1,1,0x5E620600,1,1=0x57121100,1,0,0x5E622619,1,1 0x57806419,3,0,0x5E620600,1,1=0x57806419,3,0,0x5E622699,1,1 ;00 to 0x5E62x700 (SAM 7 OxD) -0x57806499,1,1,0x5E620700,3,0=0x57121100,1,0,0x5E622799,3,0; conflicting-override +0x57806499,1,1,0x5E620700,3,0=0x57121100,1,0,0x5E622799,3,0 0x57806419,3,0,0x5E620700,3,0=0x57806419,3,0,0x5E622719,3,0 -0x57806499,1,1,0x5E620700,1,1=0x57121100,1,0,0x5E622719,1,1; conflicting-override +0x57806499,1,1,0x5E620700,1,1=0x57121100,1,0,0x5E622719,1,1 0x57806419,3,0,0x5E620700,1,1=0x57806419,3,0,0x5E622799,1,1 ;00 to 0x5E62x800 (SAM 8 OxD) -0x57806499,1,1,0x5E620800,3,0=0x57121100,1,0,0x5E622899,3,0; conflicting-override +0x57806499,1,1,0x5E620800,3,0=0x57121100,1,0,0x5E622899,3,0 0x57806419,3,0,0x5E620800,3,0=0x57806419,3,0,0x5E622819,3,0 -0x57806499,1,1,0x5E620800,1,1=0x57121100,1,0,0x5E622819,1,1; conflicting-override +0x57806499,1,1,0x5E620800,1,1=0x57121100,1,0,0x5E622819,1,1 0x57806419,3,0,0x5E620800,1,1=0x57806419,3,0,0x5E622899,1,1 ;00 to 0x5E62x900 (SAM 9 OxD) -0x57806499,1,1,0x5E620900,3,0=0x57121100,1,0,0x5E622999,3,0; conflicting-override +0x57806499,1,1,0x5E620900,3,0=0x57121100,1,0,0x5E622999,3,0 0x57806419,3,0,0x5E620900,3,0=0x57806419,3,0,0x5E622919,3,0 -0x57806499,1,1,0x5E620900,1,1=0x57121100,1,0,0x5E622919,1,1; conflicting-override +0x57806499,1,1,0x5E620900,1,1=0x57121100,1,0,0x5E622919,1,1 0x57806419,3,0,0x5E620900,1,1=0x57806419,3,0,0x5E622999,1,1 ;00 to 0x5E62xA00 (SAM 10 OxD) -0x57806499,1,1,0x5E620A00,3,0=0x57121100,1,0,0x5E622A99,3,0; conflicting-override +0x57806499,1,1,0x5E620A00,3,0=0x57121100,1,0,0x5E622A99,3,0 0x57806419,3,0,0x5E620A00,3,0=0x57806419,3,0,0x5E622A19,3,0 -0x57806499,1,1,0x5E620A00,1,1=0x57121100,1,0,0x5E622A19,1,1; conflicting-override +0x57806499,1,1,0x5E620A00,1,1=0x57121100,1,0,0x5E622A19,1,1 0x57806419,3,0,0x5E620A00,1,1=0x57806419,3,0,0x5E622A99,1,1 ;00 to 0x5E62xB00 (SAM 11 OxD) -0x57806499,1,1,0x5E620B00,3,0=0x57121100,1,0,0x5E622B99,3,0; conflicting-override +0x57806499,1,1,0x5E620B00,3,0=0x57121100,1,0,0x5E622B99,3,0 0x57806419,3,0,0x5E620B00,3,0=0x57806419,3,0,0x5E622B19,3,0 -0x57806499,1,1,0x5E620B00,1,1=0x57121100,1,0,0x5E622B19,1,1; conflicting-override +0x57806499,1,1,0x5E620B00,1,1=0x57121100,1,0,0x5E622B19,1,1 0x57806419,3,0,0x5E620B00,1,1=0x57806419,3,0,0x5E622B99,1,1 ;----OxO T Crossings---- ;00 to T-00 (Street Ends) @@ -1792,21 +1792,21 @@ ;----OxD/DxO T Crossings---- ;00 to T-33 (Avenue Thru--Orth RHW+Diag Avenue) ;Short -0x57806499,1,1,0x57603300,3,0=0x57121100,1,0,0x57623390,3,0; conflicting-override +0x57806499,1,1,0x57603300,3,0=0x57121100,1,0,0x57623390,3,0 0x57806419,3,0,0x57603300,3,0=0x57806419,3,0,0x57623310,3,0 -0x57806499,1,1,0x57603300,1,1=0x57121100,1,0,0x57623310,1,1; conflicting-override +0x57806499,1,1,0x57603300,1,1=0x57121100,1,0,0x57623310,1,1 0x57806419,3,0,0x57603300,1,1=0x57806419,3,0,0x57623390,1,1 ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57806499,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57806499,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57806419,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57806419,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57806499,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57806499,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57806419,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57806419,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE -0x57806499,1,1,0x57602400,3,0=0x57121100,1,0,0x5712D000,1,1; conflicting-override -0x57806499,1,1,0x57602400,1,1=0x57121100,1,0,0x5712D080,3,0; conflicting-override +0x57806499,1,1,0x57602400,3,0=0x57121100,1,0,0x5712D000,1,1 +0x57806499,1,1,0x57602400,1,1=0x57121100,1,0,0x5712D080,3,0 0x57806419,3,0,0x57602400,3,0=0x57806419,3,0,0x5712D080,1,1 0x57806419,3,0,0x57602400,1,1=0x57806419,3,0,0x5712D000,3,0 ;Stability @@ -1824,7 +1824,7 @@ ;00 to F3 (MHW) ;Handled by RUL1 ;00 to F4 (Avenue) -0x57806499,1,1,0x5700F480,1,0=0x57121100,1,0,0x5712F480,1,0; conflicting-override +0x57806499,1,1,0x5700F480,1,0=0x57121100,1,0,0x5712F480,1,0 0x57806419,3,0,0x5700F480,3,1=0x57806419,3,0,0x5712F480,3,1 ;NWM Transitions Handled NWM-Side ;----Special---- @@ -1833,28 +1833,28 @@ ;add once elevated OWR roundabouts supported ;--MRCs-- ;R1 -0x57806499,1,1,0x57905000,0,0=0x57121100,1,0,0x57925015,0,0; conflicting-override -0x57806499,1,1,0x57905000,2,1=0x57121100,1,0,0x57925095,2,1; conflicting-override +0x57806499,1,1,0x57905000,0,0=0x57121100,1,0,0x57925015,0,0 +0x57806499,1,1,0x57905000,2,1=0x57121100,1,0,0x57925095,2,1 0x57806419,3,0,0x57905000,0,0=0x57806419,3,0,0x57925095,0,0 0x57806419,3,0,0x57905000,2,1=0x57806419,3,0,0x57925015,2,1 ;R2 -0x57806499,1,1,0x57905400,0,0=0x57121100,1,0,0x57925415,0,0; conflicting-override -0x57806499,1,1,0x57905400,2,1=0x57121100,1,0,0x57925495,2,1; conflicting-override +0x57806499,1,1,0x57905400,0,0=0x57121100,1,0,0x57925415,0,0 +0x57806499,1,1,0x57905400,2,1=0x57121100,1,0,0x57925495,2,1 0x57806419,3,0,0x57905400,0,0=0x57806419,3,0,0x57925495,0,0 0x57806419,3,0,0x57905400,2,1=0x57806419,3,0,0x57925415,2,1 ;R3 -0x57806499,1,1,0x57906000,0,0=0x57121100,1,0,0x57926015,0,0; conflicting-override -0x57806499,1,1,0x57906000,2,1=0x57121100,1,0,0x57926095,2,1; conflicting-override +0x57806499,1,1,0x57906000,0,0=0x57121100,1,0,0x57926015,0,0 +0x57806499,1,1,0x57906000,2,1=0x57121100,1,0,0x57926095,2,1 0x57806419,3,0,0x57906000,0,0=0x57806419,3,0,0x57926095,0,0 0x57806419,3,0,0x57906000,2,1=0x57806419,3,0,0x57926015,2,1 ;R4 -0x57806499,1,1,0x57907000,0,0=0x57121100,1,0,0x57927015,0,0; conflicting-override -0x57806499,1,1,0x57907000,2,1=0x57121100,1,0,0x57927095,2,1; conflicting-override +0x57806499,1,1,0x57907000,0,0=0x57121100,1,0,0x57927015,0,0 +0x57806499,1,1,0x57907000,2,1=0x57121100,1,0,0x57927095,2,1 0x57806419,3,0,0x57907000,0,0=0x57806419,3,0,0x57927095,0,0 0x57806419,3,0,0x57907000,2,1=0x57806419,3,0,0x57927015,2,1 ;R5 -0x57806499,1,1,0x57908000,0,0=0x57121100,1,0,0x57928015,0,0; conflicting-override -0x57806499,1,1,0x57908000,2,1=0x57121100,1,0,0x57928095,2,1; conflicting-override +0x57806499,1,1,0x57908000,0,0=0x57121100,1,0,0x57928015,0,0 +0x57806499,1,1,0x57908000,2,1=0x57121100,1,0,0x57928095,2,1 0x57806419,3,0,0x57908000,0,0=0x57806419,3,0,0x57928095,0,0 0x57806419,3,0,0x57908000,2,1=0x57806419,3,0,0x57928015,2,1 ;--FLEXRamp/DRIs-- @@ -2750,10 +2750,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578064A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x578064A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57806429,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57806429,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x578064A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x578064A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57806429,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57806429,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x578064A9,1,1,0x57602400,3,0=0x578064A9,1,1,0x5722D000,1,1 @@ -3750,10 +3750,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578064B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x578064B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57806439,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57806439,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x578064B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x578064B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57806439,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57806439,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x578064B9,1,1,0x57602400,3,0=0x578064B9,1,1,0x5732D000,1,1 @@ -4754,10 +4754,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578064C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x578064C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57806449,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57806449,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x578064C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x578064C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57806449,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57806449,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x578064C9,1,1,0x57602400,3,0=0x578064C9,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_2_R3_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_2_R3_Branch_RHD.txt index 2232f5947..64cbd89bc 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_2_R3_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_2_R3_Branch_RHD.txt @@ -18,12 +18,12 @@ 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; conflicting-override -0x57B01A80,1,1,0x57906100,0,0=0x57926000,0,0,0x57926100,0,0; conflicting-override +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; conflicting-override -0x57B01A80,1,1,0x57906100,2,1=0x57926080,2,1,0x57926180,2,1; conflicting-override +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 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_3a_A1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_3a_A1_Branch_RHD.txt index ceeff58ec..a760e193d 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_3a_A1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_3a_A1_Branch_RHD.txt @@ -858,10 +858,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57810380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57810380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57810300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57810300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57810380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57810380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57810300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57810300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57810380,1,1,0x57602400,3,0=0x57810380,1,1,0x5702D000,1,1 @@ -1789,10 +1789,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57810399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57810399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57810319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57810319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57810399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57810399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57810319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57810319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57810399,1,1,0x57602400,3,0=0x57810399,1,1,0x5712D000,1,1 @@ -2753,10 +2753,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578103A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x578103A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57810329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57810329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x578103A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x578103A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57810329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57810329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x578103A9,1,1,0x57602400,3,0=0x578103A9,1,1,0x5722D000,1,1 @@ -3748,10 +3748,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578103B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x578103B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57810339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57810339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x578103B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x578103B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57810339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57810339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x578103B9,1,1,0x57602400,3,0=0x578103B9,1,1,0x5732D000,1,1 @@ -4747,10 +4747,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578103C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x578103C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57810349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57810349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x578103C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x578103C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57810349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57810349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x578103C9,1,1,0x57602400,3,0=0x578103C9,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_3a_D1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_3a_D1_Branch_RHD.txt index 4419fe7d1..19d9a1779 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_3a_D1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_3a_D1_Branch_RHD.txt @@ -858,10 +858,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57813380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57813380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57813300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57813300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57813380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57813380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57813300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57813300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57813380,1,1,0x57602400,3,0=0x57813380,1,1,0x5702D000,1,1 @@ -1789,10 +1789,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57813399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57813399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57813319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57813319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57813399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57813399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57813319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57813319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57813399,1,1,0x57602400,3,0=0x57813399,1,1,0x5712D000,1,1 @@ -2753,10 +2753,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578133A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x578133A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57813329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57813329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x578133A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x578133A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57813329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57813329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x578133A9,1,1,0x57602400,3,0=0x578133A9,1,1,0x5722D000,1,1 @@ -3748,10 +3748,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578133B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x578133B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57813339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57813339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x578133B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x578133B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57813339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57813339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x578133B9,1,1,0x57602400,3,0=0x578133B9,1,1,0x5732D000,1,1 @@ -4747,10 +4747,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578133C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x578133C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57813349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57813349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x578133C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x578133C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57813349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57813349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x578133C9,1,1,0x57602400,3,0=0x578133C9,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_3a_E1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_3a_E1_Branch_RHD.txt index d8c473851..dfbf5c55c 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_3a_E1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_3a_E1_Branch_RHD.txt @@ -836,8 +836,8 @@ ;02 to R3 0x57814500,2,0,0x57906800,1,0=0x57814500,2,0,0x57926800,1,0 0x57814580,0,1,0x57906800,3,1=0x57814580,0,1,0x57926800,3,1 -0x57814E00,2,0,0x57906800,1,0=0x57814500,2,0,0x57926880,1,0; conflicting-override -0x57814E80,0,1,0x57906800,3,1=0x57814580,0,1,0x57926880,3,1; conflicting-override +0x57814E00,2,0,0x57906800,1,0=0x57814500,2,0,0x57926880,1,0 +0x57814E80,0,1,0x57906800,3,1=0x57814580,0,1,0x57926880,3,1 ;02 to R4 0x57814E80,0,1,0x57907b00,2,0=0x57814E80,0,1,0x57927b00,2,0 0x57814E00,2,0,0x57907b00,0,1=0x57814E00,2,0,0x57927b00,0,1 @@ -1723,8 +1723,8 @@ ;02 to R3 0x57814519,2,0,0x57906800,1,0=0x57814519,2,0,0x57926815,1,0 0x57814599,0,1,0x57906800,3,1=0x57814599,0,1,0x57926815,3,1 -0x57814E19,2,0,0x57906800,1,0=0x57814519,2,0,0x57926895,1,0; conflicting-override -0x57814E99,0,1,0x57906800,3,1=0x57814599,0,1,0x57926895,3,1; conflicting-override +0x57814E19,2,0,0x57906800,1,0=0x57814519,2,0,0x57926895,1,0 +0x57814E99,0,1,0x57906800,3,1=0x57814599,0,1,0x57926895,3,1 ;02 to R4 0x57814E99,0,1,0x57907b00,2,0=0x57814E99,0,1,0x57927b15,2,0 0x57814E19,2,0,0x57907b00,0,1=0x57814E19,2,0,0x57927b15,0,1 @@ -2590,8 +2590,8 @@ ;02 to R3 0x57814529,2,0,0x57906800,1,0=0x57814529,2,0,0x57926825,1,0 0x578145A9,0,1,0x57906800,3,1=0x578145A9,0,1,0x57926825,3,1 -0x57814E29,2,0,0x57906800,1,0=0x57814529,2,0,0x579268A5,1,0; conflicting-override -0x57814EA9,0,1,0x57906800,3,1=0x578145A9,0,1,0x579268A5,3,1; conflicting-override +0x57814E29,2,0,0x57906800,1,0=0x57814529,2,0,0x579268A5,1,0 +0x57814EA9,0,1,0x57906800,3,1=0x578145A9,0,1,0x579268A5,3,1 ;02 to R4 0x57814EA9,0,1,0x57907b00,2,0=0x57814EA9,0,1,0x57927b25,2,0 0x57814E29,2,0,0x57907b00,0,1=0x57814E29,2,0,0x57927b25,0,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_3b_D1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_3b_D1_Branch_RHD.txt index 1fe81ad3f..f1105c62d 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_3b_D1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_3b_D1_Branch_RHD.txt @@ -858,10 +858,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57813A80,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57813A80,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57813A00,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57813A00,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57813A80,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57813A80,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57813A00,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57813A00,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57813A80,1,1,0x57602400,3,0=0x57813A80,1,1,0x5702D000,1,1 @@ -1789,10 +1789,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57813A99,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57813A99,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57813A19,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57813A19,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57813A99,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57813A99,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57813A19,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57813A19,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57813A99,1,1,0x57602400,3,0=0x57813A99,1,1,0x5712D000,1,1 @@ -2753,10 +2753,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57813AA9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x57813AA9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57813A29,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57813A29,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x57813AA9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x57813AA9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57813A29,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57813A29,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x57813AA9,1,1,0x57602400,3,0=0x57813AA9,1,1,0x5722D000,1,1 @@ -3748,10 +3748,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57813AB9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x57813AB9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57813A39,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57813A39,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x57813AB9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x57813AB9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57813A39,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57813A39,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x57813AB9,1,1,0x57602400,3,0=0x57813AB9,1,1,0x5732D000,1,1 @@ -4747,10 +4747,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57813AC9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x57813AC9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57813A49,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57813A49,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x57813AC9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x57813AC9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57813A49,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57813A49,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x57813AC9,1,1,0x57602400,3,0=0x57813AC9,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_4_A1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_4_A1_Branch_RHD.txt index 9c218ac9c..5f92d0343 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_4_A1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_4_A1_Branch_RHD.txt @@ -858,10 +858,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57830380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57830380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57830300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57830300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57830380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57830380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57830300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57830300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57830380,1,1,0x57602400,3,0=0x57830380,1,1,0x5702D000,1,1 @@ -1789,10 +1789,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57830399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57830399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57830319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57830319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57830399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57830399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57830319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57830319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57830399,1,1,0x57602400,3,0=0x57830399,1,1,0x5712D000,1,1 @@ -2753,10 +2753,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578303A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x578303A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57830329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57830329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x578303A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x578303A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57830329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57830329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x578303A9,1,1,0x57602400,3,0=0x578303A9,1,1,0x5722D000,1,1 @@ -3748,10 +3748,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578303B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x578303B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57830339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57830339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x578303B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x578303B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57830339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57830339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x578303B9,1,1,0x57602400,3,0=0x578303B9,1,1,0x5732D000,1,1 @@ -4747,10 +4747,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578303C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x578303C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57830349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57830349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x578303C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x578303C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57830349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57830349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x578303C9,1,1,0x57602400,3,0=0x578303C9,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_4_A1_Inside_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_4_A1_Inside_Branch_RHD.txt index d36548693..6fbb7a5f2 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_4_A1_Inside_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_4_A1_Inside_Branch_RHD.txt @@ -858,10 +858,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57830A00,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57830A00,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57830A80,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57830A80,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57830A00,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57830A00,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57830A80,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57830A80,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57830A00,1,1,0x57602400,3,0=0x57830A00,1,1,0x5702D000,1,1 @@ -1789,10 +1789,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57830A19,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57830A19,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57830A99,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57830A99,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57830A19,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57830A19,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57830A99,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57830A99,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57830A19,1,1,0x57602400,3,0=0x57830A19,1,1,0x5712D000,1,1 @@ -2753,10 +2753,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57830A29,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x57830A29,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57830AA9,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57830AA9,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x57830A29,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x57830A29,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57830AA9,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57830AA9,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x57830A29,1,1,0x57602400,3,0=0x57830A29,1,1,0x5722D000,1,1 @@ -3748,10 +3748,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57830A39,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x57830A39,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57830AB9,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57830AB9,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x57830A39,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x57830A39,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57830AB9,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57830AB9,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x57830A39,1,1,0x57602400,3,0=0x57830A39,1,1,0x5732D000,1,1 @@ -4747,10 +4747,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57830A49,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x57830A49,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57830AC9,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57830AC9,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x57830A49,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x57830A49,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57830AC9,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57830AC9,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x57830A49,1,1,0x57602400,3,0=0x57830A49,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_4_B1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_4_B1_Branch_RHD.txt index c787ccd06..2c117a6dd 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_4_B1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_4_B1_Branch_RHD.txt @@ -836,8 +836,8 @@ ;02 to R3 0x57831500,2,0,0x57906800,1,0=0x57831500,2,0,0x57926800,1,0 0x57831580,0,1,0x57906800,3,1=0x57831580,0,1,0x57926800,3,1 -0x57831E00,2,0,0x57906800,1,0=0x57831500,2,0,0x57926880,1,0; conflicting-override -0x57831E80,0,1,0x57906800,3,1=0x57831580,0,1,0x57926880,3,1; conflicting-override +0x57831E00,2,0,0x57906800,1,0=0x57831500,2,0,0x57926880,1,0 +0x57831E80,0,1,0x57906800,3,1=0x57831580,0,1,0x57926880,3,1 ;02 to R4 0x57831E80,0,1,0x57907b00,2,0=0x57831E80,0,1,0x57927b00,2,0 0x57831E00,2,0,0x57907b00,0,1=0x57831E00,2,0,0x57927b00,0,1 @@ -1723,8 +1723,8 @@ ;02 to R3 0x57831519,2,0,0x57906800,1,0=0x57831519,2,0,0x57926815,1,0 0x57831599,0,1,0x57906800,3,1=0x57831599,0,1,0x57926815,3,1 -0x57831E19,2,0,0x57906800,1,0=0x57831519,2,0,0x57926895,1,0; conflicting-override -0x57831E99,0,1,0x57906800,3,1=0x57831599,0,1,0x57926895,3,1; conflicting-override +0x57831E19,2,0,0x57906800,1,0=0x57831519,2,0,0x57926895,1,0 +0x57831E99,0,1,0x57906800,3,1=0x57831599,0,1,0x57926895,3,1 ;02 to R4 0x57831E99,0,1,0x57907b00,2,0=0x57831E99,0,1,0x57927b15,2,0 0x57831E19,2,0,0x57907b00,0,1=0x57831E19,2,0,0x57927b15,0,1 @@ -2590,8 +2590,8 @@ ;02 to R3 0x57831529,2,0,0x57906800,1,0=0x57831529,2,0,0x57926825,1,0 0x578315A9,0,1,0x57906800,3,1=0x578315A9,0,1,0x57926825,3,1 -0x57831E29,2,0,0x57906800,1,0=0x57831529,2,0,0x579268A5,1,0; conflicting-override -0x57831EA9,0,1,0x57906800,3,1=0x578315A9,0,1,0x579268A5,3,1; conflicting-override +0x57831E29,2,0,0x57906800,1,0=0x57831529,2,0,0x579268A5,1,0 +0x57831EA9,0,1,0x57906800,3,1=0x578315A9,0,1,0x579268A5,3,1 ;02 to R4 0x57831EA9,0,1,0x57907b00,2,0=0x57831EA9,0,1,0x57927b25,2,0 0x57831E29,2,0,0x57907b00,0,1=0x57831E29,2,0,0x57927b25,0,1 @@ -3488,8 +3488,8 @@ ;02 to R3 0x57831539,2,0,0x57906800,1,0=0x57831539,2,0,0x57926835,1,0 0x578315B9,0,1,0x57906800,3,1=0x578315B9,0,1,0x57926835,3,1 -0x57831E39,2,0,0x57906800,1,0=0x57831539,2,0,0x579268B5,1,0; conflicting-override -0x57831EB9,0,1,0x57906800,3,1=0x578315B9,0,1,0x579268B5,3,1; conflicting-override +0x57831E39,2,0,0x57906800,1,0=0x57831539,2,0,0x579268B5,1,0 +0x57831EB9,0,1,0x57906800,3,1=0x578315B9,0,1,0x579268B5,3,1 ;02 to R4 0x57831EB9,0,1,0x57907b00,2,0=0x57831EB9,0,1,0x57927b35,2,0 0x57831E39,2,0,0x57907b00,0,1=0x57831E39,2,0,0x57927b35,0,1 @@ -4386,8 +4386,8 @@ ;02 to R3 0x57831549,2,0,0x57906800,1,0=0x57831549,2,0,0x57926845,1,0 0x578315C9,0,1,0x57906800,3,1=0x578315C9,0,1,0x57926845,3,1 -0x57831E49,2,0,0x57906800,1,0=0x57831549,2,0,0x579268C5,1,0; conflicting-override -0x57831EC9,0,1,0x57906800,3,1=0x578315C9,0,1,0x579268C5,3,1; conflicting-override +0x57831E49,2,0,0x57906800,1,0=0x57831549,2,0,0x579268C5,1,0 +0x57831EC9,0,1,0x57906800,3,1=0x578315C9,0,1,0x579268C5,3,1 ;02 to R4 0x57831EC9,0,1,0x57907b00,2,0=0x57831EC9,0,1,0x57927b45,2,0 0x57831E49,2,0,0x57907b00,0,1=0x57831E49,2,0,0x57927b45,0,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_4_D1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_4_D1_Branch_RHD.txt index 2084f50da..1640241b9 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_4_D1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_4_D1_Branch_RHD.txt @@ -858,10 +858,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57833380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57833380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57833300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57833300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57833380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57833380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57833300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57833300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57833380,1,1,0x57602400,3,0=0x57833380,1,1,0x5702D000,1,1 @@ -1789,10 +1789,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57833399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57833399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57833319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57833319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57833399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57833399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57833319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57833319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57833399,1,1,0x57602400,3,0=0x57833399,1,1,0x5712D000,1,1 @@ -2753,10 +2753,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578333A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x578333A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57833329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57833329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x578333A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x578333A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57833329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57833329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x578333A9,1,1,0x57602400,3,0=0x578333A9,1,1,0x5722D000,1,1 @@ -3748,10 +3748,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578333B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x578333B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57833339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57833339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x578333B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x578333B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57833339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57833339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x578333B9,1,1,0x57602400,3,0=0x578333B9,1,1,0x5732D000,1,1 @@ -4747,10 +4747,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578333C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x578333C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57833349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57833349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x578333C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x578333C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57833349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57833349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x578333C9,1,1,0x57602400,3,0=0x578333C9,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_4_D1_Inside_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_4_D1_Inside_Branch_RHD.txt index c8a316aa3..9b453fc61 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_4_D1_Inside_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_4_D1_Inside_Branch_RHD.txt @@ -858,10 +858,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57833A00,3,0,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57833A00,3,0,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57833A80,1,1,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57833A80,1,1,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57833A00,3,0,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57833A00,3,0,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57833A80,1,1,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57833A80,1,1,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57833A00,3,0,0x57602400,3,0=0x57833A00,3,0,0x5702D000,1,1 @@ -1789,10 +1789,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57833A19,3,0,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57833A19,3,0,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57833A99,1,1,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57833A99,1,1,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57833A19,3,0,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57833A19,3,0,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57833A99,1,1,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57833A99,1,1,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57833A19,3,0,0x57602400,3,0=0x57833A19,3,0,0x5712D000,1,1 @@ -2753,10 +2753,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57833A29,3,0,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x57833A29,3,0,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57833AA9,1,1,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57833AA9,1,1,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x57833A29,3,0,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x57833A29,3,0,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57833AA9,1,1,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57833AA9,1,1,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x57833A29,3,0,0x57602400,3,0=0x57833A29,3,0,0x5722D000,1,1 @@ -3748,10 +3748,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57833A39,3,0,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x57833A39,3,0,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57833AB9,1,1,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57833AB9,1,1,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x57833A39,3,0,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x57833A39,3,0,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57833AB9,1,1,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57833AB9,1,1,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x57833A39,3,0,0x57602400,3,0=0x57833A39,3,0,0x5732D000,1,1 @@ -4747,10 +4747,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57833A49,3,0,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x57833A49,3,0,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57833AC9,1,1,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57833AC9,1,1,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x57833A49,3,0,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x57833A49,3,0,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57833AC9,1,1,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57833AC9,1,1,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x57833A49,3,0,0x57602400,3,0=0x57833A49,3,0,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_4_DiagA1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_4_DiagA1_Branch_RHD.txt index 18d71297b..67f3989c6 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_4_DiagA1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_4_DiagA1_Branch_RHD.txt @@ -863,10 +863,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57836480,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57836480,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57836400,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57836400,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57836480,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57836480,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57836400,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57836400,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57836480,1,1,0x57602400,3,0=0x57836480,1,1,0x5702D000,1,1 @@ -977,8 +977,8 @@ 0x57836499,1,1,0x57000100,1,0=0x57121100,1,0,0x57120100,1,0 0x57836419,3,0,0x57000100,1,0=0x57836419,3,0,0x57120100,3,1 ;00 to 04 (Orth-Diag) -0x57836499,1,1,0x57000400,3,0=0x57121100,1,0,0x57120B00,3,0; conflicting-override -0x57836499,1,1,0x57000400,1,1=0x57121100,1,0,0x57120400,1,1; conflicting-override +0x57836499,1,1,0x57000400,3,0=0x57121100,1,0,0x57120B00,3,0 +0x57836499,1,1,0x57000400,1,1=0x57121100,1,0,0x57120400,1,1 0x57836419,3,0,0x57000400,3,0=0x57836419,3,0,0x57120400,3,0 0x57836419,3,0,0x57000400,1,1=0x57836419,3,0,0x57120B00,1,1 ;00 to 08 (Orth 90-Curve) @@ -1315,119 +1315,119 @@ 0x57836419,3,0,0x5E600B00,3,0=0x57836419,3,0,0x5E602B19,3,0 ;----OxD Crossings---- ;00 to 40 (Street OxD) -0x57836499,1,1,0x57004000,3,0=0x57121100,1,0,0x57124080,3,0; conflicting-override +0x57836499,1,1,0x57004000,3,0=0x57121100,1,0,0x57124080,3,0 0x57836419,3,0,0x57004000,3,0=0x57836419,3,0,0x57124000,3,0 -0x57836499,1,1,0x57004000,1,1=0x57121100,1,0,0x57124000,1,1; conflicting-override +0x57836499,1,1,0x57004000,1,1=0x57121100,1,0,0x57124000,1,1 0x57836419,3,0,0x57004000,1,1=0x57836419,3,0,0x57124080,1,1 ;00 to 41 (Road OxD) -0x57836499,1,1,0x57004100,3,0=0x57121100,1,0,0x57124180,3,0; conflicting-override +0x57836499,1,1,0x57004100,3,0=0x57121100,1,0,0x57124180,3,0 0x57836419,3,0,0x57004100,3,0=0x57836419,3,0,0x57124100,3,0 -0x57836499,1,1,0x57004100,1,1=0x57121100,1,0,0x57124100,1,1; conflicting-override +0x57836499,1,1,0x57004100,1,1=0x57121100,1,0,0x57124100,1,1 0x57836419,3,0,0x57004100,1,1=0x57836419,3,0,0x57124180,1,1 ;00 to 41-1 (L1 Road OxD) -0x57836499,1,1,0x57004115,3,0=0x57121100,1,0,0x57124195,3,0; conflicting-override +0x57836499,1,1,0x57004115,3,0=0x57121100,1,0,0x57124195,3,0 0x57836419,3,0,0x57004115,3,0=0x57836419,3,0,0x57124115,3,0 -0x57836499,1,1,0x57004115,1,1=0x57121100,1,0,0x57124115,1,1; conflicting-override +0x57836499,1,1,0x57004115,1,1=0x57121100,1,0,0x57124115,1,1 0x57836419,3,0,0x57004115,1,1=0x57836419,3,0,0x57124195,1,1 ;00 to 41-2 (L2 Road OxD) -0x57836499,1,1,0x57004125,3,0=0x57121100,1,0,0x571241A5,3,0; conflicting-override +0x57836499,1,1,0x57004125,3,0=0x57121100,1,0,0x571241A5,3,0 0x57836419,3,0,0x57004125,3,0=0x57836419,3,0,0x57124125,3,0 -0x57836499,1,1,0x57004125,1,1=0x57121100,1,0,0x57124125,1,1; conflicting-override +0x57836499,1,1,0x57004125,1,1=0x57121100,1,0,0x57124125,1,1 0x57836419,3,0,0x57004125,1,1=0x57836419,3,0,0x571241A5,1,1 ;00 to 42 (One-Way Road OxD) -0x57836499,1,1,0x57004200,3,0=0x57121100,1,0,0x57124280,3,0; conflicting-override +0x57836499,1,1,0x57004200,3,0=0x57121100,1,0,0x57124280,3,0 0x57836419,3,0,0x57004200,3,0=0x57836419,3,0,0x57124200,3,0 -0x57836499,1,1,0x57004200,1,1=0x57121100,1,0,0x57124200,1,1; conflicting-override +0x57836499,1,1,0x57004200,1,1=0x57121100,1,0,0x57124200,1,1 0x57836419,3,0,0x57004200,1,1=0x57836419,3,0,0x57124280,1,1 ;00 to 42-1 (L1 One-Way Road OxD) -0x57836499,1,1,0x57004215,3,0=0x57121100,1,0,0x57124295,3,0; conflicting-override +0x57836499,1,1,0x57004215,3,0=0x57121100,1,0,0x57124295,3,0 0x57836419,3,0,0x57004215,3,0=0x57836419,3,0,0x57124215,3,0 -0x57836499,1,1,0x57004215,1,1=0x57121100,1,0,0x57124215,1,1; conflicting-override +0x57836499,1,1,0x57004215,1,1=0x57121100,1,0,0x57124215,1,1 0x57836419,3,0,0x57004215,1,1=0x57836419,3,0,0x57124295,1,1 ;00 to 42-2 (L2 One-Way Road OxD) -0x57836499,1,1,0x57004225,3,0=0x57121100,1,0,0x571242A5,3,0; conflicting-override +0x57836499,1,1,0x57004225,3,0=0x57121100,1,0,0x571242A5,3,0 0x57836419,3,0,0x57004225,3,0=0x57836419,3,0,0x57124225,3,0 -0x57836499,1,1,0x57004225,1,1=0x57121100,1,0,0x57124225,1,1; conflicting-override +0x57836499,1,1,0x57004225,1,1=0x57121100,1,0,0x57124225,1,1 0x57836419,3,0,0x57004225,1,1=0x57836419,3,0,0x571242A5,1,1 ;00 to 43 (Avenue OxD) -0x57836499,1,1,0x57004300,3,0=0x57121100,1,0,0x57124380,3,0; conflicting-override +0x57836499,1,1,0x57004300,3,0=0x57121100,1,0,0x57124380,3,0 0x57836419,3,0,0x57004300,3,0=0x57836419,3,0,0x57124300,3,0 -0x57836499,1,1,0x57004300,1,1=0x57121100,1,0,0x57124300,1,1; conflicting-override +0x57836499,1,1,0x57004300,1,1=0x57121100,1,0,0x57124300,1,1 0x57836419,3,0,0x57004300,1,1=0x57836419,3,0,0x57124380,1,1 ;00 to 43-1 (L1 Avenue OxD) -0x57836499,1,1,0x57004315,3,0=0x57121100,1,0,0x57124395,3,0; conflicting-override +0x57836499,1,1,0x57004315,3,0=0x57121100,1,0,0x57124395,3,0 0x57836419,3,0,0x57004315,3,0=0x57836419,3,0,0x57124315,3,0 -0x57836499,1,1,0x57004315,1,1=0x57121100,1,0,0x57124315,1,1; conflicting-override +0x57836499,1,1,0x57004315,1,1=0x57121100,1,0,0x57124315,1,1 0x57836419,3,0,0x57004315,1,1=0x57836419,3,0,0x57124395,1,1 ;00 to 43-2 (L2 Avenue OxD) -0x57836499,1,1,0x57004325,3,0=0x57121100,1,0,0x571243A5,3,0; conflicting-override +0x57836499,1,1,0x57004325,3,0=0x57121100,1,0,0x571243A5,3,0 0x57836419,3,0,0x57004325,3,0=0x57836419,3,0,0x57124325,3,0 -0x57836499,1,1,0x57004325,1,1=0x57121100,1,0,0x57124325,1,1; conflicting-override +0x57836499,1,1,0x57004325,1,1=0x57121100,1,0,0x57124325,1,1 0x57836419,3,0,0x57004325,1,1=0x57836419,3,0,0x571243A5,1,1 ;00 to 44 (L0 MHW OxD) -0x57836499,1,1,0x57004400,3,0=0x57121100,1,0,0x57124480,3,0; conflicting-override +0x57836499,1,1,0x57004400,3,0=0x57121100,1,0,0x57124480,3,0 0x57836419,3,0,0x57004400,3,0=0x57836419,3,0,0x57124400,3,0 -0x57836499,1,1,0x57004400,1,1=0x57121100,1,0,0x57124400,1,1; conflicting-override +0x57836499,1,1,0x57004400,1,1=0x57121100,1,0,0x57124400,1,1 0x57836419,3,0,0x57004400,1,1=0x57836419,3,0,0x57124480,1,1 ;00 to 44-2 (L2 MHW OxD) -0x57836499,1,1,0x57004420,3,0=0x57121100,1,0,0x571244A0,3,0; conflicting-override +0x57836499,1,1,0x57004420,3,0=0x57121100,1,0,0x571244A0,3,0 0x57836419,3,0,0x57004420,3,0=0x57836419,3,0,0x57124420,3,0 -0x57836499,1,1,0x57004420,1,1=0x57121100,1,0,0x57124420,1,1; conflicting-override +0x57836499,1,1,0x57004420,1,1=0x57121100,1,0,0x57124420,1,1 0x57836419,3,0,0x57004420,1,1=0x57836419,3,0,0x571244A0,1,1 ;00 to 45a (Rail DTR OxD) -0x57836499,1,1,0x57004500,3,0=0x57121100,1,0,0x57124580,3,0; conflicting-override +0x57836499,1,1,0x57004500,3,0=0x57121100,1,0,0x57124580,3,0 0x57836419,3,0,0x57004500,3,0=0x57836419,3,0,0x57124500,3,0 -0x57836499,1,1,0x57004500,1,1=0x57121100,1,0,0x57124500,1,1; conflicting-override +0x57836499,1,1,0x57004500,1,1=0x57121100,1,0,0x57124500,1,1 0x57836419,3,0,0x57004500,1,1=0x57836419,3,0,0x57124580,1,1 ;00 to 45-2a (L2 Rail DTR OxD) -0x57836499,1,1,0x5D777A00,1,0=0x57121100,1,0,0x5D777C90,1,0; conflicting-override +0x57836499,1,1,0x5D777A00,1,0=0x57121100,1,0,0x5D777C90,1,0 0x57836419,3,0,0x5D777A00,1,0=0x57836419,3,0,0x5D777C10,1,0 -0x57836499,1,1,0x5D777A00,3,1=0x57121100,1,0,0x5D777C10,3,1; conflicting-override +0x57836499,1,1,0x5D777A00,3,1=0x57121100,1,0,0x5D777C10,3,1 0x57836419,3,0,0x5D777A00,3,1=0x57836419,3,0,0x5D777C90,3,1 ;00 to 45b (Rail STR OxD) -0x57836499,1,1,0x57004509,3,0=0x57121100,1,0,0x57124585,3,0; conflicting-override +0x57836499,1,1,0x57004509,3,0=0x57121100,1,0,0x57124585,3,0 0x57836419,3,0,0x57004509,3,0=0x57836419,3,0,0x57124505,3,0 -0x57836499,1,1,0x57004509,1,1=0x57121100,1,0,0x57124505,1,1; conflicting-override +0x57836499,1,1,0x57004509,1,1=0x57121100,1,0,0x57124505,1,1 0x57836419,3,0,0x57004509,1,1=0x57836419,3,0,0x57124585,1,1 ;00 to 47a (GLR 1 OxD) -0x57836499,1,1,0x57004700,3,0=0x57121100,1,0,0x57124780,3,0; conflicting-override +0x57836499,1,1,0x57004700,3,0=0x57121100,1,0,0x57124780,3,0 0x57836419,3,0,0x57004700,3,0=0x57836419,3,0,0x57124700,3,0 -0x57836499,1,1,0x57004700,1,1=0x57121100,1,0,0x57124700,1,1; conflicting-override +0x57836499,1,1,0x57004700,1,1=0x57121100,1,0,0x57124700,1,1 0x57836419,3,0,0x57004700,1,1=0x57836419,3,0,0x57124780,1,1 ;00 to 47b (GLR 2 OxD) -0x57836499,1,1,0x57004709,3,0=0x57121100,1,0,0x57124785,3,0; conflicting-override +0x57836499,1,1,0x57004709,3,0=0x57121100,1,0,0x57124785,3,0 0x57836419,3,0,0x57004709,3,0=0x57836419,3,0,0x57124705,3,0 -0x57836499,1,1,0x57004709,1,1=0x57121100,1,0,0x57124705,1,1; conflicting-override +0x57836499,1,1,0x57004709,1,1=0x57121100,1,0,0x57124705,1,1 0x57836419,3,0,0x57004709,1,1=0x57836419,3,0,0x57124785,1,1 ;00 to 47-2 (ELR OxD) -0x57836499,1,1,0x57004720,3,0=0x57121100,1,0,0x571247A0,3,0; conflicting-override +0x57836499,1,1,0x57004720,3,0=0x57121100,1,0,0x571247A0,3,0 0x57836419,3,0,0x57004720,3,0=0x57836419,3,0,0x57124720,3,0 -0x57836499,1,1,0x57004720,1,1=0x57121100,1,0,0x57124720,1,1; conflicting-override +0x57836499,1,1,0x57004720,1,1=0x57121100,1,0,0x57124720,1,1 0x57836419,3,0,0x57004720,1,1=0x57836419,3,0,0x571247A0,1,1 ;00 to 48a (GLR 3 OxD) -0x57836499,1,1,0x57004800,3,0=0x57121100,1,0,0x57124880,3,0; conflicting-override +0x57836499,1,1,0x57004800,3,0=0x57121100,1,0,0x57124880,3,0 0x57836419,3,0,0x57004800,3,0=0x57836419,3,0,0x57124800,3,0 -0x57836499,1,1,0x57004800,1,1=0x57121100,1,0,0x57124800,1,1; conflicting-override +0x57836499,1,1,0x57004800,1,1=0x57121100,1,0,0x57124800,1,1 0x57836419,3,0,0x57004800,1,1=0x57836419,3,0,0x57124880,1,1 ;00 to 48b (GLR 4 OxD) -0x57836499,1,1,0x57004809,3,0=0x57121100,1,0,0x57124885,3,0; conflicting-override +0x57836499,1,1,0x57004809,3,0=0x57121100,1,0,0x57124885,3,0 0x57836419,3,0,0x57004809,3,0=0x57836419,3,0,0x57124805,3,0 -0x57836499,1,1,0x57004809,1,1=0x57121100,1,0,0x57124805,1,1; conflicting-override +0x57836499,1,1,0x57004809,1,1=0x57121100,1,0,0x57124805,1,1 0x57836419,3,0,0x57004809,1,1=0x57836419,3,0,0x57124885,1,1 ;00 to 49b (GHSR OxD) -0x57836499,1,1,0x57004705,3,0=0x57121100,1,0,0x57124785,3,0; conflicting-override +0x57836499,1,1,0x57004705,3,0=0x57121100,1,0,0x57124785,3,0 0x57836419,3,0,0x57004705,3,0=0x57836419,3,0,0x57124705,3,0 -0x57836499,1,1,0x57004705,1,1=0x57121100,1,0,0x57124705,1,1; conflicting-override +0x57836499,1,1,0x57004705,1,1=0x57121100,1,0,0x57124705,1,1 0x57836419,3,0,0x57004705,1,1=0x57836419,3,0,0x57124785,1,1 ;00 to 49-2a (ELR OxD) -0x57836499,1,1,0x57004720,3,0=0x57121100,1,0,0x571247A0,3,0; conflicting-override +0x57836499,1,1,0x57004720,3,0=0x57121100,1,0,0x571247A0,3,0 0x57836419,3,0,0x57004720,3,0=0x57836419,3,0,0x57124720,3,0 -0x57836499,1,1,0x57004720,1,1=0x57121100,1,0,0x57124720,1,1; conflicting-override +0x57836499,1,1,0x57004720,1,1=0x57121100,1,0,0x57124720,1,1 0x57836419,3,0,0x57004720,1,1=0x57836419,3,0,0x571247A0,1,1 ;00 to 49-2b (HSR OxD) -0x57836499,1,1,0x57004725,3,0=0x57121100,1,0,0x571247A5,3,0; conflicting-override +0x57836499,1,1,0x57004725,3,0=0x57121100,1,0,0x571247A5,3,0 0x57836419,3,0,0x57004725,3,0=0x57836419,3,0,0x57124725,3,0 -0x57836499,1,1,0x57004725,1,1=0x57121100,1,0,0x57124725,1,1; conflicting-override +0x57836499,1,1,0x57004725,1,1=0x57121100,1,0,0x57124725,1,1 0x57836419,3,0,0x57004725,1,1=0x57836419,3,0,0x571247A5,1,1 ;RHW x RHW Crossings handled by Meta Code ;00 to 57 (TLA-3 OxD) @@ -1619,54 +1619,54 @@ ;0x57120000,3,0,0x57006A25,1,1=0x57120000,3,0,0x57126AA5,1,1 ;00 to 0x5E62x100 (SAM 1 OxD) ;00 to 0x5E62x200 (SAM 2 OxD) -0x57836499,1,1,0x5E620200,3,0=0x57121100,1,0,0x5E622299,3,0; conflicting-override +0x57836499,1,1,0x5E620200,3,0=0x57121100,1,0,0x5E622299,3,0 0x57836419,3,0,0x5E620200,3,0=0x57836419,3,0,0x5E622219,3,0 -0x57836499,1,1,0x5E620200,1,1=0x57121100,1,0,0x5E622219,1,1; conflicting-override +0x57836499,1,1,0x5E620200,1,1=0x57121100,1,0,0x5E622219,1,1 0x57836419,3,0,0x5E620200,1,1=0x57836419,3,0,0x5E622299,1,1 ;00 to 0x5E62x300 (SAM 3 OxD) -0x57836499,1,1,0x5E620300,3,0=0x57121100,1,0,0x5E622399,3,0; conflicting-override +0x57836499,1,1,0x5E620300,3,0=0x57121100,1,0,0x5E622399,3,0 0x57836419,3,0,0x5E620300,3,0=0x57836419,3,0,0x5E622319,3,0 -0x57836499,1,1,0x5E620300,1,1=0x57121100,1,0,0x5E622319,1,1; conflicting-override +0x57836499,1,1,0x5E620300,1,1=0x57121100,1,0,0x5E622319,1,1 0x57836419,3,0,0x5E620300,1,1=0x57836419,3,0,0x5E622399,1,1 ;00 to 0x5E62x400 (SAM 4 OxD) -0x57836499,1,1,0x5E620400,3,0=0x57121100,1,0,0x5E622499,3,0; conflicting-override +0x57836499,1,1,0x5E620400,3,0=0x57121100,1,0,0x5E622499,3,0 0x57836419,3,0,0x5E620400,3,0=0x57836419,3,0,0x5E622419,3,0 -0x57836499,1,1,0x5E620400,1,1=0x57121100,1,0,0x5E622419,1,1; conflicting-override +0x57836499,1,1,0x5E620400,1,1=0x57121100,1,0,0x5E622419,1,1 0x57836419,3,0,0x5E620400,1,1=0x57836419,3,0,0x5E622499,1,1 ;00 to 0x5E62x500 (SAM 5 OxD) -0x57836499,1,1,0x5E620500,3,0=0x57121100,1,0,0x5E622599,3,0; conflicting-override +0x57836499,1,1,0x5E620500,3,0=0x57121100,1,0,0x5E622599,3,0 0x57836419,3,0,0x5E620500,3,0=0x57836419,3,0,0x5E622519,3,0 -0x57836499,1,1,0x5E620500,1,1=0x57121100,1,0,0x5E622519,1,1; conflicting-override +0x57836499,1,1,0x5E620500,1,1=0x57121100,1,0,0x5E622519,1,1 0x57836419,3,0,0x5E620500,1,1=0x57836419,3,0,0x5E622599,1,1 ;00 to 0x5E62x600 (SAM 6 OxD) -0x57836499,1,1,0x5E620600,3,0=0x57121100,1,0,0x5E622699,3,0; conflicting-override +0x57836499,1,1,0x5E620600,3,0=0x57121100,1,0,0x5E622699,3,0 0x57836419,3,0,0x5E620600,3,0=0x57836419,3,0,0x5E622619,3,0 -0x57836499,1,1,0x5E620600,1,1=0x57121100,1,0,0x5E622619,1,1; conflicting-override +0x57836499,1,1,0x5E620600,1,1=0x57121100,1,0,0x5E622619,1,1 0x57836419,3,0,0x5E620600,1,1=0x57836419,3,0,0x5E622699,1,1 ;00 to 0x5E62x700 (SAM 7 OxD) -0x57836499,1,1,0x5E620700,3,0=0x57121100,1,0,0x5E622799,3,0; conflicting-override +0x57836499,1,1,0x5E620700,3,0=0x57121100,1,0,0x5E622799,3,0 0x57836419,3,0,0x5E620700,3,0=0x57836419,3,0,0x5E622719,3,0 -0x57836499,1,1,0x5E620700,1,1=0x57121100,1,0,0x5E622719,1,1; conflicting-override +0x57836499,1,1,0x5E620700,1,1=0x57121100,1,0,0x5E622719,1,1 0x57836419,3,0,0x5E620700,1,1=0x57836419,3,0,0x5E622799,1,1 ;00 to 0x5E62x800 (SAM 8 OxD) -0x57836499,1,1,0x5E620800,3,0=0x57121100,1,0,0x5E622899,3,0; conflicting-override +0x57836499,1,1,0x5E620800,3,0=0x57121100,1,0,0x5E622899,3,0 0x57836419,3,0,0x5E620800,3,0=0x57836419,3,0,0x5E622819,3,0 -0x57836499,1,1,0x5E620800,1,1=0x57121100,1,0,0x5E622819,1,1; conflicting-override +0x57836499,1,1,0x5E620800,1,1=0x57121100,1,0,0x5E622819,1,1 0x57836419,3,0,0x5E620800,1,1=0x57836419,3,0,0x5E622899,1,1 ;00 to 0x5E62x900 (SAM 9 OxD) -0x57836499,1,1,0x5E620900,3,0=0x57121100,1,0,0x5E622999,3,0; conflicting-override +0x57836499,1,1,0x5E620900,3,0=0x57121100,1,0,0x5E622999,3,0 0x57836419,3,0,0x5E620900,3,0=0x57836419,3,0,0x5E622919,3,0 -0x57836499,1,1,0x5E620900,1,1=0x57121100,1,0,0x5E622919,1,1; conflicting-override +0x57836499,1,1,0x5E620900,1,1=0x57121100,1,0,0x5E622919,1,1 0x57836419,3,0,0x5E620900,1,1=0x57836419,3,0,0x5E622999,1,1 ;00 to 0x5E62xA00 (SAM 10 OxD) -0x57836499,1,1,0x5E620A00,3,0=0x57121100,1,0,0x5E622A99,3,0; conflicting-override +0x57836499,1,1,0x5E620A00,3,0=0x57121100,1,0,0x5E622A99,3,0 0x57836419,3,0,0x5E620A00,3,0=0x57836419,3,0,0x5E622A19,3,0 -0x57836499,1,1,0x5E620A00,1,1=0x57121100,1,0,0x5E622A19,1,1; conflicting-override +0x57836499,1,1,0x5E620A00,1,1=0x57121100,1,0,0x5E622A19,1,1 0x57836419,3,0,0x5E620A00,1,1=0x57836419,3,0,0x5E622A99,1,1 ;00 to 0x5E62xB00 (SAM 11 OxD) -0x57836499,1,1,0x5E620B00,3,0=0x57121100,1,0,0x5E622B99,3,0; conflicting-override +0x57836499,1,1,0x5E620B00,3,0=0x57121100,1,0,0x5E622B99,3,0 0x57836419,3,0,0x5E620B00,3,0=0x57836419,3,0,0x5E622B19,3,0 -0x57836499,1,1,0x5E620B00,1,1=0x57121100,1,0,0x5E622B19,1,1; conflicting-override +0x57836499,1,1,0x5E620B00,1,1=0x57121100,1,0,0x5E622B19,1,1 0x57836419,3,0,0x5E620B00,1,1=0x57836419,3,0,0x5E622B99,1,1 ;----OxO T Crossings---- ;00 to T-00 (Street Ends) @@ -1792,21 +1792,21 @@ ;----OxD/DxO T Crossings---- ;00 to T-33 (Avenue Thru--Orth RHW+Diag Avenue) ;Short -0x57836499,1,1,0x57603300,3,0=0x57121100,1,0,0x57623390,3,0; conflicting-override +0x57836499,1,1,0x57603300,3,0=0x57121100,1,0,0x57623390,3,0 0x57836419,3,0,0x57603300,3,0=0x57836419,3,0,0x57623310,3,0 -0x57836499,1,1,0x57603300,1,1=0x57121100,1,0,0x57623310,1,1; conflicting-override +0x57836499,1,1,0x57603300,1,1=0x57121100,1,0,0x57623310,1,1 0x57836419,3,0,0x57603300,1,1=0x57836419,3,0,0x57623390,1,1 ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57836499,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57836499,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57836419,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57836419,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57836499,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57836499,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57836419,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57836419,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE -0x57836499,1,1,0x57602400,3,0=0x57121100,1,0,0x5712D000,1,1; conflicting-override -0x57836499,1,1,0x57602400,1,1=0x57121100,1,0,0x5712D080,3,0; conflicting-override +0x57836499,1,1,0x57602400,3,0=0x57121100,1,0,0x5712D000,1,1 +0x57836499,1,1,0x57602400,1,1=0x57121100,1,0,0x5712D080,3,0 0x57836419,3,0,0x57602400,3,0=0x57836419,3,0,0x5712D080,1,1 0x57836419,3,0,0x57602400,1,1=0x57836419,3,0,0x5712D000,3,0 ;Stability @@ -1824,7 +1824,7 @@ ;00 to F3 (MHW) ;Handled by RUL1 ;00 to F4 (Avenue) -0x57836499,1,1,0x5700F480,1,0=0x57121100,1,0,0x5712F480,1,0; conflicting-override +0x57836499,1,1,0x5700F480,1,0=0x57121100,1,0,0x5712F480,1,0 0x57836419,3,0,0x5700F480,3,1=0x57836419,3,0,0x5712F480,3,1 ;NWM Transitions Handled NWM-Side ;----Special---- @@ -1833,28 +1833,28 @@ ;add once elevated OWR roundabouts supported ;--MRCs-- ;R1 -0x57836499,1,1,0x57905000,0,0=0x57121100,1,0,0x57925015,0,0; conflicting-override -0x57836499,1,1,0x57905000,2,1=0x57121100,1,0,0x57925095,2,1; conflicting-override +0x57836499,1,1,0x57905000,0,0=0x57121100,1,0,0x57925015,0,0 +0x57836499,1,1,0x57905000,2,1=0x57121100,1,0,0x57925095,2,1 0x57836419,3,0,0x57905000,0,0=0x57836419,3,0,0x57925095,0,0 0x57836419,3,0,0x57905000,2,1=0x57836419,3,0,0x57925015,2,1 ;R2 -0x57836499,1,1,0x57905400,0,0=0x57121100,1,0,0x57925415,0,0; conflicting-override -0x57836499,1,1,0x57905400,2,1=0x57121100,1,0,0x57925495,2,1; conflicting-override +0x57836499,1,1,0x57905400,0,0=0x57121100,1,0,0x57925415,0,0 +0x57836499,1,1,0x57905400,2,1=0x57121100,1,0,0x57925495,2,1 0x57836419,3,0,0x57905400,0,0=0x57836419,3,0,0x57925495,0,0 0x57836419,3,0,0x57905400,2,1=0x57836419,3,0,0x57925415,2,1 ;R3 -0x57836499,1,1,0x57906000,0,0=0x57121100,1,0,0x57926015,0,0; conflicting-override -0x57836499,1,1,0x57906000,2,1=0x57121100,1,0,0x57926095,2,1; conflicting-override +0x57836499,1,1,0x57906000,0,0=0x57121100,1,0,0x57926015,0,0 +0x57836499,1,1,0x57906000,2,1=0x57121100,1,0,0x57926095,2,1 0x57836419,3,0,0x57906000,0,0=0x57836419,3,0,0x57926095,0,0 0x57836419,3,0,0x57906000,2,1=0x57836419,3,0,0x57926015,2,1 ;R4 -0x57836499,1,1,0x57907000,0,0=0x57121100,1,0,0x57927015,0,0; conflicting-override -0x57836499,1,1,0x57907000,2,1=0x57121100,1,0,0x57927095,2,1; conflicting-override +0x57836499,1,1,0x57907000,0,0=0x57121100,1,0,0x57927015,0,0 +0x57836499,1,1,0x57907000,2,1=0x57121100,1,0,0x57927095,2,1 0x57836419,3,0,0x57907000,0,0=0x57836419,3,0,0x57927095,0,0 0x57836419,3,0,0x57907000,2,1=0x57836419,3,0,0x57927015,2,1 ;R5 -0x57836499,1,1,0x57908000,0,0=0x57121100,1,0,0x57928015,0,0; conflicting-override -0x57836499,1,1,0x57908000,2,1=0x57121100,1,0,0x57928095,2,1; conflicting-override +0x57836499,1,1,0x57908000,0,0=0x57121100,1,0,0x57928015,0,0 +0x57836499,1,1,0x57908000,2,1=0x57121100,1,0,0x57928095,2,1 0x57836419,3,0,0x57908000,0,0=0x57836419,3,0,0x57928095,0,0 0x57836419,3,0,0x57908000,2,1=0x57836419,3,0,0x57928015,2,1 ;--FLEXRamp/DRIs-- @@ -2750,10 +2750,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578364A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x578364A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57836429,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57836429,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x578364A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x578364A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57836429,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57836429,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x578364A9,1,1,0x57602400,3,0=0x578364A9,1,1,0x5722D000,1,1 @@ -3750,10 +3750,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578364B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x578364B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57836439,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57836439,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x578364B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x578364B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57836439,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57836439,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x578364B9,1,1,0x57602400,3,0=0x578364B9,1,1,0x5732D000,1,1 @@ -4754,10 +4754,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578364C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x578364C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57836449,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57836449,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x578364C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x578364C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57836449,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57836449,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x578364C9,1,1,0x57602400,3,0=0x578364C9,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_4_E1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_4_E1_Branch_RHD.txt index 3ef201083..91f1fee25 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_4_E1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_4_E1_Branch_RHD.txt @@ -836,8 +836,8 @@ ;02 to R3 0x57834500,2,0,0x57906800,1,0=0x57834500,2,0,0x57926800,1,0 0x57834580,0,1,0x57906800,3,1=0x57834580,0,1,0x57926800,3,1 -0x57834E00,2,0,0x57906800,1,0=0x57834500,2,0,0x57926880,1,0; conflicting-override -0x57834E80,0,1,0x57906800,3,1=0x57834580,0,1,0x57926880,3,1; conflicting-override +0x57834E00,2,0,0x57906800,1,0=0x57834500,2,0,0x57926880,1,0 +0x57834E80,0,1,0x57906800,3,1=0x57834580,0,1,0x57926880,3,1 ;02 to R4 0x57834E80,0,1,0x57907b00,2,0=0x57834E80,0,1,0x57927b00,2,0 0x57834E00,2,0,0x57907b00,0,1=0x57834E00,2,0,0x57927b00,0,1 @@ -1723,8 +1723,8 @@ ;02 to R3 0x57834519,2,0,0x57906800,1,0=0x57834519,2,0,0x57926815,1,0 0x57834599,0,1,0x57906800,3,1=0x57834599,0,1,0x57926815,3,1 -0x57834E19,2,0,0x57906800,1,0=0x57834519,2,0,0x57926895,1,0; conflicting-override -0x57834E99,0,1,0x57906800,3,1=0x57834599,0,1,0x57926895,3,1; conflicting-override +0x57834E19,2,0,0x57906800,1,0=0x57834519,2,0,0x57926895,1,0 +0x57834E99,0,1,0x57906800,3,1=0x57834599,0,1,0x57926895,3,1 ;02 to R4 0x57834E99,0,1,0x57907b00,2,0=0x57834E99,0,1,0x57927b15,2,0 0x57834E19,2,0,0x57907b00,0,1=0x57834E19,2,0,0x57927b15,0,1 @@ -2590,8 +2590,8 @@ ;02 to R3 0x57834529,2,0,0x57906800,1,0=0x57834529,2,0,0x57926825,1,0 0x578345A9,0,1,0x57906800,3,1=0x578345A9,0,1,0x57926825,3,1 -0x57834E29,2,0,0x57906800,1,0=0x57834529,2,0,0x579268A5,1,0; conflicting-override -0x57834EA9,0,1,0x57906800,3,1=0x578345A9,0,1,0x579268A5,3,1; conflicting-override +0x57834E29,2,0,0x57906800,1,0=0x57834529,2,0,0x579268A5,1,0 +0x57834EA9,0,1,0x57906800,3,1=0x578345A9,0,1,0x579268A5,3,1 ;02 to R4 0x57834EA9,0,1,0x57907b00,2,0=0x57834EA9,0,1,0x57927b25,2,0 0x57834E29,2,0,0x57907b00,0,1=0x57834E29,2,0,0x57927b25,0,1 @@ -3488,8 +3488,8 @@ ;02 to R3 0x57834539,2,0,0x57906800,1,0=0x57834539,2,0,0x57926835,1,0 0x578345B9,0,1,0x57906800,3,1=0x578345B9,0,1,0x57926835,3,1 -0x57834E39,2,0,0x57906800,1,0=0x57834539,2,0,0x579268B5,1,0; conflicting-override -0x57834EB9,0,1,0x57906800,3,1=0x578345B9,0,1,0x579268B5,3,1; conflicting-override +0x57834E39,2,0,0x57906800,1,0=0x57834539,2,0,0x579268B5,1,0 +0x57834EB9,0,1,0x57906800,3,1=0x578345B9,0,1,0x579268B5,3,1 ;02 to R4 0x57834EB9,0,1,0x57907b00,2,0=0x57834EB9,0,1,0x57927b35,2,0 0x57834E39,2,0,0x57907b00,0,1=0x57834E39,2,0,0x57927b35,0,1 @@ -4376,8 +4376,8 @@ ;02 to R3 0x57834549,2,0,0x57906800,1,0=0x57834549,2,0,0x57926845,1,0 0x578345C9,0,1,0x57906800,3,1=0x578345C9,0,1,0x57926845,3,1 -0x57834E49,2,0,0x57906800,1,0=0x57834549,2,0,0x579268C5,1,0; conflicting-override -0x57834EC9,0,1,0x57906800,3,1=0x578345C9,0,1,0x579268C5,3,1; conflicting-override +0x57834E49,2,0,0x57906800,1,0=0x57834549,2,0,0x579268C5,1,0 +0x57834EC9,0,1,0x57906800,3,1=0x578345C9,0,1,0x579268C5,3,1 ;02 to R4 0x57834EC9,0,1,0x57907b00,2,0=0x57834EC9,0,1,0x57927b45,2,0 0x57834E49,2,0,0x57907b00,0,1=0x57834E49,2,0,0x57927b45,0,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_6C_A1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_6C_A1_Branch_RHD.txt index 3efe17555..3b3fe3b03 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_6C_A1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_6C_A1_Branch_RHD.txt @@ -858,10 +858,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57880380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57880380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57880300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57880300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57880380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57880380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57880300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57880300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57880380,1,1,0x57602400,3,0=0x57880380,1,1,0x5702D000,1,1 @@ -1789,10 +1789,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57880399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57880399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57880319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57880319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57880399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57880399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57880319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57880319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57880399,1,1,0x57602400,3,0=0x57880399,1,1,0x5712D000,1,1 @@ -2753,10 +2753,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578803A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x578803A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57880329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57880329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x578803A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x578803A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57880329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57880329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x578803A9,1,1,0x57602400,3,0=0x578803A9,1,1,0x5722D000,1,1 @@ -3748,10 +3748,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578803B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x578803B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57880339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57880339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x578803B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x578803B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57880339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57880339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x578803B9,1,1,0x57602400,3,0=0x578803B9,1,1,0x5732D000,1,1 @@ -4747,10 +4747,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578803C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x578803C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57880349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57880349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x578803C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x578803C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57880349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57880349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x578803C9,1,1,0x57602400,3,0=0x578803C9,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_6S_A1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_6S_A1_Branch_RHD.txt index eb022aa47..595970ca7 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_6S_A1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_6S_A1_Branch_RHD.txt @@ -858,10 +858,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57840380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57840380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57840300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57840300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57840380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57840380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57840300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57840300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57840380,1,1,0x57602400,3,0=0x57840380,1,1,0x5702D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_6S_A1_Inside_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_6S_A1_Inside_Branch_RHD.txt index f0f32a877..ddc20a665 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_6S_A1_Inside_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_6S_A1_Inside_Branch_RHD.txt @@ -858,10 +858,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57840A00,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57840A00,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57840A80,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57840A80,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57840A00,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57840A00,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57840A80,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57840A80,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57840A00,1,1,0x57602400,3,0=0x57840A00,1,1,0x5702D000,1,1 @@ -1789,10 +1789,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57840A19,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57840A19,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57840A99,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57840A99,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57840A19,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57840A19,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57840A99,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57840A99,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57840A19,1,1,0x57602400,3,0=0x57840A19,1,1,0x5712D000,1,1 @@ -2753,10 +2753,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57840A29,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x57840A29,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57840AA9,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57840AA9,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x57840A29,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x57840A29,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57840AA9,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57840AA9,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x57840A29,1,1,0x57602400,3,0=0x57840A29,1,1,0x5722D000,1,1 @@ -3748,10 +3748,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57840A39,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x57840A39,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57840AB9,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57840AB9,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x57840A39,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x57840A39,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57840AB9,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57840AB9,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x57840A39,1,1,0x57602400,3,0=0x57840A39,1,1,0x5732D000,1,1 @@ -4747,10 +4747,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57840A49,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x57840A49,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57840AC9,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57840AC9,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x57840A49,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x57840A49,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57840AC9,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57840AC9,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x57840A49,1,1,0x57602400,3,0=0x57840A49,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_6S_B1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_6S_B1_Branch_RHD.txt index a9c87eb96..08759eba1 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_6S_B1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_6S_B1_Branch_RHD.txt @@ -836,8 +836,8 @@ ;02 to R3 0x57841500,2,0,0x57906800,1,0=0x57841500,2,0,0x57926800,1,0 0x57841580,0,1,0x57906800,3,1=0x57841580,0,1,0x57926800,3,1 -0x57841E00,2,0,0x57906800,1,0=0x57841500,2,0,0x57926880,1,0; conflicting-override -0x57841E80,0,1,0x57906800,3,1=0x57841580,0,1,0x57926880,3,1; conflicting-override +0x57841E00,2,0,0x57906800,1,0=0x57841500,2,0,0x57926880,1,0 +0x57841E80,0,1,0x57906800,3,1=0x57841580,0,1,0x57926880,3,1 ;02 to R4 0x57841E80,0,1,0x57907b00,2,0=0x57841E80,0,1,0x57927b00,2,0 0x57841E00,2,0,0x57907b00,0,1=0x57841E00,2,0,0x57927b00,0,1 @@ -1723,8 +1723,8 @@ ;02 to R3 0x57841519,2,0,0x57906800,1,0=0x57841519,2,0,0x57926815,1,0 0x57841599,0,1,0x57906800,3,1=0x57841599,0,1,0x57926815,3,1 -0x57841E19,2,0,0x57906800,1,0=0x57841519,2,0,0x57926895,1,0; conflicting-override -0x57841E99,0,1,0x57906800,3,1=0x57841599,0,1,0x57926895,3,1; conflicting-override +0x57841E19,2,0,0x57906800,1,0=0x57841519,2,0,0x57926895,1,0 +0x57841E99,0,1,0x57906800,3,1=0x57841599,0,1,0x57926895,3,1 ;02 to R4 0x57841E99,0,1,0x57907b00,2,0=0x57841E99,0,1,0x57927b15,2,0 0x57841E19,2,0,0x57907b00,0,1=0x57841E19,2,0,0x57927b15,0,1 @@ -2590,8 +2590,8 @@ ;02 to R3 0x57841529,2,0,0x57906800,1,0=0x57841529,2,0,0x57926825,1,0 0x578415A9,0,1,0x57906800,3,1=0x578415A9,0,1,0x57926825,3,1 -0x57841E29,2,0,0x57906800,1,0=0x57841529,2,0,0x579268A5,1,0; conflicting-override -0x57841EA9,0,1,0x57906800,3,1=0x578415A9,0,1,0x579268A5,3,1; conflicting-override +0x57841E29,2,0,0x57906800,1,0=0x57841529,2,0,0x579268A5,1,0 +0x57841EA9,0,1,0x57906800,3,1=0x578415A9,0,1,0x579268A5,3,1 ;02 to R4 0x57841EA9,0,1,0x57907b00,2,0=0x57841EA9,0,1,0x57927b25,2,0 0x57841E29,2,0,0x57907b00,0,1=0x57841E29,2,0,0x57927b25,0,1 @@ -3488,8 +3488,8 @@ ;02 to R3 0x57841539,2,0,0x57906800,1,0=0x57841539,2,0,0x57926835,1,0 0x578415B9,0,1,0x57906800,3,1=0x578415B9,0,1,0x57926835,3,1 -0x57841E39,2,0,0x57906800,1,0=0x57841539,2,0,0x579268B5,1,0; conflicting-override -0x57841EB9,0,1,0x57906800,3,1=0x578415B9,0,1,0x579268B5,3,1; conflicting-override +0x57841E39,2,0,0x57906800,1,0=0x57841539,2,0,0x579268B5,1,0 +0x57841EB9,0,1,0x57906800,3,1=0x578415B9,0,1,0x579268B5,3,1 ;02 to R4 0x57841EB9,0,1,0x57907b00,2,0=0x57841EB9,0,1,0x57927b35,2,0 0x57841E39,2,0,0x57907b00,0,1=0x57841E39,2,0,0x57927b35,0,1 @@ -4386,8 +4386,8 @@ ;02 to R3 0x57841549,2,0,0x57906800,1,0=0x57841549,2,0,0x57926845,1,0 0x578415C9,0,1,0x57906800,3,1=0x578415C9,0,1,0x57926845,3,1 -0x57841E49,2,0,0x57906800,1,0=0x57841549,2,0,0x579268C5,1,0; conflicting-override -0x57841EC9,0,1,0x57906800,3,1=0x578415C9,0,1,0x579268C5,3,1; conflicting-override +0x57841E49,2,0,0x57906800,1,0=0x57841549,2,0,0x579268C5,1,0 +0x57841EC9,0,1,0x57906800,3,1=0x578415C9,0,1,0x579268C5,3,1 ;02 to R4 0x57841EC9,0,1,0x57907b00,2,0=0x57841EC9,0,1,0x57927b45,2,0 0x57841E49,2,0,0x57907b00,0,1=0x57841E49,2,0,0x57927b45,0,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_6S_D1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_6S_D1_Branch_RHD.txt index 07bbfd3e6..b9f167fb2 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_6S_D1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_6S_D1_Branch_RHD.txt @@ -858,10 +858,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57843380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57843380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57843300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57843300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57843380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57843380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57843300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57843300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57843380,1,1,0x57602400,3,0=0x57843380,1,1,0x5702D000,1,1 @@ -1789,10 +1789,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57843399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57843399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57843319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57843319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57843399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57843399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57843319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57843319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57843399,1,1,0x57602400,3,0=0x57843399,1,1,0x5712D000,1,1 @@ -2753,10 +2753,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578433A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x578433A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57843329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57843329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x578433A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x578433A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57843329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57843329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x578433A9,1,1,0x57602400,3,0=0x578433A9,1,1,0x5722D000,1,1 @@ -3748,10 +3748,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578433B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x578433B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57843339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57843339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x578433B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x578433B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57843339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57843339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x578433B9,1,1,0x57602400,3,0=0x578433B9,1,1,0x5732D000,1,1 @@ -4747,10 +4747,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578433C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x578433C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57843349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57843349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x578433C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x578433C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57843349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57843349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x578433C9,1,1,0x57602400,3,0=0x578433C9,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_6S_D1_Inside_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_6S_D1_Inside_Branch_RHD.txt index 56d3c60b4..8481af3ec 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_6S_D1_Inside_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_6S_D1_Inside_Branch_RHD.txt @@ -858,10 +858,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57843A00,3,0,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57843A00,3,0,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57843A80,1,1,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57843A80,1,1,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57843A00,3,0,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57843A00,3,0,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57843A80,1,1,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57843A80,1,1,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57843A00,3,0,0x57602400,3,0=0x57843A00,3,0,0x5702D000,1,1 @@ -1789,10 +1789,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57843A19,3,0,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57843A19,3,0,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57843A99,1,1,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57843A99,1,1,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57843A19,3,0,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57843A19,3,0,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57843A99,1,1,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57843A99,1,1,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57843A19,3,0,0x57602400,3,0=0x57843A19,3,0,0x5712D000,1,1 @@ -2753,10 +2753,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57843A29,3,0,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x57843A29,3,0,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57843AA9,1,1,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57843AA9,1,1,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x57843A29,3,0,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x57843A29,3,0,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57843AA9,1,1,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57843AA9,1,1,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x57843A29,3,0,0x57602400,3,0=0x57843A29,3,0,0x5722D000,1,1 @@ -3748,10 +3748,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57843A39,3,0,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x57843A39,3,0,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57843AB9,1,1,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57843AB9,1,1,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x57843A39,3,0,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x57843A39,3,0,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57843AB9,1,1,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57843AB9,1,1,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x57843A39,3,0,0x57602400,3,0=0x57843A39,3,0,0x5732D000,1,1 @@ -4747,10 +4747,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57843A49,3,0,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x57843A49,3,0,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57843AC9,1,1,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57843AC9,1,1,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x57843A49,3,0,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x57843A49,3,0,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57843AC9,1,1,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57843AC9,1,1,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x57843A49,3,0,0x57602400,3,0=0x57843A49,3,0,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_6S_E1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_6S_E1_Branch_RHD.txt index 4539132b3..1251880c1 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_6S_E1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_6S_E1_Branch_RHD.txt @@ -836,8 +836,8 @@ ;02 to R3 0x57844500,2,0,0x57906800,1,0=0x57844500,2,0,0x57926800,1,0 0x57844580,0,1,0x57906800,3,1=0x57844580,0,1,0x57926800,3,1 -0x57844E00,2,0,0x57906800,1,0=0x57844500,2,0,0x57926880,1,0; conflicting-override -0x57844E80,0,1,0x57906800,3,1=0x57844580,0,1,0x57926880,3,1; conflicting-override +0x57844E00,2,0,0x57906800,1,0=0x57844500,2,0,0x57926880,1,0 +0x57844E80,0,1,0x57906800,3,1=0x57844580,0,1,0x57926880,3,1 ;02 to R4 0x57844E80,0,1,0x57907b00,2,0=0x57844E80,0,1,0x57927b00,2,0 0x57844E00,2,0,0x57907b00,0,1=0x57844E00,2,0,0x57927b00,0,1 @@ -1723,8 +1723,8 @@ ;02 to R3 0x57844519,2,0,0x57906800,1,0=0x57844519,2,0,0x57926815,1,0 0x57844599,0,1,0x57906800,3,1=0x57844599,0,1,0x57926815,3,1 -0x57844E19,2,0,0x57906800,1,0=0x57844519,2,0,0x57926895,1,0; conflicting-override -0x57844E99,0,1,0x57906800,3,1=0x57844599,0,1,0x57926895,3,1; conflicting-override +0x57844E19,2,0,0x57906800,1,0=0x57844519,2,0,0x57926895,1,0 +0x57844E99,0,1,0x57906800,3,1=0x57844599,0,1,0x57926895,3,1 ;02 to R4 0x57844E99,0,1,0x57907b00,2,0=0x57844E99,0,1,0x57927b15,2,0 0x57844E19,2,0,0x57907b00,0,1=0x57844E19,2,0,0x57927b15,0,1 @@ -2590,8 +2590,8 @@ ;02 to R3 0x57844529,2,0,0x57906800,1,0=0x57844529,2,0,0x57926825,1,0 0x578445A9,0,1,0x57906800,3,1=0x578445A9,0,1,0x57926825,3,1 -0x57844E29,2,0,0x57906800,1,0=0x57844529,2,0,0x579268A5,1,0; conflicting-override -0x57844EA9,0,1,0x57906800,3,1=0x578445A9,0,1,0x579268A5,3,1; conflicting-override +0x57844E29,2,0,0x57906800,1,0=0x57844529,2,0,0x579268A5,1,0 +0x57844EA9,0,1,0x57906800,3,1=0x578445A9,0,1,0x579268A5,3,1 ;02 to R4 0x57844EA9,0,1,0x57907b00,2,0=0x57844EA9,0,1,0x57927b25,2,0 0x57844E29,2,0,0x57907b00,0,1=0x57844E29,2,0,0x57927b25,0,1 @@ -3488,8 +3488,8 @@ ;02 to R3 0x57844539,2,0,0x57906800,1,0=0x57844539,2,0,0x57926835,1,0 0x578445B9,0,1,0x57906800,3,1=0x578445B9,0,1,0x57926835,3,1 -0x57844E39,2,0,0x57906800,1,0=0x57844539,2,0,0x579268B5,1,0; conflicting-override -0x57844EB9,0,1,0x57906800,3,1=0x578445B9,0,1,0x579268B5,3,1; conflicting-override +0x57844E39,2,0,0x57906800,1,0=0x57844539,2,0,0x579268B5,1,0 +0x57844EB9,0,1,0x57906800,3,1=0x578445B9,0,1,0x579268B5,3,1 ;02 to R4 0x57844EB9,0,1,0x57907b00,2,0=0x57844EB9,0,1,0x57927b35,2,0 0x57844E39,2,0,0x57907b00,0,1=0x57844E39,2,0,0x57927b35,0,1 @@ -4386,8 +4386,8 @@ ;02 to R3 0x57844549,2,0,0x57906800,1,0=0x57844549,2,0,0x57926845,1,0 0x578445C9,0,1,0x57906800,3,1=0x578445C9,0,1,0x57926845,3,1 -0x57844E49,2,0,0x57906800,1,0=0x57844549,2,0,0x579268C5,1,0; conflicting-override -0x57844EC9,0,1,0x57906800,3,1=0x578445C9,0,1,0x579268C5,3,1; conflicting-override +0x57844E49,2,0,0x57906800,1,0=0x57844549,2,0,0x579268C5,1,0 +0x57844EC9,0,1,0x57906800,3,1=0x578445C9,0,1,0x579268C5,3,1 ;02 to R4 0x57844EC9,0,1,0x57907b00,2,0=0x57844EC9,0,1,0x57927b45,2,0 0x57844E49,2,0,0x57907b00,0,1=0x57844E49,2,0,0x57927b45,0,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8C_A1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8C_A1_Branch_RHD.txt index 2760f9cfa..1dec2e57f 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8C_A1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8C_A1_Branch_RHD.txt @@ -858,10 +858,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57890380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57890380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57890300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57890300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57890380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57890380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57890300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57890300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57890380,1,1,0x57602400,3,0=0x57890380,1,1,0x5702D000,1,1 @@ -1789,10 +1789,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57890399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57890399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57890319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57890319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57890399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57890399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57890319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57890319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57890399,1,1,0x57602400,3,0=0x57890399,1,1,0x5712D000,1,1 @@ -2753,10 +2753,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578903A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x578903A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57890329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57890329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x578903A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x578903A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57890329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57890329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x578903A9,1,1,0x57602400,3,0=0x578903A9,1,1,0x5722D000,1,1 @@ -3748,10 +3748,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578903B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x578903B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57890339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57890339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x578903B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x578903B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57890339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57890339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x578903B9,1,1,0x57602400,3,0=0x578903B9,1,1,0x5732D000,1,1 @@ -4747,10 +4747,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578903C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x578903C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57890349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57890349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x578903C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x578903C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57890349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57890349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x578903C9,1,1,0x57602400,3,0=0x578903C9,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8C_D1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8C_D1_Branch_RHD.txt index 0afc286e9..42c6d89d2 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8C_D1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8C_D1_Branch_RHD.txt @@ -858,10 +858,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57893380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57893380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57893300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57893300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57893380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57893380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57893300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57893300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57893380,1,1,0x57602400,3,0=0x57893380,1,1,0x5702D000,1,1 @@ -1789,10 +1789,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57893399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57893399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57893319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57893319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57893399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57893399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57893319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57893319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57893399,1,1,0x57602400,3,0=0x57893399,1,1,0x5712D000,1,1 @@ -2753,10 +2753,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578933A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x578933A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57893329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57893329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x578933A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x578933A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57893329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57893329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x578933A9,1,1,0x57602400,3,0=0x578933A9,1,1,0x5722D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8C_E1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8C_E1_Branch_RHD.txt index f68a705bf..c97fa8da7 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8C_E1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8C_E1_Branch_RHD.txt @@ -27,19 +27,19 @@ 0x57894500,2,0,0x57007100,3,1=0x57894500,2,0,0x57027100,3,1 ;02 to 71-1 (L1 Road DxO) 0x57894580,0,1,0x57007115,1,0=0x57894580,0,1,0x57027115,1,0 -0x57894549,2,0,0x57007115,3,1=0x57894549,2,0,0x57027115,3,1; conflicting-override +0x57894549,2,0,0x57007115,3,1=0x57894549,2,0,0x57027115,3,1 ;02 to 71-2 (L2 Road DxO) 0x57894580,0,1,0x57007125,1,0=0x57894580,0,1,0x57027125,1,0 -0x57894549,2,0,0x57007125,3,1=0x57894549,2,0,0x57027125,3,1; conflicting-override +0x57894549,2,0,0x57007125,3,1=0x57894549,2,0,0x57027125,3,1 ;02 to 72 (One-Way Road DxO) 0x57894580,0,1,0x57007200,1,0=0x57894580,0,1,0x57027200,1,0 0x57894500,2,0,0x57007200,3,1=0x57894500,2,0,0x57027200,3,1 ;02 to 72-1 (L1 One-Way Road DxO) 0x57894580,0,1,0x57007215,1,0=0x57894580,0,1,0x57027215,1,0 -0x57894549,2,0,0x57007215,3,1=0x57894549,2,0,0x57027215,3,1; conflicting-override +0x57894549,2,0,0x57007215,3,1=0x57894549,2,0,0x57027215,3,1 ;02 to 72-2 (L2 One-Way Road DxO) 0x57894580,0,1,0x57007225,1,0=0x57894580,0,1,0x57027225,1,0 -0x57894549,2,0,0x57007225,3,1=0x57894549,2,0,0x57027225,3,1; conflicting-override +0x57894549,2,0,0x57007225,3,1=0x57894549,2,0,0x57027225,3,1 ;02 to 73 (Avenue DxO) 0x57894580,0,1,0x57007309,1,0=0x57894580,0,1,0x57027309,1,0 0x57894500,2,0,0x57007309,3,1=0x57894500,2,0,0x57027309,3,1 @@ -2360,20 +2360,20 @@ 0x578945C9,0,1,0x57007100,1,0=0x578945C9,0,1,0x57427100,1,0 0x57894549,2,0,0x57007100,3,1=0x57894549,2,0,0x57427100,3,1 ;02 to 71-1 (L1 Road DxO) -0x578945C9,0,1,0x57007115,1,0=0x578945C9,0,1,0x57427115,1,0; conflicting-override -0x578945C9,2,0,0x57007115,3,1=0x578945C9,2,0,0x57427115,3,1; conflicting-override +0x578945C9,0,1,0x57007115,1,0=0x578945C9,0,1,0x57427115,1,0 +0x578945C9,2,0,0x57007115,3,1=0x578945C9,2,0,0x57427115,3,1 ;02 to 71-2 (L2 Road DxO) -0x578945C9,0,1,0x57007125,1,0=0x578945C9,0,1,0x57427125,1,0; conflicting-override -0x578945C9,2,0,0x57007125,3,1=0x578945C9,2,0,0x57427125,3,1; conflicting-override +0x578945C9,0,1,0x57007125,1,0=0x578945C9,0,1,0x57427125,1,0 +0x578945C9,2,0,0x57007125,3,1=0x578945C9,2,0,0x57427125,3,1 ;02 to 72 (One-Way Road DxO) 0x578945C9,0,1,0x57007200,1,0=0x578945C9,0,1,0x57427200,1,0 0x57894549,2,0,0x57007200,3,1=0x57894549,2,0,0x57427200,3,1 ;02 to 72-1 (L1 One-Way Road DxO) -0x578945C9,0,1,0x57007215,1,0=0x578945C9,0,1,0x57427215,1,0; conflicting-override -0x578945C9,2,0,0x57007215,3,1=0x578945C9,2,0,0x57427215,3,1; conflicting-override +0x578945C9,0,1,0x57007215,1,0=0x578945C9,0,1,0x57427215,1,0 +0x578945C9,2,0,0x57007215,3,1=0x578945C9,2,0,0x57427215,3,1 ;02 to 72-2 (L2 One-Way Road DxO) -0x578945C9,0,1,0x57007225,1,0=0x578945C9,0,1,0x57427225,1,0; conflicting-override -0x578945C9,2,0,0x57007225,3,1=0x578945C9,2,0,0x57427225,3,1; conflicting-override +0x578945C9,0,1,0x57007225,1,0=0x578945C9,0,1,0x57427225,1,0 +0x578945C9,2,0,0x57007225,3,1=0x578945C9,2,0,0x57427225,3,1 ;02 to 73 (Avenue DxO) 0x578945C9,0,1,0x57007309,1,0=0x578945C9,0,1,0x57427305,1,0 0x57894549,2,0,0x57007309,3,1=0x57894549,2,0,0x57427305,3,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S+_A1_Inside_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S+_A1_Inside_Branch_RHD.txt index d2e2b5a8b..c30db5272 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S+_A1_Inside_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S+_A1_Inside_Branch_RHD.txt @@ -858,10 +858,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57850A00,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57850A00,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57850A80,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57850A80,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57850A00,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57850A00,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57850A80,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57850A80,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57850A00,1,1,0x57602400,3,0=0x57850A00,1,1,0x5702D000,1,1 @@ -1789,10 +1789,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57850A19,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57850A19,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57850A99,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57850A99,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57850A19,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57850A19,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57850A99,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57850A99,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57850A19,1,1,0x57602400,3,0=0x57850A19,1,1,0x5712D000,1,1 @@ -2753,10 +2753,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57850A29,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x57850A29,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57850AA9,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57850AA9,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x57850A29,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x57850A29,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57850AA9,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57850AA9,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x57850A29,1,1,0x57602400,3,0=0x57850A29,1,1,0x5722D000,1,1 @@ -3748,10 +3748,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578503B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x578503B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57850339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57850339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x578503B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x578503B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57850339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57850339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x578503B9,1,1,0x57602400,3,0=0x578503B9,1,1,0x5732D000,1,1 @@ -4747,10 +4747,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578503C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x578503C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57850349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57850349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x578503C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x578503C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57850349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57850349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x578503C9,1,1,0x57602400,3,0=0x578503C9,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S+_D1_Inside_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S+_D1_Inside_Branch_RHD.txt index 4aa76b6ab..25063dee6 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S+_D1_Inside_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S+_D1_Inside_Branch_RHD.txt @@ -858,10 +858,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57853A00,3,0,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57853A00,3,0,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57853A80,1,1,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57853A80,1,1,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57853A00,3,0,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57853A00,3,0,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57853A80,1,1,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57853A80,1,1,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57853A00,3,0,0x57602400,3,0=0x57853A00,3,0,0x5702D000,1,1 @@ -1789,10 +1789,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57853A19,3,0,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57853A19,3,0,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57853A99,1,1,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57853A99,1,1,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57853A19,3,0,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57853A19,3,0,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57853A99,1,1,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57853A99,1,1,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57853A19,3,0,0x57602400,3,0=0x57853A19,3,0,0x5712D000,1,1 @@ -2753,10 +2753,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57853A29,3,0,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x57853A29,3,0,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57853AA9,1,1,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57853AA9,1,1,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x57853A29,3,0,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x57853A29,3,0,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57853AA9,1,1,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57853AA9,1,1,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x57853A29,3,0,0x57602400,3,0=0x57853A29,3,0,0x5722D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S_A1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S_A1_Branch_RHD.txt index a84b87912..ab3fccf61 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S_A1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S_A1_Branch_RHD.txt @@ -858,10 +858,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57850380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57850380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57850300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57850300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57850380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57850380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57850300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57850300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57850380,1,1,0x57602400,3,0=0x57850380,1,1,0x5702D000,1,1 @@ -1789,10 +1789,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57850399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57850399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57850319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57850319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57850399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57850399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57850319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57850319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57850399,1,1,0x57602400,3,0=0x57850399,1,1,0x5712D000,1,1 @@ -2753,10 +2753,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578503A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x578503A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57850329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57850329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x578503A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x578503A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57850329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57850329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x578503A9,1,1,0x57602400,3,0=0x578503A9,1,1,0x5722D000,1,1 @@ -3748,10 +3748,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578503B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x578503B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57850339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57850339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x578503B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x578503B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57850339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57850339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x578503B9,1,1,0x57602400,3,0=0x578503B9,1,1,0x5732D000,1,1 @@ -4747,10 +4747,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578503C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x578503C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57850349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57850349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x578503C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x578503C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57850349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57850349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x578503C9,1,1,0x57602400,3,0=0x578503C9,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S_A3_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S_A3_Branch_RHD.txt index 1548b7313..c446ed168 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S_A3_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S_A3_Branch_RHD.txt @@ -1,13 +1,13 @@ ;RHW-8S Type A3 Branch Continuation Adjacency Code ;RHD Version -0x57450880,1,1,0x57000000,1,0=0x57450880,1,1,0x57040000,1,0; conflicting-override -0x57450880,1,1,0x57000000,3,0=0x57450880,1,1,0x57040000,1,0; conflicting-override -0x57450800,3,0,0x57000000,1,0=0x57450800,3,0,0x57040000,3,0; conflicting-override -0x57450800,3,0,0x57000000,3,0=0x57450800,3,0,0x57040000,3,0; conflicting-override -0x57450880,1,1,0x57000000,1,1=0x57450880,1,1,0x57040000,1,0; conflicting-override -0x57450880,1,1,0x57000000,3,1=0x57450880,1,1,0x57040000,1,0; conflicting-override -0x57450800,3,0,0x57000000,1,1=0x57450800,3,0,0x57040000,3,0; conflicting-override -0x57450800,3,0,0x57000000,3,1=0x57450800,3,0,0x57040000,3,0; conflicting-override +0x57450880,1,1,0x57000000,1,0=0x57450880,1,1,0x57040000,1,0 +0x57450880,1,1,0x57000000,3,0=0x57450880,1,1,0x57040000,1,0 +0x57450800,3,0,0x57000000,1,0=0x57450800,3,0,0x57040000,3,0 +0x57450800,3,0,0x57000000,3,0=0x57450800,3,0,0x57040000,3,0 +0x57450880,1,1,0x57000000,1,1=0x57450880,1,1,0x57040000,1,0 +0x57450880,1,1,0x57000000,3,1=0x57450880,1,1,0x57040000,1,0 +0x57450800,3,0,0x57000000,1,1=0x57450800,3,0,0x57040000,3,0 +0x57450800,3,0,0x57000000,3,1=0x57450800,3,0,0x57040000,3,0 0x57450880,1,1,0x57000100,1,0=0x57450880,1,1,0x57040100,1,0 0x57450800,3,0,0x57000100,1,0=0x57450800,3,0,0x57040100,3,1 0x57450880,1,1,0x57000400,3,0=0x57450880,1,1,0x57040B00,3,0 @@ -348,14 +348,14 @@ 0x57450880,1,1,0x5700FA00,3,0=0x57450880,1,1,0x5704FA00,1,0 0x57450800,3,0,0x5700FA00,1,0=0x57450800,3,0,0x5704FA00,3,0 0x57450800,3,0,0x5700FA00,3,0=0x57450800,3,0,0x5704FA00,3,0 -0x57450899,1,1,0x57000000,1,0=0x57450899,1,1,0x57140000,1,0; conflicting-override -0x57450899,1,1,0x57000000,3,0=0x57450899,1,1,0x57140000,1,0; conflicting-override -0x57450819,3,0,0x57000000,1,0=0x57450819,3,0,0x57140000,3,0; conflicting-override -0x57450819,3,0,0x57000000,3,0=0x57450819,3,0,0x57140000,3,0; conflicting-override -0x57450899,1,1,0x57000000,1,1=0x57450899,1,1,0x57140000,1,0; conflicting-override -0x57450899,1,1,0x57000000,3,1=0x57450899,1,1,0x57140000,1,0; conflicting-override -0x57450819,3,0,0x57000000,1,1=0x57450819,3,0,0x57140000,3,0; conflicting-override -0x57450819,3,0,0x57000000,3,1=0x57450819,3,0,0x57140000,3,0; conflicting-override +0x57450899,1,1,0x57000000,1,0=0x57450899,1,1,0x57140000,1,0 +0x57450899,1,1,0x57000000,3,0=0x57450899,1,1,0x57140000,1,0 +0x57450819,3,0,0x57000000,1,0=0x57450819,3,0,0x57140000,3,0 +0x57450819,3,0,0x57000000,3,0=0x57450819,3,0,0x57140000,3,0 +0x57450899,1,1,0x57000000,1,1=0x57450899,1,1,0x57140000,1,0 +0x57450899,1,1,0x57000000,3,1=0x57450899,1,1,0x57140000,1,0 +0x57450819,3,0,0x57000000,1,1=0x57450819,3,0,0x57140000,3,0 +0x57450819,3,0,0x57000000,3,1=0x57450819,3,0,0x57140000,3,0 0x57450899,1,1,0x57000100,1,0=0x57450899,1,1,0x57140100,1,0 0x57450819,3,0,0x57000100,1,0=0x57450819,3,0,0x57140100,3,1 0x57450899,1,1,0x57000400,3,0=0x57450899,1,1,0x57140B00,3,0 @@ -914,14 +914,14 @@ 0x574508A9,1,1,0x5E600B00,3,0=0x574508A9,1,1,0x5E600B29,3,0 0x57450829,3,0,0x5E600B00,1,0=0x57450829,3,0,0x5E600B29,1,0 0x57450829,3,0,0x5E600B00,3,0=0x57450829,3,0,0x5E600B29,3,0 -0x574508A9,1,1,0x57000000,1,0=0x574508A9,1,1,0x57240000,1,0; conflicting-override -0x574508A9,1,1,0x57000000,3,0=0x574508A9,1,1,0x57240000,1,0; conflicting-override -0x57450829,3,0,0x57000000,1,0=0x57450829,3,0,0x57240000,3,0; conflicting-override -0x57450829,3,0,0x57000000,3,0=0x57450829,3,0,0x57240000,3,0; conflicting-override -0x574508A9,1,1,0x57000000,1,1=0x574508A9,1,1,0x57240000,1,0; conflicting-override -0x574508A9,1,1,0x57000000,3,1=0x574508A9,1,1,0x57240000,1,0; conflicting-override -0x57450829,3,0,0x57000000,1,1=0x57450829,3,0,0x57240000,3,0; conflicting-override -0x57450829,3,0,0x57000000,3,1=0x57450829,3,0,0x57240000,3,0; conflicting-override +0x574508A9,1,1,0x57000000,1,0=0x574508A9,1,1,0x57240000,1,0 +0x574508A9,1,1,0x57000000,3,0=0x574508A9,1,1,0x57240000,1,0 +0x57450829,3,0,0x57000000,1,0=0x57450829,3,0,0x57240000,3,0 +0x57450829,3,0,0x57000000,3,0=0x57450829,3,0,0x57240000,3,0 +0x574508A9,1,1,0x57000000,1,1=0x574508A9,1,1,0x57240000,1,0 +0x574508A9,1,1,0x57000000,3,1=0x574508A9,1,1,0x57240000,1,0 +0x57450829,3,0,0x57000000,1,1=0x57450829,3,0,0x57240000,3,0 +0x57450829,3,0,0x57000000,3,1=0x57450829,3,0,0x57240000,3,0 0x574508A9,1,1,0x57000100,1,0=0x574508A9,1,1,0x57240100,1,0 0x57450829,3,0,0x57000100,1,0=0x57450829,3,0,0x57240100,3,1 0x574508A9,1,1,0x57000400,3,0=0x574508A9,1,1,0x57240B00,3,0 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S_B1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S_B1_Branch_RHD.txt index 4bb988732..f1c1f207c 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S_B1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S_B1_Branch_RHD.txt @@ -836,8 +836,8 @@ ;02 to R3 0x57851500,2,0,0x57906800,1,0=0x57851500,2,0,0x57926800,1,0 0x57851580,0,1,0x57906800,3,1=0x57851580,0,1,0x57926800,3,1 -0x57851E00,2,0,0x57906800,1,0=0x57851500,2,0,0x57926880,1,0; conflicting-override -0x57851E80,0,1,0x57906800,3,1=0x57851580,0,1,0x57926880,3,1; conflicting-override +0x57851E00,2,0,0x57906800,1,0=0x57851500,2,0,0x57926880,1,0 +0x57851E80,0,1,0x57906800,3,1=0x57851580,0,1,0x57926880,3,1 ;02 to R4 0x57851E80,0,1,0x57907b00,2,0=0x57851E80,0,1,0x57927b00,2,0 0x57851E00,2,0,0x57907b00,0,1=0x57851E00,2,0,0x57927b00,0,1 @@ -1723,8 +1723,8 @@ ;02 to R3 0x57851519,2,0,0x57906800,1,0=0x57851519,2,0,0x57926815,1,0 0x57851599,0,1,0x57906800,3,1=0x57851599,0,1,0x57926815,3,1 -0x57851E19,2,0,0x57906800,1,0=0x57851519,2,0,0x57926895,1,0; conflicting-override -0x57851E99,0,1,0x57906800,3,1=0x57851599,0,1,0x57926895,3,1; conflicting-override +0x57851E19,2,0,0x57906800,1,0=0x57851519,2,0,0x57926895,1,0 +0x57851E99,0,1,0x57906800,3,1=0x57851599,0,1,0x57926895,3,1 ;02 to R4 0x57851E99,0,1,0x57907b00,2,0=0x57851E99,0,1,0x57927b15,2,0 0x57851E19,2,0,0x57907b00,0,1=0x57851E19,2,0,0x57927b15,0,1 @@ -2590,8 +2590,8 @@ ;02 to R3 0x57851529,2,0,0x57906800,1,0=0x57851529,2,0,0x57926825,1,0 0x578515A9,0,1,0x57906800,3,1=0x578515A9,0,1,0x57926825,3,1 -0x57851E29,2,0,0x57906800,1,0=0x57851529,2,0,0x579268A5,1,0; conflicting-override -0x57851EA9,0,1,0x57906800,3,1=0x578515A9,0,1,0x579268A5,3,1; conflicting-override +0x57851E29,2,0,0x57906800,1,0=0x57851529,2,0,0x579268A5,1,0 +0x57851EA9,0,1,0x57906800,3,1=0x578515A9,0,1,0x579268A5,3,1 ;02 to R4 0x57851EA9,0,1,0x57907b00,2,0=0x57851EA9,0,1,0x57927b25,2,0 0x57851E29,2,0,0x57907b00,0,1=0x57851E29,2,0,0x57927b25,0,1 @@ -3488,8 +3488,8 @@ ;02 to R3 0x57851539,2,0,0x57906800,1,0=0x57851539,2,0,0x57926835,1,0 0x578515B9,0,1,0x57906800,3,1=0x578515B9,0,1,0x57926835,3,1 -0x57851E39,2,0,0x57906800,1,0=0x57851539,2,0,0x579268B5,1,0; conflicting-override -0x57851EB9,0,1,0x57906800,3,1=0x578515B9,0,1,0x579268B5,3,1; conflicting-override +0x57851E39,2,0,0x57906800,1,0=0x57851539,2,0,0x579268B5,1,0 +0x57851EB9,0,1,0x57906800,3,1=0x578515B9,0,1,0x579268B5,3,1 ;02 to R4 0x57851EB9,0,1,0x57907b00,2,0=0x57851EB9,0,1,0x57927b35,2,0 0x57851E39,2,0,0x57907b00,0,1=0x57851E39,2,0,0x57927b35,0,1 @@ -4386,8 +4386,8 @@ ;02 to R3 0x57851549,2,0,0x57906800,1,0=0x57851549,2,0,0x57926845,1,0 0x578515C9,0,1,0x57906800,3,1=0x578515C9,0,1,0x57926845,3,1 -0x57851E49,2,0,0x57906800,1,0=0x57851549,2,0,0x579268C5,1,0; conflicting-override -0x57851EC9,0,1,0x57906800,3,1=0x578515C9,0,1,0x579268C5,3,1; conflicting-override +0x57851E49,2,0,0x57906800,1,0=0x57851549,2,0,0x579268C5,1,0 +0x57851EC9,0,1,0x57906800,3,1=0x578515C9,0,1,0x579268C5,3,1 ;02 to R4 0x57851EC9,0,1,0x57907b00,2,0=0x57851EC9,0,1,0x57927b45,2,0 0x57851E49,2,0,0x57907b00,0,1=0x57851E49,2,0,0x57927b45,0,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S_D1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S_D1_Branch_RHD.txt index 9d6caf316..fa751f077 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S_D1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S_D1_Branch_RHD.txt @@ -858,10 +858,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57853380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57853380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57853300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57853300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57853380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57853380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57853300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57853300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57853380,1,1,0x57602400,3,0=0x57853380,1,1,0x5702D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S_D3_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S_D3_Branch_RHD.txt index bf4a94081..7edbd2931 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S_D3_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S_D3_Branch_RHD.txt @@ -1,13 +1,13 @@ ;RHW-8S Type D3 Branch Continuation Adjacency Code ;RHD Version -0x57453880,1,1,0x57000000,1,0=0x57453880,1,1,0x57040000,1,0; conflicting-override -0x57453880,1,1,0x57000000,3,0=0x57453880,1,1,0x57040000,1,0; conflicting-override -0x57453800,3,0,0x57000000,1,0=0x57453800,3,0,0x57040000,3,0; conflicting-override -0x57453800,3,0,0x57000000,3,0=0x57453800,3,0,0x57040000,3,0; conflicting-override -0x57453880,1,1,0x57000000,1,1=0x57453880,1,1,0x57040000,1,0; conflicting-override -0x57453880,1,1,0x57000000,3,1=0x57453880,1,1,0x57040000,1,0; conflicting-override -0x57453800,3,0,0x57000000,1,1=0x57453800,3,0,0x57040000,3,0; conflicting-override -0x57453800,3,0,0x57000000,3,1=0x57453800,3,0,0x57040000,3,0; conflicting-override +0x57453880,1,1,0x57000000,1,0=0x57453880,1,1,0x57040000,1,0 +0x57453880,1,1,0x57000000,3,0=0x57453880,1,1,0x57040000,1,0 +0x57453800,3,0,0x57000000,1,0=0x57453800,3,0,0x57040000,3,0 +0x57453800,3,0,0x57000000,3,0=0x57453800,3,0,0x57040000,3,0 +0x57453880,1,1,0x57000000,1,1=0x57453880,1,1,0x57040000,1,0 +0x57453880,1,1,0x57000000,3,1=0x57453880,1,1,0x57040000,1,0 +0x57453800,3,0,0x57000000,1,1=0x57453800,3,0,0x57040000,3,0 +0x57453800,3,0,0x57000000,3,1=0x57453800,3,0,0x57040000,3,0 0x57453880,1,1,0x57000100,1,0=0x57453880,1,1,0x57040100,1,0 0x57453800,3,0,0x57000100,1,0=0x57453800,3,0,0x57040100,3,1 0x57453880,1,1,0x57000400,3,0=0x57453880,1,1,0x57040B00,3,0 @@ -348,14 +348,14 @@ 0x57453880,1,1,0x5700FA00,3,0=0x57453880,1,1,0x5704FA00,1,0 0x57453800,3,0,0x5700FA00,1,0=0x57453800,3,0,0x5704FA00,3,0 0x57453800,3,0,0x5700FA00,3,0=0x57453800,3,0,0x5704FA00,3,0 -0x57453899,1,1,0x57000000,1,0=0x57453899,1,1,0x57140000,1,0; conflicting-override -0x57453899,1,1,0x57000000,3,0=0x57453899,1,1,0x57140000,1,0; conflicting-override -0x57453819,3,0,0x57000000,1,0=0x57453819,3,0,0x57140000,3,0; conflicting-override -0x57453819,3,0,0x57000000,3,0=0x57453819,3,0,0x57140000,3,0; conflicting-override -0x57453899,1,1,0x57000000,1,1=0x57453899,1,1,0x57140000,1,0; conflicting-override -0x57453899,1,1,0x57000000,3,1=0x57453899,1,1,0x57140000,1,0; conflicting-override -0x57453819,3,0,0x57000000,1,1=0x57453819,3,0,0x57140000,3,0; conflicting-override -0x57453819,3,0,0x57000000,3,1=0x57453819,3,0,0x57140000,3,0; conflicting-override +0x57453899,1,1,0x57000000,1,0=0x57453899,1,1,0x57140000,1,0 +0x57453899,1,1,0x57000000,3,0=0x57453899,1,1,0x57140000,1,0 +0x57453819,3,0,0x57000000,1,0=0x57453819,3,0,0x57140000,3,0 +0x57453819,3,0,0x57000000,3,0=0x57453819,3,0,0x57140000,3,0 +0x57453899,1,1,0x57000000,1,1=0x57453899,1,1,0x57140000,1,0 +0x57453899,1,1,0x57000000,3,1=0x57453899,1,1,0x57140000,1,0 +0x57453819,3,0,0x57000000,1,1=0x57453819,3,0,0x57140000,3,0 +0x57453819,3,0,0x57000000,3,1=0x57453819,3,0,0x57140000,3,0 0x57453899,1,1,0x57000100,1,0=0x57453899,1,1,0x57140100,1,0 0x57453819,3,0,0x57000100,1,0=0x57453819,3,0,0x57140100,3,1 0x57453899,1,1,0x57000400,3,0=0x57453899,1,1,0x57140B00,3,0 @@ -914,14 +914,14 @@ 0x574538A9,1,1,0x5E600B00,3,0=0x574538A9,1,1,0x5E600B29,3,0 0x57453829,3,0,0x5E600B00,1,0=0x57453829,3,0,0x5E600B29,1,0 0x57453829,3,0,0x5E600B00,3,0=0x57453829,3,0,0x5E600B29,3,0 -0x574538A9,1,1,0x57000000,1,0=0x574538A9,1,1,0x57240000,1,0; conflicting-override -0x574538A9,1,1,0x57000000,3,0=0x574538A9,1,1,0x57240000,1,0; conflicting-override -0x57453829,3,0,0x57000000,1,0=0x57453829,3,0,0x57240000,3,0; conflicting-override -0x57453829,3,0,0x57000000,3,0=0x57453829,3,0,0x57240000,3,0; conflicting-override -0x574538A9,1,1,0x57000000,1,1=0x574538A9,1,1,0x57240000,1,0; conflicting-override -0x574538A9,1,1,0x57000000,3,1=0x574538A9,1,1,0x57240000,1,0; conflicting-override -0x57453829,3,0,0x57000000,1,1=0x57453829,3,0,0x57240000,3,0; conflicting-override -0x57453829,3,0,0x57000000,3,1=0x57453829,3,0,0x57240000,3,0; conflicting-override +0x574538A9,1,1,0x57000000,1,0=0x574538A9,1,1,0x57240000,1,0 +0x574538A9,1,1,0x57000000,3,0=0x574538A9,1,1,0x57240000,1,0 +0x57453829,3,0,0x57000000,1,0=0x57453829,3,0,0x57240000,3,0 +0x57453829,3,0,0x57000000,3,0=0x57453829,3,0,0x57240000,3,0 +0x574538A9,1,1,0x57000000,1,1=0x574538A9,1,1,0x57240000,1,0 +0x574538A9,1,1,0x57000000,3,1=0x574538A9,1,1,0x57240000,1,0 +0x57453829,3,0,0x57000000,1,1=0x57453829,3,0,0x57240000,3,0 +0x57453829,3,0,0x57000000,3,1=0x57453829,3,0,0x57240000,3,0 0x574538A9,1,1,0x57000100,1,0=0x574538A9,1,1,0x57240100,1,0 0x57453829,3,0,0x57000100,1,0=0x57453829,3,0,0x57240100,3,1 0x574538A9,1,1,0x57000400,3,0=0x574538A9,1,1,0x57240B00,3,0 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S_E1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S_E1_Branch_RHD.txt index 43e8b254c..fb5d43d5c 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S_E1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_8S_E1_Branch_RHD.txt @@ -836,8 +836,8 @@ ;02 to R3 0x57854500,2,0,0x57906800,1,0=0x57854500,2,0,0x57926800,1,0 0x57854580,0,1,0x57906800,3,1=0x57854580,0,1,0x57926800,3,1 -0x57854E00,2,0,0x57906800,1,0=0x57854500,2,0,0x57926880,1,0; conflicting-override -0x57854E80,0,1,0x57906800,3,1=0x57854580,0,1,0x57926880,3,1; conflicting-override +0x57854E00,2,0,0x57906800,1,0=0x57854500,2,0,0x57926880,1,0 +0x57854E80,0,1,0x57906800,3,1=0x57854580,0,1,0x57926880,3,1 ;02 to R4 0x57854E80,0,1,0x57907b00,2,0=0x57854E80,0,1,0x57927b00,2,0 0x57854E00,2,0,0x57907b00,0,1=0x57854E00,2,0,0x57927b00,0,1 @@ -1723,8 +1723,8 @@ ;02 to R3 0x57854519,2,0,0x57906800,1,0=0x57854519,2,0,0x57926815,1,0 0x57854599,0,1,0x57906800,3,1=0x57854599,0,1,0x57926815,3,1 -0x57854E19,2,0,0x57906800,1,0=0x57854519,2,0,0x57926895,1,0; conflicting-override -0x57854E99,0,1,0x57906800,3,1=0x57854599,0,1,0x57926895,3,1; conflicting-override +0x57854E19,2,0,0x57906800,1,0=0x57854519,2,0,0x57926895,1,0 +0x57854E99,0,1,0x57906800,3,1=0x57854599,0,1,0x57926895,3,1 ;02 to R4 0x57854E99,0,1,0x57907b00,2,0=0x57854E99,0,1,0x57927b15,2,0 0x57854E19,2,0,0x57907b00,0,1=0x57854E19,2,0,0x57927b15,0,1 @@ -2590,8 +2590,8 @@ ;02 to R3 0x57854529,2,0,0x57906800,1,0=0x57854529,2,0,0x57926825,1,0 0x578545A9,0,1,0x57906800,3,1=0x578545A9,0,1,0x57926825,3,1 -0x57854E29,2,0,0x57906800,1,0=0x57854529,2,0,0x579268A5,1,0; conflicting-override -0x57854EA9,0,1,0x57906800,3,1=0x578545A9,0,1,0x579268A5,3,1; conflicting-override +0x57854E29,2,0,0x57906800,1,0=0x57854529,2,0,0x579268A5,1,0 +0x57854EA9,0,1,0x57906800,3,1=0x578545A9,0,1,0x579268A5,3,1 ;02 to R4 0x57854EA9,0,1,0x57907b00,2,0=0x57854EA9,0,1,0x57927b25,2,0 0x57854E29,2,0,0x57907b00,0,1=0x57854E29,2,0,0x57927b25,0,1 @@ -3488,8 +3488,8 @@ ;02 to R3 0x57854539,2,0,0x57906800,1,0=0x57854539,2,0,0x57926835,1,0 0x578545B9,0,1,0x57906800,3,1=0x578545B9,0,1,0x57926835,3,1 -0x57854E39,2,0,0x57906800,1,0=0x57854539,2,0,0x579268B5,1,0; conflicting-override -0x57854EB9,0,1,0x57906800,3,1=0x578545B9,0,1,0x579268B5,3,1; conflicting-override +0x57854E39,2,0,0x57906800,1,0=0x57854539,2,0,0x579268B5,1,0 +0x57854EB9,0,1,0x57906800,3,1=0x578545B9,0,1,0x579268B5,3,1 ;02 to R4 0x57854EB9,0,1,0x57907b00,2,0=0x57854EB9,0,1,0x57927b35,2,0 0x57854E39,2,0,0x57907b00,0,1=0x57854E39,2,0,0x57927b35,0,1 @@ -4386,8 +4386,8 @@ ;02 to R3 0x57854549,2,0,0x57906800,1,0=0x57854549,2,0,0x57926845,1,0 0x578545C9,0,1,0x57906800,3,1=0x578545C9,0,1,0x57926845,3,1 -0x57854E49,2,0,0x57906800,1,0=0x57854549,2,0,0x579268C5,1,0; conflicting-override -0x57854EC9,0,1,0x57906800,3,1=0x578545C9,0,1,0x579268C5,3,1; conflicting-override +0x57854E49,2,0,0x57906800,1,0=0x57854549,2,0,0x579268C5,1,0 +0x57854EC9,0,1,0x57906800,3,1=0x578545C9,0,1,0x579268C5,3,1 ;02 to R4 0x57854EC9,0,1,0x57907b00,2,0=0x57854EC9,0,1,0x57927b45,2,0 0x57854E49,2,0,0x57907b00,0,1=0x57854E49,2,0,0x57927b45,0,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_A1_Bottom_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_A1_Bottom_RHD.txt index 7391197f1..40c69072b 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_A1_Bottom_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_A1_Bottom_RHD.txt @@ -1765,10 +1765,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57820280,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57820280,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57820200,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57820200,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57820280,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57820280,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57820200,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57820200,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57820280,1,1,0x57602400,3,0=0x57820280,1,1,0x5702D000,1,1 @@ -8405,10 +8405,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57820299,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57820299,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57820219,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57820219,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57820299,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57820299,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57820219,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57820219,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57820299,1,1,0x57602400,3,0=0x57820299,1,1,0x5712D000,1,1 @@ -15501,10 +15501,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578202A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x578202A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57820229,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57820229,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x578202A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x578202A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57820229,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57820229,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x578202A9,1,1,0x57602400,3,0=0x578202A9,1,1,0x5722D000,1,1 @@ -20900,10 +20900,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578202B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x578202B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57820239,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57820239,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x578202B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x578202B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57820239,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57820239,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x578202B9,1,1,0x57602400,3,0=0x578202B9,1,1,0x5732D000,1,1 @@ -23791,10 +23791,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578202C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x578202C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57820249,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57820249,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x578202C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x578202C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57820249,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57820249,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x578202C9,1,1,0x57602400,3,0=0x578202C9,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_A1_Inside_Top_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_A1_Inside_Top_RHD.txt index 9c4bd28e4..256a287f7 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_A1_Inside_Top_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_A1_Inside_Top_RHD.txt @@ -1765,10 +1765,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57820780,3,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57820780,3,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57820700,1,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57820700,1,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57820780,3,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57820780,3,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57820700,1,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57820700,1,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57820780,3,1,0x57602400,3,0=0x57820780,3,1,0x5702D000,1,1 @@ -6418,10 +6418,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57820799,3,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57820799,3,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57820719,1,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57820719,1,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57820799,3,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57820799,3,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57820719,1,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57820719,1,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57820799,3,1,0x57602400,3,0=0x57820799,3,1,0x5712D000,1,1 @@ -11446,10 +11446,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578207A9,3,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x578207A9,3,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57820729,1,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57820729,1,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x578207A9,3,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x578207A9,3,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57820729,1,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57820729,1,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x578207A9,3,1,0x57602400,3,0=0x578207A9,3,1,0x5722D000,1,1 @@ -14808,10 +14808,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578207B9,3,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x578207B9,3,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57820739,1,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57820739,1,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x578207B9,3,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x578207B9,3,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57820739,1,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57820739,1,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x578207B9,3,1,0x57602400,3,0=0x578207B9,3,1,0x5732D000,1,1 @@ -17699,10 +17699,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578207C9,3,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x578207C9,3,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57820749,1,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57820749,1,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x578207C9,3,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x578207C9,3,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57820749,1,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57820749,1,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x578207C9,3,1,0x57602400,3,0=0x578207C9,3,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_A1_Top_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_A1_Top_RHD.txt index 0be3b300a..b8a9cac25 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_A1_Top_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_A1_Top_RHD.txt @@ -1765,10 +1765,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57820000,1,0,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57820000,1,0,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57820080,3,1,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57820080,3,1,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57820000,1,0,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57820000,1,0,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57820080,3,1,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57820080,3,1,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57820000,1,0,0x57602400,3,0=0x57820000,1,0,0x5702D000,1,1 @@ -5136,90 +5136,90 @@ ;----OxD Crossings---- ;00 to 40 (Street OxD) 0x57880000,1,0,0x57004000,3,0=0x57880000,1,0,0x57084040,3,0 -0x57880080,3,1,0x57004000,3,0=0x57880000,3,1,0x57084000,3,0; conflicting-override +0x57880080,3,1,0x57004000,3,0=0x57880000,3,1,0x57084000,3,0 0x57880000,1,0,0x57004000,1,1=0x57880000,1,0,0x57084000,1,1 -0x57880080,3,1,0x57004000,1,1=0x57880000,3,1,0x57084040,1,1; conflicting-override +0x57880080,3,1,0x57004000,1,1=0x57880000,3,1,0x57084040,1,1 ;00 to 41 (Road OxD) 0x57880000,1,0,0x57004100,3,0=0x57880000,1,0,0x57084140,3,0 -0x57880080,3,1,0x57004100,3,0=0x57880000,3,1,0x57084100,3,0; conflicting-override +0x57880080,3,1,0x57004100,3,0=0x57880000,3,1,0x57084100,3,0 0x57880000,1,0,0x57004100,1,1=0x57880000,1,0,0x57084100,1,1 -0x57880080,3,1,0x57004100,1,1=0x57880000,3,1,0x57084140,1,1; conflicting-override +0x57880080,3,1,0x57004100,1,1=0x57880000,3,1,0x57084140,1,1 ;00 to 41-1 (L1 Road OxD) 0x57880000,1,0,0x57004115,3,0=0x57880000,1,0,0x57084155,3,0 -0x57880080,3,1,0x57004115,3,0=0x57880000,3,1,0x57084115,3,0; conflicting-override +0x57880080,3,1,0x57004115,3,0=0x57880000,3,1,0x57084115,3,0 0x57880000,1,0,0x57004115,1,1=0x57880000,1,0,0x57084115,1,1 -0x57880080,3,1,0x57004115,1,1=0x57880000,3,1,0x57084155,1,1; conflicting-override +0x57880080,3,1,0x57004115,1,1=0x57880000,3,1,0x57084155,1,1 ;00 to 41-2 (L2 Road OxD) 0x57880000,1,0,0x57004125,3,0=0x57880000,1,0,0x57084165,3,0 -0x57880080,3,1,0x57004125,3,0=0x57880000,3,1,0x57084125,3,0; conflicting-override +0x57880080,3,1,0x57004125,3,0=0x57880000,3,1,0x57084125,3,0 0x57880000,1,0,0x57004125,1,1=0x57880000,1,0,0x57084125,1,1 -0x57880080,3,1,0x57004125,1,1=0x57880000,3,1,0x57084165,1,1; conflicting-override +0x57880080,3,1,0x57004125,1,1=0x57880000,3,1,0x57084165,1,1 ;00 to 42 (OWR OxD) 0x57880000,1,0,0x57004200,3,0=0x57880000,1,0,0x57084240,3,0 -0x57880080,3,1,0x57004200,3,0=0x57880000,3,1,0x57084200,3,0; conflicting-override +0x57880080,3,1,0x57004200,3,0=0x57880000,3,1,0x57084200,3,0 0x57880000,1,0,0x57004200,1,1=0x57880000,1,0,0x57084200,1,1 -0x57880080,3,1,0x57004200,1,1=0x57880000,3,1,0x57084240,1,1; conflicting-override +0x57880080,3,1,0x57004200,1,1=0x57880000,3,1,0x57084240,1,1 ;00 to 42-1 (L1 OWR OxD) 0x57880000,1,0,0x57004215,3,0=0x57880000,1,0,0x57084255,3,0 -0x57880080,3,1,0x57004215,3,0=0x57880000,3,1,0x57084215,3,0; conflicting-override +0x57880080,3,1,0x57004215,3,0=0x57880000,3,1,0x57084215,3,0 0x57880000,1,0,0x57004215,1,1=0x57880000,1,0,0x57084215,1,1 -0x57880080,3,1,0x57004215,1,1=0x57880000,3,1,0x57084255,1,1; conflicting-override +0x57880080,3,1,0x57004215,1,1=0x57880000,3,1,0x57084255,1,1 ;00 to 42-2 (L2 OWR OxD) 0x57880000,1,0,0x57004225,3,0=0x57880000,1,0,0x57084265,3,0 -0x57880080,3,1,0x57004225,3,0=0x57880000,3,1,0x57084225,3,0; conflicting-override +0x57880080,3,1,0x57004225,3,0=0x57880000,3,1,0x57084225,3,0 0x57880000,1,0,0x57004225,1,1=0x57880000,1,0,0x57084225,1,1 -0x57880080,3,1,0x57004225,1,1=0x57880000,3,1,0x57084265,1,1; conflicting-override +0x57880080,3,1,0x57004225,1,1=0x57880000,3,1,0x57084265,1,1 ;00 to 43 (Avenue OxD) 0x57880000,1,0,0x57004300,3,0=0x57880000,1,0,0x57084340,3,0 -0x57880080,3,1,0x57004300,3,0=0x57880000,3,1,0x57084300,3,0; conflicting-override +0x57880080,3,1,0x57004300,3,0=0x57880000,3,1,0x57084300,3,0 0x57880000,1,0,0x57004300,1,1=0x57880000,1,0,0x57084300,1,1 -0x57880080,3,1,0x57004300,1,1=0x57880000,3,1,0x57084340,1,1; conflicting-override +0x57880080,3,1,0x57004300,1,1=0x57880000,3,1,0x57084340,1,1 ;00 to 43-1 (L1 Avenue OxD) 0x57880000,1,0,0x57004315,3,0=0x57880000,1,0,0x57084355,3,0 -0x57880080,3,1,0x57004315,3,0=0x57880000,3,1,0x57084315,3,0; conflicting-override +0x57880080,3,1,0x57004315,3,0=0x57880000,3,1,0x57084315,3,0 0x57880000,1,0,0x57004315,1,1=0x57880000,1,0,0x57084315,1,1 -0x57880080,3,1,0x57004315,1,1=0x57880000,3,1,0x57084355,1,1; conflicting-override +0x57880080,3,1,0x57004315,1,1=0x57880000,3,1,0x57084355,1,1 ;00 to 43-2 (L2 Avenue OxD) 0x57880000,1,0,0x57004325,3,0=0x57880000,1,0,0x57084365,3,0 -0x57880080,3,1,0x57004325,3,0=0x57880000,3,1,0x57084325,3,0; conflicting-override +0x57880080,3,1,0x57004325,3,0=0x57880000,3,1,0x57084325,3,0 0x57880000,1,0,0x57004325,1,1=0x57880000,1,0,0x57084325,1,1 -0x57880080,3,1,0x57004325,1,1=0x57880000,3,1,0x57084365,1,1; conflicting-override +0x57880080,3,1,0x57004325,1,1=0x57880000,3,1,0x57084365,1,1 ;00 to 44-2 (L2 MHW OxD) 0x57880000,1,0,0x57004420,3,0=0x57880000,1,0,0x57084460,3,0 -0x57880080,3,1,0x57004420,3,0=0x57880000,3,1,0x57084420,3,0; conflicting-override +0x57880080,3,1,0x57004420,3,0=0x57880000,3,1,0x57084420,3,0 0x57880000,1,0,0x57004420,1,1=0x57880000,1,0,0x57084420,1,1 -0x57880080,3,1,0x57004420,1,1=0x57880000,3,1,0x57084460,1,1; conflicting-override +0x57880080,3,1,0x57004420,1,1=0x57880000,3,1,0x57084460,1,1 ;00 to 45a (Rail DTR OxD) 0x57880000,1,0,0x57004500,3,0=0x57880000,1,0,0x57084540,3,0 -0x57880080,3,1,0x57004500,3,0=0x57880000,3,1,0x57084500,3,0; conflicting-override +0x57880080,3,1,0x57004500,3,0=0x57880000,3,1,0x57084500,3,0 0x57880000,1,0,0x57004500,1,1=0x57880000,1,0,0x57084500,1,1 -0x57880080,3,1,0x57004500,1,1=0x57880000,3,1,0x57084540,1,1; conflicting-override +0x57880080,3,1,0x57004500,1,1=0x57880000,3,1,0x57084540,1,1 ;00 to 45-1a (L1 Rail DTR OxD) 0x57880000,1,0,0x5D677A00,1,0=0x57880000,1,0,0x5D678480,1,0 -0x57880080,3,1,0x5D677A00,1,0=0x57880000,3,1,0x5D678400,1,0; conflicting-override +0x57880080,3,1,0x5D677A00,1,0=0x57880000,3,1,0x5D678400,1,0 0x57880000,1,0,0x5D677A00,3,1=0x57880000,1,0,0x5D678400,3,1 -0x57880080,3,1,0x5D677A00,3,1=0x57880000,3,1,0x5D678480,3,1; conflicting-override +0x57880080,3,1,0x5D677A00,3,1=0x57880000,3,1,0x5D678480,3,1 ;00 to 45-2a (L2 Rail DTR OxD) 0x57880000,1,0,0x5D777A00,1,0=0x57880000,1,0,0x5D778480,1,0 -0x57880080,3,1,0x5D777A00,1,0=0x57880000,3,1,0x5D778400,1,0; conflicting-override +0x57880080,3,1,0x5D777A00,1,0=0x57880000,3,1,0x5D778400,1,0 0x57880000,1,0,0x5D777A00,3,1=0x57880000,1,0,0x5D778400,3,1 -0x57880080,3,1,0x5D777A00,3,1=0x57880000,3,1,0x5D778480,3,1; conflicting-override +0x57880080,3,1,0x5D777A00,3,1=0x57880000,3,1,0x5D778480,3,1 ;00 to 47-2 (ELR OxD) 0x57880000,1,0,0x57004720,3,0=0x57880000,1,0,0x57084760,3,0 -0x57880080,3,1,0x57004720,3,0=0x57880000,3,1,0x57084720,3,0; conflicting-override +0x57880080,3,1,0x57004720,3,0=0x57880000,3,1,0x57084720,3,0 0x57880000,1,0,0x57004720,1,1=0x57880000,1,0,0x57084720,1,1 -0x57880080,3,1,0x57004720,1,1=0x57880000,3,1,0x57084760,1,1; conflicting-override +0x57880080,3,1,0x57004720,1,1=0x57880000,3,1,0x57084760,1,1 ;00 to 49b (GHSR OxD) ;00 to 49-2a (ELR OxD) 0x57880000,1,0,0x57004920,3,0=0x57880000,1,0,0x57084960,3,0 -0x57880080,3,1,0x57004920,3,0=0x57880000,3,1,0x57084920,3,0; conflicting-override +0x57880080,3,1,0x57004920,3,0=0x57880000,3,1,0x57084920,3,0 0x57880000,1,0,0x57004920,1,1=0x57880000,1,0,0x57084920,1,1 -0x57880080,3,1,0x57004920,1,1=0x57880000,3,1,0x57084960,1,1; conflicting-override +0x57880080,3,1,0x57004920,1,1=0x57880000,3,1,0x57084960,1,1 ;00 to 49-2a (HSR OxD) 0x57880000,1,0,0x57004925,3,0=0x57880000,1,0,0x57084965,3,0 -0x57880080,3,1,0x57004925,3,0=0x57880000,3,1,0x57084925,3,0; conflicting-override +0x57880080,3,1,0x57004925,3,0=0x57880000,3,1,0x57084925,3,0 0x57880000,1,0,0x57004925,1,1=0x57880000,1,0,0x57084925,1,1 -0x57880080,3,1,0x57004925,1,1=0x57880000,3,1,0x57084965,1,1; conflicting-override +0x57880080,3,1,0x57004925,1,1=0x57880000,3,1,0x57084965,1,1 ;RHW x RHW Crossings handled by Meta Code ;00 to 58-1 (L1 AVE-2 OxD) ;0x57880000,1,0,0x57005810,3,0=0x57880000,1,0,0x57085850,3,0 @@ -8405,10 +8405,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57820019,1,0,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57820019,1,0,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57820099,3,1,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57820099,3,1,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57820019,1,0,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57820019,1,0,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57820099,3,1,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57820099,3,1,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57820019,1,0,0x57602400,3,0=0x57820019,1,0,0x5712D000,1,1 @@ -15501,10 +15501,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57820029,1,0,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x57820029,1,0,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x578200A9,3,1,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x578200A9,3,1,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x57820029,1,0,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x57820029,1,0,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x578200A9,3,1,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x578200A9,3,1,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x57820029,1,0,0x57602400,3,0=0x57820029,1,0,0x5722D000,1,1 @@ -20900,10 +20900,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57820039,1,0,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x57820039,1,0,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x578200B9,3,1,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x578200B9,3,1,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x57820039,1,0,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x57820039,1,0,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x578200B9,3,1,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x578200B9,3,1,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x57820039,1,0,0x57602400,3,0=0x57820039,1,0,0x5732D000,1,1 @@ -23791,10 +23791,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57820049,1,0,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x57820049,1,0,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x578200C9,3,1,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x578200C9,3,1,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x57820049,1,0,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x57820049,1,0,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x578200C9,3,1,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x578200C9,3,1,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x57820049,1,0,0x57602400,3,0=0x57820049,1,0,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_A2_Bottom_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_A2_Bottom_RHD.txt index e1e1c1229..a9d049154 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_A2_Bottom_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_A2_Bottom_RHD.txt @@ -1765,10 +1765,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57630580,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57630580,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57630500,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57630500,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57630580,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57630580,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57630500,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57630500,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57630580,1,1,0x57602400,3,0=0x57630580,1,1,0x5702D000,1,1 @@ -8405,10 +8405,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57630599,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57630599,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57630519,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57630519,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57630599,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57630599,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57630519,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57630519,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57630599,1,1,0x57602400,3,0=0x57630599,1,1,0x5712D000,1,1 @@ -15501,10 +15501,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x576305A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x576305A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57630529,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57630529,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x576305A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x576305A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57630529,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57630529,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x576305A9,1,1,0x57602400,3,0=0x576305A9,1,1,0x5722D000,1,1 @@ -20900,10 +20900,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x576305B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x576305B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57630539,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57630539,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x576305B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x576305B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57630539,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57630539,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x576305B9,1,1,0x57602400,3,0=0x576305B9,1,1,0x5732D000,1,1 @@ -23791,10 +23791,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x576305C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x576305C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57630549,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57630549,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x576305C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x576305C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57630549,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57630549,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x576305C9,1,1,0x57602400,3,0=0x576305C9,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_A2_Top_LHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_A2_Top_LHD.txt index 8aacd52a0..b5c666649 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_A2_Top_LHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_A2_Top_LHD.txt @@ -11,12 +11,12 @@ ;------------------------- ;----Base Network---- ;00 to 00 (Orth) -0x57610180,1,0,0x57000000,1,0=0x57610180,1,0,0x57010000,1,0 -0x57610180,1,0,0x57000000,3,0=0x57610180,1,0,0x57010000,1,0 +0x57610180,1,0,0x57000000,1,0=0x57610180,1,0,0x57010000,3,0 +0x57610180,1,0,0x57000000,3,0=0x57610180,1,0,0x57010000,3,0 0x57610100,3,1,0x57000000,1,0=0x57610100,3,1,0x57010000,3,0 0x57610100,3,1,0x57000000,3,0=0x57610100,3,1,0x57010000,3,0 ;00 to 01 (Orth Stub) -0x57610180,1,0,0x57000100,1,0=0x57610180,1,0,0x57010100,1,0 +0x57610180,1,0,0x57000100,1,0=0x57610180,1,0,0x57010100,3,1 0x57610100,3,1,0x57000100,1,0=0x57610100,3,1,0x57010100,3,1 ;00 to 04 (Orth-Diag) 0x57610180,1,0,0x57000400,3,0=0x57610180,1,0,0x57010B00,3,0 @@ -26,127 +26,127 @@ ;00 to 08 (Orth 90-Curve) ;----OxO Crossings---- ;00 to 10 (Street OxO) -0x57610180,1,0,0x57001000,1,0=0x57610180,1,0,0x57011000,1,0 -0x57610180,1,0,0x57001000,3,0=0x57610180,1,0,0x57011000,1,0 +0x57610180,1,0,0x57001000,1,0=0x57610180,1,0,0x57011000,3,0 +0x57610180,1,0,0x57001000,3,0=0x57610180,1,0,0x57011000,3,0 0x57610100,3,1,0x57001000,1,0=0x57610100,3,1,0x57011000,3,0 0x57610100,3,1,0x57001000,3,0=0x57610100,3,1,0x57011000,3,0 ;00 to 10-1 (L1 Street OxO) -0x57610180,1,0,0x57001010,1,0=0x57610180,1,0,0x57011010,1,0 -0x57610180,1,0,0x57001010,3,0=0x57610180,1,0,0x57011010,1,0 +0x57610180,1,0,0x57001010,1,0=0x57610180,1,0,0x57011010,3,0 +0x57610180,1,0,0x57001010,3,0=0x57610180,1,0,0x57011010,3,0 0x57610100,3,1,0x57001010,1,0=0x57610100,3,1,0x57011010,3,0 0x57610100,3,1,0x57001010,3,0=0x57610100,3,1,0x57011010,3,0 ;00 to 10-2 (L2 Street OxO) -0x57610180,1,0,0x57001020,1,0=0x57610180,1,0,0x57011020,1,0 -0x57610180,1,0,0x57001020,3,0=0x57610180,1,0,0x57011020,1,0 +0x57610180,1,0,0x57001020,1,0=0x57610180,1,0,0x57011020,3,0 +0x57610180,1,0,0x57001020,3,0=0x57610180,1,0,0x57011020,3,0 0x57610100,3,1,0x57001020,1,0=0x57610100,3,1,0x57011020,3,0 0x57610100,3,1,0x57001020,3,0=0x57610100,3,1,0x57011020,3,0 ;00 to 11 (Road OxO) -0x57610180,1,0,0x57001100,1,0=0x57610180,1,0,0x57011100,1,0 -0x57610180,1,0,0x57001100,3,0=0x57610180,1,0,0x57011100,1,0 +0x57610180,1,0,0x57001100,1,0=0x57610180,1,0,0x57011100,3,0 +0x57610180,1,0,0x57001100,3,0=0x57610180,1,0,0x57011100,3,0 0x57610100,3,1,0x57001100,1,0=0x57610100,3,1,0x57011100,3,0 0x57610100,3,1,0x57001100,3,0=0x57610100,3,1,0x57011100,3,0 ;00 to 11-1 (L1 Road OxO) -0x57610180,1,0,0x57001110,1,0=0x57610180,1,0,0x57011110,1,0 -0x57610180,1,0,0x57001110,3,0=0x57610180,1,0,0x57011110,1,0 +0x57610180,1,0,0x57001110,1,0=0x57610180,1,0,0x57011110,3,0 +0x57610180,1,0,0x57001110,3,0=0x57610180,1,0,0x57011110,3,0 0x57610100,3,1,0x57001110,1,0=0x57610100,3,1,0x57011110,3,0 0x57610100,3,1,0x57001110,3,0=0x57610100,3,1,0x57011110,3,0 ;00 to 11-2 (L2 Road OxO) -0x57610180,1,0,0x57001120,1,0=0x57610180,1,0,0x57011120,1,0 -0x57610180,1,0,0x57001120,3,0=0x57610180,1,0,0x57011120,1,0 +0x57610180,1,0,0x57001120,1,0=0x57610180,1,0,0x57011120,3,0 +0x57610180,1,0,0x57001120,3,0=0x57610180,1,0,0x57011120,3,0 0x57610100,3,1,0x57001120,1,0=0x57610100,3,1,0x57011120,3,0 0x57610100,3,1,0x57001120,3,0=0x57610100,3,1,0x57011120,3,0 ;00 to 12 (OWR OxO) -0x57610180,1,0,0x57001200,1,0=0x57610180,1,0,0x57011200,1,0 -0x57610180,1,0,0x57001200,3,0=0x57610180,1,0,0x57011200,1,0 +0x57610180,1,0,0x57001200,1,0=0x57610180,1,0,0x57011200,3,0 +0x57610180,1,0,0x57001200,3,0=0x57610180,1,0,0x57011200,3,0 0x57610100,3,1,0x57001200,1,0=0x57610100,3,1,0x57011200,3,0 0x57610100,3,1,0x57001200,3,0=0x57610100,3,1,0x57011200,3,0 ;00 to 12-1 (L1 OWR OxO) -0x57610180,1,0,0x57001210,1,0=0x57610180,1,0,0x57011210,1,0 -0x57610180,1,0,0x57001210,3,0=0x57610180,1,0,0x57011210,1,0 +0x57610180,1,0,0x57001210,1,0=0x57610180,1,0,0x57011210,3,0 +0x57610180,1,0,0x57001210,3,0=0x57610180,1,0,0x57011210,3,0 0x57610100,3,1,0x57001210,1,0=0x57610100,3,1,0x57011210,3,0 0x57610100,3,1,0x57001210,3,0=0x57610100,3,1,0x57011210,3,0 ;00 to 12-2 (L2 OWR OxO) -0x57610180,1,0,0x57001220,1,0=0x57610180,1,0,0x57011220,1,0 -0x57610180,1,0,0x57001220,3,0=0x57610180,1,0,0x57011220,1,0 +0x57610180,1,0,0x57001220,1,0=0x57610180,1,0,0x57011220,3,0 +0x57610180,1,0,0x57001220,3,0=0x57610180,1,0,0x57011220,3,0 0x57610100,3,1,0x57001220,1,0=0x57610100,3,1,0x57011220,3,0 0x57610100,3,1,0x57001220,3,0=0x57610100,3,1,0x57011220,3,0 ;00 to 13 (Avenue OxO) -0x57610180,1,0,0x57001300,3,0=0x57610180,1,0,0x57011300,1,1 +0x57610180,1,0,0x57001300,3,0=0x57610180,1,0,0x57011300,3,0 0x57610100,3,1,0x57001300,3,0=0x57610100,3,1,0x57011300,3,0 ;00 to 13-1 (L1 Avenue OxO) -0x57610180,1,0,0x57001310,3,0=0x57610180,1,0,0x57011310,1,1 +0x57610180,1,0,0x57001310,3,0=0x57610180,1,0,0x57011310,3,0 0x57610100,3,1,0x57001310,3,0=0x57610100,3,1,0x57011310,3,0 ;00 to 13-2 (L2 Avenue OxO) -0x57610180,1,0,0x57001320,3,0=0x57610180,1,0,0x57011320,1,1 +0x57610180,1,0,0x57001320,3,0=0x57610180,1,0,0x57011320,3,0 0x57610100,3,1,0x57001320,3,0=0x57610100,3,1,0x57011320,3,0 ;00 to 14-2 (L2 MHW OxO) -0x57610180,1,0,0x57001420,3,0=0x57610180,1,0,0x57011420,1,1 +0x57610180,1,0,0x57001420,3,0=0x57610180,1,0,0x57011420,3,0 0x57610100,3,1,0x57001420,3,0=0x57610100,3,1,0x57011420,3,0 ;00 to 15a (Rail DTR OxO) -0x57610180,1,0,0x57001500,1,0=0x57610180,1,0,0x57011500,1,0 -0x57610180,1,0,0x57001500,3,0=0x57610180,1,0,0x57011500,1,0 +0x57610180,1,0,0x57001500,1,0=0x57610180,1,0,0x57011500,3,0 +0x57610180,1,0,0x57001500,3,0=0x57610180,1,0,0x57011500,3,0 0x57610100,3,1,0x57001500,1,0=0x57610100,3,1,0x57011500,3,0 0x57610100,3,1,0x57001500,3,0=0x57610100,3,1,0x57011500,3,0 ;00 to 15-1a (L1 Rail DTR OxO) -0x57610180,1,0,0x5D671A00,0,0=0x57610180,1,0,0x5D671b00,2,0 -0x57610180,1,0,0x5D671A00,2,0=0x57610180,1,0,0x5D671b00,2,0 +0x57610180,1,0,0x5D671A00,0,0=0x57610180,1,0,0x5D671b00,0,0 +0x57610180,1,0,0x5D671A00,2,0=0x57610180,1,0,0x5D671b00,0,0 0x57610100,3,1,0x5D671A00,0,0=0x57610100,3,1,0x5D671b00,0,0 0x57610100,3,1,0x5D671A00,2,0=0x57610100,3,1,0x5D671b00,0,0 ;00 to 15-2a (L2 Rail DTR OxO) -0x57610180,1,0,0x5D771A00,0,0=0x57610180,1,0,0x5D771b00,2,0 -0x57610180,1,0,0x5D771A00,2,0=0x57610180,1,0,0x5D771b00,2,0 +0x57610180,1,0,0x5D771A00,0,0=0x57610180,1,0,0x5D771b00,0,0 +0x57610180,1,0,0x5D771A00,2,0=0x57610180,1,0,0x5D771b00,0,0 0x57610100,3,1,0x5D771A00,0,0=0x57610100,3,1,0x5D771b00,0,0 0x57610100,3,1,0x5D771A00,2,0=0x57610100,3,1,0x5D771b00,0,0 ;00 to 15b (Rail STR OxO) -0x57610180,1,0,0x57001509,1,0=0x57610180,1,0,0x57011509,1,0 -0x57610180,1,0,0x57001509,3,0=0x57610180,1,0,0x57011509,1,0 +0x57610180,1,0,0x57001509,1,0=0x57610180,1,0,0x57011509,3,0 +0x57610180,1,0,0x57001509,3,0=0x57610180,1,0,0x57011509,3,0 0x57610100,3,1,0x57001509,1,0=0x57610100,3,1,0x57011509,3,0 0x57610100,3,1,0x57001509,3,0=0x57610100,3,1,0x57011509,3,0 ;00 to 17a (GLR 1 OxO) -0x57610180,1,0,0x57001700,1,0=0x57610180,1,0,0x57011700,1,0 -0x57610180,1,0,0x57001700,3,0=0x57610180,1,0,0x57011700,1,0 +0x57610180,1,0,0x57001700,1,0=0x57610180,1,0,0x57011700,3,0 +0x57610180,1,0,0x57001700,3,0=0x57610180,1,0,0x57011700,3,0 0x57610100,3,1,0x57001700,1,0=0x57610100,3,1,0x57011700,3,0 0x57610100,3,1,0x57001700,3,0=0x57610100,3,1,0x57011700,3,0 ;00 to 17b (GLR 2 OxO) -0x57610180,1,0,0x57001709,1,0=0x57610180,1,0,0x57011709,1,0 -0x57610180,1,0,0x57001709,3,0=0x57610180,1,0,0x57011709,1,0 +0x57610180,1,0,0x57001709,1,0=0x57610180,1,0,0x57011709,3,0 +0x57610180,1,0,0x57001709,3,0=0x57610180,1,0,0x57011709,3,0 0x57610100,3,1,0x57001709,1,0=0x57610100,3,1,0x57011709,3,0 0x57610100,3,1,0x57001709,3,0=0x57610100,3,1,0x57011709,3,0 ;00 to 17-2 (ELR OxO) -0x57610180,1,0,0x57001720,1,0=0x57610180,1,0,0x57011720,1,0 -0x57610180,1,0,0x57001720,3,0=0x57610180,1,0,0x57011720,1,0 +0x57610180,1,0,0x57001720,1,0=0x57610180,1,0,0x57011720,3,0 +0x57610180,1,0,0x57001720,3,0=0x57610180,1,0,0x57011720,3,0 0x57610100,3,1,0x57001720,1,0=0x57610100,3,1,0x57011720,3,0 0x57610100,3,1,0x57001720,3,0=0x57610100,3,1,0x57011720,3,0 ;00 to 18a (GLR 3 OxO) -0x57610180,1,0,0x57001800,1,0=0x57610180,1,0,0x57011800,1,0 -0x57610180,1,0,0x57001800,3,0=0x57610180,1,0,0x57011800,1,0 +0x57610180,1,0,0x57001800,1,0=0x57610180,1,0,0x57011800,3,0 +0x57610180,1,0,0x57001800,3,0=0x57610180,1,0,0x57011800,3,0 0x57610100,3,1,0x57001800,1,0=0x57610100,3,1,0x57011800,3,0 0x57610100,3,1,0x57001800,3,0=0x57610100,3,1,0x57011800,3,0 ;00 to 18b (GLR 4 OxO) -0x57610180,1,0,0x57001809,1,0=0x57610180,1,0,0x57011809,1,0 -0x57610180,1,0,0x57001809,3,0=0x57610180,1,0,0x57011809,1,0 +0x57610180,1,0,0x57001809,1,0=0x57610180,1,0,0x57011809,3,0 +0x57610180,1,0,0x57001809,3,0=0x57610180,1,0,0x57011809,3,0 0x57610100,3,1,0x57001809,1,0=0x57610100,3,1,0x57011809,3,0 0x57610100,3,1,0x57001809,3,0=0x57610100,3,1,0x57011809,3,0 ;00 to 19b (GHSR OxO) ;00 to 19-2a (Monorail OxO) -0x57610180,1,0,0x57001920,1,0=0x57610180,1,0,0x57011920,1,0 -0x57610180,1,0,0x57001920,3,0=0x57610180,1,0,0x57011920,1,0 +0x57610180,1,0,0x57001920,1,0=0x57610180,1,0,0x57011920,3,0 +0x57610180,1,0,0x57001920,3,0=0x57610180,1,0,0x57011920,3,0 0x57610100,3,1,0x57001920,1,0=0x57610100,3,1,0x57011920,3,0 0x57610100,3,1,0x57001920,3,0=0x57610100,3,1,0x57011920,3,0 ;00 to 19-2b (HSR OxO) -0x57610180,1,0,0x57001925,1,0=0x57610180,1,0,0x57011925,1,0 -0x57610180,1,0,0x57001925,3,0=0x57610180,1,0,0x57011925,1,0 +0x57610180,1,0,0x57001925,1,0=0x57610180,1,0,0x57011925,3,0 +0x57610180,1,0,0x57001925,3,0=0x57610180,1,0,0x57011925,3,0 0x57610100,3,1,0x57001925,1,0=0x57610100,3,1,0x57011925,3,0 0x57610100,3,1,0x57001925,3,0=0x57610100,3,1,0x57011925,3,0 ;RHW +-Crossings Handled By Meta Code ;00 to 27 (TLA-3 OxO) -0x57610180,1,0,0x57002700,1,0=0x57610180,1,0,0x57012700,1,0 -0x57610180,1,0,0x57002700,3,0=0x57610180,1,0,0x57012700,1,0 +0x57610180,1,0,0x57002700,1,0=0x57610180,1,0,0x57012700,3,0 +0x57610180,1,0,0x57002700,3,0=0x57610180,1,0,0x57012700,3,0 0x57610100,3,1,0x57002700,1,0=0x57610100,3,1,0x57012700,3,0 0x57610100,3,1,0x57002700,3,0=0x57610100,3,1,0x57012700,3,0 ;00 to 28 (AVE-2 OxO) -0x57610180,1,0,0x57002800,1,0=0x57610180,1,0,0x57012800,1,0 -0x57610180,1,0,0x57002800,3,0=0x57610180,1,0,0x57012800,1,0 +0x57610180,1,0,0x57002800,1,0=0x57610180,1,0,0x57012800,3,0 +0x57610180,1,0,0x57002800,3,0=0x57610180,1,0,0x57012800,3,0 0x57610100,3,1,0x57002800,1,0=0x57610100,3,1,0x57012800,3,0 0x57610100,3,1,0x57002800,3,0=0x57610100,3,1,0x57012800,3,0 ;00 to 28-1 (L1 AVE-2 OxO) @@ -160,8 +160,8 @@ ;0x57610100,3,1,0x57002820,1,0=0x57610100,3,1,0x57012820,3,0 ;0x57610100,3,1,0x57002820,3,0=0x57610100,3,1,0x57012820,3,0 ;00 to 29 (ARD-3 OxO) -0x57610180,1,0,0x57002900,1,0=0x57610180,1,0,0x57012900,1,0 -0x57610180,1,0,0x57002900,3,0=0x57610180,1,0,0x57012900,1,1 +0x57610180,1,0,0x57002900,1,0=0x57610180,1,0,0x57012900,3,1 +0x57610180,1,0,0x57002900,3,0=0x57610180,1,0,0x57012900,3,0 0x57610100,3,1,0x57002900,1,0=0x57610100,3,1,0x57012900,3,1 0x57610100,3,1,0x57002900,3,0=0x57610100,3,1,0x57012900,3,0 ;00 to 29-1 (L1 ARD-3 OxO) @@ -175,8 +175,8 @@ ;0x57610100,3,1,0x57002920,1,0=0x57610100,3,1,0x57012920,3,1 ;0x57610100,3,1,0x57002920,3,0=0x57610100,3,1,0x57012920,3,0 ;00 to 2A (OWR-1 OxO) -0x57610180,1,0,0x57002A00,1,0=0x57610180,1,0,0x57012A00,1,0 -0x57610180,1,0,0x57002A00,3,0=0x57610180,1,0,0x57012A00,1,0 +0x57610180,1,0,0x57002A00,1,0=0x57610180,1,0,0x57012A00,3,0 +0x57610180,1,0,0x57002A00,3,0=0x57610180,1,0,0x57012A00,3,0 0x57610100,3,1,0x57002A00,1,0=0x57610100,3,1,0x57012A00,3,0 0x57610100,3,1,0x57002A00,3,0=0x57610100,3,1,0x57012A00,3,0 ;00 to 2A-1 (L1 OWR-1 OxO) @@ -190,8 +190,8 @@ ;0x57610100,3,1,0x57002A20,1,0=0x57610100,3,1,0x57012A20,3,0 ;0x57610100,3,1,0x57002A20,3,0=0x57610100,3,1,0x57012A20,3,0 ;00 to 2B (OWR-3 OxO) -0x57610180,1,0,0x57002B00,1,0=0x57610180,1,0,0x57012B00,1,0 -0x57610180,1,0,0x57002B00,3,0=0x57610180,1,0,0x57012B00,1,0 +0x57610180,1,0,0x57002B00,1,0=0x57610180,1,0,0x57012B00,3,0 +0x57610180,1,0,0x57002B00,3,0=0x57610180,1,0,0x57012B00,3,0 0x57610100,3,1,0x57002B00,1,0=0x57610100,3,1,0x57012B00,3,0 0x57610100,3,1,0x57002B00,3,0=0x57610100,3,1,0x57012B00,3,0 ;00 to 2B-1 (L1 OWR-3 OxO) @@ -205,8 +205,8 @@ ;0x57610100,3,1,0x57002B20,1,0=0x57610100,3,1,0x57012B20,3,0 ;0x57610100,3,1,0x57002B20,3,0=0x57610100,3,1,0x57012B20,3,0 ;00 to 2C (NRD-4 OxO) -0x57610180,1,0,0x57002C00,1,0=0x57610180,1,0,0x57012C00,1,0 -0x57610180,1,0,0x57002C00,3,0=0x57610180,1,0,0x57012C00,1,0 +0x57610180,1,0,0x57002C00,1,0=0x57610180,1,0,0x57012C00,3,0 +0x57610180,1,0,0x57002C00,3,0=0x57610180,1,0,0x57012C00,3,0 0x57610100,3,1,0x57002C00,1,0=0x57610100,3,1,0x57012C00,3,0 0x57610100,3,1,0x57002C00,3,0=0x57610100,3,1,0x57012C00,3,0 ;00 to 2C-1 (L1 NRD-4 OxO) @@ -220,10 +220,10 @@ ;0x57610100,3,1,0x57002C20,1,0=0x57610100,3,1,0x57012C20,3,0 ;0x57610100,3,1,0x57002C20,3,0=0x57610100,3,1,0x57012C20,3,0 ;00 to 2D (TLA-5 OxO) -0x57610180,1,0,0x57002D00,3,0=0x57610180,1,0,0x57012D00,1,1 +0x57610180,1,0,0x57002D00,3,0=0x57610180,1,0,0x57012D00,3,0 0x57610100,3,1,0x57002D00,3,0=0x57610100,3,1,0x57012D00,3,0 ;00 to 2E (OWR-4 OxO) -0x57610180,1,0,0x57002E00,3,0=0x57610180,1,0,0x57012E00,1,1 +0x57610180,1,0,0x57002E00,3,0=0x57610180,1,0,0x57012E00,3,0 0x57610100,3,1,0x57002E00,3,0=0x57610100,3,1,0x57012E00,3,0 ;00 to 2E-1 (L1 OWR-4 OxO) ;0x57610180,1,0,0x57002E10,3,0=0x57610180,1,0,0x57012E10,1,1 @@ -232,7 +232,7 @@ ;0x57610180,1,0,0x57002E20,3,0=0x57610180,1,0,0x57012E20,1,1 ;0x57610100,3,1,0x57002E20,3,0=0x57610100,3,1,0x57012E20,3,0 ;00 to 2F (OWR-5 OxO) -0x57610180,1,0,0x57002F00,3,0=0x57610180,1,0,0x57012F00,1,1 +0x57610180,1,0,0x57002F00,3,0=0x57610180,1,0,0x57012F00,3,0 0x57610100,3,1,0x57002F00,3,0=0x57610100,3,1,0x57012F00,3,0 ;00 to 2F-1 (L1 OWR-5 OxO) ;0x57610180,1,0,0x57002F10,3,0=0x57610180,1,0,0x57012F10,1,1 @@ -241,12 +241,12 @@ ;0x57610180,1,0,0x57002F20,3,0=0x57610180,1,0,0x57012F20,1,1 ;0x57610100,3,1,0x57002F20,3,0=0x57610100,3,1,0x57012F20,3,0 ;00 to 30 (RD-4 OxO) -0x57610180,1,0,0x57003000,3,0=0x57610180,1,0,0x57013000,1,1 +0x57610180,1,0,0x57003000,3,0=0x57610180,1,0,0x57013000,3,0 0x57610100,3,1,0x57003000,3,0=0x57610100,3,1,0x57013000,3,0 ;00 to 30-1 (L1 RD-4 OxO) ;00 to 30-2 (L2 RD-4 OxO) ;00 to 31 (RD-6 OxO) -0x57610180,1,0,0x57003100,3,0=0x57610180,1,0,0x57013100,1,1 +0x57610180,1,0,0x57003100,3,0=0x57610180,1,0,0x57013100,3,0 0x57610100,3,1,0x57003100,3,0=0x57610100,3,1,0x57013100,3,0 ;00 to 31-1 (L1 RD-6 OxO) ;0x57610180,1,0,0x57003110,3,0=0x57610180,1,0,0x57013110,1,1 @@ -255,9 +255,9 @@ ;0x57610180,1,0,0x57003120,3,0=0x57610180,1,0,0x57013120,1,1 ;0x57610100,3,1,0x57003120,3,0=0x57610100,3,1,0x57013120,3,0 ;00 to 32,33,34,35 (Triple-Tile NWM OxO) -0x57610180,1,0,0x57003200,3,0=0x57610180,1,0,0x57013200,1,1 +0x57610180,1,0,0x57003200,3,0=0x57610180,1,0,0x57013200,3,0 0x57610100,3,1,0x57003200,3,0=0x57610100,3,1,0x57013200,3,0 -0x57610180,1,0,0x57003400,3,0=0x57610180,1,0,0x57013400,1,1 +0x57610180,1,0,0x57003400,3,0=0x57610180,1,0,0x57013400,3,0 0x57610100,3,1,0x57003400,3,0=0x57610100,3,1,0x57013400,3,0 ;00 to 32-1,33-1,34-1,35-1 (L1 Triple-Tile NWM OxO) ;0x57610180,1,0,0x57003210,3,0=0x57610180,1,0,0x57013210,1,1 @@ -271,15 +271,15 @@ ;0x57610100,3,1,0x57003420,3,0=0x57610100,3,1,0x57013420,3,0 ;00 to 36 (Tram-on-Street OxO) ;00 to 37a (Tram-in-Road OxO) -0x57610180,1,0,0x58480000,0,0=0x57610180,1,0,0x57013700,1,0 -0x57610180,1,0,0x58480000,2,0=0x57610180,1,0,0x57013700,1,0 +0x57610180,1,0,0x58480000,0,0=0x57610180,1,0,0x57013700,3,0 +0x57610180,1,0,0x58480000,2,0=0x57610180,1,0,0x57013700,3,0 0x57610100,3,1,0x58480000,0,0=0x57610100,3,1,0x57013700,3,0 0x57610100,3,1,0x58480000,2,0=0x57610100,3,1,0x57013700,3,0 ; ; ;00 to 37b (Tram-on-Road OxO) -0x57610180,1,0,0x58486C00,0,0=0x57610180,1,0,0x57013709,1,0 -0x57610180,1,0,0x58486C00,2,0=0x57610180,1,0,0x57013709,1,0 +0x57610180,1,0,0x58486C00,0,0=0x57610180,1,0,0x57013709,3,0 +0x57610180,1,0,0x58486C00,2,0=0x57610180,1,0,0x57013709,3,0 0x57610100,3,1,0x58486C00,0,0=0x57610100,3,1,0x57013709,3,0 0x57610100,3,1,0x58486C00,2,0=0x57610100,3,1,0x57013709,3,0 ; @@ -287,7 +287,7 @@ ;00 to 38a (Tram-in-OWR OxO) ;00 to 38b (Tram-on-OWR OxO) ;00 to 39 (Tram-in-Avenue OxO) -0x57610180,1,0,0x58400000,0,0=0x57610180,1,0,0x57013900,1,1 +0x57610180,1,0,0x58400000,0,0=0x57610180,1,0,0x57013900,3,0 0x57610100,3,1,0x58400000,0,0=0x57610100,3,1,0x57013900,3,0 ; ;00 to 3Aa (PedPath OxO) @@ -312,53 +312,53 @@ ;0x57010080,3,0,0x57003A25,3,0=0x57010080,3,0,0x57013A25,3,0 ;00 to 0x5E60x100 (SAM 1 OxO) ;00 to 0x5E60x200 (SAM 2 OxO) -0x57610180,1,0,0x5E600200,1,0=0x57610180,1,0,0x5E601200,1,0 -0x57610180,1,0,0x5E600200,3,0=0x57610180,1,0,0x5E601200,1,0 +0x57610180,1,0,0x5E600200,1,0=0x57610180,1,0,0x5E601200,3,0 +0x57610180,1,0,0x5E600200,3,0=0x57610180,1,0,0x5E601200,3,0 0x57610100,3,1,0x5E600200,1,0=0x57610100,3,1,0x5E601200,3,0 0x57610100,3,1,0x5E600200,3,0=0x57610100,3,1,0x5E601200,3,0 ;00 to 0x5E60x300 (SAM 3 OxO) -0x57610180,1,0,0x5E600300,1,0=0x57610180,1,0,0x5E601300,1,0 -0x57610180,1,0,0x5E600300,3,0=0x57610180,1,0,0x5E601300,1,0 +0x57610180,1,0,0x5E600300,1,0=0x57610180,1,0,0x5E601300,3,0 +0x57610180,1,0,0x5E600300,3,0=0x57610180,1,0,0x5E601300,3,0 0x57610100,3,1,0x5E600300,1,0=0x57610100,3,1,0x5E601300,3,0 0x57610100,3,1,0x5E600300,3,0=0x57610100,3,1,0x5E601300,3,0 ;00 to 0x5E60x400 (SAM 4 OxO) -0x57610180,1,0,0x5E600400,1,0=0x57610180,1,0,0x5E601400,1,0 -0x57610180,1,0,0x5E600400,3,0=0x57610180,1,0,0x5E601400,1,0 +0x57610180,1,0,0x5E600400,1,0=0x57610180,1,0,0x5E601400,3,0 +0x57610180,1,0,0x5E600400,3,0=0x57610180,1,0,0x5E601400,3,0 0x57610100,3,1,0x5E600400,1,0=0x57610100,3,1,0x5E601400,3,0 0x57610100,3,1,0x5E600400,3,0=0x57610100,3,1,0x5E601400,3,0 ;00 to 0x5E60x500 (SAM 5 OxO) -0x57610180,1,0,0x5E600500,1,0=0x57610180,1,0,0x5E601500,1,0 -0x57610180,1,0,0x5E600500,3,0=0x57610180,1,0,0x5E601500,1,0 +0x57610180,1,0,0x5E600500,1,0=0x57610180,1,0,0x5E601500,3,0 +0x57610180,1,0,0x5E600500,3,0=0x57610180,1,0,0x5E601500,3,0 0x57610100,3,1,0x5E600500,1,0=0x57610100,3,1,0x5E601500,3,0 0x57610100,3,1,0x5E600500,3,0=0x57610100,3,1,0x5E601500,3,0 ;00 to 0x5E60x600 (SAM 6 OxO) -0x57610180,1,0,0x5E600600,1,0=0x57610180,1,0,0x5E601600,1,0 -0x57610180,1,0,0x5E600600,3,0=0x57610180,1,0,0x5E601600,1,0 +0x57610180,1,0,0x5E600600,1,0=0x57610180,1,0,0x5E601600,3,0 +0x57610180,1,0,0x5E600600,3,0=0x57610180,1,0,0x5E601600,3,0 0x57610100,3,1,0x5E600600,1,0=0x57610100,3,1,0x5E601600,3,0 0x57610100,3,1,0x5E600600,3,0=0x57610100,3,1,0x5E601600,3,0 ;00 to 0x5E60x700 (SAM 7 OxO) -0x57610180,1,0,0x5E600700,1,0=0x57610180,1,0,0x5E601700,1,0 -0x57610180,1,0,0x5E600700,3,0=0x57610180,1,0,0x5E601700,1,0 +0x57610180,1,0,0x5E600700,1,0=0x57610180,1,0,0x5E601700,3,0 +0x57610180,1,0,0x5E600700,3,0=0x57610180,1,0,0x5E601700,3,0 0x57610100,3,1,0x5E600700,1,0=0x57610100,3,1,0x5E601700,3,0 0x57610100,3,1,0x5E600700,3,0=0x57610100,3,1,0x5E601700,3,0 ;00 to 0x5E60x800 (SAM 8 OxO) -0x57610180,1,0,0x5E600800,1,0=0x57610180,1,0,0x5E601800,1,0 -0x57610180,1,0,0x5E600800,3,0=0x57610180,1,0,0x5E601800,1,0 +0x57610180,1,0,0x5E600800,1,0=0x57610180,1,0,0x5E601800,3,0 +0x57610180,1,0,0x5E600800,3,0=0x57610180,1,0,0x5E601800,3,0 0x57610100,3,1,0x5E600800,1,0=0x57610100,3,1,0x5E601800,3,0 0x57610100,3,1,0x5E600800,3,0=0x57610100,3,1,0x5E601800,3,0 ;00 to 0x5E60x900 (SAM 9 OxO) -0x57610180,1,0,0x5E600900,1,0=0x57610180,1,0,0x5E601900,1,0 -0x57610180,1,0,0x5E600900,3,0=0x57610180,1,0,0x5E601900,1,0 +0x57610180,1,0,0x5E600900,1,0=0x57610180,1,0,0x5E601900,3,0 +0x57610180,1,0,0x5E600900,3,0=0x57610180,1,0,0x5E601900,3,0 0x57610100,3,1,0x5E600900,1,0=0x57610100,3,1,0x5E601900,3,0 0x57610100,3,1,0x5E600900,3,0=0x57610100,3,1,0x5E601900,3,0 ;00 to 0x5E60xA00 (SAM 10 OxO) -0x57610180,1,0,0x5E600A00,1,0=0x57610180,1,0,0x5E601A00,1,0 -0x57610180,1,0,0x5E600A00,3,0=0x57610180,1,0,0x5E601A00,1,0 +0x57610180,1,0,0x5E600A00,1,0=0x57610180,1,0,0x5E601A00,3,0 +0x57610180,1,0,0x5E600A00,3,0=0x57610180,1,0,0x5E601A00,3,0 0x57610100,3,1,0x5E600A00,1,0=0x57610100,3,1,0x5E601A00,3,0 0x57610100,3,1,0x5E600A00,3,0=0x57610100,3,1,0x5E601A00,3,0 ;00 to 0x5E60xB00 (SAM 11 OxO) -0x57610180,1,0,0x5E600B00,1,0=0x57610180,1,0,0x5E601B00,1,0 -0x57610180,1,0,0x5E600B00,3,0=0x57610180,1,0,0x5E601B00,1,0 +0x57610180,1,0,0x5E600B00,1,0=0x57610180,1,0,0x5E601B00,3,0 +0x57610180,1,0,0x5E600B00,3,0=0x57610180,1,0,0x5E601B00,3,0 0x57610100,3,1,0x5E600B00,1,0=0x57610100,3,1,0x5E601B00,3,0 0x57610100,3,1,0x5E600B00,3,0=0x57610100,3,1,0x5E601B00,3,0 ;----OxD Crossings---- @@ -738,69 +738,69 @@ 0x57610100,3,1,0x5E620B00,1,1=0x57610100,3,1,0x5E621B80,1,1 ;----OxO T Crossings---- ;00 to T-00 (Street Ends) -0x57610180,1,0,0x57600000,1,0=0x57610180,1,0,0x57610000,1,0 +0x57610180,1,0,0x57600000,1,0=0x57610180,1,0,0x57610080,1,0 0x57610100,3,1,0x57600000,3,0=0x57610100,3,1,0x57610000,3,0 0x57610180,1,0,0x57600000,3,0=0x57610180,1,0,0x57610000,3,0 -0x57610100,3,1,0x57600000,1,0=0x57610100,3,1,0x57610000,1,0 +0x57610100,3,1,0x57600000,1,0=0x57610100,3,1,0x57610080,1,0 ;00 to T-01 (Road Ends) -0x57610180,1,0,0x57600100,1,0=0x57610180,1,0,0x57610100,1,0 +0x57610180,1,0,0x57600100,1,0=0x57610180,1,0,0x57610180,1,0 0x57610100,3,1,0x57600100,3,0=0x57610100,3,1,0x57610100,3,0 -0x57610180,1,0,0x57600100,3,0=0x57610180,1,0,0x57610180,3,0 +0x57610180,1,0,0x57600100,3,0=0x57610180,1,0,0x57610100,3,0 0x57610100,3,1,0x57600100,1,0=0x57610100,3,1,0x57610180,1,0 ;00 to T-02 (OWR Ends) -0x57610180,1,0,0x57600200,1,0=0x57610180,1,0,0x57610200,1,0 +0x57610180,1,0,0x57600200,1,0=0x57610180,1,0,0x57610280,1,0 0x57610100,3,1,0x57600200,3,0=0x57610100,3,1,0x57610200,3,0 -0x57610180,1,0,0x57600200,3,0=0x57610180,1,0,0x57610280,3,0 +0x57610180,1,0,0x57600200,3,0=0x57610180,1,0,0x57610200,3,0 0x57610100,3,1,0x57600200,1,0=0x57610100,3,1,0x57610280,1,0 ;00 to T-03 (Avenue Ends) -0x57610180,1,0,0x57600300,1,1=0x57610180,1,0,0x57610300,1,1 +0x57610180,1,0,0x57600300,1,1=0x57610180,1,0,0x57610380,1,1 0x57610100,3,1,0x57600300,3,0=0x57610100,3,1,0x57610300,3,0 -0x57610180,1,0,0x57600300,3,0=0x57610180,1,0,0x57610380,3,0 +0x57610180,1,0,0x57600300,3,0=0x57610180,1,0,0x57610300,3,0 0x57610100,3,1,0x57600300,1,1=0x57610100,3,1,0x57610380,1,1 ;00 to T-04 (RHW-2 Ends) -0x57610180,1,0,0x57600400,1,0=0x57610180,1,0,0x57610400,1,0 +0x57610180,1,0,0x57600400,1,0=0x57610180,1,0,0x57610480,1,0 0x57610100,3,1,0x57600400,3,0=0x57610100,3,1,0x57610400,3,0 -0x57610180,1,0,0x57600400,3,0=0x57610180,1,0,0x57610480,3,0 +0x57610180,1,0,0x57600400,3,0=0x57610180,1,0,0x57610400,3,0 0x57610100,3,1,0x57600400,1,0=0x57610100,3,1,0x57610480,1,0 ;00 to T-05 (RHW-3 Ends) ;00 to T-07 (TLA-3 Ends) -0x57610180,1,0,0x57600700,1,0=0x57610180,1,0,0x57610700,1,0 +0x57610180,1,0,0x57600700,1,0=0x57610180,1,0,0x57610780,1,0 0x57610100,3,1,0x57600700,3,0=0x57610100,3,1,0x57610700,3,0 -0x57610180,1,0,0x57600700,3,0=0x57610180,1,0,0x57610780,3,0 +0x57610180,1,0,0x57600700,3,0=0x57610180,1,0,0x57610700,3,0 0x57610100,3,1,0x57600700,1,0=0x57610100,3,1,0x57610780,1,0 ;00 to T-08 (AVE-2 Ends) -0x57610180,1,0,0x57600800,1,0=0x57610180,1,0,0x57610800,1,0 +0x57610180,1,0,0x57600800,1,0=0x57610180,1,0,0x57610880,1,0 0x57610100,3,1,0x57600800,3,0=0x57610100,3,1,0x57610800,3,0 -0x57610180,1,0,0x57600800,3,0=0x57610180,1,0,0x57610880,3,0 +0x57610180,1,0,0x57600800,3,0=0x57610180,1,0,0x57610800,3,0 0x57610100,3,1,0x57600800,1,0=0x57610100,3,1,0x57610880,1,0 ;00 to T-09 (ARD-3 Ends) -0x57610180,1,0,0x57600900,1,0=0x57610180,1,0,0x57610900,1,0 +0x57610180,1,0,0x57600900,1,0=0x57610180,1,0,0x57610980,1,0 0x57610100,3,1,0x57600900,3,0=0x57610100,3,1,0x57610900,3,0 -0x57610180,1,0,0x57600900,3,0=0x57610180,1,0,0x57610980,3,0 +0x57610180,1,0,0x57600900,3,0=0x57610180,1,0,0x57610900,3,0 0x57610100,3,1,0x57600900,1,0=0x57610100,3,1,0x57610980,1,0 -0x57610180,1,0,0x57600909,1,0=0x57610180,1,0,0x57610909,1,0 +0x57610180,1,0,0x57600909,1,0=0x57610180,1,0,0x57610989,1,0 0x57610100,3,1,0x57600909,3,0=0x57610100,3,1,0x57610909,3,0 -0x57610180,1,0,0x57600909,3,0=0x57610180,1,0,0x57610989,3,0 +0x57610180,1,0,0x57600909,3,0=0x57610180,1,0,0x57610909,3,0 0x57610100,3,1,0x57600909,1,0=0x57610100,3,1,0x57610989,1,0 ;00 to T-0A (OWR-1 Ends) -0x57610180,1,0,0x57600A00,1,0=0x57610180,1,0,0x57610A00,1,0 +0x57610180,1,0,0x57600A00,1,0=0x57610180,1,0,0x57610A80,1,0 0x57610100,3,1,0x57600A00,3,0=0x57610100,3,1,0x57610A00,3,0 -0x57610180,1,0,0x57600A00,3,0=0x57610180,1,0,0x57610A80,3,0 +0x57610180,1,0,0x57600A00,3,0=0x57610180,1,0,0x57610A00,3,0 0x57610100,3,1,0x57600A00,1,0=0x57610100,3,1,0x57610A80,1,0 ;00 to T-0B (OWR-3 Ends) -0x57610180,1,0,0x57600C00,1,0=0x57610180,1,0,0x57610B00,1,0 -0x57610100,3,1,0x57600C00,3,0=0x57610100,3,1,0x57610B00,3,0 -0x57610180,1,0,0x57600C00,3,0=0x57610180,1,0,0x57610B80,3,0 -0x57610100,3,1,0x57600C00,1,0=0x57610100,3,1,0x57610B80,1,0 +0x57610180,1,0,0x57600B00,1,0=0x57610180,1,0,0x57610B80,1,0 +0x57610100,3,1,0x57600B00,3,0=0x57610100,3,1,0x57610B00,3,0 +0x57610180,1,0,0x57600B00,3,0=0x57610180,1,0,0x57610B00,3,0 +0x57610100,3,1,0x57600B00,1,0=0x57610100,3,1,0x57610B80,1,0 ;00 to T-0C (NRD-4 Ends) -0x57610180,1,0,0x57600C00,1,0=0x57610180,1,0,0x57610C00,1,0; conflicting-override -0x57610100,3,1,0x57600C00,3,0=0x57610100,3,1,0x57610C00,3,0; conflicting-override -0x57610180,1,0,0x57600C00,3,0=0x57610180,1,0,0x57610C80,3,0; conflicting-override -0x57610100,3,1,0x57600C00,1,0=0x57610100,3,1,0x57610C80,1,0; conflicting-override +0x57610180,1,0,0x57600C00,1,0=0x57610180,1,0,0x57610C80,1,0 +0x57610100,3,1,0x57600C00,3,0=0x57610100,3,1,0x57610C00,3,0 +0x57610180,1,0,0x57600C00,3,0=0x57610180,1,0,0x57610C00,3,0 +0x57610100,3,1,0x57600C00,1,0=0x57610100,3,1,0x57610C80,1,0 ;00 to T-0D (TLA-5 Ends) -0x57610180,1,0,0x57600D00,1,0=0x57610180,1,0,0x57610D00,1,0 +0x57610180,1,0,0x57600D00,1,0=0x57610180,1,0,0x57610D80,1,0 0x57610100,3,1,0x57600D00,3,0=0x57610100,3,1,0x57610D00,3,0 -0x57610180,1,0,0x57600D00,3,0=0x57610180,1,0,0x57610D80,3,0 +0x57610180,1,0,0x57600D00,3,0=0x57610180,1,0,0x57610D00,3,0 0x57610100,3,1,0x57600D00,1,0=0x57610100,3,1,0x57610D80,1,0 ;00 to T-0E (OWR-4 Ends) ;00 to T-0F (OWR-5 Ends) @@ -840,7 +840,7 @@ ;00 to F0 (Street) ;00 to F1 (Road) ;00 to F2 (OWR) -0x57610180,1,0,0x5700F200,1,0=0x57610180,1,0,0x5701F200,1,0 +0x57610180,1,0,0x5700F200,1,0=0x57610180,1,0,0x5701F200,3,1 0x57610100,3,1,0x5700F200,1,0=0x57610100,3,1,0x5701F200,3,1 ;00 to F3 (MHW) ;Handled by RUL1 @@ -883,16 +883,16 @@ ;add ;--FLEXHeight-- ;Up -0x57610180,1,0,0x57700230,1,0=0x57610180,1,0,0x57711230,1,0 +0x57610180,1,0,0x57700230,1,0=0x57610180,1,0,0x57711230,3,1 0x57610100,3,1,0x57700230,1,0=0x57610100,3,1,0x57711230,3,1 ;Down ;--FLEXOnSlope-- ;Up 1 -0x57610180,1,0,0x57700000,1,0=0x57610180,1,0,0x57711000,1,0 +0x57610180,1,0,0x57700000,1,0=0x57610180,1,0,0x57711000,3,1 0x57610100,3,1,0x57700000,1,0=0x57610100,3,1,0x57711000,3,1 ;Down 1 ;Up 2 -0x57610180,1,0,0x57700100,1,0=0x57610180,1,0,0x57711100,1,0 +0x57610180,1,0,0x57700100,1,0=0x57610180,1,0,0x57711100,3,1 0x57610100,3,1,0x57700100,1,0=0x57610100,3,1,0x57711100,3,1 ;Down 2 ;--FLEXWidth-- diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_A2_Top_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_A2_Top_RHD.txt index 55ca87f8a..cc8cfbe1d 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_A2_Top_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_A2_Top_RHD.txt @@ -11,275 +11,275 @@ ;------------------------- ;----Base Network---- ;00 to 00 (Orth) -0x57610100,1,0,0x57000000,1,0=0x57610180,1,0,0x57010000,1,0 -0x57610100,1,0,0x57000000,3,0=0x57610180,1,0,0x57010000,1,0 +0x57610100,1,0,0x57000000,1,0=0x57610100,1,0,0x57010000,1,0 +0x57610100,1,0,0x57000000,3,0=0x57610100,1,0,0x57010000,1,0 0x57610180,3,1,0x57000000,1,0=0x57610180,3,1,0x57010000,3,0 0x57610180,3,1,0x57000000,3,0=0x57610180,3,1,0x57010000,3,0 ;00 to 01 (Orth Stub) -0x57610100,1,0,0x57000100,1,0=0x57610180,1,0,0x57010100,1,0 +0x57610100,1,0,0x57000100,1,0=0x57610100,1,0,0x57010100,1,0 0x57610180,3,1,0x57000100,1,0=0x57610180,3,1,0x57010100,3,1 ;00 to 04 (Orth-Diag) -0x57610100,1,0,0x57000400,3,0=0x57610180,1,0,0x57010B00,3,0; conflicting-override -0x57610100,1,0,0x57000400,1,1=0x57610180,1,0,0x57010400,1,1; conflicting-override +0x57610100,1,0,0x57000400,3,0=0x57610100,1,0,0x57010B00,3,0 +0x57610100,1,0,0x57000400,1,1=0x57610100,1,0,0x57010400,1,1 0x57610180,3,1,0x57000400,3,0=0x57610180,3,1,0x57010400,3,0 0x57610180,3,1,0x57000400,1,1=0x57610180,3,1,0x57010B00,1,1 ;00 to 08 (Orth 90-Curve) ;----OxO Crossings---- ;00 to 10 (Street OxO) -0x57610100,1,0,0x57001000,1,0=0x57610180,1,0,0x57011000,1,0 -0x57610100,1,0,0x57001000,3,0=0x57610180,1,0,0x57011000,1,0 +0x57610100,1,0,0x57001000,1,0=0x57610100,1,0,0x57011000,1,0 +0x57610100,1,0,0x57001000,3,0=0x57610100,1,0,0x57011000,1,0 0x57610180,3,1,0x57001000,1,0=0x57610180,3,1,0x57011000,3,0 0x57610180,3,1,0x57001000,3,0=0x57610180,3,1,0x57011000,3,0 ;00 to 10-1 (L1 Street OxO) -0x57610100,1,0,0x57001010,1,0=0x57610180,1,0,0x57011010,1,0 -0x57610100,1,0,0x57001010,3,0=0x57610180,1,0,0x57011010,1,0 +0x57610100,1,0,0x57001010,1,0=0x57610100,1,0,0x57011010,1,0 +0x57610100,1,0,0x57001010,3,0=0x57610100,1,0,0x57011010,1,0 0x57610180,3,1,0x57001010,1,0=0x57610180,3,1,0x57011010,3,0 0x57610180,3,1,0x57001010,3,0=0x57610180,3,1,0x57011010,3,0 ;00 to 10-2 (L2 Street OxO) -0x57610100,1,0,0x57001020,1,0=0x57610180,1,0,0x57011020,1,0 -0x57610100,1,0,0x57001020,3,0=0x57610180,1,0,0x57011020,1,0 +0x57610100,1,0,0x57001020,1,0=0x57610100,1,0,0x57011020,1,0 +0x57610100,1,0,0x57001020,3,0=0x57610100,1,0,0x57011020,1,0 0x57610180,3,1,0x57001020,1,0=0x57610180,3,1,0x57011020,3,0 0x57610180,3,1,0x57001020,3,0=0x57610180,3,1,0x57011020,3,0 ;00 to 11 (Road OxO) -0x57610100,1,0,0x57001100,1,0=0x57610180,1,0,0x57011100,1,0 -0x57610100,1,0,0x57001100,3,0=0x57610180,1,0,0x57011100,1,0 +0x57610100,1,0,0x57001100,1,0=0x57610100,1,0,0x57011100,1,0 +0x57610100,1,0,0x57001100,3,0=0x57610100,1,0,0x57011100,1,0 0x57610180,3,1,0x57001100,1,0=0x57610180,3,1,0x57011100,3,0 0x57610180,3,1,0x57001100,3,0=0x57610180,3,1,0x57011100,3,0 ;00 to 11-1 (L1 Road OxO) -0x57610100,1,0,0x57001110,1,0=0x57610180,1,0,0x57011110,1,0 -0x57610100,1,0,0x57001110,3,0=0x57610180,1,0,0x57011110,1,0 +0x57610100,1,0,0x57001110,1,0=0x57610100,1,0,0x57011110,1,0 +0x57610100,1,0,0x57001110,3,0=0x57610100,1,0,0x57011110,1,0 0x57610180,3,1,0x57001110,1,0=0x57610180,3,1,0x57011110,3,0 0x57610180,3,1,0x57001110,3,0=0x57610180,3,1,0x57011110,3,0 ;00 to 11-2 (L2 Road OxO) -0x57610100,1,0,0x57001120,1,0=0x57610180,1,0,0x57011120,1,0 -0x57610100,1,0,0x57001120,3,0=0x57610180,1,0,0x57011120,1,0 +0x57610100,1,0,0x57001120,1,0=0x57610100,1,0,0x57011120,1,0 +0x57610100,1,0,0x57001120,3,0=0x57610100,1,0,0x57011120,1,0 0x57610180,3,1,0x57001120,1,0=0x57610180,3,1,0x57011120,3,0 0x57610180,3,1,0x57001120,3,0=0x57610180,3,1,0x57011120,3,0 ;00 to 12 (OWR OxO) -0x57610100,1,0,0x57001200,1,0=0x57610180,1,0,0x57011200,1,0 -0x57610100,1,0,0x57001200,3,0=0x57610180,1,0,0x57011200,1,0 +0x57610100,1,0,0x57001200,1,0=0x57610100,1,0,0x57011200,1,0 +0x57610100,1,0,0x57001200,3,0=0x57610100,1,0,0x57011200,1,0 0x57610180,3,1,0x57001200,1,0=0x57610180,3,1,0x57011200,3,0 0x57610180,3,1,0x57001200,3,0=0x57610180,3,1,0x57011200,3,0 ;00 to 12-1 (L1 OWR OxO) -0x57610100,1,0,0x57001210,1,0=0x57610180,1,0,0x57011210,1,0 -0x57610100,1,0,0x57001210,3,0=0x57610180,1,0,0x57011210,1,0 +0x57610100,1,0,0x57001210,1,0=0x57610100,1,0,0x57011210,1,0 +0x57610100,1,0,0x57001210,3,0=0x57610100,1,0,0x57011210,1,0 0x57610180,3,1,0x57001210,1,0=0x57610180,3,1,0x57011210,3,0 0x57610180,3,1,0x57001210,3,0=0x57610180,3,1,0x57011210,3,0 ;00 to 12-2 (L2 OWR OxO) -0x57610100,1,0,0x57001220,1,0=0x57610180,1,0,0x57011220,1,0 -0x57610100,1,0,0x57001220,3,0=0x57610180,1,0,0x57011220,1,0 +0x57610100,1,0,0x57001220,1,0=0x57610100,1,0,0x57011220,1,0 +0x57610100,1,0,0x57001220,3,0=0x57610100,1,0,0x57011220,1,0 0x57610180,3,1,0x57001220,1,0=0x57610180,3,1,0x57011220,3,0 0x57610180,3,1,0x57001220,3,0=0x57610180,3,1,0x57011220,3,0 ;00 to 13 (Avenue OxO) -0x57610100,1,0,0x57001300,3,0=0x57610180,1,0,0x57011300,1,1 +0x57610100,1,0,0x57001300,3,0=0x57610100,1,0,0x57011300,1,1 0x57610180,3,1,0x57001300,3,0=0x57610180,3,1,0x57011300,3,0 ;00 to 13-1 (L1 Avenue OxO) -0x57610100,1,0,0x57001310,3,0=0x57610180,1,0,0x57011310,1,1 +0x57610100,1,0,0x57001310,3,0=0x57610100,1,0,0x57011310,1,1 0x57610180,3,1,0x57001310,3,0=0x57610180,3,1,0x57011310,3,0 ;00 to 13-2 (L2 Avenue OxO) -0x57610100,1,0,0x57001320,3,0=0x57610180,1,0,0x57011320,1,1 +0x57610100,1,0,0x57001320,3,0=0x57610100,1,0,0x57011320,1,1 0x57610180,3,1,0x57001320,3,0=0x57610180,3,1,0x57011320,3,0 ;00 to 14-2 (L2 MHW OxO) -0x57610100,1,0,0x57001420,3,0=0x57610180,1,0,0x57011420,1,1 +0x57610100,1,0,0x57001420,3,0=0x57610100,1,0,0x57011420,1,1 0x57610180,3,1,0x57001420,3,0=0x57610180,3,1,0x57011420,3,0 ;00 to 15a (Rail DTR OxO) -0x57610100,1,0,0x57001500,1,0=0x57610180,1,0,0x57011500,1,0 -0x57610100,1,0,0x57001500,3,0=0x57610180,1,0,0x57011500,1,0 +0x57610100,1,0,0x57001500,1,0=0x57610100,1,0,0x57011500,1,0 +0x57610100,1,0,0x57001500,3,0=0x57610100,1,0,0x57011500,1,0 0x57610180,3,1,0x57001500,1,0=0x57610180,3,1,0x57011500,3,0 0x57610180,3,1,0x57001500,3,0=0x57610180,3,1,0x57011500,3,0 ;00 to 15-1a (L1 Rail DTR OxO) -0x57610100,1,0,0x5D671A00,0,0=0x57610180,1,0,0x5D671b00,2,0 -0x57610100,1,0,0x5D671A00,2,0=0x57610180,1,0,0x5D671b00,2,0 +0x57610100,1,0,0x5D671A00,0,0=0x57610100,1,0,0x5D671b00,2,0 +0x57610100,1,0,0x5D671A00,2,0=0x57610100,1,0,0x5D671b00,2,0 0x57610180,3,1,0x5D671A00,0,0=0x57610180,3,1,0x5D671b00,0,0 0x57610180,3,1,0x5D671A00,2,0=0x57610180,3,1,0x5D671b00,0,0 ;00 to 15-2a (L2 Rail DTR OxO) -0x57610100,1,0,0x5D771A00,0,0=0x57610180,1,0,0x5D771b00,2,0 -0x57610100,1,0,0x5D771A00,2,0=0x57610180,1,0,0x5D771b00,2,0 +0x57610100,1,0,0x5D771A00,0,0=0x57610100,1,0,0x5D771b00,2,0 +0x57610100,1,0,0x5D771A00,2,0=0x57610100,1,0,0x5D771b00,2,0 0x57610180,3,1,0x5D771A00,0,0=0x57610180,3,1,0x5D771b00,0,0 0x57610180,3,1,0x5D771A00,2,0=0x57610180,3,1,0x5D771b00,0,0 ;00 to 15b (Rail STR OxO) -0x57610100,1,0,0x57001509,1,0=0x57610180,1,0,0x57011509,1,0 -0x57610100,1,0,0x57001509,3,0=0x57610180,1,0,0x57011509,1,0 +0x57610100,1,0,0x57001509,1,0=0x57610100,1,0,0x57011509,1,0 +0x57610100,1,0,0x57001509,3,0=0x57610100,1,0,0x57011509,1,0 0x57610180,3,1,0x57001509,1,0=0x57610180,3,1,0x57011509,3,0 0x57610180,3,1,0x57001509,3,0=0x57610180,3,1,0x57011509,3,0 ;00 to 17a (GLR 1 OxO) -0x57610100,1,0,0x57001700,1,0=0x57610180,1,0,0x57011700,1,0 -0x57610100,1,0,0x57001700,3,0=0x57610180,1,0,0x57011700,1,0 +0x57610100,1,0,0x57001700,1,0=0x57610100,1,0,0x57011700,1,0 +0x57610100,1,0,0x57001700,3,0=0x57610100,1,0,0x57011700,1,0 0x57610180,3,1,0x57001700,1,0=0x57610180,3,1,0x57011700,3,0 0x57610180,3,1,0x57001700,3,0=0x57610180,3,1,0x57011700,3,0 ;00 to 17b (GLR 2 OxO) -0x57610100,1,0,0x57001709,1,0=0x57610180,1,0,0x57011709,1,0 -0x57610100,1,0,0x57001709,3,0=0x57610180,1,0,0x57011709,1,0 +0x57610100,1,0,0x57001709,1,0=0x57610100,1,0,0x57011709,1,0 +0x57610100,1,0,0x57001709,3,0=0x57610100,1,0,0x57011709,1,0 0x57610180,3,1,0x57001709,1,0=0x57610180,3,1,0x57011709,3,0 0x57610180,3,1,0x57001709,3,0=0x57610180,3,1,0x57011709,3,0 ;00 to 17-2 (ELR OxO) -0x57610100,1,0,0x57001720,1,0=0x57610180,1,0,0x57011720,1,0 -0x57610100,1,0,0x57001720,3,0=0x57610180,1,0,0x57011720,1,0 +0x57610100,1,0,0x57001720,1,0=0x57610100,1,0,0x57011720,1,0 +0x57610100,1,0,0x57001720,3,0=0x57610100,1,0,0x57011720,1,0 0x57610180,3,1,0x57001720,1,0=0x57610180,3,1,0x57011720,3,0 0x57610180,3,1,0x57001720,3,0=0x57610180,3,1,0x57011720,3,0 ;00 to 18a (GLR 3 OxO) -0x57610100,1,0,0x57001800,1,0=0x57610180,1,0,0x57011800,1,0 -0x57610100,1,0,0x57001800,3,0=0x57610180,1,0,0x57011800,1,0 +0x57610100,1,0,0x57001800,1,0=0x57610100,1,0,0x57011800,1,0 +0x57610100,1,0,0x57001800,3,0=0x57610100,1,0,0x57011800,1,0 0x57610180,3,1,0x57001800,1,0=0x57610180,3,1,0x57011800,3,0 0x57610180,3,1,0x57001800,3,0=0x57610180,3,1,0x57011800,3,0 ;00 to 18b (GLR 4 OxO) -0x57610100,1,0,0x57001809,1,0=0x57610180,1,0,0x57011809,1,0 -0x57610100,1,0,0x57001809,3,0=0x57610180,1,0,0x57011809,1,0 +0x57610100,1,0,0x57001809,1,0=0x57610100,1,0,0x57011809,1,0 +0x57610100,1,0,0x57001809,3,0=0x57610100,1,0,0x57011809,1,0 0x57610180,3,1,0x57001809,1,0=0x57610180,3,1,0x57011809,3,0 0x57610180,3,1,0x57001809,3,0=0x57610180,3,1,0x57011809,3,0 ;00 to 19b (GHSR OxO) ;00 to 19-2a (Monorail OxO) -0x57610100,1,0,0x57001920,1,0=0x57610180,1,0,0x57011920,1,0 -0x57610100,1,0,0x57001920,3,0=0x57610180,1,0,0x57011920,1,0 +0x57610100,1,0,0x57001920,1,0=0x57610100,1,0,0x57011920,1,0 +0x57610100,1,0,0x57001920,3,0=0x57610100,1,0,0x57011920,1,0 0x57610180,3,1,0x57001920,1,0=0x57610180,3,1,0x57011920,3,0 0x57610180,3,1,0x57001920,3,0=0x57610180,3,1,0x57011920,3,0 ;00 to 19-2b (HSR OxO) -0x57610100,1,0,0x57001925,1,0=0x57610180,1,0,0x57011925,1,0 -0x57610100,1,0,0x57001925,3,0=0x57610180,1,0,0x57011925,1,0 +0x57610100,1,0,0x57001925,1,0=0x57610100,1,0,0x57011925,1,0 +0x57610100,1,0,0x57001925,3,0=0x57610100,1,0,0x57011925,1,0 0x57610180,3,1,0x57001925,1,0=0x57610180,3,1,0x57011925,3,0 0x57610180,3,1,0x57001925,3,0=0x57610180,3,1,0x57011925,3,0 ;RHW +-Crossings Handled By Meta Code ;00 to 27 (TLA-3 OxO) -0x57610100,1,0,0x57002700,1,0=0x57610180,1,0,0x57012700,1,0 -0x57610100,1,0,0x57002700,3,0=0x57610180,1,0,0x57012700,1,0 +0x57610100,1,0,0x57002700,1,0=0x57610100,1,0,0x57012700,1,0 +0x57610100,1,0,0x57002700,3,0=0x57610100,1,0,0x57012700,1,0 0x57610180,3,1,0x57002700,1,0=0x57610180,3,1,0x57012700,3,0 0x57610180,3,1,0x57002700,3,0=0x57610180,3,1,0x57012700,3,0 ;00 to 28 (AVE-2 OxO) -0x57610100,1,0,0x57002800,1,0=0x57610180,1,0,0x57012800,1,0 -0x57610100,1,0,0x57002800,3,0=0x57610180,1,0,0x57012800,1,0 +0x57610100,1,0,0x57002800,1,0=0x57610100,1,0,0x57012800,1,0 +0x57610100,1,0,0x57002800,3,0=0x57610100,1,0,0x57012800,1,0 0x57610180,3,1,0x57002800,1,0=0x57610180,3,1,0x57012800,3,0 0x57610180,3,1,0x57002800,3,0=0x57610180,3,1,0x57012800,3,0 ;00 to 28-1 (L1 AVE-2 OxO) -;0x57610100,1,0,0x57002810,1,0=0x57610180,1,0,0x57012810,1,0 -;0x57610100,1,0,0x57002810,3,0=0x57610180,1,0,0x57012810,1,0 +;0x57610100,1,0,0x57002810,1,0=0x57610100,1,0,0x57012810,1,0 +;0x57610100,1,0,0x57002810,3,0=0x57610100,1,0,0x57012810,1,0 ;0x57610180,3,1,0x57002810,1,0=0x57610180,3,1,0x57012810,3,0 ;0x57610180,3,1,0x57002810,3,0=0x57610180,3,1,0x57012810,3,0 ;00 to 28-2 (L2 AVE-2 OxO) -;0x57610100,1,0,0x57002820,1,0=0x57610180,1,0,0x57012820,1,0 -;0x57610100,1,0,0x57002820,3,0=0x57610180,1,0,0x57012820,1,0 +;0x57610100,1,0,0x57002820,1,0=0x57610100,1,0,0x57012820,1,0 +;0x57610100,1,0,0x57002820,3,0=0x57610100,1,0,0x57012820,1,0 ;0x57610180,3,1,0x57002820,1,0=0x57610180,3,1,0x57012820,3,0 ;0x57610180,3,1,0x57002820,3,0=0x57610180,3,1,0x57012820,3,0 ;00 to 29 (ARD-3 OxO) -0x57610100,1,0,0x57002900,1,0=0x57610180,1,0,0x57012900,1,0 -0x57610100,1,0,0x57002900,3,0=0x57610180,1,0,0x57012900,1,1 +0x57610100,1,0,0x57002900,1,0=0x57610100,1,0,0x57012900,1,0 +0x57610100,1,0,0x57002900,3,0=0x57610100,1,0,0x57012900,1,1 0x57610180,3,1,0x57002900,1,0=0x57610180,3,1,0x57012900,3,1 0x57610180,3,1,0x57002900,3,0=0x57610180,3,1,0x57012900,3,0 ;00 to 29-1 (L1 ARD-3 OxO) -;0x57610100,1,0,0x57002910,1,0=0x57610180,1,0,0x57012910,1,0 -;0x57610100,1,0,0x57002910,3,0=0x57610180,1,0,0x57012910,1,1 +;0x57610100,1,0,0x57002910,1,0=0x57610100,1,0,0x57012910,1,0 +;0x57610100,1,0,0x57002910,3,0=0x57610100,1,0,0x57012910,1,1 ;0x57610180,3,1,0x57002910,1,0=0x57610180,3,1,0x57012910,3,1 ;0x57610180,3,1,0x57002910,3,0=0x57610180,3,1,0x57012910,3,0 ;00 to 29-2 (L2 ARD-3 OxO) -;0x57610100,1,0,0x57002920,1,0=0x57610180,1,0,0x57012920,1,0 -;0x57610100,1,0,0x57002920,3,0=0x57610180,1,0,0x57012920,1,1 +;0x57610100,1,0,0x57002920,1,0=0x57610100,1,0,0x57012920,1,0 +;0x57610100,1,0,0x57002920,3,0=0x57610100,1,0,0x57012920,1,1 ;0x57610180,3,1,0x57002920,1,0=0x57610180,3,1,0x57012920,3,1 ;0x57610180,3,1,0x57002920,3,0=0x57610180,3,1,0x57012920,3,0 ;00 to 2A (OWR-1 OxO) -0x57610100,1,0,0x57002A00,1,0=0x57610180,1,0,0x57012A00,1,0 -0x57610100,1,0,0x57002A00,3,0=0x57610180,1,0,0x57012A00,1,0 +0x57610100,1,0,0x57002A00,1,0=0x57610100,1,0,0x57012A00,1,0 +0x57610100,1,0,0x57002A00,3,0=0x57610100,1,0,0x57012A00,1,0 0x57610180,3,1,0x57002A00,1,0=0x57610180,3,1,0x57012A00,3,0 0x57610180,3,1,0x57002A00,3,0=0x57610180,3,1,0x57012A00,3,0 ;00 to 2A-1 (L1 OWR-1 OxO) -;0x57610100,1,0,0x57002A10,1,0=0x57610180,1,0,0x57012A10,1,0 -;0x57610100,1,0,0x57002A10,3,0=0x57610180,1,0,0x57012A10,1,0 +;0x57610100,1,0,0x57002A10,1,0=0x57610100,1,0,0x57012A10,1,0 +;0x57610100,1,0,0x57002A10,3,0=0x57610100,1,0,0x57012A10,1,0 ;0x57610180,3,1,0x57002A10,1,0=0x57610180,3,1,0x57012A10,3,0 ;0x57610180,3,1,0x57002A10,3,0=0x57610180,3,1,0x57012A10,3,0 ;00 to 2A-2 (L2 OWR-1 OxO) -;0x57610100,1,0,0x57002A20,1,0=0x57610180,1,0,0x57012A20,1,0 -;0x57610100,1,0,0x57002A20,3,0=0x57610180,1,0,0x57012A20,1,0 +;0x57610100,1,0,0x57002A20,1,0=0x57610100,1,0,0x57012A20,1,0 +;0x57610100,1,0,0x57002A20,3,0=0x57610100,1,0,0x57012A20,1,0 ;0x57610180,3,1,0x57002A20,1,0=0x57610180,3,1,0x57012A20,3,0 ;0x57610180,3,1,0x57002A20,3,0=0x57610180,3,1,0x57012A20,3,0 ;00 to 2B (OWR-3 OxO) -0x57610100,1,0,0x57002B00,1,0=0x57610180,1,0,0x57012B00,1,0 -0x57610100,1,0,0x57002B00,3,0=0x57610180,1,0,0x57012B00,1,0 +0x57610100,1,0,0x57002B00,1,0=0x57610100,1,0,0x57012B00,1,0 +0x57610100,1,0,0x57002B00,3,0=0x57610100,1,0,0x57012B00,1,0 0x57610180,3,1,0x57002B00,1,0=0x57610180,3,1,0x57012B00,3,0 0x57610180,3,1,0x57002B00,3,0=0x57610180,3,1,0x57012B00,3,0 ;00 to 2B-1 (L1 OWR-3 OxO) -;0x57610100,1,0,0x57002B10,1,0=0x57610180,1,0,0x57012B10,1,0 -;0x57610100,1,0,0x57002B10,3,0=0x57610180,1,0,0x57012B10,1,0 +;0x57610100,1,0,0x57002B10,1,0=0x57610100,1,0,0x57012B10,1,0 +;0x57610100,1,0,0x57002B10,3,0=0x57610100,1,0,0x57012B10,1,0 ;0x57610180,3,1,0x57002B10,1,0=0x57610180,3,1,0x57012B10,3,0 ;0x57610180,3,1,0x57002B10,3,0=0x57610180,3,1,0x57012B10,3,0 ;00 to 2B-2 (L2 OWR-3 OxO) -;0x57610100,1,0,0x57002B20,1,0=0x57610180,1,0,0x57012B20,1,0 -;0x57610100,1,0,0x57002B20,3,0=0x57610180,1,0,0x57012B20,1,0 +;0x57610100,1,0,0x57002B20,1,0=0x57610100,1,0,0x57012B20,1,0 +;0x57610100,1,0,0x57002B20,3,0=0x57610100,1,0,0x57012B20,1,0 ;0x57610180,3,1,0x57002B20,1,0=0x57610180,3,1,0x57012B20,3,0 ;0x57610180,3,1,0x57002B20,3,0=0x57610180,3,1,0x57012B20,3,0 ;00 to 2C (NRD-4 OxO) -0x57610100,1,0,0x57002C00,1,0=0x57610180,1,0,0x57012C00,1,0 -0x57610100,1,0,0x57002C00,3,0=0x57610180,1,0,0x57012C00,1,0 +0x57610100,1,0,0x57002C00,1,0=0x57610100,1,0,0x57012C00,1,0 +0x57610100,1,0,0x57002C00,3,0=0x57610100,1,0,0x57012C00,1,0 0x57610180,3,1,0x57002C00,1,0=0x57610180,3,1,0x57012C00,3,0 0x57610180,3,1,0x57002C00,3,0=0x57610180,3,1,0x57012C00,3,0 ;00 to 2C-1 (L1 NRD-4 OxO) -;0x57610100,1,0,0x57002C10,1,0=0x57610180,1,0,0x57012C10,1,0 -;0x57610100,1,0,0x57002C10,3,0=0x57610180,1,0,0x57012C10,1,0 +;0x57610100,1,0,0x57002C10,1,0=0x57610100,1,0,0x57012C10,1,0 +;0x57610100,1,0,0x57002C10,3,0=0x57610100,1,0,0x57012C10,1,0 ;0x57610180,3,1,0x57002C10,1,0=0x57610180,3,1,0x57012C10,3,0 ;0x57610180,3,1,0x57002C10,3,0=0x57610180,3,1,0x57012C10,3,0 ;00 to 2C-2 (L2 NRD-4 OxO) -;0x57610100,1,0,0x57002C20,1,0=0x57610180,1,0,0x57012C20,1,0 -;0x57610100,1,0,0x57002C20,3,0=0x57610180,1,0,0x57012C20,1,0 +;0x57610100,1,0,0x57002C20,1,0=0x57610100,1,0,0x57012C20,1,0 +;0x57610100,1,0,0x57002C20,3,0=0x57610100,1,0,0x57012C20,1,0 ;0x57610180,3,1,0x57002C20,1,0=0x57610180,3,1,0x57012C20,3,0 ;0x57610180,3,1,0x57002C20,3,0=0x57610180,3,1,0x57012C20,3,0 ;00 to 2D (TLA-5 OxO) -0x57610100,1,0,0x57002D00,3,0=0x57610180,1,0,0x57012D00,1,1 +0x57610100,1,0,0x57002D00,3,0=0x57610100,1,0,0x57012D00,1,1 0x57610180,3,1,0x57002D00,3,0=0x57610180,3,1,0x57012D00,3,0 ;00 to 2E (OWR-4 OxO) -0x57610100,1,0,0x57002E00,3,0=0x57610180,1,0,0x57012E00,1,1 +0x57610100,1,0,0x57002E00,3,0=0x57610100,1,0,0x57012E00,1,1 0x57610180,3,1,0x57002E00,3,0=0x57610180,3,1,0x57012E00,3,0 ;00 to 2E-1 (L1 OWR-4 OxO) -;0x57610100,1,0,0x57002E10,3,0=0x57610180,1,0,0x57012E10,1,1 +;0x57610100,1,0,0x57002E10,3,0=0x57610100,1,0,0x57012E10,1,1 ;0x57610180,3,1,0x57002E10,3,0=0x57610180,3,1,0x57012E10,3,0 ;00 to 2E-2 (L2 OWR-4 OxO) -;0x57610100,1,0,0x57002E20,3,0=0x57610180,1,0,0x57012E20,1,1 +;0x57610100,1,0,0x57002E20,3,0=0x57610100,1,0,0x57012E20,1,1 ;0x57610180,3,1,0x57002E20,3,0=0x57610180,3,1,0x57012E20,3,0 ;00 to 2F (OWR-5 OxO) -0x57610100,1,0,0x57002F00,3,0=0x57610180,1,0,0x57012F00,1,1 +0x57610100,1,0,0x57002F00,3,0=0x57610100,1,0,0x57012F00,1,1 0x57610180,3,1,0x57002F00,3,0=0x57610180,3,1,0x57012F00,3,0 ;00 to 2F-1 (L1 OWR-5 OxO) -;0x57610100,1,0,0x57002F10,3,0=0x57610180,1,0,0x57012F10,1,1 +;0x57610100,1,0,0x57002F10,3,0=0x57610100,1,0,0x57012F10,1,1 ;0x57610180,3,1,0x57002F10,3,0=0x57610180,3,1,0x57012F10,3,0 ;00 to 2F-2 (L2 OWR-5 OxO) -;0x57610100,1,0,0x57002F20,3,0=0x57610180,1,0,0x57012F20,1,1 +;0x57610100,1,0,0x57002F20,3,0=0x57610100,1,0,0x57012F20,1,1 ;0x57610180,3,1,0x57002F20,3,0=0x57610180,3,1,0x57012F20,3,0 ;00 to 30 (RD-4 OxO) -0x57610100,1,0,0x57003000,3,0=0x57610180,1,0,0x57013000,1,1 +0x57610100,1,0,0x57003000,3,0=0x57610100,1,0,0x57013000,1,1 0x57610180,3,1,0x57003000,3,0=0x57610180,3,1,0x57013000,3,0 ;00 to 30-1 (L1 RD-4 OxO) ;00 to 30-2 (L2 RD-4 OxO) ;00 to 31 (RD-6 OxO) -0x57610100,1,0,0x57003100,3,0=0x57610180,1,0,0x57013100,1,1 +0x57610100,1,0,0x57003100,3,0=0x57610100,1,0,0x57013100,1,1 0x57610180,3,1,0x57003100,3,0=0x57610180,3,1,0x57013100,3,0 ;00 to 31-1 (L1 RD-6 OxO) -;0x57610100,1,0,0x57003110,3,0=0x57610180,1,0,0x57013110,1,1 +;0x57610100,1,0,0x57003110,3,0=0x57610100,1,0,0x57013110,1,1 ;0x57610180,3,1,0x57003110,3,0=0x57610180,3,1,0x57013110,3,0 ;00 to 31-2 (L2 RD-6 OxO) -;0x57610100,1,0,0x57003120,3,0=0x57610180,1,0,0x57013120,1,1 +;0x57610100,1,0,0x57003120,3,0=0x57610100,1,0,0x57013120,1,1 ;0x57610180,3,1,0x57003120,3,0=0x57610180,3,1,0x57013120,3,0 ;00 to 32,33,34,35 (Triple-Tile NWM OxO) -0x57610100,1,0,0x57003200,3,0=0x57610180,1,0,0x57013200,1,1 +0x57610100,1,0,0x57003200,3,0=0x57610100,1,0,0x57013200,1,1 0x57610180,3,1,0x57003200,3,0=0x57610180,3,1,0x57013200,3,0 -0x57610100,1,0,0x57003400,3,0=0x57610180,1,0,0x57013400,1,1 +0x57610100,1,0,0x57003400,3,0=0x57610100,1,0,0x57013400,1,1 0x57610180,3,1,0x57003400,3,0=0x57610180,3,1,0x57013400,3,0 ;00 to 32-1,33-1,34-1,35-1 (L1 Triple-Tile NWM OxO) -;0x57610100,1,0,0x57003210,3,0=0x57610180,1,0,0x57013210,1,1 +;0x57610100,1,0,0x57003210,3,0=0x57610100,1,0,0x57013210,1,1 ;0x57610180,3,1,0x57003210,3,0=0x57610180,3,1,0x57013210,3,0 -;0x57610100,1,0,0x57003410,3,0=0x57610180,1,0,0x57013410,1,1 +;0x57610100,1,0,0x57003410,3,0=0x57610100,1,0,0x57013410,1,1 ;0x57610180,3,1,0x57003410,3,0=0x57610180,3,1,0x57013410,3,0 ;00 to 32-2,33-2,34-2,35-2 (L2 Triple-Tile NWM OxO) -;0x57610100,1,0,0x57003220,3,0=0x57610180,1,0,0x57013220,1,1 +;0x57610100,1,0,0x57003220,3,0=0x57610100,1,0,0x57013220,1,1 ;0x57610180,3,1,0x57003220,3,0=0x57610180,3,1,0x57013220,3,0 -;0x57610100,1,0,0x57003420,3,0=0x57610180,1,0,0x57013420,1,1 +;0x57610100,1,0,0x57003420,3,0=0x57610100,1,0,0x57013420,1,1 ;0x57610180,3,1,0x57003420,3,0=0x57610180,3,1,0x57013420,3,0 ;00 to 36 (Tram-on-Street OxO) ;00 to 37a (Tram-in-Road OxO) -0x57610100,1,0,0x58480000,0,0=0x57610180,1,0,0x57013700,1,0 -0x57610100,1,0,0x58480000,2,0=0x57610180,1,0,0x57013700,1,0 +0x57610100,1,0,0x58480000,0,0=0x57610100,1,0,0x57013700,1,0 +0x57610100,1,0,0x58480000,2,0=0x57610100,1,0,0x57013700,1,0 0x57610180,3,1,0x58480000,0,0=0x57610180,3,1,0x57013700,3,0 0x57610180,3,1,0x58480000,2,0=0x57610180,3,1,0x57013700,3,0 ; ; ;00 to 37b (Tram-on-Road OxO) -0x57610100,1,0,0x58486C00,0,0=0x57610180,1,0,0x57013709,1,0 -0x57610100,1,0,0x58486C00,2,0=0x57610180,1,0,0x57013709,1,0 +0x57610100,1,0,0x58486C00,0,0=0x57610100,1,0,0x57013709,1,0 +0x57610100,1,0,0x58486C00,2,0=0x57610100,1,0,0x57013709,1,0 0x57610180,3,1,0x58486C00,0,0=0x57610180,3,1,0x57013709,3,0 0x57610180,3,1,0x58486C00,2,0=0x57610180,3,1,0x57013709,3,0 ; @@ -287,7 +287,7 @@ ;00 to 38a (Tram-in-OWR OxO) ;00 to 38b (Tram-on-OWR OxO) ;00 to 39 (Tram-in-Avenue OxO) -0x57610100,1,0,0x58400000,0,0=0x57610180,1,0,0x57013900,1,1 +0x57610100,1,0,0x58400000,0,0=0x57610100,1,0,0x57013900,1,1 0x57610180,3,1,0x58400000,0,0=0x57610180,3,1,0x57013900,3,0 ; ;00 to 3Aa (PedPath OxO) @@ -312,352 +312,352 @@ ;0x57010000,3,0,0x57003A25,3,0=0x57010000,3,0,0x57013A25,3,0 ;00 to 0x5E60x100 (SAM 1 OxO) ;00 to 0x5E60x200 (SAM 2 OxO) -0x57610100,1,0,0x5E600200,1,0=0x57610180,1,0,0x5E601200,1,0 -0x57610100,1,0,0x5E600200,3,0=0x57610180,1,0,0x5E601200,1,0 +0x57610100,1,0,0x5E600200,1,0=0x57610100,1,0,0x5E601200,1,0 +0x57610100,1,0,0x5E600200,3,0=0x57610100,1,0,0x5E601200,1,0 0x57610180,3,1,0x5E600200,1,0=0x57610180,3,1,0x5E601200,3,0 0x57610180,3,1,0x5E600200,3,0=0x57610180,3,1,0x5E601200,3,0 ;00 to 0x5E60x300 (SAM 3 OxO) -0x57610100,1,0,0x5E600300,1,0=0x57610180,1,0,0x5E601300,1,0 -0x57610100,1,0,0x5E600300,3,0=0x57610180,1,0,0x5E601300,1,0 +0x57610100,1,0,0x5E600300,1,0=0x57610100,1,0,0x5E601300,1,0 +0x57610100,1,0,0x5E600300,3,0=0x57610100,1,0,0x5E601300,1,0 0x57610180,3,1,0x5E600300,1,0=0x57610180,3,1,0x5E601300,3,0 0x57610180,3,1,0x5E600300,3,0=0x57610180,3,1,0x5E601300,3,0 ;00 to 0x5E60x400 (SAM 4 OxO) -0x57610100,1,0,0x5E600400,1,0=0x57610180,1,0,0x5E601400,1,0 -0x57610100,1,0,0x5E600400,3,0=0x57610180,1,0,0x5E601400,1,0 +0x57610100,1,0,0x5E600400,1,0=0x57610100,1,0,0x5E601400,1,0 +0x57610100,1,0,0x5E600400,3,0=0x57610100,1,0,0x5E601400,1,0 0x57610180,3,1,0x5E600400,1,0=0x57610180,3,1,0x5E601400,3,0 0x57610180,3,1,0x5E600400,3,0=0x57610180,3,1,0x5E601400,3,0 ;00 to 0x5E60x500 (SAM 5 OxO) -0x57610100,1,0,0x5E600500,1,0=0x57610180,1,0,0x5E601500,1,0 -0x57610100,1,0,0x5E600500,3,0=0x57610180,1,0,0x5E601500,1,0 +0x57610100,1,0,0x5E600500,1,0=0x57610100,1,0,0x5E601500,1,0 +0x57610100,1,0,0x5E600500,3,0=0x57610100,1,0,0x5E601500,1,0 0x57610180,3,1,0x5E600500,1,0=0x57610180,3,1,0x5E601500,3,0 0x57610180,3,1,0x5E600500,3,0=0x57610180,3,1,0x5E601500,3,0 ;00 to 0x5E60x600 (SAM 6 OxO) -0x57610100,1,0,0x5E600600,1,0=0x57610180,1,0,0x5E601600,1,0 -0x57610100,1,0,0x5E600600,3,0=0x57610180,1,0,0x5E601600,1,0 +0x57610100,1,0,0x5E600600,1,0=0x57610100,1,0,0x5E601600,1,0 +0x57610100,1,0,0x5E600600,3,0=0x57610100,1,0,0x5E601600,1,0 0x57610180,3,1,0x5E600600,1,0=0x57610180,3,1,0x5E601600,3,0 0x57610180,3,1,0x5E600600,3,0=0x57610180,3,1,0x5E601600,3,0 ;00 to 0x5E60x700 (SAM 7 OxO) -0x57610100,1,0,0x5E600700,1,0=0x57610180,1,0,0x5E601700,1,0 -0x57610100,1,0,0x5E600700,3,0=0x57610180,1,0,0x5E601700,1,0 +0x57610100,1,0,0x5E600700,1,0=0x57610100,1,0,0x5E601700,1,0 +0x57610100,1,0,0x5E600700,3,0=0x57610100,1,0,0x5E601700,1,0 0x57610180,3,1,0x5E600700,1,0=0x57610180,3,1,0x5E601700,3,0 0x57610180,3,1,0x5E600700,3,0=0x57610180,3,1,0x5E601700,3,0 ;00 to 0x5E60x800 (SAM 8 OxO) -0x57610100,1,0,0x5E600800,1,0=0x57610180,1,0,0x5E601800,1,0 -0x57610100,1,0,0x5E600800,3,0=0x57610180,1,0,0x5E601800,1,0 +0x57610100,1,0,0x5E600800,1,0=0x57610100,1,0,0x5E601800,1,0 +0x57610100,1,0,0x5E600800,3,0=0x57610100,1,0,0x5E601800,1,0 0x57610180,3,1,0x5E600800,1,0=0x57610180,3,1,0x5E601800,3,0 0x57610180,3,1,0x5E600800,3,0=0x57610180,3,1,0x5E601800,3,0 ;00 to 0x5E60x900 (SAM 9 OxO) -0x57610100,1,0,0x5E600900,1,0=0x57610180,1,0,0x5E601900,1,0 -0x57610100,1,0,0x5E600900,3,0=0x57610180,1,0,0x5E601900,1,0 +0x57610100,1,0,0x5E600900,1,0=0x57610100,1,0,0x5E601900,1,0 +0x57610100,1,0,0x5E600900,3,0=0x57610100,1,0,0x5E601900,1,0 0x57610180,3,1,0x5E600900,1,0=0x57610180,3,1,0x5E601900,3,0 0x57610180,3,1,0x5E600900,3,0=0x57610180,3,1,0x5E601900,3,0 ;00 to 0x5E60xA00 (SAM 10 OxO) -0x57610100,1,0,0x5E600A00,1,0=0x57610180,1,0,0x5E601A00,1,0 -0x57610100,1,0,0x5E600A00,3,0=0x57610180,1,0,0x5E601A00,1,0 +0x57610100,1,0,0x5E600A00,1,0=0x57610100,1,0,0x5E601A00,1,0 +0x57610100,1,0,0x5E600A00,3,0=0x57610100,1,0,0x5E601A00,1,0 0x57610180,3,1,0x5E600A00,1,0=0x57610180,3,1,0x5E601A00,3,0 0x57610180,3,1,0x5E600A00,3,0=0x57610180,3,1,0x5E601A00,3,0 ;00 to 0x5E60xB00 (SAM 11 OxO) -0x57610100,1,0,0x5E600B00,1,0=0x57610180,1,0,0x5E601B00,1,0 -0x57610100,1,0,0x5E600B00,3,0=0x57610180,1,0,0x5E601B00,1,0 +0x57610100,1,0,0x5E600B00,1,0=0x57610100,1,0,0x5E601B00,1,0 +0x57610100,1,0,0x5E600B00,3,0=0x57610100,1,0,0x5E601B00,1,0 0x57610180,3,1,0x5E600B00,1,0=0x57610180,3,1,0x5E601B00,3,0 0x57610180,3,1,0x5E600B00,3,0=0x57610180,3,1,0x5E601B00,3,0 ;----OxD Crossings---- ;00 to 40 (Street OxD) -0x57610100,1,0,0x57004000,3,0=0x57610180,1,0,0x57014080,3,0; conflicting-override +0x57610100,1,0,0x57004000,3,0=0x57610100,1,0,0x57014080,3,0 0x57610180,3,1,0x57004000,3,0=0x57610180,3,1,0x57014000,3,0 -0x57610100,1,0,0x57004000,1,1=0x57610180,1,0,0x57014000,1,1; conflicting-override +0x57610100,1,0,0x57004000,1,1=0x57610100,1,0,0x57014000,1,1 0x57610180,3,1,0x57004000,1,1=0x57610180,3,1,0x57014080,1,1 ;00 to 41 (Road OxD) -0x57610100,1,0,0x57004100,3,0=0x57610180,1,0,0x57014180,3,0; conflicting-override +0x57610100,1,0,0x57004100,3,0=0x57610100,1,0,0x57014180,3,0 0x57610180,3,1,0x57004100,3,0=0x57610180,3,1,0x57014100,3,0 -0x57610100,1,0,0x57004100,1,1=0x57610180,1,0,0x57014100,1,1; conflicting-override +0x57610100,1,0,0x57004100,1,1=0x57610100,1,0,0x57014100,1,1 0x57610180,3,1,0x57004100,1,1=0x57610180,3,1,0x57014180,1,1 ;00 to 41-1 (L1 Road OxD) -0x57610100,1,0,0x57004115,3,0=0x57610180,1,0,0x57014195,3,0; conflicting-override +0x57610100,1,0,0x57004115,3,0=0x57610100,1,0,0x57014195,3,0 0x57610180,3,1,0x57004115,3,0=0x57610180,3,1,0x57014115,3,0 -0x57610100,1,0,0x57004115,1,1=0x57610180,1,0,0x57014115,1,1; conflicting-override +0x57610100,1,0,0x57004115,1,1=0x57610100,1,0,0x57014115,1,1 0x57610180,3,1,0x57004115,1,1=0x57610180,3,1,0x57014195,1,1 ;00 to 41-2 (L2 Road OxD) -0x57610100,1,0,0x57004125,3,0=0x57610180,1,0,0x570141A5,3,0; conflicting-override +0x57610100,1,0,0x57004125,3,0=0x57610100,1,0,0x570141A5,3,0 0x57610180,3,1,0x57004125,3,0=0x57610180,3,1,0x57014125,3,0 -0x57610100,1,0,0x57004125,1,1=0x57610180,1,0,0x57014125,1,1; conflicting-override +0x57610100,1,0,0x57004125,1,1=0x57610100,1,0,0x57014125,1,1 0x57610180,3,1,0x57004125,1,1=0x57610180,3,1,0x570141A5,1,1 ;00 to 42 (OWR OxD) -0x57610100,1,0,0x57004200,3,0=0x57610180,1,0,0x57014280,3,0; conflicting-override +0x57610100,1,0,0x57004200,3,0=0x57610100,1,0,0x57014280,3,0 0x57610180,3,1,0x57004200,3,0=0x57610180,3,1,0x57014200,3,0 -0x57610100,1,0,0x57004200,1,1=0x57610180,1,0,0x57014200,1,1; conflicting-override +0x57610100,1,0,0x57004200,1,1=0x57610100,1,0,0x57014200,1,1 0x57610180,3,1,0x57004200,1,1=0x57610180,3,1,0x57014280,1,1 ;00 to 42-1 (L1 OWR OxD) -0x57610100,1,0,0x57004215,3,0=0x57610180,1,0,0x57014295,3,0; conflicting-override +0x57610100,1,0,0x57004215,3,0=0x57610100,1,0,0x57014295,3,0 0x57610180,3,1,0x57004215,3,0=0x57610180,3,1,0x57014215,3,0 -0x57610100,1,0,0x57004215,1,1=0x57610180,1,0,0x57014215,1,1; conflicting-override +0x57610100,1,0,0x57004215,1,1=0x57610100,1,0,0x57014215,1,1 0x57610180,3,1,0x57004215,1,1=0x57610180,3,1,0x57014295,1,1 ;00 to 42-2 (L2 OWR OxD) -0x57610100,1,0,0x57004225,3,0=0x57610180,1,0,0x570142A5,3,0; conflicting-override +0x57610100,1,0,0x57004225,3,0=0x57610100,1,0,0x570142A5,3,0 0x57610180,3,1,0x57004225,3,0=0x57610180,3,1,0x57014225,3,0 -0x57610100,1,0,0x57004225,1,1=0x57610180,1,0,0x57014225,1,1; conflicting-override +0x57610100,1,0,0x57004225,1,1=0x57610100,1,0,0x57014225,1,1 0x57610180,3,1,0x57004225,1,1=0x57610180,3,1,0x570142A5,1,1 ;00 to 43 (Avenue OxD) -0x57610100,1,0,0x57004300,3,0=0x57610180,1,0,0x57014380,3,0; conflicting-override +0x57610100,1,0,0x57004300,3,0=0x57610100,1,0,0x57014380,3,0 0x57610180,3,1,0x57004300,3,0=0x57610180,3,1,0x57014300,3,0 -0x57610100,1,0,0x57004300,1,1=0x57610180,1,0,0x57014300,1,1; conflicting-override +0x57610100,1,0,0x57004300,1,1=0x57610100,1,0,0x57014300,1,1 0x57610180,3,1,0x57004300,1,1=0x57610180,3,1,0x57014380,1,1 ;00 to 43-1 (L1 Avenue OxD) -0x57610100,1,0,0x57004315,3,0=0x57610180,1,0,0x57014395,3,0; conflicting-override +0x57610100,1,0,0x57004315,3,0=0x57610100,1,0,0x57014395,3,0 0x57610180,3,1,0x57004315,3,0=0x57610180,3,1,0x57014315,3,0 -0x57610100,1,0,0x57004315,1,1=0x57610180,1,0,0x57014315,1,1; conflicting-override +0x57610100,1,0,0x57004315,1,1=0x57610100,1,0,0x57014315,1,1 0x57610180,3,1,0x57004315,1,1=0x57610180,3,1,0x57014395,1,1 ;00 to 43-2 (L2 Avenue OxD) -0x57610100,1,0,0x57004325,3,0=0x57610180,1,0,0x570143A5,3,0; conflicting-override +0x57610100,1,0,0x57004325,3,0=0x57610100,1,0,0x570143A5,3,0 0x57610180,3,1,0x57004325,3,0=0x57610180,3,1,0x57014325,3,0 -0x57610100,1,0,0x57004325,1,1=0x57610180,1,0,0x57014325,1,1; conflicting-override +0x57610100,1,0,0x57004325,1,1=0x57610100,1,0,0x57014325,1,1 0x57610180,3,1,0x57004325,1,1=0x57610180,3,1,0x570143A5,1,1 ;00 to 44-2 (L2 MHW OxD) -0x57610100,1,0,0x57004420,3,0=0x57610180,1,0,0x570144A0,3,0; conflicting-override +0x57610100,1,0,0x57004420,3,0=0x57610100,1,0,0x570144A0,3,0 0x57610180,3,1,0x57004420,3,0=0x57610180,3,1,0x57014420,3,0 -0x57610100,1,0,0x57004420,1,1=0x57610180,1,0,0x57014420,1,1; conflicting-override +0x57610100,1,0,0x57004420,1,1=0x57610100,1,0,0x57014420,1,1 0x57610180,3,1,0x57004420,1,1=0x57610180,3,1,0x570144A0,1,1 ;00 to 45a (Rail DTR OxD) -0x57610100,1,0,0x57004500,3,0=0x57610180,1,0,0x57014580,3,0; conflicting-override +0x57610100,1,0,0x57004500,3,0=0x57610100,1,0,0x57014580,3,0 0x57610180,3,1,0x57004500,3,0=0x57610180,3,1,0x57014500,3,0 -0x57610100,1,0,0x57004500,1,1=0x57610180,1,0,0x57014500,1,1; conflicting-override +0x57610100,1,0,0x57004500,1,1=0x57610100,1,0,0x57014500,1,1 0x57610180,3,1,0x57004500,1,1=0x57610180,3,1,0x57014580,1,1 ;00 to 45-1a (L1 Rail DTR OxD) -0x57610100,1,0,0x5D677A00,1,0=0x57610180,1,0,0x5D677B80,1,0; conflicting-override +0x57610100,1,0,0x5D677A00,1,0=0x57610100,1,0,0x5D677B80,1,0 0x57610180,3,1,0x5D677A00,1,0=0x57610180,3,1,0x5D677B00,1,0 -0x57610100,1,0,0x5D677A00,3,1=0x57610180,1,0,0x5D677B00,3,1; conflicting-override +0x57610100,1,0,0x5D677A00,3,1=0x57610100,1,0,0x5D677B00,3,1 0x57610180,3,1,0x5D677A00,3,1=0x57610180,3,1,0x5D677B80,3,1 ;00 to 45-2a (L2 Rail DTR OxD) -0x57610100,1,0,0x5D777A00,1,0=0x57610180,1,0,0x5D777B80,1,0; conflicting-override +0x57610100,1,0,0x5D777A00,1,0=0x57610100,1,0,0x5D777B80,1,0 0x57610180,3,1,0x5D777A00,1,0=0x57610180,3,1,0x5D777B00,1,0 -0x57610100,1,0,0x5D777A00,3,1=0x57610180,1,0,0x5D777B00,3,1; conflicting-override +0x57610100,1,0,0x5D777A00,3,1=0x57610100,1,0,0x5D777B00,3,1 0x57610180,3,1,0x5D777A00,3,1=0x57610180,3,1,0x5D777B80,3,1 ;00 to 45b (Rail STR OxD) -0x57610100,1,0,0x57004509,3,0=0x57610180,1,0,0x57014589,3,0; conflicting-override +0x57610100,1,0,0x57004509,3,0=0x57610100,1,0,0x57014589,3,0 0x57610180,3,1,0x57004509,3,0=0x57610180,3,1,0x57014509,3,0 -0x57610100,1,0,0x57004509,1,1=0x57610180,1,0,0x57014509,1,1; conflicting-override +0x57610100,1,0,0x57004509,1,1=0x57610100,1,0,0x57014509,1,1 0x57610180,3,1,0x57004509,1,1=0x57610180,3,1,0x57014589,1,1 ;00 to 47a (GLR 1 OxD) -0x57610100,1,0,0x57004700,3,0=0x57610180,1,0,0x57014780,3,0; conflicting-override +0x57610100,1,0,0x57004700,3,0=0x57610100,1,0,0x57014780,3,0 0x57610180,3,1,0x57004700,3,0=0x57610180,3,1,0x57014700,3,0 -0x57610100,1,0,0x57004700,1,1=0x57610180,1,0,0x57014700,1,1; conflicting-override +0x57610100,1,0,0x57004700,1,1=0x57610100,1,0,0x57014700,1,1 0x57610180,3,1,0x57004700,1,1=0x57610180,3,1,0x57014780,1,1 ;00 to 47b (GLR 2 OxD) -0x57610100,1,0,0x57004709,3,0=0x57610180,1,0,0x57014789,3,0; conflicting-override +0x57610100,1,0,0x57004709,3,0=0x57610100,1,0,0x57014789,3,0 0x57610180,3,1,0x57004709,3,0=0x57610180,3,1,0x57014709,3,0 -0x57610100,1,0,0x57004709,1,1=0x57610180,1,0,0x57014709,1,1; conflicting-override +0x57610100,1,0,0x57004709,1,1=0x57610100,1,0,0x57014709,1,1 0x57610180,3,1,0x57004709,1,1=0x57610180,3,1,0x57014789,1,1 ;00 to 47-2 (ELR OxD) -0x57610100,1,0,0x57004720,3,0=0x57610180,1,0,0x570147A0,3,0; conflicting-override +0x57610100,1,0,0x57004720,3,0=0x57610100,1,0,0x570147A0,3,0 0x57610180,3,1,0x57004720,3,0=0x57610180,3,1,0x57014720,3,0 -0x57610100,1,0,0x57004720,1,1=0x57610180,1,0,0x57014720,1,1; conflicting-override +0x57610100,1,0,0x57004720,1,1=0x57610100,1,0,0x57014720,1,1 0x57610180,3,1,0x57004720,1,1=0x57610180,3,1,0x570147A0,1,1 ;00 to 48a (GLR 3 OxD) -0x57610100,1,0,0x57004800,3,0=0x57610180,1,0,0x57014880,3,0; conflicting-override +0x57610100,1,0,0x57004800,3,0=0x57610100,1,0,0x57014880,3,0 0x57610180,3,1,0x57004800,3,0=0x57610180,3,1,0x57014800,3,0 -0x57610100,1,0,0x57004800,1,1=0x57610180,1,0,0x57014800,1,1; conflicting-override +0x57610100,1,0,0x57004800,1,1=0x57610100,1,0,0x57014800,1,1 0x57610180,3,1,0x57004800,1,1=0x57610180,3,1,0x57014880,1,1 ;00 to 48b (GLR 4 OxD) -0x57610100,1,0,0x57004809,3,0=0x57610180,1,0,0x57014889,3,0; conflicting-override +0x57610100,1,0,0x57004809,3,0=0x57610100,1,0,0x57014889,3,0 0x57610180,3,1,0x57004809,3,0=0x57610180,3,1,0x57014809,3,0 -0x57610100,1,0,0x57004809,1,1=0x57610180,1,0,0x57014809,1,1; conflicting-override +0x57610100,1,0,0x57004809,1,1=0x57610100,1,0,0x57014809,1,1 0x57610180,3,1,0x57004809,1,1=0x57610180,3,1,0x57014889,1,1 ;00 to 49b (GHSR OxD) ;00 to 49-2a (ELR OxD) -0x57610100,1,0,0x57004920,3,0=0x57610180,1,0,0x570149A0,3,0; conflicting-override +0x57610100,1,0,0x57004920,3,0=0x57610100,1,0,0x570149A0,3,0 0x57610180,3,1,0x57004920,3,0=0x57610180,3,1,0x57014920,3,0 -0x57610100,1,0,0x57004920,1,1=0x57610180,1,0,0x57014920,1,1; conflicting-override +0x57610100,1,0,0x57004920,1,1=0x57610100,1,0,0x57014920,1,1 0x57610180,3,1,0x57004920,1,1=0x57610180,3,1,0x570149A0,1,1 ;00 to 49-2b (HSR OxD) -0x57610100,1,0,0x57004925,3,0=0x57610180,1,0,0x570149A5,3,0; conflicting-override +0x57610100,1,0,0x57004925,3,0=0x57610100,1,0,0x570149A5,3,0 0x57610180,3,1,0x57004925,3,0=0x57610180,3,1,0x57014925,3,0 -0x57610100,1,0,0x57004925,1,1=0x57610180,1,0,0x57014925,1,1; conflicting-override +0x57610100,1,0,0x57004925,1,1=0x57610100,1,0,0x57014925,1,1 0x57610180,3,1,0x57004925,1,1=0x57610180,3,1,0x570149A5,1,1 ;RHW x RHW Crossings handled by Meta Code ;need to add ;00 to 57 (TLA-3 OxD) -;0x57610100,1,0,0x57005700,3,0=0x57610180,1,0,0x57015780,3,0 +;0x57610100,1,0,0x57005700,3,0=0x57610100,1,0,0x57015780,3,0 ;0x57610180,3,1,0x57005700,3,0=0x57610180,3,1,0x57015700,3,0 -;0x57610100,1,0,0x57005700,1,1=0x57610180,1,0,0x57015700,1,1 +;0x57610100,1,0,0x57005700,1,1=0x57610100,1,0,0x57015700,1,1 ;0x57610180,3,1,0x57005700,1,1=0x57610180,3,1,0x57015780,1,1 ;00 to 58 (AVE-2 OxD) -;0x57610100,1,0,0x57005800,3,0=0x57610180,1,0,0x57015880,3,0 +;0x57610100,1,0,0x57005800,3,0=0x57610100,1,0,0x57015880,3,0 ;0x57610180,3,1,0x57005800,3,0=0x57610180,3,1,0x57015800,3,0 -;0x57610100,1,0,0x57005800,1,1=0x57610180,1,0,0x57015800,1,1 +;0x57610100,1,0,0x57005800,1,1=0x57610100,1,0,0x57015800,1,1 ;0x57610180,3,1,0x57005800,1,1=0x57610180,3,1,0x57015880,1,1 ;00 to 58-1 (L1 AVE-2 OxD) -;0x57610100,1,0,0x57005810,3,0=0x57610180,1,0,0x57015890,3,0 +;0x57610100,1,0,0x57005810,3,0=0x57610100,1,0,0x57015890,3,0 ;0x57610180,3,1,0x57005810,3,0=0x57610180,3,1,0x57015810,3,0 -;0x57610100,1,0,0x57005810,1,1=0x57610180,1,0,0x57015810,1,1 +;0x57610100,1,0,0x57005810,1,1=0x57610100,1,0,0x57015810,1,1 ;0x57610180,3,1,0x57005810,1,1=0x57610180,3,1,0x57015890,1,1 ;00 to 58-2 (L2 AVE-2 OxD) -;0x57610100,1,0,0x57005820,3,0=0x57610180,1,0,0x570158A0,3,0 +;0x57610100,1,0,0x57005820,3,0=0x57610100,1,0,0x570158A0,3,0 ;0x57610180,3,1,0x57005820,3,0=0x57610180,3,1,0x57015820,3,0 -;0x57610100,1,0,0x57005820,1,1=0x57610180,1,0,0x57015820,1,1 +;0x57610100,1,0,0x57005820,1,1=0x57610100,1,0,0x57015820,1,1 ;0x57610180,3,1,0x57005820,1,1=0x57610180,3,1,0x570158A0,1,1 ;00 to 59 (ARD-3 OxD) -;0x57610100,1,0,0x57005900,3,0=0x57610180,1,0,0x57015980,3,0 +;0x57610100,1,0,0x57005900,3,0=0x57610100,1,0,0x57015980,3,0 ;0x57610180,3,1,0x57005900,3,0=0x57610180,3,1,0x57015900,3,0 -;0x57610100,1,0,0x57005900,1,1=0x57610180,1,0,0x57015900,1,1 +;0x57610100,1,0,0x57005900,1,1=0x57610100,1,0,0x57015900,1,1 ;0x57610180,3,1,0x57005900,1,1=0x57610180,3,1,0x57015980,1,1 -;0x57610100,1,0,0x57005909,3,0=0x57610180,1,0,0x57015989,3,0 +;0x57610100,1,0,0x57005909,3,0=0x57610100,1,0,0x57015989,3,0 ;0x57610180,3,1,0x57005909,3,0=0x57610180,3,1,0x57015909,3,0 -;0x57610100,1,0,0x57005909,1,1=0x57610180,1,0,0x57015909,1,1 +;0x57610100,1,0,0x57005909,1,1=0x57610100,1,0,0x57015909,1,1 ;0x57610180,3,1,0x57005909,1,1=0x57610180,3,1,0x57015989,1,1 ;00 to 59-1 (L1 ARD-3 OxD) -;0x57610100,1,0,0x57005910,3,0=0x57610180,1,0,0x57015990,3,0 +;0x57610100,1,0,0x57005910,3,0=0x57610100,1,0,0x57015990,3,0 ;0x57610180,3,1,0x57005910,3,0=0x57610180,3,1,0x57015910,3,0 -;0x57610100,1,0,0x57005910,1,1=0x57610180,1,0,0x57015910,1,1 +;0x57610100,1,0,0x57005910,1,1=0x57610100,1,0,0x57015910,1,1 ;0x57610180,3,1,0x57005910,1,1=0x57610180,3,1,0x57015990,1,1 -;0x57610100,1,0,0x57005915,3,0=0x57610180,1,0,0x57015995,3,0 +;0x57610100,1,0,0x57005915,3,0=0x57610100,1,0,0x57015995,3,0 ;0x57610180,3,1,0x57005915,3,0=0x57610180,3,1,0x57015915,3,0 -;0x57610100,1,0,0x57005915,1,1=0x57610180,1,0,0x57015915,1,1 +;0x57610100,1,0,0x57005915,1,1=0x57610100,1,0,0x57015915,1,1 ;0x57610180,3,1,0x57005915,1,1=0x57610180,3,1,0x57015995,1,1 ;00 to 59-2 (L2 ARD-3 OxD) -;0x57610100,1,0,0x57005920,3,0=0x57610180,1,0,0x570159A0,3,0 +;0x57610100,1,0,0x57005920,3,0=0x57610100,1,0,0x570159A0,3,0 ;0x57610180,3,1,0x57005920,3,0=0x57610180,3,1,0x57015920,3,0 -;0x57610100,1,0,0x57005920,1,1=0x57610180,1,0,0x57015920,1,1 +;0x57610100,1,0,0x57005920,1,1=0x57610100,1,0,0x57015920,1,1 ;0x57610180,3,1,0x57005920,1,1=0x57610180,3,1,0x570159A0,1,1 -;0x57610100,1,0,0x57005925,3,0=0x57610180,1,0,0x570159A5,3,0 +;0x57610100,1,0,0x57005925,3,0=0x57610100,1,0,0x570159A5,3,0 ;0x57610180,3,1,0x57005925,3,0=0x57610180,3,1,0x57015925,3,0 -;0x57610100,1,0,0x57005925,1,1=0x57610180,1,0,0x57015925,1,1 +;0x57610100,1,0,0x57005925,1,1=0x57610100,1,0,0x57015925,1,1 ;0x57610180,3,1,0x57005925,1,1=0x57610180,3,1,0x570159A5,1,1 ;00 to 5A (OWR-1 OxD) -;0x57610100,1,0,0x57005A00,3,0=0x57610180,1,0,0x57015A80,3,0 +;0x57610100,1,0,0x57005A00,3,0=0x57610100,1,0,0x57015A80,3,0 ;0x57610180,3,1,0x57005A00,3,0=0x57610180,3,1,0x57015A00,3,0 -;0x57610100,1,0,0x57005A00,1,1=0x57610180,1,0,0x57015A00,1,1 +;0x57610100,1,0,0x57005A00,1,1=0x57610100,1,0,0x57015A00,1,1 ;0x57610180,3,1,0x57005A00,1,1=0x57610180,3,1,0x57015A80,1,1 ;00 to 5A-1 (L1 OWR-1 OxD) -;0x57610100,1,0,0x57005A10,3,0=0x57610180,1,0,0x57015A90,3,0 +;0x57610100,1,0,0x57005A10,3,0=0x57610100,1,0,0x57015A90,3,0 ;0x57610180,3,1,0x57005A10,3,0=0x57610180,3,1,0x57015A10,3,0 -;0x57610100,1,0,0x57005A10,1,1=0x57610180,1,0,0x57015A10,1,1 +;0x57610100,1,0,0x57005A10,1,1=0x57610100,1,0,0x57015A10,1,1 ;0x57610180,3,1,0x57005A10,1,1=0x57610180,3,1,0x57015A90,1,1 ;00 to 5A-2 (L2 OWR-1 OxD) -;0x57610100,1,0,0x57005A20,3,0=0x57610180,1,0,0x57015AA0,3,0 +;0x57610100,1,0,0x57005A20,3,0=0x57610100,1,0,0x57015AA0,3,0 ;0x57610180,3,1,0x57005A20,3,0=0x57610180,3,1,0x57015A20,3,0 -;0x57610100,1,0,0x57005A20,1,1=0x57610180,1,0,0x57015A20,1,1 +;0x57610100,1,0,0x57005A20,1,1=0x57610100,1,0,0x57015A20,1,1 ;0x57610180,3,1,0x57005A20,1,1=0x57610180,3,1,0x57015AA0,1,1 ;00 to 5B (OWR-3 OxD) -;0x57610100,1,0,0x57005B00,3,0=0x57610180,1,0,0x57015B80,3,0 +;0x57610100,1,0,0x57005B00,3,0=0x57610100,1,0,0x57015B80,3,0 ;0x57610180,3,1,0x57005B00,3,0=0x57610180,3,1,0x57015B00,3,0 -;0x57610100,1,0,0x57005B00,1,1=0x57610180,1,0,0x57015B00,1,1 +;0x57610100,1,0,0x57005B00,1,1=0x57610100,1,0,0x57015B00,1,1 ;0x57610180,3,1,0x57005B00,1,1=0x57610180,3,1,0x57015B80,1,1 ;00 to 5B-1 (L1 OWR-3 OxD) -;0x57610100,1,0,0x57005B10,3,0=0x57610180,1,0,0x57015B90,3,0 +;0x57610100,1,0,0x57005B10,3,0=0x57610100,1,0,0x57015B90,3,0 ;0x57610180,3,1,0x57005B10,3,0=0x57610180,3,1,0x57015B10,3,0 -;0x57610100,1,0,0x57005B10,1,1=0x57610180,1,0,0x57015B10,1,1 +;0x57610100,1,0,0x57005B10,1,1=0x57610100,1,0,0x57015B10,1,1 ;0x57610180,3,1,0x57005B10,1,1=0x57610180,3,1,0x57015B90,1,1 ;00 to 5B-2 (L2 OWR-3 OxD) -;0x57610100,1,0,0x57005B20,3,0=0x57610180,1,0,0x57015BA0,3,0 +;0x57610100,1,0,0x57005B20,3,0=0x57610100,1,0,0x57015BA0,3,0 ;0x57610180,3,1,0x57005B20,3,0=0x57610180,3,1,0x57015B20,3,0 -;0x57610100,1,0,0x57005B20,1,1=0x57610180,1,0,0x57015B20,1,1 +;0x57610100,1,0,0x57005B20,1,1=0x57610100,1,0,0x57015B20,1,1 ;0x57610180,3,1,0x57005B20,1,1=0x57610180,3,1,0x57015BA0,1,1 ;00 to 5C (NRD-4 OxD) -;0x57610100,1,0,0x57005C00,3,0=0x57610180,1,0,0x57015C80,3,0 +;0x57610100,1,0,0x57005C00,3,0=0x57610100,1,0,0x57015C80,3,0 ;0x57610180,3,1,0x57005C00,3,0=0x57610180,3,1,0x57015C00,3,0 -;0x57610100,1,0,0x57005C00,1,1=0x57610180,1,0,0x57015C00,1,1 +;0x57610100,1,0,0x57005C00,1,1=0x57610100,1,0,0x57015C00,1,1 ;0x57610180,3,1,0x57005C00,1,1=0x57610180,3,1,0x57015C80,1,1 ;00 to 5C-1 (L1 NRD-4 OxD) -;0x57610100,1,0,0x57005C10,3,0=0x57610180,1,0,0x57015C90,3,0 +;0x57610100,1,0,0x57005C10,3,0=0x57610100,1,0,0x57015C90,3,0 ;0x57610180,3,1,0x57005C10,3,0=0x57610180,3,1,0x57015C10,3,0 -;0x57610100,1,0,0x57005C10,1,1=0x57610180,1,0,0x57015C10,1,1 +;0x57610100,1,0,0x57005C10,1,1=0x57610100,1,0,0x57015C10,1,1 ;0x57610180,3,1,0x57005C10,1,1=0x57610180,3,1,0x57015C90,1,1 ;00 to 5C-2 (L2 NRD-4 OxD) -;0x57610100,1,0,0x57005C20,3,0=0x57610180,1,0,0x57015CA0,3,0 +;0x57610100,1,0,0x57005C20,3,0=0x57610100,1,0,0x57015CA0,3,0 ;0x57610180,3,1,0x57005C20,3,0=0x57610180,3,1,0x57015C20,3,0 -;0x57610100,1,0,0x57005C20,1,1=0x57610180,1,0,0x57015C20,1,1 +;0x57610100,1,0,0x57005C20,1,1=0x57610100,1,0,0x57015C20,1,1 ;0x57610180,3,1,0x57005C20,1,1=0x57610180,3,1,0x57015CA0,1,1 ;00 to 5D (TLA-5 OxD) -;0x57610100,1,0,0x57005D00,3,0=0x57610180,1,0,0x57015D80,3,0 +;0x57610100,1,0,0x57005D00,3,0=0x57610100,1,0,0x57015D80,3,0 ;0x57610180,3,1,0x57005D00,3,0=0x57610180,3,1,0x57015D00,3,0 -;0x57610100,1,0,0x57005D00,1,1=0x57610180,1,0,0x57015D00,1,1 +;0x57610100,1,0,0x57005D00,1,1=0x57610100,1,0,0x57015D00,1,1 ;0x57610180,3,1,0x57005D00,1,1=0x57610180,3,1,0x57015D80,1,1 ;00 to 5E (OWR-4 OxD) -;0x57610100,1,0,0x57005E00,3,0=0x57610180,1,0,0x57015E80,3,0 +;0x57610100,1,0,0x57005E00,3,0=0x57610100,1,0,0x57015E80,3,0 ;0x57610180,3,1,0x57005E00,3,0=0x57610180,3,1,0x57015E00,3,0 -;0x57610100,1,0,0x57005E00,1,1=0x57610180,1,0,0x57015E00,1,1 +;0x57610100,1,0,0x57005E00,1,1=0x57610100,1,0,0x57015E00,1,1 ;0x57610180,3,1,0x57005E00,1,1=0x57610180,3,1,0x57015E80,1,1 ;00 to 5E-1 (L1 Avenue OxD) -;0x57610100,1,0,0x57005E10,3,0=0x57610180,1,0,0x57015E90,3,0 +;0x57610100,1,0,0x57005E10,3,0=0x57610100,1,0,0x57015E90,3,0 ;0x57610180,3,1,0x57005E10,3,0=0x57610180,3,1,0x57015E10,3,0 -;0x57610100,1,0,0x57005E10,1,1=0x57610180,1,0,0x57015E10,1,1 +;0x57610100,1,0,0x57005E10,1,1=0x57610100,1,0,0x57015E10,1,1 ;0x57610180,3,1,0x57005E10,1,1=0x57610180,3,1,0x57015E90,1,1 ;00 to 5E-2 (L2 Avenue OxD) -;0x57610100,1,0,0x57005E20,3,0=0x57610180,1,0,0x57015EA0,3,0 +;0x57610100,1,0,0x57005E20,3,0=0x57610100,1,0,0x57015EA0,3,0 ;0x57610180,3,1,0x57005E20,3,0=0x57610180,3,1,0x57015E20,3,0 -;0x57610100,1,0,0x57005E20,1,1=0x57610180,1,0,0x57015E20,1,1 +;0x57610100,1,0,0x57005E20,1,1=0x57610100,1,0,0x57015E20,1,1 ;0x57610180,3,1,0x57005E20,1,1=0x57610180,3,1,0x57015EA0,1,1 ;00 to 5F (OWR-5 OxD) -;0x57610100,1,0,0x57005F00,3,0=0x57610180,1,0,0x57015F80,3,0 +;0x57610100,1,0,0x57005F00,3,0=0x57610100,1,0,0x57015F80,3,0 ;0x57610180,3,1,0x57005F00,3,0=0x57610180,3,1,0x57015F00,3,0 -;0x57610100,1,0,0x57005F00,1,1=0x57610180,1,0,0x57015F00,1,1 +;0x57610100,1,0,0x57005F00,1,1=0x57610100,1,0,0x57015F00,1,1 ;0x57610180,3,1,0x57005F00,1,1=0x57610180,3,1,0x57015F80,1,1 ;00 to 5F-1 (L1 OWR-5 OxD) -;0x57610100,1,0,0x57005F10,3,0=0x57610180,1,0,0x57015F90,3,0 +;0x57610100,1,0,0x57005F10,3,0=0x57610100,1,0,0x57015F90,3,0 ;0x57610180,3,1,0x57005F10,3,0=0x57610180,3,1,0x57015F10,3,0 -;0x57610100,1,0,0x57005F10,1,1=0x57610180,1,0,0x57015F10,1,1 +;0x57610100,1,0,0x57005F10,1,1=0x57610100,1,0,0x57015F10,1,1 ;0x57610180,3,1,0x57005F10,1,1=0x57610180,3,1,0x57015F90,1,1 ;00 to 5F-2 (L2 OWR-5 OxD) -;0x57610100,1,0,0x57005F20,3,0=0x57610180,1,0,0x57015FA0,3,0 +;0x57610100,1,0,0x57005F20,3,0=0x57610100,1,0,0x57015FA0,3,0 ;0x57610180,3,1,0x57005F20,3,0=0x57610180,3,1,0x57015F20,3,0 -;0x57610100,1,0,0x57005F20,1,1=0x57610180,1,0,0x57015F20,1,1 +;0x57610100,1,0,0x57005F20,1,1=0x57610100,1,0,0x57015F20,1,1 ;0x57610180,3,1,0x57005F20,1,1=0x57610180,3,1,0x57015FA0,1,1 ;00 to 60 (RD-4 OxD) -;0x57610100,1,0,0x57006000,3,0=0x57610180,1,0,0x57016080,3,0 +;0x57610100,1,0,0x57006000,3,0=0x57610100,1,0,0x57016080,3,0 ;0x57610180,3,1,0x57006000,3,0=0x57610180,3,1,0x57016000,3,0 -;0x57610100,1,0,0x57006000,1,1=0x57610180,1,0,0x57016000,1,1 +;0x57610100,1,0,0x57006000,1,1=0x57610100,1,0,0x57016000,1,1 ;0x57610180,3,1,0x57006000,1,1=0x57610180,3,1,0x57016080,1,1 ;00 to 60-1 (L1 RD-4 OxD) -;0x57610100,1,0,0x57006010,3,0=0x57610180,1,0,0x57016090,3,0 +;0x57610100,1,0,0x57006010,3,0=0x57610100,1,0,0x57016090,3,0 ;0x57610180,3,1,0x57006010,3,0=0x57610180,3,1,0x57016010,3,0 -;0x57610100,1,0,0x57006010,1,1=0x57610180,1,0,0x57016010,1,1 +;0x57610100,1,0,0x57006010,1,1=0x57610100,1,0,0x57016010,1,1 ;0x57610180,3,1,0x57006010,1,1=0x57610180,3,1,0x57016090,1,1 ;00 to 60-2 (L2 RD-4 OxD) -;0x57610100,1,0,0x57006020,3,0=0x57610180,1,0,0x570160A0,3,0 +;0x57610100,1,0,0x57006020,3,0=0x57610100,1,0,0x570160A0,3,0 ;0x57610180,3,1,0x57006020,3,0=0x57610180,3,1,0x57016020,3,0 -;0x57610100,1,0,0x57006020,1,1=0x57610180,1,0,0x57016020,1,1 +;0x57610100,1,0,0x57006020,1,1=0x57610100,1,0,0x57016020,1,1 ;0x57610180,3,1,0x57006020,1,1=0x57610180,3,1,0x570160A0,1,1 ;00 to 61 (RD-6 OxD) -;0x57610100,1,0,0x57006100,3,0=0x57610180,1,0,0x57016180,3,0 +;0x57610100,1,0,0x57006100,3,0=0x57610100,1,0,0x57016180,3,0 ;0x57610180,3,1,0x57006100,3,0=0x57610180,3,1,0x57016100,3,0 -;0x57610100,1,0,0x57006100,1,1=0x57610180,1,0,0x57016100,1,1 +;0x57610100,1,0,0x57006100,1,1=0x57610100,1,0,0x57016100,1,1 ;0x57610180,3,1,0x57006100,1,1=0x57610180,3,1,0x57016180,1,1 ;00 to 61-1 (L1 RD-6 OxD) -;0x57610100,1,0,0x57006110,3,0=0x57610180,1,0,0x57016190,3,0 +;0x57610100,1,0,0x57006110,3,0=0x57610100,1,0,0x57016190,3,0 ;0x57610180,3,1,0x57006110,3,0=0x57610180,3,1,0x57016110,3,0 -;0x57610100,1,0,0x57006110,1,1=0x57610180,1,0,0x57016110,1,1 +;0x57610100,1,0,0x57006110,1,1=0x57610100,1,0,0x57016110,1,1 ;0x57610180,3,1,0x57006110,1,1=0x57610180,3,1,0x57016190,1,1 ;00 to 61-2 (L2 RD-6 OxD) -;0x57610100,1,0,0x57006120,3,0=0x57610180,1,0,0x570161A0,3,0 +;0x57610100,1,0,0x57006120,3,0=0x57610100,1,0,0x570161A0,3,0 ;0x57610180,3,1,0x57006120,3,0=0x57610180,3,1,0x57016120,3,0 -;0x57610100,1,0,0x57006120,1,1=0x57610180,1,0,0x57016120,1,1 +;0x57610100,1,0,0x57006120,1,1=0x57610100,1,0,0x57016120,1,1 ;0x57610180,3,1,0x57006120,1,1=0x57610180,3,1,0x570161A0,1,1 ;00 to 62,63,64,65 (Triple-Tile NWM OxD) -;0x57610100,1,0,0x57006200,3,0=0x57610180,1,0,0x57016280,3,0 +;0x57610100,1,0,0x57006200,3,0=0x57610100,1,0,0x57016280,3,0 ;0x57610180,3,1,0x57006200,3,0=0x57610180,3,1,0x57016200,3,0 -;0x57610100,1,0,0x57006200,1,1=0x57610180,1,0,0x57016200,1,1 +;0x57610100,1,0,0x57006200,1,1=0x57610100,1,0,0x57016200,1,1 ;0x57610180,3,1,0x57006200,1,1=0x57610180,3,1,0x57016280,1,1 -;0x57610100,1,0,0x57006400,3,0=0x57610180,1,0,0x57016480,3,0 +;0x57610100,1,0,0x57006400,3,0=0x57610100,1,0,0x57016480,3,0 ;0x57610180,3,1,0x57006400,3,0=0x57610180,3,1,0x57016400,3,0 -;0x57610100,1,0,0x57006400,1,1=0x57610180,1,0,0x57016400,1,1 +;0x57610100,1,0,0x57006400,1,1=0x57610100,1,0,0x57016400,1,1 ;0x57610180,3,1,0x57006400,1,1=0x57610180,3,1,0x57016480,1,1 ;00 to 62,63,64,65 (L1 Triple-Tile NWM OxD) -;0x57610100,1,0,0x57006210,3,0=0x57610180,1,0,0x57016290,3,0 +;0x57610100,1,0,0x57006210,3,0=0x57610100,1,0,0x57016290,3,0 ;0x57610180,3,1,0x57006210,3,0=0x57610180,3,1,0x57016210,3,0 -;0x57610100,1,0,0x57006210,1,1=0x57610180,1,0,0x57016210,1,1 +;0x57610100,1,0,0x57006210,1,1=0x57610100,1,0,0x57016210,1,1 ;0x57610180,3,1,0x57006210,1,1=0x57610180,3,1,0x57016290,1,1 -;0x57610100,1,0,0x57006410,3,0=0x57610180,1,0,0x57016490,3,0 +;0x57610100,1,0,0x57006410,3,0=0x57610100,1,0,0x57016490,3,0 ;0x57610180,3,1,0x57006410,3,0=0x57610180,3,1,0x57016410,3,0 -;0x57610100,1,0,0x57006410,1,1=0x57610180,1,0,0x57016410,1,1 +;0x57610100,1,0,0x57006410,1,1=0x57610100,1,0,0x57016410,1,1 ;0x57610180,3,1,0x57006410,1,1=0x57610180,3,1,0x57016490,1,1 ;00 to 62,63,64,65 (L2 Triple-Tile NWM OxD) -;0x57610100,1,0,0x57006220,3,0=0x57610180,1,0,0x570162A0,3,0 +;0x57610100,1,0,0x57006220,3,0=0x57610100,1,0,0x570162A0,3,0 ;0x57610180,3,1,0x57006220,3,0=0x57610180,3,1,0x57016220,3,0 -;0x57610100,1,0,0x57006220,1,1=0x57610180,1,0,0x57016220,1,1 +;0x57610100,1,0,0x57006220,1,1=0x57610100,1,0,0x57016220,1,1 ;0x57610180,3,1,0x57006220,1,1=0x57610180,3,1,0x570162A0,1,1 -;0x57610100,1,0,0x57006420,3,0=0x57610180,1,0,0x570164A0,3,0 +;0x57610100,1,0,0x57006420,3,0=0x57610100,1,0,0x570164A0,3,0 ;0x57610180,3,1,0x57006420,3,0=0x57610180,3,1,0x57016420,3,0 -;0x57610100,1,0,0x57006420,1,1=0x57610180,1,0,0x57016420,1,1 +;0x57610100,1,0,0x57006420,1,1=0x57610100,1,0,0x57016420,1,1 ;0x57610180,3,1,0x57006420,1,1=0x57610180,3,1,0x570164A0,1,1 ;00 to 66 (Tram-on-Street OxD) ;00 to 67a (Tram-in-Road OxD) @@ -687,121 +687,121 @@ ;0x57010000,3,0,0x57006A25,1,1=0x57010000,3,0,0x57016AA5,1,1 ;00 to 0x5E62x100 (SAM 1 OxD) ;00 to 0x5E62x200 (SAM 2 OxD) -0x57610100,1,0,0x5E620200,3,0=0x57610180,1,0,0x5E621280,3,0; conflicting-override +0x57610100,1,0,0x5E620200,3,0=0x57610100,1,0,0x5E621280,3,0 0x57610180,3,1,0x5E620200,3,0=0x57610180,3,1,0x5E621200,3,0 -0x57610100,1,0,0x5E620200,1,1=0x57610180,1,0,0x5E621200,1,1; conflicting-override +0x57610100,1,0,0x5E620200,1,1=0x57610100,1,0,0x5E621200,1,1 0x57610180,3,1,0x5E620200,1,1=0x57610180,3,1,0x5E621280,1,1 ;00 to 0x5E62x300 (SAM 3 OxD) -0x57610100,1,0,0x5E620300,3,0=0x57610180,1,0,0x5E621380,3,0; conflicting-override +0x57610100,1,0,0x5E620300,3,0=0x57610100,1,0,0x5E621380,3,0 0x57610180,3,1,0x5E620300,3,0=0x57610180,3,1,0x5E621300,3,0 -0x57610100,1,0,0x5E620300,1,1=0x57610180,1,0,0x5E621300,1,1; conflicting-override +0x57610100,1,0,0x5E620300,1,1=0x57610100,1,0,0x5E621300,1,1 0x57610180,3,1,0x5E620300,1,1=0x57610180,3,1,0x5E621380,1,1 ;00 to 0x5E62x400 (SAM 4 OxD) -0x57610100,1,0,0x5E620400,3,0=0x57610180,1,0,0x5E621480,3,0; conflicting-override +0x57610100,1,0,0x5E620400,3,0=0x57610100,1,0,0x5E621480,3,0 0x57610180,3,1,0x5E620400,3,0=0x57610180,3,1,0x5E621400,3,0 -0x57610100,1,0,0x5E620400,1,1=0x57610180,1,0,0x5E621400,1,1; conflicting-override +0x57610100,1,0,0x5E620400,1,1=0x57610100,1,0,0x5E621400,1,1 0x57610180,3,1,0x5E620400,1,1=0x57610180,3,1,0x5E621480,1,1 ;00 to 0x5E62x500 (SAM 5 OxD) -0x57610100,1,0,0x5E620500,3,0=0x57610180,1,0,0x5E621580,3,0; conflicting-override +0x57610100,1,0,0x5E620500,3,0=0x57610100,1,0,0x5E621580,3,0 0x57610180,3,1,0x5E620500,3,0=0x57610180,3,1,0x5E621500,3,0 -0x57610100,1,0,0x5E620500,1,1=0x57610180,1,0,0x5E621500,1,1; conflicting-override +0x57610100,1,0,0x5E620500,1,1=0x57610100,1,0,0x5E621500,1,1 0x57610180,3,1,0x5E620500,1,1=0x57610180,3,1,0x5E621580,1,1 ;00 to 0x5E62x600 (SAM 6 OxD) -0x57610100,1,0,0x5E620600,3,0=0x57610180,1,0,0x5E621680,3,0; conflicting-override +0x57610100,1,0,0x5E620600,3,0=0x57610100,1,0,0x5E621680,3,0 0x57610180,3,1,0x5E620600,3,0=0x57610180,3,1,0x5E621600,3,0 -0x57610100,1,0,0x5E620600,1,1=0x57610180,1,0,0x5E621600,1,1; conflicting-override +0x57610100,1,0,0x5E620600,1,1=0x57610100,1,0,0x5E621600,1,1 0x57610180,3,1,0x5E620600,1,1=0x57610180,3,1,0x5E621680,1,1 ;00 to 0x5E62x700 (SAM 7 OxD) -0x57610100,1,0,0x5E620700,3,0=0x57610180,1,0,0x5E621780,3,0; conflicting-override +0x57610100,1,0,0x5E620700,3,0=0x57610100,1,0,0x5E621780,3,0 0x57610180,3,1,0x5E620700,3,0=0x57610180,3,1,0x5E621700,3,0 -0x57610100,1,0,0x5E620700,1,1=0x57610180,1,0,0x5E621700,1,1; conflicting-override +0x57610100,1,0,0x5E620700,1,1=0x57610100,1,0,0x5E621700,1,1 0x57610180,3,1,0x5E620700,1,1=0x57610180,3,1,0x5E621780,1,1 ;00 to 0x5E62x800 (SAM 8 OxD) -0x57610100,1,0,0x5E620800,3,0=0x57610180,1,0,0x5E621880,3,0; conflicting-override +0x57610100,1,0,0x5E620800,3,0=0x57610100,1,0,0x5E621880,3,0 0x57610180,3,1,0x5E620800,3,0=0x57610180,3,1,0x5E621800,3,0 -0x57610100,1,0,0x5E620800,1,1=0x57610180,1,0,0x5E621800,1,1; conflicting-override +0x57610100,1,0,0x5E620800,1,1=0x57610100,1,0,0x5E621800,1,1 0x57610180,3,1,0x5E620800,1,1=0x57610180,3,1,0x5E621880,1,1 ;00 to 0x5E62x900 (SAM 9 OxD) -0x57610100,1,0,0x5E620900,3,0=0x57610180,1,0,0x5E621980,3,0; conflicting-override +0x57610100,1,0,0x5E620900,3,0=0x57610100,1,0,0x5E621980,3,0 0x57610180,3,1,0x5E620900,3,0=0x57610180,3,1,0x5E621900,3,0 -0x57610100,1,0,0x5E620900,1,1=0x57610180,1,0,0x5E621900,1,1; conflicting-override +0x57610100,1,0,0x5E620900,1,1=0x57610100,1,0,0x5E621900,1,1 0x57610180,3,1,0x5E620900,1,1=0x57610180,3,1,0x5E621980,1,1 ;00 to 0x5E62xA00 (SAM 10 OxD) -0x57610100,1,0,0x5E620A00,3,0=0x57610180,1,0,0x5E621A80,3,0; conflicting-override +0x57610100,1,0,0x5E620A00,3,0=0x57610100,1,0,0x5E621A80,3,0 0x57610180,3,1,0x5E620A00,3,0=0x57610180,3,1,0x5E621A00,3,0 -0x57610100,1,0,0x5E620A00,1,1=0x57610180,1,0,0x5E621A00,1,1; conflicting-override +0x57610100,1,0,0x5E620A00,1,1=0x57610100,1,0,0x5E621A00,1,1 0x57610180,3,1,0x5E620A00,1,1=0x57610180,3,1,0x5E621A80,1,1 ;00 to 0x5E62xB00 (SAM 11 OxD) -0x57610100,1,0,0x5E620B00,3,0=0x57610180,1,0,0x5E621B80,3,0; conflicting-override +0x57610100,1,0,0x5E620B00,3,0=0x57610100,1,0,0x5E621B80,3,0 0x57610180,3,1,0x5E620B00,3,0=0x57610180,3,1,0x5E621B00,3,0 -0x57610100,1,0,0x5E620B00,1,1=0x57610180,1,0,0x5E621B00,1,1; conflicting-override +0x57610100,1,0,0x5E620B00,1,1=0x57610100,1,0,0x5E621B00,1,1 0x57610180,3,1,0x5E620B00,1,1=0x57610180,3,1,0x5E621B80,1,1 ;----OxO T Crossings---- ;00 to T-00 (Street Ends) -0x57610100,1,0,0x57600000,1,0=0x57610180,1,0,0x57610000,1,0 -0x57610180,3,1,0x57600000,3,0=0x57610180,3,1,0x57610000,3,0 -0x57610100,1,0,0x57600000,3,0=0x57610180,1,0,0x57610000,3,0 +0x57610100,1,0,0x57600000,1,0=0x57610100,1,0,0x57610000,1,0 +0x57610180,3,1,0x57600000,3,0=0x57610180,3,1,0x57610080,3,0 +0x57610100,1,0,0x57600000,3,0=0x57610100,1,0,0x57610080,3,0 0x57610180,3,1,0x57600000,1,0=0x57610180,3,1,0x57610000,1,0 ;00 to T-01 (Road Ends) -0x57610100,1,0,0x57600100,1,0=0x57610180,1,0,0x57610100,1,0 -0x57610180,3,1,0x57600100,3,0=0x57610180,3,1,0x57610100,3,0 -0x57610100,1,0,0x57600100,3,0=0x57610180,1,0,0x57610180,3,0 -0x57610180,3,1,0x57600100,1,0=0x57610180,3,1,0x57610180,1,0 +0x57610100,1,0,0x57600100,1,0=0x57610100,1,0,0x57610100,1,0 +0x57610180,3,1,0x57600100,3,0=0x57610180,3,1,0x57610180,3,0 +0x57610100,1,0,0x57600100,3,0=0x57610100,1,0,0x57610180,3,0 +0x57610180,3,1,0x57600100,1,0=0x57610180,3,1,0x57610100,1,0 ;00 to T-02 (OWR Ends) -0x57610100,1,0,0x57600200,1,0=0x57610180,1,0,0x57610200,1,0 -0x57610180,3,1,0x57600200,3,0=0x57610180,3,1,0x57610200,3,0 -0x57610100,1,0,0x57600200,3,0=0x57610180,1,0,0x57610280,3,0 -0x57610180,3,1,0x57600200,1,0=0x57610180,3,1,0x57610280,1,0 +0x57610100,1,0,0x57600200,1,0=0x57610100,1,0,0x57610200,1,0 +0x57610180,3,1,0x57600200,3,0=0x57610180,3,1,0x57610280,3,0 +0x57610100,1,0,0x57600200,3,0=0x57610100,1,0,0x57610280,3,0 +0x57610180,3,1,0x57600200,1,0=0x57610180,3,1,0x57610200,1,0 ;00 to T-03 (Avenue Ends) -0x57610100,1,0,0x57600300,1,1=0x57610180,1,0,0x57610300,1,1; conflicting-override -0x57610180,3,1,0x57600300,3,0=0x57610180,3,1,0x57610300,3,0 -0x57610100,1,0,0x57600300,3,0=0x57610180,1,0,0x57610380,3,0; conflicting-override -0x57610180,3,1,0x57600300,1,1=0x57610180,3,1,0x57610380,1,1 +0x57610100,1,0,0x57600300,1,1=0x57610100,1,0,0x57610300,1,1 +0x57610180,3,1,0x57600300,3,0=0x57610180,3,1,0x57610380,3,0 +0x57610100,1,0,0x57600300,3,0=0x57610100,1,0,0x57610380,3,0 +0x57610180,3,1,0x57600300,1,1=0x57610180,3,1,0x57610300,1,1 ;00 to T-04 (RHW-2 Ends) -0x57610100,1,0,0x57600400,1,0=0x57610180,1,0,0x57610400,1,0 -0x57610180,3,1,0x57600400,3,0=0x57610180,3,1,0x57610400,3,0 -0x57610100,1,0,0x57600400,3,0=0x57610180,1,0,0x57610480,3,0 -0x57610180,3,1,0x57600400,1,0=0x57610180,3,1,0x57610480,1,0 +0x57610100,1,0,0x57600400,1,0=0x57610100,1,0,0x57610400,1,0 +0x57610180,3,1,0x57600400,3,0=0x57610180,3,1,0x57610480,3,0 +0x57610100,1,0,0x57600400,3,0=0x57610100,1,0,0x57610480,3,0 +0x57610180,3,1,0x57600400,1,0=0x57610180,3,1,0x57610400,1,0 ;00 to T-05 (RHW-3 Ends) ;00 to T-07 (TLA-3 Ends) -0x57610100,1,0,0x57600700,1,0=0x57610180,1,0,0x57610700,1,0 -0x57610180,3,1,0x57600700,3,0=0x57610180,3,1,0x57610700,3,0 -0x57610100,1,0,0x57600700,3,0=0x57610180,1,0,0x57610780,3,0 -0x57610180,3,1,0x57600700,1,0=0x57610180,3,1,0x57610780,1,0 +0x57610100,1,0,0x57600700,1,0=0x57610100,1,0,0x57610700,1,0 +0x57610180,3,1,0x57600700,3,0=0x57610180,3,1,0x57610780,3,0 +0x57610100,1,0,0x57600700,3,0=0x57610100,1,0,0x57610780,3,0 +0x57610180,3,1,0x57600700,1,0=0x57610180,3,1,0x57610700,1,0 ;00 to T-08 (AVE-2 Ends) -0x57610100,1,0,0x57600800,1,0=0x57610180,1,0,0x57610800,1,0 -0x57610180,3,1,0x57600800,3,0=0x57610180,3,1,0x57610800,3,0 -0x57610100,1,0,0x57600800,3,0=0x57610180,1,0,0x57610880,3,0 -0x57610180,3,1,0x57600800,1,0=0x57610180,3,1,0x57610880,1,0 +0x57610100,1,0,0x57600800,1,0=0x57610100,1,0,0x57610800,1,0 +0x57610180,3,1,0x57600800,3,0=0x57610180,3,1,0x57610880,3,0 +0x57610100,1,0,0x57600800,3,0=0x57610100,1,0,0x57610880,3,0 +0x57610180,3,1,0x57600800,1,0=0x57610180,3,1,0x57610800,1,0 ;00 to T-09 (ARD-3 Ends) -0x57610100,1,0,0x57600900,1,0=0x57610180,1,0,0x57610900,1,0 -0x57610180,3,1,0x57600900,3,0=0x57610180,3,1,0x57610900,3,0 -0x57610100,1,0,0x57600900,3,0=0x57610180,1,0,0x57610980,3,0 -0x57610180,3,1,0x57600900,1,0=0x57610180,3,1,0x57610980,1,0 -0x57610100,1,0,0x57600909,1,0=0x57610180,1,0,0x57610909,1,0 -0x57610180,3,1,0x57600909,3,0=0x57610180,3,1,0x57610909,3,0 -0x57610100,1,0,0x57600909,3,0=0x57610180,1,0,0x57610989,3,0 -0x57610180,3,1,0x57600909,1,0=0x57610180,3,1,0x57610989,1,0 +0x57610100,1,0,0x57600900,1,0=0x57610100,1,0,0x57610900,1,0 +0x57610180,3,1,0x57600900,3,0=0x57610180,3,1,0x57610980,3,0 +0x57610100,1,0,0x57600900,3,0=0x57610100,1,0,0x57610980,3,0 +0x57610180,3,1,0x57600900,1,0=0x57610180,3,1,0x57610900,1,0 +0x57610100,1,0,0x57600909,1,0=0x57610100,1,0,0x57610909,1,0 +0x57610180,3,1,0x57600909,3,0=0x57610180,3,1,0x57610989,3,0 +0x57610100,1,0,0x57600909,3,0=0x57610100,1,0,0x57610989,3,0 +0x57610180,3,1,0x57600909,1,0=0x57610180,3,1,0x57610909,1,0 ;00 to T-0A (OWR-1 Ends) -0x57610100,1,0,0x57600A00,1,0=0x57610180,1,0,0x57610A00,1,0 -0x57610180,3,1,0x57600A00,3,0=0x57610180,3,1,0x57610A00,3,0 -0x57610100,1,0,0x57600A00,3,0=0x57610180,1,0,0x57610A80,3,0 -0x57610180,3,1,0x57600A00,1,0=0x57610180,3,1,0x57610A80,1,0 +0x57610100,1,0,0x57600A00,1,0=0x57610100,1,0,0x57610A00,1,0 +0x57610180,3,1,0x57600A00,3,0=0x57610180,3,1,0x57610A80,3,0 +0x57610100,1,0,0x57600A00,3,0=0x57610100,1,0,0x57610A80,3,0 +0x57610180,3,1,0x57600A00,1,0=0x57610180,3,1,0x57610A00,1,0 ;00 to T-0B (OWR-3 Ends) -0x57610100,1,0,0x57600C00,1,0=0x57610180,1,0,0x57610B00,1,0 -0x57610180,3,1,0x57600C00,3,0=0x57610180,3,1,0x57610B00,3,0 -0x57610100,1,0,0x57600C00,3,0=0x57610180,1,0,0x57610B80,3,0 -0x57610180,3,1,0x57600C00,1,0=0x57610180,3,1,0x57610B80,1,0 +0x57610100,1,0,0x57600C00,1,0=0x57610100,1,0,0x57610B00,1,0 +0x57610180,3,1,0x57600C00,3,0=0x57610180,3,1,0x57610B80,3,0 +0x57610100,1,0,0x57600C00,3,0=0x57610100,1,0,0x57610B80,3,0 +0x57610180,3,1,0x57600C00,1,0=0x57610180,3,1,0x57610B00,1,0 ;00 to T-0C (NRD-4 Ends) -0x57610100,1,0,0x57600C00,1,0=0x57610180,1,0,0x57610C00,1,0; conflicting-override -0x57610180,3,1,0x57600C00,3,0=0x57610180,3,1,0x57610C00,3,0; conflicting-override -0x57610100,1,0,0x57600C00,3,0=0x57610180,1,0,0x57610C80,3,0; conflicting-override -0x57610180,3,1,0x57600C00,1,0=0x57610180,3,1,0x57610C80,1,0; conflicting-override +0x57610100,1,0,0x57600C00,1,0=0x57610100,1,0,0x57610C00,1,0; conflicting-override +0x57610180,3,1,0x57600C00,3,0=0x57610180,3,1,0x57610C80,3,0; conflicting-override +0x57610100,1,0,0x57600C00,3,0=0x57610100,1,0,0x57610C80,3,0; conflicting-override +0x57610180,3,1,0x57600C00,1,0=0x57610180,3,1,0x57610C00,1,0; conflicting-override ;00 to T-0D (TLA-5 Ends) -0x57610100,1,0,0x57600D00,1,0=0x57610180,1,0,0x57610D00,1,0 -0x57610180,3,1,0x57600D00,3,0=0x57610180,3,1,0x57610D00,3,0 -0x57610100,1,0,0x57600D00,3,0=0x57610180,1,0,0x57610D80,3,0 -0x57610180,3,1,0x57600D00,1,0=0x57610180,3,1,0x57610D80,1,0 +0x57610100,1,0,0x57600D00,1,0=0x57610100,1,0,0x57610D00,1,0 +0x57610180,3,1,0x57600D00,3,0=0x57610180,3,1,0x57610D80,3,0 +0x57610100,1,0,0x57600D00,3,0=0x57610100,1,0,0x57610D80,3,0 +0x57610180,3,1,0x57600D00,1,0=0x57610180,3,1,0x57610D00,1,0 ;00 to T-0E (OWR-4 Ends) ;00 to T-0F (OWR-5 Ends) ;00 to T-10 (Street Thru) @@ -809,7 +809,7 @@ ;00 to T-12 (OWR Thru) ;00 to T-13 (Avenue Thru) ;Short -0x57610100,1,0,0x57601300,2,0=0x57610180,1,0,0x57601300,0,1 +0x57610100,1,0,0x57601300,2,0=0x57610100,1,0,0x57601300,0,1 ;0x57610180,3,1,0x57601300,2,0=0x57610180,3,1,0x57601300,2,0 ;redundant prevent ;Long (see 13_Avenue_OxO) ;00 to T-14 (RHW-2 Thru) @@ -830,9 +830,9 @@ ;----OxD/DxO T Crossings---- ;00 to T-33 (Avenue Thru--Orth RHW+Diag Avenue) ;Short -0x57610100,1,0,0x57603300,3,0=0x57610180,1,0,0x57613380,3,0; conflicting-override +0x57610100,1,0,0x57603300,3,0=0x57610100,1,0,0x57613380,3,0 0x57610180,3,1,0x57603300,3,0=0x57610180,3,1,0x57613300,3,0 -0x57610100,1,0,0x57603300,1,1=0x57610180,1,0,0x57613300,1,1; conflicting-override +0x57610100,1,0,0x57603300,1,1=0x57610100,1,0,0x57613300,1,1 0x57610180,3,1,0x57603300,1,1=0x57610180,3,1,0x57613380,1,1 ;Long ;----Other Base Crossings---- @@ -840,12 +840,12 @@ ;00 to F0 (Street) ;00 to F1 (Road) ;00 to F2 (OWR) -0x57610100,1,0,0x5700F200,1,0=0x57610180,1,0,0x5701F200,1,0 +0x57610100,1,0,0x5700F200,1,0=0x57610100,1,0,0x5701F200,1,0 0x57610180,3,1,0x5700F200,1,0=0x57610180,3,1,0x5701F200,3,1 ;00 to F3 (MHW) ;Handled by RUL1 ;00 to F4 (Avenue) -0x57610100,1,0,0x5700F480,1,0=0x57610180,1,0,0x5701F480,1,0; conflicting-override +0x57610100,1,0,0x5700F480,1,0=0x57610100,1,0,0x5701F480,1,0 0x57610180,3,1,0x5700F480,3,1=0x57610180,3,1,0x5701F480,3,1 ;NWM Transitions Handled NWM-Side ;----Special---- @@ -855,44 +855,44 @@ ;00 to T-E4 (Avenue Outer) ;--MRCs-- ;00 to R1 -0x57610100,1,0,0x57905000,0,0=0x57610180,1,0,0x57915000,0,0; conflicting-override -0x57610100,1,0,0x57905000,2,1=0x57610180,1,0,0x57915080,2,1; conflicting-override +0x57610100,1,0,0x57905000,0,0=0x57610100,1,0,0x57915000,0,0 +0x57610100,1,0,0x57905000,2,1=0x57610100,1,0,0x57915080,2,1 0x57610180,3,1,0x57905000,0,0=0x57610180,3,1,0x57915080,0,0 0x57610180,3,1,0x57905000,2,1=0x57610180,3,1,0x57915000,2,1 ;00 to R2 -0x57610100,1,0,0x57905400,0,0=0x57610180,1,0,0x57915400,0,0; conflicting-override -0x57610100,1,0,0x57905400,2,1=0x57610180,1,0,0x57915480,2,1; conflicting-override +0x57610100,1,0,0x57905400,0,0=0x57610100,1,0,0x57915400,0,0 +0x57610100,1,0,0x57905400,2,1=0x57610100,1,0,0x57915480,2,1 0x57610180,3,1,0x57905400,0,0=0x57610180,3,1,0x57915480,0,0 0x57610180,3,1,0x57905400,2,1=0x57610180,3,1,0x57915400,2,1 ;00 to R3 -0x57610100,1,0,0x57906000,0,0=0x57610180,1,0,0x57916000,0,0; conflicting-override -0x57610100,1,0,0x57906000,2,1=0x57610180,1,0,0x57916080,2,1; conflicting-override +0x57610100,1,0,0x57906000,0,0=0x57610100,1,0,0x57916000,0,0 +0x57610100,1,0,0x57906000,2,1=0x57610100,1,0,0x57916080,2,1 0x57610180,3,1,0x57906000,0,0=0x57610180,3,1,0x57916080,0,0 0x57610180,3,1,0x57906000,2,1=0x57610180,3,1,0x57916000,2,1 ;00 to R4 -0x57610100,1,0,0x57907000,0,0=0x57610180,1,0,0x57917000,0,0; conflicting-override -0x57610100,1,0,0x57907000,2,1=0x57610180,1,0,0x57917080,2,1; conflicting-override +0x57610100,1,0,0x57907000,0,0=0x57610100,1,0,0x57917000,0,0 +0x57610100,1,0,0x57907000,2,1=0x57610100,1,0,0x57917080,2,1 0x57610180,3,1,0x57907000,0,0=0x57610180,3,1,0x57917080,0,0 0x57610180,3,1,0x57907000,2,1=0x57610180,3,1,0x57917000,2,1 ;00 to R5 -0x57610100,1,0,0x57908000,0,0=0x57610180,1,0,0x57918000,0,0; conflicting-override -0x57610100,1,0,0x57908000,2,1=0x57610180,1,0,0x57918080,2,1; conflicting-override +0x57610100,1,0,0x57908000,0,0=0x57610100,1,0,0x57918000,0,0 +0x57610100,1,0,0x57908000,2,1=0x57610100,1,0,0x57918080,2,1 0x57610180,3,1,0x57908000,0,0=0x57610180,3,1,0x57918080,0,0 0x57610180,3,1,0x57908000,2,1=0x57610180,3,1,0x57918000,2,1 ;--FLEXRamp/DRIs-- ;add ;--FLEXHeight-- ;Up -0x57610100,1,0,0x57700230,1,0=0x57610180,1,0,0x57711230,1,0 +0x57610100,1,0,0x57700230,1,0=0x57610100,1,0,0x57711230,1,0 0x57610180,3,1,0x57700230,1,0=0x57610180,3,1,0x57711230,3,1 ;Down ;--FLEXOnSlope-- ;Up 1 -0x57610100,1,0,0x57700000,1,0=0x57610180,1,0,0x57711000,1,0 +0x57610100,1,0,0x57700000,1,0=0x57610100,1,0,0x57711000,1,0 0x57610180,3,1,0x57700000,1,0=0x57610180,3,1,0x57711000,3,1 ;Down 1 ;Up 2 -0x57610100,1,0,0x57700100,1,0=0x57610180,1,0,0x57711100,1,0 +0x57610100,1,0,0x57700100,1,0=0x57610100,1,0,0x57711100,1,0 0x57610180,3,1,0x57700100,1,0=0x57610180,3,1,0x57711100,3,1 ;Down 2 ;--FLEXWidth-- diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_B1_Bottom_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_B1_Bottom_RHD.txt index ff14173ea..1fc0d6a14 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_B1_Bottom_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_B1_Bottom_RHD.txt @@ -1765,10 +1765,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57821480,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57821480,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57821400,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57821400,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57821480,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57821480,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57821400,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57821400,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57821480,1,1,0x57602400,3,0=0x57821480,1,1,0x5702D000,1,1 @@ -5136,90 +5136,90 @@ ;----OxD Crossings---- ;00 to 40 (Street OxD) 0x57881480,1,1,0x57004000,3,0=0x57881480,1,1,0x57084040,3,0 -0x57881400,3,0,0x57004000,3,0=0x57881480,3,0,0x57084000,3,0; conflicting-override +0x57881400,3,0,0x57004000,3,0=0x57881480,3,0,0x57084000,3,0 0x57881480,1,1,0x57004000,1,1=0x57881480,1,1,0x57084000,1,1 -0x57881400,3,0,0x57004000,1,1=0x57881480,3,0,0x57084040,1,1; conflicting-override +0x57881400,3,0,0x57004000,1,1=0x57881480,3,0,0x57084040,1,1 ;00 to 41 (Road OxD) 0x57881480,1,1,0x57004100,3,0=0x57881480,1,1,0x57084140,3,0 -0x57881400,3,0,0x57004100,3,0=0x57881480,3,0,0x57084100,3,0; conflicting-override +0x57881400,3,0,0x57004100,3,0=0x57881480,3,0,0x57084100,3,0 0x57881480,1,1,0x57004100,1,1=0x57881480,1,1,0x57084100,1,1 -0x57881400,3,0,0x57004100,1,1=0x57881480,3,0,0x57084140,1,1; conflicting-override +0x57881400,3,0,0x57004100,1,1=0x57881480,3,0,0x57084140,1,1 ;00 to 41-1 (L1 Road OxD) 0x57881480,1,1,0x57004115,3,0=0x57881480,1,1,0x57084155,3,0 -0x57881400,3,0,0x57004115,3,0=0x57881480,3,0,0x57084115,3,0; conflicting-override +0x57881400,3,0,0x57004115,3,0=0x57881480,3,0,0x57084115,3,0 0x57881480,1,1,0x57004115,1,1=0x57881480,1,1,0x57084115,1,1 -0x57881400,3,0,0x57004115,1,1=0x57881480,3,0,0x57084155,1,1; conflicting-override +0x57881400,3,0,0x57004115,1,1=0x57881480,3,0,0x57084155,1,1 ;00 to 41-2 (L2 Road OxD) 0x57881480,1,1,0x57004125,3,0=0x57881480,1,1,0x57084165,3,0 -0x57881400,3,0,0x57004125,3,0=0x57881480,3,0,0x57084125,3,0; conflicting-override +0x57881400,3,0,0x57004125,3,0=0x57881480,3,0,0x57084125,3,0 0x57881480,1,1,0x57004125,1,1=0x57881480,1,1,0x57084125,1,1 -0x57881400,3,0,0x57004125,1,1=0x57881480,3,0,0x57084165,1,1; conflicting-override +0x57881400,3,0,0x57004125,1,1=0x57881480,3,0,0x57084165,1,1 ;00 to 42 (OWR OxD) 0x57881480,1,1,0x57004200,3,0=0x57881480,1,1,0x57084240,3,0 -0x57881400,3,0,0x57004200,3,0=0x57881480,3,0,0x57084200,3,0; conflicting-override +0x57881400,3,0,0x57004200,3,0=0x57881480,3,0,0x57084200,3,0 0x57881480,1,1,0x57004200,1,1=0x57881480,1,1,0x57084200,1,1 -0x57881400,3,0,0x57004200,1,1=0x57881480,3,0,0x57084240,1,1; conflicting-override +0x57881400,3,0,0x57004200,1,1=0x57881480,3,0,0x57084240,1,1 ;00 to 42-1 (L1 OWR OxD) 0x57881480,1,1,0x57004215,3,0=0x57881480,1,1,0x57084255,3,0 -0x57881400,3,0,0x57004215,3,0=0x57881480,3,0,0x57084215,3,0; conflicting-override +0x57881400,3,0,0x57004215,3,0=0x57881480,3,0,0x57084215,3,0 0x57881480,1,1,0x57004215,1,1=0x57881480,1,1,0x57084215,1,1 -0x57881400,3,0,0x57004215,1,1=0x57881480,3,0,0x57084255,1,1; conflicting-override +0x57881400,3,0,0x57004215,1,1=0x57881480,3,0,0x57084255,1,1 ;00 to 42-2 (L2 OWR OxD) 0x57881480,1,1,0x57004225,3,0=0x57881480,1,1,0x57084265,3,0 -0x57881400,3,0,0x57004225,3,0=0x57881480,3,0,0x57084225,3,0; conflicting-override +0x57881400,3,0,0x57004225,3,0=0x57881480,3,0,0x57084225,3,0 0x57881480,1,1,0x57004225,1,1=0x57881480,1,1,0x57084225,1,1 -0x57881400,3,0,0x57004225,1,1=0x57881480,3,0,0x57084265,1,1; conflicting-override +0x57881400,3,0,0x57004225,1,1=0x57881480,3,0,0x57084265,1,1 ;00 to 43 (Avenue OxD) 0x57881480,1,1,0x57004300,3,0=0x57881480,1,1,0x57084340,3,0 -0x57881400,3,0,0x57004300,3,0=0x57881480,3,0,0x57084300,3,0; conflicting-override +0x57881400,3,0,0x57004300,3,0=0x57881480,3,0,0x57084300,3,0 0x57881480,1,1,0x57004300,1,1=0x57881480,1,1,0x57084300,1,1 -0x57881400,3,0,0x57004300,1,1=0x57881480,3,0,0x57084340,1,1; conflicting-override +0x57881400,3,0,0x57004300,1,1=0x57881480,3,0,0x57084340,1,1 ;00 to 43-1 (L1 Avenue OxD) 0x57881480,1,1,0x57004315,3,0=0x57881480,1,1,0x57084355,3,0 -0x57881400,3,0,0x57004315,3,0=0x57881480,3,0,0x57084315,3,0; conflicting-override +0x57881400,3,0,0x57004315,3,0=0x57881480,3,0,0x57084315,3,0 0x57881480,1,1,0x57004315,1,1=0x57881480,1,1,0x57084315,1,1 -0x57881400,3,0,0x57004315,1,1=0x57881480,3,0,0x57084355,1,1; conflicting-override +0x57881400,3,0,0x57004315,1,1=0x57881480,3,0,0x57084355,1,1 ;00 to 43-2 (L2 Avenue OxD) 0x57881480,1,1,0x57004325,3,0=0x57881480,1,1,0x57084365,3,0 -0x57881400,3,0,0x57004325,3,0=0x57881480,3,0,0x57084325,3,0; conflicting-override +0x57881400,3,0,0x57004325,3,0=0x57881480,3,0,0x57084325,3,0 0x57881480,1,1,0x57004325,1,1=0x57881480,1,1,0x57084325,1,1 -0x57881400,3,0,0x57004325,1,1=0x57881480,3,0,0x57084365,1,1; conflicting-override +0x57881400,3,0,0x57004325,1,1=0x57881480,3,0,0x57084365,1,1 ;00 to 44-2 (L2 MHW OxD) 0x57881480,1,1,0x57004420,3,0=0x57881480,1,1,0x57084460,3,0 -0x57881400,3,0,0x57004420,3,0=0x57881480,3,0,0x57084420,3,0; conflicting-override +0x57881400,3,0,0x57004420,3,0=0x57881480,3,0,0x57084420,3,0 0x57881480,1,1,0x57004420,1,1=0x57881480,1,1,0x57084420,1,1 -0x57881400,3,0,0x57004420,1,1=0x57881480,3,0,0x57084460,1,1; conflicting-override +0x57881400,3,0,0x57004420,1,1=0x57881480,3,0,0x57084460,1,1 ;00 to 45a (Rail DTR OxD) 0x57881480,1,1,0x57004500,3,0=0x57881480,1,1,0x57084540,3,0 -0x57881400,3,0,0x57004500,3,0=0x57881480,3,0,0x57084500,3,0; conflicting-override +0x57881400,3,0,0x57004500,3,0=0x57881480,3,0,0x57084500,3,0 0x57881480,1,1,0x57004500,1,1=0x57881480,1,1,0x57084500,1,1 -0x57881400,3,0,0x57004500,1,1=0x57881480,3,0,0x57084540,1,1; conflicting-override +0x57881400,3,0,0x57004500,1,1=0x57881480,3,0,0x57084540,1,1 ;00 to 45-1a (L1 Rail DTR OxD) 0x57881480,1,1,0x5D677A00,1,0=0x57881480,1,1,0x5D678480,1,0 -0x57881400,3,0,0x5D677A00,1,0=0x57881480,3,0,0x5D678400,1,0; conflicting-override +0x57881400,3,0,0x5D677A00,1,0=0x57881480,3,0,0x5D678400,1,0 0x57881480,1,1,0x5D677A00,3,1=0x57881480,1,1,0x5D678400,3,1 -0x57881400,3,0,0x5D677A00,3,1=0x57881480,3,0,0x5D678480,3,1; conflicting-override +0x57881400,3,0,0x5D677A00,3,1=0x57881480,3,0,0x5D678480,3,1 ;00 to 45-2a (L2 Rail DTR OxD) 0x57881480,1,1,0x5D777A00,1,0=0x57881480,1,1,0x5D778480,1,0 -0x57881400,3,0,0x5D777A00,1,0=0x57881480,3,0,0x5D778400,1,0; conflicting-override +0x57881400,3,0,0x5D777A00,1,0=0x57881480,3,0,0x5D778400,1,0 0x57881480,1,1,0x5D777A00,3,1=0x57881480,1,1,0x5D778400,3,1 -0x57881400,3,0,0x5D777A00,3,1=0x57881480,3,0,0x5D778480,3,1; conflicting-override +0x57881400,3,0,0x5D777A00,3,1=0x57881480,3,0,0x5D778480,3,1 ;00 to 47-2 (ELR OxD) 0x57881480,1,1,0x57004720,3,0=0x57881480,1,1,0x57084760,3,0 -0x57881400,3,0,0x57004720,3,0=0x57881480,3,0,0x57084720,3,0; conflicting-override +0x57881400,3,0,0x57004720,3,0=0x57881480,3,0,0x57084720,3,0 0x57881480,1,1,0x57004720,1,1=0x57881480,1,1,0x57084720,1,1 -0x57881400,3,0,0x57004720,1,1=0x57881480,3,0,0x57084760,1,1; conflicting-override +0x57881400,3,0,0x57004720,1,1=0x57881480,3,0,0x57084760,1,1 ;00 to 49b (GHSR OxD) ;00 to 49-2a (ELR OxD) 0x57881480,1,1,0x57004920,3,0=0x57881480,1,1,0x57084960,3,0 -0x57881400,3,0,0x57004920,3,0=0x57881480,3,0,0x57084920,3,0; conflicting-override +0x57881400,3,0,0x57004920,3,0=0x57881480,3,0,0x57084920,3,0 0x57881480,1,1,0x57004920,1,1=0x57881480,1,1,0x57084920,1,1 -0x57881400,3,0,0x57004920,1,1=0x57881480,3,0,0x57084960,1,1; conflicting-override +0x57881400,3,0,0x57004920,1,1=0x57881480,3,0,0x57084960,1,1 ;00 to 49-2a (HSR OxD) 0x57881480,1,1,0x57004925,3,0=0x57881480,1,1,0x57084965,3,0 -0x57881400,3,0,0x57004925,3,0=0x57881480,3,0,0x57084925,3,0; conflicting-override +0x57881400,3,0,0x57004925,3,0=0x57881480,3,0,0x57084925,3,0 0x57881480,1,1,0x57004925,1,1=0x57881480,1,1,0x57084925,1,1 -0x57881400,3,0,0x57004925,1,1=0x57881480,3,0,0x57084965,1,1; conflicting-override +0x57881400,3,0,0x57004925,1,1=0x57881480,3,0,0x57084965,1,1 ;RHW x RHW Crossings handled by Meta Code ;00 to 58-1 (L1 AVE-2 OxD) ;0x57881480,1,1,0x57005810,3,0=0x57881480,1,1,0x57085850,3,0 @@ -8405,10 +8405,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57821499,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57821499,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57821419,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57821419,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57821499,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57821499,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57821419,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57821419,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57821499,1,1,0x57602400,3,0=0x57821499,1,1,0x5712D000,1,1 @@ -15501,10 +15501,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578214A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x578214A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57821429,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57821429,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x578214A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x578214A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57821429,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57821429,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x578214A9,1,1,0x57602400,3,0=0x578214A9,1,1,0x5722D000,1,1 @@ -20900,10 +20900,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578214B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x578214B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57821439,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57821439,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x578214B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x578214B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57821439,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57821439,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x578214B9,1,1,0x57602400,3,0=0x578214B9,1,1,0x5732D000,1,1 @@ -23791,10 +23791,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578214C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x578214C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57821449,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57821449,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x578214C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x578214C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57821449,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57821449,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x578214C9,1,1,0x57602400,3,0=0x578214C9,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_B1_Inside_Top_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_B1_Inside_Top_RHD.txt index 7243e00fe..243bedca3 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_B1_Inside_Top_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_B1_Inside_Top_RHD.txt @@ -1765,10 +1765,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57821980,3,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57821980,3,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57821900,1,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57821900,1,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57821980,3,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57821980,3,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57821900,1,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57821900,1,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57821980,3,1,0x57602400,3,0=0x57821980,3,1,0x5702D000,1,1 @@ -6418,10 +6418,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57821999,3,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57821999,3,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57821919,1,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57821919,1,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57821999,3,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57821999,3,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57821919,1,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57821919,1,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57821999,3,1,0x57602400,3,0=0x57821999,3,1,0x5712D000,1,1 @@ -11446,10 +11446,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578219A9,3,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x578219A9,3,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57821929,1,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57821929,1,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x578219A9,3,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x578219A9,3,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57821929,1,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57821929,1,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x578219A9,3,1,0x57602400,3,0=0x578219A9,3,1,0x5722D000,1,1 @@ -14808,10 +14808,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578219B9,3,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x578219B9,3,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57821939,1,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57821939,1,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x578219B9,3,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x578219B9,3,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57821939,1,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57821939,1,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x578219B9,3,1,0x57602400,3,0=0x578219B9,3,1,0x5732D000,1,1 @@ -17699,10 +17699,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578219C9,3,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x578219C9,3,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57821949,1,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57821949,1,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x578219C9,3,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x578219C9,3,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57821949,1,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57821949,1,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x578219C9,3,1,0x57602400,3,0=0x578219C9,3,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_B1_Top_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_B1_Top_RHD.txt index 7993f92f0..aae3de4a5 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_B1_Top_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_B1_Top_RHD.txt @@ -1765,10 +1765,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57821000,1,0,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57821000,1,0,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57821080,3,1,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57821080,3,1,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57821000,1,0,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57821000,1,0,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57821080,3,1,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57821080,3,1,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57821000,1,0,0x57602400,3,0=0x57821000,1,0,0x5702D000,1,1 @@ -5136,90 +5136,90 @@ ;----OxD Crossings---- ;00 to 40 (Street OxD) 0x57881000,1,0,0x57004000,3,0=0x57881000,1,0,0x57084040,3,0 -0x57881080,3,1,0x57004000,3,0=0x57881000,3,1,0x57084000,3,0; conflicting-override +0x57881080,3,1,0x57004000,3,0=0x57881000,3,1,0x57084000,3,0 0x57881000,1,0,0x57004000,1,1=0x57881000,1,0,0x57084000,1,1 -0x57881080,3,1,0x57004000,1,1=0x57881000,3,1,0x57084040,1,1; conflicting-override +0x57881080,3,1,0x57004000,1,1=0x57881000,3,1,0x57084040,1,1 ;00 to 41 (Road OxD) 0x57881000,1,0,0x57004100,3,0=0x57881000,1,0,0x57084140,3,0 -0x57881080,3,1,0x57004100,3,0=0x57881000,3,1,0x57084100,3,0; conflicting-override +0x57881080,3,1,0x57004100,3,0=0x57881000,3,1,0x57084100,3,0 0x57881000,1,0,0x57004100,1,1=0x57881000,1,0,0x57084100,1,1 -0x57881080,3,1,0x57004100,1,1=0x57881000,3,1,0x57084140,1,1; conflicting-override +0x57881080,3,1,0x57004100,1,1=0x57881000,3,1,0x57084140,1,1 ;00 to 41-1 (L1 Road OxD) 0x57881000,1,0,0x57004115,3,0=0x57881000,1,0,0x57084155,3,0 -0x57881080,3,1,0x57004115,3,0=0x57881000,3,1,0x57084115,3,0; conflicting-override +0x57881080,3,1,0x57004115,3,0=0x57881000,3,1,0x57084115,3,0 0x57881000,1,0,0x57004115,1,1=0x57881000,1,0,0x57084115,1,1 -0x57881080,3,1,0x57004115,1,1=0x57881000,3,1,0x57084155,1,1; conflicting-override +0x57881080,3,1,0x57004115,1,1=0x57881000,3,1,0x57084155,1,1 ;00 to 41-2 (L2 Road OxD) 0x57881000,1,0,0x57004125,3,0=0x57881000,1,0,0x57084165,3,0 -0x57881080,3,1,0x57004125,3,0=0x57881000,3,1,0x57084125,3,0; conflicting-override +0x57881080,3,1,0x57004125,3,0=0x57881000,3,1,0x57084125,3,0 0x57881000,1,0,0x57004125,1,1=0x57881000,1,0,0x57084125,1,1 -0x57881080,3,1,0x57004125,1,1=0x57881000,3,1,0x57084165,1,1; conflicting-override +0x57881080,3,1,0x57004125,1,1=0x57881000,3,1,0x57084165,1,1 ;00 to 42 (OWR OxD) 0x57881000,1,0,0x57004200,3,0=0x57881000,1,0,0x57084240,3,0 -0x57881080,3,1,0x57004200,3,0=0x57881000,3,1,0x57084200,3,0; conflicting-override +0x57881080,3,1,0x57004200,3,0=0x57881000,3,1,0x57084200,3,0 0x57881000,1,0,0x57004200,1,1=0x57881000,1,0,0x57084200,1,1 -0x57881080,3,1,0x57004200,1,1=0x57881000,3,1,0x57084240,1,1; conflicting-override +0x57881080,3,1,0x57004200,1,1=0x57881000,3,1,0x57084240,1,1 ;00 to 42-1 (L1 OWR OxD) 0x57881000,1,0,0x57004215,3,0=0x57881000,1,0,0x57084255,3,0 -0x57881080,3,1,0x57004215,3,0=0x57881000,3,1,0x57084215,3,0; conflicting-override +0x57881080,3,1,0x57004215,3,0=0x57881000,3,1,0x57084215,3,0 0x57881000,1,0,0x57004215,1,1=0x57881000,1,0,0x57084215,1,1 -0x57881080,3,1,0x57004215,1,1=0x57881000,3,1,0x57084255,1,1; conflicting-override +0x57881080,3,1,0x57004215,1,1=0x57881000,3,1,0x57084255,1,1 ;00 to 42-2 (L2 OWR OxD) 0x57881000,1,0,0x57004225,3,0=0x57881000,1,0,0x57084265,3,0 -0x57881080,3,1,0x57004225,3,0=0x57881000,3,1,0x57084225,3,0; conflicting-override +0x57881080,3,1,0x57004225,3,0=0x57881000,3,1,0x57084225,3,0 0x57881000,1,0,0x57004225,1,1=0x57881000,1,0,0x57084225,1,1 -0x57881080,3,1,0x57004225,1,1=0x57881000,3,1,0x57084265,1,1; conflicting-override +0x57881080,3,1,0x57004225,1,1=0x57881000,3,1,0x57084265,1,1 ;00 to 43 (Avenue OxD) 0x57881000,1,0,0x57004300,3,0=0x57881000,1,0,0x57084340,3,0 -0x57881080,3,1,0x57004300,3,0=0x57881000,3,1,0x57084300,3,0; conflicting-override +0x57881080,3,1,0x57004300,3,0=0x57881000,3,1,0x57084300,3,0 0x57881000,1,0,0x57004300,1,1=0x57881000,1,0,0x57084300,1,1 -0x57881080,3,1,0x57004300,1,1=0x57881000,3,1,0x57084340,1,1; conflicting-override +0x57881080,3,1,0x57004300,1,1=0x57881000,3,1,0x57084340,1,1 ;00 to 43-1 (L1 Avenue OxD) 0x57881000,1,0,0x57004315,3,0=0x57881000,1,0,0x57084355,3,0 -0x57881080,3,1,0x57004315,3,0=0x57881000,3,1,0x57084315,3,0; conflicting-override +0x57881080,3,1,0x57004315,3,0=0x57881000,3,1,0x57084315,3,0 0x57881000,1,0,0x57004315,1,1=0x57881000,1,0,0x57084315,1,1 -0x57881080,3,1,0x57004315,1,1=0x57881000,3,1,0x57084355,1,1; conflicting-override +0x57881080,3,1,0x57004315,1,1=0x57881000,3,1,0x57084355,1,1 ;00 to 43-2 (L2 Avenue OxD) 0x57881000,1,0,0x57004325,3,0=0x57881000,1,0,0x57084365,3,0 -0x57881080,3,1,0x57004325,3,0=0x57881000,3,1,0x57084325,3,0; conflicting-override +0x57881080,3,1,0x57004325,3,0=0x57881000,3,1,0x57084325,3,0 0x57881000,1,0,0x57004325,1,1=0x57881000,1,0,0x57084325,1,1 -0x57881080,3,1,0x57004325,1,1=0x57881000,3,1,0x57084365,1,1; conflicting-override +0x57881080,3,1,0x57004325,1,1=0x57881000,3,1,0x57084365,1,1 ;00 to 44-2 (L2 MHW OxD) 0x57881000,1,0,0x57004420,3,0=0x57881000,1,0,0x57084460,3,0 -0x57881080,3,1,0x57004420,3,0=0x57881000,3,1,0x57084420,3,0; conflicting-override +0x57881080,3,1,0x57004420,3,0=0x57881000,3,1,0x57084420,3,0 0x57881000,1,0,0x57004420,1,1=0x57881000,1,0,0x57084420,1,1 -0x57881080,3,1,0x57004420,1,1=0x57881000,3,1,0x57084460,1,1; conflicting-override +0x57881080,3,1,0x57004420,1,1=0x57881000,3,1,0x57084460,1,1 ;00 to 45a (Rail DTR OxD) 0x57881000,1,0,0x57004500,3,0=0x57881000,1,0,0x57084540,3,0 -0x57881080,3,1,0x57004500,3,0=0x57881000,3,1,0x57084500,3,0; conflicting-override +0x57881080,3,1,0x57004500,3,0=0x57881000,3,1,0x57084500,3,0 0x57881000,1,0,0x57004500,1,1=0x57881000,1,0,0x57084500,1,1 -0x57881080,3,1,0x57004500,1,1=0x57881000,3,1,0x57084540,1,1; conflicting-override +0x57881080,3,1,0x57004500,1,1=0x57881000,3,1,0x57084540,1,1 ;00 to 45-1a (L1 Rail DTR OxD) 0x57881000,1,0,0x5D677A00,1,0=0x57881000,1,0,0x5D678480,1,0 -0x57881080,3,1,0x5D677A00,1,0=0x57881000,3,1,0x5D678400,1,0; conflicting-override +0x57881080,3,1,0x5D677A00,1,0=0x57881000,3,1,0x5D678400,1,0 0x57881000,1,0,0x5D677A00,3,1=0x57881000,1,0,0x5D678400,3,1 -0x57881080,3,1,0x5D677A00,3,1=0x57881000,3,1,0x5D678480,3,1; conflicting-override +0x57881080,3,1,0x5D677A00,3,1=0x57881000,3,1,0x5D678480,3,1 ;00 to 45-2a (L2 Rail DTR OxD) 0x57881000,1,0,0x5D777A00,1,0=0x57881000,1,0,0x5D778480,1,0 -0x57881080,3,1,0x5D777A00,1,0=0x57881000,3,1,0x5D778400,1,0; conflicting-override +0x57881080,3,1,0x5D777A00,1,0=0x57881000,3,1,0x5D778400,1,0 0x57881000,1,0,0x5D777A00,3,1=0x57881000,1,0,0x5D778400,3,1 -0x57881080,3,1,0x5D777A00,3,1=0x57881000,3,1,0x5D778480,3,1; conflicting-override +0x57881080,3,1,0x5D777A00,3,1=0x57881000,3,1,0x5D778480,3,1 ;00 to 47-2 (ELR OxD) 0x57881000,1,0,0x57004720,3,0=0x57881000,1,0,0x57084760,3,0 -0x57881080,3,1,0x57004720,3,0=0x57881000,3,1,0x57084720,3,0; conflicting-override +0x57881080,3,1,0x57004720,3,0=0x57881000,3,1,0x57084720,3,0 0x57881000,1,0,0x57004720,1,1=0x57881000,1,0,0x57084720,1,1 -0x57881080,3,1,0x57004720,1,1=0x57881000,3,1,0x57084760,1,1; conflicting-override +0x57881080,3,1,0x57004720,1,1=0x57881000,3,1,0x57084760,1,1 ;00 to 49b (GHSR OxD) ;00 to 49-2a (ELR OxD) 0x57881000,1,0,0x57004920,3,0=0x57881000,1,0,0x57084960,3,0 -0x57881080,3,1,0x57004920,3,0=0x57881000,3,1,0x57084920,3,0; conflicting-override +0x57881080,3,1,0x57004920,3,0=0x57881000,3,1,0x57084920,3,0 0x57881000,1,0,0x57004920,1,1=0x57881000,1,0,0x57084920,1,1 -0x57881080,3,1,0x57004920,1,1=0x57881000,3,1,0x57084960,1,1; conflicting-override +0x57881080,3,1,0x57004920,1,1=0x57881000,3,1,0x57084960,1,1 ;00 to 49-2a (HSR OxD) 0x57881000,1,0,0x57004925,3,0=0x57881000,1,0,0x57084965,3,0 -0x57881080,3,1,0x57004925,3,0=0x57881000,3,1,0x57084925,3,0; conflicting-override +0x57881080,3,1,0x57004925,3,0=0x57881000,3,1,0x57084925,3,0 0x57881000,1,0,0x57004925,1,1=0x57881000,1,0,0x57084925,1,1 -0x57881080,3,1,0x57004925,1,1=0x57881000,3,1,0x57084965,1,1; conflicting-override +0x57881080,3,1,0x57004925,1,1=0x57881000,3,1,0x57084965,1,1 ;RHW x RHW Crossings handled by Meta Code ;00 to 58-1 (L1 AVE-2 OxD) ;0x57881000,1,0,0x57005810,3,0=0x57881000,1,0,0x57085850,3,0 @@ -8405,10 +8405,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57821019,1,0,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57821019,1,0,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57821099,3,1,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57821099,3,1,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57821019,1,0,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57821019,1,0,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57821099,3,1,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57821099,3,1,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57821019,1,0,0x57602400,3,0=0x57821019,1,0,0x5712D000,1,1 @@ -15501,10 +15501,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57821029,1,0,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x57821029,1,0,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x578210A9,3,1,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x578210A9,3,1,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x57821029,1,0,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x57821029,1,0,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x578210A9,3,1,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x578210A9,3,1,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x57821029,1,0,0x57602400,3,0=0x57821029,1,0,0x5722D000,1,1 @@ -20900,10 +20900,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57821039,1,0,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x57821039,1,0,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x578210B9,3,1,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x578210B9,3,1,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x57821039,1,0,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x57821039,1,0,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x578210B9,3,1,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x578210B9,3,1,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x57821039,1,0,0x57602400,3,0=0x57821039,1,0,0x5732D000,1,1 @@ -23791,10 +23791,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57821049,1,0,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x57821049,1,0,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x578210C9,3,1,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x578210C9,3,1,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x57821049,1,0,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x57821049,1,0,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x578210C9,3,1,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x578210C9,3,1,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x57821049,1,0,0x57602400,3,0=0x57821049,1,0,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_B2_Bottom_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_B2_Bottom_RHD.txt index 59968445e..d9ee3a545 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_B2_Bottom_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_B2_Bottom_RHD.txt @@ -1765,10 +1765,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57631580,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57631580,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57631500,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57631500,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57631580,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57631580,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57631500,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57631500,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57631580,1,1,0x57602400,3,0=0x57631580,1,1,0x5702D000,1,1 @@ -8405,10 +8405,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57631599,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57631599,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57631519,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57631519,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57631599,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57631599,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57631519,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57631519,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57631599,1,1,0x57602400,3,0=0x57631599,1,1,0x5712D000,1,1 @@ -15501,10 +15501,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x576315A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x576315A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57631529,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57631529,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x576315A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x576315A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57631529,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57631529,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x576315A9,1,1,0x57602400,3,0=0x576315A9,1,1,0x5722D000,1,1 @@ -20900,10 +20900,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x576315B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x576315B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57631539,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57631539,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x576315B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x576315B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57631539,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57631539,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x576315B9,1,1,0x57602400,3,0=0x576315B9,1,1,0x5732D000,1,1 @@ -23791,10 +23791,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x576315C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x576315C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57631549,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57631549,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x576315C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x576315C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57631549,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57631549,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x576315C9,1,1,0x57602400,3,0=0x576315C9,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_D1_Bottom_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_D1_Bottom_RHD.txt index 0bac8e99c..fcf68f945 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_D1_Bottom_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_D1_Bottom_RHD.txt @@ -863,10 +863,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57803400,3,0,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57803400,3,0,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57803480,1,1,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57803480,1,1,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57803400,3,0,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57803400,3,0,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57803480,1,1,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57803480,1,1,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57803400,3,0,0x57602400,3,0=0x57803400,3,0,0x5702D000,1,1 @@ -2721,10 +2721,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57833480,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57833480,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57833400,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57833400,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57833480,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57833480,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57833400,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57833400,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57833480,1,1,0x57602400,3,0=0x57833480,1,1,0x5702D000,1,1 @@ -6092,90 +6092,90 @@ ;----OxD Crossings---- ;00 to 40 (Street OxD) 0x57893480,1,1,0x57004000,3,0=0x57893480,1,1,0x57084040,3,0 -0x57893400,3,0,0x57004000,3,0=0x57893480,3,0,0x57084000,3,0; conflicting-override +0x57893400,3,0,0x57004000,3,0=0x57893480,3,0,0x57084000,3,0 0x57893480,1,1,0x57004000,1,1=0x57893480,1,1,0x57084000,1,1 -0x57893400,3,0,0x57004000,1,1=0x57893480,3,0,0x57084040,1,1; conflicting-override +0x57893400,3,0,0x57004000,1,1=0x57893480,3,0,0x57084040,1,1 ;00 to 41 (Road OxD) 0x57893480,1,1,0x57004100,3,0=0x57893480,1,1,0x57084140,3,0 -0x57893400,3,0,0x57004100,3,0=0x57893480,3,0,0x57084100,3,0; conflicting-override +0x57893400,3,0,0x57004100,3,0=0x57893480,3,0,0x57084100,3,0 0x57893480,1,1,0x57004100,1,1=0x57893480,1,1,0x57084100,1,1 -0x57893400,3,0,0x57004100,1,1=0x57893480,3,0,0x57084140,1,1; conflicting-override +0x57893400,3,0,0x57004100,1,1=0x57893480,3,0,0x57084140,1,1 ;00 to 41-1 (L1 Road OxD) 0x57893480,1,1,0x57004115,3,0=0x57893480,1,1,0x57084155,3,0 -0x57893400,3,0,0x57004115,3,0=0x57893480,3,0,0x57084115,3,0; conflicting-override +0x57893400,3,0,0x57004115,3,0=0x57893480,3,0,0x57084115,3,0 0x57893480,1,1,0x57004115,1,1=0x57893480,1,1,0x57084115,1,1 -0x57893400,3,0,0x57004115,1,1=0x57893480,3,0,0x57084155,1,1; conflicting-override +0x57893400,3,0,0x57004115,1,1=0x57893480,3,0,0x57084155,1,1 ;00 to 41-2 (L2 Road OxD) 0x57893480,1,1,0x57004125,3,0=0x57893480,1,1,0x57084165,3,0 -0x57893400,3,0,0x57004125,3,0=0x57893480,3,0,0x57084125,3,0; conflicting-override +0x57893400,3,0,0x57004125,3,0=0x57893480,3,0,0x57084125,3,0 0x57893480,1,1,0x57004125,1,1=0x57893480,1,1,0x57084125,1,1 -0x57893400,3,0,0x57004125,1,1=0x57893480,3,0,0x57084165,1,1; conflicting-override +0x57893400,3,0,0x57004125,1,1=0x57893480,3,0,0x57084165,1,1 ;00 to 42 (OWR OxD) 0x57893480,1,1,0x57004200,3,0=0x57893480,1,1,0x57084240,3,0 -0x57893400,3,0,0x57004200,3,0=0x57893480,3,0,0x57084200,3,0; conflicting-override +0x57893400,3,0,0x57004200,3,0=0x57893480,3,0,0x57084200,3,0 0x57893480,1,1,0x57004200,1,1=0x57893480,1,1,0x57084200,1,1 -0x57893400,3,0,0x57004200,1,1=0x57893480,3,0,0x57084240,1,1; conflicting-override +0x57893400,3,0,0x57004200,1,1=0x57893480,3,0,0x57084240,1,1 ;00 to 42-1 (L1 OWR OxD) 0x57893480,1,1,0x57004215,3,0=0x57893480,1,1,0x57084255,3,0 -0x57893400,3,0,0x57004215,3,0=0x57893480,3,0,0x57084215,3,0; conflicting-override +0x57893400,3,0,0x57004215,3,0=0x57893480,3,0,0x57084215,3,0 0x57893480,1,1,0x57004215,1,1=0x57893480,1,1,0x57084215,1,1 -0x57893400,3,0,0x57004215,1,1=0x57893480,3,0,0x57084255,1,1; conflicting-override +0x57893400,3,0,0x57004215,1,1=0x57893480,3,0,0x57084255,1,1 ;00 to 42-2 (L2 OWR OxD) 0x57893480,1,1,0x57004225,3,0=0x57893480,1,1,0x57084265,3,0 -0x57893400,3,0,0x57004225,3,0=0x57893480,3,0,0x57084225,3,0; conflicting-override +0x57893400,3,0,0x57004225,3,0=0x57893480,3,0,0x57084225,3,0 0x57893480,1,1,0x57004225,1,1=0x57893480,1,1,0x57084225,1,1 -0x57893400,3,0,0x57004225,1,1=0x57893480,3,0,0x57084265,1,1; conflicting-override +0x57893400,3,0,0x57004225,1,1=0x57893480,3,0,0x57084265,1,1 ;00 to 43 (Avenue OxD) 0x57893480,1,1,0x57004300,3,0=0x57893480,1,1,0x57084340,3,0 -0x57893400,3,0,0x57004300,3,0=0x57893480,3,0,0x57084300,3,0; conflicting-override +0x57893400,3,0,0x57004300,3,0=0x57893480,3,0,0x57084300,3,0 0x57893480,1,1,0x57004300,1,1=0x57893480,1,1,0x57084300,1,1 -0x57893400,3,0,0x57004300,1,1=0x57893480,3,0,0x57084340,1,1; conflicting-override +0x57893400,3,0,0x57004300,1,1=0x57893480,3,0,0x57084340,1,1 ;00 to 43-1 (L1 Avenue OxD) 0x57893480,1,1,0x57004315,3,0=0x57893480,1,1,0x57084355,3,0 -0x57893400,3,0,0x57004315,3,0=0x57893480,3,0,0x57084315,3,0; conflicting-override +0x57893400,3,0,0x57004315,3,0=0x57893480,3,0,0x57084315,3,0 0x57893480,1,1,0x57004315,1,1=0x57893480,1,1,0x57084315,1,1 -0x57893400,3,0,0x57004315,1,1=0x57893480,3,0,0x57084355,1,1; conflicting-override +0x57893400,3,0,0x57004315,1,1=0x57893480,3,0,0x57084355,1,1 ;00 to 43-2 (L2 Avenue OxD) 0x57893480,1,1,0x57004325,3,0=0x57893480,1,1,0x57084365,3,0 -0x57893400,3,0,0x57004325,3,0=0x57893480,3,0,0x57084325,3,0; conflicting-override +0x57893400,3,0,0x57004325,3,0=0x57893480,3,0,0x57084325,3,0 0x57893480,1,1,0x57004325,1,1=0x57893480,1,1,0x57084325,1,1 -0x57893400,3,0,0x57004325,1,1=0x57893480,3,0,0x57084365,1,1; conflicting-override +0x57893400,3,0,0x57004325,1,1=0x57893480,3,0,0x57084365,1,1 ;00 to 44-2 (L2 MHW OxD) 0x57893480,1,1,0x57004420,3,0=0x57893480,1,1,0x57084460,3,0 -0x57893400,3,0,0x57004420,3,0=0x57893480,3,0,0x57084420,3,0; conflicting-override +0x57893400,3,0,0x57004420,3,0=0x57893480,3,0,0x57084420,3,0 0x57893480,1,1,0x57004420,1,1=0x57893480,1,1,0x57084420,1,1 -0x57893400,3,0,0x57004420,1,1=0x57893480,3,0,0x57084460,1,1; conflicting-override +0x57893400,3,0,0x57004420,1,1=0x57893480,3,0,0x57084460,1,1 ;00 to 45a (Rail DTR OxD) 0x57893480,1,1,0x57004500,3,0=0x57893480,1,1,0x57084540,3,0 -0x57893400,3,0,0x57004500,3,0=0x57893480,3,0,0x57084500,3,0; conflicting-override +0x57893400,3,0,0x57004500,3,0=0x57893480,3,0,0x57084500,3,0 0x57893480,1,1,0x57004500,1,1=0x57893480,1,1,0x57084500,1,1 -0x57893400,3,0,0x57004500,1,1=0x57893480,3,0,0x57084540,1,1; conflicting-override +0x57893400,3,0,0x57004500,1,1=0x57893480,3,0,0x57084540,1,1 ;00 to 45-1a (L1 Rail DTR OxD) 0x57893480,1,1,0x5D677A00,1,0=0x57893480,1,1,0x5D678480,1,0 -0x57893400,3,0,0x5D677A00,1,0=0x57893480,3,0,0x5D678400,1,0; conflicting-override +0x57893400,3,0,0x5D677A00,1,0=0x57893480,3,0,0x5D678400,1,0 0x57893480,1,1,0x5D677A00,3,1=0x57893480,1,1,0x5D678400,3,1 -0x57893400,3,0,0x5D677A00,3,1=0x57893480,3,0,0x5D678480,3,1; conflicting-override +0x57893400,3,0,0x5D677A00,3,1=0x57893480,3,0,0x5D678480,3,1 ;00 to 45-2a (L2 Rail DTR OxD) 0x57893480,1,1,0x5D777A00,1,0=0x57893480,1,1,0x5D778480,1,0 -0x57893400,3,0,0x5D777A00,1,0=0x57893480,3,0,0x5D778400,1,0; conflicting-override +0x57893400,3,0,0x5D777A00,1,0=0x57893480,3,0,0x5D778400,1,0 0x57893480,1,1,0x5D777A00,3,1=0x57893480,1,1,0x5D778400,3,1 -0x57893400,3,0,0x5D777A00,3,1=0x57893480,3,0,0x5D778480,3,1; conflicting-override +0x57893400,3,0,0x5D777A00,3,1=0x57893480,3,0,0x5D778480,3,1 ;00 to 47-2 (ELR OxD) 0x57893480,1,1,0x57004720,3,0=0x57893480,1,1,0x57084760,3,0 -0x57893400,3,0,0x57004720,3,0=0x57893480,3,0,0x57084720,3,0; conflicting-override +0x57893400,3,0,0x57004720,3,0=0x57893480,3,0,0x57084720,3,0 0x57893480,1,1,0x57004720,1,1=0x57893480,1,1,0x57084720,1,1 -0x57893400,3,0,0x57004720,1,1=0x57893480,3,0,0x57084760,1,1; conflicting-override +0x57893400,3,0,0x57004720,1,1=0x57893480,3,0,0x57084760,1,1 ;00 to 49b (GHSR OxD) ;00 to 49-2a (ELR OxD) 0x57893480,1,1,0x57004920,3,0=0x57893480,1,1,0x57084960,3,0 -0x57893400,3,0,0x57004920,3,0=0x57893480,3,0,0x57084920,3,0; conflicting-override +0x57893400,3,0,0x57004920,3,0=0x57893480,3,0,0x57084920,3,0 0x57893480,1,1,0x57004920,1,1=0x57893480,1,1,0x57084920,1,1 -0x57893400,3,0,0x57004920,1,1=0x57893480,3,0,0x57084960,1,1; conflicting-override +0x57893400,3,0,0x57004920,1,1=0x57893480,3,0,0x57084960,1,1 ;00 to 49-2a (HSR OxD) 0x57893480,1,1,0x57004925,3,0=0x57893480,1,1,0x57084965,3,0 -0x57893400,3,0,0x57004925,3,0=0x57893480,3,0,0x57084925,3,0; conflicting-override +0x57893400,3,0,0x57004925,3,0=0x57893480,3,0,0x57084925,3,0 0x57893480,1,1,0x57004925,1,1=0x57893480,1,1,0x57084925,1,1 -0x57893400,3,0,0x57004925,1,1=0x57893480,3,0,0x57084965,1,1; conflicting-override +0x57893400,3,0,0x57004925,1,1=0x57893480,3,0,0x57084965,1,1 ;RHW x RHW Crossings handled by Meta Code ;00 to 58-1 (L1 AVE-2 OxD) ;0x57893480,1,1,0x57005810,3,0=0x57893480,1,1,0x57085850,3,0 @@ -7727,10 +7727,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57803419,3,0,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57803419,3,0,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57803499,1,1,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57803499,1,1,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57803419,3,0,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57803419,3,0,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57803499,1,1,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57803499,1,1,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57803419,3,0,0x57602400,3,0=0x57803419,3,0,0x5702D000,1,1 @@ -9428,10 +9428,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57833499,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57833499,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57833419,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57833419,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57833499,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57833499,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57833419,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57833419,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57833499,1,1,0x57602400,3,0=0x57833499,1,1,0x5712D000,1,1 @@ -14908,10 +14908,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57803429,3,0,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57803429,3,0,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x578034A9,1,1,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x578034A9,1,1,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57803429,3,0,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57803429,3,0,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x578034A9,1,1,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x578034A9,1,1,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57803429,3,0,0x57602400,3,0=0x57803429,3,0,0x5702D000,1,1 @@ -16620,10 +16620,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578334A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x578334A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57833429,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57833429,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x578334A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x578334A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57833429,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57833429,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x578334A9,1,1,0x57602400,3,0=0x578334A9,1,1,0x5722D000,1,1 @@ -22019,10 +22019,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578334B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x578334B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57833439,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57833439,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x578334B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x578334B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57833439,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57833439,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x578334B9,1,1,0x57602400,3,0=0x578334B9,1,1,0x5732D000,1,1 @@ -24910,10 +24910,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578334C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x578334C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57833449,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57833449,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x578334C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x578334C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57833449,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57833449,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x578334C9,1,1,0x57602400,3,0=0x578334C9,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_D1_Inside_Top_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_D1_Inside_Top_RHD.txt index af2250a7b..834cb26d5 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_D1_Inside_Top_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_D1_Inside_Top_RHD.txt @@ -4713,91 +4713,91 @@ ;0x57080000,3,0,0x57003A25,3,0=0x57080000,3,0,0x57083A25,3,0 ;----OxD Crossings---- ;00 to 40 (Street OxD) -0x57883780,3,1,0x57004000,3,0=0x57883780,3,1,0x57084040,3,0; conflicting-override -0x57883700,1,0,0x57004000,3,0=0x57880000,3,1,0x57084000,3,0; conflicting-override -0x57883780,3,1,0x57004000,1,1=0x57883780,3,1,0x57084000,1,1; conflicting-override -0x57883700,1,0,0x57004000,1,1=0x57880000,3,1,0x57084040,1,1; conflicting-override +0x57883780,3,1,0x57004000,3,0=0x57883780,3,1,0x57084040,3,0 +0x57883700,1,0,0x57004000,3,0=0x57880000,3,1,0x57084000,3,0 +0x57883780,3,1,0x57004000,1,1=0x57883780,3,1,0x57084000,1,1 +0x57883700,1,0,0x57004000,1,1=0x57880000,3,1,0x57084040,1,1 ;00 to 41 (Road OxD) -0x57883780,3,1,0x57004100,3,0=0x57883780,3,1,0x57084140,3,0; conflicting-override -0x57883700,1,0,0x57004100,3,0=0x57880000,3,1,0x57084100,3,0; conflicting-override -0x57883780,3,1,0x57004100,1,1=0x57883780,3,1,0x57084100,1,1; conflicting-override -0x57883700,1,0,0x57004100,1,1=0x57880000,3,1,0x57084140,1,1; conflicting-override +0x57883780,3,1,0x57004100,3,0=0x57883780,3,1,0x57084140,3,0 +0x57883700,1,0,0x57004100,3,0=0x57880000,3,1,0x57084100,3,0 +0x57883780,3,1,0x57004100,1,1=0x57883780,3,1,0x57084100,1,1 +0x57883700,1,0,0x57004100,1,1=0x57880000,3,1,0x57084140,1,1 ;00 to 41-1 (L1 Road OxD) -0x57883780,3,1,0x57004115,3,0=0x57883780,3,1,0x57084155,3,0; conflicting-override -0x57883700,1,0,0x57004115,3,0=0x57880000,3,1,0x57084115,3,0; conflicting-override -0x57883780,3,1,0x57004115,1,1=0x57883780,3,1,0x57084115,1,1; conflicting-override -0x57883700,1,0,0x57004115,1,1=0x57880000,3,1,0x57084155,1,1; conflicting-override +0x57883780,3,1,0x57004115,3,0=0x57883780,3,1,0x57084155,3,0 +0x57883700,1,0,0x57004115,3,0=0x57880000,3,1,0x57084115,3,0 +0x57883780,3,1,0x57004115,1,1=0x57883780,3,1,0x57084115,1,1 +0x57883700,1,0,0x57004115,1,1=0x57880000,3,1,0x57084155,1,1 ;00 to 41-2 (L2 Road OxD) -0x57883780,3,1,0x57004125,3,0=0x57883780,3,1,0x57084165,3,0; conflicting-override -0x57883700,1,0,0x57004125,3,0=0x57880000,3,1,0x57084125,3,0; conflicting-override -0x57883780,3,1,0x57004125,1,1=0x57883780,3,1,0x57084125,1,1; conflicting-override -0x57883700,1,0,0x57004125,1,1=0x57880000,3,1,0x57084165,1,1; conflicting-override +0x57883780,3,1,0x57004125,3,0=0x57883780,3,1,0x57084165,3,0 +0x57883700,1,0,0x57004125,3,0=0x57880000,3,1,0x57084125,3,0 +0x57883780,3,1,0x57004125,1,1=0x57883780,3,1,0x57084125,1,1 +0x57883700,1,0,0x57004125,1,1=0x57880000,3,1,0x57084165,1,1 ;00 to 42 (OWR OxD) -0x57883780,3,1,0x57004200,3,0=0x57883780,3,1,0x57084240,3,0; conflicting-override -0x57883700,1,0,0x57004200,3,0=0x57880000,3,1,0x57084200,3,0; conflicting-override -0x57883780,3,1,0x57004200,1,1=0x57883780,3,1,0x57084200,1,1; conflicting-override -0x57883700,1,0,0x57004200,1,1=0x57880000,3,1,0x57084240,1,1; conflicting-override +0x57883780,3,1,0x57004200,3,0=0x57883780,3,1,0x57084240,3,0 +0x57883700,1,0,0x57004200,3,0=0x57880000,3,1,0x57084200,3,0 +0x57883780,3,1,0x57004200,1,1=0x57883780,3,1,0x57084200,1,1 +0x57883700,1,0,0x57004200,1,1=0x57880000,3,1,0x57084240,1,1 ;00 to 42-1 (L1 OWR OxD) -0x57883780,3,1,0x57004215,3,0=0x57883780,3,1,0x57084255,3,0; conflicting-override -0x57883700,1,0,0x57004215,3,0=0x57880000,3,1,0x57084215,3,0; conflicting-override -0x57883780,3,1,0x57004215,1,1=0x57883780,3,1,0x57084215,1,1; conflicting-override -0x57883700,1,0,0x57004215,1,1=0x57880000,3,1,0x57084255,1,1; conflicting-override +0x57883780,3,1,0x57004215,3,0=0x57883780,3,1,0x57084255,3,0 +0x57883700,1,0,0x57004215,3,0=0x57880000,3,1,0x57084215,3,0 +0x57883780,3,1,0x57004215,1,1=0x57883780,3,1,0x57084215,1,1 +0x57883700,1,0,0x57004215,1,1=0x57880000,3,1,0x57084255,1,1 ;00 to 42-2 (L2 OWR OxD) -0x57883780,3,1,0x57004225,3,0=0x57883780,3,1,0x57084265,3,0; conflicting-override -0x57883700,1,0,0x57004225,3,0=0x57880000,3,1,0x57084225,3,0; conflicting-override -0x57883780,3,1,0x57004225,1,1=0x57883780,3,1,0x57084225,1,1; conflicting-override -0x57883700,1,0,0x57004225,1,1=0x57880000,3,1,0x57084265,1,1; conflicting-override +0x57883780,3,1,0x57004225,3,0=0x57883780,3,1,0x57084265,3,0 +0x57883700,1,0,0x57004225,3,0=0x57880000,3,1,0x57084225,3,0 +0x57883780,3,1,0x57004225,1,1=0x57883780,3,1,0x57084225,1,1 +0x57883700,1,0,0x57004225,1,1=0x57880000,3,1,0x57084265,1,1 ;00 to 43 (Avenue OxD) -0x57883780,3,1,0x57004300,3,0=0x57883780,3,1,0x57084340,3,0; conflicting-override -0x57883700,1,0,0x57004300,3,0=0x57880000,3,1,0x57084300,3,0; conflicting-override -0x57883780,3,1,0x57004300,1,1=0x57883780,3,1,0x57084300,1,1; conflicting-override -0x57883700,1,0,0x57004300,1,1=0x57880000,3,1,0x57084340,1,1; conflicting-override +0x57883780,3,1,0x57004300,3,0=0x57883780,3,1,0x57084340,3,0 +0x57883700,1,0,0x57004300,3,0=0x57880000,3,1,0x57084300,3,0 +0x57883780,3,1,0x57004300,1,1=0x57883780,3,1,0x57084300,1,1 +0x57883700,1,0,0x57004300,1,1=0x57880000,3,1,0x57084340,1,1 ;00 to 43-1 (L1 Avenue OxD) -0x57883780,3,1,0x57004315,3,0=0x57883780,3,1,0x57084355,3,0; conflicting-override -0x57883700,1,0,0x57004315,3,0=0x57880000,3,1,0x57084315,3,0; conflicting-override -0x57883780,3,1,0x57004315,1,1=0x57883780,3,1,0x57084315,1,1; conflicting-override -0x57883700,1,0,0x57004315,1,1=0x57880000,3,1,0x57084355,1,1; conflicting-override +0x57883780,3,1,0x57004315,3,0=0x57883780,3,1,0x57084355,3,0 +0x57883700,1,0,0x57004315,3,0=0x57880000,3,1,0x57084315,3,0 +0x57883780,3,1,0x57004315,1,1=0x57883780,3,1,0x57084315,1,1 +0x57883700,1,0,0x57004315,1,1=0x57880000,3,1,0x57084355,1,1 ;00 to 43-2 (L2 Avenue OxD) -0x57883780,3,1,0x57004325,3,0=0x57883780,3,1,0x57084365,3,0; conflicting-override -0x57883700,1,0,0x57004325,3,0=0x57880000,3,1,0x57084325,3,0; conflicting-override -0x57883780,3,1,0x57004325,1,1=0x57883780,3,1,0x57084325,1,1; conflicting-override -0x57883700,1,0,0x57004325,1,1=0x57880000,3,1,0x57084365,1,1; conflicting-override +0x57883780,3,1,0x57004325,3,0=0x57883780,3,1,0x57084365,3,0 +0x57883700,1,0,0x57004325,3,0=0x57880000,3,1,0x57084325,3,0 +0x57883780,3,1,0x57004325,1,1=0x57883780,3,1,0x57084325,1,1 +0x57883700,1,0,0x57004325,1,1=0x57880000,3,1,0x57084365,1,1 ;00 to 44-2 (L2 MHW OxD) -0x57883780,3,1,0x57004420,3,0=0x57883780,3,1,0x57084460,3,0; conflicting-override -0x57883700,1,0,0x57004420,3,0=0x57880000,3,1,0x57084420,3,0; conflicting-override -0x57883780,3,1,0x57004420,1,1=0x57883780,3,1,0x57084420,1,1; conflicting-override -0x57883700,1,0,0x57004420,1,1=0x57880000,3,1,0x57084460,1,1; conflicting-override +0x57883780,3,1,0x57004420,3,0=0x57883780,3,1,0x57084460,3,0 +0x57883700,1,0,0x57004420,3,0=0x57880000,3,1,0x57084420,3,0 +0x57883780,3,1,0x57004420,1,1=0x57883780,3,1,0x57084420,1,1 +0x57883700,1,0,0x57004420,1,1=0x57880000,3,1,0x57084460,1,1 ;00 to 45a (Rail DTR OxD) -0x57883780,3,1,0x57004500,3,0=0x57883780,3,1,0x57084540,3,0; conflicting-override -0x57883700,1,0,0x57004500,3,0=0x57880000,3,1,0x57084500,3,0; conflicting-override -0x57883780,3,1,0x57004500,1,1=0x57883780,3,1,0x57084500,1,1; conflicting-override -0x57883700,1,0,0x57004500,1,1=0x57880000,3,1,0x57084540,1,1; conflicting-override +0x57883780,3,1,0x57004500,3,0=0x57883780,3,1,0x57084540,3,0 +0x57883700,1,0,0x57004500,3,0=0x57880000,3,1,0x57084500,3,0 +0x57883780,3,1,0x57004500,1,1=0x57883780,3,1,0x57084500,1,1 +0x57883700,1,0,0x57004500,1,1=0x57880000,3,1,0x57084540,1,1 ;00 to 45-1a (L1 Rail DTR OxD) -0x57883780,3,1,0x5D677A00,1,0=0x57883780,3,1,0x5D678480,1,0; conflicting-override -0x57883700,1,0,0x5D677A00,1,0=0x57880000,3,1,0x5D678400,1,0; conflicting-override -0x57883780,3,1,0x5D677A00,3,1=0x57883780,3,1,0x5D678400,3,1; conflicting-override -0x57883700,1,0,0x5D677A00,3,1=0x57880000,3,1,0x5D678480,3,1; conflicting-override +0x57883780,3,1,0x5D677A00,1,0=0x57883780,3,1,0x5D678480,1,0 +0x57883700,1,0,0x5D677A00,1,0=0x57880000,3,1,0x5D678400,1,0 +0x57883780,3,1,0x5D677A00,3,1=0x57883780,3,1,0x5D678400,3,1 +0x57883700,1,0,0x5D677A00,3,1=0x57880000,3,1,0x5D678480,3,1 ;00 to 45-2a (L2 Rail DTR OxD) -0x57883780,3,1,0x5D777A00,1,0=0x57883780,3,1,0x5D778480,1,0; conflicting-override -0x57883700,1,0,0x5D777A00,1,0=0x57880000,3,1,0x5D778400,1,0; conflicting-override -0x57883780,3,1,0x5D777A00,3,1=0x57883780,3,1,0x5D778400,3,1; conflicting-override -0x57883700,1,0,0x5D777A00,3,1=0x57880000,3,1,0x5D778480,3,1; conflicting-override +0x57883780,3,1,0x5D777A00,1,0=0x57883780,3,1,0x5D778480,1,0 +0x57883700,1,0,0x5D777A00,1,0=0x57880000,3,1,0x5D778400,1,0 +0x57883780,3,1,0x5D777A00,3,1=0x57883780,3,1,0x5D778400,3,1 +0x57883700,1,0,0x5D777A00,3,1=0x57880000,3,1,0x5D778480,3,1 ;00 to 47-2 (ELR OxD) -0x57883780,3,1,0x57004720,3,0=0x57883780,3,1,0x57084760,3,0; conflicting-override -0x57883700,1,0,0x57004720,3,0=0x57880000,3,1,0x57084720,3,0; conflicting-override -0x57883780,3,1,0x57004720,1,1=0x57883780,3,1,0x57084720,1,1; conflicting-override -0x57883700,1,0,0x57004720,1,1=0x57880000,3,1,0x57084760,1,1; conflicting-override +0x57883780,3,1,0x57004720,3,0=0x57883780,3,1,0x57084760,3,0 +0x57883700,1,0,0x57004720,3,0=0x57880000,3,1,0x57084720,3,0 +0x57883780,3,1,0x57004720,1,1=0x57883780,3,1,0x57084720,1,1 +0x57883700,1,0,0x57004720,1,1=0x57880000,3,1,0x57084760,1,1 ;00 to 49b (GHSR OxD) ;00 to 49-2a (ELR OxD) -0x57883780,3,1,0x57004920,3,0=0x57883780,3,1,0x57084960,3,0; conflicting-override -0x57883700,1,0,0x57004920,3,0=0x57880000,3,1,0x57084920,3,0; conflicting-override -0x57883780,3,1,0x57004920,1,1=0x57883780,3,1,0x57084920,1,1; conflicting-override -0x57883700,1,0,0x57004920,1,1=0x57880000,3,1,0x57084960,1,1; conflicting-override +0x57883780,3,1,0x57004920,3,0=0x57883780,3,1,0x57084960,3,0 +0x57883700,1,0,0x57004920,3,0=0x57880000,3,1,0x57084920,3,0 +0x57883780,3,1,0x57004920,1,1=0x57883780,3,1,0x57084920,1,1 +0x57883700,1,0,0x57004920,1,1=0x57880000,3,1,0x57084960,1,1 ;00 to 49-2a (HSR OxD) -0x57883780,3,1,0x57004925,3,0=0x57883780,3,1,0x57084965,3,0; conflicting-override -0x57883700,1,0,0x57004925,3,0=0x57880000,3,1,0x57084925,3,0; conflicting-override -0x57883780,3,1,0x57004925,1,1=0x57883780,3,1,0x57084925,1,1; conflicting-override -0x57883700,1,0,0x57004925,1,1=0x57880000,3,1,0x57084965,1,1; conflicting-override +0x57883780,3,1,0x57004925,3,0=0x57883780,3,1,0x57084965,3,0 +0x57883700,1,0,0x57004925,3,0=0x57880000,3,1,0x57084925,3,0 +0x57883780,3,1,0x57004925,1,1=0x57883780,3,1,0x57084925,1,1 +0x57883700,1,0,0x57004925,1,1=0x57880000,3,1,0x57084965,1,1 ;RHW x RHW Crossings handled by Meta Code ;00 to 58-1 (L1 AVE-2 OxD) ;0x57883780,3,1,0x57005810,3,0=0x57883780,3,1,0x57085850,3,0 @@ -4945,18 +4945,18 @@ ;--Mainline-- ;Type A1 ;Top -0x57883700,1,0,0x57800080,3,0=0x57880000,3,1,0x57880080,3,0; conflicting-override -0x57883780,3,1,0x57800000,1,1=0x57883780,3,1,0x57880000,1,1; conflicting-override +0x57883700,1,0,0x57800080,3,0=0x57880000,3,1,0x57880080,3,0 +0x57883780,3,1,0x57800000,1,1=0x57883780,3,1,0x57880000,1,1 ;Bottom -0x57883780,3,1,0x57800280,1,0=0x57883780,3,1,0x57880280,1,0; conflicting-override -0x57883700,1,0,0x57800200,3,1=0x57880000,3,1,0x57880200,3,1; conflicting-override +0x57883780,3,1,0x57800280,1,0=0x57883780,3,1,0x57880280,1,0 +0x57883700,1,0,0x57800200,3,1=0x57880000,3,1,0x57880200,3,1 ;Type B1 ;Top -0x57883700,1,0,0x57801080,3,0=0x57880000,3,1,0x57881080,3,0; conflicting-override -0x57883780,3,1,0x57801000,1,1=0x57883780,3,1,0x57881000,1,1; conflicting-override +0x57883700,1,0,0x57801080,3,0=0x57880000,3,1,0x57881080,3,0 +0x57883780,3,1,0x57801000,1,1=0x57883780,3,1,0x57881000,1,1 ;Bottom -0x57883780,3,1,0x57801280,1,0=0x57883780,3,1,0x57881280,1,0; conflicting-override -0x57883700,1,0,0x57801200,3,1=0x57880000,3,1,0x57881200,3,1; conflicting-override +0x57883780,3,1,0x57801280,1,0=0x57883780,3,1,0x57881280,1,0 +0x57883700,1,0,0x57801200,3,1=0x57880000,3,1,0x57881200,3,1 ;Type C1 ;--FLEXHeight-- ;Up diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_D2_Bottom_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_D2_Bottom_RHD.txt index b626de6d4..d1b082e53 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_D2_Bottom_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_D2_Bottom_RHD.txt @@ -1765,10 +1765,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57643580,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57643580,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57643500,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57643500,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57643580,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57643580,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57643500,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57643500,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57643580,1,1,0x57602400,3,0=0x57643580,1,1,0x5702D000,1,1 @@ -8405,10 +8405,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57643599,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57643599,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57643519,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57643519,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57643599,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57643599,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57643519,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57643519,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57643599,1,1,0x57602400,3,0=0x57643599,1,1,0x5712D000,1,1 @@ -15501,10 +15501,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x576435A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x576435A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57643529,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57643529,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x576435A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x576435A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57643529,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57643529,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x576435A9,1,1,0x57602400,3,0=0x576435A9,1,1,0x5722D000,1,1 @@ -20900,10 +20900,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x576435B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x576435B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57643539,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57643539,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x576435B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x576435B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57643539,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57643539,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x576435B9,1,1,0x57602400,3,0=0x576435B9,1,1,0x5732D000,1,1 @@ -23791,10 +23791,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x576435C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x576435C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57643549,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57643549,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x576435C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x576435C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57643549,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57643549,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x576435C9,1,1,0x57602400,3,0=0x576435C9,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_E1_Bottom_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_E1_Bottom_RHD.txt index e3b0461c7..da6ebd4cc 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_E1_Bottom_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_E1_Bottom_RHD.txt @@ -1765,10 +1765,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57834480,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57834480,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57834400,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57834400,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57834480,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57834480,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57834400,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57834400,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57834480,1,1,0x57602400,3,0=0x57834480,1,1,0x5702D000,1,1 @@ -8405,10 +8405,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57834499,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57834499,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57834419,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57834419,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57834499,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57834499,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57834419,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57834419,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57834499,1,1,0x57602400,3,0=0x57834499,1,1,0x5712D000,1,1 @@ -15501,10 +15501,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578344A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x578344A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57834429,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57834429,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x578344A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x578344A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57834429,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57834429,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x578344A9,1,1,0x57602400,3,0=0x578344A9,1,1,0x5722D000,1,1 @@ -20900,10 +20900,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578344B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x578344B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57834439,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57834439,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x578344B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x578344B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57834439,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57834439,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x578344B9,1,1,0x57602400,3,0=0x578344B9,1,1,0x5732D000,1,1 @@ -23791,10 +23791,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578344C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x578344C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57834449,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57834449,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x578344C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x578344C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57834449,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57834449,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x578344C9,1,1,0x57602400,3,0=0x578344C9,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_E2_Bottom_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_E2_Bottom_RHD.txt index 858086929..b63f4d54c 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_E2_Bottom_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_E2_Bottom_RHD.txt @@ -1765,10 +1765,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57644580,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57644580,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57644500,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57644500,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57644580,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57644580,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57644500,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57644500,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57644580,1,1,0x57602400,3,0=0x57644580,1,1,0x5702D000,1,1 @@ -8405,10 +8405,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57644599,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57644599,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57644519,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57644519,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57644599,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57644599,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57644519,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57644519,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57644599,1,1,0x57602400,3,0=0x57644599,1,1,0x5712D000,1,1 @@ -15501,10 +15501,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x576445A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x576445A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57644529,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57644529,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x576445A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x576445A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57644529,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57644529,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x576445A9,1,1,0x57602400,3,0=0x576445A9,1,1,0x5722D000,1,1 @@ -20900,10 +20900,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x576445B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x576445B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57644539,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57644539,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x576445B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x576445B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57644539,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57644539,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x576445B9,1,1,0x57602400,3,0=0x576445B9,1,1,0x5732D000,1,1 @@ -23791,10 +23791,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x576445C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x576445C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57644549,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57644549,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x576445C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x576445C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57644549,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57644549,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x576445C9,1,1,0x57602400,3,0=0x576445C9,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_MIS_A1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_MIS_A1_Branch_RHD.txt index fec73676c..a09bf59c8 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_MIS_A1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_MIS_A1_Branch_RHD.txt @@ -863,10 +863,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57820380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57820380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57820300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57820300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57820380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57820380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57820300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57820300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57820380,1,1,0x57602400,3,0=0x57820380,1,1,0x5702D000,1,1 @@ -1799,10 +1799,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57820399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57820399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57820319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57820319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57820399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57820399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57820319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57820319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57820399,1,1,0x57602400,3,0=0x57820399,1,1,0x5712D000,1,1 @@ -2768,10 +2768,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578203A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x578203A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57820329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57820329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x578203A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x578203A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57820329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57820329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x578203A9,1,1,0x57602400,3,0=0x578203A9,1,1,0x5722D000,1,1 @@ -3768,10 +3768,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578203B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x578203B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57820339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57820339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x578203B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x578203B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57820339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57820339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x578203B9,1,1,0x57602400,3,0=0x578203B9,1,1,0x5732D000,1,1 @@ -4772,10 +4772,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x578203C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x578203C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57820349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57820349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x578203C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x578203C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57820349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57820349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x578203C9,1,1,0x57602400,3,0=0x578203C9,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_MIS_A1_Inside_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_MIS_A1_Inside_Branch_RHD.txt index 66a03a2cc..b34fc84cb 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_MIS_A1_Inside_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_MIS_A1_Inside_Branch_RHD.txt @@ -858,10 +858,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57820A00,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override -0x57820A00,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override -0x57820A80,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override -0x57820A80,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override +0x57820A00,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1 +0x57820A00,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0 +0x57820A80,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1 +0x57820A80,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0 ;Stability ;REVERSE 0x57820A00,1,1,0x57602400,3,0=0x57820A00,1,1,0x5702D000,1,1 @@ -1789,10 +1789,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57820A19,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override -0x57820A19,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override -0x57820A99,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override -0x57820A99,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override +0x57820A19,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1 +0x57820A19,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0 +0x57820A99,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1 +0x57820A99,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0 ;Stability ;REVERSE 0x57820A19,1,1,0x57602400,3,0=0x57820A19,1,1,0x5712D000,1,1 @@ -2753,10 +2753,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57820A29,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override -0x57820A29,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override -0x57820AA9,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override -0x57820AA9,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override +0x57820A29,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1 +0x57820A29,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0 +0x57820AA9,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1 +0x57820AA9,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0 ;Stability ;REVERSE 0x57820A29,1,1,0x57602400,3,0=0x57820A29,1,1,0x5722D000,1,1 @@ -3748,10 +3748,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57820A39,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override -0x57820A39,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override -0x57820AB9,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override -0x57820AB9,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override +0x57820A39,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1 +0x57820A39,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0 +0x57820AB9,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1 +0x57820AB9,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0 ;Stability ;REVERSE 0x57820A39,1,1,0x57602400,3,0=0x57820A39,1,1,0x5732D000,1,1 @@ -4747,10 +4747,10 @@ ;Long ;----Other Base Crossings---- ;MIS Y-Split (D0) -0x57820A49,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override -0x57820A49,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override -0x57820AC9,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override -0x57820AC9,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override +0x57820A49,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1 +0x57820A49,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0 +0x57820AC9,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1 +0x57820AC9,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0 ;Stability ;REVERSE 0x57820A49,1,1,0x57602400,3,0=0x57820A49,1,1,0x5742D000,1,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_MIS_B1_Branch_RHD.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_MIS_B1_Branch_RHD.txt index 583cb5565..17f2b54df 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_MIS_B1_Branch_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_MIS_B1_Branch_RHD.txt @@ -836,8 +836,8 @@ ;02 to R3 0x57821500,2,0,0x57906800,1,0=0x57821500,2,0,0x57926800,1,0 0x57821580,0,1,0x57906800,3,1=0x57821580,0,1,0x57926800,3,1 -0x57821E00,2,0,0x57906800,1,0=0x57821500,2,0,0x57926880,1,0; conflicting-override -0x57821E80,0,1,0x57906800,3,1=0x57821580,0,1,0x57926880,3,1; conflicting-override +0x57821E00,2,0,0x57906800,1,0=0x57821500,2,0,0x57926880,1,0 +0x57821E80,0,1,0x57906800,3,1=0x57821580,0,1,0x57926880,3,1 ;02 to R4 0x57821E80,0,1,0x57907b00,2,0=0x57821E80,0,1,0x57927b00,2,0 0x57821E00,2,0,0x57907b00,0,1=0x57821E00,2,0,0x57927b00,0,1 @@ -1723,8 +1723,8 @@ ;02 to R3 0x57821519,2,0,0x57906800,1,0=0x57821519,2,0,0x57926815,1,0 0x57821599,0,1,0x57906800,3,1=0x57821599,0,1,0x57926815,3,1 -0x57821E19,2,0,0x57906800,1,0=0x57821519,2,0,0x57926895,1,0; conflicting-override -0x57821E99,0,1,0x57906800,3,1=0x57821599,0,1,0x57926895,3,1; conflicting-override +0x57821E19,2,0,0x57906800,1,0=0x57821519,2,0,0x57926895,1,0 +0x57821E99,0,1,0x57906800,3,1=0x57821599,0,1,0x57926895,3,1 ;02 to R4 0x57821E99,0,1,0x57907b00,2,0=0x57821E99,0,1,0x57927b15,2,0 0x57821E19,2,0,0x57907b00,0,1=0x57821E19,2,0,0x57927b15,0,1 @@ -2590,8 +2590,8 @@ ;02 to R3 0x57821529,2,0,0x57906800,1,0=0x57821529,2,0,0x57926825,1,0 0x578215A9,0,1,0x57906800,3,1=0x578215A9,0,1,0x57926825,3,1 -0x57821E29,2,0,0x57906800,1,0=0x57821529,2,0,0x579268A5,1,0; conflicting-override -0x57821EA9,0,1,0x57906800,3,1=0x578215A9,0,1,0x579268A5,3,1; conflicting-override +0x57821E29,2,0,0x57906800,1,0=0x57821529,2,0,0x579268A5,1,0 +0x57821EA9,0,1,0x57906800,3,1=0x578215A9,0,1,0x579268A5,3,1 ;02 to R4 0x57821EA9,0,1,0x57907b00,2,0=0x57821EA9,0,1,0x57927b25,2,0 0x57821E29,2,0,0x57907b00,0,1=0x57821E29,2,0,0x57927b25,0,1 @@ -3488,8 +3488,8 @@ ;02 to R3 0x57821539,2,0,0x57906800,1,0=0x57821539,2,0,0x57926835,1,0 0x578215B9,0,1,0x57906800,3,1=0x578215B9,0,1,0x57926835,3,1 -0x57821E39,2,0,0x57906800,1,0=0x57821539,2,0,0x579268B5,1,0; conflicting-override -0x57821EB9,0,1,0x57906800,3,1=0x578215B9,0,1,0x579268B5,3,1; conflicting-override +0x57821E39,2,0,0x57906800,1,0=0x57821539,2,0,0x579268B5,1,0 +0x57821EB9,0,1,0x57906800,3,1=0x578215B9,0,1,0x579268B5,3,1 ;02 to R4 0x57821EB9,0,1,0x57907b00,2,0=0x57821EB9,0,1,0x57927b35,2,0 0x57821E39,2,0,0x57907b00,0,1=0x57821E39,2,0,0x57927b35,0,1 @@ -3539,143 +3539,143 @@ 0x57821549,2,0,0x57000200,2,0=0x57821549,2,0,0x57420200,2,0 0x578215C9,0,1,0x57000200,1,0=0x578215C9,0,1,0x57420200,1,0 ;02 to 03 (Diag Stub) -0x57821EC9,0,1,0x57000300,3,1=0x578215C9,0,1,0x57420A00,3,1; conflicting-override +0x57821EC9,0,1,0x57000300,3,1=0x578215C9,0,1,0x57420A00,3,1 0x57821E49,2,0,0x57000300,1,0=0x57821E49,2,0,0x57420A00,1,0 0x578215C9,0,1,0x57000300,3,1=0x578215C9,0,1,0x57420300,3,1 0x57821549,2,0,0x57000300,1,0=0x57821549,2,0,0x57420300,1,0 ;02 to 05 (Orth-Diag Top) -0x57821EC9,0,1,0x57000500,0,1=0x578215C9,0,1,0x57420C00,0,1; conflicting-override +0x57821EC9,0,1,0x57000500,0,1=0x578215C9,0,1,0x57420C00,0,1 0x57821E49,2,0,0x57000500,2,0=0x57821E49,2,0,0x57420C00,2,0 0x578215C9,0,1,0x57000500,0,1=0x578215C9,0,1,0x57420500,0,1 0x57821549,2,0,0x57000500,2,0=0x57821549,2,0,0x57420500,2,0 ;----DxO Crossings---- ;02 to 70 (Street DxO) -0x57821EC9,0,1,0x57007000,1,0=0x578215C9,0,1,0x57427080,1,0; conflicting-override +0x57821EC9,0,1,0x57007000,1,0=0x578215C9,0,1,0x57427080,1,0 0x57821E49,2,0,0x57007000,3,1=0x57821E49,2,0,0x57427080,3,1 0x578215C9,0,1,0x57007000,1,0=0x578215C9,0,1,0x57427000,1,0 0x57821549,2,0,0x57007000,3,1=0x57821549,2,0,0x57427000,3,1 ;02 to 70-1 (L1 Street DxO) -0x57821EC9,0,1,0x57007010,1,0=0x578215C9,0,1,0x57427090,1,0; conflicting-override +0x57821EC9,0,1,0x57007010,1,0=0x578215C9,0,1,0x57427090,1,0 0x57821E49,2,0,0x57007010,3,1=0x57821E49,2,0,0x57427090,3,1 0x578215C9,0,1,0x57007010,1,0=0x578215C9,0,1,0x57427010,1,0 0x57821549,2,0,0x57007010,3,1=0x57821549,2,0,0x57427010,3,1 ;02 to 70-2 (L2 Street DxO) -0x57821EC9,0,1,0x57007020,1,0=0x578215C9,0,1,0x574270A0,1,0; conflicting-override +0x57821EC9,0,1,0x57007020,1,0=0x578215C9,0,1,0x574270A0,1,0 0x57821E49,2,0,0x57007020,3,1=0x57821E49,2,0,0x574270A0,3,1 0x578215C9,0,1,0x57007020,1,0=0x578215C9,0,1,0x57427020,1,0 0x57821549,2,0,0x57007020,3,1=0x57821549,2,0,0x57427020,3,1 ;02 to 71 (Road DxO) -0x57821EC9,0,1,0x57007100,1,0=0x578215C9,0,1,0x57427180,1,0; conflicting-override +0x57821EC9,0,1,0x57007100,1,0=0x578215C9,0,1,0x57427180,1,0 0x57821E49,2,0,0x57007100,3,1=0x57821E49,2,0,0x57427180,3,1 0x578215C9,0,1,0x57007100,1,0=0x578215C9,0,1,0x57427100,1,0 0x57821549,2,0,0x57007100,3,1=0x57821549,2,0,0x57427100,3,1 ;02 to 71-1 (L1 Road DxO) -0x57821EC9,0,1,0x57007115,1,0=0x578215C9,0,1,0x57427195,1,0; conflicting-override +0x57821EC9,0,1,0x57007115,1,0=0x578215C9,0,1,0x57427195,1,0 0x57821E49,2,0,0x57007115,3,1=0x57821E49,2,0,0x57427195,3,1 0x578215C9,0,1,0x57007115,1,0=0x578215C9,0,1,0x57427115,1,0 0x57821549,2,0,0x57007115,3,1=0x57821549,2,0,0x57427115,3,1 ;02 to 71-2 (L2 Road DxO) -0x57821EC9,0,1,0x57007125,1,0=0x578215C9,0,1,0x574271A5,1,0; conflicting-override +0x57821EC9,0,1,0x57007125,1,0=0x578215C9,0,1,0x574271A5,1,0 0x57821E49,2,0,0x57007125,3,1=0x57821E49,2,0,0x574271A5,3,1 0x578215C9,0,1,0x57007125,1,0=0x578215C9,0,1,0x57427125,1,0 0x57821549,2,0,0x57007125,3,1=0x57821549,2,0,0x57427125,3,1 ;02 to 72 (One-Way Road DxO) -0x57821EC9,0,1,0x57007200,1,0=0x578215C9,0,1,0x57427280,1,0; conflicting-override +0x57821EC9,0,1,0x57007200,1,0=0x578215C9,0,1,0x57427280,1,0 0x57821E49,2,0,0x57007200,3,1=0x57821E49,2,0,0x57427280,3,1 0x578215C9,0,1,0x57007200,1,0=0x578215C9,0,1,0x57427200,1,0 0x57821549,2,0,0x57007200,3,1=0x57821549,2,0,0x57427200,3,1 ;02 to 72-1 (L1 One-Way Road DxO) -0x57821EC9,0,1,0x57007215,1,0=0x578215C9,0,1,0x57427295,1,0; conflicting-override +0x57821EC9,0,1,0x57007215,1,0=0x578215C9,0,1,0x57427295,1,0 0x57821E49,2,0,0x57007215,3,1=0x57821E49,2,0,0x57427295,3,1 0x578215C9,0,1,0x57007215,1,0=0x578215C9,0,1,0x57427215,1,0 0x57821549,2,0,0x57007215,3,1=0x57821549,2,0,0x57427215,3,1 ;02 to 72-2 (L2 One-Way Road DxO) -0x57821EC9,0,1,0x57007225,1,0=0x578215C9,0,1,0x574272A5,1,0; conflicting-override +0x57821EC9,0,1,0x57007225,1,0=0x578215C9,0,1,0x574272A5,1,0 0x57821E49,2,0,0x57007225,3,1=0x57821E49,2,0,0x574272A5,3,1 0x578215C9,0,1,0x57007225,1,0=0x578215C9,0,1,0x57427225,1,0 0x57821549,2,0,0x57007225,3,1=0x57821549,2,0,0x57427225,3,1 ;02 to 73 (Avenue DxO) -0x57821EC9,0,1,0x57007309,1,0=0x578215C9,0,1,0x57427385,1,0; conflicting-override +0x57821EC9,0,1,0x57007309,1,0=0x578215C9,0,1,0x57427385,1,0 0x578215C9,0,1,0x57007309,1,0=0x578215C9,0,1,0x57427305,1,0 0x57821E49,2,0,0x57007309,3,1=0x57821E49,2,0,0x57427385,3,1 0x57821549,2,0,0x57007309,3,1=0x57821549,2,0,0x57427305,3,1 ;02 to 73-1 (L1 Avenue DxO) -0x57821EC9,0,1,0x57007315,1,0=0x578215C9,0,1,0x5742739A,1,0; conflicting-override +0x57821EC9,0,1,0x57007315,1,0=0x578215C9,0,1,0x5742739A,1,0 0x578215C9,0,1,0x57007315,1,0=0x578215C9,0,1,0x5742731A,1,0 0x57821E49,2,0,0x57007315,3,1=0x57821E49,2,0,0x5742739A,3,1 0x57821549,2,0,0x57007315,3,1=0x57821549,2,0,0x5742731A,3,1 ;02 to 73-2 (L2 Avenue DxO) -0x57821EC9,0,1,0x57007325,1,0=0x578215C9,0,1,0x574273AA,1,0; conflicting-override +0x57821EC9,0,1,0x57007325,1,0=0x578215C9,0,1,0x574273AA,1,0 0x578215C9,0,1,0x57007325,1,0=0x578215C9,0,1,0x5742732A,1,0 0x57821E49,2,0,0x57007325,3,1=0x57821E49,2,0,0x574273AA,3,1 0x57821549,2,0,0x57007325,3,1=0x57821549,2,0,0x5742732A,3,1 ;02 to 74 (GMHW DxO) -0x57821EC9,0,1,0x57007405,1,0=0x578215C9,0,1,0x57427485,1,0; conflicting-override +0x57821EC9,0,1,0x57007405,1,0=0x578215C9,0,1,0x57427485,1,0 0x578215C9,0,1,0x57007405,1,0=0x578215C9,0,1,0x57427405,1,0 0x57821E49,2,0,0x57007405,3,1=0x57821E49,2,0,0x57427485,3,1 0x57821549,2,0,0x57007405,3,1=0x57821549,2,0,0x57427405,3,1 ;02 to 74-2 (EMHW DxO) -0x57821EC9,0,1,0x57007425,1,0=0x578215C9,0,1,0x574274A5,1,0; conflicting-override +0x57821EC9,0,1,0x57007425,1,0=0x578215C9,0,1,0x574274A5,1,0 0x578215C9,0,1,0x57007425,1,0=0x578215C9,0,1,0x57427425,1,0 0x57821E49,2,0,0x57007425,3,1=0x57821E49,2,0,0x574274A5,3,1 0x57821549,2,0,0x57007425,3,1=0x57821549,2,0,0x57427425,3,1 ;02 to 75a (Rail DTR DxO) -0x57821EC9,0,1,0x57007500,1,0=0x578215C9,0,1,0x57427580,1,0; conflicting-override +0x57821EC9,0,1,0x57007500,1,0=0x578215C9,0,1,0x57427580,1,0 0x57821E49,2,0,0x57007500,3,1=0x57821E49,2,0,0x57427580,3,1 0x578215C9,0,1,0x57007500,1,0=0x578215C9,0,1,0x57427500,1,0 0x57821549,2,0,0x57007500,3,1=0x57821549,2,0,0x57427500,3,1 ;02 to 75-1a (L1 Rail DTR DxO) -0x57821EC9,0,1,0x5D674A00,1,0=0x578215C9,0,1,0x5D674CC0,1,0; conflicting-override +0x57821EC9,0,1,0x5D674A00,1,0=0x578215C9,0,1,0x5D674CC0,1,0 0x57821E49,2,0,0x5D674A00,3,1=0x57821E49,2,0,0x5D674CC0,3,1 0x578215C9,0,1,0x5D674A00,1,0=0x578215C9,0,1,0x5D674C40,1,0 0x57821549,2,0,0x5D674A00,3,1=0x57821549,2,0,0x5D674C40,3,1 ;02 to 75-2a (L2 Rail DTR DxO) -0x57821EC9,0,1,0x5D774A00,1,0=0x578215C9,0,1,0x5D774CC0,1,0; conflicting-override +0x57821EC9,0,1,0x5D774A00,1,0=0x578215C9,0,1,0x5D774CC0,1,0 0x57821E49,2,0,0x5D774A00,3,1=0x57821E49,2,0,0x5D774CC0,3,1 0x578215C9,0,1,0x5D774A00,1,0=0x578215C9,0,1,0x5D774C40,1,0 0x57821549,2,0,0x5D774A00,3,1=0x57821549,2,0,0x5D774C40,3,1 ;02 to 75b (Rail STR DxO) -0x57821EC9,0,1,0x57007505,1,0=0x578215C9,0,1,0x57427585,1,0; conflicting-override +0x57821EC9,0,1,0x57007505,1,0=0x578215C9,0,1,0x57427585,1,0 0x57821E49,2,0,0x57007505,3,1=0x57821E49,2,0,0x57427585,3,1 0x578215C9,0,1,0x57007505,1,0=0x578215C9,0,1,0x57427505,1,0 0x57821549,2,0,0x57007505,3,1=0x57821549,2,0,0x57427505,3,1 ;02 to 77a (GLR 1 DxO) -0x57821EC9,0,1,0x57007700,1,0=0x578215C9,0,1,0x57427780,1,0; conflicting-override +0x57821EC9,0,1,0x57007700,1,0=0x578215C9,0,1,0x57427780,1,0 0x57821E49,2,0,0x57007700,3,1=0x57821E49,2,0,0x57427780,3,1 0x578215C9,0,1,0x57007700,1,0=0x578215C9,0,1,0x57427700,1,0 0x57821549,2,0,0x57007700,3,1=0x57821549,2,0,0x57427700,3,1 ;02 to 77b (GLR 2 DxO) -0x57821EC9,0,1,0x57007705,1,0=0x578215C9,0,1,0x57427785,1,0; conflicting-override +0x57821EC9,0,1,0x57007705,1,0=0x578215C9,0,1,0x57427785,1,0 0x57821E49,2,0,0x57007705,3,1=0x57821E49,2,0,0x57427785,3,1 0x578215C9,0,1,0x57007705,1,0=0x578215C9,0,1,0x57427705,1,0 0x57821549,2,0,0x57007705,3,1=0x57821549,2,0,0x57427705,3,1 ;02 to 77-2 (ELR DxO) -0x57821EC9,0,1,0x57007720,1,0=0x578215C9,0,1,0x574277A0,1,0; conflicting-override +0x57821EC9,0,1,0x57007720,1,0=0x578215C9,0,1,0x574277A0,1,0 0x57821E49,2,0,0x57007720,3,1=0x57821E49,2,0,0x574277A0,3,1 0x578215C9,0,1,0x57007720,1,0=0x578215C9,0,1,0x57427720,1,0 0x57821549,2,0,0x57007720,3,1=0x57821549,2,0,0x57427720,3,1 ;02 to 78a (GLR 3 DxO) -0x57821EC9,0,1,0x57007800,1,0=0x578215C9,0,1,0x57427880,1,0; conflicting-override +0x57821EC9,0,1,0x57007800,1,0=0x578215C9,0,1,0x57427880,1,0 0x57821E49,2,0,0x57007800,3,1=0x57821E49,2,0,0x57427880,3,1 0x578215C9,0,1,0x57007800,1,0=0x578215C9,0,1,0x57427800,1,0 0x57821549,2,0,0x57007800,3,1=0x57821549,2,0,0x57427800,3,1 ;02 to 78b (GLR 4 DxO) -0x57821EC9,0,1,0x57007805,1,0=0x578215C9,0,1,0x57427885,1,0; conflicting-override +0x57821EC9,0,1,0x57007805,1,0=0x578215C9,0,1,0x57427885,1,0 0x57821E49,2,0,0x57007805,3,1=0x57821E49,2,0,0x57427885,3,1 0x578215C9,0,1,0x57007805,1,0=0x578215C9,0,1,0x57427805,1,0 0x57821549,2,0,0x57007805,3,1=0x57821549,2,0,0x57427805,3,1 ;02 to 79b (GHSR DxO) -0x57821EC9,0,1,0x57007905,1,0=0x578215C9,0,1,0x57427985,1,0; conflicting-override +0x57821EC9,0,1,0x57007905,1,0=0x578215C9,0,1,0x57427985,1,0 0x57821E49,2,0,0x57007905,3,1=0x57821E49,2,0,0x57427985,3,1 0x578215C9,0,1,0x57007905,1,0=0x578215C9,0,1,0x57427905,1,0 0x57821549,2,0,0x57007905,3,1=0x57821549,2,0,0x57427905,3,1 ;02 to 79-2a (Monorail DxO) -0x57821EC9,0,1,0x57007920,1,0=0x578215C9,0,1,0x574279A0,1,0; conflicting-override +0x57821EC9,0,1,0x57007920,1,0=0x578215C9,0,1,0x574279A0,1,0 0x57821E49,2,0,0x57007920,3,1=0x57821E49,2,0,0x574279A0,3,1 0x578215C9,0,1,0x57007920,1,0=0x578215C9,0,1,0x57427920,1,0 0x57821549,2,0,0x57007920,3,1=0x57821549,2,0,0x57427920,3,1 ;02 to 79-2b (HSR DxO) -0x57821EC9,0,1,0x57007925,1,0=0x578215C9,0,1,0x574279A5,1,0; conflicting-override +0x57821EC9,0,1,0x57007925,1,0=0x578215C9,0,1,0x574279A5,1,0 0x57821E49,2,0,0x57007925,3,1=0x57821E49,2,0,0x574279A5,3,1 0x578215C9,0,1,0x57007925,1,0=0x578215C9,0,1,0x57427925,1,0 0x57821549,2,0,0x57007925,3,1=0x57821549,2,0,0x57427925,3,1 @@ -3918,174 +3918,174 @@ ;02 to 99 (Tram-in-Avenue DxO) ;02 to 0x5E61x149 (SAM 1 DxO) ;02 to 0x5E61x249 (SAM 2 DxO) -0x57821EC9,0,1,0x5E610200,1,0=0x578215C9,0,1,0x5E6122C9,1,0; conflicting-override +0x57821EC9,0,1,0x5E610200,1,0=0x578215C9,0,1,0x5E6122C9,1,0 0x57821E49,2,0,0x5E610200,3,1=0x57821E49,2,0,0x5E6122C9,3,1 0x578215C9,0,1,0x5E610200,1,0=0x578215C9,0,1,0x5E612249,1,0 0x57821549,2,0,0x5E610200,3,1=0x57821549,2,0,0x5E612249,3,1 ;02 to 0x5E61x349 (SAM 3 DxO) -0x57821EC9,0,1,0x5E610300,1,0=0x578215C9,0,1,0x5E6123C9,1,0; conflicting-override +0x57821EC9,0,1,0x5E610300,1,0=0x578215C9,0,1,0x5E6123C9,1,0 0x57821E49,2,0,0x5E610300,3,1=0x57821E49,2,0,0x5E6123C9,3,1 0x578215C9,0,1,0x5E610300,1,0=0x578215C9,0,1,0x5E612349,1,0 0x57821549,2,0,0x5E610300,3,1=0x57821549,2,0,0x5E612349,3,1 ;02 to 0x5E61x449 (SAM 4 DxO) -0x57821EC9,0,1,0x5E610400,1,0=0x578215C9,0,1,0x5E6124C9,1,0; conflicting-override +0x57821EC9,0,1,0x5E610400,1,0=0x578215C9,0,1,0x5E6124C9,1,0 0x57821E49,2,0,0x5E610400,3,1=0x57821E49,2,0,0x5E6124C9,3,1 0x578215C9,0,1,0x5E610400,1,0=0x578215C9,0,1,0x5E612449,1,0 0x57821549,2,0,0x5E610400,3,1=0x57821549,2,0,0x5E612449,3,1 ;02 to 0x5E61x549 (SAM 5 DxO) -0x57821EC9,0,1,0x5E610500,1,0=0x578215C9,0,1,0x5E6125C9,1,0; conflicting-override +0x57821EC9,0,1,0x5E610500,1,0=0x578215C9,0,1,0x5E6125C9,1,0 0x57821E49,2,0,0x5E610500,3,1=0x57821E49,2,0,0x5E6125C9,3,1 0x578215C9,0,1,0x5E610500,1,0=0x578215C9,0,1,0x5E612549,1,0 0x57821549,2,0,0x5E610500,3,1=0x57821549,2,0,0x5E612549,3,1 ;02 to 0x5E61x649 (SAM 6 DxO) -0x57821EC9,0,1,0x5E610600,1,0=0x578215C9,0,1,0x5E6126C9,1,0; conflicting-override +0x57821EC9,0,1,0x5E610600,1,0=0x578215C9,0,1,0x5E6126C9,1,0 0x57821E49,2,0,0x5E610600,3,1=0x57821E49,2,0,0x5E6126C9,3,1 0x578215C9,0,1,0x5E610600,1,0=0x578215C9,0,1,0x5E612649,1,0 0x57821549,2,0,0x5E610600,3,1=0x57821549,2,0,0x5E612649,3,1 ;02 to 0x5E61x749 (SAM 7 DxO) -0x57821EC9,0,1,0x5E610700,1,0=0x578215C9,0,1,0x5E6127C9,1,0; conflicting-override +0x57821EC9,0,1,0x5E610700,1,0=0x578215C9,0,1,0x5E6127C9,1,0 0x57821E49,2,0,0x5E610700,3,1=0x57821E49,2,0,0x5E6127C9,3,1 0x578215C9,0,1,0x5E610700,1,0=0x578215C9,0,1,0x5E612749,1,0 0x57821549,2,0,0x5E610700,3,1=0x57821549,2,0,0x5E612749,3,1 ;02 to 0x5E61x849 (SAM 8 DxO) -0x57821EC9,0,1,0x5E610800,1,0=0x578215C9,0,1,0x5E6128C9,1,0; conflicting-override +0x57821EC9,0,1,0x5E610800,1,0=0x578215C9,0,1,0x5E6128C9,1,0 0x57821E49,2,0,0x5E610800,3,1=0x57821E49,2,0,0x5E6128C9,3,1 0x578215C9,0,1,0x5E610800,1,0=0x578215C9,0,1,0x5E612849,1,0 0x57821549,2,0,0x5E610800,3,1=0x57821549,2,0,0x5E612849,3,1 ;02 to 0x5E61x949 (SAM 9 DxO) -0x57821EC9,0,1,0x5E610900,1,0=0x578215C9,0,1,0x5E6129C9,1,0; conflicting-override +0x57821EC9,0,1,0x5E610900,1,0=0x578215C9,0,1,0x5E6129C9,1,0 0x57821E49,2,0,0x5E610900,3,1=0x57821E49,2,0,0x5E6129C9,3,1 0x578215C9,0,1,0x5E610900,1,0=0x578215C9,0,1,0x5E612949,1,0 0x57821549,2,0,0x5E610900,3,1=0x57821549,2,0,0x5E612949,3,1 ;02 to 0x5E61xA49 (SAM 10 DxO) -0x57821EC9,0,1,0x5E610A00,1,0=0x578215C9,0,1,0x5E612AC9,1,0; conflicting-override +0x57821EC9,0,1,0x5E610A00,1,0=0x578215C9,0,1,0x5E612AC9,1,0 0x57821E49,2,0,0x5E610A00,3,1=0x57821E49,2,0,0x5E612AC9,3,1 0x578215C9,0,1,0x5E610A00,1,0=0x578215C9,0,1,0x5E612A49,1,0 0x57821549,2,0,0x5E610A00,3,1=0x57821549,2,0,0x5E612A49,3,1 ;02 to 0x5E61xB49 (SAM 11 DxO) -0x57821EC9,0,1,0x5E610B00,1,0=0x578215C9,0,1,0x5E612BC9,1,0; conflicting-override +0x57821EC9,0,1,0x5E610B00,1,0=0x578215C9,0,1,0x5E612BC9,1,0 0x57821E49,2,0,0x5E610B00,3,1=0x57821E49,2,0,0x5E612BC9,3,1 0x578215C9,0,1,0x5E610B00,1,0=0x578215C9,0,1,0x5E612B49,1,0 0x57821549,2,0,0x5E610B00,3,1=0x57821549,2,0,0x5E612B49,3,1 ;----DxD Crossings---- ;02 to A0 (Street DxD) 0x57821E49,2,0,0x5700A000,2,0=0x57821E49,2,0,0x5742A080,2,0 -0x57821EC9,0,1,0x5700A000,0,1=0x578215C9,0,1,0x5742A080,0,1; conflicting-override +0x57821EC9,0,1,0x5700A000,0,1=0x578215C9,0,1,0x5742A080,0,1 0x57821549,2,0,0x5700A000,2,0=0x57821549,2,0,0x5742A000,2,0 0x578215C9,0,1,0x5700A000,0,1=0x578215C9,0,1,0x5742A000,0,1 ;02 to A1 (Road DxD) 0x57821E49,2,0,0x5700A100,2,0=0x57821E49,2,0,0x5742A180,2,0 -0x57821EC9,0,1,0x5700A100,0,1=0x578215C9,0,1,0x5742A180,0,1; conflicting-override +0x57821EC9,0,1,0x5700A100,0,1=0x578215C9,0,1,0x5742A180,0,1 0x57821549,2,0,0x5700A100,2,0=0x57821549,2,0,0x5742A100,2,0 0x578215C9,0,1,0x5700A100,0,1=0x578215C9,0,1,0x5742A100,0,1 ;02 to A1-1 (L1 Road DxD) 0x57821E49,2,0,0x5700A115,2,0=0x57821E49,2,0,0x5742A195,2,0 -0x57821EC9,0,1,0x5700A115,0,1=0x578215C9,0,1,0x5742A195,0,1; conflicting-override +0x57821EC9,0,1,0x5700A115,0,1=0x578215C9,0,1,0x5742A195,0,1 0x57821549,2,0,0x5700A115,2,0=0x57821549,2,0,0x5742A115,2,0 0x578215C9,0,1,0x5700A115,0,1=0x578215C9,0,1,0x5742A115,0,1 ;02 to A1-2 (L2 Road DxD) 0x57821E49,2,0,0x5700A125,2,0=0x57821E49,2,0,0x5742A1A5,2,0 -0x57821EC9,0,1,0x5700A125,0,1=0x578215C9,0,1,0x5742A1A5,0,1; conflicting-override +0x57821EC9,0,1,0x5700A125,0,1=0x578215C9,0,1,0x5742A1A5,0,1 0x57821549,2,0,0x5700A125,2,0=0x57821549,2,0,0x5742A125,2,0 0x578215C9,0,1,0x5700A125,0,1=0x578215C9,0,1,0x5742A125,0,1 ;02 to A2 (One-Way Road DxD) 0x57821E49,2,0,0x5700A200,2,0=0x57821E49,2,0,0x5742A280,2,0 -0x57821EC9,0,1,0x5700A200,0,1=0x578215C9,0,1,0x5742A280,0,1; conflicting-override +0x57821EC9,0,1,0x5700A200,0,1=0x578215C9,0,1,0x5742A280,0,1 0x57821549,2,0,0x5700A200,2,0=0x57821549,2,0,0x5742A200,2,0 0x578215C9,0,1,0x5700A200,0,1=0x578215C9,0,1,0x5742A200,0,1 ;02 to A2-1 (L1 One-Way Road DxD) 0x57821E49,2,0,0x5700A215,2,0=0x57821E49,2,0,0x5742A295,2,0 -0x57821EC9,0,1,0x5700A215,0,1=0x578215C9,0,1,0x5742A295,0,1; conflicting-override +0x57821EC9,0,1,0x5700A215,0,1=0x578215C9,0,1,0x5742A295,0,1 0x57821549,2,0,0x5700A215,2,0=0x57821549,2,0,0x5742A215,2,0 0x578215C9,0,1,0x5700A215,0,1=0x578215C9,0,1,0x5742A215,0,1 ;02 to A2-2 (L2 One-Way Road DxD) 0x57821E49,2,0,0x5700A225,2,0=0x57821E49,2,0,0x5742A2A5,2,0 -0x57821EC9,0,1,0x5700A225,0,1=0x578215C9,0,1,0x5742A2A5,0,1; conflicting-override +0x57821EC9,0,1,0x5700A225,0,1=0x578215C9,0,1,0x5742A2A5,0,1 0x57821549,2,0,0x5700A225,2,0=0x57821549,2,0,0x5742A225,2,0 0x578215C9,0,1,0x5700A225,0,1=0x578215C9,0,1,0x5742A225,0,1 ;02 to A3 (Avenue DxD) 0x57821E49,2,0,0x5700A300,2,0=0x57821E49,2,0,0x5742A380,2,0 0x57821549,2,0,0x5700A300,2,0=0x57821549,2,0,0x5742A300,2,0 -0x57821EC9,0,1,0x5700A300,0,1=0x578215C9,0,1,0x5742A380,0,1; conflicting-override +0x57821EC9,0,1,0x5700A300,0,1=0x578215C9,0,1,0x5742A380,0,1 0x578215C9,0,1,0x5700A300,0,1=0x578215C9,0,1,0x5742A300,0,1 ;02 to A3-1 (L1 Avenue DxD) 0x57821E49,2,0,0x5700A315,2,0=0x57821E49,2,0,0x5742A395,2,0 0x57821549,2,0,0x5700A315,2,0=0x57821549,2,0,0x5742A315,2,0 -0x57821EC9,0,1,0x5700A315,0,1=0x578215C9,0,1,0x5742A395,0,1; conflicting-override +0x57821EC9,0,1,0x5700A315,0,1=0x578215C9,0,1,0x5742A395,0,1 0x578215C9,0,1,0x5700A315,0,1=0x578215C9,0,1,0x5742A315,0,1 ;02 to A3-2 (L2 Avenue DxD) 0x57821E49,2,0,0x5700A325,2,0=0x57821E49,2,0,0x5742A3A5,2,0 0x57821549,2,0,0x5700A325,2,0=0x57821549,2,0,0x5742A325,2,0 -0x57821EC9,0,1,0x5700A325,0,1=0x578215C9,0,1,0x5742A3A5,0,1; conflicting-override +0x57821EC9,0,1,0x5700A325,0,1=0x578215C9,0,1,0x5742A3A5,0,1 0x578215C9,0,1,0x5700A325,0,1=0x578215C9,0,1,0x5742A325,0,1 ;02 to A4 (GMHW DxD) 0x57821E49,2,0,0x5700A400,2,0=0x57821E49,2,0,0x5742A480,2,0 0x57821549,2,0,0x5700A400,2,0=0x57821549,2,0,0x5742A400,2,0 -0x57821EC9,0,1,0x5700A400,0,1=0x578215C9,0,1,0x5742A480,0,1; conflicting-override +0x57821EC9,0,1,0x5700A400,0,1=0x578215C9,0,1,0x5742A480,0,1 0x578215C9,0,1,0x5700A400,0,1=0x578215C9,0,1,0x5742A400,0,1 ;02 to A4-2 (EMHW DxD) 0x57821E49,2,0,0x5700A420,2,0=0x57821E49,2,0,0x5742A4A0,2,0 0x57821549,2,0,0x5700A420,2,0=0x57821549,2,0,0x5742A420,2,0 -0x57821EC9,0,1,0x5700A420,0,1=0x578215C9,0,1,0x5742A4A0,0,1; conflicting-override +0x57821EC9,0,1,0x5700A420,0,1=0x578215C9,0,1,0x5742A4A0,0,1 0x578215C9,0,1,0x5700A420,0,1=0x578215C9,0,1,0x5742A420,0,1 ;02 to A5a (Rail DTR DxD) 0x57821E49,2,0,0x5700A500,2,0=0x57821E49,2,0,0x5742A580,2,0 -0x57821EC9,0,1,0x5700A500,0,1=0x578215C9,0,1,0x5742A580,0,1; conflicting-override +0x57821EC9,0,1,0x5700A500,0,1=0x578215C9,0,1,0x5742A580,0,1 0x57821549,2,0,0x5700A500,2,0=0x57821549,2,0,0x5742A500,2,0 0x578215C9,0,1,0x5700A500,0,1=0x578215C9,0,1,0x5742A500,0,1 ;02 to A5-1a (L1 Rail DTR DxD) 0x57821E49,2,0,0x5D67AA00,2,0=0x57821E49,2,0,0x5D67ACC0,2,0 -0x57821EC9,0,1,0x5D67AA00,0,1=0x578215C9,0,1,0x5D67ACC0,0,1; conflicting-override +0x57821EC9,0,1,0x5D67AA00,0,1=0x578215C9,0,1,0x5D67ACC0,0,1 0x57821549,2,0,0x5D67AA00,2,0=0x57821549,2,0,0x5D67AC40,2,0 0x578215C9,0,1,0x5D67AA00,0,1=0x578215C9,0,1,0x5D67AC40,0,1 ;02 to A5-2a (L2 Rail DTR DxD) 0x57821E49,2,0,0x5D77AA00,2,0=0x57821E49,2,0,0x5D77ACC0,2,0 -0x57821EC9,0,1,0x5D77AA00,0,1=0x578215C9,0,1,0x5D77ACC0,0,1; conflicting-override +0x57821EC9,0,1,0x5D77AA00,0,1=0x578215C9,0,1,0x5D77ACC0,0,1 0x57821549,2,0,0x5D77AA00,2,0=0x57821549,2,0,0x5D77AC40,2,0 0x578215C9,0,1,0x5D77AA00,0,1=0x578215C9,0,1,0x5D77AC40,0,1 ;02 to A5b (Rail STR DxD) 0x57821E49,2,0,0x5700A505,2,0=0x57821E49,2,0,0x5742A585,2,0 -0x57821EC9,0,1,0x5700A505,0,1=0x578215C9,0,1,0x5742A585,0,1; conflicting-override +0x57821EC9,0,1,0x5700A505,0,1=0x578215C9,0,1,0x5742A585,0,1 0x57821549,2,0,0x5700A505,2,0=0x57821549,2,0,0x5742A505,2,0 0x578215C9,0,1,0x5700A505,0,1=0x578215C9,0,1,0x5742A505,0,1 ;02 to A7a (GLR 1 DxD) 0x57821E49,2,0,0x5700A700,2,0=0x57821E49,2,0,0x5742A780,2,0 -0x57821EC9,0,1,0x5700A700,0,1=0x578215C9,0,1,0x5742A780,0,1; conflicting-override +0x57821EC9,0,1,0x5700A700,0,1=0x578215C9,0,1,0x5742A780,0,1 0x57821549,2,0,0x5700A700,2,0=0x57821549,2,0,0x5742A700,2,0 0x578215C9,0,1,0x5700A700,0,1=0x578215C9,0,1,0x5742A700,0,1 ;02 to A7b (GLR 2 DxD) 0x57821E49,2,0,0x5700A705,2,0=0x57821E49,2,0,0x5742A785,2,0 -0x57821EC9,0,1,0x5700A705,0,1=0x578215C9,0,1,0x5742A785,0,1; conflicting-override +0x57821EC9,0,1,0x5700A705,0,1=0x578215C9,0,1,0x5742A785,0,1 0x57821549,2,0,0x5700A705,2,0=0x57821549,2,0,0x5742A705,2,0 0x578215C9,0,1,0x5700A705,0,1=0x578215C9,0,1,0x5742A705,0,1 ;02 to A7-2 (ELR DxD) 0x57821E49,2,0,0x5700A720,2,0=0x57821E49,2,0,0x5742A7A0,2,0 -0x57821EC9,0,1,0x5700A720,0,1=0x578215C9,0,1,0x5742A7A0,0,1; conflicting-override +0x57821EC9,0,1,0x5700A720,0,1=0x578215C9,0,1,0x5742A7A0,0,1 0x57821549,2,0,0x5700A720,2,0=0x57821549,2,0,0x5742A720,2,0 0x578215C9,0,1,0x5700A720,0,1=0x578215C9,0,1,0x5742A720,0,1 ;02 to A8a (GLR 3 DxD) 0x57821E49,2,0,0x5700A800,2,0=0x57821E49,2,0,0x5742A880,2,0 -0x57821EC9,0,1,0x5700A800,0,1=0x578215C9,0,1,0x5742A880,0,1; conflicting-override +0x57821EC9,0,1,0x5700A800,0,1=0x578215C9,0,1,0x5742A880,0,1 0x57821549,2,0,0x5700A800,2,0=0x57821549,2,0,0x5742A800,2,0 0x578215C9,0,1,0x5700A800,0,1=0x578215C9,0,1,0x5742A800,0,1 ;02 to A8b (GLR 4 DxD) 0x57821E49,2,0,0x5700A805,2,0=0x57821E49,2,0,0x5742A885,2,0 -0x57821EC9,0,1,0x5700A805,0,1=0x578215C9,0,1,0x5742A885,0,1; conflicting-override +0x57821EC9,0,1,0x5700A805,0,1=0x578215C9,0,1,0x5742A885,0,1 0x57821549,2,0,0x5700A805,2,0=0x57821549,2,0,0x5742A805,2,0 0x578215C9,0,1,0x5700A805,0,1=0x578215C9,0,1,0x5742A805,0,1 ;02 to A9b (GHSR DxD) 0x57821E49,2,0,0x5700A905,2,0=0x57821E49,2,0,0x5742A985,2,0 -0x57821EC9,0,1,0x5700A905,0,1=0x578215C9,0,1,0x5742A985,0,1; conflicting-override +0x57821EC9,0,1,0x5700A905,0,1=0x578215C9,0,1,0x5742A985,0,1 0x57821549,2,0,0x5700A905,2,0=0x57821549,2,0,0x5742A905,2,0 0x578215C9,0,1,0x5700A905,0,1=0x578215C9,0,1,0x5742A905,0,1 ;02 to A9-2a (Monorail DxD) 0x57821E49,2,0,0x5700A920,2,0=0x57821E49,2,0,0x5742A9A0,2,0 -0x57821EC9,0,1,0x5700A920,0,1=0x578215C9,0,1,0x5742A9A0,0,1; conflicting-override +0x57821EC9,0,1,0x5700A920,0,1=0x578215C9,0,1,0x5742A9A0,0,1 0x57821549,2,0,0x5700A920,2,0=0x57821549,2,0,0x5742A920,2,0 0x578215C9,0,1,0x5700A920,0,1=0x578215C9,0,1,0x5742A920,0,1 ;02 to A9-2b (HSR DxD) 0x57821E49,2,0,0x5700A925,2,0=0x57821E49,2,0,0x5742A9A5,2,0 -0x57821EC9,0,1,0x5700A925,0,1=0x578215C9,0,1,0x5742A9A5,0,1; conflicting-override +0x57821EC9,0,1,0x5700A925,0,1=0x578215C9,0,1,0x5742A9A5,0,1 0x57821549,2,0,0x5700A925,2,0=0x57821549,2,0,0x5742A925,2,0 0x578215C9,0,1,0x5700A925,0,1=0x578215C9,0,1,0x5742A925,0,1 ;RHW x RHW Crossings Handled by Meta Code @@ -4301,52 +4301,52 @@ ;02 to 0x5E63x149 (SAM 1 DxD) ;02 to 0x5E63x249 (SAM 2 DxD) 0x57821E49,2,0,0x5E630249,2,0=0x57821E49,2,0,0x5E6322C9,2,0 -0x57821EC9,0,1,0x5E630249,0,1=0x578215C9,0,1,0x5E6322C9,0,1; conflicting-override +0x57821EC9,0,1,0x5E630249,0,1=0x578215C9,0,1,0x5E6322C9,0,1 0x57821549,2,0,0x5E630249,2,0=0x57821549,2,0,0x5E632249,2,0 0x578215C9,0,1,0x5E630249,0,1=0x578215C9,0,1,0x5E632249,0,1 ;02 to 0x5E63x349 (SAM 3 DxD) 0x57821E49,2,0,0x5E630349,2,0=0x57821E49,2,0,0x5E6323C9,2,0 -0x57821EC9,0,1,0x5E630349,0,1=0x578215C9,0,1,0x5E6323C9,0,1; conflicting-override +0x57821EC9,0,1,0x5E630349,0,1=0x578215C9,0,1,0x5E6323C9,0,1 0x57821549,2,0,0x5E630349,2,0=0x57821549,2,0,0x5E632349,2,0 0x578215C9,0,1,0x5E630349,0,1=0x578215C9,0,1,0x5E632349,0,1 ;02 to 0x5E63x449 (SAM 4 DxD) 0x57821E49,2,0,0x5E630449,2,0=0x57821E49,2,0,0x5E6324C9,2,0 -0x57821EC9,0,1,0x5E630449,0,1=0x578215C9,0,1,0x5E6324C9,0,1; conflicting-override +0x57821EC9,0,1,0x5E630449,0,1=0x578215C9,0,1,0x5E6324C9,0,1 0x57821549,2,0,0x5E630449,2,0=0x57821549,2,0,0x5E632449,2,0 0x578215C9,0,1,0x5E630449,0,1=0x578215C9,0,1,0x5E632449,0,1 ;02 to 0x5E63x549 (SAM 5 DxD) 0x57821E49,2,0,0x5E630549,2,0=0x57821E49,2,0,0x5E6325C9,2,0 -0x57821EC9,0,1,0x5E630549,0,1=0x578215C9,0,1,0x5E6325C9,0,1; conflicting-override +0x57821EC9,0,1,0x5E630549,0,1=0x578215C9,0,1,0x5E6325C9,0,1 0x57821549,2,0,0x5E630549,2,0=0x57821549,2,0,0x5E632549,2,0 0x578215C9,0,1,0x5E630549,0,1=0x578215C9,0,1,0x5E632549,0,1 ;02 to 0x5E63x649 (SAM 6 DxD) 0x57821E49,2,0,0x5E630649,2,0=0x57821E49,2,0,0x5E6326C9,2,0 -0x57821EC9,0,1,0x5E630649,0,1=0x578215C9,0,1,0x5E6326C9,0,1; conflicting-override +0x57821EC9,0,1,0x5E630649,0,1=0x578215C9,0,1,0x5E6326C9,0,1 0x57821549,2,0,0x5E630649,2,0=0x57821549,2,0,0x5E632649,2,0 0x578215C9,0,1,0x5E630649,0,1=0x578215C9,0,1,0x5E632649,0,1 ;02 to 0x5E63x749 (SAM 7 DxD) 0x57821E49,2,0,0x5E630749,2,0=0x57821E49,2,0,0x5E6327C9,2,0 -0x57821EC9,0,1,0x5E630749,0,1=0x578215C9,0,1,0x5E6327C9,0,1; conflicting-override +0x57821EC9,0,1,0x5E630749,0,1=0x578215C9,0,1,0x5E6327C9,0,1 0x57821549,2,0,0x5E630749,2,0=0x57821549,2,0,0x5E632749,2,0 0x578215C9,0,1,0x5E630749,0,1=0x578215C9,0,1,0x5E632749,0,1 ;02 to 0x5E63x849 (SAM 8 DxD) 0x57821E49,2,0,0x5E630849,2,0=0x57821E49,2,0,0x5E6328C9,2,0 -0x57821EC9,0,1,0x5E630849,0,1=0x578215C9,0,1,0x5E6328C9,0,1; conflicting-override +0x57821EC9,0,1,0x5E630849,0,1=0x578215C9,0,1,0x5E6328C9,0,1 0x57821549,2,0,0x5E630849,2,0=0x57821549,2,0,0x5E632849,2,0 0x578215C9,0,1,0x5E630849,0,1=0x578215C9,0,1,0x5E632849,0,1 ;02 to 0x5E63x949 (SAM 9 DxD) 0x57821E49,2,0,0x5E630949,2,0=0x57821E49,2,0,0x5E6329C9,2,0 -0x57821EC9,0,1,0x5E630949,0,1=0x578215C9,0,1,0x5E6329C9,0,1; conflicting-override +0x57821EC9,0,1,0x5E630949,0,1=0x578215C9,0,1,0x5E6329C9,0,1 0x57821549,2,0,0x5E630949,2,0=0x57821549,2,0,0x5E632949,2,0 0x578215C9,0,1,0x5E630949,0,1=0x578215C9,0,1,0x5E632949,0,1 ;02 to 0x5E63xA49 (SAM 10 DxD) 0x57821E49,2,0,0x5E630A49,2,0=0x57821E49,2,0,0x5E632AC9,2,0 -0x57821EC9,0,1,0x5E630A49,0,1=0x578215C9,0,1,0x5E632AC9,0,1; conflicting-override +0x57821EC9,0,1,0x5E630A49,0,1=0x578215C9,0,1,0x5E632AC9,0,1 0x57821549,2,0,0x5E630A49,2,0=0x57821549,2,0,0x5E632A49,2,0 0x578215C9,0,1,0x5E630A49,0,1=0x578215C9,0,1,0x5E632A49,0,1 ;02 to 0x5E63xB49 (SAM 11 DxD) 0x57821E49,2,0,0x5E630B49,2,0=0x57821E49,2,0,0x5E632BC9,2,0 -0x57821EC9,0,1,0x5E630B49,0,1=0x578215C9,0,1,0x5E632BC9,0,1; conflicting-override +0x57821EC9,0,1,0x5E630B49,0,1=0x578215C9,0,1,0x5E632BC9,0,1 0x57821549,2,0,0x5E630B49,2,0=0x57821549,2,0,0x5E632B49,2,0 0x578215C9,0,1,0x5E630B49,0,1=0x578215C9,0,1,0x5E632B49,0,1 ;----OxD/DxO T Crossings---- @@ -4355,7 +4355,7 @@ ;Stability ;02 to T-54 (Avenue-Short) ;Short (T54) -0x57821EC9,0,1,0x57605405,1,0=0x578215C9,0,1,0x57625485,1,0; conflicting-override +0x57821EC9,0,1,0x57605405,1,0=0x578215C9,0,1,0x57625485,1,0 0x578215C9,0,1,0x57605405,1,0=0x578215C9,0,1,0x57625405,1,0 0x57821E49,2,0,0x57605405,3,1=0x57821E49,2,0,0x57625485,3,1 0x57821549,2,0,0x57605405,3,1=0x57821549,2,0,0x57625405,3,1 @@ -4369,32 +4369,32 @@ ;----One-Way Road (F7)---- 0x57821E49,2,0,0x5700F700,3,1=0x57821E49,2,0,0x5742F780,3,1 0x57821549,2,0,0x5700F700,3,1=0x57821549,2,0,0x5742F700,3,1 -0x57821EC9,0,1,0x5700F700,1,0=0x578215C9,0,1,0x5742F780,1,0; conflicting-override +0x57821EC9,0,1,0x5700F700,1,0=0x578215C9,0,1,0x5742F780,1,0 0x578215C9,0,1,0x5700F700,1,0=0x578215C9,0,1,0x5742F700,1,0 ;----Special---- ;MRCs ;02 to R1 0x57821E49,2,0,0x57905200,0,1=0x57821E49,2,0,0x57925245,0,1 -0x57821EC9,0,1,0x57905200,2,0=0x578215C9,0,1,0x57925245,2,0; conflicting-override +0x57821EC9,0,1,0x57905200,2,0=0x578215C9,0,1,0x57925245,2,0 0x57821549,2,0,0x57905200,0,1=0x57821549,2,0,0x579252C5,0,1 0x578215C9,0,1,0x57905200,2,0=0x578215C9,0,1,0x579252C5,2,0 ;02 to R2 0x57821549,2,0,0x57905900,1,0=0x57821549,2,0,0x57925945,1,0 0x578215C9,0,1,0x57905900,3,1=0x578215C9,0,1,0x57925945,3,1 0x57821E49,2,0,0x57905900,1,0=0x57821E49,2,0,0x579259C5,1,0 -0x57821EC9,0,1,0x57905900,3,1=0x578215C9,0,1,0x579259C5,3,1; conflicting-override +0x57821EC9,0,1,0x57905900,3,1=0x578215C9,0,1,0x579259C5,3,1 ;02 to R3 0x57821549,2,0,0x57906800,1,0=0x57821549,2,0,0x57926845,1,0 0x578215C9,0,1,0x57906800,3,1=0x578215C9,0,1,0x57926845,3,1 -0x57821E49,2,0,0x57906800,1,0=0x57821549,2,0,0x579268C5,1,0; conflicting-override -0x57821EC9,0,1,0x57906800,3,1=0x578215C9,0,1,0x579268C5,3,1; conflicting-override +0x57821E49,2,0,0x57906800,1,0=0x57821549,2,0,0x579268C5,1,0 +0x57821EC9,0,1,0x57906800,3,1=0x578215C9,0,1,0x579268C5,3,1 ;02 to R4 -0x57821EC9,0,1,0x57907b00,2,0=0x578215C9,0,1,0x57927b45,2,0; conflicting-override +0x57821EC9,0,1,0x57907b00,2,0=0x578215C9,0,1,0x57927b45,2,0 0x57821E49,2,0,0x57907b00,0,1=0x57821E49,2,0,0x57927b45,0,1 0x578215C9,0,1,0x57907b00,2,0=0x578215C9,0,1,0x57927bC5,2,0 0x57821549,2,0,0x57907b00,0,1=0x57821549,2,0,0x57927bC5,0,1 ;02 to R5 -0x57821EC9,0,1,0x57908f00,2,0=0x578215C9,0,1,0x57928f45,2,0; conflicting-override +0x57821EC9,0,1,0x57908f00,2,0=0x578215C9,0,1,0x57928f45,2,0 0x57821E49,2,0,0x57908f00,0,1=0x57821E49,2,0,0x57928f45,0,1 0x578215C9,0,1,0x57908f00,2,0=0x578215C9,0,1,0x57928fC5,2,0 0x57821549,2,0,0x57908f00,0,1=0x57821549,2,0,0x57928fC5,0,1 diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/T01A_Road_ThruT_OxO.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/T01A_Road_ThruT_OxO.txt index 30846306b..c7505c3af 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/T01A_Road_ThruT_OxO.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/T01A_Road_ThruT_OxO.txt @@ -11,12 +11,12 @@ ;------------------------- ;----Base Network---- ;00 to 00 (Orth) -0x57610100,1,0,0x57000000,1,0=0x57610100,1,0,0x57010000,1,0; conflicting-override -0x57610100,1,0,0x57000000,3,0=0x57610100,1,0,0x57010000,1,0; conflicting-override +0x57610100,1,0,0x57000000,1,0=0x57610100,1,0,0x57010000,1,0 +0x57610100,1,0,0x57000000,3,0=0x57610100,1,0,0x57010000,1,0 0x57610100,3,0,0x57000000,1,0=0x57610100,3,0,0x57010000,3,0 0x57610100,3,0,0x57000000,3,0=0x57610100,3,0,0x57010000,3,0 ;00 to 01 (Orth Stub) -0x57610100,1,0,0x57000100,1,0=0x57610100,1,0,0x57010100,1,0; conflicting-override +0x57610100,1,0,0x57000100,1,0=0x57610100,1,0,0x57010100,1,0 0x57610100,3,0,0x57000100,1,0=0x57610100,3,0,0x57010100,3,1 ;00 to 04 (Orth-Diag) 0x57610100,1,0,0x57000400,3,0=0x57610100,1,0,0x57010B00,3,0 @@ -26,127 +26,127 @@ ;00 to 08 (Orth 90-Curve) ;----OxO Crossings---- ;00 to 10 (Street OxO) -0x57610100,1,0,0x57001000,1,0=0x57610100,1,0,0x57011000,1,0; conflicting-override -0x57610100,1,0,0x57001000,3,0=0x57610100,1,0,0x57011000,1,0; conflicting-override +0x57610100,1,0,0x57001000,1,0=0x57610100,1,0,0x57011000,1,0 +0x57610100,1,0,0x57001000,3,0=0x57610100,1,0,0x57011000,1,0 0x57610100,3,0,0x57001000,1,0=0x57610100,3,0,0x57011000,3,0 0x57610100,3,0,0x57001000,3,0=0x57610100,3,0,0x57011000,3,0 ;00 to 10-1 (L1 Street OxO) -0x57610100,1,0,0x57001010,1,0=0x57610100,1,0,0x57011010,1,0; conflicting-override -0x57610100,1,0,0x57001010,3,0=0x57610100,1,0,0x57011010,1,0; conflicting-override +0x57610100,1,0,0x57001010,1,0=0x57610100,1,0,0x57011010,1,0 +0x57610100,1,0,0x57001010,3,0=0x57610100,1,0,0x57011010,1,0 0x57610100,3,0,0x57001010,1,0=0x57610100,3,0,0x57011010,3,0 0x57610100,3,0,0x57001010,3,0=0x57610100,3,0,0x57011010,3,0 ;00 to 10-2 (L2 Street OxO) -0x57610100,1,0,0x57001020,1,0=0x57610100,1,0,0x57011020,1,0; conflicting-override -0x57610100,1,0,0x57001020,3,0=0x57610100,1,0,0x57011020,1,0; conflicting-override +0x57610100,1,0,0x57001020,1,0=0x57610100,1,0,0x57011020,1,0 +0x57610100,1,0,0x57001020,3,0=0x57610100,1,0,0x57011020,1,0 0x57610100,3,0,0x57001020,1,0=0x57610100,3,0,0x57011020,3,0 0x57610100,3,0,0x57001020,3,0=0x57610100,3,0,0x57011020,3,0 ;00 to 11 (Road OxO) -0x57610100,1,0,0x57001100,1,0=0x57610100,1,0,0x57011100,1,0; conflicting-override -0x57610100,1,0,0x57001100,3,0=0x57610100,1,0,0x57011100,1,0; conflicting-override +0x57610100,1,0,0x57001100,1,0=0x57610100,1,0,0x57011100,1,0 +0x57610100,1,0,0x57001100,3,0=0x57610100,1,0,0x57011100,1,0 0x57610100,3,0,0x57001100,1,0=0x57610100,3,0,0x57011100,3,0 0x57610100,3,0,0x57001100,3,0=0x57610100,3,0,0x57011100,3,0 ;00 to 11-1 (L1 Road OxO) -0x57610100,1,0,0x57001110,1,0=0x57610100,1,0,0x57011110,1,0; conflicting-override -0x57610100,1,0,0x57001110,3,0=0x57610100,1,0,0x57011110,1,0; conflicting-override +0x57610100,1,0,0x57001110,1,0=0x57610100,1,0,0x57011110,1,0 +0x57610100,1,0,0x57001110,3,0=0x57610100,1,0,0x57011110,1,0 0x57610100,3,0,0x57001110,1,0=0x57610100,3,0,0x57011110,3,0 0x57610100,3,0,0x57001110,3,0=0x57610100,3,0,0x57011110,3,0 ;00 to 11-2 (L2 Road OxO) -0x57610100,1,0,0x57001120,1,0=0x57610100,1,0,0x57011120,1,0; conflicting-override -0x57610100,1,0,0x57001120,3,0=0x57610100,1,0,0x57011120,1,0; conflicting-override +0x57610100,1,0,0x57001120,1,0=0x57610100,1,0,0x57011120,1,0 +0x57610100,1,0,0x57001120,3,0=0x57610100,1,0,0x57011120,1,0 0x57610100,3,0,0x57001120,1,0=0x57610100,3,0,0x57011120,3,0 0x57610100,3,0,0x57001120,3,0=0x57610100,3,0,0x57011120,3,0 ;00 to 12 (OWR OxO) -0x57610100,1,0,0x57001200,1,0=0x57610100,1,0,0x57011200,1,0; conflicting-override -0x57610100,1,0,0x57001200,3,0=0x57610100,1,0,0x57011200,1,0; conflicting-override +0x57610100,1,0,0x57001200,1,0=0x57610100,1,0,0x57011200,1,0 +0x57610100,1,0,0x57001200,3,0=0x57610100,1,0,0x57011200,1,0 0x57610100,3,0,0x57001200,1,0=0x57610100,3,0,0x57011200,3,0 0x57610100,3,0,0x57001200,3,0=0x57610100,3,0,0x57011200,3,0 ;00 to 12-1 (L1 OWR OxO) -0x57610100,1,0,0x57001210,1,0=0x57610100,1,0,0x57011210,1,0; conflicting-override -0x57610100,1,0,0x57001210,3,0=0x57610100,1,0,0x57011210,1,0; conflicting-override +0x57610100,1,0,0x57001210,1,0=0x57610100,1,0,0x57011210,1,0 +0x57610100,1,0,0x57001210,3,0=0x57610100,1,0,0x57011210,1,0 0x57610100,3,0,0x57001210,1,0=0x57610100,3,0,0x57011210,3,0 0x57610100,3,0,0x57001210,3,0=0x57610100,3,0,0x57011210,3,0 ;00 to 12-2 (L2 OWR OxO) -0x57610100,1,0,0x57001220,1,0=0x57610100,1,0,0x57011220,1,0; conflicting-override -0x57610100,1,0,0x57001220,3,0=0x57610100,1,0,0x57011220,1,0; conflicting-override +0x57610100,1,0,0x57001220,1,0=0x57610100,1,0,0x57011220,1,0 +0x57610100,1,0,0x57001220,3,0=0x57610100,1,0,0x57011220,1,0 0x57610100,3,0,0x57001220,1,0=0x57610100,3,0,0x57011220,3,0 0x57610100,3,0,0x57001220,3,0=0x57610100,3,0,0x57011220,3,0 ;00 to 13 (Avenue OxO) -0x57610100,1,0,0x57001300,3,0=0x57610100,1,0,0x57011300,1,1; conflicting-override +0x57610100,1,0,0x57001300,3,0=0x57610100,1,0,0x57011300,1,1 0x57610100,3,0,0x57001300,3,0=0x57610100,3,0,0x57011300,3,0 ;00 to 13-1 (L1 Avenue OxO) -0x57610100,1,0,0x57001310,3,0=0x57610100,1,0,0x57011310,1,1; conflicting-override +0x57610100,1,0,0x57001310,3,0=0x57610100,1,0,0x57011310,1,1 0x57610100,3,0,0x57001310,3,0=0x57610100,3,0,0x57011310,3,0 ;00 to 13-2 (L2 Avenue OxO) -0x57610100,1,0,0x57001320,3,0=0x57610100,1,0,0x57011320,1,1; conflicting-override +0x57610100,1,0,0x57001320,3,0=0x57610100,1,0,0x57011320,1,1 0x57610100,3,0,0x57001320,3,0=0x57610100,3,0,0x57011320,3,0 ;00 to 14-2 (L2 MHW OxO) -0x57610100,1,0,0x57001420,3,0=0x57610100,1,0,0x57011420,1,1; conflicting-override +0x57610100,1,0,0x57001420,3,0=0x57610100,1,0,0x57011420,1,1 0x57610100,3,0,0x57001420,3,0=0x57610100,3,0,0x57011420,3,0 ;00 to 15a (Rail DTR OxO) -0x57610100,1,0,0x57001500,1,0=0x57610100,1,0,0x57011500,1,0; conflicting-override -0x57610100,1,0,0x57001500,3,0=0x57610100,1,0,0x57011500,1,0; conflicting-override +0x57610100,1,0,0x57001500,1,0=0x57610100,1,0,0x57011500,1,0 +0x57610100,1,0,0x57001500,3,0=0x57610100,1,0,0x57011500,1,0 0x57610100,3,0,0x57001500,1,0=0x57610100,3,0,0x57011500,3,0 0x57610100,3,0,0x57001500,3,0=0x57610100,3,0,0x57011500,3,0 ;00 to 15-1a (L1 Rail DTR OxO) -0x57610100,1,0,0x5D671A00,0,0=0x57610100,1,0,0x5D671b00,2,0; conflicting-override -0x57610100,1,0,0x5D671A00,2,0=0x57610100,1,0,0x5D671b00,2,0; conflicting-override +0x57610100,1,0,0x5D671A00,0,0=0x57610100,1,0,0x5D671b00,2,0 +0x57610100,1,0,0x5D671A00,2,0=0x57610100,1,0,0x5D671b00,2,0 0x57610100,3,0,0x5D671A00,0,0=0x57610100,3,0,0x5D671b00,0,0 0x57610100,3,0,0x5D671A00,2,0=0x57610100,3,0,0x5D671b00,0,0 ;00 to 15-2a (L2 Rail DTR OxO) -0x57610100,1,0,0x5D771A00,0,0=0x57610100,1,0,0x5D771b00,2,0; conflicting-override -0x57610100,1,0,0x5D771A00,2,0=0x57610100,1,0,0x5D771b00,2,0; conflicting-override +0x57610100,1,0,0x5D771A00,0,0=0x57610100,1,0,0x5D771b00,2,0 +0x57610100,1,0,0x5D771A00,2,0=0x57610100,1,0,0x5D771b00,2,0 0x57610100,3,0,0x5D771A00,0,0=0x57610100,3,0,0x5D771b00,0,0 0x57610100,3,0,0x5D771A00,2,0=0x57610100,3,0,0x5D771b00,0,0 ;00 to 15b (Rail STR OxO) -0x57610100,1,0,0x57001509,1,0=0x57610100,1,0,0x57011509,1,0; conflicting-override -0x57610100,1,0,0x57001509,3,0=0x57610100,1,0,0x57011509,1,0; conflicting-override +0x57610100,1,0,0x57001509,1,0=0x57610100,1,0,0x57011509,1,0 +0x57610100,1,0,0x57001509,3,0=0x57610100,1,0,0x57011509,1,0 0x57610100,3,0,0x57001509,1,0=0x57610100,3,0,0x57011509,3,0 0x57610100,3,0,0x57001509,3,0=0x57610100,3,0,0x57011509,3,0 ;00 to 17a (GLR 1 OxO) -0x57610100,1,0,0x57001700,1,0=0x57610100,1,0,0x57011700,1,0; conflicting-override -0x57610100,1,0,0x57001700,3,0=0x57610100,1,0,0x57011700,1,0; conflicting-override +0x57610100,1,0,0x57001700,1,0=0x57610100,1,0,0x57011700,1,0 +0x57610100,1,0,0x57001700,3,0=0x57610100,1,0,0x57011700,1,0 0x57610100,3,0,0x57001700,1,0=0x57610100,3,0,0x57011700,3,0 0x57610100,3,0,0x57001700,3,0=0x57610100,3,0,0x57011700,3,0 ;00 to 17b (GLR 2 OxO) -0x57610100,1,0,0x57001709,1,0=0x57610100,1,0,0x57011709,1,0; conflicting-override -0x57610100,1,0,0x57001709,3,0=0x57610100,1,0,0x57011709,1,0; conflicting-override +0x57610100,1,0,0x57001709,1,0=0x57610100,1,0,0x57011709,1,0 +0x57610100,1,0,0x57001709,3,0=0x57610100,1,0,0x57011709,1,0 0x57610100,3,0,0x57001709,1,0=0x57610100,3,0,0x57011709,3,0 0x57610100,3,0,0x57001709,3,0=0x57610100,3,0,0x57011709,3,0 ;00 to 17-2 (ELR OxO) -0x57610100,1,0,0x57001720,1,0=0x57610100,1,0,0x57011720,1,0; conflicting-override -0x57610100,1,0,0x57001720,3,0=0x57610100,1,0,0x57011720,1,0; conflicting-override +0x57610100,1,0,0x57001720,1,0=0x57610100,1,0,0x57011720,1,0 +0x57610100,1,0,0x57001720,3,0=0x57610100,1,0,0x57011720,1,0 0x57610100,3,0,0x57001720,1,0=0x57610100,3,0,0x57011720,3,0 0x57610100,3,0,0x57001720,3,0=0x57610100,3,0,0x57011720,3,0 ;00 to 18a (GLR 3 OxO) -0x57610100,1,0,0x57001800,1,0=0x57610100,1,0,0x57011800,1,0; conflicting-override -0x57610100,1,0,0x57001800,3,0=0x57610100,1,0,0x57011800,1,0; conflicting-override +0x57610100,1,0,0x57001800,1,0=0x57610100,1,0,0x57011800,1,0 +0x57610100,1,0,0x57001800,3,0=0x57610100,1,0,0x57011800,1,0 0x57610100,3,0,0x57001800,1,0=0x57610100,3,0,0x57011800,3,0 0x57610100,3,0,0x57001800,3,0=0x57610100,3,0,0x57011800,3,0 ;00 to 18b (GLR 4 OxO) -0x57610100,1,0,0x57001809,1,0=0x57610100,1,0,0x57011809,1,0; conflicting-override -0x57610100,1,0,0x57001809,3,0=0x57610100,1,0,0x57011809,1,0; conflicting-override +0x57610100,1,0,0x57001809,1,0=0x57610100,1,0,0x57011809,1,0 +0x57610100,1,0,0x57001809,3,0=0x57610100,1,0,0x57011809,1,0 0x57610100,3,0,0x57001809,1,0=0x57610100,3,0,0x57011809,3,0 0x57610100,3,0,0x57001809,3,0=0x57610100,3,0,0x57011809,3,0 ;00 to 19b (GHSR OxO) ;00 to 19-2a (Monorail OxO) -0x57610100,1,0,0x57001920,1,0=0x57610100,1,0,0x57011920,1,0; conflicting-override -0x57610100,1,0,0x57001920,3,0=0x57610100,1,0,0x57011920,1,0; conflicting-override +0x57610100,1,0,0x57001920,1,0=0x57610100,1,0,0x57011920,1,0 +0x57610100,1,0,0x57001920,3,0=0x57610100,1,0,0x57011920,1,0 0x57610100,3,0,0x57001920,1,0=0x57610100,3,0,0x57011920,3,0 0x57610100,3,0,0x57001920,3,0=0x57610100,3,0,0x57011920,3,0 ;00 to 19-2b (HSR OxO) -0x57610100,1,0,0x57001925,1,0=0x57610100,1,0,0x57011925,1,0; conflicting-override -0x57610100,1,0,0x57001925,3,0=0x57610100,1,0,0x57011925,1,0; conflicting-override +0x57610100,1,0,0x57001925,1,0=0x57610100,1,0,0x57011925,1,0 +0x57610100,1,0,0x57001925,3,0=0x57610100,1,0,0x57011925,1,0 0x57610100,3,0,0x57001925,1,0=0x57610100,3,0,0x57011925,3,0 0x57610100,3,0,0x57001925,3,0=0x57610100,3,0,0x57011925,3,0 ;RHW +-Crossings Handled By Meta Code ;00 to 27 (TLA-3 OxO) -0x57610100,1,0,0x57002700,1,0=0x57610100,1,0,0x57012700,1,0; conflicting-override -0x57610100,1,0,0x57002700,3,0=0x57610100,1,0,0x57012700,1,0; conflicting-override +0x57610100,1,0,0x57002700,1,0=0x57610100,1,0,0x57012700,1,0 +0x57610100,1,0,0x57002700,3,0=0x57610100,1,0,0x57012700,1,0 0x57610100,3,0,0x57002700,1,0=0x57610100,3,0,0x57012700,3,0 0x57610100,3,0,0x57002700,3,0=0x57610100,3,0,0x57012700,3,0 ;00 to 28 (AVE-2 OxO) -0x57610100,1,0,0x57002800,1,0=0x57610100,1,0,0x57012800,1,0; conflicting-override -0x57610100,1,0,0x57002800,3,0=0x57610100,1,0,0x57012800,1,0; conflicting-override +0x57610100,1,0,0x57002800,1,0=0x57610100,1,0,0x57012800,1,0 +0x57610100,1,0,0x57002800,3,0=0x57610100,1,0,0x57012800,1,0 0x57610100,3,0,0x57002800,1,0=0x57610100,3,0,0x57012800,3,0 0x57610100,3,0,0x57002800,3,0=0x57610100,3,0,0x57012800,3,0 ;00 to 28-1 (L1 AVE-2 OxO) @@ -160,8 +160,8 @@ ;0x57610100,3,0,0x57002820,1,0=0x57610100,3,0,0x57012820,3,0 ;0x57610100,3,0,0x57002820,3,0=0x57610100,3,0,0x57012820,3,0 ;00 to 29 (ARD-3 OxO) -0x57610100,1,0,0x57002900,1,0=0x57610100,1,0,0x57012900,1,0; conflicting-override -0x57610100,1,0,0x57002900,3,0=0x57610100,1,0,0x57012900,1,1; conflicting-override +0x57610100,1,0,0x57002900,1,0=0x57610100,1,0,0x57012900,1,0 +0x57610100,1,0,0x57002900,3,0=0x57610100,1,0,0x57012900,1,1 0x57610100,3,0,0x57002900,1,0=0x57610100,3,0,0x57012900,3,1 0x57610100,3,0,0x57002900,3,0=0x57610100,3,0,0x57012900,3,0 ;00 to 29-1 (L1 ARD-3 OxO) @@ -175,8 +175,8 @@ ;0x57610100,3,0,0x57002920,1,0=0x57610100,3,0,0x57012920,3,1 ;0x57610100,3,0,0x57002920,3,0=0x57610100,3,0,0x57012920,3,0 ;00 to 2A (OWR-1 OxO) -0x57610100,1,0,0x57002A00,1,0=0x57610100,1,0,0x57012A00,1,0; conflicting-override -0x57610100,1,0,0x57002A00,3,0=0x57610100,1,0,0x57012A00,1,0; conflicting-override +0x57610100,1,0,0x57002A00,1,0=0x57610100,1,0,0x57012A00,1,0 +0x57610100,1,0,0x57002A00,3,0=0x57610100,1,0,0x57012A00,1,0 0x57610100,3,0,0x57002A00,1,0=0x57610100,3,0,0x57012A00,3,0 0x57610100,3,0,0x57002A00,3,0=0x57610100,3,0,0x57012A00,3,0 ;00 to 2A-1 (L1 OWR-1 OxO) @@ -190,8 +190,8 @@ ;0x57610100,3,0,0x57002A20,1,0=0x57610100,3,0,0x57012A20,3,0 ;0x57610100,3,0,0x57002A20,3,0=0x57610100,3,0,0x57012A20,3,0 ;00 to 2B (OWR-3 OxO) -0x57610100,1,0,0x57002B00,1,0=0x57610100,1,0,0x57012B00,1,0; conflicting-override -0x57610100,1,0,0x57002B00,3,0=0x57610100,1,0,0x57012B00,1,0; conflicting-override +0x57610100,1,0,0x57002B00,1,0=0x57610100,1,0,0x57012B00,1,0 +0x57610100,1,0,0x57002B00,3,0=0x57610100,1,0,0x57012B00,1,0 0x57610100,3,0,0x57002B00,1,0=0x57610100,3,0,0x57012B00,3,0 0x57610100,3,0,0x57002B00,3,0=0x57610100,3,0,0x57012B00,3,0 ;00 to 2B-1 (L1 OWR-3 OxO) @@ -205,8 +205,8 @@ ;0x57610100,3,0,0x57002B20,1,0=0x57610100,3,0,0x57012B20,3,0 ;0x57610100,3,0,0x57002B20,3,0=0x57610100,3,0,0x57012B20,3,0 ;00 to 2C (NRD-4 OxO) -0x57610100,1,0,0x57002C00,1,0=0x57610100,1,0,0x57012C00,1,0; conflicting-override -0x57610100,1,0,0x57002C00,3,0=0x57610100,1,0,0x57012C00,1,0; conflicting-override +0x57610100,1,0,0x57002C00,1,0=0x57610100,1,0,0x57012C00,1,0 +0x57610100,1,0,0x57002C00,3,0=0x57610100,1,0,0x57012C00,1,0 0x57610100,3,0,0x57002C00,1,0=0x57610100,3,0,0x57012C00,3,0 0x57610100,3,0,0x57002C00,3,0=0x57610100,3,0,0x57012C00,3,0 ;00 to 2C-1 (L1 NRD-4 OxO) @@ -220,10 +220,10 @@ ;0x57610100,3,0,0x57002C20,1,0=0x57610100,3,0,0x57012C20,3,0 ;0x57610100,3,0,0x57002C20,3,0=0x57610100,3,0,0x57012C20,3,0 ;00 to 2D (TLA-5 OxO) -0x57610100,1,0,0x57002D00,3,0=0x57610100,1,0,0x57012D00,1,1; conflicting-override +0x57610100,1,0,0x57002D00,3,0=0x57610100,1,0,0x57012D00,1,1 0x57610100,3,0,0x57002D00,3,0=0x57610100,3,0,0x57012D00,3,0 ;00 to 2E (OWR-4 OxO) -0x57610100,1,0,0x57002E00,3,0=0x57610100,1,0,0x57012E00,1,1; conflicting-override +0x57610100,1,0,0x57002E00,3,0=0x57610100,1,0,0x57012E00,1,1 0x57610100,3,0,0x57002E00,3,0=0x57610100,3,0,0x57012E00,3,0 ;00 to 2E-1 (L1 OWR-4 OxO) ;0x57610100,1,0,0x57002E10,3,0=0x57610100,1,0,0x57012E10,1,1 @@ -232,7 +232,7 @@ ;0x57610100,1,0,0x57002E20,3,0=0x57610100,1,0,0x57012E20,1,1 ;0x57610100,3,0,0x57002E20,3,0=0x57610100,3,0,0x57012E20,3,0 ;00 to 2F (OWR-5 OxO) -0x57610100,1,0,0x57002F00,3,0=0x57610100,1,0,0x57012F00,1,1; conflicting-override +0x57610100,1,0,0x57002F00,3,0=0x57610100,1,0,0x57012F00,1,1 0x57610100,3,0,0x57002F00,3,0=0x57610100,3,0,0x57012F00,3,0 ;00 to 2F-1 (L1 OWR-5 OxO) ;0x57610100,1,0,0x57002F10,3,0=0x57610100,1,0,0x57012F10,1,1 @@ -241,12 +241,12 @@ ;0x57610100,1,0,0x57002F20,3,0=0x57610100,1,0,0x57012F20,1,1 ;0x57610100,3,0,0x57002F20,3,0=0x57610100,3,0,0x57012F20,3,0 ;00 to 30 (RD-4 OxO) -0x57610100,1,0,0x57003000,3,0=0x57610100,1,0,0x57013000,1,1; conflicting-override +0x57610100,1,0,0x57003000,3,0=0x57610100,1,0,0x57013000,1,1 0x57610100,3,0,0x57003000,3,0=0x57610100,3,0,0x57013000,3,0 ;00 to 30-1 (L1 RD-4 OxO) ;00 to 30-2 (L2 RD-4 OxO) ;00 to 31 (RD-6 OxO) -0x57610100,1,0,0x57003100,3,0=0x57610100,1,0,0x57013100,1,1; conflicting-override +0x57610100,1,0,0x57003100,3,0=0x57610100,1,0,0x57013100,1,1 0x57610100,3,0,0x57003100,3,0=0x57610100,3,0,0x57013100,3,0 ;00 to 31-1 (L1 RD-6 OxO) ;0x57610100,1,0,0x57003110,3,0=0x57610100,1,0,0x57013110,1,1 @@ -255,9 +255,9 @@ ;0x57610100,1,0,0x57003120,3,0=0x57610100,1,0,0x57013120,1,1 ;0x57610100,3,0,0x57003120,3,0=0x57610100,3,0,0x57013120,3,0 ;00 to 32,33,34,35 (Triple-Tile NWM OxO) -0x57610100,1,0,0x57003200,3,0=0x57610100,1,0,0x57013200,1,1; conflicting-override +0x57610100,1,0,0x57003200,3,0=0x57610100,1,0,0x57013200,1,1 0x57610100,3,0,0x57003200,3,0=0x57610100,3,0,0x57013200,3,0 -0x57610100,1,0,0x57003400,3,0=0x57610100,1,0,0x57013400,1,1; conflicting-override +0x57610100,1,0,0x57003400,3,0=0x57610100,1,0,0x57013400,1,1 0x57610100,3,0,0x57003400,3,0=0x57610100,3,0,0x57013400,3,0 ;00 to 32-1,33-1,34-1,35-1 (L1 Triple-Tile NWM OxO) ;0x57610100,1,0,0x57003210,3,0=0x57610100,1,0,0x57013210,1,1 @@ -271,15 +271,15 @@ ;0x57610100,3,0,0x57003420,3,0=0x57610100,3,0,0x57013420,3,0 ;00 to 36 (Tram-on-Street OxO) ;00 to 37a (Tram-in-Road OxO) -0x57610100,1,0,0x58480000,0,0=0x57610100,1,0,0x57013700,1,0; conflicting-override -0x57610100,1,0,0x58480000,2,0=0x57610100,1,0,0x57013700,1,0; conflicting-override +0x57610100,1,0,0x58480000,0,0=0x57610100,1,0,0x57013700,1,0 +0x57610100,1,0,0x58480000,2,0=0x57610100,1,0,0x57013700,1,0 0x57610100,3,0,0x58480000,0,0=0x57610100,3,0,0x57013700,3,0 0x57610100,3,0,0x58480000,2,0=0x57610100,3,0,0x57013700,3,0 ; ; ;00 to 37b (Tram-on-Road OxO) -0x57610100,1,0,0x58486C00,0,0=0x57610100,1,0,0x57013709,1,0; conflicting-override -0x57610100,1,0,0x58486C00,2,0=0x57610100,1,0,0x57013709,1,0; conflicting-override +0x57610100,1,0,0x58486C00,0,0=0x57610100,1,0,0x57013709,1,0 +0x57610100,1,0,0x58486C00,2,0=0x57610100,1,0,0x57013709,1,0 0x57610100,3,0,0x58486C00,0,0=0x57610100,3,0,0x57013709,3,0 0x57610100,3,0,0x58486C00,2,0=0x57610100,3,0,0x57013709,3,0 ; @@ -287,7 +287,7 @@ ;00 to 38a (Tram-in-OWR OxO) ;00 to 38b (Tram-on-OWR OxO) ;00 to 39 (Tram-in-Avenue OxO) -0x57610100,1,0,0x58400000,0,0=0x57610100,1,0,0x57013900,1,1; conflicting-override +0x57610100,1,0,0x58400000,0,0=0x57610100,1,0,0x57013900,1,1 0x57610100,3,0,0x58400000,0,0=0x57610100,3,0,0x57013900,3,0 ; ;00 to 3Aa (PedPath OxO) @@ -312,53 +312,53 @@ ;0x57010000,3,0,0x57003A25,3,0=0x57010000,3,0,0x57013A25,3,0 ;00 to 0x5E60x100 (SAM 1 OxO) ;00 to 0x5E60x200 (SAM 2 OxO) -0x57610100,1,0,0x5E600200,1,0=0x57610100,1,0,0x5E601200,1,0; conflicting-override -0x57610100,1,0,0x5E600200,3,0=0x57610100,1,0,0x5E601200,1,0; conflicting-override +0x57610100,1,0,0x5E600200,1,0=0x57610100,1,0,0x5E601200,1,0 +0x57610100,1,0,0x5E600200,3,0=0x57610100,1,0,0x5E601200,1,0 0x57610100,3,0,0x5E600200,1,0=0x57610100,3,0,0x5E601200,3,0 0x57610100,3,0,0x5E600200,3,0=0x57610100,3,0,0x5E601200,3,0 ;00 to 0x5E60x300 (SAM 3 OxO) -0x57610100,1,0,0x5E600300,1,0=0x57610100,1,0,0x5E601300,1,0; conflicting-override -0x57610100,1,0,0x5E600300,3,0=0x57610100,1,0,0x5E601300,1,0; conflicting-override +0x57610100,1,0,0x5E600300,1,0=0x57610100,1,0,0x5E601300,1,0 +0x57610100,1,0,0x5E600300,3,0=0x57610100,1,0,0x5E601300,1,0 0x57610100,3,0,0x5E600300,1,0=0x57610100,3,0,0x5E601300,3,0 0x57610100,3,0,0x5E600300,3,0=0x57610100,3,0,0x5E601300,3,0 ;00 to 0x5E60x400 (SAM 4 OxO) -0x57610100,1,0,0x5E600400,1,0=0x57610100,1,0,0x5E601400,1,0; conflicting-override -0x57610100,1,0,0x5E600400,3,0=0x57610100,1,0,0x5E601400,1,0; conflicting-override +0x57610100,1,0,0x5E600400,1,0=0x57610100,1,0,0x5E601400,1,0 +0x57610100,1,0,0x5E600400,3,0=0x57610100,1,0,0x5E601400,1,0 0x57610100,3,0,0x5E600400,1,0=0x57610100,3,0,0x5E601400,3,0 0x57610100,3,0,0x5E600400,3,0=0x57610100,3,0,0x5E601400,3,0 ;00 to 0x5E60x500 (SAM 5 OxO) -0x57610100,1,0,0x5E600500,1,0=0x57610100,1,0,0x5E601500,1,0; conflicting-override -0x57610100,1,0,0x5E600500,3,0=0x57610100,1,0,0x5E601500,1,0; conflicting-override +0x57610100,1,0,0x5E600500,1,0=0x57610100,1,0,0x5E601500,1,0 +0x57610100,1,0,0x5E600500,3,0=0x57610100,1,0,0x5E601500,1,0 0x57610100,3,0,0x5E600500,1,0=0x57610100,3,0,0x5E601500,3,0 0x57610100,3,0,0x5E600500,3,0=0x57610100,3,0,0x5E601500,3,0 ;00 to 0x5E60x600 (SAM 6 OxO) -0x57610100,1,0,0x5E600600,1,0=0x57610100,1,0,0x5E601600,1,0; conflicting-override -0x57610100,1,0,0x5E600600,3,0=0x57610100,1,0,0x5E601600,1,0; conflicting-override +0x57610100,1,0,0x5E600600,1,0=0x57610100,1,0,0x5E601600,1,0 +0x57610100,1,0,0x5E600600,3,0=0x57610100,1,0,0x5E601600,1,0 0x57610100,3,0,0x5E600600,1,0=0x57610100,3,0,0x5E601600,3,0 0x57610100,3,0,0x5E600600,3,0=0x57610100,3,0,0x5E601600,3,0 ;00 to 0x5E60x700 (SAM 7 OxO) -0x57610100,1,0,0x5E600700,1,0=0x57610100,1,0,0x5E601700,1,0; conflicting-override -0x57610100,1,0,0x5E600700,3,0=0x57610100,1,0,0x5E601700,1,0; conflicting-override +0x57610100,1,0,0x5E600700,1,0=0x57610100,1,0,0x5E601700,1,0 +0x57610100,1,0,0x5E600700,3,0=0x57610100,1,0,0x5E601700,1,0 0x57610100,3,0,0x5E600700,1,0=0x57610100,3,0,0x5E601700,3,0 0x57610100,3,0,0x5E600700,3,0=0x57610100,3,0,0x5E601700,3,0 ;00 to 0x5E60x800 (SAM 8 OxO) -0x57610100,1,0,0x5E600800,1,0=0x57610100,1,0,0x5E601800,1,0; conflicting-override -0x57610100,1,0,0x5E600800,3,0=0x57610100,1,0,0x5E601800,1,0; conflicting-override +0x57610100,1,0,0x5E600800,1,0=0x57610100,1,0,0x5E601800,1,0 +0x57610100,1,0,0x5E600800,3,0=0x57610100,1,0,0x5E601800,1,0 0x57610100,3,0,0x5E600800,1,0=0x57610100,3,0,0x5E601800,3,0 0x57610100,3,0,0x5E600800,3,0=0x57610100,3,0,0x5E601800,3,0 ;00 to 0x5E60x900 (SAM 9 OxO) -0x57610100,1,0,0x5E600900,1,0=0x57610100,1,0,0x5E601900,1,0; conflicting-override -0x57610100,1,0,0x5E600900,3,0=0x57610100,1,0,0x5E601900,1,0; conflicting-override +0x57610100,1,0,0x5E600900,1,0=0x57610100,1,0,0x5E601900,1,0 +0x57610100,1,0,0x5E600900,3,0=0x57610100,1,0,0x5E601900,1,0 0x57610100,3,0,0x5E600900,1,0=0x57610100,3,0,0x5E601900,3,0 0x57610100,3,0,0x5E600900,3,0=0x57610100,3,0,0x5E601900,3,0 ;00 to 0x5E60xA00 (SAM 10 OxO) -0x57610100,1,0,0x5E600A00,1,0=0x57610100,1,0,0x5E601A00,1,0; conflicting-override -0x57610100,1,0,0x5E600A00,3,0=0x57610100,1,0,0x5E601A00,1,0; conflicting-override +0x57610100,1,0,0x5E600A00,1,0=0x57610100,1,0,0x5E601A00,1,0 +0x57610100,1,0,0x5E600A00,3,0=0x57610100,1,0,0x5E601A00,1,0 0x57610100,3,0,0x5E600A00,1,0=0x57610100,3,0,0x5E601A00,3,0 0x57610100,3,0,0x5E600A00,3,0=0x57610100,3,0,0x5E601A00,3,0 ;00 to 0x5E60xB00 (SAM 11 OxO) -0x57610100,1,0,0x5E600B00,1,0=0x57610100,1,0,0x5E601B00,1,0; conflicting-override -0x57610100,1,0,0x5E600B00,3,0=0x57610100,1,0,0x5E601B00,1,0; conflicting-override +0x57610100,1,0,0x5E600B00,1,0=0x57610100,1,0,0x5E601B00,1,0 +0x57610100,1,0,0x5E600B00,3,0=0x57610100,1,0,0x5E601B00,1,0 0x57610100,3,0,0x5E600B00,1,0=0x57610100,3,0,0x5E601B00,3,0 0x57610100,3,0,0x5E600B00,3,0=0x57610100,3,0,0x5E601B00,3,0 ;----OxD Crossings---- @@ -738,19 +738,19 @@ 0x57610100,3,0,0x5E620B00,1,1=0x57610100,3,0,0x5E621B80,1,1 ;----OxO T Crossings---- ;00 to T-00 (Street Ends) -0x57610100,1,0,0x57600000,1,0=0x57610100,1,0,0x57610000,1,0; conflicting-override +0x57610100,1,0,0x57600000,1,0=0x57610100,1,0,0x57610000,1,0 0x57610100,3,0,0x57600000,3,0=0x57610100,3,0,0x57610000,3,0 -0x57610100,1,0,0x57600000,3,0=0x57610100,1,0,0x57610080,3,0; conflicting-override +0x57610100,1,0,0x57600000,3,0=0x57610100,1,0,0x57610080,3,0 0x57610100,3,0,0x57600000,1,0=0x57610100,3,0,0x57610080,1,0 ;00 to T-01 (Road Ends) -0x57610100,1,0,0x57600100,1,0=0x57610100,1,0,0x57610100,1,0; conflicting-override +0x57610100,1,0,0x57600100,1,0=0x57610100,1,0,0x57610100,1,0 0x57610100,3,0,0x57600100,3,0=0x57610100,3,0,0x57610100,3,0 -0x57610100,1,0,0x57600100,3,0=0x57610100,1,0,0x57610180,3,0; conflicting-override +0x57610100,1,0,0x57600100,3,0=0x57610100,1,0,0x57610180,3,0 0x57610100,3,0,0x57600100,1,0=0x57610100,3,0,0x57610180,1,0 ;00 to T-02 (OWR Ends) -0x57610100,1,0,0x57600200,1,0=0x57610100,1,0,0x57610200,1,0; conflicting-override +0x57610100,1,0,0x57600200,1,0=0x57610100,1,0,0x57610200,1,0 0x57610100,3,0,0x57600200,3,0=0x57610100,3,0,0x57610200,3,0 -0x57610100,1,0,0x57600200,3,0=0x57610100,1,0,0x57610280,3,0; conflicting-override +0x57610100,1,0,0x57600200,3,0=0x57610100,1,0,0x57610280,3,0 0x57610100,3,0,0x57600200,1,0=0x57610100,3,0,0x57610280,1,0 ;00 to T-03 (Avenue Ends) 0x57610100,1,0,0x57600300,1,1=0x57610100,1,0,0x57610300,1,1 @@ -758,39 +758,39 @@ 0x57610100,1,0,0x57600300,3,0=0x57610100,1,0,0x57610380,3,0 0x57610100,3,0,0x57600300,1,1=0x57610100,3,0,0x57610380,1,1 ;00 to T-04 (RHW-2 Ends) -0x57610100,1,0,0x57600400,1,0=0x57610100,1,0,0x57610400,1,0; conflicting-override +0x57610100,1,0,0x57600400,1,0=0x57610100,1,0,0x57610400,1,0 0x57610100,3,0,0x57600400,3,0=0x57610100,3,0,0x57610400,3,0 -0x57610100,1,0,0x57600400,3,0=0x57610100,1,0,0x57610480,3,0; conflicting-override +0x57610100,1,0,0x57600400,3,0=0x57610100,1,0,0x57610480,3,0 0x57610100,3,0,0x57600400,1,0=0x57610100,3,0,0x57610480,1,0 ;00 to T-05 (RHW-3 Ends) ;00 to T-07 (TLA-3 Ends) -0x57610100,1,0,0x57600700,1,0=0x57610100,1,0,0x57610700,1,0; conflicting-override +0x57610100,1,0,0x57600700,1,0=0x57610100,1,0,0x57610700,1,0 0x57610100,3,0,0x57600700,3,0=0x57610100,3,0,0x57610700,3,0 -0x57610100,1,0,0x57600700,3,0=0x57610100,1,0,0x57610780,3,0; conflicting-override +0x57610100,1,0,0x57600700,3,0=0x57610100,1,0,0x57610780,3,0 0x57610100,3,0,0x57600700,1,0=0x57610100,3,0,0x57610780,1,0 ;00 to T-08 (AVE-2 Ends) -0x57610100,1,0,0x57600800,1,0=0x57610100,1,0,0x57610800,1,0; conflicting-override +0x57610100,1,0,0x57600800,1,0=0x57610100,1,0,0x57610800,1,0 0x57610100,3,0,0x57600800,3,0=0x57610100,3,0,0x57610800,3,0 -0x57610100,1,0,0x57600800,3,0=0x57610100,1,0,0x57610880,3,0; conflicting-override +0x57610100,1,0,0x57600800,3,0=0x57610100,1,0,0x57610880,3,0 0x57610100,3,0,0x57600800,1,0=0x57610100,3,0,0x57610880,1,0 ;00 to T-09 (ARD-3 Ends) -0x57610100,1,0,0x57600900,1,0=0x57610100,1,0,0x57610900,1,0; conflicting-override +0x57610100,1,0,0x57600900,1,0=0x57610100,1,0,0x57610900,1,0 0x57610100,3,0,0x57600900,3,0=0x57610100,3,0,0x57610900,3,0 -0x57610100,1,0,0x57600900,3,0=0x57610100,1,0,0x57610980,3,0; conflicting-override +0x57610100,1,0,0x57600900,3,0=0x57610100,1,0,0x57610980,3,0 0x57610100,3,0,0x57600900,1,0=0x57610100,3,0,0x57610980,1,0 -0x57610100,1,0,0x57600909,1,0=0x57610100,1,0,0x57610909,1,0; conflicting-override +0x57610100,1,0,0x57600909,1,0=0x57610100,1,0,0x57610909,1,0 0x57610100,3,0,0x57600909,3,0=0x57610100,3,0,0x57610909,3,0 -0x57610100,1,0,0x57600909,3,0=0x57610100,1,0,0x57610989,3,0; conflicting-override +0x57610100,1,0,0x57600909,3,0=0x57610100,1,0,0x57610989,3,0 0x57610100,3,0,0x57600909,1,0=0x57610100,3,0,0x57610989,1,0 ;00 to T-0A (OWR-1 Ends) -0x57610100,1,0,0x57600A00,1,0=0x57610100,1,0,0x57610A00,1,0; conflicting-override +0x57610100,1,0,0x57600A00,1,0=0x57610100,1,0,0x57610A00,1,0 0x57610100,3,0,0x57600A00,3,0=0x57610100,3,0,0x57610A00,3,0 -0x57610100,1,0,0x57600A00,3,0=0x57610100,1,0,0x57610A80,3,0; conflicting-override +0x57610100,1,0,0x57600A00,3,0=0x57610100,1,0,0x57610A80,3,0 0x57610100,3,0,0x57600A00,1,0=0x57610100,3,0,0x57610A80,1,0 ;00 to T-0B (OWR-3 Ends) -0x57610100,1,0,0x57600C00,1,0=0x57610100,1,0,0x57610B00,1,0; conflicting-override +0x57610100,1,0,0x57600C00,1,0=0x57610100,1,0,0x57610B00,1,0 0x57610100,3,0,0x57600C00,3,0=0x57610100,3,0,0x57610B00,3,0 -0x57610100,1,0,0x57600C00,3,0=0x57610100,1,0,0x57610B80,3,0; conflicting-override +0x57610100,1,0,0x57600C00,3,0=0x57610100,1,0,0x57610B80,3,0 0x57610100,3,0,0x57600C00,1,0=0x57610100,3,0,0x57610B80,1,0 ;00 to T-0C (NRD-4 Ends) 0x57610100,1,0,0x57600C00,1,0=0x57610100,1,0,0x57610C00,1,0; conflicting-override @@ -798,9 +798,9 @@ 0x57610100,1,0,0x57600C00,3,0=0x57610100,1,0,0x57610C80,3,0; conflicting-override 0x57610100,3,0,0x57600C00,1,0=0x57610100,3,0,0x57610C80,1,0; conflicting-override ;00 to T-0D (TLA-5 Ends) -0x57610100,1,0,0x57600D00,1,0=0x57610100,1,0,0x57610D00,1,0; conflicting-override +0x57610100,1,0,0x57600D00,1,0=0x57610100,1,0,0x57610D00,1,0 0x57610100,3,0,0x57600D00,3,0=0x57610100,3,0,0x57610D00,3,0 -0x57610100,1,0,0x57600D00,3,0=0x57610100,1,0,0x57610D80,3,0; conflicting-override +0x57610100,1,0,0x57600D00,3,0=0x57610100,1,0,0x57610D80,3,0 0x57610100,3,0,0x57600D00,1,0=0x57610100,3,0,0x57610D80,1,0 ;00 to T-0E (OWR-4 Ends) ;00 to T-0F (OWR-5 Ends) @@ -809,7 +809,7 @@ ;00 to T-12 (OWR Thru) ;00 to T-13 (Avenue Thru) ;Short -0x57610100,1,0,0x57601300,2,0=0x57610100,1,0,0x57601300,0,1; conflicting-override +0x57610100,1,0,0x57601300,2,0=0x57610100,1,0,0x57601300,0,1 ;0x57610100,3,0,0x57601300,2,0=0x57610100,3,0,0x57601300,2,0 ;redundant prevent ;Long (see 13_Avenue_OxO) ;00 to T-14 (RHW-2 Thru) @@ -840,7 +840,7 @@ ;00 to F0 (Street) ;00 to F1 (Road) ;00 to F2 (OWR) -0x57610100,1,0,0x5700F200,1,0=0x57610100,1,0,0x5701F200,1,0; conflicting-override +0x57610100,1,0,0x5700F200,1,0=0x57610100,1,0,0x5701F200,1,0 0x57610100,3,0,0x5700F200,1,0=0x57610100,3,0,0x5701F200,3,1 ;00 to F3 (MHW) ;Handled by RUL1 @@ -883,16 +883,16 @@ ;add ;--FLEXHeight-- ;Up -0x57610100,1,0,0x57700230,1,0=0x57610100,1,0,0x57711230,1,0; conflicting-override +0x57610100,1,0,0x57700230,1,0=0x57610100,1,0,0x57711230,1,0 0x57610100,3,0,0x57700230,1,0=0x57610100,3,0,0x57711230,3,1 ;Down ;--FLEXOnSlope-- ;Up 1 -0x57610100,1,0,0x57700000,1,0=0x57610100,1,0,0x57711000,1,0; conflicting-override +0x57610100,1,0,0x57700000,1,0=0x57610100,1,0,0x57711000,1,0 0x57610100,3,0,0x57700000,1,0=0x57610100,3,0,0x57711000,3,1 ;Down 1 ;Up 2 -0x57610100,1,0,0x57700100,1,0=0x57610100,1,0,0x57711100,1,0; conflicting-override +0x57610100,1,0,0x57700100,1,0=0x57610100,1,0,0x57711100,1,0 0x57610100,3,0,0x57700100,1,0=0x57610100,3,0,0x57711100,3,1 ;Down 2 ;--FLEXWidth-- diff --git a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/T01B_Road_ThruT_OxO.txt b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/T01B_Road_ThruT_OxO.txt index 14aaa3a31..a4ab54181 100644 --- a/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/T01B_Road_ThruT_OxO.txt +++ b/Controller/RUL2/07_RHW/Sec7b_BaseNetwork/T01B_Road_ThruT_OxO.txt @@ -13,11 +13,11 @@ ;00 to 00 (Orth) 0x57610180,3,0,0x57000000,1,0=0x57610180,3,0,0x57010000,1,0 0x57610180,3,0,0x57000000,3,0=0x57610180,3,0,0x57010000,1,0 -0x57610180,1,0,0x57000000,1,0=0x57610180,1,0,0x57010000,3,0; conflicting-override -0x57610180,1,0,0x57000000,3,0=0x57610180,1,0,0x57010000,3,0; conflicting-override +0x57610180,1,0,0x57000000,1,0=0x57610180,1,0,0x57010000,3,0 +0x57610180,1,0,0x57000000,3,0=0x57610180,1,0,0x57010000,3,0 ;00 to 01 (Orth Stub) 0x57610180,3,0,0x57000100,1,0=0x57610180,3,0,0x57010100,1,0 -0x57610180,1,0,0x57000100,1,0=0x57610180,1,0,0x57010100,3,1; conflicting-override +0x57610180,1,0,0x57000100,1,0=0x57610180,1,0,0x57010100,3,1 ;00 to 04 (Orth-Diag) 0x57610180,3,0,0x57000400,3,0=0x57610180,3,0,0x57010B00,3,0 0x57610180,3,0,0x57000400,1,1=0x57610180,3,0,0x57010400,1,1 @@ -28,127 +28,127 @@ ;00 to 10 (Street OxO) 0x57610180,3,0,0x57001000,1,0=0x57610180,3,0,0x57011000,1,0 0x57610180,3,0,0x57001000,3,0=0x57610180,3,0,0x57011000,1,0 -0x57610180,1,0,0x57001000,1,0=0x57610180,1,0,0x57011000,3,0; conflicting-override -0x57610180,1,0,0x57001000,3,0=0x57610180,1,0,0x57011000,3,0; conflicting-override +0x57610180,1,0,0x57001000,1,0=0x57610180,1,0,0x57011000,3,0 +0x57610180,1,0,0x57001000,3,0=0x57610180,1,0,0x57011000,3,0 ;00 to 10-1 (L1 Street OxO) 0x57610180,3,0,0x57001010,1,0=0x57610180,3,0,0x57011010,1,0 0x57610180,3,0,0x57001010,3,0=0x57610180,3,0,0x57011010,1,0 -0x57610180,1,0,0x57001010,1,0=0x57610180,1,0,0x57011010,3,0; conflicting-override -0x57610180,1,0,0x57001010,3,0=0x57610180,1,0,0x57011010,3,0; conflicting-override +0x57610180,1,0,0x57001010,1,0=0x57610180,1,0,0x57011010,3,0 +0x57610180,1,0,0x57001010,3,0=0x57610180,1,0,0x57011010,3,0 ;00 to 10-2 (L2 Street OxO) 0x57610180,3,0,0x57001020,1,0=0x57610180,3,0,0x57011020,1,0 0x57610180,3,0,0x57001020,3,0=0x57610180,3,0,0x57011020,1,0 -0x57610180,1,0,0x57001020,1,0=0x57610180,1,0,0x57011020,3,0; conflicting-override -0x57610180,1,0,0x57001020,3,0=0x57610180,1,0,0x57011020,3,0; conflicting-override +0x57610180,1,0,0x57001020,1,0=0x57610180,1,0,0x57011020,3,0 +0x57610180,1,0,0x57001020,3,0=0x57610180,1,0,0x57011020,3,0 ;00 to 11 (Road OxO) 0x57610180,3,0,0x57001100,1,0=0x57610180,3,0,0x57011100,1,0 0x57610180,3,0,0x57001100,3,0=0x57610180,3,0,0x57011100,1,0 -0x57610180,1,0,0x57001100,1,0=0x57610180,1,0,0x57011100,3,0; conflicting-override -0x57610180,1,0,0x57001100,3,0=0x57610180,1,0,0x57011100,3,0; conflicting-override +0x57610180,1,0,0x57001100,1,0=0x57610180,1,0,0x57011100,3,0 +0x57610180,1,0,0x57001100,3,0=0x57610180,1,0,0x57011100,3,0 ;00 to 11-1 (L1 Road OxO) 0x57610180,3,0,0x57001110,1,0=0x57610180,3,0,0x57011110,1,0 0x57610180,3,0,0x57001110,3,0=0x57610180,3,0,0x57011110,1,0 -0x57610180,1,0,0x57001110,1,0=0x57610180,1,0,0x57011110,3,0; conflicting-override -0x57610180,1,0,0x57001110,3,0=0x57610180,1,0,0x57011110,3,0; conflicting-override +0x57610180,1,0,0x57001110,1,0=0x57610180,1,0,0x57011110,3,0 +0x57610180,1,0,0x57001110,3,0=0x57610180,1,0,0x57011110,3,0 ;00 to 11-2 (L2 Road OxO) 0x57610180,3,0,0x57001120,1,0=0x57610180,3,0,0x57011120,1,0 0x57610180,3,0,0x57001120,3,0=0x57610180,3,0,0x57011120,1,0 -0x57610180,1,0,0x57001120,1,0=0x57610180,1,0,0x57011120,3,0; conflicting-override -0x57610180,1,0,0x57001120,3,0=0x57610180,1,0,0x57011120,3,0; conflicting-override +0x57610180,1,0,0x57001120,1,0=0x57610180,1,0,0x57011120,3,0 +0x57610180,1,0,0x57001120,3,0=0x57610180,1,0,0x57011120,3,0 ;00 to 12 (OWR OxO) 0x57610180,3,0,0x57001200,1,0=0x57610180,3,0,0x57011200,1,0 0x57610180,3,0,0x57001200,3,0=0x57610180,3,0,0x57011200,1,0 -0x57610180,1,0,0x57001200,1,0=0x57610180,1,0,0x57011200,3,0; conflicting-override -0x57610180,1,0,0x57001200,3,0=0x57610180,1,0,0x57011200,3,0; conflicting-override +0x57610180,1,0,0x57001200,1,0=0x57610180,1,0,0x57011200,3,0 +0x57610180,1,0,0x57001200,3,0=0x57610180,1,0,0x57011200,3,0 ;00 to 12-1 (L1 OWR OxO) 0x57610180,3,0,0x57001210,1,0=0x57610180,3,0,0x57011210,1,0 0x57610180,3,0,0x57001210,3,0=0x57610180,3,0,0x57011210,1,0 -0x57610180,1,0,0x57001210,1,0=0x57610180,1,0,0x57011210,3,0; conflicting-override -0x57610180,1,0,0x57001210,3,0=0x57610180,1,0,0x57011210,3,0; conflicting-override +0x57610180,1,0,0x57001210,1,0=0x57610180,1,0,0x57011210,3,0 +0x57610180,1,0,0x57001210,3,0=0x57610180,1,0,0x57011210,3,0 ;00 to 12-2 (L2 OWR OxO) 0x57610180,3,0,0x57001220,1,0=0x57610180,3,0,0x57011220,1,0 0x57610180,3,0,0x57001220,3,0=0x57610180,3,0,0x57011220,1,0 -0x57610180,1,0,0x57001220,1,0=0x57610180,1,0,0x57011220,3,0; conflicting-override -0x57610180,1,0,0x57001220,3,0=0x57610180,1,0,0x57011220,3,0; conflicting-override +0x57610180,1,0,0x57001220,1,0=0x57610180,1,0,0x57011220,3,0 +0x57610180,1,0,0x57001220,3,0=0x57610180,1,0,0x57011220,3,0 ;00 to 13 (Avenue OxO) 0x57610180,3,0,0x57001300,3,0=0x57610180,3,0,0x57011300,1,1 -0x57610180,1,0,0x57001300,3,0=0x57610180,1,0,0x57011300,3,0; conflicting-override +0x57610180,1,0,0x57001300,3,0=0x57610180,1,0,0x57011300,3,0 ;00 to 13-1 (L1 Avenue OxO) 0x57610180,3,0,0x57001310,3,0=0x57610180,3,0,0x57011310,1,1 -0x57610180,1,0,0x57001310,3,0=0x57610180,1,0,0x57011310,3,0; conflicting-override +0x57610180,1,0,0x57001310,3,0=0x57610180,1,0,0x57011310,3,0 ;00 to 13-2 (L2 Avenue OxO) 0x57610180,3,0,0x57001320,3,0=0x57610180,3,0,0x57011320,1,1 -0x57610180,1,0,0x57001320,3,0=0x57610180,1,0,0x57011320,3,0; conflicting-override +0x57610180,1,0,0x57001320,3,0=0x57610180,1,0,0x57011320,3,0 ;00 to 14-2 (L2 MHW OxO) 0x57610180,3,0,0x57001420,3,0=0x57610180,3,0,0x57011420,1,1 -0x57610180,1,0,0x57001420,3,0=0x57610180,1,0,0x57011420,3,0; conflicting-override +0x57610180,1,0,0x57001420,3,0=0x57610180,1,0,0x57011420,3,0 ;00 to 15a (Rail DTR OxO) 0x57610180,3,0,0x57001500,1,0=0x57610180,3,0,0x57011500,1,0 0x57610180,3,0,0x57001500,3,0=0x57610180,3,0,0x57011500,1,0 -0x57610180,1,0,0x57001500,1,0=0x57610180,1,0,0x57011500,3,0; conflicting-override -0x57610180,1,0,0x57001500,3,0=0x57610180,1,0,0x57011500,3,0; conflicting-override +0x57610180,1,0,0x57001500,1,0=0x57610180,1,0,0x57011500,3,0 +0x57610180,1,0,0x57001500,3,0=0x57610180,1,0,0x57011500,3,0 ;00 to 15-1a (L1 Rail DTR OxO) 0x57610180,3,0,0x5D671A00,0,0=0x57610180,3,0,0x5D671b00,2,0 0x57610180,3,0,0x5D671A00,2,0=0x57610180,3,0,0x5D671b00,2,0 -0x57610180,1,0,0x5D671A00,0,0=0x57610180,1,0,0x5D671b00,0,0; conflicting-override -0x57610180,1,0,0x5D671A00,2,0=0x57610180,1,0,0x5D671b00,0,0; conflicting-override +0x57610180,1,0,0x5D671A00,0,0=0x57610180,1,0,0x5D671b00,0,0 +0x57610180,1,0,0x5D671A00,2,0=0x57610180,1,0,0x5D671b00,0,0 ;00 to 15-2a (L2 Rail DTR OxO) 0x57610180,3,0,0x5D771A00,0,0=0x57610180,3,0,0x5D771b00,2,0 0x57610180,3,0,0x5D771A00,2,0=0x57610180,3,0,0x5D771b00,2,0 -0x57610180,1,0,0x5D771A00,0,0=0x57610180,1,0,0x5D771b00,0,0; conflicting-override -0x57610180,1,0,0x5D771A00,2,0=0x57610180,1,0,0x5D771b00,0,0; conflicting-override +0x57610180,1,0,0x5D771A00,0,0=0x57610180,1,0,0x5D771b00,0,0 +0x57610180,1,0,0x5D771A00,2,0=0x57610180,1,0,0x5D771b00,0,0 ;00 to 15b (Rail STR OxO) 0x57610180,3,0,0x57001509,1,0=0x57610180,3,0,0x57011509,1,0 0x57610180,3,0,0x57001509,3,0=0x57610180,3,0,0x57011509,1,0 -0x57610180,1,0,0x57001509,1,0=0x57610180,1,0,0x57011509,3,0; conflicting-override -0x57610180,1,0,0x57001509,3,0=0x57610180,1,0,0x57011509,3,0; conflicting-override +0x57610180,1,0,0x57001509,1,0=0x57610180,1,0,0x57011509,3,0 +0x57610180,1,0,0x57001509,3,0=0x57610180,1,0,0x57011509,3,0 ;00 to 17a (GLR 1 OxO) 0x57610180,3,0,0x57001700,1,0=0x57610180,3,0,0x57011700,1,0 0x57610180,3,0,0x57001700,3,0=0x57610180,3,0,0x57011700,1,0 -0x57610180,1,0,0x57001700,1,0=0x57610180,1,0,0x57011700,3,0; conflicting-override -0x57610180,1,0,0x57001700,3,0=0x57610180,1,0,0x57011700,3,0; conflicting-override +0x57610180,1,0,0x57001700,1,0=0x57610180,1,0,0x57011700,3,0 +0x57610180,1,0,0x57001700,3,0=0x57610180,1,0,0x57011700,3,0 ;00 to 17b (GLR 2 OxO) 0x57610180,3,0,0x57001709,1,0=0x57610180,3,0,0x57011709,1,0 0x57610180,3,0,0x57001709,3,0=0x57610180,3,0,0x57011709,1,0 -0x57610180,1,0,0x57001709,1,0=0x57610180,1,0,0x57011709,3,0; conflicting-override -0x57610180,1,0,0x57001709,3,0=0x57610180,1,0,0x57011709,3,0; conflicting-override +0x57610180,1,0,0x57001709,1,0=0x57610180,1,0,0x57011709,3,0 +0x57610180,1,0,0x57001709,3,0=0x57610180,1,0,0x57011709,3,0 ;00 to 17-2 (ELR OxO) 0x57610180,3,0,0x57001720,1,0=0x57610180,3,0,0x57011720,1,0 0x57610180,3,0,0x57001720,3,0=0x57610180,3,0,0x57011720,1,0 -0x57610180,1,0,0x57001720,1,0=0x57610180,1,0,0x57011720,3,0; conflicting-override -0x57610180,1,0,0x57001720,3,0=0x57610180,1,0,0x57011720,3,0; conflicting-override +0x57610180,1,0,0x57001720,1,0=0x57610180,1,0,0x57011720,3,0 +0x57610180,1,0,0x57001720,3,0=0x57610180,1,0,0x57011720,3,0 ;00 to 18a (GLR 3 OxO) 0x57610180,3,0,0x57001800,1,0=0x57610180,3,0,0x57011800,1,0 0x57610180,3,0,0x57001800,3,0=0x57610180,3,0,0x57011800,1,0 -0x57610180,1,0,0x57001800,1,0=0x57610180,1,0,0x57011800,3,0; conflicting-override -0x57610180,1,0,0x57001800,3,0=0x57610180,1,0,0x57011800,3,0; conflicting-override +0x57610180,1,0,0x57001800,1,0=0x57610180,1,0,0x57011800,3,0 +0x57610180,1,0,0x57001800,3,0=0x57610180,1,0,0x57011800,3,0 ;00 to 18b (GLR 4 OxO) 0x57610180,3,0,0x57001809,1,0=0x57610180,3,0,0x57011809,1,0 0x57610180,3,0,0x57001809,3,0=0x57610180,3,0,0x57011809,1,0 -0x57610180,1,0,0x57001809,1,0=0x57610180,1,0,0x57011809,3,0; conflicting-override -0x57610180,1,0,0x57001809,3,0=0x57610180,1,0,0x57011809,3,0; conflicting-override +0x57610180,1,0,0x57001809,1,0=0x57610180,1,0,0x57011809,3,0 +0x57610180,1,0,0x57001809,3,0=0x57610180,1,0,0x57011809,3,0 ;00 to 19b (GHSR OxO) ;00 to 19-2a (Monorail OxO) 0x57610180,3,0,0x57001920,1,0=0x57610180,3,0,0x57011920,1,0 0x57610180,3,0,0x57001920,3,0=0x57610180,3,0,0x57011920,1,0 -0x57610180,1,0,0x57001920,1,0=0x57610180,1,0,0x57011920,3,0; conflicting-override -0x57610180,1,0,0x57001920,3,0=0x57610180,1,0,0x57011920,3,0; conflicting-override +0x57610180,1,0,0x57001920,1,0=0x57610180,1,0,0x57011920,3,0 +0x57610180,1,0,0x57001920,3,0=0x57610180,1,0,0x57011920,3,0 ;00 to 19-2b (HSR OxO) 0x57610180,3,0,0x57001925,1,0=0x57610180,3,0,0x57011925,1,0 0x57610180,3,0,0x57001925,3,0=0x57610180,3,0,0x57011925,1,0 -0x57610180,1,0,0x57001925,1,0=0x57610180,1,0,0x57011925,3,0; conflicting-override -0x57610180,1,0,0x57001925,3,0=0x57610180,1,0,0x57011925,3,0; conflicting-override +0x57610180,1,0,0x57001925,1,0=0x57610180,1,0,0x57011925,3,0 +0x57610180,1,0,0x57001925,3,0=0x57610180,1,0,0x57011925,3,0 ;RHW +-Crossings Handled By Meta Code ;00 to 27 (TLA-3 OxO) 0x57610180,3,0,0x57002700,1,0=0x57610180,3,0,0x57012700,1,0 0x57610180,3,0,0x57002700,3,0=0x57610180,3,0,0x57012700,1,0 -0x57610180,1,0,0x57002700,1,0=0x57610180,1,0,0x57012700,3,0; conflicting-override -0x57610180,1,0,0x57002700,3,0=0x57610180,1,0,0x57012700,3,0; conflicting-override +0x57610180,1,0,0x57002700,1,0=0x57610180,1,0,0x57012700,3,0 +0x57610180,1,0,0x57002700,3,0=0x57610180,1,0,0x57012700,3,0 ;00 to 28 (AVE-2 OxO) 0x57610180,3,0,0x57002800,1,0=0x57610180,3,0,0x57012800,1,0 0x57610180,3,0,0x57002800,3,0=0x57610180,3,0,0x57012800,1,0 -0x57610180,1,0,0x57002800,1,0=0x57610180,1,0,0x57012800,3,0; conflicting-override -0x57610180,1,0,0x57002800,3,0=0x57610180,1,0,0x57012800,3,0; conflicting-override +0x57610180,1,0,0x57002800,1,0=0x57610180,1,0,0x57012800,3,0 +0x57610180,1,0,0x57002800,3,0=0x57610180,1,0,0x57012800,3,0 ;00 to 28-1 (L1 AVE-2 OxO) ;0x57610180,3,0,0x57002810,1,0=0x57610180,3,0,0x57012810,1,0 ;0x57610180,3,0,0x57002810,3,0=0x57610180,3,0,0x57012810,1,0 @@ -162,8 +162,8 @@ ;00 to 29 (ARD-3 OxO) 0x57610180,3,0,0x57002900,1,0=0x57610180,3,0,0x57012900,1,0 0x57610180,3,0,0x57002900,3,0=0x57610180,3,0,0x57012900,1,1 -0x57610180,1,0,0x57002900,1,0=0x57610180,1,0,0x57012900,3,1; conflicting-override -0x57610180,1,0,0x57002900,3,0=0x57610180,1,0,0x57012900,3,0; conflicting-override +0x57610180,1,0,0x57002900,1,0=0x57610180,1,0,0x57012900,3,1 +0x57610180,1,0,0x57002900,3,0=0x57610180,1,0,0x57012900,3,0 ;00 to 29-1 (L1 ARD-3 OxO) ;0x57610180,3,0,0x57002910,1,0=0x57610180,3,0,0x57012910,1,0 ;0x57610180,3,0,0x57002910,3,0=0x57610180,3,0,0x57012910,1,1 @@ -177,8 +177,8 @@ ;00 to 2A (OWR-1 OxO) 0x57610180,3,0,0x57002A00,1,0=0x57610180,3,0,0x57012A00,1,0 0x57610180,3,0,0x57002A00,3,0=0x57610180,3,0,0x57012A00,1,0 -0x57610180,1,0,0x57002A00,1,0=0x57610180,1,0,0x57012A00,3,0; conflicting-override -0x57610180,1,0,0x57002A00,3,0=0x57610180,1,0,0x57012A00,3,0; conflicting-override +0x57610180,1,0,0x57002A00,1,0=0x57610180,1,0,0x57012A00,3,0 +0x57610180,1,0,0x57002A00,3,0=0x57610180,1,0,0x57012A00,3,0 ;00 to 2A-1 (L1 OWR-1 OxO) ;0x57610180,3,0,0x57002A10,1,0=0x57610180,3,0,0x57012A10,1,0 ;0x57610180,3,0,0x57002A10,3,0=0x57610180,3,0,0x57012A10,1,0 @@ -192,8 +192,8 @@ ;00 to 2B (OWR-3 OxO) 0x57610180,3,0,0x57002B00,1,0=0x57610180,3,0,0x57012B00,1,0 0x57610180,3,0,0x57002B00,3,0=0x57610180,3,0,0x57012B00,1,0 -0x57610180,1,0,0x57002B00,1,0=0x57610180,1,0,0x57012B00,3,0; conflicting-override -0x57610180,1,0,0x57002B00,3,0=0x57610180,1,0,0x57012B00,3,0; conflicting-override +0x57610180,1,0,0x57002B00,1,0=0x57610180,1,0,0x57012B00,3,0 +0x57610180,1,0,0x57002B00,3,0=0x57610180,1,0,0x57012B00,3,0 ;00 to 2B-1 (L1 OWR-3 OxO) ;0x57610180,3,0,0x57002B10,1,0=0x57610180,3,0,0x57012B10,1,0 ;0x57610180,3,0,0x57002B10,3,0=0x57610180,3,0,0x57012B10,1,0 @@ -207,8 +207,8 @@ ;00 to 2C (NRD-4 OxO) 0x57610180,3,0,0x57002C00,1,0=0x57610180,3,0,0x57012C00,1,0 0x57610180,3,0,0x57002C00,3,0=0x57610180,3,0,0x57012C00,1,0 -0x57610180,1,0,0x57002C00,1,0=0x57610180,1,0,0x57012C00,3,0; conflicting-override -0x57610180,1,0,0x57002C00,3,0=0x57610180,1,0,0x57012C00,3,0; conflicting-override +0x57610180,1,0,0x57002C00,1,0=0x57610180,1,0,0x57012C00,3,0 +0x57610180,1,0,0x57002C00,3,0=0x57610180,1,0,0x57012C00,3,0 ;00 to 2C-1 (L1 NRD-4 OxO) ;0x57610180,3,0,0x57002C10,1,0=0x57610180,3,0,0x57012C10,1,0 ;0x57610180,3,0,0x57002C10,3,0=0x57610180,3,0,0x57012C10,1,0 @@ -221,10 +221,10 @@ ;0x57610180,1,0,0x57002C20,3,0=0x57610180,1,0,0x57012C20,3,0 ;00 to 2D (TLA-5 OxO) 0x57610180,3,0,0x57002D00,3,0=0x57610180,3,0,0x57012D00,1,1 -0x57610180,1,0,0x57002D00,3,0=0x57610180,1,0,0x57012D00,3,0; conflicting-override +0x57610180,1,0,0x57002D00,3,0=0x57610180,1,0,0x57012D00,3,0 ;00 to 2E (OWR-4 OxO) 0x57610180,3,0,0x57002E00,3,0=0x57610180,3,0,0x57012E00,1,1 -0x57610180,1,0,0x57002E00,3,0=0x57610180,1,0,0x57012E00,3,0; conflicting-override +0x57610180,1,0,0x57002E00,3,0=0x57610180,1,0,0x57012E00,3,0 ;00 to 2E-1 (L1 OWR-4 OxO) ;0x57610180,3,0,0x57002E10,3,0=0x57610180,3,0,0x57012E10,1,1 ;0x57610180,1,0,0x57002E10,3,0=0x57610180,1,0,0x57012E10,3,0 @@ -233,7 +233,7 @@ ;0x57610180,1,0,0x57002E20,3,0=0x57610180,1,0,0x57012E20,3,0 ;00 to 2F (OWR-5 OxO) 0x57610180,3,0,0x57002F00,3,0=0x57610180,3,0,0x57012F00,1,1 -0x57610180,1,0,0x57002F00,3,0=0x57610180,1,0,0x57012F00,3,0; conflicting-override +0x57610180,1,0,0x57002F00,3,0=0x57610180,1,0,0x57012F00,3,0 ;00 to 2F-1 (L1 OWR-5 OxO) ;0x57610180,3,0,0x57002F10,3,0=0x57610180,3,0,0x57012F10,1,1 ;0x57610180,1,0,0x57002F10,3,0=0x57610180,1,0,0x57012F10,3,0 @@ -242,12 +242,12 @@ ;0x57610180,1,0,0x57002F20,3,0=0x57610180,1,0,0x57012F20,3,0 ;00 to 30 (RD-4 OxO) 0x57610180,3,0,0x57003000,3,0=0x57610180,3,0,0x57013000,1,1 -0x57610180,1,0,0x57003000,3,0=0x57610180,1,0,0x57013000,3,0; conflicting-override +0x57610180,1,0,0x57003000,3,0=0x57610180,1,0,0x57013000,3,0 ;00 to 30-1 (L1 RD-4 OxO) ;00 to 30-2 (L2 RD-4 OxO) ;00 to 31 (RD-6 OxO) 0x57610180,3,0,0x57003100,3,0=0x57610180,3,0,0x57013100,1,1 -0x57610180,1,0,0x57003100,3,0=0x57610180,1,0,0x57013100,3,0; conflicting-override +0x57610180,1,0,0x57003100,3,0=0x57610180,1,0,0x57013100,3,0 ;00 to 31-1 (L1 RD-6 OxO) ;0x57610180,3,0,0x57003110,3,0=0x57610180,3,0,0x57013110,1,1 ;0x57610180,1,0,0x57003110,3,0=0x57610180,1,0,0x57013110,3,0 @@ -256,9 +256,9 @@ ;0x57610180,1,0,0x57003120,3,0=0x57610180,1,0,0x57013120,3,0 ;00 to 32,33,34,35 (Triple-Tile NWM OxO) 0x57610180,3,0,0x57003200,3,0=0x57610180,3,0,0x57013200,1,1 -0x57610180,1,0,0x57003200,3,0=0x57610180,1,0,0x57013200,3,0; conflicting-override +0x57610180,1,0,0x57003200,3,0=0x57610180,1,0,0x57013200,3,0 0x57610180,3,0,0x57003400,3,0=0x57610180,3,0,0x57013400,1,1 -0x57610180,1,0,0x57003400,3,0=0x57610180,1,0,0x57013400,3,0; conflicting-override +0x57610180,1,0,0x57003400,3,0=0x57610180,1,0,0x57013400,3,0 ;00 to 32-1,33-1,34-1,35-1 (L1 Triple-Tile NWM OxO) ;0x57610180,3,0,0x57003210,3,0=0x57610180,3,0,0x57013210,1,1 ;0x57610180,1,0,0x57003210,3,0=0x57610180,1,0,0x57013210,3,0 @@ -273,22 +273,22 @@ ;00 to 37a (Tram-in-Road OxO) 0x57610180,3,0,0x58480000,0,0=0x57610180,3,0,0x57013700,1,0 0x57610180,3,0,0x58480000,2,0=0x57610180,3,0,0x57013700,1,0 -0x57610180,1,0,0x58480000,0,0=0x57610180,1,0,0x57013700,3,0; conflicting-override -0x57610180,1,0,0x58480000,2,0=0x57610180,1,0,0x57013700,3,0; conflicting-override +0x57610180,1,0,0x58480000,0,0=0x57610180,1,0,0x57013700,3,0 +0x57610180,1,0,0x58480000,2,0=0x57610180,1,0,0x57013700,3,0 ; ; ;00 to 37b (Tram-on-Road OxO) 0x57610180,3,0,0x58486C00,0,0=0x57610180,3,0,0x57013709,1,0 0x57610180,3,0,0x58486C00,2,0=0x57610180,3,0,0x57013709,1,0 -0x57610180,1,0,0x58486C00,0,0=0x57610180,1,0,0x57013709,3,0; conflicting-override -0x57610180,1,0,0x58486C00,2,0=0x57610180,1,0,0x57013709,3,0; conflicting-override +0x57610180,1,0,0x58486C00,0,0=0x57610180,1,0,0x57013709,3,0 +0x57610180,1,0,0x58486C00,2,0=0x57610180,1,0,0x57013709,3,0 ; ; ;00 to 38a (Tram-in-OWR OxO) ;00 to 38b (Tram-on-OWR OxO) ;00 to 39 (Tram-in-Avenue OxO) 0x57610180,3,0,0x58400000,0,0=0x57610180,3,0,0x57013900,1,1 -0x57610180,1,0,0x58400000,0,0=0x57610180,1,0,0x57013900,3,0; conflicting-override +0x57610180,1,0,0x58400000,0,0=0x57610180,1,0,0x57013900,3,0 ; ;00 to 3Aa (PedPath OxO) 0x57010000,1,0,0x57003A00,1,0=0x57010000,1,0,0x57013A00,1,0 @@ -314,53 +314,53 @@ ;00 to 0x5E60x200 (SAM 2 OxO) 0x57610180,3,0,0x5E600200,1,0=0x57610180,3,0,0x5E601200,1,0 0x57610180,3,0,0x5E600200,3,0=0x57610180,3,0,0x5E601200,1,0 -0x57610180,1,0,0x5E600200,1,0=0x57610180,1,0,0x5E601200,3,0; conflicting-override -0x57610180,1,0,0x5E600200,3,0=0x57610180,1,0,0x5E601200,3,0; conflicting-override +0x57610180,1,0,0x5E600200,1,0=0x57610180,1,0,0x5E601200,3,0 +0x57610180,1,0,0x5E600200,3,0=0x57610180,1,0,0x5E601200,3,0 ;00 to 0x5E60x300 (SAM 3 OxO) 0x57610180,3,0,0x5E600300,1,0=0x57610180,3,0,0x5E601300,1,0 0x57610180,3,0,0x5E600300,3,0=0x57610180,3,0,0x5E601300,1,0 -0x57610180,1,0,0x5E600300,1,0=0x57610180,1,0,0x5E601300,3,0; conflicting-override -0x57610180,1,0,0x5E600300,3,0=0x57610180,1,0,0x5E601300,3,0; conflicting-override +0x57610180,1,0,0x5E600300,1,0=0x57610180,1,0,0x5E601300,3,0 +0x57610180,1,0,0x5E600300,3,0=0x57610180,1,0,0x5E601300,3,0 ;00 to 0x5E60x400 (SAM 4 OxO) 0x57610180,3,0,0x5E600400,1,0=0x57610180,3,0,0x5E601400,1,0 0x57610180,3,0,0x5E600400,3,0=0x57610180,3,0,0x5E601400,1,0 -0x57610180,1,0,0x5E600400,1,0=0x57610180,1,0,0x5E601400,3,0; conflicting-override -0x57610180,1,0,0x5E600400,3,0=0x57610180,1,0,0x5E601400,3,0; conflicting-override +0x57610180,1,0,0x5E600400,1,0=0x57610180,1,0,0x5E601400,3,0 +0x57610180,1,0,0x5E600400,3,0=0x57610180,1,0,0x5E601400,3,0 ;00 to 0x5E60x500 (SAM 5 OxO) 0x57610180,3,0,0x5E600500,1,0=0x57610180,3,0,0x5E601500,1,0 0x57610180,3,0,0x5E600500,3,0=0x57610180,3,0,0x5E601500,1,0 -0x57610180,1,0,0x5E600500,1,0=0x57610180,1,0,0x5E601500,3,0; conflicting-override -0x57610180,1,0,0x5E600500,3,0=0x57610180,1,0,0x5E601500,3,0; conflicting-override +0x57610180,1,0,0x5E600500,1,0=0x57610180,1,0,0x5E601500,3,0 +0x57610180,1,0,0x5E600500,3,0=0x57610180,1,0,0x5E601500,3,0 ;00 to 0x5E60x600 (SAM 6 OxO) 0x57610180,3,0,0x5E600600,1,0=0x57610180,3,0,0x5E601600,1,0 0x57610180,3,0,0x5E600600,3,0=0x57610180,3,0,0x5E601600,1,0 -0x57610180,1,0,0x5E600600,1,0=0x57610180,1,0,0x5E601600,3,0; conflicting-override -0x57610180,1,0,0x5E600600,3,0=0x57610180,1,0,0x5E601600,3,0; conflicting-override +0x57610180,1,0,0x5E600600,1,0=0x57610180,1,0,0x5E601600,3,0 +0x57610180,1,0,0x5E600600,3,0=0x57610180,1,0,0x5E601600,3,0 ;00 to 0x5E60x700 (SAM 7 OxO) 0x57610180,3,0,0x5E600700,1,0=0x57610180,3,0,0x5E601700,1,0 0x57610180,3,0,0x5E600700,3,0=0x57610180,3,0,0x5E601700,1,0 -0x57610180,1,0,0x5E600700,1,0=0x57610180,1,0,0x5E601700,3,0; conflicting-override -0x57610180,1,0,0x5E600700,3,0=0x57610180,1,0,0x5E601700,3,0; conflicting-override +0x57610180,1,0,0x5E600700,1,0=0x57610180,1,0,0x5E601700,3,0 +0x57610180,1,0,0x5E600700,3,0=0x57610180,1,0,0x5E601700,3,0 ;00 to 0x5E60x800 (SAM 8 OxO) 0x57610180,3,0,0x5E600800,1,0=0x57610180,3,0,0x5E601800,1,0 0x57610180,3,0,0x5E600800,3,0=0x57610180,3,0,0x5E601800,1,0 -0x57610180,1,0,0x5E600800,1,0=0x57610180,1,0,0x5E601800,3,0; conflicting-override -0x57610180,1,0,0x5E600800,3,0=0x57610180,1,0,0x5E601800,3,0; conflicting-override +0x57610180,1,0,0x5E600800,1,0=0x57610180,1,0,0x5E601800,3,0 +0x57610180,1,0,0x5E600800,3,0=0x57610180,1,0,0x5E601800,3,0 ;00 to 0x5E60x900 (SAM 9 OxO) 0x57610180,3,0,0x5E600900,1,0=0x57610180,3,0,0x5E601900,1,0 0x57610180,3,0,0x5E600900,3,0=0x57610180,3,0,0x5E601900,1,0 -0x57610180,1,0,0x5E600900,1,0=0x57610180,1,0,0x5E601900,3,0; conflicting-override -0x57610180,1,0,0x5E600900,3,0=0x57610180,1,0,0x5E601900,3,0; conflicting-override +0x57610180,1,0,0x5E600900,1,0=0x57610180,1,0,0x5E601900,3,0 +0x57610180,1,0,0x5E600900,3,0=0x57610180,1,0,0x5E601900,3,0 ;00 to 0x5E60xA00 (SAM 10 OxO) 0x57610180,3,0,0x5E600A00,1,0=0x57610180,3,0,0x5E601A00,1,0 0x57610180,3,0,0x5E600A00,3,0=0x57610180,3,0,0x5E601A00,1,0 -0x57610180,1,0,0x5E600A00,1,0=0x57610180,1,0,0x5E601A00,3,0; conflicting-override -0x57610180,1,0,0x5E600A00,3,0=0x57610180,1,0,0x5E601A00,3,0; conflicting-override +0x57610180,1,0,0x5E600A00,1,0=0x57610180,1,0,0x5E601A00,3,0 +0x57610180,1,0,0x5E600A00,3,0=0x57610180,1,0,0x5E601A00,3,0 ;00 to 0x5E60xB00 (SAM 11 OxO) 0x57610180,3,0,0x5E600B00,1,0=0x57610180,3,0,0x5E601B00,1,0 0x57610180,3,0,0x5E600B00,3,0=0x57610180,3,0,0x5E601B00,1,0 -0x57610180,1,0,0x5E600B00,1,0=0x57610180,1,0,0x5E601B00,3,0; conflicting-override -0x57610180,1,0,0x5E600B00,3,0=0x57610180,1,0,0x5E601B00,3,0; conflicting-override +0x57610180,1,0,0x5E600B00,1,0=0x57610180,1,0,0x5E601B00,3,0 +0x57610180,1,0,0x5E600B00,3,0=0x57610180,1,0,0x5E601B00,3,0 ;----OxD Crossings---- ;00 to 40 (Street OxD) 0x57610180,3,0,0x57004000,3,0=0x57610180,3,0,0x57014080,3,0 @@ -741,67 +741,67 @@ 0x57610180,3,0,0x57600000,1,0=0x57610180,3,0,0x57610000,1,0 0x57610180,1,0,0x57600000,3,0=0x57610180,1,0,0x57610000,3,0 0x57610180,3,0,0x57600000,3,0=0x57610180,3,0,0x57610080,3,0 -0x57610180,1,0,0x57600000,1,0=0x57610180,1,0,0x57610080,1,0; conflicting-override +0x57610180,1,0,0x57600000,1,0=0x57610180,1,0,0x57610080,1,0 ;00 to T-01 (Road Ends) 0x57610180,3,0,0x57600100,1,0=0x57610180,3,0,0x57610100,1,0 -0x57610180,1,0,0x57600100,3,0=0x57610180,1,0,0x57610100,3,0; conflicting-override +0x57610180,1,0,0x57600100,3,0=0x57610180,1,0,0x57610100,3,0 0x57610180,3,0,0x57600100,3,0=0x57610180,3,0,0x57610180,3,0 -0x57610180,1,0,0x57600100,1,0=0x57610180,1,0,0x57610180,1,0; conflicting-override +0x57610180,1,0,0x57600100,1,0=0x57610180,1,0,0x57610180,1,0 ;00 to T-02 (OWR Ends) 0x57610180,3,0,0x57600200,1,0=0x57610180,3,0,0x57610200,1,0 -0x57610180,1,0,0x57600200,3,0=0x57610180,1,0,0x57610200,3,0; conflicting-override +0x57610180,1,0,0x57600200,3,0=0x57610180,1,0,0x57610200,3,0 0x57610180,3,0,0x57600200,3,0=0x57610180,3,0,0x57610280,3,0 -0x57610180,1,0,0x57600200,1,0=0x57610180,1,0,0x57610280,1,0; conflicting-override +0x57610180,1,0,0x57600200,1,0=0x57610180,1,0,0x57610280,1,0 ;00 to T-03 (Avenue Ends) 0x57610180,3,0,0x57600300,1,1=0x57610180,3,0,0x57610300,1,1 -0x57610180,1,0,0x57600300,3,0=0x57610180,1,0,0x57610300,3,0; conflicting-override +0x57610180,1,0,0x57600300,3,0=0x57610180,1,0,0x57610300,3,0 0x57610180,3,0,0x57600300,3,0=0x57610180,3,0,0x57610380,3,0 -0x57610180,1,0,0x57600300,1,1=0x57610180,1,0,0x57610380,1,1; conflicting-override +0x57610180,1,0,0x57600300,1,1=0x57610180,1,0,0x57610380,1,1 ;00 to T-04 (RHW-2 Ends) 0x57610180,3,0,0x57600400,1,0=0x57610180,3,0,0x57610400,1,0 -0x57610180,1,0,0x57600400,3,0=0x57610180,1,0,0x57610400,3,0; conflicting-override +0x57610180,1,0,0x57600400,3,0=0x57610180,1,0,0x57610400,3,0 0x57610180,3,0,0x57600400,3,0=0x57610180,3,0,0x57610480,3,0 -0x57610180,1,0,0x57600400,1,0=0x57610180,1,0,0x57610480,1,0; conflicting-override +0x57610180,1,0,0x57600400,1,0=0x57610180,1,0,0x57610480,1,0 ;00 to T-05 (RHW-3 Ends) ;00 to T-07 (TLA-3 Ends) 0x57610180,3,0,0x57600700,1,0=0x57610180,3,0,0x57610700,1,0 -0x57610180,1,0,0x57600700,3,0=0x57610180,1,0,0x57610700,3,0; conflicting-override +0x57610180,1,0,0x57600700,3,0=0x57610180,1,0,0x57610700,3,0 0x57610180,3,0,0x57600700,3,0=0x57610180,3,0,0x57610780,3,0 -0x57610180,1,0,0x57600700,1,0=0x57610180,1,0,0x57610780,1,0; conflicting-override +0x57610180,1,0,0x57600700,1,0=0x57610180,1,0,0x57610780,1,0 ;00 to T-08 (AVE-2 Ends) 0x57610180,3,0,0x57600800,1,0=0x57610180,3,0,0x57610800,1,0 -0x57610180,1,0,0x57600800,3,0=0x57610180,1,0,0x57610800,3,0; conflicting-override +0x57610180,1,0,0x57600800,3,0=0x57610180,1,0,0x57610800,3,0 0x57610180,3,0,0x57600800,3,0=0x57610180,3,0,0x57610880,3,0 -0x57610180,1,0,0x57600800,1,0=0x57610180,1,0,0x57610880,1,0; conflicting-override +0x57610180,1,0,0x57600800,1,0=0x57610180,1,0,0x57610880,1,0 ;00 to T-09 (ARD-3 Ends) 0x57610180,3,0,0x57600900,1,0=0x57610180,3,0,0x57610900,1,0 -0x57610180,1,0,0x57600900,3,0=0x57610180,1,0,0x57610900,3,0; conflicting-override +0x57610180,1,0,0x57600900,3,0=0x57610180,1,0,0x57610900,3,0 0x57610180,3,0,0x57600900,3,0=0x57610180,3,0,0x57610980,3,0 -0x57610180,1,0,0x57600900,1,0=0x57610180,1,0,0x57610980,1,0; conflicting-override +0x57610180,1,0,0x57600900,1,0=0x57610180,1,0,0x57610980,1,0 0x57610180,3,0,0x57600909,1,0=0x57610180,3,0,0x57610909,1,0 -0x57610180,1,0,0x57600909,3,0=0x57610180,1,0,0x57610909,3,0; conflicting-override +0x57610180,1,0,0x57600909,3,0=0x57610180,1,0,0x57610909,3,0 0x57610180,3,0,0x57600909,3,0=0x57610180,3,0,0x57610989,3,0 -0x57610180,1,0,0x57600909,1,0=0x57610180,1,0,0x57610989,1,0; conflicting-override +0x57610180,1,0,0x57600909,1,0=0x57610180,1,0,0x57610989,1,0 ;00 to T-0A (OWR-1 Ends) 0x57610180,3,0,0x57600A00,1,0=0x57610180,3,0,0x57610A00,1,0 -0x57610180,1,0,0x57600A00,3,0=0x57610180,1,0,0x57610A00,3,0; conflicting-override +0x57610180,1,0,0x57600A00,3,0=0x57610180,1,0,0x57610A00,3,0 0x57610180,3,0,0x57600A00,3,0=0x57610180,3,0,0x57610A80,3,0 -0x57610180,1,0,0x57600A00,1,0=0x57610180,1,0,0x57610A80,1,0; conflicting-override +0x57610180,1,0,0x57600A00,1,0=0x57610180,1,0,0x57610A80,1,0 ;00 to T-0B (OWR-3 Ends) -0x57610180,3,0,0x57600C00,1,0=0x57610180,3,0,0x57610B00,1,0 -0x57610180,1,0,0x57600C00,3,0=0x57610180,1,0,0x57610B00,3,0; conflicting-override -0x57610180,3,0,0x57600C00,3,0=0x57610180,3,0,0x57610B80,3,0 -0x57610180,1,0,0x57600C00,1,0=0x57610180,1,0,0x57610B80,1,0; conflicting-override +0x57610180,3,0,0x57600B00,1,0=0x57610180,3,0,0x57610B00,1,0 +0x57610180,1,0,0x57600B00,3,0=0x57610180,1,0,0x57610B00,3,0 +0x57610180,3,0,0x57600B00,3,0=0x57610180,3,0,0x57610B80,3,0 +0x57610180,1,0,0x57600B00,1,0=0x57610180,1,0,0x57610B80,1,0 ;00 to T-0C (NRD-4 Ends) -0x57610180,3,0,0x57600C00,1,0=0x57610180,3,0,0x57610C00,1,0; conflicting-override -0x57610180,1,0,0x57600C00,3,0=0x57610180,1,0,0x57610C00,3,0; conflicting-override -0x57610180,3,0,0x57600C00,3,0=0x57610180,3,0,0x57610C80,3,0; conflicting-override -0x57610180,1,0,0x57600C00,1,0=0x57610180,1,0,0x57610C80,1,0; conflicting-override +0x57610180,3,0,0x57600C00,1,0=0x57610180,3,0,0x57610C00,1,0 +0x57610180,1,0,0x57600C00,3,0=0x57610180,1,0,0x57610C00,3,0 +0x57610180,3,0,0x57600C00,3,0=0x57610180,3,0,0x57610C80,3,0 +0x57610180,1,0,0x57600C00,1,0=0x57610180,1,0,0x57610C80,1,0 ;00 to T-0D (TLA-5 Ends) 0x57610180,3,0,0x57600D00,1,0=0x57610180,3,0,0x57610D00,1,0 -0x57610180,1,0,0x57600D00,3,0=0x57610180,1,0,0x57610D00,3,0; conflicting-override +0x57610180,1,0,0x57600D00,3,0=0x57610180,1,0,0x57610D00,3,0 0x57610180,3,0,0x57600D00,3,0=0x57610180,3,0,0x57610D80,3,0 -0x57610180,1,0,0x57600D00,1,0=0x57610180,1,0,0x57610D80,1,0; conflicting-override +0x57610180,1,0,0x57600D00,1,0=0x57610180,1,0,0x57610D80,1,0 ;00 to T-0E (OWR-4 Ends) ;00 to T-0F (OWR-5 Ends) ;00 to T-10 (Street Thru) @@ -841,7 +841,7 @@ ;00 to F1 (Road) ;00 to F2 (OWR) 0x57610180,3,0,0x5700F200,1,0=0x57610180,3,0,0x5701F200,1,0 -0x57610180,1,0,0x5700F200,1,0=0x57610180,1,0,0x5701F200,3,1; conflicting-override +0x57610180,1,0,0x5700F200,1,0=0x57610180,1,0,0x5701F200,3,1 ;00 to F3 (MHW) ;Handled by RUL1 ;00 to F4 (Avenue) @@ -884,16 +884,16 @@ ;--FLEXHeight-- ;Up 0x57610180,3,0,0x57700230,1,0=0x57610180,3,0,0x57711230,1,0 -0x57610180,1,0,0x57700230,1,0=0x57610180,1,0,0x57711230,3,1; conflicting-override +0x57610180,1,0,0x57700230,1,0=0x57610180,1,0,0x57711230,3,1 ;Down ;--FLEXOnSlope-- ;Up 1 0x57610180,3,0,0x57700000,1,0=0x57610180,3,0,0x57711000,1,0 -0x57610180,1,0,0x57700000,1,0=0x57610180,1,0,0x57711000,3,1; conflicting-override +0x57610180,1,0,0x57700000,1,0=0x57610180,1,0,0x57711000,3,1 ;Down 1 ;Up 2 0x57610180,3,0,0x57700100,1,0=0x57610180,3,0,0x57711100,1,0 -0x57610180,1,0,0x57700100,1,0=0x57610180,1,0,0x57711100,3,1; conflicting-override +0x57610180,1,0,0x57700100,1,0=0x57610180,1,0,0x57711100,3,1 ;Down 2 ;--FLEXWidth-- ;--FARHW-- diff --git a/Controller/RUL2/07_RHW/Sec7h_Flex_Transition/Sec7h0_FlexHT-OST.txt b/Controller/RUL2/07_RHW/Sec7h_Flex_Transition/Sec7h0_FlexHT-OST.txt index da0b3e25a..c69d46311 100644 --- a/Controller/RUL2/07_RHW/Sec7h_Flex_Transition/Sec7h0_FlexHT-OST.txt +++ b/Controller/RUL2/07_RHW/Sec7h_Flex_Transition/Sec7h0_FlexHT-OST.txt @@ -440,10 +440,10 @@ 0x57610000,3,0,0x57700230,1,0=0x57610000,3,0,0x57711230,3,1 0x57610080,3,0,0x57700230,1,0=0x57610080,3,0,0x57711230,1,0 0x57610080,1,0,0x57700230,1,0=0x57610080,1,0,0x57711230,3,1 -0x57610100,1,0,0x57700230,1,0=0x57610100,1,0,0x57711230,1,0; conflicting-override +0x57610100,1,0,0x57700230,1,0=0x57610100,1,0,0x57711230,1,0 0x57610100,3,0,0x57700230,1,0=0x57610100,3,0,0x57711230,3,1 0x57610180,3,0,0x57700230,1,0=0x57610180,3,0,0x57711230,1,0 -0x57610180,1,0,0x57700230,1,0=0x57610180,1,0,0x57711230,3,1; conflicting-override +0x57610180,1,0,0x57700230,1,0=0x57610180,1,0,0x57711230,3,1 0x57610200,1,0,0x57700230,1,0=0x57610200,1,0,0x57711230,1,0 0x57610200,3,0,0x57700230,1,0=0x57610200,3,0,0x57711230,3,1 0x57610280,3,0,0x57700230,1,0=0x57610280,3,0,0x57711230,1,0 diff --git a/Controller/RUL2/07_RHW/Sec7h_Flex_Transition/Sec7h9_FlexWT_LHD.txt b/Controller/RUL2/07_RHW/Sec7h_Flex_Transition/Sec7h9_FlexWT_LHD.txt index 96ed86569..406e6dc43 100644 --- a/Controller/RUL2/07_RHW/Sec7h_Flex_Transition/Sec7h9_FlexWT_LHD.txt +++ b/Controller/RUL2/07_RHW/Sec7h_Flex_Transition/Sec7h9_FlexWT_LHD.txt @@ -138,8 +138,8 @@ 0x57000100,3,0,0x57723400,3,0=0x57030100,3,0,0x57723400,3,0 0x57000100,3,0,0x57732400,1,1=0x57030100,1,1,0x57732400,1,1 ; -0x57701400,3,0,0x57723500,3,0=0x57030000,3,0,0x57723500,3,0; conflicting-override -0x57710400,1,1,0x57732500,1,1=0x57030000,1,0,0x57732500,1,1; conflicting-override +0x57701400,3,0,0x57723500,3,0=0x57030000,3,0,0x57723500,3,0 +0x57710400,1,1,0x57732500,1,1=0x57030000,1,0,0x57732500,1,1 ; 0x57030000,3,0,0x57701400,3,0=0x57030000,3,0,0x57723400,3,0 0x57030000,1,0,0x57710400,1,1=0x57030000,1,0,0x57732400,1,1 @@ -167,8 +167,8 @@ 0x57723600,3,0,0x57000000,3,0=0x57723600,3,0,0x57020000,3,0 0x57732600,1,1,0x57000000,1,0=0x57732600,1,1,0x57020000,1,0 0x57732600,1,1,0x57000000,3,0=0x57732600,1,1,0x57020000,1,0 -0x57723600,3,0,0x57701700,3,0=0x57723600,3,0,0x57020000,3,0; conflicting-override -0x57732600,1,1,0x57710700,1,1=0x57732600,1,1,0x57020000,1,0; conflicting-override +0x57723600,3,0,0x57701700,3,0=0x57723600,3,0,0x57020000,3,0 +0x57732600,1,1,0x57710700,1,1=0x57732600,1,1,0x57020000,1,0 ;3 to 2 0x57701600,3,0,0x57020000,3,0=0x57723600,3,0,0x57020000,3,0 0x57710600,1,1,0x57020000,1,0=0x57732600,1,1,0x57020000,1,0 @@ -342,10 +342,10 @@ 0x57756700,3,0,0x57000100,1,0=0x57756700,3,0,0x57050100,3,1 0x57765700,1,1,0x57000100,1,0=0x57765700,1,1,0x57050100,1,0 ;8S-6S -> 10S-8S Stability -0x57756600,0,0,0x57745680,0,0=0x57756600,0,0,0x57050080,0,0; conflicting-override -0x57754680,0,1,0x57765600,0,1=0x57050080,2,0,0x57765600,0,1; conflicting-override -0x57756700,0,0,0x57745780,0,0=0x57756700,0,0,0x57050080,0,0; conflicting-override -0x57754780,0,1,0x57765700,0,1=0x57050080,2,0,0x57765700,0,1; conflicting-override +0x57756600,0,0,0x57745680,0,0=0x57756600,0,0,0x57050080,0,0 +0x57754680,0,1,0x57765600,0,1=0x57050080,2,0,0x57765600,0,1 +0x57756700,0,0,0x57745780,0,0=0x57756700,0,0,0x57050080,0,0 +0x57754780,0,1,0x57765700,0,1=0x57050080,2,0,0x57765700,0,1 0x57745700,3,0,0x57000000,1,0=0x57756700,3,0,0x57050000,3,0 0x57745700,3,0,0x57000000,3,0=0x57756700,3,0,0x57050000,3,0 ;N to 3 @@ -450,10 +450,10 @@ 0x57776700,1,1,0x57050100,1,0=0x57776700,1,1,0x57060100,1,0 ;8S-6S -> 12S-10S Stability -0x57767600,0,0,0x57745680,0,0=0x57767600,0,0,0x57050080,0,0; conflicting-override -0x57754680,0,1,0x57776600,0,1=0x57050080,2,0,0x57776600,0,1; conflicting-override -0x57767700,0,0,0x57745780,0,0=0x57767700,0,0,0x57050080,0,0; conflicting-override -0x57754780,0,1,0x57776700,0,1=0x57050080,2,0,0x57776700,0,1; conflicting-override +0x57767600,0,0,0x57745680,0,0=0x57767600,0,0,0x57050080,0,0 +0x57754680,0,1,0x57776600,0,1=0x57050080,2,0,0x57776600,0,1 +0x57767700,0,0,0x57745780,0,0=0x57767700,0,0,0x57050080,0,0 +0x57754780,0,1,0x57776700,0,1=0x57050080,2,0,0x57776700,0,1 ;0x57745700,3,0,0x57000000,1,0=0x57767700,3,0,0x57060000,3,0 ;0x57745700,3,0,0x57000000,3,0=0x57767700,3,0,0x57060000,3,0 ;N to 3 @@ -548,8 +548,8 @@ 0x57000100,3,0,0x57723419,3,0=0x57130100,3,0,0x57723419,3,0 0x57000100,3,0,0x57732419,1,1=0x57130100,1,1,0x57732419,1,1 ; -0x57701400,3,0,0x57723519,3,0=0x57130000,3,0,0x57723519,3,0; conflicting-override -0x57710400,1,1,0x57732519,1,1=0x57130000,1,0,0x57732519,1,1; conflicting-override +0x57701400,3,0,0x57723519,3,0=0x57130000,3,0,0x57723519,3,0 +0x57710400,1,1,0x57732519,1,1=0x57130000,1,0,0x57732519,1,1 ; 0x57130000,3,0,0x57701400,3,0=0x57130000,3,0,0x57723419,3,0 0x57130000,1,0,0x57710400,1,1=0x57130000,1,0,0x57732419,1,1 @@ -577,8 +577,8 @@ 0x57723619,3,0,0x57000000,3,0=0x57723619,3,0,0x57120000,3,0 0x57732619,1,1,0x57000000,1,0=0x57732619,1,1,0x57120000,1,0 0x57732619,1,1,0x57000000,3,0=0x57732619,1,1,0x57120000,1,0 -0x57723619,3,0,0x57701700,3,0=0x57723619,3,0,0x57120000,3,0; conflicting-override -0x57732619,1,1,0x57710700,1,1=0x57732619,1,1,0x57120000,1,0; conflicting-override +0x57723619,3,0,0x57701700,3,0=0x57723619,3,0,0x57120000,3,0 +0x57732619,1,1,0x57710700,1,1=0x57732619,1,1,0x57120000,1,0 ; 0x57723619,3,0,0x57000100,1,0=0x57723619,3,0,0x57120100,3,1 0x57732619,1,1,0x57000100,1,0=0x57732619,1,1,0x57120100,1,0 @@ -687,8 +687,8 @@ ;7 to Orth 0x57745799,3,0,0x57000000,1,0=0x57745799,3,0,0x57140000,3,0 0x57745799,3,0,0x57000000,3,0=0x57745799,3,0,0x57140000,3,0 -0x57754799,1,1,0x57000000,1,0=0x57754799,1,1,0x57140000,1,0; conflicting-override -0x57754799,1,1,0x57000000,3,0=0x57754799,1,1,0x57140000,1,0; conflicting-override +0x57754799,1,1,0x57000000,1,0=0x57754799,1,1,0x57140000,1,0 +0x57754799,1,1,0x57000000,3,0=0x57754799,1,1,0x57140000,1,0 ;7 to Orth Stub 0x57745799,3,0,0x57000100,1,0=0x57745799,3,0,0x57140100,3,1 0x57754799,1,1,0x57000100,1,0=0x57754799,1,1,0x57140100,1,0 @@ -804,14 +804,14 @@ 0x57756719,3,0,0x57000100,1,0=0x57756719,3,0,0x57150100,3,1 0x57765719,1,1,0x57000100,1,0=0x57765719,1,1,0x57150100,1,0 ;8S-6S -> 10S-8S Stability -0x57756619,0,0,0x57745699,0,0=0x57756619,0,0,0x57150080,0,0; conflicting-override -0x57754699,0,1,0x57765619,0,1=0x57150080,2,0,0x57765619,0,1; conflicting-override -0x57756719,0,0,0x57745799,0,0=0x57756719,0,0,0x57150080,0,0; conflicting-override -0x57754799,0,1,0x57765719,0,1=0x57150080,2,0,0x57765719,0,1; conflicting-override +0x57756619,0,0,0x57745699,0,0=0x57756619,0,0,0x57150080,0,0 +0x57754699,0,1,0x57765619,0,1=0x57150080,2,0,0x57765619,0,1 +0x57756719,0,0,0x57745799,0,0=0x57756719,0,0,0x57150080,0,0 +0x57754799,0,1,0x57765719,0,1=0x57150080,2,0,0x57765719,0,1 0x57745719,3,0,0x57000000,1,0=0x57756719,3,0,0x57150000,3,0 0x57745719,3,0,0x57000000,3,0=0x57756719,3,0,0x57150000,3,0 -0x57745799,1,1,0x57000000,1,0=0x57765799,1,1,0x57150000,1,0; conflicting-override -0x57745799,1,1,0x57000000,3,0=0x57765799,1,1,0x57150000,1,0; conflicting-override +0x57745799,1,1,0x57000000,1,0=0x57765799,1,1,0x57150000,1,0 +0x57745799,1,1,0x57000000,3,0=0x57765799,1,1,0x57150000,1,0 ;N to 3 0x57701700,3,0,0x57150000,3,0=0x57756719,3,0,0x57150000,3,0 0x57710700,1,1,0x57150000,1,0=0x57765719,1,1,0x57150000,1,0 @@ -977,32 +977,32 @@ 0x57767719,3,0,0x57150100,1,0=0x57767719,3,0,0x57160100,3,1 0x57776719,1,1,0x57150100,1,0=0x57776719,1,1,0x57160100,1,0 ;8S-6S -> 12S-10S Stability -0x57767619,0,0,0x57745680,0,0=0x57767619,0,0,0x57150080,0,0; conflicting-override -0x57754680,0,1,0x57776619,0,1=0x57150080,2,0,0x57776619,0,1; conflicting-override -0x57767719,0,0,0x57745780,0,0=0x57767719,0,0,0x57150080,0,0; conflicting-override -0x57754780,0,1,0x57776719,0,1=0x57150080,2,0,0x57776719,0,1; conflicting-override +0x57767619,0,0,0x57745680,0,0=0x57767619,0,0,0x57150080,0,0 +0x57754680,0,1,0x57776619,0,1=0x57150080,2,0,0x57776619,0,1 +0x57767719,0,0,0x57745780,0,0=0x57767719,0,0,0x57150080,0,0 +0x57754780,0,1,0x57776719,0,1=0x57150080,2,0,0x57776719,0,1 0x57767619,0,0,0x57745680,0,0=0x57767619,0,0,0x57160080,0,0; conflicting-override -0x57754680,0,1,0x57776619,0,1=0x57150080,2,0,0x57776619,0,1; conflicting-override -0x57767719,0,0,0x57745780,0,0=0x57767719,0,0,0x57150080,0,0; conflicting-override -0x57754780,0,1,0x57776719,0,1=0x57150080,2,0,0x57776719,0,1; conflicting-override +0x57754680,0,1,0x57776619,0,1=0x57150080,2,0,0x57776619,0,1 +0x57767719,0,0,0x57745780,0,0=0x57767719,0,0,0x57150080,0,0 +0x57754780,0,1,0x57776719,0,1=0x57150080,2,0,0x57776719,0,1 -0x57767600,0,0,0x57745699,0,0=0x57767619,0,0,0x57150080,0,0; conflicting-override -0x57754699,0,1,0x57776600,0,1=0x57150080,2,0,0x57776619,0,1; conflicting-override -0x57767700,0,0,0x57745799,0,0=0x57767719,0,0,0x57150080,0,0; conflicting-override -0x57754799,0,1,0x57776700,0,1=0x57150080,2,0,0x57776719,0,1; conflicting-override +0x57767600,0,0,0x57745699,0,0=0x57767619,0,0,0x57150080,0,0 +0x57754699,0,1,0x57776600,0,1=0x57150080,2,0,0x57776619,0,1 +0x57767700,0,0,0x57745799,0,0=0x57767719,0,0,0x57150080,0,0 +0x57754799,0,1,0x57776700,0,1=0x57150080,2,0,0x57776719,0,1 0x57767600,0,0,0x57745699,0,0=0x57767619,0,0,0x57160080,0,0; conflicting-override -0x57754699,0,1,0x57776600,0,1=0x57150080,2,0,0x57776619,0,1; conflicting-override -0x57767700,0,0,0x57745799,0,0=0x57767719,0,0,0x57150080,0,0; conflicting-override -0x57754799,0,1,0x57776700,0,1=0x57150080,2,0,0x57776719,0,1; conflicting-override +0x57754699,0,1,0x57776600,0,1=0x57150080,2,0,0x57776619,0,1 +0x57767700,0,0,0x57745799,0,0=0x57767719,0,0,0x57150080,0,0 +0x57754799,0,1,0x57776700,0,1=0x57150080,2,0,0x57776719,0,1 -0x57767619,0,0,0x57745699,0,0=0x57767619,0,0,0x57150080,0,0; conflicting-override -0x57754699,0,1,0x57776619,0,1=0x57150080,2,0,0x57776619,0,1; conflicting-override -0x57767719,0,0,0x57745799,0,0=0x57767719,0,0,0x57150080,0,0; conflicting-override -0x57754799,0,1,0x57776719,0,1=0x57150080,2,0,0x57776719,0,1; conflicting-override +0x57767619,0,0,0x57745699,0,0=0x57767619,0,0,0x57150080,0,0 +0x57754699,0,1,0x57776619,0,1=0x57150080,2,0,0x57776619,0,1 +0x57767719,0,0,0x57745799,0,0=0x57767719,0,0,0x57150080,0,0 +0x57754799,0,1,0x57776719,0,1=0x57150080,2,0,0x57776719,0,1 0x57767619,0,0,0x57745699,0,0=0x57767619,0,0,0x57160080,0,0; conflicting-override -0x57754699,0,1,0x57776619,0,1=0x57150080,2,0,0x57776619,0,1; conflicting-override -0x57767719,0,0,0x57745799,0,0=0x57767719,0,0,0x57150080,0,0; conflicting-override -0x57754799,0,1,0x57776719,0,1=0x57150080,2,0,0x57776719,0,1; conflicting-override +0x57754699,0,1,0x57776619,0,1=0x57150080,2,0,0x57776619,0,1 +0x57767719,0,0,0x57745799,0,0=0x57767719,0,0,0x57150080,0,0 +0x57754799,0,1,0x57776719,0,1=0x57150080,2,0,0x57776719,0,1 ;0x57745719,3,0,0x57000000,1,0=0x57767719,3,0,0x57160000,3,0 ;0x57745719,3,0,0x57000000,3,0=0x57767719,3,0,0x57160000,3,0 @@ -1105,8 +1105,8 @@ 0x57000100,3,0,0x57723429,3,0=0x57230100,3,0,0x57723429,3,0 0x57000100,3,0,0x57732429,1,1=0x57230100,1,1,0x57732429,1,1 ; -0x57701400,3,0,0x57723529,3,0=0x57230000,3,0,0x57723529,3,0; conflicting-override -0x57710400,1,1,0x57732529,1,1=0x57230000,1,0,0x57732529,1,1; conflicting-override +0x57701400,3,0,0x57723529,3,0=0x57230000,3,0,0x57723529,3,0 +0x57710400,1,1,0x57732529,1,1=0x57230000,1,0,0x57732529,1,1 ; 0x57230000,3,0,0x57701400,3,0=0x57230000,3,0,0x57723429,3,0 0x57230000,1,0,0x57710400,1,1=0x57230000,1,0,0x57732429,1,1 @@ -1134,8 +1134,8 @@ 0x57723629,3,0,0x57000000,3,0=0x57723629,3,0,0x57220000,3,0 0x57732629,1,1,0x57000000,1,0=0x57732629,1,1,0x57220000,1,0 0x57732629,1,1,0x57000000,3,0=0x57732629,1,1,0x57220000,1,0 -0x57723629,3,0,0x57701700,3,0=0x57723629,3,0,0x57220000,3,0; conflicting-override -0x57732629,1,1,0x57710700,1,1=0x57732629,1,1,0x57220000,1,0; conflicting-override +0x57723629,3,0,0x57701700,3,0=0x57723629,3,0,0x57220000,3,0 +0x57732629,1,1,0x57710700,1,1=0x57732629,1,1,0x57220000,1,0 ;3 to 2 0x57701600,3,0,0x57220000,3,0=0x57723629,3,0,0x57220000,3,0 0x57710600,1,1,0x57220000,1,0=0x57732629,1,1,0x57220000,1,0 @@ -1243,8 +1243,8 @@ ;7 to Orth 0x577457A9,3,0,0x57000000,1,0=0x577457A9,3,0,0x57240000,3,0 0x577457A9,3,0,0x57000000,3,0=0x577457A9,3,0,0x57240000,3,0 -0x577547A9,1,1,0x57000000,1,0=0x577547A9,1,1,0x57240000,1,0; conflicting-override -0x577547A9,1,1,0x57000000,3,0=0x577547A9,1,1,0x57240000,1,0; conflicting-override +0x577547A9,1,1,0x57000000,1,0=0x577547A9,1,1,0x57240000,1,0 +0x577547A9,1,1,0x57000000,3,0=0x577547A9,1,1,0x57240000,1,0 ;7 to Orth Stub 0x577457A9,3,0,0x57000100,1,0=0x577457A9,3,0,0x57240100,3,1 0x577547A9,1,1,0x57000100,1,0=0x577547A9,1,1,0x57240100,1,0 @@ -1362,14 +1362,14 @@ 0x57765729,1,1,0x57000100,1,0=0x57765729,1,1,0x57250100,1,0 ;8S-6S -> 10S-8S Stability -0x57756629,0,0,0x577456A9,0,0=0x57756629,0,0,0x57250080,0,0; conflicting-override -0x577546A9,0,1,0x57765629,0,1=0x57250080,2,0,0x57765629,0,1; conflicting-override -0x57756729,0,0,0x577457A9,0,0=0x57756729,0,0,0x57250080,0,0; conflicting-override -0x577547A9,0,1,0x57765729,0,1=0x57250080,2,0,0x57765729,0,1; conflicting-override +0x57756629,0,0,0x577456A9,0,0=0x57756629,0,0,0x57250080,0,0 +0x577546A9,0,1,0x57765629,0,1=0x57250080,2,0,0x57765629,0,1 +0x57756729,0,0,0x577457A9,0,0=0x57756729,0,0,0x57250080,0,0 +0x577547A9,0,1,0x57765729,0,1=0x57250080,2,0,0x57765729,0,1 0x57745729,3,0,0x57000000,1,0=0x57756729,3,0,0x57250000,3,0 0x57745729,3,0,0x57000000,3,0=0x57756729,3,0,0x57250000,3,0 -0x577457A9,1,1,0x57000000,1,0=0x577657A9,1,1,0x57250000,1,0; conflicting-override -0x577457A9,1,1,0x57000000,3,0=0x577657A9,1,1,0x57250000,1,0; conflicting-override +0x577457A9,1,1,0x57000000,1,0=0x577657A9,1,1,0x57250000,1,0 +0x577457A9,1,1,0x57000000,3,0=0x577657A9,1,1,0x57250000,1,0 ;N to 3 0x57701700,3,0,0x57250000,3,0=0x57756729,3,0,0x57250000,3,0 0x57710700,1,1,0x57250000,1,0=0x57765729,1,1,0x57250000,1,0 @@ -1535,14 +1535,14 @@ 0x57767729,3,0,0x57150100,1,0=0x57767729,3,0,0x57160100,3,1 0x57776729,1,1,0x57150100,1,0=0x57776729,1,1,0x57160100,1,0 ;8S-6S -> 12S-10S Stability -0x57767629,0,0,0x57745680,0,0=0x57767629,0,0,0x57150080,0,0; conflicting-override -0x57754680,0,1,0x57776629,0,1=0x57150080,2,0,0x57776629,0,1; conflicting-override -0x57767729,0,0,0x57745780,0,0=0x57767729,0,0,0x57150080,0,0; conflicting-override -0x57754780,0,1,0x57776729,0,1=0x57150080,2,0,0x57776729,0,1; conflicting-override +0x57767629,0,0,0x57745680,0,0=0x57767629,0,0,0x57150080,0,0 +0x57754680,0,1,0x57776629,0,1=0x57150080,2,0,0x57776629,0,1 +0x57767729,0,0,0x57745780,0,0=0x57767729,0,0,0x57150080,0,0 +0x57754780,0,1,0x57776729,0,1=0x57150080,2,0,0x57776729,0,1 0x57767629,0,0,0x57745680,0,0=0x57767629,0,0,0x57160080,0,0; conflicting-override -0x57754680,0,1,0x57776629,0,1=0x57150080,2,0,0x57776629,0,1; conflicting-override -0x57767729,0,0,0x57745780,0,0=0x57767729,0,0,0x57150080,0,0; conflicting-override -0x57754780,0,1,0x57776729,0,1=0x57150080,2,0,0x57776729,0,1; conflicting-override +0x57754680,0,1,0x57776629,0,1=0x57150080,2,0,0x57776629,0,1 +0x57767729,0,0,0x57745780,0,0=0x57767729,0,0,0x57150080,0,0 +0x57754780,0,1,0x57776729,0,1=0x57150080,2,0,0x57776729,0,1 0x57767600,0,0,0x57745699,0,0=0x57767629,0,0,0x57150080,0,0; conflicting-override 0x57754699,0,1,0x57776600,0,1=0x57150080,2,0,0x57776629,0,1; conflicting-override @@ -1553,14 +1553,14 @@ 0x57767700,0,0,0x57745799,0,0=0x57767729,0,0,0x57150080,0,0; conflicting-override 0x57754799,0,1,0x57776700,0,1=0x57150080,2,0,0x57776729,0,1; conflicting-override -0x57767629,0,0,0x57745699,0,0=0x57767629,0,0,0x57150080,0,0; conflicting-override -0x57754699,0,1,0x57776629,0,1=0x57150080,2,0,0x57776629,0,1; conflicting-override -0x57767729,0,0,0x57745799,0,0=0x57767729,0,0,0x57150080,0,0; conflicting-override -0x57754799,0,1,0x57776729,0,1=0x57150080,2,0,0x57776729,0,1; conflicting-override +0x57767629,0,0,0x57745699,0,0=0x57767629,0,0,0x57150080,0,0 +0x57754699,0,1,0x57776629,0,1=0x57150080,2,0,0x57776629,0,1 +0x57767729,0,0,0x57745799,0,0=0x57767729,0,0,0x57150080,0,0 +0x57754799,0,1,0x57776729,0,1=0x57150080,2,0,0x57776729,0,1 0x57767629,0,0,0x57745699,0,0=0x57767629,0,0,0x57160080,0,0; conflicting-override -0x57754699,0,1,0x57776629,0,1=0x57150080,2,0,0x57776629,0,1; conflicting-override -0x57767729,0,0,0x57745799,0,0=0x57767729,0,0,0x57150080,0,0; conflicting-override -0x57754799,0,1,0x57776729,0,1=0x57150080,2,0,0x57776729,0,1; conflicting-override +0x57754699,0,1,0x57776629,0,1=0x57150080,2,0,0x57776629,0,1 +0x57767729,0,0,0x57745799,0,0=0x57767729,0,0,0x57150080,0,0 +0x57754799,0,1,0x57776729,0,1=0x57150080,2,0,0x57776729,0,1 ;0x57745729,3,0,0x57000000,1,0=0x57767729,3,0,0x57160000,3,0 ;0x57745729,3,0,0x57000000,3,0=0x57767729,3,0,0x57160000,3,0 @@ -1664,8 +1664,8 @@ 0x57000100,3,0,0x57723439,3,0=0x57330100,3,0,0x57723439,3,0 0x57000100,3,0,0x57732439,1,1=0x57330100,1,1,0x57732439,1,1 ; -0x57701400,3,0,0x57723539,3,0=0x57330000,3,0,0x57723539,3,0; conflicting-override -0x57710400,1,1,0x57732539,1,1=0x57330000,1,0,0x57732539,1,1; conflicting-override +0x57701400,3,0,0x57723539,3,0=0x57330000,3,0,0x57723539,3,0 +0x57710400,1,1,0x57732539,1,1=0x57330000,1,0,0x57732539,1,1 ; 0x57330000,3,0,0x57701400,3,0=0x57330000,3,0,0x57723439,3,0 0x57330000,1,0,0x57710400,1,1=0x57330000,1,0,0x57732439,1,1 @@ -1693,8 +1693,8 @@ 0x57723639,3,0,0x57000000,3,0=0x57723639,3,0,0x57320000,3,0 0x57732639,1,1,0x57000000,1,0=0x57732639,1,1,0x57320000,1,0 0x57732639,1,1,0x57000000,3,0=0x57732639,1,1,0x57320000,1,0 -0x57723639,3,0,0x57701700,3,0=0x57723639,3,0,0x57320000,3,0; conflicting-override -0x57732639,1,1,0x57710700,1,1=0x57732639,1,1,0x57320000,1,0; conflicting-override +0x57723639,3,0,0x57701700,3,0=0x57723639,3,0,0x57320000,3,0 +0x57732639,1,1,0x57710700,1,1=0x57732639,1,1,0x57320000,1,0 0x57723639,3,0,0x57000100,1,0=0x57723639,3,0,0x57320100,3,1 0x57732639,1,1,0x57000100,1,0=0x57732639,1,1,0x57320100,1,0 ;3 to 2 @@ -1784,8 +1784,8 @@ 0x57000100,3,0,0x57732449,1,1=0x57430100,1,1,0x57732449,1,1 ; -0x57701400,3,0,0x57723549,3,0=0x57430000,3,0,0x57723549,3,0; conflicting-override -0x57710400,1,1,0x57732549,1,1=0x57430000,1,0,0x57732549,1,1; conflicting-override +0x57701400,3,0,0x57723549,3,0=0x57430000,3,0,0x57723549,3,0 +0x57710400,1,1,0x57732549,1,1=0x57430000,1,0,0x57732549,1,1 ; 0x57430000,3,0,0x57701400,3,0=0x57430000,3,0,0x57723449,3,0 0x57430000,1,0,0x57710400,1,1=0x57430000,1,0,0x57732449,1,1 @@ -1813,8 +1813,8 @@ 0x57723649,3,0,0x57000000,3,0=0x57723649,3,0,0x57420000,3,0 0x57732649,1,1,0x57000000,1,0=0x57732649,1,1,0x57420000,1,0 0x57732649,1,1,0x57000000,3,0=0x57732649,1,1,0x57420000,1,0 -0x57723649,3,0,0x57701700,3,0=0x57723649,3,0,0x57420000,3,0; conflicting-override -0x57732649,1,1,0x57710700,1,1=0x57732649,1,1,0x57420000,1,0; conflicting-override +0x57723649,3,0,0x57701700,3,0=0x57723649,3,0,0x57420000,3,0 +0x57732649,1,1,0x57710700,1,1=0x57732649,1,1,0x57420000,1,0 0x57723649,3,0,0x57000100,1,0=0x57723649,3,0,0x57420100,3,1 0x57732649,1,1,0x57000100,1,0=0x57732649,1,1,0x57420100,1,0 ;3 to 2 @@ -2094,10 +2094,10 @@ 0x57050080,3,0,0x57783A80,3,1=0x57050080,3,0,0x57785A80,3,1 0x57050080,1,0,0x57783B80,3,1=0x57050080,1,0,0x57785B80,3,1 ;Ortho -> A00/B00 (Upward) (Has Arrow Tiles) -0x57050000,1,0,0x57783A00,1,0=0x57050000,1,0,0x57758A00,1,0; conflicting-override -0x57050000,3,0,0x57783B00,1,0=0x57050000,3,0,0x57758B00,1,0; conflicting-override -0x57050000,3,0,0x57783A00,3,1=0x57050000,3,0,0x57785A00,3,1; conflicting-override -0x57050000,1,0,0x57783B00,3,1=0x57050000,1,0,0x57785B00,3,1; conflicting-override +0x57050000,1,0,0x57783A00,1,0=0x57050000,1,0,0x57758A00,1,0 +0x57050000,3,0,0x57783B00,1,0=0x57050000,3,0,0x57758B00,1,0 +0x57050000,3,0,0x57783A00,3,1=0x57050000,3,0,0x57785A00,3,1 +0x57050000,1,0,0x57783B00,3,1=0x57050000,1,0,0x57785B00,3,1 ;A80 -> 880 (Upward) 0x57785A80,1,0,0x57783880,1,0=0x57785A80,1,0,0x57785880,1,0 0x57785A80,3,1,0x57783880,3,1=0x57785A80,3,1,0x57785880,3,1 @@ -2108,8 +2108,8 @@ 0x57758A00,1,0,0x57783800,1,0=0x57758A00,1,0,0x57758800,1,0 0x57785A00,3,1,0x57783800,3,1=0x57785A00,3,1,0x57785800,3,1 ;Orth Fix -0x57050000,1,0,0x57783800,1,0=0x57758A00,1,0,0x57758800,1,0; conflicting-override -0x57050000,3,0,0x57783800,3,1=0x57785A00,3,1,0x57785800,3,1; conflicting-override +0x57050000,1,0,0x57783800,1,0=0x57758A00,1,0,0x57758800,1,0 +0x57050000,3,0,0x57783800,3,1=0x57785A00,3,1,0x57785800,3,1 0x57050000,1,0,0x57758800,1,0=0x57758A00,1,0,0x57758800,1,0 0x57050000,3,0,0x57785800,3,1=0x57785A00,3,1,0x57785800,3,1 ;B80 -> 980 (Upward) @@ -2122,8 +2122,8 @@ 0x57758B00,1,0,0x57783900,1,0=0x57758B00,1,0,0x57758900,1,0 0x57785B00,3,1,0x57783900,3,1=0x57785B00,3,1,0x57785900,3,1 ;Orth Fix -0x57050000,3,0,0x57783900,1,0=0x57758B00,1,0,0x57758900,1,0; conflicting-override -0x57050000,1,0,0x57783900,3,1=0x57785B00,3,1,0x57785900,3,1; conflicting-override +0x57050000,3,0,0x57783900,1,0=0x57758B00,1,0,0x57758900,1,0 +0x57050000,1,0,0x57783900,3,1=0x57785B00,3,1,0x57785900,3,1 0x57050000,3,0,0x57758900,1,0=0x57758B00,1,0,0x57758900,1,0 0x57050000,1,0,0x57785900,3,1=0x57785B00,3,1,0x57785900,3,1 ;880 -> 680 (Upward) (Has Arrow Tiles) @@ -2210,19 +2210,19 @@ 0x57090000,3,0,0x57794300,1,1=0x57794100,1,1,0x57794300,1,1 ;200 -> 400 (Downward) (Has Arrows) 0x57794200,3,0,0x57738400,3,0=0x57794200,3,0,0x57749400,3,0 -0x57794200,1,1,0x57783400,1,1=0x57794200,1,1,0x57749400,1,1; conflicting-override +0x57794200,1,1,0x57783400,1,1=0x57794200,1,1,0x57749400,1,1 ; -0x57794200,3,0,0x57784400,3,0=0x57794200,3,0,0x57749400,3,0; conflicting-override -0x57794200,1,1,0x57784400,1,1=0x57794200,1,1,0x57749400,1,1; conflicting-override +0x57794200,3,0,0x57784400,3,0=0x57794200,3,0,0x57749400,3,0 +0x57794200,1,1,0x57784400,1,1=0x57794200,1,1,0x57749400,1,1 ;Orth Fix 0x57090000,3,0,0x57749400,3,0=0x57794200,3,0,0x57749400,3,0 0x57090000,1,0,0x57749400,1,1=0x57794200,1,1,0x57749400,1,1 ;300 -> 500 (Downward) (Has Arrows) 0x57794300,3,0,0x57738580,3,0=0x57794300,3,0,0x57749580,3,0 -0x57794300,1,1,0x57783580,1,1=0x57794300,1,1,0x57749580,1,1; conflicting-override +0x57794300,1,1,0x57783580,1,1=0x57794300,1,1,0x57749580,1,1 ; -0x57794300,3,0,0x57784580,3,0=0x57794300,3,0,0x57749580,3,0; conflicting-override -0x57794300,1,1,0x57784580,1,1=0x57794300,1,1,0x57749580,1,1; conflicting-override +0x57794300,3,0,0x57784580,3,0=0x57794300,3,0,0x57749580,3,0 +0x57794300,1,1,0x57784580,1,1=0x57794300,1,1,0x57749580,1,1 ;Orth Fix 0x57090000,1,0,0x57749580,3,0=0x57794300,3,0,0x57749580,3,0 0x57090000,3,0,0x57749580,1,1=0x57794300,1,1,0x57749580,1,1 @@ -2247,14 +2247,14 @@ 0x57749580,3,0,0x57784780,3,0=0x57749580,3,0,0x57749780,3,0 0x57749580,1,1,0x57784780,1,1=0x57749580,1,1,0x57749780,1,1 ;Mirror Fixes -0x57749580,1,1,0x57794780,1,1=0x57794580,1,1,0x57794780,1,1; conflicting-override -0x57794580,1,1,0x57749780,1,1=0x57794580,1,1,0x57794780,1,1; conflicting-override +0x57749580,1,1,0x57794780,1,1=0x57794580,1,1,0x57794780,1,1 +0x57794580,1,1,0x57749780,1,1=0x57794580,1,1,0x57794780,1,1 ;600 -> 680 (Side) (Has Arrows) 0x57749600,0,0,0x57783680,0,0=0x57749600,0,0,0x57794680,0,0 0x57749600,2,1,0x57783680,2,1=0x57749600,2,1,0x57794680,2,1 ;780 -> 700 (Side) (Has Arrows) -0x57749780,0,0,0x57783700,0,0=0x57749780,0,0,0x57794700,0,0; conflicting-override -0x57749780,2,1,0x57783700,2,1=0x57749780,2,1,0x57749700,2,1 +0x57749780,0,0,0x57783700,0,0=0x57749780,0,0,0x57794700,0,0 +0x57749780,2,1,0x57783700,2,1=0x57749780,2,1,0x57749700,2,1; conflicting-override ;Mirror Fix 0x57749780,2,1,0x57794700,2,1=0x57794780,2,1,0x57794700,2,1 ;600 -> 800 (Downward) (Has Arrows) @@ -2496,15 +2496,15 @@ ;0x57060080,3,0,0x57783A80,3,1=0x57060080,3,0,0x57796A80,3,1 ;0x57060080,1,0,0x57783B80,3,1=0x57060080,1,0,0x57796B80,3,1 ;Ortho -> A00/B00 (Upward) (Has Arrow Tiles) -0x57060000,1,0,0x57783A00,1,0=0x57060000,1,0,0x57769A00,1,0; conflicting-override -0x57060000,3,0,0x57783B00,1,0=0x57060000,3,0,0x57769B00,1,0; conflicting-override -0x57060000,3,0,0x57783A00,3,1=0x57060000,3,0,0x57796A00,3,1; conflicting-override -0x57060000,1,0,0x57783B00,3,1=0x57060000,1,0,0x57796B00,3,1; conflicting-override -; -0x57060000,1,0,0x57794A00,1,0=0x57060000,1,0,0x57769A00,1,0; conflicting-override -0x57060000,3,0,0x57794B00,1,0=0x57060000,3,0,0x57769B00,1,0; conflicting-override -0x57060000,3,0,0x57794A00,3,1=0x57060000,3,0,0x57796A00,3,1; conflicting-override -0x57060000,1,0,0x57794B00,3,1=0x57060000,1,0,0x57796B00,3,1; conflicting-override +0x57060000,1,0,0x57783A00,1,0=0x57060000,1,0,0x57769A00,1,0 +0x57060000,3,0,0x57783B00,1,0=0x57060000,3,0,0x57769B00,1,0 +0x57060000,3,0,0x57783A00,3,1=0x57060000,3,0,0x57796A00,3,1 +0x57060000,1,0,0x57783B00,3,1=0x57060000,1,0,0x57796B00,3,1 +; +0x57060000,1,0,0x57794A00,1,0=0x57060000,1,0,0x57769A00,1,0 +0x57060000,3,0,0x57794B00,1,0=0x57060000,3,0,0x57769B00,1,0 +0x57060000,3,0,0x57794A00,3,1=0x57060000,3,0,0x57796A00,3,1 +0x57060000,1,0,0x57794B00,3,1=0x57060000,1,0,0x57796B00,3,1 ;A00 -> A80 (Side) (Has Arrow Tiles) 0x57769A00,0,0,0x57785A80,0,0=0x57769A00,0,0,0x57796A80,0,0 0x57796A00,2,1,0x57785A80,2,1=0x57796A00,2,1,0x57796A80,2,1 @@ -2543,14 +2543,14 @@ 0x57060000,1,0,0x57769800,1,0=0x57769A00,1,0,0x57769800,1,0 0x57060000,3,0,0x57796800,3,1=0x57796A00,3,1,0x57796800,3,1 ; -0x57060000,1,0,0x57783800,1,0=0x57769A00,1,0,0x57769800,1,0; conflicting-override -0x57060000,3,0,0x57783800,3,1=0x57796A00,3,1,0x57796800,3,1; conflicting-override -0x57060000,1,0,0x57784800,1,0=0x57769A00,1,0,0x57769800,1,0; conflicting-override -0x57060000,3,0,0x57784800,3,1=0x57796A00,3,1,0x57796800,3,1; conflicting-override -0x57060000,1,0,0x57794800,1,0=0x57769A00,1,0,0x57769800,1,0; conflicting-override -0x57060000,3,0,0x57794800,3,1=0x57796A00,3,1,0x57796800,3,1; conflicting-override -0x57060000,1,0,0x57795800,1,0=0x57769A00,1,0,0x57769800,1,0; conflicting-override -0x57060000,3,0,0x57795800,3,1=0x57796A00,3,1,0x57796800,3,1; conflicting-override +0x57060000,1,0,0x57783800,1,0=0x57769A00,1,0,0x57769800,1,0 +0x57060000,3,0,0x57783800,3,1=0x57796A00,3,1,0x57796800,3,1 +0x57060000,1,0,0x57784800,1,0=0x57769A00,1,0,0x57769800,1,0 +0x57060000,3,0,0x57784800,3,1=0x57796A00,3,1,0x57796800,3,1 +0x57060000,1,0,0x57794800,1,0=0x57769A00,1,0,0x57769800,1,0 +0x57060000,3,0,0x57794800,3,1=0x57796A00,3,1,0x57796800,3,1 +0x57060000,1,0,0x57795800,1,0=0x57769A00,1,0,0x57769800,1,0 +0x57060000,3,0,0x57795800,3,1=0x57796A00,3,1,0x57796800,3,1 ;B80 -> 980 (Upward) 0x57796B80,1,0,0x57783980,1,0=0x57796B80,1,0,0x57796980,1,0 0x57796B80,3,1,0x57783980,3,1=0x57796B80,3,1,0x57796980,3,1 @@ -2570,14 +2570,14 @@ 0x57060000,3,0,0x57769900,1,0=0x57769B00,1,0,0x57769900,1,0 0x57060000,1,0,0x57796900,3,1=0x57796B00,3,1,0x57796900,3,1 ; -0x57060000,3,0,0x57783900,1,0=0x57769B00,1,0,0x57769900,1,0; conflicting-override -0x57060000,1,0,0x57783900,3,1=0x57796B00,3,1,0x57796900,3,1; conflicting-override -0x57060000,3,0,0x57784900,1,0=0x57769B00,1,0,0x57769900,1,0; conflicting-override -0x57060000,1,0,0x57784900,3,1=0x57796B00,3,1,0x57796900,3,1; conflicting-override -0x57060000,3,0,0x57794900,1,0=0x57769B00,1,0,0x57769900,1,0; conflicting-override -0x57060000,1,0,0x57794900,3,1=0x57796B00,3,1,0x57796900,3,1; conflicting-override -0x57060000,3,0,0x57795900,1,0=0x57769B00,1,0,0x57769900,1,0; conflicting-override -0x57060000,1,0,0x57795900,3,1=0x57796B00,3,1,0x57796900,3,1; conflicting-override +0x57060000,3,0,0x57783900,1,0=0x57769B00,1,0,0x57769900,1,0 +0x57060000,1,0,0x57783900,3,1=0x57796B00,3,1,0x57796900,3,1 +0x57060000,3,0,0x57784900,1,0=0x57769B00,1,0,0x57769900,1,0 +0x57060000,1,0,0x57784900,3,1=0x57796B00,3,1,0x57796900,3,1 +0x57060000,3,0,0x57794900,1,0=0x57769B00,1,0,0x57769900,1,0 +0x57060000,1,0,0x57794900,3,1=0x57796B00,3,1,0x57796900,3,1 +0x57060000,3,0,0x57795900,1,0=0x57769B00,1,0,0x57769900,1,0 +0x57060000,1,0,0x57795900,3,1=0x57796B00,3,1,0x57796900,3,1 ;880 -> 680 (Upward) (Has Arrow Tiles) 0x57796880,1,0,0x57783680,1,0=0x57796880,1,0,0x57796680,1,0 0x57796880,3,1,0x57783680,3,1=0x57796880,3,1,0x57796680,3,1 @@ -2606,8 +2606,8 @@ 0x57769800,1,0,0x57749600,1,0=0x57769800,1,0,0x57796600,1,0 0x57796800,3,1,0x57749600,3,1=0x57796800,3,1,0x57796600,3,1 ;Orth Fix -0x57060000,1,0,0x57796600,1,0=0x57769800,1,0,0x57796600,1,0; conflicting-override -0x57060000,3,0,0x57796600,3,1=0x57796800,3,0,0x57796600,3,1; conflicting-override +0x57060000,1,0,0x57796600,1,0=0x57769800,1,0,0x57796600,1,0 +0x57060000,3,0,0x57796600,3,1=0x57796800,3,0,0x57796600,3,1 ;980 -> 780 (Upward) (Has Arrow Tiles) 0x57796980,1,0,0x57738780,1,0=0x57796980,1,0,0x57796780,1,0 0x57796980,3,1,0x57738780,3,1=0x57796980,3,1,0x57796780,3,1 @@ -2636,8 +2636,8 @@ 0x57769900,1,0,0x57749700,1,0=0x57769900,1,0,0x57796700,1,0 0x57796900,3,1,0x57749700,3,1=0x57796900,3,1,0x57796700,3,1 ;Orth Fix -0x57060000,3,0,0x57749700,1,0=0x57769900,1,0,0x57796700,1,0; conflicting-override -0x57060000,1,0,0x57749700,3,1=0x57796900,3,1,0x57796700,3,1; conflicting-override +0x57060000,3,0,0x57749700,1,0=0x57769900,1,0,0x57796700,1,0 +0x57060000,1,0,0x57749700,3,1=0x57796900,3,1,0x57796700,3,1 ;700 -> 780 (Side) 0x57796700,2,0,0x57738780,2,0=0x57796700,2,0,0x57796780,2,0 0x57796700,0,1,0x57783780,0,1=0x57796700,0,1,0x57796780,0,1 @@ -2953,10 +2953,10 @@ 0x57180000,3,0,0x57738419,3,0=0x57783219,3,0,0x57738419,3,0 0x57180000,1,0,0x57783419,1,1=0x57783219,1,1,0x57783419,1,1 ;RHW-2 Fix -0x57783219,3,0,0x57000000,3,0=0x57783219,3,0,0x57738419,3,0; conflicting-override -0x57783219,1,1,0x57000000,1,0=0x57783219,1,1,0x57783419,1,1; conflicting-override -0x57783219,3,0,0x57000000,1,0=0x57783219,3,0,0x57738419,3,0; conflicting-override -0x57783219,1,1,0x57000000,3,0=0x57783219,1,1,0x57783419,1,1; conflicting-override +0x57783219,3,0,0x57000000,3,0=0x57783219,3,0,0x57738419,3,0 +0x57783219,1,1,0x57000000,1,0=0x57783219,1,1,0x57783419,1,1 +0x57783219,3,0,0x57000000,1,0=0x57783219,3,0,0x57738419,3,0 +0x57783219,1,1,0x57000000,3,0=0x57783219,1,1,0x57783419,1,1 ;400 -> 200 (Upward) 0x57738419,1,0,0x57783200,1,0=0x57738419,1,0,0x57783219,1,0 0x57783419,3,1,0x57783200,3,1=0x57783419,3,1,0x57783219,3,1 @@ -2973,10 +2973,10 @@ 0x57180000,1,0,0x57738599,3,0=0x57783319,3,0,0x57738599,3,0 0x57180000,3,0,0x57783599,1,1=0x57783319,1,1,0x57783599,1,1 ;RHW-2 Fix -0x57783319,3,0,0x57000000,3,0=0x57783319,3,0,0x57738599,3,0; conflicting-override -0x57783319,1,1,0x57000000,1,0=0x57783319,1,1,0x57783599,1,1; conflicting-override -0x57783319,3,0,0x57000000,1,0=0x57783319,3,0,0x57738599,3,0; conflicting-override -0x57783319,1,1,0x57000000,3,0=0x57783319,1,1,0x57783599,1,1; conflicting-override +0x57783319,3,0,0x57000000,3,0=0x57783319,3,0,0x57738599,3,0 +0x57783319,1,1,0x57000000,1,0=0x57783319,1,1,0x57783599,1,1 +0x57783319,3,0,0x57000000,1,0=0x57783319,3,0,0x57738599,3,0 +0x57783319,1,1,0x57000000,3,0=0x57783319,1,1,0x57783599,1,1 ;500 -> 300 (Upward) 0x57738599,1,0,0x57783300,1,0=0x57738599,1,0,0x57783319,1,0 0x57783599,3,1,0x57783300,3,1=0x57783599,3,1,0x57783319,3,1 @@ -3055,10 +3055,10 @@ 0x57783819,1,0,0x57738600,1,0=0x57783819,1,0,0x57738619,1,0 0x57783819,3,1,0x57783600,3,1=0x57783819,3,1,0x57783619,3,1 ;RHW-2 Fix -0x57783819,1,0,0x57000000,1,0=0x57783819,1,0,0x57738619,1,0; conflicting-override -0x57783819,3,1,0x57000000,3,0=0x57783819,3,1,0x57783619,3,1; conflicting-override -0x57783819,1,0,0x57000000,3,0=0x57783819,1,0,0x57738619,1,0; conflicting-override -0x57783819,3,1,0x57000000,1,0=0x57783819,3,1,0x57783619,3,1; conflicting-override +0x57783819,1,0,0x57000000,1,0=0x57783819,1,0,0x57738619,1,0 +0x57783819,3,1,0x57000000,3,0=0x57783819,3,1,0x57783619,3,1 +0x57783819,1,0,0x57000000,3,0=0x57783819,1,0,0x57738619,1,0 +0x57783819,3,1,0x57000000,1,0=0x57783819,3,1,0x57783619,3,1 ;680 -> 880 (Downward) 0x57783699,3,0,0x57783880,3,0=0x57783699,3,0,0x57783899,3,0 @@ -3396,10 +3396,10 @@ 0x57150080,3,0,0x57783A80,3,1=0x57150080,3,0,0x57785A99,3,1 0x57150080,1,0,0x57783B80,3,1=0x57150080,1,0,0x57785B99,3,1 ;Ortho -> A00/B00 (Upward) (Has Arrow Tiles) -0x57150000,1,0,0x57783A00,1,0=0x57150000,1,0,0x57758A19,1,0; conflicting-override -0x57150000,3,0,0x57783B00,1,0=0x57150000,3,0,0x57758B19,1,0; conflicting-override -0x57150000,3,0,0x57783A00,3,1=0x57150000,3,0,0x57785A19,3,1; conflicting-override -0x57150000,1,0,0x57783B00,3,1=0x57150000,1,0,0x57785B19,3,1; conflicting-override +0x57150000,1,0,0x57783A00,1,0=0x57150000,1,0,0x57758A19,1,0 +0x57150000,3,0,0x57783B00,1,0=0x57150000,3,0,0x57758B19,1,0 +0x57150000,3,0,0x57783A00,3,1=0x57150000,3,0,0x57785A19,3,1 +0x57150000,1,0,0x57783B00,3,1=0x57150000,1,0,0x57785B19,3,1 ;Stability 0x57150000,1,0,0x57758A00,1,0=0x57150000,1,0,0x57758A19,1,0 0x57150000,3,0,0x57758B00,1,0=0x57150000,3,0,0x57758B19,1,0 @@ -3417,8 +3417,8 @@ 0x57758A19,1,0,0x57783800,1,0=0x57758A19,1,0,0x57758819,1,0 0x57785A19,3,1,0x57783800,3,1=0x57785A19,3,1,0x57785819,3,1 ;Orth Fix -0x57150000,1,0,0x57783800,1,0=0x57758A19,1,0,0x57758819,1,0; conflicting-override -0x57150000,3,0,0x57783800,3,1=0x57785A19,3,1,0x57785819,3,1; conflicting-override +0x57150000,1,0,0x57783800,1,0=0x57758A19,1,0,0x57758819,1,0 +0x57150000,3,0,0x57783800,3,1=0x57785A19,3,1,0x57785819,3,1 0x57150000,1,0,0x57758819,1,0=0x57758A19,1,0,0x57758819,1,0 0x57150000,3,0,0x57785819,3,1=0x57785A19,3,1,0x57785819,3,1 ;B80 -> 980 (Upward) @@ -3431,8 +3431,8 @@ 0x57758B19,1,0,0x57758900,1,0=0x57758B19,1,0,0x57758919,1,0 0x57785B19,3,1,0x57785900,3,1=0x57785B19,3,1,0x57785919,3,1 ;Orth Fix -0x57150000,3,0,0x57783900,1,0=0x57758B19,1,0,0x57758919,1,0; conflicting-override -0x57150000,1,0,0x57783900,3,1=0x57785B19,3,1,0x57785919,3,1; conflicting-override +0x57150000,3,0,0x57783900,1,0=0x57758B19,1,0,0x57758919,1,0 +0x57150000,1,0,0x57783900,3,1=0x57785B19,3,1,0x57785919,3,1 0x57150000,3,0,0x57758919,1,0=0x57758B19,1,0,0x57758919,1,0 0x57150000,1,0,0x57785919,3,1=0x57785B19,3,1,0x57785919,3,1 ;880 -> 680 (Upward) (Has Arrow Tiles) @@ -3514,10 +3514,10 @@ 0x57150080,3,0,0x57783A99,3,1=0x57150080,3,0,0x57785A99,3,1 0x57150080,1,0,0x57783B99,3,1=0x57150080,1,0,0x57785B99,3,1 ;Ortho -> A00/B00 (Upward) (Has Arrow Tiles) -0x57150000,1,0,0x57783A19,1,0=0x57150000,1,0,0x57758A19,1,0; conflicting-override -0x57150000,3,0,0x57783B19,1,0=0x57150000,3,0,0x57758B19,1,0; conflicting-override -0x57150000,3,0,0x57783A19,3,1=0x57150000,3,0,0x57785A19,3,1; conflicting-override -0x57150000,1,0,0x57783B19,3,1=0x57150000,1,0,0x57785B19,3,1; conflicting-override +0x57150000,1,0,0x57783A19,1,0=0x57150000,1,0,0x57758A19,1,0 +0x57150000,3,0,0x57783B19,1,0=0x57150000,3,0,0x57758B19,1,0 +0x57150000,3,0,0x57783A19,3,1=0x57150000,3,0,0x57785A19,3,1 +0x57150000,1,0,0x57783B19,3,1=0x57150000,1,0,0x57785B19,3,1 ;A80 -> 880 (Upward) 0x57785A99,1,0,0x57783899,1,0=0x57785A99,1,0,0x57785899,1,0 0x57785A99,3,1,0x57783899,3,1=0x57785A99,3,1,0x57785899,3,1 @@ -3641,8 +3641,8 @@ 0x57794219,3,0,0x57738400,3,0=0x57794219,3,0,0x57749419,3,0 0x57794219,1,1,0x57783400,1,1=0x57794219,1,1,0x57794419,1,1 ; -0x57794219,3,0,0x57784400,3,0=0x57794219,3,0,0x57749419,3,0; conflicting-override -0x57794219,1,1,0x57784400,1,1=0x57794219,1,1,0x57794419,1,1 +0x57794219,3,0,0x57784400,3,0=0x57794219,3,0,0x57749419,3,0 +0x57794219,1,1,0x57784400,1,1=0x57794219,1,1,0x57794419,1,1; conflicting-override ; 0x57794219,3,0,0x57749400,3,0=0x57794219,3,0,0x57749419,3,0 0x57794219,1,1,0x57749400,1,1=0x57794219,1,1,0x57794419,1,1; conflicting-override @@ -3653,8 +3653,8 @@ 0x57794319,3,0,0x57738580,3,0=0x57794319,3,0,0x57749599,3,0 0x57794319,1,1,0x57783580,1,1=0x57794319,1,1,0x57794599,1,1 ; -0x57794319,3,0,0x57784580,3,0=0x57794319,3,0,0x57749599,3,0; conflicting-override -0x57794319,1,1,0x57784580,1,1=0x57794319,1,1,0x57794599,1,1 +0x57794319,3,0,0x57784580,3,0=0x57794319,3,0,0x57749599,3,0 +0x57794319,1,1,0x57784580,1,1=0x57794319,1,1,0x57794599,1,1; conflicting-override ; 0x57794319,3,0,0x57749580,3,0=0x57794319,3,0,0x57749599,3,0 0x57794319,1,1,0x57749580,1,1=0x57794319,1,1,0x57794599,1,1; conflicting-override @@ -3687,14 +3687,14 @@ 0x57749599,3,0,0x57784780,3,0=0x57749599,3,0,0x57749799,3,0 0x57794599,1,1,0x57784780,1,1=0x57794599,1,1,0x57794799,1,1 ;Mirror Fixes -0x57749599,1,1,0x57794799,1,1=0x57794599,1,1,0x57794799,1,1; conflicting-override -0x57794599,1,1,0x57749799,1,1=0x57794599,1,1,0x57794799,1,1; conflicting-override +0x57749599,1,1,0x57794799,1,1=0x57794599,1,1,0x57794799,1,1 +0x57794599,1,1,0x57749799,1,1=0x57794599,1,1,0x57794799,1,1 ;600 -> 680 (Side) (Has Arrows) 0x57749619,0,0,0x57783680,0,0=0x57749619,0,0,0x57794699,0,0 0x57794619,2,1,0x57783680,2,1=0x57794619,2,1,0x57794699,2,1 ;780 -> 700 (Side) (Has Arrows) -0x57749799,0,0,0x57783700,0,0=0x57749799,0,0,0x57794719,0,0; conflicting-override -0x57794799,2,1,0x57783700,2,1=0x57794799,2,1,0x57749719,2,1; conflicting-override +0x57749799,0,0,0x57783700,0,0=0x57749799,0,0,0x57794719,0,0 +0x57794799,2,1,0x57783700,2,1=0x57794799,2,1,0x57749719,2,1 ;Mirror Fix 0x57749799,2,1,0x57749719,2,1=0x57794799,2,1,0x57749719,2,1 ;600 -> 800 (Downward) (Has Arrows) @@ -3824,27 +3824,27 @@ 0x57794219,3,0,0x57738419,3,0=0x57794219,3,0,0x57749419,3,0 0x57794219,1,1,0x57783419,1,1=0x57794219,1,1,0x57794419,1,1 ; -0x57794219,3,0,0x57784419,3,0=0x57794219,3,0,0x57749419,3,0; conflicting-override -0x57794219,1,1,0x57784419,1,1=0x57794219,1,1,0x57794419,1,1 +0x57794219,3,0,0x57784419,3,0=0x57794219,3,0,0x57749419,3,0 +0x57794219,1,1,0x57784419,1,1=0x57794219,1,1,0x57794419,1,1; conflicting-override ;Orth Fix 0x57190000,3,0,0x57749419,3,0=0x57794219,3,0,0x57749419,3,0 0x57190000,1,0,0x57794419,1,1=0x57794219,1,1,0x57794419,1,1 ;400 -> 200 (Upward) (Has Arrows) -0x57749419,1,0,0x57783200,3,0=0x57749419,1,0,0x57794219,1,0; conflicting-override -0x57794419,3,1,0x57783200,1,1=0x57794419,3,1,0x57749219,3,1; conflicting-override -0x57749419,1,0,0x57783219,3,0=0x57749419,1,0,0x57794219,1,0; conflicting-override -0x57794419,3,1,0x57783219,1,1=0x57794419,3,1,0x57749219,3,1; conflicting-override +0x57749419,1,0,0x57783200,3,0=0x57749419,1,0,0x57794219,1,0 +0x57794419,3,1,0x57783200,1,1=0x57794419,3,1,0x57749219,3,1 +0x57749419,1,0,0x57783219,3,0=0x57749419,1,0,0x57794219,1,0 +0x57794419,3,1,0x57783219,1,1=0x57794419,3,1,0x57749219,3,1 ;300 -> 500 (Downward) (Has Arrows) 0x57794319,3,0,0x57738599,3,0=0x57794319,3,0,0x57749599,3,0 0x57794319,1,1,0x57783599,1,1=0x57794319,1,1,0x57794599,1,1 ; -0x57794319,3,0,0x57784599,3,0=0x57794319,3,0,0x57749599,3,0; conflicting-override -0x57794319,1,1,0x57784599,1,1=0x57794319,1,1,0x57794599,1,1 +0x57794319,3,0,0x57784599,3,0=0x57794319,3,0,0x57749599,3,0 +0x57794319,1,1,0x57784599,1,1=0x57794319,1,1,0x57794599,1,1; conflicting-override ;500 -> 300 (Upward) (Has Arrows) -0x57749599,1,0,0x57783300,3,0=0x57749599,1,0,0x57794319,1,0; conflicting-override -0x57794599,3,1,0x57783300,1,1=0x57794599,3,1,0x57749319,3,1; conflicting-override -0x57749599,1,0,0x57783319,3,0=0x57749599,1,0,0x57794319,1,0; conflicting-override -0x57794599,3,1,0x57783319,1,1=0x57794599,3,1,0x57749319,3,1; conflicting-override +0x57749599,1,0,0x57783300,3,0=0x57749599,1,0,0x57794319,1,0 +0x57794599,3,1,0x57783300,1,1=0x57794599,3,1,0x57749319,3,1 +0x57749599,1,0,0x57783319,3,0=0x57749599,1,0,0x57794319,1,0 +0x57794599,3,1,0x57783319,1,1=0x57794599,3,1,0x57749319,3,1 ;Orth Fix 0x57190000,1,0,0x57749599,3,0=0x57794319,3,0,0x57749599,3,0 0x57190000,3,0,0x57794599,1,1=0x57794319,1,1,0x57794599,1,1 @@ -3869,14 +3869,14 @@ 0x57749599,3,0,0x57784799,3,0=0x57749599,3,0,0x57749799,3,0 0x57794599,1,1,0x57784799,1,1=0x57794599,1,1,0x57794799,1,1 ;Mirror Fixes -0x57749599,1,1,0x57794799,1,1=0x57794599,1,1,0x57794799,1,1; conflicting-override -0x57794599,1,1,0x57749799,1,1=0x57794599,1,1,0x57794799,1,1; conflicting-override +0x57749599,1,1,0x57794799,1,1=0x57794599,1,1,0x57794799,1,1 +0x57794599,1,1,0x57749799,1,1=0x57794599,1,1,0x57794799,1,1 ;600 -> 680 (Side) (Has Arrows) 0x57749619,0,0,0x57783699,0,0=0x57749619,0,0,0x57794699,0,0 0x57794619,2,1,0x57783699,2,1=0x57794619,2,1,0x57794699,2,1 ;780 -> 700 (Side) (Has Arrows) -0x57749799,0,0,0x57783719,0,0=0x57749799,0,0,0x57794719,0,0; conflicting-override -0x57794799,2,1,0x57783719,2,1=0x57794799,2,1,0x57749719,2,1; conflicting-override +0x57749799,0,0,0x57783719,0,0=0x57749799,0,0,0x57794719,0,0 +0x57794799,2,1,0x57783719,2,1=0x57794799,2,1,0x57749719,2,1 ;Mirror Fix 0x57749799,2,1,0x57749719,2,1=0x57794799,2,1,0x57749719,2,1 ;600 -> 800 (Downward) (Has Arrows) @@ -4272,20 +4272,20 @@ ;0x57160080,3,0,0x57783A80,3,1=0x57160080,3,0,0x57796A99,3,1 ;0x57160080,1,0,0x57783B80,3,1=0x57160080,1,0,0x57796B99,3,1 ;Ortho -> A00/B00 (Upward) (Has Arrow Tiles) -0x57160000,1,0,0x57783A00,1,0=0x57160000,1,0,0x57769A19,1,0; conflicting-override -0x57160000,3,0,0x57783B00,1,0=0x57160000,3,0,0x57769B19,1,0; conflicting-override -0x57160000,3,0,0x57783A00,3,1=0x57160000,3,0,0x57796A19,3,1; conflicting-override -0x57160000,1,0,0x57783B00,3,1=0x57160000,1,0,0x57796B19,3,1; conflicting-override +0x57160000,1,0,0x57783A00,1,0=0x57160000,1,0,0x57769A19,1,0 +0x57160000,3,0,0x57783B00,1,0=0x57160000,3,0,0x57769B19,1,0 +0x57160000,3,0,0x57783A00,3,1=0x57160000,3,0,0x57796A19,3,1 +0x57160000,1,0,0x57783B00,3,1=0x57160000,1,0,0x57796B19,3,1 ; -0x57160000,1,0,0x57794A00,1,0=0x57160000,1,0,0x57769A19,1,0; conflicting-override -0x57160000,3,0,0x57794B00,1,0=0x57160000,3,0,0x57769B19,1,0; conflicting-override -0x57160000,3,0,0x57794A00,3,1=0x57160000,3,0,0x57796A19,3,1; conflicting-override -0x57160000,1,0,0x57794B00,3,1=0x57160000,1,0,0x57796B19,3,1; conflicting-override +0x57160000,1,0,0x57794A00,1,0=0x57160000,1,0,0x57769A19,1,0 +0x57160000,3,0,0x57794B00,1,0=0x57160000,3,0,0x57769B19,1,0 +0x57160000,3,0,0x57794A00,3,1=0x57160000,3,0,0x57796A19,3,1 +0x57160000,1,0,0x57794B00,3,1=0x57160000,1,0,0x57796B19,3,1 ; -0x57160000,1,0,0x57795A00,1,0=0x57160000,1,0,0x57769A19,1,0; conflicting-override -0x57160000,3,0,0x57795B00,1,0=0x57160000,3,0,0x57769B19,1,0; conflicting-override -0x57160000,3,0,0x57795A00,3,1=0x57160000,3,0,0x57796A19,3,1; conflicting-override -0x57160000,1,0,0x57795B00,3,1=0x57160000,1,0,0x57796B19,3,1; conflicting-override +0x57160000,1,0,0x57795A00,1,0=0x57160000,1,0,0x57769A19,1,0 +0x57160000,3,0,0x57795B00,1,0=0x57160000,3,0,0x57769B19,1,0 +0x57160000,3,0,0x57795A00,3,1=0x57160000,3,0,0x57796A19,3,1 +0x57160000,1,0,0x57795B00,3,1=0x57160000,1,0,0x57796B19,3,1 ; 0x57160000,1,0,0x57769A00,1,0=0x57160000,1,0,0x57769A19,1,0 0x57160000,3,0,0x57769B00,1,0=0x57160000,3,0,0x57769B19,1,0 @@ -4332,14 +4332,14 @@ 0x57769A19,1,0,0x57769800,1,0=0x57769A19,1,0,0x57769819,1,0 0x57796A19,3,1,0x57796800,3,1=0x57796A19,3,1,0x57796819,3,1 ;Stability -0x57160000,1,0,0x57783880,1,0=0x57769A19,1,0,0x57769819,1,0; conflicting-override -0x57160000,3,0,0x57783880,3,1=0x57796A19,3,1,0x57796819,3,1; conflicting-override -0x57160000,1,0,0x57784880,1,0=0x57769A19,1,0,0x57769819,1,0; conflicting-override -0x57160000,3,0,0x57784880,3,1=0x57796A19,3,1,0x57796819,3,1; conflicting-override -0x57160000,1,0,0x57794880,1,0=0x57769A19,1,0,0x57769819,1,0; conflicting-override -0x57160000,3,0,0x57794880,3,1=0x57796A19,3,1,0x57796819,3,1; conflicting-override -0x57160000,1,0,0x57795880,1,0=0x57769A19,1,0,0x57769819,1,0; conflicting-override -0x57160000,3,0,0x57795880,3,1=0x57796A19,3,1,0x57796819,3,1; conflicting-override +0x57160000,1,0,0x57783880,1,0=0x57769A19,1,0,0x57769819,1,0 +0x57160000,3,0,0x57783880,3,1=0x57796A19,3,1,0x57796819,3,1 +0x57160000,1,0,0x57784880,1,0=0x57769A19,1,0,0x57769819,1,0 +0x57160000,3,0,0x57784880,3,1=0x57796A19,3,1,0x57796819,3,1 +0x57160000,1,0,0x57794880,1,0=0x57769A19,1,0,0x57769819,1,0 +0x57160000,3,0,0x57794880,3,1=0x57796A19,3,1,0x57796819,3,1 +0x57160000,1,0,0x57795880,1,0=0x57769A19,1,0,0x57769819,1,0 +0x57160000,3,0,0x57795880,3,1=0x57796A19,3,1,0x57796819,3,1 ;B80 -> 980 (Upward) 0x57796B99,1,0,0x57783980,1,0=0x57796B99,1,0,0x57796999,1,0 0x57796B99,3,1,0x57783980,3,1=0x57796B99,3,1,0x57796999,3,1 @@ -4362,14 +4362,14 @@ 0x57769B19,1,0,0x57769900,1,0=0x57769B19,1,0,0x57769919,1,0 0x57796B19,3,1,0x57796900,3,1=0x57796B19,3,1,0x57796919,3,1 ;Stability -0x57160000,3,0,0x57783980,1,0=0x57769B19,1,0,0x57769919,1,0; conflicting-override -0x57160000,1,0,0x57783980,3,1=0x57796B19,3,1,0x57796919,3,1; conflicting-override -0x57160000,3,0,0x57784980,1,0=0x57769B19,1,0,0x57769919,1,0; conflicting-override -0x57160000,1,0,0x57784980,3,1=0x57796B19,3,1,0x57796919,3,1; conflicting-override -0x57160000,3,0,0x57794980,1,0=0x57769B19,1,0,0x57769919,1,0; conflicting-override -0x57160000,1,0,0x57794980,3,1=0x57796B19,3,1,0x57796919,3,1; conflicting-override -0x57160000,3,0,0x57795980,1,0=0x57769B19,1,0,0x57769919,1,0; conflicting-override -0x57160000,1,0,0x57795980,3,1=0x57796B19,3,1,0x57796919,3,1; conflicting-override +0x57160000,3,0,0x57783980,1,0=0x57769B19,1,0,0x57769919,1,0 +0x57160000,1,0,0x57783980,3,1=0x57796B19,3,1,0x57796919,3,1 +0x57160000,3,0,0x57784980,1,0=0x57769B19,1,0,0x57769919,1,0 +0x57160000,1,0,0x57784980,3,1=0x57796B19,3,1,0x57796919,3,1 +0x57160000,3,0,0x57794980,1,0=0x57769B19,1,0,0x57769919,1,0 +0x57160000,1,0,0x57794980,3,1=0x57796B19,3,1,0x57796919,3,1 +0x57160000,3,0,0x57795980,1,0=0x57769B19,1,0,0x57769919,1,0 +0x57160000,1,0,0x57795980,3,1=0x57796B19,3,1,0x57796919,3,1 ;880 -> 680 (Upward) (Has Arrow Tiles) 0x57796899,1,0,0x57783680,1,0=0x57796899,1,0,0x57796699,1,0 0x57796899,3,1,0x57783680,3,1=0x57796899,3,1,0x57796699,3,1 @@ -4579,20 +4579,20 @@ ;0x57160080,3,0,0x57783A99,3,1=0x57160080,3,0,0x57796A99,3,1 ;0x57160080,1,0,0x57783B99,3,1=0x57160080,1,0,0x57796B99,3,1 ;Ortho -> A00/B00 (Upward) (Has Arrow Tiles) -0x57160000,1,0,0x57783A19,1,0=0x57160000,1,0,0x57769A19,1,0; conflicting-override -0x57160000,3,0,0x57783B19,1,0=0x57160000,3,0,0x57769B19,1,0; conflicting-override -0x57160000,3,0,0x57783A19,3,1=0x57160000,3,0,0x57796A19,3,1; conflicting-override -0x57160000,1,0,0x57783B19,3,1=0x57160000,1,0,0x57796B19,3,1; conflicting-override -; -0x57160000,1,0,0x57794A19,1,0=0x57160000,1,0,0x57769A19,1,0; conflicting-override -0x57160000,3,0,0x57794B19,1,0=0x57160000,3,0,0x57769B19,1,0; conflicting-override -0x57160000,3,0,0x57794A19,3,1=0x57160000,3,0,0x57796A19,3,1; conflicting-override -0x57160000,1,0,0x57794B19,3,1=0x57160000,1,0,0x57796B19,3,1; conflicting-override -; -0x57160000,1,0,0x57795A19,1,0=0x57160000,1,0,0x57769A19,1,0; conflicting-override -0x57160000,3,0,0x57795B19,1,0=0x57160000,3,0,0x57769B19,1,0; conflicting-override -0x57160000,3,0,0x57795A19,3,1=0x57160000,3,0,0x57796A19,3,1; conflicting-override -0x57160000,1,0,0x57795B19,3,1=0x57160000,1,0,0x57796B19,3,1; conflicting-override +0x57160000,1,0,0x57783A19,1,0=0x57160000,1,0,0x57769A19,1,0 +0x57160000,3,0,0x57783B19,1,0=0x57160000,3,0,0x57769B19,1,0 +0x57160000,3,0,0x57783A19,3,1=0x57160000,3,0,0x57796A19,3,1 +0x57160000,1,0,0x57783B19,3,1=0x57160000,1,0,0x57796B19,3,1 +; +0x57160000,1,0,0x57794A19,1,0=0x57160000,1,0,0x57769A19,1,0 +0x57160000,3,0,0x57794B19,1,0=0x57160000,3,0,0x57769B19,1,0 +0x57160000,3,0,0x57794A19,3,1=0x57160000,3,0,0x57796A19,3,1 +0x57160000,1,0,0x57794B19,3,1=0x57160000,1,0,0x57796B19,3,1 +; +0x57160000,1,0,0x57795A19,1,0=0x57160000,1,0,0x57769A19,1,0 +0x57160000,3,0,0x57795B19,1,0=0x57160000,3,0,0x57769B19,1,0 +0x57160000,3,0,0x57795A19,3,1=0x57160000,3,0,0x57796A19,3,1 +0x57160000,1,0,0x57795B19,3,1=0x57160000,1,0,0x57796B19,3,1 ;A00 -> A80 (Side) (Has Arrow Tiles) 0x57769A19,0,0,0x57785A99,0,0=0x57769A19,0,0,0x57796A99,0,0 0x57796A19,2,1,0x57785A99,2,1=0x57796A19,2,1,0x57796A99,2,1 @@ -4625,14 +4625,14 @@ 0x57769A19,1,0,0x57795819,1,0=0x57769A19,1,0,0x57769819,1,0 0x57796A19,3,1,0x57795819,3,1=0x57796A19,3,1,0x57796819,3,1 ;Stability -0x57160000,1,0,0x57783819,1,0=0x57769A19,1,0,0x57769819,1,0; conflicting-override -0x57160000,3,0,0x57783819,3,1=0x57796A19,3,1,0x57796819,3,1; conflicting-override +0x57160000,1,0,0x57783819,1,0=0x57769A19,1,0,0x57769819,1,0 +0x57160000,3,0,0x57783819,3,1=0x57796A19,3,1,0x57796819,3,1 ; -0x57160000,1,0,0x57794819,1,0=0x57769A19,1,0,0x57769819,1,0; conflicting-override -0x57160000,3,0,0x57794819,3,1=0x57796A19,3,1,0x57796819,3,1; conflicting-override +0x57160000,1,0,0x57794819,1,0=0x57769A19,1,0,0x57769819,1,0 +0x57160000,3,0,0x57794819,3,1=0x57796A19,3,1,0x57796819,3,1 ; -0x57160000,1,0,0x57795819,1,0=0x57769A19,1,0,0x57769819,1,0; conflicting-override -0x57160000,3,0,0x57795819,3,1=0x57796A19,3,1,0x57796819,3,1; conflicting-override +0x57160000,1,0,0x57795819,1,0=0x57769A19,1,0,0x57769819,1,0 +0x57160000,3,0,0x57795819,3,1=0x57796A19,3,1,0x57796819,3,1 ;B80 -> 980 (Upward) 0x57796B99,1,0,0x57783999,1,0=0x57796B99,1,0,0x57796999,1,0 0x57796B99,3,1,0x57783999,3,1=0x57796B99,3,1,0x57796999,3,1 @@ -4652,14 +4652,14 @@ 0x57769B19,1,0,0x57795919,1,0=0x57769B19,1,0,0x57769919,1,0 0x57796B19,3,1,0x57795919,3,1=0x57796B19,3,1,0x57796919,3,1 ;Stability -0x57160000,3,0,0x57783919,1,0=0x57769B19,1,0,0x57769919,1,0; conflicting-override -0x57160000,1,0,0x57783919,3,1=0x57796B19,3,1,0x57796919,3,1; conflicting-override +0x57160000,3,0,0x57783919,1,0=0x57769B19,1,0,0x57769919,1,0 +0x57160000,1,0,0x57783919,3,1=0x57796B19,3,1,0x57796919,3,1 ; -0x57160000,3,0,0x57794919,1,0=0x57769B19,1,0,0x57769919,1,0; conflicting-override -0x57160000,1,0,0x57794919,3,1=0x57796B19,3,1,0x57796919,3,1; conflicting-override +0x57160000,3,0,0x57794919,1,0=0x57769B19,1,0,0x57769919,1,0 +0x57160000,1,0,0x57794919,3,1=0x57796B19,3,1,0x57796919,3,1 ; -0x57160000,3,0,0x57795919,1,0=0x57769B19,1,0,0x57769919,1,0; conflicting-override -0x57160000,1,0,0x57795919,3,1=0x57796B19,3,1,0x57796919,3,1; conflicting-override +0x57160000,3,0,0x57795919,1,0=0x57769B19,1,0,0x57769919,1,0 +0x57160000,1,0,0x57795919,3,1=0x57796B19,3,1,0x57796919,3,1 ;880 -> 680 (Upward) (Has Arrow Tiles) 0x57796899,1,0,0x57783699,1,0=0x57796899,1,0,0x57796699,1,0 0x57796899,3,1,0x57783699,3,1=0x57796899,3,1,0x57796699,3,1 @@ -4994,10 +4994,10 @@ 0x57280000,3,0,0x57738429,3,0=0x57783229,3,0,0x57738429,3,0 0x57280000,1,0,0x57783429,1,1=0x57783229,1,1,0x57783429,1,1 ;RHW-2 Fix -0x57783229,3,0,0x57000000,3,0=0x57783229,3,0,0x57738429,3,0; conflicting-override -0x57783229,1,1,0x57000000,1,0=0x57783229,1,1,0x57783429,1,1; conflicting-override -0x57783229,3,0,0x57000000,1,0=0x57783229,3,0,0x57738429,3,0; conflicting-override -0x57783229,1,1,0x57000000,3,0=0x57783229,1,1,0x57783429,1,1; conflicting-override +0x57783229,3,0,0x57000000,3,0=0x57783229,3,0,0x57738429,3,0 +0x57783229,1,1,0x57000000,1,0=0x57783229,1,1,0x57783429,1,1 +0x57783229,3,0,0x57000000,1,0=0x57783229,3,0,0x57738429,3,0 +0x57783229,1,1,0x57000000,3,0=0x57783229,1,1,0x57783429,1,1 ;400 -> 200 (Upward) 0x57738429,1,0,0x57783200,1,0=0x57738429,1,0,0x57783229,1,0 0x57783429,3,1,0x57783200,3,1=0x57783429,3,1,0x57783229,3,1 @@ -5014,10 +5014,10 @@ 0x57280000,1,0,0x577385A9,3,0=0x57783329,3,0,0x577385A9,3,0 0x57280000,3,0,0x577835A9,1,1=0x57783329,1,1,0x577835A9,1,1 ;RHW-2 Fix -0x57783329,3,0,0x57000000,3,0=0x57783329,3,0,0x577385A9,3,0; conflicting-override -0x57783329,1,1,0x57000000,1,0=0x57783329,1,1,0x577835A9,1,1; conflicting-override -0x57783329,3,0,0x57000000,1,0=0x57783329,3,0,0x577385A9,3,0; conflicting-override -0x57783329,1,1,0x57000000,3,0=0x57783329,1,1,0x577835A9,1,1; conflicting-override +0x57783329,3,0,0x57000000,3,0=0x57783329,3,0,0x577385A9,3,0 +0x57783329,1,1,0x57000000,1,0=0x57783329,1,1,0x577835A9,1,1 +0x57783329,3,0,0x57000000,1,0=0x57783329,3,0,0x577385A9,3,0 +0x57783329,1,1,0x57000000,3,0=0x57783329,1,1,0x577835A9,1,1 ;500 -> 300 (Upward) 0x577385A9,1,0,0x57783300,1,0=0x577385A9,1,0,0x57783329,1,0 0x577835A9,3,1,0x57783300,3,1=0x577835A9,3,1,0x57783329,3,1 @@ -5096,10 +5096,10 @@ 0x57783829,1,0,0x57738600,1,0=0x57783829,1,0,0x57738629,1,0 0x57783829,3,1,0x57783600,3,1=0x57783829,3,1,0x57783629,3,1 ;RHW-2 Fix -0x57783829,1,0,0x57000000,1,0=0x57783829,1,0,0x57738629,1,0; conflicting-override -0x57783829,3,1,0x57000000,3,0=0x57783829,3,1,0x57783629,3,1; conflicting-override -0x57783829,1,0,0x57000000,3,0=0x57783829,1,0,0x57738629,1,0; conflicting-override -0x57783829,3,1,0x57000000,1,0=0x57783829,3,1,0x57783629,3,1; conflicting-override +0x57783829,1,0,0x57000000,1,0=0x57783829,1,0,0x57738629,1,0 +0x57783829,3,1,0x57000000,3,0=0x57783829,3,1,0x57783629,3,1 +0x57783829,1,0,0x57000000,3,0=0x57783829,1,0,0x57738629,1,0 +0x57783829,3,1,0x57000000,1,0=0x57783829,3,1,0x57783629,3,1 ;680 -> 880 (Downward) 0x577836A9,3,0,0x57783880,3,0=0x577836A9,3,0,0x577838A9,3,0 @@ -5437,10 +5437,10 @@ 0x57250080,3,0,0x57783A80,3,1=0x57250080,3,0,0x57785AA9,3,1 0x57250080,1,0,0x57783B80,3,1=0x57250080,1,0,0x57785BA9,3,1 ;Ortho -> A00/B00 (Upward) (Has Arrow Tiles) -0x57250000,1,0,0x57783A00,1,0=0x57250000,1,0,0x57758A29,1,0; conflicting-override -0x57250000,3,0,0x57783B00,1,0=0x57250000,3,0,0x57758B29,1,0; conflicting-override -0x57250000,3,0,0x57783A00,3,1=0x57250000,3,0,0x57785A29,3,1; conflicting-override -0x57250000,1,0,0x57783B00,3,1=0x57250000,1,0,0x57785B29,3,1; conflicting-override +0x57250000,1,0,0x57783A00,1,0=0x57250000,1,0,0x57758A29,1,0 +0x57250000,3,0,0x57783B00,1,0=0x57250000,3,0,0x57758B29,1,0 +0x57250000,3,0,0x57783A00,3,1=0x57250000,3,0,0x57785A29,3,1 +0x57250000,1,0,0x57783B00,3,1=0x57250000,1,0,0x57785B29,3,1 ;Stability 0x57250000,1,0,0x57758A00,1,0=0x57250000,1,0,0x57758A29,1,0 0x57250000,3,0,0x57758B00,1,0=0x57250000,3,0,0x57758B29,1,0 @@ -5458,8 +5458,8 @@ 0x57758A29,1,0,0x57783800,1,0=0x57758A29,1,0,0x57758829,1,0 0x57785A29,3,1,0x57783800,3,1=0x57785A29,3,1,0x57785829,3,1 ;Orth Fix -0x57250000,1,0,0x57783800,1,0=0x57758A29,1,0,0x57758829,1,0; conflicting-override -0x57250000,3,0,0x57783800,3,1=0x57785A29,3,1,0x57785829,3,1; conflicting-override +0x57250000,1,0,0x57783800,1,0=0x57758A29,1,0,0x57758829,1,0 +0x57250000,3,0,0x57783800,3,1=0x57785A29,3,1,0x57785829,3,1 0x57250000,1,0,0x57758829,1,0=0x57758A29,1,0,0x57758829,1,0 0x57250000,3,0,0x57785829,3,1=0x57785A29,3,1,0x57785829,3,1 ;B80 -> 980 (Upward) @@ -5472,8 +5472,8 @@ 0x57758B29,1,0,0x57758900,1,0=0x57758B29,1,0,0x57758929,1,0 0x57785B29,3,1,0x57785900,3,1=0x57785B29,3,1,0x57785929,3,1 ;Orth Fix -0x57250000,3,0,0x57783900,1,0=0x57758B29,1,0,0x57758929,1,0; conflicting-override -0x57250000,1,0,0x57783900,3,1=0x57785B29,3,1,0x57785929,3,1; conflicting-override +0x57250000,3,0,0x57783900,1,0=0x57758B29,1,0,0x57758929,1,0 +0x57250000,1,0,0x57783900,3,1=0x57785B29,3,1,0x57785929,3,1 0x57250000,3,0,0x57758929,1,0=0x57758B29,1,0,0x57758929,1,0 0x57250000,1,0,0x57785929,3,1=0x57785B29,3,1,0x57785929,3,1 ;880 -> 680 (Upward) (Has Arrow Tiles) @@ -5555,10 +5555,10 @@ 0x57250080,3,0,0x57783AA9,3,1=0x57250080,3,0,0x57785AA9,3,1 0x57250080,1,0,0x57783BA9,3,1=0x57250080,1,0,0x57785BA9,3,1 ;Ortho -> A00/B00 (Upward) (Has Arrow Tiles) -0x57250000,1,0,0x57783A29,1,0=0x57250000,1,0,0x57758A29,1,0; conflicting-override -0x57250000,3,0,0x57783B29,1,0=0x57250000,3,0,0x57758B29,1,0; conflicting-override -0x57250000,3,0,0x57783A29,3,1=0x57250000,3,0,0x57785A29,3,1; conflicting-override -0x57250000,1,0,0x57783B29,3,1=0x57250000,1,0,0x57785B29,3,1; conflicting-override +0x57250000,1,0,0x57783A29,1,0=0x57250000,1,0,0x57758A29,1,0 +0x57250000,3,0,0x57783B29,1,0=0x57250000,3,0,0x57758B29,1,0 +0x57250000,3,0,0x57783A29,3,1=0x57250000,3,0,0x57785A29,3,1 +0x57250000,1,0,0x57783B29,3,1=0x57250000,1,0,0x57785B29,3,1 ;A80 -> 880 (Upward) 0x57785AA9,1,0,0x577838A9,1,0=0x57785AA9,1,0,0x577858A9,1,0 0x57785AA9,3,1,0x577838A9,3,1=0x57785AA9,3,1,0x577858A9,3,1 @@ -5682,8 +5682,8 @@ 0x57794229,3,0,0x57738400,3,0=0x57794229,3,0,0x57749429,3,0 0x57794229,1,1,0x57783400,1,1=0x57794229,1,1,0x57794429,1,1 ; -0x57794229,3,0,0x57784400,3,0=0x57794229,3,0,0x57749429,3,0; conflicting-override -0x57794229,1,1,0x57784400,1,1=0x57794229,1,1,0x57794429,1,1 +0x57794229,3,0,0x57784400,3,0=0x57794229,3,0,0x57749429,3,0 +0x57794229,1,1,0x57784400,1,1=0x57794229,1,1,0x57794429,1,1; conflicting-override ; 0x57794229,3,0,0x57749400,3,0=0x57794229,3,0,0x57749429,3,0 0x57794229,1,1,0x57749400,1,1=0x57794229,1,1,0x57794429,1,1; conflicting-override @@ -5694,8 +5694,8 @@ 0x57794329,3,0,0x57738580,3,0=0x57794329,3,0,0x577495A9,3,0 0x57794329,1,1,0x57783580,1,1=0x57794329,1,1,0x577945A9,1,1 ; -0x57794329,3,0,0x57784580,3,0=0x57794329,3,0,0x577495A9,3,0; conflicting-override -0x57794329,1,1,0x57784580,1,1=0x57794329,1,1,0x577945A9,1,1 +0x57794329,3,0,0x57784580,3,0=0x57794329,3,0,0x577495A9,3,0 +0x57794329,1,1,0x57784580,1,1=0x57794329,1,1,0x577945A9,1,1; conflicting-override ; 0x57794329,3,0,0x57749580,3,0=0x57794329,3,0,0x577495A9,3,0 0x57794329,1,1,0x57749580,1,1=0x57794329,1,1,0x577945A9,1,1; conflicting-override @@ -5728,14 +5728,14 @@ 0x577495A9,3,0,0x57784780,3,0=0x577495A9,3,0,0x577497A9,3,0 0x577945A9,1,1,0x57784780,1,1=0x577945A9,1,1,0x577947A9,1,1 ;Mirror Fixes -0x577495A9,1,1,0x577947A9,1,1=0x577945A9,1,1,0x577947A9,1,1; conflicting-override -0x577945A9,1,1,0x577497A9,1,1=0x577945A9,1,1,0x577947A9,1,1; conflicting-override +0x577495A9,1,1,0x577947A9,1,1=0x577945A9,1,1,0x577947A9,1,1 +0x577945A9,1,1,0x577497A9,1,1=0x577945A9,1,1,0x577947A9,1,1 ;600 -> 680 (Side) (Has Arrows) 0x57749629,0,0,0x57783680,0,0=0x57749629,0,0,0x577946A9,0,0 0x57794629,2,1,0x57783680,2,1=0x57794629,2,1,0x577946A9,2,1 ;780 -> 700 (Side) (Has Arrows) -0x577497A9,0,0,0x57783700,0,0=0x577497A9,0,0,0x57794729,0,0; conflicting-override -0x577947A9,2,1,0x57783700,2,1=0x577947A9,2,1,0x57749729,2,1; conflicting-override +0x577497A9,0,0,0x57783700,0,0=0x577497A9,0,0,0x57794729,0,0 +0x577947A9,2,1,0x57783700,2,1=0x577947A9,2,1,0x57749729,2,1 ;Mirror Fix 0x577497A9,2,1,0x57749729,2,1=0x577947A9,2,1,0x57749729,2,1 ;600 -> 800 (Downward) (Has Arrows) @@ -5865,27 +5865,27 @@ 0x57794229,3,0,0x57738429,3,0=0x57794229,3,0,0x57749429,3,0 0x57794229,1,1,0x57783429,1,1=0x57794229,1,1,0x57794429,1,1 ; -0x57794229,3,0,0x57784429,3,0=0x57794229,3,0,0x57749429,3,0; conflicting-override -0x57794229,1,1,0x57784429,1,1=0x57794229,1,1,0x57794429,1,1 +0x57794229,3,0,0x57784429,3,0=0x57794229,3,0,0x57749429,3,0 +0x57794229,1,1,0x57784429,1,1=0x57794229,1,1,0x57794429,1,1; conflicting-override ;Orth Fix 0x57290000,3,0,0x57749429,3,0=0x57794229,3,0,0x57749429,3,0 0x57290000,1,0,0x57794429,1,1=0x57794229,1,1,0x57794429,1,1 ;400 -> 200 (Upward) (Has Arrows) -0x57749429,1,0,0x57783200,3,0=0x57749429,1,0,0x57794229,1,0; conflicting-override -0x57794429,3,1,0x57783200,1,1=0x57794429,3,1,0x57749229,3,1; conflicting-override -0x57749429,1,0,0x57783229,3,0=0x57749429,1,0,0x57794229,1,0; conflicting-override -0x57794429,3,1,0x57783229,1,1=0x57794429,3,1,0x57749229,3,1; conflicting-override +0x57749429,1,0,0x57783200,3,0=0x57749429,1,0,0x57794229,1,0 +0x57794429,3,1,0x57783200,1,1=0x57794429,3,1,0x57749229,3,1 +0x57749429,1,0,0x57783229,3,0=0x57749429,1,0,0x57794229,1,0 +0x57794429,3,1,0x57783229,1,1=0x57794429,3,1,0x57749229,3,1 ;300 -> 500 (Downward) (Has Arrows) 0x57794329,3,0,0x577385A9,3,0=0x57794329,3,0,0x577495A9,3,0 0x57794329,1,1,0x577835A9,1,1=0x57794329,1,1,0x577945A9,1,1 ; -0x57794329,3,0,0x577845A9,3,0=0x57794329,3,0,0x577495A9,3,0; conflicting-override -0x57794329,1,1,0x577845A9,1,1=0x57794329,1,1,0x577945A9,1,1 +0x57794329,3,0,0x577845A9,3,0=0x57794329,3,0,0x577495A9,3,0 +0x57794329,1,1,0x577845A9,1,1=0x57794329,1,1,0x577945A9,1,1; conflicting-override ;500 -> 300 (Upward) (Has Arrows) -0x577495A9,1,0,0x57783300,3,0=0x577495A9,1,0,0x57794329,1,0; conflicting-override -0x577945A9,3,1,0x57783300,1,1=0x577945A9,3,1,0x57749329,3,1; conflicting-override -0x577495A9,1,0,0x57783329,3,0=0x577495A9,1,0,0x57794329,1,0; conflicting-override -0x577945A9,3,1,0x57783329,1,1=0x577945A9,3,1,0x57749329,3,1; conflicting-override +0x577495A9,1,0,0x57783300,3,0=0x577495A9,1,0,0x57794329,1,0 +0x577945A9,3,1,0x57783300,1,1=0x577945A9,3,1,0x57749329,3,1 +0x577495A9,1,0,0x57783329,3,0=0x577495A9,1,0,0x57794329,1,0 +0x577945A9,3,1,0x57783329,1,1=0x577945A9,3,1,0x57749329,3,1 ;Orth Fix 0x57290000,1,0,0x577495A9,3,0=0x57794329,3,0,0x577495A9,3,0 0x57290000,3,0,0x577945A9,1,1=0x57794329,1,1,0x577945A9,1,1 @@ -5910,14 +5910,14 @@ 0x577495A9,3,0,0x577847A9,3,0=0x577495A9,3,0,0x577497A9,3,0 0x577945A9,1,1,0x577847A9,1,1=0x577945A9,1,1,0x577947A9,1,1 ;Mirror Fixes -0x577495A9,1,1,0x577947A9,1,1=0x577945A9,1,1,0x577947A9,1,1; conflicting-override -0x577945A9,1,1,0x577497A9,1,1=0x577945A9,1,1,0x577947A9,1,1; conflicting-override +0x577495A9,1,1,0x577947A9,1,1=0x577945A9,1,1,0x577947A9,1,1 +0x577945A9,1,1,0x577497A9,1,1=0x577945A9,1,1,0x577947A9,1,1 ;600 -> 680 (Side) (Has Arrows) 0x57749629,0,0,0x577836A9,0,0=0x57749629,0,0,0x577946A9,0,0 0x57794629,2,1,0x577836A9,2,1=0x57794629,2,1,0x577946A9,2,1 ;780 -> 700 (Side) (Has Arrows) -0x577497A9,0,0,0x57783729,0,0=0x577497A9,0,0,0x57794729,0,0; conflicting-override -0x577947A9,2,1,0x57783729,2,1=0x577947A9,2,1,0x57749729,2,1; conflicting-override +0x577497A9,0,0,0x57783729,0,0=0x577497A9,0,0,0x57794729,0,0 +0x577947A9,2,1,0x57783729,2,1=0x577947A9,2,1,0x57749729,2,1 ;Mirror Fix 0x577497A9,2,1,0x57749729,2,1=0x577947A9,2,1,0x57749729,2,1 ;600 -> 800 (Downward) (Has Arrows) @@ -6313,20 +6313,20 @@ ;0x57260080,3,0,0x57783A80,3,1=0x57260080,3,0,0x57796AA9,3,1 ;0x57260080,1,0,0x57783B80,3,1=0x57260080,1,0,0x57796BA9,3,1 ;Ortho -> A00/B00 (Upward) (Has Arrow Tiles) -0x57260000,1,0,0x57783A00,1,0=0x57260000,1,0,0x57769A29,1,0; conflicting-override -0x57260000,3,0,0x57783B00,1,0=0x57260000,3,0,0x57769B29,1,0; conflicting-override -0x57260000,3,0,0x57783A00,3,1=0x57260000,3,0,0x57796A29,3,1; conflicting-override -0x57260000,1,0,0x57783B00,3,1=0x57260000,1,0,0x57796B29,3,1; conflicting-override +0x57260000,1,0,0x57783A00,1,0=0x57260000,1,0,0x57769A29,1,0 +0x57260000,3,0,0x57783B00,1,0=0x57260000,3,0,0x57769B29,1,0 +0x57260000,3,0,0x57783A00,3,1=0x57260000,3,0,0x57796A29,3,1 +0x57260000,1,0,0x57783B00,3,1=0x57260000,1,0,0x57796B29,3,1 ; -0x57260000,1,0,0x57794A00,1,0=0x57260000,1,0,0x57769A29,1,0; conflicting-override -0x57260000,3,0,0x57794B00,1,0=0x57260000,3,0,0x57769B29,1,0; conflicting-override -0x57260000,3,0,0x57794A00,3,1=0x57260000,3,0,0x57796A29,3,1; conflicting-override -0x57260000,1,0,0x57794B00,3,1=0x57260000,1,0,0x57796B29,3,1; conflicting-override +0x57260000,1,0,0x57794A00,1,0=0x57260000,1,0,0x57769A29,1,0 +0x57260000,3,0,0x57794B00,1,0=0x57260000,3,0,0x57769B29,1,0 +0x57260000,3,0,0x57794A00,3,1=0x57260000,3,0,0x57796A29,3,1 +0x57260000,1,0,0x57794B00,3,1=0x57260000,1,0,0x57796B29,3,1 ; -0x57260000,1,0,0x57795A00,1,0=0x57260000,1,0,0x57769A29,1,0; conflicting-override -0x57260000,3,0,0x57795B00,1,0=0x57260000,3,0,0x57769B29,1,0; conflicting-override -0x57260000,3,0,0x57795A00,3,1=0x57260000,3,0,0x57796A29,3,1; conflicting-override -0x57260000,1,0,0x57795B00,3,1=0x57260000,1,0,0x57796B29,3,1; conflicting-override +0x57260000,1,0,0x57795A00,1,0=0x57260000,1,0,0x57769A29,1,0 +0x57260000,3,0,0x57795B00,1,0=0x57260000,3,0,0x57769B29,1,0 +0x57260000,3,0,0x57795A00,3,1=0x57260000,3,0,0x57796A29,3,1 +0x57260000,1,0,0x57795B00,3,1=0x57260000,1,0,0x57796B29,3,1 ; 0x57260000,1,0,0x57769A00,1,0=0x57260000,1,0,0x57769A29,1,0 0x57260000,3,0,0x57769B00,1,0=0x57260000,3,0,0x57769B29,1,0 @@ -6373,14 +6373,14 @@ 0x57769A29,1,0,0x57769800,1,0=0x57769A29,1,0,0x57769829,1,0 0x57796A29,3,1,0x57796800,3,1=0x57796A29,3,1,0x57796829,3,1 ;Stability -0x57260000,1,0,0x57783880,1,0=0x57769A29,1,0,0x57769829,1,0; conflicting-override -0x57260000,3,0,0x57783880,3,1=0x57796A29,3,1,0x57796829,3,1; conflicting-override -0x57260000,1,0,0x57784880,1,0=0x57769A29,1,0,0x57769829,1,0; conflicting-override -0x57260000,3,0,0x57784880,3,1=0x57796A29,3,1,0x57796829,3,1; conflicting-override -0x57260000,1,0,0x57794880,1,0=0x57769A29,1,0,0x57769829,1,0; conflicting-override -0x57260000,3,0,0x57794880,3,1=0x57796A29,3,1,0x57796829,3,1; conflicting-override -0x57260000,1,0,0x57795880,1,0=0x57769A29,1,0,0x57769829,1,0; conflicting-override -0x57260000,3,0,0x57795880,3,1=0x57796A29,3,1,0x57796829,3,1; conflicting-override +0x57260000,1,0,0x57783880,1,0=0x57769A29,1,0,0x57769829,1,0 +0x57260000,3,0,0x57783880,3,1=0x57796A29,3,1,0x57796829,3,1 +0x57260000,1,0,0x57784880,1,0=0x57769A29,1,0,0x57769829,1,0 +0x57260000,3,0,0x57784880,3,1=0x57796A29,3,1,0x57796829,3,1 +0x57260000,1,0,0x57794880,1,0=0x57769A29,1,0,0x57769829,1,0 +0x57260000,3,0,0x57794880,3,1=0x57796A29,3,1,0x57796829,3,1 +0x57260000,1,0,0x57795880,1,0=0x57769A29,1,0,0x57769829,1,0 +0x57260000,3,0,0x57795880,3,1=0x57796A29,3,1,0x57796829,3,1 ;B80 -> 980 (Upward) 0x57796BA9,1,0,0x57783980,1,0=0x57796BA9,1,0,0x577969A9,1,0 0x57796BA9,3,1,0x57783980,3,1=0x57796BA9,3,1,0x577969A9,3,1 @@ -6403,14 +6403,14 @@ 0x57769B29,1,0,0x57769900,1,0=0x57769B29,1,0,0x57769929,1,0 0x57796B29,3,1,0x57796900,3,1=0x57796B29,3,1,0x57796929,3,1 ;Stability -0x57260000,3,0,0x57783980,1,0=0x57769B29,1,0,0x57769929,1,0; conflicting-override -0x57260000,1,0,0x57783980,3,1=0x57796B29,3,1,0x57796929,3,1; conflicting-override -0x57260000,3,0,0x57784980,1,0=0x57769B29,1,0,0x57769929,1,0; conflicting-override -0x57260000,1,0,0x57784980,3,1=0x57796B29,3,1,0x57796929,3,1; conflicting-override -0x57260000,3,0,0x57794980,1,0=0x57769B29,1,0,0x57769929,1,0; conflicting-override -0x57260000,1,0,0x57794980,3,1=0x57796B29,3,1,0x57796929,3,1; conflicting-override -0x57260000,3,0,0x57795980,1,0=0x57769B29,1,0,0x57769929,1,0; conflicting-override -0x57260000,1,0,0x57795980,3,1=0x57796B29,3,1,0x57796929,3,1; conflicting-override +0x57260000,3,0,0x57783980,1,0=0x57769B29,1,0,0x57769929,1,0 +0x57260000,1,0,0x57783980,3,1=0x57796B29,3,1,0x57796929,3,1 +0x57260000,3,0,0x57784980,1,0=0x57769B29,1,0,0x57769929,1,0 +0x57260000,1,0,0x57784980,3,1=0x57796B29,3,1,0x57796929,3,1 +0x57260000,3,0,0x57794980,1,0=0x57769B29,1,0,0x57769929,1,0 +0x57260000,1,0,0x57794980,3,1=0x57796B29,3,1,0x57796929,3,1 +0x57260000,3,0,0x57795980,1,0=0x57769B29,1,0,0x57769929,1,0 +0x57260000,1,0,0x57795980,3,1=0x57796B29,3,1,0x57796929,3,1 ;880 -> 680 (Upward) (Has Arrow Tiles) 0x577968A9,1,0,0x57783680,1,0=0x577968A9,1,0,0x577966A9,1,0 0x577968A9,3,1,0x57783680,3,1=0x577968A9,3,1,0x577966A9,3,1 @@ -6620,20 +6620,20 @@ ;0x57260080,3,0,0x57783AA9,3,1=0x57260080,3,0,0x57796AA9,3,1 ;0x57260080,1,0,0x57783BA9,3,1=0x57260080,1,0,0x57796BA9,3,1 ;Ortho -> A00/B00 (Upward) (Has Arrow Tiles) -0x57260000,1,0,0x57783A29,1,0=0x57260000,1,0,0x57769A29,1,0; conflicting-override -0x57260000,3,0,0x57783B29,1,0=0x57260000,3,0,0x57769B29,1,0; conflicting-override -0x57260000,3,0,0x57783A29,3,1=0x57260000,3,0,0x57796A29,3,1; conflicting-override -0x57260000,1,0,0x57783B29,3,1=0x57260000,1,0,0x57796B29,3,1; conflicting-override -; -0x57260000,1,0,0x57794A29,1,0=0x57260000,1,0,0x57769A29,1,0; conflicting-override -0x57260000,3,0,0x57794B29,1,0=0x57260000,3,0,0x57769B29,1,0; conflicting-override -0x57260000,3,0,0x57794A29,3,1=0x57260000,3,0,0x57796A29,3,1; conflicting-override -0x57260000,1,0,0x57794B29,3,1=0x57260000,1,0,0x57796B29,3,1; conflicting-override -; -0x57260000,1,0,0x57795A29,1,0=0x57260000,1,0,0x57769A29,1,0; conflicting-override -0x57260000,3,0,0x57795B29,1,0=0x57260000,3,0,0x57769B29,1,0; conflicting-override -0x57260000,3,0,0x57795A29,3,1=0x57260000,3,0,0x57796A29,3,1; conflicting-override -0x57260000,1,0,0x57795B29,3,1=0x57260000,1,0,0x57796B29,3,1; conflicting-override +0x57260000,1,0,0x57783A29,1,0=0x57260000,1,0,0x57769A29,1,0 +0x57260000,3,0,0x57783B29,1,0=0x57260000,3,0,0x57769B29,1,0 +0x57260000,3,0,0x57783A29,3,1=0x57260000,3,0,0x57796A29,3,1 +0x57260000,1,0,0x57783B29,3,1=0x57260000,1,0,0x57796B29,3,1 +; +0x57260000,1,0,0x57794A29,1,0=0x57260000,1,0,0x57769A29,1,0 +0x57260000,3,0,0x57794B29,1,0=0x57260000,3,0,0x57769B29,1,0 +0x57260000,3,0,0x57794A29,3,1=0x57260000,3,0,0x57796A29,3,1 +0x57260000,1,0,0x57794B29,3,1=0x57260000,1,0,0x57796B29,3,1 +; +0x57260000,1,0,0x57795A29,1,0=0x57260000,1,0,0x57769A29,1,0 +0x57260000,3,0,0x57795B29,1,0=0x57260000,3,0,0x57769B29,1,0 +0x57260000,3,0,0x57795A29,3,1=0x57260000,3,0,0x57796A29,3,1 +0x57260000,1,0,0x57795B29,3,1=0x57260000,1,0,0x57796B29,3,1 ;A00 -> A80 (Side) (Has Arrow Tiles) 0x57769A29,0,0,0x57785AA9,0,0=0x57769A29,0,0,0x57796AA9,0,0 0x57796A29,2,1,0x57785AA9,2,1=0x57796A29,2,1,0x57796AA9,2,1 @@ -6666,14 +6666,14 @@ 0x57769A29,1,0,0x57795829,1,0=0x57769A29,1,0,0x57769829,1,0 0x57796A29,3,1,0x57795829,3,1=0x57796A29,3,1,0x57796829,3,1 ;Stability -0x57260000,1,0,0x57783829,1,0=0x57769A29,1,0,0x57769829,1,0; conflicting-override -0x57260000,3,0,0x57783829,3,1=0x57796A29,3,1,0x57796829,3,1; conflicting-override +0x57260000,1,0,0x57783829,1,0=0x57769A29,1,0,0x57769829,1,0 +0x57260000,3,0,0x57783829,3,1=0x57796A29,3,1,0x57796829,3,1 ; -0x57260000,1,0,0x57794829,1,0=0x57769A29,1,0,0x57769829,1,0; conflicting-override -0x57260000,3,0,0x57794829,3,1=0x57796A29,3,1,0x57796829,3,1; conflicting-override +0x57260000,1,0,0x57794829,1,0=0x57769A29,1,0,0x57769829,1,0 +0x57260000,3,0,0x57794829,3,1=0x57796A29,3,1,0x57796829,3,1 ; -0x57260000,1,0,0x57795829,1,0=0x57769A29,1,0,0x57769829,1,0; conflicting-override -0x57260000,3,0,0x57795829,3,1=0x57796A29,3,1,0x57796829,3,1; conflicting-override +0x57260000,1,0,0x57795829,1,0=0x57769A29,1,0,0x57769829,1,0 +0x57260000,3,0,0x57795829,3,1=0x57796A29,3,1,0x57796829,3,1 ;B80 -> 980 (Upward) 0x57796BA9,1,0,0x577839A9,1,0=0x57796BA9,1,0,0x577969A9,1,0 0x57796BA9,3,1,0x577839A9,3,1=0x57796BA9,3,1,0x577969A9,3,1 @@ -6693,14 +6693,14 @@ 0x57769B29,1,0,0x57795929,1,0=0x57769B29,1,0,0x57769929,1,0 0x57796B29,3,1,0x57795929,3,1=0x57796B29,3,1,0x57796929,3,1 ;Stability -0x57260000,3,0,0x57783929,1,0=0x57769B29,1,0,0x57769929,1,0; conflicting-override -0x57260000,1,0,0x57783929,3,1=0x57796B29,3,1,0x57796929,3,1; conflicting-override +0x57260000,3,0,0x57783929,1,0=0x57769B29,1,0,0x57769929,1,0 +0x57260000,1,0,0x57783929,3,1=0x57796B29,3,1,0x57796929,3,1 ; -0x57260000,3,0,0x57794929,1,0=0x57769B29,1,0,0x57769929,1,0; conflicting-override -0x57260000,1,0,0x57794929,3,1=0x57796B29,3,1,0x57796929,3,1; conflicting-override +0x57260000,3,0,0x57794929,1,0=0x57769B29,1,0,0x57769929,1,0 +0x57260000,1,0,0x57794929,3,1=0x57796B29,3,1,0x57796929,3,1 ; -0x57260000,3,0,0x57795929,1,0=0x57769B29,1,0,0x57769929,1,0; conflicting-override -0x57260000,1,0,0x57795929,3,1=0x57796B29,3,1,0x57796929,3,1; conflicting-override +0x57260000,3,0,0x57795929,1,0=0x57769B29,1,0,0x57769929,1,0 +0x57260000,1,0,0x57795929,3,1=0x57796B29,3,1,0x57796929,3,1 ;880 -> 680 (Upward) (Has Arrow Tiles) 0x577968A9,1,0,0x577836A9,1,0=0x577968A9,1,0,0x577966A9,1,0 0x577968A9,3,1,0x577836A9,3,1=0x577968A9,3,1,0x577966A9,3,1 @@ -6833,10 +6833,10 @@ 0x57000000,1,0,0x57730480,3,1=0x57730580,3,1,0x57730480,3,1 0x57000000,3,0,0x57730480,3,1=0x57730580,3,1,0x57730480,3,1 ; -0x5700F480,1,1,0x57703400,1,0=0x57730500,1,0,0x57703400,1,0; conflicting-override -0x5700F480,3,0,0x57703480,1,0=0x57703580,1,0,0x57703480,1,0; conflicting-override -0x5700F480,1,1,0x57730480,3,1=0x57730500,3,1,0x57730400,3,1; conflicting-override -0x5700F480,3,0,0x57730400,3,1=0x57703580,3,1,0x57730480,3,1; conflicting-override +0x5700F480,1,1,0x57703400,1,0=0x57730500,1,0,0x57703400,1,0 +0x5700F480,3,0,0x57703480,1,0=0x57703580,1,0,0x57703480,1,0 +0x5700F480,1,1,0x57730480,3,1=0x57730500,3,1,0x57730400,3,1 +0x5700F480,3,0,0x57730400,3,1=0x57703580,3,1,0x57730480,3,1 ;5 -> RHW-4 Orth 0x57000000,1,0,0x57730500,1,0=0x57030000,1,0,0x57730500,1,0 0x57000000,3,0,0x57730500,1,0=0x57030000,1,0,0x57730500,1,0 @@ -6981,12 +6981,12 @@ 0x57730380,1,0,0x57735C80,1,0=0x57735D80,1,0,0x57735C80,1,0 0x57730380,3,1,0x57735C80,3,1=0x57735D80,3,1,0x57735C80,3,1 ;3 -> 4/Orth -0x57703400,1,0,0x57735300,1,0=0x57130000,3,0,0x57735300,1,0; conflicting-override -0x57730400,3,1,0x57735300,3,1=0x57130000,1,0,0x57735300,3,1; conflicting-override +0x57703400,1,0,0x57735300,1,0=0x57130000,3,0,0x57735300,1,0 +0x57730400,3,1,0x57735300,3,1=0x57130000,1,0,0x57735300,3,1 0x57703480,1,0,0x57735380,1,0=0x57735480,1,0,0x57735380,1,0 0x57730480,3,1,0x57735380,3,1=0x57735480,3,1,0x57735380,3,1 -0x57703400,1,0,0x57735D00,1,0=0x57130000,1,0,0x57735D00,1,0; conflicting-override -0x57730400,3,1,0x57735D00,3,1=0x57130000,3,0,0x57735D00,3,1; conflicting-override +0x57703400,1,0,0x57735D00,1,0=0x57130000,1,0,0x57735D00,1,0 +0x57730400,3,1,0x57735D00,3,1=0x57130000,3,0,0x57735D00,3,1 0x57703480,1,0,0x57735D80,1,0=0x57735E80,1,0,0x57735D80,1,0 0x57730480,3,1,0x57735D80,3,1=0x57735E80,3,1,0x57735D80,3,1 ;4 -> 5/Orth diff --git a/Controller/RUL2/07_RHW/Sec7i_FLEXRamp/Sec7i_FLEXRamp_LHD.txt b/Controller/RUL2/07_RHW/Sec7i_FLEXRamp/Sec7i_FLEXRamp_LHD.txt index 9a285120a..2e57b5ce9 100644 --- a/Controller/RUL2/07_RHW/Sec7i_FLEXRamp/Sec7i_FLEXRamp_LHD.txt +++ b/Controller/RUL2/07_RHW/Sec7i_FLEXRamp/Sec7i_FLEXRamp_LHD.txt @@ -25537,77 +25537,77 @@ ; ;----MIS---- ;L0 -0x57820a80,3,0,0x57000000,1,0=0x57820a80,3,0,0x57020000,1,0; conflicting-override -0x57820a80,3,0,0x57000000,3,0=0x57820a80,3,0,0x57020000,1,0; conflicting-override -0x57820a00,1,1,0x57000000,1,0=0x57820a00,1,1,0x57020000,3,0; conflicting-override -0x57820a00,1,1,0x57000000,3,0=0x57820a00,1,1,0x57020000,3,0; conflicting-override +0x57820a80,3,0,0x57000000,1,0=0x57820a80,3,0,0x57020000,1,0 +0x57820a80,3,0,0x57000000,3,0=0x57820a80,3,0,0x57020000,1,0 +0x57820a00,1,1,0x57000000,1,0=0x57820a00,1,1,0x57020000,3,0 +0x57820a00,1,1,0x57000000,3,0=0x57820a00,1,1,0x57020000,3,0 ;L1 -0x57820a99,3,0,0x57000000,1,0=0x57820a99,3,0,0x57120000,1,0; conflicting-override -0x57820a99,3,0,0x57000000,3,0=0x57820a99,3,0,0x57120000,1,0; conflicting-override -0x57820a19,1,1,0x57000000,1,0=0x57820a19,1,1,0x57120000,3,0; conflicting-override -0x57820a19,1,1,0x57000000,3,0=0x57820a19,1,1,0x57120000,3,0; conflicting-override +0x57820a99,3,0,0x57000000,1,0=0x57820a99,3,0,0x57120000,1,0 +0x57820a99,3,0,0x57000000,3,0=0x57820a99,3,0,0x57120000,1,0 +0x57820a19,1,1,0x57000000,1,0=0x57820a19,1,1,0x57120000,3,0 +0x57820a19,1,1,0x57000000,3,0=0x57820a19,1,1,0x57120000,3,0 ;Stability 0x57820a99,3,0,0x57020000,3,0=0x57820a99,3,0,0x57120000,1,0 0x57820a19,1,1,0x57020000,1,0=0x57820a19,1,1,0x57120000,3,0 ;L2 -0x57820aa9,3,0,0x57000000,1,0=0x57820aa9,3,0,0x57220000,1,0; conflicting-override -0x57820aa9,3,0,0x57000000,3,0=0x57820aa9,3,0,0x57220000,1,0; conflicting-override -0x57820a29,1,1,0x57000000,1,0=0x57820a29,1,1,0x57220000,3,0; conflicting-override -0x57820a29,1,1,0x57000000,3,0=0x57820a29,1,1,0x57220000,3,0; conflicting-override +0x57820aa9,3,0,0x57000000,1,0=0x57820aa9,3,0,0x57220000,1,0 +0x57820aa9,3,0,0x57000000,3,0=0x57820aa9,3,0,0x57220000,1,0 +0x57820a29,1,1,0x57000000,1,0=0x57820a29,1,1,0x57220000,3,0 +0x57820a29,1,1,0x57000000,3,0=0x57820a29,1,1,0x57220000,3,0 ;Stability 0x57820aa9,3,0,0x57020000,3,0=0x57820aa9,3,0,0x57220000,1,0 0x57820a29,1,1,0x57020000,1,0=0x57820a29,1,1,0x57220000,3,0 ;L3 -0x57820ab9,3,0,0x57000000,1,0=0x57820ab9,3,0,0x57320000,1,0; conflicting-override -0x57820ab9,3,0,0x57000000,3,0=0x57820ab9,3,0,0x57320000,1,0; conflicting-override -0x57820a39,1,1,0x57000000,1,0=0x57820a39,1,1,0x57320000,3,0; conflicting-override -0x57820a39,1,1,0x57000000,3,0=0x57820a39,1,1,0x57320000,3,0; conflicting-override +0x57820ab9,3,0,0x57000000,1,0=0x57820ab9,3,0,0x57320000,1,0 +0x57820ab9,3,0,0x57000000,3,0=0x57820ab9,3,0,0x57320000,1,0 +0x57820a39,1,1,0x57000000,1,0=0x57820a39,1,1,0x57320000,3,0 +0x57820a39,1,1,0x57000000,3,0=0x57820a39,1,1,0x57320000,3,0 ;Stability 0x57820ab9,3,0,0x57020000,3,0=0x57820ab9,3,0,0x57320000,1,0 0x57820a39,1,1,0x57020000,1,0=0x57820a39,1,1,0x57320000,3,0 ;L4 -0x57820ac9,3,0,0x57000000,1,0=0x57820ac9,3,0,0x57420000,1,0; conflicting-override -0x57820ac9,3,0,0x57000000,3,0=0x57820ac9,3,0,0x57420000,1,0; conflicting-override -0x57820a49,1,1,0x57000000,1,0=0x57820a49,1,1,0x57420000,3,0; conflicting-override -0x57820a49,1,1,0x57000000,3,0=0x57820a49,1,1,0x57420000,3,0; conflicting-override +0x57820ac9,3,0,0x57000000,1,0=0x57820ac9,3,0,0x57420000,1,0 +0x57820ac9,3,0,0x57000000,3,0=0x57820ac9,3,0,0x57420000,1,0 +0x57820a49,1,1,0x57000000,1,0=0x57820a49,1,1,0x57420000,3,0 +0x57820a49,1,1,0x57000000,3,0=0x57820a49,1,1,0x57420000,3,0 ;Stability 0x57820ac9,3,0,0x57020000,3,0=0x57820ac9,3,0,0x57420000,1,0 0x57820a49,1,1,0x57020000,1,0=0x57820a49,1,1,0x57420000,3,0 ;----RHW-4---- ;L0 -0x57830a80,3,0,0x57000000,1,0=0x57830a80,3,0,0x57020000,1,0; conflicting-override -0x57830a80,3,0,0x57000000,3,0=0x57830a80,3,0,0x57020000,1,0; conflicting-override -0x57830a00,1,1,0x57000000,1,0=0x57830a00,1,1,0x57020000,3,0; conflicting-override -0x57830a00,1,1,0x57000000,3,0=0x57830a00,1,1,0x57020000,3,0; conflicting-override +0x57830a80,3,0,0x57000000,1,0=0x57830a80,3,0,0x57020000,1,0 +0x57830a80,3,0,0x57000000,3,0=0x57830a80,3,0,0x57020000,1,0 +0x57830a00,1,1,0x57000000,1,0=0x57830a00,1,1,0x57020000,3,0 +0x57830a00,1,1,0x57000000,3,0=0x57830a00,1,1,0x57020000,3,0 ;L1 -0x57830a99,3,0,0x57000000,1,0=0x57830a99,3,0,0x57120000,1,0; conflicting-override -0x57830a99,3,0,0x57000000,3,0=0x57830a99,3,0,0x57120000,1,0; conflicting-override -0x57830a19,1,1,0x57000000,1,0=0x57830a19,1,1,0x57120000,3,0; conflicting-override -0x57830a19,1,1,0x57000000,3,0=0x57830a19,1,1,0x57120000,3,0; conflicting-override +0x57830a99,3,0,0x57000000,1,0=0x57830a99,3,0,0x57120000,1,0 +0x57830a99,3,0,0x57000000,3,0=0x57830a99,3,0,0x57120000,1,0 +0x57830a19,1,1,0x57000000,1,0=0x57830a19,1,1,0x57120000,3,0 +0x57830a19,1,1,0x57000000,3,0=0x57830a19,1,1,0x57120000,3,0 ;Stability 0x57830a99,3,0,0x57020000,3,0=0x57830a99,3,0,0x57120000,1,0 0x57830a19,1,1,0x57020000,1,0=0x57830a19,1,1,0x57120000,3,0 ;L2 -0x57830aa9,3,0,0x57000000,1,0=0x57830aa9,3,0,0x57220000,1,0; conflicting-override -0x57830aa9,3,0,0x57000000,3,0=0x57830aa9,3,0,0x57220000,1,0; conflicting-override -0x57830a29,1,1,0x57000000,1,0=0x57830a29,1,1,0x57220000,3,0; conflicting-override -0x57830a29,1,1,0x57000000,3,0=0x57830a29,1,1,0x57220000,3,0; conflicting-override +0x57830aa9,3,0,0x57000000,1,0=0x57830aa9,3,0,0x57220000,1,0 +0x57830aa9,3,0,0x57000000,3,0=0x57830aa9,3,0,0x57220000,1,0 +0x57830a29,1,1,0x57000000,1,0=0x57830a29,1,1,0x57220000,3,0 +0x57830a29,1,1,0x57000000,3,0=0x57830a29,1,1,0x57220000,3,0 ;Stability 0x57830aa9,3,0,0x57020000,3,0=0x57830aa9,3,0,0x57220000,1,0 0x57830a29,1,1,0x57020000,1,0=0x57830a29,1,1,0x57220000,3,0 ;L3 -0x57830ab9,3,0,0x57000000,1,0=0x57830ab9,3,0,0x57320000,1,0; conflicting-override -0x57830ab9,3,0,0x57000000,3,0=0x57830ab9,3,0,0x57320000,1,0; conflicting-override -0x57830a39,1,1,0x57000000,1,0=0x57830a39,1,1,0x57320000,3,0; conflicting-override -0x57830a39,1,1,0x57000000,3,0=0x57830a39,1,1,0x57320000,3,0; conflicting-override +0x57830ab9,3,0,0x57000000,1,0=0x57830ab9,3,0,0x57320000,1,0 +0x57830ab9,3,0,0x57000000,3,0=0x57830ab9,3,0,0x57320000,1,0 +0x57830a39,1,1,0x57000000,1,0=0x57830a39,1,1,0x57320000,3,0 +0x57830a39,1,1,0x57000000,3,0=0x57830a39,1,1,0x57320000,3,0 ;Stability 0x57830ab9,3,0,0x57020000,3,0=0x57830ab9,3,0,0x57320000,1,0 0x57830a39,1,1,0x57020000,1,0=0x57830a39,1,1,0x57320000,3,0 ;L4 -0x57830ac9,3,0,0x57000000,1,0=0x57830ac9,3,0,0x57420000,1,0; conflicting-override -0x57830ac9,3,0,0x57000000,3,0=0x57830ac9,3,0,0x57420000,1,0; conflicting-override -0x57830a49,1,1,0x57000000,1,0=0x57830a49,1,1,0x57420000,3,0; conflicting-override -0x57830a49,1,1,0x57000000,3,0=0x57830a49,1,1,0x57420000,3,0; conflicting-override +0x57830ac9,3,0,0x57000000,1,0=0x57830ac9,3,0,0x57420000,1,0 +0x57830ac9,3,0,0x57000000,3,0=0x57830ac9,3,0,0x57420000,1,0 +0x57830a49,1,1,0x57000000,1,0=0x57830a49,1,1,0x57420000,3,0 +0x57830a49,1,1,0x57000000,3,0=0x57830a49,1,1,0x57420000,3,0 ;Stability 0x57830ac9,3,0,0x57020000,3,0=0x57830ac9,3,0,0x57420000,1,0 0x57830a49,1,1,0x57020000,1,0=0x57830a49,1,1,0x57420000,3,0 @@ -25630,69 +25630,69 @@ 0x57830a59,1,1,0x57020000,3,0=0x57830a59,1,1,0x57220000,3,0 ;----RHW-6S---- ;L0 -0x57840a80,3,0,0x57000000,1,0=0x57840a80,3,0,0x57020000,1,0; conflicting-override -0x57840a80,3,0,0x57000000,3,0=0x57840a80,3,0,0x57020000,1,0; conflicting-override -0x57840a00,1,1,0x57000000,1,0=0x57840a00,1,1,0x57020000,3,0; conflicting-override -0x57840a00,1,1,0x57000000,3,0=0x57840a00,1,1,0x57020000,3,0; conflicting-override +0x57840a80,3,0,0x57000000,1,0=0x57840a80,3,0,0x57020000,1,0 +0x57840a80,3,0,0x57000000,3,0=0x57840a80,3,0,0x57020000,1,0 +0x57840a00,1,1,0x57000000,1,0=0x57840a00,1,1,0x57020000,3,0 +0x57840a00,1,1,0x57000000,3,0=0x57840a00,1,1,0x57020000,3,0 ;L1 -0x57840a99,3,0,0x57000000,1,0=0x57840a99,3,0,0x57120000,1,0; conflicting-override -0x57840a99,3,0,0x57000000,3,0=0x57840a99,3,0,0x57120000,1,0; conflicting-override -0x57840a19,1,1,0x57000000,1,0=0x57840a19,1,1,0x57120000,3,0; conflicting-override -0x57840a19,1,1,0x57000000,3,0=0x57840a19,1,1,0x57120000,3,0; conflicting-override +0x57840a99,3,0,0x57000000,1,0=0x57840a99,3,0,0x57120000,1,0 +0x57840a99,3,0,0x57000000,3,0=0x57840a99,3,0,0x57120000,1,0 +0x57840a19,1,1,0x57000000,1,0=0x57840a19,1,1,0x57120000,3,0 +0x57840a19,1,1,0x57000000,3,0=0x57840a19,1,1,0x57120000,3,0 ;Stability 0x57840a99,3,0,0x57020000,1,0=0x57840a99,3,0,0x57120000,1,0 0x57840a19,1,1,0x57020000,3,0=0x57840a19,1,1,0x57120000,3,0 ;L1 -0x57840a99,3,0,0x57000000,1,0=0x57840a99,3,0,0x57120000,1,0; conflicting-override -0x57840a99,3,0,0x57000000,3,0=0x57840a99,3,0,0x57120000,1,0; conflicting-override -0x57840a19,1,1,0x57000000,1,0=0x57840a19,1,1,0x57120000,3,0; conflicting-override -0x57840a19,1,1,0x57000000,3,0=0x57840a19,1,1,0x57120000,3,0; conflicting-override +0x57840a99,3,0,0x57000000,1,0=0x57840a99,3,0,0x57120000,1,0 +0x57840a99,3,0,0x57000000,3,0=0x57840a99,3,0,0x57120000,1,0 +0x57840a19,1,1,0x57000000,1,0=0x57840a19,1,1,0x57120000,3,0 +0x57840a19,1,1,0x57000000,3,0=0x57840a19,1,1,0x57120000,3,0 ;Stability 0x57840a99,3,0,0x57020000,1,0=0x57840a99,3,0,0x57120000,1,0 0x57840a19,1,1,0x57020000,3,0=0x57840a19,1,1,0x57120000,3,0 ;L2 -0x57840aa9,3,0,0x57000000,1,0=0x57840aa9,3,0,0x57220000,1,0; conflicting-override -0x57840aa9,3,0,0x57000000,3,0=0x57840aa9,3,0,0x57220000,1,0; conflicting-override -0x57840a29,1,1,0x57000000,1,0=0x57840a29,1,1,0x57220000,3,0; conflicting-override -0x57840a29,1,1,0x57000000,3,0=0x57840a29,1,1,0x57220000,3,0; conflicting-override +0x57840aa9,3,0,0x57000000,1,0=0x57840aa9,3,0,0x57220000,1,0 +0x57840aa9,3,0,0x57000000,3,0=0x57840aa9,3,0,0x57220000,1,0 +0x57840a29,1,1,0x57000000,1,0=0x57840a29,1,1,0x57220000,3,0 +0x57840a29,1,1,0x57000000,3,0=0x57840a29,1,1,0x57220000,3,0 ;Stability 0x57840aa9,3,0,0x57020000,1,0=0x57840aa9,3,0,0x57220000,1,0 0x57840a29,1,1,0x57020000,3,0=0x57840a29,1,1,0x57220000,3,0 ;L3 -0x57840ab9,3,0,0x57000000,1,0=0x57840ab9,3,0,0x57320000,1,0; conflicting-override -0x57840ab9,3,0,0x57000000,3,0=0x57840ab9,3,0,0x57320000,1,0; conflicting-override -0x57840a39,1,1,0x57000000,1,0=0x57840a39,1,1,0x57320000,3,0; conflicting-override -0x57840a39,1,1,0x57000000,3,0=0x57840a39,1,1,0x57320000,3,0; conflicting-override +0x57840ab9,3,0,0x57000000,1,0=0x57840ab9,3,0,0x57320000,1,0 +0x57840ab9,3,0,0x57000000,3,0=0x57840ab9,3,0,0x57320000,1,0 +0x57840a39,1,1,0x57000000,1,0=0x57840a39,1,1,0x57320000,3,0 +0x57840a39,1,1,0x57000000,3,0=0x57840a39,1,1,0x57320000,3,0 ;Stability 0x57840ab9,3,0,0x57020000,1,0=0x57840ab9,3,0,0x57320000,1,0 0x57840a39,1,1,0x57020000,3,0=0x57840a39,1,1,0x57320000,3,0 ;L4 -0x57840ac9,3,0,0x57000000,1,0=0x57840ac9,3,0,0x57420000,1,0; conflicting-override -0x57840ac9,3,0,0x57000000,3,0=0x57840ac9,3,0,0x57420000,1,0; conflicting-override -0x57840a49,1,1,0x57000000,1,0=0x57840a49,1,1,0x57420000,3,0; conflicting-override -0x57840a49,1,1,0x57000000,3,0=0x57840a49,1,1,0x57420000,3,0; conflicting-override +0x57840ac9,3,0,0x57000000,1,0=0x57840ac9,3,0,0x57420000,1,0 +0x57840ac9,3,0,0x57000000,3,0=0x57840ac9,3,0,0x57420000,1,0 +0x57840a49,1,1,0x57000000,1,0=0x57840a49,1,1,0x57420000,3,0 +0x57840a49,1,1,0x57000000,3,0=0x57840a49,1,1,0x57420000,3,0 ;Stability 0x57840ac9,3,0,0x57020000,1,0=0x57840ac9,3,0,0x57420000,1,0 0x57840a49,1,1,0x57020000,3,0=0x57840a49,1,1,0x57420000,3,0 ;----RHW-8S and Up---- ;L0 -0x57850a80,3,0,0x57000000,1,0=0x57850a80,3,0,0x57020000,1,0; conflicting-override -0x57850a80,3,0,0x57000000,3,0=0x57850a80,3,0,0x57020000,1,0; conflicting-override -0x57850a00,1,1,0x57000000,1,0=0x57850a00,1,1,0x57020000,3,0; conflicting-override -0x57850a00,1,1,0x57000000,3,0=0x57850a00,1,1,0x57020000,3,0; conflicting-override +0x57850a80,3,0,0x57000000,1,0=0x57850a80,3,0,0x57020000,1,0 +0x57850a80,3,0,0x57000000,3,0=0x57850a80,3,0,0x57020000,1,0 +0x57850a00,1,1,0x57000000,1,0=0x57850a00,1,1,0x57020000,3,0 +0x57850a00,1,1,0x57000000,3,0=0x57850a00,1,1,0x57020000,3,0 ;L1 -0x57850a99,3,0,0x57000000,1,0=0x57850a99,3,0,0x57120000,1,0; conflicting-override -0x57850a99,3,0,0x57000000,3,0=0x57850a99,3,0,0x57120000,1,0; conflicting-override -0x57850a19,1,1,0x57000000,1,0=0x57850a19,1,1,0x57120000,3,0; conflicting-override -0x57850a19,1,1,0x57000000,3,0=0x57850a19,1,1,0x57120000,3,0; conflicting-override +0x57850a99,3,0,0x57000000,1,0=0x57850a99,3,0,0x57120000,1,0 +0x57850a99,3,0,0x57000000,3,0=0x57850a99,3,0,0x57120000,1,0 +0x57850a19,1,1,0x57000000,1,0=0x57850a19,1,1,0x57120000,3,0 +0x57850a19,1,1,0x57000000,3,0=0x57850a19,1,1,0x57120000,3,0 ;Stability 0x57850a99,3,0,0x57020000,1,0=0x57850a99,3,0,0x57120000,1,0 0x57850a19,1,1,0x57020000,3,0=0x57850a19,1,1,0x57120000,3,0 ;L2 -0x57850aa9,3,0,0x57000000,1,0=0x57850aa9,3,0,0x57220000,1,0; conflicting-override -0x57850aa9,3,0,0x57000000,3,0=0x57850aa9,3,0,0x57220000,1,0; conflicting-override -0x57850a29,1,1,0x57000000,1,0=0x57850a29,1,1,0x57220000,3,0; conflicting-override -0x57850a29,1,1,0x57000000,3,0=0x57850a29,1,1,0x57220000,3,0; conflicting-override +0x57850aa9,3,0,0x57000000,1,0=0x57850aa9,3,0,0x57220000,1,0 +0x57850aa9,3,0,0x57000000,3,0=0x57850aa9,3,0,0x57220000,1,0 +0x57850a29,1,1,0x57000000,1,0=0x57850a29,1,1,0x57220000,3,0 +0x57850a29,1,1,0x57000000,3,0=0x57850a29,1,1,0x57220000,3,0 ;Stability 0x57850aa9,3,0,0x57020000,1,0=0x57850aa9,3,0,0x57220000,1,0 0x57850a29,1,1,0x57020000,3,0=0x57850a29,1,1,0x57220000,3,0 @@ -27202,14 +27202,14 @@ 0x57890F80,3,0,0x57700230,1,0=0x57890F80,3,0,0x57722230,3,1 0x57890F00,1,1,0x57700230,1,0=0x57890F00,1,1,0x57722230,1,0 ;A1 Inside -0x57820A80,3,0,0x57700230,1,0=0x57820A80,3,0,0x57722230,1,0; conflicting-override -0x57820A00,1,1,0x57700230,1,0=0x57820A00,1,1,0x57722230,3,1; conflicting-override -0x57830A80,3,0,0x57700230,1,0=0x57830A80,3,0,0x57722230,1,0; conflicting-override -0x57830A00,1,1,0x57700230,1,0=0x57830A00,1,1,0x57722230,3,1; conflicting-override -0x57840A80,3,0,0x57700230,1,0=0x57840A80,3,0,0x57722230,1,0; conflicting-override -0x57840A00,1,1,0x57700230,1,0=0x57840A00,1,1,0x57722230,3,1; conflicting-override -0x57850A80,3,0,0x57700230,1,0=0x57850A80,3,0,0x57722230,1,0; conflicting-override -0x57850A00,1,1,0x57700230,1,0=0x57850A00,1,1,0x57722230,3,1; conflicting-override +0x57820A80,3,0,0x57700230,1,0=0x57820A80,3,0,0x57722230,1,0 +0x57820A00,1,1,0x57700230,1,0=0x57820A00,1,1,0x57722230,3,1 +0x57830A80,3,0,0x57700230,1,0=0x57830A80,3,0,0x57722230,1,0 +0x57830A00,1,1,0x57700230,1,0=0x57830A00,1,1,0x57722230,3,1 +0x57840A80,3,0,0x57700230,1,0=0x57840A80,3,0,0x57722230,1,0 +0x57840A00,1,1,0x57700230,1,0=0x57840A00,1,1,0x57722230,3,1 +0x57850A80,3,0,0x57700230,1,0=0x57850A80,3,0,0x57722230,1,0 +0x57850A00,1,1,0x57700230,1,0=0x57850A00,1,1,0x57722230,3,1 0x57860A80,3,0,0x57700230,1,0=0x57860A80,3,0,0x57722230,1,0 0x57860A00,1,1,0x57700230,1,0=0x57860A00,1,1,0x57722230,3,1 0x57870A80,3,0,0x57700230,1,0=0x57870A80,3,0,0x57722230,1,0 diff --git a/Controller/RUL2/07_RHW/Sec7i_FLEXRamp/Sec7i_FLEXRamp_RHD.txt b/Controller/RUL2/07_RHW/Sec7i_FLEXRamp/Sec7i_FLEXRamp_RHD.txt index 3c5e399fe..0689443a7 100644 --- a/Controller/RUL2/07_RHW/Sec7i_FLEXRamp/Sec7i_FLEXRamp_RHD.txt +++ b/Controller/RUL2/07_RHW/Sec7i_FLEXRamp/Sec7i_FLEXRamp_RHD.txt @@ -333,10 +333,10 @@ 0x57810780,3,1,0x57700230,1,0=0x57810780,3,1,0x57711230,1,0 ;FHT from 00 ;up -0x57800000,1,0,0x57711230,1,0=0x57810000,1,0,0x57711230,1,0; conflicting-override -0x57800080,3,1,0x57711230,3,1=0x57810080,3,1,0x57711230,1,0; conflicting-override -0x57800000,1,0,0x57711230,3,1=0x57810700,1,0,0x57711230,3,1; conflicting-override -0x57800080,3,1,0x57711230,1,0=0x57810780,3,1,0x57711230,3,1; conflicting-override +0x57800000,1,0,0x57711230,1,0=0x57810000,1,0,0x57711230,1,0 +0x57800080,3,1,0x57711230,3,1=0x57810080,3,1,0x57711230,1,0 +0x57800000,1,0,0x57711230,3,1=0x57810700,1,0,0x57711230,3,1 +0x57800080,3,1,0x57711230,1,0=0x57810780,3,1,0x57711230,3,1 ;FHT to 02 ;up 0x57810200,3,0,0x57700230,1,0=0x57810200,3,0,0x57711230,3,1 @@ -2738,15 +2738,15 @@ 0x57800500,3,0,0x57010000,3,0=0x57810500,3,0,0x57010000,3,0 0x57800500,3,0,0x57010000,1,0=0x57810580,3,0,0x57010000,1,0 ;00 to Orth (Up) -0x57810400,1,0,0x57000000,1,0=0x57810400,1,0,0x57010000,1,0; conflicting-override -0x57810400,1,0,0x57000000,3,0=0x57810400,1,0,0x57010000,1,0; conflicting-override -0x57810480,1,0,0x57000000,1,0=0x57810400,1,0,0x57010000,3,0; conflicting-override -0x57810480,1,0,0x57000000,3,0=0x57810400,1,0,0x57010000,3,0; conflicting-override +0x57810400,1,0,0x57000000,1,0=0x57810400,1,0,0x57010000,1,0 +0x57810400,1,0,0x57000000,3,0=0x57810400,1,0,0x57010000,1,0 +0x57810480,1,0,0x57000000,1,0=0x57810400,1,0,0x57010000,3,0 +0x57810480,1,0,0x57000000,3,0=0x57810400,1,0,0x57010000,3,0 ;02 to Orth (Down) -0x57810500,3,0,0x57000000,1,0=0x57810500,3,0,0x57010000,3,0; conflicting-override -0x57810500,3,0,0x57000000,3,0=0x57810500,3,0,0x57010000,3,0; conflicting-override -0x57810580,3,0,0x57000000,1,0=0x57810580,3,0,0x57010000,1,0; conflicting-override -0x57810580,3,0,0x57000000,3,0=0x57810580,3,0,0x57010000,1,0; conflicting-override +0x57810500,3,0,0x57000000,1,0=0x57810500,3,0,0x57010000,3,0 +0x57810500,3,0,0x57000000,3,0=0x57810500,3,0,0x57010000,3,0 +0x57810580,3,0,0x57000000,1,0=0x57810580,3,0,0x57010000,1,0 +0x57810580,3,0,0x57000000,3,0=0x57810580,3,0,0x57010000,1,0 ;00 to 02 (Down) 0x57810400,3,0,0x57800500,3,0=0x57810400,3,0,0x57810500,3,0 0x57810480,3,0,0x57800500,3,0=0x57810480,3,0,0x57810580,3,0 @@ -2763,16 +2763,16 @@ ;--------- ;FHT to 00 ;up -0x57810400,1,0,0x57700230,1,0=0x57810400,1,0,0x57711230,1,0; conflicting-override -0x57810480,1,0,0x57700230,1,0=0x57810480,1,0,0x57711230,3,1; conflicting-override +0x57810400,1,0,0x57700230,1,0=0x57810400,1,0,0x57711230,1,0 +0x57810480,1,0,0x57700230,1,0=0x57810480,1,0,0x57711230,3,1 ;FHT from 00 ;up 0x57800400,1,0,0x57711230,1,0=0x57810400,1,0,0x57711230,1,0 0x57800400,1,0,0x57711230,3,1=0x57810480,1,0,0x57711230,3,1 ;FHT to 02 ;up -0x57810500,3,0,0x57700230,1,0=0x57810500,3,0,0x57711230,3,1; conflicting-override -0x57810580,3,0,0x57700230,1,0=0x57810580,3,0,0x57711230,1,0; conflicting-override +0x57810500,3,0,0x57700230,1,0=0x57810500,3,0,0x57711230,3,1 +0x57810580,3,0,0x57700230,1,0=0x57810580,3,0,0x57711230,1,0 ;FHT from 02 ;up 0x57800500,3,0,0x57711230,3,1=0x57810500,3,0,0x57711230,3,1 @@ -3191,8 +3191,8 @@ 0x57830780,3,1,0x57700230,1,0=0x57830780,3,1,0x57733230,1,0 ;FHT from 00 ;up -0x57820700,1,0,0x57733230,3,1=0x57830700,1,0,0x57733230,3,1; conflicting-override -0x57820780,3,1,0x57733230,1,0=0x57830780,3,1,0x57733230,3,1; conflicting-override +0x57820700,1,0,0x57733230,3,1=0x57830700,1,0,0x57733230,3,1 +0x57820780,3,1,0x57733230,1,0=0x57830780,3,1,0x57733230,3,1 ;FHT to 02 ;up @@ -3658,8 +3658,8 @@ 0x57840780,3,1,0x57700230,1,0=0x57840780,3,1,0x57744230,1,0 ;FHT from 00 ;up -0x57820700,1,0,0x57744230,3,1=0x57840700,1,0,0x57744230,3,1; conflicting-override -0x57820780,3,1,0x57744230,1,0=0x57840780,3,1,0x57744230,3,1; conflicting-override +0x57820700,1,0,0x57744230,3,1=0x57840700,1,0,0x57744230,3,1 +0x57820780,3,1,0x57744230,1,0=0x57840780,3,1,0x57744230,3,1 ;FHT to 02 ;up @@ -4053,8 +4053,8 @@ 0x57850780,3,1,0x57700230,1,0=0x57850780,3,1,0x577552B0,1,0 ;FHT from 00 ;up -0x57820700,1,0,0x577552B0,3,1=0x57850700,1,0,0x577552B0,3,1; conflicting-override -0x57820780,3,1,0x577552B0,1,0=0x57850780,3,1,0x577552B0,3,1; conflicting-override +0x57820700,1,0,0x577552B0,3,1=0x57850700,1,0,0x577552B0,3,1 +0x57820780,3,1,0x577552B0,1,0=0x57850780,3,1,0x577552B0,3,1 ;FHT to 02 ;up @@ -5708,10 +5708,10 @@ 0x57811980,3,1,0x57700230,1,0=0x57811980,3,1,0x57711230,1,0 ;FHT from 00 ;up -0x57801000,1,0,0x57711230,1,0=0x57811000,1,0,0x57711230,1,0; conflicting-override -0x57801080,3,1,0x57711230,3,1=0x57811080,3,1,0x57711230,1,0; conflicting-override -0x57801000,1,0,0x57711230,3,1=0x57811900,1,0,0x57711230,3,1; conflicting-override -0x57801080,3,1,0x57711230,1,0=0x57811980,3,1,0x57711230,3,1; conflicting-override +0x57801000,1,0,0x57711230,1,0=0x57811000,1,0,0x57711230,1,0 +0x57801080,3,1,0x57711230,3,1=0x57811080,3,1,0x57711230,1,0 +0x57801000,1,0,0x57711230,3,1=0x57811900,1,0,0x57711230,3,1 +0x57801080,3,1,0x57711230,1,0=0x57811980,3,1,0x57711230,3,1 ;FHT to 02 ;up 0x57811400,3,0,0x57700230,1,0=0x57811400,3,0,0x57711230,3,1 @@ -5920,8 +5920,8 @@ 0x57821080,3,1,0x57700230,1,0=0x57821080,3,1,0x57722230,3,1 ;FHT from 00 ;up -0x57801019,1,0,0x57722230,1,0=0x57821000,1,0,0x57722230,1,0; conflicting-override -0x57801099,3,1,0x57722230,3,1=0x57821080,3,1,0x57722230,1,0; conflicting-override +0x57801019,1,0,0x57722230,1,0=0x57821000,1,0,0x57722230,1,0 +0x57801099,3,1,0x57722230,3,1=0x57821080,3,1,0x57722230,1,0 ;FHT to 02 ;up @@ -6346,8 +6346,8 @@ 0x57831080,3,1,0x57700230,1,0=0x57831080,3,1,0x57733230,3,1 ;FHT from 00 ;up -0x57801019,1,0,0x57733230,1,0=0x57831000,1,0,0x57733230,1,0; conflicting-override -0x57801099,3,1,0x57733230,3,1=0x57831080,3,1,0x57733230,1,0; conflicting-override +0x57801019,1,0,0x57733230,1,0=0x57831000,1,0,0x57733230,1,0 +0x57801099,3,1,0x57733230,3,1=0x57831080,3,1,0x57733230,1,0 ;FHT to 02 ;up @@ -6862,8 +6862,8 @@ 0x57841080,3,1,0x57700230,1,0=0x57841080,3,1,0x57744230,3,1 ;FHT from 00 ;up -0x57801019,1,0,0x57744230,1,0=0x57841000,1,0,0x57744230,1,0; conflicting-override -0x57801099,3,1,0x57744230,3,1=0x57841080,3,1,0x57744230,1,0; conflicting-override +0x57801019,1,0,0x57744230,1,0=0x57841000,1,0,0x57744230,1,0 +0x57801099,3,1,0x57744230,3,1=0x57841080,3,1,0x57744230,1,0 ;FHT to 02 ;up @@ -7333,8 +7333,8 @@ 0x57851080,3,1,0x57700230,1,0=0x57851080,3,1,0x57755230,3,1 ;FHT from 00 ;up -0x57801019,1,0,0x57755230,1,0=0x57851000,1,0,0x57755230,1,0; conflicting-override -0x57801099,3,1,0x57755230,3,1=0x57851080,3,1,0x57755230,1,0; conflicting-override +0x57801019,1,0,0x57755230,1,0=0x57851000,1,0,0x57755230,1,0 +0x57801099,3,1,0x57755230,3,1=0x57851080,3,1,0x57755230,1,0 ;FHT to 02 ;up @@ -7556,8 +7556,8 @@ 0x57861080,3,1,0x57700230,1,0=0x57861080,3,1,0x57766230,3,1 ;FHT from 00 ;up -0x57801019,1,0,0x57766230,1,0=0x57861000,1,0,0x57766230,1,0; conflicting-override -0x57801099,3,1,0x57766230,3,1=0x57861080,3,1,0x57766230,1,0; conflicting-override +0x57801019,1,0,0x57766230,1,0=0x57861000,1,0,0x57766230,1,0 +0x57801099,3,1,0x57766230,3,1=0x57861080,3,1,0x57766230,1,0 ;FHT to 02 ;up @@ -7779,8 +7779,8 @@ 0x57871080,3,1,0x57700230,1,0=0x57871080,3,1,0x57777230,3,1 ;FHT from 00 ;up -0x57801019,1,0,0x57777230,1,0=0x57871000,1,0,0x57777230,1,0; conflicting-override -0x57801099,3,1,0x57777230,3,1=0x57871080,3,1,0x57777230,1,0; conflicting-override +0x57801019,1,0,0x57777230,1,0=0x57871000,1,0,0x57777230,1,0 +0x57801099,3,1,0x57777230,3,1=0x57871080,3,1,0x57777230,1,0 ;FHT to 02 ;up @@ -8001,8 +8001,8 @@ 0x57881080,3,1,0x57700230,1,0=0x57881080,3,1,0x57788230,3,1; conflicting-override ;FHT from 00 ;up -0x57801019,1,0,0x57788230,1,0=0x57881000,1,0,0x57788230,1,0; conflicting-override -0x57801099,3,1,0x57788230,3,1=0x57881080,3,1,0x57788230,1,0; conflicting-override +0x57801019,1,0,0x57788230,1,0=0x57881000,1,0,0x57788230,1,0 +0x57801099,3,1,0x57788230,3,1=0x57881080,3,1,0x57788230,1,0 ;FHT to 02 ;up @@ -8228,8 +8228,8 @@ 0x57891080,3,1,0x57700230,1,0=0x57891080,3,1,0x57799230,3,1 ;FHT from 00 ;up -0x57801019,1,0,0x57799230,1,0=0x57891000,1,0,0x57799230,1,0; conflicting-override -0x57801099,3,1,0x57799230,3,1=0x57891080,3,1,0x57799230,1,0; conflicting-override +0x57801019,1,0,0x57799230,1,0=0x57891000,1,0,0x57799230,1,0 +0x57801099,3,1,0x57799230,3,1=0x57891080,3,1,0x57799230,1,0 ;FHT to 02 ;up @@ -8534,15 +8534,15 @@ 0x57801800,3,0,0x57010000,1,0=0x57811880,3,0,0x57010000,1,0 0x57801800,3,0,0x57010000,3,0=0x57811800,3,0,0x57010000,3,0 ;16 to Orth (Up) -0x57811600,1,0,0x57000000,1,0=0x57811600,1,0,0x57010000,1,0; conflicting-override -0x57811600,1,0,0x57000000,3,0=0x57811600,1,0,0x57010000,1,0; conflicting-override -0x57811680,1,0,0x57000000,1,0=0x57811680,1,0,0x57010000,3,0; conflicting-override -0x57811680,1,0,0x57000000,3,0=0x57811680,1,0,0x57010000,3,0; conflicting-override +0x57811600,1,0,0x57000000,1,0=0x57811600,1,0,0x57010000,1,0 +0x57811600,1,0,0x57000000,3,0=0x57811600,1,0,0x57010000,1,0 +0x57811680,1,0,0x57000000,1,0=0x57811680,1,0,0x57010000,3,0 +0x57811680,1,0,0x57000000,3,0=0x57811680,1,0,0x57010000,3,0 ;18 to Orth (Down) -0x57811880,3,0,0x57000000,1,0=0x57811880,3,0,0x57010000,1,0; conflicting-override -0x57811880,3,0,0x57000000,3,0=0x57811880,3,0,0x57010000,1,0; conflicting-override -0x57811800,3,0,0x57000000,1,0=0x57811800,3,0,0x57010000,3,0; conflicting-override -0x57811800,3,0,0x57000000,3,0=0x57811800,3,0,0x57010000,3,0; conflicting-override +0x57811880,3,0,0x57000000,1,0=0x57811880,3,0,0x57010000,1,0 +0x57811880,3,0,0x57000000,3,0=0x57811880,3,0,0x57010000,1,0 +0x57811800,3,0,0x57000000,1,0=0x57811800,3,0,0x57010000,3,0 +0x57811800,3,0,0x57000000,3,0=0x57811800,3,0,0x57010000,3,0 ;16 to 17 (Down) 0x57811600,3,0,0x57801700,3,0=0x57811600,3,0,0x57811700,3,0 0x57811680,3,0,0x57801700,3,0=0x57811680,3,0,0x57811780,3,0 @@ -8570,16 +8570,16 @@ ;--------- ;FHT to 00 ;up -0x57811600,1,0,0x57700230,1,0=0x57811600,1,0,0x57711230,1,0; conflicting-override -0x57811680,1,0,0x57700230,1,0=0x57811680,1,0,0x57711230,3,1; conflicting-override +0x57811600,1,0,0x57700230,1,0=0x57811600,1,0,0x57711230,1,0 +0x57811680,1,0,0x57700230,1,0=0x57811680,1,0,0x57711230,3,1 ;FHT from 00 ;up 0x57801600,1,0,0x57711230,1,0=0x57811600,1,0,0x57711230,1,0 0x57801600,1,0,0x57711230,3,1=0x57811680,1,0,0x57711230,3,1 ;FHT to 02 ;up -0x57811800,3,0,0x57700230,1,0=0x57811800,3,0,0x57711230,3,1; conflicting-override -0x57811880,3,0,0x57700230,1,0=0x57811880,3,0,0x57711230,1,0; conflicting-override +0x57811800,3,0,0x57700230,1,0=0x57811800,3,0,0x57711230,3,1 +0x57811880,3,0,0x57700230,1,0=0x57811880,3,0,0x57711230,1,0 ;FHT from 02 ;up 0x57801800,3,0,0x57711230,3,1=0x57811800,3,0,0x57711230,3,1 @@ -9058,8 +9058,8 @@ 0x57831980,3,1,0x57700230,1,0=0x57831980,3,1,0x57733230,1,0 ;FHT from 00 ;up -0x57821900,1,0,0x57733230,3,1=0x57831900,1,0,0x57733230,3,1; conflicting-override -0x57821980,3,1,0x57733230,1,0=0x57831980,3,1,0x57733230,3,1; conflicting-override +0x57821900,1,0,0x57733230,3,1=0x57831900,1,0,0x57733230,3,1 +0x57821980,3,1,0x57733230,1,0=0x57831980,3,1,0x57733230,3,1 ;FHT to 02 ;up @@ -9587,8 +9587,8 @@ 0x57841980,3,1,0x57700230,1,0=0x57841980,3,1,0x57744230,1,0 ;FHT from 00 ;up -0x57821900,1,0,0x57744230,3,1=0x57841900,1,0,0x57744230,3,1; conflicting-override -0x57821980,3,1,0x57744230,1,0=0x57841980,3,1,0x57744230,3,1; conflicting-override +0x57821900,1,0,0x57744230,3,1=0x57841900,1,0,0x57744230,3,1 +0x57821980,3,1,0x57744230,1,0=0x57841980,3,1,0x57744230,3,1 ;FHT to 02 ;up @@ -10027,8 +10027,8 @@ 0x57851980,3,1,0x57700230,1,0=0x57851980,3,1,0x577552B0,1,0 ;FHT from 00 ;up -0x57821900,1,0,0x577552B0,3,1=0x57851900,1,0,0x577552B0,3,1; conflicting-override -0x57821980,3,1,0x577552B0,1,0=0x57851980,3,1,0x577552B0,3,1; conflicting-override +0x57821900,1,0,0x577552B0,3,1=0x57851900,1,0,0x577552B0,3,1 +0x57821980,3,1,0x577552B0,1,0=0x57851980,3,1,0x577552B0,3,1 ;FHT to 02 ;up @@ -10383,15 +10383,15 @@ ;0x57803099,3,1,0x57700200,3,0=0x57803099,3,1,0x57700200,3,0 ;redundant prevent ;FHT from 00 ;up -0x57803000,1,0,0x57722330,3,1=0x57803019,1,0,0x57700330,1,0; conflicting-override -0x57803080,3,1,0x57722330,1,0=0x57803099,3,1,0x57700330,1,0; conflicting-override -0x57803019,1,0,0x57722330,3,1=0x57803019,1,0,0x57700330,1,0; conflicting-override -0x57803099,3,1,0x57722330,1,0=0x57803099,3,1,0x57700330,1,0; conflicting-override +0x57803000,1,0,0x57722330,3,1=0x57803019,1,0,0x57700330,1,0 +0x57803080,3,1,0x57722330,1,0=0x57803099,3,1,0x57700330,1,0 +0x57803019,1,0,0x57722330,3,1=0x57803019,1,0,0x57700330,1,0 +0x57803099,3,1,0x57722330,1,0=0x57803099,3,1,0x57700330,1,0 ;down -0x57803000,1,0,0x57722200,1,1=0x57803019,1,0,0x57700200,3,0; conflicting-override -0x57803080,3,1,0x57722200,3,0=0x57803099,3,1,0x57700200,3,0; conflicting-override -0x57803019,1,0,0x57722200,1,1=0x57803019,1,0,0x57700200,3,0; conflicting-override -0x57803099,3,1,0x57722200,3,0=0x57803099,3,1,0x57700200,3,0; conflicting-override +0x57803000,1,0,0x57722200,1,1=0x57803019,1,0,0x57700200,3,0 +0x57803080,3,1,0x57722200,3,0=0x57803099,3,1,0x57700200,3,0 +0x57803019,1,0,0x57722200,1,1=0x57803019,1,0,0x57700200,3,0 +0x57803099,3,1,0x57722200,3,0=0x57803099,3,1,0x57700200,3,0 ;FHT to 34 ;up 0x57803419,3,0,0x57700230,1,0=0x57803419,3,0,0x57722330,1,0; conflicting-override @@ -10467,14 +10467,14 @@ ;0x578030A9,3,1,0x57700300,3,0=0x578030A9,3,1,0x57700300,3,0 ;redundant prevent ;FHT from 00 ;down -0x57803000,1,0,0x57722300,1,1=0x57803029,1,0,0x57700300,3,0; conflicting-override -0x57803080,3,1,0x57722300,3,0=0x578030A9,3,1,0x57700300,3,0; conflicting-override -0x57803019,1,0,0x57722300,1,1=0x57803029,1,0,0x57700300,3,0; conflicting-override -0x57803099,3,1,0x57722300,3,0=0x578030A9,3,1,0x57700300,3,0; conflicting-override -0x57803029,1,0,0x57722200,1,1=0x57803029,1,0,0x57700300,3,0; conflicting-override -0x578030A9,3,1,0x57722200,3,0=0x578030A9,3,1,0x57700300,3,0; conflicting-override -0x57803029,1,0,0x57722300,1,1=0x57803029,1,0,0x57700300,3,0; conflicting-override -0x578030A9,3,1,0x57722300,3,0=0x578030A9,3,1,0x57700300,3,0; conflicting-override +0x57803000,1,0,0x57722300,1,1=0x57803029,1,0,0x57700300,3,0 +0x57803080,3,1,0x57722300,3,0=0x578030A9,3,1,0x57700300,3,0 +0x57803019,1,0,0x57722300,1,1=0x57803029,1,0,0x57700300,3,0 +0x57803099,3,1,0x57722300,3,0=0x578030A9,3,1,0x57700300,3,0 +0x57803029,1,0,0x57722200,1,1=0x57803029,1,0,0x57700300,3,0 +0x578030A9,3,1,0x57722200,3,0=0x578030A9,3,1,0x57700300,3,0 +0x57803029,1,0,0x57722300,1,1=0x57803029,1,0,0x57700300,3,0 +0x578030A9,3,1,0x57722300,3,0=0x578030A9,3,1,0x57700300,3,0 ;FHT to 02 ;down 0x57803429,3,0,0x57700200,3,0=0x57803029,3,0,0x57700300,3,0 @@ -10609,8 +10609,8 @@ 0x57833080,3,1,0x57700230,1,0=0x57833080,3,1,0x57733230,3,1 ;FHT from 00 ;up -0x57813000,1,0,0x57733230,1,0=0x57833000,1,0,0x57733230,1,0; conflicting-override -0x57813080,3,1,0x57733230,3,1=0x57833080,3,1,0x57733230,1,0; conflicting-override +0x57813000,1,0,0x57733230,1,0=0x57833000,1,0,0x57733230,1,0 +0x57813080,3,1,0x57733230,3,1=0x57833080,3,1,0x57733230,1,0 ;FHT to 02 ;up @@ -10991,8 +10991,8 @@ 0x57843000,3,0,0x57813200,3,0=0x57843000,3,0,0x57843200,3,0 0x57843080,1,1,0x57813280,1,1=0x57843080,1,1,0x57843280,1,1 ;32-34/Orth (Down) -0x57843200,3,0,0x57813400,3,0=0x57843200,3,0,0x57030000,3,0; conflicting-override -0x57843280,1,1,0x57813480,1,1=0x57843280,1,1,0x57030000,1,0; conflicting-override +0x57843200,3,0,0x57813400,3,0=0x57843200,3,0,0x57030000,3,0 +0x57843280,1,1,0x57813480,1,1=0x57843280,1,1,0x57030000,1,0 ;34/Orth-32 (Up) 0x57030000,1,0,0x57813200,1,0=0x57030000,1,0,0x57843200,1,0 0x57030000,3,0,0x57813280,3,1=0x57030000,3,0,0x57843280,3,1 @@ -11018,8 +11018,8 @@ 0x57843080,3,1,0x57700230,1,0=0x57843080,3,1,0x57744230,3,1 ;FHT from 00 ;up -0x57813000,1,0,0x57744230,1,0=0x57843000,1,0,0x57744230,1,0; conflicting-override -0x57813080,3,1,0x57744230,3,1=0x57843080,3,1,0x57744230,1,0; conflicting-override +0x57813000,1,0,0x57744230,1,0=0x57843000,1,0,0x57744230,1,0 +0x57813080,3,1,0x57744230,3,1=0x57843080,3,1,0x57744230,1,0 ;FHT to 02 ;up @@ -11062,8 +11062,8 @@ 0x57843019,3,0,0x57843200,3,0=0x57843019,3,0,0x57843219,3,0 0x57843099,1,1,0x57843280,1,1=0x57843099,1,1,0x57843299,1,1 ;32-34/Orth (Down) -0x57843219,3,0,0x57813400,3,0=0x57843219,3,0,0x57130000,3,0; conflicting-override -0x57843299,1,1,0x57813480,1,1=0x57843299,1,1,0x57130000,1,0; conflicting-override +0x57843219,3,0,0x57813400,3,0=0x57843219,3,0,0x57130000,3,0 +0x57843299,1,1,0x57813480,1,1=0x57843299,1,1,0x57130000,1,0 ;34/Orth-32 (Up) 0x57130000,1,0,0x57813200,1,0=0x57130000,1,0,0x57843219,1,0 0x57130000,3,0,0x57813280,3,1=0x57130000,3,0,0x57843299,3,1 @@ -11158,8 +11158,8 @@ 0x57843029,3,0,0x57813200,3,0=0x57843029,3,0,0x57843229,3,0 0x578430a9,1,1,0x57813280,1,1=0x578430a9,1,1,0x578432a9,1,1 ;32-34/Orth (Down) -0x57843229,3,0,0x57813400,3,0=0x57843229,3,0,0x57230000,3,0; conflicting-override -0x578432a9,1,1,0x57813480,1,1=0x578432a9,1,1,0x57230000,1,0; conflicting-override +0x57843229,3,0,0x57813400,3,0=0x57843229,3,0,0x57230000,3,0 +0x578432a9,1,1,0x57813480,1,1=0x578432a9,1,1,0x57230000,1,0 ;34/Orth-32 (Up) 0x57230000,1,0,0x57813200,1,0=0x57230000,1,0,0x57843229,1,0 0x57230000,3,0,0x57813280,3,1=0x57230000,3,0,0x578432a9,3,1 @@ -11265,8 +11265,8 @@ 0x57843039,3,0,0x57813200,3,0=0x57843039,3,0,0x57843239,3,0 0x578430b9,1,1,0x57813280,1,1=0x578430b9,1,1,0x578432b9,1,1 ;32-34/Orth (Down) -0x57843239,3,0,0x57813400,3,0=0x57843239,3,0,0x57330000,3,0; conflicting-override -0x578432b9,1,1,0x57813480,1,1=0x578432b9,1,1,0x57330000,1,0; conflicting-override +0x57843239,3,0,0x57813400,3,0=0x57843239,3,0,0x57330000,3,0 +0x578432b9,1,1,0x57813480,1,1=0x578432b9,1,1,0x57330000,1,0 ;34/Orth-32 (Up) 0x57330000,1,0,0x57813200,1,0=0x57330000,1,0,0x57843239,1,0 0x57330000,3,0,0x57813280,3,1=0x57330000,3,0,0x578432b9,3,1 @@ -11360,8 +11360,8 @@ 0x57843049,3,0,0x57813200,3,0=0x57843049,3,0,0x57843249,3,0 0x578430c9,1,1,0x57813280,1,1=0x578430c9,1,1,0x578432c9,1,1 ;32-34/Orth (Down) -0x57843249,3,0,0x57813400,3,0=0x57843249,3,0,0x57430000,3,0; conflicting-override -0x578432c9,1,1,0x57813480,1,1=0x578432c9,1,1,0x57430000,1,0; conflicting-override +0x57843249,3,0,0x57813400,3,0=0x57843249,3,0,0x57430000,3,0 +0x578432c9,1,1,0x57813480,1,1=0x578432c9,1,1,0x57430000,1,0 ;34/Orth-32 (Up) 0x57430000,1,0,0x57813200,1,0=0x57430000,1,0,0x57843249,1,0 0x57430000,3,0,0x57813280,3,1=0x57430000,3,0,0x578432c9,3,1 @@ -11480,8 +11480,8 @@ 0x57853080,3,1,0x57700230,1,0=0x57853080,3,1,0x57755230,3,1 ;FHT from 00 ;up -0x57813000,1,0,0x57755230,1,0=0x57853000,1,0,0x57755230,1,0; conflicting-override -0x57813080,3,1,0x57755230,3,1=0x57853080,3,1,0x57755230,1,0; conflicting-override +0x57813000,1,0,0x57755230,1,0=0x57853000,1,0,0x57755230,1,0 +0x57813080,3,1,0x57755230,3,1=0x57853080,3,1,0x57755230,1,0 ;FHT to 02 ;up @@ -11731,8 +11731,8 @@ 0x57863000,3,0,0x57813200,3,0=0x57863000,3,0,0x57863200,3,0 0x57863080,1,1,0x57813280,1,1=0x57863080,1,1,0x57863280,1,1 ;32-34/Orth (Down) -0x57863200,3,0,0x57813400,3,0=0x57863200,3,0,0x57050000,3,0; conflicting-override -0x57863280,1,1,0x57813480,1,1=0x57863280,1,1,0x57050000,1,0; conflicting-override +0x57863200,3,0,0x57813400,3,0=0x57863200,3,0,0x57050000,3,0 +0x57863280,1,1,0x57813480,1,1=0x57863280,1,1,0x57050000,1,0 ;34/Orth-32 (Up) 0x57050000,1,0,0x57813200,1,0=0x57050000,1,0,0x57863200,1,0 0x57050000,3,0,0x57813280,3,1=0x57050000,3,0,0x57863280,3,1 @@ -11752,8 +11752,8 @@ 0x57863080,3,1,0x57700230,1,0=0x57863080,3,1,0x57766230,3,1 ;FHT from 00 ;up -0x57833019,1,0,0x57766230,1,0=0x57863000,1,0,0x57766230,1,0; conflicting-override -0x57833099,3,1,0x57766230,3,1=0x57863080,3,1,0x57766230,1,0; conflicting-override +0x57833019,1,0,0x57766230,1,0=0x57863000,1,0,0x57766230,1,0 +0x57833099,3,1,0x57766230,3,1=0x57863080,3,1,0x57766230,1,0 ;FHT to 02 ;up @@ -11797,8 +11797,8 @@ 0x57863019,3,0,0x57863200,3,0=0x57863019,3,0,0x57863219,3,0 0x57863099,1,1,0x57863280,1,1=0x57863099,1,1,0x57863299,1,1 ;32-34/Orth (Down) -0x57863219,3,0,0x57813400,3,0=0x57863219,3,0,0x57150000,3,0; conflicting-override -0x57863299,1,1,0x57813480,1,1=0x57863299,1,1,0x57150000,1,0; conflicting-override +0x57863219,3,0,0x57813400,3,0=0x57863219,3,0,0x57150000,3,0 +0x57863299,1,1,0x57813480,1,1=0x57863299,1,1,0x57150000,1,0 ;34/Orth-32 (Up) 0x57150000,1,0,0x57813200,1,0=0x57150000,1,0,0x57863219,1,0 0x57150000,3,0,0x57813280,3,1=0x57150000,3,0,0x57863299,3,1 @@ -11883,8 +11883,8 @@ 0x57863029,3,0,0x57813200,3,0=0x57863029,3,0,0x57863229,3,0 0x578630a9,1,1,0x57813280,1,1=0x578630a9,1,1,0x578632a9,1,1 ;32-34/Orth (Down) -0x57863229,3,0,0x57813400,3,0=0x57863229,3,0,0x57250000,3,0; conflicting-override -0x578632a9,1,1,0x57813480,1,1=0x578632a9,1,1,0x57250000,1,0; conflicting-override +0x57863229,3,0,0x57813400,3,0=0x57863229,3,0,0x57250000,3,0 +0x578632a9,1,1,0x57813480,1,1=0x578632a9,1,1,0x57250000,1,0 ;34/Orth-32 (Up) 0x57250000,1,0,0x57813200,1,0=0x57250000,1,0,0x57863229,1,0 0x57250000,3,0,0x57813280,3,1=0x57250000,3,0,0x578632a9,3,1 @@ -11960,8 +11960,8 @@ 0x57873000,3,0,0x57813200,3,0=0x57873000,3,0,0x57873200,3,0 0x57873080,1,1,0x57813280,1,1=0x57873080,1,1,0x57873280,1,1 ;32-34/Orth (Down) -0x57873200,3,0,0x57813400,3,0=0x57873200,3,0,0x57060000,3,0; conflicting-override -0x57873280,1,1,0x57813480,1,1=0x57873280,1,1,0x57060000,1,0; conflicting-override +0x57873200,3,0,0x57813400,3,0=0x57873200,3,0,0x57060000,3,0 +0x57873280,1,1,0x57813480,1,1=0x57873280,1,1,0x57060000,1,0 ;34/Orth-32 (Up) 0x57060000,1,0,0x57813200,1,0=0x57060000,1,0,0x57873200,1,0 0x57060000,3,0,0x57813280,3,1=0x57060000,3,0,0x57873280,3,1 @@ -11993,8 +11993,8 @@ ;up ;FHT from 02 ;up -0x57813400,3,0,0x57766230,3,1=0x57060000,3,0,0x57766230,3,1; conflicting-override -0x57813480,1,1,0x57766230,1,0=0x57060000,1,0,0x57766230,1,0; conflicting-override +0x57813400,3,0,0x57766230,3,1=0x57060000,3,0,0x57766230,3,1 +0x57813480,1,1,0x57766230,1,0=0x57060000,1,0,0x57766230,1,0 ;---L1--- ;Orth to 30 (Down) @@ -12008,8 +12008,8 @@ 0x57873019,3,0,0x57873200,3,0=0x57873019,3,0,0x57873219,3,0 0x57873099,1,1,0x57873280,1,1=0x57873099,1,1,0x57873299,1,1 ;32 to 34/Orth (Down) -0x57873219,3,0,0x57813400,3,0=0x57873219,3,0,0x57160000,3,0; conflicting-override -0x57873299,1,1,0x57813480,1,1=0x57873299,1,1,0x57160000,1,0; conflicting-override +0x57873219,3,0,0x57813400,3,0=0x57873219,3,0,0x57160000,3,0 +0x57873299,1,1,0x57813480,1,1=0x57873299,1,1,0x57160000,1,0 0x57873219,3,0,0x57060000,3,0=0x57873219,3,0,0x57160000,3,0 0x57873299,1,1,0x57060000,1,0=0x57873299,1,1,0x57160000,1,0 ;34/Orth to 33 @@ -12077,11 +12077,11 @@ ;down ;FHT from 34 ;up -0x57813400,3,0,0x57766330,3,1=0x57160000,3,0,0x57766330,3,1; conflicting-override -0x57813480,1,1,0x57766330,1,0=0x57160000,1,0,0x57766330,1,0; conflicting-override +0x57813400,3,0,0x57766330,3,1=0x57160000,3,0,0x57766330,3,1 +0x57813480,1,1,0x57766330,1,0=0x57160000,1,0,0x57766330,1,0 ;down -0x57813400,3,0,0x57766200,3,0=0x57160000,3,0,0x57766200,3,0; conflicting-override -0x57813480,1,1,0x57766200,1,1=0x57160000,1,0,0x57766200,1,1; conflicting-override +0x57813400,3,0,0x57766200,3,0=0x57160000,3,0,0x57766200,3,0 +0x57813480,1,1,0x57766200,1,1=0x57160000,1,0,0x57766200,1,1 ;--------- @@ -12097,8 +12097,8 @@ 0x57873029,3,0,0x57873200,3,0=0x57873029,3,0,0x57873229,3,0 0x578730a9,1,1,0x57873280,1,1=0x578730a9,1,1,0x578732a9,1,1 ;32 to 34/Orth (Down) -0x57873229,3,0,0x57813400,3,0=0x57873229,3,0,0x57260000,3,0; conflicting-override -0x578732a9,1,1,0x57813480,1,1=0x578732a9,1,1,0x57260000,1,0; conflicting-override +0x57873229,3,0,0x57813400,3,0=0x57873229,3,0,0x57260000,3,0 +0x578732a9,1,1,0x57813480,1,1=0x578732a9,1,1,0x57260000,1,0 0x57873229,3,0,0x57060000,3,0=0x57873229,3,0,0x57260000,3,0 0x578732a9,1,1,0x57060000,1,0=0x578732a9,1,1,0x57260000,1,0 ;34/Orth to 33 @@ -12159,8 +12159,8 @@ ;FHT from 02 ;down -0x57813400,3,0,0x57766300,3,0=0x57260000,3,0,0x57766300,3,0; conflicting-override -0x57813480,1,1,0x57766300,1,1=0x57260000,1,0,0x57766300,1,1; conflicting-override +0x57813400,3,0,0x57766300,3,0=0x57260000,3,0,0x57766300,3,0 +0x57813480,1,1,0x57766300,1,1=0x57260000,1,0,0x57766300,1,1 ;--------- ;----RHW-6C---- @@ -12188,8 +12188,8 @@ 0x57893000,3,0,0x57813200,3,0=0x57893000,3,0,0x57893200,3,0 0x57893080,1,1,0x57813280,1,1=0x57893080,1,1,0x57893280,1,1 ;32-34/Orth (Down) -0x57893200,3,0,0x57813400,3,0=0x57893200,3,0,0x57080000,3,0; conflicting-override -0x57893280,1,1,0x57813480,1,1=0x57893280,1,1,0x57080000,1,0; conflicting-override +0x57893200,3,0,0x57813400,3,0=0x57893200,3,0,0x57080000,3,0 +0x57893280,1,1,0x57813480,1,1=0x57893280,1,1,0x57080000,1,0 ;34/Orth-32 (Up) 0x57080000,1,0,0x57813200,1,0=0x57080000,1,0,0x57893200,1,0 0x57080000,3,0,0x57813280,3,1=0x57080000,3,0,0x57893280,3,1 @@ -12209,8 +12209,8 @@ 0x57893080,3,1,0x57700230,1,0=0x57893080,3,1,0x57799230,3,1 ;FHT from 00 ;up -0x57813000,1,0,0x57799230,1,0=0x57893000,1,0,0x57799230,1,0; conflicting-override -0x57813080,3,1,0x57799230,3,1=0x57893080,3,1,0x57799230,1,0; conflicting-override +0x57813000,1,0,0x57799230,1,0=0x57893000,1,0,0x57799230,1,0 +0x57813080,3,1,0x57799230,3,1=0x57893080,3,1,0x57799230,1,0 ;FHT to 02 ;up @@ -12254,8 +12254,8 @@ 0x57893019,3,0,0x57893200,3,0=0x57893019,3,0,0x57893219,3,0 0x57893099,1,1,0x57893280,1,1=0x57893099,1,1,0x57893299,1,1 ;32-34/Orth (Down) -0x57893219,3,0,0x57813400,3,0=0x57893219,3,0,0x57180000,3,0; conflicting-override -0x57893299,1,1,0x57813480,1,1=0x57893299,1,1,0x57180000,1,0; conflicting-override +0x57893219,3,0,0x57813400,3,0=0x57893219,3,0,0x57180000,3,0 +0x57893299,1,1,0x57813480,1,1=0x57893299,1,1,0x57180000,1,0 ;34/Orth-32 (Up) 0x57180000,1,0,0x57813200,1,0=0x57180000,1,0,0x57893219,1,0 0x57180000,3,0,0x57813280,3,1=0x57180000,3,0,0x57893299,3,1 @@ -12341,10 +12341,10 @@ 0x57893029,3,0,0x57893200,3,0=0x57893029,3,0,0x57893229,3,0 0x578930a9,1,1,0x57893280,1,1=0x578930a9,1,1,0x578932a9,1,1 ;32-34/Orth (Down) -0x57893229,3,0,0x57813400,3,0=0x57893229,3,0,0x57280000,3,0; conflicting-override -0x578932a9,1,1,0x57813480,1,1=0x578932a9,1,1,0x57280000,1,0; conflicting-override -0x57893229,3,0,0x57893400,3,0=0x57893229,3,0,0x57280000,3,0; conflicting-override -0x578932a9,1,1,0x57893480,1,1=0x578932a9,1,1,0x57280000,1,0; conflicting-override +0x57893229,3,0,0x57813400,3,0=0x57893229,3,0,0x57280000,3,0 +0x578932a9,1,1,0x57813480,1,1=0x578932a9,1,1,0x57280000,1,0 +0x57893229,3,0,0x57893400,3,0=0x57893229,3,0,0x57280000,3,0 +0x578932a9,1,1,0x57893480,1,1=0x578932a9,1,1,0x57280000,1,0 ;34/Orth-32 (Up) 0x57280000,1,0,0x57813200,1,0=0x57280000,1,0,0x57893229,1,0 0x57280000,3,0,0x57813280,3,1=0x57280000,3,0,0x578932a9,3,1 @@ -12421,8 +12421,8 @@ 0x578a3000,3,0,0x57813200,3,0=0x578a3000,3,0,0x578a3200,3,0 0x578a3080,1,1,0x57813280,1,1=0x578a3080,1,1,0x578a3280,1,1 ;32-34/Orth (Down) -0x578a3200,3,0,0x57813400,3,0=0x578a3200,3,0,0x57090000,3,0; conflicting-override -0x578a3280,1,1,0x57813480,1,1=0x578a3280,1,1,0x57090000,1,0; conflicting-override +0x578a3200,3,0,0x57813400,3,0=0x578a3200,3,0,0x57090000,3,0 +0x578a3280,1,1,0x57813480,1,1=0x578a3280,1,1,0x57090000,1,0 ;34/Orth-32 (Up) 0x57090000,1,0,0x57813200,1,0=0x57090000,1,0,0x578a3200,1,0 0x57090000,3,0,0x57813280,3,1=0x57090000,3,0,0x578a3280,3,1 @@ -12454,8 +12454,8 @@ 0x578a3019,3,0,0x57813200,3,0=0x578a3019,3,0,0x578a3219,3,0 0x578a3099,1,1,0x57813280,1,1=0x578a3099,1,1,0x578a3299,1,1 ;32-34/Orth (Down) -0x578a3219,3,0,0x57813400,3,0=0x578a3219,3,0,0x57190000,3,0; conflicting-override -0x578a3299,1,1,0x57813480,1,1=0x578a3299,1,1,0x57190000,1,0; conflicting-override +0x578a3219,3,0,0x57813400,3,0=0x578a3219,3,0,0x57190000,3,0 +0x578a3299,1,1,0x57813480,1,1=0x578a3299,1,1,0x57190000,1,0 ;34/Orth-32 (Up) 0x57190000,1,0,0x57813200,1,0=0x57190000,1,0,0x578a3219,1,0 0x57190000,3,0,0x57813280,3,1=0x57190000,3,0,0x578a3299,3,1 @@ -12487,8 +12487,8 @@ 0x578a3029,3,0,0x57813200,3,0=0x578a3029,3,0,0x578a3229,3,0 0x578a30a9,1,1,0x57813280,1,1=0x578a30a9,1,1,0x578a32a9,1,1 ;32-34/Orth (Down) -0x578a3229,3,0,0x57813400,3,0=0x578a3229,3,0,0x57290000,3,0; conflicting-override -0x578a32a9,1,1,0x57813480,1,1=0x578a32a9,1,1,0x57290000,1,0; conflicting-override +0x578a3229,3,0,0x57813400,3,0=0x578a3229,3,0,0x57290000,3,0 +0x578a32a9,1,1,0x57813480,1,1=0x578a32a9,1,1,0x57290000,1,0 ;34/Orth-32 (Up) 0x57290000,1,0,0x57813200,1,0=0x57290000,1,0,0x578a3229,1,0 0x57290000,3,0,0x57813280,3,1=0x57290000,3,0,0x578a32a9,3,1 @@ -14500,8 +14500,8 @@ 0x57834080,3,1,0x57700230,1,0=0x57834080,3,1,0x57733230,3,1 ;FHT from 00 ;up -0x57814000,1,0,0x57733230,1,0=0x57834000,1,0,0x57733230,1,0; conflicting-override -0x57814080,3,1,0x57733230,3,1=0x57834080,3,1,0x57733230,1,0; conflicting-override +0x57814000,1,0,0x57733230,1,0=0x57834000,1,0,0x57733230,1,0 +0x57814080,3,1,0x57733230,3,1=0x57834080,3,1,0x57733230,1,0 ;FHT to 02 ;up @@ -14519,8 +14519,8 @@ 0x57834080,3,1,0x57700230,1,0=0x57834080,3,1,0x57733230,3,1 ;FHT from 00 ;up -0x57814000,1,0,0x57733230,1,0=0x57834000,1,0,0x57733230,1,0 ;redundant prevent; conflicting-override -0x57814080,3,1,0x57733230,3,1=0x57834080,3,1,0x57733230,1,0 ;redundant/broken; conflicting-override +0x57814000,1,0,0x57733230,1,0=0x57834000,1,0,0x57733230,1,0 ;redundant prevent +0x57814080,3,1,0x57733230,3,1=0x57834080,3,1,0x57733230,1,0 ;redundant/broken ;FHT to 02 ;up @@ -14957,8 +14957,8 @@ 0x57844080,3,1,0x57700230,1,0=0x57844080,3,1,0x57744230,3,1 ;FHT from 00 ;up -0x57844000,1,0,0x57733230,1,0=0x57844000,1,0,0x57744230,1,0; conflicting-override -0x57844080,3,1,0x57733230,3,1=0x57844080,3,1,0x57744230,1,0; conflicting-override +0x57844000,1,0,0x57733230,1,0=0x57844000,1,0,0x57744230,1,0 +0x57844080,3,1,0x57733230,3,1=0x57844080,3,1,0x57744230,1,0 ;FHT to 02 ;up @@ -15374,24 +15374,24 @@ 0x57854080,3,1,0x57000000,1,0=0x57854080,3,1,0x57050000,3,0 0x57854080,3,1,0x57000000,3,0=0x57854080,3,1,0x57050000,3,0 ;Orth (RHW-8S Outer) to 40 (Down); to 41, w/MIS Outer stubs (For adjacent 10S/8S D1 Ramps) -0x57814100,1,0,0x57020100,1,1=0x57854000,1,0,0x57050000,1,0; conflicting-override -0x57814180,3,1,0x57020100,3,0=0x57854080,3,1,0x57050000,3,0; conflicting-override +0x57814100,1,0,0x57020100,1,1=0x57854000,1,0,0x57050000,1,0 +0x57814180,3,1,0x57020100,3,0=0x57854080,3,1,0x57050000,3,0 ;Orth (RHW-8S Outer) to 40 (Down); to 41, w/RHW-8S Outer stubs -0x57814100,1,0,0x57050100,1,1=0x57854000,1,0,0x57050000,1,0; conflicting-override -0x57814180,3,1,0x57050100,3,0=0x57854080,3,1,0x57050000,3,0; conflicting-override +0x57814100,1,0,0x57050100,1,1=0x57854000,1,0,0x57050000,1,0 +0x57814180,3,1,0x57050100,3,0=0x57854080,3,1,0x57050000,3,0 ;Orth (RHW-8S Outer) to 40 (Down); to 41, w/RHW-8S Outer ortho 0x57814100,1,0,0x57050000,1,0=0x57854000,1,0,0x57050000,1,0 0x57814180,3,1,0x57050000,3,0=0x57854080,3,1,0x57050000,3,0 ;Stability -0x57854000,1,0,0x57050100,1,1=0x57854000,1,0,0x57050000,1,0; conflicting-override -0x57854080,3,1,0x57050100,3,0=0x57854080,3,1,0x57050000,3,0; conflicting-override +0x57854000,1,0,0x57050100,1,1=0x57854000,1,0,0x57050000,1,0 +0x57854080,3,1,0x57050100,3,0=0x57854080,3,1,0x57050000,3,0 ;ANTIOVERRIDE: RHW-2 90-deg bend to 42 0x57000800,2,0,0x57854200,0,0=0,0,0,0,0,0 0x57854280,0,1,0x57000800,3,0=0,0,0,0,0,0 ;FROM TOP ;40 next to 42 -0x57050100,2,1,0x57854200,0,0=0x57050000,0,0,0x57854200,0,0; conflicting-override -0x57050100,0,0,0x57854280,2,1=0x57050000,0,0,0x57854280,2,1; conflicting-override +0x57050100,2,1,0x57854200,0,0=0x57050000,0,0,0x57854200,0,0 +0x57050100,0,0,0x57854280,2,1=0x57050000,0,0,0x57854280,2,1 ;40 next to 41 0x57050000,3,0,0x57814100,3,0=0x57050000,3,0,0x57854000,3,0 0x57050000,1,0,0x57814180,1,1=0x57050000,1,0,0x57854080,1,1 @@ -15446,8 +15446,8 @@ 0x57854080,3,1,0x57700230,1,0=0x57854080,3,1,0x57755230,3,1 ;FHT from 00 ;up -0x57854000,1,0,0x57733230,1,0=0x57854000,1,0,0x57755230,1,0; conflicting-override -0x57854080,3,1,0x57733230,3,1=0x57854080,3,1,0x57755230,1,0; conflicting-override +0x57854000,1,0,0x57733230,1,0=0x57854000,1,0,0x57755230,1,0 +0x57854080,3,1,0x57733230,3,1=0x57854080,3,1,0x57755230,1,0 ;FHT to 02 ;up @@ -15470,18 +15470,18 @@ 0x57814100,1,0,0x57020100,1,1=0x57854019,1,0,0x57150000,1,0; conflicting-override 0x57814180,3,1,0x57020100,3,0=0x57854099,3,1,0x57150000,3,0; conflicting-override ;Orth (RHW-8S Outer) to 40 (Down); to 41, w/RHW-8S Outer stubs -0x57814100,1,0,0x57150100,1,1=0x57854019,1,0,0x57150000,1,0; conflicting-override -0x57814180,3,1,0x57150100,3,0=0x57854099,3,1,0x57150000,3,0; conflicting-override +0x57814100,1,0,0x57150100,1,1=0x57854019,1,0,0x57150000,1,0 +0x57814180,3,1,0x57150100,3,0=0x57854099,3,1,0x57150000,3,0 ;Stability -0x57854019,1,0,0x57150100,1,1=0x57854019,1,0,0x57150000,1,0; conflicting-override -0x57854099,3,1,0x57150100,3,0=0x57854099,3,1,0x57150000,3,0; conflicting-override +0x57854019,1,0,0x57150100,1,1=0x57854019,1,0,0x57150000,1,0 +0x57854099,3,1,0x57150100,3,0=0x57854099,3,1,0x57150000,3,0 ;ANTIOVERRIDE: RHW-2 90-deg bend to 42 0x57000800,2,0,0x57854219,0,0=0,0,0,0,0,0 0x57854299,0,1,0x57000800,3,0=0,0,0,0,0,0 ;FROM TOP ;40 next to 42 -0x57150100,2,1,0x57854219,0,0=0x57150000,0,0,0x57854219,0,0; conflicting-override -0x57150100,0,0,0x57854299,2,1=0x57150000,0,0,0x57854299,2,1; conflicting-override +0x57150100,2,1,0x57854219,0,0=0x57150000,0,0,0x57854219,0,0 +0x57150100,0,0,0x57854299,2,1=0x57150000,0,0,0x57854299,2,1 ;40 next to 41 0x57150000,3,0,0x57814100,3,0=0x57150000,3,0,0x57854019,3,0 0x57150000,1,0,0x57814180,1,1=0x57150000,1,0,0x57854099,1,1 @@ -15587,18 +15587,18 @@ 0x57814100,1,0,0x57020100,1,1=0x57854029,1,0,0x57250000,1,0; conflicting-override 0x57814180,3,1,0x57020100,3,0=0x578540A9,3,1,0x57250000,3,0; conflicting-override ;Orth (RHW-8S Outer) to 40 (Down); to 41, w/RHW-8S Outer stubs -0x57814100,1,0,0x57250100,1,1=0x57854029,1,0,0x57250000,1,0; conflicting-override -0x57814180,3,1,0x57250100,3,0=0x578540A9,3,1,0x57250000,3,0; conflicting-override +0x57814100,1,0,0x57250100,1,1=0x57854029,1,0,0x57250000,1,0 +0x57814180,3,1,0x57250100,3,0=0x578540A9,3,1,0x57250000,3,0 ;Stability -0x57854029,1,0,0x57250100,1,1=0x57854029,1,0,0x57250000,1,0; conflicting-override -0x578540A9,3,1,0x57250100,3,0=0x578540A9,3,1,0x57250000,3,0; conflicting-override +0x57854029,1,0,0x57250100,1,1=0x57854029,1,0,0x57250000,1,0 +0x578540A9,3,1,0x57250100,3,0=0x578540A9,3,1,0x57250000,3,0 ;ANTIOVERRIDE: RHW-2 90-deg bend to 42 0x57000800,2,0,0x57854229,0,0=0,0,0,0,0,0 0x578542A9,0,1,0x57000800,3,0=0,0,0,0,0,0 ;FROM TOP ;40 next to 42 -0x57250100,2,1,0x57854229,0,0=0x57250000,0,0,0x57854229,0,0; conflicting-override -0x57250100,0,0,0x578542A9,2,1=0x57250000,0,0,0x578542A9,2,1; conflicting-override +0x57250100,2,1,0x57854229,0,0=0x57250000,0,0,0x57854229,0,0 +0x57250100,0,0,0x578542A9,2,1=0x57250000,0,0,0x578542A9,2,1 ;40 next to 41 0x57250000,3,0,0x57814100,3,0=0x57250000,3,0,0x57854029,3,0 0x57250000,1,0,0x57814180,1,1=0x57250000,1,0,0x578540A9,1,1 @@ -15769,8 +15769,8 @@ 0x57864080,3,1,0x57700230,1,0=0x57864080,3,1,0x57766230,3,1 ;FHT from 00 ;up -0x57864000,1,0,0x57733230,1,0=0x57864000,1,0,0x57766230,1,0; conflicting-override -0x57864080,3,1,0x57733230,3,1=0x57864080,3,1,0x57766230,1,0; conflicting-override +0x57864000,1,0,0x57733230,1,0=0x57864000,1,0,0x57766230,1,0 +0x57864080,3,1,0x57733230,3,1=0x57864080,3,1,0x57766230,1,0 ;FHT to 02 ;up @@ -16139,8 +16139,8 @@ 0x57894080,3,1,0x57700230,1,0=0x57894080,3,1,0x57799230,3,1 ;FHT from 00 ;up -0x57894000,1,0,0x57733230,1,0=0x57894000,1,0,0x57799230,1,0; conflicting-override -0x57894080,3,1,0x57733230,3,1=0x57894080,3,1,0x57799230,1,0; conflicting-override +0x57894000,1,0,0x57733230,1,0=0x57894000,1,0,0x57799230,1,0 +0x57894080,3,1,0x57733230,3,1=0x57894080,3,1,0x57799230,1,0 ;FHT to 02 ;up @@ -17891,8 +17891,8 @@ 0x57660180,3,1,0x57700230,1,0=0x57660180,3,1,0x57766230,3,1 ;FHT from 00 ;up -0x57640100,1,0,0x57766230,1,0=0x57660100,1,0,0x57766230,1,0; conflicting-override -0x57640180,3,1,0x57766230,3,1=0x57660180,3,1,0x57766230,1,0; conflicting-override +0x57640100,1,0,0x57766230,1,0=0x57660100,1,0,0x57766230,1,0 +0x57640180,3,1,0x57766230,3,1=0x57660180,3,1,0x57766230,1,0 ;FHT to 02 ;up @@ -18241,8 +18241,8 @@ 0x57670180,3,1,0x57700230,1,0=0x57670180,3,1,0x57777230,3,1 ;FHT from 00 ;up -0x57640100,1,0,0x57777230,1,0=0x57670100,1,0,0x57777230,1,0; conflicting-override -0x57640180,3,1,0x57777230,3,1=0x57670180,3,1,0x57777230,1,0; conflicting-override +0x57640100,1,0,0x57777230,1,0=0x57670100,1,0,0x57777230,1,0 +0x57640180,3,1,0x57777230,3,1=0x57670180,3,1,0x57777230,1,0 ;FHT to 02 ;up @@ -18599,8 +18599,8 @@ 0x57690180,3,1,0x57700230,1,0=0x57690180,3,1,0x57799230,3,1 ;FHT from 00 ;up -0x57640100,1,0,0x57799230,1,0=0x57690100,1,0,0x57799230,1,0; conflicting-override -0x57640180,3,1,0x57799230,3,1=0x57690180,3,1,0x57799230,1,0; conflicting-override +0x57640100,1,0,0x57799230,1,0=0x57690100,1,0,0x57799230,1,0 +0x57640180,3,1,0x57799230,3,1=0x57690180,3,1,0x57799230,1,0 ;FHT to 02 ;up @@ -19113,8 +19113,8 @@ 0x57641129,3,0,0x57641300,3,0=0x57641129,3,0,0x57641329,3,0 0x576411a9,1,1,0x57641380,1,1=0x576411a9,1,1,0x576413a9,1,1 ;12 from 13 -0x57641200,0,0,0x57641329,0,0=0x57641229,0,0,0x57641329,0,0; conflicting-override -0x57641280,2,1,0x576413a9,2,1=0x576412a9,2,1,0x576413a9,2,1; conflicting-override +0x57641200,0,0,0x57641329,0,0=0x57641229,0,0,0x57641329,0,0 +0x57641280,2,1,0x576413a9,2,1=0x576412a9,2,1,0x576413a9,2,1 ;13 to 15 0x57641329,3,0,0x57641500,3,0=0x57641329,3,0,0x57641529,3,0 0x576413a9,1,1,0x57641580,1,1=0x576413a9,1,1,0x576415a9,1,1 @@ -19425,8 +19425,8 @@ 0x57651080,3,1,0x57700230,1,0=0x57651080,3,1,0x57755230,3,1 ;FHT from 00 ;up -0x57641000,1,0,0x57755230,1,0=0x57651000,1,0,0x57755230,1,0; conflicting-override -0x57641080,3,1,0x57755230,3,1=0x57651080,3,1,0x57755230,1,0; conflicting-override +0x57641000,1,0,0x57755230,1,0=0x57651000,1,0,0x57755230,1,0 +0x57641080,3,1,0x57755230,3,1=0x57651080,3,1,0x57755230,1,0 ;FHT to 02 ;up @@ -19622,8 +19622,8 @@ 0x57691080,3,1,0x57700230,1,0=0x57691080,3,1,0x57799230,3,1 ;FHT from 00 ;up -0x57641000,1,0,0x57799230,1,0=0x57691000,1,0,0x57799230,1,0; conflicting-override -0x57641080,3,1,0x57799230,3,1=0x57691080,3,1,0x57799230,1,0; conflicting-override +0x57641000,1,0,0x57799230,1,0=0x57691000,1,0,0x57799230,1,0 +0x57641080,3,1,0x57799230,3,1=0x57691080,3,1,0x57799230,1,0 ;FHT to 02 ;up @@ -19805,8 +19805,8 @@ 0x57661080,3,1,0x57700230,1,0=0x57661080,3,1,0x57766230,3,1 ;FHT from 00 ;up -0x57641000,1,0,0x57766230,1,0=0x57661000,1,0,0x57766230,1,0; conflicting-override -0x57641080,3,1,0x57766230,3,1=0x57661080,3,1,0x57766230,1,0; conflicting-override +0x57641000,1,0,0x57766230,1,0=0x57661000,1,0,0x57766230,1,0 +0x57641080,3,1,0x57766230,3,1=0x57661080,3,1,0x57766230,1,0 ;FHT to 02 ;up @@ -19973,8 +19973,8 @@ 0x57671080,3,1,0x57700230,1,0=0x57671080,3,1,0x57777230,3,1 ;FHT from 00 ;up -0x57641000,1,0,0x57777230,1,0=0x57671000,1,0,0x57777230,1,0; conflicting-override -0x57641080,3,1,0x57777230,3,1=0x57671080,3,1,0x57777230,1,0; conflicting-override +0x57641000,1,0,0x57777230,1,0=0x57671000,1,0,0x57777230,1,0 +0x57641080,3,1,0x57777230,3,1=0x57671080,3,1,0x57777230,1,0 ;FHT to 02 ;up @@ -20549,10 +20549,10 @@ ;FHT from 00 ;up -0x57643000,1,0,0x57755230,1,0=0x57653000,1,0,0x57755230,1,0; conflicting-override -0x57643080,3,1,0x57755230,3,1=0x57653080,3,1,0x57755230,1,0; conflicting-override -0x57643100,1,0,0x577552B0,1,0=0x57653100,1,0,0x577552B0,1,0; conflicting-override -0x57643180,3,1,0x577552B0,3,1=0x57653180,3,1,0x577552B0,1,0; conflicting-override +0x57643000,1,0,0x57755230,1,0=0x57653000,1,0,0x57755230,1,0 +0x57643080,3,1,0x57755230,3,1=0x57653080,3,1,0x57755230,1,0 +0x57643100,1,0,0x577552B0,1,0=0x57653100,1,0,0x577552B0,1,0 +0x57643180,3,1,0x577552B0,3,1=0x57653180,3,1,0x577552B0,1,0 ;FHT to 02 ;up 0x57653500,3,0,0x57700230,1,0=0x57653500,3,0,0x57733230,3,1 @@ -21019,8 +21019,8 @@ 0x57663180,3,1,0x57700230,1,0=0x57663180,3,1,0x57766230,3,1 ;FHT from 00 ;up -0x57643100,1,0,0x57766230,1,0=0x57663100,1,0,0x57766230,1,0; conflicting-override -0x57643180,3,1,0x57766230,3,1=0x57663180,3,1,0x57766230,1,0; conflicting-override +0x57643100,1,0,0x57766230,1,0=0x57663100,1,0,0x57766230,1,0 +0x57643180,3,1,0x57766230,3,1=0x57663180,3,1,0x57766230,1,0 ;FHT to 02 - See E2 Version @@ -21077,8 +21077,8 @@ ;FHT from 00 ;up -0x57643100,1,0,0x57777230,1,0=0x57673100,1,0,0x57777230,1,0; conflicting-override -0x57643180,3,1,0x57777230,3,1=0x57673180,3,1,0x57777230,1,0; conflicting-override +0x57643100,1,0,0x57777230,1,0=0x57673100,1,0,0x57777230,1,0 +0x57643180,3,1,0x57777230,3,1=0x57673180,3,1,0x57777230,1,0 ;FHT to 02 ;up 0x57673500,3,0,0x57700230,1,0=0x57673500,3,0,0x57755230,3,1 @@ -21669,10 +21669,10 @@ 0x57654180,3,1,0x57700230,1,0=0x57654180,3,1,0x577552B0,3,1 ;FHT from 00 ;up -0x57644000,1,0,0x57755230,1,0=0x57654000,1,0,0x57755230,1,0; conflicting-override -0x57644080,3,1,0x57755230,3,1=0x57654080,3,1,0x57755230,1,0; conflicting-override -0x57644100,1,0,0x577552B0,1,0=0x57654100,1,0,0x577552B0,1,0; conflicting-override -0x57644180,3,1,0x577552B0,3,1=0x57654180,3,1,0x577552B0,1,0; conflicting-override +0x57644000,1,0,0x57755230,1,0=0x57654000,1,0,0x57755230,1,0 +0x57644080,3,1,0x57755230,3,1=0x57654080,3,1,0x57755230,1,0 +0x57644100,1,0,0x577552B0,1,0=0x57654100,1,0,0x577552B0,1,0 +0x57644180,3,1,0x577552B0,3,1=0x57654180,3,1,0x577552B0,1,0 ;FHT to 02 ;up 0x57654500,3,0,0x57700230,1,0=0x57654500,3,0,0x57733230,3,1 @@ -21998,8 +21998,8 @@ 0x57674180,3,1,0x57700230,1,0=0x57674180,3,1,0x57777230,3,1 ;FHT from 41 ;up -0x57644100,1,0,0x57777230,1,0=0x57674100,1,0,0x57777230,1,0; conflicting-override -0x57644180,3,1,0x57777230,3,1=0x57674180,3,1,0x57777230,1,0; conflicting-override +0x57644100,1,0,0x57777230,1,0=0x57674100,1,0,0x57777230,1,0 +0x57644180,3,1,0x57777230,3,1=0x57674180,3,1,0x57777230,1,0 ;FHT to 45 ;up @@ -22156,8 +22156,8 @@ 0x57460400,3,0,0x57450600,3,0=0x57460400,3,0,0x57460600,3,0 0x57460480,1,1,0x57450680,1,1=0x57460480,1,1,0x57460680,1,1 ;06 to 04 (Up) -0x57460600,1,0,0x57450400,1,0=0x57460600,1,0,0x57460400,1,0; conflicting-override -0x57460680,3,1,0x57450480,3,1=0x57460680,3,1,0x57460400,3,1; conflicting-override +0x57460600,1,0,0x57450400,1,0=0x57460600,1,0,0x57460400,1,0 +0x57460680,3,1,0x57450480,3,1=0x57460680,3,1,0x57460400,3,1 ;05 to 07 (Down) 0x57460500,3,0,0x57450700,3,0=0x57460500,3,0,0x57460700,3,0 0x57460580,1,1,0x57450780,1,1=0x57460580,1,1,0x57460780,1,1 @@ -22612,8 +22612,8 @@ 0x57473400,3,0,0x57453600,3,0=0x57473400,3,0,0x57473600,3,0 0x57473480,1,1,0x57453680,1,1=0x57473480,1,1,0x57473680,1,1 ;36 to 34 (Up) -0x57473600,1,0,0x57453400,1,0=0x57473600,1,0,0x57473400,1,0; conflicting-override -0x57473680,3,1,0x57453480,3,1=0x57473680,3,1,0x57473400,3,1; conflicting-override +0x57473600,1,0,0x57453400,1,0=0x57473600,1,0,0x57473400,1,0 +0x57473680,3,1,0x57453480,3,1=0x57473680,3,1,0x57473400,3,1 ;35 to 37 (Down) 0x57473500,3,0,0x57453700,3,0=0x57473500,3,0,0x57473700,3,0 0x57473580,1,1,0x57453780,1,1=0x57473580,1,1,0x57473780,1,1 @@ -23843,11 +23843,11 @@ ; 0x57859009,0,0,0x57819300,0,0=0x57859009,0,0,0x57859000,0,0 0x57859089,2,1,0x57819380,2,1=0x57859089,2,1,0x57859080,2,1 -0x57819200,0,0,0x57859000,0,0=0x57859009,0,0,0x57859000,0,0; conflicting-override -0x57819280,2,1,0x57859080,2,1=0x57859089,2,1,0x57859080,2,1; conflicting-override +0x57819200,0,0,0x57859000,0,0=0x57859009,0,0,0x57859000,0,0 +0x57819280,2,1,0x57859080,2,1=0x57859089,2,1,0x57859080,2,1 ; -0x57859009,3,0,0x57000300,1,0=0x57859009,3,0,0x57859200,3,0; conflicting-override -0x57859089,1,1,0x57000300,3,1=0x57859089,1,1,0x57859280,1,1; conflicting-override +0x57859009,3,0,0x57000300,1,0=0x57859009,3,0,0x57859200,3,0 +0x57859089,1,1,0x57000300,3,1=0x57859089,1,1,0x57859280,1,1 ; 0x57859000,0,0,0x57819400,0,0=0x57859000,0,0,0x57859100,0,0 @@ -23916,16 +23916,16 @@ 0x57869400,0,0,0x57819300,0,0=0x57869400,0,0,0x57869500,0,0 0x57869480,2,1,0x57819380,2,1=0x57869480,2,1,0x57869580,2,1 -0x57869500,3,0,0x57819500,3,0=0x57869500,3,0,0x57020000,3,0; conflicting-override -0x57869580,1,1,0x57819580,1,1=0x57869580,1,1,0x57020000,1,0; conflicting-override +0x57869500,3,0,0x57819500,3,0=0x57869500,3,0,0x57020000,3,0 +0x57869580,1,1,0x57819580,1,1=0x57869580,1,1,0x57020000,1,0 0x57869500,0,0,0x57819400,0,0=0x57869500,0,0,0x57869600,0,0 0x57869580,2,1,0x57819480,2,1=0x57869580,2,1,0x57869680,2,1 0x57819300,0,0,0x57869600,0,0=0x57869500,0,0,0x57869600,0,0 0x57819380,2,1,0x57869680,2,1=0x57869580,2,1,0x57869680,2,1 -0x57869600,3,0,0x57819600,3,0=0x57869600,3,0,0x57050300,2,0; conflicting-override -0x57869680,1,1,0x57819680,1,1=0x57869680,1,1,0x57050300,1,0; conflicting-override +0x57869600,3,0,0x57819600,3,0=0x57869600,3,0,0x57050300,2,0 +0x57869680,1,1,0x57819680,1,1=0x57869680,1,1,0x57050300,1,0 0x57819600,3,0,0x57050300,2,0=0x57869600,3,0,0x57050300,2,0 0x57819680,1,1,0x57050300,1,0=0x57869680,1,1,0x57050300,1,0 @@ -23958,16 +23958,16 @@ 0x57879400,0,0,0x57819300,0,0=0x57879400,0,0,0x57879500,0,0 0x57879480,2,1,0x57819380,2,1=0x57879480,2,1,0x57879580,2,1 -0x57879500,3,0,0x57819500,3,0=0x57879500,3,0,0x57020000,3,0; conflicting-override -0x57879580,1,1,0x57819580,1,1=0x57879580,1,1,0x57020000,1,0; conflicting-override +0x57879500,3,0,0x57819500,3,0=0x57879500,3,0,0x57020000,3,0 +0x57879580,1,1,0x57819580,1,1=0x57879580,1,1,0x57020000,1,0 0x57879500,0,0,0x57819400,0,0=0x57879500,0,0,0x57879600,0,0 0x57879580,2,1,0x57819480,2,1=0x57879580,2,1,0x57879680,2,1 0x57819300,0,0,0x57879600,0,0=0x57879500,0,0,0x57879600,0,0 0x57819380,2,1,0x57879680,2,1=0x57879580,2,1,0x57879680,2,1 -0x57879600,3,0,0x57819600,3,0=0x57879600,3,0,0x57060300,2,0; conflicting-override -0x57879680,1,1,0x57819680,1,1=0x57879680,1,1,0x57060300,1,0; conflicting-override +0x57879600,3,0,0x57819600,3,0=0x57879600,3,0,0x57060300,2,0 +0x57879680,1,1,0x57819680,1,1=0x57879680,1,1,0x57060300,1,0 0x57819600,3,0,0x57060300,2,0=0x57879600,3,0,0x57060300,2,0 0x57819680,1,1,0x57060300,1,0=0x57879680,1,1,0x57060300,1,0 @@ -24002,16 +24002,16 @@ 0x57899200,0,0,0x57819300,0,0=0x57899400,0,0,0x57899500,0,0 0x57899280,2,1,0x57819380,2,1=0x57899480,2,1,0x57899580,2,1 -0x57899500,3,0,0x57819500,3,0=0x57899500,3,0,0x57020000,3,0; conflicting-override -0x57899580,1,1,0x57819580,1,1=0x57899580,1,1,0x57020000,1,0; conflicting-override +0x57899500,3,0,0x57819500,3,0=0x57899500,3,0,0x57020000,3,0 +0x57899580,1,1,0x57819580,1,1=0x57899580,1,1,0x57020000,1,0 0x57899500,0,0,0x57819400,0,0=0x57899500,0,0,0x57899600,0,0 0x57899580,2,1,0x57819480,2,1=0x57899580,2,1,0x57899680,2,1 0x57819300,0,0,0x57899600,0,0=0x57899500,0,0,0x57899600,0,0 0x57819380,2,1,0x57899680,2,1=0x57899580,2,1,0x57899680,2,1 -0x57899600,3,0,0x57819600,3,0=0x57899600,3,0,0x57080300,2,0; conflicting-override -0x57899680,1,1,0x57819680,1,1=0x57899680,1,1,0x57080300,1,0; conflicting-override +0x57899600,3,0,0x57819600,3,0=0x57899600,3,0,0x57080300,2,0 +0x57899680,1,1,0x57819680,1,1=0x57899680,1,1,0x57080300,1,0 0x57819400,3,0,0x57080300,2,0=0x57899600,3,0,0x57080300,2,0 0x57819480,1,1,0x57080300,1,0=0x57899680,1,1,0x57080300,1,0 @@ -24624,8 +24624,8 @@ ; 0x57050380,0,0,0x5781A100,3,0=0x57050380,0,0,0x5785A100,3,0 0x57050380,3,0,0x5781A180,1,1=0x57050380,3,0,0x5785A180,1,1 -0x5781A000,3,0,0x5785A100,3,0=0x57050380,0,0,0x5785A100,3,0; conflicting-override -0x5781A080,1,1,0x5785A180,1,1=0x57050380,3,0,0x5785A180,1,1; conflicting-override +0x5781A000,3,0,0x5785A100,3,0=0x57050380,0,0,0x5785A100,3,0 +0x5781A080,1,1,0x5785A180,1,1=0x57050380,3,0,0x5785A180,1,1 ; 0x57050200,1,0,0x5785A100,0,0=0x5785A109,0,0,0x5785A100,0,0 0x57050200,2,0,0x5785A180,2,1=0x5785A189,2,1,0x5785A180,2,1 @@ -25543,77 +25543,77 @@ ; ;----MIS---- ;L0 -0x57820a00,3,0,0x57000000,1,0=0x57820a00,3,0,0x57020000,1,0; conflicting-override -0x57820a00,3,0,0x57000000,3,0=0x57820a00,3,0,0x57020000,1,0; conflicting-override -0x57820a80,1,1,0x57000000,1,0=0x57820a80,1,1,0x57020000,3,0; conflicting-override -0x57820a80,1,1,0x57000000,3,0=0x57820a80,1,1,0x57020000,3,0; conflicting-override +0x57820a00,3,0,0x57000000,1,0=0x57820a00,3,0,0x57020000,1,0 +0x57820a00,3,0,0x57000000,3,0=0x57820a00,3,0,0x57020000,1,0 +0x57820a80,1,1,0x57000000,1,0=0x57820a80,1,1,0x57020000,3,0 +0x57820a80,1,1,0x57000000,3,0=0x57820a80,1,1,0x57020000,3,0 ;L1 -0x57820a19,3,0,0x57000000,1,0=0x57820a19,3,0,0x57120000,1,0; conflicting-override -0x57820a19,3,0,0x57000000,3,0=0x57820a19,3,0,0x57120000,1,0; conflicting-override -0x57820a99,1,1,0x57000000,1,0=0x57820a99,1,1,0x57120000,3,0; conflicting-override -0x57820a99,1,1,0x57000000,3,0=0x57820a99,1,1,0x57120000,3,0; conflicting-override +0x57820a19,3,0,0x57000000,1,0=0x57820a19,3,0,0x57120000,1,0 +0x57820a19,3,0,0x57000000,3,0=0x57820a19,3,0,0x57120000,1,0 +0x57820a99,1,1,0x57000000,1,0=0x57820a99,1,1,0x57120000,3,0 +0x57820a99,1,1,0x57000000,3,0=0x57820a99,1,1,0x57120000,3,0 ;Stability 0x57820a19,3,0,0x57020000,3,0=0x57820a19,3,0,0x57120000,1,0 0x57820a99,1,1,0x57020000,1,0=0x57820a99,1,1,0x57120000,3,0 ;L2 -0x57820a29,3,0,0x57000000,1,0=0x57820a29,3,0,0x57220000,1,0; conflicting-override -0x57820a29,3,0,0x57000000,3,0=0x57820a29,3,0,0x57220000,1,0; conflicting-override -0x57820aa9,1,1,0x57000000,1,0=0x57820aa9,1,1,0x57220000,3,0; conflicting-override -0x57820aa9,1,1,0x57000000,3,0=0x57820aa9,1,1,0x57220000,3,0; conflicting-override +0x57820a29,3,0,0x57000000,1,0=0x57820a29,3,0,0x57220000,1,0 +0x57820a29,3,0,0x57000000,3,0=0x57820a29,3,0,0x57220000,1,0 +0x57820aa9,1,1,0x57000000,1,0=0x57820aa9,1,1,0x57220000,3,0 +0x57820aa9,1,1,0x57000000,3,0=0x57820aa9,1,1,0x57220000,3,0 ;Stability 0x57820a29,3,0,0x57020000,3,0=0x57820a29,3,0,0x57220000,1,0 0x57820aa9,1,1,0x57020000,1,0=0x57820aa9,1,1,0x57220000,3,0 ;L3 -0x57820a39,3,0,0x57000000,1,0=0x57820a39,3,0,0x57320000,1,0; conflicting-override -0x57820a39,3,0,0x57000000,3,0=0x57820a39,3,0,0x57320000,1,0; conflicting-override -0x57820ab9,1,1,0x57000000,1,0=0x57820ab9,1,1,0x57320000,3,0; conflicting-override -0x57820ab9,1,1,0x57000000,3,0=0x57820ab9,1,1,0x57320000,3,0; conflicting-override +0x57820a39,3,0,0x57000000,1,0=0x57820a39,3,0,0x57320000,1,0 +0x57820a39,3,0,0x57000000,3,0=0x57820a39,3,0,0x57320000,1,0 +0x57820ab9,1,1,0x57000000,1,0=0x57820ab9,1,1,0x57320000,3,0 +0x57820ab9,1,1,0x57000000,3,0=0x57820ab9,1,1,0x57320000,3,0 ;Stability 0x57820a39,3,0,0x57020000,3,0=0x57820a39,3,0,0x57320000,1,0 0x57820ab9,1,1,0x57020000,1,0=0x57820ab9,1,1,0x57320000,3,0 ;L4 -0x57820a49,3,0,0x57000000,1,0=0x57820a49,3,0,0x57420000,1,0; conflicting-override -0x57820a49,3,0,0x57000000,3,0=0x57820a49,3,0,0x57420000,1,0; conflicting-override -0x57820ac9,1,1,0x57000000,1,0=0x57820ac9,1,1,0x57420000,3,0; conflicting-override -0x57820ac9,1,1,0x57000000,3,0=0x57820ac9,1,1,0x57420000,3,0; conflicting-override +0x57820a49,3,0,0x57000000,1,0=0x57820a49,3,0,0x57420000,1,0 +0x57820a49,3,0,0x57000000,3,0=0x57820a49,3,0,0x57420000,1,0 +0x57820ac9,1,1,0x57000000,1,0=0x57820ac9,1,1,0x57420000,3,0 +0x57820ac9,1,1,0x57000000,3,0=0x57820ac9,1,1,0x57420000,3,0 ;Stability 0x57820a49,3,0,0x57020000,3,0=0x57820a49,3,0,0x57420000,1,0 0x57820ac9,1,1,0x57020000,1,0=0x57820ac9,1,1,0x57420000,3,0 ;----RHW-4---- ;L0 -0x57830a00,3,0,0x57000000,1,0=0x57830a00,3,0,0x57020000,1,0; conflicting-override -0x57830a00,3,0,0x57000000,3,0=0x57830a00,3,0,0x57020000,1,0; conflicting-override -0x57830a80,1,1,0x57000000,1,0=0x57830a80,1,1,0x57020000,3,0; conflicting-override -0x57830a80,1,1,0x57000000,3,0=0x57830a80,1,1,0x57020000,3,0; conflicting-override +0x57830a00,3,0,0x57000000,1,0=0x57830a00,3,0,0x57020000,1,0 +0x57830a00,3,0,0x57000000,3,0=0x57830a00,3,0,0x57020000,1,0 +0x57830a80,1,1,0x57000000,1,0=0x57830a80,1,1,0x57020000,3,0 +0x57830a80,1,1,0x57000000,3,0=0x57830a80,1,1,0x57020000,3,0 ;L1 -0x57830a19,3,0,0x57000000,1,0=0x57830a19,3,0,0x57120000,1,0; conflicting-override -0x57830a19,3,0,0x57000000,3,0=0x57830a19,3,0,0x57120000,1,0; conflicting-override -0x57830a99,1,1,0x57000000,1,0=0x57830a99,1,1,0x57120000,3,0; conflicting-override -0x57830a99,1,1,0x57000000,3,0=0x57830a99,1,1,0x57120000,3,0; conflicting-override +0x57830a19,3,0,0x57000000,1,0=0x57830a19,3,0,0x57120000,1,0 +0x57830a19,3,0,0x57000000,3,0=0x57830a19,3,0,0x57120000,1,0 +0x57830a99,1,1,0x57000000,1,0=0x57830a99,1,1,0x57120000,3,0 +0x57830a99,1,1,0x57000000,3,0=0x57830a99,1,1,0x57120000,3,0 ;Stability 0x57830a19,3,0,0x57020000,3,0=0x57830a19,3,0,0x57120000,1,0 0x57830a99,1,1,0x57020000,1,0=0x57830a99,1,1,0x57120000,3,0 ;L2 -0x57830a29,3,0,0x57000000,1,0=0x57830a29,3,0,0x57220000,1,0; conflicting-override -0x57830a29,3,0,0x57000000,3,0=0x57830a29,3,0,0x57220000,1,0; conflicting-override -0x57830aa9,1,1,0x57000000,1,0=0x57830aa9,1,1,0x57220000,3,0; conflicting-override -0x57830aa9,1,1,0x57000000,3,0=0x57830aa9,1,1,0x57220000,3,0; conflicting-override +0x57830a29,3,0,0x57000000,1,0=0x57830a29,3,0,0x57220000,1,0 +0x57830a29,3,0,0x57000000,3,0=0x57830a29,3,0,0x57220000,1,0 +0x57830aa9,1,1,0x57000000,1,0=0x57830aa9,1,1,0x57220000,3,0 +0x57830aa9,1,1,0x57000000,3,0=0x57830aa9,1,1,0x57220000,3,0 ;Stability 0x57830a29,3,0,0x57020000,3,0=0x57830a29,3,0,0x57220000,1,0 0x57830aa9,1,1,0x57020000,1,0=0x57830aa9,1,1,0x57220000,3,0 ;L3 -0x57830a39,3,0,0x57000000,1,0=0x57830a39,3,0,0x57320000,1,0; conflicting-override -0x57830a39,3,0,0x57000000,3,0=0x57830a39,3,0,0x57320000,1,0; conflicting-override -0x57830ab9,1,1,0x57000000,1,0=0x57830ab9,1,1,0x57320000,3,0; conflicting-override -0x57830ab9,1,1,0x57000000,3,0=0x57830ab9,1,1,0x57320000,3,0; conflicting-override +0x57830a39,3,0,0x57000000,1,0=0x57830a39,3,0,0x57320000,1,0 +0x57830a39,3,0,0x57000000,3,0=0x57830a39,3,0,0x57320000,1,0 +0x57830ab9,1,1,0x57000000,1,0=0x57830ab9,1,1,0x57320000,3,0 +0x57830ab9,1,1,0x57000000,3,0=0x57830ab9,1,1,0x57320000,3,0 ;Stability 0x57830a39,3,0,0x57020000,3,0=0x57830a39,3,0,0x57320000,1,0 0x57830ab9,1,1,0x57020000,1,0=0x57830ab9,1,1,0x57320000,3,0 ;L4 -0x57830a49,3,0,0x57000000,1,0=0x57830a49,3,0,0x57420000,1,0; conflicting-override -0x57830a49,3,0,0x57000000,3,0=0x57830a49,3,0,0x57420000,1,0; conflicting-override -0x57830ac9,1,1,0x57000000,1,0=0x57830ac9,1,1,0x57420000,3,0; conflicting-override -0x57830ac9,1,1,0x57000000,3,0=0x57830ac9,1,1,0x57420000,3,0; conflicting-override +0x57830a49,3,0,0x57000000,1,0=0x57830a49,3,0,0x57420000,1,0 +0x57830a49,3,0,0x57000000,3,0=0x57830a49,3,0,0x57420000,1,0 +0x57830ac9,1,1,0x57000000,1,0=0x57830ac9,1,1,0x57420000,3,0 +0x57830ac9,1,1,0x57000000,3,0=0x57830ac9,1,1,0x57420000,3,0 ;Stability 0x57830a49,3,0,0x57020000,3,0=0x57830a49,3,0,0x57420000,1,0 0x57830ac9,1,1,0x57020000,1,0=0x57830ac9,1,1,0x57420000,3,0 @@ -25636,69 +25636,69 @@ 0x57830aD9,1,1,0x57020000,3,0=0x57830aD9,1,1,0x57220000,3,0 ;----RHW-6S---- ;L0 -0x57840a00,3,0,0x57000000,1,0=0x57840a00,3,0,0x57020000,1,0; conflicting-override -0x57840a00,3,0,0x57000000,3,0=0x57840a00,3,0,0x57020000,1,0; conflicting-override -0x57840a80,1,1,0x57000000,1,0=0x57840a80,1,1,0x57020000,3,0; conflicting-override -0x57840a80,1,1,0x57000000,3,0=0x57840a80,1,1,0x57020000,3,0; conflicting-override +0x57840a00,3,0,0x57000000,1,0=0x57840a00,3,0,0x57020000,1,0 +0x57840a00,3,0,0x57000000,3,0=0x57840a00,3,0,0x57020000,1,0 +0x57840a80,1,1,0x57000000,1,0=0x57840a80,1,1,0x57020000,3,0 +0x57840a80,1,1,0x57000000,3,0=0x57840a80,1,1,0x57020000,3,0 ;L1 -0x57840a19,3,0,0x57000000,1,0=0x57840a19,3,0,0x57120000,1,0; conflicting-override -0x57840a19,3,0,0x57000000,3,0=0x57840a19,3,0,0x57120000,1,0; conflicting-override -0x57840a99,1,1,0x57000000,1,0=0x57840a99,1,1,0x57120000,3,0; conflicting-override -0x57840a99,1,1,0x57000000,3,0=0x57840a99,1,1,0x57120000,3,0; conflicting-override +0x57840a19,3,0,0x57000000,1,0=0x57840a19,3,0,0x57120000,1,0 +0x57840a19,3,0,0x57000000,3,0=0x57840a19,3,0,0x57120000,1,0 +0x57840a99,1,1,0x57000000,1,0=0x57840a99,1,1,0x57120000,3,0 +0x57840a99,1,1,0x57000000,3,0=0x57840a99,1,1,0x57120000,3,0 ;Stability 0x57840a19,3,0,0x57020000,1,0=0x57840a19,3,0,0x57120000,1,0 0x57840a99,1,1,0x57020000,3,0=0x57840a99,1,1,0x57120000,3,0 ;L1 -0x57840a19,3,0,0x57000000,1,0=0x57840a19,3,0,0x57120000,1,0; conflicting-override -0x57840a19,3,0,0x57000000,3,0=0x57840a19,3,0,0x57120000,1,0; conflicting-override -0x57840a99,1,1,0x57000000,1,0=0x57840a99,1,1,0x57120000,3,0; conflicting-override -0x57840a99,1,1,0x57000000,3,0=0x57840a99,1,1,0x57120000,3,0; conflicting-override +0x57840a19,3,0,0x57000000,1,0=0x57840a19,3,0,0x57120000,1,0 +0x57840a19,3,0,0x57000000,3,0=0x57840a19,3,0,0x57120000,1,0 +0x57840a99,1,1,0x57000000,1,0=0x57840a99,1,1,0x57120000,3,0 +0x57840a99,1,1,0x57000000,3,0=0x57840a99,1,1,0x57120000,3,0 ;Stability 0x57840a19,3,0,0x57020000,1,0=0x57840a19,3,0,0x57120000,1,0 0x57840a99,1,1,0x57020000,3,0=0x57840a99,1,1,0x57120000,3,0 ;L2 -0x57840a29,3,0,0x57000000,1,0=0x57840a29,3,0,0x57220000,1,0; conflicting-override -0x57840a29,3,0,0x57000000,3,0=0x57840a29,3,0,0x57220000,1,0; conflicting-override -0x57840aa9,1,1,0x57000000,1,0=0x57840aa9,1,1,0x57220000,3,0; conflicting-override -0x57840aa9,1,1,0x57000000,3,0=0x57840aa9,1,1,0x57220000,3,0; conflicting-override +0x57840a29,3,0,0x57000000,1,0=0x57840a29,3,0,0x57220000,1,0 +0x57840a29,3,0,0x57000000,3,0=0x57840a29,3,0,0x57220000,1,0 +0x57840aa9,1,1,0x57000000,1,0=0x57840aa9,1,1,0x57220000,3,0 +0x57840aa9,1,1,0x57000000,3,0=0x57840aa9,1,1,0x57220000,3,0 ;Stability 0x57840a29,3,0,0x57020000,1,0=0x57840a29,3,0,0x57220000,1,0 0x57840aa9,1,1,0x57020000,3,0=0x57840aa9,1,1,0x57220000,3,0 ;L3 -0x57840a39,3,0,0x57000000,1,0=0x57840a39,3,0,0x57320000,1,0; conflicting-override -0x57840a39,3,0,0x57000000,3,0=0x57840a39,3,0,0x57320000,1,0; conflicting-override -0x57840ab9,1,1,0x57000000,1,0=0x57840ab9,1,1,0x57320000,3,0; conflicting-override -0x57840ab9,1,1,0x57000000,3,0=0x57840ab9,1,1,0x57320000,3,0; conflicting-override +0x57840a39,3,0,0x57000000,1,0=0x57840a39,3,0,0x57320000,1,0 +0x57840a39,3,0,0x57000000,3,0=0x57840a39,3,0,0x57320000,1,0 +0x57840ab9,1,1,0x57000000,1,0=0x57840ab9,1,1,0x57320000,3,0 +0x57840ab9,1,1,0x57000000,3,0=0x57840ab9,1,1,0x57320000,3,0 ;Stability 0x57840a39,3,0,0x57020000,1,0=0x57840a39,3,0,0x57320000,1,0 0x57840ab9,1,1,0x57020000,3,0=0x57840ab9,1,1,0x57320000,3,0 ;L4 -0x57840a49,3,0,0x57000000,1,0=0x57840a49,3,0,0x57420000,1,0; conflicting-override -0x57840a49,3,0,0x57000000,3,0=0x57840a49,3,0,0x57420000,1,0; conflicting-override -0x57840ac9,1,1,0x57000000,1,0=0x57840ac9,1,1,0x57420000,3,0; conflicting-override -0x57840ac9,1,1,0x57000000,3,0=0x57840ac9,1,1,0x57420000,3,0; conflicting-override +0x57840a49,3,0,0x57000000,1,0=0x57840a49,3,0,0x57420000,1,0 +0x57840a49,3,0,0x57000000,3,0=0x57840a49,3,0,0x57420000,1,0 +0x57840ac9,1,1,0x57000000,1,0=0x57840ac9,1,1,0x57420000,3,0 +0x57840ac9,1,1,0x57000000,3,0=0x57840ac9,1,1,0x57420000,3,0 ;Stability 0x57840a49,3,0,0x57020000,1,0=0x57840a49,3,0,0x57420000,1,0 0x57840ac9,1,1,0x57020000,3,0=0x57840ac9,1,1,0x57420000,3,0 ;----RHW-8S and Up---- ;L0 -0x57850a00,3,0,0x57000000,1,0=0x57850a00,3,0,0x57020000,1,0; conflicting-override -0x57850a00,3,0,0x57000000,3,0=0x57850a00,3,0,0x57020000,1,0; conflicting-override -0x57850a80,1,1,0x57000000,1,0=0x57850a80,1,1,0x57020000,3,0; conflicting-override -0x57850a80,1,1,0x57000000,3,0=0x57850a80,1,1,0x57020000,3,0; conflicting-override +0x57850a00,3,0,0x57000000,1,0=0x57850a00,3,0,0x57020000,1,0 +0x57850a00,3,0,0x57000000,3,0=0x57850a00,3,0,0x57020000,1,0 +0x57850a80,1,1,0x57000000,1,0=0x57850a80,1,1,0x57020000,3,0 +0x57850a80,1,1,0x57000000,3,0=0x57850a80,1,1,0x57020000,3,0 ;L1 -0x57850a19,3,0,0x57000000,1,0=0x57850a19,3,0,0x57120000,1,0; conflicting-override -0x57850a19,3,0,0x57000000,3,0=0x57850a19,3,0,0x57120000,1,0; conflicting-override -0x57850a99,1,1,0x57000000,1,0=0x57850a99,1,1,0x57120000,3,0; conflicting-override -0x57850a99,1,1,0x57000000,3,0=0x57850a99,1,1,0x57120000,3,0; conflicting-override +0x57850a19,3,0,0x57000000,1,0=0x57850a19,3,0,0x57120000,1,0 +0x57850a19,3,0,0x57000000,3,0=0x57850a19,3,0,0x57120000,1,0 +0x57850a99,1,1,0x57000000,1,0=0x57850a99,1,1,0x57120000,3,0 +0x57850a99,1,1,0x57000000,3,0=0x57850a99,1,1,0x57120000,3,0 ;Stability 0x57850a19,3,0,0x57020000,1,0=0x57850a19,3,0,0x57120000,1,0 0x57850a99,1,1,0x57020000,3,0=0x57850a99,1,1,0x57120000,3,0 ;L2 -0x57850a29,3,0,0x57000000,1,0=0x57850a29,3,0,0x57220000,1,0; conflicting-override -0x57850a29,3,0,0x57000000,3,0=0x57850a29,3,0,0x57220000,1,0; conflicting-override -0x57850aa9,1,1,0x57000000,1,0=0x57850aa9,1,1,0x57220000,3,0; conflicting-override -0x57850aa9,1,1,0x57000000,3,0=0x57850aa9,1,1,0x57220000,3,0; conflicting-override +0x57850a29,3,0,0x57000000,1,0=0x57850a29,3,0,0x57220000,1,0 +0x57850a29,3,0,0x57000000,3,0=0x57850a29,3,0,0x57220000,1,0 +0x57850aa9,1,1,0x57000000,1,0=0x57850aa9,1,1,0x57220000,3,0 +0x57850aa9,1,1,0x57000000,3,0=0x57850aa9,1,1,0x57220000,3,0 ;Stability 0x57850a29,3,0,0x57020000,1,0=0x57850a29,3,0,0x57220000,1,0 0x57850aa9,1,1,0x57020000,3,0=0x57850aa9,1,1,0x57220000,3,0 @@ -27208,14 +27208,14 @@ 0x57890F00,3,0,0x57700230,1,0=0x57890F00,3,0,0x57722230,3,1 0x57890F80,1,1,0x57700230,1,0=0x57890F80,1,1,0x57722230,1,0 ;A1 Inside -0x57820A00,3,0,0x57700230,1,0=0x57820A00,3,0,0x57722230,1,0; conflicting-override -0x57820A80,1,1,0x57700230,1,0=0x57820A80,1,1,0x57722230,3,1; conflicting-override -0x57830A00,3,0,0x57700230,1,0=0x57830A00,3,0,0x57722230,1,0; conflicting-override -0x57830A80,1,1,0x57700230,1,0=0x57830A80,1,1,0x57722230,3,1; conflicting-override -0x57840A00,3,0,0x57700230,1,0=0x57840A00,3,0,0x57722230,1,0; conflicting-override -0x57840A80,1,1,0x57700230,1,0=0x57840A80,1,1,0x57722230,3,1; conflicting-override -0x57850A00,3,0,0x57700230,1,0=0x57850A00,3,0,0x57722230,1,0; conflicting-override -0x57850A80,1,1,0x57700230,1,0=0x57850A80,1,1,0x57722230,3,1; conflicting-override +0x57820A00,3,0,0x57700230,1,0=0x57820A00,3,0,0x57722230,1,0 +0x57820A80,1,1,0x57700230,1,0=0x57820A80,1,1,0x57722230,3,1 +0x57830A00,3,0,0x57700230,1,0=0x57830A00,3,0,0x57722230,1,0 +0x57830A80,1,1,0x57700230,1,0=0x57830A80,1,1,0x57722230,3,1 +0x57840A00,3,0,0x57700230,1,0=0x57840A00,3,0,0x57722230,1,0 +0x57840A80,1,1,0x57700230,1,0=0x57840A80,1,1,0x57722230,3,1 +0x57850A00,3,0,0x57700230,1,0=0x57850A00,3,0,0x57722230,1,0 +0x57850A80,1,1,0x57700230,1,0=0x57850A80,1,1,0x57722230,3,1 0x57860A00,3,0,0x57700230,1,0=0x57860A00,3,0,0x57722230,1,0 0x57860A80,1,1,0x57700230,1,0=0x57860A80,1,1,0x57722230,3,1 0x57870A00,3,0,0x57700230,1,0=0x57870A00,3,0,0x57722230,1,0 diff --git a/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c1_DraggableMall_Street_Classic_custom_RHD.txt b/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c1_DraggableMall_Street_Classic_custom_RHD.txt index c24ee4f0f..a9846eb2e 100644 --- a/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c1_DraggableMall_Street_Classic_custom_RHD.txt +++ b/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c1_DraggableMall_Street_Classic_custom_RHD.txt @@ -3412,20 +3412,20 @@ ;-- ROAD & BIDIRECTIONAL SINGLE TILE NWM -- ;-- ROAD (RD-2) NETWORK -- ;3-way OXO road thru & end street T intersection - initial override -0x5C531100,0,0,0x00AA0800,1,0=0x5C531100,0,0,0x5C541000,0,0; conflicting-override -0x5C531100,1,0,0x00AA0800,1,0=0x5C531100,1,0,0x5C541000,0,0; conflicting-override -0x5C531100,2,0,0x00AA0800,1,0=0x5C531100,2,0,0x5C541000,0,0; conflicting-override -0x5C531100,3,0,0x00AA0800,1,0=0x5C531100,3,0,0x5C541000,0,0; conflicting-override +0x5C531100,0,0,0x00AA0800,1,0=0x5C531100,0,0,0x5C541000,0,0 +0x5C531100,1,0,0x00AA0800,1,0=0x5C531100,1,0,0x5C541000,0,0 +0x5C531100,2,0,0x00AA0800,1,0=0x5C531100,2,0,0x5C541000,0,0 +0x5C531100,3,0,0x00AA0800,1,0=0x5C531100,3,0,0x5C541000,0,0 ; ;4-way OXO + intersection - initial override -0x5C531100,0,0,0x00AA0A00,1,0=0x5C531100,0,0,0x5C541000,0,0; conflicting-override -0x5C531100,1,0,0x00AA0A00,1,0=0x5C531100,1,0,0x5C541000,0,0; conflicting-override -0x5C531100,2,0,0x00AA0A00,1,0=0x5C531100,2,0,0x5C541000,0,0; conflicting-override -0x5C531100,3,0,0x00AA0A00,1,0=0x5C531100,3,0,0x5C541000,0,0; conflicting-override -0x5C531100,0,0,0x00AA0A00,3,0=0x5C531100,0,0,0x5C541000,0,0; conflicting-override -0x5C531100,1,0,0x00AA0A00,3,0=0x5C531100,1,0,0x5C541000,0,0; conflicting-override -0x5C531100,2,0,0x00AA0A00,3,0=0x5C531100,2,0,0x5C541000,0,0; conflicting-override -0x5C531100,3,0,0x00AA0A00,3,0=0x5C531100,3,0,0x5C541000,0,0; conflicting-override +0x5C531100,0,0,0x00AA0A00,1,0=0x5C531100,0,0,0x5C541000,0,0 +0x5C531100,1,0,0x00AA0A00,1,0=0x5C531100,1,0,0x5C541000,0,0 +0x5C531100,2,0,0x00AA0A00,1,0=0x5C531100,2,0,0x5C541000,0,0 +0x5C531100,3,0,0x00AA0A00,1,0=0x5C531100,3,0,0x5C541000,0,0 +0x5C531100,0,0,0x00AA0A00,3,0=0x5C531100,0,0,0x5C541000,0,0 +0x5C531100,1,0,0x00AA0A00,3,0=0x5C531100,1,0,0x5C541000,0,0 +0x5C531100,2,0,0x00AA0A00,3,0=0x5C531100,2,0,0x5C541000,0,0 +0x5C531100,3,0,0x00AA0A00,3,0=0x5C531100,3,0,0x5C541000,0,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -3574,10 +3574,10 @@ ; ;-- TLA-3 NETWORK -- ;3-way OXO TLA-3 thru & end Street T intersection - initial override -0x5C531100,0,0,0x51003000,1,0=0x5C531100,0,0,0x5C541080,0,0; conflicting-override -0x5C531100,1,0,0x51003000,1,0=0x5C531100,1,0,0x5C541080,0,0; conflicting-override -0x5C531100,2,0,0x51003000,1,0=0x5C531100,2,0,0x5C541080,0,0; conflicting-override -0x5C531100,3,0,0x51003000,1,0=0x5C531100,3,0,0x5C541080,0,0; conflicting-override +0x5C531100,0,0,0x51003000,1,0=0x5C531100,0,0,0x5C541080,0,0 +0x5C531100,1,0,0x51003000,1,0=0x5C531100,1,0,0x5C541080,0,0 +0x5C531100,2,0,0x51003000,1,0=0x5C531100,2,0,0x5C541080,0,0 +0x5C531100,3,0,0x51003000,1,0=0x5C531100,3,0,0x5C541080,0,0 ; ;3-way OXO TLA-3 thru & end Street T intersection - stabilization 0x51000000,1,0,0x5C541000,1,0=0x51000000,1,0,0x5C541080,1,0 @@ -3596,14 +3596,14 @@ 0x00000300,3,0,0x5C541080,3,0=0x51000100,3,0,0x5C541080,3,0 ; ;4-way OXO + intersection - initial override -0x5C531100,0,0,0x51001000,1,0=0x5C531100,0,0,0x5C541080,0,0; conflicting-override -0x5C531100,1,0,0x51001000,1,0=0x5C531100,1,0,0x5C541080,0,0; conflicting-override -0x5C531100,2,0,0x51001000,1,0=0x5C531100,2,0,0x5C541080,0,0; conflicting-override -0x5C531100,3,0,0x51001000,1,0=0x5C531100,3,0,0x5C541080,0,0; conflicting-override -0x5C531100,0,0,0x51001000,3,0=0x5C531100,0,0,0x5C541080,2,0; conflicting-override -0x5C531100,1,0,0x51001000,3,0=0x5C531100,1,0,0x5C541080,2,0; conflicting-override -0x5C531100,2,0,0x51001000,3,0=0x5C531100,2,0,0x5C541080,2,0; conflicting-override -0x5C531100,3,0,0x51001000,3,0=0x5C531100,3,0,0x5C541080,2,0; conflicting-override +0x5C531100,0,0,0x51001000,1,0=0x5C531100,0,0,0x5C541080,0,0 +0x5C531100,1,0,0x51001000,1,0=0x5C531100,1,0,0x5C541080,0,0 +0x5C531100,2,0,0x51001000,1,0=0x5C531100,2,0,0x5C541080,0,0 +0x5C531100,3,0,0x51001000,1,0=0x5C531100,3,0,0x5C541080,0,0 +0x5C531100,0,0,0x51001000,3,0=0x5C531100,0,0,0x5C541080,2,0 +0x5C531100,1,0,0x51001000,3,0=0x5C531100,1,0,0x5C541080,2,0 +0x5C531100,2,0,0x51001000,3,0=0x5C531100,2,0,0x5C541080,2,0 +0x5C531100,3,0,0x51001000,3,0=0x5C531100,3,0,0x5C541080,2,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -3752,10 +3752,10 @@ ; ;-- AVE-2 NETWORK -- ;3-way OXO AVE-2 thru & end Street T intersection - initial override -0x5C531100,0,0,0x51013000,1,0=0x5C531100,0,0,0x5C541100,0,0; conflicting-override -0x5C531100,1,0,0x51013000,1,0=0x5C531100,1,0,0x5C541100,0,0; conflicting-override -0x5C531100,2,0,0x51013000,1,0=0x5C531100,2,0,0x5C541100,0,0; conflicting-override -0x5C531100,3,0,0x51013000,1,0=0x5C531100,3,0,0x5C541100,0,0; conflicting-override +0x5C531100,0,0,0x51013000,1,0=0x5C531100,0,0,0x5C541100,0,0 +0x5C531100,1,0,0x51013000,1,0=0x5C531100,1,0,0x5C541100,0,0 +0x5C531100,2,0,0x51013000,1,0=0x5C531100,2,0,0x5C541100,0,0 +0x5C531100,3,0,0x51013000,1,0=0x5C531100,3,0,0x5C541100,0,0 ; ;3-way OXO AVE-2 thru & end Street T intersection - stabilization 0x51010000,1,0,0x5C541000,1,0=0x51010000,1,0,0x5C541100,1,0 @@ -3774,14 +3774,14 @@ 0x00000300,3,0,0x5C541100,3,0=0x51010100,3,0,0x5C541100,3,0 ; ;4-way OXO + intersection - initial override -0x5C531100,0,0,0x51011000,1,0=0x5C531100,0,0,0x5C541100,0,0; conflicting-override -0x5C531100,1,0,0x51011000,1,0=0x5C531100,1,0,0x5C541100,0,0; conflicting-override -0x5C531100,2,0,0x51011000,1,0=0x5C531100,2,0,0x5C541100,0,0; conflicting-override -0x5C531100,3,0,0x51011000,1,0=0x5C531100,3,0,0x5C541100,0,0; conflicting-override -0x5C531100,0,0,0x51011000,3,0=0x5C531100,0,0,0x5C541100,2,0; conflicting-override -0x5C531100,1,0,0x51011000,3,0=0x5C531100,1,0,0x5C541100,2,0; conflicting-override -0x5C531100,2,0,0x51011000,3,0=0x5C531100,2,0,0x5C541100,2,0; conflicting-override -0x5C531100,3,0,0x51011000,3,0=0x5C531100,3,0,0x5C541100,2,0; conflicting-override +0x5C531100,0,0,0x51011000,1,0=0x5C531100,0,0,0x5C541100,0,0 +0x5C531100,1,0,0x51011000,1,0=0x5C531100,1,0,0x5C541100,0,0 +0x5C531100,2,0,0x51011000,1,0=0x5C531100,2,0,0x5C541100,0,0 +0x5C531100,3,0,0x51011000,1,0=0x5C531100,3,0,0x5C541100,0,0 +0x5C531100,0,0,0x51011000,3,0=0x5C531100,0,0,0x5C541100,2,0 +0x5C531100,1,0,0x51011000,3,0=0x5C531100,1,0,0x5C541100,2,0 +0x5C531100,2,0,0x51011000,3,0=0x5C531100,2,0,0x5C541100,2,0 +0x5C531100,3,0,0x51011000,3,0=0x5C531100,3,0,0x5C541100,2,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -3930,15 +3930,15 @@ ; ;-- ARD-3 NETWORK -- ;3-way OXO ARD-3 thru & end Street T intersection - initial override -0x5C531100,0,0,0x51023000,1,0=0x5C531100,0,0,0x5C541180,2,0; conflicting-override -0x5C531100,1,0,0x51023000,1,0=0x5C531100,1,0,0x5C541180,2,0; conflicting-override -0x5C531100,2,0,0x51023000,1,0=0x5C531100,2,0,0x5C541180,2,0; conflicting-override -0x5C531100,3,0,0x51023000,1,0=0x5C531100,3,0,0x5C541180,2,0; conflicting-override +0x5C531100,0,0,0x51023000,1,0=0x5C531100,0,0,0x5C541180,2,0 +0x5C531100,1,0,0x51023000,1,0=0x5C531100,1,0,0x5C541180,2,0 +0x5C531100,2,0,0x51023000,1,0=0x5C531100,2,0,0x5C541180,2,0 +0x5C531100,3,0,0x51023000,1,0=0x5C531100,3,0,0x5C541180,2,0 ; -0x5C531100,0,0,0x51023080,1,0=0x5C531100,0,0,0x5C541180,0,0; conflicting-override -0x5C531100,1,0,0x51023080,1,0=0x5C531100,1,0,0x5C541180,0,0; conflicting-override -0x5C531100,2,0,0x51023080,1,0=0x5C531100,2,0,0x5C541180,0,0; conflicting-override -0x5C531100,3,0,0x51023080,1,0=0x5C531100,3,0,0x5C541180,0,0; conflicting-override +0x5C531100,0,0,0x51023080,1,0=0x5C531100,0,0,0x5C541180,0,0 +0x5C531100,1,0,0x51023080,1,0=0x5C531100,1,0,0x5C541180,0,0 +0x5C531100,2,0,0x51023080,1,0=0x5C531100,2,0,0x5C541180,0,0 +0x5C531100,3,0,0x51023080,1,0=0x5C531100,3,0,0x5C541180,0,0 ; ;3-way OXO ARD-3 thru & end Street T intersection - stabilization 0x51020000,1,0,0x5C541000,1,0=0x51020000,1,0,0x5C541180,1,0 @@ -3957,14 +3957,14 @@ 0x00000300,3,0,0x5C541180,3,0=0x51020100,3,0,0x5C541180,3,0 ; ;4-way OXO + intersection - initial override -0x5C531100,0,0,0x51021000,1,0=0x5C531100,0,0,0x5C541180,2,0; conflicting-override -0x5C531100,1,0,0x51021000,1,0=0x5C531100,1,0,0x5C541180,2,0; conflicting-override -0x5C531100,2,0,0x51021000,1,0=0x5C531100,2,0,0x5C541180,2,0; conflicting-override -0x5C531100,3,0,0x51021000,1,0=0x5C531100,3,0,0x5C541180,2,0; conflicting-override -0x5C531100,0,0,0x51021000,3,0=0x5C531100,0,0,0x5C541180,0,0; conflicting-override -0x5C531100,1,0,0x51021000,3,0=0x5C531100,1,0,0x5C541180,0,0; conflicting-override -0x5C531100,2,0,0x51021000,3,0=0x5C531100,2,0,0x5C541180,0,0; conflicting-override -0x5C531100,3,0,0x51021000,3,0=0x5C531100,3,0,0x5C541180,0,0; conflicting-override +0x5C531100,0,0,0x51021000,1,0=0x5C531100,0,0,0x5C541180,2,0 +0x5C531100,1,0,0x51021000,1,0=0x5C531100,1,0,0x5C541180,2,0 +0x5C531100,2,0,0x51021000,1,0=0x5C531100,2,0,0x5C541180,2,0 +0x5C531100,3,0,0x51021000,1,0=0x5C531100,3,0,0x5C541180,2,0 +0x5C531100,0,0,0x51021000,3,0=0x5C531100,0,0,0x5C541180,0,0 +0x5C531100,1,0,0x51021000,3,0=0x5C531100,1,0,0x5C541180,0,0 +0x5C531100,2,0,0x51021000,3,0=0x5C531100,2,0,0x5C541180,0,0 +0x5C531100,3,0,0x51021000,3,0=0x5C531100,3,0,0x5C541180,0,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -4113,10 +4113,10 @@ ; ;-- NRD-4 NETWORK -- ;3-way OXO NRD-4 thru & end Street T intersection - initial override -0x5C531100,0,0,0x51053000,1,0=0x5C531100,0,0,0x5C541200,0,0; conflicting-override -0x5C531100,1,0,0x51053000,1,0=0x5C531100,1,0,0x5C541200,0,0; conflicting-override -0x5C531100,2,0,0x51053000,1,0=0x5C531100,2,0,0x5C541200,0,0; conflicting-override -0x5C531100,3,0,0x51053000,1,0=0x5C531100,3,0,0x5C541200,0,0; conflicting-override +0x5C531100,0,0,0x51053000,1,0=0x5C531100,0,0,0x5C541200,0,0 +0x5C531100,1,0,0x51053000,1,0=0x5C531100,1,0,0x5C541200,0,0 +0x5C531100,2,0,0x51053000,1,0=0x5C531100,2,0,0x5C541200,0,0 +0x5C531100,3,0,0x51053000,1,0=0x5C531100,3,0,0x5C541200,0,0 ; ;3-way OXO NRD-4 thru & end Street T intersection - stabilization 0x51050000,1,0,0x5C541000,1,0=0x51050000,1,0,0x5C541200,1,0 @@ -4135,14 +4135,14 @@ 0x00000300,3,0,0x5C541200,3,0=0x51050100,3,0,0x5C541200,3,0 ; ;4-way OXO + intersection - initial override -0x5C531100,0,0,0x51051000,1,0=0x5C531100,0,0,0x5C541200,0,0; conflicting-override -0x5C531100,1,0,0x51051000,1,0=0x5C531100,1,0,0x5C541200,0,0; conflicting-override -0x5C531100,2,0,0x51051000,1,0=0x5C531100,2,0,0x5C541200,0,0; conflicting-override -0x5C531100,3,0,0x51051000,1,0=0x5C531100,3,0,0x5C541200,0,0; conflicting-override -0x5C531100,0,0,0x51051000,3,0=0x5C531100,0,0,0x5C541200,2,0; conflicting-override -0x5C531100,1,0,0x51051000,3,0=0x5C531100,1,0,0x5C541200,2,0; conflicting-override -0x5C531100,2,0,0x51051000,3,0=0x5C531100,2,0,0x5C541200,2,0; conflicting-override -0x5C531100,3,0,0x51051000,3,0=0x5C531100,3,0,0x5C541200,2,0; conflicting-override +0x5C531100,0,0,0x51051000,1,0=0x5C531100,0,0,0x5C541200,0,0 +0x5C531100,1,0,0x51051000,1,0=0x5C531100,1,0,0x5C541200,0,0 +0x5C531100,2,0,0x51051000,1,0=0x5C531100,2,0,0x5C541200,0,0 +0x5C531100,3,0,0x51051000,1,0=0x5C531100,3,0,0x5C541200,0,0 +0x5C531100,0,0,0x51051000,3,0=0x5C531100,0,0,0x5C541200,2,0 +0x5C531100,1,0,0x51051000,3,0=0x5C531100,1,0,0x5C541200,2,0 +0x5C531100,2,0,0x51051000,3,0=0x5C531100,2,0,0x5C541200,2,0 +0x5C531100,3,0,0x51051000,3,0=0x5C531100,3,0,0x5C541200,2,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -4292,26 +4292,26 @@ ;-- AVENUE & BIDIRECTIONAL MULTI TILE NWM -- ;-- AVENUE (AVE-4) NETWORK -- ;3-way OXO avenue thru & end street short T intersection -0x5C531100,0,0,0x04004400,2,0=0x5C531100,0,0,0x5C541380,0,0; conflicting-override -0x5C531100,1,0,0x04004400,2,0=0x5C531100,1,0,0x5C541380,0,0; conflicting-override -0x5C531100,2,0,0x04004400,2,0=0x5C531100,2,0,0x5C541380,0,0; conflicting-override -0x5C531100,3,0,0x04004400,2,0=0x5C531100,3,0,0x5C541380,0,0; conflicting-override +0x5C531100,0,0,0x04004400,2,0=0x5C531100,0,0,0x5C541380,0,0 +0x5C531100,1,0,0x04004400,2,0=0x5C531100,1,0,0x5C541380,0,0 +0x5C531100,2,0,0x04004400,2,0=0x5C531100,2,0,0x5C541380,0,0 +0x5C531100,3,0,0x04004400,2,0=0x5C531100,3,0,0x5C541380,0,0 ; -0x5C531100,0,1,0x04004400,2,0=0x5C531100,0,1,0x5C541380,0,0; conflicting-override -0x5C531100,1,1,0x04004400,2,0=0x5C531100,1,1,0x5C541380,0,0; conflicting-override -0x5C531100,2,1,0x04004400,2,0=0x5C531100,2,1,0x5C541380,0,0; conflicting-override -0x5C531100,3,1,0x04004400,2,0=0x5C531100,3,1,0x5C541380,0,0; conflicting-override +0x5C531100,0,1,0x04004400,2,0=0x5C531100,0,1,0x5C541380,0,0 +0x5C531100,1,1,0x04004400,2,0=0x5C531100,1,1,0x5C541380,0,0 +0x5C531100,2,1,0x04004400,2,0=0x5C531100,2,1,0x5C541380,0,0 +0x5C531100,3,1,0x04004400,2,0=0x5C531100,3,1,0x5C541380,0,0 ; ;3-way OXO avenue thru & end street long T intersection - start + intersection -0x5C531100,0,0,0x04008300,2,0=0x5C531100,0,0,0x5C541300,0,0; conflicting-override -0x5C531100,1,0,0x04008300,2,0=0x5C531100,1,0,0x5C541300,0,0; conflicting-override -0x5C531100,2,0,0x04008300,2,0=0x5C531100,2,0,0x5C541300,0,0; conflicting-override -0x5C531100,3,0,0x04008300,2,0=0x5C531100,3,0,0x5C541300,0,0; conflicting-override +0x5C531100,0,0,0x04008300,2,0=0x5C531100,0,0,0x5C541300,0,0 +0x5C531100,1,0,0x04008300,2,0=0x5C531100,1,0,0x5C541300,0,0 +0x5C531100,2,0,0x04008300,2,0=0x5C531100,2,0,0x5C541300,0,0 +0x5C531100,3,0,0x04008300,2,0=0x5C531100,3,0,0x5C541300,0,0 ; -0x5C531100,0,1,0x04008300,2,0=0x5C531100,0,1,0x5C541300,0,0; conflicting-override -0x5C531100,1,1,0x04008300,2,0=0x5C531100,1,1,0x5C541300,0,0; conflicting-override -0x5C531100,2,1,0x04008300,2,0=0x5C531100,2,1,0x5C541300,0,0; conflicting-override -0x5C531100,3,1,0x04008300,2,0=0x5C531100,3,1,0x5C541300,0,0; conflicting-override +0x5C531100,0,1,0x04008300,2,0=0x5C531100,0,1,0x5C541300,0,0 +0x5C531100,1,1,0x04008300,2,0=0x5C531100,1,1,0x5C541300,0,0 +0x5C531100,2,1,0x04008300,2,0=0x5C531100,2,1,0x5C541300,0,0 +0x5C531100,3,1,0x04008300,2,0=0x5C531100,3,1,0x5C541300,0,0 ; 0x5C541300,0,0,0x04008600,0,0=0x5C541300,0,0,0x5C541300,2,0 ; @@ -4412,15 +4412,15 @@ ; ;-- TLA-5 NETWORK -- ;3-way OXO TLA-5 thru & end street short T intersection -0x5C531100,0,0,0x51103000,3,0=0x5C531100,0,0,0x5C541480,0,0; conflicting-override -0x5C531100,1,0,0x51103000,3,0=0x5C531100,1,0,0x5C541480,0,0; conflicting-override -0x5C531100,2,0,0x51103000,3,0=0x5C531100,2,0,0x5C541480,0,0; conflicting-override -0x5C531100,3,0,0x51103000,3,0=0x5C531100,3,0,0x5C541480,0,0; conflicting-override +0x5C531100,0,0,0x51103000,3,0=0x5C531100,0,0,0x5C541480,0,0 +0x5C531100,1,0,0x51103000,3,0=0x5C531100,1,0,0x5C541480,0,0 +0x5C531100,2,0,0x51103000,3,0=0x5C531100,2,0,0x5C541480,0,0 +0x5C531100,3,0,0x51103000,3,0=0x5C531100,3,0,0x5C541480,0,0 ; -0x5C531100,0,1,0x51103000,3,0=0x5C531100,0,1,0x5C541480,0,0; conflicting-override -0x5C531100,1,1,0x51103000,3,0=0x5C531100,1,1,0x5C541480,0,0; conflicting-override -0x5C531100,2,1,0x51103000,3,0=0x5C531100,2,1,0x5C541480,0,0; conflicting-override -0x5C531100,3,1,0x51103000,3,0=0x5C531100,3,1,0x5C541480,0,0; conflicting-override +0x5C531100,0,1,0x51103000,3,0=0x5C531100,0,1,0x5C541480,0,0 +0x5C531100,1,1,0x51103000,3,0=0x5C531100,1,1,0x5C541480,0,0 +0x5C531100,2,1,0x51103000,3,0=0x5C531100,2,1,0x5C541480,0,0 +0x5C531100,3,1,0x51103000,3,0=0x5C531100,3,1,0x5C541480,0,0 ; ;3-way OXO TLA-5 thru & end Street Short T intersection - stabilization 0x5C541480,1,0,0x00004B00,1,0=0x5C541480,1,0,0x51100000,1,0 @@ -4437,15 +4437,15 @@ 0x51100000,0,0,0x5C541000,2,0=0x51100000,0,0,0x5C541480,2,0 ; ;3-way OXO TLA-5 thru & end street long T intersection - override start -0x5C531100,0,0,0x51101000,3,0=0x5C531100,0,0,0x5C541400,0,0; conflicting-override -0x5C531100,1,0,0x51101000,3,0=0x5C531100,1,0,0x5C541400,0,0; conflicting-override -0x5C531100,2,0,0x51101000,3,0=0x5C531100,2,0,0x5C541400,0,0; conflicting-override -0x5C531100,3,0,0x51101000,3,0=0x5C531100,3,0,0x5C541400,0,0; conflicting-override +0x5C531100,0,0,0x51101000,3,0=0x5C531100,0,0,0x5C541400,0,0 +0x5C531100,1,0,0x51101000,3,0=0x5C531100,1,0,0x5C541400,0,0 +0x5C531100,2,0,0x51101000,3,0=0x5C531100,2,0,0x5C541400,0,0 +0x5C531100,3,0,0x51101000,3,0=0x5C531100,3,0,0x5C541400,0,0 ; -0x5C531100,0,1,0x51101000,3,0=0x5C531100,0,1,0x5C541400,0,0; conflicting-override -0x5C531100,1,1,0x51101000,3,0=0x5C531100,1,1,0x5C541400,0,0; conflicting-override -0x5C531100,2,1,0x51101000,3,0=0x5C531100,2,1,0x5C541400,0,0; conflicting-override -0x5C531100,3,1,0x51101000,3,0=0x5C531100,3,1,0x5C541400,0,0; conflicting-override +0x5C531100,0,1,0x51101000,3,0=0x5C531100,0,1,0x5C541400,0,0 +0x5C531100,1,1,0x51101000,3,0=0x5C531100,1,1,0x5C541400,0,0 +0x5C531100,2,1,0x51101000,3,0=0x5C531100,2,1,0x5C541400,0,0 +0x5C531100,3,1,0x51101000,3,0=0x5C531100,3,1,0x5C541400,0,0 ; ;3-way OXO TLA-5 thru & end street long T intersection - stabilization 0x5C541400,0,0,0x00AA0800,1,0=0x5C541400,0,0,0x5C541400,2,0 @@ -4578,15 +4578,15 @@ ; ;-- RD-4 NETWORK -- ;3-way OXO RD-4 thru & end street short T intersection -0x5C531100,0,0,0x51133000,3,0=0x5C531100,0,0,0x5C541580,0,0; conflicting-override -0x5C531100,1,0,0x51133000,3,0=0x5C531100,1,0,0x5C541580,0,0; conflicting-override -0x5C531100,2,0,0x51133000,3,0=0x5C531100,2,0,0x5C541580,0,0; conflicting-override -0x5C531100,3,0,0x51133000,3,0=0x5C531100,3,0,0x5C541580,0,0; conflicting-override +0x5C531100,0,0,0x51133000,3,0=0x5C531100,0,0,0x5C541580,0,0 +0x5C531100,1,0,0x51133000,3,0=0x5C531100,1,0,0x5C541580,0,0 +0x5C531100,2,0,0x51133000,3,0=0x5C531100,2,0,0x5C541580,0,0 +0x5C531100,3,0,0x51133000,3,0=0x5C531100,3,0,0x5C541580,0,0 ; -0x5C531100,0,1,0x51133000,3,0=0x5C531100,0,1,0x5C541580,0,0; conflicting-override -0x5C531100,1,1,0x51133000,3,0=0x5C531100,1,1,0x5C541580,0,0; conflicting-override -0x5C531100,2,1,0x51133000,3,0=0x5C531100,2,1,0x5C541580,0,0; conflicting-override -0x5C531100,3,1,0x51133000,3,0=0x5C531100,3,1,0x5C541580,0,0; conflicting-override +0x5C531100,0,1,0x51133000,3,0=0x5C531100,0,1,0x5C541580,0,0 +0x5C531100,1,1,0x51133000,3,0=0x5C531100,1,1,0x5C541580,0,0 +0x5C531100,2,1,0x51133000,3,0=0x5C531100,2,1,0x5C541580,0,0 +0x5C531100,3,1,0x51133000,3,0=0x5C531100,3,1,0x5C541580,0,0 ; ;3-way OXO RD-4 thru & end Street Short T intersection - stabilization 0x5C541580,1,0,0x00004B00,1,0=0x5C541580,1,0,0x51130000,1,0 @@ -4608,15 +4608,15 @@ 0x51133080,1,0,0x5C541000,2,0=0x5C541500,0,0,0x5C541500,2,0 ; ;3-way OXO RD-4 thru & end street long T intersection - override start -0x5C531100,0,0,0x51131000,3,0=0x5C531100,0,0,0x5C541500,0,0; conflicting-override -0x5C531100,1,0,0x51131000,3,0=0x5C531100,1,0,0x5C541500,0,0; conflicting-override -0x5C531100,2,0,0x51131000,3,0=0x5C531100,2,0,0x5C541500,0,0; conflicting-override -0x5C531100,3,0,0x51131000,3,0=0x5C531100,3,0,0x5C541500,0,0; conflicting-override +0x5C531100,0,0,0x51131000,3,0=0x5C531100,0,0,0x5C541500,0,0 +0x5C531100,1,0,0x51131000,3,0=0x5C531100,1,0,0x5C541500,0,0 +0x5C531100,2,0,0x51131000,3,0=0x5C531100,2,0,0x5C541500,0,0 +0x5C531100,3,0,0x51131000,3,0=0x5C531100,3,0,0x5C541500,0,0 ; -0x5C531100,0,1,0x51131000,3,0=0x5C531100,0,1,0x5C541500,0,0; conflicting-override -0x5C531100,1,1,0x51131000,3,0=0x5C531100,1,1,0x5C541500,0,0; conflicting-override -0x5C531100,2,1,0x51131000,3,0=0x5C531100,2,1,0x5C541500,0,0; conflicting-override -0x5C531100,3,1,0x51131000,3,0=0x5C531100,3,1,0x5C541500,0,0; conflicting-override +0x5C531100,0,1,0x51131000,3,0=0x5C531100,0,1,0x5C541500,0,0 +0x5C531100,1,1,0x51131000,3,0=0x5C531100,1,1,0x5C541500,0,0 +0x5C531100,2,1,0x51131000,3,0=0x5C531100,2,1,0x5C541500,0,0 +0x5C531100,3,1,0x51131000,3,0=0x5C531100,3,1,0x5C541500,0,0 ; 0x51133080,1,0,0x5C541000,0,0=0x5C541500,0,0,0x5C541500,2,0 0x51133080,1,0,0x5C541000,2,0=0x5C541500,0,0,0x5C541500,2,0 @@ -4683,7 +4683,7 @@ 0x5C541580,3,0,0x04006100,3,0=0x5C541580,3,0,0x51130000,3,0 ; 0x5C541580,0,0,0x04006100,2,0=0x5C541580,0,0,0x51130000,2,0 -0x5C541380,0,0,0x51130000,2,0=0x5C541580,0,0,0x51130000,2,0; conflicting-override +0x5C541380,0,0,0x51130000,2,0=0x5C541580,0,0,0x51130000,2,0 ; ;-Adjacency Stability ;4-way OXO + intersection - continuity @@ -4779,15 +4779,15 @@ ; ;-- RD-6 NETWORK -- ;3-way OXO RD-6 thru & end street short T intersection -0x5C531100,0,0,0x51143000,3,0=0x5C531100,0,0,0x5C541680,0,0; conflicting-override -0x5C531100,1,0,0x51143000,3,0=0x5C531100,1,0,0x5C541680,0,0; conflicting-override -0x5C531100,2,0,0x51143000,3,0=0x5C531100,2,0,0x5C541680,0,0; conflicting-override -0x5C531100,3,0,0x51143000,3,0=0x5C531100,3,0,0x5C541680,0,0; conflicting-override +0x5C531100,0,0,0x51143000,3,0=0x5C531100,0,0,0x5C541680,0,0 +0x5C531100,1,0,0x51143000,3,0=0x5C531100,1,0,0x5C541680,0,0 +0x5C531100,2,0,0x51143000,3,0=0x5C531100,2,0,0x5C541680,0,0 +0x5C531100,3,0,0x51143000,3,0=0x5C531100,3,0,0x5C541680,0,0 ; -0x5C531100,0,1,0x51143000,3,0=0x5C531100,0,1,0x5C541680,0,0; conflicting-override -0x5C531100,1,1,0x51143000,3,0=0x5C531100,1,1,0x5C541680,0,0; conflicting-override -0x5C531100,2,1,0x51143000,3,0=0x5C531100,2,1,0x5C541680,0,0; conflicting-override -0x5C531100,3,1,0x51143000,3,0=0x5C531100,3,1,0x5C541680,0,0; conflicting-override +0x5C531100,0,1,0x51143000,3,0=0x5C531100,0,1,0x5C541680,0,0 +0x5C531100,1,1,0x51143000,3,0=0x5C531100,1,1,0x5C541680,0,0 +0x5C531100,2,1,0x51143000,3,0=0x5C531100,2,1,0x5C541680,0,0 +0x5C531100,3,1,0x51143000,3,0=0x5C531100,3,1,0x5C541680,0,0 ; ;3-way OXO RD-6 thru & end Street Short T intersection - stabilization 0x5C541680,1,0,0x00004B00,1,0=0x5C541680,1,0,0x51140000,1,0 @@ -4809,15 +4809,15 @@ 0x51143080,1,0,0x5C541000,2,0=0x5C541600,0,0,0x5C541600,2,0 ; ;3-way OXO RD-6 thru & end street long T intersection - override start -0x5C531100,0,0,0x51141000,3,0=0x5C531100,0,0,0x5C541600,0,0; conflicting-override -0x5C531100,1,0,0x51141000,3,0=0x5C531100,1,0,0x5C541600,0,0; conflicting-override -0x5C531100,2,0,0x51141000,3,0=0x5C531100,2,0,0x5C541600,0,0; conflicting-override -0x5C531100,3,0,0x51141000,3,0=0x5C531100,3,0,0x5C541600,0,0; conflicting-override +0x5C531100,0,0,0x51141000,3,0=0x5C531100,0,0,0x5C541600,0,0 +0x5C531100,1,0,0x51141000,3,0=0x5C531100,1,0,0x5C541600,0,0 +0x5C531100,2,0,0x51141000,3,0=0x5C531100,2,0,0x5C541600,0,0 +0x5C531100,3,0,0x51141000,3,0=0x5C531100,3,0,0x5C541600,0,0 ; -0x5C531100,0,1,0x51141000,3,0=0x5C531100,0,1,0x5C541600,0,0; conflicting-override -0x5C531100,1,1,0x51141000,3,0=0x5C531100,1,1,0x5C541600,0,0; conflicting-override -0x5C531100,2,1,0x51141000,3,0=0x5C531100,2,1,0x5C541600,0,0; conflicting-override -0x5C531100,3,1,0x51141000,3,0=0x5C531100,3,1,0x5C541600,0,0; conflicting-override +0x5C531100,0,1,0x51141000,3,0=0x5C531100,0,1,0x5C541600,0,0 +0x5C531100,1,1,0x51141000,3,0=0x5C531100,1,1,0x5C541600,0,0 +0x5C531100,2,1,0x51141000,3,0=0x5C531100,2,1,0x5C541600,0,0 +0x5C531100,3,1,0x51141000,3,0=0x5C531100,3,1,0x5C541600,0,0 ; 0x51143080,1,0,0x5C541000,0,0=0x5C541600,0,0,0x5C541600,2,0 0x51143080,1,0,0x5C541000,2,0=0x5C541600,0,0,0x5C541600,2,0 @@ -4946,14 +4946,14 @@ ;-- TRIPLE TILE (AVE-6, TLA-7) NETWORK -- ;-- TLA-7 / AVE-6 outer lanes -- ; Initial override - crosswalk (4-way street intersection) - pedmall side -0x5C531100,0,0,0x51201000,3,0=0x5C531100,0,0,0x5C541700,0,0; conflicting-override -0x5C531100,1,0,0x51201000,3,0=0x5C531100,1,0,0x5C541700,0,0; conflicting-override -0x5C531100,2,0,0x51201000,3,0=0x5C531100,2,0,0x5C541700,0,0; conflicting-override -0x5C531100,3,0,0x51201000,3,0=0x5C531100,3,0,0x5C541700,0,0; conflicting-override -0x5C531100,0,1,0x51201000,3,0=0x5C531100,0,1,0x5C541700,0,0; conflicting-override -0x5C531100,1,1,0x51201000,3,0=0x5C531100,1,1,0x5C541700,0,0; conflicting-override -0x5C531100,2,1,0x51201000,3,0=0x5C531100,2,1,0x5C541700,0,0; conflicting-override -0x5C531100,3,1,0x51201000,3,0=0x5C531100,3,1,0x5C541700,0,0; conflicting-override +0x5C531100,0,0,0x51201000,3,0=0x5C531100,0,0,0x5C541700,0,0 +0x5C531100,1,0,0x51201000,3,0=0x5C531100,1,0,0x5C541700,0,0 +0x5C531100,2,0,0x51201000,3,0=0x5C531100,2,0,0x5C541700,0,0 +0x5C531100,3,0,0x51201000,3,0=0x5C531100,3,0,0x5C541700,0,0 +0x5C531100,0,1,0x51201000,3,0=0x5C531100,0,1,0x5C541700,0,0 +0x5C531100,1,1,0x51201000,3,0=0x5C531100,1,1,0x5C541700,0,0 +0x5C531100,2,1,0x51201000,3,0=0x5C531100,2,1,0x5C541700,0,0 +0x5C531100,3,1,0x51201000,3,0=0x5C531100,3,1,0x5C541700,0,0 ; ; Override stability - outer crosswalk - continuity 0x5C541700,1,0,0x00004B00,1,0=0x5C541700,1,0,0x51200000,1,0 @@ -4964,14 +4964,14 @@ 0x5C541700,3,0,0x00000300,1,0=0x5C541700,3,0,0x51200100,3,1 ; ; Initial override - end T (street short T) - pedmall side -0x5C531100,0,0,0x51203000,3,0=0x5C531100,0,0,0x5C541780,0,0; conflicting-override -0x5C531100,1,0,0x51203000,3,0=0x5C531100,1,0,0x5C541780,0,0; conflicting-override -0x5C531100,2,0,0x51203000,3,0=0x5C531100,2,0,0x5C541780,0,0; conflicting-override -0x5C531100,3,0,0x51203000,3,0=0x5C531100,3,0,0x5C541780,0,0; conflicting-override -0x5C531100,0,1,0x51203000,3,0=0x5C531100,0,1,0x5C541780,0,0; conflicting-override -0x5C531100,1,1,0x51203000,3,0=0x5C531100,1,1,0x5C541780,0,0; conflicting-override -0x5C531100,2,1,0x51203000,3,0=0x5C531100,2,1,0x5C541780,0,0; conflicting-override -0x5C531100,3,1,0x51203000,3,0=0x5C531100,3,1,0x5C541780,0,0; conflicting-override +0x5C531100,0,0,0x51203000,3,0=0x5C531100,0,0,0x5C541780,0,0 +0x5C531100,1,0,0x51203000,3,0=0x5C531100,1,0,0x5C541780,0,0 +0x5C531100,2,0,0x51203000,3,0=0x5C531100,2,0,0x5C541780,0,0 +0x5C531100,3,0,0x51203000,3,0=0x5C531100,3,0,0x5C541780,0,0 +0x5C531100,0,1,0x51203000,3,0=0x5C531100,0,1,0x5C541780,0,0 +0x5C531100,1,1,0x51203000,3,0=0x5C531100,1,1,0x5C541780,0,0 +0x5C531100,2,1,0x51203000,3,0=0x5C531100,2,1,0x5C541780,0,0 +0x5C531100,3,1,0x51203000,3,0=0x5C531100,3,1,0x5C541780,0,0 ; ; Override stability - end T - median side 0x5C541700,0,0,0x51200080,0,0=0x5C541780,0,0,0x51200080,0,0 diff --git a/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c2_DraggableMall_Street_Pavement_custom_RHD.txt b/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c2_DraggableMall_Street_Pavement_custom_RHD.txt index eef52ec3c..528e94e6c 100644 --- a/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c2_DraggableMall_Street_Pavement_custom_RHD.txt +++ b/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c2_DraggableMall_Street_Pavement_custom_RHD.txt @@ -3413,20 +3413,20 @@ ;-- ROAD & BIDIRECTIONAL SINGLE TILE NWM -- ;-- ROAD (RD-2) NETWORK -- ;3-way OXO road thru & end street T intersection - initial override -0x5C532100,0,0,0x00AA0800,1,0=0x5C532100,0,0,0x5C542000,0,0; conflicting-override -0x5C532100,1,0,0x00AA0800,1,0=0x5C532100,1,0,0x5C542000,0,0; conflicting-override -0x5C532100,2,0,0x00AA0800,1,0=0x5C532100,2,0,0x5C542000,0,0; conflicting-override -0x5C532100,3,0,0x00AA0800,1,0=0x5C532100,3,0,0x5C542000,0,0; conflicting-override +0x5C532100,0,0,0x00AA0800,1,0=0x5C532100,0,0,0x5C542000,0,0 +0x5C532100,1,0,0x00AA0800,1,0=0x5C532100,1,0,0x5C542000,0,0 +0x5C532100,2,0,0x00AA0800,1,0=0x5C532100,2,0,0x5C542000,0,0 +0x5C532100,3,0,0x00AA0800,1,0=0x5C532100,3,0,0x5C542000,0,0 ; ;4-way OXO + intersection - initial override -0x5C532100,0,0,0x00AA0A00,1,0=0x5C532100,0,0,0x5C542000,0,0; conflicting-override -0x5C532100,1,0,0x00AA0A00,1,0=0x5C532100,1,0,0x5C542000,0,0; conflicting-override -0x5C532100,2,0,0x00AA0A00,1,0=0x5C532100,2,0,0x5C542000,0,0; conflicting-override -0x5C532100,3,0,0x00AA0A00,1,0=0x5C532100,3,0,0x5C542000,0,0; conflicting-override -0x5C532100,0,0,0x00AA0A00,3,0=0x5C532100,0,0,0x5C542000,0,0; conflicting-override -0x5C532100,1,0,0x00AA0A00,3,0=0x5C532100,1,0,0x5C542000,0,0; conflicting-override -0x5C532100,2,0,0x00AA0A00,3,0=0x5C532100,2,0,0x5C542000,0,0; conflicting-override -0x5C532100,3,0,0x00AA0A00,3,0=0x5C532100,3,0,0x5C542000,0,0; conflicting-override +0x5C532100,0,0,0x00AA0A00,1,0=0x5C532100,0,0,0x5C542000,0,0 +0x5C532100,1,0,0x00AA0A00,1,0=0x5C532100,1,0,0x5C542000,0,0 +0x5C532100,2,0,0x00AA0A00,1,0=0x5C532100,2,0,0x5C542000,0,0 +0x5C532100,3,0,0x00AA0A00,1,0=0x5C532100,3,0,0x5C542000,0,0 +0x5C532100,0,0,0x00AA0A00,3,0=0x5C532100,0,0,0x5C542000,0,0 +0x5C532100,1,0,0x00AA0A00,3,0=0x5C532100,1,0,0x5C542000,0,0 +0x5C532100,2,0,0x00AA0A00,3,0=0x5C532100,2,0,0x5C542000,0,0 +0x5C532100,3,0,0x00AA0A00,3,0=0x5C532100,3,0,0x5C542000,0,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -3575,10 +3575,10 @@ ; ;-- TLA-3 NETWORK -- ;3-way OXO TLA-3 thru & end Street T intersection - initial override -0x5C532100,0,0,0x51003000,1,0=0x5C532100,0,0,0x5C542080,0,0; conflicting-override -0x5C532100,1,0,0x51003000,1,0=0x5C532100,1,0,0x5C542080,0,0; conflicting-override -0x5C532100,2,0,0x51003000,1,0=0x5C532100,2,0,0x5C542080,0,0; conflicting-override -0x5C532100,3,0,0x51003000,1,0=0x5C532100,3,0,0x5C542080,0,0; conflicting-override +0x5C532100,0,0,0x51003000,1,0=0x5C532100,0,0,0x5C542080,0,0 +0x5C532100,1,0,0x51003000,1,0=0x5C532100,1,0,0x5C542080,0,0 +0x5C532100,2,0,0x51003000,1,0=0x5C532100,2,0,0x5C542080,0,0 +0x5C532100,3,0,0x51003000,1,0=0x5C532100,3,0,0x5C542080,0,0 ; ;3-way OXO TLA-3 thru & end Street T intersection - stabilization 0x51000000,1,0,0x5C542000,1,0=0x51000000,1,0,0x5C542080,1,0 @@ -3597,14 +3597,14 @@ 0x00000300,3,0,0x5C542080,3,0=0x51000100,3,0,0x5C542080,3,0 ; ;4-way OXO + intersection - initial override -0x5C532100,0,0,0x51001000,1,0=0x5C532100,0,0,0x5C542080,0,0; conflicting-override -0x5C532100,1,0,0x51001000,1,0=0x5C532100,1,0,0x5C542080,0,0; conflicting-override -0x5C532100,2,0,0x51001000,1,0=0x5C532100,2,0,0x5C542080,0,0; conflicting-override -0x5C532100,3,0,0x51001000,1,0=0x5C532100,3,0,0x5C542080,0,0; conflicting-override -0x5C532100,0,0,0x51001000,3,0=0x5C532100,0,0,0x5C542080,2,0; conflicting-override -0x5C532100,1,0,0x51001000,3,0=0x5C532100,1,0,0x5C542080,2,0; conflicting-override -0x5C532100,2,0,0x51001000,3,0=0x5C532100,2,0,0x5C542080,2,0; conflicting-override -0x5C532100,3,0,0x51001000,3,0=0x5C532100,3,0,0x5C542080,2,0; conflicting-override +0x5C532100,0,0,0x51001000,1,0=0x5C532100,0,0,0x5C542080,0,0 +0x5C532100,1,0,0x51001000,1,0=0x5C532100,1,0,0x5C542080,0,0 +0x5C532100,2,0,0x51001000,1,0=0x5C532100,2,0,0x5C542080,0,0 +0x5C532100,3,0,0x51001000,1,0=0x5C532100,3,0,0x5C542080,0,0 +0x5C532100,0,0,0x51001000,3,0=0x5C532100,0,0,0x5C542080,2,0 +0x5C532100,1,0,0x51001000,3,0=0x5C532100,1,0,0x5C542080,2,0 +0x5C532100,2,0,0x51001000,3,0=0x5C532100,2,0,0x5C542080,2,0 +0x5C532100,3,0,0x51001000,3,0=0x5C532100,3,0,0x5C542080,2,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -3753,10 +3753,10 @@ ; ;-- AVE-2 NETWORK -- ;3-way OXO AVE-2 thru & end Street T intersection - initial override -0x5C532100,0,0,0x51013000,1,0=0x5C532100,0,0,0x5C542100,0,0; conflicting-override -0x5C532100,1,0,0x51013000,1,0=0x5C532100,1,0,0x5C542100,0,0; conflicting-override -0x5C532100,2,0,0x51013000,1,0=0x5C532100,2,0,0x5C542100,0,0; conflicting-override -0x5C532100,3,0,0x51013000,1,0=0x5C532100,3,0,0x5C542100,0,0; conflicting-override +0x5C532100,0,0,0x51013000,1,0=0x5C532100,0,0,0x5C542100,0,0 +0x5C532100,1,0,0x51013000,1,0=0x5C532100,1,0,0x5C542100,0,0 +0x5C532100,2,0,0x51013000,1,0=0x5C532100,2,0,0x5C542100,0,0 +0x5C532100,3,0,0x51013000,1,0=0x5C532100,3,0,0x5C542100,0,0 ; ;3-way OXO AVE-2 thru & end Street T intersection - stabilization 0x51010000,1,0,0x5C542000,1,0=0x51010000,1,0,0x5C542100,1,0 @@ -3775,14 +3775,14 @@ 0x00000300,3,0,0x5C542100,3,0=0x51010100,3,0,0x5C542100,3,0 ; ;4-way OXO + intersection - initial override -0x5C532100,0,0,0x51011000,1,0=0x5C532100,0,0,0x5C542100,0,0; conflicting-override -0x5C532100,1,0,0x51011000,1,0=0x5C532100,1,0,0x5C542100,0,0; conflicting-override -0x5C532100,2,0,0x51011000,1,0=0x5C532100,2,0,0x5C542100,0,0; conflicting-override -0x5C532100,3,0,0x51011000,1,0=0x5C532100,3,0,0x5C542100,0,0; conflicting-override -0x5C532100,0,0,0x51011000,3,0=0x5C532100,0,0,0x5C542100,2,0; conflicting-override -0x5C532100,1,0,0x51011000,3,0=0x5C532100,1,0,0x5C542100,2,0; conflicting-override -0x5C532100,2,0,0x51011000,3,0=0x5C532100,2,0,0x5C542100,2,0; conflicting-override -0x5C532100,3,0,0x51011000,3,0=0x5C532100,3,0,0x5C542100,2,0; conflicting-override +0x5C532100,0,0,0x51011000,1,0=0x5C532100,0,0,0x5C542100,0,0 +0x5C532100,1,0,0x51011000,1,0=0x5C532100,1,0,0x5C542100,0,0 +0x5C532100,2,0,0x51011000,1,0=0x5C532100,2,0,0x5C542100,0,0 +0x5C532100,3,0,0x51011000,1,0=0x5C532100,3,0,0x5C542100,0,0 +0x5C532100,0,0,0x51011000,3,0=0x5C532100,0,0,0x5C542100,2,0 +0x5C532100,1,0,0x51011000,3,0=0x5C532100,1,0,0x5C542100,2,0 +0x5C532100,2,0,0x51011000,3,0=0x5C532100,2,0,0x5C542100,2,0 +0x5C532100,3,0,0x51011000,3,0=0x5C532100,3,0,0x5C542100,2,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -3931,15 +3931,15 @@ ; ;-- ARD-3 NETWORK -- ;3-way OXO ARD-3 thru & end Street T intersection - initial override -0x5C532100,0,0,0x51023000,1,0=0x5C532100,0,0,0x5C542180,2,0; conflicting-override -0x5C532100,1,0,0x51023000,1,0=0x5C532100,1,0,0x5C542180,2,0; conflicting-override -0x5C532100,2,0,0x51023000,1,0=0x5C532100,2,0,0x5C542180,2,0; conflicting-override -0x5C532100,3,0,0x51023000,1,0=0x5C532100,3,0,0x5C542180,2,0; conflicting-override +0x5C532100,0,0,0x51023000,1,0=0x5C532100,0,0,0x5C542180,2,0 +0x5C532100,1,0,0x51023000,1,0=0x5C532100,1,0,0x5C542180,2,0 +0x5C532100,2,0,0x51023000,1,0=0x5C532100,2,0,0x5C542180,2,0 +0x5C532100,3,0,0x51023000,1,0=0x5C532100,3,0,0x5C542180,2,0 ; -0x5C532100,0,0,0x51023080,1,0=0x5C532100,0,0,0x5C542180,0,0; conflicting-override -0x5C532100,1,0,0x51023080,1,0=0x5C532100,1,0,0x5C542180,0,0; conflicting-override -0x5C532100,2,0,0x51023080,1,0=0x5C532100,2,0,0x5C542180,0,0; conflicting-override -0x5C532100,3,0,0x51023080,1,0=0x5C532100,3,0,0x5C542180,0,0; conflicting-override +0x5C532100,0,0,0x51023080,1,0=0x5C532100,0,0,0x5C542180,0,0 +0x5C532100,1,0,0x51023080,1,0=0x5C532100,1,0,0x5C542180,0,0 +0x5C532100,2,0,0x51023080,1,0=0x5C532100,2,0,0x5C542180,0,0 +0x5C532100,3,0,0x51023080,1,0=0x5C532100,3,0,0x5C542180,0,0 ; ;3-way OXO ARD-3 thru & end Street T intersection - stabilization 0x51020000,1,0,0x5C542000,1,0=0x51020000,1,0,0x5C542180,1,0 @@ -3958,14 +3958,14 @@ 0x00000300,3,0,0x5C542180,3,0=0x51020100,3,0,0x5C542180,3,0 ; ;4-way OXO + intersection - initial override -0x5C532100,0,0,0x51021000,1,0=0x5C532100,0,0,0x5C542180,2,0; conflicting-override -0x5C532100,1,0,0x51021000,1,0=0x5C532100,1,0,0x5C542180,2,0; conflicting-override -0x5C532100,2,0,0x51021000,1,0=0x5C532100,2,0,0x5C542180,2,0; conflicting-override -0x5C532100,3,0,0x51021000,1,0=0x5C532100,3,0,0x5C542180,2,0; conflicting-override -0x5C532100,0,0,0x51021000,3,0=0x5C532100,0,0,0x5C542180,0,0; conflicting-override -0x5C532100,1,0,0x51021000,3,0=0x5C532100,1,0,0x5C542180,0,0; conflicting-override -0x5C532100,2,0,0x51021000,3,0=0x5C532100,2,0,0x5C542180,0,0; conflicting-override -0x5C532100,3,0,0x51021000,3,0=0x5C532100,3,0,0x5C542180,0,0; conflicting-override +0x5C532100,0,0,0x51021000,1,0=0x5C532100,0,0,0x5C542180,2,0 +0x5C532100,1,0,0x51021000,1,0=0x5C532100,1,0,0x5C542180,2,0 +0x5C532100,2,0,0x51021000,1,0=0x5C532100,2,0,0x5C542180,2,0 +0x5C532100,3,0,0x51021000,1,0=0x5C532100,3,0,0x5C542180,2,0 +0x5C532100,0,0,0x51021000,3,0=0x5C532100,0,0,0x5C542180,0,0 +0x5C532100,1,0,0x51021000,3,0=0x5C532100,1,0,0x5C542180,0,0 +0x5C532100,2,0,0x51021000,3,0=0x5C532100,2,0,0x5C542180,0,0 +0x5C532100,3,0,0x51021000,3,0=0x5C532100,3,0,0x5C542180,0,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -4114,10 +4114,10 @@ ; ;-- NRD-4 NETWORK -- ;3-way OXO NRD-4 thru & end Street T intersection - initial override -0x5C532100,0,0,0x51053000,1,0=0x5C532100,0,0,0x5C542200,0,0; conflicting-override -0x5C532100,1,0,0x51053000,1,0=0x5C532100,1,0,0x5C542200,0,0; conflicting-override -0x5C532100,2,0,0x51053000,1,0=0x5C532100,2,0,0x5C542200,0,0; conflicting-override -0x5C532100,3,0,0x51053000,1,0=0x5C532100,3,0,0x5C542200,0,0; conflicting-override +0x5C532100,0,0,0x51053000,1,0=0x5C532100,0,0,0x5C542200,0,0 +0x5C532100,1,0,0x51053000,1,0=0x5C532100,1,0,0x5C542200,0,0 +0x5C532100,2,0,0x51053000,1,0=0x5C532100,2,0,0x5C542200,0,0 +0x5C532100,3,0,0x51053000,1,0=0x5C532100,3,0,0x5C542200,0,0 ; ;3-way OXO NRD-4 thru & end Street T intersection - stabilization 0x51050000,1,0,0x5C542000,1,0=0x51050000,1,0,0x5C542200,1,0 @@ -4136,14 +4136,14 @@ 0x00000300,3,0,0x5C542200,3,0=0x51050100,3,0,0x5C542200,3,0 ; ;4-way OXO + intersection - initial override -0x5C532100,0,0,0x51051000,1,0=0x5C532100,0,0,0x5C542200,0,0; conflicting-override -0x5C532100,1,0,0x51051000,1,0=0x5C532100,1,0,0x5C542200,0,0; conflicting-override -0x5C532100,2,0,0x51051000,1,0=0x5C532100,2,0,0x5C542200,0,0; conflicting-override -0x5C532100,3,0,0x51051000,1,0=0x5C532100,3,0,0x5C542200,0,0; conflicting-override -0x5C532100,0,0,0x51051000,3,0=0x5C532100,0,0,0x5C542200,2,0; conflicting-override -0x5C532100,1,0,0x51051000,3,0=0x5C532100,1,0,0x5C542200,2,0; conflicting-override -0x5C532100,2,0,0x51051000,3,0=0x5C532100,2,0,0x5C542200,2,0; conflicting-override -0x5C532100,3,0,0x51051000,3,0=0x5C532100,3,0,0x5C542200,2,0; conflicting-override +0x5C532100,0,0,0x51051000,1,0=0x5C532100,0,0,0x5C542200,0,0 +0x5C532100,1,0,0x51051000,1,0=0x5C532100,1,0,0x5C542200,0,0 +0x5C532100,2,0,0x51051000,1,0=0x5C532100,2,0,0x5C542200,0,0 +0x5C532100,3,0,0x51051000,1,0=0x5C532100,3,0,0x5C542200,0,0 +0x5C532100,0,0,0x51051000,3,0=0x5C532100,0,0,0x5C542200,2,0 +0x5C532100,1,0,0x51051000,3,0=0x5C532100,1,0,0x5C542200,2,0 +0x5C532100,2,0,0x51051000,3,0=0x5C532100,2,0,0x5C542200,2,0 +0x5C532100,3,0,0x51051000,3,0=0x5C532100,3,0,0x5C542200,2,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -4293,26 +4293,26 @@ ;-- AVENUE & BIDIRECTIONAL MULTI TILE NWM -- ;-- AVENUE (AVE-4) NETWORK -- ;3-way OXO avenue thru & end street short T intersection -0x5C532100,0,0,0x04004400,2,0=0x5C532100,0,0,0x5C542380,0,0; conflicting-override -0x5C532100,1,0,0x04004400,2,0=0x5C532100,1,0,0x5C542380,0,0; conflicting-override -0x5C532100,2,0,0x04004400,2,0=0x5C532100,2,0,0x5C542380,0,0; conflicting-override -0x5C532100,3,0,0x04004400,2,0=0x5C532100,3,0,0x5C542380,0,0; conflicting-override +0x5C532100,0,0,0x04004400,2,0=0x5C532100,0,0,0x5C542380,0,0 +0x5C532100,1,0,0x04004400,2,0=0x5C532100,1,0,0x5C542380,0,0 +0x5C532100,2,0,0x04004400,2,0=0x5C532100,2,0,0x5C542380,0,0 +0x5C532100,3,0,0x04004400,2,0=0x5C532100,3,0,0x5C542380,0,0 ; -0x5C532100,0,1,0x04004400,2,0=0x5C532100,0,1,0x5C542380,0,0; conflicting-override -0x5C532100,1,1,0x04004400,2,0=0x5C532100,1,1,0x5C542380,0,0; conflicting-override -0x5C532100,2,1,0x04004400,2,0=0x5C532100,2,1,0x5C542380,0,0; conflicting-override -0x5C532100,3,1,0x04004400,2,0=0x5C532100,3,1,0x5C542380,0,0; conflicting-override +0x5C532100,0,1,0x04004400,2,0=0x5C532100,0,1,0x5C542380,0,0 +0x5C532100,1,1,0x04004400,2,0=0x5C532100,1,1,0x5C542380,0,0 +0x5C532100,2,1,0x04004400,2,0=0x5C532100,2,1,0x5C542380,0,0 +0x5C532100,3,1,0x04004400,2,0=0x5C532100,3,1,0x5C542380,0,0 ; ;3-way OXO avenue thru & end street long T intersection - start + intersection -0x5C532100,0,0,0x04008300,2,0=0x5C532100,0,0,0x5C542300,0,0; conflicting-override -0x5C532100,1,0,0x04008300,2,0=0x5C532100,1,0,0x5C542300,0,0; conflicting-override -0x5C532100,2,0,0x04008300,2,0=0x5C532100,2,0,0x5C542300,0,0; conflicting-override -0x5C532100,3,0,0x04008300,2,0=0x5C532100,3,0,0x5C542300,0,0; conflicting-override +0x5C532100,0,0,0x04008300,2,0=0x5C532100,0,0,0x5C542300,0,0 +0x5C532100,1,0,0x04008300,2,0=0x5C532100,1,0,0x5C542300,0,0 +0x5C532100,2,0,0x04008300,2,0=0x5C532100,2,0,0x5C542300,0,0 +0x5C532100,3,0,0x04008300,2,0=0x5C532100,3,0,0x5C542300,0,0 ; -0x5C532100,0,1,0x04008300,2,0=0x5C532100,0,1,0x5C542300,0,0; conflicting-override -0x5C532100,1,1,0x04008300,2,0=0x5C532100,1,1,0x5C542300,0,0; conflicting-override -0x5C532100,2,1,0x04008300,2,0=0x5C532100,2,1,0x5C542300,0,0; conflicting-override -0x5C532100,3,1,0x04008300,2,0=0x5C532100,3,1,0x5C542300,0,0; conflicting-override +0x5C532100,0,1,0x04008300,2,0=0x5C532100,0,1,0x5C542300,0,0 +0x5C532100,1,1,0x04008300,2,0=0x5C532100,1,1,0x5C542300,0,0 +0x5C532100,2,1,0x04008300,2,0=0x5C532100,2,1,0x5C542300,0,0 +0x5C532100,3,1,0x04008300,2,0=0x5C532100,3,1,0x5C542300,0,0 ; 0x5C542300,0,0,0x04008600,0,0=0x5C542300,0,0,0x5C542300,2,0 ; @@ -4413,15 +4413,15 @@ ; ;-- TLA-5 NETWORK -- ;3-way OXO TLA-5 thru & end street short T intersection -0x5C532100,0,0,0x51103000,3,0=0x5C532100,0,0,0x5C542480,0,0; conflicting-override -0x5C532100,1,0,0x51103000,3,0=0x5C532100,1,0,0x5C542480,0,0; conflicting-override -0x5C532100,2,0,0x51103000,3,0=0x5C532100,2,0,0x5C542480,0,0; conflicting-override -0x5C532100,3,0,0x51103000,3,0=0x5C532100,3,0,0x5C542480,0,0; conflicting-override +0x5C532100,0,0,0x51103000,3,0=0x5C532100,0,0,0x5C542480,0,0 +0x5C532100,1,0,0x51103000,3,0=0x5C532100,1,0,0x5C542480,0,0 +0x5C532100,2,0,0x51103000,3,0=0x5C532100,2,0,0x5C542480,0,0 +0x5C532100,3,0,0x51103000,3,0=0x5C532100,3,0,0x5C542480,0,0 ; -0x5C532100,0,1,0x51103000,3,0=0x5C532100,0,1,0x5C542480,0,0; conflicting-override -0x5C532100,1,1,0x51103000,3,0=0x5C532100,1,1,0x5C542480,0,0; conflicting-override -0x5C532100,2,1,0x51103000,3,0=0x5C532100,2,1,0x5C542480,0,0; conflicting-override -0x5C532100,3,1,0x51103000,3,0=0x5C532100,3,1,0x5C542480,0,0; conflicting-override +0x5C532100,0,1,0x51103000,3,0=0x5C532100,0,1,0x5C542480,0,0 +0x5C532100,1,1,0x51103000,3,0=0x5C532100,1,1,0x5C542480,0,0 +0x5C532100,2,1,0x51103000,3,0=0x5C532100,2,1,0x5C542480,0,0 +0x5C532100,3,1,0x51103000,3,0=0x5C532100,3,1,0x5C542480,0,0 ; ;3-way OXO TLA-5 thru & end Street Short T intersection - stabilization 0x5C542480,1,0,0x00004B00,1,0=0x5C542480,1,0,0x51100000,1,0 @@ -4438,15 +4438,15 @@ 0x51100000,0,0,0x5C542000,2,0=0x51100000,0,0,0x5C542480,2,0 ; ;3-way OXO TLA-5 thru & end street long T intersection - override start -0x5C532100,0,0,0x51101000,3,0=0x5C532100,0,0,0x5C542400,0,0; conflicting-override -0x5C532100,1,0,0x51101000,3,0=0x5C532100,1,0,0x5C542400,0,0; conflicting-override -0x5C532100,2,0,0x51101000,3,0=0x5C532100,2,0,0x5C542400,0,0; conflicting-override -0x5C532100,3,0,0x51101000,3,0=0x5C532100,3,0,0x5C542400,0,0; conflicting-override +0x5C532100,0,0,0x51101000,3,0=0x5C532100,0,0,0x5C542400,0,0 +0x5C532100,1,0,0x51101000,3,0=0x5C532100,1,0,0x5C542400,0,0 +0x5C532100,2,0,0x51101000,3,0=0x5C532100,2,0,0x5C542400,0,0 +0x5C532100,3,0,0x51101000,3,0=0x5C532100,3,0,0x5C542400,0,0 ; -0x5C532100,0,1,0x51101000,3,0=0x5C532100,0,1,0x5C542400,0,0; conflicting-override -0x5C532100,1,1,0x51101000,3,0=0x5C532100,1,1,0x5C542400,0,0; conflicting-override -0x5C532100,2,1,0x51101000,3,0=0x5C532100,2,1,0x5C542400,0,0; conflicting-override -0x5C532100,3,1,0x51101000,3,0=0x5C532100,3,1,0x5C542400,0,0; conflicting-override +0x5C532100,0,1,0x51101000,3,0=0x5C532100,0,1,0x5C542400,0,0 +0x5C532100,1,1,0x51101000,3,0=0x5C532100,1,1,0x5C542400,0,0 +0x5C532100,2,1,0x51101000,3,0=0x5C532100,2,1,0x5C542400,0,0 +0x5C532100,3,1,0x51101000,3,0=0x5C532100,3,1,0x5C542400,0,0 ; ;3-way OXO TLA-5 thru & end street long T intersection - stabilization 0x5C542400,0,0,0x00AA0800,1,0=0x5C542400,0,0,0x5C542400,2,0 @@ -4579,15 +4579,15 @@ ; ;-- RD-4 NETWORK -- ;3-way OXO RD-4 thru & end street short T intersection -0x5C532100,0,0,0x51133000,3,0=0x5C532100,0,0,0x5C542580,0,0; conflicting-override -0x5C532100,1,0,0x51133000,3,0=0x5C532100,1,0,0x5C542580,0,0; conflicting-override -0x5C532100,2,0,0x51133000,3,0=0x5C532100,2,0,0x5C542580,0,0; conflicting-override -0x5C532100,3,0,0x51133000,3,0=0x5C532100,3,0,0x5C542580,0,0; conflicting-override +0x5C532100,0,0,0x51133000,3,0=0x5C532100,0,0,0x5C542580,0,0 +0x5C532100,1,0,0x51133000,3,0=0x5C532100,1,0,0x5C542580,0,0 +0x5C532100,2,0,0x51133000,3,0=0x5C532100,2,0,0x5C542580,0,0 +0x5C532100,3,0,0x51133000,3,0=0x5C532100,3,0,0x5C542580,0,0 ; -0x5C532100,0,1,0x51133000,3,0=0x5C532100,0,1,0x5C542580,0,0; conflicting-override -0x5C532100,1,1,0x51133000,3,0=0x5C532100,1,1,0x5C542580,0,0; conflicting-override -0x5C532100,2,1,0x51133000,3,0=0x5C532100,2,1,0x5C542580,0,0; conflicting-override -0x5C532100,3,1,0x51133000,3,0=0x5C532100,3,1,0x5C542580,0,0; conflicting-override +0x5C532100,0,1,0x51133000,3,0=0x5C532100,0,1,0x5C542580,0,0 +0x5C532100,1,1,0x51133000,3,0=0x5C532100,1,1,0x5C542580,0,0 +0x5C532100,2,1,0x51133000,3,0=0x5C532100,2,1,0x5C542580,0,0 +0x5C532100,3,1,0x51133000,3,0=0x5C532100,3,1,0x5C542580,0,0 ; ;3-way OXO RD-4 thru & end Street Short T intersection - stabilization 0x5C542580,1,0,0x00004B00,1,0=0x5C542580,1,0,0x51130000,1,0 @@ -4609,15 +4609,15 @@ 0x51133080,1,0,0x5C542000,2,0=0x5C542500,0,0,0x5C542500,2,0 ; ;3-way OXO RD-4 thru & end street long T intersection - override start -0x5C532100,0,0,0x51131000,3,0=0x5C532100,0,0,0x5C542500,0,0; conflicting-override -0x5C532100,1,0,0x51131000,3,0=0x5C532100,1,0,0x5C542500,0,0; conflicting-override -0x5C532100,2,0,0x51131000,3,0=0x5C532100,2,0,0x5C542500,0,0; conflicting-override -0x5C532100,3,0,0x51131000,3,0=0x5C532100,3,0,0x5C542500,0,0; conflicting-override +0x5C532100,0,0,0x51131000,3,0=0x5C532100,0,0,0x5C542500,0,0 +0x5C532100,1,0,0x51131000,3,0=0x5C532100,1,0,0x5C542500,0,0 +0x5C532100,2,0,0x51131000,3,0=0x5C532100,2,0,0x5C542500,0,0 +0x5C532100,3,0,0x51131000,3,0=0x5C532100,3,0,0x5C542500,0,0 ; -0x5C532100,0,1,0x51131000,3,0=0x5C532100,0,1,0x5C542500,0,0; conflicting-override -0x5C532100,1,1,0x51131000,3,0=0x5C532100,1,1,0x5C542500,0,0; conflicting-override -0x5C532100,2,1,0x51131000,3,0=0x5C532100,2,1,0x5C542500,0,0; conflicting-override -0x5C532100,3,1,0x51131000,3,0=0x5C532100,3,1,0x5C542500,0,0; conflicting-override +0x5C532100,0,1,0x51131000,3,0=0x5C532100,0,1,0x5C542500,0,0 +0x5C532100,1,1,0x51131000,3,0=0x5C532100,1,1,0x5C542500,0,0 +0x5C532100,2,1,0x51131000,3,0=0x5C532100,2,1,0x5C542500,0,0 +0x5C532100,3,1,0x51131000,3,0=0x5C532100,3,1,0x5C542500,0,0 ; 0x51133080,1,0,0x5C542000,0,0=0x5C542500,0,0,0x5C542500,2,0 0x51133080,1,0,0x5C542000,2,0=0x5C542500,0,0,0x5C542500,2,0 @@ -4684,7 +4684,7 @@ 0x5C542580,3,0,0x04006100,3,0=0x5C542580,3,0,0x51130000,3,0 ; 0x5C542580,0,0,0x04006100,2,0=0x5C542580,0,0,0x51130000,2,0 -0x5C542380,0,0,0x51130000,2,0=0x5C542580,0,0,0x51130000,2,0; conflicting-override +0x5C542380,0,0,0x51130000,2,0=0x5C542580,0,0,0x51130000,2,0 ; ;-Adjacency Stability ;4-way OXO + intersection - continuity @@ -4780,15 +4780,15 @@ ; ;-- RD-6 NETWORK -- ;3-way OXO RD-6 thru & end street short T intersection -0x5C532100,0,0,0x51143000,3,0=0x5C532100,0,0,0x5C542680,0,0; conflicting-override -0x5C532100,1,0,0x51143000,3,0=0x5C532100,1,0,0x5C542680,0,0; conflicting-override -0x5C532100,2,0,0x51143000,3,0=0x5C532100,2,0,0x5C542680,0,0; conflicting-override -0x5C532100,3,0,0x51143000,3,0=0x5C532100,3,0,0x5C542680,0,0; conflicting-override +0x5C532100,0,0,0x51143000,3,0=0x5C532100,0,0,0x5C542680,0,0 +0x5C532100,1,0,0x51143000,3,0=0x5C532100,1,0,0x5C542680,0,0 +0x5C532100,2,0,0x51143000,3,0=0x5C532100,2,0,0x5C542680,0,0 +0x5C532100,3,0,0x51143000,3,0=0x5C532100,3,0,0x5C542680,0,0 ; -0x5C532100,0,1,0x51143000,3,0=0x5C532100,0,1,0x5C542680,0,0; conflicting-override -0x5C532100,1,1,0x51143000,3,0=0x5C532100,1,1,0x5C542680,0,0; conflicting-override -0x5C532100,2,1,0x51143000,3,0=0x5C532100,2,1,0x5C542680,0,0; conflicting-override -0x5C532100,3,1,0x51143000,3,0=0x5C532100,3,1,0x5C542680,0,0; conflicting-override +0x5C532100,0,1,0x51143000,3,0=0x5C532100,0,1,0x5C542680,0,0 +0x5C532100,1,1,0x51143000,3,0=0x5C532100,1,1,0x5C542680,0,0 +0x5C532100,2,1,0x51143000,3,0=0x5C532100,2,1,0x5C542680,0,0 +0x5C532100,3,1,0x51143000,3,0=0x5C532100,3,1,0x5C542680,0,0 ; ;3-way OXO RD-6 thru & end Street Short T intersection - stabilization 0x5C542680,1,0,0x00004B00,1,0=0x5C542680,1,0,0x51140000,1,0 @@ -4810,15 +4810,15 @@ 0x51140000,0,0,0x5C542000,2,0=0x51140000,0,0,0x5C542680,2,0 ; ;3-way OXO RD-6 thru & end street long T intersection - override start -0x5C532100,0,0,0x51141000,3,0=0x5C532100,0,0,0x5C542600,0,0; conflicting-override -0x5C532100,1,0,0x51141000,3,0=0x5C532100,1,0,0x5C542600,0,0; conflicting-override -0x5C532100,2,0,0x51141000,3,0=0x5C532100,2,0,0x5C542600,0,0; conflicting-override -0x5C532100,3,0,0x51141000,3,0=0x5C532100,3,0,0x5C542600,0,0; conflicting-override +0x5C532100,0,0,0x51141000,3,0=0x5C532100,0,0,0x5C542600,0,0 +0x5C532100,1,0,0x51141000,3,0=0x5C532100,1,0,0x5C542600,0,0 +0x5C532100,2,0,0x51141000,3,0=0x5C532100,2,0,0x5C542600,0,0 +0x5C532100,3,0,0x51141000,3,0=0x5C532100,3,0,0x5C542600,0,0 ; -0x5C532100,0,1,0x51141000,3,0=0x5C532100,0,1,0x5C542600,0,0; conflicting-override -0x5C532100,1,1,0x51141000,3,0=0x5C532100,1,1,0x5C542600,0,0; conflicting-override -0x5C532100,2,1,0x51141000,3,0=0x5C532100,2,1,0x5C542600,0,0; conflicting-override -0x5C532100,3,1,0x51141000,3,0=0x5C532100,3,1,0x5C542600,0,0; conflicting-override +0x5C532100,0,1,0x51141000,3,0=0x5C532100,0,1,0x5C542600,0,0 +0x5C532100,1,1,0x51141000,3,0=0x5C532100,1,1,0x5C542600,0,0 +0x5C532100,2,1,0x51141000,3,0=0x5C532100,2,1,0x5C542600,0,0 +0x5C532100,3,1,0x51141000,3,0=0x5C532100,3,1,0x5C542600,0,0 ; 0x51143080,1,0,0x5C542000,0,0=0x5C542600,0,0,0x5C542600,2,0 0x51143080,1,0,0x5C542000,2,0=0x5C542600,0,0,0x5C542600,2,0 @@ -4947,14 +4947,14 @@ ;-- TRIPLE TILE (AVE-6, TLA-7) NETWORK -- ;-- TLA-7 / AVE-6 outer lanes -- ; Initial override - crosswalk (4-way street intersection) - pedmall side -0x5C532100,0,0,0x51201000,3,0=0x5C532100,0,0,0x5C542700,0,0; conflicting-override -0x5C532100,1,0,0x51201000,3,0=0x5C532100,1,0,0x5C542700,0,0; conflicting-override -0x5C532100,2,0,0x51201000,3,0=0x5C532100,2,0,0x5C542700,0,0; conflicting-override -0x5C532100,3,0,0x51201000,3,0=0x5C532100,3,0,0x5C542700,0,0; conflicting-override -0x5C532100,0,1,0x51201000,3,0=0x5C532100,0,1,0x5C542700,0,0; conflicting-override -0x5C532100,1,1,0x51201000,3,0=0x5C532100,1,1,0x5C542700,0,0; conflicting-override -0x5C532100,2,1,0x51201000,3,0=0x5C532100,2,1,0x5C542700,0,0; conflicting-override -0x5C532100,3,1,0x51201000,3,0=0x5C532100,3,1,0x5C542700,0,0; conflicting-override +0x5C532100,0,0,0x51201000,3,0=0x5C532100,0,0,0x5C542700,0,0 +0x5C532100,1,0,0x51201000,3,0=0x5C532100,1,0,0x5C542700,0,0 +0x5C532100,2,0,0x51201000,3,0=0x5C532100,2,0,0x5C542700,0,0 +0x5C532100,3,0,0x51201000,3,0=0x5C532100,3,0,0x5C542700,0,0 +0x5C532100,0,1,0x51201000,3,0=0x5C532100,0,1,0x5C542700,0,0 +0x5C532100,1,1,0x51201000,3,0=0x5C532100,1,1,0x5C542700,0,0 +0x5C532100,2,1,0x51201000,3,0=0x5C532100,2,1,0x5C542700,0,0 +0x5C532100,3,1,0x51201000,3,0=0x5C532100,3,1,0x5C542700,0,0 ; ; Override stability - outer crosswalk - continuity 0x5C542700,1,0,0x00004B00,1,0=0x5C542700,1,0,0x51200000,1,0 @@ -4965,14 +4965,14 @@ 0x5C542700,3,0,0x00000300,1,0=0x5C542700,3,0,0x51200100,3,1 ; ; Initial override - end T (street short T) - pedmall side -0x5C532100,0,0,0x51203000,3,0=0x5C532100,0,0,0x5C542780,0,0; conflicting-override -0x5C532100,1,0,0x51203000,3,0=0x5C532100,1,0,0x5C542780,0,0; conflicting-override -0x5C532100,2,0,0x51203000,3,0=0x5C532100,2,0,0x5C542780,0,0; conflicting-override -0x5C532100,3,0,0x51203000,3,0=0x5C532100,3,0,0x5C542780,0,0; conflicting-override -0x5C532100,0,1,0x51203000,3,0=0x5C532100,0,1,0x5C542780,0,0; conflicting-override -0x5C532100,1,1,0x51203000,3,0=0x5C532100,1,1,0x5C542780,0,0; conflicting-override -0x5C532100,2,1,0x51203000,3,0=0x5C532100,2,1,0x5C542780,0,0; conflicting-override -0x5C532100,3,1,0x51203000,3,0=0x5C532100,3,1,0x5C542780,0,0; conflicting-override +0x5C532100,0,0,0x51203000,3,0=0x5C532100,0,0,0x5C542780,0,0 +0x5C532100,1,0,0x51203000,3,0=0x5C532100,1,0,0x5C542780,0,0 +0x5C532100,2,0,0x51203000,3,0=0x5C532100,2,0,0x5C542780,0,0 +0x5C532100,3,0,0x51203000,3,0=0x5C532100,3,0,0x5C542780,0,0 +0x5C532100,0,1,0x51203000,3,0=0x5C532100,0,1,0x5C542780,0,0 +0x5C532100,1,1,0x51203000,3,0=0x5C532100,1,1,0x5C542780,0,0 +0x5C532100,2,1,0x51203000,3,0=0x5C532100,2,1,0x5C542780,0,0 +0x5C532100,3,1,0x51203000,3,0=0x5C532100,3,1,0x5C542780,0,0 ; ; Override stability - end T - median side 0x5C542700,0,0,0x51200080,0,0=0x5C542780,0,0,0x51200080,0,0 diff --git a/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c3_DraggableMall_Street_Cobblestone_custom_RHD.txt b/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c3_DraggableMall_Street_Cobblestone_custom_RHD.txt index 16ea6d119..07ef6197e 100644 --- a/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c3_DraggableMall_Street_Cobblestone_custom_RHD.txt +++ b/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c3_DraggableMall_Street_Cobblestone_custom_RHD.txt @@ -3410,20 +3410,20 @@ ;-- ROAD & BIDIRECTIONAL SINGLE TILE NWM -- ;-- ROAD (RD-2) NETWORK -- ;3-way OXO road thru & end street T intersection - initial override -0x5C533100,0,0,0x00AA0800,1,0=0x5C533100,0,0,0x5C543000,0,0; conflicting-override -0x5C533100,1,0,0x00AA0800,1,0=0x5C533100,1,0,0x5C543000,0,0; conflicting-override -0x5C533100,2,0,0x00AA0800,1,0=0x5C533100,2,0,0x5C543000,0,0; conflicting-override -0x5C533100,3,0,0x00AA0800,1,0=0x5C533100,3,0,0x5C543000,0,0; conflicting-override +0x5C533100,0,0,0x00AA0800,1,0=0x5C533100,0,0,0x5C543000,0,0 +0x5C533100,1,0,0x00AA0800,1,0=0x5C533100,1,0,0x5C543000,0,0 +0x5C533100,2,0,0x00AA0800,1,0=0x5C533100,2,0,0x5C543000,0,0 +0x5C533100,3,0,0x00AA0800,1,0=0x5C533100,3,0,0x5C543000,0,0 ; ;4-way OXO + intersection - initial override -0x5C533100,0,0,0x00AA0A00,1,0=0x5C533100,0,0,0x5C543000,0,0; conflicting-override -0x5C533100,1,0,0x00AA0A00,1,0=0x5C533100,1,0,0x5C543000,0,0; conflicting-override -0x5C533100,2,0,0x00AA0A00,1,0=0x5C533100,2,0,0x5C543000,0,0; conflicting-override -0x5C533100,3,0,0x00AA0A00,1,0=0x5C533100,3,0,0x5C543000,0,0; conflicting-override -0x5C533100,0,0,0x00AA0A00,3,0=0x5C533100,0,0,0x5C543000,0,0; conflicting-override -0x5C533100,1,0,0x00AA0A00,3,0=0x5C533100,1,0,0x5C543000,0,0; conflicting-override -0x5C533100,2,0,0x00AA0A00,3,0=0x5C533100,2,0,0x5C543000,0,0; conflicting-override -0x5C533100,3,0,0x00AA0A00,3,0=0x5C533100,3,0,0x5C543000,0,0; conflicting-override +0x5C533100,0,0,0x00AA0A00,1,0=0x5C533100,0,0,0x5C543000,0,0 +0x5C533100,1,0,0x00AA0A00,1,0=0x5C533100,1,0,0x5C543000,0,0 +0x5C533100,2,0,0x00AA0A00,1,0=0x5C533100,2,0,0x5C543000,0,0 +0x5C533100,3,0,0x00AA0A00,1,0=0x5C533100,3,0,0x5C543000,0,0 +0x5C533100,0,0,0x00AA0A00,3,0=0x5C533100,0,0,0x5C543000,0,0 +0x5C533100,1,0,0x00AA0A00,3,0=0x5C533100,1,0,0x5C543000,0,0 +0x5C533100,2,0,0x00AA0A00,3,0=0x5C533100,2,0,0x5C543000,0,0 +0x5C533100,3,0,0x00AA0A00,3,0=0x5C533100,3,0,0x5C543000,0,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -3571,10 +3571,10 @@ ; ;-- TLA-3 NETWORK -- ;3-way OXO TLA-3 thru & end Street T intersection - initial override -0x5C533100,0,0,0x51003000,1,0=0x5C533100,0,0,0x5C543080,0,0; conflicting-override -0x5C533100,1,0,0x51003000,1,0=0x5C533100,1,0,0x5C543080,0,0; conflicting-override -0x5C533100,2,0,0x51003000,1,0=0x5C533100,2,0,0x5C543080,0,0; conflicting-override -0x5C533100,3,0,0x51003000,1,0=0x5C533100,3,0,0x5C543080,0,0; conflicting-override +0x5C533100,0,0,0x51003000,1,0=0x5C533100,0,0,0x5C543080,0,0 +0x5C533100,1,0,0x51003000,1,0=0x5C533100,1,0,0x5C543080,0,0 +0x5C533100,2,0,0x51003000,1,0=0x5C533100,2,0,0x5C543080,0,0 +0x5C533100,3,0,0x51003000,1,0=0x5C533100,3,0,0x5C543080,0,0 ; ;3-way OXO TLA-3 thru & end Street T intersection - stabilization 0x51000000,1,0,0x5C543000,1,0=0x51000000,1,0,0x5C543080,1,0 @@ -3593,14 +3593,14 @@ 0x00000300,3,0,0x5C543080,3,0=0x51000100,3,0,0x5C543080,3,0 ; ;4-way OXO + intersection - initial override -0x5C533100,0,0,0x51001000,1,0=0x5C533100,0,0,0x5C543080,0,0; conflicting-override -0x5C533100,1,0,0x51001000,1,0=0x5C533100,1,0,0x5C543080,0,0; conflicting-override -0x5C533100,2,0,0x51001000,1,0=0x5C533100,2,0,0x5C543080,0,0; conflicting-override -0x5C533100,3,0,0x51001000,1,0=0x5C533100,3,0,0x5C543080,0,0; conflicting-override -0x5C533100,0,0,0x51001000,3,0=0x5C533100,0,0,0x5C543080,2,0; conflicting-override -0x5C533100,1,0,0x51001000,3,0=0x5C533100,1,0,0x5C543080,2,0; conflicting-override -0x5C533100,2,0,0x51001000,3,0=0x5C533100,2,0,0x5C543080,2,0; conflicting-override -0x5C533100,3,0,0x51001000,3,0=0x5C533100,3,0,0x5C543080,2,0; conflicting-override +0x5C533100,0,0,0x51001000,1,0=0x5C533100,0,0,0x5C543080,0,0 +0x5C533100,1,0,0x51001000,1,0=0x5C533100,1,0,0x5C543080,0,0 +0x5C533100,2,0,0x51001000,1,0=0x5C533100,2,0,0x5C543080,0,0 +0x5C533100,3,0,0x51001000,1,0=0x5C533100,3,0,0x5C543080,0,0 +0x5C533100,0,0,0x51001000,3,0=0x5C533100,0,0,0x5C543080,2,0 +0x5C533100,1,0,0x51001000,3,0=0x5C533100,1,0,0x5C543080,2,0 +0x5C533100,2,0,0x51001000,3,0=0x5C533100,2,0,0x5C543080,2,0 +0x5C533100,3,0,0x51001000,3,0=0x5C533100,3,0,0x5C543080,2,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -3749,10 +3749,10 @@ ; ;-- AVE-2 NETWORK -- ;3-way OXO AVE-2 thru & end Street T intersection - initial override -0x5C533100,0,0,0x51013000,1,0=0x5C533100,0,0,0x5C543100,0,0; conflicting-override -0x5C533100,1,0,0x51013000,1,0=0x5C533100,1,0,0x5C543100,0,0; conflicting-override -0x5C533100,2,0,0x51013000,1,0=0x5C533100,2,0,0x5C543100,0,0; conflicting-override -0x5C533100,3,0,0x51013000,1,0=0x5C533100,3,0,0x5C543100,0,0; conflicting-override +0x5C533100,0,0,0x51013000,1,0=0x5C533100,0,0,0x5C543100,0,0 +0x5C533100,1,0,0x51013000,1,0=0x5C533100,1,0,0x5C543100,0,0 +0x5C533100,2,0,0x51013000,1,0=0x5C533100,2,0,0x5C543100,0,0 +0x5C533100,3,0,0x51013000,1,0=0x5C533100,3,0,0x5C543100,0,0 ; ;3-way OXO AVE-2 thru & end Street T intersection - stabilization 0x51010000,1,0,0x5C543000,1,0=0x51010000,1,0,0x5C543100,1,0 @@ -3771,14 +3771,14 @@ 0x00000300,3,0,0x5C543100,3,0=0x51010100,3,0,0x5C543100,3,0 ; ;4-way OXO + intersection - initial override -0x5C533100,0,0,0x51011000,1,0=0x5C533100,0,0,0x5C543100,0,0; conflicting-override -0x5C533100,1,0,0x51011000,1,0=0x5C533100,1,0,0x5C543100,0,0; conflicting-override -0x5C533100,2,0,0x51011000,1,0=0x5C533100,2,0,0x5C543100,0,0; conflicting-override -0x5C533100,3,0,0x51011000,1,0=0x5C533100,3,0,0x5C543100,0,0; conflicting-override -0x5C533100,0,0,0x51011000,3,0=0x5C533100,0,0,0x5C543100,2,0; conflicting-override -0x5C533100,1,0,0x51011000,3,0=0x5C533100,1,0,0x5C543100,2,0; conflicting-override -0x5C533100,2,0,0x51011000,3,0=0x5C533100,2,0,0x5C543100,2,0; conflicting-override -0x5C533100,3,0,0x51011000,3,0=0x5C533100,3,0,0x5C543100,2,0; conflicting-override +0x5C533100,0,0,0x51011000,1,0=0x5C533100,0,0,0x5C543100,0,0 +0x5C533100,1,0,0x51011000,1,0=0x5C533100,1,0,0x5C543100,0,0 +0x5C533100,2,0,0x51011000,1,0=0x5C533100,2,0,0x5C543100,0,0 +0x5C533100,3,0,0x51011000,1,0=0x5C533100,3,0,0x5C543100,0,0 +0x5C533100,0,0,0x51011000,3,0=0x5C533100,0,0,0x5C543100,2,0 +0x5C533100,1,0,0x51011000,3,0=0x5C533100,1,0,0x5C543100,2,0 +0x5C533100,2,0,0x51011000,3,0=0x5C533100,2,0,0x5C543100,2,0 +0x5C533100,3,0,0x51011000,3,0=0x5C533100,3,0,0x5C543100,2,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -3927,15 +3927,15 @@ ; ;-- ARD-3 NETWORK -- ;3-way OXO ARD-3 thru & end Street T intersection - initial override -0x5C533100,0,0,0x51023000,1,0=0x5C533100,0,0,0x5C543180,2,0; conflicting-override -0x5C533100,1,0,0x51023000,1,0=0x5C533100,1,0,0x5C543180,2,0; conflicting-override -0x5C533100,2,0,0x51023000,1,0=0x5C533100,2,0,0x5C543180,2,0; conflicting-override -0x5C533100,3,0,0x51023000,1,0=0x5C533100,3,0,0x5C543180,2,0; conflicting-override +0x5C533100,0,0,0x51023000,1,0=0x5C533100,0,0,0x5C543180,2,0 +0x5C533100,1,0,0x51023000,1,0=0x5C533100,1,0,0x5C543180,2,0 +0x5C533100,2,0,0x51023000,1,0=0x5C533100,2,0,0x5C543180,2,0 +0x5C533100,3,0,0x51023000,1,0=0x5C533100,3,0,0x5C543180,2,0 ; -0x5C533100,0,0,0x51023080,1,0=0x5C533100,0,0,0x5C543180,0,0; conflicting-override -0x5C533100,1,0,0x51023080,1,0=0x5C533100,1,0,0x5C543180,0,0; conflicting-override -0x5C533100,2,0,0x51023080,1,0=0x5C533100,2,0,0x5C543180,0,0; conflicting-override -0x5C533100,3,0,0x51023080,1,0=0x5C533100,3,0,0x5C543180,0,0; conflicting-override +0x5C533100,0,0,0x51023080,1,0=0x5C533100,0,0,0x5C543180,0,0 +0x5C533100,1,0,0x51023080,1,0=0x5C533100,1,0,0x5C543180,0,0 +0x5C533100,2,0,0x51023080,1,0=0x5C533100,2,0,0x5C543180,0,0 +0x5C533100,3,0,0x51023080,1,0=0x5C533100,3,0,0x5C543180,0,0 ; ;3-way OXO ARD-3 thru & end Street T intersection - stabilization 0x51020000,1,0,0x5C543000,1,0=0x51020000,1,0,0x5C543180,1,0 @@ -3954,14 +3954,14 @@ 0x00000300,3,0,0x5C543180,3,0=0x51020100,3,0,0x5C543180,3,0 ; ;4-way OXO + intersection - initial override -0x5C533100,0,0,0x51021000,1,0=0x5C533100,0,0,0x5C543180,2,0; conflicting-override -0x5C533100,1,0,0x51021000,1,0=0x5C533100,1,0,0x5C543180,2,0; conflicting-override -0x5C533100,2,0,0x51021000,1,0=0x5C533100,2,0,0x5C543180,2,0; conflicting-override -0x5C533100,3,0,0x51021000,1,0=0x5C533100,3,0,0x5C543180,2,0; conflicting-override -0x5C533100,0,0,0x51021000,3,0=0x5C533100,0,0,0x5C543180,0,0; conflicting-override -0x5C533100,1,0,0x51021000,3,0=0x5C533100,1,0,0x5C543180,0,0; conflicting-override -0x5C533100,2,0,0x51021000,3,0=0x5C533100,2,0,0x5C543180,0,0; conflicting-override -0x5C533100,3,0,0x51021000,3,0=0x5C533100,3,0,0x5C543180,0,0; conflicting-override +0x5C533100,0,0,0x51021000,1,0=0x5C533100,0,0,0x5C543180,2,0 +0x5C533100,1,0,0x51021000,1,0=0x5C533100,1,0,0x5C543180,2,0 +0x5C533100,2,0,0x51021000,1,0=0x5C533100,2,0,0x5C543180,2,0 +0x5C533100,3,0,0x51021000,1,0=0x5C533100,3,0,0x5C543180,2,0 +0x5C533100,0,0,0x51021000,3,0=0x5C533100,0,0,0x5C543180,0,0 +0x5C533100,1,0,0x51021000,3,0=0x5C533100,1,0,0x5C543180,0,0 +0x5C533100,2,0,0x51021000,3,0=0x5C533100,2,0,0x5C543180,0,0 +0x5C533100,3,0,0x51021000,3,0=0x5C533100,3,0,0x5C543180,0,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -4110,10 +4110,10 @@ ; ;-- NRD-4 NETWORK -- ;3-way OXO NRD-4 thru & end Street T intersection - initial override -0x5C533100,0,0,0x51053000,1,0=0x5C533100,0,0,0x5C543200,0,0; conflicting-override -0x5C533100,1,0,0x51053000,1,0=0x5C533100,1,0,0x5C543200,0,0; conflicting-override -0x5C533100,2,0,0x51053000,1,0=0x5C533100,2,0,0x5C543200,0,0; conflicting-override -0x5C533100,3,0,0x51053000,1,0=0x5C533100,3,0,0x5C543200,0,0; conflicting-override +0x5C533100,0,0,0x51053000,1,0=0x5C533100,0,0,0x5C543200,0,0 +0x5C533100,1,0,0x51053000,1,0=0x5C533100,1,0,0x5C543200,0,0 +0x5C533100,2,0,0x51053000,1,0=0x5C533100,2,0,0x5C543200,0,0 +0x5C533100,3,0,0x51053000,1,0=0x5C533100,3,0,0x5C543200,0,0 ; ;3-way OXO NRD-4 thru & end Street T intersection - stabilization 0x51050000,1,0,0x5C543000,1,0=0x51050000,1,0,0x5C543200,1,0 @@ -4132,14 +4132,14 @@ 0x00000300,3,0,0x5C543200,3,0=0x51050100,3,0,0x5C543200,3,0 ; ;4-way OXO + intersection - initial override -0x5C533100,0,0,0x51051000,1,0=0x5C533100,0,0,0x5C543200,0,0; conflicting-override -0x5C533100,1,0,0x51051000,1,0=0x5C533100,1,0,0x5C543200,0,0; conflicting-override -0x5C533100,2,0,0x51051000,1,0=0x5C533100,2,0,0x5C543200,0,0; conflicting-override -0x5C533100,3,0,0x51051000,1,0=0x5C533100,3,0,0x5C543200,0,0; conflicting-override -0x5C533100,0,0,0x51051000,3,0=0x5C533100,0,0,0x5C543200,2,0; conflicting-override -0x5C533100,1,0,0x51051000,3,0=0x5C533100,1,0,0x5C543200,2,0; conflicting-override -0x5C533100,2,0,0x51051000,3,0=0x5C533100,2,0,0x5C543200,2,0; conflicting-override -0x5C533100,3,0,0x51051000,3,0=0x5C533100,3,0,0x5C543200,2,0; conflicting-override +0x5C533100,0,0,0x51051000,1,0=0x5C533100,0,0,0x5C543200,0,0 +0x5C533100,1,0,0x51051000,1,0=0x5C533100,1,0,0x5C543200,0,0 +0x5C533100,2,0,0x51051000,1,0=0x5C533100,2,0,0x5C543200,0,0 +0x5C533100,3,0,0x51051000,1,0=0x5C533100,3,0,0x5C543200,0,0 +0x5C533100,0,0,0x51051000,3,0=0x5C533100,0,0,0x5C543200,2,0 +0x5C533100,1,0,0x51051000,3,0=0x5C533100,1,0,0x5C543200,2,0 +0x5C533100,2,0,0x51051000,3,0=0x5C533100,2,0,0x5C543200,2,0 +0x5C533100,3,0,0x51051000,3,0=0x5C533100,3,0,0x5C543200,2,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -4289,26 +4289,26 @@ ;-- AVENUE & BIDIRECTIONAL MULTI TILE NWM -- ;-- AVENUE (AVE-4) NETWORK -- ;3-way OXO avenue thru & end street short T intersection -0x5C533100,0,0,0x04004400,2,0=0x5C533100,0,0,0x5C543380,0,0; conflicting-override -0x5C533100,1,0,0x04004400,2,0=0x5C533100,1,0,0x5C543380,0,0; conflicting-override -0x5C533100,2,0,0x04004400,2,0=0x5C533100,2,0,0x5C543380,0,0; conflicting-override -0x5C533100,3,0,0x04004400,2,0=0x5C533100,3,0,0x5C543380,0,0; conflicting-override +0x5C533100,0,0,0x04004400,2,0=0x5C533100,0,0,0x5C543380,0,0 +0x5C533100,1,0,0x04004400,2,0=0x5C533100,1,0,0x5C543380,0,0 +0x5C533100,2,0,0x04004400,2,0=0x5C533100,2,0,0x5C543380,0,0 +0x5C533100,3,0,0x04004400,2,0=0x5C533100,3,0,0x5C543380,0,0 ; -0x5C533100,0,1,0x04004400,2,0=0x5C533100,0,1,0x5C543380,0,0; conflicting-override -0x5C533100,1,1,0x04004400,2,0=0x5C533100,1,1,0x5C543380,0,0; conflicting-override -0x5C533100,2,1,0x04004400,2,0=0x5C533100,2,1,0x5C543380,0,0; conflicting-override -0x5C533100,3,1,0x04004400,2,0=0x5C533100,3,1,0x5C543380,0,0; conflicting-override +0x5C533100,0,1,0x04004400,2,0=0x5C533100,0,1,0x5C543380,0,0 +0x5C533100,1,1,0x04004400,2,0=0x5C533100,1,1,0x5C543380,0,0 +0x5C533100,2,1,0x04004400,2,0=0x5C533100,2,1,0x5C543380,0,0 +0x5C533100,3,1,0x04004400,2,0=0x5C533100,3,1,0x5C543380,0,0 ; ;3-way OXO avenue thru & end street long T intersection - start + intersection -0x5C533100,0,0,0x04008300,2,0=0x5C533100,0,0,0x5C543300,0,0; conflicting-override -0x5C533100,1,0,0x04008300,2,0=0x5C533100,1,0,0x5C543300,0,0; conflicting-override -0x5C533100,2,0,0x04008300,2,0=0x5C533100,2,0,0x5C543300,0,0; conflicting-override -0x5C533100,3,0,0x04008300,2,0=0x5C533100,3,0,0x5C543300,0,0; conflicting-override +0x5C533100,0,0,0x04008300,2,0=0x5C533100,0,0,0x5C543300,0,0 +0x5C533100,1,0,0x04008300,2,0=0x5C533100,1,0,0x5C543300,0,0 +0x5C533100,2,0,0x04008300,2,0=0x5C533100,2,0,0x5C543300,0,0 +0x5C533100,3,0,0x04008300,2,0=0x5C533100,3,0,0x5C543300,0,0 ; -0x5C533100,0,1,0x04008300,2,0=0x5C533100,0,1,0x5C543300,0,0; conflicting-override -0x5C533100,1,1,0x04008300,2,0=0x5C533100,1,1,0x5C543300,0,0; conflicting-override -0x5C533100,2,1,0x04008300,2,0=0x5C533100,2,1,0x5C543300,0,0; conflicting-override -0x5C533100,3,1,0x04008300,2,0=0x5C533100,3,1,0x5C543300,0,0; conflicting-override +0x5C533100,0,1,0x04008300,2,0=0x5C533100,0,1,0x5C543300,0,0 +0x5C533100,1,1,0x04008300,2,0=0x5C533100,1,1,0x5C543300,0,0 +0x5C533100,2,1,0x04008300,2,0=0x5C533100,2,1,0x5C543300,0,0 +0x5C533100,3,1,0x04008300,2,0=0x5C533100,3,1,0x5C543300,0,0 ; 0x5C543300,0,0,0x04008600,0,0=0x5C543300,0,0,0x5C543300,2,0 ; @@ -4409,15 +4409,15 @@ ; ;-- TLA-5 NETWORK -- ;3-way OXO TLA-5 thru & end street short T intersection -0x5C533100,0,0,0x51103000,3,0=0x5C533100,0,0,0x5C543480,0,0; conflicting-override -0x5C533100,1,0,0x51103000,3,0=0x5C533100,1,0,0x5C543480,0,0; conflicting-override -0x5C533100,2,0,0x51103000,3,0=0x5C533100,2,0,0x5C543480,0,0; conflicting-override -0x5C533100,3,0,0x51103000,3,0=0x5C533100,3,0,0x5C543480,0,0; conflicting-override +0x5C533100,0,0,0x51103000,3,0=0x5C533100,0,0,0x5C543480,0,0 +0x5C533100,1,0,0x51103000,3,0=0x5C533100,1,0,0x5C543480,0,0 +0x5C533100,2,0,0x51103000,3,0=0x5C533100,2,0,0x5C543480,0,0 +0x5C533100,3,0,0x51103000,3,0=0x5C533100,3,0,0x5C543480,0,0 ; -0x5C533100,0,1,0x51103000,3,0=0x5C533100,0,1,0x5C543480,0,0; conflicting-override -0x5C533100,1,1,0x51103000,3,0=0x5C533100,1,1,0x5C543480,0,0; conflicting-override -0x5C533100,2,1,0x51103000,3,0=0x5C533100,2,1,0x5C543480,0,0; conflicting-override -0x5C533100,3,1,0x51103000,3,0=0x5C533100,3,1,0x5C543480,0,0; conflicting-override +0x5C533100,0,1,0x51103000,3,0=0x5C533100,0,1,0x5C543480,0,0 +0x5C533100,1,1,0x51103000,3,0=0x5C533100,1,1,0x5C543480,0,0 +0x5C533100,2,1,0x51103000,3,0=0x5C533100,2,1,0x5C543480,0,0 +0x5C533100,3,1,0x51103000,3,0=0x5C533100,3,1,0x5C543480,0,0 ; ;3-way OXO TLA-5 thru & end Street Short T intersection - stabilization 0x5C543480,1,0,0x00004B00,1,0=0x5C543480,1,0,0x51100000,1,0 @@ -4439,15 +4439,15 @@ 0x51100000,0,0,0x5C543000,2,0=0x51100000,0,0,0x5C543480,2,0 ; ;3-way OXO TLA-5 thru & end street long T intersection - override start -0x5C533100,0,0,0x51101000,3,0=0x5C533100,0,0,0x5C543400,0,0; conflicting-override -0x5C533100,1,0,0x51101000,3,0=0x5C533100,1,0,0x5C543400,0,0; conflicting-override -0x5C533100,2,0,0x51101000,3,0=0x5C533100,2,0,0x5C543400,0,0; conflicting-override -0x5C533100,3,0,0x51101000,3,0=0x5C533100,3,0,0x5C543400,0,0; conflicting-override +0x5C533100,0,0,0x51101000,3,0=0x5C533100,0,0,0x5C543400,0,0 +0x5C533100,1,0,0x51101000,3,0=0x5C533100,1,0,0x5C543400,0,0 +0x5C533100,2,0,0x51101000,3,0=0x5C533100,2,0,0x5C543400,0,0 +0x5C533100,3,0,0x51101000,3,0=0x5C533100,3,0,0x5C543400,0,0 ; -0x5C533100,0,1,0x51101000,3,0=0x5C533100,0,1,0x5C543400,0,0; conflicting-override -0x5C533100,1,1,0x51101000,3,0=0x5C533100,1,1,0x5C543400,0,0; conflicting-override -0x5C533100,2,1,0x51101000,3,0=0x5C533100,2,1,0x5C543400,0,0; conflicting-override -0x5C533100,3,1,0x51101000,3,0=0x5C533100,3,1,0x5C543400,0,0; conflicting-override +0x5C533100,0,1,0x51101000,3,0=0x5C533100,0,1,0x5C543400,0,0 +0x5C533100,1,1,0x51101000,3,0=0x5C533100,1,1,0x5C543400,0,0 +0x5C533100,2,1,0x51101000,3,0=0x5C533100,2,1,0x5C543400,0,0 +0x5C533100,3,1,0x51101000,3,0=0x5C533100,3,1,0x5C543400,0,0 ; 0x51103080,1,0,0x5C543000,0,0=0x5C543400,0,0,0x5C543400,2,0 0x51103080,1,0,0x5C543000,2,0=0x5C543400,0,0,0x5C543400,2,0 @@ -4575,15 +4575,15 @@ ; ;-- RD-4 NETWORK -- ;3-way OXO RD-4 thru & end street short T intersection -0x5C533100,0,0,0x51133000,3,0=0x5C533100,0,0,0x5C543580,0,0; conflicting-override -0x5C533100,1,0,0x51133000,3,0=0x5C533100,1,0,0x5C543580,0,0; conflicting-override -0x5C533100,2,0,0x51133000,3,0=0x5C533100,2,0,0x5C543580,0,0; conflicting-override -0x5C533100,3,0,0x51133000,3,0=0x5C533100,3,0,0x5C543580,0,0; conflicting-override +0x5C533100,0,0,0x51133000,3,0=0x5C533100,0,0,0x5C543580,0,0 +0x5C533100,1,0,0x51133000,3,0=0x5C533100,1,0,0x5C543580,0,0 +0x5C533100,2,0,0x51133000,3,0=0x5C533100,2,0,0x5C543580,0,0 +0x5C533100,3,0,0x51133000,3,0=0x5C533100,3,0,0x5C543580,0,0 ; -0x5C533100,0,1,0x51133000,3,0=0x5C533100,0,1,0x5C543580,0,0; conflicting-override -0x5C533100,1,1,0x51133000,3,0=0x5C533100,1,1,0x5C543580,0,0; conflicting-override -0x5C533100,2,1,0x51133000,3,0=0x5C533100,2,1,0x5C543580,0,0; conflicting-override -0x5C533100,3,1,0x51133000,3,0=0x5C533100,3,1,0x5C543580,0,0; conflicting-override +0x5C533100,0,1,0x51133000,3,0=0x5C533100,0,1,0x5C543580,0,0 +0x5C533100,1,1,0x51133000,3,0=0x5C533100,1,1,0x5C543580,0,0 +0x5C533100,2,1,0x51133000,3,0=0x5C533100,2,1,0x5C543580,0,0 +0x5C533100,3,1,0x51133000,3,0=0x5C533100,3,1,0x5C543580,0,0 ; ;3-way OXO RD-4 thru & end Street Short T intersection - stabilization 0x5C543580,1,0,0x00004B00,1,0=0x5C543580,1,0,0x51130000,1,0 @@ -4600,15 +4600,15 @@ 0x51130000,0,0,0x5C543000,2,0=0x51130000,0,0,0x5C543580,2,0 ; ;3-way OXO RD-4 thru & end street long T intersection - override start -0x5C533100,0,0,0x51131000,3,0=0x5C533100,0,0,0x5C543500,0,0; conflicting-override -0x5C533100,1,0,0x51131000,3,0=0x5C533100,1,0,0x5C543500,0,0; conflicting-override -0x5C533100,2,0,0x51131000,3,0=0x5C533100,2,0,0x5C543500,0,0; conflicting-override -0x5C533100,3,0,0x51131000,3,0=0x5C533100,3,0,0x5C543500,0,0; conflicting-override +0x5C533100,0,0,0x51131000,3,0=0x5C533100,0,0,0x5C543500,0,0 +0x5C533100,1,0,0x51131000,3,0=0x5C533100,1,0,0x5C543500,0,0 +0x5C533100,2,0,0x51131000,3,0=0x5C533100,2,0,0x5C543500,0,0 +0x5C533100,3,0,0x51131000,3,0=0x5C533100,3,0,0x5C543500,0,0 ; -0x5C533100,0,1,0x51131000,3,0=0x5C533100,0,1,0x5C543500,0,0; conflicting-override -0x5C533100,1,1,0x51131000,3,0=0x5C533100,1,1,0x5C543500,0,0; conflicting-override -0x5C533100,2,1,0x51131000,3,0=0x5C533100,2,1,0x5C543500,0,0; conflicting-override -0x5C533100,3,1,0x51131000,3,0=0x5C533100,3,1,0x5C543500,0,0; conflicting-override +0x5C533100,0,1,0x51131000,3,0=0x5C533100,0,1,0x5C543500,0,0 +0x5C533100,1,1,0x51131000,3,0=0x5C533100,1,1,0x5C543500,0,0 +0x5C533100,2,1,0x51131000,3,0=0x5C533100,2,1,0x5C543500,0,0 +0x5C533100,3,1,0x51131000,3,0=0x5C533100,3,1,0x5C543500,0,0 ; ;3-way OXO RD-4 thru & end street long T intersection - stabilization 0x5C543500,0,0,0x00AA0800,1,0=0x5C543500,0,0,0x5C543500,2,0 @@ -4680,7 +4680,7 @@ 0x5C543580,3,0,0x04006100,3,0=0x5C543580,3,0,0x51130000,3,0 ; 0x5C543580,0,0,0x04006100,2,0=0x5C543580,0,0,0x51130000,2,0 -0x5C543380,0,0,0x51130000,2,0=0x5C543580,0,0,0x51130000,2,0; conflicting-override +0x5C543380,0,0,0x51130000,2,0=0x5C543580,0,0,0x51130000,2,0 ; ;-Adjacency Stability ;4-way OXO + intersection - continuity @@ -4776,15 +4776,15 @@ ; ;-- RD-6 NETWORK -- ;3-way OXO RD-6 thru & end street short T intersection -0x5C533100,0,0,0x51143000,3,0=0x5C533100,0,0,0x5C543680,0,0; conflicting-override -0x5C533100,1,0,0x51143000,3,0=0x5C533100,1,0,0x5C543680,0,0; conflicting-override -0x5C533100,2,0,0x51143000,3,0=0x5C533100,2,0,0x5C543680,0,0; conflicting-override -0x5C533100,3,0,0x51143000,3,0=0x5C533100,3,0,0x5C543680,0,0; conflicting-override +0x5C533100,0,0,0x51143000,3,0=0x5C533100,0,0,0x5C543680,0,0 +0x5C533100,1,0,0x51143000,3,0=0x5C533100,1,0,0x5C543680,0,0 +0x5C533100,2,0,0x51143000,3,0=0x5C533100,2,0,0x5C543680,0,0 +0x5C533100,3,0,0x51143000,3,0=0x5C533100,3,0,0x5C543680,0,0 ; -0x5C533100,0,1,0x51143000,3,0=0x5C533100,0,1,0x5C543680,0,0; conflicting-override -0x5C533100,1,1,0x51143000,3,0=0x5C533100,1,1,0x5C543680,0,0; conflicting-override -0x5C533100,2,1,0x51143000,3,0=0x5C533100,2,1,0x5C543680,0,0; conflicting-override -0x5C533100,3,1,0x51143000,3,0=0x5C533100,3,1,0x5C543680,0,0; conflicting-override +0x5C533100,0,1,0x51143000,3,0=0x5C533100,0,1,0x5C543680,0,0 +0x5C533100,1,1,0x51143000,3,0=0x5C533100,1,1,0x5C543680,0,0 +0x5C533100,2,1,0x51143000,3,0=0x5C533100,2,1,0x5C543680,0,0 +0x5C533100,3,1,0x51143000,3,0=0x5C533100,3,1,0x5C543680,0,0 ; ;3-way OXO RD-6 thru & end Street Short T intersection - stabilization 0x5C543680,1,0,0x00004B00,1,0=0x5C543680,1,0,0x51140000,1,0 @@ -4801,15 +4801,15 @@ 0x51140000,0,0,0x5C543000,2,0=0x51140000,0,0,0x5C543680,2,0 ; ;3-way OXO RD-6 thru & end street long T intersection - override start -0x5C533100,0,0,0x51141000,3,0=0x5C533100,0,0,0x5C543600,0,0; conflicting-override -0x5C533100,1,0,0x51141000,3,0=0x5C533100,1,0,0x5C543600,0,0; conflicting-override -0x5C533100,2,0,0x51141000,3,0=0x5C533100,2,0,0x5C543600,0,0; conflicting-override -0x5C533100,3,0,0x51141000,3,0=0x5C533100,3,0,0x5C543600,0,0; conflicting-override +0x5C533100,0,0,0x51141000,3,0=0x5C533100,0,0,0x5C543600,0,0 +0x5C533100,1,0,0x51141000,3,0=0x5C533100,1,0,0x5C543600,0,0 +0x5C533100,2,0,0x51141000,3,0=0x5C533100,2,0,0x5C543600,0,0 +0x5C533100,3,0,0x51141000,3,0=0x5C533100,3,0,0x5C543600,0,0 ; -0x5C533100,0,1,0x51141000,3,0=0x5C533100,0,1,0x5C543600,0,0; conflicting-override -0x5C533100,1,1,0x51141000,3,0=0x5C533100,1,1,0x5C543600,0,0; conflicting-override -0x5C533100,2,1,0x51141000,3,0=0x5C533100,2,1,0x5C543600,0,0; conflicting-override -0x5C533100,3,1,0x51141000,3,0=0x5C533100,3,1,0x5C543600,0,0; conflicting-override +0x5C533100,0,1,0x51141000,3,0=0x5C533100,0,1,0x5C543600,0,0 +0x5C533100,1,1,0x51141000,3,0=0x5C533100,1,1,0x5C543600,0,0 +0x5C533100,2,1,0x51141000,3,0=0x5C533100,2,1,0x5C543600,0,0 +0x5C533100,3,1,0x51141000,3,0=0x5C533100,3,1,0x5C543600,0,0 ; ;3-way OXO RD-6 thru & end street long T intersection - stabilization 0x5C543600,0,0,0x00AA0800,1,0=0x5C543600,0,0,0x5C543600,2,0 @@ -4943,14 +4943,14 @@ ;-- TRIPLE TILE (AVE-6, TLA-7) NETWORK -- ;-- TLA-7 / AVE-6 outer lanes -- ; Initial override - crosswalk (4-way street intersection) - pedmall side -0x5C533100,0,0,0x51201000,3,0=0x5C533100,0,0,0x5C543700,0,0; conflicting-override -0x5C533100,1,0,0x51201000,3,0=0x5C533100,1,0,0x5C543700,0,0; conflicting-override -0x5C533100,2,0,0x51201000,3,0=0x5C533100,2,0,0x5C543700,0,0; conflicting-override -0x5C533100,3,0,0x51201000,3,0=0x5C533100,3,0,0x5C543700,0,0; conflicting-override -0x5C533100,0,1,0x51201000,3,0=0x5C533100,0,1,0x5C543700,0,0; conflicting-override -0x5C533100,1,1,0x51201000,3,0=0x5C533100,1,1,0x5C543700,0,0; conflicting-override -0x5C533100,2,1,0x51201000,3,0=0x5C533100,2,1,0x5C543700,0,0; conflicting-override -0x5C533100,3,1,0x51201000,3,0=0x5C533100,3,1,0x5C543700,0,0; conflicting-override +0x5C533100,0,0,0x51201000,3,0=0x5C533100,0,0,0x5C543700,0,0 +0x5C533100,1,0,0x51201000,3,0=0x5C533100,1,0,0x5C543700,0,0 +0x5C533100,2,0,0x51201000,3,0=0x5C533100,2,0,0x5C543700,0,0 +0x5C533100,3,0,0x51201000,3,0=0x5C533100,3,0,0x5C543700,0,0 +0x5C533100,0,1,0x51201000,3,0=0x5C533100,0,1,0x5C543700,0,0 +0x5C533100,1,1,0x51201000,3,0=0x5C533100,1,1,0x5C543700,0,0 +0x5C533100,2,1,0x51201000,3,0=0x5C533100,2,1,0x5C543700,0,0 +0x5C533100,3,1,0x51201000,3,0=0x5C533100,3,1,0x5C543700,0,0 ; ; Override stability - outer crosswalk - continuity 0x5C543700,1,0,0x00004B00,1,0=0x5C543700,1,0,0x51200000,1,0 @@ -4961,14 +4961,14 @@ 0x5C543700,3,0,0x00000300,1,0=0x5C543700,3,0,0x51200100,3,1 ; ; Initial override - end T (street short T) - pedmall side -0x5C533100,0,0,0x51203000,3,0=0x5C533100,0,0,0x5C543780,0,0; conflicting-override -0x5C533100,1,0,0x51203000,3,0=0x5C533100,1,0,0x5C543780,0,0; conflicting-override -0x5C533100,2,0,0x51203000,3,0=0x5C533100,2,0,0x5C543780,0,0; conflicting-override -0x5C533100,3,0,0x51203000,3,0=0x5C533100,3,0,0x5C543780,0,0; conflicting-override -0x5C533100,0,1,0x51203000,3,0=0x5C533100,0,1,0x5C543780,0,0; conflicting-override -0x5C533100,1,1,0x51203000,3,0=0x5C533100,1,1,0x5C543780,0,0; conflicting-override -0x5C533100,2,1,0x51203000,3,0=0x5C533100,2,1,0x5C543780,0,0; conflicting-override -0x5C533100,3,1,0x51203000,3,0=0x5C533100,3,1,0x5C543780,0,0; conflicting-override +0x5C533100,0,0,0x51203000,3,0=0x5C533100,0,0,0x5C543780,0,0 +0x5C533100,1,0,0x51203000,3,0=0x5C533100,1,0,0x5C543780,0,0 +0x5C533100,2,0,0x51203000,3,0=0x5C533100,2,0,0x5C543780,0,0 +0x5C533100,3,0,0x51203000,3,0=0x5C533100,3,0,0x5C543780,0,0 +0x5C533100,0,1,0x51203000,3,0=0x5C533100,0,1,0x5C543780,0,0 +0x5C533100,1,1,0x51203000,3,0=0x5C533100,1,1,0x5C543780,0,0 +0x5C533100,2,1,0x51203000,3,0=0x5C533100,2,1,0x5C543780,0,0 +0x5C533100,3,1,0x51203000,3,0=0x5C533100,3,1,0x5C543780,0,0 ; ; Override stability - end T - median side 0x5C543700,0,0,0x51200080,0,0=0x5C543780,0,0,0x51200080,0,0 diff --git a/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c4_DraggableMall_Street_WavyBrick_custom_RHD.txt b/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c4_DraggableMall_Street_WavyBrick_custom_RHD.txt index 76ec08ee1..4602ca374 100644 --- a/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c4_DraggableMall_Street_WavyBrick_custom_RHD.txt +++ b/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c4_DraggableMall_Street_WavyBrick_custom_RHD.txt @@ -3410,20 +3410,20 @@ ;-- ROAD & BIDIRECTIONAL SINGLE TILE NWM -- ;-- ROAD (RD-2) NETWORK -- ;3-way OXO road thru & end street T intersection - initial override -0x5C534100,0,0,0x00AA0800,1,0=0x5C534100,0,0,0x5C544000,0,0; conflicting-override -0x5C534100,1,0,0x00AA0800,1,0=0x5C534100,1,0,0x5C544000,0,0; conflicting-override -0x5C534100,2,0,0x00AA0800,1,0=0x5C534100,2,0,0x5C544000,0,0; conflicting-override -0x5C534100,3,0,0x00AA0800,1,0=0x5C534100,3,0,0x5C544000,0,0; conflicting-override +0x5C534100,0,0,0x00AA0800,1,0=0x5C534100,0,0,0x5C544000,0,0 +0x5C534100,1,0,0x00AA0800,1,0=0x5C534100,1,0,0x5C544000,0,0 +0x5C534100,2,0,0x00AA0800,1,0=0x5C534100,2,0,0x5C544000,0,0 +0x5C534100,3,0,0x00AA0800,1,0=0x5C534100,3,0,0x5C544000,0,0 ; ;4-way OXO + intersection - initial override -0x5C534100,0,0,0x00AA0A00,1,0=0x5C534100,0,0,0x5C544000,0,0; conflicting-override -0x5C534100,1,0,0x00AA0A00,1,0=0x5C534100,1,0,0x5C544000,0,0; conflicting-override -0x5C534100,2,0,0x00AA0A00,1,0=0x5C534100,2,0,0x5C544000,0,0; conflicting-override -0x5C534100,3,0,0x00AA0A00,1,0=0x5C534100,3,0,0x5C544000,0,0; conflicting-override -0x5C534100,0,0,0x00AA0A00,3,0=0x5C534100,0,0,0x5C544000,0,0; conflicting-override -0x5C534100,1,0,0x00AA0A00,3,0=0x5C534100,1,0,0x5C544000,0,0; conflicting-override -0x5C534100,2,0,0x00AA0A00,3,0=0x5C534100,2,0,0x5C544000,0,0; conflicting-override -0x5C534100,3,0,0x00AA0A00,3,0=0x5C534100,3,0,0x5C544000,0,0; conflicting-override +0x5C534100,0,0,0x00AA0A00,1,0=0x5C534100,0,0,0x5C544000,0,0 +0x5C534100,1,0,0x00AA0A00,1,0=0x5C534100,1,0,0x5C544000,0,0 +0x5C534100,2,0,0x00AA0A00,1,0=0x5C534100,2,0,0x5C544000,0,0 +0x5C534100,3,0,0x00AA0A00,1,0=0x5C534100,3,0,0x5C544000,0,0 +0x5C534100,0,0,0x00AA0A00,3,0=0x5C534100,0,0,0x5C544000,0,0 +0x5C534100,1,0,0x00AA0A00,3,0=0x5C534100,1,0,0x5C544000,0,0 +0x5C534100,2,0,0x00AA0A00,3,0=0x5C534100,2,0,0x5C544000,0,0 +0x5C534100,3,0,0x00AA0A00,3,0=0x5C534100,3,0,0x5C544000,0,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -3572,10 +3572,10 @@ ; ;-- TLA-3 NETWORK -- ;3-way OXO TLA-3 thru & end Street T intersection - initial override -0x5C534100,0,0,0x51003000,1,0=0x5C534100,0,0,0x5C544080,0,0; conflicting-override -0x5C534100,1,0,0x51003000,1,0=0x5C534100,1,0,0x5C544080,0,0; conflicting-override -0x5C534100,2,0,0x51003000,1,0=0x5C534100,2,0,0x5C544080,0,0; conflicting-override -0x5C534100,3,0,0x51003000,1,0=0x5C534100,3,0,0x5C544080,0,0; conflicting-override +0x5C534100,0,0,0x51003000,1,0=0x5C534100,0,0,0x5C544080,0,0 +0x5C534100,1,0,0x51003000,1,0=0x5C534100,1,0,0x5C544080,0,0 +0x5C534100,2,0,0x51003000,1,0=0x5C534100,2,0,0x5C544080,0,0 +0x5C534100,3,0,0x51003000,1,0=0x5C534100,3,0,0x5C544080,0,0 ; ;3-way OXO TLA-3 thru & end Street T intersection - stabilization 0x51000000,1,0,0x5C544000,1,0=0x51000000,1,0,0x5C544080,1,0 @@ -3594,14 +3594,14 @@ 0x00000300,3,0,0x5C544080,3,0=0x51000100,3,0,0x5C544080,3,0 ; ;4-way OXO + intersection - initial override -0x5C534100,0,0,0x51001000,1,0=0x5C534100,0,0,0x5C544080,0,0; conflicting-override -0x5C534100,1,0,0x51001000,1,0=0x5C534100,1,0,0x5C544080,0,0; conflicting-override -0x5C534100,2,0,0x51001000,1,0=0x5C534100,2,0,0x5C544080,0,0; conflicting-override -0x5C534100,3,0,0x51001000,1,0=0x5C534100,3,0,0x5C544080,0,0; conflicting-override -0x5C534100,0,0,0x51001000,3,0=0x5C534100,0,0,0x5C544080,2,0; conflicting-override -0x5C534100,1,0,0x51001000,3,0=0x5C534100,1,0,0x5C544080,2,0; conflicting-override -0x5C534100,2,0,0x51001000,3,0=0x5C534100,2,0,0x5C544080,2,0; conflicting-override -0x5C534100,3,0,0x51001000,3,0=0x5C534100,3,0,0x5C544080,2,0; conflicting-override +0x5C534100,0,0,0x51001000,1,0=0x5C534100,0,0,0x5C544080,0,0 +0x5C534100,1,0,0x51001000,1,0=0x5C534100,1,0,0x5C544080,0,0 +0x5C534100,2,0,0x51001000,1,0=0x5C534100,2,0,0x5C544080,0,0 +0x5C534100,3,0,0x51001000,1,0=0x5C534100,3,0,0x5C544080,0,0 +0x5C534100,0,0,0x51001000,3,0=0x5C534100,0,0,0x5C544080,2,0 +0x5C534100,1,0,0x51001000,3,0=0x5C534100,1,0,0x5C544080,2,0 +0x5C534100,2,0,0x51001000,3,0=0x5C534100,2,0,0x5C544080,2,0 +0x5C534100,3,0,0x51001000,3,0=0x5C534100,3,0,0x5C544080,2,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -3750,10 +3750,10 @@ ; ;-- AVE-2 NETWORK -- ;3-way OXO AVE-2 thru & end Street T intersection - initial override -0x5C534100,0,0,0x51013000,1,0=0x5C534100,0,0,0x5C544100,0,0; conflicting-override -0x5C534100,1,0,0x51013000,1,0=0x5C534100,1,0,0x5C544100,0,0; conflicting-override -0x5C534100,2,0,0x51013000,1,0=0x5C534100,2,0,0x5C544100,0,0; conflicting-override -0x5C534100,3,0,0x51013000,1,0=0x5C534100,3,0,0x5C544100,0,0; conflicting-override +0x5C534100,0,0,0x51013000,1,0=0x5C534100,0,0,0x5C544100,0,0 +0x5C534100,1,0,0x51013000,1,0=0x5C534100,1,0,0x5C544100,0,0 +0x5C534100,2,0,0x51013000,1,0=0x5C534100,2,0,0x5C544100,0,0 +0x5C534100,3,0,0x51013000,1,0=0x5C534100,3,0,0x5C544100,0,0 ; ;3-way OXO AVE-2 thru & end Street T intersection - stabilization 0x51010000,1,0,0x5C544000,1,0=0x51010000,1,0,0x5C544100,1,0 @@ -3772,14 +3772,14 @@ 0x00000300,3,0,0x5C544100,3,0=0x51010100,3,0,0x5C544100,3,0 ; ;4-way OXO + intersection - initial override -0x5C534100,0,0,0x51011000,1,0=0x5C534100,0,0,0x5C544100,0,0; conflicting-override -0x5C534100,1,0,0x51011000,1,0=0x5C534100,1,0,0x5C544100,0,0; conflicting-override -0x5C534100,2,0,0x51011000,1,0=0x5C534100,2,0,0x5C544100,0,0; conflicting-override -0x5C534100,3,0,0x51011000,1,0=0x5C534100,3,0,0x5C544100,0,0; conflicting-override -0x5C534100,0,0,0x51011000,3,0=0x5C534100,0,0,0x5C544100,2,0; conflicting-override -0x5C534100,1,0,0x51011000,3,0=0x5C534100,1,0,0x5C544100,2,0; conflicting-override -0x5C534100,2,0,0x51011000,3,0=0x5C534100,2,0,0x5C544100,2,0; conflicting-override -0x5C534100,3,0,0x51011000,3,0=0x5C534100,3,0,0x5C544100,2,0; conflicting-override +0x5C534100,0,0,0x51011000,1,0=0x5C534100,0,0,0x5C544100,0,0 +0x5C534100,1,0,0x51011000,1,0=0x5C534100,1,0,0x5C544100,0,0 +0x5C534100,2,0,0x51011000,1,0=0x5C534100,2,0,0x5C544100,0,0 +0x5C534100,3,0,0x51011000,1,0=0x5C534100,3,0,0x5C544100,0,0 +0x5C534100,0,0,0x51011000,3,0=0x5C534100,0,0,0x5C544100,2,0 +0x5C534100,1,0,0x51011000,3,0=0x5C534100,1,0,0x5C544100,2,0 +0x5C534100,2,0,0x51011000,3,0=0x5C534100,2,0,0x5C544100,2,0 +0x5C534100,3,0,0x51011000,3,0=0x5C534100,3,0,0x5C544100,2,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -3928,15 +3928,15 @@ ; ;-- ARD-3 NETWORK -- ;3-way OXO ARD-3 thru & end Street T intersection - initial override -0x5C534100,0,0,0x51023000,1,0=0x5C534100,0,0,0x5C544180,2,0; conflicting-override -0x5C534100,1,0,0x51023000,1,0=0x5C534100,1,0,0x5C544180,2,0; conflicting-override -0x5C534100,2,0,0x51023000,1,0=0x5C534100,2,0,0x5C544180,2,0; conflicting-override -0x5C534100,3,0,0x51023000,1,0=0x5C534100,3,0,0x5C544180,2,0; conflicting-override +0x5C534100,0,0,0x51023000,1,0=0x5C534100,0,0,0x5C544180,2,0 +0x5C534100,1,0,0x51023000,1,0=0x5C534100,1,0,0x5C544180,2,0 +0x5C534100,2,0,0x51023000,1,0=0x5C534100,2,0,0x5C544180,2,0 +0x5C534100,3,0,0x51023000,1,0=0x5C534100,3,0,0x5C544180,2,0 ; -0x5C534100,0,0,0x51023080,1,0=0x5C534100,0,0,0x5C544180,0,0; conflicting-override -0x5C534100,1,0,0x51023080,1,0=0x5C534100,1,0,0x5C544180,0,0; conflicting-override -0x5C534100,2,0,0x51023080,1,0=0x5C534100,2,0,0x5C544180,0,0; conflicting-override -0x5C534100,3,0,0x51023080,1,0=0x5C534100,3,0,0x5C544180,0,0; conflicting-override +0x5C534100,0,0,0x51023080,1,0=0x5C534100,0,0,0x5C544180,0,0 +0x5C534100,1,0,0x51023080,1,0=0x5C534100,1,0,0x5C544180,0,0 +0x5C534100,2,0,0x51023080,1,0=0x5C534100,2,0,0x5C544180,0,0 +0x5C534100,3,0,0x51023080,1,0=0x5C534100,3,0,0x5C544180,0,0 ; ;3-way OXO ARD-3 thru & end Street T intersection - stabilization 0x51020000,1,0,0x5C544000,1,0=0x51020000,1,0,0x5C544180,1,0 @@ -3955,14 +3955,14 @@ 0x00000300,3,0,0x5C544180,3,0=0x51020100,3,0,0x5C544180,3,0 ; ;4-way OXO + intersection - initial override -0x5C534100,0,0,0x51021000,1,0=0x5C534100,0,0,0x5C544180,2,0; conflicting-override -0x5C534100,1,0,0x51021000,1,0=0x5C534100,1,0,0x5C544180,2,0; conflicting-override -0x5C534100,2,0,0x51021000,1,0=0x5C534100,2,0,0x5C544180,2,0; conflicting-override -0x5C534100,3,0,0x51021000,1,0=0x5C534100,3,0,0x5C544180,2,0; conflicting-override -0x5C534100,0,0,0x51021000,3,0=0x5C534100,0,0,0x5C544180,0,0; conflicting-override -0x5C534100,1,0,0x51021000,3,0=0x5C534100,1,0,0x5C544180,0,0; conflicting-override -0x5C534100,2,0,0x51021000,3,0=0x5C534100,2,0,0x5C544180,0,0; conflicting-override -0x5C534100,3,0,0x51021000,3,0=0x5C534100,3,0,0x5C544180,0,0; conflicting-override +0x5C534100,0,0,0x51021000,1,0=0x5C534100,0,0,0x5C544180,2,0 +0x5C534100,1,0,0x51021000,1,0=0x5C534100,1,0,0x5C544180,2,0 +0x5C534100,2,0,0x51021000,1,0=0x5C534100,2,0,0x5C544180,2,0 +0x5C534100,3,0,0x51021000,1,0=0x5C534100,3,0,0x5C544180,2,0 +0x5C534100,0,0,0x51021000,3,0=0x5C534100,0,0,0x5C544180,0,0 +0x5C534100,1,0,0x51021000,3,0=0x5C534100,1,0,0x5C544180,0,0 +0x5C534100,2,0,0x51021000,3,0=0x5C534100,2,0,0x5C544180,0,0 +0x5C534100,3,0,0x51021000,3,0=0x5C534100,3,0,0x5C544180,0,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -4111,10 +4111,10 @@ ; ;-- NRD-4 NETWORK -- ;3-way OXO NRD-4 thru & end Street T intersection - initial override -0x5C534100,0,0,0x51053000,1,0=0x5C534100,0,0,0x5C544200,0,0; conflicting-override -0x5C534100,1,0,0x51053000,1,0=0x5C534100,1,0,0x5C544200,0,0; conflicting-override -0x5C534100,2,0,0x51053000,1,0=0x5C534100,2,0,0x5C544200,0,0; conflicting-override -0x5C534100,3,0,0x51053000,1,0=0x5C534100,3,0,0x5C544200,0,0; conflicting-override +0x5C534100,0,0,0x51053000,1,0=0x5C534100,0,0,0x5C544200,0,0 +0x5C534100,1,0,0x51053000,1,0=0x5C534100,1,0,0x5C544200,0,0 +0x5C534100,2,0,0x51053000,1,0=0x5C534100,2,0,0x5C544200,0,0 +0x5C534100,3,0,0x51053000,1,0=0x5C534100,3,0,0x5C544200,0,0 ; ;3-way OXO NRD-4 thru & end Street T intersection - stabilization 0x51050000,1,0,0x5C544000,1,0=0x51050000,1,0,0x5C544200,1,0 @@ -4133,14 +4133,14 @@ 0x00000300,3,0,0x5C544200,3,0=0x51050100,3,0,0x5C544200,3,0 ; ;4-way OXO + intersection - initial override -0x5C534100,0,0,0x51051000,1,0=0x5C534100,0,0,0x5C544200,0,0; conflicting-override -0x5C534100,1,0,0x51051000,1,0=0x5C534100,1,0,0x5C544200,0,0; conflicting-override -0x5C534100,2,0,0x51051000,1,0=0x5C534100,2,0,0x5C544200,0,0; conflicting-override -0x5C534100,3,0,0x51051000,1,0=0x5C534100,3,0,0x5C544200,0,0; conflicting-override -0x5C534100,0,0,0x51051000,3,0=0x5C534100,0,0,0x5C544200,2,0; conflicting-override -0x5C534100,1,0,0x51051000,3,0=0x5C534100,1,0,0x5C544200,2,0; conflicting-override -0x5C534100,2,0,0x51051000,3,0=0x5C534100,2,0,0x5C544200,2,0; conflicting-override -0x5C534100,3,0,0x51051000,3,0=0x5C534100,3,0,0x5C544200,2,0; conflicting-override +0x5C534100,0,0,0x51051000,1,0=0x5C534100,0,0,0x5C544200,0,0 +0x5C534100,1,0,0x51051000,1,0=0x5C534100,1,0,0x5C544200,0,0 +0x5C534100,2,0,0x51051000,1,0=0x5C534100,2,0,0x5C544200,0,0 +0x5C534100,3,0,0x51051000,1,0=0x5C534100,3,0,0x5C544200,0,0 +0x5C534100,0,0,0x51051000,3,0=0x5C534100,0,0,0x5C544200,2,0 +0x5C534100,1,0,0x51051000,3,0=0x5C534100,1,0,0x5C544200,2,0 +0x5C534100,2,0,0x51051000,3,0=0x5C534100,2,0,0x5C544200,2,0 +0x5C534100,3,0,0x51051000,3,0=0x5C534100,3,0,0x5C544200,2,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -4290,26 +4290,26 @@ ;-- AVENUE & BIDIRECTIONAL MULTI TILE NWM -- ;-- AVENUE (AVE-4) NETWORK -- ;3-way OXO avenue thru & end street short T intersection -0x5C534100,0,0,0x04004400,2,0=0x5C534100,0,0,0x5C544380,0,0; conflicting-override -0x5C534100,1,0,0x04004400,2,0=0x5C534100,1,0,0x5C544380,0,0; conflicting-override -0x5C534100,2,0,0x04004400,2,0=0x5C534100,2,0,0x5C544380,0,0; conflicting-override -0x5C534100,3,0,0x04004400,2,0=0x5C534100,3,0,0x5C544380,0,0; conflicting-override +0x5C534100,0,0,0x04004400,2,0=0x5C534100,0,0,0x5C544380,0,0 +0x5C534100,1,0,0x04004400,2,0=0x5C534100,1,0,0x5C544380,0,0 +0x5C534100,2,0,0x04004400,2,0=0x5C534100,2,0,0x5C544380,0,0 +0x5C534100,3,0,0x04004400,2,0=0x5C534100,3,0,0x5C544380,0,0 ; -0x5C534100,0,1,0x04004400,2,0=0x5C534100,0,1,0x5C544380,0,0; conflicting-override -0x5C534100,1,1,0x04004400,2,0=0x5C534100,1,1,0x5C544380,0,0; conflicting-override -0x5C534100,2,1,0x04004400,2,0=0x5C534100,2,1,0x5C544380,0,0; conflicting-override -0x5C534100,3,1,0x04004400,2,0=0x5C534100,3,1,0x5C544380,0,0; conflicting-override +0x5C534100,0,1,0x04004400,2,0=0x5C534100,0,1,0x5C544380,0,0 +0x5C534100,1,1,0x04004400,2,0=0x5C534100,1,1,0x5C544380,0,0 +0x5C534100,2,1,0x04004400,2,0=0x5C534100,2,1,0x5C544380,0,0 +0x5C534100,3,1,0x04004400,2,0=0x5C534100,3,1,0x5C544380,0,0 ; ;3-way OXO avenue thru & end street long T intersection - start + intersection -0x5C534100,0,0,0x04008300,2,0=0x5C534100,0,0,0x5C544300,0,0; conflicting-override -0x5C534100,1,0,0x04008300,2,0=0x5C534100,1,0,0x5C544300,0,0; conflicting-override -0x5C534100,2,0,0x04008300,2,0=0x5C534100,2,0,0x5C544300,0,0; conflicting-override -0x5C534100,3,0,0x04008300,2,0=0x5C534100,3,0,0x5C544300,0,0; conflicting-override +0x5C534100,0,0,0x04008300,2,0=0x5C534100,0,0,0x5C544300,0,0 +0x5C534100,1,0,0x04008300,2,0=0x5C534100,1,0,0x5C544300,0,0 +0x5C534100,2,0,0x04008300,2,0=0x5C534100,2,0,0x5C544300,0,0 +0x5C534100,3,0,0x04008300,2,0=0x5C534100,3,0,0x5C544300,0,0 ; -0x5C534100,0,1,0x04008300,2,0=0x5C534100,0,1,0x5C544300,0,0; conflicting-override -0x5C534100,1,1,0x04008300,2,0=0x5C534100,1,1,0x5C544300,0,0; conflicting-override -0x5C534100,2,1,0x04008300,2,0=0x5C534100,2,1,0x5C544300,0,0; conflicting-override -0x5C534100,3,1,0x04008300,2,0=0x5C534100,3,1,0x5C544300,0,0; conflicting-override +0x5C534100,0,1,0x04008300,2,0=0x5C534100,0,1,0x5C544300,0,0 +0x5C534100,1,1,0x04008300,2,0=0x5C534100,1,1,0x5C544300,0,0 +0x5C534100,2,1,0x04008300,2,0=0x5C534100,2,1,0x5C544300,0,0 +0x5C534100,3,1,0x04008300,2,0=0x5C534100,3,1,0x5C544300,0,0 ; 0x5C544300,0,0,0x04008600,0,0=0x5C544300,0,0,0x5C544300,2,0 ; @@ -4410,15 +4410,15 @@ ; ;-- TLA-5 NETWORK -- ;3-way OXO TLA-5 thru & end street short T intersection -0x5C534100,0,0,0x51103000,3,0=0x5C534100,0,0,0x5C544480,0,0; conflicting-override -0x5C534100,1,0,0x51103000,3,0=0x5C534100,1,0,0x5C544480,0,0; conflicting-override -0x5C534100,2,0,0x51103000,3,0=0x5C534100,2,0,0x5C544480,0,0; conflicting-override -0x5C534100,3,0,0x51103000,3,0=0x5C534100,3,0,0x5C544480,0,0; conflicting-override +0x5C534100,0,0,0x51103000,3,0=0x5C534100,0,0,0x5C544480,0,0 +0x5C534100,1,0,0x51103000,3,0=0x5C534100,1,0,0x5C544480,0,0 +0x5C534100,2,0,0x51103000,3,0=0x5C534100,2,0,0x5C544480,0,0 +0x5C534100,3,0,0x51103000,3,0=0x5C534100,3,0,0x5C544480,0,0 ; -0x5C534100,0,1,0x51103000,3,0=0x5C534100,0,1,0x5C544480,0,0; conflicting-override -0x5C534100,1,1,0x51103000,3,0=0x5C534100,1,1,0x5C544480,0,0; conflicting-override -0x5C534100,2,1,0x51103000,3,0=0x5C534100,2,1,0x5C544480,0,0; conflicting-override -0x5C534100,3,1,0x51103000,3,0=0x5C534100,3,1,0x5C544480,0,0; conflicting-override +0x5C534100,0,1,0x51103000,3,0=0x5C534100,0,1,0x5C544480,0,0 +0x5C534100,1,1,0x51103000,3,0=0x5C534100,1,1,0x5C544480,0,0 +0x5C534100,2,1,0x51103000,3,0=0x5C534100,2,1,0x5C544480,0,0 +0x5C534100,3,1,0x51103000,3,0=0x5C534100,3,1,0x5C544480,0,0 ; ;3-way OXO TLA-5 thru & end Street Short T intersection - stabilization 0x5C544480,1,0,0x00004B00,1,0=0x5C544480,1,0,0x51100000,1,0 @@ -4440,15 +4440,15 @@ 0x51100000,0,0,0x5C544000,2,0=0x51100000,0,0,0x5C544480,2,0 ; ;3-way OXO TLA-5 thru & end street long T intersection - override start -0x5C534100,0,0,0x51101000,3,0=0x5C534100,0,0,0x5C544400,0,0; conflicting-override -0x5C534100,1,0,0x51101000,3,0=0x5C534100,1,0,0x5C544400,0,0; conflicting-override -0x5C534100,2,0,0x51101000,3,0=0x5C534100,2,0,0x5C544400,0,0; conflicting-override -0x5C534100,3,0,0x51101000,3,0=0x5C534100,3,0,0x5C544400,0,0; conflicting-override +0x5C534100,0,0,0x51101000,3,0=0x5C534100,0,0,0x5C544400,0,0 +0x5C534100,1,0,0x51101000,3,0=0x5C534100,1,0,0x5C544400,0,0 +0x5C534100,2,0,0x51101000,3,0=0x5C534100,2,0,0x5C544400,0,0 +0x5C534100,3,0,0x51101000,3,0=0x5C534100,3,0,0x5C544400,0,0 ; -0x5C534100,0,1,0x51101000,3,0=0x5C534100,0,1,0x5C544400,0,0; conflicting-override -0x5C534100,1,1,0x51101000,3,0=0x5C534100,1,1,0x5C544400,0,0; conflicting-override -0x5C534100,2,1,0x51101000,3,0=0x5C534100,2,1,0x5C544400,0,0; conflicting-override -0x5C534100,3,1,0x51101000,3,0=0x5C534100,3,1,0x5C544400,0,0; conflicting-override +0x5C534100,0,1,0x51101000,3,0=0x5C534100,0,1,0x5C544400,0,0 +0x5C534100,1,1,0x51101000,3,0=0x5C534100,1,1,0x5C544400,0,0 +0x5C534100,2,1,0x51101000,3,0=0x5C534100,2,1,0x5C544400,0,0 +0x5C534100,3,1,0x51101000,3,0=0x5C534100,3,1,0x5C544400,0,0 ; 0x51103080,1,0,0x5C544000,0,0=0x5C544400,0,0,0x5C544400,2,0 0x51103080,1,0,0x5C544000,2,0=0x5C544400,0,0,0x5C544400,2,0 @@ -4576,15 +4576,15 @@ ; ;-- RD-4 NETWORK -- ;3-way OXO RD-4 thru & end street short T intersection -0x5C534100,0,0,0x51133000,3,0=0x5C534100,0,0,0x5C544580,0,0; conflicting-override -0x5C534100,1,0,0x51133000,3,0=0x5C534100,1,0,0x5C544580,0,0; conflicting-override -0x5C534100,2,0,0x51133000,3,0=0x5C534100,2,0,0x5C544580,0,0; conflicting-override -0x5C534100,3,0,0x51133000,3,0=0x5C534100,3,0,0x5C544580,0,0; conflicting-override +0x5C534100,0,0,0x51133000,3,0=0x5C534100,0,0,0x5C544580,0,0 +0x5C534100,1,0,0x51133000,3,0=0x5C534100,1,0,0x5C544580,0,0 +0x5C534100,2,0,0x51133000,3,0=0x5C534100,2,0,0x5C544580,0,0 +0x5C534100,3,0,0x51133000,3,0=0x5C534100,3,0,0x5C544580,0,0 ; -0x5C534100,0,1,0x51133000,3,0=0x5C534100,0,1,0x5C544580,0,0; conflicting-override -0x5C534100,1,1,0x51133000,3,0=0x5C534100,1,1,0x5C544580,0,0; conflicting-override -0x5C534100,2,1,0x51133000,3,0=0x5C534100,2,1,0x5C544580,0,0; conflicting-override -0x5C534100,3,1,0x51133000,3,0=0x5C534100,3,1,0x5C544580,0,0; conflicting-override +0x5C534100,0,1,0x51133000,3,0=0x5C534100,0,1,0x5C544580,0,0 +0x5C534100,1,1,0x51133000,3,0=0x5C534100,1,1,0x5C544580,0,0 +0x5C534100,2,1,0x51133000,3,0=0x5C534100,2,1,0x5C544580,0,0 +0x5C534100,3,1,0x51133000,3,0=0x5C534100,3,1,0x5C544580,0,0 ; ;3-way OXO RD-4 thru & end Street Short T intersection - stabilization 0x5C544580,1,0,0x00004B00,1,0=0x5C544580,1,0,0x51130000,1,0 @@ -4606,15 +4606,15 @@ 0x51130000,0,0,0x5C544000,2,0=0x51130000,0,0,0x5C544580,2,0 ; ;3-way OXO RD-4 thru & end street long T intersection - override start -0x5C534100,0,0,0x51131000,3,0=0x5C534100,0,0,0x5C544500,0,0; conflicting-override -0x5C534100,1,0,0x51131000,3,0=0x5C534100,1,0,0x5C544500,0,0; conflicting-override -0x5C534100,2,0,0x51131000,3,0=0x5C534100,2,0,0x5C544500,0,0; conflicting-override -0x5C534100,3,0,0x51131000,3,0=0x5C534100,3,0,0x5C544500,0,0; conflicting-override +0x5C534100,0,0,0x51131000,3,0=0x5C534100,0,0,0x5C544500,0,0 +0x5C534100,1,0,0x51131000,3,0=0x5C534100,1,0,0x5C544500,0,0 +0x5C534100,2,0,0x51131000,3,0=0x5C534100,2,0,0x5C544500,0,0 +0x5C534100,3,0,0x51131000,3,0=0x5C534100,3,0,0x5C544500,0,0 ; -0x5C534100,0,1,0x51131000,3,0=0x5C534100,0,1,0x5C544500,0,0; conflicting-override -0x5C534100,1,1,0x51131000,3,0=0x5C534100,1,1,0x5C544500,0,0; conflicting-override -0x5C534100,2,1,0x51131000,3,0=0x5C534100,2,1,0x5C544500,0,0; conflicting-override -0x5C534100,3,1,0x51131000,3,0=0x5C534100,3,1,0x5C544500,0,0; conflicting-override +0x5C534100,0,1,0x51131000,3,0=0x5C534100,0,1,0x5C544500,0,0 +0x5C534100,1,1,0x51131000,3,0=0x5C534100,1,1,0x5C544500,0,0 +0x5C534100,2,1,0x51131000,3,0=0x5C534100,2,1,0x5C544500,0,0 +0x5C534100,3,1,0x51131000,3,0=0x5C534100,3,1,0x5C544500,0,0 ; 0x51133080,1,0,0x5C544000,0,0=0x5C544500,0,0,0x5C544500,2,0 0x51133080,1,0,0x5C544000,2,0=0x5C544500,0,0,0x5C544500,2,0 @@ -4681,7 +4681,7 @@ 0x5C544580,3,0,0x04006100,3,0=0x5C544580,3,0,0x51130000,3,0 ; 0x5C544580,0,0,0x04006100,2,0=0x5C544580,0,0,0x51130000,2,0 -0x5C544380,0,0,0x51130000,2,0=0x5C544580,0,0,0x51130000,2,0; conflicting-override +0x5C544380,0,0,0x51130000,2,0=0x5C544580,0,0,0x51130000,2,0 ; ;-Adjacency Stability ;4-way OXO + intersection - continuity @@ -4777,15 +4777,15 @@ ; ;-- RD-6 NETWORK -- ;3-way OXO RD-6 thru & end street short T intersection -0x5C534100,0,0,0x51143000,3,0=0x5C534100,0,0,0x5C544680,0,0; conflicting-override -0x5C534100,1,0,0x51143000,3,0=0x5C534100,1,0,0x5C544680,0,0; conflicting-override -0x5C534100,2,0,0x51143000,3,0=0x5C534100,2,0,0x5C544680,0,0; conflicting-override -0x5C534100,3,0,0x51143000,3,0=0x5C534100,3,0,0x5C544680,0,0; conflicting-override +0x5C534100,0,0,0x51143000,3,0=0x5C534100,0,0,0x5C544680,0,0 +0x5C534100,1,0,0x51143000,3,0=0x5C534100,1,0,0x5C544680,0,0 +0x5C534100,2,0,0x51143000,3,0=0x5C534100,2,0,0x5C544680,0,0 +0x5C534100,3,0,0x51143000,3,0=0x5C534100,3,0,0x5C544680,0,0 ; -0x5C534100,0,1,0x51143000,3,0=0x5C534100,0,1,0x5C544680,0,0; conflicting-override -0x5C534100,1,1,0x51143000,3,0=0x5C534100,1,1,0x5C544680,0,0; conflicting-override -0x5C534100,2,1,0x51143000,3,0=0x5C534100,2,1,0x5C544680,0,0; conflicting-override -0x5C534100,3,1,0x51143000,3,0=0x5C534100,3,1,0x5C544680,0,0; conflicting-override +0x5C534100,0,1,0x51143000,3,0=0x5C534100,0,1,0x5C544680,0,0 +0x5C534100,1,1,0x51143000,3,0=0x5C534100,1,1,0x5C544680,0,0 +0x5C534100,2,1,0x51143000,3,0=0x5C534100,2,1,0x5C544680,0,0 +0x5C534100,3,1,0x51143000,3,0=0x5C534100,3,1,0x5C544680,0,0 ; ;3-way OXO RD-6 thru & end Street Short T intersection - stabilization 0x5C544680,1,0,0x00004B00,1,0=0x5C544680,1,0,0x51140000,1,0 @@ -4802,15 +4802,15 @@ 0x51140000,0,0,0x5C544000,2,0=0x51140000,0,0,0x5C544680,2,0 ; ;3-way OXO RD-6 thru & end street long T intersection - override start -0x5C534100,0,0,0x51141000,3,0=0x5C534100,0,0,0x5C544600,0,0; conflicting-override -0x5C534100,1,0,0x51141000,3,0=0x5C534100,1,0,0x5C544600,0,0; conflicting-override -0x5C534100,2,0,0x51141000,3,0=0x5C534100,2,0,0x5C544600,0,0; conflicting-override -0x5C534100,3,0,0x51141000,3,0=0x5C534100,3,0,0x5C544600,0,0; conflicting-override +0x5C534100,0,0,0x51141000,3,0=0x5C534100,0,0,0x5C544600,0,0 +0x5C534100,1,0,0x51141000,3,0=0x5C534100,1,0,0x5C544600,0,0 +0x5C534100,2,0,0x51141000,3,0=0x5C534100,2,0,0x5C544600,0,0 +0x5C534100,3,0,0x51141000,3,0=0x5C534100,3,0,0x5C544600,0,0 ; -0x5C534100,0,1,0x51141000,3,0=0x5C534100,0,1,0x5C544600,0,0; conflicting-override -0x5C534100,1,1,0x51141000,3,0=0x5C534100,1,1,0x5C544600,0,0; conflicting-override -0x5C534100,2,1,0x51141000,3,0=0x5C534100,2,1,0x5C544600,0,0; conflicting-override -0x5C534100,3,1,0x51141000,3,0=0x5C534100,3,1,0x5C544600,0,0; conflicting-override +0x5C534100,0,1,0x51141000,3,0=0x5C534100,0,1,0x5C544600,0,0 +0x5C534100,1,1,0x51141000,3,0=0x5C534100,1,1,0x5C544600,0,0 +0x5C534100,2,1,0x51141000,3,0=0x5C534100,2,1,0x5C544600,0,0 +0x5C534100,3,1,0x51141000,3,0=0x5C534100,3,1,0x5C544600,0,0 ; ;3-way OXO RD-6 thru & end street long T intersection - stabilization 0x5C544600,0,0,0x00AA0800,1,0=0x5C544600,0,0,0x5C544600,2,0 @@ -4944,14 +4944,14 @@ ;-- TRIPLE TILE (AVE-6, TLA-7) NETWORK -- ;-- TLA-7 / AVE-6 outer lanes -- ; Initial override - crosswalk (4-way street intersection) - pedmall side -0x5C534100,0,0,0x51201000,3,0=0x5C534100,0,0,0x5C544700,0,0; conflicting-override -0x5C534100,1,0,0x51201000,3,0=0x5C534100,1,0,0x5C544700,0,0; conflicting-override -0x5C534100,2,0,0x51201000,3,0=0x5C534100,2,0,0x5C544700,0,0; conflicting-override -0x5C534100,3,0,0x51201000,3,0=0x5C534100,3,0,0x5C544700,0,0; conflicting-override -0x5C534100,0,1,0x51201000,3,0=0x5C534100,0,1,0x5C544700,0,0; conflicting-override -0x5C534100,1,1,0x51201000,3,0=0x5C534100,1,1,0x5C544700,0,0; conflicting-override -0x5C534100,2,1,0x51201000,3,0=0x5C534100,2,1,0x5C544700,0,0; conflicting-override -0x5C534100,3,1,0x51201000,3,0=0x5C534100,3,1,0x5C544700,0,0; conflicting-override +0x5C534100,0,0,0x51201000,3,0=0x5C534100,0,0,0x5C544700,0,0 +0x5C534100,1,0,0x51201000,3,0=0x5C534100,1,0,0x5C544700,0,0 +0x5C534100,2,0,0x51201000,3,0=0x5C534100,2,0,0x5C544700,0,0 +0x5C534100,3,0,0x51201000,3,0=0x5C534100,3,0,0x5C544700,0,0 +0x5C534100,0,1,0x51201000,3,0=0x5C534100,0,1,0x5C544700,0,0 +0x5C534100,1,1,0x51201000,3,0=0x5C534100,1,1,0x5C544700,0,0 +0x5C534100,2,1,0x51201000,3,0=0x5C534100,2,1,0x5C544700,0,0 +0x5C534100,3,1,0x51201000,3,0=0x5C534100,3,1,0x5C544700,0,0 ; ; Override stability - outer crosswalk - continuity 0x5C544700,1,0,0x00004B00,1,0=0x5C544700,1,0,0x51200000,1,0 @@ -4962,14 +4962,14 @@ 0x5C544700,3,0,0x00000300,1,0=0x5C544700,3,0,0x51200100,3,1 ; ; Initial override - end T (street short T) - pedmall side -0x5C534100,0,0,0x51203000,3,0=0x5C534100,0,0,0x5C544780,0,0; conflicting-override -0x5C534100,1,0,0x51203000,3,0=0x5C534100,1,0,0x5C544780,0,0; conflicting-override -0x5C534100,2,0,0x51203000,3,0=0x5C534100,2,0,0x5C544780,0,0; conflicting-override -0x5C534100,3,0,0x51203000,3,0=0x5C534100,3,0,0x5C544780,0,0; conflicting-override -0x5C534100,0,1,0x51203000,3,0=0x5C534100,0,1,0x5C544780,0,0; conflicting-override -0x5C534100,1,1,0x51203000,3,0=0x5C534100,1,1,0x5C544780,0,0; conflicting-override -0x5C534100,2,1,0x51203000,3,0=0x5C534100,2,1,0x5C544780,0,0; conflicting-override -0x5C534100,3,1,0x51203000,3,0=0x5C534100,3,1,0x5C544780,0,0; conflicting-override +0x5C534100,0,0,0x51203000,3,0=0x5C534100,0,0,0x5C544780,0,0 +0x5C534100,1,0,0x51203000,3,0=0x5C534100,1,0,0x5C544780,0,0 +0x5C534100,2,0,0x51203000,3,0=0x5C534100,2,0,0x5C544780,0,0 +0x5C534100,3,0,0x51203000,3,0=0x5C534100,3,0,0x5C544780,0,0 +0x5C534100,0,1,0x51203000,3,0=0x5C534100,0,1,0x5C544780,0,0 +0x5C534100,1,1,0x51203000,3,0=0x5C534100,1,1,0x5C544780,0,0 +0x5C534100,2,1,0x51203000,3,0=0x5C534100,2,1,0x5C544780,0,0 +0x5C534100,3,1,0x51203000,3,0=0x5C534100,3,1,0x5C544780,0,0 ; ; Override stability - end T - median side 0x5C544700,0,0,0x51200080,0,0=0x5C544780,0,0,0x51200080,0,0 diff --git a/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c5_DraggableMall_Street_Grass_custom_RHD.txt b/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c5_DraggableMall_Street_Grass_custom_RHD.txt index f090b04f2..b92cbc1d9 100644 --- a/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c5_DraggableMall_Street_Grass_custom_RHD.txt +++ b/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c5_DraggableMall_Street_Grass_custom_RHD.txt @@ -3410,20 +3410,20 @@ ;-- ROAD & BIDIRECTIONAL SINGLE TILE NWM -- ;-- ROAD (RD-2) NETWORK -- ;3-way OXO road thru & end street T intersection - initial override -0x5C535100,0,0,0x00AA0800,1,0=0x5C535100,0,0,0x5C545000,0,0; conflicting-override -0x5C535100,1,0,0x00AA0800,1,0=0x5C535100,1,0,0x5C545000,0,0; conflicting-override -0x5C535100,2,0,0x00AA0800,1,0=0x5C535100,2,0,0x5C545000,0,0; conflicting-override -0x5C535100,3,0,0x00AA0800,1,0=0x5C535100,3,0,0x5C545000,0,0; conflicting-override +0x5C535100,0,0,0x00AA0800,1,0=0x5C535100,0,0,0x5C545000,0,0 +0x5C535100,1,0,0x00AA0800,1,0=0x5C535100,1,0,0x5C545000,0,0 +0x5C535100,2,0,0x00AA0800,1,0=0x5C535100,2,0,0x5C545000,0,0 +0x5C535100,3,0,0x00AA0800,1,0=0x5C535100,3,0,0x5C545000,0,0 ; ;4-way OXO + intersection - initial override -0x5C535100,0,0,0x00AA0A00,1,0=0x5C535100,0,0,0x5C545000,0,0; conflicting-override -0x5C535100,1,0,0x00AA0A00,1,0=0x5C535100,1,0,0x5C545000,0,0; conflicting-override -0x5C535100,2,0,0x00AA0A00,1,0=0x5C535100,2,0,0x5C545000,0,0; conflicting-override -0x5C535100,3,0,0x00AA0A00,1,0=0x5C535100,3,0,0x5C545000,0,0; conflicting-override -0x5C535100,0,0,0x00AA0A00,3,0=0x5C535100,0,0,0x5C545000,0,0; conflicting-override -0x5C535100,1,0,0x00AA0A00,3,0=0x5C535100,1,0,0x5C545000,0,0; conflicting-override -0x5C535100,2,0,0x00AA0A00,3,0=0x5C535100,2,0,0x5C545000,0,0; conflicting-override -0x5C535100,3,0,0x00AA0A00,3,0=0x5C535100,3,0,0x5C545000,0,0; conflicting-override +0x5C535100,0,0,0x00AA0A00,1,0=0x5C535100,0,0,0x5C545000,0,0 +0x5C535100,1,0,0x00AA0A00,1,0=0x5C535100,1,0,0x5C545000,0,0 +0x5C535100,2,0,0x00AA0A00,1,0=0x5C535100,2,0,0x5C545000,0,0 +0x5C535100,3,0,0x00AA0A00,1,0=0x5C535100,3,0,0x5C545000,0,0 +0x5C535100,0,0,0x00AA0A00,3,0=0x5C535100,0,0,0x5C545000,0,0 +0x5C535100,1,0,0x00AA0A00,3,0=0x5C535100,1,0,0x5C545000,0,0 +0x5C535100,2,0,0x00AA0A00,3,0=0x5C535100,2,0,0x5C545000,0,0 +0x5C535100,3,0,0x00AA0A00,3,0=0x5C535100,3,0,0x5C545000,0,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -3572,10 +3572,10 @@ ; ;-- TLA-3 NETWORK -- ;3-way OXO TLA-3 thru & end Street T intersection - initial override -0x5C535100,0,0,0x51003000,1,0=0x5C535100,0,0,0x5C545080,0,0; conflicting-override -0x5C535100,1,0,0x51003000,1,0=0x5C535100,1,0,0x5C545080,0,0; conflicting-override -0x5C535100,2,0,0x51003000,1,0=0x5C535100,2,0,0x5C545080,0,0; conflicting-override -0x5C535100,3,0,0x51003000,1,0=0x5C535100,3,0,0x5C545080,0,0; conflicting-override +0x5C535100,0,0,0x51003000,1,0=0x5C535100,0,0,0x5C545080,0,0 +0x5C535100,1,0,0x51003000,1,0=0x5C535100,1,0,0x5C545080,0,0 +0x5C535100,2,0,0x51003000,1,0=0x5C535100,2,0,0x5C545080,0,0 +0x5C535100,3,0,0x51003000,1,0=0x5C535100,3,0,0x5C545080,0,0 ; ;3-way OXO TLA-3 thru & end Street T intersection - stabilization 0x51000000,1,0,0x5C545000,1,0=0x51000000,1,0,0x5C545080,1,0 @@ -3594,14 +3594,14 @@ 0x00000300,3,0,0x5C545080,3,0=0x51000100,3,0,0x5C545080,3,0 ; ;4-way OXO + intersection - initial override -0x5C535100,0,0,0x51001000,1,0=0x5C535100,0,0,0x5C545080,0,0; conflicting-override -0x5C535100,1,0,0x51001000,1,0=0x5C535100,1,0,0x5C545080,0,0; conflicting-override -0x5C535100,2,0,0x51001000,1,0=0x5C535100,2,0,0x5C545080,0,0; conflicting-override -0x5C535100,3,0,0x51001000,1,0=0x5C535100,3,0,0x5C545080,0,0; conflicting-override -0x5C535100,0,0,0x51001000,3,0=0x5C535100,0,0,0x5C545080,2,0; conflicting-override -0x5C535100,1,0,0x51001000,3,0=0x5C535100,1,0,0x5C545080,2,0; conflicting-override -0x5C535100,2,0,0x51001000,3,0=0x5C535100,2,0,0x5C545080,2,0; conflicting-override -0x5C535100,3,0,0x51001000,3,0=0x5C535100,3,0,0x5C545080,2,0; conflicting-override +0x5C535100,0,0,0x51001000,1,0=0x5C535100,0,0,0x5C545080,0,0 +0x5C535100,1,0,0x51001000,1,0=0x5C535100,1,0,0x5C545080,0,0 +0x5C535100,2,0,0x51001000,1,0=0x5C535100,2,0,0x5C545080,0,0 +0x5C535100,3,0,0x51001000,1,0=0x5C535100,3,0,0x5C545080,0,0 +0x5C535100,0,0,0x51001000,3,0=0x5C535100,0,0,0x5C545080,2,0 +0x5C535100,1,0,0x51001000,3,0=0x5C535100,1,0,0x5C545080,2,0 +0x5C535100,2,0,0x51001000,3,0=0x5C535100,2,0,0x5C545080,2,0 +0x5C535100,3,0,0x51001000,3,0=0x5C535100,3,0,0x5C545080,2,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -3750,10 +3750,10 @@ ; ;-- AVE-2 NETWORK -- ;3-way OXO AVE-2 thru & end Street T intersection - initial override -0x5C535100,0,0,0x51013000,1,0=0x5C535100,0,0,0x5C545100,0,0; conflicting-override -0x5C535100,1,0,0x51013000,1,0=0x5C535100,1,0,0x5C545100,0,0; conflicting-override -0x5C535100,2,0,0x51013000,1,0=0x5C535100,2,0,0x5C545100,0,0; conflicting-override -0x5C535100,3,0,0x51013000,1,0=0x5C535100,3,0,0x5C545100,0,0; conflicting-override +0x5C535100,0,0,0x51013000,1,0=0x5C535100,0,0,0x5C545100,0,0 +0x5C535100,1,0,0x51013000,1,0=0x5C535100,1,0,0x5C545100,0,0 +0x5C535100,2,0,0x51013000,1,0=0x5C535100,2,0,0x5C545100,0,0 +0x5C535100,3,0,0x51013000,1,0=0x5C535100,3,0,0x5C545100,0,0 ; ;3-way OXO AVE-2 thru & end Street T intersection - stabilization 0x51010000,1,0,0x5C545000,1,0=0x51010000,1,0,0x5C545100,1,0 @@ -3772,14 +3772,14 @@ 0x00000300,3,0,0x5C545100,3,0=0x51010100,3,0,0x5C545100,3,0 ; ;4-way OXO + intersection - initial override -0x5C535100,0,0,0x51011000,1,0=0x5C535100,0,0,0x5C545100,0,0; conflicting-override -0x5C535100,1,0,0x51011000,1,0=0x5C535100,1,0,0x5C545100,0,0; conflicting-override -0x5C535100,2,0,0x51011000,1,0=0x5C535100,2,0,0x5C545100,0,0; conflicting-override -0x5C535100,3,0,0x51011000,1,0=0x5C535100,3,0,0x5C545100,0,0; conflicting-override -0x5C535100,0,0,0x51011000,3,0=0x5C535100,0,0,0x5C545100,2,0; conflicting-override -0x5C535100,1,0,0x51011000,3,0=0x5C535100,1,0,0x5C545100,2,0; conflicting-override -0x5C535100,2,0,0x51011000,3,0=0x5C535100,2,0,0x5C545100,2,0; conflicting-override -0x5C535100,3,0,0x51011000,3,0=0x5C535100,3,0,0x5C545100,2,0; conflicting-override +0x5C535100,0,0,0x51011000,1,0=0x5C535100,0,0,0x5C545100,0,0 +0x5C535100,1,0,0x51011000,1,0=0x5C535100,1,0,0x5C545100,0,0 +0x5C535100,2,0,0x51011000,1,0=0x5C535100,2,0,0x5C545100,0,0 +0x5C535100,3,0,0x51011000,1,0=0x5C535100,3,0,0x5C545100,0,0 +0x5C535100,0,0,0x51011000,3,0=0x5C535100,0,0,0x5C545100,2,0 +0x5C535100,1,0,0x51011000,3,0=0x5C535100,1,0,0x5C545100,2,0 +0x5C535100,2,0,0x51011000,3,0=0x5C535100,2,0,0x5C545100,2,0 +0x5C535100,3,0,0x51011000,3,0=0x5C535100,3,0,0x5C545100,2,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -3928,15 +3928,15 @@ ; ;-- ARD-3 NETWORK -- ;3-way OXO ARD-3 thru & end Street T intersection - initial override -0x5C535100,0,0,0x51023000,1,0=0x5C535100,0,0,0x5C545180,2,0; conflicting-override -0x5C535100,1,0,0x51023000,1,0=0x5C535100,1,0,0x5C545180,2,0; conflicting-override -0x5C535100,2,0,0x51023000,1,0=0x5C535100,2,0,0x5C545180,2,0; conflicting-override -0x5C535100,3,0,0x51023000,1,0=0x5C535100,3,0,0x5C545180,2,0; conflicting-override +0x5C535100,0,0,0x51023000,1,0=0x5C535100,0,0,0x5C545180,2,0 +0x5C535100,1,0,0x51023000,1,0=0x5C535100,1,0,0x5C545180,2,0 +0x5C535100,2,0,0x51023000,1,0=0x5C535100,2,0,0x5C545180,2,0 +0x5C535100,3,0,0x51023000,1,0=0x5C535100,3,0,0x5C545180,2,0 ; -0x5C535100,0,0,0x51023080,1,0=0x5C535100,0,0,0x5C545180,0,0; conflicting-override -0x5C535100,1,0,0x51023080,1,0=0x5C535100,1,0,0x5C545180,0,0; conflicting-override -0x5C535100,2,0,0x51023080,1,0=0x5C535100,2,0,0x5C545180,0,0; conflicting-override -0x5C535100,3,0,0x51023080,1,0=0x5C535100,3,0,0x5C545180,0,0; conflicting-override +0x5C535100,0,0,0x51023080,1,0=0x5C535100,0,0,0x5C545180,0,0 +0x5C535100,1,0,0x51023080,1,0=0x5C535100,1,0,0x5C545180,0,0 +0x5C535100,2,0,0x51023080,1,0=0x5C535100,2,0,0x5C545180,0,0 +0x5C535100,3,0,0x51023080,1,0=0x5C535100,3,0,0x5C545180,0,0 ; ;3-way OXO ARD-3 thru & end Street T intersection - stabilization 0x51020000,1,0,0x5C545000,1,0=0x51020000,1,0,0x5C545180,1,0 @@ -3955,14 +3955,14 @@ 0x00000300,3,0,0x5C545180,3,0=0x51020100,3,0,0x5C545180,3,0 ; ;4-way OXO + intersection - initial override -0x5C535100,0,0,0x51021000,1,0=0x5C535100,0,0,0x5C545180,2,0; conflicting-override -0x5C535100,1,0,0x51021000,1,0=0x5C535100,1,0,0x5C545180,2,0; conflicting-override -0x5C535100,2,0,0x51021000,1,0=0x5C535100,2,0,0x5C545180,2,0; conflicting-override -0x5C535100,3,0,0x51021000,1,0=0x5C535100,3,0,0x5C545180,2,0; conflicting-override -0x5C535100,0,0,0x51021000,3,0=0x5C535100,0,0,0x5C545180,0,0; conflicting-override -0x5C535100,1,0,0x51021000,3,0=0x5C535100,1,0,0x5C545180,0,0; conflicting-override -0x5C535100,2,0,0x51021000,3,0=0x5C535100,2,0,0x5C545180,0,0; conflicting-override -0x5C535100,3,0,0x51021000,3,0=0x5C535100,3,0,0x5C545180,0,0; conflicting-override +0x5C535100,0,0,0x51021000,1,0=0x5C535100,0,0,0x5C545180,2,0 +0x5C535100,1,0,0x51021000,1,0=0x5C535100,1,0,0x5C545180,2,0 +0x5C535100,2,0,0x51021000,1,0=0x5C535100,2,0,0x5C545180,2,0 +0x5C535100,3,0,0x51021000,1,0=0x5C535100,3,0,0x5C545180,2,0 +0x5C535100,0,0,0x51021000,3,0=0x5C535100,0,0,0x5C545180,0,0 +0x5C535100,1,0,0x51021000,3,0=0x5C535100,1,0,0x5C545180,0,0 +0x5C535100,2,0,0x51021000,3,0=0x5C535100,2,0,0x5C545180,0,0 +0x5C535100,3,0,0x51021000,3,0=0x5C535100,3,0,0x5C545180,0,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -4111,10 +4111,10 @@ ; ;-- NRD-4 NETWORK -- ;3-way OXO NRD-4 thru & end Street T intersection - initial override -0x5C535100,0,0,0x51053000,1,0=0x5C535100,0,0,0x5C545200,0,0; conflicting-override -0x5C535100,1,0,0x51053000,1,0=0x5C535100,1,0,0x5C545200,0,0; conflicting-override -0x5C535100,2,0,0x51053000,1,0=0x5C535100,2,0,0x5C545200,0,0; conflicting-override -0x5C535100,3,0,0x51053000,1,0=0x5C535100,3,0,0x5C545200,0,0; conflicting-override +0x5C535100,0,0,0x51053000,1,0=0x5C535100,0,0,0x5C545200,0,0 +0x5C535100,1,0,0x51053000,1,0=0x5C535100,1,0,0x5C545200,0,0 +0x5C535100,2,0,0x51053000,1,0=0x5C535100,2,0,0x5C545200,0,0 +0x5C535100,3,0,0x51053000,1,0=0x5C535100,3,0,0x5C545200,0,0 ; ;3-way OXO NRD-4 thru & end Street T intersection - stabilization 0x51050000,1,0,0x5C545000,1,0=0x51050000,1,0,0x5C545200,1,0 @@ -4133,14 +4133,14 @@ 0x00000300,3,0,0x5C545200,3,0=0x51050100,3,0,0x5C545200,3,0 ; ;4-way OXO + intersection - initial override -0x5C535100,0,0,0x51051000,1,0=0x5C535100,0,0,0x5C545200,0,0; conflicting-override -0x5C535100,1,0,0x51051000,1,0=0x5C535100,1,0,0x5C545200,0,0; conflicting-override -0x5C535100,2,0,0x51051000,1,0=0x5C535100,2,0,0x5C545200,0,0; conflicting-override -0x5C535100,3,0,0x51051000,1,0=0x5C535100,3,0,0x5C545200,0,0; conflicting-override -0x5C535100,0,0,0x51051000,3,0=0x5C535100,0,0,0x5C545200,2,0; conflicting-override -0x5C535100,1,0,0x51051000,3,0=0x5C535100,1,0,0x5C545200,2,0; conflicting-override -0x5C535100,2,0,0x51051000,3,0=0x5C535100,2,0,0x5C545200,2,0; conflicting-override -0x5C535100,3,0,0x51051000,3,0=0x5C535100,3,0,0x5C545200,2,0; conflicting-override +0x5C535100,0,0,0x51051000,1,0=0x5C535100,0,0,0x5C545200,0,0 +0x5C535100,1,0,0x51051000,1,0=0x5C535100,1,0,0x5C545200,0,0 +0x5C535100,2,0,0x51051000,1,0=0x5C535100,2,0,0x5C545200,0,0 +0x5C535100,3,0,0x51051000,1,0=0x5C535100,3,0,0x5C545200,0,0 +0x5C535100,0,0,0x51051000,3,0=0x5C535100,0,0,0x5C545200,2,0 +0x5C535100,1,0,0x51051000,3,0=0x5C535100,1,0,0x5C545200,2,0 +0x5C535100,2,0,0x51051000,3,0=0x5C535100,2,0,0x5C545200,2,0 +0x5C535100,3,0,0x51051000,3,0=0x5C535100,3,0,0x5C545200,2,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -4290,26 +4290,26 @@ ;-- AVENUE & BIDIRECTIONAL MULTI TILE NWM -- ;-- AVENUE (AVE-4) NETWORK -- ;3-way OXO avenue thru & end street short T intersection -0x5C535100,0,0,0x04004400,2,0=0x5C535100,0,0,0x5C545380,0,0; conflicting-override -0x5C535100,1,0,0x04004400,2,0=0x5C535100,1,0,0x5C545380,0,0; conflicting-override -0x5C535100,2,0,0x04004400,2,0=0x5C535100,2,0,0x5C545380,0,0; conflicting-override -0x5C535100,3,0,0x04004400,2,0=0x5C535100,3,0,0x5C545380,0,0; conflicting-override +0x5C535100,0,0,0x04004400,2,0=0x5C535100,0,0,0x5C545380,0,0 +0x5C535100,1,0,0x04004400,2,0=0x5C535100,1,0,0x5C545380,0,0 +0x5C535100,2,0,0x04004400,2,0=0x5C535100,2,0,0x5C545380,0,0 +0x5C535100,3,0,0x04004400,2,0=0x5C535100,3,0,0x5C545380,0,0 ; -0x5C535100,0,1,0x04004400,2,0=0x5C535100,0,1,0x5C545380,0,0; conflicting-override -0x5C535100,1,1,0x04004400,2,0=0x5C535100,1,1,0x5C545380,0,0; conflicting-override -0x5C535100,2,1,0x04004400,2,0=0x5C535100,2,1,0x5C545380,0,0; conflicting-override -0x5C535100,3,1,0x04004400,2,0=0x5C535100,3,1,0x5C545380,0,0; conflicting-override +0x5C535100,0,1,0x04004400,2,0=0x5C535100,0,1,0x5C545380,0,0 +0x5C535100,1,1,0x04004400,2,0=0x5C535100,1,1,0x5C545380,0,0 +0x5C535100,2,1,0x04004400,2,0=0x5C535100,2,1,0x5C545380,0,0 +0x5C535100,3,1,0x04004400,2,0=0x5C535100,3,1,0x5C545380,0,0 ; ;3-way OXO avenue thru & end street long T intersection - start + intersection -0x5C535100,0,0,0x04008300,2,0=0x5C535100,0,0,0x5C545300,0,0; conflicting-override -0x5C535100,1,0,0x04008300,2,0=0x5C535100,1,0,0x5C545300,0,0; conflicting-override -0x5C535100,2,0,0x04008300,2,0=0x5C535100,2,0,0x5C545300,0,0; conflicting-override -0x5C535100,3,0,0x04008300,2,0=0x5C535100,3,0,0x5C545300,0,0; conflicting-override +0x5C535100,0,0,0x04008300,2,0=0x5C535100,0,0,0x5C545300,0,0 +0x5C535100,1,0,0x04008300,2,0=0x5C535100,1,0,0x5C545300,0,0 +0x5C535100,2,0,0x04008300,2,0=0x5C535100,2,0,0x5C545300,0,0 +0x5C535100,3,0,0x04008300,2,0=0x5C535100,3,0,0x5C545300,0,0 ; -0x5C535100,0,1,0x04008300,2,0=0x5C535100,0,1,0x5C545300,0,0; conflicting-override -0x5C535100,1,1,0x04008300,2,0=0x5C535100,1,1,0x5C545300,0,0; conflicting-override -0x5C535100,2,1,0x04008300,2,0=0x5C535100,2,1,0x5C545300,0,0; conflicting-override -0x5C535100,3,1,0x04008300,2,0=0x5C535100,3,1,0x5C545300,0,0; conflicting-override +0x5C535100,0,1,0x04008300,2,0=0x5C535100,0,1,0x5C545300,0,0 +0x5C535100,1,1,0x04008300,2,0=0x5C535100,1,1,0x5C545300,0,0 +0x5C535100,2,1,0x04008300,2,0=0x5C535100,2,1,0x5C545300,0,0 +0x5C535100,3,1,0x04008300,2,0=0x5C535100,3,1,0x5C545300,0,0 ; 0x5C545300,0,0,0x04008600,0,0=0x5C545300,0,0,0x5C545300,2,0 ; @@ -4410,15 +4410,15 @@ ; ;-- TLA-5 NETWORK -- ;3-way OXO TLA-5 thru & end street short T intersection -0x5C535100,0,0,0x51103000,3,0=0x5C535100,0,0,0x5C545480,0,0; conflicting-override -0x5C535100,1,0,0x51103000,3,0=0x5C535100,1,0,0x5C545480,0,0; conflicting-override -0x5C535100,2,0,0x51103000,3,0=0x5C535100,2,0,0x5C545480,0,0; conflicting-override -0x5C535100,3,0,0x51103000,3,0=0x5C535100,3,0,0x5C545480,0,0; conflicting-override +0x5C535100,0,0,0x51103000,3,0=0x5C535100,0,0,0x5C545480,0,0 +0x5C535100,1,0,0x51103000,3,0=0x5C535100,1,0,0x5C545480,0,0 +0x5C535100,2,0,0x51103000,3,0=0x5C535100,2,0,0x5C545480,0,0 +0x5C535100,3,0,0x51103000,3,0=0x5C535100,3,0,0x5C545480,0,0 ; -0x5C535100,0,1,0x51103000,3,0=0x5C535100,0,1,0x5C545480,0,0; conflicting-override -0x5C535100,1,1,0x51103000,3,0=0x5C535100,1,1,0x5C545480,0,0; conflicting-override -0x5C535100,2,1,0x51103000,3,0=0x5C535100,2,1,0x5C545480,0,0; conflicting-override -0x5C535100,3,1,0x51103000,3,0=0x5C535100,3,1,0x5C545480,0,0; conflicting-override +0x5C535100,0,1,0x51103000,3,0=0x5C535100,0,1,0x5C545480,0,0 +0x5C535100,1,1,0x51103000,3,0=0x5C535100,1,1,0x5C545480,0,0 +0x5C535100,2,1,0x51103000,3,0=0x5C535100,2,1,0x5C545480,0,0 +0x5C535100,3,1,0x51103000,3,0=0x5C535100,3,1,0x5C545480,0,0 ; ;3-way OXO TLA-5 thru & end Street Short T intersection - stabilization 0x5C545480,1,0,0x00004B00,1,0=0x5C545480,1,0,0x51100000,1,0 @@ -4440,15 +4440,15 @@ 0x51100000,0,0,0x5C545000,2,0=0x51100000,0,0,0x5C545480,2,0 ; ;3-way OXO TLA-5 thru & end street long T intersection - override start -0x5C535100,0,0,0x51101000,3,0=0x5C535100,0,0,0x5C545400,0,0; conflicting-override -0x5C535100,1,0,0x51101000,3,0=0x5C535100,1,0,0x5C545400,0,0; conflicting-override -0x5C535100,2,0,0x51101000,3,0=0x5C535100,2,0,0x5C545400,0,0; conflicting-override -0x5C535100,3,0,0x51101000,3,0=0x5C535100,3,0,0x5C545400,0,0; conflicting-override +0x5C535100,0,0,0x51101000,3,0=0x5C535100,0,0,0x5C545400,0,0 +0x5C535100,1,0,0x51101000,3,0=0x5C535100,1,0,0x5C545400,0,0 +0x5C535100,2,0,0x51101000,3,0=0x5C535100,2,0,0x5C545400,0,0 +0x5C535100,3,0,0x51101000,3,0=0x5C535100,3,0,0x5C545400,0,0 ; -0x5C535100,0,1,0x51101000,3,0=0x5C535100,0,1,0x5C545400,0,0; conflicting-override -0x5C535100,1,1,0x51101000,3,0=0x5C535100,1,1,0x5C545400,0,0; conflicting-override -0x5C535100,2,1,0x51101000,3,0=0x5C535100,2,1,0x5C545400,0,0; conflicting-override -0x5C535100,3,1,0x51101000,3,0=0x5C535100,3,1,0x5C545400,0,0; conflicting-override +0x5C535100,0,1,0x51101000,3,0=0x5C535100,0,1,0x5C545400,0,0 +0x5C535100,1,1,0x51101000,3,0=0x5C535100,1,1,0x5C545400,0,0 +0x5C535100,2,1,0x51101000,3,0=0x5C535100,2,1,0x5C545400,0,0 +0x5C535100,3,1,0x51101000,3,0=0x5C535100,3,1,0x5C545400,0,0 ; 0x51103080,1,0,0x5C545000,0,0=0x5C545400,0,0,0x5C545400,2,0 0x51103080,1,0,0x5C545000,2,0=0x5C545400,0,0,0x5C545400,2,0 @@ -4576,15 +4576,15 @@ ; ;-- RD-4 NETWORK -- ;3-way OXO RD-4 thru & end street short T intersection -0x5C535100,0,0,0x51133000,3,0=0x5C535100,0,0,0x5C545580,0,0; conflicting-override -0x5C535100,1,0,0x51133000,3,0=0x5C535100,1,0,0x5C545580,0,0; conflicting-override -0x5C535100,2,0,0x51133000,3,0=0x5C535100,2,0,0x5C545580,0,0; conflicting-override -0x5C535100,3,0,0x51133000,3,0=0x5C535100,3,0,0x5C545580,0,0; conflicting-override +0x5C535100,0,0,0x51133000,3,0=0x5C535100,0,0,0x5C545580,0,0 +0x5C535100,1,0,0x51133000,3,0=0x5C535100,1,0,0x5C545580,0,0 +0x5C535100,2,0,0x51133000,3,0=0x5C535100,2,0,0x5C545580,0,0 +0x5C535100,3,0,0x51133000,3,0=0x5C535100,3,0,0x5C545580,0,0 ; -0x5C535100,0,1,0x51133000,3,0=0x5C535100,0,1,0x5C545580,0,0; conflicting-override -0x5C535100,1,1,0x51133000,3,0=0x5C535100,1,1,0x5C545580,0,0; conflicting-override -0x5C535100,2,1,0x51133000,3,0=0x5C535100,2,1,0x5C545580,0,0; conflicting-override -0x5C535100,3,1,0x51133000,3,0=0x5C535100,3,1,0x5C545580,0,0; conflicting-override +0x5C535100,0,1,0x51133000,3,0=0x5C535100,0,1,0x5C545580,0,0 +0x5C535100,1,1,0x51133000,3,0=0x5C535100,1,1,0x5C545580,0,0 +0x5C535100,2,1,0x51133000,3,0=0x5C535100,2,1,0x5C545580,0,0 +0x5C535100,3,1,0x51133000,3,0=0x5C535100,3,1,0x5C545580,0,0 ; ;3-way OXO RD-4 thru & end Street Short T intersection - stabilization 0x5C545580,1,0,0x00004B00,1,0=0x5C545580,1,0,0x51130000,1,0 @@ -4606,15 +4606,15 @@ 0x51130000,0,0,0x5C545000,2,0=0x51130000,0,0,0x5C545580,2,0 ; ;3-way OXO RD-4 thru & end street long T intersection - override start -0x5C535100,0,0,0x51131000,3,0=0x5C535100,0,0,0x5C545500,0,0; conflicting-override -0x5C535100,1,0,0x51131000,3,0=0x5C535100,1,0,0x5C545500,0,0; conflicting-override -0x5C535100,2,0,0x51131000,3,0=0x5C535100,2,0,0x5C545500,0,0; conflicting-override -0x5C535100,3,0,0x51131000,3,0=0x5C535100,3,0,0x5C545500,0,0; conflicting-override +0x5C535100,0,0,0x51131000,3,0=0x5C535100,0,0,0x5C545500,0,0 +0x5C535100,1,0,0x51131000,3,0=0x5C535100,1,0,0x5C545500,0,0 +0x5C535100,2,0,0x51131000,3,0=0x5C535100,2,0,0x5C545500,0,0 +0x5C535100,3,0,0x51131000,3,0=0x5C535100,3,0,0x5C545500,0,0 ; -0x5C535100,0,1,0x51131000,3,0=0x5C535100,0,1,0x5C545500,0,0; conflicting-override -0x5C535100,1,1,0x51131000,3,0=0x5C535100,1,1,0x5C545500,0,0; conflicting-override -0x5C535100,2,1,0x51131000,3,0=0x5C535100,2,1,0x5C545500,0,0; conflicting-override -0x5C535100,3,1,0x51131000,3,0=0x5C535100,3,1,0x5C545500,0,0; conflicting-override +0x5C535100,0,1,0x51131000,3,0=0x5C535100,0,1,0x5C545500,0,0 +0x5C535100,1,1,0x51131000,3,0=0x5C535100,1,1,0x5C545500,0,0 +0x5C535100,2,1,0x51131000,3,0=0x5C535100,2,1,0x5C545500,0,0 +0x5C535100,3,1,0x51131000,3,0=0x5C535100,3,1,0x5C545500,0,0 ; 0x51133080,1,0,0x5C545000,0,0=0x5C545500,0,0,0x5C545500,2,0 0x51133080,1,0,0x5C545000,2,0=0x5C545500,0,0,0x5C545500,2,0 @@ -4681,7 +4681,7 @@ 0x5C545580,3,0,0x04006100,3,0=0x5C545580,3,0,0x51130000,3,0 ; 0x5C545580,0,0,0x04006100,2,0=0x5C545580,0,0,0x51130000,2,0 -0x5C545380,0,0,0x51130000,2,0=0x5C545580,0,0,0x51130000,2,0; conflicting-override +0x5C545380,0,0,0x51130000,2,0=0x5C545580,0,0,0x51130000,2,0 ; ;-Adjacency Stability ;4-way OXO + intersection - continuity @@ -4777,15 +4777,15 @@ ; ;-- RD-6 NETWORK -- ;3-way OXO RD-6 thru & end street short T intersection -0x5C535100,0,0,0x51143000,3,0=0x5C535100,0,0,0x5C545680,0,0; conflicting-override -0x5C535100,1,0,0x51143000,3,0=0x5C535100,1,0,0x5C545680,0,0; conflicting-override -0x5C535100,2,0,0x51143000,3,0=0x5C535100,2,0,0x5C545680,0,0; conflicting-override -0x5C535100,3,0,0x51143000,3,0=0x5C535100,3,0,0x5C545680,0,0; conflicting-override +0x5C535100,0,0,0x51143000,3,0=0x5C535100,0,0,0x5C545680,0,0 +0x5C535100,1,0,0x51143000,3,0=0x5C535100,1,0,0x5C545680,0,0 +0x5C535100,2,0,0x51143000,3,0=0x5C535100,2,0,0x5C545680,0,0 +0x5C535100,3,0,0x51143000,3,0=0x5C535100,3,0,0x5C545680,0,0 ; -0x5C535100,0,1,0x51143000,3,0=0x5C535100,0,1,0x5C545680,0,0; conflicting-override -0x5C535100,1,1,0x51143000,3,0=0x5C535100,1,1,0x5C545680,0,0; conflicting-override -0x5C535100,2,1,0x51143000,3,0=0x5C535100,2,1,0x5C545680,0,0; conflicting-override -0x5C535100,3,1,0x51143000,3,0=0x5C535100,3,1,0x5C545680,0,0; conflicting-override +0x5C535100,0,1,0x51143000,3,0=0x5C535100,0,1,0x5C545680,0,0 +0x5C535100,1,1,0x51143000,3,0=0x5C535100,1,1,0x5C545680,0,0 +0x5C535100,2,1,0x51143000,3,0=0x5C535100,2,1,0x5C545680,0,0 +0x5C535100,3,1,0x51143000,3,0=0x5C535100,3,1,0x5C545680,0,0 ; ;3-way OXO RD-6 thru & end Street Short T intersection - stabilization 0x5C545680,1,0,0x00004B00,1,0=0x5C545680,1,0,0x51140000,1,0 @@ -4802,15 +4802,15 @@ 0x51140000,0,0,0x5C545000,2,0=0x51140000,0,0,0x5C545680,2,0 ; ;3-way OXO RD-6 thru & end street long T intersection - override start -0x5C535100,0,0,0x51141000,3,0=0x5C535100,0,0,0x5C545600,0,0; conflicting-override -0x5C535100,1,0,0x51141000,3,0=0x5C535100,1,0,0x5C545600,0,0; conflicting-override -0x5C535100,2,0,0x51141000,3,0=0x5C535100,2,0,0x5C545600,0,0; conflicting-override -0x5C535100,3,0,0x51141000,3,0=0x5C535100,3,0,0x5C545600,0,0; conflicting-override +0x5C535100,0,0,0x51141000,3,0=0x5C535100,0,0,0x5C545600,0,0 +0x5C535100,1,0,0x51141000,3,0=0x5C535100,1,0,0x5C545600,0,0 +0x5C535100,2,0,0x51141000,3,0=0x5C535100,2,0,0x5C545600,0,0 +0x5C535100,3,0,0x51141000,3,0=0x5C535100,3,0,0x5C545600,0,0 ; -0x5C535100,0,1,0x51141000,3,0=0x5C535100,0,1,0x5C545600,0,0; conflicting-override -0x5C535100,1,1,0x51141000,3,0=0x5C535100,1,1,0x5C545600,0,0; conflicting-override -0x5C535100,2,1,0x51141000,3,0=0x5C535100,2,1,0x5C545600,0,0; conflicting-override -0x5C535100,3,1,0x51141000,3,0=0x5C535100,3,1,0x5C545600,0,0; conflicting-override +0x5C535100,0,1,0x51141000,3,0=0x5C535100,0,1,0x5C545600,0,0 +0x5C535100,1,1,0x51141000,3,0=0x5C535100,1,1,0x5C545600,0,0 +0x5C535100,2,1,0x51141000,3,0=0x5C535100,2,1,0x5C545600,0,0 +0x5C535100,3,1,0x51141000,3,0=0x5C535100,3,1,0x5C545600,0,0 ; ;3-way OXO RD-6 thru & end street long T intersection - stabilization 0x5C545600,0,0,0x00AA0800,1,0=0x5C545600,0,0,0x5C545600,2,0 @@ -4944,14 +4944,14 @@ ;-- TRIPLE TILE (AVE-6, TLA-7) NETWORK -- ;-- TLA-7 / AVE-6 outer lanes -- ; Initial override - crosswalk (4-way street intersection) - pedmall side -0x5C535100,0,0,0x51201000,3,0=0x5C535100,0,0,0x5C545700,0,0; conflicting-override -0x5C535100,1,0,0x51201000,3,0=0x5C535100,1,0,0x5C545700,0,0; conflicting-override -0x5C535100,2,0,0x51201000,3,0=0x5C535100,2,0,0x5C545700,0,0; conflicting-override -0x5C535100,3,0,0x51201000,3,0=0x5C535100,3,0,0x5C545700,0,0; conflicting-override -0x5C535100,0,1,0x51201000,3,0=0x5C535100,0,1,0x5C545700,0,0; conflicting-override -0x5C535100,1,1,0x51201000,3,0=0x5C535100,1,1,0x5C545700,0,0; conflicting-override -0x5C535100,2,1,0x51201000,3,0=0x5C535100,2,1,0x5C545700,0,0; conflicting-override -0x5C535100,3,1,0x51201000,3,0=0x5C535100,3,1,0x5C545700,0,0; conflicting-override +0x5C535100,0,0,0x51201000,3,0=0x5C535100,0,0,0x5C545700,0,0 +0x5C535100,1,0,0x51201000,3,0=0x5C535100,1,0,0x5C545700,0,0 +0x5C535100,2,0,0x51201000,3,0=0x5C535100,2,0,0x5C545700,0,0 +0x5C535100,3,0,0x51201000,3,0=0x5C535100,3,0,0x5C545700,0,0 +0x5C535100,0,1,0x51201000,3,0=0x5C535100,0,1,0x5C545700,0,0 +0x5C535100,1,1,0x51201000,3,0=0x5C535100,1,1,0x5C545700,0,0 +0x5C535100,2,1,0x51201000,3,0=0x5C535100,2,1,0x5C545700,0,0 +0x5C535100,3,1,0x51201000,3,0=0x5C535100,3,1,0x5C545700,0,0 ; ; Override stability - outer crosswalk - continuity 0x5C545700,1,0,0x00004B00,1,0=0x5C545700,1,0,0x51200000,1,0 @@ -4962,14 +4962,14 @@ 0x5C545700,3,0,0x00000300,1,0=0x5C545700,3,0,0x51200100,3,1 ; ; Initial override - end T (street short T) - pedmall side -0x5C535100,0,0,0x51203000,3,0=0x5C535100,0,0,0x5C545780,0,0; conflicting-override -0x5C535100,1,0,0x51203000,3,0=0x5C535100,1,0,0x5C545780,0,0; conflicting-override -0x5C535100,2,0,0x51203000,3,0=0x5C535100,2,0,0x5C545780,0,0; conflicting-override -0x5C535100,3,0,0x51203000,3,0=0x5C535100,3,0,0x5C545780,0,0; conflicting-override -0x5C535100,0,1,0x51203000,3,0=0x5C535100,0,1,0x5C545780,0,0; conflicting-override -0x5C535100,1,1,0x51203000,3,0=0x5C535100,1,1,0x5C545780,0,0; conflicting-override -0x5C535100,2,1,0x51203000,3,0=0x5C535100,2,1,0x5C545780,0,0; conflicting-override -0x5C535100,3,1,0x51203000,3,0=0x5C535100,3,1,0x5C545780,0,0; conflicting-override +0x5C535100,0,0,0x51203000,3,0=0x5C535100,0,0,0x5C545780,0,0 +0x5C535100,1,0,0x51203000,3,0=0x5C535100,1,0,0x5C545780,0,0 +0x5C535100,2,0,0x51203000,3,0=0x5C535100,2,0,0x5C545780,0,0 +0x5C535100,3,0,0x51203000,3,0=0x5C535100,3,0,0x5C545780,0,0 +0x5C535100,0,1,0x51203000,3,0=0x5C535100,0,1,0x5C545780,0,0 +0x5C535100,1,1,0x51203000,3,0=0x5C535100,1,1,0x5C545780,0,0 +0x5C535100,2,1,0x51203000,3,0=0x5C535100,2,1,0x5C545780,0,0 +0x5C535100,3,1,0x51203000,3,0=0x5C535100,3,1,0x5C545780,0,0 ; ; Override stability - end T - median side 0x5C545700,0,0,0x51200080,0,0=0x5C545780,0,0,0x51200080,0,0 diff --git a/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c6_DraggableMall_Street_sandstone_custom_RHD.txt b/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c6_DraggableMall_Street_sandstone_custom_RHD.txt index d8ceda3f4..a5965e266 100644 --- a/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c6_DraggableMall_Street_sandstone_custom_RHD.txt +++ b/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c6_DraggableMall_Street_sandstone_custom_RHD.txt @@ -3410,20 +3410,20 @@ ;-- ROAD & BIDIRECTIONAL SINGLE TILE NWM -- ;-- ROAD (RD-2) NETWORK -- ;3-way OXO road thru & end street T intersection - initial override -0x5C536100,0,0,0x00AA0800,1,0=0x5C536100,0,0,0x5C546000,0,0; conflicting-override -0x5C536100,1,0,0x00AA0800,1,0=0x5C536100,1,0,0x5C546000,0,0; conflicting-override -0x5C536100,2,0,0x00AA0800,1,0=0x5C536100,2,0,0x5C546000,0,0; conflicting-override -0x5C536100,3,0,0x00AA0800,1,0=0x5C536100,3,0,0x5C546000,0,0; conflicting-override +0x5C536100,0,0,0x00AA0800,1,0=0x5C536100,0,0,0x5C546000,0,0 +0x5C536100,1,0,0x00AA0800,1,0=0x5C536100,1,0,0x5C546000,0,0 +0x5C536100,2,0,0x00AA0800,1,0=0x5C536100,2,0,0x5C546000,0,0 +0x5C536100,3,0,0x00AA0800,1,0=0x5C536100,3,0,0x5C546000,0,0 ; ;4-way OXO + intersection - initial override -0x5C536100,0,0,0x00AA0A00,1,0=0x5C536100,0,0,0x5C546000,0,0; conflicting-override -0x5C536100,1,0,0x00AA0A00,1,0=0x5C536100,1,0,0x5C546000,0,0; conflicting-override -0x5C536100,2,0,0x00AA0A00,1,0=0x5C536100,2,0,0x5C546000,0,0; conflicting-override -0x5C536100,3,0,0x00AA0A00,1,0=0x5C536100,3,0,0x5C546000,0,0; conflicting-override -0x5C536100,0,0,0x00AA0A00,3,0=0x5C536100,0,0,0x5C546000,0,0; conflicting-override -0x5C536100,1,0,0x00AA0A00,3,0=0x5C536100,1,0,0x5C546000,0,0; conflicting-override -0x5C536100,2,0,0x00AA0A00,3,0=0x5C536100,2,0,0x5C546000,0,0; conflicting-override -0x5C536100,3,0,0x00AA0A00,3,0=0x5C536100,3,0,0x5C546000,0,0; conflicting-override +0x5C536100,0,0,0x00AA0A00,1,0=0x5C536100,0,0,0x5C546000,0,0 +0x5C536100,1,0,0x00AA0A00,1,0=0x5C536100,1,0,0x5C546000,0,0 +0x5C536100,2,0,0x00AA0A00,1,0=0x5C536100,2,0,0x5C546000,0,0 +0x5C536100,3,0,0x00AA0A00,1,0=0x5C536100,3,0,0x5C546000,0,0 +0x5C536100,0,0,0x00AA0A00,3,0=0x5C536100,0,0,0x5C546000,0,0 +0x5C536100,1,0,0x00AA0A00,3,0=0x5C536100,1,0,0x5C546000,0,0 +0x5C536100,2,0,0x00AA0A00,3,0=0x5C536100,2,0,0x5C546000,0,0 +0x5C536100,3,0,0x00AA0A00,3,0=0x5C536100,3,0,0x5C546000,0,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -3572,10 +3572,10 @@ ; ;-- TLA-3 NETWORK -- ;3-way OXO TLA-3 thru & end Street T intersection - initial override -0x5C536100,0,0,0x51003000,1,0=0x5C536100,0,0,0x5C546080,0,0; conflicting-override -0x5C536100,1,0,0x51003000,1,0=0x5C536100,1,0,0x5C546080,0,0; conflicting-override -0x5C536100,2,0,0x51003000,1,0=0x5C536100,2,0,0x5C546080,0,0; conflicting-override -0x5C536100,3,0,0x51003000,1,0=0x5C536100,3,0,0x5C546080,0,0; conflicting-override +0x5C536100,0,0,0x51003000,1,0=0x5C536100,0,0,0x5C546080,0,0 +0x5C536100,1,0,0x51003000,1,0=0x5C536100,1,0,0x5C546080,0,0 +0x5C536100,2,0,0x51003000,1,0=0x5C536100,2,0,0x5C546080,0,0 +0x5C536100,3,0,0x51003000,1,0=0x5C536100,3,0,0x5C546080,0,0 ; ;3-way OXO TLA-3 thru & end Street T intersection - stabilization 0x51000000,1,0,0x5C546000,1,0=0x51000000,1,0,0x5C546080,1,0 @@ -3594,14 +3594,14 @@ 0x00000300,3,0,0x5C546080,3,0=0x51000100,3,0,0x5C546080,3,0 ; ;4-way OXO + intersection - initial override -0x5C536100,0,0,0x51001000,1,0=0x5C536100,0,0,0x5C546080,0,0; conflicting-override -0x5C536100,1,0,0x51001000,1,0=0x5C536100,1,0,0x5C546080,0,0; conflicting-override -0x5C536100,2,0,0x51001000,1,0=0x5C536100,2,0,0x5C546080,0,0; conflicting-override -0x5C536100,3,0,0x51001000,1,0=0x5C536100,3,0,0x5C546080,0,0; conflicting-override -0x5C536100,0,0,0x51001000,3,0=0x5C536100,0,0,0x5C546080,2,0; conflicting-override -0x5C536100,1,0,0x51001000,3,0=0x5C536100,1,0,0x5C546080,2,0; conflicting-override -0x5C536100,2,0,0x51001000,3,0=0x5C536100,2,0,0x5C546080,2,0; conflicting-override -0x5C536100,3,0,0x51001000,3,0=0x5C536100,3,0,0x5C546080,2,0; conflicting-override +0x5C536100,0,0,0x51001000,1,0=0x5C536100,0,0,0x5C546080,0,0 +0x5C536100,1,0,0x51001000,1,0=0x5C536100,1,0,0x5C546080,0,0 +0x5C536100,2,0,0x51001000,1,0=0x5C536100,2,0,0x5C546080,0,0 +0x5C536100,3,0,0x51001000,1,0=0x5C536100,3,0,0x5C546080,0,0 +0x5C536100,0,0,0x51001000,3,0=0x5C536100,0,0,0x5C546080,2,0 +0x5C536100,1,0,0x51001000,3,0=0x5C536100,1,0,0x5C546080,2,0 +0x5C536100,2,0,0x51001000,3,0=0x5C536100,2,0,0x5C546080,2,0 +0x5C536100,3,0,0x51001000,3,0=0x5C536100,3,0,0x5C546080,2,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -3750,10 +3750,10 @@ ; ;-- AVE-2 NETWORK -- ;3-way OXO AVE-2 thru & end Street T intersection - initial override -0x5C536100,0,0,0x51013000,1,0=0x5C536100,0,0,0x5C546100,0,0; conflicting-override -0x5C536100,1,0,0x51013000,1,0=0x5C536100,1,0,0x5C546100,0,0; conflicting-override -0x5C536100,2,0,0x51013000,1,0=0x5C536100,2,0,0x5C546100,0,0; conflicting-override -0x5C536100,3,0,0x51013000,1,0=0x5C536100,3,0,0x5C546100,0,0; conflicting-override +0x5C536100,0,0,0x51013000,1,0=0x5C536100,0,0,0x5C546100,0,0 +0x5C536100,1,0,0x51013000,1,0=0x5C536100,1,0,0x5C546100,0,0 +0x5C536100,2,0,0x51013000,1,0=0x5C536100,2,0,0x5C546100,0,0 +0x5C536100,3,0,0x51013000,1,0=0x5C536100,3,0,0x5C546100,0,0 ; ;3-way OXO AVE-2 thru & end Street T intersection - stabilization 0x51010000,1,0,0x5C546000,1,0=0x51010000,1,0,0x5C546100,1,0 @@ -3772,14 +3772,14 @@ 0x00000300,3,0,0x5C546100,3,0=0x51010100,3,0,0x5C546100,3,0 ; ;4-way OXO + intersection - initial override -0x5C536100,0,0,0x51011000,1,0=0x5C536100,0,0,0x5C546100,0,0; conflicting-override -0x5C536100,1,0,0x51011000,1,0=0x5C536100,1,0,0x5C546100,0,0; conflicting-override -0x5C536100,2,0,0x51011000,1,0=0x5C536100,2,0,0x5C546100,0,0; conflicting-override -0x5C536100,3,0,0x51011000,1,0=0x5C536100,3,0,0x5C546100,0,0; conflicting-override -0x5C536100,0,0,0x51011000,3,0=0x5C536100,0,0,0x5C546100,2,0; conflicting-override -0x5C536100,1,0,0x51011000,3,0=0x5C536100,1,0,0x5C546100,2,0; conflicting-override -0x5C536100,2,0,0x51011000,3,0=0x5C536100,2,0,0x5C546100,2,0; conflicting-override -0x5C536100,3,0,0x51011000,3,0=0x5C536100,3,0,0x5C546100,2,0; conflicting-override +0x5C536100,0,0,0x51011000,1,0=0x5C536100,0,0,0x5C546100,0,0 +0x5C536100,1,0,0x51011000,1,0=0x5C536100,1,0,0x5C546100,0,0 +0x5C536100,2,0,0x51011000,1,0=0x5C536100,2,0,0x5C546100,0,0 +0x5C536100,3,0,0x51011000,1,0=0x5C536100,3,0,0x5C546100,0,0 +0x5C536100,0,0,0x51011000,3,0=0x5C536100,0,0,0x5C546100,2,0 +0x5C536100,1,0,0x51011000,3,0=0x5C536100,1,0,0x5C546100,2,0 +0x5C536100,2,0,0x51011000,3,0=0x5C536100,2,0,0x5C546100,2,0 +0x5C536100,3,0,0x51011000,3,0=0x5C536100,3,0,0x5C546100,2,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -3928,15 +3928,15 @@ ; ;-- ARD-3 NETWORK -- ;3-way OXO ARD-3 thru & end Street T intersection - initial override -0x5C536100,0,0,0x51023000,1,0=0x5C536100,0,0,0x5C546180,2,0; conflicting-override -0x5C536100,1,0,0x51023000,1,0=0x5C536100,1,0,0x5C546180,2,0; conflicting-override -0x5C536100,2,0,0x51023000,1,0=0x5C536100,2,0,0x5C546180,2,0; conflicting-override -0x5C536100,3,0,0x51023000,1,0=0x5C536100,3,0,0x5C546180,2,0; conflicting-override +0x5C536100,0,0,0x51023000,1,0=0x5C536100,0,0,0x5C546180,2,0 +0x5C536100,1,0,0x51023000,1,0=0x5C536100,1,0,0x5C546180,2,0 +0x5C536100,2,0,0x51023000,1,0=0x5C536100,2,0,0x5C546180,2,0 +0x5C536100,3,0,0x51023000,1,0=0x5C536100,3,0,0x5C546180,2,0 ; -0x5C536100,0,0,0x51023080,1,0=0x5C536100,0,0,0x5C546180,0,0; conflicting-override -0x5C536100,1,0,0x51023080,1,0=0x5C536100,1,0,0x5C546180,0,0; conflicting-override -0x5C536100,2,0,0x51023080,1,0=0x5C536100,2,0,0x5C546180,0,0; conflicting-override -0x5C536100,3,0,0x51023080,1,0=0x5C536100,3,0,0x5C546180,0,0; conflicting-override +0x5C536100,0,0,0x51023080,1,0=0x5C536100,0,0,0x5C546180,0,0 +0x5C536100,1,0,0x51023080,1,0=0x5C536100,1,0,0x5C546180,0,0 +0x5C536100,2,0,0x51023080,1,0=0x5C536100,2,0,0x5C546180,0,0 +0x5C536100,3,0,0x51023080,1,0=0x5C536100,3,0,0x5C546180,0,0 ; ;3-way OXO ARD-3 thru & end Street T intersection - stabilization 0x51020000,1,0,0x5C546000,1,0=0x51020000,1,0,0x5C546180,1,0 @@ -3955,14 +3955,14 @@ 0x00000300,3,0,0x5C546180,3,0=0x51020100,3,0,0x5C546180,3,0 ; ;4-way OXO + intersection - initial override -0x5C536100,0,0,0x51021000,1,0=0x5C536100,0,0,0x5C546180,2,0; conflicting-override -0x5C536100,1,0,0x51021000,1,0=0x5C536100,1,0,0x5C546180,2,0; conflicting-override -0x5C536100,2,0,0x51021000,1,0=0x5C536100,2,0,0x5C546180,2,0; conflicting-override -0x5C536100,3,0,0x51021000,1,0=0x5C536100,3,0,0x5C546180,2,0; conflicting-override -0x5C536100,0,0,0x51021000,3,0=0x5C536100,0,0,0x5C546180,0,0; conflicting-override -0x5C536100,1,0,0x51021000,3,0=0x5C536100,1,0,0x5C546180,0,0; conflicting-override -0x5C536100,2,0,0x51021000,3,0=0x5C536100,2,0,0x5C546180,0,0; conflicting-override -0x5C536100,3,0,0x51021000,3,0=0x5C536100,3,0,0x5C546180,0,0; conflicting-override +0x5C536100,0,0,0x51021000,1,0=0x5C536100,0,0,0x5C546180,2,0 +0x5C536100,1,0,0x51021000,1,0=0x5C536100,1,0,0x5C546180,2,0 +0x5C536100,2,0,0x51021000,1,0=0x5C536100,2,0,0x5C546180,2,0 +0x5C536100,3,0,0x51021000,1,0=0x5C536100,3,0,0x5C546180,2,0 +0x5C536100,0,0,0x51021000,3,0=0x5C536100,0,0,0x5C546180,0,0 +0x5C536100,1,0,0x51021000,3,0=0x5C536100,1,0,0x5C546180,0,0 +0x5C536100,2,0,0x51021000,3,0=0x5C536100,2,0,0x5C546180,0,0 +0x5C536100,3,0,0x51021000,3,0=0x5C536100,3,0,0x5C546180,0,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -4111,10 +4111,10 @@ ; ;-- NRD-4 NETWORK -- ;3-way OXO NRD-4 thru & end Street T intersection - initial override -0x5C536100,0,0,0x51053000,1,0=0x5C536100,0,0,0x5C546200,0,0; conflicting-override -0x5C536100,1,0,0x51053000,1,0=0x5C536100,1,0,0x5C546200,0,0; conflicting-override -0x5C536100,2,0,0x51053000,1,0=0x5C536100,2,0,0x5C546200,0,0; conflicting-override -0x5C536100,3,0,0x51053000,1,0=0x5C536100,3,0,0x5C546200,0,0; conflicting-override +0x5C536100,0,0,0x51053000,1,0=0x5C536100,0,0,0x5C546200,0,0 +0x5C536100,1,0,0x51053000,1,0=0x5C536100,1,0,0x5C546200,0,0 +0x5C536100,2,0,0x51053000,1,0=0x5C536100,2,0,0x5C546200,0,0 +0x5C536100,3,0,0x51053000,1,0=0x5C536100,3,0,0x5C546200,0,0 ; ;3-way OXO NRD-4 thru & end Street T intersection - stabilization 0x51050000,1,0,0x5C546000,1,0=0x51050000,1,0,0x5C546200,1,0 @@ -4133,14 +4133,14 @@ 0x00000300,3,0,0x5C546200,3,0=0x51050100,3,0,0x5C546200,3,0 ; ;4-way OXO + intersection - initial override -0x5C536100,0,0,0x51051000,1,0=0x5C536100,0,0,0x5C546200,0,0; conflicting-override -0x5C536100,1,0,0x51051000,1,0=0x5C536100,1,0,0x5C546200,0,0; conflicting-override -0x5C536100,2,0,0x51051000,1,0=0x5C536100,2,0,0x5C546200,0,0; conflicting-override -0x5C536100,3,0,0x51051000,1,0=0x5C536100,3,0,0x5C546200,0,0; conflicting-override -0x5C536100,0,0,0x51051000,3,0=0x5C536100,0,0,0x5C546200,2,0; conflicting-override -0x5C536100,1,0,0x51051000,3,0=0x5C536100,1,0,0x5C546200,2,0; conflicting-override -0x5C536100,2,0,0x51051000,3,0=0x5C536100,2,0,0x5C546200,2,0; conflicting-override -0x5C536100,3,0,0x51051000,3,0=0x5C536100,3,0,0x5C546200,2,0; conflicting-override +0x5C536100,0,0,0x51051000,1,0=0x5C536100,0,0,0x5C546200,0,0 +0x5C536100,1,0,0x51051000,1,0=0x5C536100,1,0,0x5C546200,0,0 +0x5C536100,2,0,0x51051000,1,0=0x5C536100,2,0,0x5C546200,0,0 +0x5C536100,3,0,0x51051000,1,0=0x5C536100,3,0,0x5C546200,0,0 +0x5C536100,0,0,0x51051000,3,0=0x5C536100,0,0,0x5C546200,2,0 +0x5C536100,1,0,0x51051000,3,0=0x5C536100,1,0,0x5C546200,2,0 +0x5C536100,2,0,0x51051000,3,0=0x5C536100,2,0,0x5C546200,2,0 +0x5C536100,3,0,0x51051000,3,0=0x5C536100,3,0,0x5C546200,2,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -4290,26 +4290,26 @@ ;-- AVENUE & BIDIRECTIONAL MULTI TILE NWM -- ;-- AVENUE (AVE-4) NETWORK -- ;3-way OXO avenue thru & end street short T intersection -0x5C536100,0,0,0x04004400,2,0=0x5C536100,0,0,0x5C546380,0,0; conflicting-override -0x5C536100,1,0,0x04004400,2,0=0x5C536100,1,0,0x5C546380,0,0; conflicting-override -0x5C536100,2,0,0x04004400,2,0=0x5C536100,2,0,0x5C546380,0,0; conflicting-override -0x5C536100,3,0,0x04004400,2,0=0x5C536100,3,0,0x5C546380,0,0; conflicting-override +0x5C536100,0,0,0x04004400,2,0=0x5C536100,0,0,0x5C546380,0,0 +0x5C536100,1,0,0x04004400,2,0=0x5C536100,1,0,0x5C546380,0,0 +0x5C536100,2,0,0x04004400,2,0=0x5C536100,2,0,0x5C546380,0,0 +0x5C536100,3,0,0x04004400,2,0=0x5C536100,3,0,0x5C546380,0,0 ; -0x5C536100,0,1,0x04004400,2,0=0x5C536100,0,1,0x5C546380,0,0; conflicting-override -0x5C536100,1,1,0x04004400,2,0=0x5C536100,1,1,0x5C546380,0,0; conflicting-override -0x5C536100,2,1,0x04004400,2,0=0x5C536100,2,1,0x5C546380,0,0; conflicting-override -0x5C536100,3,1,0x04004400,2,0=0x5C536100,3,1,0x5C546380,0,0; conflicting-override +0x5C536100,0,1,0x04004400,2,0=0x5C536100,0,1,0x5C546380,0,0 +0x5C536100,1,1,0x04004400,2,0=0x5C536100,1,1,0x5C546380,0,0 +0x5C536100,2,1,0x04004400,2,0=0x5C536100,2,1,0x5C546380,0,0 +0x5C536100,3,1,0x04004400,2,0=0x5C536100,3,1,0x5C546380,0,0 ; ;3-way OXO avenue thru & end street long T intersection - start + intersection -0x5C536100,0,0,0x04008300,2,0=0x5C536100,0,0,0x5C546300,0,0; conflicting-override -0x5C536100,1,0,0x04008300,2,0=0x5C536100,1,0,0x5C546300,0,0; conflicting-override -0x5C536100,2,0,0x04008300,2,0=0x5C536100,2,0,0x5C546300,0,0; conflicting-override -0x5C536100,3,0,0x04008300,2,0=0x5C536100,3,0,0x5C546300,0,0; conflicting-override +0x5C536100,0,0,0x04008300,2,0=0x5C536100,0,0,0x5C546300,0,0 +0x5C536100,1,0,0x04008300,2,0=0x5C536100,1,0,0x5C546300,0,0 +0x5C536100,2,0,0x04008300,2,0=0x5C536100,2,0,0x5C546300,0,0 +0x5C536100,3,0,0x04008300,2,0=0x5C536100,3,0,0x5C546300,0,0 ; -0x5C536100,0,1,0x04008300,2,0=0x5C536100,0,1,0x5C546300,0,0; conflicting-override -0x5C536100,1,1,0x04008300,2,0=0x5C536100,1,1,0x5C546300,0,0; conflicting-override -0x5C536100,2,1,0x04008300,2,0=0x5C536100,2,1,0x5C546300,0,0; conflicting-override -0x5C536100,3,1,0x04008300,2,0=0x5C536100,3,1,0x5C546300,0,0; conflicting-override +0x5C536100,0,1,0x04008300,2,0=0x5C536100,0,1,0x5C546300,0,0 +0x5C536100,1,1,0x04008300,2,0=0x5C536100,1,1,0x5C546300,0,0 +0x5C536100,2,1,0x04008300,2,0=0x5C536100,2,1,0x5C546300,0,0 +0x5C536100,3,1,0x04008300,2,0=0x5C536100,3,1,0x5C546300,0,0 ; 0x5C546300,0,0,0x04008600,0,0=0x5C546300,0,0,0x5C546300,2,0 ; @@ -4410,15 +4410,15 @@ ; ;-- TLA-5 NETWORK -- ;3-way OXO TLA-5 thru & end street short T intersection -0x5C536100,0,0,0x51103000,3,0=0x5C536100,0,0,0x5C546480,0,0; conflicting-override -0x5C536100,1,0,0x51103000,3,0=0x5C536100,1,0,0x5C546480,0,0; conflicting-override -0x5C536100,2,0,0x51103000,3,0=0x5C536100,2,0,0x5C546480,0,0; conflicting-override -0x5C536100,3,0,0x51103000,3,0=0x5C536100,3,0,0x5C546480,0,0; conflicting-override +0x5C536100,0,0,0x51103000,3,0=0x5C536100,0,0,0x5C546480,0,0 +0x5C536100,1,0,0x51103000,3,0=0x5C536100,1,0,0x5C546480,0,0 +0x5C536100,2,0,0x51103000,3,0=0x5C536100,2,0,0x5C546480,0,0 +0x5C536100,3,0,0x51103000,3,0=0x5C536100,3,0,0x5C546480,0,0 ; -0x5C536100,0,1,0x51103000,3,0=0x5C536100,0,1,0x5C546480,0,0; conflicting-override -0x5C536100,1,1,0x51103000,3,0=0x5C536100,1,1,0x5C546480,0,0; conflicting-override -0x5C536100,2,1,0x51103000,3,0=0x5C536100,2,1,0x5C546480,0,0; conflicting-override -0x5C536100,3,1,0x51103000,3,0=0x5C536100,3,1,0x5C546480,0,0; conflicting-override +0x5C536100,0,1,0x51103000,3,0=0x5C536100,0,1,0x5C546480,0,0 +0x5C536100,1,1,0x51103000,3,0=0x5C536100,1,1,0x5C546480,0,0 +0x5C536100,2,1,0x51103000,3,0=0x5C536100,2,1,0x5C546480,0,0 +0x5C536100,3,1,0x51103000,3,0=0x5C536100,3,1,0x5C546480,0,0 ; ;3-way OXO TLA-5 thru & end Street Short T intersection - stabilization 0x5C546480,1,0,0x00004B00,1,0=0x5C546480,1,0,0x51100000,1,0 @@ -4440,15 +4440,15 @@ 0x51100000,0,0,0x5C546000,2,0=0x51100000,0,0,0x5C546480,2,0 ; ;3-way OXO TLA-5 thru & end street long T intersection - override start -0x5C536100,0,0,0x51101000,3,0=0x5C536100,0,0,0x5C546400,0,0; conflicting-override -0x5C536100,1,0,0x51101000,3,0=0x5C536100,1,0,0x5C546400,0,0; conflicting-override -0x5C536100,2,0,0x51101000,3,0=0x5C536100,2,0,0x5C546400,0,0; conflicting-override -0x5C536100,3,0,0x51101000,3,0=0x5C536100,3,0,0x5C546400,0,0; conflicting-override +0x5C536100,0,0,0x51101000,3,0=0x5C536100,0,0,0x5C546400,0,0 +0x5C536100,1,0,0x51101000,3,0=0x5C536100,1,0,0x5C546400,0,0 +0x5C536100,2,0,0x51101000,3,0=0x5C536100,2,0,0x5C546400,0,0 +0x5C536100,3,0,0x51101000,3,0=0x5C536100,3,0,0x5C546400,0,0 ; -0x5C536100,0,1,0x51101000,3,0=0x5C536100,0,1,0x5C546400,0,0; conflicting-override -0x5C536100,1,1,0x51101000,3,0=0x5C536100,1,1,0x5C546400,0,0; conflicting-override -0x5C536100,2,1,0x51101000,3,0=0x5C536100,2,1,0x5C546400,0,0; conflicting-override -0x5C536100,3,1,0x51101000,3,0=0x5C536100,3,1,0x5C546400,0,0; conflicting-override +0x5C536100,0,1,0x51101000,3,0=0x5C536100,0,1,0x5C546400,0,0 +0x5C536100,1,1,0x51101000,3,0=0x5C536100,1,1,0x5C546400,0,0 +0x5C536100,2,1,0x51101000,3,0=0x5C536100,2,1,0x5C546400,0,0 +0x5C536100,3,1,0x51101000,3,0=0x5C536100,3,1,0x5C546400,0,0 ; 0x51103080,1,0,0x5C546000,0,0=0x5C546400,0,0,0x5C546400,2,0 0x51103080,1,0,0x5C546000,2,0=0x5C546400,0,0,0x5C546400,2,0 @@ -4576,15 +4576,15 @@ ; ;-- RD-4 NETWORK -- ;3-way OXO RD-4 thru & end street short T intersection -0x5C536100,0,0,0x51133000,3,0=0x5C536100,0,0,0x5C546580,0,0; conflicting-override -0x5C536100,1,0,0x51133000,3,0=0x5C536100,1,0,0x5C546580,0,0; conflicting-override -0x5C536100,2,0,0x51133000,3,0=0x5C536100,2,0,0x5C546580,0,0; conflicting-override -0x5C536100,3,0,0x51133000,3,0=0x5C536100,3,0,0x5C546580,0,0; conflicting-override +0x5C536100,0,0,0x51133000,3,0=0x5C536100,0,0,0x5C546580,0,0 +0x5C536100,1,0,0x51133000,3,0=0x5C536100,1,0,0x5C546580,0,0 +0x5C536100,2,0,0x51133000,3,0=0x5C536100,2,0,0x5C546580,0,0 +0x5C536100,3,0,0x51133000,3,0=0x5C536100,3,0,0x5C546580,0,0 ; -0x5C536100,0,1,0x51133000,3,0=0x5C536100,0,1,0x5C546580,0,0; conflicting-override -0x5C536100,1,1,0x51133000,3,0=0x5C536100,1,1,0x5C546580,0,0; conflicting-override -0x5C536100,2,1,0x51133000,3,0=0x5C536100,2,1,0x5C546580,0,0; conflicting-override -0x5C536100,3,1,0x51133000,3,0=0x5C536100,3,1,0x5C546580,0,0; conflicting-override +0x5C536100,0,1,0x51133000,3,0=0x5C536100,0,1,0x5C546580,0,0 +0x5C536100,1,1,0x51133000,3,0=0x5C536100,1,1,0x5C546580,0,0 +0x5C536100,2,1,0x51133000,3,0=0x5C536100,2,1,0x5C546580,0,0 +0x5C536100,3,1,0x51133000,3,0=0x5C536100,3,1,0x5C546580,0,0 ; ;3-way OXO RD-4 thru & end Street Short T intersection - stabilization 0x5C546580,1,0,0x00004B00,1,0=0x5C546580,1,0,0x51130000,1,0 @@ -4606,15 +4606,15 @@ 0x51130000,0,0,0x5C546000,2,0=0x51130000,0,0,0x5C546580,2,0 ; ;3-way OXO RD-4 thru & end street long T intersection - override start -0x5C536100,0,0,0x51131000,3,0=0x5C536100,0,0,0x5C546500,0,0; conflicting-override -0x5C536100,1,0,0x51131000,3,0=0x5C536100,1,0,0x5C546500,0,0; conflicting-override -0x5C536100,2,0,0x51131000,3,0=0x5C536100,2,0,0x5C546500,0,0; conflicting-override -0x5C536100,3,0,0x51131000,3,0=0x5C536100,3,0,0x5C546500,0,0; conflicting-override +0x5C536100,0,0,0x51131000,3,0=0x5C536100,0,0,0x5C546500,0,0 +0x5C536100,1,0,0x51131000,3,0=0x5C536100,1,0,0x5C546500,0,0 +0x5C536100,2,0,0x51131000,3,0=0x5C536100,2,0,0x5C546500,0,0 +0x5C536100,3,0,0x51131000,3,0=0x5C536100,3,0,0x5C546500,0,0 ; -0x5C536100,0,1,0x51131000,3,0=0x5C536100,0,1,0x5C546500,0,0; conflicting-override -0x5C536100,1,1,0x51131000,3,0=0x5C536100,1,1,0x5C546500,0,0; conflicting-override -0x5C536100,2,1,0x51131000,3,0=0x5C536100,2,1,0x5C546500,0,0; conflicting-override -0x5C536100,3,1,0x51131000,3,0=0x5C536100,3,1,0x5C546500,0,0; conflicting-override +0x5C536100,0,1,0x51131000,3,0=0x5C536100,0,1,0x5C546500,0,0 +0x5C536100,1,1,0x51131000,3,0=0x5C536100,1,1,0x5C546500,0,0 +0x5C536100,2,1,0x51131000,3,0=0x5C536100,2,1,0x5C546500,0,0 +0x5C536100,3,1,0x51131000,3,0=0x5C536100,3,1,0x5C546500,0,0 ; 0x51133080,1,0,0x5C546000,0,0=0x5C546500,0,0,0x5C546500,2,0 0x51133080,1,0,0x5C546000,2,0=0x5C546500,0,0,0x5C546500,2,0 @@ -4681,7 +4681,7 @@ 0x5C546580,3,0,0x04006100,3,0=0x5C546580,3,0,0x51130000,3,0 ; 0x5C546580,0,0,0x04006100,2,0=0x5C546580,0,0,0x51130000,2,0 -0x5C546380,0,0,0x51130000,2,0=0x5C546580,0,0,0x51130000,2,0; conflicting-override +0x5C546380,0,0,0x51130000,2,0=0x5C546580,0,0,0x51130000,2,0 ; ;-Adjacency Stability ;4-way OXO + intersection - continuity @@ -4777,15 +4777,15 @@ ; ;-- RD-6 NETWORK -- ;3-way OXO RD-6 thru & end street short T intersection -0x5C536100,0,0,0x51143000,3,0=0x5C536100,0,0,0x5C546680,0,0; conflicting-override -0x5C536100,1,0,0x51143000,3,0=0x5C536100,1,0,0x5C546680,0,0; conflicting-override -0x5C536100,2,0,0x51143000,3,0=0x5C536100,2,0,0x5C546680,0,0; conflicting-override -0x5C536100,3,0,0x51143000,3,0=0x5C536100,3,0,0x5C546680,0,0; conflicting-override +0x5C536100,0,0,0x51143000,3,0=0x5C536100,0,0,0x5C546680,0,0 +0x5C536100,1,0,0x51143000,3,0=0x5C536100,1,0,0x5C546680,0,0 +0x5C536100,2,0,0x51143000,3,0=0x5C536100,2,0,0x5C546680,0,0 +0x5C536100,3,0,0x51143000,3,0=0x5C536100,3,0,0x5C546680,0,0 ; -0x5C536100,0,1,0x51143000,3,0=0x5C536100,0,1,0x5C546680,0,0; conflicting-override -0x5C536100,1,1,0x51143000,3,0=0x5C536100,1,1,0x5C546680,0,0; conflicting-override -0x5C536100,2,1,0x51143000,3,0=0x5C536100,2,1,0x5C546680,0,0; conflicting-override -0x5C536100,3,1,0x51143000,3,0=0x5C536100,3,1,0x5C546680,0,0; conflicting-override +0x5C536100,0,1,0x51143000,3,0=0x5C536100,0,1,0x5C546680,0,0 +0x5C536100,1,1,0x51143000,3,0=0x5C536100,1,1,0x5C546680,0,0 +0x5C536100,2,1,0x51143000,3,0=0x5C536100,2,1,0x5C546680,0,0 +0x5C536100,3,1,0x51143000,3,0=0x5C536100,3,1,0x5C546680,0,0 ; ;3-way OXO RD-6 thru & end Street Short T intersection - stabilization 0x5C546680,1,0,0x00004B00,1,0=0x5C546680,1,0,0x51140000,1,0 @@ -4802,15 +4802,15 @@ 0x51140000,0,0,0x5C546000,2,0=0x51140000,0,0,0x5C546680,2,0 ; ;3-way OXO RD-6 thru & end street long T intersection - override start -0x5C536100,0,0,0x51141000,3,0=0x5C536100,0,0,0x5C546600,0,0; conflicting-override -0x5C536100,1,0,0x51141000,3,0=0x5C536100,1,0,0x5C546600,0,0; conflicting-override -0x5C536100,2,0,0x51141000,3,0=0x5C536100,2,0,0x5C546600,0,0; conflicting-override -0x5C536100,3,0,0x51141000,3,0=0x5C536100,3,0,0x5C546600,0,0; conflicting-override +0x5C536100,0,0,0x51141000,3,0=0x5C536100,0,0,0x5C546600,0,0 +0x5C536100,1,0,0x51141000,3,0=0x5C536100,1,0,0x5C546600,0,0 +0x5C536100,2,0,0x51141000,3,0=0x5C536100,2,0,0x5C546600,0,0 +0x5C536100,3,0,0x51141000,3,0=0x5C536100,3,0,0x5C546600,0,0 ; -0x5C536100,0,1,0x51141000,3,0=0x5C536100,0,1,0x5C546600,0,0; conflicting-override -0x5C536100,1,1,0x51141000,3,0=0x5C536100,1,1,0x5C546600,0,0; conflicting-override -0x5C536100,2,1,0x51141000,3,0=0x5C536100,2,1,0x5C546600,0,0; conflicting-override -0x5C536100,3,1,0x51141000,3,0=0x5C536100,3,1,0x5C546600,0,0; conflicting-override +0x5C536100,0,1,0x51141000,3,0=0x5C536100,0,1,0x5C546600,0,0 +0x5C536100,1,1,0x51141000,3,0=0x5C536100,1,1,0x5C546600,0,0 +0x5C536100,2,1,0x51141000,3,0=0x5C536100,2,1,0x5C546600,0,0 +0x5C536100,3,1,0x51141000,3,0=0x5C536100,3,1,0x5C546600,0,0 ; ;3-way OXO RD-6 thru & end street long T intersection - stabilization 0x5C546600,0,0,0x00AA0800,1,0=0x5C546600,0,0,0x5C546600,2,0 @@ -4944,14 +4944,14 @@ ;-- TRIPLE TILE (AVE-6, TLA-7) NETWORK -- ;-- TLA-7 / AVE-6 outer lanes -- ; Initial override - crosswalk (4-way street intersection) - pedmall side -0x5C536100,0,0,0x51201000,3,0=0x5C536100,0,0,0x5C546700,0,0; conflicting-override -0x5C536100,1,0,0x51201000,3,0=0x5C536100,1,0,0x5C546700,0,0; conflicting-override -0x5C536100,2,0,0x51201000,3,0=0x5C536100,2,0,0x5C546700,0,0; conflicting-override -0x5C536100,3,0,0x51201000,3,0=0x5C536100,3,0,0x5C546700,0,0; conflicting-override -0x5C536100,0,1,0x51201000,3,0=0x5C536100,0,1,0x5C546700,0,0; conflicting-override -0x5C536100,1,1,0x51201000,3,0=0x5C536100,1,1,0x5C546700,0,0; conflicting-override -0x5C536100,2,1,0x51201000,3,0=0x5C536100,2,1,0x5C546700,0,0; conflicting-override -0x5C536100,3,1,0x51201000,3,0=0x5C536100,3,1,0x5C546700,0,0; conflicting-override +0x5C536100,0,0,0x51201000,3,0=0x5C536100,0,0,0x5C546700,0,0 +0x5C536100,1,0,0x51201000,3,0=0x5C536100,1,0,0x5C546700,0,0 +0x5C536100,2,0,0x51201000,3,0=0x5C536100,2,0,0x5C546700,0,0 +0x5C536100,3,0,0x51201000,3,0=0x5C536100,3,0,0x5C546700,0,0 +0x5C536100,0,1,0x51201000,3,0=0x5C536100,0,1,0x5C546700,0,0 +0x5C536100,1,1,0x51201000,3,0=0x5C536100,1,1,0x5C546700,0,0 +0x5C536100,2,1,0x51201000,3,0=0x5C536100,2,1,0x5C546700,0,0 +0x5C536100,3,1,0x51201000,3,0=0x5C536100,3,1,0x5C546700,0,0 ; ; Override stability - outer crosswalk - continuity 0x5C546700,1,0,0x00004B00,1,0=0x5C546700,1,0,0x51200000,1,0 @@ -4962,14 +4962,14 @@ 0x5C546700,3,0,0x00000300,1,0=0x5C546700,3,0,0x51200100,3,1 ; ; Initial override - end T (street short T) - pedmall side -0x5C536100,0,0,0x51203000,3,0=0x5C536100,0,0,0x5C546780,0,0; conflicting-override -0x5C536100,1,0,0x51203000,3,0=0x5C536100,1,0,0x5C546780,0,0; conflicting-override -0x5C536100,2,0,0x51203000,3,0=0x5C536100,2,0,0x5C546780,0,0; conflicting-override -0x5C536100,3,0,0x51203000,3,0=0x5C536100,3,0,0x5C546780,0,0; conflicting-override -0x5C536100,0,1,0x51203000,3,0=0x5C536100,0,1,0x5C546780,0,0; conflicting-override -0x5C536100,1,1,0x51203000,3,0=0x5C536100,1,1,0x5C546780,0,0; conflicting-override -0x5C536100,2,1,0x51203000,3,0=0x5C536100,2,1,0x5C546780,0,0; conflicting-override -0x5C536100,3,1,0x51203000,3,0=0x5C536100,3,1,0x5C546780,0,0; conflicting-override +0x5C536100,0,0,0x51203000,3,0=0x5C536100,0,0,0x5C546780,0,0 +0x5C536100,1,0,0x51203000,3,0=0x5C536100,1,0,0x5C546780,0,0 +0x5C536100,2,0,0x51203000,3,0=0x5C536100,2,0,0x5C546780,0,0 +0x5C536100,3,0,0x51203000,3,0=0x5C536100,3,0,0x5C546780,0,0 +0x5C536100,0,1,0x51203000,3,0=0x5C536100,0,1,0x5C546780,0,0 +0x5C536100,1,1,0x51203000,3,0=0x5C536100,1,1,0x5C546780,0,0 +0x5C536100,2,1,0x51203000,3,0=0x5C536100,2,1,0x5C546780,0,0 +0x5C536100,3,1,0x51203000,3,0=0x5C536100,3,1,0x5C546780,0,0 ; ; Override stability - end T - median side 0x5C546700,0,0,0x51200080,0,0=0x5C546780,0,0,0x51200080,0,0 diff --git a/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c7_DraggableMall_Street_retrowave_custom_RHD.txt b/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c7_DraggableMall_Street_retrowave_custom_RHD.txt index e131ab51f..b9a366855 100644 --- a/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c7_DraggableMall_Street_retrowave_custom_RHD.txt +++ b/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c7_DraggableMall_Street_retrowave_custom_RHD.txt @@ -3410,20 +3410,20 @@ ;-- ROAD & BIDIRECTIONAL SINGLE TILE NWM -- ;-- ROAD (RD-2) NETWORK -- ;3-way OXO road thru & end street T intersection - initial override -0x5C537100,0,0,0x00AA0800,1,0=0x5C537100,0,0,0x5C547000,0,0; conflicting-override -0x5C537100,1,0,0x00AA0800,1,0=0x5C537100,1,0,0x5C547000,0,0; conflicting-override -0x5C537100,2,0,0x00AA0800,1,0=0x5C537100,2,0,0x5C547000,0,0; conflicting-override -0x5C537100,3,0,0x00AA0800,1,0=0x5C537100,3,0,0x5C547000,0,0; conflicting-override +0x5C537100,0,0,0x00AA0800,1,0=0x5C537100,0,0,0x5C547000,0,0 +0x5C537100,1,0,0x00AA0800,1,0=0x5C537100,1,0,0x5C547000,0,0 +0x5C537100,2,0,0x00AA0800,1,0=0x5C537100,2,0,0x5C547000,0,0 +0x5C537100,3,0,0x00AA0800,1,0=0x5C537100,3,0,0x5C547000,0,0 ; ;4-way OXO + intersection - initial override -0x5C537100,0,0,0x00AA0A00,1,0=0x5C537100,0,0,0x5C547000,0,0; conflicting-override -0x5C537100,1,0,0x00AA0A00,1,0=0x5C537100,1,0,0x5C547000,0,0; conflicting-override -0x5C537100,2,0,0x00AA0A00,1,0=0x5C537100,2,0,0x5C547000,0,0; conflicting-override -0x5C537100,3,0,0x00AA0A00,1,0=0x5C537100,3,0,0x5C547000,0,0; conflicting-override -0x5C537100,0,0,0x00AA0A00,3,0=0x5C537100,0,0,0x5C547000,0,0; conflicting-override -0x5C537100,1,0,0x00AA0A00,3,0=0x5C537100,1,0,0x5C547000,0,0; conflicting-override -0x5C537100,2,0,0x00AA0A00,3,0=0x5C537100,2,0,0x5C547000,0,0; conflicting-override -0x5C537100,3,0,0x00AA0A00,3,0=0x5C537100,3,0,0x5C547000,0,0; conflicting-override +0x5C537100,0,0,0x00AA0A00,1,0=0x5C537100,0,0,0x5C547000,0,0 +0x5C537100,1,0,0x00AA0A00,1,0=0x5C537100,1,0,0x5C547000,0,0 +0x5C537100,2,0,0x00AA0A00,1,0=0x5C537100,2,0,0x5C547000,0,0 +0x5C537100,3,0,0x00AA0A00,1,0=0x5C537100,3,0,0x5C547000,0,0 +0x5C537100,0,0,0x00AA0A00,3,0=0x5C537100,0,0,0x5C547000,0,0 +0x5C537100,1,0,0x00AA0A00,3,0=0x5C537100,1,0,0x5C547000,0,0 +0x5C537100,2,0,0x00AA0A00,3,0=0x5C537100,2,0,0x5C547000,0,0 +0x5C537100,3,0,0x00AA0A00,3,0=0x5C537100,3,0,0x5C547000,0,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -3572,10 +3572,10 @@ ; ;-- TLA-3 NETWORK -- ;3-way OXO TLA-3 thru & end Street T intersection - initial override -0x5C537100,0,0,0x51003000,1,0=0x5C537100,0,0,0x5C547080,0,0; conflicting-override -0x5C537100,1,0,0x51003000,1,0=0x5C537100,1,0,0x5C547080,0,0; conflicting-override -0x5C537100,2,0,0x51003000,1,0=0x5C537100,2,0,0x5C547080,0,0; conflicting-override -0x5C537100,3,0,0x51003000,1,0=0x5C537100,3,0,0x5C547080,0,0; conflicting-override +0x5C537100,0,0,0x51003000,1,0=0x5C537100,0,0,0x5C547080,0,0 +0x5C537100,1,0,0x51003000,1,0=0x5C537100,1,0,0x5C547080,0,0 +0x5C537100,2,0,0x51003000,1,0=0x5C537100,2,0,0x5C547080,0,0 +0x5C537100,3,0,0x51003000,1,0=0x5C537100,3,0,0x5C547080,0,0 ; ;3-way OXO TLA-3 thru & end Street T intersection - stabilization 0x51000000,1,0,0x5C547000,1,0=0x51000000,1,0,0x5C547080,1,0 @@ -3594,14 +3594,14 @@ 0x00000300,3,0,0x5C547080,3,0=0x51000100,3,0,0x5C547080,3,0 ; ;4-way OXO + intersection - initial override -0x5C537100,0,0,0x51001000,1,0=0x5C537100,0,0,0x5C547080,0,0; conflicting-override -0x5C537100,1,0,0x51001000,1,0=0x5C537100,1,0,0x5C547080,0,0; conflicting-override -0x5C537100,2,0,0x51001000,1,0=0x5C537100,2,0,0x5C547080,0,0; conflicting-override -0x5C537100,3,0,0x51001000,1,0=0x5C537100,3,0,0x5C547080,0,0; conflicting-override -0x5C537100,0,0,0x51001000,3,0=0x5C537100,0,0,0x5C547080,2,0; conflicting-override -0x5C537100,1,0,0x51001000,3,0=0x5C537100,1,0,0x5C547080,2,0; conflicting-override -0x5C537100,2,0,0x51001000,3,0=0x5C537100,2,0,0x5C547080,2,0; conflicting-override -0x5C537100,3,0,0x51001000,3,0=0x5C537100,3,0,0x5C547080,2,0; conflicting-override +0x5C537100,0,0,0x51001000,1,0=0x5C537100,0,0,0x5C547080,0,0 +0x5C537100,1,0,0x51001000,1,0=0x5C537100,1,0,0x5C547080,0,0 +0x5C537100,2,0,0x51001000,1,0=0x5C537100,2,0,0x5C547080,0,0 +0x5C537100,3,0,0x51001000,1,0=0x5C537100,3,0,0x5C547080,0,0 +0x5C537100,0,0,0x51001000,3,0=0x5C537100,0,0,0x5C547080,2,0 +0x5C537100,1,0,0x51001000,3,0=0x5C537100,1,0,0x5C547080,2,0 +0x5C537100,2,0,0x51001000,3,0=0x5C537100,2,0,0x5C547080,2,0 +0x5C537100,3,0,0x51001000,3,0=0x5C537100,3,0,0x5C547080,2,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -3750,10 +3750,10 @@ ; ;-- AVE-2 NETWORK -- ;3-way OXO AVE-2 thru & end Street T intersection - initial override -0x5C537100,0,0,0x51013000,1,0=0x5C537100,0,0,0x5C547100,0,0; conflicting-override -0x5C537100,1,0,0x51013000,1,0=0x5C537100,1,0,0x5C547100,0,0; conflicting-override -0x5C537100,2,0,0x51013000,1,0=0x5C537100,2,0,0x5C547100,0,0; conflicting-override -0x5C537100,3,0,0x51013000,1,0=0x5C537100,3,0,0x5C547100,0,0; conflicting-override +0x5C537100,0,0,0x51013000,1,0=0x5C537100,0,0,0x5C547100,0,0 +0x5C537100,1,0,0x51013000,1,0=0x5C537100,1,0,0x5C547100,0,0 +0x5C537100,2,0,0x51013000,1,0=0x5C537100,2,0,0x5C547100,0,0 +0x5C537100,3,0,0x51013000,1,0=0x5C537100,3,0,0x5C547100,0,0 ; ;3-way OXO AVE-2 thru & end Street T intersection - stabilization 0x51010000,1,0,0x5C547000,1,0=0x51010000,1,0,0x5C547100,1,0 @@ -3772,14 +3772,14 @@ 0x00000300,3,0,0x5C547100,3,0=0x51010100,3,0,0x5C547100,3,0 ; ;4-way OXO + intersection - initial override -0x5C537100,0,0,0x51011000,1,0=0x5C537100,0,0,0x5C547100,0,0; conflicting-override -0x5C537100,1,0,0x51011000,1,0=0x5C537100,1,0,0x5C547100,0,0; conflicting-override -0x5C537100,2,0,0x51011000,1,0=0x5C537100,2,0,0x5C547100,0,0; conflicting-override -0x5C537100,3,0,0x51011000,1,0=0x5C537100,3,0,0x5C547100,0,0; conflicting-override -0x5C537100,0,0,0x51011000,3,0=0x5C537100,0,0,0x5C547100,2,0; conflicting-override -0x5C537100,1,0,0x51011000,3,0=0x5C537100,1,0,0x5C547100,2,0; conflicting-override -0x5C537100,2,0,0x51011000,3,0=0x5C537100,2,0,0x5C547100,2,0; conflicting-override -0x5C537100,3,0,0x51011000,3,0=0x5C537100,3,0,0x5C547100,2,0; conflicting-override +0x5C537100,0,0,0x51011000,1,0=0x5C537100,0,0,0x5C547100,0,0 +0x5C537100,1,0,0x51011000,1,0=0x5C537100,1,0,0x5C547100,0,0 +0x5C537100,2,0,0x51011000,1,0=0x5C537100,2,0,0x5C547100,0,0 +0x5C537100,3,0,0x51011000,1,0=0x5C537100,3,0,0x5C547100,0,0 +0x5C537100,0,0,0x51011000,3,0=0x5C537100,0,0,0x5C547100,2,0 +0x5C537100,1,0,0x51011000,3,0=0x5C537100,1,0,0x5C547100,2,0 +0x5C537100,2,0,0x51011000,3,0=0x5C537100,2,0,0x5C547100,2,0 +0x5C537100,3,0,0x51011000,3,0=0x5C537100,3,0,0x5C547100,2,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -3928,15 +3928,15 @@ ; ;-- ARD-3 NETWORK -- ;3-way OXO ARD-3 thru & end Street T intersection - initial override -0x5C537100,0,0,0x51023000,1,0=0x5C537100,0,0,0x5C547180,2,0; conflicting-override -0x5C537100,1,0,0x51023000,1,0=0x5C537100,1,0,0x5C547180,2,0; conflicting-override -0x5C537100,2,0,0x51023000,1,0=0x5C537100,2,0,0x5C547180,2,0; conflicting-override -0x5C537100,3,0,0x51023000,1,0=0x5C537100,3,0,0x5C547180,2,0; conflicting-override +0x5C537100,0,0,0x51023000,1,0=0x5C537100,0,0,0x5C547180,2,0 +0x5C537100,1,0,0x51023000,1,0=0x5C537100,1,0,0x5C547180,2,0 +0x5C537100,2,0,0x51023000,1,0=0x5C537100,2,0,0x5C547180,2,0 +0x5C537100,3,0,0x51023000,1,0=0x5C537100,3,0,0x5C547180,2,0 ; -0x5C537100,0,0,0x51023080,1,0=0x5C537100,0,0,0x5C547180,0,0; conflicting-override -0x5C537100,1,0,0x51023080,1,0=0x5C537100,1,0,0x5C547180,0,0; conflicting-override -0x5C537100,2,0,0x51023080,1,0=0x5C537100,2,0,0x5C547180,0,0; conflicting-override -0x5C537100,3,0,0x51023080,1,0=0x5C537100,3,0,0x5C547180,0,0; conflicting-override +0x5C537100,0,0,0x51023080,1,0=0x5C537100,0,0,0x5C547180,0,0 +0x5C537100,1,0,0x51023080,1,0=0x5C537100,1,0,0x5C547180,0,0 +0x5C537100,2,0,0x51023080,1,0=0x5C537100,2,0,0x5C547180,0,0 +0x5C537100,3,0,0x51023080,1,0=0x5C537100,3,0,0x5C547180,0,0 ; ;3-way OXO ARD-3 thru & end Street T intersection - stabilization 0x51020000,1,0,0x5C547000,1,0=0x51020000,1,0,0x5C547180,1,0 @@ -3955,14 +3955,14 @@ 0x00000300,3,0,0x5C547180,3,0=0x51020100,3,0,0x5C547180,3,0 ; ;4-way OXO + intersection - initial override -0x5C537100,0,0,0x51021000,1,0=0x5C537100,0,0,0x5C547180,2,0; conflicting-override -0x5C537100,1,0,0x51021000,1,0=0x5C537100,1,0,0x5C547180,2,0; conflicting-override -0x5C537100,2,0,0x51021000,1,0=0x5C537100,2,0,0x5C547180,2,0; conflicting-override -0x5C537100,3,0,0x51021000,1,0=0x5C537100,3,0,0x5C547180,2,0; conflicting-override -0x5C537100,0,0,0x51021000,3,0=0x5C537100,0,0,0x5C547180,0,0; conflicting-override -0x5C537100,1,0,0x51021000,3,0=0x5C537100,1,0,0x5C547180,0,0; conflicting-override -0x5C537100,2,0,0x51021000,3,0=0x5C537100,2,0,0x5C547180,0,0; conflicting-override -0x5C537100,3,0,0x51021000,3,0=0x5C537100,3,0,0x5C547180,0,0; conflicting-override +0x5C537100,0,0,0x51021000,1,0=0x5C537100,0,0,0x5C547180,2,0 +0x5C537100,1,0,0x51021000,1,0=0x5C537100,1,0,0x5C547180,2,0 +0x5C537100,2,0,0x51021000,1,0=0x5C537100,2,0,0x5C547180,2,0 +0x5C537100,3,0,0x51021000,1,0=0x5C537100,3,0,0x5C547180,2,0 +0x5C537100,0,0,0x51021000,3,0=0x5C537100,0,0,0x5C547180,0,0 +0x5C537100,1,0,0x51021000,3,0=0x5C537100,1,0,0x5C547180,0,0 +0x5C537100,2,0,0x51021000,3,0=0x5C537100,2,0,0x5C547180,0,0 +0x5C537100,3,0,0x51021000,3,0=0x5C537100,3,0,0x5C547180,0,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -4111,10 +4111,10 @@ ; ;-- NRD-4 NETWORK -- ;3-way OXO NRD-4 thru & end Street T intersection - initial override -0x5C537100,0,0,0x51053000,1,0=0x5C537100,0,0,0x5C547200,0,0; conflicting-override -0x5C537100,1,0,0x51053000,1,0=0x5C537100,1,0,0x5C547200,0,0; conflicting-override -0x5C537100,2,0,0x51053000,1,0=0x5C537100,2,0,0x5C547200,0,0; conflicting-override -0x5C537100,3,0,0x51053000,1,0=0x5C537100,3,0,0x5C547200,0,0; conflicting-override +0x5C537100,0,0,0x51053000,1,0=0x5C537100,0,0,0x5C547200,0,0 +0x5C537100,1,0,0x51053000,1,0=0x5C537100,1,0,0x5C547200,0,0 +0x5C537100,2,0,0x51053000,1,0=0x5C537100,2,0,0x5C547200,0,0 +0x5C537100,3,0,0x51053000,1,0=0x5C537100,3,0,0x5C547200,0,0 ; ;3-way OXO NRD-4 thru & end Street T intersection - stabilization 0x51050000,1,0,0x5C547000,1,0=0x51050000,1,0,0x5C547200,1,0 @@ -4133,14 +4133,14 @@ 0x00000300,3,0,0x5C547200,3,0=0x51050100,3,0,0x5C547200,3,0 ; ;4-way OXO + intersection - initial override -0x5C537100,0,0,0x51051000,1,0=0x5C537100,0,0,0x5C547200,0,0; conflicting-override -0x5C537100,1,0,0x51051000,1,0=0x5C537100,1,0,0x5C547200,0,0; conflicting-override -0x5C537100,2,0,0x51051000,1,0=0x5C537100,2,0,0x5C547200,0,0; conflicting-override -0x5C537100,3,0,0x51051000,1,0=0x5C537100,3,0,0x5C547200,0,0; conflicting-override -0x5C537100,0,0,0x51051000,3,0=0x5C537100,0,0,0x5C547200,2,0; conflicting-override -0x5C537100,1,0,0x51051000,3,0=0x5C537100,1,0,0x5C547200,2,0; conflicting-override -0x5C537100,2,0,0x51051000,3,0=0x5C537100,2,0,0x5C547200,2,0; conflicting-override -0x5C537100,3,0,0x51051000,3,0=0x5C537100,3,0,0x5C547200,2,0; conflicting-override +0x5C537100,0,0,0x51051000,1,0=0x5C537100,0,0,0x5C547200,0,0 +0x5C537100,1,0,0x51051000,1,0=0x5C537100,1,0,0x5C547200,0,0 +0x5C537100,2,0,0x51051000,1,0=0x5C537100,2,0,0x5C547200,0,0 +0x5C537100,3,0,0x51051000,1,0=0x5C537100,3,0,0x5C547200,0,0 +0x5C537100,0,0,0x51051000,3,0=0x5C537100,0,0,0x5C547200,2,0 +0x5C537100,1,0,0x51051000,3,0=0x5C537100,1,0,0x5C547200,2,0 +0x5C537100,2,0,0x51051000,3,0=0x5C537100,2,0,0x5C547200,2,0 +0x5C537100,3,0,0x51051000,3,0=0x5C537100,3,0,0x5C547200,2,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -4290,26 +4290,26 @@ ;-- AVENUE & BIDIRECTIONAL MULTI TILE NWM -- ;-- AVENUE (AVE-4) NETWORK -- ;3-way OXO avenue thru & end street short T intersection -0x5C537100,0,0,0x04004400,2,0=0x5C537100,0,0,0x5C547380,0,0; conflicting-override -0x5C537100,1,0,0x04004400,2,0=0x5C537100,1,0,0x5C547380,0,0; conflicting-override -0x5C537100,2,0,0x04004400,2,0=0x5C537100,2,0,0x5C547380,0,0; conflicting-override -0x5C537100,3,0,0x04004400,2,0=0x5C537100,3,0,0x5C547380,0,0; conflicting-override +0x5C537100,0,0,0x04004400,2,0=0x5C537100,0,0,0x5C547380,0,0 +0x5C537100,1,0,0x04004400,2,0=0x5C537100,1,0,0x5C547380,0,0 +0x5C537100,2,0,0x04004400,2,0=0x5C537100,2,0,0x5C547380,0,0 +0x5C537100,3,0,0x04004400,2,0=0x5C537100,3,0,0x5C547380,0,0 ; -0x5C537100,0,1,0x04004400,2,0=0x5C537100,0,1,0x5C547380,0,0; conflicting-override -0x5C537100,1,1,0x04004400,2,0=0x5C537100,1,1,0x5C547380,0,0; conflicting-override -0x5C537100,2,1,0x04004400,2,0=0x5C537100,2,1,0x5C547380,0,0; conflicting-override -0x5C537100,3,1,0x04004400,2,0=0x5C537100,3,1,0x5C547380,0,0; conflicting-override +0x5C537100,0,1,0x04004400,2,0=0x5C537100,0,1,0x5C547380,0,0 +0x5C537100,1,1,0x04004400,2,0=0x5C537100,1,1,0x5C547380,0,0 +0x5C537100,2,1,0x04004400,2,0=0x5C537100,2,1,0x5C547380,0,0 +0x5C537100,3,1,0x04004400,2,0=0x5C537100,3,1,0x5C547380,0,0 ; ;3-way OXO avenue thru & end street long T intersection - start + intersection -0x5C537100,0,0,0x04008300,2,0=0x5C537100,0,0,0x5C547300,0,0; conflicting-override -0x5C537100,1,0,0x04008300,2,0=0x5C537100,1,0,0x5C547300,0,0; conflicting-override -0x5C537100,2,0,0x04008300,2,0=0x5C537100,2,0,0x5C547300,0,0; conflicting-override -0x5C537100,3,0,0x04008300,2,0=0x5C537100,3,0,0x5C547300,0,0; conflicting-override +0x5C537100,0,0,0x04008300,2,0=0x5C537100,0,0,0x5C547300,0,0 +0x5C537100,1,0,0x04008300,2,0=0x5C537100,1,0,0x5C547300,0,0 +0x5C537100,2,0,0x04008300,2,0=0x5C537100,2,0,0x5C547300,0,0 +0x5C537100,3,0,0x04008300,2,0=0x5C537100,3,0,0x5C547300,0,0 ; -0x5C537100,0,1,0x04008300,2,0=0x5C537100,0,1,0x5C547300,0,0; conflicting-override -0x5C537100,1,1,0x04008300,2,0=0x5C537100,1,1,0x5C547300,0,0; conflicting-override -0x5C537100,2,1,0x04008300,2,0=0x5C537100,2,1,0x5C547300,0,0; conflicting-override -0x5C537100,3,1,0x04008300,2,0=0x5C537100,3,1,0x5C547300,0,0; conflicting-override +0x5C537100,0,1,0x04008300,2,0=0x5C537100,0,1,0x5C547300,0,0 +0x5C537100,1,1,0x04008300,2,0=0x5C537100,1,1,0x5C547300,0,0 +0x5C537100,2,1,0x04008300,2,0=0x5C537100,2,1,0x5C547300,0,0 +0x5C537100,3,1,0x04008300,2,0=0x5C537100,3,1,0x5C547300,0,0 ; 0x5C547300,0,0,0x04008600,0,0=0x5C547300,0,0,0x5C547300,2,0 ; @@ -4410,15 +4410,15 @@ ; ;-- TLA-5 NETWORK -- ;3-way OXO TLA-5 thru & end street short T intersection -0x5C537100,0,0,0x51103000,3,0=0x5C537100,0,0,0x5C547480,0,0; conflicting-override -0x5C537100,1,0,0x51103000,3,0=0x5C537100,1,0,0x5C547480,0,0; conflicting-override -0x5C537100,2,0,0x51103000,3,0=0x5C537100,2,0,0x5C547480,0,0; conflicting-override -0x5C537100,3,0,0x51103000,3,0=0x5C537100,3,0,0x5C547480,0,0; conflicting-override +0x5C537100,0,0,0x51103000,3,0=0x5C537100,0,0,0x5C547480,0,0 +0x5C537100,1,0,0x51103000,3,0=0x5C537100,1,0,0x5C547480,0,0 +0x5C537100,2,0,0x51103000,3,0=0x5C537100,2,0,0x5C547480,0,0 +0x5C537100,3,0,0x51103000,3,0=0x5C537100,3,0,0x5C547480,0,0 ; -0x5C537100,0,1,0x51103000,3,0=0x5C537100,0,1,0x5C547480,0,0; conflicting-override -0x5C537100,1,1,0x51103000,3,0=0x5C537100,1,1,0x5C547480,0,0; conflicting-override -0x5C537100,2,1,0x51103000,3,0=0x5C537100,2,1,0x5C547480,0,0; conflicting-override -0x5C537100,3,1,0x51103000,3,0=0x5C537100,3,1,0x5C547480,0,0; conflicting-override +0x5C537100,0,1,0x51103000,3,0=0x5C537100,0,1,0x5C547480,0,0 +0x5C537100,1,1,0x51103000,3,0=0x5C537100,1,1,0x5C547480,0,0 +0x5C537100,2,1,0x51103000,3,0=0x5C537100,2,1,0x5C547480,0,0 +0x5C537100,3,1,0x51103000,3,0=0x5C537100,3,1,0x5C547480,0,0 ; ;3-way OXO TLA-5 thru & end Street Short T intersection - stabilization 0x5C547480,1,0,0x00004B00,1,0=0x5C547480,1,0,0x51100000,1,0 @@ -4440,15 +4440,15 @@ 0x51100000,0,0,0x5C547000,2,0=0x51100000,0,0,0x5C547480,2,0 ; ;3-way OXO TLA-5 thru & end street long T intersection - override start -0x5C537100,0,0,0x51101000,3,0=0x5C537100,0,0,0x5C547400,0,0; conflicting-override -0x5C537100,1,0,0x51101000,3,0=0x5C537100,1,0,0x5C547400,0,0; conflicting-override -0x5C537100,2,0,0x51101000,3,0=0x5C537100,2,0,0x5C547400,0,0; conflicting-override -0x5C537100,3,0,0x51101000,3,0=0x5C537100,3,0,0x5C547400,0,0; conflicting-override +0x5C537100,0,0,0x51101000,3,0=0x5C537100,0,0,0x5C547400,0,0 +0x5C537100,1,0,0x51101000,3,0=0x5C537100,1,0,0x5C547400,0,0 +0x5C537100,2,0,0x51101000,3,0=0x5C537100,2,0,0x5C547400,0,0 +0x5C537100,3,0,0x51101000,3,0=0x5C537100,3,0,0x5C547400,0,0 ; -0x5C537100,0,1,0x51101000,3,0=0x5C537100,0,1,0x5C547400,0,0; conflicting-override -0x5C537100,1,1,0x51101000,3,0=0x5C537100,1,1,0x5C547400,0,0; conflicting-override -0x5C537100,2,1,0x51101000,3,0=0x5C537100,2,1,0x5C547400,0,0; conflicting-override -0x5C537100,3,1,0x51101000,3,0=0x5C537100,3,1,0x5C547400,0,0; conflicting-override +0x5C537100,0,1,0x51101000,3,0=0x5C537100,0,1,0x5C547400,0,0 +0x5C537100,1,1,0x51101000,3,0=0x5C537100,1,1,0x5C547400,0,0 +0x5C537100,2,1,0x51101000,3,0=0x5C537100,2,1,0x5C547400,0,0 +0x5C537100,3,1,0x51101000,3,0=0x5C537100,3,1,0x5C547400,0,0 ; 0x51103080,1,0,0x5C547000,0,0=0x5C547400,0,0,0x5C547400,2,0 0x51103080,1,0,0x5C547000,2,0=0x5C547400,0,0,0x5C547400,2,0 @@ -4576,15 +4576,15 @@ ; ;-- RD-4 NETWORK -- ;3-way OXO RD-4 thru & end street short T intersection -0x5C537100,0,0,0x51133000,3,0=0x5C537100,0,0,0x5C547580,0,0; conflicting-override -0x5C537100,1,0,0x51133000,3,0=0x5C537100,1,0,0x5C547580,0,0; conflicting-override -0x5C537100,2,0,0x51133000,3,0=0x5C537100,2,0,0x5C547580,0,0; conflicting-override -0x5C537100,3,0,0x51133000,3,0=0x5C537100,3,0,0x5C547580,0,0; conflicting-override +0x5C537100,0,0,0x51133000,3,0=0x5C537100,0,0,0x5C547580,0,0 +0x5C537100,1,0,0x51133000,3,0=0x5C537100,1,0,0x5C547580,0,0 +0x5C537100,2,0,0x51133000,3,0=0x5C537100,2,0,0x5C547580,0,0 +0x5C537100,3,0,0x51133000,3,0=0x5C537100,3,0,0x5C547580,0,0 ; -0x5C537100,0,1,0x51133000,3,0=0x5C537100,0,1,0x5C547580,0,0; conflicting-override -0x5C537100,1,1,0x51133000,3,0=0x5C537100,1,1,0x5C547580,0,0; conflicting-override -0x5C537100,2,1,0x51133000,3,0=0x5C537100,2,1,0x5C547580,0,0; conflicting-override -0x5C537100,3,1,0x51133000,3,0=0x5C537100,3,1,0x5C547580,0,0; conflicting-override +0x5C537100,0,1,0x51133000,3,0=0x5C537100,0,1,0x5C547580,0,0 +0x5C537100,1,1,0x51133000,3,0=0x5C537100,1,1,0x5C547580,0,0 +0x5C537100,2,1,0x51133000,3,0=0x5C537100,2,1,0x5C547580,0,0 +0x5C537100,3,1,0x51133000,3,0=0x5C537100,3,1,0x5C547580,0,0 ; ;3-way OXO RD-4 thru & end Street Short T intersection - stabilization 0x5C547580,1,0,0x00004B00,1,0=0x5C547580,1,0,0x51130000,1,0 @@ -4606,15 +4606,15 @@ 0x51130000,0,0,0x5C547000,2,0=0x51130000,0,0,0x5C547580,2,0 ; ;3-way OXO RD-4 thru & end street long T intersection - override start -0x5C537100,0,0,0x51131000,3,0=0x5C537100,0,0,0x5C547500,0,0; conflicting-override -0x5C537100,1,0,0x51131000,3,0=0x5C537100,1,0,0x5C547500,0,0; conflicting-override -0x5C537100,2,0,0x51131000,3,0=0x5C537100,2,0,0x5C547500,0,0; conflicting-override -0x5C537100,3,0,0x51131000,3,0=0x5C537100,3,0,0x5C547500,0,0; conflicting-override +0x5C537100,0,0,0x51131000,3,0=0x5C537100,0,0,0x5C547500,0,0 +0x5C537100,1,0,0x51131000,3,0=0x5C537100,1,0,0x5C547500,0,0 +0x5C537100,2,0,0x51131000,3,0=0x5C537100,2,0,0x5C547500,0,0 +0x5C537100,3,0,0x51131000,3,0=0x5C537100,3,0,0x5C547500,0,0 ; -0x5C537100,0,1,0x51131000,3,0=0x5C537100,0,1,0x5C547500,0,0; conflicting-override -0x5C537100,1,1,0x51131000,3,0=0x5C537100,1,1,0x5C547500,0,0; conflicting-override -0x5C537100,2,1,0x51131000,3,0=0x5C537100,2,1,0x5C547500,0,0; conflicting-override -0x5C537100,3,1,0x51131000,3,0=0x5C537100,3,1,0x5C547500,0,0; conflicting-override +0x5C537100,0,1,0x51131000,3,0=0x5C537100,0,1,0x5C547500,0,0 +0x5C537100,1,1,0x51131000,3,0=0x5C537100,1,1,0x5C547500,0,0 +0x5C537100,2,1,0x51131000,3,0=0x5C537100,2,1,0x5C547500,0,0 +0x5C537100,3,1,0x51131000,3,0=0x5C537100,3,1,0x5C547500,0,0 ; 0x51133080,1,0,0x5C547000,0,0=0x5C547500,0,0,0x5C547500,2,0 0x51133080,1,0,0x5C547000,2,0=0x5C547500,0,0,0x5C547500,2,0 @@ -4681,7 +4681,7 @@ 0x5C547580,3,0,0x04006100,3,0=0x5C547580,3,0,0x51130000,3,0 ; 0x5C547580,0,0,0x04006100,2,0=0x5C547580,0,0,0x51130000,2,0 -0x5C547380,0,0,0x51130000,2,0=0x5C547580,0,0,0x51130000,2,0; conflicting-override +0x5C547380,0,0,0x51130000,2,0=0x5C547580,0,0,0x51130000,2,0 ; ;-Adjacency Stability ;4-way OXO + intersection - continuity @@ -4777,15 +4777,15 @@ ; ;-- RD-6 NETWORK -- ;3-way OXO RD-6 thru & end street short T intersection -0x5C537100,0,0,0x51143000,3,0=0x5C537100,0,0,0x5C547680,0,0; conflicting-override -0x5C537100,1,0,0x51143000,3,0=0x5C537100,1,0,0x5C547680,0,0; conflicting-override -0x5C537100,2,0,0x51143000,3,0=0x5C537100,2,0,0x5C547680,0,0; conflicting-override -0x5C537100,3,0,0x51143000,3,0=0x5C537100,3,0,0x5C547680,0,0; conflicting-override +0x5C537100,0,0,0x51143000,3,0=0x5C537100,0,0,0x5C547680,0,0 +0x5C537100,1,0,0x51143000,3,0=0x5C537100,1,0,0x5C547680,0,0 +0x5C537100,2,0,0x51143000,3,0=0x5C537100,2,0,0x5C547680,0,0 +0x5C537100,3,0,0x51143000,3,0=0x5C537100,3,0,0x5C547680,0,0 ; -0x5C537100,0,1,0x51143000,3,0=0x5C537100,0,1,0x5C547680,0,0; conflicting-override -0x5C537100,1,1,0x51143000,3,0=0x5C537100,1,1,0x5C547680,0,0; conflicting-override -0x5C537100,2,1,0x51143000,3,0=0x5C537100,2,1,0x5C547680,0,0; conflicting-override -0x5C537100,3,1,0x51143000,3,0=0x5C537100,3,1,0x5C547680,0,0; conflicting-override +0x5C537100,0,1,0x51143000,3,0=0x5C537100,0,1,0x5C547680,0,0 +0x5C537100,1,1,0x51143000,3,0=0x5C537100,1,1,0x5C547680,0,0 +0x5C537100,2,1,0x51143000,3,0=0x5C537100,2,1,0x5C547680,0,0 +0x5C537100,3,1,0x51143000,3,0=0x5C537100,3,1,0x5C547680,0,0 ; ;3-way OXO RD-6 thru & end Street Short T intersection - stabilization 0x5C547680,1,0,0x00004B00,1,0=0x5C547680,1,0,0x51140000,1,0 @@ -4807,15 +4807,15 @@ 0x51140000,0,0,0x5C547000,2,0=0x51140000,0,0,0x5C547680,2,0 ; ;3-way OXO RD-6 thru & end street long T intersection - override start -0x5C537100,0,0,0x51141000,3,0=0x5C537100,0,0,0x5C547600,0,0; conflicting-override -0x5C537100,1,0,0x51141000,3,0=0x5C537100,1,0,0x5C547600,0,0; conflicting-override -0x5C537100,2,0,0x51141000,3,0=0x5C537100,2,0,0x5C547600,0,0; conflicting-override -0x5C537100,3,0,0x51141000,3,0=0x5C537100,3,0,0x5C547600,0,0; conflicting-override +0x5C537100,0,0,0x51141000,3,0=0x5C537100,0,0,0x5C547600,0,0 +0x5C537100,1,0,0x51141000,3,0=0x5C537100,1,0,0x5C547600,0,0 +0x5C537100,2,0,0x51141000,3,0=0x5C537100,2,0,0x5C547600,0,0 +0x5C537100,3,0,0x51141000,3,0=0x5C537100,3,0,0x5C547600,0,0 ; -0x5C537100,0,1,0x51141000,3,0=0x5C537100,0,1,0x5C547600,0,0; conflicting-override -0x5C537100,1,1,0x51141000,3,0=0x5C537100,1,1,0x5C547600,0,0; conflicting-override -0x5C537100,2,1,0x51141000,3,0=0x5C537100,2,1,0x5C547600,0,0; conflicting-override -0x5C537100,3,1,0x51141000,3,0=0x5C537100,3,1,0x5C547600,0,0; conflicting-override +0x5C537100,0,1,0x51141000,3,0=0x5C537100,0,1,0x5C547600,0,0 +0x5C537100,1,1,0x51141000,3,0=0x5C537100,1,1,0x5C547600,0,0 +0x5C537100,2,1,0x51141000,3,0=0x5C537100,2,1,0x5C547600,0,0 +0x5C537100,3,1,0x51141000,3,0=0x5C537100,3,1,0x5C547600,0,0 ; 0x51143080,1,0,0x5C547000,0,0=0x5C547600,0,0,0x5C547600,2,0 0x51143080,1,0,0x5C547000,2,0=0x5C547600,0,0,0x5C547600,2,0 @@ -4944,14 +4944,14 @@ ;-- TRIPLE TILE (AVE-6, TLA-7) NETWORK -- ;-- TLA-7 / AVE-6 outer lanes -- ; Initial override - crosswalk (4-way street intersection) - pedmall side -0x5C537100,0,0,0x51201000,3,0=0x5C537100,0,0,0x5C547700,0,0; conflicting-override -0x5C537100,1,0,0x51201000,3,0=0x5C537100,1,0,0x5C547700,0,0; conflicting-override -0x5C537100,2,0,0x51201000,3,0=0x5C537100,2,0,0x5C547700,0,0; conflicting-override -0x5C537100,3,0,0x51201000,3,0=0x5C537100,3,0,0x5C547700,0,0; conflicting-override -0x5C537100,0,1,0x51201000,3,0=0x5C537100,0,1,0x5C547700,0,0; conflicting-override -0x5C537100,1,1,0x51201000,3,0=0x5C537100,1,1,0x5C547700,0,0; conflicting-override -0x5C537100,2,1,0x51201000,3,0=0x5C537100,2,1,0x5C547700,0,0; conflicting-override -0x5C537100,3,1,0x51201000,3,0=0x5C537100,3,1,0x5C547700,0,0; conflicting-override +0x5C537100,0,0,0x51201000,3,0=0x5C537100,0,0,0x5C547700,0,0 +0x5C537100,1,0,0x51201000,3,0=0x5C537100,1,0,0x5C547700,0,0 +0x5C537100,2,0,0x51201000,3,0=0x5C537100,2,0,0x5C547700,0,0 +0x5C537100,3,0,0x51201000,3,0=0x5C537100,3,0,0x5C547700,0,0 +0x5C537100,0,1,0x51201000,3,0=0x5C537100,0,1,0x5C547700,0,0 +0x5C537100,1,1,0x51201000,3,0=0x5C537100,1,1,0x5C547700,0,0 +0x5C537100,2,1,0x51201000,3,0=0x5C537100,2,1,0x5C547700,0,0 +0x5C537100,3,1,0x51201000,3,0=0x5C537100,3,1,0x5C547700,0,0 ; ; Override stability - outer crosswalk - continuity 0x5C547700,1,0,0x00004B00,1,0=0x5C547700,1,0,0x51200000,1,0 @@ -4962,14 +4962,14 @@ 0x5C547700,3,0,0x00000300,1,0=0x5C547700,3,0,0x51200100,3,1 ; ; Initial override - end T (street short T) - pedmall side -0x5C537100,0,0,0x51203000,3,0=0x5C537100,0,0,0x5C547780,0,0; conflicting-override -0x5C537100,1,0,0x51203000,3,0=0x5C537100,1,0,0x5C547780,0,0; conflicting-override -0x5C537100,2,0,0x51203000,3,0=0x5C537100,2,0,0x5C547780,0,0; conflicting-override -0x5C537100,3,0,0x51203000,3,0=0x5C537100,3,0,0x5C547780,0,0; conflicting-override -0x5C537100,0,1,0x51203000,3,0=0x5C537100,0,1,0x5C547780,0,0; conflicting-override -0x5C537100,1,1,0x51203000,3,0=0x5C537100,1,1,0x5C547780,0,0; conflicting-override -0x5C537100,2,1,0x51203000,3,0=0x5C537100,2,1,0x5C547780,0,0; conflicting-override -0x5C537100,3,1,0x51203000,3,0=0x5C537100,3,1,0x5C547780,0,0; conflicting-override +0x5C537100,0,0,0x51203000,3,0=0x5C537100,0,0,0x5C547780,0,0 +0x5C537100,1,0,0x51203000,3,0=0x5C537100,1,0,0x5C547780,0,0 +0x5C537100,2,0,0x51203000,3,0=0x5C537100,2,0,0x5C547780,0,0 +0x5C537100,3,0,0x51203000,3,0=0x5C537100,3,0,0x5C547780,0,0 +0x5C537100,0,1,0x51203000,3,0=0x5C537100,0,1,0x5C547780,0,0 +0x5C537100,1,1,0x51203000,3,0=0x5C537100,1,1,0x5C547780,0,0 +0x5C537100,2,1,0x51203000,3,0=0x5C537100,2,1,0x5C547780,0,0 +0x5C537100,3,1,0x51203000,3,0=0x5C537100,3,1,0x5C547780,0,0 ; ; Override stability - end T - median side 0x5C547700,0,0,0x51200080,0,0=0x5C547780,0,0,0x51200080,0,0 diff --git a/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c8_DraggableMall_Street_industrial_custom_RHD.txt b/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c8_DraggableMall_Street_industrial_custom_RHD.txt index 6e0651467..3596080bf 100644 --- a/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c8_DraggableMall_Street_industrial_custom_RHD.txt +++ b/Controller/RUL2/15_PedestrianRevolution/Sec15c_Draggable_Pedmalls/Sec15c8_DraggableMall_Street_industrial_custom_RHD.txt @@ -3410,20 +3410,20 @@ ;-- ROAD & BIDIRECTIONAL SINGLE TILE NWM -- ;-- ROAD (RD-2) NETWORK -- ;3-way OXO road thru & end street T intersection - initial override -0x5C538100,0,0,0x00AA0800,1,0=0x5C538100,0,0,0x5C548000,0,0; conflicting-override -0x5C538100,1,0,0x00AA0800,1,0=0x5C538100,1,0,0x5C548000,0,0; conflicting-override -0x5C538100,2,0,0x00AA0800,1,0=0x5C538100,2,0,0x5C548000,0,0; conflicting-override -0x5C538100,3,0,0x00AA0800,1,0=0x5C538100,3,0,0x5C548000,0,0; conflicting-override +0x5C538100,0,0,0x00AA0800,1,0=0x5C538100,0,0,0x5C548000,0,0 +0x5C538100,1,0,0x00AA0800,1,0=0x5C538100,1,0,0x5C548000,0,0 +0x5C538100,2,0,0x00AA0800,1,0=0x5C538100,2,0,0x5C548000,0,0 +0x5C538100,3,0,0x00AA0800,1,0=0x5C538100,3,0,0x5C548000,0,0 ; ;4-way OXO + intersection - initial override -0x5C538100,0,0,0x00AA0A00,1,0=0x5C538100,0,0,0x5C548000,0,0; conflicting-override -0x5C538100,1,0,0x00AA0A00,1,0=0x5C538100,1,0,0x5C548000,0,0; conflicting-override -0x5C538100,2,0,0x00AA0A00,1,0=0x5C538100,2,0,0x5C548000,0,0; conflicting-override -0x5C538100,3,0,0x00AA0A00,1,0=0x5C538100,3,0,0x5C548000,0,0; conflicting-override -0x5C538100,0,0,0x00AA0A00,3,0=0x5C538100,0,0,0x5C548000,0,0; conflicting-override -0x5C538100,1,0,0x00AA0A00,3,0=0x5C538100,1,0,0x5C548000,0,0; conflicting-override -0x5C538100,2,0,0x00AA0A00,3,0=0x5C538100,2,0,0x5C548000,0,0; conflicting-override -0x5C538100,3,0,0x00AA0A00,3,0=0x5C538100,3,0,0x5C548000,0,0; conflicting-override +0x5C538100,0,0,0x00AA0A00,1,0=0x5C538100,0,0,0x5C548000,0,0 +0x5C538100,1,0,0x00AA0A00,1,0=0x5C538100,1,0,0x5C548000,0,0 +0x5C538100,2,0,0x00AA0A00,1,0=0x5C538100,2,0,0x5C548000,0,0 +0x5C538100,3,0,0x00AA0A00,1,0=0x5C538100,3,0,0x5C548000,0,0 +0x5C538100,0,0,0x00AA0A00,3,0=0x5C538100,0,0,0x5C548000,0,0 +0x5C538100,1,0,0x00AA0A00,3,0=0x5C538100,1,0,0x5C548000,0,0 +0x5C538100,2,0,0x00AA0A00,3,0=0x5C538100,2,0,0x5C548000,0,0 +0x5C538100,3,0,0x00AA0A00,3,0=0x5C538100,3,0,0x5C548000,0,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -3572,10 +3572,10 @@ ; ;-- TLA-3 NETWORK -- ;3-way OXO TLA-3 thru & end Street T intersection - initial override -0x5C538100,0,0,0x51003000,1,0=0x5C538100,0,0,0x5C548080,0,0; conflicting-override -0x5C538100,1,0,0x51003000,1,0=0x5C538100,1,0,0x5C548080,0,0; conflicting-override -0x5C538100,2,0,0x51003000,1,0=0x5C538100,2,0,0x5C548080,0,0; conflicting-override -0x5C538100,3,0,0x51003000,1,0=0x5C538100,3,0,0x5C548080,0,0; conflicting-override +0x5C538100,0,0,0x51003000,1,0=0x5C538100,0,0,0x5C548080,0,0 +0x5C538100,1,0,0x51003000,1,0=0x5C538100,1,0,0x5C548080,0,0 +0x5C538100,2,0,0x51003000,1,0=0x5C538100,2,0,0x5C548080,0,0 +0x5C538100,3,0,0x51003000,1,0=0x5C538100,3,0,0x5C548080,0,0 ; ;3-way OXO TLA-3 thru & end Street T intersection - stabilization 0x51000000,1,0,0x5C548000,1,0=0x51000000,1,0,0x5C548080,1,0 @@ -3594,14 +3594,14 @@ 0x00000300,3,0,0x5C548080,3,0=0x51000100,3,0,0x5C548080,3,0 ; ;4-way OXO + intersection - initial override -0x5C538100,0,0,0x51001000,1,0=0x5C538100,0,0,0x5C548080,0,0; conflicting-override -0x5C538100,1,0,0x51001000,1,0=0x5C538100,1,0,0x5C548080,0,0; conflicting-override -0x5C538100,2,0,0x51001000,1,0=0x5C538100,2,0,0x5C548080,0,0; conflicting-override -0x5C538100,3,0,0x51001000,1,0=0x5C538100,3,0,0x5C548080,0,0; conflicting-override -0x5C538100,0,0,0x51001000,3,0=0x5C538100,0,0,0x5C548080,2,0; conflicting-override -0x5C538100,1,0,0x51001000,3,0=0x5C538100,1,0,0x5C548080,2,0; conflicting-override -0x5C538100,2,0,0x51001000,3,0=0x5C538100,2,0,0x5C548080,2,0; conflicting-override -0x5C538100,3,0,0x51001000,3,0=0x5C538100,3,0,0x5C548080,2,0; conflicting-override +0x5C538100,0,0,0x51001000,1,0=0x5C538100,0,0,0x5C548080,0,0 +0x5C538100,1,0,0x51001000,1,0=0x5C538100,1,0,0x5C548080,0,0 +0x5C538100,2,0,0x51001000,1,0=0x5C538100,2,0,0x5C548080,0,0 +0x5C538100,3,0,0x51001000,1,0=0x5C538100,3,0,0x5C548080,0,0 +0x5C538100,0,0,0x51001000,3,0=0x5C538100,0,0,0x5C548080,2,0 +0x5C538100,1,0,0x51001000,3,0=0x5C538100,1,0,0x5C548080,2,0 +0x5C538100,2,0,0x51001000,3,0=0x5C538100,2,0,0x5C548080,2,0 +0x5C538100,3,0,0x51001000,3,0=0x5C538100,3,0,0x5C548080,2,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -3750,10 +3750,10 @@ ; ;-- AVE-2 NETWORK -- ;3-way OXO AVE-2 thru & end Street T intersection - initial override -0x5C538100,0,0,0x51013000,1,0=0x5C538100,0,0,0x5C548100,0,0; conflicting-override -0x5C538100,1,0,0x51013000,1,0=0x5C538100,1,0,0x5C548100,0,0; conflicting-override -0x5C538100,2,0,0x51013000,1,0=0x5C538100,2,0,0x5C548100,0,0; conflicting-override -0x5C538100,3,0,0x51013000,1,0=0x5C538100,3,0,0x5C548100,0,0; conflicting-override +0x5C538100,0,0,0x51013000,1,0=0x5C538100,0,0,0x5C548100,0,0 +0x5C538100,1,0,0x51013000,1,0=0x5C538100,1,0,0x5C548100,0,0 +0x5C538100,2,0,0x51013000,1,0=0x5C538100,2,0,0x5C548100,0,0 +0x5C538100,3,0,0x51013000,1,0=0x5C538100,3,0,0x5C548100,0,0 ; ;3-way OXO AVE-2 thru & end Street T intersection - stabilization 0x51010000,1,0,0x5C548000,1,0=0x51010000,1,0,0x5C548100,1,0 @@ -3772,14 +3772,14 @@ 0x00000300,3,0,0x5C548100,3,0=0x51010100,3,0,0x5C548100,3,0 ; ;4-way OXO + intersection - initial override -0x5C538100,0,0,0x51011000,1,0=0x5C538100,0,0,0x5C548100,0,0; conflicting-override -0x5C538100,1,0,0x51011000,1,0=0x5C538100,1,0,0x5C548100,0,0; conflicting-override -0x5C538100,2,0,0x51011000,1,0=0x5C538100,2,0,0x5C548100,0,0; conflicting-override -0x5C538100,3,0,0x51011000,1,0=0x5C538100,3,0,0x5C548100,0,0; conflicting-override -0x5C538100,0,0,0x51011000,3,0=0x5C538100,0,0,0x5C548100,2,0; conflicting-override -0x5C538100,1,0,0x51011000,3,0=0x5C538100,1,0,0x5C548100,2,0; conflicting-override -0x5C538100,2,0,0x51011000,3,0=0x5C538100,2,0,0x5C548100,2,0; conflicting-override -0x5C538100,3,0,0x51011000,3,0=0x5C538100,3,0,0x5C548100,2,0; conflicting-override +0x5C538100,0,0,0x51011000,1,0=0x5C538100,0,0,0x5C548100,0,0 +0x5C538100,1,0,0x51011000,1,0=0x5C538100,1,0,0x5C548100,0,0 +0x5C538100,2,0,0x51011000,1,0=0x5C538100,2,0,0x5C548100,0,0 +0x5C538100,3,0,0x51011000,1,0=0x5C538100,3,0,0x5C548100,0,0 +0x5C538100,0,0,0x51011000,3,0=0x5C538100,0,0,0x5C548100,2,0 +0x5C538100,1,0,0x51011000,3,0=0x5C538100,1,0,0x5C548100,2,0 +0x5C538100,2,0,0x51011000,3,0=0x5C538100,2,0,0x5C548100,2,0 +0x5C538100,3,0,0x51011000,3,0=0x5C538100,3,0,0x5C548100,2,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -3928,15 +3928,15 @@ ; ;-- ARD-3 NETWORK -- ;3-way OXO ARD-3 thru & end Street T intersection - initial override -0x5C538100,0,0,0x51023000,1,0=0x5C538100,0,0,0x5C548180,2,0; conflicting-override -0x5C538100,1,0,0x51023000,1,0=0x5C538100,1,0,0x5C548180,2,0; conflicting-override -0x5C538100,2,0,0x51023000,1,0=0x5C538100,2,0,0x5C548180,2,0; conflicting-override -0x5C538100,3,0,0x51023000,1,0=0x5C538100,3,0,0x5C548180,2,0; conflicting-override +0x5C538100,0,0,0x51023000,1,0=0x5C538100,0,0,0x5C548180,2,0 +0x5C538100,1,0,0x51023000,1,0=0x5C538100,1,0,0x5C548180,2,0 +0x5C538100,2,0,0x51023000,1,0=0x5C538100,2,0,0x5C548180,2,0 +0x5C538100,3,0,0x51023000,1,0=0x5C538100,3,0,0x5C548180,2,0 ; -0x5C538100,0,0,0x51023080,1,0=0x5C538100,0,0,0x5C548180,0,0; conflicting-override -0x5C538100,1,0,0x51023080,1,0=0x5C538100,1,0,0x5C548180,0,0; conflicting-override -0x5C538100,2,0,0x51023080,1,0=0x5C538100,2,0,0x5C548180,0,0; conflicting-override -0x5C538100,3,0,0x51023080,1,0=0x5C538100,3,0,0x5C548180,0,0; conflicting-override +0x5C538100,0,0,0x51023080,1,0=0x5C538100,0,0,0x5C548180,0,0 +0x5C538100,1,0,0x51023080,1,0=0x5C538100,1,0,0x5C548180,0,0 +0x5C538100,2,0,0x51023080,1,0=0x5C538100,2,0,0x5C548180,0,0 +0x5C538100,3,0,0x51023080,1,0=0x5C538100,3,0,0x5C548180,0,0 ; ;3-way OXO ARD-3 thru & end Street T intersection - stabilization 0x51020000,1,0,0x5C548000,1,0=0x51020000,1,0,0x5C548180,1,0 @@ -3955,14 +3955,14 @@ 0x00000300,3,0,0x5C548180,3,0=0x51020100,3,0,0x5C548180,3,0 ; ;4-way OXO + intersection - initial override -0x5C538100,0,0,0x51021000,1,0=0x5C538100,0,0,0x5C548180,2,0; conflicting-override -0x5C538100,1,0,0x51021000,1,0=0x5C538100,1,0,0x5C548180,2,0; conflicting-override -0x5C538100,2,0,0x51021000,1,0=0x5C538100,2,0,0x5C548180,2,0; conflicting-override -0x5C538100,3,0,0x51021000,1,0=0x5C538100,3,0,0x5C548180,2,0; conflicting-override -0x5C538100,0,0,0x51021000,3,0=0x5C538100,0,0,0x5C548180,0,0; conflicting-override -0x5C538100,1,0,0x51021000,3,0=0x5C538100,1,0,0x5C548180,0,0; conflicting-override -0x5C538100,2,0,0x51021000,3,0=0x5C538100,2,0,0x5C548180,0,0; conflicting-override -0x5C538100,3,0,0x51021000,3,0=0x5C538100,3,0,0x5C548180,0,0; conflicting-override +0x5C538100,0,0,0x51021000,1,0=0x5C538100,0,0,0x5C548180,2,0 +0x5C538100,1,0,0x51021000,1,0=0x5C538100,1,0,0x5C548180,2,0 +0x5C538100,2,0,0x51021000,1,0=0x5C538100,2,0,0x5C548180,2,0 +0x5C538100,3,0,0x51021000,1,0=0x5C538100,3,0,0x5C548180,2,0 +0x5C538100,0,0,0x51021000,3,0=0x5C538100,0,0,0x5C548180,0,0 +0x5C538100,1,0,0x51021000,3,0=0x5C538100,1,0,0x5C548180,0,0 +0x5C538100,2,0,0x51021000,3,0=0x5C538100,2,0,0x5C548180,0,0 +0x5C538100,3,0,0x51021000,3,0=0x5C538100,3,0,0x5C548180,0,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -4111,10 +4111,10 @@ ; ;-- NRD-4 NETWORK -- ;3-way OXO NRD-4 thru & end Street T intersection - initial override -0x5C538100,0,0,0x51053000,1,0=0x5C538100,0,0,0x5C548200,0,0; conflicting-override -0x5C538100,1,0,0x51053000,1,0=0x5C538100,1,0,0x5C548200,0,0; conflicting-override -0x5C538100,2,0,0x51053000,1,0=0x5C538100,2,0,0x5C548200,0,0; conflicting-override -0x5C538100,3,0,0x51053000,1,0=0x5C538100,3,0,0x5C548200,0,0; conflicting-override +0x5C538100,0,0,0x51053000,1,0=0x5C538100,0,0,0x5C548200,0,0 +0x5C538100,1,0,0x51053000,1,0=0x5C538100,1,0,0x5C548200,0,0 +0x5C538100,2,0,0x51053000,1,0=0x5C538100,2,0,0x5C548200,0,0 +0x5C538100,3,0,0x51053000,1,0=0x5C538100,3,0,0x5C548200,0,0 ; ;3-way OXO NRD-4 thru & end Street T intersection - stabilization 0x51050000,1,0,0x5C548000,1,0=0x51050000,1,0,0x5C548200,1,0 @@ -4133,14 +4133,14 @@ 0x00000300,3,0,0x5C548200,3,0=0x51050100,3,0,0x5C548200,3,0 ; ;4-way OXO + intersection - initial override -0x5C538100,0,0,0x51051000,1,0=0x5C538100,0,0,0x5C548200,0,0; conflicting-override -0x5C538100,1,0,0x51051000,1,0=0x5C538100,1,0,0x5C548200,0,0; conflicting-override -0x5C538100,2,0,0x51051000,1,0=0x5C538100,2,0,0x5C548200,0,0; conflicting-override -0x5C538100,3,0,0x51051000,1,0=0x5C538100,3,0,0x5C548200,0,0; conflicting-override -0x5C538100,0,0,0x51051000,3,0=0x5C538100,0,0,0x5C548200,2,0; conflicting-override -0x5C538100,1,0,0x51051000,3,0=0x5C538100,1,0,0x5C548200,2,0; conflicting-override -0x5C538100,2,0,0x51051000,3,0=0x5C538100,2,0,0x5C548200,2,0; conflicting-override -0x5C538100,3,0,0x51051000,3,0=0x5C538100,3,0,0x5C548200,2,0; conflicting-override +0x5C538100,0,0,0x51051000,1,0=0x5C538100,0,0,0x5C548200,0,0 +0x5C538100,1,0,0x51051000,1,0=0x5C538100,1,0,0x5C548200,0,0 +0x5C538100,2,0,0x51051000,1,0=0x5C538100,2,0,0x5C548200,0,0 +0x5C538100,3,0,0x51051000,1,0=0x5C538100,3,0,0x5C548200,0,0 +0x5C538100,0,0,0x51051000,3,0=0x5C538100,0,0,0x5C548200,2,0 +0x5C538100,1,0,0x51051000,3,0=0x5C538100,1,0,0x5C548200,2,0 +0x5C538100,2,0,0x51051000,3,0=0x5C538100,2,0,0x5C548200,2,0 +0x5C538100,3,0,0x51051000,3,0=0x5C538100,3,0,0x5C548200,2,0 ; ;4-way OXO + intersection - continuity ;Through Segment @@ -4290,26 +4290,26 @@ ;-- AVENUE & BIDIRECTIONAL MULTI TILE NWM -- ;-- AVENUE (AVE-4) NETWORK -- ;3-way OXO avenue thru & end street short T intersection -0x5C538100,0,0,0x04004400,2,0=0x5C538100,0,0,0x5C548380,0,0; conflicting-override -0x5C538100,1,0,0x04004400,2,0=0x5C538100,1,0,0x5C548380,0,0; conflicting-override -0x5C538100,2,0,0x04004400,2,0=0x5C538100,2,0,0x5C548380,0,0; conflicting-override -0x5C538100,3,0,0x04004400,2,0=0x5C538100,3,0,0x5C548380,0,0; conflicting-override +0x5C538100,0,0,0x04004400,2,0=0x5C538100,0,0,0x5C548380,0,0 +0x5C538100,1,0,0x04004400,2,0=0x5C538100,1,0,0x5C548380,0,0 +0x5C538100,2,0,0x04004400,2,0=0x5C538100,2,0,0x5C548380,0,0 +0x5C538100,3,0,0x04004400,2,0=0x5C538100,3,0,0x5C548380,0,0 ; -0x5C538100,0,1,0x04004400,2,0=0x5C538100,0,1,0x5C548380,0,0; conflicting-override -0x5C538100,1,1,0x04004400,2,0=0x5C538100,1,1,0x5C548380,0,0; conflicting-override -0x5C538100,2,1,0x04004400,2,0=0x5C538100,2,1,0x5C548380,0,0; conflicting-override -0x5C538100,3,1,0x04004400,2,0=0x5C538100,3,1,0x5C548380,0,0; conflicting-override +0x5C538100,0,1,0x04004400,2,0=0x5C538100,0,1,0x5C548380,0,0 +0x5C538100,1,1,0x04004400,2,0=0x5C538100,1,1,0x5C548380,0,0 +0x5C538100,2,1,0x04004400,2,0=0x5C538100,2,1,0x5C548380,0,0 +0x5C538100,3,1,0x04004400,2,0=0x5C538100,3,1,0x5C548380,0,0 ; ;3-way OXO avenue thru & end street long T intersection - start + intersection -0x5C538100,0,0,0x04008300,2,0=0x5C538100,0,0,0x5C548300,0,0; conflicting-override -0x5C538100,1,0,0x04008300,2,0=0x5C538100,1,0,0x5C548300,0,0; conflicting-override -0x5C538100,2,0,0x04008300,2,0=0x5C538100,2,0,0x5C548300,0,0; conflicting-override -0x5C538100,3,0,0x04008300,2,0=0x5C538100,3,0,0x5C548300,0,0; conflicting-override +0x5C538100,0,0,0x04008300,2,0=0x5C538100,0,0,0x5C548300,0,0 +0x5C538100,1,0,0x04008300,2,0=0x5C538100,1,0,0x5C548300,0,0 +0x5C538100,2,0,0x04008300,2,0=0x5C538100,2,0,0x5C548300,0,0 +0x5C538100,3,0,0x04008300,2,0=0x5C538100,3,0,0x5C548300,0,0 ; -0x5C538100,0,1,0x04008300,2,0=0x5C538100,0,1,0x5C548300,0,0; conflicting-override -0x5C538100,1,1,0x04008300,2,0=0x5C538100,1,1,0x5C548300,0,0; conflicting-override -0x5C538100,2,1,0x04008300,2,0=0x5C538100,2,1,0x5C548300,0,0; conflicting-override -0x5C538100,3,1,0x04008300,2,0=0x5C538100,3,1,0x5C548300,0,0; conflicting-override +0x5C538100,0,1,0x04008300,2,0=0x5C538100,0,1,0x5C548300,0,0 +0x5C538100,1,1,0x04008300,2,0=0x5C538100,1,1,0x5C548300,0,0 +0x5C538100,2,1,0x04008300,2,0=0x5C538100,2,1,0x5C548300,0,0 +0x5C538100,3,1,0x04008300,2,0=0x5C538100,3,1,0x5C548300,0,0 ; 0x5C548300,0,0,0x04008600,0,0=0x5C548300,0,0,0x5C548300,2,0 ; @@ -4410,15 +4410,15 @@ ; ;-- TLA-5 NETWORK -- ;3-way OXO TLA-5 thru & end street short T intersection -0x5C538100,0,0,0x51103000,3,0=0x5C538100,0,0,0x5C548480,0,0; conflicting-override -0x5C538100,1,0,0x51103000,3,0=0x5C538100,1,0,0x5C548480,0,0; conflicting-override -0x5C538100,2,0,0x51103000,3,0=0x5C538100,2,0,0x5C548480,0,0; conflicting-override -0x5C538100,3,0,0x51103000,3,0=0x5C538100,3,0,0x5C548480,0,0; conflicting-override +0x5C538100,0,0,0x51103000,3,0=0x5C538100,0,0,0x5C548480,0,0 +0x5C538100,1,0,0x51103000,3,0=0x5C538100,1,0,0x5C548480,0,0 +0x5C538100,2,0,0x51103000,3,0=0x5C538100,2,0,0x5C548480,0,0 +0x5C538100,3,0,0x51103000,3,0=0x5C538100,3,0,0x5C548480,0,0 ; -0x5C538100,0,1,0x51103000,3,0=0x5C538100,0,1,0x5C548480,0,0; conflicting-override -0x5C538100,1,1,0x51103000,3,0=0x5C538100,1,1,0x5C548480,0,0; conflicting-override -0x5C538100,2,1,0x51103000,3,0=0x5C538100,2,1,0x5C548480,0,0; conflicting-override -0x5C538100,3,1,0x51103000,3,0=0x5C538100,3,1,0x5C548480,0,0; conflicting-override +0x5C538100,0,1,0x51103000,3,0=0x5C538100,0,1,0x5C548480,0,0 +0x5C538100,1,1,0x51103000,3,0=0x5C538100,1,1,0x5C548480,0,0 +0x5C538100,2,1,0x51103000,3,0=0x5C538100,2,1,0x5C548480,0,0 +0x5C538100,3,1,0x51103000,3,0=0x5C538100,3,1,0x5C548480,0,0 ; ;3-way OXO TLA-5 thru & end Street Short T intersection - stabilization 0x5C548480,1,0,0x00004B00,1,0=0x5C548480,1,0,0x51100000,1,0 @@ -4440,15 +4440,15 @@ 0x51100000,0,0,0x5C548000,2,0=0x51100000,0,0,0x5C548480,2,0 ; ;3-way OXO TLA-5 thru & end street long T intersection - override start -0x5C538100,0,0,0x51101000,3,0=0x5C538100,0,0,0x5C548400,0,0; conflicting-override -0x5C538100,1,0,0x51101000,3,0=0x5C538100,1,0,0x5C548400,0,0; conflicting-override -0x5C538100,2,0,0x51101000,3,0=0x5C538100,2,0,0x5C548400,0,0; conflicting-override -0x5C538100,3,0,0x51101000,3,0=0x5C538100,3,0,0x5C548400,0,0; conflicting-override +0x5C538100,0,0,0x51101000,3,0=0x5C538100,0,0,0x5C548400,0,0 +0x5C538100,1,0,0x51101000,3,0=0x5C538100,1,0,0x5C548400,0,0 +0x5C538100,2,0,0x51101000,3,0=0x5C538100,2,0,0x5C548400,0,0 +0x5C538100,3,0,0x51101000,3,0=0x5C538100,3,0,0x5C548400,0,0 ; -0x5C538100,0,1,0x51101000,3,0=0x5C538100,0,1,0x5C548400,0,0; conflicting-override -0x5C538100,1,1,0x51101000,3,0=0x5C538100,1,1,0x5C548400,0,0; conflicting-override -0x5C538100,2,1,0x51101000,3,0=0x5C538100,2,1,0x5C548400,0,0; conflicting-override -0x5C538100,3,1,0x51101000,3,0=0x5C538100,3,1,0x5C548400,0,0; conflicting-override +0x5C538100,0,1,0x51101000,3,0=0x5C538100,0,1,0x5C548400,0,0 +0x5C538100,1,1,0x51101000,3,0=0x5C538100,1,1,0x5C548400,0,0 +0x5C538100,2,1,0x51101000,3,0=0x5C538100,2,1,0x5C548400,0,0 +0x5C538100,3,1,0x51101000,3,0=0x5C538100,3,1,0x5C548400,0,0 ; 0x51103080,1,0,0x5C548000,0,0=0x5C548400,0,0,0x5C548400,2,0 0x51103080,1,0,0x5C548000,2,0=0x5C548400,0,0,0x5C548400,2,0 @@ -4576,15 +4576,15 @@ ; ;-- RD-4 NETWORK -- ;3-way OXO RD-4 thru & end street short T intersection -0x5C538100,0,0,0x51133000,3,0=0x5C538100,0,0,0x5C548580,0,0; conflicting-override -0x5C538100,1,0,0x51133000,3,0=0x5C538100,1,0,0x5C548580,0,0; conflicting-override -0x5C538100,2,0,0x51133000,3,0=0x5C538100,2,0,0x5C548580,0,0; conflicting-override -0x5C538100,3,0,0x51133000,3,0=0x5C538100,3,0,0x5C548580,0,0; conflicting-override +0x5C538100,0,0,0x51133000,3,0=0x5C538100,0,0,0x5C548580,0,0 +0x5C538100,1,0,0x51133000,3,0=0x5C538100,1,0,0x5C548580,0,0 +0x5C538100,2,0,0x51133000,3,0=0x5C538100,2,0,0x5C548580,0,0 +0x5C538100,3,0,0x51133000,3,0=0x5C538100,3,0,0x5C548580,0,0 ; -0x5C538100,0,1,0x51133000,3,0=0x5C538100,0,1,0x5C548580,0,0; conflicting-override -0x5C538100,1,1,0x51133000,3,0=0x5C538100,1,1,0x5C548580,0,0; conflicting-override -0x5C538100,2,1,0x51133000,3,0=0x5C538100,2,1,0x5C548580,0,0; conflicting-override -0x5C538100,3,1,0x51133000,3,0=0x5C538100,3,1,0x5C548580,0,0; conflicting-override +0x5C538100,0,1,0x51133000,3,0=0x5C538100,0,1,0x5C548580,0,0 +0x5C538100,1,1,0x51133000,3,0=0x5C538100,1,1,0x5C548580,0,0 +0x5C538100,2,1,0x51133000,3,0=0x5C538100,2,1,0x5C548580,0,0 +0x5C538100,3,1,0x51133000,3,0=0x5C538100,3,1,0x5C548580,0,0 ; ;3-way OXO RD-4 thru & end Street Short T intersection - stabilization 0x5C548580,1,0,0x00004B00,1,0=0x5C548580,1,0,0x51130000,1,0 @@ -4606,15 +4606,15 @@ 0x51130000,0,0,0x5C548000,2,0=0x51130000,0,0,0x5C548580,2,0 ; ;3-way OXO RD-4 thru & end street long T intersection - override start -0x5C538100,0,0,0x51131000,3,0=0x5C538100,0,0,0x5C548500,0,0; conflicting-override -0x5C538100,1,0,0x51131000,3,0=0x5C538100,1,0,0x5C548500,0,0; conflicting-override -0x5C538100,2,0,0x51131000,3,0=0x5C538100,2,0,0x5C548500,0,0; conflicting-override -0x5C538100,3,0,0x51131000,3,0=0x5C538100,3,0,0x5C548500,0,0; conflicting-override +0x5C538100,0,0,0x51131000,3,0=0x5C538100,0,0,0x5C548500,0,0 +0x5C538100,1,0,0x51131000,3,0=0x5C538100,1,0,0x5C548500,0,0 +0x5C538100,2,0,0x51131000,3,0=0x5C538100,2,0,0x5C548500,0,0 +0x5C538100,3,0,0x51131000,3,0=0x5C538100,3,0,0x5C548500,0,0 ; -0x5C538100,0,1,0x51131000,3,0=0x5C538100,0,1,0x5C548500,0,0; conflicting-override -0x5C538100,1,1,0x51131000,3,0=0x5C538100,1,1,0x5C548500,0,0; conflicting-override -0x5C538100,2,1,0x51131000,3,0=0x5C538100,2,1,0x5C548500,0,0; conflicting-override -0x5C538100,3,1,0x51131000,3,0=0x5C538100,3,1,0x5C548500,0,0; conflicting-override +0x5C538100,0,1,0x51131000,3,0=0x5C538100,0,1,0x5C548500,0,0 +0x5C538100,1,1,0x51131000,3,0=0x5C538100,1,1,0x5C548500,0,0 +0x5C538100,2,1,0x51131000,3,0=0x5C538100,2,1,0x5C548500,0,0 +0x5C538100,3,1,0x51131000,3,0=0x5C538100,3,1,0x5C548500,0,0 ; 0x51133080,1,0,0x5C548000,0,0=0x5C548500,0,0,0x5C548500,2,0 0x51133080,1,0,0x5C548000,2,0=0x5C548500,0,0,0x5C548500,2,0 @@ -4681,7 +4681,7 @@ 0x5C548580,3,0,0x04006100,3,0=0x5C548580,3,0,0x51130000,3,0 ; 0x5C548580,0,0,0x04006100,2,0=0x5C548580,0,0,0x51130000,2,0 -0x5C548380,0,0,0x51130000,2,0=0x5C548580,0,0,0x51130000,2,0; conflicting-override +0x5C548380,0,0,0x51130000,2,0=0x5C548580,0,0,0x51130000,2,0 ; ;-Adjacency Stability ;4-way OXO + intersection - continuity @@ -4777,15 +4777,15 @@ ; ;-- RD-6 NETWORK -- ;3-way OXO RD-6 thru & end street short T intersection -0x5C538100,0,0,0x51143000,3,0=0x5C538100,0,0,0x5C548680,0,0; conflicting-override -0x5C538100,1,0,0x51143000,3,0=0x5C538100,1,0,0x5C548680,0,0; conflicting-override -0x5C538100,2,0,0x51143000,3,0=0x5C538100,2,0,0x5C548680,0,0; conflicting-override -0x5C538100,3,0,0x51143000,3,0=0x5C538100,3,0,0x5C548680,0,0; conflicting-override +0x5C538100,0,0,0x51143000,3,0=0x5C538100,0,0,0x5C548680,0,0 +0x5C538100,1,0,0x51143000,3,0=0x5C538100,1,0,0x5C548680,0,0 +0x5C538100,2,0,0x51143000,3,0=0x5C538100,2,0,0x5C548680,0,0 +0x5C538100,3,0,0x51143000,3,0=0x5C538100,3,0,0x5C548680,0,0 ; -0x5C538100,0,1,0x51143000,3,0=0x5C538100,0,1,0x5C548680,0,0; conflicting-override -0x5C538100,1,1,0x51143000,3,0=0x5C538100,1,1,0x5C548680,0,0; conflicting-override -0x5C538100,2,1,0x51143000,3,0=0x5C538100,2,1,0x5C548680,0,0; conflicting-override -0x5C538100,3,1,0x51143000,3,0=0x5C538100,3,1,0x5C548680,0,0; conflicting-override +0x5C538100,0,1,0x51143000,3,0=0x5C538100,0,1,0x5C548680,0,0 +0x5C538100,1,1,0x51143000,3,0=0x5C538100,1,1,0x5C548680,0,0 +0x5C538100,2,1,0x51143000,3,0=0x5C538100,2,1,0x5C548680,0,0 +0x5C538100,3,1,0x51143000,3,0=0x5C538100,3,1,0x5C548680,0,0 ; ;3-way OXO RD-6 thru & end Street Short T intersection - stabilization 0x5C548680,1,0,0x00004B00,1,0=0x5C548680,1,0,0x51140000,1,0 @@ -4807,15 +4807,15 @@ 0x51140000,0,0,0x5C548000,2,0=0x51140000,0,0,0x5C548680,2,0 ; ;3-way OXO RD-6 thru & end street long T intersection - override start -0x5C538100,0,0,0x51141000,3,0=0x5C538100,0,0,0x5C548600,0,0; conflicting-override -0x5C538100,1,0,0x51141000,3,0=0x5C538100,1,0,0x5C548600,0,0; conflicting-override -0x5C538100,2,0,0x51141000,3,0=0x5C538100,2,0,0x5C548600,0,0; conflicting-override -0x5C538100,3,0,0x51141000,3,0=0x5C538100,3,0,0x5C548600,0,0; conflicting-override +0x5C538100,0,0,0x51141000,3,0=0x5C538100,0,0,0x5C548600,0,0 +0x5C538100,1,0,0x51141000,3,0=0x5C538100,1,0,0x5C548600,0,0 +0x5C538100,2,0,0x51141000,3,0=0x5C538100,2,0,0x5C548600,0,0 +0x5C538100,3,0,0x51141000,3,0=0x5C538100,3,0,0x5C548600,0,0 ; -0x5C538100,0,1,0x51141000,3,0=0x5C538100,0,1,0x5C548600,0,0; conflicting-override -0x5C538100,1,1,0x51141000,3,0=0x5C538100,1,1,0x5C548600,0,0; conflicting-override -0x5C538100,2,1,0x51141000,3,0=0x5C538100,2,1,0x5C548600,0,0; conflicting-override -0x5C538100,3,1,0x51141000,3,0=0x5C538100,3,1,0x5C548600,0,0; conflicting-override +0x5C538100,0,1,0x51141000,3,0=0x5C538100,0,1,0x5C548600,0,0 +0x5C538100,1,1,0x51141000,3,0=0x5C538100,1,1,0x5C548600,0,0 +0x5C538100,2,1,0x51141000,3,0=0x5C538100,2,1,0x5C548600,0,0 +0x5C538100,3,1,0x51141000,3,0=0x5C538100,3,1,0x5C548600,0,0 ; 0x51143080,1,0,0x5C548000,0,0=0x5C548600,0,0,0x5C548600,2,0 0x51143080,1,0,0x5C548000,2,0=0x5C548600,0,0,0x5C548600,2,0 @@ -4944,14 +4944,14 @@ ;-- TRIPLE TILE (AVE-6, TLA-7) NETWORK -- ;-- TLA-7 / AVE-6 outer lanes -- ; Initial override - crosswalk (4-way street intersection) - pedmall side -0x5C538100,0,0,0x51201000,3,0=0x5C538100,0,0,0x5C548700,0,0; conflicting-override -0x5C538100,1,0,0x51201000,3,0=0x5C538100,1,0,0x5C548700,0,0; conflicting-override -0x5C538100,2,0,0x51201000,3,0=0x5C538100,2,0,0x5C548700,0,0; conflicting-override -0x5C538100,3,0,0x51201000,3,0=0x5C538100,3,0,0x5C548700,0,0; conflicting-override -0x5C538100,0,1,0x51201000,3,0=0x5C538100,0,1,0x5C548700,0,0; conflicting-override -0x5C538100,1,1,0x51201000,3,0=0x5C538100,1,1,0x5C548700,0,0; conflicting-override -0x5C538100,2,1,0x51201000,3,0=0x5C538100,2,1,0x5C548700,0,0; conflicting-override -0x5C538100,3,1,0x51201000,3,0=0x5C538100,3,1,0x5C548700,0,0; conflicting-override +0x5C538100,0,0,0x51201000,3,0=0x5C538100,0,0,0x5C548700,0,0 +0x5C538100,1,0,0x51201000,3,0=0x5C538100,1,0,0x5C548700,0,0 +0x5C538100,2,0,0x51201000,3,0=0x5C538100,2,0,0x5C548700,0,0 +0x5C538100,3,0,0x51201000,3,0=0x5C538100,3,0,0x5C548700,0,0 +0x5C538100,0,1,0x51201000,3,0=0x5C538100,0,1,0x5C548700,0,0 +0x5C538100,1,1,0x51201000,3,0=0x5C538100,1,1,0x5C548700,0,0 +0x5C538100,2,1,0x51201000,3,0=0x5C538100,2,1,0x5C548700,0,0 +0x5C538100,3,1,0x51201000,3,0=0x5C538100,3,1,0x5C548700,0,0 ; ; Override stability - outer crosswalk - continuity 0x5C548700,1,0,0x00004B00,1,0=0x5C548700,1,0,0x51200000,1,0 @@ -4962,14 +4962,14 @@ 0x5C548700,3,0,0x00000300,1,0=0x5C548700,3,0,0x51200100,3,1 ; ; Initial override - end T (street short T) - pedmall side -0x5C538100,0,0,0x51203000,3,0=0x5C538100,0,0,0x5C548780,0,0; conflicting-override -0x5C538100,1,0,0x51203000,3,0=0x5C538100,1,0,0x5C548780,0,0; conflicting-override -0x5C538100,2,0,0x51203000,3,0=0x5C538100,2,0,0x5C548780,0,0; conflicting-override -0x5C538100,3,0,0x51203000,3,0=0x5C538100,3,0,0x5C548780,0,0; conflicting-override -0x5C538100,0,1,0x51203000,3,0=0x5C538100,0,1,0x5C548780,0,0; conflicting-override -0x5C538100,1,1,0x51203000,3,0=0x5C538100,1,1,0x5C548780,0,0; conflicting-override -0x5C538100,2,1,0x51203000,3,0=0x5C538100,2,1,0x5C548780,0,0; conflicting-override -0x5C538100,3,1,0x51203000,3,0=0x5C538100,3,1,0x5C548780,0,0; conflicting-override +0x5C538100,0,0,0x51203000,3,0=0x5C538100,0,0,0x5C548780,0,0 +0x5C538100,1,0,0x51203000,3,0=0x5C538100,1,0,0x5C548780,0,0 +0x5C538100,2,0,0x51203000,3,0=0x5C538100,2,0,0x5C548780,0,0 +0x5C538100,3,0,0x51203000,3,0=0x5C538100,3,0,0x5C548780,0,0 +0x5C538100,0,1,0x51203000,3,0=0x5C538100,0,1,0x5C548780,0,0 +0x5C538100,1,1,0x51203000,3,0=0x5C538100,1,1,0x5C548780,0,0 +0x5C538100,2,1,0x51203000,3,0=0x5C538100,2,1,0x5C548780,0,0 +0x5C538100,3,1,0x51203000,3,0=0x5C538100,3,1,0x5C548780,0,0 ; ; Override stability - end T - median side 0x5C548700,0,0,0x51200080,0,0=0x5C548780,0,0,0x51200080,0,0 diff --git a/src/main/scala/module/Rul2Model.scala b/src/main/scala/module/Rul2Model.scala index 0d923dceb..f0362664d 100644 --- a/src/main/scala/module/Rul2Model.scala +++ b/src/main/scala/module/Rul2Model.scala @@ -34,7 +34,7 @@ object Rul2Model { } def drivesideOfFile(path: Path): Driveside = { - val name = path.getFileName().toString() + val name = path.getFileName().toString().toLowerCase(java.util.Locale.ENGLISH) if (name.contains("rhd.")) Rhd else if (name.contains("lhd.")) Lhd else RhdAndLhd @@ -102,13 +102,11 @@ object Rul2Model { case Some((rule, RhdAndLhd)) => val key = new EquivRule(rule) if (!rulesShared.contains(key)) { - if (!rulesRhd.contains(key) && !rulesLhd.contains(key)) - rulesShared.addOne(key, rule) - else - require( - rulesRhd.contains(key) == rulesLhd.contains(key), - s"There's an unexpected rule conflict that differs between RHD and LHD: $rule" - ) + (rulesRhd.get(key).filterNot(rulesHaveSameOutput(rule, _)), rulesLhd.get(key).filterNot(rulesHaveSameOutput(rule, _))) match { + case (None, None) => rulesShared.addOne(key, rule) + case (Some(rule2), Some(rule3)) => // ignore, as both RHD/LHD already define a different rule, so this rule never has an effect + case _ => require(false, s"There's an unexpected rule conflict that differs between RHD and LHD: $rule") + } } case None => // ignore } @@ -124,6 +122,17 @@ object Rul2Model { lookupRule.unapply(key).flatMap(rule => applyRule(rule, t0, t1)) } + /** Check if two rules with equivalent LHS actually lead to the same output on + * the RHS (and thus are not at conflict with each other). + */ + def rulesHaveSameOutput(x: Rule[IdTile], y: Rule[IdTile]): Boolean = ( + x(0) == y(0) && x(1) == y(1) && x(2) == y(2) && x(3) == y(3) || + x(0) == y(0) * R2F1 && x(1) == y(1) * R2F1 && x(2) == y(2) * R2F1 && x(3) == y(3) * R2F1 || + x(0) == y(1) * R2F0 && x(1) == y(0) * R2F0 && x(2) == y(3) * R2F0 && x(3) == y(2) * R2F0 || + x(0) == y(1) * R0F1 && x(1) == y(0) * R0F1 && x(2) == y(3) * R0F1 && x(3) == y(2) * R0F1 || + (x(2).id == 0 || x(3).id == 0) && (y(2).id == 0 || y(3).id == 0) + ) + } /** Holds all RUL2 code in memory. Instantiate this with `Rul2Model.load`. */ diff --git a/src/main/scala/scripts/ConflictingOverridesChecker.scala b/src/main/scala/scripts/ConflictingOverridesChecker.scala index 91062b1d6..942b4b40d 100644 --- a/src/main/scala/scripts/ConflictingOverridesChecker.scala +++ b/src/main/scala/scripts/ConflictingOverridesChecker.scala @@ -4,7 +4,7 @@ import java.nio.file.{Files, Paths} import io.github.memo33.metarules.meta.{RotFlip, EquivRule, Rule, IdTile} import RotFlip._ import com.sc4nam.module._ -import Rul2Model.{iterateRulFiles, parseRuleWithRestrictedDriveside, Rhd, Lhd, RhdAndLhd, drivesideOfFile} +import Rul2Model.{iterateRulFiles, parseRuleWithRestrictedDriveside, Driveside, Rhd, Lhd, RhdAndLhd, drivesideOfFile, rulesHaveSameOutput} import SanityChecker.{fileEndsWithNewline, linePatternIncludingNewlines} /** Checks for conflicting/duplicate RUL2 code. There are two modes of operation: @@ -28,7 +28,11 @@ import SanityChecker.{fileEndsWithNewline, linePatternIncludingNewlines} */ object ConflictingOverridesChecker { - val tag = "conflicting-override" + val tagBoth = "conflicting-override" + val tagRhd = "conflicting-override_rhd" // underscore (instead of hyphen) for use with regex word boundaries + val tagLhd = "conflicting-override_lhd" + val tagOf = Map[Driveside, String](RhdAndLhd -> tagBoth, Rhd -> tagRhd, Lhd -> tagLhd) + val allTags = Seq(tagBoth, tagRhd, tagLhd) /** Scans the Controller/RUL2 folder for conflicting duplicate RUL2 code. * @@ -79,35 +83,35 @@ object ConflictingOverridesChecker { val drivesideFile = drivesideOfFile(path) // simultaneously builds the RUL2 cache and looks for conflicts - def findConflict(line: String): Option[(Rule[IdTile], Rule[IdTile])] = { + def findConflict(line: String): Option[(Rule[IdTile], Rule[IdTile], Driveside)] = { parseRuleWithRestrictedDriveside(line, drivesideFile) match { // only the first matching rule is loaded by the game, so we store only the first one read case Some((rule, Rhd)) => val key = new EquivRule(rule) lookupRuleRhd.unapply(key) match { - case Some(rule2) => if (rulesHaveSameOutput(rule, rule2)) None else Some((rule, rule2)) + case Some(rule2) => if (rulesHaveSameOutput(rule, rule2)) None else Some((rule, rule2, RhdAndLhd)) case None => rulesRhd.addOne(key, rule); None } case Some((rule, Lhd)) => val key = new EquivRule(rule) lookupRuleLhd.unapply(key) match { - case Some(rule2) => if (rulesHaveSameOutput(rule, rule2)) None else Some((rule, rule2)) + case Some(rule2) => if (rulesHaveSameOutput(rule, rule2)) None else Some((rule, rule2, RhdAndLhd)) case None => rulesLhd.addOne(key, rule); None } case Some((rule, RhdAndLhd)) => val key = new EquivRule(rule) rulesShared.get(key) match { - case Some(rule2) => if (rulesHaveSameOutput(rule, rule2)) None else Some((rule, rule2)) + case Some(rule2) => if (rulesHaveSameOutput(rule, rule2)) None else Some((rule, rule2, RhdAndLhd)) case None => if (!rulesRhd.contains(key) && !rulesLhd.contains(key)) { rulesShared.addOne(key, rule); None } else { - rulesRhd.get(key) - .flatMap(rule2 => if (rulesHaveSameOutput(rule, rule2)) None else Some((rule, rule2))) - .orElse( - rulesLhd.get(key) - .flatMap(rule2 => if (rulesHaveSameOutput(rule, rule2)) None else Some((rule, rule2))) - ) + (rulesRhd.get(key).filterNot(rulesHaveSameOutput(rule, _)), rulesLhd.get(key).filterNot(rulesHaveSameOutput(rule, _))) match { + case (None, None) => rulesShared.addOne(key, rule); None // no conflict + case (Some(rule2), None) => Some((rule, rule2, Rhd)) // conflict only with RHD rules + case (None, Some(rule3)) => Some((rule, rule3, Lhd)) // conflict only with LHD rules + case (Some(rule2), Some(rule3)) => Some((rule, rule2, RhdAndLhd)) // conflict with both + } } } case None => None @@ -130,8 +134,8 @@ object ConflictingOverridesChecker { val line = scanner.nextLine() lineNumber += 1 findConflict(line) match { - case Some((rule, rule2)) => - if (!line.contains(tag)) { + case Some((rule, rule2, _)) => + if (!line.contains(tagBoth)) { numConflicts += 1 logConflict(rule, rule2) } @@ -149,18 +153,16 @@ object ConflictingOverridesChecker { while (lineScanner.hasNext()) { val line = lineScanner.next() findConflict(line) match { - case Some(_) => + case Some((_, _, driveside)) => numConflicts += 1 - if (line.contains(tag)) { - printer.print(line) // preserving original linebreaks - } else { + if (!line.contains(tagBoth)) { added += 1 - printer.println(s"${line.stripLineEnd}; $tag") } + printer.println(replaceTags(line, add = Some(tagOf(driveside)), remove = allTags)) case None => - if (line.contains(tag)) { // no conflict, so remove tag + if (line.contains(tagBoth)) { // no conflict, so remove tag removed += 1 - printer.println(line.stripLineEnd.replaceFirst(s" ?$tag", "").replaceFirst(";\\s*$", "")) + printer.println(replaceTags(line, add = None, remove = allTags)) } else { printer.print(line) // preserving original linebreaks } @@ -173,15 +175,12 @@ object ConflictingOverridesChecker { (numConflicts, removed, added) } - /** Check if two rules with equivalent LHS actually lead to the same output on - * the RHS (and thus are not at conflict with each other). - */ - def rulesHaveSameOutput(x: Rule[IdTile], y: Rule[IdTile]): Boolean = ( - x(0) == y(0) && x(1) == y(1) && x(2) == y(2) && x(3) == y(3) || - x(0) == y(0) * R2F1 && x(1) == y(1) * R2F1 && x(2) == y(2) * R2F1 && x(3) == y(3) * R2F1 || - x(0) == y(1) * R2F0 && x(1) == y(0) * R2F0 && x(2) == y(3) * R2F0 && x(3) == y(2) * R2F0 || - x(0) == y(1) * R0F1 && x(1) == y(0) * R0F1 && x(2) == y(3) * R0F1 && x(3) == y(2) * R0F1 || - (x(2).id == 0 || x(3).id == 0) && (y(2).id == 0 || y(3).id == 0) - ) + def replaceTags(line: String, add: Option[String], remove: Seq[String]): String = { + val line0 = + remove.foldLeft(line.stripLineEnd) { (line, rem) => + line.replaceFirst(s" ?\\b$rem\\b", "").replaceFirst(";\\s*$", "") + } + if (add.isDefined) s"$line0; ${add.get}" else line0 + } }