diff --git a/Controller/INRULs/LightrailAdvanced/RUL10_LightRail_Advanced.rul b/Controller/INRULs/LightrailAdvanced/RUL10_LightRail_Advanced.rul index 76b1358f8..c70746f2d 100644 --- a/Controller/INRULs/LightrailAdvanced/RUL10_LightRail_Advanced.rul +++ b/Controller/INRULs/LightrailAdvanced/RUL10_LightRail_Advanced.rul @@ -115,6 +115,126 @@ ; End of Draggable GLR Section ;------------------------------ ; + +; +;piece 297 (and its neighborhood) +; +1,22,0,02,02 +3,0,0x08029700,1,1 +1,2,2,22,0 +3,0,0x08029700,3,1 +1,0,2,2,22 +3,0,0x08029700,2,1 +1,2,22,0,2 +3,0,0x08029700,0,1 +1,0,42,2,2 +3,0,0x08029700,0,0 +1,2,2,0,42 +3,0,0x08029700,2,0 +1,42,2,2,0 +3,0,0x08029700,3,0 +1,2,0,42,2 +3,0,0x08029700,1,0 +; +1,3,0,0,42 +2,7,0,42,2,2 +3,0,0x08001C00,0,1 +1,42,3,0,0 +2,1,2,0,42,2 +3,0,0x08001C00,3,1 +1,0,42,3,0 +2,3,2,2,0,42 +3,0,0x08001C00,2,1 +1,0,0,42,3 +2,5,42,2,2,0 +3,0,0x08001C00,1,1 +1,0,0,1,22 +2,7,2,22,0,2 +3,0,0x08001C00,0,0 +1,0,1,22,0 +2,5,22,0,2,2 +3,0,0x08001C00,3,0 +1,1,22,0,0 +2,3,0,2,2,22 +3,0,0x08001C00,2,0 +1,22,0,0,1 +2,1,2,2,22,0 +3,0,0x08001C00,1,0 +; +1,23,0,2,42 +2,7,0,42,2,2 +3,0,0x08aa6500,1,1 +1,42,23,0,2 +2,1,2,0,42,2 +3,0,0x08aa6500,0,1 +1,2,42,23,0 +2,3,2,2,0,42 +3,0,0x08aa6500,3,1 +1,0,2,42,23 +2,5,42,2,2,0 +3,0,0x08aa6500,2,1 +1,2,0,21,22 +2,7,2,22,0,2 +3,0,0x08aa6500,1,0 +1,0,21,22,2 +2,5,22,0,2,2 +3,0,0x08aa6500,0,0 +1,21,22,2,0 +2,3,0,2,2,22 +3,0,0x08aa6500,3,0 +1,22,2,0,21 +2,1,2,2,22,0 +3,0,0x08aa6500,2,0 +; +1,2,0,2,0 +2,1,0,42,2,2 +3,0,0x08031600,1,0 +1,0,2,0,2 +2,3,2,0,42,2 +3,0,0x08031600,2,0 +1,2,0,2,0 +2,5,2,2,0,42 +3,0,0x08031600,3,0 +1,0,2,0,2 +2,7,42,2,2,0 +3,0,0x08031600,0,0 +1,2,0,2,0 +2,5,2,22,0,2 +3,0,0x08031600,1,1 +1,0,2,0,2 +2,3,22,0,2,2 +3,0,0x08031600,2,1 +1,2,0,2,0 +2,1,0,2,2,22 +3,0,0x08031600,3,1 +1,0,2,0,2 +2,7,2,2,22,0 +3,0,0x08031600,0,1 +; +1,2,0,13,0 +2,1,0,42,2,2 +3,0,0x08018B00,3,1 +1,0,2,0,13 +2,3,2,0,42,2 +3,0,0x08018B00,0,1 +1,13,0,2,0 +2,5,2,2,0,42 +3,0,0x08018B00,3,1 +1,0,13,0,2 +2,7,42,2,2,0 +3,0,0x08018B00,0,1 +1,11,0,2,0 +2,5,2,22,0,2 +3,0,0x08018B00,1,0 +1,0,2,0,11 +2,3,22,0,2,2 +3,0,0x08018B00,0,0 +1,2,0,11,0 +2,1,0,2,2,22 +3,0,0x08018B00,1,0 +1,0,11,0,2 +2,7,2,2,22,0 +3,0,0x08018B00,0,0 ; ;piece 316 (9) the right way ; @@ -388,12 +508,16 @@ ;piece AA63 (conflict with 14e) ; 1,0,21,62,23 +2,5,62,23,0,21 3,0,0x08aa6300,0,0 1,23,0,21,62 +2,7,21,62,23,0 3,0,0x08aa6300,1,0 1,62,23,0,21 +2,1,0,21,62,23 3,0,0x08aa6300,2,0 1,21,62,23,0 +2,3,23,0,21,62 3,0,0x08aa6300,3,0 ; ;piece 14e (58) the right way @@ -409,24 +533,30 @@ ; ;piece AA65 ; -1,0,21,32,2 -3,0,0x08aa6500,0,0 -1,2,0,21,32 -3,0,0x08aa6500,1,0 -1,32,2,0,21 -3,0,0x08aa6500,2,0 -1,21,32,2,0 -3,0,0x08aa6500,3,0 -1,52,23,0,2 -3,0,0x08aa6500,0,1 -1,2,52,23,0 -3,0,0x08aa6500,3,1 -1,0,2,52,23 -3,0,0x08aa6500,2,1 -1,23,0,2,52 -3,0,0x08aa6500,1,1 -; -;piece 1340 (57) the right way (wrong rules, using piece aa65 instead) +1,2,21,23,0 +2,3,?,23,?,21 +3,0,0x0802f900,3,1 +1,0,2,21,23 +2,5,21,?,23,? +3,0,0x0802f900,2,1 +1,23,0,2,21 +2,7,?,21,?,23 +3,0,0x0802f900,1,1 +1,21,23,0,2 +2,1,23,?,21,? +3,0,0x0802f900,0,1 +1,21,23,2,0 +2,3,?,21,?,23 +3,0,0x0802f900,3,0 +1,23,2,0,21 +2,1,21,?,23,? +3,0,0x0802f900,2,0 +1,2,0,21,23 +2,7,?,23,?,21 +3,0,0x0802f900,1,0 +1,0,21,23,2 +2,5,23,?,21,? +3,0,0x0802f900,0,0 ; 1,2,21,23,0 3,0,0x08aa6500,3,1 @@ -446,42 +576,66 @@ 3,0,0x08aa6500,2,0 ; ; -;piece 325 +;piece 325 (pattern seems not draggable) ; -1,01,22,00,02 -3,0,0x08032500,2,0 -1,02,01,22,00 -3,0,0x08032500,3,0 -1,00,02,01,22 -3,0,0x08032500,0,0 -1,02,00,42,03 -3,0,0x08032500,1,1 -1,00,42,03,02 -3,0,0x08032500,2,1 -1,03,02,00,42 -3,0,0x08032500,0,1 -; -;yet more rules for piece 297 -; -1,22,0,02,02 -3,0,0x08029700,1,1 -1,2,2,22,0 -3,0,0x08029700,3,1 -1,0,2,2,22 -3,0,0x08029700,2,1 -1,2,22,0,2 -3,0,0x08029700,0,1 -1,0,42,2,2 -3,0,0x08029700,0,0 -1,2,2,0,42 -3,0,0x08029700,2,0 -1,42,2,2,0 -3,0,0x08029700,3,0 -1,2,0,42,2 -3,0,0x08029700,1,0 +; 1,01,22,00,02 +; 3,0,0x08032500,2,0 +; 1,02,01,22,00 +; 3,0,0x08032500,3,0 +; 1,00,02,01,22 +; 3,0,0x08032500,0,0 +; 1,02,00,42,03 +; 3,0,0x08032500,1,1 +; 1,00,42,03,02 +; 3,0,0x08032500,2,1 +; 1,03,02,00,42 +; 3,0,0x08032500,0,1 ; ;piece 1a (2) for 38 edge conditions ;altered for bow tie intersection +;(traffic circle is removed) +; +1,23,0,0,21 +2,1,21,?,23,? +2,7,?,21,?,23 +3,0,0x08001a00,1,0 +1,21,23,0,0 +2,1,23,?,21,? +2,3,?,21,?,23 +3,0,0x08001a00,2,0 +1,0,21,23,0 +2,3,?,23,?,21 +2,5,23,?,21,? +3,0,0x08001a00,3,0 +1,0,0,21,23 +2,5,21,?,23,? +2,7,?,23,?,21 +3,0,0x08001a00,0,0 +; +1,23,0,0,21 +2,1,21,?,23,? +3,0,0x08001c00,0,1 +1,21,23,0,0 +2,3,?,21,?,23 +3,0,0x08001c00,3,1 +1,0,21,23,0 +2,5,23,?,21,? +3,0,0x08001c00,2,1 +1,0,0,21,23 +2,7,?,23,?,21 +3,0,0x08001c00,1,1 +1,23,0,0,21 +2,7,?,21,?,23 +3,0,0x08001c00,1,0 +1,21,23,0,0 +2,1,23,?,21,? +3,0,0x08001c00,2,0 +1,0,21,23,0 +2,3,?,23,?,21 +3,0,0x08001c00,3,0 +1,0,0,21,23 +2,5,21,?,23,? +3,0,0x08001c00,0,0 ; 1,23,0,0,21 3,0,0x08aa6600,1,0 @@ -491,3 +645,74 @@ 3,0,0x08aa6600,3,0 1,0,0,21,23 3,0,0x08aa6600,0,0 +; +;more traffic circle removal +; +1,23,0,0,1 +2,1,21,?,23,? +3,0,0x08001a00,1,0 +1,1,23,0,0 +2,3,?,21,?,23 +3,0,0x08001a00,2,0 +1,0,1,23,0 +2,5,23,?,21,? +3,0,0x08001a00,3,0 +1,0,0,1,23 +2,7,?,23,?,21 +3,0,0x08001a00,0,0 +1,0,0,21,3 +2,5,21,?,23,? +3,0,0x08001a00,0,0 +1,0,21,3,0 +2,3,?,23,?,21 +3,0,0x08001a00,3,0 +1,21,3,0,0 +2,1,23,?,21,? +3,0,0x08001a00,2,0 +1,3,0,0,21 +2,7,?,21,?,23 +3,0,0x08001a00,1,0 +; +1,23,0,0,1 +3,0,0x08001c00,1,0 +1,1,23,0,0 +3,0,0x08001c00,2,0 +1,0,1,23,0 +3,0,0x08001c00,3,0 +1,0,0,1,23 +3,0,0x08001c00,0,0 +1,0,0,21,3 +3,0,0x08001c00,1,1 +1,0,21,3,0 +3,0,0x08001c00,2,1 +1,21,3,0,0 +3,0,0x08001c00,3,1 +1,3,0,0,21 +3,0,0x08001c00,0,1 +; +; yet more traffic circle removal rules +; +1,0,0,21,13 +2,5,21,?,23,? +3,0,0x08002200,0,0 +1,13,0,0,21 +2,7,?,21,?,23 +3,0,0x08002200,1,0 +1,21,13,0,0 +2,1,23,?,21,? +3,0,0x08002200,2,0 +1,0,21,13,0 +2,3,?,23,?,21 +3,0,0x08002200,3,0 +1,23,0,0,11 +2,1,21,?,23,? +3,0,0x08002200,0,1 +1,0,0,11,23 +2,7,?,23,?,21 +3,0,0x08002200,1,1 +1,0,11,23,0 +2,5,23,?,21,? +3,0,0x08002200,2,1 +1,11,23,0,0 +2,3,?,21,?,23 +3,0,0x08002200,3,1 diff --git a/Controller/INRULs/LightrailBasic/RUL0F_LightRail_Basic.rul b/Controller/INRULs/LightrailBasic/RUL0F_LightRail_Basic.rul index 6ecf0b862..f638b0a82 100644 --- a/Controller/INRULs/LightrailBasic/RUL0F_LightRail_Basic.rul +++ b/Controller/INRULs/LightrailBasic/RUL0F_LightRail_Basic.rul @@ -8,11 +8,13 @@ 1,00,00,01,03 3,0,0x08001A00,0,0 -1,00,00,01,23 -3,0,0x08001C00,0,0 +; see advanced INRUL file +; 1,00,00,01,23 +; 3,0,0x08001C00,0,0 -1,00,00,11,22 -3,0,0x08002200,0,0 +; see advanced INRUL file +; 1,00,00,11,22 +; 3,0,0x08002200,0,0 1,00,01,62,03 3,0,0x08014E00,0,0 @@ -27,7 +29,7 @@ 3,0,0x08029700,0,0 1,00,21,13,02 -3,0,0x0802F900,0,0 +3,0,0x08029700,0,0 1,00,02,00,22 3,0,0x08031600,0,0 @@ -50,8 +52,8 @@ 1,02,02,02,02 3,0,0x082E2D00,0,0 -1,0,21,32,2 -3,0,0x08aa6500,0,0 +; 1,0,21,32,2 +; 3,0,0x08aa6500,0,0 1,0,13,0,42 3,0,0x08019500,0,1 @@ -62,23 +64,12 @@ 1,0,0,1,13 3,0,0x08002200,0,0 -1,0,0,21,13 -3,0,0x08002200,0,0 - -1,23,0,0,42 -3,0,0x08002200,0,1 - -1,13,0,0,42 -3,0,0x08002200,0,1 - -1,3,0,0,42 -3,0,0x08002200,0,1 - 1,2,1,23,0 3,0,0x0802F900,3,1 -1,23,0,0,21 -3,0,0x08001A00,1,0 +; see advanced INRUL file +; 1,23,0,0,21 +; 3,0,0x08AA6600,1,0 1,0,2,0,13 3,0,0x08031600,0,0 @@ -121,5 +112,6 @@ 1,0,21,3,22 3,0,0x08aa5000,0,0 -1,0,21,62,23 -3,0,0x08aa6300,0,0 \ No newline at end of file +; see advanced INRUL file +; 1,0,21,62,23 +; 3,0,0x08aa6300,0,0 \ No newline at end of file diff --git a/Controller/RUL2/01_Maxis_Misc/Sec1a_Maxis.txt b/Controller/RUL2/01_Maxis_Misc/Sec1a_Maxis.txt index c347ed4b2..59aab0dfa 100644 --- a/Controller/RUL2/01_Maxis_Misc/Sec1a_Maxis.txt +++ b/Controller/RUL2/01_Maxis_Misc/Sec1a_Maxis.txt @@ -735,49 +735,16 @@ 0x0ab00500,3,1,0x0a002100,0,0=0x0ab00500,3,1,0x0ab00600,0,0 ; ;----------------- Light rail -0x08002200,0,0,0x08031600,3,0=0,0,0,0,0,0 -0x08002200,0,1,0x08031600,1,0=0,0,0,0,0,0 -0x08002200,0,0,0x08031600,3,1=0,0,0,0,0,0 -0x08002200,2,1,0x08034b00,3,1=0,0,0,0,0,0; missing_paths -0x08002200,0,0,0x08029500,3,0=0,0,0,0,0,0 -0x08014e00,1,0,0x08029500,3,0=0,0,0,0,0,0 -;0x0802f900,3,1,0x08002200,0,1=0,0,0,0,0,0 -0x0802f900,1,0,0x08002200,2,0=0,0,0,0,0,0 -0x08014e00,3,0,0x08002200,0,1=0,0,0,0,0,0 -0x08002200,0,0,0x08029700,3,0=0,0,0,0,0,0 0x08aa6300,3,0,0x0802f900,1,1=0,0,0,0,0,0 0x0812ff00,1,0,0x0812ff00,3,0=0,0,0,0,0,0 -0x08aa6300,3,0,0x08aa6300,1,0=0,0,0,0,0,0 -0x0824f100,2,1,0x08002200,0,1=0,0,0,0,0,0; missing_paths -0x0824fd00,0,1,0x08002200,0,1=0,0,0,0,0,0; missing_paths ;allowing for short fork ;0x0812ff00,0,0,0x08002200,0,1=0,0,0,0,0,0 ;0x0812ff00,2,0,0x08002200,2,0=0,0,0,0,0,0 -0x08aa5000,3,1,0x082a5900,3,0=0,0,0,0,0,0; missing_paths -0x08aa5000,3,1,0x08002200,0,1=0,0,0,0,0,0 -0x08aa6300,3,0,0x08002200,0,1=0,0,0,0,0,0 0x0802f900,3,1,0x08aa6500,1,1=0,0,0,0,0,0 -0x0802f900,3,1,0x082a5900,3,0=0,0,0,0,0,0; missing_paths -0x0802f900,3,1,0x08aa6500,2,0=0,0,0,0,0,0 -0x08000200,1,1,0x08aa2800,3,1=0,0,0,0,0,0; missing_paths -0x0802f900,1,0,0x08187700,3,0=0,0,0,0,0,0; missing_paths 0x08014e00,3,0,0x08aa5000,1,1=0,0,0,0,0,0 0x08aa6500,1,0,0x08002200,2,0=0,0,0,0,0,0 0x08014e00,3,0,0x0802f900,1,1=0,0,0,0,0,0 0x0802f900,1,0,0x08014e00,3,0=0,0,0,0,0,0 -0x08032500,3,0,0x0824f100,3,0=0,0,0,0,0,0; missing_paths -0x08032500,1,1,0x0824f100,3,1=0,0,0,0,0,0; missing_paths -0x08aa6300,1,0,0x08aa6300,3,0=0,0,0,0,0,0 -0x08014e00,2,0,0x08002200,3,0=0,0,0,0,0,0 -0x08014e00,1,0,0x08002200,2,0=0,0,0,0,0,0 -0x08002200,2,1,0x08014e00,1,0=0,0,0,0,0,0 -0x08002200,0,0,0x08014e00,3,0=0,0,0,0,0,0 -0x08031a00,0,0,0x08aa6300,3,0=0,0,0,0,0,0 -0x08aa6300,3,0,0x08002200,0,1=0,0,0,0,0,0 -0x08aa6300,1,0,0x08002200,2,0=0,0,0,0,0,0 -0x08002200,2,1,0x08aa6300,1,0=0,0,0,0,0,0 -0x08002200,0,0,0x08aa6300,3,0=0,0,0,0,0,0 -0x08aa6000,3,1,0x0824f100,3,0=0,0,0,0,0,0; missing_paths 0x08aa6000,0,0,0x0802f900,1,1=0,0,0,0,0,0 0x08aa6000,2,1,0x0802f900,3,0=0,0,0,0,0,0 ;fix for dragging straight over diagonal @@ -787,21 +754,15 @@ ;fix for blend end cap 0x08000200,3,0,0x08031600,3,1=0,0,0,0,0,0 0x08000200,1,1,0x08031600,1,0=0,0,0,0,0,0 -;adjacent diagonal blend fix -0x08031600,1,1,0x08002200,2,0=0,0,0,0,0,0 ;adjacent to rail clover 0x0812ff00,2,0,0x08aa6500,3,0=0,0,0,0,0,0 0x0812ff00,0,0,0x08aa6500,1,1=0,0,0,0,0,0 -0x08aa6500,2,0,0x0812ff00,3,0=0,0,0,0,0,0 -0x0812ff00,2,0,0x0802f900,3,1=0,0,0,0,0,0 0x0812ff00,2,0,0x0802f900,3,0=0,0,0,0,0,0 0x0802f900,3,1,0x0812ff00,2,0=0,0,0,0,0,0 ; ;short 45 to prevent 90 0x08002200,2,1,0x0802f900,1,1=0,0,0,0,0,0 ; -0x0802f900,1,0,0x0824fd00,0,0=0,0,0,0,0,0; missing_paths -; ;prevent for drag near diag/diag intersection 0x08aa6300,1,0,0x0802f900,3,0=0,0,0,0,0,0 ; @@ -809,22 +770,13 @@ 0x08000200,1,1,0x08018b00,3,1=0,0,0,0,0,0 0x08018b00,1,0,0x08000200,1,0=0,0,0,0,0,0 ; -0x08aa6300,0,0,0x08aa5900,3,0=0x08014e00,0,0,0x08aa5900,3,0; missing_paths -0x08aa6300,0,0,0x08031a00,1,0=0x08014e00,0,0,0x08031a00,1,0 -0x08aa6300,0,0,0x08aa6100,1,1=0x08014e00,0,0,0x08aa6100,1,1; missing_paths 0x08aa6000,1,0,0x08032500,3,1=0x08aa6000,1,0,0x08aa2000,3,0 0x08aa2000,1,0,0x08032500,3,1=0x08aa2000,1,0,0x08aa2000,3,0 ;replace short stub of rail during straight/diagonal cross 0x08aa6000,3,1,0x08032500,1,0=0x08aa6000,3,1,0x08aa2000,1,1 -0x08032500,2,0,0x08aa6000,2,1=0x08aa2000,2,1,0x08aa6000,2,1 0x08032500,3,0,0x08002200,1,0=0x08aa2000,3,1,0x08aa6000,1,1 0x08032500,1,1,0x08002200,3,1=0x08aa2000,1,0,0x08aa6000,3,0 0x08032500,3,0,0x08032500,1,0=0x08aa2000,3,1,0x08aa2000,1,1 -0x0824fd00,3,1,0x08aa6000,0,1=0x082a5900,2,0,0x08aa6000,0,1; missing_paths -0x08aa6000,1,0,0x0824fd00,1,1=0x08aa6000,1,0,0x08aa6700,2,0; missing_paths -0x0824fd00,3,1,0x08aa2000,0,1=0x082a5900,2,0,0x08aa2000,0,1; missing_paths -0x0824fd00,1,1,0x08032500,1,1=0x082a5900,2,0,0x08aa2000,3,0; missing_paths -0x0824fd00,1,0,0x08aa2000,1,1=0x08aa6700,2,1,0x08aa2000,1,1; missing_paths 0x08002200,3,0,0x08002200,1,0=0x08001a00,3,0,0x08001a00,1,0; conflicting-override 0x08001a00,3,0,0x08001a00,0,1=0x08001a00,3,0,0x08001a00,1,0 0x08001a00,2,1,0x08001a00,1,0=0x08001a00,3,0,0x08001a00,1,0 @@ -838,86 +790,23 @@ 0x0802f900,1,0,0x08aa2000,3,0=0x08aa2000,1,0,0x08aa2000,3,0 0x0802f900,0,0,0x08031600,1,0=0x08029700,0,0,0x08031600,1,0 0x0802f900,0,0,0x08018b00,3,1=0x08029700,0,0,0x08018b00,3,1 -0x08aa3500,1,1,0x0802f900,2,0=0x08aa3500,1,1,0x08029700,2,0; missing_paths -0x08002200,3,0,0x08000200,3,1=0x08001a00,3,0,0x08000200,3,1; conflicting-override 0x08aa5000,3,0,0x0802f900,2,0=0x08aa5000,3,0,0x08029700,2,0 0x0802f900,2,1,0x08019500,3,0=0x08029700,2,1,0x08019500,3,0 0x08031700,1,1,0x08aa2000,3,0=0x08031700,1,1,0x08032500,3,1 -0x08aa3900,3,1,0x08aa2000,3,0=0x08aa3900,3,1,0x08032500,3,1; missing_paths 0x08029700,2,1,0x08002200,3,1=0x0802f900,2,1,0x08001a00,3,1 ;0x0806bd00,1,0,0x08aa2000,3,0=0x08aaXX00,X,X,0x08aa2000,3,0 ;0x0806bd00,1,0,0x08032500,3,1=0x08aaXX00,X,X,0x08aa2000,3,0 -;0x08aa6000,3,1,0x08aa3000,3,1=0x08aa6000,3,1,0x08aa7000,3,1 0x08aa2000,1,0,0x08001c00,3,1=0x0802f900,1,0,0x08001c00,3,1 ; -0x08001a00,0,0,0x0802f900,3,0=0x08ffff00,0,0,0x0802f900,3,0 -0x08ffff00,3,0,0x0802f900,1,1=0x08aa6600,3,0,0x0802f900,1,1 -0x08ffff00,3,0,0x0802f900,1,0=0x08aa6600,3,0,0x0802f900,1,0 -0x08ffff00,3,0,0x0802f900,2,1=0x08aa6600,3,0,0x0802f900,2,1 -0x08ffff00,3,0,0x0812ff00,2,0=0x08aa6600,3,0,0x0812ff00,2,0 -0x08ffff00,3,0,0x08aa6300,1,0=0x08aa6600,3,0,0x08aa6300,1,0 -0x08ffff00,3,0,0x08aa6300,3,0=0x08aa6600,3,0,0x08aa6300,3,0 -0x08ffff00,1,0,0x08aa6300,1,0=0x08aa6600,3,0,0x08aa6300,1,0 -0x08ffff00,0,0,0x082a5900,3,0=0x08aa6600,3,0,0x082a5900,3,0; missing_paths -;0x08001a00,3,0,0x0812ff00,2,0=0x08ffff00,0,0,0x0812ff00,2,0 -;0x08001a00,0,0,0x0812ff00,0,0=0x08ffff00,0,0,0x0812ff00,0,0 -;0x08ffff00,1,0,0x0812ff00,0,0=0x08aa6600,0,0,0x0812ff00,0,0 -;0x08ffff00,3,0,0x0824fd00,2,1=0x08aa6600,3,0,0x0824fd00,2,1 -;0x0824fd00,2,0,0x08ffff00,3,0=0x0824fd00,2,0,0x08aa6600,2,0 -0x08001a00,3,0,0x08aa6700,1,0=0x08ffff00,0,0,0x08aa6700,1,0; missing_paths -0x08ffff00,1,0,0x08aa6500,3,0=0x08aa6600,0,0,0x08aa6500,3,0 -0x08001a00,3,0,0x082a5900,3,0=0x08ffff00,0,0,0x082a5900,3,0; missing_paths -;0x08001a00,0,0,0x08aa6700,3,1=0x08fffa00,0,0,0x08aa6700,3,1 -;0x08fffa00,3,0,0x0802f900,1,1=0x08aa6600,3,0,0x0802f900,1,1 -0x08aa6500,3,1,0x08ffff00,1,0=0x08aa6500,3,1,0x08aa6600,1,0 -;re-enabled for NAM 32 by Tarkus, 06072013 -;0x08aa6300,1,0,0x08001a00,2,0=0x08aa6300,1,0,0x08ffff00,0,0;Maxis line commented out by Swamper77 090122 in order to let custom diagonal crossover model work -;0x08ffff00,3,0,0x08014e00,1,0=0x08aa6600,3,0,0x08014e00,1,0;Maxis line commented out by Swamper77 090122 in order to let custom 2way wye model work -;0x08ffff00,1,0,0x08014e00,3,0=0x08aa6600,0,0,0x08014e00,3,0;Maxis line commented out by Swamper77 090122 in order to let custom 2way wye model work -;0x08014e00,1,0,0x08ffff00,0,0=0x08014e00,1,0,0x08aa6600,2,0;Maxis line commented out by Swamper77 090127 in order to let custom 2way wye model work -0x08001a00,3,0,0x0802f900,1,1=0x08ffff00,0,0,0x0802f900,1,1;Maxis line commented out by Swamper77 090127 in order to let custom 2way wye model work -0x08aa5000,3,1,0x08ffff00,1,0=0x08aa5000,3,1,0x08aa6600,1,0;Maxis line commented out by Swamper77 090127 in order to let custom 2way wye model work -;0x08ffff00,0,0,0x0802f900,1,1=0x08aa6600,3,0,0x0802f900,1,1;Maxis line commented out by Swamper77 090127 in order to let custom 2way wye model work -;0x08ffff00,0,0,0x0802f900,3,0=0x08aa6600,1,1,0x0802f900,3,0;Maxis line commented out by Swamper77 090127 in order to let custom 2way wye model work -;0x08014e00,3,0,0x08001a00,1,0=0x08014e00,3,0,0x08ffff00,1,0;Maxis line commented out by Swamper77 090127 in order to let custom 2way wye model work -;recent fixes from rail (5 cloverleaf) -;0x082a5900,2,0,0x08ffff00,3,0=0x082a5900,2,0,0x08aa6600,2,0 -;0x0812ff00,2,0,0x08ffff00,2,0=0x0812ff00,2,0,0x08aa6600,2,0 -;0x0802f900,1,0,0x08ffff00,3,0=0x0802f900,1,0,0x08aa6600,2,0 -;attempt to fix short ended pitchfork -;0x08ffff00,1,0,0x08000200,1,0=0x08aa6600,0,0,0x08000200,1,0 -;0x08ffff00,1,0,0x08001a00,2,0=0x08aa6600,0,0,0x08001a00,2,0 -;0x08aa6600,3,0,0x08000200,3,1=0x08001c00,2,1,0x08000200,3,1 -;0x08aa6600,0,0,0x08000200,1,0=0x08001c00,0,0,0x08000200,1,0 -;0x08aa6600,3,0,0x08001a00,1,0=0x08001c00,2,1,0x08001a00,1,0 -;0x08aa6600,0,0,0x08001a00,2,0=0x08001c00,0,0,0x08001a00,2,0 -; -;prevent for long ended pitchfork -;0x08002200,2,1,0x0812ff00,2,0=0,0,0,0,0,0 -;0x0812ff00,2,0,0x08002200,2,0=0,0,0,0,0,0 -; -0x08019d00,1,1,0x08032500,3,1=0x08aa6800,3,0,0x08032500,3,1 -0x0824fd00,3,1,0x08032500,3,1=0x08aa6700,0,0,0x08aa2000,3,0; missing_paths 0x08aa6800,1,1,0x08032500,1,0=0x08aa6800,1,1,0x08aa2000,1,1 0x0802f900,3,1,0x08000200,3,1=0x0802f900,3,1,0x08aa6900,3,1 -0x08aa3000,3,0,0x08032500,3,1=0x08aa4100,3,1,0x08aa2000,3,0; missing_paths -0x0824fd00,3,1,0x0824fd00,1,1=0x08aa6700,0,0,0x08aa6700,2,0; missing_paths -0x08aa6300,0,0,0x08aa6100,3,0=0x08014e00,0,0,0x08aa6100,3,0; missing_paths -0x0812ff00,0,0,0x08000200,3,1=0x0812ff00,0,0,0x08aa6900,3,1 -0x08000200,3,0,0x0812ff00,0,0=0x08aa6900,3,0,0x0812ff00,0,0 ;0x08031600,3,0,0x08aa2000,2,0=0x08031600,3,0,0x08032500,0,1 0x08aa1400,3,0,0x0802f900,0,1=0x08aa1400,3,0,0x08029700,0,1 0x08000200,1,1,0x08aa5000,1,1=0x08aa6900,1,1,0x08aa5000,1,1 -0x08aa6300,1,0,0x08000200,1,0=0x08aa6300,1,0,0x08aa6900,1,0 -0x08aa6300,3,0,0x08000200,3,1=0x08aa6300,3,0,0x08aa6900,3,1 0x08aa5000,3,1,0x0802f900,1,1=0x08aa6800,1,1,0x08aa2000,1,1 -0x0802f900,3,1,0x0802e900,1,1=0x08aa2000,3,1,0x08aa2400,1,1; missing_paths 0x08002200,3,0,0x08001c00,0,1=0x08001a00,3,0,0x08001c00,0,1 -0x08aa6700,2,1,0x08032500,1,0=0x08aa6700,2,1,0x08aa2000,1,1; missing_paths 0x08aa5000,3,1,0x08aa5000,1,1=0x08aa6800,1,1,0x08aa6800,3,1 0x08aa6800,1,1,0x08aa5000,1,1=0x08aa6800,1,1,0x08aa6800,3,1 -0x082a5900,2,0,0x08001a00,2,0=0x082a5900,2,0,0x08aa6600,2,0; missing_paths -0x08000200,1,1,0x08014e00,1,0=0x08aa6900,1,1,0x08014e00,1,0 ; ;intersection coming in the backside of a 45 0x0802f900,2,1,0x08031600,3,1=0x08029700,2,1,0x08031600,3,1 @@ -949,24 +838,6 @@ 0x08000200,1,1,0x08019500,1,0=0,0,0,0,0,0 0x08000200,3,0,0x08019500,3,0=0,0,0,0,0,0 ; -;dxd light rail model override fix; added by Swamper77 090122 -;Requires 0x08aa6300,1,0,0x08001a00,2,0=0x08aa6300,1,0,0x08ffff00,0,0 to be commented out. -0x08001c00,3,0,0x08aa6300,1,0=0x08001a00,3,0,0x08aa6300,1,0;added by Swamper77 090122 to allow the dxd light rail model override to work -0x08001c00,3,0,0x08aa6300,1,1=0x08001a00,3,0,0x08aa6300,1,1;added by Swamper77 090122 to allow the dxd light rail model override to work -; -;2-way wye light rail model override fix; added by Swamper77 090127 -;Requires a large block to be commented out. Smoncrie provided the code. Adapted from Smoncrie's Rail RUL bits. -0x08001c00,3,0,0x08014e00,1,0=0x08001a00,3,0,0x08014e00,1,0;added by Swamper77 090127 to allow the 2-way wye dual rail model override to work -0x08014e00,1,0,0x08001c00,3,1=0x08014e00,1,0,0x08001a00,2,0;added by Swamper77 090127 to allow the 2-way wye dual rail model override to work -;Further fixes by Tarkus 03-Mar-2022 -0x0812ff00,0,0,0x08001c00,0,1=0x0812ff00,0,0,0x08001a00,1,0 -0x0812ff00,0,0,0x08001c00,1,0=0x0812ff00,0,0,0x08001a00,1,0 -0x0812ff00,2,0,0x08001c00,3,1=0x0812ff00,2,0,0x08001a00,2,0 -0x0812ff00,2,0,0x08001c00,2,0=0x0812ff00,2,0,0x08001a00,2,0 -0x0812ff00,0,0,0x08aa6600,0,1=0x0812ff00,0,0,0x08001a00,1,0 -0x0812ff00,0,0,0x08aa6600,1,0=0x0812ff00,0,0,0x08001a00,1,0 -0x0812ff00,2,0,0x08aa6600,3,1=0x0812ff00,2,0,0x08001a00,2,0 -0x0812ff00,2,0,0x08aa6600,2,0=0x0812ff00,2,0,0x08001a00,2,0 ; ;----------------- One Way Road