Skip to content

Commit c4b2d50

Browse files
committed
re-enable orthogonal FLEX OST for HRW using new falsies
The diagonal ones are too broken currently to enable (orientation issues between RUL2, models, paths and T21s).
1 parent abc1a41 commit c4b2d50

3 files changed

Lines changed: 34 additions & 237 deletions

File tree

Controller/RUL0/C000_Monorail/CE00_HybridRailway_L1_Pieces.txt

Lines changed: 17 additions & 220 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
;DUALNETWORKING ELEVATED SECTION
44
; 0xCE##
55
RotationRing = CE00, 1CE00, 2CE00, 3CE00, 4CE00, 5CE00, 6CE00, 7CE00, 8CE00, 9CE00, ACE00, BCE00, CCE00, DCE00, ECE00, FCE00 ;HRW-FLEX HT 7.5m [L1]
6-
;AddTypes = CE01, 1CE01, 2CE01, 3CE01, 4CE01, 5CE01, 6CE01, 7CE01, 8CE01, 9CE01, ACE01, BCE01, CCE01, DCE01, ECE01, FCE01 ;HRW-FLEX OST Orthogonal [L1]
6+
AddTypes = CE01, 1CE01, 2CE01, 3CE01, 4CE01, 5CE01, 6CE01, 7CE01, 8CE01, 9CE01, ACE01, BCE01, CCE01, DCE01, ECE01, FCE01 ;HRW-FLEX OST Orthogonal [L1]
77
;AddTypes = CE02, 1CE02, 2CE02, 3CE02, 4CE02, 5CE02, 6CE02, 7CE02, 8CE02, 9CE02, ACE02, BCE02, CCE02, DCE02, ECE02, FCE02 ;HRW-FLEX OST Diagonal [L1]
8-
;AddTypes = CE03, 1CE03, 2CE03, 3CE03, 4CE03, 5CE03, 6CE03, 7CE03, 8CE03, 9CE03, ACE03, BCE03, CCE03, DCE03, ECE03, FCE03 ;HRW-FLEX OST Orthogonal [L2]
8+
AddTypes = CE03, 1CE03, 2CE03, 3CE03, 4CE03, 5CE03, 6CE03, 7CE03, 8CE03, 9CE03, ACE03, BCE03, CCE03, DCE03, ECE03, FCE03 ;HRW-FLEX OST Orthogonal [L2]
99
;AddTypes = CE04, 1CE04, 2CE04, 3CE04, 4CE04, 5CE04, 6CE04, 7CE04, 8CE04, 9CE04, ACE04, BCE04, CCE04, DCE04, ECE04, FCE04 ;HRW-FLEX OST Diagonal [L2]
1010
AddTypes = CE05, 1CE05, 2CE05, 3CE05, 4CE05, 5CE05, 6CE05, 7CE05, 8CE05, 9CE05, ACE05, BCE05, CCE05, DCE05, ECE05, FCE05 ;HRW S1 X S1 - HRW OxD-STR-DTR-L1
1111
;AddTypes = CE06, 1CE06, 2CE06, 3CE06, 4CE06, 5CE06, 6CE06, 7CE06, 8CE06, 9CE06, ACE06, BCE06, CCE06, DCE06, ECE06, FCE06 ;HRW OxD-STR-DTR-L1
1212
;AddTypes = CE07, 1CE07, 2CE07, 3CE07, 4CE07, 5CE07, 6CE07, 7CE07, 8CE07, 9CE07, ACE07, BCE07, CCE07, DCE07, ECE07, FCE07 ;HRW <Open>
13-
AddTypes = CE08, 1CE08, 2CE08, 3CE08, 4CE08, 5CE08, 6CE08, 7CE08, 8CE08, 9CE08, ACE08, BCE08, CCE08, DCE08, ECE08, FCE08 ;HRW Orthogonal OST Puzzle Piece (L0-L1)/(L0-L2)
13+
;AddTypes = CE08, 1CE08, 2CE08, 3CE08, 4CE08, 5CE08, 6CE08, 7CE08, 8CE08, 9CE08, ACE08, BCE08, CCE08, DCE08, ECE08, FCE08 ;HRW Orthogonal OST Puzzle Piece (L0-L1)/(L0-L2)
1414
AddTypes = CE09, 1CE09, 2CE09, 3CE09, 4CE09, 5CE09, 6CE09, 7CE09, 8CE09, 9CE09, ACE09, BCE09, CCE09, DCE09, ECE09, FCE09 ;HRW Diagonal OST Puzzle Piece (L0-L1)/(L0-L2)
1515
;AddTypes = CE0A, 1CE0A, 2CE0A, 3CE0A, 4CE0A, 5CE0A, 6CE0A, 7CE0A, 8CE0A, 9CE0A, ACE0A, BCE0A, CCE0A, DCE0A, ECE0A, FCE0A ;HRW Orthogonal/Diagonal OST Puzzle Piece (L1/L2)
1616

