Skip to content

Commit 7ad1f6e

Browse files
committed
Merge branch 'segment-orientation-check' into redundant-adjacencies-removal
2 parents 9529db6 + ea50425 commit 7ad1f6e

362 files changed

Lines changed: 541 additions & 145587 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/scala.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ jobs:
3434
run: sbt generateLocales
3535
- name: Check for new conflicting RUL2 overrides
3636
run: SBT_OPTS="-Xmx2G" sbt conflictingOverridesCheck
37+
- name: Check for new segment orientation issues in RUL2 overrides
38+
run: sbt "runMain com.sc4nam.scripts.SegmentOrientationChecker"
3739

3840
lint:
3941
runs-on: ubuntu-latest

Controller/RUL1/09_Dirtroad/11_FlexFly_falsies_MANAGED.txt

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Type5=0x04040204,0x04040401,0x5CA6C100,3,1
1919
Type6=0x04020404,0x04040104,0x5CA6C100,2,1
2020
Type7=0x02040404,0x04010404,0x5CA6C100,1,1
2121

22-
;Mis~(+233,0,-243,0)
22+
;Mis~(0,+231,-243,0)
2323
Type0=0x02020404,0x03040404,0x5CA6C300,0,0
2424
Type1=0x02040402,0x04040403,0x5CA6C300,1,0
2525
Type2=0x04040202,0x04040304,0x5CA6C300,2,0
@@ -59,7 +59,7 @@ Type5=0x04040204,0x04010104,0x5CA2C111,3,1
5959
Type6=0x04020404,0x01010404,0x5CA2C111,2,1
6060
Type7=0x02040404,0x01040401,0x5CA2C111,1,1
6161

62-
;L1Mis~(+233,0,-243,0)
62+
;L1Mis~(0,+231,-243,0)
6363
Type0=0x02020404,0x01040404,0x5CA2C311,0,0
6464
Type1=0x02040402,0x04040401,0x5CA2C311,1,0
6565
Type2=0x04040202,0x04040104,0x5CA2C311,2,0
@@ -99,7 +99,7 @@ Type5=0x04040204,0x04040102,0x5CABC122,3,1
9999
Type6=0x04020404,0x04010204,0x5CABC122,2,1
100100
Type7=0x02040404,0x01020404,0x5CABC122,1,1
101101

102-
;L2Mis~(+233,0,-243,0)
102+
;L2Mis~(0,+231,-243,0)
103103
Type0=0x02020404,0x03030404,0x5CABC322,0,0
104104
Type1=0x02040402,0x03040403,0x5CABC322,1,0
105105
Type2=0x04040202,0x04040303,0x5CABC322,2,0
@@ -139,7 +139,7 @@ Type5=0x04040204,0x04030104,0x5CA1C133,3,1
139139
Type6=0x04020404,0x03010404,0x5CA1C133,2,1
140140
Type7=0x02040404,0x01040403,0x5CA1C133,1,1
141141

142-
;L3Mis~(+233,0,-243,0)
142+
;L3Mis~(0,+231,-243,0)
143143
Type0=0x02040204,0x03040404,0x5CA1C333,0,0
144144
Type1=0x04020402,0x04040403,0x5CA1C333,1,0
145145
Type2=0x02040204,0x04040304,0x5CA1C333,2,0
@@ -179,7 +179,7 @@ Type5=0x04040204,0x01040401,0x5CA5C144,3,1
179179
Type6=0x04020404,0x04040101,0x5CA5C144,2,1
180180
Type7=0x02040404,0x04010104,0x5CA5C144,1,1
181181

182-
;L4Mis~(+233,0,-243,0)
182+
;L4Mis~(0,+231,-243,0)
183183
Type0=0x04020204,0x03040404,0x5CA5C344,0,0
184184
Type1=0x02020404,0x04040403,0x5CA5C344,1,0
185185
Type2=0x02040402,0x04040304,0x5CA5C344,2,0
@@ -219,7 +219,7 @@ Type5=0x04040204,0x00040401,0x5CA64100,3,1
219219
Type6=0x04020404,0x04040100,0x5CA64100,2,1
220220
Type7=0x02040404,0x04010004,0x5CA64100,1,1
221221

