Metarules implementation of road roundabouts

Controller/INRULs/RoadAdvanced/RUL08_Road_Advanced.rul

@@ -3212,59 +3212,55 @@
 2,5,2,2,?,?
 3,0,0x5F06BA00,3,0
 ;
-;Configurations for orthogonal road piece flipped; 5F06BB00
-;
 1,2,0,2,2
 2,5,2,?,?,2
 2,6,2,2,?,?
 2,7,?,2,2,?
-3,0,0x5F06BB00,3,0
+3,0,0x5F06BA00,1,1
 ;
 1,2,2,0,2
 2,7,2,2,?,?
 2,8,?,2,2,?
 2,1,?,?,2,2
-3,0,0x5F06BB00,0,0
+3,0,0x5F06BA00,0,1
 ;
 1,2,2,2,0
 2,1,?,2,2,?
 2,2,?,?,2,2
 2,3,2,?,?,2
-3,0,0x5F06BB00,1,0
+3,0,0x5F06BA00,3,1
 ;
 1,0,2,2,2
 2,3,?,?,2,2
 2,4,2,?,?,2
 2,5,2,2,?,?
-3,0,0x5F06BB00,2,0
+3,0,0x5F06BA00,2,1
 ;
-;Configurations for right-hook diagonal road piece; 5F06BF00
+;Configurations for diagonal (away) road piece; 5F06BE00
 ;
 1,13,0,2,2
 2,5,2,?,?,2
 2,6,2,2,?,?
 2,7,?,2,2,?
-3,0,0x5F06BF00,3,0
+3,0,0x5F06BE00,1,1
 ;
 1,2,13,0,2
 2,7,2,2,?,?
 2,8,?,2,2,?
 2,1,?,?,2,2
-3,0,0x5F06BF00,0,0
+3,0,0x5F06BE00,0,1
 ;
 1,2,2,13,0
 2,1,?,2,2,?
 2,2,?,?,2,2
 2,3,2,?,?,2
-3,0,0x5F06BF00,1,0
+3,0,0x5F06BE00,3,1
 ;
 1,0,2,2,13
 2,3,?,?,2,2
 2,4,2,?,?,2
 2,5,2,2,?,?
-3,0,0x5F06BF00,2,0
-;
-;Configurations for right-hook diagonal road piece flipped; 5F06BE00
+3,0,0x5F06BE00,2,1
 ;
 1,0,11,2,2
 2,5,2,?,?,2
@@ -3290,33 +3286,31 @@
 2,5,2,2,?,?
 3,0,0x5F06BE00,3,0
 ;
-;Configurations for left-hook diagonal road piece; 5F06B900
+;Configurations for diagonal (back) road piece; 5F06B800
 ;
 1,11,0,2,2
 2,5,2,?,?,2
 2,6,2,2,?,?
 2,7,?,2,2,?
-3,0,0x5F06B900,3,0
+3,0,0x5F06B800,1,1
 ;
 1,2,11,0,2
 2,7,2,2,?,?
 2,8,?,2,2,?
 2,1,?,?,2,2
-3,0,0x5F06B900,0,0
+3,0,0x5F06B800,0,1
 ;
 1,2,2,11,0
 2,1,?,2,2,?
 2,2,?,?,2,2
 2,3,2,?,?,2
-3,0,0x5F06B900,1,0
+3,0,0x5F06B800,3,1
 ;
 1,0,2,2,11
 2,3,?,?,2,2
 2,4,2,?,?,2
 2,5,2,2,?,?
-3,0,0x5F06B900,2,0
-;
-;Configurations for left-hook diagonal road piece flipped; 5F06B800
+3,0,0x5F06B800,2,1
 ;
 1,0,13,2,2
 2,5,2,?,?,2

Controller/RUL1/01_Road/04_Road_Street.txt

@@ -158,24 +158,54 @@ TYPE4=0x00030100,0x02000002,0x5F072300,3,0
 
 
 ; road corner, diagonal street away
-TYPE1=0x02020000,0x00000100,0x5F972800,0,0
-TYPE2=0x02000002,0x00010000,0x5F972800,1,0
-TYPE3=0x00000202,0x01000000,0x5F972800,2,0
-TYPE4=0x00020200,0x00000001,0x5F972800,3,0
-TYPE5=0x02000002,0x00000300,0x5F972800,0,1
-TYPE6=0x02020000,0x00000003,0x5F972800,1,1
-TYPE7=0x00020200,0x03000000,0x5F972800,2,1
-TYPE8=0x00000202,0x00030000,0x5F972800,3,1
+TYPE1=0x02020000,0x00000100,0x5F072800,0,0
+TYPE2=0x02000002,0x00010000,0x5F072800,1,0
+TYPE3=0x00000202,0x01000000,0x5F072800,2,0
+TYPE4=0x00020200,0x00000001,0x5F072800,3,0
+TYPE5=0x02000002,0x00000300,0x5F072800,0,1
+TYPE6=0x02020000,0x00000003,0x5F072800,1,1
+TYPE7=0x00020200,0x03000000,0x5F072800,2,1
+TYPE8=0x00000202,0x00030000,0x5F072800,3,1
 
 ; road corner, diagonal street hook back
