tag all conflicting-override rules in Controller/RUL2

This is the initial run of:

    sbt conflictingOverridesCheck --update

It tags all conflicting overrides with an inline comment. It does not
remove or modify any functionality.

Author: memo33

Controller/RUL2/01_Maxis_Misc/Sec1a_Maxis.txt

@@ -181,7 +181,7 @@
 0x03aa5000,3,1,0x03ffff00,1,0=0x03aa5000,3,1,0x03aa6600,1,0
 0x03ffff00,0,0,0x0302f900,1,1=0x03aa6600,3,0,0x0302f900,1,1
 0x03ffff00,0,0,0x0302f900,3,0=0x03001c00,1,1,0x0302f900,3,0
-0x03ffff00,0,0,0x0302f900,3,0=0x03aa6600,1,1,0x0302f900,3,0
+0x03ffff00,0,0,0x0302f900,3,0=0x03aa6600,1,1,0x0302f900,3,0; conflicting-override
 0x03014e00,3,0,0x03001a00,1,0=0x03014e00,3,0,0x03ffff00,1,0
 ;;;end commented out lines
 ;;;lines added by dedgren 090130 wye retexture fix see smoncrie's post http://sc4devotion.com/forums/index.php?topic=1145.msg218110#msg218110
@@ -351,21 +351,21 @@
 0x03aa6500,1,1,0x03aa6300,3,1=0x0302f900,1,1,0x03aa6300,3,0
 0x03aa6500,0,0,0x03aa6300,1,0=0x0302f900,0,0,0x03aa6300,1,0
 0x03aa6500,0,0,0x03aa6300,1,0=0x0302f900,0,0,0x03aa6300,1,0
-0x03aa6500,0,0,0x03aa6300,1,1=0x0302f900,0,0,0x03aa6300,1,0
+0x03aa6500,0,0,0x03aa6300,1,1=0x0302f900,0,0,0x03aa6300,1,0; conflicting-override
 0x03aa6500,2,0,0x03aa6300,3,0=0x0302f900,2,0,0x03aa6300,3,0
-0x03aa6500,2,0,0x03aa6300,3,1=0x0302f900,2,0,0x03aa6300,3,0
-0x03aa6500,2,1,0x03aa6300,1,0=0x0302f900,2,1,0x03aa6300,1,0
+0x03aa6500,2,0,0x03aa6300,3,1=0x0302f900,2,0,0x03aa6300,3,0; conflicting-override
+0x03aa6500,2,1,0x03aa6300,1,0=0x0302f900,2,1,0x03aa6300,1,0; conflicting-override
 0x03aa6500,2,1,0x03aa6300,1,1=0x0302f900,2,1,0x03aa6300,1,1
 0x03aa6500,2,1,0x03aa6300,3,0=0x0302f900,2,1,0x03aa6300,3,0
-0x03aa6500,2,1,0x03aa6300,3,1=0x0302f900,2,1,0x03aa6300,3,0
-0x03aa6500,3,0,0x03aa6300,1,0=0x0302f900,3,0,0x03aa6300,1,0
+0x03aa6500,2,1,0x03aa6300,3,1=0x0302f900,2,1,0x03aa6300,3,0; conflicting-override
+0x03aa6500,3,0,0x03aa6300,1,0=0x0302f900,3,0,0x03aa6300,1,0; conflicting-override
 0x03aa6500,3,0,0x03aa6300,1,1=0x0302f900,3,0,0x03aa6300,1,1
 0x03aa6500,3,0,0x03aa6300,3,0=0x0302f900,3,0,0x03aa6300,3,0
-0x03aa6500,3,0,0x03aa6300,3,1=0x0302f900,3,0,0x03aa6300,3,0
-0x03aa6500,3,1,0x03aa6300,1,0=0x0302f900,3,1,0x03aa6300,1,0
+0x03aa6500,3,0,0x03aa6300,3,1=0x0302f900,3,0,0x03aa6300,3,0; conflicting-override
+0x03aa6500,3,1,0x03aa6300,1,0=0x0302f900,3,1,0x03aa6300,1,0; conflicting-override
 0x03aa6500,3,1,0x03aa6300,1,1=0x0302f900,3,1,0x03aa6300,1,1
 0x03aa6500,3,1,0x03aa6300,3,0=0x0302f900,3,1,0x03aa6300,3,0