222-
;Rhw4~(+233,0,-243,0)
222+
;Rhw4~(0,+231,-243,0)
223223
Type0=0x02020204,0x03040404,0x5CA64300,0,0
224224
Type1=0x02020402,0x04040403,0x5CA64300,1,0
225225
Type2=0x02040202,0x04040304,0x5CA64300,2,0
@@ -259,7 +259,7 @@ Type5=0x04040204,0x03040402,0x5CA24111,3,1
259259
Type6=0x04020404,0x04040203,0x5CA24111,2,1
260260
Type7=0x02040404,0x04020304,0x5CA24111,1,1
261261

262-
;L1Rhw4~(+233,0,-243,0)
262+
;L1Rhw4~(0,+231,-243,0)
263263
Type0=0x04020204,0x02040404,0x5CA24311,0,0
264264
Type1=0x02020404,0x04040402,0x5CA24311,1,0
265265
Type2=0x02040402,0x04040204,0x5CA24311,2,0
@@ -299,7 +299,7 @@ Type5=0x04040204,0x02040403,0x5CAB4122,3,1
299299
Type6=0x04020404,0x04040302,0x5CAB4122,2,1
300300
Type7=0x02040404,0x04030204,0x5CAB4122,1,1
301301

302-
;L2Rhw4~(+233,0,-243,0)
302+
;L2Rhw4~(0,+231,-243,0)
303303
Type0=0x04020204,0x01040404,0x5CAB4322,0,0
304304
Type1=0x02020404,0x04040401,0x5CAB4322,1,0
305305
Type2=0x02040402,0x04040104,0x5CAB4322,2,0
@@ -339,7 +339,7 @@ Type5=0x04040204,0x01040400,0x5CA14133,3,1
339339
Type6=0x04020404,0x04040001,0x5CA14133,2,1
340340
Type7=0x02040404,0x04000104,0x5CA14133,1,1
341341

342-
;L3Rhw4~(+233,0,-243,0)
342+
;L3Rhw4~(0,+231,-243,0)
343343
Type0=0x02020204,0x01040404,0x5CA14333,0,0
344344
Type1=0x02020402,0x04040401,0x5CA14333,1,0
345345
Type2=0x02040202,0x04040104,0x5CA14333,2,0
@@ -379,7 +379,7 @@ Type5=0x04040204,0x01040104,0x5CA54144,3,1
379379
Type6=0x04020404,0x04010401,0x5CA54144,2,1
380380
Type7=0x02040404,0x01040104,0x5CA54144,1,1
381381

382-
;L4Rhw4~(+233,0,-243,0)
382+
;L4Rhw4~(0,+231,-243,0)
383383
Type0=0x02040204,0x04030404,0x5CA54344,0,0
384384
Type1=0x04020402,0x03040404,0x5CA54344,1,0
385385
Type2=0x02040204,0x04040403,0x5CA54344,2,0
@@ -419,7 +419,7 @@ Type5=0x04040204,0x04010402,0x5CA6D100,3,1
419419
Type6=0x04020404,0x01040204,0x5CA6D100,2,1
420420
Type7=0x02040404,0x04020401,0x5CA6D100,1,1
421421

422-
;Mis~(-233,0,+243,0)
422+
;Mis~(0,-231,+243,0)
423423
Type0=0x02040204,0x03030404,0x5CA6D300,0,0
424424
Type1=0x04020402,0x03040403,0x5CA6D300,1,0
425425
Type2=0x02040204,0x04040303,0x5CA6D300,2,0
@@ -459,7 +459,7 @@ Type5=0x04040204,0x01010304,0x5CA2D111,3,1
459459
Type6=0x04020404,0x01030401,0x5CA2D111,2,1
460460
Type7=0x02040404,0x03040101,0x5CA2D111,1,1
461461

462-
;L1Mis~(-233,0,+243,0)
462+
;L1Mis~(0,-231,+243,0)
463463
Type0=0x02040204,0x01030404,0x5CA2D311,0,0
464464
Type1=0x04020402,0x03040401,0x5CA2D311,1,0
465465
Type2=0x02040204,0x04040103,0x5CA2D311,2,0
@@ -499,7 +499,7 @@ Type5=0x04040204,0x04010103,0x5CABD122,3,1
499499
Type6=0x04020404,0x01010304,0x5CABD122,2,1
500500
Type7=0x02040404,0x01030401,0x5CABD122,1,1
501501

502-
;L2Mis~(-233,0,+243,0)
502+
;L2Mis~(0,-231,+243,0)
503503
Type0=0x02020204,0x04030404,0x5CABD322,0,0
504504
Type1=0x02020402,0x03040404,0x5CABD322,1,0
505505
Type2=0x02040202,0x04040403,0x5CABD322,2,0
@@ -539,7 +539,7 @@ Type5=0x04040204,0x01020304,0x5CA1D133,3,1
539539
Type6=0x04020404,0x02030401,0x5CA1D133,2,1
540540
Type7=0x02040404,0x03040102,0x5CA1D133,1,1
541541