@@ -165,20 +165,14 @@ PreviewEffect = preview_ost_orth_alt_flex_001
165165
CellLayout = ........
166166
CellLayout = ..a.....
167167
CellLayout = ..b.....
168-
CellLayout = ..Y.....
168+
CellLayout = ..a.....
169169
CellLayout = ..X....<
170170
CellLayout = ..^.....
171171

172172
;senw
173-
CheckType = X - rail: 0x00000000 monorail: 0x00000000
174-
CheckType = Y - monorail: 0x00000000 rail: 0x02000000 optional
175-
CheckType = a - monorail: 0x00000000 rail: 0x02000000, 0x00000000 optional
176-
;CheckType = b - dirtroad: 0x02000200 monorail: 0x04000404, 0x00000000 optional
177-
;Test by Tarkus 8 Aug 2020
178-
;CheckType = b - monorail: 0x04000404 rail: 0x02000000, 0x00000000 optional
179-
CheckType = b - monorail: 0x00000000 rail: 0x00040000, 0x00000000 optional
180-
;CheckType = c - monorail: 0x00010003 rail: 0x02000000, 0xFF000000 optional
181-
;CheckType = c - monorail: 0x04000000 rail: 0x00040004, 0xFFFF00FF optional
173+
CheckType = X - rail: 0x02000200 monorail: 0x00000000
174+
CheckType = a - monorail: 0x00000000 rail: 0x02000200, 0x00000000 optional
175+
CheckType = b - monorail: 0x04020403 rail: 0x02040204, 0x00000000 optional
182176

