revise RUL1, RUL2 for RHW OxD & DxO T ints

Controller/RUL1/01_Road/08_Road_OneWayRoad.txt

@@ -55,7 +55,7 @@ TYPE6=0x00000001,0x00030100,0x09702e00,3,0
 TYPE7=0x00000100,0x03010000,0x09702e00,0,0
 TYPE8=0x00010000,0x01000003,0x09702e00,1,0
 ;
-;piece 3a diagonal T-int DxO half-drag (formerly piece 39)
+; DxO T (short drag) - diagonal road, orthogonal onewayroad T
 ;
 TYPE1=0x00030100,0x02000000,0x09703a00,0,0
 TYPE2=0x03010000,0x00000002,0x09703a00,1,0
@@ -66,7 +66,18 @@ TYPE6=0x00030100,0x00000002,0x09703a00,3,1
 TYPE7=0x03010000,0x00000200,0x09703a00,2,1
 TYPE8=0x01000003,0x00020000,0x09703a00,1,1
 ;
-;piece 39 full +-int DxO thru (formerly piece 39 alt)
+; DxO T (long drag end) - diagonal road, orthogonal onewayroad T
+;
+TYPE1=0x01000003,0x02000000,0x09703c00,0,0
+TYPE2=0x00000301,0x00000002,0x09703c00,1,0
+TYPE3=0x00030100,0x00000200,0x09703c00,2,0
+TYPE4=0x03010000,0x00020000,0x09703c00,3,0
+TYPE5=0x03010000,0x02000000,0x09703c00,0,1
+TYPE6=0x00030100,0x00020000,0x09703c00,1,1
+TYPE7=0x00000301,0x00000200,0x09703c00,2,1
+TYPE8=0x01000003,0x00000002,0x09703c00,3,1
+;
+; DxO - diagonal road, orthogonal onewayroad
 ;
 TYPE1=0x00030100,0x02000200,0x09703900,0,0
 TYPE2=0x03010000,0x00020002,0x09703900,1,0
@@ -139,18 +150,29 @@ TYPE3=0x02000002,0x00020200,0x09720500,2,0
 TYPE1=0x02000200,0x00020002,0x09720700,0,0
 TYPE1=0x00020002,0x02000200,0x09720700,1,0
 ;
-;piece 39 (98)
-;
-TYPE1=0x02000000,0x00030100,0x09803900,0,0
-TYPE2=0x00000002,0x03010000,0x09803900,1,0
-TYPE3=0x00000200,0x01000003,0x09803900,2,0
-TYPE4=0x00020000,0x00000301,0x09803900,3,0
-TYPE5=0x02000000,0x00000301,0x09803900,0,1
-TYPE6=0x00000002,0x00030100,0x09803900,3,1
-TYPE7=0x00000200,0x03010000,0x09803900,2,1
-TYPE8=0x00020000,0x01000003,0x09803900,1,1
-;
-;piece 39 (98) alt for through one-way
+; OxD T (short drag) - orthogonal road T, diagonal onewayroad
+;
+TYPE1=0x02000000,0x00030100,0x09803a00,0,0
+TYPE2=0x00000002,0x03010000,0x09803a00,1,0
+TYPE3=0x00000200,0x01000003,0x09803a00,2,0
+TYPE4=0x00020000,0x00000301,0x09803a00,3,0
+TYPE5=0x02000000,0x00000301,0x09803a00,0,1
+TYPE6=0x00020000,0x01000003,0x09803a00,1,1
+TYPE7=0x00000200,0x03010000,0x09803a00,2,1
+TYPE8=0x00000002,0x00030100,0x09803a00,3,1
+;
+; OxD T (long drag end) - orthogonal road T, diagonal onewayroad
+;
+TYPE1=0x02000000,0x01000003,0x09803c00,0,0
+TYPE2=0x00000002,0x00000301,0x09803c00,1,0
+TYPE3=0x00000200,0x00030100,0x09803c00,2,0
+TYPE4=0x00020000,0x03010000,0x09803c00,3,0
+TYPE5=0x02000000,0x03010000,0x09803c00,0,1
+TYPE6=0x00020000,0x00030100,0x09803c00,1,1
+TYPE7=0x00000200,0x00000301,0x09803c00,2,1
+TYPE8=0x00000002,0x01000003,0x09803c00,3,1
+;
+; OxD - orthogonal road, diagonal onewayroad
 ;
 TYPE1=0x02000200,0x00030100,0x09803900,0,0
 TYPE2=0x00020002,0x03010000,0x09803900,1,0

