Skip to content

Commit 9975709

Browse files
TarkusSC4TarkusSC4
committed
Adds more T-intersections to RhwResolver
1 parent b718420 commit 9975709

1 file changed

Lines changed: 163 additions & 1 deletion

File tree

‎src/main/scala/module/RhwResolver.scala‎

Lines changed: 163 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,11 @@ class RhwResolver extends IdResolver {
191191
// T intersections at ground level
192192
// Rhw2
193193
// OxO
194+
add(0x57600000, Dirtroad~NS & Street~EC)
195+
add(0x57600100, Dirtroad~NS & Road~EC)
196+
add(0x57600200, Dirtroad~NS & Onewayroad~EC)
197+
add(0x57600300, Dirtroad~NS & Avenue~EC)
198+
add(0x57600400, Dirtroad~NS & Dirtroad~EC)
194199
add(0x57600700, Dirtroad~NS & Tla3~EC)
195200
add(0x57600800, Dirtroad~NS & Ave2~EC)
196201
add(0x57600900, Dirtroad~NS & Ard3~EC)
@@ -203,6 +208,11 @@ class RhwResolver extends IdResolver {
203208
add(0x57609200, Dirtroad~NS & Ave6~CE) // dummy intersection to enable Rhw3 support
204209
add(0x57609209, Dirtroad~NS & Tla7m~CE) // dummy intersection to enable Rhw3 support
205210
add(0x57609309, Dirtroad~NS & Ave6m~CE) // dummy intersection to enable Rhw3 support
211+
add(0x57601000, Dirtroad~CE & Street~NS)
212+
add(0x57601100, Dirtroad~CE & Road~NS)
213+
add(0x57601200, Dirtroad~CE & Onewayroad~NS)
214+
add(0x57601300, Dirtroad~CE & Avenue~SN)
215+
add(0x57601309, Dirtroad~CE & Avenue~NS)
206216
add(0x57601700, Dirtroad~CE & Tla3~NS)
207217
add(0x57601800, Dirtroad~CE & Ave2~NS)
208218
add(0x57601900, Dirtroad~CE & Ard3~NS)
@@ -226,9 +236,32 @@ class RhwResolver extends IdResolver {
226236
add(0x57608209, Dirtroad~CE & Ave6~NS) // Long-T
227237
add(0x57608300, Dirtroad~CE & Ave8~SN) // Short-T
228238
add(0x57608309, Dirtroad~CE & Ave8~NS) // Long-T
239+
// OxD
240+
add(0x57603400, Dirtroad~NC & Avenue~ES)
241+
add(0x57603300, Dirtroad~CS & Avenue~ES)
242+
add(0x57603309, Dirtroad~CS & Avenue~SharedDiagRight)
243+
// DxO
244+
add(0x57605300, Dirtroad~ESC & Avenue~NS)
245+
add(0x57605309, Dirtroad~NWC & Avenue~NS)
246+
add(0x57605409, Dirtroad~CES & Avenue~WE)
247+
add(0x57605400, Dirtroad~CWN & Avenue~SN)
248+
// DxD
249+
add(0x57607100, Dirtroad~CSW & Road~ES)
250+
add(0x57607109, Dirtroad~SWC & Road~ES)
251+
add(0x57607200, Dirtroad~CSW & Onewayroad~ES)
252+
add(0x57607209, Dirtroad~SWC & Onewayroad~ES)
253+
add(0x57607300, Dirtroad~CES & Avenue~SharedDiagLeft)
254+
add(0x57607309, Dirtroad~ESC & Avenue~NE)
255+
add(0x57607400, Dirtroad~WSC & Avenue~ES)
256+
// add(0x57607409, Dirtroad~WNC & Avenue~SharedDiagRight)
229257

230258
// Rhw3
231259
// OxO
260+
add(0x57610000, Rhw3~NS & Street~EC)
261+
add(0x57610100, Rhw3~NS & Road~EC)
262+
add(0x57610200, Rhw3~NS & Onewayroad~EC)
263+
add(0x57610300, Rhw3~NS & Avenue~EC)
264+
add(0x57610400, Rhw3~NS & Dirtroad~EC)
232265
add(0x57610700, Rhw3~NS & Tla3~EC)
233266
add(0x57610800, Rhw3~NS & Ave2~EC)
234267
add(0x57610900, Rhw3~NS & Ard3~EC)
@@ -241,6 +274,8 @@ class RhwResolver extends IdResolver {
241274
add(0x57619200, Rhw3~NS & Ave6~CE)
242275
add(0x57619209, Rhw3~NS & Tla7m~CE)
243276
add(0x57619309, Rhw3~NS & Ave6m~CE)
277+
add(0x57611300, Rhw3~EC & Avenue~SN)
278+
add(0x57611309, Rhw3~EC & Avenue~NS)
244279
add(0x57611700, Rhw3~EC & Tla3~NS)
245280
add(0x57611800, Rhw3~EC & Ave2~NS)
246281
add(0x57611900, Rhw3~EC & Ard3~NS)
@@ -265,6 +300,11 @@ class RhwResolver extends IdResolver {
265300
add(0x57618300, Rhw3~EC & Ave8~SN) // Short-T
266301
add(0x57618309, Rhw3~EC & Ave8~NS) // Long-T
267302
//Reverse for Thru-Ts
303+
add(0x57610080, Rhw3~SN & Street~EC)
304+
add(0x57610180, Rhw3~SN & Road~EC)
305+
add(0x57610280, Rhw3~SN & Onewayroad~EC)
306+
add(0x57610380, Rhw3~SN & Avenue~EC)
307+
add(0x57610480, Rhw3~SN & Dirtroad~EC)
268308
add(0x57610780, Rhw3~SN & Tla3~EC)
269309
add(0x57610880, Rhw3~SN & Ave2~EC)
270310
add(0x57610980, Rhw3~SN & Ard3~EC)
@@ -277,9 +317,45 @@ class RhwResolver extends IdResolver {
277317
add(0x57619280, Rhw3~SN & Ave6~CE)
278318
add(0x57619289, Rhw3~SN & Tla7m~CE)
279319
add(0x57619389, Rhw3~SN & Ave6m~CE)
320+
// OxD
321+
// add(0x57613400, Rhw3~NC & Avenue~ES)
322+
// add(0x57613480, Rhw3~CN & Avenue~ES)
323+
// add(0x57613300, Rhw3~CS & Avenue~ES)
324+
// add(0x57613380, Rhw3~SC & Avenue~ES)
325+
// add(0x57613309, Rhw3~CS & Avenue~SharedDiagRight)
326+
// add(0x57613389, Rhw3~SC & Avenue~SharedDiagRight)
327+
// DxO
328+
// add(0x57615300, Rhw3~ESC & Avenue~NS)
329+
// add(0x57615309, Rhw3~NWC & Avenue~NS)
330+
// add(0x57615380, Rhw3~CSE & Avenue~NS)
331+
// add(0x57615389, Rhw3~CWN & Avenue~NS)
332+
// add(0x57615409, Rhw3~CES & Avenue~WE)
333+
// add(0x57615489, Rhw3~SEC & Avenue~WE)
334+
// add(0x57615400, Rhw3~CWN & Avenue~SN)
335+
// add(0x57615480, Rhw3~NWC & Avenue~SN)
336+
// DxD
337+
// add(0x57617100, Rhw3~CSW & Road~ES)
338+
// add(0x57617109, Rhw3~SWC & Road~ES)
339+
// add(0x57617180, Rhw3~WSC & Road~ES)
340+
// add(0x57617189, Rhw3~CWS & Road~ES)
341+
// add(0x57617200, Rhw3~CSW & Onewayroad~ES)
342+
// add(0x57617209, Rhw3~SWC & Onewayroad~ES)
343+
// add(0x57617280, Rhw3~WSC & Onewayroad~ES)
344+
// add(0x57617289, Rhw3~CWS & Onewayroad~ES)
345+
// add(0x57617300, Rhw3~CES & Avenue~SharedDiagLeft)
346+
// add(0x57617380, Rhw3~SEC & Avenue~SharedDiagLeft)
347+
// add(0x57617309, Rhw3~ESC & Avenue~NE)
348+
// add(0x57617389, Rhw3~CSE & Avenue~NE)
349+
// add(0x57617400, Rhw3~WSC & Avenue~ES)
350+
// add(0x57617480, Rhw3~CSW & Avenue~ES)
280351

281352
// Mis
282353
// OxO
354+
add(0x57620000, Mis~NS & Street~EC)
355+
add(0x57620100, Mis~NS & Road~EC)
356+
add(0x57620200, Mis~NS & Onewayroad~EC)
357+
// add(0x57620300, Mis~NS & Avenue~EC)
358+
add(0x57620400, Mis~NS & Dirtroad~EC)
283359
add(0x57620700, Mis~NS & Tla3~EC)
284360
add(0x57620800, Mis~NS & Ave2~EC)
285361
// add(0x57620900, Mis~NS & Ard3~EC)
@@ -292,6 +368,10 @@ class RhwResolver extends IdResolver {
292368
// add(0x57629200, Mis~NS & Ave6~CE)
293369
// add(0x57629209, Mis~NS & Tla7m~CE)
294370
// add(0x57629309, Mis~NS & Ave6m~CE)
371+
add(0x57621300, Mis~EC & Avenue~SN)
372+
add(0x57621309, Mis~EC & Avenue~NS)
373+
add(0x57621500, Mis~EC & Rhw3~NS)
374+
add(0x57621509, Mis~EC & Rhw3~SN)
295375
add(0x57621700, Mis~EC & Tla3~NS)
296376
add(0x57621800, Mis~EC & Ave2~NS)
297377
add(0x57621900, Mis~EC & Ard3~NS)
@@ -316,6 +396,11 @@ class RhwResolver extends IdResolver {
316396
add(0x57628300, Mis~EC & Ave8~SN) // Short-T
317397
add(0x57628309, Mis~EC & Ave8~NS) // Long-T
318398
//Reverse for Thru-Ts
399+
add(0x57620080, Mis~SN & Street~EC)
400+
add(0x57620180, Mis~SN & Road~EC)
401+
add(0x57620280, Mis~SN & Onewayroad~EC)
402+
// add(0x57620380, Mis~SN & Avenue~EC)
403+
add(0x57620480, Mis~SN & Dirtroad~EC)
319404
add(0x57620780, Mis~SN & Tla3~EC)
320405
add(0x57620880, Mis~SN & Ave2~EC)
321406
// add(0x57620980, Mis~SN & Ard3~EC)
@@ -328,9 +413,48 @@ class RhwResolver extends IdResolver {
328413
// add(0x57629280, Mis~SN & Ave6~CE)
329414
// add(0x57629289, Mis~SN & Tla7m~CE)
330415
// add(0x57629389, Mis~SN & Ave6m~CE)
416+
// OxD
417+
add(0x57623400, Mis~NC & Avenue~ES)
418+
add(0x57623480, Mis~CN & Avenue~ES)
419+
add(0x57623300, Mis~CS & Avenue~ES)
420+
add(0x57623380, Mis~SC & Avenue~ES)
421+
add(0x57623309, Mis~CS & Avenue~SharedDiagRight)
422+
add(0x57623389, Mis~SC & Avenue~SharedDiagRight)
423+
// DxO
424+
add(0x57625300, Mis~ESC & Avenue~NS)
425+
add(0x57625309, Mis~NWC & Avenue~NS)
426+
add(0x57625380, Mis~CSE & Avenue~NS)
427+
add(0x57625389, Mis~CWN & Avenue~NS)
428+
add(0x57625409, Mis~CES & Avenue~WE)
429+
add(0x57625489, Mis~SEC & Avenue~WE)
430+
add(0x57625400, Mis~CWN & Avenue~SN)
431+
add(0x57625480, Mis~NWC & Avenue~SN)
432+
// DxD
433+
add(0x57627100, Mis~CSW & Road~ES)
434+
add(0x57627109, Mis~SWC & Road~ES)
435+
add(0x57627180, Mis~WSC & Road~ES)
436+
add(0x57627189, Mis~CWS & Road~ES)
437+
add(0x57627200, Mis~CSW & Onewayroad~ES)
438+
add(0x57627209, Mis~SWC & Onewayroad~ES)
439+
add(0x57627280, Mis~WSC & Onewayroad~ES)
440+
add(0x57627289, Mis~CWS & Onewayroad~ES)
441+
add(0x57627300, Mis~CES & Avenue~SharedDiagLeft)
442+
add(0x57627380, Mis~SEC & Avenue~SharedDiagLeft)
443+
add(0x57627309, Mis~ESC & Avenue~NE)
444+
add(0x57627389, Mis~CSE & Avenue~NE)
445+
add(0x57627400, Mis~WSC & Avenue~ES)
446+
add(0x57627480, Mis~CSW & Avenue~ES)
447+
448+
// add(0x57627480, Mis~WSC & Avenue~ES)
449+
// add(0x57627409, Mis~CWN & Avenue~SharedDiagRight)
331450

332451
// Rhw4
333452
// OxO
453+
add(0x57630000, Rhw4~NS & Street~EC)
454+
add(0x57630100, Rhw4~NS & Road~EC)
455+
add(0x57630200, Rhw4~NS & Onewayroad~EC)
456+
add(0x57630300, Rhw4~NS & Avenue~EC)
457+
add(0x57630400, Rhw4~NS & Dirtroad~EC)
334458
add(0x57630700, Rhw4~NS & Tla3~EC)
335459
add(0x57630800, Rhw4~NS & Ave2~EC)
336460
add(0x57630900, Rhw4~NS & Ard3~EC)
@@ -344,6 +468,8 @@ class RhwResolver extends IdResolver {
344468
add(0x57639300, Rhw4~NS & Ave8~CE) // enabled for double RHW-4 setups
345469
add(0x57639209, Rhw4~NS & Tla7m~CE) // enabled for double RHW-4 setups
346470
add(0x57639309, Rhw4~NS & Ave6m~CE) // enabled for double RHW-4 setups
471+
add(0x57631300, Rhw4~EC & Avenue~SN)
472+
add(0x57631309, Rhw4~EC & Avenue~NS)
347473
add(0x57631700, Rhw4~EC & Tla3~NS)
348474
add(0x57631800, Rhw4~EC & Ave2~NS)
349475
add(0x57631900, Rhw4~EC & Ard3~NS)
@@ -368,6 +494,11 @@ class RhwResolver extends IdResolver {
368494
add(0x57638300, Rhw4~EC & Ave8~SN) // Short-T
369495
add(0x57638309, Rhw4~EC & Ave8~NS) // Long-T
370496
//Reverse for Thru-Ts
497+
add(0x57630080, Rhw4~SN & Street~EC)
498+
add(0x57630180, Rhw4~SN & Road~EC)
499+
add(0x57630280, Rhw4~SN & Onewayroad~EC)
500+
add(0x57630380, Rhw4~SN & Avenue~EC)
501+
add(0x57630480, Rhw4~SN & Dirtroad~EC)
371502
add(0x57630780, Rhw4~SN & Tla3~EC)
372503
add(0x57630880, Rhw4~SN & Ave2~EC)
373504
add(0x57630980, Rhw4~SN & Ard3~EC)
@@ -381,7 +512,38 @@ class RhwResolver extends IdResolver {
381512
// add(0x57639380, Rhw4~SN & Ave8~CE)
382513
// add(0x57639289, Rhw4~SN & Tla7m~CE)
383514
// add(0x57639389, Rhw4~SN & Ave6m~CE)
384-
515+
// OxD
516+
add(0x57633400, Rhw4~NC & Avenue~ES)
517+
add(0x57633480, Rhw4~CN & Avenue~ES)
518+
add(0x57633300, Rhw4~CS & Avenue~ES)
519+
add(0x57633380, Rhw4~SC & Avenue~ES)
520+
add(0x57633309, Rhw4~CS & Avenue~SharedDiagRight)
521+
add(0x57633389, Rhw4~SC & Avenue~SharedDiagRight)
522+
// DxO
523+
add(0x57635300, Rhw4~ESC & Avenue~NS)
524+
add(0x57635309, Rhw4~NWC & Avenue~NS)
525+
add(0x57635380, Rhw4~CSE & Avenue~NS)
526+
add(0x57635389, Rhw4~CWN & Avenue~NS)
527+
add(0x57635409, Rhw4~CES & Avenue~WE)
528+
add(0x57635489, Rhw4~SEC & Avenue~WE)
529+
add(0x57635400, Rhw4~CWN & Avenue~SN)
530+
add(0x57635480, Rhw4~NWC & Avenue~SN)
531+
// DxD
532+
add(0x57637100, Rhw4~CSW & Road~ES)
533+
add(0x57637109, Rhw4~SWC & Road~ES)
534+
add(0x57637180, Rhw4~WSC & Road~ES)
535+
add(0x57637189, Rhw4~CWS & Road~ES)
536+
add(0x57637200, Rhw4~CSW & Onewayroad~ES)
537+
add(0x57637209, Rhw4~SWC & Onewayroad~ES)
538+
add(0x57637280, Rhw4~WSC & Onewayroad~ES)
539+
add(0x57637289, Rhw4~CWS & Onewayroad~ES)
540+
add(0x57637300, Rhw4~CES & Avenue~SharedDiagLeft)
541+
add(0x57637380, Rhw4~SEC & Avenue~SharedDiagLeft)
542+
add(0x57637309, Rhw4~ESC & Avenue~NE)
543+
add(0x57637389, Rhw4~CSE & Avenue~NE)
544+
add(0x57637400, Rhw4~WSC & Avenue~ES)
545+
add(0x57637480, Rhw4~CSW & Avenue~ES)
546+
385547
// T intersections with viaducts
386548
// Rhw2
387549
add(0x57600110, L1Rhw2~NS & L1Road~EC)

0 commit comments

Comments
 (0)