-0x03aa6500,3,1,0x03aa6300,3,1=0x0302f900,3,1,0x03aa6300,3,0
+0x03aa6500,3,1,0x03aa6300,3,1=0x0302f900,3,1,0x03aa6300,3,0; conflicting-override
 ;to turn the orth stub rail x diag rail into a switch, added by Warrior(31/Jan/09)
 0x03aa6000,1,0,0x03aa2000,3,0=0x03001c00,1,1,0x0302f900,3,0
 0x03aa6000,3,1,0x03aa2000,1,1=0x03001c00,3,0,0x0302f900,1,1
@@ -605,8 +605,8 @@
 0x091a3900,3,0,0x09000a00,1,0=0x091a3900,3,0,0x09051100,0,1
 ;
 ;overrides for T avenue one-way road intersections
-0x091a3900,0,0,0x09000a00,2,0=0x091a3900,0,0,0x04003500,0,1
-0x091a3900,3,0,0x09000a00,1,0=0x091a3900,3,0,0x04003500,2,0
+0x091a3900,0,0,0x09000a00,2,0=0x091a3900,0,0,0x04003500,0,1; conflicting-override
+0x091a3900,3,0,0x09000a00,1,0=0x091a3900,3,0,0x04003500,2,0; conflicting-override
 ;
 ;override for adjacent T avenue one-way road intersections
 0x04008500,2,0,0x091a3900,2,0=0,0,0,0,0,0
@@ -825,7 +825,7 @@
 0x0824fd00,3,1,0x08aa2000,0,1=0x082a5900,2,0,0x08aa2000,0,1
 0x0824fd00,1,1,0x08032500,1,1=0x082a5900,2,0,0x08aa2000,3,0
 0x0824fd00,1,0,0x08aa2000,1,1=0x08aa6700,2,1,0x08aa2000,1,1
-0x08002200,3,0,0x08002200,1,0=0x08001a00,3,0,0x08001a00,1,0
+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
 ;
@@ -839,7 +839,7 @@
 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
-0x08002200,3,0,0x08000200,3,1=0x08001a00,3,0,0x08000200,3,1
+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
@@ -1093,7 +1093,7 @@
 0x0d24fd00,3,1,0x0daa2000,0,1=0x0d2a5900,2,0,0x0daa2000,0,1
 0x0d24fd00,1,1,0x0d032500,1,1=0x0d2a5900,2,0,0x0daa2000,3,0
 0x0d24fd00,1,0,0x0daa2000,1,1=0x0daa6700,2,1,0x0daa2000,1,1
-0x0d002200,3,0,0x0d002200,1,0=0x0d001a00,3,0,0x0d001a00,1,0
+0x0d002200,3,0,0x0d002200,1,0=0x0d001a00,3,0,0x0d001a00,1,0; conflicting-override
 0x0d001a00,3,0,0x0d001a00,0,1=0x0d001a00,3,0,0x0d001a00,1,0
 0x0d001a00,2,1,0x0d001a00,1,0=0x0d001a00,3,0,0x0d001a00,1,0
 ;
@@ -1107,7 +1107,7 @@
 0x0d02f900,0,0,0x0d031600,1,0=0x0d029700,0,0,0x0d031600,1,0
 0x0d02f900,0,0,0x0d018b00,3,1=0x0d029700,0,0,0x0d018b00,3,1
 0x0daa3500,1,1,0x0d02f900,2,0=0x0daa3500,1,1,0x0d029700,2,0
-0x0d002200,3,0,0x0d000200,3,1=0x0d001a00,3,0,0x0d000200,3,1
+0x0d002200,3,0,0x0d000200,3,1=0x0d001a00,3,0,0x0d000200,3,1; conflicting-override
 0x0daa5000,3,0,0x0d02f900,2,0=0x0daa5000,3,0,0x0d029700,2,0
 0x0d02f900,2,1,0x0d019500,3,0=0x0d029700,2,1,0x0d019500,3,0
 0x0d031700,1,1,0x0daa2000,3,0=0x0d031700,1,1,0x0d032500,3,1
