Skip to content

Commit dba8d73

Browse files
memo33memo33
committed
add new dedicated Avenue FLEX-OSTs
1 parent fce2c28 commit dba8d73

7 files changed

Lines changed: 253 additions & 1 deletion

File tree

‎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/RUL0/7000_Road_NWM/7F00_ElevatedViaducts.txt‎

Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ AddTypes = 7F09, 17F09, 27F09, 37F09, 47F09, 57F09, 67F09, 77F09, 87F09, 97F09,
2020
AddTypes = 7F10, 17F10, 27F10, 37F10, 47F10, 57F10, 67F10, 77F10, 87F10, 97F10, A7F10, B7F10, C7F10, D7F10, E7F10, F7F10 ;Road 1-Level FLEX-HT Diag
2121
AddTypes = 7F11, 17F11, 27F11, 37F11, 47F11, 57F11, 67F11, 77F11, 87F11, 97F11, A7F11, B7F11, C7F11, D7F11, E7F11, F7F11 ;One-Way Road 1-Level FLEX-HT Diag
2222
AddTypes = 7F12, 17F12, 27F12, 37F12, 47F12, 57F12, 67F12, 77F12, 87F12, 97F12, A7F12, B7F12, C7F12, D7F12, E7F12, F7F12 ;Avenue 1-Level FLEX-HT Diag
23+
AddTypes = 7F17, 17F17, 27F17, 37F17, 47F17, 57F17, 67F17, 77F17, 87F17, 97F17, A7F17, B7F17, C7F17, D7F17, E7F17, F7F17 ;Avenue 1-Level FLEX-OST
24+
AddTypes = 7F18, 17F18, 27F18, 37F18, 47F18, 57F18, 67F18, 77F18, 87F18, 97F18, A7F18, B7F18, C7F18, D7F18, E7F18, F7F18 ;Avenue 2-Level FLEX-OST
2325

2426
;FLEX Road Viaduct Overpasses BUTTON SECTION
2527
RotationRing = 7F30, 17F30, 27F30, 37F30, 47F30, 57F30, 67F30, 77F30, 87F30, 97F30, A7F30, B7F30, C7F30, D7F30, E7F30, F7F30 ;Road FLEX Ortho Overpass
@@ -1206,6 +1208,151 @@ CopyFrom = 0x67F12
12061208
CopyFrom = 0x77F12
12071209

12081210

