Skip to content

Commit e41eb76

Browse files
memo33memo33
committed
add new dedicated OWR FLEX-OSTs
1 parent dba8d73 commit e41eb76

8 files changed

Lines changed: 192 additions & 7 deletions

File tree

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

Lines changed: 132 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 = 7F15, 17F15, 27F15, 37F15, 47F15, 57F15, 67F15, 77F15, 87F15, 97F15, A7F15, B7F15, C7F15, D7F15, E7F15, F7F15 ;One-Way Road 1-Level FLEX-OST
24+
AddTypes = 7F16, 17F16, 27F16, 37F16, 47F16, 57F16, 67F16, 77F16, 87F16, 97F16, A7F16, B7F16, C7F16, D7F16, E7F16, F7F16 ;One-Way Road 2-Level FLEX-OST
2325
AddTypes = 7F17, 17F17, 27F17, 37F17, 47F17, 57F17, 67F17, 77F17, 87F17, 97F17, A7F17, B7F17, C7F17, D7F17, E7F17, F7F17 ;Avenue 1-Level FLEX-OST
2426
AddTypes = 7F18, 17F18, 27F18, 37F18, 47F18, 57F18, 67F18, 77F18, 87F18, 97F18, A7F18, B7F18, C7F18, D7F18, E7F18, F7F18 ;Avenue 2-Level FLEX-OST
2527

@@ -1208,6 +1210,136 @@ CopyFrom = 0x67F12
12081210
CopyFrom = 0x77F12
12091211

12101212