@@ -1698,7 +1698,7 @@
 0x0324fd00,3,1,0x530D4100,1,0=0x03aa6700,0,0,0x530D4100,1,0
 0x0324fd00,1,0,0x0324F100,3,0=0x0324fd00,1,0,0x530D4100,1,1
 0x0324F100,1,1,0x0324fd00,1,1=0x530D4100,1,0,0x03AA6700,2,0
-0x0324F100,3,1,0x0324fd00,1,1=0x530D4100,1,0,0x03AA6700,2,0
+0x0324F100,3,1,0x0324fd00,1,1=0x530D4100,1,0,0x03AA6700,2,0; conflicting-override
 0x03aa3000,3,0,0x530D4100,1,0=0x03aa4100,3,1,0x530D4100,1,0
 0x03aa3000,1,1,0x530D4100,1,1=0x03aa4100,1,0,0x530D4100,1,1
 0x0302e900,1,0,0x530D4100,0,1=0,0,0,0,0,0

Controller/RUL2/01_Maxis_Misc/Sec1c_PS.txt

@@ -126,8 +126,8 @@
 0x57020B00,1,0,0x5A570310,1,0=0x5A571320,1,0,0x5A571310,1,0
 0x57020B00,1,0,0x5A571310,1,0=0x5A571320,1,0,0x5A571310,1,0
 0x5A571320,1,0,0x5A570310,1,0=0x5A571320,1,0,0x5A571310,1,0
-0x57001400,1,0,0x5A571310,0,0=0x5A570210,0,0,0x5A571310,0,0
-0x57001400,1,0,0x5A571010,2,0=0x5A570110,2,0,0x5A571010,2,0
+0x57001400,1,0,0x5A571310,0,0=0x5A570210,0,0,0x5A571310,0,0; conflicting-override
+0x57001400,1,0,0x5A571010,2,0=0x5A570110,2,0,0x5A571010,2,0; conflicting-override
 ;
 0x57000500,3,0,0x5A571020,1,0=0x5A571030,1,0,0x5A571020,1,0
 0x57020C00,3,0,0x5A571020,1,0=0x5A571030,1,0,0x5A571020,1,0
@@ -173,8 +173,8 @@
 0x57220B00,1,0,0x5A570710,1,0=0x5A571720,1,0,0x5A571710,1,0
 0x57220B00,1,0,0x5A571710,1,0=0x5A571720,1,0,0x5A571710,1,0
 0x5A571720,1,0,0x5A570710,1,0=0x5A571720,1,0,0x5A571710,1,0
-0x57001420,1,0,0x5A571710,0,0=0x5A570610,0,0,0x5A571710,0,0
-0x57001420,1,0,0x5A571410,2,0=0x5A570510,2,0,0x5A571410,2,0
+0x57001420,1,0,0x5A571710,0,0=0x5A570610,0,0,0x5A571710,0,0; conflicting-override
+0x57001420,1,0,0x5A571410,2,0=0x5A570510,2,0,0x5A571410,2,0; conflicting-override
 ;
 0x57000500,3,0,0x5A571420,1,0=0x5A571430,1,0,0x5A571420,1,0
 0x57220C00,3,0,0x5A571420,1,0=0x5A571430,1,0,0x5A571420,1,0
@@ -218,10 +218,10 @@
 0x5A572310,2,0,0x5A57200F,0,0=0x5A572310,2,0,0x5A572210,2,0
 0x57000800,0,0,0x5A572110,0,0=0x5A572010,0,0,0x5A572110,0,0
 0x57000800,1,0,0x5A572210,2,0=0x5A572310,2,0,0x5A572210,2,0