Controller/RUL1/01_Road/09_Road_Dirtroad.txt

@@ -85,26 +85,37 @@ TYPE6=0x00000001,0x00030100,0x5700A100,2,1
 TYPE7=0x00000100,0x03010000,0x5700A100,1,1
 TYPE8=0x00010000,0x01000003,0x5700A100,0,1
 ;
-;ortho rhw x diagonal cross network
-;
-TYPE1=0x00030100,0x02000000,0x57004100,2,0
-TYPE2=0x03010000,0x00000002,0x57004100,3,0
-TYPE3=0x01000003,0x00000200,0x57004100,0,0
-TYPE4=0x00000301,0x00020000,0x57004100,1,0
-TYPE5=0x00000301,0x02000000,0x57004100,2,1
-TYPE6=0x00030100,0x00000002,0x57004100,1,1
-TYPE7=0x03010000,0x00000200,0x57004100,0,1
-TYPE8=0x01000003,0x00020000,0x57004100,3,1
-;
-;piece 39 alt
-;
-TYPE1=0x00030100,0x02000200,0x57004100,2,0
-TYPE2=0x03010000,0x00020002,0x57004100,3,0
-TYPE3=0x01000003,0x02000200,0x57004100,0,0
-TYPE4=0x00000301,0x00020002,0x57004100,1,0
-TYPE5=0x00000301,0x02000200,0x57004100,2,1
+; DxO T (short T) - diagonal road, orthogonal RHW T
+;
+TYPE1=0x01000003,0x00000200,0x57603100,0,0
+TYPE2=0x00000301,0x00020000,0x57603100,1,0
+TYPE3=0x00030100,0x02000000,0x57603100,2,0
+TYPE4=0x03010000,0x00000002,0x57603100,3,0
+TYPE5=0x03010000,0x00000200,0x57603100,0,1
+TYPE6=0x00030100,0x00000002,0x57603100,1,1
+TYPE7=0x00000301,0x02000000,0x57603100,2,1
+TYPE8=0x01000003,0x00020000,0x57603100,3,1
+;
+; DxO T (long T end) - diagonal road, orthogonal RHW T
+;
+TYPE1=0x00030100,0x00000200,0x57603109,0,0
+TYPE2=0x03010000,0x00020000,0x57603109,1,0
+TYPE3=0x01000003,0x02000000,0x57603109,2,0
+TYPE4=0x00000301,0x00000002,0x57603109,3,0
+TYPE5=0x00000301,0x00000200,0x57603109,0,1
+TYPE6=0x01000003,0x00000002,0x57603109,1,1
+TYPE7=0x03010000,0x02000000,0x57603109,2,1
+TYPE8=0x00030100,0x00020000,0x57603109,3,1
+;
+; DxO - diagonal road, orthogonal RHW
+;
+TYPE1=0x01000003,0x02000200,0x57004100,0,0
+TYPE2=0x00000301,0x00020002,0x57004100,1,0
+TYPE3=0x00030100,0x02000200,0x57004100,2,0
+TYPE4=0x03010000,0x00020002,0x57004100,3,0
+TYPE5=0x03010000,0x02000200,0x57004100,0,1
 TYPE6=0x00030100,0x00020002,0x57004100,1,1
-TYPE7=0x03010000,0x02000200,0x57004100,0,1
+TYPE7=0x00000301,0x02000200,0x57004100,2,1
 TYPE8=0x01000003,0x00020002,0x57004100,3,1
 ;OnSlope
 TYPE1=0x00030100,0x04000400,0x57004100,2,0
@@ -182,27 +193,41 @@ TYPE2=0x02000200,0x00020002,0x57001100,1,0
 TYPE1=0x00020002,0x04000400,0x57001100,0,0
 TYPE2=0x02000200,0x00040004,0x57001100,1,0
 ;
