From d672e0d2b9a1ea32b748efb09125737bd5521944 Mon Sep 17 00:00:00 2001
From: memo <memo33@users.noreply.github.com>
Date: Sat, 30 May 2026 17:33:07 +0200
Subject: [PATCH 1/3] Reapply "Change FLEXRamp D1 INRUL for side-by-side
 placing"

This reverts commit 50e80add3689d99364a91fac8ef4e26009731d34.
---
 .../DirtroadAdvanced/RUL14_RHW_Advanced.rul      | 16 ++++++++--------
 .../DirtroadAdvanced/RUL14_RHW_Advanced_LHD.rul  | 16 ++++++++--------
 Controller/RUL0/5000_RHW/51F0_FlexRamps.txt      |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul
index f40fafb30..2461a8d31 100644
--- a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul
+++ b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul
@@ -4846,7 +4846,7 @@
 
 ;---Type D1---
 ;NOTE: Will eventually be changed to be RHW-3 by default
-1,4,2,4,2
+1,4,2,0,2
 2,1,4,0,4,2
 2,3,0,?,0,?
 2,7,0,2,0,2
@@ -4857,7 +4857,7 @@
 3,7,0x57813400,0,0
 3,8,0x57813300,0,0
 ;
-1,2,4,2,4
+1,2,4,2,0
 2,1,2,0,2,0
 2,2,2,0,2,0
 2,3,2,4,0,4
@@ -4868,7 +4868,7 @@
 3,3,0x57813100,1,0
 3,5,0x57813000,1,0
 ;
-1,4,2,4,2
+1,0,2,4,2
 2,3,0,2,0,2
 2,4,0,2,0,2
 2,5,4,2,4,0
@@ -4879,7 +4879,7 @@
 3,5,0x57813100,2,0
 3,7,0x57813000,2,0
 ;
-1,2,4,2,4
+1,2,0,2,4
 2,1,?,0,?,0
 2,5,2,0,2,0
 2,6,2,0,2,0
@@ -4890,7 +4890,7 @@
 3,6,0x57813300,3,0
 3,7,0x57813100,3,0
 ;
-1,4,2,4,2
+1,0,2,4,2
 2,3,0,?,0,?
 2,5,4,0,4,2
 2,6,0,2,0,2
@@ -4901,7 +4901,7 @@
 3,6,0x57813380,0,1
 3,7,0x57813480,0,1
 ;
-1,2,4,2,4
+1,2,4,2,0
 2,1,?,0,?,0
 2,3,0,4,2,4
 2,4,2,0,2,0
@@ -4912,7 +4912,7 @@
 3,4,0x57813380,1,1
 3,5,0x57813480,1,1
 ;
-1,4,2,4,2
+1,4,2,0,2
 2,1,4,2,4,0
 2,2,0,2,0,2
 2,3,0,2,0,2
@@ -4923,7 +4923,7 @@
 3,3,0x57813480,2,1
 3,7,0x57813080,2,1
 ;
-1,2,4,2,4
+1,2,0,2,4
 2,1,2,0,2,0
 2,5,?,0,?,0
 2,7,2,4,0,4
diff --git a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced_LHD.rul b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced_LHD.rul
index 369464fc0..83e66e0f6 100644
--- a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced_LHD.rul
+++ b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced_LHD.rul
@@ -4846,7 +4846,7 @@
 
 ;---Type D1---
 ;NOTE: Will eventually be changed to be RHW-3 by default
-1,4,2,4,2
+1,4,2,0,2
 2,1,4,0,4,2
 2,3,0,?,0,?
 2,7,0,2,0,2
@@ -4857,7 +4857,7 @@
 3,7,0x57813480,0,0
 3,8,0x57813380,0,0
 ;
-1,2,4,2,4
+1,2,4,2,0
 2,1,2,0,2,0
 2,2,2,0,2,0
 2,3,2,4,0,4
