Skip to content

Commit c229e8e

Browse files
committed
add new dedicated Road FLEX-OSTs
1 parent e41eb76 commit c229e8e

6 files changed

Lines changed: 177 additions & 4 deletions

File tree

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+
;

Controller/RUL0/7000_Road_NWM/7F00_ElevatedViaducts.txt

Lines changed: 134 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@ AddTypes = 7F0A, 17F0A, 27F0A, 37F0A, 47F0A, 57F0A, 67F0A, 77F0A, 87F0A, 97F0A,
1515
AddTypes = 7F0B, 17F0B, 27F0B, 37F0B, 47F0B, 57F0B, 67F0B, 77F0B, 87F0B, 97F0B, A7F0B, B7F0B, C7F0B, D7F0B, E7F0B, F7F0B ;One-Way Road 2-Level FLEX-HT
1616
AddTypes = 7F0C, 17F0C, 27F0C, 37F0C, 47F0C, 57F0C, 67F0C, 77F0C, 87F0C, 97F0C, A7F0C, B7F0C, C7F0C, D7F0C, E7F0C, F7F0C ;Avenue 1-Level FLEX-HT
1717
AddTypes = 7F0D, 17F0D, 27F0D, 37F0D, 47F0D, 57F0D, 67F0D, 77F0D, 87F0D, 97F0D, A7F0D, B7F0D, C7F0D, D7F0D, E7F0D, F7F0D ;Avenue 2-Level FLEX-HT
18-
AddTypes = 7F08, 17F08, 27F08, 37F08, 47F08, 57F08, 67F08, 77F08, 87F08, 97F08, A7F08, B7F08, C7F08, D7F08, E7F08, F7F08 ;All-Roadway 1-Level FLEX-OST
19-
AddTypes = 7F09, 17F09, 27F09, 37F09, 47F09, 57F09, 67F09, 77F09, 87F09, 97F09, A7F09, B7F09, C7F09, D7F09, E7F09, F7F09 ;All-Roadway 2-Level FLEX-OST
18+
;AddTypes = 7F08, 17F08, 27F08, 37F08, 47F08, 57F08, 67F08, 77F08, 87F08, 97F08, A7F08, B7F08, C7F08, D7F08, E7F08, F7F08 ;All-Roadway 1-Level FLEX-OST
19+
;AddTypes = 7F09, 17F09, 27F09, 37F09, 47F09, 57F09, 67F09, 77F09, 87F09, 97F09, A7F09, B7F09, C7F09, D7F09, E7F09, F7F09 ;All-Roadway 2-Level FLEX-OST
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 = 7F13, 17F13, 27F13, 37F13, 47F13, 57F13, 67F13, 77F13, 87F13, 97F13, A7F13, B7F13, C7F13, D7F13, E7F13, F7F13 ;Road 1-Level FLEX-OST
24+
AddTypes = 7F14, 17F14, 27F14, 37F14, 47F14, 57F14, 67F14, 77F14, 87F14, 97F14, A7F14, B7F14, C7F14, D7F14, E7F14, F7F14 ;Road 2-Level FLEX-OST
2325
AddTypes = 7F15, 17F15, 27F15, 37F15, 47F15, 57F15, 67F15, 77F15, 87F15, 97F15, A7F15, B7F15, C7F15, D7F15, E7F15, F7F15 ;One-Way Road 1-Level FLEX-OST
2426
AddTypes = 7F16, 17F16, 27F16, 37F16, 47F16, 57F16, 67F16, 77F16, 87F16, 97F16, A7F16, B7F16, C7F16, D7F16, E7F16, F7F16 ;One-Way Road 2-Level FLEX-OST
2527
AddTypes = 7F17, 17F17, 27F17, 37F17, 47F17, 57F17, 67F17, 77F17, 87F17, 97F17, A7F17, B7F17, C7F17, D7F17, E7F17, F7F17 ;Avenue 1-Level FLEX-OST
@@ -1210,6 +1212,136 @@ CopyFrom = 0x67F12
12101212
CopyFrom = 0x77F12
12111213

12121214

