Skip to content

Sinkhole fixes #543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
memo33 wants to merge 5 commits into
base: staging
Choose a base branch
from
Open

Sinkhole fixes #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
866dc50
add script to check RUL0 files for sinkhole issues
memo33 Jan 16, 2026
76c0a51
fix various sinkholes
memo33 Jan 18, 2026
7fc5cdd
implement review comments
memo33 Jan 19, 2026
b26dc09
improve sinkhole criteria in script
memo33 Jan 19, 2026
7dc73aa
fix missing check types and remaining sinkholes
memo33 Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/scala.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,7 @@ jobs:
- uses: actions/checkout@v4
with:
persist-credentials: false
- name: Check RUL0 syntax
run: python src/scripts/syntax-check-rul0.py
- name: Check RUL2 syntax
run: sh src/scripts/syntax-check-rul2.sh
4 changes: 2 additions & 2 deletions Controller/RUL0/0000_TuLEPS_CanAM/0100_CanAM.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,8 +504,8 @@ CheckType = c - highway: 0x04020002, 0x00000000 optional
CheckType = d - highway: 0x00020402, 0x00000000 optional

ConsLayout =.........
ConsLayout =...-+-...
ConsLayout =...-+-..<
ConsLayout =....+-...
ConsLayout =....+-..<
ConsLayout =....^....

AutoTileBase = 0xCA1A1D00
Expand Down
2 changes: 1 addition & 1 deletion Controller/RUL0/0000_TuLEPS_CanAM/0400_BasicTuLEPs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1954,8 +1954,8 @@ CheckType = c - avenue: 0x04020002
CheckType = d - avenue: 0x00020402

ConsLayout =.......
ConsLayout =..++...
ConsLayout =..++..<
ConsLayout =..++...
ConsLayout =.......
ConsLayout =..^....

Expand Down
39 changes: 23 additions & 16 deletions Controller/RUL0/0000_TuLEPS_CanAM/0460_FlexTurnLanes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ CheckType = a - road: 0x02000200
;###LHD###CheckType = b - road: 0x02000200 street: 0x00000304, 0xffffffff optional

ConsLayout=...
ConsLayout=...
ConsLayout=.+<
ConsLayout=.+.
ConsLayout=..<
ConsLayout=.^.

AutoTileBase= 0x55387000
Expand Down Expand Up @@ -3115,8 +3115,8 @@ CopyFrom = 0x304B6
;CellLayout=..^...

;CheckType = a - road: 0x02000200
;###RHD###CheckType = b - road: 0x02000200 onewayroad: 0x00000304, 0xffffffff optional
;###LHD###CheckType = b - road: 0x02000200 onewayroad: 0x00000104, 0xffffffff optional
;;###RHD###CheckType = b - road: 0x02000200 onewayroad: 0x00000304, 0xffffffff optional
;;###LHD###CheckType = b - road: 0x02000200 onewayroad: 0x00000104, 0xffffffff optional
;CheckType = c - road: 0x02000200 onewayroad: 0x04000003, 0xffffffff optional
;CheckType = d - road: 0x02000200 onewayroad: 0x00030400, 0xffffffff optional

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

ConsLayout=...........
ConsLayout=...........
ConsLayout=...........
ConsLayout=....+......
;###LHD###ConsLayout=...........
;###LHD###ConsLayout=...........
;###LHD###ConsLayout=...........
ConsLayout=...........
ConsLayout=..........<
ConsLayout=...........
ConsLayout=...........
ConsLayout=...........
;###RHD###ConsLayout=...........
;###RHD###ConsLayout=...........
;###RHD###ConsLayout=...........
ConsLayout=...........
ConsLayout=....^......

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

ConsLayout=...........
ConsLayout=...........
ConsLayout=...........
ConsLayout=...........
ConsLayout=...........
ConsLayout=....+......
;###LHD###ConsLayout=...........
;###LHD###ConsLayout=...........
;###LHD###ConsLayout=...........
;###LHD###ConsLayout=...........
ConsLayout=...........
ConsLayout=..........<
ConsLayout=...........
ConsLayout=...........
;###RHD###ConsLayout=...........
;###RHD###ConsLayout=...........
;###RHD###ConsLayout=...........
;###RHD###ConsLayout=...........
ConsLayout=...........
ConsLayout=....^......