542-
;L3Mis~(-233,0,+243,0)
542+
;L3Mis~(0,-231,+243,0)
543543
Type0=0x04020204,0x03030404,0x5CA1D333,0,0
544544
Type1=0x02020404,0x03040403,0x5CA1D333,1,0
545545
Type2=0x02040402,0x04040303,0x5CA1D333,2,0
@@ -579,7 +579,7 @@ Type5=0x04040204,0x04010301,0x5CA5D144,3,1
579579
Type6=0x04020404,0x01030104,0x5CA5D144,2,1
580580
Type7=0x02040404,0x03010401,0x5CA5D144,1,1
581581

582-
;L4Mis~(-233,0,+243,0)
582+
;L4Mis~(0,-231,+243,0)
583583
Type0=0x02020204,0x03030404,0x5CA5D344,0,0
584584
Type1=0x02020402,0x03040403,0x5CA5D344,1,0
585585
Type2=0x02040202,0x04040303,0x5CA5D344,2,0
@@ -619,7 +619,7 @@ Type5=0x04040204,0x01000104,0x5CA65100,3,1
619619
Type6=0x04020404,0x00010401,0x5CA65100,2,1
620620
Type7=0x02040404,0x01040100,0x5CA65100,1,1
621621

622-
;Rhw4~(-233,0,+243,0)
622+
;Rhw4~(0,-231,+243,0)
623623
Type0=0x04020204,0x02030404,0x5CA65300,0,0
624624
Type1=0x02020404,0x03040402,0x5CA65300,1,0
625625
Type2=0x02040402,0x04040203,0x5CA65300,2,0
@@ -659,7 +659,7 @@ Type5=0x04040204,0x00040104,0x5CA25111,3,1
659659
Type6=0x04020404,0x04010400,0x5CA25111,2,1
660660
Type7=0x02040404,0x01040004,0x5CA25111,1,1
661661

662-
;L1Rhw4~(-233,0,+243,0)
662+
;L1Rhw4~(0,-231,+243,0)
663663
Type0=0x04020204,0x01030404,0x5CA25311,0,0
664664
Type1=0x02020404,0x03040401,0x5CA25311,1,0
665665
Type2=0x02040402,0x04040103,0x5CA25311,2,0
@@ -699,7 +699,7 @@ Type5=0x04040204,0x00040101,0x5CAB5122,3,1
699699
Type6=0x04020404,0x04010100,0x5CAB5122,2,1
700700
Type7=0x02040404,0x01010004,0x5CAB5122,1,1
701701

702-
;L2Rhw4~(-233,0,+243,0)
702+
;L2Rhw4~(0,-231,+243,0)
703703
Type0=0x02020204,0x01030404,0x5CAB5322,0,0
704704
Type1=0x02020402,0x03040401,0x5CAB5322,1,0
705705
Type2=0x02040202,0x04040103,0x5CAB5322,2,0
@@ -739,7 +739,7 @@ Type5=0x04040204,0x00040102,0x5CA15133,3,1
739739
Type6=0x04020404,0x04010200,0x5CA15133,2,1
740740
Type7=0x02040404,0x01020004,0x5CA15133,1,1
741741

742-
;L3Rhw4~(-233,0,+243,0)
742+
;L3Rhw4~(0,-231,+243,0)
743743
Type0=0x04020204,0x00030404,0x5CA15333,0,0
744744
Type1=0x02020404,0x03040400,0x5CA15333,1,0
745745
Type2=0x02040402,0x04040003,0x5CA15333,2,0
@@ -779,7 +779,7 @@ Type5=0x04040204,0x00040103,0x5CA55144,3,1
779779
Type6=0x04020404,0x04010300,0x5CA55144,2,1
780780
Type7=0x02040404,0x01030004,0x5CA55144,1,1
781781

782-
;L4Rhw4~(-233,0,+243,0)
782+
;L4Rhw4~(0,-231,+243,0)
783783
Type0=0x02040204,0x03020404,0x5CA55344,0,0
784784
Type1=0x04020402,0x02040403,0x5CA55344,1,0
785785
Type2=0x02040204,0x04040302,0x5CA55344,2,0

0 commit comments

Comments
 (0)