Skip to content

Commit c8152d9

Browse files
memo33memo33
authored
Merge pull request #543 from memo33/sinkholes
Sinkhole fixes
2 parents 9e5a778 + 7dc73aa commit c8152d9

47 files changed

Lines changed: 402 additions & 258 deletions

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
@@ -41,5 +41,7 @@ jobs:
4141
- uses: actions/checkout@v4
4242
with:
4343
persist-credentials: false
44+
- name: Check RUL0 syntax
45+
run: python src/scripts/syntax-check-rul0.py
4446
- name: Check RUL2 syntax
4547
run: sh src/scripts/syntax-check-rul2.sh

‎Controller/RUL0/0000_TuLEPS_CanAM/0100_CanAM.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -504,8 +504,8 @@ CheckType = c - highway: 0x04020002, 0x00000000 optional
504504
CheckType = d - highway: 0x00020402, 0x00000000 optional
505505

506506
ConsLayout =.........
507-
ConsLayout =...-+-...
508-
ConsLayout =...-+-..<
507+
ConsLayout =....+-...
508+
ConsLayout =....+-..<
509509
ConsLayout =....^....
510510

511511
AutoTileBase = 0xCA1A1D00

‎Controller/RUL0/0000_TuLEPS_CanAM/0400_BasicTuLEPs.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1954,8 +1954,8 @@ CheckType = c - avenue: 0x04020002
19541954
CheckType = d - avenue: 0x00020402
19551955

19561956
ConsLayout =.......
1957-
ConsLayout =..++...
19581957
ConsLayout =..++..<
1958+
ConsLayout =..++...
19591959
ConsLayout =.......
19601960
ConsLayout =..^....
19611961

‎Controller/RUL0/0000_TuLEPS_CanAM/0460_FlexTurnLanes.txt‎

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ CheckType = a - road: 0x02000200
146146
;###LHD###CheckType = b - road: 0x02000200 street: 0x00000304, 0xffffffff optional
147147

148148
ConsLayout=...
149-
ConsLayout=...
150-
ConsLayout=.+<
149+
ConsLayout=.+.
150+
ConsLayout=..<
151151
ConsLayout=.^.
152152

153153
AutoTileBase= 0x55387000
@@ -3115,8 +3115,8 @@ CopyFrom = 0x304B6
31153115
;CellLayout=..^...
31163116

31173117
;CheckType = a - road: 0x02000200
3118-
;###RHD###CheckType = b - road: 0x02000200 onewayroad: 0x00000304, 0xffffffff optional
3119-
;###LHD###CheckType = b - road: 0x02000200 onewayroad: 0x00000104, 0xffffffff optional
3118+
;;###RHD###CheckType = b - road: 0x02000200 onewayroad: 0x00000304, 0xffffffff optional
3119+
;;###LHD###CheckType = b - road: 0x02000200 onewayroad: 0x00000104, 0xffffffff optional
31203120
;CheckType = c - road: 0x02000200 onewayroad: 0x04000003, 0xffffffff optional
31213121
;CheckType = d - road: 0x02000200 onewayroad: 0x00030400, 0xffffffff optional
31223122

@@ -3476,13 +3476,16 @@ CheckType = r - avenue: 0x04040402 road: 0x02020200, 0xffffffff optional
34763476
CheckType = s - avenue: 0x04000404 road: 0x02000202, 0xffffffff optional
34773477

34783478
ConsLayout=...........
3479-
ConsLayout=...........
3480-
ConsLayout=...........
3479+
ConsLayout=....+......
3480+
;###LHD###ConsLayout=...........
3481+
;###LHD###ConsLayout=...........
3482+
;###LHD###ConsLayout=...........
34813483
ConsLayout=...........
34823484
ConsLayout=..........<
34833485
ConsLayout=...........
3484-
ConsLayout=...........
3485-
ConsLayout=...........
3486+
;###RHD###ConsLayout=...........
3487+
;###RHD###ConsLayout=...........
3488+
;###RHD###ConsLayout=...........
34863489
ConsLayout=...........
34873490
ConsLayout=....^......
34883491

@@ -3727,14 +3730,18 @@ CheckType = r - avenue: 0x04040402 road: 0x02020200, 0xffffffff optional
37273730
CheckType = s - avenue: 0x04000404 road: 0x02000202, 0xffffffff optional
37283731

37293732
ConsLayout=...........
3730-
ConsLayout=...........
3731-
ConsLayout=...........
3732-
ConsLayout=...........
3733-
ConsLayout=...........
3733+
ConsLayout=....+......
3734+
;###LHD###ConsLayout=...........
3735+
;###LHD###ConsLayout=...........
3736+
;###LHD###ConsLayout=...........
3737+
;###LHD###ConsLayout=...........
37343738
ConsLayout=...........
37353739
ConsLayout=..........<
37363740
ConsLayout=...........
3737-
ConsLayout=...........
3741+
;###RHD###ConsLayout=...........
3742+
;###RHD###ConsLayout=...........
3743+
;###RHD###ConsLayout=...........
3744+
;###RHD###ConsLayout=...........
37383745
ConsLayout=...........
37393746
ConsLayout=....^......
37403747