Expand Down Expand Up @@ -4097,9 +4104,9 @@ CellLayout=.....a......
CellLayout=.....jk.....
CellLayout=.....fg.....
CellLayout=.....fg.....
CellLayout=.XohhbchhoY.
CellLayout=.XnhhrshhqY<
CellLayout=.XphhedhhpY.
CellLayout=..ohhbchho..
CellLayout=..nhhrshhq.<
CellLayout=..phhedhhp..
CellLayout=.....fg.....
CellLayout=.....fg.....
CellLayout=.....lm.....
Expand Down
67 changes: 35 additions & 32 deletions Controller/RUL0/1000_2000_3000_MaxisContent/2000_T-Intersections.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,18 +93,18 @@ CheckType = Y - highway:0x03020201
CheckType = Z - highway:0x01030202

ConsLayout =..............
ConsLayout =.\\........//.
ConsLayout =.\\\......///.
ConsLayout =..\\\....///..
ConsLayout =...\\\..///...
ConsLayout =....\\\///....
ConsLayout =.\\...........
ConsLayout =.\\\..........
ConsLayout =..\\\.........
ConsLayout =...\\\........
ConsLayout =....\\\//.....
ConsLayout =.....\##/....<
ConsLayout =...../##\.....
ConsLayout =....///\\\....
ConsLayout =...///..\\\...
ConsLayout =..///....\\\..
ConsLayout =.///......\\\.
ConsLayout =.//........\\.
ConsLayout =.....//\\\....
ConsLayout =........\\\...
ConsLayout =.........\\\..
ConsLayout =..........\\\.
ConsLayout =...........\\.
ConsLayout =......^.......

AutoTileBase = 0x0C001000
Expand Down Expand Up @@ -146,25 +146,28 @@ CheckType = k - highway:0x00000103,0x0000ffff check
CheckType = l - highway:0x00030100 check
CheckType = m - highway:0x03010000 check
CheckType = n - highway:0x03000001,0xff0000ff check
CheckType = o - highway:0x00000301 check
CheckType = p - highway:0x03010000 check
CheckType = q - highway:0x00010300,0x00ffff00 check
CheckType = r - highway:0x00000301 check
CheckType = A - highway:0x02010003
CheckType = B - highway:0x03020100
CheckType = C - highway:0x02020202
CheckType = D - highway:0x01000302
CheckType = E - highway:0x00030201

ConsLayout =.............
ConsLayout =.\\.......//.
ConsLayout =.\\\.....///.
ConsLayout =..\\\...///..
ConsLayout =...\\\.///...
ConsLayout =.\\..........
ConsLayout =.\\\.........
ConsLayout =..\\\........
ConsLayout =...\\\.//....
ConsLayout =....\\#//....
ConsLayout =.....###....<
ConsLayout =....//#\\....
ConsLayout =...///.\\\...
ConsLayout =..///...\\\..
ConsLayout =.///.....\\\.
ConsLayout =.//.......\\.
ConsLayout =....//.\\\...
ConsLayout =........\\\..
ConsLayout =.........\\\.
ConsLayout =..........\\.
ConsLayout =......^......

AutoTileBase = 0x0C002000
Expand Down Expand Up @@ -216,20 +219,20 @@ CheckType = A - highway:0x02040203
CheckType = B - highway:0x02030204

ConsLayout =.............
ConsLayout =......||.....
ConsLayout =.\\...||.....
ConsLayout =.\\\..||.....
ConsLayout =..\\\.||.....
ConsLayout =.............
ConsLayout =.\\..........
ConsLayout =.\\\.........
ConsLayout =..\\\........
ConsLayout =...\\\||.....
ConsLayout =....\\#|....<
ConsLayout =.....\##.....
ConsLayout =......##\....
ConsLayout =......|#\\...
ConsLayout =......||\\\..
ConsLayout =......||.\\\.
ConsLayout =......||..\\.
ConsLayout =......||.....
ConsLayout =......||.....
ConsLayout =.........\\\.
ConsLayout =..........\\.
ConsLayout =.............
ConsLayout =.............
ConsLayout =......^......

AutoTileBase = 0x0C003010
Expand Down Expand Up @@ -582,10 +585,10 @@ CheckType = U - groundhighway:0x03010000 check
CheckType = V - groundhighway:0x03000001, 0xFF0000FF check
CheckType = W - groundhighway:0x00000301 check

ConsLayout =\\XXX//
ConsLayout =\\X.X//
ConsLayout =\\\X///
ConsLayout =X\\#//X
ConsLayout =.X###XX<
ConsLayout =.X###X.<
ConsLayout =.XX#\\X
ConsLayout =..XX\\\
ConsLayout =....X\\
Expand Down Expand Up @@ -698,10 +701,10 @@ CheckType = U - highway:0x03010000 check
CheckType = V - highway:0x03000001, 0xFF0000FF check
CheckType = W - highway:0x00000301 check

