From 7a476376188bc21c7e836eb4e3531ddd551ee1e7 Mon Sep 17 00:00:00 2001 From: jflann <26899145+jflann@users.noreply.github.com> Date: Wed, 30 Aug 2023 23:58:07 -0500 Subject: [PATCH 1/6] revise RUL1, RUL2 for RHW OxD & DxO T ints --- Controller/RUL1/01_Road/09_Road_Dirtroad.txt | 58 +++++++------- .../RUL1/04_Street/09_Street_Dirtroad.txt | 63 +++++++-------- .../08_OneWayRoad/09_OneWayRoad_Dirtroad.txt | 78 +++++++++---------- .../Sec7a_Initial/Sec7a1_RHW-2_Initial.txt | 25 ++---- 4 files changed, 102 insertions(+), 122 deletions(-) diff --git a/Controller/RUL1/01_Road/09_Road_Dirtroad.txt b/Controller/RUL1/01_Road/09_Road_Dirtroad.txt index 99f3b384b..712790b8f 100644 --- a/Controller/RUL1/01_Road/09_Road_Dirtroad.txt +++ b/Controller/RUL1/01_Road/09_Road_Dirtroad.txt @@ -85,26 +85,26 @@ TYPE6=0x00000001,0x00030100,0x5700A100,2,1 TYPE7=0x00000100,0x03010000,0x5700A100,1,1 TYPE8=0x00010000,0x01000003,0x5700A100,0,1 ; -;ortho rhw x diagonal cross network +; DxO T - diagonal road, orthogonal RHW T ; -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 +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 ; -;piece 39 alt +; DxO - diagonal road, orthogonal RHW ; -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 +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,7 +182,7 @@ TYPE2=0x02000200,0x00020002,0x57001100,1,0 TYPE1=0x00020002,0x04000400,0x57001100,0,0 TYPE2=0x02000200,0x00040004,0x57001100,1,0 ; -;;diagonal rhw, straight cross network +; OxD - orthogonal road, diagonal RHW 1=0X00020002,0X00000301,0x57007100,2,0 2=0X02000200,0X00030100,0x57007100,3,0 3=0X00020002,0X03010000,0x57007100,0,0 @@ -191,18 +191,18 @@ TYPE2=0x02000200,0x00040004,0x57001100,1,0 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 T - orthogonal road T, diagonal RHW +1=0x00000002,0x03010000,0x57604100,0,0 +2=0x00000200,0x01000003,0x57604100,1,0 +3=0x00020000,0x00000301,0x57604100,2,0 +4=0x02000000,0x00030100,0x57604100,3,0 +5=0x00020000,0x01000003,0x57604100,0,1 +6=0x00000200,0x03010000,0x57604100,1,1 +7=0x00000002,0x00030100,0x57604100,2,1 +8=0x02000000,0x00000301,0x57604100,3,1 + ; -;diagonal rhw t, straight road +; OxD T - orthogonal road, diagonal RHW T 1=0X00020002,0X00000300,0x57605100,3,1 2=0X02000200,0X00030000,0x57605100,2,1 3=0X00020002,0X03000000,0x57605100,1,1 @@ -212,7 +212,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 diff --git a/Controller/RUL1/04_Street/09_Street_Dirtroad.txt b/Controller/RUL1/04_Street/09_Street_Dirtroad.txt index e4e45eee4..a6defefd5 100644 --- a/Controller/RUL1/04_Street/09_Street_Dirtroad.txt +++ b/Controller/RUL1/04_Street/09_Street_Dirtroad.txt @@ -95,27 +95,25 @@ 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 T - 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 - 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 +136,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 @@ -166,17 +164,16 @@ 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 - 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 - diagonal street, orthogonal RHW TYPE1=0x00030100,0x02000200,0x57004000,2,0 TYPE2=0x03010000,0x00020002,0x57004000,3,0 TYPE3=0x01000003,0x02000200,0x57004000,0,0 diff --git a/Controller/RUL1/08_OneWayRoad/09_OneWayRoad_Dirtroad.txt b/Controller/RUL1/08_OneWayRoad/09_OneWayRoad_Dirtroad.txt index 86d43dce9..6fd5108f6 100644 --- a/Controller/RUL1/08_OneWayRoad/09_OneWayRoad_Dirtroad.txt +++ b/Controller/RUL1/08_OneWayRoad/09_OneWayRoad_Dirtroad.txt @@ -49,17 +49,15 @@ TYPE7=0x00000100,0x03010000,0x5700A200,1,1 TYPE8=0x00010000,0x01000003,0x5700A200,0,1 ; -;piece 39 -;t version -1=0X00020000,0X00000301,0x57604209,2,0 -2=0X00000200,0X00030100,0x57604209,3,0 -3=0X00000002,0X03010000,0x57604209,0,0 -4=0X02000000,0X01000003,0x57604209,1,0 -;duplicates disabled ~ memo -5=0X00020002,0X00030100,0x57604209,2,1 -6=0X02000200,0X00000301,0x57604209,3,1 -7=0X00020002,0X01000003,0x57604209,0,1 -8=0X02000200,0X03010000,0x57604209,1,1 +; OxD T - orthogonal OWR T, diagonal RHW +TYPE1=0x00000002,0x03010000,0x57604200,0,0 +TYPE2=0x00000200,0x01000003,0x57604200,1,0 +TYPE3=0x00020000,0x00000301,0x57604200,2,0 +TYPE4=0x02000000,0x00030100,0x57604200,3,0 +TYPE5=0x00020000,0x01000003,0x57604200,0,1 +TYPE6=0x00000200,0x03010000,0x57604200,1,1 +TYPE7=0x00000002,0x00030100,0x57604200,2,1 +TYPE8=0x02000000,0x00000301,0x57604200,3,1 ; ;TYPE1=0x02000000,0x00030100,0x57007200,0,0 ;TYPE2=0x00000002,0x03010000,0x57007200,1,0 @@ -145,18 +143,18 @@ TYPE2=0x02000200,0x00020002,0x57001200,1,0 TYPE1=0x00020002,0x04000400,0x57001200,0,0 TYPE2=0x02000200,0x00040004,0x57001200,1,0 ; -;piece 39 (98) +; DxO T - diagonal onewayroad, orthogonal RHW T ; -TYPE1=0x00030100,0x02000000,0x57004200,2,0 -TYPE2=0x03010000,0x00000002,0x57004200,3,0 -TYPE3=0x01000003,0x00000200,0x57004200,0,0 -TYPE4=0x00000301,0x00020000,0x57004200,1,0 -TYPE5=0x00000301,0x02000000,0x57004200,2,1 -TYPE6=0x00030100,0x00000002,0x57004200,1,1 -TYPE7=0x03010000,0x00000200,0x57004200,0,1 -TYPE8=0x01000003,0x00020000,0x57004200,3,1 +TYPE1=0x01000003,0x00000200,0x57603200,0,0 +TYPE2=0x00000301,0x00020000,0x57603200,1,0 +TYPE3=0x00030100,0x02000000,0x57603200,2,0 +TYPE4=0x03010000,0x00000002,0x57603200,3,0 +TYPE5=0x03010000,0x00000200,0x57603200,0,1 +TYPE6=0x00030100,0x00000002,0x57603200,1,1 +TYPE7=0x00000301,0x02000000,0x57603200,2,1 +TYPE8=0x01000003,0x00020000,0x57603200,3,1 ; -;piece 39 (98) alt for through one-way +; DxO - diagonal onewayroad, orthogonal RHW ; TYPE1=0x00030100,0x02000200,0x57004200,2,0 TYPE2=0x03010000,0x00020002,0x57004200,3,0 @@ -176,27 +174,25 @@ TYPE6=0x00030100,0x00040004,0x57004200,1,1 TYPE7=0x03010000,0x04000400,0x57004200,0,1 TYPE8=0x01000003,0x00040004,0x57004200,3,1 -; -;diagonal rhw t, straight onewayroad -; -1=0X00020002,0X00000300,0x57605200,3,1 -2=0X02000200,0X00030000,0x57605200,2,1 -3=0X00020002,0X03000000,0x57605200,1,1 -4=0X02000200,0X00000003,0x57605200,0,1 -5=0X00020002,0X00000100,0x57605200,3,0 -6=0X02000200,0X00000001,0x57605200,2,0 -7=0X00020002,0X01000000,0x57605200,1,0 -8=0X02000200,0X00010000,0x57605200,0,0 +; OxD T - orthogonal onewayroad, diagonal RHW T +TYPE1=0x02000200,0x00010000,0x57605200,0,0 +TYPE2=0x00020002,0x01000000,0x57605200,1,0 +TYPE3=0x02000200,0x00000001,0x57605200,2,0 +TYPE4=0x00020002,0x00000100,0x57605200,3,0 +TYPE5=0x02000200,0x00000003,0x57605200,0,1 +TYPE6=0x00020002,0x03000000,0x57605200,1,1 +TYPE7=0x02000200,0x00030000,0x57605200,2,1 +TYPE8=0x00020002,0x00000300,0x57605200,3,1 -;diagonal onewayroad t, straight rhw -1=0X00000300,0X00020002,0x57602200,3,1 -2=0X00030000,0X02000200,0x57602200,2,1 -3=0X03000000,0X00020002,0x57602200,1,1 -4=0X00000003,0X02000200,0x57602200,0,1 -5=0X00000100,0X00020002,0x57602200,3,0 -6=0X00000001,0X02000200,0x57602200,2,0 -7=0X01000000,0X00020002,0x57602200,1,0 -8=0X00010000,0X02000200,0x57602200,0,0 +; DxO T - diagonal onewayroad T, orthogonal RHW +TYPE1=0x00010000,0x02000200,0x57602200,0,0 +TYPE2=0x01000000,0x00020002,0x57602200,1,0 +TYPE3=0x00000001,0x02000200,0x57602200,2,0 +TYPE4=0x00000100,0x00020002,0x57602200,3,0 +TYPE5=0x00000003,0x02000200,0x57602200,0,1 +TYPE6=0x03000000,0x00020002,0x57602200,1,1 +TYPE7=0x00030000,0x02000200,0x57602200,2,1 +TYPE8=0x00000300,0x00020002,0x57602200,3,1 ; ;Added 010107 ~ memo diff --git a/Controller/RUL2/07_RHW/Sec7a_Initial/Sec7a1_RHW-2_Initial.txt b/Controller/RUL2/07_RHW/Sec7a_Initial/Sec7a1_RHW-2_Initial.txt index 3d194e447..e9347975e 100644 --- a/Controller/RUL2/07_RHW/Sec7a_Initial/Sec7a1_RHW-2_Initial.txt +++ b/Controller/RUL2/07_RHW/Sec7a_Initial/Sec7a1_RHW-2_Initial.txt @@ -4,12 +4,6 @@ ;Most instances handled by RUL1, INRUL13 and INRUL14 ;DxO and DxD T Fix (TD5) ;DxO -0x57000200,0,0,0x57007000,2,0=0x5760D500,0,0,0x57007000,2,0 -0x57000200,3,0,0x57007000,0,1=0x5760D500,2,1,0x57007000,0,1 -0x57000200,0,0,0x57007100,2,0=0x5760D500,0,0,0x57007100,2,0 -0x57000200,3,0,0x57007100,0,1=0x5760D500,2,1,0x57007100,0,1 -0x57000200,0,0,0x57007200,2,0=0x5760D500,0,0,0x57007200,2,0 -0x57000200,3,0,0x57007200,0,1=0x5760D500,2,1,0x57007200,0,1 0x57000200,0,0,0x57004A00,1,0=0x5760D500,0,0,0x57004A00,1,0 0x57000200,3,0,0x57004A00,3,1=0x5760D500,2,1,0x57004A00,3,1 0x57000200,0,0,0x57027A00,2,0=0x5760D500,0,0,0x57027A00,2,0 @@ -45,36 +39,29 @@ 0x09000a00,3,0,0x57602200,0,1=0x09000c00,3,0,0x57602200,0,1 ;----Orthogonal RHW-2 x Diagonal Street Fix (T30)---- -0x57004000,3,0,0x5F500200,2,0=0x57603000,3,0,0x57603009,3,0 -0x57004000,1,1,0x5F500200,1,0=0x57603000,1,1,0x57603009,1,1 +0x57603000,3,0,0x5F500200,2,0=0x57603000,3,0,0x57603009,3,0 +0x57603000,1,1,0x5F500200,1,0=0x57603000,1,1,0x57603009,1,1 ;----Orthogonal RHW-2 x Diagonal Road Fix (T31)---- -0x57004100,3,0,0x00000a00,2,0=0x57603100,3,0,0x57603109,3,0 -0x57004100,1,1,0x00000a00,1,0=0x57603100,1,1,0x57603109,1,1 +0x57603100,3,0,0x00000a00,2,0=0x57603100,3,0,0x57603109,3,0 +0x57603100,1,1,0x00000a00,1,0=0x57603100,1,1,0x57603109,1,1 ;----Orthogonal RHW-2 x Diagonal One-Way Road Fix (T32)---- -0x57004200,3,0,0x09000a00,2,0=0x57603200,3,0,0x57603209,3,0 -0x57004200,1,1,0x09000a00,1,0=0x57603200,1,1,0x57603209,1,1 +0x57603200,3,0,0x09000a00,2,0=0x57603200,3,0,0x57603209,3,0 +0x57603200,1,1,0x09000a00,1,0=0x57603200,1,1,0x57603209,1,1 ;----Orthogonal Street x Diagonal RHW-2 Fix (T40)---- -0x57007000,0,0,0x57000200,2,0=0x57604000,0,0,0x57604009,2,0 -0x57007000,2,1,0x57000200,1,0=0x57604000,2,1,0x57604009,0,1 0x57604000,0,0,0x57000200,2,0=0x57604000,0,0,0x57604009,2,0 0x57604000,2,1,0x57000200,1,0=0x57604000,2,1,0x57604009,0,1 ;----Orthogonal Road x Diagonal RHW-2 Fix (T41)---- -0x57007100,0,0,0x57000200,2,0=0x57604100,0,0,0x57604109,2,0 -0x57007100,2,1,0x57000200,1,0=0x57604100,2,1,0x57604109,0,1 0x57604100,0,0,0x57000200,2,0=0x57604100,0,0,0x57604109,2,0 0x57604100,2,1,0x57000200,1,0=0x57604100,2,1,0x57604109,0,1 ;----Orthogonal One-Way Road x Diagonal RHW-2 Fix (T42)---- -0x57007200,0,0,0x57000200,2,0=0x57604200,0,0,0x57604209,2,0 -0x57007200,2,1,0x57000200,1,0=0x57604200,2,1,0x57604209,0,1 0x57604200,0,0,0x57000200,2,0=0x57604200,0,0,0x57604209,2,0 0x57604200,2,1,0x57000200,1,0=0x57604200,2,1,0x57604209,0,1 - ;----Diagonal RHW-2 x Ortho Street Fix (T50)---- 0x57000200,0,0,0x57605000,2,0=0x57000500,1,1,0x57605000,2,0 0x57000200,3,0,0x57605000,0,1=0x57000500,3,0,0x57605000,0,1 From 86fd78e6871181629ae0656363017a676e2290a2 Mon Sep 17 00:00:00 2001 From: jflann <26899145+jflann@users.noreply.github.com> Date: Sun, 3 Sep 2023 10:44:42 -0500 Subject: [PATCH 2/6] add long drag DxO T RUL1 & RUL2 supplement for RHW --- Controller/RUL1/01_Road/09_Road_Dirtroad.txt | 13 ++++++++++++- Controller/RUL1/04_Street/09_Street_Dirtroad.txt | 11 ++++++++++- .../08_OneWayRoad/09_OneWayRoad_Dirtroad.txt | 13 ++++++++++++- .../Sec7a_Initial/Sec7a1_RHW-2_Initial.txt | 16 ++++++++++++++-- 4 files changed, 48 insertions(+), 5 deletions(-) diff --git a/Controller/RUL1/01_Road/09_Road_Dirtroad.txt b/Controller/RUL1/01_Road/09_Road_Dirtroad.txt index 712790b8f..1cbe0691c 100644 --- a/Controller/RUL1/01_Road/09_Road_Dirtroad.txt +++ b/Controller/RUL1/01_Road/09_Road_Dirtroad.txt @@ -85,7 +85,7 @@ TYPE6=0x00000001,0x00030100,0x5700A100,2,1 TYPE7=0x00000100,0x03010000,0x5700A100,1,1 TYPE8=0x00010000,0x01000003,0x5700A100,0,1 ; -; DxO T - diagonal road, orthogonal RHW T +; DxO T (short T) - diagonal road, orthogonal RHW T ; TYPE1=0x01000003,0x00000200,0x57603100,0,0 TYPE2=0x00000301,0x00020000,0x57603100,1,0 @@ -96,6 +96,17 @@ 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 diff --git a/Controller/RUL1/04_Street/09_Street_Dirtroad.txt b/Controller/RUL1/04_Street/09_Street_Dirtroad.txt index a6defefd5..3ea11f828 100644 --- a/Controller/RUL1/04_Street/09_Street_Dirtroad.txt +++ b/Controller/RUL1/04_Street/09_Street_Dirtroad.txt @@ -164,7 +164,7 @@ TYPE6=0x03000000,0x00040004,0x57004000,3,1 TYPE7=0x00030000,0x04000400,0x57004000,0,1 TYPE8=0x00000300,0x00040004,0x57004000,1,1 -; DxO T - diagonal street, orthogonal RHW T +; 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 @@ -173,6 +173,15 @@ 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 diff --git a/Controller/RUL1/08_OneWayRoad/09_OneWayRoad_Dirtroad.txt b/Controller/RUL1/08_OneWayRoad/09_OneWayRoad_Dirtroad.txt index 6fd5108f6..2cd1fcc61 100644 --- a/Controller/RUL1/08_OneWayRoad/09_OneWayRoad_Dirtroad.txt +++ b/Controller/RUL1/08_OneWayRoad/09_OneWayRoad_Dirtroad.txt @@ -143,7 +143,7 @@ TYPE2=0x02000200,0x00020002,0x57001200,1,0 TYPE1=0x00020002,0x04000400,0x57001200,0,0 TYPE2=0x02000200,0x00040004,0x57001200,1,0 ; -; DxO T - diagonal onewayroad, orthogonal RHW T +; DxO T (short T) - diagonal onewayroad, orthogonal RHW T ; TYPE1=0x01000003,0x00000200,0x57603200,0,0 TYPE2=0x00000301,0x00020000,0x57603200,1,0 @@ -154,6 +154,17 @@ TYPE6=0x00030100,0x00000002,0x57603200,1,1 TYPE7=0x00000301,0x02000000,0x57603200,2,1 TYPE8=0x01000003,0x00020000,0x57603200,3,1 ; +; DxO T (long T end) - diagonal onewayroad, orthogonal RHW T +; +TYPE1=0x00030100,0x00000200,0x57603209,0,0 +TYPE2=0x03010000,0x00020000,0x57603209,1,0 +TYPE3=0x01000003,0x02000000,0x57603209,2,0 +TYPE4=0x00000301,0x00000002,0x57603209,3,0 +TYPE5=0x00000301,0x00000200,0x57603209,0,1 +TYPE6=0x01000003,0x00000002,0x57603209,1,1 +TYPE7=0x03010000,0x02000000,0x57603209,2,1 +TYPE8=0x00030100,0x00020000,0x57603209,3,1 +; ; DxO - diagonal onewayroad, orthogonal RHW ; TYPE1=0x00030100,0x02000200,0x57004200,2,0 diff --git a/Controller/RUL2/07_RHW/Sec7a_Initial/Sec7a1_RHW-2_Initial.txt b/Controller/RUL2/07_RHW/Sec7a_Initial/Sec7a1_RHW-2_Initial.txt index e9347975e..c2b9c33c6 100644 --- a/Controller/RUL2/07_RHW/Sec7a_Initial/Sec7a1_RHW-2_Initial.txt +++ b/Controller/RUL2/07_RHW/Sec7a_Initial/Sec7a1_RHW-2_Initial.txt @@ -39,16 +39,28 @@ 0x09000a00,3,0,0x57602200,0,1=0x09000c00,3,0,0x57602200,0,1 ;----Orthogonal RHW-2 x Diagonal Street Fix (T30)---- +; short T converts base diagonal -> long T end 0x57603000,3,0,0x5F500200,2,0=0x57603000,3,0,0x57603009,3,0 0x57603000,1,1,0x5F500200,1,0=0x57603000,1,1,0x57603009,1,1 +; long T end converts +-int -> T-int +0x57603009,1,0,0x57004000,1,0=0x57603009,1,0,0x57603000,1,0 +0x57603009,3,1,0x57004000,3,1=0x57603009,3,1,0x57603000,3,1 ;----Orthogonal RHW-2 x Diagonal Road Fix (T31)---- +; short T converts base diagonal -> long T end 0x57603100,3,0,0x00000a00,2,0=0x57603100,3,0,0x57603109,3,0 0x57603100,1,1,0x00000a00,1,0=0x57603100,1,1,0x57603109,1,1 +; long T end converts +-int -> T-int +0x57603109,1,0,0x57004100,1,0=0x57603109,1,0,0x57603100,1,0 +0x57603109,3,1,0x57004100,3,1=0x57603109,3,1,0x57603100,3,1 ;----Orthogonal RHW-2 x Diagonal One-Way Road Fix (T32)---- +; short T converts base diagonal -> long T end 0x57603200,3,0,0x09000a00,2,0=0x57603200,3,0,0x57603209,3,0 0x57603200,1,1,0x09000a00,1,0=0x57603200,1,1,0x57603209,1,1 +; long T end converts +-int -> T-int +0x57603209,1,0,0x57004200,1,0=0x57603209,1,0,0x57603200,1,0 +0x57603209,3,1,0x57004200,3,1=0x57603209,3,1,0x57603200,3,1 ;----Orthogonal Street x Diagonal RHW-2 Fix (T40)---- 0x57604000,0,0,0x57000200,2,0=0x57604000,0,0,0x57604009,2,0 @@ -66,11 +78,11 @@ 0x57000200,0,0,0x57605000,2,0=0x57000500,1,1,0x57605000,2,0 0x57000200,3,0,0x57605000,0,1=0x57000500,3,0,0x57605000,0,1 -;----Diagonal RHW-2 x Ortho Street Fix (T51)---- +;----Diagonal RHW-2 x Ortho Road Fix (T51)---- 0x57000200,0,0,0x57605100,2,0=0x57000500,1,1,0x57605100,2,0 0x57000200,3,0,0x57605100,0,1=0x57000500,3,0,0x57605100,0,1 -;----Diagonal RHW-2 x Ortho Street Fix (T52)---- +;----Diagonal RHW-2 x Ortho Onewayroad Fix (T52)---- 0x57000200,0,0,0x57605200,2,0=0x57000500,1,1,0x57605200,2,0 0x57000200,3,0,0x57605200,0,1=0x57000500,3,0,0x57605200,0,1 From 29030ef1ba44c18a672271173b5d59d3f26f3d87 Mon Sep 17 00:00:00 2001 From: jflann <26899145+jflann@users.noreply.github.com> Date: Sun, 3 Sep 2023 10:45:20 -0500 Subject: [PATCH 3/6] add prevents for back-to-back short T for RHW --- .../RUL2/07_RHW/Sec7a_Initial/Sec7a1_RHW-2_Initial.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Controller/RUL2/07_RHW/Sec7a_Initial/Sec7a1_RHW-2_Initial.txt b/Controller/RUL2/07_RHW/Sec7a_Initial/Sec7a1_RHW-2_Initial.txt index c2b9c33c6..42d42e36c 100644 --- a/Controller/RUL2/07_RHW/Sec7a_Initial/Sec7a1_RHW-2_Initial.txt +++ b/Controller/RUL2/07_RHW/Sec7a_Initial/Sec7a1_RHW-2_Initial.txt @@ -45,6 +45,9 @@ ; long T end converts +-int -> T-int 0x57603009,1,0,0x57004000,1,0=0x57603009,1,0,0x57603000,1,0 0x57603009,3,1,0x57004000,3,1=0x57603009,3,1,0x57603000,3,1 +; prevent back-to-back short T-ints +0x57603000,3,0,0x57603000,1,0=0,0,0,0,0,0 +0x57603000,1,1,0x57603000,3,1=0,0,0,0,0,0 ;----Orthogonal RHW-2 x Diagonal Road Fix (T31)---- ; short T converts base diagonal -> long T end @@ -53,6 +56,9 @@ ; long T end converts +-int -> T-int 0x57603109,1,0,0x57004100,1,0=0x57603109,1,0,0x57603100,1,0 0x57603109,3,1,0x57004100,3,1=0x57603109,3,1,0x57603100,3,1 +; prevent back-to-back short T-ints +0x57603100,3,0,0x57603100,1,0=0,0,0,0,0,0 +0x57603100,1,1,0x57603100,3,1=0,0,0,0,0,0 ;----Orthogonal RHW-2 x Diagonal One-Way Road Fix (T32)---- ; short T converts base diagonal -> long T end @@ -61,6 +67,9 @@ ; long T end converts +-int -> T-int 0x57603209,1,0,0x57004200,1,0=0x57603209,1,0,0x57603200,1,0 0x57603209,3,1,0x57004200,3,1=0x57603209,3,1,0x57603200,3,1 +; prevent back-to-back short T-ints +0x57603200,3,0,0x57603200,1,0=0,0,0,0,0,0 +0x57603200,1,1,0x57603200,3,1=0,0,0,0,0,0 ;----Orthogonal Street x Diagonal RHW-2 Fix (T40)---- 0x57604000,0,0,0x57000200,2,0=0x57604000,0,0,0x57604009,2,0 From 61f9cf4705d63238a1d38c481aa156ad496554ce Mon Sep 17 00:00:00 2001 From: jflann <26899145+jflann@users.noreply.github.com> Date: Sun, 3 Sep 2023 12:13:07 -0500 Subject: [PATCH 4/6] add prevents for back-to-back long T ends --- .../RUL2/07_RHW/Sec7a_Initial/Sec7a1_RHW-2_Initial.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Controller/RUL2/07_RHW/Sec7a_Initial/Sec7a1_RHW-2_Initial.txt b/Controller/RUL2/07_RHW/Sec7a_Initial/Sec7a1_RHW-2_Initial.txt index 42d42e36c..dde196f10 100644 --- a/Controller/RUL2/07_RHW/Sec7a_Initial/Sec7a1_RHW-2_Initial.txt +++ b/Controller/RUL2/07_RHW/Sec7a_Initial/Sec7a1_RHW-2_Initial.txt @@ -48,6 +48,9 @@ ; prevent back-to-back short T-ints 0x57603000,3,0,0x57603000,1,0=0,0,0,0,0,0 0x57603000,1,1,0x57603000,3,1=0,0,0,0,0,0 +; prevent back-to-back long T ends +0x57603009,1,0,0x57603009,3,0=0,0,0,0,0,0 +0x57603009,3,1,0x57603009,1,1=0,0,0,0,0,0 ;----Orthogonal RHW-2 x Diagonal Road Fix (T31)---- ; short T converts base diagonal -> long T end @@ -59,6 +62,9 @@ ; prevent back-to-back short T-ints 0x57603100,3,0,0x57603100,1,0=0,0,0,0,0,0 0x57603100,1,1,0x57603100,3,1=0,0,0,0,0,0 +; prevent back-to-back long T ends +0x57603109,1,0,0x57603109,3,0=0,0,0,0,0,0 +0x57603109,3,1,0x57603109,1,1=0,0,0,0,0,0 ;----Orthogonal RHW-2 x Diagonal One-Way Road Fix (T32)---- ; short T converts base diagonal -> long T end @@ -70,6 +76,9 @@ ; prevent back-to-back short T-ints 0x57603200,3,0,0x57603200,1,0=0,0,0,0,0,0 0x57603200,1,1,0x57603200,3,1=0,0,0,0,0,0 +; prevent back-to-back long T ends +0x57603209,1,0,0x57603209,3,0=0,0,0,0,0,0 +0x57603209,3,1,0x57603209,1,1=0,0,0,0,0,0 ;----Orthogonal Street x Diagonal RHW-2 Fix (T40)---- 0x57604000,0,0,0x57000200,2,0=0x57604000,0,0,0x57604009,2,0 From f77d2367254cfa5d165dd534534964608b866424 Mon Sep 17 00:00:00 2001 From: jflann <26899145+jflann@users.noreply.github.com> Date: Sun, 3 Sep 2023 23:28:10 -0500 Subject: [PATCH 5/6] addtional RUL1, RUL2 for diagonal Ts involving RHW --- Controller/RUL1/01_Road/09_Road_Dirtroad.txt | 50 +++++++++------ .../RUL1/04_Street/09_Street_Dirtroad.txt | 49 ++++++++------- .../08_OneWayRoad/09_OneWayRoad_Dirtroad.txt | 63 ++++++++++--------- .../Sec7a_Initial/Sec7a1_RHW-2_Initial.txt | 30 +++++++++ 4 files changed, 124 insertions(+), 68 deletions(-) diff --git a/Controller/RUL1/01_Road/09_Road_Dirtroad.txt b/Controller/RUL1/01_Road/09_Road_Dirtroad.txt index 1cbe0691c..922b3da69 100644 --- a/Controller/RUL1/01_Road/09_Road_Dirtroad.txt +++ b/Controller/RUL1/01_Road/09_Road_Dirtroad.txt @@ -194,26 +194,40 @@ TYPE1=0x00020002,0x04000400,0x57001100,0,0 TYPE2=0x02000200,0x00040004,0x57001100,1,0 ; ; OxD - orthogonal road, diagonal RHW -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 -; OxD T - orthogonal road T, diagonal RHW -1=0x00000002,0x03010000,0x57604100,0,0 -2=0x00000200,0x01000003,0x57604100,1,0 -3=0x00020000,0x00000301,0x57604100,2,0 -4=0x02000000,0x00030100,0x57604100,3,0 -5=0x00020000,0x01000003,0x57604100,0,1 -6=0x00000200,0x03010000,0x57604100,1,1 -7=0x00000002,0x00030100,0x57604100,2,1 -8=0x02000000,0x00000301,0x57604100,3,1 - +; +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 +; 1=0X00020002,0X00000300,0x57605100,3,1 2=0X02000200,0X00030000,0x57605100,2,1 3=0X00020002,0X03000000,0x57605100,1,1 diff --git a/Controller/RUL1/04_Street/09_Street_Dirtroad.txt b/Controller/RUL1/04_Street/09_Street_Dirtroad.txt index 3ea11f828..bac10b42e 100644 --- a/Controller/RUL1/04_Street/09_Street_Dirtroad.txt +++ b/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,7 +86,20 @@ RWNSSE=0X00020000,0X02000202,0x5760B000,0,0 6=0X00000200,0X00000001,0x5EAA1100,1,1 7=0X00000002,0X01000000,0x5EAA1100,2,1 8=0X02000000,0X00010000,0x5EAA1100,3,1 -; OxD T - orthogonal street T, diagonal RHW +; +; 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 @@ -104,8 +108,20 @@ RWNSSE=0X00020000,0X02000202,0x5760B000,0,0 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 @@ -145,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 diff --git a/Controller/RUL1/08_OneWayRoad/09_OneWayRoad_Dirtroad.txt b/Controller/RUL1/08_OneWayRoad/09_OneWayRoad_Dirtroad.txt index 2cd1fcc61..e50557344 100644 --- a/Controller/RUL1/08_OneWayRoad/09_OneWayRoad_Dirtroad.txt +++ b/Controller/RUL1/08_OneWayRoad/09_OneWayRoad_Dirtroad.txt @@ -49,7 +49,8 @@ TYPE7=0x00000100,0x03010000,0x5700A200,1,1 TYPE8=0x00010000,0x01000003,0x5700A200,0,1 ; -; OxD T - orthogonal OWR T, diagonal RHW +; OxD T (short drag) - orthogonal OWR T, diagonal RHW +; TYPE1=0x00000002,0x03010000,0x57604200,0,0 TYPE2=0x00000200,0x01000003,0x57604200,1,0 TYPE3=0x00020000,0x00000301,0x57604200,2,0 @@ -59,24 +60,38 @@ TYPE6=0x00000200,0x03010000,0x57604200,1,1 TYPE7=0x00000002,0x00030100,0x57604200,2,1 TYPE8=0x02000000,0x00000301,0x57604200,3,1 ; -;TYPE1=0x02000000,0x00030100,0x57007200,0,0 -;TYPE2=0x00000002,0x03010000,0x57007200,1,0 -;TYPE3=0x00000200,0x01000003,0x57007200,2,0 -;TYPE4=0x00020000,0x00000301,0x57007200,3,0 -;TYPE5=0x02000000,0x00000301,0x57007200,0,1 -;TYPE6=0x00000002,0x00030100,0x57007200,3,1 -;TYPE7=0x00000200,0x03010000,0x57007200,2,1 -;TYPE8=0x00020000,0x01000003,0x57007200,1,1 -; -;;diagonal rhw, straight cross network -1=0X00020002,0X00000301,0x57007200,2,0 -2=0X02000200,0X00030100,0x57007200,3,0 -3=0X00020002,0X03010000,0x57007200,0,0 -4=0X02000200,0X01000003,0x57007200,1,0 -5=0X00020002,0X00030100,0x57007200,2,1 -6=0X02000200,0X00000301,0x57007200,3,1 -7=0X00020002,0X01000003,0x57007200,0,1 -8=0X02000200,0X03010000,0x57007200,1,1 +; OxD T (long drag end) - orthogonal OWR T, diagonal RHW +; +TYPE1=0x00020000,0x03010000,0x57604209,0,0 +TYPE2=0x02000000,0x01000003,0x57604209,1,0 +TYPE3=0x00000002,0x00000301,0x57604209,2,0 +TYPE4=0x00000200,0x00030100,0x57604209,3,0 +TYPE5=0x00000002,0x01000003,0x57604209,0,1 +TYPE6=0x02000000,0x03010000,0x57604209,1,1 +TYPE7=0x00020000,0x00030100,0x57604209,2,1 +TYPE8=0x00000200,0x00000301,0x57604209,3,1 +; +; OxD T - orthogonal onewayroad, diagonal RHW T +; +TYPE1=0x02000200,0x00010000,0x57605200,0,0 +TYPE2=0x00020002,0x01000000,0x57605200,1,0 +TYPE3=0x02000200,0x00000001,0x57605200,2,0 +TYPE4=0x00020002,0x00000100,0x57605200,3,0 +TYPE5=0x02000200,0x00000003,0x57605200,0,1 +TYPE6=0x00020002,0x03000000,0x57605200,1,1 +TYPE7=0x02000200,0x00030000,0x57605200,2,1 +TYPE8=0x00020002,0x00000300,0x57605200,3,1 +; +; OxD - orthogonal Onewayroad, diagonal RHW +; +TYPE1=0x00020002,0x03010000,0x57007200,0,0 +TYPE2=0x02000200,0x01000003,0x57007200,1,0 +TYPE3=0x00020002,0x00000301,0x57007200,2,0 +TYPE4=0x02000200,0x00030100,0x57007200,3,0 +TYPE5=0x00020002,0x01000003,0x57007200,0,1 +TYPE6=0x02000200,0x03010000,0x57007200,1,1 +TYPE7=0x00020002,0x00030100,0x57007200,2,1 +TYPE8=0x02000200,0x00000301,0x57007200,3,1 ; ;piece 57 for single road/elbow one-way ; @@ -185,16 +200,6 @@ TYPE6=0x00030100,0x00040004,0x57004200,1,1 TYPE7=0x03010000,0x04000400,0x57004200,0,1 TYPE8=0x01000003,0x00040004,0x57004200,3,1 -; OxD T - orthogonal onewayroad, diagonal RHW T -TYPE1=0x02000200,0x00010000,0x57605200,0,0 -TYPE2=0x00020002,0x01000000,0x57605200,1,0 -TYPE3=0x02000200,0x00000001,0x57605200,2,0 -TYPE4=0x00020002,0x00000100,0x57605200,3,0 -TYPE5=0x02000200,0x00000003,0x57605200,0,1 -TYPE6=0x00020002,0x03000000,0x57605200,1,1 -TYPE7=0x02000200,0x00030000,0x57605200,2,1 -TYPE8=0x00020002,0x00000300,0x57605200,3,1 - ; DxO T - diagonal onewayroad T, orthogonal RHW TYPE1=0x00010000,0x02000200,0x57602200,0,0 TYPE2=0x01000000,0x00020002,0x57602200,1,0 diff --git a/Controller/RUL2/07_RHW/Sec7a_Initial/Sec7a1_RHW-2_Initial.txt b/Controller/RUL2/07_RHW/Sec7a_Initial/Sec7a1_RHW-2_Initial.txt index dde196f10..3d4dcde1d 100644 --- a/Controller/RUL2/07_RHW/Sec7a_Initial/Sec7a1_RHW-2_Initial.txt +++ b/Controller/RUL2/07_RHW/Sec7a_Initial/Sec7a1_RHW-2_Initial.txt @@ -81,16 +81,46 @@ 0x57603209,3,1,0x57603209,1,1=0,0,0,0,0,0 ;----Orthogonal Street x Diagonal RHW-2 Fix (T40)---- +; short T converts base diagonal -> long T end 0x57604000,0,0,0x57000200,2,0=0x57604000,0,0,0x57604009,2,0 0x57604000,2,1,0x57000200,1,0=0x57604000,2,1,0x57604009,0,1 +; long T end converts +-int -> T-int +0x57604009,0,0,0x57007000,2,0=0x57604009,0,0,0x57604000,2,0 +0x57604009,2,1,0x57007000,0,1=0x57604009,2,1,0x57604000,0,1 +; prevent back-to-back short T-ints +0x57604000,0,0,0x57604000,2,0=0,0,0,0,0,0 +0x57604000,2,1,0x57604000,0,1=0,0,0,0,0,0 +; prevent back-to-back long T ends +0x57604009,0,0,0x57604009,2,0=0,0,0,0,0,0 +0x57604009,2,1,0x57604009,0,1=0,0,0,0,0,0 ;----Orthogonal Road x Diagonal RHW-2 Fix (T41)---- +; short T converts base diagonal -> long T end 0x57604100,0,0,0x57000200,2,0=0x57604100,0,0,0x57604109,2,0 0x57604100,2,1,0x57000200,1,0=0x57604100,2,1,0x57604109,0,1 +; long T end converts +-int -> T-int +0x57604109,0,0,0x57007100,2,0=0x57604109,0,0,0x57604100,2,0 +0x57604109,2,1,0x57007100,0,1=0x57604109,2,1,0x57604100,0,1 +; prevent back-to-back short T-ints +0x57604100,0,0,0x57604100,2,0=0,0,0,0,0,0 +0x57604100,2,1,0x57604100,0,1=0,0,0,0,0,0 +; prevent back-to-back long T ends +0x57604109,0,0,0x57604109,2,0=0,0,0,0,0,0 +0x57604109,2,1,0x57604109,0,1=0,0,0,0,0,0 ;----Orthogonal One-Way Road x Diagonal RHW-2 Fix (T42)---- +; short T converts base diagonal -> long T end 0x57604200,0,0,0x57000200,2,0=0x57604200,0,0,0x57604209,2,0 0x57604200,2,1,0x57000200,1,0=0x57604200,2,1,0x57604209,0,1 +; long T end converts +-int -> T-int +0x57604209,0,0,0x57007200,2,0=0x57604209,0,0,0x57604200,2,0 +0x57604209,2,1,0x57007200,0,1=0x57604209,2,1,0x57604200,0,1 +; prevent back-to-back short T-ints +0x57604200,0,0,0x57604200,2,0=0,0,0,0,0,0 +0x57604200,2,1,0x57604200,0,1=0,0,0,0,0,0 +; prevent back-to-back long T ends +0x57604209,0,0,0x57604209,2,0=0,0,0,0,0,0 +0x57604209,2,1,0x57604209,0,1=0,0,0,0,0,0 ;----Diagonal RHW-2 x Ortho Street Fix (T50)---- 0x57000200,0,0,0x57605000,2,0=0x57000500,1,1,0x57605000,2,0 From daf7f78b38fda791ca9c2d89de8a759d5f1a8292 Mon Sep 17 00:00:00 2001 From: jflann <26899145+jflann@users.noreply.github.com> Date: Mon, 4 Sep 2023 11:08:49 -0500 Subject: [PATCH 6/6] standardize OxD/DxO T implementation on road, owr --- .../RUL1/01_Road/08_Road_OneWayRoad.txt | 50 +++++++++++++------ .../RUL2/01_Maxis_Misc/Sec1e_Rd_Misc.txt | 26 ++++++---- 2 files changed, 52 insertions(+), 24 deletions(-) diff --git a/Controller/RUL1/01_Road/08_Road_OneWayRoad.txt b/Controller/RUL1/01_Road/08_Road_OneWayRoad.txt index b05df5fb4..3865246b5 100644 --- a/Controller/RUL1/01_Road/08_Road_OneWayRoad.txt +++ b/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 diff --git a/Controller/RUL2/01_Maxis_Misc/Sec1e_Rd_Misc.txt b/Controller/RUL2/01_Maxis_Misc/Sec1e_Rd_Misc.txt index d3b987960..628077323 100644 --- a/Controller/RUL2/01_Maxis_Misc/Sec1e_Rd_Misc.txt +++ b/Controller/RUL2/01_Maxis_Misc/Sec1e_Rd_Misc.txt @@ -22,26 +22,32 @@ 0x00003900,3,1,0x00003c00,3,1=0x00003a00,3,1,0x00003c00,3,1 ;Road Diag x One-Way Road Orth +; short T converts base diagonal -> long T end 0x09703a00,1,0,0x00000a00,2,0=0x09703a00,1,0,0x09703c00,1,0 0x09703a00,3,1,0x00000a00,1,0=0x09703a00,3,1,0x09703c00,3,1 -;half-drag +-int prevent +; long T end converts +-int -> T-int +0x09703c00,3,0,0x09703900,3,0=0x09703c00,3,0,0x09703a00,3,0 +0x09703c00,1,1,0x09703900,1,1=0x09703c00,1,1,0x09703a00,1,1 +; prevent back-to-back short T-ints 0x09703a00,1,0,0x09703a00,3,0=0,0,0,0,0,0 0x09703a00,3,1,0x09703a00,1,1=0,0,0,0,0,0 +; prevent back-to-back long T ends +0x09703c00,3,0,0x09703c00,1,0=0,0,0,0,0,0 +0x09703c00,1,1,0x09703c00,3,1=0,0,0,0,0,0 ;One-Way Road Diag x Road Orth -0x09000a00,0,0,0x09803900,3,0=0x09803c00,3,0,0x09803a00,3,0 -0x09000a00,3,0,0x09803900,1,1=0x09803c00,1,1,0x09803a00,1,1 -0x09803900,1,0,0x09000a00,2,0=0x09803a00,1,0,0x09803c00,1,0 -0x09803900,3,1,0x09000a00,1,0=0x09803a00,3,1,0x09803c00,3,1 -;Stability -0x09000a00,0,0,0x09803a00,3,0=0x09803c00,3,0,0x09803a00,3,0 -0x09000a00,3,0,0x09803a00,1,1=0x09803c00,1,1,0x09803a00,1,1 +; short T converts base diagonal -> long T end 0x09803a00,1,0,0x09000a00,2,0=0x09803a00,1,0,0x09803c00,1,0 0x09803a00,3,1,0x09000a00,1,0=0x09803a00,3,1,0x09803c00,3,1 +; long T end converts +-int -> T-int 0x09803c00,3,0,0x09803900,3,0=0x09803c00,3,0,0x09803a00,3,0 0x09803c00,1,1,0x09803900,1,1=0x09803c00,1,1,0x09803a00,1,1 -0x09803900,1,0,0x09803c00,1,0=0x09803a00,1,0,0x09803c00,1,0 -0x09803900,3,1,0x09803c00,3,1=0x09803a00,3,1,0x09803c00,3,1 +; prevent back-to-back short T-ints +0x09803a00,1,0,0x09803a00,3,0=0,0,0,0,0,0 +0x09803a00,3,1,0x09803a00,1,1=0,0,0,0,0,0 +; prevent back-to-back long T ends +0x09803c00,3,0,0x09803c00,1,0=0,0,0,0,0,0 +0x09803c00,1,1,0x09803c00,3,1=0,0,0,0,0,0 ;One-Way Road Diag x One-Way Road Orth 0x09000a00,0,0,0x09003900,3,0=0x09003c00,3,0,0x09003a00,3,0