-;;diagonal rhw, straight cross network
-1=0X00020002,0X00000301,0x57007100,2,0
-2=0X02000200,0X00030100,0x57007100,3,0
-3=0X00020002,0X03010000,0x57007100,0,0
-4=0X02000200,0X01000003,0x57007100,1,0
-5=0X00020002,0X00030100,0x57007100,2,1
-6=0X02000200,0X00000301,0x57007100,3,1
-7=0X00020002,0X01000003,0x57007100,0,1
-8=0X02000200,0X03010000,0x57007100,1,1
-;t version
-1=0X00020000,0X00000301,0x57604109,2,0
-2=0X00000200,0X00030100,0x57604109,3,0
-3=0X00000002,0X03010000,0x57604109,0,0
-4=0X02000000,0X01000003,0x57604109,1,0
-;duplicates disabled ~ memo
-5=0X00020002,0X00030100,0x57604109,2,1
-6=0X02000200,0X00000301,0x57604109,3,1
-7=0X00020002,0X01000003,0x57604109,0,1
-8=0X02000200,0X03010000,0x57604109,1,1
+; OxD - orthogonal road, diagonal RHW
+;
+TYPE1=0x00020002,0x03010000,0x57007100,0,0
+TYPE2=0x02000200,0x01000003,0x57007100,1,0
+TYPE3=0x00020002,0x00000301,0x57007100,2,0
+TYPE4=0x02000200,0x00030100,0x57007100,3,0
+TYPE5=0x00020002,0x01000003,0x57007100,0,1
+TYPE6=0x02000200,0x03010000,0x57007100,1,1
+TYPE7=0x00020002,0x00030100,0x57007100,2,1
+TYPE8=0x02000200,0x00000301,0x57007100,3,1
+;
+; OxD T (short drag) - orthogonal road T, diagonal RHW
+;
+TYPE1=0x00000002,0x03010000,0x57604100,0,0
+TYPE2=0x00000200,0x01000003,0x57604100,1,0
+TYPE3=0x00020000,0x00000301,0x57604100,2,0
+TYPE4=0x02000000,0x00030100,0x57604100,3,0
+TYPE5=0x00020000,0x01000003,0x57604100,0,1
+TYPE6=0x00000200,0x03010000,0x57604100,1,1
+TYPE7=0x00000002,0x00030100,0x57604100,2,1
+TYPE8=0x02000000,0x00000301,0x57604100,3,1
+;
+; OxD T (long drag end) - orthogonal road T, diagonal RHW
+;
+TYPE1=0x00020000,0x03010000,0x57604109,0,0
+TYPE2=0x02000000,0x01000003,0x57604109,1,0
+TYPE3=0x00000002,0x00000301,0x57604109,2,0
+TYPE4=0x00000200,0x00030100,0x57604109,3,0
+TYPE5=0x00000002,0x01000003,0x57604109,0,1
+TYPE6=0x02000000,0x03010000,0x57604109,1,1
+TYPE7=0x00020000,0x00030100,0x57604109,2,1
+TYPE8=0x00000200,0x00000301,0x57604109,3,1
+;
+; OxD T - orthogonal road, diagonal RHW T
 ;
-;diagonal rhw t, straight road
 1=0X00020002,0X00000300,0x57605100,3,1
 2=0X02000200,0X00030000,0x57605100,2,1
 3=0X00020002,0X03000000,0x57605100,1,1
@@ -212,7 +237,7 @@ TYPE2=0x02000200,0x00040004,0x57001100,1,0
 7=0X00020002,0X01000000,0x57605100,1,0
 8=0X02000200,0X00010000,0x57605100,0,0
 
-;diagonal road t, straight rhw
+; DxO T - diagonal road T, orthogonal RHW
 1=0X00000300,0X00020002,0x57602100,3,1
 2=0X00030000,0X02000200,0x57602100,2,1
 3=0X03000000,0X00020002,0x57602100,1,1

Controller/RUL1/04_Street/09_Street_Dirtroad.txt

@@ -67,16 +67,7 @@ RWNESS=0X02000000,0X00020202,0x5760B000,1,0
 RNESSW=0X00000002,0X02020200,0x5760B000,2,0
 RWESSN=0X00000200,0X02020002,0x5760B000,3,0
 RWNSSE=0X00020000,0X02000202,0x5760B000,0,0
