Merge pull request #501 from NAMTeam/revert-broken-flexramp-d1-change

Revert broken flexramp d1 change

Author: TarkusSC4

Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul

@@ -4844,99 +4844,11 @@
 3,5,0x57801480,1,1
 3,16,0x57801580,1,1
 
-;---Type D1--- (new pattern)
-1,4,2,0,2
-2,1,4,0,4,2
-2,3,0,?,0,?
-2,7,0,2,0,2
-2,8,0,2,0,2
-3,0,0x57813200,0,0
-3,1,0x57813100,0,0
-3,3,0x57813000,0,0
-3,7,0x57813400,0,0
-3,8,0x57813300,0,0
-;
-1,2,4,2,0
-2,1,2,0,2,0
-2,2,2,0,2,0
-2,3,2,4,0,4
-2,5,?,0,?,0
-3,0,0x57813200,1,0
-3,1,0x57813400,1,0
-3,2,0x57813300,1,0
-3,3,0x57813100,1,0
-3,5,0x57813000,1,0
-;
-1,0,2,4,2
-2,3,0,2,0,2
-2,4,0,2,0,2
-2,5,4,2,4,0
-2,7,0,?,0,?
-3,0,0x57813200,2,0
-3,3,0x57813400,2,0
-3,4,0x57813300,2,0
-3,5,0x57813100,2,0
-3,7,0x57813000,2,0
-;
-1,2,0,2,4
-2,1,?,0,?,0
-2,5,2,0,2,0
-2,6,2,0,2,0
-2,7,0,4,2,4
-3,0,0x57813200,3,0
-3,1,0x57813000,3,0
-3,5,0x57813400,3,0
-3,6,0x57813300,3,0
-3,7,0x57813100,3,0
-;
-1,0,2,4,2
-2,3,0,?,0,?
-2,5,4,0,4,2
-2,6,0,2,0,2
-2,7,0,2,0,2
-3,0,0x57813280,0,1
-3,3,0x57813080,0,1
-3,5,0x57813180,0,1
-3,6,0x57813380,0,1
-3,7,0x57813480,0,1
-;
-1,2,4,2,0
-2,1,?,0,?,0
-2,3,0,4,2,4
-2,4,2,0,2,0
-2,5,2,0,2,0
-3,0,0x57813280,1,1
-3,1,0x57813080,1,1
-3,3,0x57813180,1,1
-3,4,0x57813380,1,1
-3,5,0x57813480,1,1
-;
-1,4,2,0,2
-2,1,4,2,4,0
-2,2,0,2,0,2
-2,3,0,2,0,2
-2,7,0,?,0,?
-3,0,0x57813280,2,1
-3,1,0x57813180,2,1
-3,2,0x57813380,2,1
-3,3,0x57813480,2,1
-3,7,0x57813080,2,1
-;
-1,2,0,2,4
-2,1,2,0,2,0
-2,5,?,0,?,0
-2,7,2,4,0,4
-2,8,2,0,2,0
-3,0,0x57813280,3,1
-3,1,0x57813480,3,1
-3,5,0x57813080,3,1
-3,7,0x57813180,3,1
-3,8,0x57813380,3,1
-
-;---Type D1--- (legacy support - original pattern)
+;---Type D1---
+;NOTE: Will eventually be changed to be RHW-3 by default
 1,4,2,4,2
 2,1,4,0,4,2
-2,3,0,2,0,2
+2,3,0,?,0,?
 2,7,0,2,0,2
 2,8,0,2,0,2
 3,0,0x57813200,0,0
@@ -4949,7 +4861,7 @@
 2,1,2,0,2,0
 2,2,2,0,2,0
 2,3,2,4,0,4
-2,5,2,0,2,0
+2,5,?,0,?,0
 3,0,0x57813200,1,0
 3,1,0x57813400,1,0
 3,2,0x57813300,1,0