1211+
[HighwayIntersectionInfo_0x00007F17]
1212+
;Added by memo 2023-07-03
1213+
;Avenue FLEXSlope-L1
1214+
Piece = 48.0, 0.0, 1, 0, 0x5700002f
1215+
PreviewEffect = preview_ost_orth_alt_flex_001
1216+
1217+
CellLayout=........
1218+
CellLayout=...DA...
1219+
CellLayout=..bda..<
1220+
CellLayout=..^.....
1221+
1222+
CheckType = A - avenue: 0x04040004 dirtroad: 0x00020001, 0x00000000 optional
1223+
CheckType = a - avenue: 0x00040404 dirtroad: 0x00020003, 0x00000000 optional
1224+
CheckType = b - avenue: 0x04040404
1225+
CheckType = d - avenue: 0x00040404, 0x000000FF optional
1226+
CheckType = D - avenue: 0x04040004, 0x000000FF optional
1227+
1228+
ConsLayout=........
1229+
ConsLayout=........
1230+
ConsLayout=..+....<
1231+
ConsLayout=..^.....
1232+
1233+
AutoTileBase = 0x55387000
1234+
PlaceQueryID = 0x5C08000F
1235+
Costs = 1200
1236+
1237+
[HighwayIntersectionInfo_0x00017F17]
1238+
CopyFrom = 0x7F17
1239+
Rotate = 1
1240+
1241+
[HighwayIntersectionInfo_0x00027F17]
1242+
; Avenue FLEXSlope-L1 (rotated by 180 degrees)
1243+
; Added by memo 2023-07-03
1244+
; Having a dedicated 180-degree rotation has the advantage that we can use an
1245+
; ordinary orthogonal tile adjacent to the On-Slope Transition which overall
1246+
; behaves more intuitively than the 0x00040004 tile.
1247+
Piece = -48.0, 0.0, 3, 0, 0x5700002f
1248+
PreviewEffect = preview_ost_orth_alt_flex_001
1249+
1250+
CellLayout=........
1251+
CellLayout=..DA.b.<
1252+
CellLayout=..da....
1253+
CellLayout=.....^..
1254+
1255+
CheckType = A - avenue: 0x04040004 dirtroad: 0x00030002, 0x00000000 optional
1256+
CheckType = a - avenue: 0x00040404 dirtroad: 0x00010002, 0x00000000 optional
1257+
CheckType = b - avenue: 0x04040404
1258+
CheckType = d - avenue: 0x00040404, 0x000000FF optional
1259+
CheckType = D - avenue: 0x04040004, 0x000000FF optional
1260+
1261+
ConsLayout=........
1262+
ConsLayout=.....+.<
1263+
ConsLayout=........
1264+
ConsLayout=.....^..
1265+
1266+
AutoTileBase = 0x55387000
1267+
PlaceQueryID = 0x5C08000F
1268+
Costs = 1200
1269+
1270+
[HighwayIntersectionInfo_0x00037F17]
1271+
CopyFrom = 0x27F17
1272+
Rotate = 1
1273+
[HighwayIntersectionInfo_0x00047F17]
1274+
CopyFrom = 0x7F17
1275+
[HighwayIntersectionInfo_0x00057F17]
1276+
CopyFrom = 0x17F17
1277+
[HighwayIntersectionInfo_0x00067F17]
1278+
CopyFrom = 0x27F17
1279+
[HighwayIntersectionInfo_0x00077F17]
1280+
CopyFrom = 0x37F17
1281+
1282+
1283+
[HighwayIntersectionInfo_0x00007F18]
1284+
;Added by memo 2023-07-03
1285+
;Avenue FLEXSlope-L2
1286+
Piece = 48.0, 0.0, 1, 0, 0x5700002f
1287+
PreviewEffect = preview_ost_orth_alt_flex_002
1288+
1289+
CellLayout=........
1290+
CellLayout=...DA...
1291+
CellLayout=..bda..<
1292+
CellLayout=..^.....
1293+
1294+
CheckType = A - avenue: 0x04040004 dirtroad: 0x00010002, 0x00000000 optional
1295+
CheckType = a - avenue: 0x00040404 dirtroad: 0x00030002, 0x00000000 optional
1296+
CheckType = b - avenue: 0x04040404
1297+
CheckType = d - avenue: 0x00040404, 0x000000FF optional
1298+
CheckType = D - avenue: 0x04040004, 0x000000FF optional
1299+
1300+
ConsLayout=........
1301+
ConsLayout=........
1302+
ConsLayout=..+....<
1303+
ConsLayout=..^.....
1304+
1305+
AutoTileBase = 0x55387000
1306+
PlaceQueryID = 0x5C08010F
1307+
Costs = 1200
1308+
1309+
[HighwayIntersectionInfo_0x00017F18]
1310+
CopyFrom = 0x7F18
1311+
Rotate = 1
1312+
1313+
[HighwayIntersectionInfo_0x00027F18]
1314+
; Avenue FLEXSlope-L2 (rotated by 180 degrees)
1315+
; Added by memo 2023-07-03
1316+
; Having a dedicated 180-degree rotation has the advantage that we can use an
1317+
; ordinary orthogonal tile adjacent to the On-Slope Transition which overall
1318+
; behaves more intuitively than the 0x00040004 tile.
1319+
Piece = -48.0, 0.0, 3, 0, 0x5700002f
1320+
PreviewEffect = preview_ost_orth_alt_flex_002
1321+
1322+
CellLayout=........
1323+
CellLayout=..DA.b.<
1324+
CellLayout=..da....
1325+
CellLayout=.....^..
1326+
1327+
CheckType = A - avenue: 0x04040004 dirtroad: 0x00020003, 0x00000000 optional
1328+
CheckType = a - avenue: 0x00040404 dirtroad: 0x00020001, 0x00000000 optional
1329+
CheckType = b - avenue: 0x04040404
1330+
CheckType = d - avenue: 0x00040404, 0x000000FF optional
1331+
CheckType = D - avenue: 0x04040004, 0x000000FF optional
1332+
1333+
ConsLayout=........
1334+
ConsLayout=.....+.<
1335+
ConsLayout=........
1336+
ConsLayout=.....^..
1337+
1338+
AutoTileBase = 0x55387000
1339+
PlaceQueryID = 0x5C08010F
1340+
Costs = 1200
1341+
1342+
[HighwayIntersectionInfo_0x00037F18]
1343+
CopyFrom = 0x27F18
1344+
Rotate = 1
1345+
[HighwayIntersectionInfo_0x00047F18]
1346+
CopyFrom = 0x7F18
1347+
[HighwayIntersectionInfo_0x00057F18]
1348+
CopyFrom = 0x17F18
1349+
[HighwayIntersectionInfo_0x00067F18]
1350+
CopyFrom = 0x27F18
1351+
[HighwayIntersectionInfo_0x00077F18]
1352+
CopyFrom = 0x37F18
1353+
1354+
1355+
12091356
;;Road Puzzle Pieces
12101357
;;Effect Preview line usage upto
12111358
;;PreviewEffect = preview_road_puzzlepiece044