-;
-;;diagonal road, straight street
-1=0X00020002,0X00000301,0x57007000,2,0
-2=0X02000200,0X00030100,0x57007000,3,0
-3=0X00020002,0X03010000,0x57007000,0,0
-4=0X02000200,0X01000003,0x57007000,1,0
-5=0X00020002,0X00030100,0x57007000,2,1
-6=0X02000200,0X00000301,0x57007000,3,1
-7=0X00020002,0X01000003,0x57007000,0,1
-8=0X02000200,0X03010000,0x57007000,1,1
+
 ;;end of diag road, end of street
 1=0X00020000,0X00000300,0x5EAA0E00,0,0
 2=0X02000000,0X00030000,0x5EAA0E00,1,0
@@ -95,27 +86,50 @@ RWNSSE=0X00020000,0X02000202,0x5760B000,0,0
 6=0X00000200,0X00000001,0x5EAA1100,1,1
 7=0X00000002,0X01000000,0x5EAA1100,2,1
 8=0X02000000,0X00010000,0x5EAA1100,3,1
-;;diagonal road, straight street t
-;t version
-1=0X00020000,0X00000301,0x57604009,2,0
-2=0X00000200,0X00030100,0x57604009,3,0
-3=0X00000002,0X03010000,0x57604009,0,0
-4=0X02000000,0X01000003,0x57604009,1,0
-;duplicates disabled ~ memo
-5=0X00020002,0X00030100,0x57604009,2,1
-6=0X02000200,0X00000301,0x57604009,3,1
-7=0X00020002,0X01000003,0x57604009,0,1
-8=0X02000200,0X03010000,0x57604009,1,1
-;diagonal rhw t, straight street
 ;
-1=0X00020002,0X00000300,0x57605000,3,1
-2=0X02000200,0X00030000,0x57605000,2,1
-3=0X00020002,0X03000000,0x57605000,1,1
-4=0X02000200,0X00000003,0x57605000,0,1
-5=0X00020002,0X00000100,0x57605000,3,0
-6=0X02000200,0X00000001,0x57605000,2,0
-7=0X00020002,0X01000000,0x57605000,1,0
-8=0X02000200,0X00010000,0x57605000,0,0
+; OxD - orthogonal street, diagonal RHW
+;
+1=0X00020002,0X00000301,0x57007000,2,0
+2=0X02000200,0X00030100,0x57007000,3,0
+3=0X00020002,0X03010000,0x57007000,0,0
+4=0X02000200,0X01000003,0x57007000,1,0
+5=0X00020002,0X00030100,0x57007000,2,1
+6=0X02000200,0X00000301,0x57007000,3,1
+7=0X00020002,0X01000003,0x57007000,0,1
+8=0X02000200,0X03010000,0x57007000,1,1
+;
+; OxD T (short drag) - orthogonal street T, diagonal RHW
+;
+1=0x00000002,0x03010000,0x57604000,0,0
+2=0x00000200,0x01000003,0x57604000,1,0
+3=0x00020000,0x00000301,0x57604000,2,0
+4=0x02000000,0x00030100,0x57604000,3,0
+5=0x00020000,0x01000003,0x57604000,0,1
+6=0x00000200,0x03010000,0x57604000,1,1
+7=0x00000002,0x00030100,0x57604000,2,1
+8=0x02000000,0x00000301,0x57604000,3,1
+;
+; OxD T (long drag end) - orthogonal road T, diagonal RHW
+;
+TYPE1=0x00020000,0x03010000,0x57604009,0,0
+TYPE2=0x02000000,0x01000003,0x57604009,1,0
+TYPE3=0x00000002,0x00000301,0x57604009,2,0
+TYPE4=0x00000200,0x00030100,0x57604009,3,0
+TYPE5=0x00000002,0x01000003,0x57604009,0,1
+TYPE6=0x02000000,0x03010000,0x57604009,1,1
+TYPE7=0x00020000,0x00030100,0x57604009,2,1
+TYPE8=0x00000200,0x00000301,0x57604009,3,1
+;
+; OxD T - orthogonal street, diagonal RHW T
+;
+1=0x02000200,0x00010000,0x57605000,0,0
+2=0x00020002,0x01000000,0x57605000,1,0
+3=0x02000200,0x00000001,0x57605000,2,0
+4=0x00020002,0x00000100,0x57605000,3,0
+5=0x02000200,0x00000003,0x57605000,0,1
+6=0x00020002,0x03000000,0x57605000,1,1
+7=0x02000200,0x00030000,0x57605000,2,1
+8=0x00020002,0x00000300,0x57605000,3,1
 
 ;
 ;Dummy for Transitions