1215+
[HighwayIntersectionInfo_0x00007F13]
1216+
;Added by memo 2023-07-09
1217+
;Road FLEXSlope-L1
1218+
Piece = 48.0, 0.0, 1, 0, 0x5700001f
1219+
PreviewEffect = preview_ost_orth_alt_flex_001
1220+
1221+
CellLayout=........
1222+
CellLayout=..zba..<
1223+
CellLayout=..^.....
1224+
1225+
CheckType = a - road: 0x00040004 dirtroad: 0x00020001, 0x00000000 optional
1226+
CheckType = b - road: 0x00040004, 0x000000FF optional
1227+
CheckType = z - road: 0x00040004
1228+
1229+
ConsLayout=........
1230+
ConsLayout=..+....<
1231+
ConsLayout=..^.....
1232+
1233+
AutoTileBase = 0x55387000
1234+
PlaceQueryID = 0x5C06000F
1235+
Costs = 600
1236+
1237+
[HighwayIntersectionInfo_0x00017F13]
1238+
CopyFrom = 0x7F13
1239+
Rotate = 1
1240+
1241+
[HighwayIntersectionInfo_0x00027F13]
1242+
; Road FLEXSlope-L1 (rotated by 180 degrees)
1243+
; Added by memo 2023-07-09
1244+
; Having a dedicated 180-degree rotation has the advantage that we can use an
1245+
; ordinary orthogonal tile on one side adjacent to the On-Slope Transition which
1246+
; overall behaves more intuitively than the 0x00040004 tile.
1247+
; Moreover, the use of 00-flags on the sides makes it easier to bulldoze parallel OSTs.
1248+
Piece = -48.0, 0.0, 3, 0, 0x5700001f
1249+
PreviewEffect = preview_ost_orth_alt_flex_001
1250+
1251+
CellLayout=........
1252+
CellLayout=..ba.z.<
1253+
CellLayout=.....^..
1254+
1255+
CheckType = a - road: 0x00040004 dirtroad: 0x00010002, 0x00000000 optional
1256+
CheckType = b - road: 0x00040004, 0x000000FF optional
1257+
CheckType = z - road: 0x00040004
1258+
1259+
ConsLayout=........
1260+
ConsLayout=.....+.<
1261+
ConsLayout=.....^..
1262+
1263+
AutoTileBase = 0x55387000
1264+
PlaceQueryID = 0x5C06000F
1265+
Costs = 600
1266+
1267+
[HighwayIntersectionInfo_0x00037F13]
1268+
CopyFrom = 0x27F13
1269+
Rotate = 1
1270+
[HighwayIntersectionInfo_0x00047F13]
1271+
CopyFrom = 0x7F13
1272+
[HighwayIntersectionInfo_0x00057F13]
1273+
CopyFrom = 0x17F13
1274+
[HighwayIntersectionInfo_0x00067F13]
1275+
CopyFrom = 0x27F13
1276+
[HighwayIntersectionInfo_0x00077F13]
1277+
CopyFrom = 0x37F13
1278+
1279+
1280+
[HighwayIntersectionInfo_0x00007F14]
1281+
;Added by memo 2023-07-09
1282+
;Road FLEXSlope-L2
1283+
Piece = 48.0, 0.0, 1, 0, 0x5700002f
1284+
PreviewEffect = preview_ost_orth_alt_flex_002
1285+
1286+
CellLayout=........
1287+
CellLayout=..zba..<
1288+
CellLayout=..^.....
1289+
1290+
CheckType = a - road: 0x00040004 dirtroad: 0x00020003, 0x00000000 optional
1291+
CheckType = b - road: 0x00040004, 0x000000FF optional
1292+
CheckType = z - road: 0x00040004
1293+
1294+
ConsLayout=........
1295+
ConsLayout=..+....<
1296+
ConsLayout=..^.....
1297+
1298+
AutoTileBase = 0x55387000
1299+
PlaceQueryID = 0x5C06010F
1300+
Costs = 600
1301+
1302+
[HighwayIntersectionInfo_0x00017F14]
1303+
CopyFrom = 0x7F14
1304+
Rotate = 1
1305+
1306+
[HighwayIntersectionInfo_0x00027F14]
1307+
; Road FLEXSlope-L2 (rotated by 180 degrees)
1308+
; Added by memo 2023-07-09
1309+
; Having a dedicated 180-degree rotation has the advantage that we can use an
1310+
; ordinary orthogonal tile on one side adjacent to the On-Slope Transition which
1311+
; overall behaves more intuitively than the 0x00040004 tile.
1312+
; Moreover, the use of 00-flags on the sides makes it easier to bulldoze parallel OSTs.
1313+
Piece = -48.0, 0.0, 3, 0, 0x5700002f
1314+
PreviewEffect = preview_ost_orth_alt_flex_002
1315+
1316+
CellLayout=........
1317+
CellLayout=..ba.z.<
1318+
CellLayout=.....^..
1319+
1320+
CheckType = a - road: 0x00040004 dirtroad: 0x00030002, 0x00000000 optional
1321+
CheckType = b - road: 0x00040004, 0x000000FF optional
1322+
CheckType = z - road: 0x00040004
1323+
1324+
ConsLayout=........
1325+
ConsLayout=.....+.<
1326+
ConsLayout=.....^..
1327+
1328+
AutoTileBase = 0x55387000
1329+
PlaceQueryID = 0x5C06010F
1330+
Costs = 600
1331+
1332+
[HighwayIntersectionInfo_0x00037F14]
1333+
CopyFrom = 0x27F14
1334+
Rotate = 1
1335+
[HighwayIntersectionInfo_0x00047F14]
1336+
CopyFrom = 0x7F14
1337+
[HighwayIntersectionInfo_0x00057F14]
1338+
CopyFrom = 0x17F14
1339+
[HighwayIntersectionInfo_0x00067F14]
1340+
CopyFrom = 0x27F14
1341+
[HighwayIntersectionInfo_0x00077F14]
1342+
CopyFrom = 0x37F14
1343+
1344+
12131345
[HighwayIntersectionInfo_0x00007F15]
12141346
;Added by memo 2023-07-09
12151347
;OWR FLEXSlope-L1