‎Controller/RUL1/01_Road/05_Road_Avenue.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ TYPE2=0x02000200,0x04020002,0x04008900,1,0
77
TYPE3=0x00020002,0x02000204,0x04008900,2,0
88
TYPE4=0x00020002,0x02040200,0x04008900,0,0
99
;
10+
; crossing adjacent to avenue on-slope transition
11+
TYPE1=0x02000200,0x00040404,0x04008900,3,0
12+
TYPE2=0x02000200,0x04040004,0x04008900,1,0
13+
TYPE3=0x00020002,0x04000404,0x04008900,2,0
14+
TYPE4=0x00020002,0x04040400,0x04008900,0,0
15+
;
1016
;piece 88
1117
;
1218
TYPE1=0x00000200,0x00020402,0x04008800,1,0

‎Controller/RUL1/04_Street/05_Street_Avenue.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,12 @@ TYPE2=0x02000200,0x04020002,0x04008300,3,0
6969
TYPE3=0x00020002,0x02000204,0x04008300,0,0
7070
TYPE4=0x00020002,0x02040200,0x04008300,2,0
7171
;
72+
; crossing adjacent to avenue on-slope transition
73+
TYPE1=0x02000200,0x00040404,0x04008300,1,0
74+
TYPE2=0x02000200,0x04040004,0x04008300,3,0
75+
TYPE3=0x00020002,0x04000404,0x04008300,0,0
76+
TYPE4=0x00020002,0x04040400,0x04008300,2,0
77+
;
7278
;piece 88
7379
;
7480
TYPE1=0x00000200,0x00020402,0x04008600,1,0

‎Controller/RUL1/05_Avenue/08_Avenue_OneWayRoad.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ TYPE1=0x00020402,0x02000200,0x091a8900,3,0
66
TYPE2=0x04020002,0x02000200,0x091a8900,1,0
77
TYPE3=0x02000204,0x00020002,0x091a8900,2,0
88
TYPE4=0x02040200,0x00020002,0x091a8900,0,0
9+
;
10+
; crossing adjacent to avenue on-slope transition
11+
TYPE1=0x00040404,0x02000200,0x091a8900,3,0
12+
TYPE2=0x04040004,0x02000200,0x091a8900,1,0
13+
TYPE3=0x04000404,0x00020002,0x091a8900,2,0
14+
TYPE4=0x04040400,0x00020002,0x091a8900,0,0
915
;
1016
;piece 88
1117
;