@@ -4097,9 +4104,9 @@ CellLayout=.....a......
40974104
CellLayout=.....jk.....
40984105
CellLayout=.....fg.....
40994106
CellLayout=.....fg.....
4100-
CellLayout=.XohhbchhoY.
4101-
CellLayout=.XnhhrshhqY<
4102-
CellLayout=.XphhedhhpY.
4107+
CellLayout=..ohhbchho..
4108+
CellLayout=..nhhrshhq.<
4109+
CellLayout=..phhedhhp..
41034110
CellLayout=.....fg.....
41044111
CellLayout=.....fg.....
41054112
CellLayout=.....lm.....

‎Controller/RUL0/1000_2000_3000_MaxisContent/2000_T-Intersections.txt‎

Lines changed: 35 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -93,18 +93,18 @@ CheckType = Y - highway:0x03020201
9393
CheckType = Z - highway:0x01030202
9494

9595
ConsLayout =..............
96-
ConsLayout =.\\........//.
97-
ConsLayout =.\\\......///.
98-
ConsLayout =..\\\....///..
99-
ConsLayout =...\\\..///...
100-
ConsLayout =....\\\///....
96+
ConsLayout =.\\...........
97+
ConsLayout =.\\\..........
98+
ConsLayout =..\\\.........
99+
ConsLayout =...\\\........
100+
ConsLayout =....\\\//.....
101101
ConsLayout =.....\##/....<
102102
ConsLayout =...../##\.....
103-
ConsLayout =....///\\\....
104-
ConsLayout =...///..\\\...
105-
ConsLayout =..///....\\\..
106-
ConsLayout =.///......\\\.
107-
ConsLayout =.//........\\.
103+
ConsLayout =.....//\\\....
104+
ConsLayout =........\\\...
105+
ConsLayout =.........\\\..
106+
ConsLayout =..........\\\.
107+
ConsLayout =...........\\.
108108
ConsLayout =......^.......
109109

110110
AutoTileBase = 0x0C001000
@@ -146,25 +146,28 @@ CheckType = k - highway:0x00000103,0x0000ffff check
146146
CheckType = l - highway:0x00030100 check
147147
CheckType = m - highway:0x03010000 check
148148
CheckType = n - highway:0x03000001,0xff0000ff check
149+
CheckType = o - highway:0x00000301 check
150+
CheckType = p - highway:0x03010000 check
149151
CheckType = q - highway:0x00010300,0x00ffff00 check
152+
CheckType = r - highway:0x00000301 check
150153
CheckType = A - highway:0x02010003
151154
CheckType = B - highway:0x03020100
152155
CheckType = C - highway:0x02020202
153156
CheckType = D - highway:0x01000302
154157
CheckType = E - highway:0x00030201
155158

156159
ConsLayout =.............
157-
ConsLayout =.\\.......//.
158-
ConsLayout =.\\\.....///.
159-
ConsLayout =..\\\...///..
160-
ConsLayout =...\\\.///...
160+
ConsLayout =.\\..........
161+
ConsLayout =.\\\.........
162+
ConsLayout =..\\\........
163+
ConsLayout =...\\\.//....
161164
ConsLayout =....\\#//....
162165
ConsLayout =.....###....<
163166
ConsLayout =....//#\\....
164-
ConsLayout =...///.\\\...
165-
ConsLayout =..///...\\\..
166-
ConsLayout =.///.....\\\.
167-
ConsLayout =.//.......\\.
167+
ConsLayout =....//.\\\...
168+
ConsLayout =........\\\..
169+
ConsLayout =.........\\\.
170+
ConsLayout =..........\\.
168171
ConsLayout =......^......
169172

170173
AutoTileBase = 0x0C002000
@@ -216,20 +219,20 @@ CheckType = A - highway:0x02040203
216219
CheckType = B - highway:0x02030204
217220

218221
ConsLayout =.............
219-
ConsLayout =......||.....
220-
ConsLayout =.\\...||.....
221-
ConsLayout =.\\\..||.....
222-
ConsLayout =..\\\.||.....
222+
ConsLayout =.............
223+
ConsLayout =.\\..........
224+
ConsLayout =.\\\.........
225+
ConsLayout =..\\\........
223226
ConsLayout =...\\\||.....
224227
ConsLayout =....\\#|....<
225228
ConsLayout =.....\##.....
226229
ConsLayout =......##\....
227230
ConsLayout =......|#\\...
228231
ConsLayout =......||\\\..
229-
ConsLayout =......||.\\\.
230-
ConsLayout =......||..\\.
231-
ConsLayout =......||.....
232-
ConsLayout =......||.....
232+
ConsLayout =.........\\\.
233+
ConsLayout =..........\\.
234+
ConsLayout =.............
235+
ConsLayout =.............
233236
ConsLayout =......^......
234237