-TYPE1=0x02020000,0x00000300,0x5F972900,0,0
-TYPE2=0x02000002,0x00030000,0x5F972900,1,0
-TYPE3=0x00000202,0x03000000,0x5F972900,2,0
-TYPE4=0x00020200,0x00000003,0x5F972900,3,0
-TYPE5=0x02000002,0x00000100,0x5F972900,0,1
-TYPE6=0x02020000,0x00000001,0x5F972900,1,1
-TYPE7=0x00020200,0x01000000,0x5F972900,2,1
-TYPE8=0x00000202,0x00010000,0x5F972900,3,1
+TYPE1=0x02020000,0x00000300,0x5F072900,0,0
+TYPE2=0x02000002,0x00030000,0x5F072900,1,0
+TYPE3=0x00000202,0x03000000,0x5F072900,2,0
+TYPE4=0x00020200,0x00000003,0x5F072900,3,0
+TYPE5=0x02000002,0x00000100,0x5F072900,0,1
+TYPE6=0x02020000,0x00000001,0x5F072900,1,1
+TYPE7=0x00020200,0x01000000,0x5F072900,2,1
+TYPE8=0x00000202,0x00010000,0x5F072900,3,1
+
+; road corner, street ortho & street diag toward street
+TYPE1=0x02020000,0x00000102,0x5F072600,0,0
+TYPE2=0x02000002,0x00010200,0x5F072600,1,0
+TYPE3=0x00000202,0x01020000,0x5F072600,2,0
+TYPE4=0x00020200,0x02000001,0x5F072600,3,0
+TYPE5=0x02000002,0x00020300,0x5F072600,0,1
+TYPE6=0x02020000,0x00000203,0x5F072600,1,1
+TYPE7=0x00020200,0x03000002,0x5F072600,2,1
+TYPE8=0x00000202,0x02030000,0x5F072600,3,1
+
+; road corner, street ortho & street diag toward road
+TYPE1=0x02020000,0x00000302,0x5F072700,0,0
+TYPE2=0x02000002,0x00030200,0x5F072700,1,0
+TYPE3=0x00000202,0x03020000,0x5F072700,2,0
+TYPE4=0x00020200,0x02000003,0x5F072700,3,0
+TYPE5=0x02000002,0x00020100,0x5F072700,0,1
+TYPE6=0x02020000,0x00000201,0x5F072700,1,1
+TYPE7=0x00020200,0x01000002,0x5F072700,2,1
+TYPE8=0x00000202,0x02010000,0x5F072700,3,1
+
+; road T, street diag
+TYPE1=0x02020002,0x00000100,0x5F072A00,0,0
+TYPE2=0x02000202,0x00010000,0x5F072A00,1,0
+TYPE3=0x00020202,0x01000000,0x5F072A00,2,0
+TYPE4=0x02020200,0x00000001,0x5F072A00,3,0
+TYPE5=0x02020002,0x00000300,0x5F072A00,0,1
+TYPE6=0x02020200,0x00000003,0x5F072A00,1,1
+TYPE7=0x00020202,0x03000000,0x5F072A00,2,1
+TYPE8=0x02000202,0x00030000,0x5F072A00,3,1
 
 
 ;Update 100306 ~ memo

Controller/RUL2/02_Diagonal_Streets/Sec2a_Diagonal_Streets_Intersections.txt

@@ -45,10 +45,22 @@
 0x5F503600,2,1,0x09000a00,1,0=0x5F504600,2,1,0x5F504700,2,1
 ;
 ;road corner x diag street away
-0x5F972800,1,0,0x5F500200,2,0=0x5F972800,1,0,0x5F500400,3,1
-0x5F972800,3,1,0x5F500200,1,0=0x5F972800,3,1,0x5F500400,1,0
+0x5F072800,1,0,0x5F500200,2,0=0x5F072800,1,0,0x5F500400,3,1
+0x5F072800,3,1,0x5F500200,1,0=0x5F072800,3,1,0x5F500400,1,0
 ;
 ;road corner x diag street hook back
-0x5F972900,1,0,0x5F500200,1,0=0x5F972900,1,0,0x5F500400,1,0
-0x5F972900,3,1,0x5F500200,2,0=0x5F972900,3,1,0x5F500400,3,1
+0x5F072900,1,0,0x5F500200,1,0=0x5F072900,1,0,0x5F500400,1,0
+0x5F072900,3,1,0x5F500200,2,0=0x5F072900,3,1,0x5F500400,3,1
+;
+; road corner, street ortho & street diag toward street
+0x5F072600,1,0,0x5F500200,2,0=0x5F072600,1,0,0x5F500400,3,1
+0x5F072600,3,1,0x5F500200,1,0=0x5F072600,3,1,0x5F500400,1,0
+;
+; road corner, street ortho & street diag toward road
+0x5F072700,1,0,0x5F500200,1,0=0x5F072700,1,0,0x5F500400,1,0
+0x5F072700,3,1,0x5F500200,2,0=0x5F072700,3,1,0x5F500400,3,1
+;
+; road T, street diag
+0x5F072A00,1,0,0x5F500200,2,0=0x5F072A00,1,0,0x5F500400,3,1
+0x5F072A00,3,1,0x5F500200,1,0=0x5F072A00,3,1,0x5F500400,1,0
 ;