@@ -4868,7 +4868,7 @@
 3,3,0x57813180,1,0
 3,5,0x57813080,1,0
 ;
-1,4,2,4,2
+1,0,2,4,2
 2,3,0,2,0,2
 2,4,0,2,0,2
 2,5,4,2,4,0
@@ -4879,7 +4879,7 @@
 3,5,0x57813180,2,0
 3,7,0x57813080,2,0
 ;
-1,2,4,2,4
+1,2,0,2,4
 2,1,?,0,?,0
 2,5,2,0,2,0
 2,6,2,0,2,0
@@ -4890,7 +4890,7 @@
 3,6,0x57813380,3,0
 3,7,0x57813180,3,0
 ;
-1,4,2,4,2
+1,0,2,4,2
 2,3,0,?,0,?
 2,5,4,0,4,2
 2,6,0,2,0,2
@@ -4901,7 +4901,7 @@
 3,6,0x57813300,0,1
 3,7,0x57813400,0,1
 ;
-1,2,4,2,4
+1,2,4,2,0
 2,1,?,0,?,0
 2,3,0,4,2,4
 2,4,2,0,2,0
@@ -4912,7 +4912,7 @@
 3,4,0x57813300,1,1
 3,5,0x57813400,1,1
 ;
-1,4,2,4,2
+1,4,2,0,2
 2,1,4,2,4,0
 2,2,0,2,0,2
 2,3,0,2,0,2
@@ -4923,7 +4923,7 @@
 3,3,0x57813400,2,1
 3,7,0x57813000,2,1
 ;
-1,2,4,2,4
+1,2,0,2,4
 2,1,2,0,2,0
 2,5,?,0,?,0
 2,7,2,4,0,4
diff --git a/Controller/RUL0/5000_RHW/51F0_FlexRamps.txt b/Controller/RUL0/5000_RHW/51F0_FlexRamps.txt
index a7a6e42ff..04597ded5 100644
--- a/Controller/RUL0/5000_RHW/51F0_FlexRamps.txt
+++ b/Controller/RUL0/5000_RHW/51F0_FlexRamps.txt
@@ -272,7 +272,7 @@ CellLayout =.......
 CellLayout =..^....
 
 CheckType = a - dirtroad: 0x02040004, 0xffffffff optional
-CheckType = b - dirtroad: 0x02040204, 0xffffffff optional
+CheckType = b - dirtroad: 0x02000204, 0xffffffff optional
 CheckType = c - dirtroad: 0x02000200, 0xffffffff optional
 CheckType = d - dirtroad: 0x02000000, 0x0000ff00 optional
 CheckType = e - dirtroad: 0x00000200, 0xff000000 optional

From 15756873fbfd6f08bf80c0367cd8cf6b05b681b2 Mon Sep 17 00:00:00 2001
From: memo <memo33@users.noreply.github.com>
Date: Sat, 30 May 2026 17:34:05 +0200
Subject: [PATCH 2/3] Reapply "Keep original FLEXRamp D1 INRUL for legacy
 support"

This reverts commit 8ad1636f4ecace501642c09ac79ecde7bbf368a3.
---
 .../DirtroadAdvanced/RUL14_RHW_Advanced.rul   | 92 ++++++++++++++++++-
 .../RUL14_RHW_Advanced_LHD.rul                | 92 ++++++++++++++++++-
 2 files changed, 180 insertions(+), 4 deletions(-)

diff --git a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul
index 2461a8d31..7503a501a 100644
--- a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul
+++ b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul
@@ -4844,8 +4844,7 @@
 3,5,0x57801480,1,1
 3,16,0x57801580,1,1
 
-;---Type D1---
-;NOTE: Will eventually be changed to be RHW-3 by default
+;---Type D1--- (new pattern)
 1,4,2,0,2
 2,1,4,0,4,2
 2,3,0,?,0,?