235238
AutoTileBase = 0x0C003010
@@ -582,10 +585,10 @@ CheckType = U - groundhighway:0x03010000 check
582585
CheckType = V - groundhighway:0x03000001, 0xFF0000FF check
583586
CheckType = W - groundhighway:0x00000301 check
584587

585-
ConsLayout =\\XXX//
588+
ConsLayout =\\X.X//
586589
ConsLayout =\\\X///
587590
ConsLayout =X\\#//X
588-
ConsLayout =.X###XX<
591+
ConsLayout =.X###X.<
589592
ConsLayout =.XX#\\X
590593
ConsLayout =..XX\\\
591594
ConsLayout =....X\\
@@ -698,10 +701,10 @@ CheckType = U - highway:0x03010000 check
698701
CheckType = V - highway:0x03000001, 0xFF0000FF check
699702
CheckType = W - highway:0x00000301 check
700703

701-
ConsLayout =\\XXX//
704+
ConsLayout =\\X.X//
702705
ConsLayout =\\\X///
703706
ConsLayout =X\\#//X
704-
ConsLayout =.X###XX<
707+
ConsLayout =.X###X.<
705708
ConsLayout =.XX#\\X
706709
ConsLayout =..XX\\\
707710
ConsLayout =....X\\
@@ -1106,9 +1109,9 @@ ConsLayout =.\\..........
11061109
ConsLayout =.\\\.........
11071110
ConsLayout =..\\\........
11081111
ConsLayout =...\\\.......
1109-
ConsLayout =....\\#......
1112+
ConsLayout =....\\#/.....
11101113
ConsLayout =.....###....<
1111-
ConsLayout =......#\\....
1114+
ConsLayout =...../#\\....
11121115
ConsLayout =.......\\\...
11131116
ConsLayout =........\\\..
11141117
ConsLayout =.........\\\.

‎Controller/RUL0/3400_Symphony/3400_PSRamps.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ ConsLayout =.......
412412
ConsLayout =.......
413413
ConsLayout =../|..<
414414
ConsLayout =../|...
415-
ConsLayout =..|....
415+
ConsLayout =..||...
416416
ConsLayout =.......
417417
ConsLayout =...^...
418418

@@ -459,7 +459,7 @@ ConsLayout =.......
459459
ConsLayout =.......
460460
ConsLayout =..|\<..
461461
ConsLayout =..|\...
462-
ConsLayout =...|...
462+
ConsLayout =..||...
463463
ConsLayout =.......
464464
ConsLayout =..^....
465465

@@ -505,7 +505,7 @@ ConsLayout =.......
505505
ConsLayout =.......
506506
ConsLayout =../|..<
507507
ConsLayout =../|...
508-
ConsLayout =..|....
508+
ConsLayout =..||...
509509
ConsLayout =.......
510510
ConsLayout =...^...
511511

@@ -550,7 +550,7 @@ ConsLayout =.......
550550
ConsLayout =.......
551551
ConsLayout =..|\<..
552552
ConsLayout =..|\...
553-
ConsLayout =...|...
553+
ConsLayout =..||...
554554
ConsLayout =.......
555555
ConsLayout =..^....
556556

‎Controller/RUL0/4000_RAM/4080_FARR-2-3.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ ConsLayout =..|..........<
9191
ConsLayout =..\\..........
9292
ConsLayout =..\\..........
9393
ConsLayout =..\\..........
94-
ConsLayout =...\..........
94+
ConsLayout =..\\..........
9595
ConsLayout =..............
9696
ConsLayout =..^...........
9797

‎Controller/RUL0/4000_RAM/4200_TTR.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ ConsLayout =..|..........<
198198
ConsLayout =..\\..........
199199
ConsLayout =..\\..........
200200
ConsLayout =..\\..........
201-
ConsLayout =...\..........
201+
ConsLayout =..\\..........
202202
ConsLayout =..............
203203
ConsLayout =..^...........
204204

‎Controller/RUL0/4000_RAM/4600_L2DTR.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ CheckType = z - rail: 0x00000002,0x00000000 check
145145

146146
ConsLayout =..........
147147
ConsLayout =...----..<
148-
ConsLayout =.....--...
148+
ConsLayout =....---...
149149
ConsLayout =..........
150150
ConsLayout =....^.....
151151

@@ -578,7 +578,7 @@ CheckType = a - rail: 0x02000200
578578
ConsLayout =..........
579579
ConsLayout =...--....<
580580
ConsLayout =...---....
581-
CellLayout =..........
581+
ConsLayout =..........
582582
ConsLayout =...^......
583583

584584
AutoTileBase = 0x53d7EB3A

‎Controller/RUL0/5000_RHW/5000_Starters.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2032,7 +2032,7 @@ CellLayout =...^...
20322032
CheckType = Z - dirtroad: 0x04040404
20332033

20342034
ConsLayout =.......
2035-
ConsLayout =......<
2035+
ConsLayout =...+..<
20362036
ConsLayout =...^...
20372037

20382038
AutoTileBase= 0x55387000

0 commit comments

Comments
 (0)