183177
ConsLayout = ........
184178
ConsLayout = ........
@@ -202,38 +196,7 @@ Rotate = 2
202196
CopyFrom = 0xCE01
203197
Rotate = 3
204198
[HighwayIntersectionInfo_0x0004CE01]
205-
Piece = 0.0, -48.0, 0, 0, 0x5700001f
206-
PreviewEffect = preview_ost_orth_alt_flex_001
207-
208-
CellLayout = ........
209-
CellLayout = ..a.....
210-
CellLayout = ..b.....
211-
CellLayout = ..Y.....
212-
CellLayout = ..X....<
213-
CellLayout = ..^.....
214-
215-
;senw
216-
CheckType = X - rail: 0x00000000 monorail: 0x00000000
217-
CheckType = Y - monorail: 0x00000000 rail: 0x02000000 optional
218-
CheckType = a - monorail: 0x00000000 rail: 0x00000200, 0x00000000 optional
219-
;CheckType = b - dirtroad: 0x02000200 monorail: 0x04000404, 0x00000000 optional
220-
;Test by Tarkus 8 Aug 2020
221-
;CheckType = b - monorail: 0x04000404 rail: 0x00000200, 0x00000000 optional
222-
CheckType = b - monorail: 0x00000000 rail: 0x00040000, 0x00000000 optional
223-
;CheckType = c - monorail: 0x00010003 rail: 0x02000000, 0xFF000000 optional
224-
225-
ConsLayout = ........
226-
ConsLayout = ........
227-
ConsLayout = ........
228-
ConsLayout = ........
229-
ConsLayout = ..+....<
230-
ConsLayout = ..^.....
231-
232-
AutoTileBase = 0x55387000
233-
ReplacementIntersection = 0, 0
234-
PlaceQueryID = 0x5dac000f
235-
Costs = 600
236-
199+
CopyFrom = 0xCE01
237200
[HighwayIntersectionInfo_0x0005CE01]
238201
CopyFrom = 0x4CE01
239202
Rotate = 1
@@ -243,41 +206,8 @@ Rotate = 2
243206
[HighwayIntersectionInfo_0x0007CE01]
244207
CopyFrom = 0x4CE01
245208
Rotate = 3
246-
247209
[HighwayIntersectionInfo_0x0008CE01]
248-
Piece = 0.0, -48.0, 0, 0, 0x5700001f
249-
PreviewEffect = preview_ost_orth_alt_flex_001
250-
251-
CellLayout = ........
252-
CellLayout = ..a.....
253-
CellLayout = ..b.....
254-
CellLayout = ..Y.....
255-
CellLayout = ..X....<
256-
CellLayout = ..^.....
257-
258-
;senw
259-
CheckType = X - rail: 0x00000000 monorail: 0x00000000
260-
CheckType = Y - monorail: 0x00000000 rail: 0x02000000 optional
261-
CheckType = a - monorail: 0x00000000 rail: 0x00040004, 0xFF000000 check
262-
;CheckType = b - dirtroad: 0x02000200 monorail: 0x04000404, 0x00000000 optional
263-
;Test by Tarkus 8 Aug 2020
264-
;CheckType = b - monorail: 0x04000404 rail: 0x02000000, 0x00000000 optional
265-
CheckType = b - monorail: 0x00000000 rail: 0x00040000, 0x00000000 optional
266-
;CheckType = c - monorail: 0x00010003 rail: 0x02000000, 0xFF000000 optional
267-
;CheckType = c - monorail: 0x04000000 rail: 0x00040004, 0xFFFF00FF optional
268-
269-
ConsLayout = ........
270-
ConsLayout = ........
271-
ConsLayout = ........
272-
ConsLayout = ........
273-
ConsLayout = ..+....<
274-
ConsLayout = ..^.....
275-
276-
AutoTileBase = 0x55387000
277-
ReplacementIntersection = 0, 0
278-
PlaceQueryID = 0x5dac000f
279-
Costs = 600
280-
210+
CopyFrom = 0xCE01
281211
[HighwayIntersectionInfo_0x0009CE01]
282212
CopyFrom = 0x8CE01
283213
Rotate = 1
@@ -288,38 +218,7 @@ Rotate = 2
288218
CopyFrom = 0x8CE01
289219
Rotate = 3
290220
[HighwayIntersectionInfo_0x000CCE01]
291-
Piece = 0.0, -48.0, 0, 0, 0x5700001f
292-
PreviewEffect = preview_ost_orth_alt_flex_001
293-
294-
CellLayout = ........
295-
CellLayout = ..a.....
296-
CellLayout = ..b.....
297-
CellLayout = ..Y.....
298-
CellLayout = ..X....<
299-
CellLayout = ..^.....
300-
301-
;senw
302-
CheckType = X - rail: 0x00000000 monorail: 0x00000000
303-
CheckType = Y - monorail: 0x00000000 rail: 0x02000000 optional
304-
CheckType = a - monorail: 0x00000000 rail: 0x00040004, 0xFF000000 check
305-
;CheckType = b - dirtroad: 0x02000200 monorail: 0x04000404, 0x00000000 optional
306-
;Test by Tarkus 8 Aug 2020
307-
;CheckType = b - monorail: 0x04000404 rail: 0x00000200, 0x00000000 optional
308-
CheckType = b - monorail: 0x00000000 rail: 0x00040000, 0x00000000 optional
309-
;CheckType = c - monorail: 0x00010003 rail: 0x02000000, 0xFF000000 optional
310-
311-
ConsLayout = ........
312-
ConsLayout = ........
313-
ConsLayout = ........
314-
ConsLayout = ........
315-
ConsLayout = ..+....<
316-
ConsLayout = ..^.....
317-
318-
AutoTileBase = 0x55387000
319-
ReplacementIntersection = 0, 0
320-
PlaceQueryID = 0x5dac000f
321-
Costs = 600
322-
221+
CopyFrom = 0xCE01
323222
[HighwayIntersectionInfo_0x000DCE01]
324223
CopyFrom = 0xCCE01
325224
Rotate = 1
@@ -672,20 +571,13 @@ PreviewEffect = preview_ost_orth_alt_flex_002
672571
CellLayout = ........
673572
CellLayout = ..a.....
674573
CellLayout = ..b.....
675-
CellLayout = ..Y.....
574+
CellLayout = ..a.....
676575
CellLayout = ..X....<
677576
CellLayout = ..^.....
678577