@@ -4934,6 +4933,95 @@
 3,7,0x57813180,3,1
 3,8,0x57813380,3,1
 
+;---Type D1--- (legacy support - original pattern)
+1,4,2,4,2
+2,1,4,0,4,2
+2,3,0,2,0,2
+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,4
+2,1,2,0,2,0
+2,2,2,0,2,0
+2,3,2,4,0,4
+2,5,2,0,2,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,4,2,4,2
+2,3,0,2,0,2
+2,4,0,2,0,2
+2,5,4,2,4,0
+2,7,0,2,0,2
+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,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,4,2,4,2
+2,3,0,2,0,2
+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,4
+2,1,2,0,2,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,4,2
+2,1,4,2,4,0
+2,2,0,2,0,2
+2,3,0,2,0,2
+2,7,0,2,0,2
+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,4,2,4
+2,1,2,0,2,0
+2,5,2,0,2,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 E1---
 ;NOTE: Will eventually be changed to be RHW-2 by default
 1,4,2,4,2
diff --git a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced_LHD.rul b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced_LHD.rul
index 83e66e0f6..8a730d197 100644
--- a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced_LHD.rul
+++ b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced_LHD.rul
@@ -4844,8 +4844,7 @@
 3,5,0x57801400,1,1
 3,16,0x57801500,1,1
 
-;---Type D1---
-;NOTE: Will eventually be changed to be RHW-3 by default
+;---Type D1--- (new pattern)
 1,4,2,0,2
 2,1,4,0,4,2
 2,3,0,?,0,?
@@ -4934,6 +4933,95 @@
 3,7,0x57813100,3,1
 3,8,0x57813300,3,1
 
+;---Type D1--- (legacy support - original pattern)
+1,4,2,4,2
+2,1,4,0,4,2
+2,3,0,2,0,2
+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,4
+2,1,2,0,2,0
+2,2,2,0,2,0
+2,3,2,4,0,4
+2,5,2,0,2,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,4,2,4,2
+2,3,0,2,0,2
+2,4,0,2,0,2
+2,5,4,2,4,0
+2,7,0,2,0,2
+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,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,4,2,4,2
+2,3,0,2,0,2
+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,4
+2,1,2,0,2,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,4,2
+2,1,4,2,4,0
+2,2,0,2,0,2
+2,3,0,2,0,2
+2,7,0,2,0,2
+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,4,2,4
+2,1,2,0,2,0
+2,5,2,0,2,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 E1---
 ;NOTE: Will eventually be changed to be RHW-2 by default
 1,4,2,4,2

From c054e0bf4f5e2e9a88de5632f44084c80262ebe8 Mon Sep 17 00:00:00 2001
From: memo <memo33@users.noreply.github.com>
Date: Sat, 30 May 2026 17:45:13 +0200
Subject: [PATCH 3/3] fix `?` wildcards in legacy flexramp d1 pattern

---
 .../DirtroadAdvanced/RUL14_RHW_Advanced.rul      | 16 ++++++++--------
 .../DirtroadAdvanced/RUL14_RHW_Advanced_LHD.rul  | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul
index 7503a501a..43dda8c67 100644
--- a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul
+++ b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul
@@ -4936,7 +4936,7 @@
 ;---Type D1--- (legacy support - original pattern)
 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 +4949,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,7 +4960,7 @@
 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
@@ -4968,7 +4968,7 @@
 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 +4979,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 +4990,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 +5004,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 +5013,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
diff --git a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced_LHD.rul b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced_LHD.rul
index 8a730d197..d8b37b3fb 100644
--- a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced_LHD.rul
+++ b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced_LHD.rul
@@ -4936,7 +4936,7 @@
 ;---Type D1--- (legacy support - original pattern)
 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 +4949,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,7 +4960,7 @@
 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
@@ -4968,7 +4968,7 @@
 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 +4979,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 +4990,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 +5004,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 +5013,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