1213+
[HighwayIntersectionInfo_0x00007F15]
1214+
;Added by memo 2023-07-09
1215+
;OWR FLEXSlope-L1
1216+
Piece = 48.0, 0.0, 1, 0, 0x5700001f
1217+
PreviewEffect = preview_ost_orth_alt_flex_001
1218+
1219+
CellLayout=........
1220+
CellLayout=..zba..<
1221+
CellLayout=..^.....
1222+
1223+
CheckType = a - rail: 0x00040000 onewayroad: 0x00020002, 0x00000000 optional
1224+
CheckType = b - onewayroad: 0x00040004, 0x000000FF optional
1225+
CheckType = z - onewayroad: 0x00040004
1226+
1227+
ConsLayout=........
1228+
ConsLayout=..+....<
1229+
ConsLayout=..^.....
1230+
1231+
AutoTileBase = 0x55387000
1232+
PlaceQueryID = 0x5C07000F
1233+
Costs = 600
1234+
1235+
[HighwayIntersectionInfo_0x00017F15]
1236+
CopyFrom = 0x7F15
1237+
Rotate = 1
1238+
1239+
[HighwayIntersectionInfo_0x00027F15]
1240+
; OWR FLEXSlope-L1 (rotated by 180 degrees)
1241+
; Added by memo 2023-07-09
1242+
; Having a dedicated 180-degree rotation has the advantage that we can use an
1243+
; ordinary orthogonal tile on one side adjacent to the On-Slope Transition which
1244+
; overall behaves more intuitively than the 0x00040004 tile.
1245+
; Moreover, the use of 00-flags on the sides makes it easier to bulldoze parallel OSTs.
1246+
Piece = -48.0, 0.0, 3, 0, 0x5700001f
1247+
PreviewEffect = preview_ost_orth_alt_flex_001
1248+
1249+
CellLayout=........
1250+
CellLayout=..ba.z.<
1251+
CellLayout=.....^..
1252+
1253+
CheckType = a - rail: 0x00000004 onewayroad: 0x00020002, 0x00000000 optional
1254+
CheckType = b - onewayroad: 0x00040004, 0x000000FF optional
1255+
CheckType = z - onewayroad: 0x00040004
1256+
1257+
ConsLayout=........
1258+
ConsLayout=.....+.<
1259+
ConsLayout=.....^..
1260+
1261+
AutoTileBase = 0x55387000
1262+
PlaceQueryID = 0x5C07000F
1263+
Costs = 600
1264+
1265+
[HighwayIntersectionInfo_0x00037F15]
1266+
CopyFrom = 0x27F15
1267+
Rotate = 1
1268+
[HighwayIntersectionInfo_0x00047F15]
1269+
CopyFrom = 0x7F15
1270+
[HighwayIntersectionInfo_0x00057F15]
1271+
CopyFrom = 0x17F15
1272+
[HighwayIntersectionInfo_0x00067F15]
1273+
CopyFrom = 0x27F15
1274+
[HighwayIntersectionInfo_0x00077F15]
1275+
CopyFrom = 0x37F15
1276+
1277+
1278+
[HighwayIntersectionInfo_0x00007F16]
1279+
;Added by memo 2023-07-09
1280+
;OWR FLEXSlope-L2
1281+
Piece = 48.0, 0.0, 1, 0, 0x5700002f
1282+
PreviewEffect = preview_ost_orth_alt_flex_002
1283+
1284+
CellLayout=........
1285+
CellLayout=..zba..<
1286+
CellLayout=..^.....
1287+
1288+
CheckType = a - lightrail: 0x00040000 onewayroad: 0x00020002, 0x00000000 optional
1289+
CheckType = b - onewayroad: 0x00040004, 0x000000FF optional
1290+
CheckType = z - onewayroad: 0x00040004
1291+
1292+
ConsLayout=........
1293+
ConsLayout=..+....<
1294+
ConsLayout=..^.....
1295+
1296+
AutoTileBase = 0x55387000
1297+
PlaceQueryID = 0x5C07010F
1298+
Costs = 600
1299+
1300+
[HighwayIntersectionInfo_0x00017F16]
1301+
CopyFrom = 0x7F16
1302+
Rotate = 1
1303+
1304+
[HighwayIntersectionInfo_0x00027F16]
1305+
; OWR FLEXSlope-L2 (rotated by 180 degrees)
1306+
; Added by memo 2023-07-09
1307+
; Having a dedicated 180-degree rotation has the advantage that we can use an
1308+
; ordinary orthogonal tile on one side adjacent to the On-Slope Transition which
1309+
; overall behaves more intuitively than the 0x00040004 tile.
1310+
; Moreover, the use of 00-flags on the sides makes it easier to bulldoze parallel OSTs.
1311+
Piece = -48.0, 0.0, 3, 0, 0x5700002f
1312+
PreviewEffect = preview_ost_orth_alt_flex_002
1313+
1314+
CellLayout=........
1315+
CellLayout=..ba.z.<
1316+
CellLayout=.....^..
1317+
1318+
CheckType = a - lightrail: 0x00000004 onewayroad: 0x00020002, 0x00000000 optional
1319+
CheckType = b - onewayroad: 0x00040004, 0x000000FF optional
1320+
CheckType = z - onewayroad: 0x00040004
1321+
1322+
ConsLayout=........
1323+
ConsLayout=.....+.<
1324+
ConsLayout=.....^..
1325+
1326+
AutoTileBase = 0x55387000
1327+
PlaceQueryID = 0x5C07010F
1328+
Costs = 600
1329+
1330+
[HighwayIntersectionInfo_0x00037F16]
1331+
CopyFrom = 0x27F16
1332+
Rotate = 1
1333+
[HighwayIntersectionInfo_0x00047F16]
1334+
CopyFrom = 0x7F16
1335+
[HighwayIntersectionInfo_0x00057F16]
1336+
CopyFrom = 0x17F16
1337+
[HighwayIntersectionInfo_0x00067F16]
1338+
CopyFrom = 0x27F16
1339+
[HighwayIntersectionInfo_0x00077F16]
1340+
CopyFrom = 0x37F16
1341+
1342+
12111343
[HighwayIntersectionInfo_0x00007F17]
12121344
;Added by memo 2023-07-03
12131345
;Avenue FLEXSlope-L1

‎Controller/RUL1/02_Rail/08_Rail_OneWayRoad.txt‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,19 @@ TYPE8=0x01000001,0x03010000,0x51040200,1,1
122122
;
123123
;
124124