-0x57000800,0,0,0x57001400,3,0=0x5A572010,0,0,0x5A572110,0,0
-0x57000800,1,0,0x57001400,3,0=0x5A572310,2,0,0x5A572210,2,0
-0x57020800,0,0,0x57001400,3,0=0x5A572010,0,0,0x5A572110,0,0
-0x57020800,1,0,0x57001400,3,0=0x5A572310,2,0,0x5A572210,2,0
+0x57000800,0,0,0x57001400,3,0=0x5A572010,0,0,0x5A572110,0,0; conflicting-override
+0x57000800,1,0,0x57001400,3,0=0x5A572310,2,0,0x5A572210,2,0; conflicting-override
+0x57020800,0,0,0x57001400,3,0=0x5A572010,0,0,0x5A572110,0,0; conflicting-override
+0x57020800,1,0,0x57001400,3,0=0x5A572310,2,0,0x5A572210,2,0; conflicting-override
 0x5A572010,0,0,0x57001400,3,0=0x5A572010,0,0,0x5A572110,0,0
 0x5A572310,2,0,0x57001400,3,0=0x5A572310,2,0,0x5A572210,2,0
 ;
@@ -231,19 +231,19 @@
 0x5A57200F,2,0,0x57020800,2,0=0x5A572110,2,0,0x5A572010,2,0
 0x5A57200F,2,0,0x5A572310,0,0=0x5A572210,0,0,0x5A572310,0,0
 0x5A57200F,2,0,0x5A572310,2,0=0x5A572110,2,0,0x5A572310,2,0
-0x57001400,1,0,0x57000800,1,0=0x5A572210,0,0,0x5A572310,0,0
-0x57001400,1,0,0x57000800,0,0=0x5A572110,2,0,0x5A572010,2,0
-0x57001400,1,0,0x57020800,1,0=0x5A572210,0,0,0x5A572310,0,0
-0x57001400,1,0,0x57020800,2,0=0x5A572110,2,0,0x5A572010,2,0
+0x57001400,1,0,0x57000800,1,0=0x5A572210,0,0,0x5A572310,0,0; conflicting-override
+0x57001400,1,0,0x57000800,0,0=0x5A572110,2,0,0x5A572010,2,0; conflicting-override
+0x57001400,1,0,0x57020800,1,0=0x5A572210,0,0,0x5A572310,0,0; conflicting-override
+0x57001400,1,0,0x57020800,2,0=0x5A572110,2,0,0x5A572010,2,0; conflicting-override
 0x5A572210,0,0,0x57000800,1,0=0x5A572210,0,0,0x5A572310,0,0
 0x5A572110,2,0,0x57000800,0,0=0x5A572110,2,0,0x5A572010,2,0
 0x57001400,1,0,0x5A572310,0,0=0x5A572210,0,0,0x5A572310,0,0
 0x57001400,1,0,0x5A572010,2,0=0x5A572110,2,0,0x5A572010,2,0
 ;
 0x5A572110,1,0,0x0A001500,0,0=0x5A572110,1,0,0x5A572100,1,0
 0x5A572210,1,0,0x0A001500,2,0=0x5A572210,1,0,0x5A572200,1,0
-0x57020800,0,0,0x0A001500,0,0=0x5A572110,1,0,0x5A572100,1,0
-0x57020800,1,0,0x0A001500,2,0=0x5A572210,1,0,0x5A572200,1,0
+0x57020800,0,0,0x0A001500,0,0=0x5A572110,1,0,0x5A572100,1,0; conflicting-override
+0x57020800,1,0,0x0A001500,2,0=0x5A572210,1,0,0x5A572200,1,0; conflicting-override
 ;
 0x57000000,1,0,0x5A572110,1,0=0x5A572120,1,0,0x5A572110,1,0
 0x57000000,3,0,0x5A572110,1,0=0x5A572120,1,0,0x5A572110,1,0
@@ -285,10 +285,10 @@
 0x5A572710,2,0,0x5A57240F,0,0=0x5A572710,2,0,0x5A572610,2,0
 0x57000800,0,0,0x5A572510,0,0=0x5A572410,0,0,0x5A572510,0,0
 0x57000800,1,0,0x5A572610,2,0=0x5A572710,2,0,0x5A572610,2,0