679-
;senw
680-
CheckType = X - rail: 0x00000000 monorail: 0x00000000
681-
CheckType = Y - monorail: 0x04000000 rail: 0x02000000, 0xFF000000 check
682-
CheckType = a - monorail: 0x00000000 rail: 0x02000000, 0x00000000 optional
683-
;CheckType = b - dirtroad: 0x02000200 monorail: 0x04000404, 0x00000000 optional
684-
;Test by Tarkus 8 Aug 2020
685-
;CheckType = b - monorail: 0x04000404 rail: 0x02000000, 0x00000000 optional
686-
CheckType = b - monorail: 0x00000000 rail: 0x00040000, 0x00000000 optional
687-
;CheckType = c - monorail: 0x00010003 rail: 0x02000000, 0xFF000000 optional
688-
;CheckType = c - monorail: 0x04000000 rail: 0x00040004, 0xFFFF00FF optional
578+
CheckType = X - rail: 0x02000200 monorail: 0x00000000
579+
CheckType = a - monorail: 0x00000000 rail: 0x02000200, 0x00000000 optional
580+
CheckType = b - monorail: 0x04010402 rail: 0x02040204, 0x00000000 optional
689581

690582
ConsLayout = ........
691583
ConsLayout = ........
@@ -709,38 +601,7 @@ Rotate = 2
709601
CopyFrom = 0xCE03
710602
Rotate = 3
711603
[HighwayIntersectionInfo_0x0004CE03]
712-
Piece = 0.0, -48.0, 0, 0, 0x5700002f
713-
PreviewEffect = preview_ost_orth_alt_flex_002
714-
715-
CellLayout = ........
716-
CellLayout = ..a.....
717-
CellLayout = ..b.....
718-
CellLayout = ..Y.....
719-
CellLayout = ..X....<
720-
CellLayout = ..^.....
721-
722-
;senw
723-
CheckType = X - rail: 0x00000000 monorail: 0x00000000
724-
CheckType = Y - monorail: 0x04000000 rail: 0x02000000, 0xFF000000 check
725-
CheckType = a - monorail: 0x00000000 rail: 0x00000200, 0x00000000 optional
726-
;CheckType = b - dirtroad: 0x02000200 monorail: 0x04000404, 0x00000000 optional
727-
;Test by Tarkus 8 Aug 2020
728-
;CheckType = b - monorail: 0x04000404 rail: 0x00000200, 0x00000000 optional
729-
CheckType = b - monorail: 0x00000000 rail: 0x00040000, 0x00000000 optional
730-
;CheckType = c - monorail: 0x00010003 rail: 0x02000000, 0xFF000000 optional
731-
732-
ConsLayout = ........
733-
ConsLayout = ........
734-
ConsLayout = ........
735-
ConsLayout = ........
736-
ConsLayout = ..+....<
737-
ConsLayout = ..^.....
738-
739-
AutoTileBase = 0x55387000
740-
ReplacementIntersection = 0, 0
741-
PlaceQueryID = 0x5dae000f
742-
Costs = 600
743-
604+
CopyFrom = 0xCE03
744605
[HighwayIntersectionInfo_0x0005CE03]
745606
CopyFrom = 0x4CE03
746607
Rotate = 1
@@ -750,41 +611,8 @@ Rotate = 2
750611
[HighwayIntersectionInfo_0x0007CE03]
751612
CopyFrom = 0x4CE03
752613
Rotate = 3
753-
754614
[HighwayIntersectionInfo_0x0008CE03]
755-
Piece = 0.0, -48.0, 0, 0, 0x5700002f
756-
PreviewEffect = preview_ost_orth_alt_flex_002
757-
758-
CellLayout = ........
759-
CellLayout = ..a.....
760-
CellLayout = ..b.....
761-
CellLayout = ..Y.....
762-
CellLayout = ..X....<
763-
CellLayout = ..^.....
764-
765-
;senw
766-
CheckType = X - rail: 0x00000000 monorail: 0x00000000
767-
CheckType = Y - monorail: 0x04000000 rail: 0x02000000, 0xFF000000 check
768-
CheckType = a - monorail: 0x00000000 rail: 0x00040004, 0xFF000000 check
769-
;CheckType = b - dirtroad: 0x02000200 monorail: 0x04000404, 0x00000000 optional
770-
;Test by Tarkus 8 Aug 2020
771-
;CheckType = b - monorail: 0x04000404 rail: 0x02000000, 0x00000000 optional
772-
CheckType = b - monorail: 0x00000000 rail: 0x00040000, 0x00000000 optional
773-
;CheckType = c - monorail: 0x00010003 rail: 0x02000000, 0xFF000000 optional
774-
;CheckType = c - monorail: 0x04000000 rail: 0x00040004, 0xFFFF00FF optional
775-
776-
ConsLayout = ........
777-
ConsLayout = ........
778-
ConsLayout = ........
779-
ConsLayout = ........
780-
ConsLayout = ..+....<
781-
ConsLayout = ..^.....
782-
783-
AutoTileBase = 0x55387000
784-
ReplacementIntersection = 0, 0
785-
PlaceQueryID = 0x5dae000f
786-
Costs = 600
787-
615+
CopyFrom = 0xCE03
788616
[HighwayIntersectionInfo_0x0009CE03]
789617
CopyFrom = 0x8CE03
790618
Rotate = 1
@@ -795,38 +623,7 @@ Rotate = 2
795623
CopyFrom = 0x8CE03
796624
Rotate = 3
797625
[HighwayIntersectionInfo_0x000CCE03]
798-
Piece = 0.0, -48.0, 0, 0, 0x5700002f
799-
PreviewEffect = preview_ost_orth_alt_flex_002
800-
801-
CellLayout = ........
802-
CellLayout = ..a.....
803-
CellLayout = ..b.....
804-
CellLayout = ..Y.....
805-
CellLayout = ..X....<
806-
CellLayout = ..^.....
807-
808-
;senw
809-
CheckType = X - rail: 0x00000000 monorail: 0x00000000
810-
CheckType = Y - monorail: 0x04000000 rail: 0x02000000, 0xFF000000 check
811-
CheckType = a - monorail: 0x00000000 rail: 0x00040004, 0xFF000000 check
812-
;CheckType = b - dirtroad: 0x02000200 monorail: 0x04000404, 0x00000000 optional
813-
;Test by Tarkus 8 Aug 2020
814-
;CheckType = b - monorail: 0x04000404 rail: 0x00000200, 0x00000000 optional
815-
CheckType = b - monorail: 0x00000000 rail: 0x00040000, 0x00000000 optional
816-
;CheckType = c - monorail: 0x00010003 rail: 0x02000000, 0xFF000000 optional
817-
818-
ConsLayout = ........
819-
ConsLayout = ........
820-
ConsLayout = ........
821-
ConsLayout = ........
822-
ConsLayout = ..+....<
823-
ConsLayout = ..^.....
824-
825-
AutoTileBase = 0x55387000
826-
ReplacementIntersection = 0, 0
827-
PlaceQueryID = 0x5dae000f
828-
Costs = 600
829-
626+
CopyFrom = 0xCE03
830627
[HighwayIntersectionInfo_0x000DCE03]
831628
CopyFrom = 0xCCE03
832629
Rotate = 1