@@ -4960,15 +4872,15 @@
 2,3,0,2,0,2
 2,4,0,2,0,2
 2,5,4,2,4,0
-2,7,0,2,0,2
+2,7,0,?,0,?
 3,0,0x57813200,2,0
 3,3,0x57813400,2,0
 3,4,0x57813300,2,0
 3,5,0x57813100,2,0
 3,7,0x57813000,2,0
 ;
 1,2,4,2,4
-2,1,2,0,2,0
+2,1,?,0,?,0
 2,5,2,0,2,0
 2,6,2,0,2,0
 2,7,0,4,2,4
@@ -4979,7 +4891,7 @@
 3,7,0x57813100,3,0
 ;
 1,4,2,4,2
-2,3,0,2,0,2
+2,3,0,?,0,?
 2,5,4,0,4,2
 2,6,0,2,0,2
 2,7,0,2,0,2
@@ -4990,7 +4902,7 @@
 3,7,0x57813480,0,1
 ;
 1,2,4,2,4
-2,1,2,0,2,0
+2,1,?,0,?,0
 2,3,0,4,2,4
 2,4,2,0,2,0
 2,5,2,0,2,0
@@ -5004,7 +4916,7 @@
 2,1,4,2,4,0
 2,2,0,2,0,2
 2,3,0,2,0,2
-2,7,0,2,0,2
+2,7,0,?,0,?
 3,0,0x57813280,2,1
 3,1,0x57813180,2,1
 3,2,0x57813380,2,1
@@ -5013,7 +4925,7 @@
 ;
 1,2,4,2,4
 2,1,2,0,2,0
-2,5,2,0,2,0
+2,5,?,0,?,0
 2,7,2,4,0,4
 2,8,2,0,2,0
 3,0,0x57813280,3,1

Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced_LHD.rul

@@ -4844,99 +4844,11 @@
 3,5,0x57801400,1,1
 3,16,0x57801500,1,1
 
-;---Type D1--- (new pattern)
-1,4,2,0,2
-2,1,4,0,4,2
-2,3,0,?,0,?
-2,7,0,2,0,2
-2,8,0,2,0,2
-3,0,0x57813280,0,0
-3,1,0x57813180,0,0
-3,3,0x57813080,0,0
-3,7,0x57813480,0,0
-3,8,0x57813380,0,0
-;
-1,2,4,2,0
-2,1,2,0,2,0
-2,2,2,0,2,0
-2,3,2,4,0,4
-2,5,?,0,?,0
-3,0,0x57813280,1,0
-3,1,0x57813480,1,0
-3,2,0x57813380,1,0
-3,3,0x57813180,1,0
-3,5,0x57813080,1,0
-;
-1,0,2,4,2
-2,3,0,2,0,2
-2,4,0,2,0,2
-2,5,4,2,4,0
-2,7,0,?,0,?
-3,0,0x57813280,2,0
-3,3,0x57813480,2,0
-3,4,0x57813380,2,0
-3,5,0x57813180,2,0
-3,7,0x57813080,2,0
-;
-1,2,0,2,4
-2,1,?,0,?,0
-2,5,2,0,2,0
-2,6,2,0,2,0
-2,7,0,4,2,4
-3,0,0x57813280,3,0
-3,1,0x57813080,3,0
-3,5,0x57813480,3,0
-3,6,0x57813380,3,0
-3,7,0x57813180,3,0
-;
-1,0,2,4,2
-2,3,0,?,0,?
-2,5,4,0,4,2
-2,6,0,2,0,2
-2,7,0,2,0,2
-3,0,0x57813200,0,1
-3,3,0x57813000,0,1
-3,5,0x57813100,0,1
-3,6,0x57813300,0,1
-3,7,0x57813400,0,1
-;
-1,2,4,2,0
-2,1,?,0,?,0
-2,3,0,4,2,4
-2,4,2,0,2,0
-2,5,2,0,2,0
-3,0,0x57813200,1,1
-3,1,0x57813000,1,1
-3,3,0x57813100,1,1
-3,4,0x57813300,1,1
-3,5,0x57813400,1,1
-;
-1,4,2,0,2
-2,1,4,2,4,0
-2,2,0,2,0,2
-2,3,0,2,0,2
-2,7,0,?,0,?
-3,0,0x57813200,2,1
-3,1,0x57813100,2,1
-3,2,0x57813300,2,1
-3,3,0x57813400,2,1
-3,7,0x57813000,2,1
-;
-1,2,0,2,4
-2,1,2,0,2,0
-2,5,?,0,?,0
-2,7,2,4,0,4
-2,8,2,0,2,0
-3,0,0x57813200,3,1
-3,1,0x57813400,3,1
-3,5,0x57813000,3,1
-3,7,0x57813100,3,1
-3,8,0x57813300,3,1
-
-;---Type D1--- (legacy support - original pattern)
+;---Type D1---
+;NOTE: Will eventually be changed to be RHW-3 by default
 1,4,2,4,2
 2,1,4,0,4,2