-0x57000800,0,0,0x57001420,3,0=0x5A572410,0,0,0x5A572510,0,0
-0x57000800,1,0,0x57001420,3,0=0x5A572710,2,0,0x5A572610,2,0
-0x57220800,0,0,0x57001420,3,0=0x5A572410,0,0,0x5A572510,0,0
-0x57220800,1,0,0x57001420,3,0=0x5A572710,2,0,0x5A572610,2,0
+0x57000800,0,0,0x57001420,3,0=0x5A572410,0,0,0x5A572510,0,0; conflicting-override
+0x57000800,1,0,0x57001420,3,0=0x5A572710,2,0,0x5A572610,2,0; conflicting-override
+0x57220800,0,0,0x57001420,3,0=0x5A572410,0,0,0x5A572510,0,0; conflicting-override
+0x57220800,1,0,0x57001420,3,0=0x5A572710,2,0,0x5A572610,2,0; conflicting-override
 0x5A572410,0,0,0x57001420,3,0=0x5A572410,0,0,0x5A572510,0,0
 0x5A572710,2,0,0x57001420,3,0=0x5A572710,2,0,0x5A572610,2,0
 ;
@@ -298,19 +298,19 @@
 0x5A57240F,2,0,0x57220800,2,0=0x5A572510,2,0,0x5A572410,2,0
 0x5A57240F,2,0,0x5A572710,0,0=0x5A572610,0,0,0x5A572710,0,0
 0x5A57240F,2,0,0x5A572710,2,0=0x5A572510,2,0,0x5A572710,2,0
-0x57001420,1,0,0x57000800,1,0=0x5A572610,0,0,0x5A572710,0,0
-0x57001420,1,0,0x57000800,0,0=0x5A572510,2,0,0x5A572410,2,0
-0x57001420,1,0,0x57220800,1,0=0x5A572610,0,0,0x5A572710,0,0
-0x57001420,1,0,0x57220800,2,0=0x5A572510,2,0,0x5A572410,2,0
+0x57001420,1,0,0x57000800,1,0=0x5A572610,0,0,0x5A572710,0,0; conflicting-override
+0x57001420,1,0,0x57000800,0,0=0x5A572510,2,0,0x5A572410,2,0; conflicting-override
+0x57001420,1,0,0x57220800,1,0=0x5A572610,0,0,0x5A572710,0,0; conflicting-override
+0x57001420,1,0,0x57220800,2,0=0x5A572510,2,0,0x5A572410,2,0; conflicting-override
 0x5A572610,0,0,0x57000800,1,0=0x5A572610,0,0,0x5A572710,0,0
 0x5A572510,2,0,0x57000800,0,0=0x5A572510,2,0,0x5A572410,2,0
 0x57001420,1,0,0x5A572710,0,0=0x5A572610,0,0,0x5A572710,0,0
 0x57001420,1,0,0x5A572410,2,0=0x5A572510,2,0,0x5A572410,2,0
 ;
 0x5A572510,1,0,0x02001500,0,0=0x5A572510,1,0,0x5A572500,1,0
 0x5A572610,1,0,0x02001500,2,0=0x5A572610,1,0,0x5A572600,1,0
-0x57220800,0,0,0x02001500,0,0=0x5A572510,1,0,0x5A572500,1,0
-0x57220800,1,0,0x02001500,2,0=0x5A572610,1,0,0x5A572600,1,0
+0x57220800,0,0,0x02001500,0,0=0x5A572510,1,0,0x5A572500,1,0; conflicting-override
+0x57220800,1,0,0x02001500,2,0=0x5A572610,1,0,0x5A572600,1,0; conflicting-override
 ;
 0x57000000,1,0,0x5A572510,1,0=0x5A572520,1,0,0x5A572510,1,0
 0x57000000,3,0,0x5A572510,1,0=0x5A572520,1,0,0x5A572510,1,0
@@ -365,8 +365,8 @@
 0x57020B00,1,0,0x5A572310,1,0=0x5A573310,1,0,0x5A573300,1,0
 0x57020B00,1,0,0x5A573300,1,0=0x5A573310,1,0,0x5A573300,1,0
 0x5A573310,1,0,0x5A572310,1,0=0x5A573310,1,0,0x5A573300,1,0