Controller/RUL1/01_Road/04_Road_Street.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -681,3 +681,7 @@ TYPE8=0x01040400,0x00020000,0x5f098f00,3,1
681681
TYPE1=0x02020202,0x01010101,0x5C531300,0,0
682682

683683

684+
; crossing adjacent to road on-slope transition
685+
TYPE1=0x00040004,0x02000200,0x00AA0A00,0,0
686+
TYPE2=0x04000400,0x00020002,0x00AA0A00,1,0
687+
;

Controller/RUL1/01_Road/09_Road_Dirtroad.txt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -658,3 +658,20 @@ TYPE1=0x00000000,0x02020202,0x57D09E00,0,0
658658
;TYPE2=0x02020200,0x00040002,0x57E24400,1,0
659659
;TYPE3=0x02020002,0x04000200,0x57E24400,2,0
660660
;TYPE4=0x02000202,0x00020004,0x57E24400,3,0
661+
662+
663+
; Road L1 Onslope
664+
TYPE1=0x04000400,0x01000200,0x5C060000,0,0
665+
TYPE2=0x00040004,0x00020001,0x5C060000,1,0
666+
TYPE3=0x04000400,0x02000100,0x5C060000,2,0
667+
TYPE4=0x00040004,0x00010002,0x5C060000,3,0
668+
; Road L2 Onslope
669+
TYPE1=0x04000400,0x02000300,0x5C060100,2,0
670+
TYPE2=0x00040004,0x00030002,0x5C060100,3,0
671+
TYPE3=0x04000400,0x03000200,0x5C060100,0,0
672+
TYPE4=0x00040004,0x00020003,0x5C060100,1,0
673+
;
674+
; crossing adjacent to road on-slope transition
675+
TYPE1=0x00040004,0x02000200,0x57001100,0,0
676+
TYPE2=0x04000400,0x00020002,0x57001100,1,0
677+
;

Controller/RUL1/06_Lightrail/09_Lightrail_Dirtroad.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,13 +280,13 @@ TYPE8=0x00040200,0x00000301,0x57700810,3,1
280280
;TYPE7=0x04000002,0x00030100,0x57700800,2,1
281281
;TYPE8=0x00000204,0x00000301,0x57700800,3,1
282282

283-
;L1 Onslope
283+
;L1 Onslope (legacy, so can be repurposed ~ memo)
284284
TYPE1=0x04040000,0x00000200,0x57700000,2,0
285285
TYPE2=0x04000004,0x00020000,0x57700000,3,0
286286
TYPE3=0x00000404,0x02000000,0x57700000,0,0
287287
TYPE4=0x00040400,0x00000002,0x57700000,1,0
288288

289-
;L2 Onslope
289+
;L2 Onslope (legacy, so can be repurposed ~ memo)
290290
TYPE1=0x04040400,0x00000200,0x57700100,2,0
291291
TYPE2=0x04040004,0x00020000,0x57700100,3,0
292292
TYPE3=0x04000404,0x02000000,0x57700100,0,0

ltext/puzzlepieces-viaducts.pot

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,20 @@ msgid ""
5858
"Drag the ROAD network up to the transition on both ends to use."
5959
msgstr ""
6060

61+
msgctxt "2026960B-2A592FD1-5C06000F"
62+
msgid ""
63+
"1-Level Road FLEX On-Slope Transition (works for L0-L1 or L1-L2)\n"
64+
"\n"
65+
"Drag the Road network through the transition."
66+
msgstr ""
67+
68+
msgctxt "2026960B-2A592FD1-5C06010F"
69+
msgid ""
70+
"2-Level Road FLEX On-Slope Transition (works for L0-L2)\n"
71+
"\n"
72+
"Drag the Road network through the transition."
73+
msgstr ""
74+
6175
msgctxt "2026960B-2A592FD1-5C060200"
6276
msgid ""
6377
"1-Level FLEX Road Ramp-Style Height Transition (works for L0-L1 or L1-L2)\n"

0 commit comments

Comments
 (0)