Skip to content

fix IID of diagonal STR (RAM vs RRW) #535

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 3 commits into
base: staging
Choose a base branch
from
Open

fix IID of diagonal STR (RAM vs RRW) #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6586f0a
script: recompile RRW metarules
memo33 Aug 30, 2025
84a96f5
replace duplicate diagonal STR ID 0x5d302000 (RAM) by 0x5d500100 (RRW)
memo33 Nov 9, 2025
f18aae3
fix bad segment orientations
memo33 Nov 9, 2025
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
32 changes: 16 additions & 16 deletions Controller/RUL1/02_Rail/04_Rail_Street.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,25 +132,25 @@ TYPE4b=0x00020000,0x00000101,0x5d300000,1,0
TYPE4c=0x00000200,0x00000101,0x5d300000,2,0
TYPE4d=0x00000002,0x00000101,0x5d300000,3,0
;diagonal RAM Set 1 starter
TYPE1=0x03010000,0x00000101,0x5d302000,0,0
TYPE2=0x00030100,0x01000001,0x5d302000,3,0
TYPE3=0x00000301,0x01010000,0x5d302000,2,0
TYPE4=0x01000003,0x00010100,0x5d302000,1,0
TYPE1=0x03010000,0x00000101,0x5d500100,0,0
TYPE2=0x00030100,0x01000001,0x5d500100,3,0
TYPE3=0x00000301,0x01010000,0x5d500100,2,0
TYPE4=0x01000003,0x00010100,0x5d500100,1,0
;flip
TYPE1=0x03010000,0x00000303,0x5d302000,0,0
TYPE2=0x00030100,0x03000003,0x5d302000,3,0
TYPE3=0x00000301,0x03030000,0x5d302000,2,0
TYPE4=0x01000003,0x00030300,0x5d302000,1,0
TYPE1=0x03010000,0x00000303,0x5d500100,0,0
TYPE2=0x00030100,0x03000003,0x5d500100,3,0
TYPE3=0x00000301,0x03030000,0x5d500100,2,0
TYPE4=0x01000003,0x00030300,0x5d500100,1,0
;Stub
TYPE1=0x00010000,0x00000101,0x5d302000,0,0
TYPE2=0x00000100,0x01000001,0x5d302000,3,0
TYPE3=0x00000001,0x01010000,0x5d302000,2,0
TYPE4=0x01000000,0x00010100,0x5d302000,1,0
TYPE1=0x00010000,0x00000101,0x5d500100,0,0
TYPE2=0x00000100,0x01000001,0x5d500100,3,0
TYPE3=0x00000001,0x01010000,0x5d500100,2,0
TYPE4=0x01000000,0x00010100,0x5d500100,1,0
;flip stub
TYPE1=0x00000003,0x00030300,0x5d302000,1,0
TYPE2=0x00000300,0x03030000,0x5d302000,2,0
TYPE3=0x00030000,0x03000003,0x5d302000,3,0
TYPE1=0x03000000,0x00000303,0x5d302000,0,0
TYPE1=0x00000003,0x00030300,0x5d500100,1,0
TYPE2=0x00000300,0x03030000,0x5d500100,2,0
TYPE3=0x00030000,0x03000003,0x5d500100,3,0
TYPE1=0x03000000,0x00000303,0x5d500100,0,0