-0x57001400,1,0,0x5A573300,0,0=0x5A572210,0,0,0x5A573300,0,0
-0x57001400,1,0,0x5A573000,2,0=0x5A572110,2,0,0x5A573000,2,0
+0x57001400,1,0,0x5A573300,0,0=0x5A572210,0,0,0x5A573300,0,0; conflicting-override
+0x57001400,1,0,0x5A573000,2,0=0x5A572110,2,0,0x5A573000,2,0; conflicting-override
 ;
 0x57000500,3,0,0x5A573010,1,0=0x5A573020,1,0,0x5A573010,1,0
 0x57020C00,3,0,0x5A573010,1,0=0x5A573020,1,0,0x5A573010,1,0
@@ -432,8 +432,8 @@
 0x57220B00,1,0,0x5A572710,1,0=0x5A573710,1,0,0x5A573700,1,0
 0x57220B00,1,0,0x5A573700,1,0=0x5A573710,1,0,0x5A573700,1,0
 0x5A573710,1,0,0x5A572710,1,0=0x5A573710,1,0,0x5A573700,1,0
-0x57001400,1,0,0x5A573700,0,0=0x5A572610,0,0,0x5A573700,0,0
-0x57001400,1,0,0x5A573400,2,0=0x5A572510,2,0,0x5A573400,2,0
+0x57001400,1,0,0x5A573700,0,0=0x5A572610,0,0,0x5A573700,0,0; conflicting-override
+0x57001400,1,0,0x5A573400,2,0=0x5A572510,2,0,0x5A573400,2,0; conflicting-override
 ;
 0x57000500,3,0,0x5A573410,1,0=0x5A573420,1,0,0x5A573410,1,0
 0x57220C00,3,0,0x5A573410,1,0=0x5A573420,1,0,0x5A573410,1,0

Controller/RUL2/02_Diagonal_Streets/Sec2_Diagonal_Streets.txt

@@ -175,9 +175,9 @@
 ;
 ;Enforce 'C' bend
 ;
-0x5f500200,0,0,0x5f500400,1,1=0x5f500400,1,1,0x5f501100,3,0
+0x5f500200,0,0,0x5f500400,1,1=0x5f500400,1,1,0x5f501100,3,0; conflicting-override
 0x5f500400,1,1,0x5f500500,1,1=0x5f500400,1,1,0x5f501100,3,0
-0x5f500500,1,0,0x5f500400,1,0=0x5f501100,3,0,0x5f500400,1,0
+0x5f500500,1,0,0x5f500400,1,0=0x5f501100,3,0,0x5f500400,1,0; conflicting-override
 0x5f501100,3,0,0x5f500200,1,0=0x5f501100,3,0,0x5f500400,1,0
 ;;
 ;------------------------
@@ -199,14 +199,14 @@
 0x05004b00,3,0,0x5f501d00,0,1=0x5f500500,1,1,0x5f500400,1,0
 ;
 0x5f500400,0,0,0x5f500400,3,1=0x5f500400,0,0,0x5f500200,2,0
-0x5f500400,3,0,0x5f500400,0,1=0x5f500200,3,0,0x5f500400,0,1
+0x5f500400,3,0,0x5f500400,0,1=0x5f500200,3,0,0x5f500400,0,1; conflicting-override
 ;stability
 0x5f501d00,0,0,0x5f500500,1,0=0x5f500400,1,1,0x5f500500,1,0
 0x5f500500,1,1,0x5f501d00,0,1=0x5f500500,1,1,0x5f500400,1,0
 ;
 ;diagonal - straight - diagonal (long turn)
 0x5f501d00,0,0,0x5f500500,1,1=0x5f500400,1,1,0x5f501100,3,0
-0x5f500500,1,0,0x5f501d00,0,1=0x5f501100,3,0,0x5f500400,1,0
+0x5f500500,1,0,0x5f501d00,0,1=0x5f501100,3,0,0x5f500400,1,0; conflicting-override
 ;stability
 0x5f501d00,0,0,0x5f501100,3,0=0x5f500400,1,1,0x5f501100,3,0
 0x5f501100,3,0,0x5f501d00,0,1=0x5f501100,3,0,0x5f500400,1,0
@@ -249,14 +249,14 @@
 ;stability
 0x5f500200,0,0,0x5f500c00,2,0=0x5f500200,0,0,0x5f500600,0,1
 0x5f501d00,0,0,0x5f500600,0,1=0x5f500200,0,0,0x5f500600,0,1