ConsLayout =\\XXX//
ConsLayout =\\X.X//
ConsLayout =\\\X///
ConsLayout =X\\#//X
ConsLayout =.X###XX<
ConsLayout =.X###X.<
ConsLayout =.XX#\\X
ConsLayout =..XX\\\
ConsLayout =....X\\
Expand Down Expand Up @@ -1106,9 +1109,9 @@ ConsLayout =.\\..........
ConsLayout =.\\\.........
ConsLayout =..\\\........
ConsLayout =...\\\.......
ConsLayout =....\\#......
ConsLayout =....\\#/.....
ConsLayout =.....###....<
ConsLayout =......#\\....
ConsLayout =...../#\\....
ConsLayout =.......\\\...
ConsLayout =........\\\..
ConsLayout =.........\\\.
Expand Down
8 changes: 4 additions & 4 deletions Controller/RUL0/3400_Symphony/3400_PSRamps.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ ConsLayout =.......
ConsLayout =.......
ConsLayout =../|..<
ConsLayout =../|...
ConsLayout =..|....
ConsLayout =..||...
ConsLayout =.......
ConsLayout =...^...

Expand Down Expand Up @@ -459,7 +459,7 @@ ConsLayout =.......
ConsLayout =.......
ConsLayout =..|\<..
ConsLayout =..|\...
ConsLayout =...|...
ConsLayout =..||...
ConsLayout =.......
ConsLayout =..^....

Expand Down Expand Up @@ -505,7 +505,7 @@ ConsLayout =.......
ConsLayout =.......
ConsLayout =../|..<
ConsLayout =../|...
ConsLayout =..|....
ConsLayout =..||...
ConsLayout =.......
ConsLayout =...^...

Expand Down Expand Up @@ -550,7 +550,7 @@ ConsLayout =.......
ConsLayout =.......
ConsLayout =..|\<..
ConsLayout =..|\...
ConsLayout =...|...
ConsLayout =..||...
ConsLayout =.......
ConsLayout =..^....

Expand Down
2 changes: 1 addition & 1 deletion Controller/RUL0/4000_RAM/4080_FARR-2-3.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ ConsLayout =..|..........<
ConsLayout =..\\..........
ConsLayout =..\\..........
ConsLayout =..\\..........
ConsLayout =...\..........
ConsLayout =..\\..........
ConsLayout =..............
ConsLayout =..^...........

Expand Down
2 changes: 1 addition & 1 deletion Controller/RUL0/4000_RAM/4200_TTR.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ ConsLayout =..|..........<
ConsLayout =..\\..........
ConsLayout =..\\..........
ConsLayout =..\\..........
ConsLayout =...\..........
ConsLayout =..\\..........
ConsLayout =..............
ConsLayout =..^...........

Expand Down
4 changes: 2 additions & 2 deletions Controller/RUL0/4000_RAM/4600_L2DTR.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ CheckType = z - rail: 0x00000002,0x00000000 check

ConsLayout =..........
ConsLayout =...----..<
ConsLayout =.....--...
ConsLayout =....---...
ConsLayout =..........
ConsLayout =....^.....

Expand Down Expand Up @@ -578,7 +578,7 @@ CheckType = a - rail: 0x02000200
ConsLayout =..........
ConsLayout =...--....<
ConsLayout =...---....
CellLayout =..........
ConsLayout =..........
ConsLayout =...^......

AutoTileBase = 0x53d7EB3A
Expand Down
2 changes: 1 addition & 1 deletion Controller/RUL0/5000_RHW/5000_Starters.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2032,7 +2032,7 @@ CellLayout =...^...
CheckType = Z - dirtroad: 0x04040404

ConsLayout =.......
ConsLayout =......<
ConsLayout =...+..<
ConsLayout =...^...

AutoTileBase= 0x55387000
Expand Down
2 changes: 1 addition & 1 deletion Controller/RUL0/5000_RHW/5050_Fillers.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ CheckType = c - dirtroad: 0x02000200
ConsLayout = .......
ConsLayout = .......
ConsLayout = ...||<.
ConsLayout = =...^..
ConsLayout = ....^..

AutoTileBase= 0x57F05300
ReplacementIntersection = 0, 0
Expand Down
4 changes: 2 additions & 2 deletions Controller/RUL0/5000_RHW/5080_NeighborConnectors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ CellLayout =...^...
CheckType = Z - dirtroad: 0x00020002

ConsLayout =.......
ConsLayout =......<
ConsLayout =...+..<
ConsLayout =.......
ConsLayout =...^...

Expand Down Expand Up @@ -560,7 +560,7 @@ CellLayout =...^...
CheckType = Z - dirtroad: 0x00020002

ConsLayout =.......
ConsLayout =......<
ConsLayout =...+..<
ConsLayout =.......
ConsLayout =...^...

Expand Down
Loading