@@ -138,7 +152,7 @@ TYPE5=0x01000000,0x00000003,0x5F502000,0,1
 TYPE6=0x00010000,0x03000000,0x5F502000,1,1
 TYPE7=0x00000100,0x00030000,0x5F502000,2,1
 TYPE8=0x00000001,0x00000300,0x5F502000,3,1
-;orth road, single diag street (T)
+; DxD T - diagonal street T, orthogonal RHW
 TYPE1=0x00010000,0x02000200,0x57602000,0,0
 TYPE2=0x01000000,0x00020002,0x57602000,1,0
 TYPE3=0x00000001,0x02000200,0x57602000,2,0
@@ -147,15 +161,6 @@ TYPE5=0x00000003,0x02000200,0x57602000,0,1
 TYPE6=0x03000000,0x00020002,0x57602000,1,1
 TYPE7=0x00030000,0x02000200,0x57602000,2,1
 TYPE8=0x00000300,0x00020002,0x57602000,3,1
-;
-;TYPE1=0x00010000,0x02000200,0x57004000,2,0
-;TYPE2=0x01000000,0x00020002,0x57004000,3,0
-;TYPE3=0x00000001,0x02000200,0x57004000,0,0
-;TYPE4=0x00000100,0x00020002,0x57004000,1,0
-;TYPE5=0x00000003,0x02000200,0x57004000,2,1
-;TYPE6=0x03000000,0x00020002,0x57004000,3,1
-;TYPE7=0x00030000,0x02000200,0x57004000,0,1
-;TYPE8=0x00000300,0x00020002,0x57004000,1,1
 ;OnSlope
 TYPE1=0x00010000,0x04000400,0x57004000,2,0
 TYPE2=0x01000000,0x00040004,0x57004000,3,0
@@ -166,17 +171,25 @@ TYPE6=0x03000000,0x00040004,0x57004000,3,1
 TYPE7=0x00030000,0x04000400,0x57004000,0,1
 TYPE8=0x00000300,0x00040004,0x57004000,1,1
 
-;ortho rhw x diagonal cross network
-;
-TYPE1=0x00030100,0x02000000,0x57003000,2,0
-TYPE2=0x03010000,0x00000002,0x57003000,3,0
-TYPE3=0x01000003,0x00000200,0x57003000,0,0
-TYPE4=0x00000301,0x00020000,0x57003000,1,0
-TYPE5=0x00000301,0x02000000,0x57003000,2,1
-TYPE6=0x00030100,0x00000002,0x57003000,1,1
-TYPE7=0x03010000,0x00000200,0x57003000,0,1
-TYPE8=0x01000003,0x00020000,0x57003000,3,1
-;
+; DxO T (short T) - diagonal street, orthogonal RHW T
+TYPE1=0x01000003,0x00000200,0x57603000,0,0
+TYPE2=0x00000301,0x00020000,0x57603000,1,0
+TYPE3=0x00030100,0x02000000,0x57603000,2,0
+TYPE4=0x03010000,0x00000002,0x57603000,3,0
+TYPE5=0x03010000,0x00000200,0x57603000,0,1
+TYPE6=0x00030100,0x00000002,0x57603000,1,1
+TYPE7=0x00000301,0x02000000,0x57603000,2,1
+TYPE8=0x01000003,0x00020000,0x57603000,3,1
+; DxO T (long T end) - diagonal street, orthogonal RHW T
+TYPE1=0x00030100,0x00000200,0x57603009,0,0
+TYPE2=0x03010000,0x00020000,0x57603009,1,0
+TYPE3=0x01000003,0x02000000,0x57603009,2,0
+TYPE4=0x00000301,0x00000002,0x57603009,3,0
+TYPE5=0x00000301,0x00000200,0x57603009,0,1
+TYPE6=0x01000003,0x00000002,0x57603009,1,1
+TYPE7=0x03010000,0x02000000,0x57603009,2,1
+TYPE8=0x00030100,0x00020000,0x57603009,3,1
+; DxO - diagonal street, orthogonal RHW
 TYPE1=0x00030100,0x02000200,0x57004000,2,0
 TYPE2=0x03010000,0x00020002,0x57004000,3,0
 TYPE3=0x01000003,0x02000200,0x57004000,0,0