-0x5f500600,0,0,0x5f501d00,0,1=0x5f500600,0,0,0x5f500200,1,0
+0x5f500600,0,0,0x5f501d00,0,1=0x5f500600,0,0,0x5f500200,1,0; conflicting-override
 0x5f500c00,0,0,0x5f500200,1,0=0x5f500600,0,0,0x5f500200,1,0
 ;
 ;4-way, 2 diagonals 2 orthogonals, 2 tiles
 0x5f500a00,3,0,0x5f500a00,1,0=0x5f500700,3,1,0x5f500700,1,1
 0x5f500a00,1,1,0x5f500a00,3,1=0x5f500700,1,0,0x5f500700,3,0
 0x5f500700,0,0,0x5f500400,1,0=0x5f500700,0,0,0x5f500200,1,0
-0x5f500400,1,1,0x5f500700,0,1=0x5f500200,0,0,0x5f500700,0,1
+0x5f500400,1,1,0x5f500700,0,1=0x5f500200,0,0,0x5f500700,0,1; conflicting-override
 ;stability
 0x5f500700,3,1,0x5f500a00,1,0=0x5f500700,3,1,0x5f500700,1,1
 0x5f500a00,3,0,0x5f500700,1,1=0x5f500700,3,1,0x5f500700,1,1
@@ -280,7 +280,7 @@
 ;
 0x5f500200,0,0,0x5f500a00,3,1=0x5f500200,0,0,0x5f500700,3,0
 0x5f500200,3,0,0x5f500a00,1,0=0x5f500200,3,0,0x5f500700,1,1
-0x5f500700,2,1,0x5f500400,3,1=0x5f500700,2,1,0x5f500200,2,0
+0x5f500700,2,1,0x5f500400,3,1=0x5f500700,2,1,0x5f500200,2,0; conflicting-override
 0x5f500700,0,0,0x5f500400,1,0=0x5f500700,0,0,0x5f500200,1,0
 ;
 ;-------
@@ -299,7 +299,7 @@
 0x5f502100,3,0,0x5f502100,1,0=0x5f502200,3,0,0x5f502200,1,0
 0x5f502100,1,1,0x5f502100,3,1=0x5f502200,1,1,0x5f502200,3,1
 0x5f502200,0,0,0x5f500400,3,1=0x5f502200,0,0,0x5f500200,2,0
-0x5f502200,2,1,0x5f500400,1,0=0x5f502200,2,1,0x5f500200,1,0
+0x5f502200,2,1,0x5f500400,1,0=0x5f502200,2,1,0x5f500200,1,0; conflicting-override
 ;stability
 0x5f502200,3,0,0x5f502100,1,0=0x5f502200,3,0,0x5f502200,1,0
 0x5f502200,1,1,0x5f502100,3,1=0x5f502200,1,1,0x5f502200,3,1
@@ -326,7 +326,7 @@
 0x5F503500,3,0,0x5F503500,1,0=0x5F503400,3,0,0x5F503400,1,0
 0x5F503500,1,1,0x5F503500,3,1=0x5F503400,1,1,0x5F503400,3,1
 0x5F503400,0,0,0x5f500400,3,1=0x5F503400,0,0,0x5f500200,2,0
-0x5F503400,2,1,0x5f500400,1,0=0x5F503400,2,1,0x5f500200,1,0
+0x5F503400,2,1,0x5f500400,1,0=0x5F503400,2,1,0x5f500200,1,0; conflicting-override
 ;stability
 0x5F503400,3,0,0x5F503500,1,0=0x5F503400,3,0,0x5F503400,1,0
 0x5F503400,1,1,0x5F503500,3,1=0x5F503400,1,1,0x5F503400,3,1
@@ -356,15 +356,15 @@
 ;-------
 ;override smoothed diagonal transition into blend tile
 0x5f500900,1,1,0x5f500400,2,0=0x5f500900,1,1,0x5f501400,2,0
-0x5f500900,3,0,0x5f500400,0,1=0x5f500900,3,0,0x5f501400,1,0
+0x5f500900,3,0,0x5f500400,0,1=0x5f500900,3,0,0x5f501400,1,0; conflicting-override
 ;-
 0x5f501200,1,0,0x5f500400,2,0=0x5f501200,1,0,0x5f501400,2,0
