Skip to content

Commit 86f36ee

Browse files
authored
Merge pull request #529 from NAMTeam/onslope-viaducts
new OST implementation for road viaducts
2 parents abb3419 + 3d711f6 commit 86f36ee

25 files changed

Lines changed: 711 additions & 2025 deletions

Controller/INRULs/AvenueAdvanced/Intersections.rul

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,3 +308,52 @@
308308
2,3,1,0,0,3
309309
3,0,0x04001000,3,1
310310
3,3,0x04004200,0,0
311+
312+
; Avenue FLEX-OST (adjacent tile)
313+
1,4,4,4,0
314+
3,0,0x04006100,3,0
315+
1,0,4,4,4
316+
3,0,0x04006100,0,0
317+
1,4,0,4,4
318+
3,0,0x04006100,1,0
319+
1,4,4,0,4
320+
3,0,0x04006100,2,0
321+
;
322+
; OxO crossing adjacent to Avenue FLEX-OST
323+
;
324+
1,4,4,4,2
325+
2,3,4,2,4,4
326+
2,4,4,2,2,4
327+
2,5,4,4,2,2
328+
3,0,0x04009000,0,0
329+
3,3,0x04009000,1,0
330+
3,4,0x04009000,2,0
331+
3,5,0x04009000,3,0
332+
;
333+
1,2,4,4,4
334+
2,5,4,4,2,4
335+
2,6,4,4,2,2
336+
2,7,2,4,4,2
337+
3,0,0x04009000,1,0
338+
3,5,0x04009000,2,0
339+
3,6,0x04009000,3,0
340+
3,7,0x04009000,0,0
341+
;
342+
1,4,2,4,4
343+
2,1,2,2,4,4
344+
2,7,4,4,4,2
345+
2,8,2,4,4,2
346+
3,0,0x04009000,2,0
347+
3,1,0x04009000,1,0
348+
3,7,0x04009000,3,0
349+
3,8,0x04009000,0,0
350+
;
351+
1,4,4,2,4
352+
2,1,2,4,4,4
353+
2,2,2,2,4,4
354+
2,3,4,2,2,4
355+
3,0,0x04009000,3,0
356+
3,1,0x04009000,0,0
357+
3,2,0x04009000,1,0
358+
3,3,0x04009000,2,0
359+
;

Controller/INRULs/OnewayroadBasic/RUL11_OWR_Basic.rul

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -828,4 +828,14 @@
828828
3,0,0x00000100,0,0
829829
1,4,0,0,0
830830
3,0,0x00000100,1,0
831+
;
832+
; tiles adjacent to on-slope transitions
833+
1,0,4,0,4
834+
3,0,0x09004B00,0,0
835+
1,4,0,4,0
836+
3,0,0x09004B00,1,0
837+
1,2,4,2,4
838+
3,0,0x09020700,0,0
839+
1,4,2,4,2
840+
3,0,0x09020700,0,0
831841
;

Controller/INRULs/OnewayroadBasic/RUL11_OWR_Basic_memoOWRArrowReduction.rul

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -851,3 +851,14 @@
851851
3,0,0x09040E00,0,1
852852
1,13,13,13,13
853853
3,0,0x09040D00,0,1
854+
;
855+
; tiles adjacent to on-slope transitions
856+
1,0,4,0,4
857+
3,0,0x09004B00,0,0
858+
1,4,0,4,0
859+
3,0,0x09004B00,1,0
860+
1,2,4,2,4
861+
3,0,0x09020700,0,0
862+
1,4,2,4,2
863+
3,0,0x09020700,0,0
864+
;

Controller/INRULs/RoadBasic/RUL07_Road_Basic.rul

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,3 +1266,9 @@
12661266
3,0,0x5f098B00,1,1
12671267

12681268

1269+
; crossing adjacent to road on-slope transition
1270+
1,02,04,02,04
1271+
3,0,0x00020700,0,0
1272+
1,04,02,04,02
1273+
3,0,0x00020700,0,0
1274+
;

0 commit comments

Comments
 (0)