-2,3,0,2,0,2
+2,3,0,?,0,?
 2,7,0,2,0,2
 2,8,0,2,0,2
 3,0,0x57813280,0,0
@@ -4949,7 +4861,7 @@
 2,1,2,0,2,0
 2,2,2,0,2,0
 2,3,2,4,0,4
-2,5,2,0,2,0
+2,5,?,0,?,0
 3,0,0x57813280,1,0
 3,1,0x57813480,1,0
 3,2,0x57813380,1,0
@@ -4960,15 +4872,15 @@
 2,3,0,2,0,2
 2,4,0,2,0,2
 2,5,4,2,4,0
-2,7,0,2,0,2
+2,7,0,?,0,?
 3,0,0x57813280,2,0
 3,3,0x57813480,2,0
 3,4,0x57813380,2,0
 3,5,0x57813180,2,0
 3,7,0x57813080,2,0
 ;
 1,2,4,2,4
-2,1,2,0,2,0
+2,1,?,0,?,0
 2,5,2,0,2,0
 2,6,2,0,2,0
 2,7,0,4,2,4
@@ -4979,7 +4891,7 @@
 3,7,0x57813180,3,0
 ;
 1,4,2,4,2
-2,3,0,2,0,2
+2,3,0,?,0,?
 2,5,4,0,4,2
 2,6,0,2,0,2
 2,7,0,2,0,2
@@ -4990,7 +4902,7 @@
 3,7,0x57813400,0,1
 ;
 1,2,4,2,4
-2,1,2,0,2,0
+2,1,?,0,?,0
 2,3,0,4,2,4
 2,4,2,0,2,0
 2,5,2,0,2,0
@@ -5004,7 +4916,7 @@
 2,1,4,2,4,0
 2,2,0,2,0,2
 2,3,0,2,0,2
-2,7,0,2,0,2
+2,7,0,?,0,?
 3,0,0x57813200,2,1
 3,1,0x57813100,2,1
 3,2,0x57813300,2,1
@@ -5013,7 +4925,7 @@
 ;
 1,2,4,2,4
 2,1,2,0,2,0
-2,5,2,0,2,0
+2,5,?,0,?,0
 2,7,2,4,0,4
 2,8,2,0,2,0
 3,0,0x57813200,3,1

Controller/RUL0/5000_RHW/51F0_FlexRamps.txt

@@ -272,7 +272,7 @@ CellLayout =.......
 CellLayout =..^....
 
 CheckType = a - dirtroad: 0x02040004, 0xffffffff optional
-CheckType = b - dirtroad: 0x02000204, 0xffffffff optional
+CheckType = b - dirtroad: 0x02040204, 0xffffffff optional
 CheckType = c - dirtroad: 0x02000200, 0xffffffff optional
 CheckType = d - dirtroad: 0x02000000, 0x0000ff00 optional
 CheckType = e - dirtroad: 0x00000200, 0xff000000 optional