-0x5f501200,3,1,0x5f500400,0,1=0x5f501200,3,1,0x5f501400,1,0
+0x5f501200,3,1,0x5f500400,0,1=0x5f501200,3,1,0x5f501400,1,0; conflicting-override
 ;-
 0x5f500c00,1,0,0x5f500400,2,0=0x5f500c00,1,0,0x5f501400,2,0
 0x5f500c00,1,1,0x5f500400,2,0=0x5f500c00,1,1,0x5f501400,2,0
-0x5f500c00,3,0,0x5f500400,0,1=0x5f500c00,3,0,0x5f501400,1,0
-0x5f500c00,3,1,0x5f500400,0,1=0x5f500c00,3,1,0x5f501400,1,0
+0x5f500c00,3,0,0x5f500400,0,1=0x5f500c00,3,0,0x5f501400,1,0; conflicting-override
+0x5f500c00,3,1,0x5f500400,0,1=0x5f500c00,3,1,0x5f501400,1,0; conflicting-override
 
 ;Improved T-Intersections for DxO and DxD
 ;Added by Tarkus 20230423
@@ -395,10 +395,10 @@
 0x5F500600,2,1,0x5F504300,2,1=0x5F504200,2,1,0x5F504300,2,1
 
 0x5F500400,1,1,0x5F504300,1,1=0x5F500200,0,0,0x5F504300,1,1
-0x5F500400,3,0,0x5F504300,3,0=0x5F500200,3,0,0x5F504300,3,0
+0x5F500400,3,0,0x5F504300,3,0=0x5F500200,3,0,0x5F504300,3,0; conflicting-override
 
 0x5F500400,3,0,0x5F504200,1,1=0x5F500200,3,0,0x5F504200,1,1
-0x5F500400,1,1,0x5F504200,3,0=0x5F500200,0,0,0x5F504200,3,0
+0x5F500400,1,1,0x5F504200,3,0=0x5F500200,0,0,0x5F504200,3,0; conflicting-override
 
 ;Street Orth x Road Diag T
 0x00aa0c00,0,0,0x00000a00,2,0=0x00aa0c00,0,0,0x00aa0c80,0,0

Controller/RUL2/03_Turn_Lanes/Sec3c_OWR_SITAP.txt

@@ -10,7 +10,7 @@
 0x5F045B00,3,0,0x5F942100,0,0=0x5F941000,1,0,0x5F942100,0,0
 0x5F045B00,3,0,0x5F942100,1,0=0x5F941000,1,0,0x5F942100,1,0
 0x5F045B00,3,0,0x5F942100,2,0=0x5F941000,1,0,0x5F942100,2,0
-0x5F045B00,3,0,0x5F942100,0,0=0x5F941000,1,0,0x5F942100,3,0
+0x5F045B00,3,0,0x5F942100,0,0=0x5F941000,1,0,0x5F942100,3,0; conflicting-override
 
 ;New Version
 0x5F045B00,3,0,0x5F940F00,0,0=0x5F941000,1,0,0x5F940F00,0,0
@@ -67,8 +67,8 @@
 0x5F941300,1,0,0x5F942100,1,0=0x5F941200,1,0,0x5F942100,1,0
 0x5F941300,1,0,0x5F942100,2,0=0x5F941280,1,0,0x5F942100,2,0
 ;Transition Stability
-0x5F045B00,3,0,0x5F942100,1,0=0x5F941200,1,0,0x5F942100,1,0
-0x5F045B00,3,0,0x5F942100,2,0=0x5F941280,1,0,0x5F942100,2,0
+0x5F045B00,3,0,0x5F942100,1,0=0x5F941200,1,0,0x5F942100,1,0; conflicting-override
+0x5F045B00,3,0,0x5F942100,2,0=0x5F941280,1,0,0x5F942100,2,0; conflicting-override
 ;note to self - check stability on 3 and 4-way intersections to catch glitch spots
 ;2-Road 1-OWR End T-Intersection (with TLs)
 0x5F045B00,3,0,0x00005700,2,0=0x5F941600,1,0,0x5F943200,2,0