Merge branch 'staging' into nwm-diag-phase2a

Author: TarkusSC4

.github/workflows/scala.yml

@@ -34,6 +34,8 @@ jobs:
       run: sbt generateLocales
     - name: Check for new conflicting RUL2 overrides
       run: SBT_OPTS="-Xmx2G" sbt conflictingOverridesCheck
+    - name: Check for new segment orientation issues in RUL2 overrides
+      run: sbt "runMain com.sc4nam.scripts.SegmentOrientationChecker"
 
   lint:
     runs-on: ubuntu-latest

Controller/INRULs/RULConfig.txt

@@ -59,11 +59,17 @@ Source: RoadAdvanced/RUL08_Road_Advanced.rul
 
 TGI: 0x0A5BCF4B 0xAA5BCF57 0x00000009
 Compressed: 1
-Source: StreetBasic/RUL09_Street_Basic.rul
+Source: StreetBasic/RUL09_Street_Basic_Header.rul
+Source: StreetBasic/StreetBasic.rul
+Source: StreetBasic/FractionalAngle.rul
 
 TGI: 0x0A5BCF4B 0xAA5BCF57 0x0000000A
 Compressed: 1
-Source: StreetAdvanced/RUL0A_Street_Advanced.rul
+Source: StreetAdvanced/RUL0A_Street_Advanced_Header.rul
+Source: StreetAdvanced/FractionalAngle.rul
+Source: StreetAdvanced/Roundabouts.rul
+Source: StreetAdvanced/WideRadiusCurves.rul
+Source: StreetAdvanced/Miscellaneous.rul
 
 TGI: 0x0A5BCF4B 0xAA5BCF57 0x0000000B
 Compressed: 1
@@ -165,11 +171,17 @@ Source: RoadAdvanced/RUL08_Road_Advanced.rul
 
 TGI: 0x0A5BCF4B 0xAA5BCF57 0x00000009
 Compressed: 1
-Source: StreetBasic/RUL09_Street_Basic.rul
+Source: StreetBasic/RUL09_Street_Basic_Header.rul
+Source: StreetBasic/StreetBasic.rul
+Source: StreetBasic/FractionalAngle.rul
 
 TGI: 0x0A5BCF4B 0xAA5BCF57 0x0000000A
 Compressed: 1
-Source: StreetAdvanced/RUL0A_Street_Advanced.rul
+Source: StreetAdvanced/RUL0A_Street_Advanced_Header.rul
+Source: StreetAdvanced/FractionalAngle.rul
+Source: StreetAdvanced/Roundabouts.rul
+Source: StreetAdvanced/WideRadiusCurves.rul
+Source: StreetAdvanced/Miscellaneous.rul
 
 TGI: 0x0A5BCF4B 0xAA5BCF57 0x0000000B
 Compressed: 1
@@ -261,7 +273,10 @@ Source: RoadAdvanced/RUL08_Road_Advanced_Lite.rul
 
 TGI: 0x0A5BCF4B 0xAA5BCF57 0x00000009
 Compressed: 1
-Source: StreetBasic/RUL09_Street_Basic.rul
+Source: StreetBasic/RUL09_Street_Basic_Header.rul
+Source: StreetBasic/LegacyDiagonalStreets.rul
+Source: StreetBasic/StreetBasic.rul
+Source: StreetBasic/FractionalAngle.rul
 
 TGI: 0x0A5BCF4B 0xAA5BCF57 0x0000000A
 Compressed: 1

Controller/INRULs/RoadAdvanced/RUL08_Road_Advanced.rul

@@ -3212,59 +3212,55 @@
 2,5,2,2,?,?
 3,0,0x5F06BA00,3,0
 ;
-;Configurations for orthogonal road piece flipped; 5F06BB00
-;
 1,2,0,2,2
 2,5,2,?,?,2
 2,6,2,2,?,?
 2,7,?,2,2,?
-3,0,0x5F06BB00,3,0
+3,0,0x5F06BA00,1,1
 ;
 1,2,2,0,2
 2,7,2,2,?,?
 2,8,?,2,2,?
 2,1,?,?,2,2
-3,0,0x5F06BB00,0,0
+3,0,0x5F06BA00,0,1
 ;
 1,2,2,2,0
 2,1,?,2,2,?
 2,2,?,?,2,2
 2,3,2,?,?,2
-3,0,0x5F06BB00,1,0
+3,0,0x5F06BA00,3,1
 ;
 1,0,2,2,2
 2,3,?,?,2,2
 2,4,2,?,?,2
 2,5,2,2,?,?
-3,0,0x5F06BB00,2,0
+3,0,0x5F06BA00,2,1
 ;
-;Configurations for right-hook diagonal road piece; 5F06BF00
+;Configurations for diagonal (away) road piece; 5F06BE00
 ;
 1,13,0,2,2
 2,5,2,?,?,2
 2,6,2,2,?,?
 2,7,?,2,2,?
-3,0,0x5F06BF00,3,0
+3,0,0x5F06BE00,1,1
 ;
 1,2,13,0,2
 2,7,2,2,?,?
 2,8,?,2,2,?
 2,1,?,?,2,2
-3,0,0x5F06BF00,0,0
+3,0,0x5F06BE00,0,1
 ;
 1,2,2,13,0
 2,1,?,2,2,?
 2,2,?,?,2,2
 2,3,2,?,?,2
-3,0,0x5F06BF00,1,0
+3,0,0x5F06BE00,3,1
 ;
 1,0,2,2,13
 2,3,?,?,2,2
 2,4,2,?,?,2
 2,5,2,2,?,?
-3,0,0x5F06BF00,2,0
-;
-;Configurations for right-hook diagonal road piece flipped; 5F06BE00
+3,0,0x5F06BE00,2,1
 ;
 1,0,11,2,2
 2,5,2,?,?,2
@@ -3290,33 +3286,31 @@
 2,5,2,2,?,?
 3,0,0x5F06BE00,3,0
 ;
-;Configurations for left-hook diagonal road piece; 5F06B900
+;Configurations for diagonal (back) road piece; 5F06B800
 ;
 1,11,0,2,2
 2,5,2,?,?,2
 2,6,2,2,?,?
 2,7,?,2,2,?
-3,0,0x5F06B900,3,0
+3,0,0x5F06B800,1,1
 ;
 1,2,11,0,2
 2,7,2,2,?,?
 2,8,?,2,2,?
 2,1,?,?,2,2
-3,0,0x5F06B900,0,0
+3,0,0x5F06B800,0,1
 ;
 1,2,2,11,0
 2,1,?,2,2,?
 2,2,?,?,2,2
 2,3,2,?,?,2
-3,0,0x5F06B900,1,0
+3,0,0x5F06B800,3,1
 ;
 1,0,2,2,11
 2,3,?,?,2,2
 2,4,2,?,?,2
 2,5,2,2,?,?
-3,0,0x5F06B900,2,0
-;
-;Configurations for left-hook diagonal road piece flipped; 5F06B800
+3,0,0x5F06B800,2,1
 ;
 1,0,13,2,2
 2,5,2,?,?,2