Controller/RUL1/02_Rail/07_Rail_Monorail.txt

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -245,31 +245,33 @@ TYPE2=0x00020000,0x04000402,0x5da40005,1,0
245245
TYPE3=0x02000000,0x00040204,0x5da40005,2,0
246246
TYPE4=0x00000002,0x04020400,0x5da40005,3,0
247247
;
248-
;;Rail-E-DN-RealRailway Style-Orthogonal
248+
;;Rail-E-HRW-RealRailway Style-Orthogonal
249249
;TYPE1=0x04000400,0x00040004,0x5dac000a,0,0
250250
;TYPE2=0x00040004,0x04000400,0x5dac000a,1,0
251251
;
252-
;L1 Onslope DN
253-
;Test by Tarkus 8 Aug 2020
254-
TYPE1=0x00000200,0x04000404,0x5dac0f00,0,0
255-
;TYPE1=0x02000000,0x04000404,0x5dac0f00,0,0
256-
TYPE2=0x00000002,0x00040404,0x5dac0f00,1,0
257-
TYPE3=0x00000200,0x04040400,0x5dac0f00,2,0
258-
TYPE4=0x00000002,0x04040004,0x5dac0f00,3,0
259-
;TYPE4=0x00020000,0x04040004,0x5dac0f00,3,0
260-
;
261-
;L1 FLEXHeight DN
252+
;L1 Onslope HRW
253+
TYPE1=0x02040204,0x04020403,0x5dac0f00,0,0
254+
TYPE2=0x04020402,0x02040304,0x5dac0f00,1,0
255+
TYPE3=0x02040204,0x04030402,0x5dac0f00,2,0
256+
TYPE4=0x04020402,0x03040204,0x5dac0f00,3,0
257+
;L2 Onslope HRW
258+
TYPE1=0x02040204,0x04010402,0x5dae0f00,0,0
259+
TYPE2=0x04020402,0x01040204,0x5dae0f00,1,0
260+
TYPE3=0x02040204,0x04020401,0x5dae0f00,2,0
261+
TYPE4=0x04020402,0x02040104,0x5dae0f00,3,0
262+
;
263+
;L1 FLEXHeight HRW
262264
TYPE1=0x02000200,0x03000400,0x5dace000,0,0
263265
TYPE2=0x00020002,0x00040003,0x5dace000,1,0
264266
TYPE3=0x02000200,0x04000300,0x5dace000,2,0
265267
TYPE4=0x00020002,0x00030004,0x5dace000,3,0
266268
;
267-
;L1 Onslope DN Abutment (Half)
269+
;L1 Onslope HRW Abutment (Half)
268270
TYPE1=0x02000000,0x00010003,0x5da40200,0,0
269271
TYPE2=0x00000002,0x01000300,0x5da40200,1,0
270272
TYPE3=0x00000200,0x00030001,0x5da40200,2,0
271273
TYPE4=0x00020000,0x03000100,0x5da40200,3,0
272-
;L1 Onslope DN Abutment (Full)
274+
;L1 Onslope HRW Abutment (Full)
273275
TYPE1=0x02000200,0x00010003,0x5da40000,0,0
274276
TYPE2=0x00020002,0x01000300,0x5da40000,1,0
275277
TYPE3=0x02000200,0x00030001,0x5da40000,2,0