;Added 31-Dec-10 - Tarkus
;Updated 18-Mar-11 to add Diagonal Starter
Expand Down
32 changes: 14 additions & 18 deletions Controller/RUL2/06_Road_Viaducts/Sec6a_L1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19665,8 +19665,6 @@
;> L0 RHW-8C
;> L1 MIS
;from STR side
0x5D302000,0,0,0x5C004500,2,1=0x5D302000,0,0,0x5C004505,2,1
0x5D302000,3,0,0x5C004500,0,0=0x5D302000,3,0,0x5C004505,0,0
0x5D500100,0,0,0x5C004500,2,1=0x5D500100,0,0,0x5C004505,2,1
0x5D500100,3,0,0x5C004500,0,0=0x5D500100,3,0,0x5C004505,0,0
;
Expand All @@ -19675,8 +19673,8 @@
;
0x5C004505,2,0,0x5D540100,1,0=0x5C004505,2,0,0x5D500100,1,0
0x5C004505,0,1,0x5D540100,2,0=0x5C004505,0,1,0x5D500100,2,0
0x5C004505,2,0,0x03001A00,1,0=0x5C004505,2,0,0x5D302000,1,0
0x5C004505,0,1,0x03001A00,2,0=0x5C004505,0,1,0x5D302000,2,0
0x5C004505,2,0,0x03001A00,1,0=0x5C004505,2,0,0x5D500100,1,0
0x5C004505,0,1,0x03001A00,2,0=0x5C004505,0,1,0x5D500100,2,0
;----Light Rail (47)----
;Elevated Light Rail (47-2)
0x5C000000,1,0,0x08DD1600,1,1=0x5C000000,1,0,0x5C004720,3,0
Expand Down Expand Up @@ -23154,8 +23152,6 @@
;> L0 RHW-8C
;> L1 MIS
;from STR side
0x5D302000,0,0,0x5C014500,2,1=0x5D302000,0,0,0x5C014505,2,1
0x5D302000,3,0,0x5C014500,0,0=0x5D302000,3,0,0x5C014505,0,0
0x5D500100,0,0,0x5C014500,2,1=0x5D500100,0,0,0x5C014505,2,1
0x5D500100,3,0,0x5C014500,0,0=0x5D500100,3,0,0x5C014505,0,0
;
Expand All @@ -23164,8 +23160,8 @@
;
0x5C014505,2,0,0x5D540100,1,0=0x5C014505,2,0,0x5D500100,1,0
0x5C014505,0,1,0x5D540100,2,0=0x5C014505,0,1,0x5D500100,2,0
0x5C014505,2,0,0x09301A00,1,0=0x5C014505,2,0,0x5D302000,1,0; missing_paths
0x5C014505,0,1,0x09301A00,2,0=0x5C014505,0,1,0x5D302000,2,0; missing_paths
0x5C014505,2,0,0x09301A00,1,0=0x5C014505,2,0,0x5D500100,1,0; missing_paths
0x5C014505,0,1,0x09301A00,2,0=0x5C014505,0,1,0x5D500100,2,0; missing_paths
;----Light Rail (47)----
;Elevated Light Rail (47-2)
0x5C010000,1,0,0x091D1600,1,1=0x5C010000,1,0,0x5C014720,3,0
Expand Down Expand Up @@ -27551,10 +27547,10 @@
0x5C024505,3,1,0x57127389,0,0=0x5C024505,3,1,0x5712739A,0,0; missing_paths
0x5C024505,1,0,0x57127389,2,1=0x5C024505,1,0,0x5712739A,2,1; missing_paths
;-STR Side-
0x5d302000,0,0,0x5C024500,2,1=0x5d302000,0,0,0x5C024505,2,1
0x5d302000,3,0,0x5C024500,0,0=0x5d302000,3,0,0x5C024505,0,0
0x5d302000,0,0,0x5C024580,0,1=0x5d302000,0,0,0x5C024585,0,1
0x5d302000,3,0,0x5C024580,2,0=0x5d302000,3,0,0x5C024585,2,0
0x5d500100,0,0,0x5C024500,2,1=0x5d500100,0,0,0x5C024505,2,1
0x5d500100,3,0,0x5C024500,0,0=0x5d500100,3,0,0x5C024505,0,0
0x5d500100,0,0,0x5C024580,0,1=0x5d500100,0,0,0x5C024585,0,1
0x5d500100,3,0,0x5C024580,2,0=0x5d500100,3,0,0x5C024585,2,0
;Tile 2/4
0x5C024505,1,1,0x5C024580,1,1=0x5C024505,1,1,0x5C024585,1,1
0x5C024505,3,0,0x5C024580,3,0=0x5C024505,3,0,0x5C024585,3,0
Expand All @@ -27564,10 +27560,10 @@
0x5C024585,2,1,0x5C024580,0,1=0x5C024585,2,1,0x5C024585,0,1
0x5C024585,0,0,0x5C024580,2,0=0x5C024585,0,0,0x5C024585,2,0
;Diag
0x5C024505,2,0,0x03001a00,1,0=0x5C024505,2,0,0x5d302000,1,0
0x5C024505,2,0,0x5d540200,1,0=0x5C024505,2,0,0x5d302000,1,0
0x5C024505,0,1,0x03001a00,2,0=0x5C024505,0,1,0x5d302000,2,0
0x5C024505,0,1,0x5d540200,2,0=0x5C024505,0,1,0x5d302000,2,0
0x5C024505,2,0,0x03001a00,1,0=0x5C024505,2,0,0x5d500100,1,0
0x5C024505,2,0,0x5d540200,1,0=0x5C024505,2,0,0x5d500100,1,0
0x5C024505,0,1,0x03001a00,2,0=0x5C024505,0,1,0x5d500100,2,0
0x5C024505,0,1,0x5d540200,2,0=0x5C024505,0,1,0x5d500100,2,0
;--Ground Light Rail 1 (47a)--
0x5C020000,1,0,0x5f882100,1,0=0x5C020000,1,0,0x5C024780,1,0
0x5C020000,3,0,0x5f882100,3,1=0x5C020000,3,0,0x5C024780,3,1
Expand Down Expand Up @@ -31886,9 +31882,9 @@
;-STR Side-
0x5D500100,3,0,0x5C02A500,1,0=0x5D500100,3,0,0x5C02A505,1,0
0x5D500100,0,0,0x5C02A500,3,1=0x5D500100,0,0,0x5C02A505,3,1
0x5C02A505,3,0,0x03001a00,1,0=0x5C02A505,3,0,0x5d302000,1,0
0x5C02A505,3,0,0x03001a00,1,0=0x5C02A505,3,0,0x5d500100,1,0
0x5C02A505,3,0,0x5d540100,1,0=0x5C02A505,3,0,0x5d500100,1,0
0x5C02A505,1,1,0x03001a00,2,0=0x5C02A505,1,1,0x5d302000,2,0
0x5C02A505,1,1,0x03001a00,2,0=0x5C02A505,1,1,0x5d500100,2,0
0x5C02A505,1,1,0x5d540100,2,0=0x5C02A505,1,1,0x5d500100,2,0
;--Ground Light Rail (A7a)--
0x5C020200,0,0,0x5f882600,3,0=0x5C020200,0,0,0x5C02A780,0,0
Expand Down
32 changes: 14 additions & 18 deletions Controller/RUL2/06_Road_Viaducts/Sec6b_L2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11497,8 +11497,6 @@
;> L0 RHW-8C
;> L1 MIS
;from STR side
0x5D302000,0,0,0x5C034500,2,1=0x5D302000,0,0,0x5C034505,2,1
0x5D302000,3,0,0x5C034500,0,0=0x5D302000,3,0,0x5C034505,0,0
0x5D500100,0,0,0x5C034500,2,1=0x5D500100,0,0,0x5C034505,2,1
0x5D500100,3,0,0x5C034500,0,0=0x5D500100,3,0,0x5C034505,0,0
;
Expand All @@ -11507,8 +11505,8 @@
;
0x5C034505,2,0,0x5D540100,1,0=0x5C034505,2,0,0x5D500100,1,0
0x5C034505,0,1,0x5D540100,2,0=0x5C034505,0,1,0x5D500100,2,0
0x5C034505,2,0,0x03001A00,1,0=0x5C034505,2,0,0x5D302000,1,0
0x5C034505,0,1,0x03001A00,2,0=0x5C034505,0,1,0x5D302000,2,0
0x5C034505,2,0,0x03001A00,1,0=0x5C034505,2,0,0x5D500100,1,0
0x5C034505,0,1,0x03001A00,2,0=0x5C034505,0,1,0x5D500100,2,0
;----Light Rail (47)----
;Elevated Light Rail (47-2)
0x5C030000,1,0,0x08DD1600,1,1=0x5C030000,1,0,0x5C034720,3,0
Expand Down Expand Up @@ -15136,8 +15134,6 @@
;> L0 RHW-8C
;> L1 MIS
;from STR side
0x5D302000,0,0,0x5C044500,2,1=0x5D302000,0,0,0x5C044505,2,1
0x5D302000,3,0,0x5C044500,0,0=0x5D302000,3,0,0x5C044505,0,0
0x5D500100,0,0,0x5C044500,2,1=0x5D500100,0,0,0x5C044505,2,1
0x5D500100,3,0,0x5C044500,0,0=0x5D500100,3,0,0x5C044505,0,0
;
Expand All @@ -15146,8 +15142,8 @@
;
0x5C044505,2,0,0x5D540100,1,0=0x5C044505,2,0,0x5D500100,1,0
0x5C044505,0,1,0x5D540100,2,0=0x5C044505,0,1,0x5D500100,2,0
0x5C044505,2,0,0x09301A00,1,0=0x5C044505,2,0,0x5D302000,1,0; missing_paths
0x5C044505,0,1,0x09301A00,2,0=0x5C044505,0,1,0x5D302000,2,0; missing_paths
0x5C044505,2,0,0x09301A00,1,0=0x5C044505,2,0,0x5D500100,1,0; missing_paths
0x5C044505,0,1,0x09301A00,2,0=0x5C044505,0,1,0x5D500100,2,0; missing_paths
;----Light Rail (47)----
;Elevated Light Rail (47-2)
0x5C040000,1,0,0x091D1600,1,1=0x5C040000,1,0,0x5C044720,3,0
Expand Down Expand Up @@ -19549,10 +19545,10 @@
0x5C054505,3,1,0x57227389,0,0=0x5C054505,3,1,0x572273AA,0,0; missing_paths
0x5C054505,1,0,0x57227389,2,1=0x5C054505,1,0,0x572273AA,2,1; missing_paths
;-STR Side-
0x5d302000,0,0,0x5C054500,2,1=0x5d302000,0,0,0x5C054505,2,1
0x5d302000,3,0,0x5C054500,0,0=0x5d302000,3,0,0x5C054505,0,0
0x5d302000,0,0,0x5C054580,0,1=0x5d302000,0,0,0x5C054585,0,1
0x5d302000,3,0,0x5C054580,2,0=0x5d302000,3,0,0x5C054585,2,0
0x5d500100,0,0,0x5C054500,2,1=0x5d500100,0,0,0x5C054505,2,1
0x5d500100,3,0,0x5C054500,0,0=0x5d500100,3,0,0x5C054505,0,0
0x5d500100,0,0,0x5C054580,0,1=0x5d500100,0,0,0x5C054585,0,1
0x5d500100,3,0,0x5C054580,2,0=0x5d500100,3,0,0x5C054585,2,0
;Tile 2/4
0x5C054505,1,1,0x5C054580,1,1=0x5C054505,1,1,0x5C054585,1,1
0x5C054505,3,0,0x5C054580,3,0=0x5C054505,3,0,0x5C054585,3,0
Expand All @@ -19562,10 +19558,10 @@
0x5C054585,2,1,0x5C054580,0,1=0x5C054585,2,1,0x5C054585,0,1
0x5C054585,0,0,0x5C054580,2,0=0x5C054585,0,0,0x5C054585,2,0
;Diag
0x5C054505,2,0,0x03001a00,1,0=0x5C054505,2,0,0x5d302000,1,0
0x5C054505,2,0,0x5d540200,1,0=0x5C054505,2,0,0x5d302000,1,0
0x5C054505,0,1,0x03001a00,2,0=0x5C054505,0,1,0x5d302000,2,0
0x5C054505,0,1,0x5d540200,2,0=0x5C054505,0,1,0x5d302000,2,0
0x5C054505,2,0,0x03001a00,1,0=0x5C054505,2,0,0x5d500100,1,0
0x5C054505,2,0,0x5d540200,1,0=0x5C054505,2,0,0x5d500100,1,0
0x5C054505,0,1,0x03001a00,2,0=0x5C054505,0,1,0x5d500100,2,0
0x5C054505,0,1,0x5d540200,2,0=0x5C054505,0,1,0x5d500100,2,0
;--Ground Light Rail 1 (47a)--
0x5C050000,1,0,0x5f882100,1,0=0x5C050000,1,0,0x5C054780,1,0
0x5C050000,3,0,0x5f882100,3,1=0x5C050000,3,0,0x5C054780,3,1
Expand Down Expand Up @@ -23936,9 +23932,9 @@
;-STR Side-
0x5D500100,3,0,0x5C05A500,1,0=0x5D500100,3,0,0x5C05A505,1,0
0x5D500100,0,0,0x5C05A500,3,1=0x5D500100,0,0,0x5C05A505,3,1
0x5C05A505,3,0,0x03001a00,1,0=0x5C05A505,3,0,0x5d302000,1,0
0x5C05A505,3,0,0x03001a00,1,0=0x5C05A505,3,0,0x5d500100,1,0
0x5C05A505,3,0,0x5d540100,1,0=0x5C05A505,3,0,0x5d500100,1,0
0x5C05A505,1,1,0x03001a00,2,0=0x5C05A505,1,1,0x5d302000,2,0
0x5C05A505,1,1,0x03001a00,2,0=0x5C05A505,1,1,0x5d500100,2,0
0x5C05A505,1,1,0x5d540100,2,0=0x5C05A505,1,1,0x5d500100,2,0
;--Ground Light Rail (A7a)--
0x5C050200,0,0,0x5f882600,3,0=0x5C050200,0,0,0x5C05A780,0,0
Expand Down
Loading