125+
126+
; OWR L1 OST
127+
TYPE1=0x04000000,0x02000200,0x5C070000,2,0
128+
TYPE2=0x00000004,0x00020002,0x5C070000,3,0
129+
TYPE3=0x00000400,0x02000200,0x5C070000,0,0
130+
TYPE4=0x00040000,0x00020002,0x5C070000,1,0
131+
125132
;Legacy code, to be removed or repurposed ~ memo
126133
;OWR-HT Top
127-
TYPE1=0x00000400,0x02000200,0x5C070200,0,0
128-
TYPE2=0x00040000,0x00020002,0x5C070200,1,0
129-
TYPE3=0x04000000,0x02000200,0x5C070200,2,0
130-
TYPE4=0x00000004,0x00020002,0x5C070200,3,0
134+
;TYPE1=0x00000400,0x02000200,0x5C070200,0,0
135+
;TYPE2=0x00040000,0x00020002,0x5C070200,1,0
136+
;TYPE3=0x04000000,0x02000200,0x5C070200,2,0
137+
;TYPE4=0x00000004,0x00020002,0x5C070200,3,0
131138

132139
;OWR-HT Bottom
133140
TYPE1=0x00040404,0x02000200,0x5C070230,0,0

‎Controller/RUL1/04_Street/08_Street_OneWayRoad.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,5 +330,7 @@ TYPE1=0x02020202,0x01010101,0x5C532100,0,0
330330
TYPE1=0x02020202,0x03030303,0x5C534100,0,0
331331

332332

333-
334-
333+
; crossing adjacent to OWR on-slope transition
334+
TYPE1=0x02000200,0x00040004,0x09aa0A00,0,0
335+
TYPE2=0x00020002,0x04000400,0x09aa0A00,1,0
336+
;

‎Controller/RUL1/06_Lightrail/08_Lightrail_OneWayRoad.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,3 +314,9 @@ TYPE4=0x01000004,0x00020002,0x5C040000,3,0
314314
;Use for semi-draggable continuation of Tram-in/on-OneWayRoad
315315
;TYPE1=0x00000000,0x02000200,IID,0,0
316316
;TYPE2=0x00000000,0x00020002,IID,1,0
317+
318+
; OWR L2 OST
319+
TYPE1=0x04000000,0x02000200,0x5C070100,2,0
320+
TYPE2=0x00000004,0x00020002,0x5C070100,3,0
321+
TYPE3=0x00000400,0x02000200,0x5C070100,0,0
322+
TYPE4=0x00040000,0x00020002,0x5C070100,1,0

‎Controller/RUL1/08_OneWayRoad/09_OneWayRoad_Dirtroad.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,12 @@ TYPE4=0x02020000,0x00000202,0x5760B800,2,0
140140
;
141141
TYPE1=0x00020002,0x02000200,0x57001200,0,0
142142
TYPE2=0x02000200,0x00020002,0x57001200,1,0
143-
;OnSlope
143+
;OnSlope RHW
144144
TYPE1=0x00020002,0x04000400,0x57001200,0,0
145145
TYPE2=0x02000200,0x00040004,0x57001200,1,0
146+
;OnSlope OWR
147+
TYPE1=0x00040004,0x02000200,0x57001200,0,0
148+
TYPE2=0x04000400,0x00020002,0x57001200,1,0
146149
;
147150
;piece 39 (98)
148151
;

‎ltext/puzzlepieces-viaducts.pot‎

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

110+
msgctxt "2026960B-2A592FD1-5C07000F"
111+
msgid ""
112+
"1-Level One-Way Road FLEX On-Slope Transition (works for L0-L1 or L1-L2)\n"
113+
"\n"
114+
"Drag the One-Way Road network through the transition."
115+
msgstr ""
116+
117+
msgctxt "2026960B-2A592FD1-5C07010F"
118+
msgid ""
119+
"2-Level One-Way Road FLEX On-Slope Transition (works for L0-L2)\n"
120+
"\n"
121+
"Drag the One-Way Road network through the transition."
122+
msgstr ""
123+
110124
msgctxt "2026960B-2A592FD1-5C070200"
111125
msgid ""
112126
"1-Level FLEX One-Way Road Ramp-Style Height Transition (works for L0-L1 or L1-L2)\n"

0 commit comments

Comments
 (0)