Controller/RUL2/13_DualNetworking/Sec13j_DualNetworking_L2.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33
;====== DualNetworking(Rail MonoRail Elevated L2)==========
44
;==========================================================
55
;
6-
0x5daef000,3,0,0x5dac0f00,1,0=0x5daef000,3,0,0x5dae0005,1,0
7-
0x5daef000,1,0,0x5dac0f00,1,0=0x5daef000,3,0,0x5dae0005,1,0
6+
0x5da40000,3,0,0x5dae0f00,1,0=0x5da40000,3,0,0x5dae0005,1,0
7+
0x5da40000,1,0,0x5dae0f00,1,0=0x5da40000,1,0,0x5dae0005,1,0
88
;-DN-Style
99
;(L1-Onslope) Monorail
1010
0x5dae0005,1,0,0x5da40200,3,0=0x5dae0005,1,0,0x5dae0000,3,0
1111
0x5dae0005,1,0,0x5da40200,1,0=0x5dae0005,1,0,0x5dae0000,1,0
12-
0x5dae0005,1,0,0x5da40000,1,0=0x5dae0005,1,0,0x5dae0000,1,0
13-
0x5dae0005,1,0,0x5da40200,3,0=0x5dae0005,1,0,0x5dae0000,3,0
1412
;Continue
1513
0x5dae0005,1,0,0x5da40000,1,0=0x5dae0005,1,0,0x5dae0000,1,0
1614
0x5dae0005,1,0,0x5da40000,3,0=0x5dae0005,1,0,0x5dae0000,3,0

0 commit comments

Comments
 (0)