‎Controller/RUL1/05_Avenue/09_Avenue_Dirtroad.txt‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,35 @@ TYPE1=0x00020402,0x02000200,0x57001300,2,0
66
TYPE2=0x04020002,0x02000200,0x57001300,0,0
77
TYPE3=0x02000204,0x00020002,0x57001300,1,0
88
TYPE4=0x02040200,0x00020002,0x57001300,3,0
9-
;OnSlope
9+
;crossing adjacent to RHW OST
1010
TYPE1=0x00020402,0x04000400,0x57001300,2,0
1111
TYPE2=0x04020002,0x04000400,0x57001300,0,0
1212
TYPE3=0x02000204,0x00040004,0x57001300,1,0
1313
TYPE4=0x02040200,0x00040004,0x57001300,3,0
14+
;crossing adjacent to Avenue OST
15+
TYPE1=0x00040404,0x02000200,0x57001300,2,0
16+
TYPE2=0x04040004,0x02000200,0x57001300,0,0
17+
TYPE3=0x04000404,0x00020002,0x57001300,1,0
18+
TYPE4=0x04040400,0x00020002,0x57001300,3,0
19+
20+
; Avenue OnSlope Transition L1
21+
TYPE1=0x04040400,0x01000200,0x5C080000,0,0
22+
TYPE2=0x04040004,0x00020001,0x5C080000,1,0
23+
TYPE3=0x04000404,0x02000100,0x5C080000,2,0
24+
TYPE4=0x00040404,0x00010002,0x5C080000,3,0
25+
TYPE1=0x04040400,0x02000300,0x5C080000,2,1
26+
TYPE2=0x04040004,0x00030002,0x5C080000,1,1
27+
TYPE3=0x04000404,0x03000200,0x5C080000,0,1
28+
TYPE4=0x00040404,0x00020003,0x5C080000,3,1
29+
; Avenue OnSlope Transition L2
30+
TYPE1=0x04040400,0x02000100,0x5C080100,0,0
31+
TYPE2=0x04040004,0x00010002,0x5C080100,1,0
32+
TYPE3=0x04000404,0x01000200,0x5C080100,2,0
33+
TYPE4=0x00040404,0x00020001,0x5C080100,3,0
34+
TYPE1=0x04040400,0x03000200,0x5C080100,2,1
35+
TYPE2=0x04040004,0x00020003,0x5C080100,1,1
36+
TYPE3=0x04000404,0x02000300,0x5C080100,0,1
37+
TYPE4=0x00040404,0x00030002,0x5C080100,3,1
1438

1539
;
1640
;piece 88

‎ltext/puzzlepieces-viaducts.pot‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,20 @@ msgid ""
149149
"Drag the ONE-WAY ROAD network THROUGH the transition to use."
150150
msgstr ""
151151

152+
msgctxt "2026960B-2A592FD1-5C08000F"
153+
msgid ""
154+
"1-Level Avenue FLEX On-Slope Transition (works for L0-L1 or L1-L2)\n"
155+
"\n"
156+
"Drag the Avenue network through the transition."
157+
msgstr ""
158+
159+
msgctxt "2026960B-2A592FD1-5C08010F"
160+
msgid ""
161+
"2-Level Avenue FLEX On-Slope Transition (works for L0-L2)\n"
162+
"\n"
163+
"Drag the Avenue network through the transition."
164+
msgstr ""
165+
152166
msgctxt "2026960B-2A592FD1-5C080200"
153167
msgid ""
154168
"1-Level FLEX Avenue Ramp-Style Height Transition (works for L0-L1 or L1-L2)\n"

0 commit comments

Comments
 (0)