From dba8d73baa66ed48e54e76c68212d5f5d3d72168 Mon Sep 17 00:00:00 2001 From: memo Date: Mon, 3 Jul 2023 18:02:43 +0200 Subject: [PATCH 1/6] add new dedicated Avenue FLEX-OSTs --- .../INRULs/AvenueAdvanced/Intersections.rul | 49 ++++++ .../7000_Road_NWM/7F00_ElevatedViaducts.txt | 147 ++++++++++++++++++ Controller/RUL1/01_Road/05_Road_Avenue.txt | 6 + .../RUL1/04_Street/05_Street_Avenue.txt | 6 + .../RUL1/05_Avenue/08_Avenue_OneWayRoad.txt | 6 + .../RUL1/05_Avenue/09_Avenue_Dirtroad.txt | 26 +++- ltext/puzzlepieces-viaducts.pot | 14 ++ 7 files changed, 253 insertions(+), 1 deletion(-) diff --git a/Controller/INRULs/AvenueAdvanced/Intersections.rul b/Controller/INRULs/AvenueAdvanced/Intersections.rul index 949f3b71a..ae9e7b4f8 100644 --- a/Controller/INRULs/AvenueAdvanced/Intersections.rul +++ b/Controller/INRULs/AvenueAdvanced/Intersections.rul @@ -308,3 +308,52 @@ 2,3,1,0,0,3 3,0,0x04001000,3,1 3,3,0x04004200,0,0 + +; Avenue FLEX-OST (adjacent tile) +1,4,4,4,0 +3,0,0x04006100,3,0 +1,0,4,4,4 +3,0,0x04006100,0,0 +1,4,0,4,4 +3,0,0x04006100,1,0 +1,4,4,0,4 +3,0,0x04006100,2,0 +; +; OxO crossing adjacent to Avenue FLEX-OST +; +1,4,4,4,2 +2,3,4,2,4,4 +2,4,4,2,2,4 +2,5,4,4,2,2 +3,0,0x04009000,0,0 +3,3,0x04009000,1,0 +3,4,0x04009000,2,0 +3,5,0x04009000,3,0 +; +1,2,4,4,4 +2,5,4,4,2,4 +2,6,4,4,2,2 +2,7,2,4,4,2 +3,0,0x04009000,1,0 +3,5,0x04009000,2,0 +3,6,0x04009000,3,0 +3,7,0x04009000,0,0 +; +1,4,2,4,4 +2,1,2,2,4,4 +2,7,4,4,4,2 +2,8,2,4,4,2 +3,0,0x04009000,2,0 +3,1,0x04009000,1,0 +3,7,0x04009000,3,0 +3,8,0x04009000,0,0 +; +1,4,4,2,4 +2,1,2,4,4,4 +2,2,2,2,4,4 +2,3,4,2,2,4 +3,0,0x04009000,3,0 +3,1,0x04009000,0,0 +3,2,0x04009000,1,0 +3,3,0x04009000,2,0 +; diff --git a/Controller/RUL0/7000_Road_NWM/7F00_ElevatedViaducts.txt b/Controller/RUL0/7000_Road_NWM/7F00_ElevatedViaducts.txt index e3b2749d4..c64072174 100644 --- a/Controller/RUL0/7000_Road_NWM/7F00_ElevatedViaducts.txt +++ b/Controller/RUL0/7000_Road_NWM/7F00_ElevatedViaducts.txt @@ -20,6 +20,8 @@ AddTypes = 7F09, 17F09, 27F09, 37F09, 47F09, 57F09, 67F09, 77F09, 87F09, 97F09, AddTypes = 7F10, 17F10, 27F10, 37F10, 47F10, 57F10, 67F10, 77F10, 87F10, 97F10, A7F10, B7F10, C7F10, D7F10, E7F10, F7F10 ;Road 1-Level FLEX-HT Diag 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 AddTypes = 7F12, 17F12, 27F12, 37F12, 47F12, 57F12, 67F12, 77F12, 87F12, 97F12, A7F12, B7F12, C7F12, D7F12, E7F12, F7F12 ;Avenue 1-Level FLEX-HT Diag +AddTypes = 7F17, 17F17, 27F17, 37F17, 47F17, 57F17, 67F17, 77F17, 87F17, 97F17, A7F17, B7F17, C7F17, D7F17, E7F17, F7F17 ;Avenue 1-Level FLEX-OST +AddTypes = 7F18, 17F18, 27F18, 37F18, 47F18, 57F18, 67F18, 77F18, 87F18, 97F18, A7F18, B7F18, C7F18, D7F18, E7F18, F7F18 ;Avenue 2-Level FLEX-OST ;FLEX Road Viaduct Overpasses BUTTON SECTION 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 CopyFrom = 0x77F12 +[HighwayIntersectionInfo_0x00007F17] +;Added by memo 2023-07-03 +;Avenue FLEXSlope-L1 +Piece = 48.0, 0.0, 1, 0, 0x5700002f +PreviewEffect = preview_ost_orth_alt_flex_001 + +CellLayout=........ +CellLayout=...DA... +CellLayout=..bda..< +CellLayout=..^..... + +CheckType = A - avenue: 0x04040004 dirtroad: 0x00020001, 0x00000000 optional +CheckType = a - avenue: 0x00040404 dirtroad: 0x00020003, 0x00000000 optional +CheckType = b - avenue: 0x04040404 +CheckType = d - avenue: 0x00040404, 0x000000FF optional +CheckType = D - avenue: 0x04040004, 0x000000FF optional + +ConsLayout=........ +ConsLayout=........ +ConsLayout=..+....< +ConsLayout=..^..... + +AutoTileBase = 0x55387000 +PlaceQueryID = 0x5C08000F +Costs = 1200 + +[HighwayIntersectionInfo_0x00017F17] +CopyFrom = 0x7F17 +Rotate = 1 + +[HighwayIntersectionInfo_0x00027F17] +; Avenue FLEXSlope-L1 (rotated by 180 degrees) +; Added by memo 2023-07-03 +; Having a dedicated 180-degree rotation has the advantage that we can use an +; ordinary orthogonal tile adjacent to the On-Slope Transition which overall +; behaves more intuitively than the 0x00040004 tile. +Piece = -48.0, 0.0, 3, 0, 0x5700002f +PreviewEffect = preview_ost_orth_alt_flex_001 + +CellLayout=........ +CellLayout=..DA.b.< +CellLayout=..da.... +CellLayout=.....^.. + +CheckType = A - avenue: 0x04040004 dirtroad: 0x00030002, 0x00000000 optional +CheckType = a - avenue: 0x00040404 dirtroad: 0x00010002, 0x00000000 optional +CheckType = b - avenue: 0x04040404 +CheckType = d - avenue: 0x00040404, 0x000000FF optional +CheckType = D - avenue: 0x04040004, 0x000000FF optional + +ConsLayout=........ +ConsLayout=.....+.< +ConsLayout=........ +ConsLayout=.....^.. + +AutoTileBase = 0x55387000 +PlaceQueryID = 0x5C08000F +Costs = 1200 + +[HighwayIntersectionInfo_0x00037F17] +CopyFrom = 0x27F17 +Rotate = 1 +[HighwayIntersectionInfo_0x00047F17] +CopyFrom = 0x7F17 +[HighwayIntersectionInfo_0x00057F17] +CopyFrom = 0x17F17 +[HighwayIntersectionInfo_0x00067F17] +CopyFrom = 0x27F17 +[HighwayIntersectionInfo_0x00077F17] +CopyFrom = 0x37F17 + + +[HighwayIntersectionInfo_0x00007F18] +;Added by memo 2023-07-03 +;Avenue FLEXSlope-L2 +Piece = 48.0, 0.0, 1, 0, 0x5700002f +PreviewEffect = preview_ost_orth_alt_flex_002 + +CellLayout=........ +CellLayout=...DA... +CellLayout=..bda..< +CellLayout=..^..... + +CheckType = A - avenue: 0x04040004 dirtroad: 0x00010002, 0x00000000 optional +CheckType = a - avenue: 0x00040404 dirtroad: 0x00030002, 0x00000000 optional +CheckType = b - avenue: 0x04040404 +CheckType = d - avenue: 0x00040404, 0x000000FF optional +CheckType = D - avenue: 0x04040004, 0x000000FF optional + +ConsLayout=........ +ConsLayout=........ +ConsLayout=..+....< +ConsLayout=..^..... + +AutoTileBase = 0x55387000 +PlaceQueryID = 0x5C08010F +Costs = 1200 + +[HighwayIntersectionInfo_0x00017F18] +CopyFrom = 0x7F18 +Rotate = 1 + +[HighwayIntersectionInfo_0x00027F18] +; Avenue FLEXSlope-L2 (rotated by 180 degrees) +; Added by memo 2023-07-03 +; Having a dedicated 180-degree rotation has the advantage that we can use an +; ordinary orthogonal tile adjacent to the On-Slope Transition which overall +; behaves more intuitively than the 0x00040004 tile. +Piece = -48.0, 0.0, 3, 0, 0x5700002f +PreviewEffect = preview_ost_orth_alt_flex_002 + +CellLayout=........ +CellLayout=..DA.b.< +CellLayout=..da.... +CellLayout=.....^.. + +CheckType = A - avenue: 0x04040004 dirtroad: 0x00020003, 0x00000000 optional +CheckType = a - avenue: 0x00040404 dirtroad: 0x00020001, 0x00000000 optional +CheckType = b - avenue: 0x04040404 +CheckType = d - avenue: 0x00040404, 0x000000FF optional +CheckType = D - avenue: 0x04040004, 0x000000FF optional + +ConsLayout=........ +ConsLayout=.....+.< +ConsLayout=........ +ConsLayout=.....^.. + +AutoTileBase = 0x55387000 +PlaceQueryID = 0x5C08010F +Costs = 1200 + +[HighwayIntersectionInfo_0x00037F18] +CopyFrom = 0x27F18 +Rotate = 1 +[HighwayIntersectionInfo_0x00047F18] +CopyFrom = 0x7F18 +[HighwayIntersectionInfo_0x00057F18] +CopyFrom = 0x17F18 +[HighwayIntersectionInfo_0x00067F18] +CopyFrom = 0x27F18 +[HighwayIntersectionInfo_0x00077F18] +CopyFrom = 0x37F18 + + + ;;Road Puzzle Pieces ;;Effect Preview line usage upto ;;PreviewEffect = preview_road_puzzlepiece044 diff --git a/Controller/RUL1/01_Road/05_Road_Avenue.txt b/Controller/RUL1/01_Road/05_Road_Avenue.txt index a5898b389..43dc682a4 100644 --- a/Controller/RUL1/01_Road/05_Road_Avenue.txt +++ b/Controller/RUL1/01_Road/05_Road_Avenue.txt @@ -7,6 +7,12 @@ TYPE2=0x02000200,0x04020002,0x04008900,1,0 TYPE3=0x00020002,0x02000204,0x04008900,2,0 TYPE4=0x00020002,0x02040200,0x04008900,0,0 ; +; crossing adjacent to avenue on-slope transition +TYPE1=0x02000200,0x00040404,0x04008900,3,0 +TYPE2=0x02000200,0x04040004,0x04008900,1,0 +TYPE3=0x00020002,0x04000404,0x04008900,2,0 +TYPE4=0x00020002,0x04040400,0x04008900,0,0 +; ;piece 88 ; TYPE1=0x00000200,0x00020402,0x04008800,1,0 diff --git a/Controller/RUL1/04_Street/05_Street_Avenue.txt b/Controller/RUL1/04_Street/05_Street_Avenue.txt index d18cdeb4e..56fbf2ccc 100644 --- a/Controller/RUL1/04_Street/05_Street_Avenue.txt +++ b/Controller/RUL1/04_Street/05_Street_Avenue.txt @@ -69,6 +69,12 @@ TYPE2=0x02000200,0x04020002,0x04008300,3,0 TYPE3=0x00020002,0x02000204,0x04008300,0,0 TYPE4=0x00020002,0x02040200,0x04008300,2,0 ; +; crossing adjacent to avenue on-slope transition +TYPE1=0x02000200,0x00040404,0x04008300,1,0 +TYPE2=0x02000200,0x04040004,0x04008300,3,0 +TYPE3=0x00020002,0x04000404,0x04008300,0,0 +TYPE4=0x00020002,0x04040400,0x04008300,2,0 +; ;piece 88 ; TYPE1=0x00000200,0x00020402,0x04008600,1,0 diff --git a/Controller/RUL1/05_Avenue/08_Avenue_OneWayRoad.txt b/Controller/RUL1/05_Avenue/08_Avenue_OneWayRoad.txt index 5b0746499..94fb458a2 100644 --- a/Controller/RUL1/05_Avenue/08_Avenue_OneWayRoad.txt +++ b/Controller/RUL1/05_Avenue/08_Avenue_OneWayRoad.txt @@ -6,6 +6,12 @@ TYPE1=0x00020402,0x02000200,0x091a8900,3,0 TYPE2=0x04020002,0x02000200,0x091a8900,1,0 TYPE3=0x02000204,0x00020002,0x091a8900,2,0 TYPE4=0x02040200,0x00020002,0x091a8900,0,0 +; +; crossing adjacent to avenue on-slope transition +TYPE1=0x00040404,0x02000200,0x091a8900,3,0 +TYPE2=0x04040004,0x02000200,0x091a8900,1,0 +TYPE3=0x04000404,0x00020002,0x091a8900,2,0 +TYPE4=0x04040400,0x00020002,0x091a8900,0,0 ; ;piece 88 ; diff --git a/Controller/RUL1/05_Avenue/09_Avenue_Dirtroad.txt b/Controller/RUL1/05_Avenue/09_Avenue_Dirtroad.txt index d21c37b31..156f9100b 100644 --- a/Controller/RUL1/05_Avenue/09_Avenue_Dirtroad.txt +++ b/Controller/RUL1/05_Avenue/09_Avenue_Dirtroad.txt @@ -6,11 +6,35 @@ TYPE1=0x00020402,0x02000200,0x57001300,2,0 TYPE2=0x04020002,0x02000200,0x57001300,0,0 TYPE3=0x02000204,0x00020002,0x57001300,1,0 TYPE4=0x02040200,0x00020002,0x57001300,3,0 -;OnSlope +;crossing adjacent to RHW OST TYPE1=0x00020402,0x04000400,0x57001300,2,0 TYPE2=0x04020002,0x04000400,0x57001300,0,0 TYPE3=0x02000204,0x00040004,0x57001300,1,0 TYPE4=0x02040200,0x00040004,0x57001300,3,0 +;crossing adjacent to Avenue OST +TYPE1=0x00040404,0x02000200,0x57001300,2,0 +TYPE2=0x04040004,0x02000200,0x57001300,0,0 +TYPE3=0x04000404,0x00020002,0x57001300,1,0 +TYPE4=0x04040400,0x00020002,0x57001300,3,0 + +; Avenue OnSlope Transition L1 +TYPE1=0x04040400,0x01000200,0x5C080000,0,0 +TYPE2=0x04040004,0x00020001,0x5C080000,1,0 +TYPE3=0x04000404,0x02000100,0x5C080000,2,0 +TYPE4=0x00040404,0x00010002,0x5C080000,3,0 +TYPE1=0x04040400,0x02000300,0x5C080000,2,1 +TYPE2=0x04040004,0x00030002,0x5C080000,1,1 +TYPE3=0x04000404,0x03000200,0x5C080000,0,1 +TYPE4=0x00040404,0x00020003,0x5C080000,3,1 +; Avenue OnSlope Transition L2 +TYPE1=0x04040400,0x02000100,0x5C080100,0,0 +TYPE2=0x04040004,0x00010002,0x5C080100,1,0 +TYPE3=0x04000404,0x01000200,0x5C080100,2,0 +TYPE4=0x00040404,0x00020001,0x5C080100,3,0 +TYPE1=0x04040400,0x03000200,0x5C080100,2,1 +TYPE2=0x04040004,0x00020003,0x5C080100,1,1 +TYPE3=0x04000404,0x02000300,0x5C080100,0,1 +TYPE4=0x00040404,0x00030002,0x5C080100,3,1 ; ;piece 88 diff --git a/ltext/puzzlepieces-viaducts.pot b/ltext/puzzlepieces-viaducts.pot index 6e314a3be..57f477eb7 100644 --- a/ltext/puzzlepieces-viaducts.pot +++ b/ltext/puzzlepieces-viaducts.pot @@ -149,6 +149,20 @@ msgid "" "Drag the ONE-WAY ROAD network THROUGH the transition to use." msgstr "" +msgctxt "2026960B-2A592FD1-5C08000F" +msgid "" +"1-Level Avenue FLEX On-Slope Transition (works for L0-L1 or L1-L2)\n" +"\n" +"Drag the Avenue network through the transition." +msgstr "" + +msgctxt "2026960B-2A592FD1-5C08010F" +msgid "" +"2-Level Avenue FLEX On-Slope Transition (works for L0-L2)\n" +"\n" +"Drag the Avenue network through the transition." +msgstr "" + msgctxt "2026960B-2A592FD1-5C080200" msgid "" "1-Level FLEX Avenue Ramp-Style Height Transition (works for L0-L1 or L1-L2)\n" From e41eb7657eb05cdda9fb337a5bea260acf097dab Mon Sep 17 00:00:00 2001 From: memo Date: Sun, 9 Jul 2023 16:55:26 +0200 Subject: [PATCH 2/6] add new dedicated OWR FLEX-OSTs --- .../OnewayroadBasic/RUL11_OWR_Basic.rul | 10 ++ .../RUL11_OWR_Basic_memoOWRArrowReduction.rul | 11 ++ .../7000_Road_NWM/7F00_ElevatedViaducts.txt | 132 ++++++++++++++++++ .../RUL1/02_Rail/08_Rail_OneWayRoad.txt | 15 +- .../RUL1/04_Street/08_Street_OneWayRoad.txt | 6 +- .../06_Lightrail/08_Lightrail_OneWayRoad.txt | 6 + .../08_OneWayRoad/09_OneWayRoad_Dirtroad.txt | 5 +- ltext/puzzlepieces-viaducts.pot | 14 ++ 8 files changed, 192 insertions(+), 7 deletions(-) diff --git a/Controller/INRULs/OnewayroadBasic/RUL11_OWR_Basic.rul b/Controller/INRULs/OnewayroadBasic/RUL11_OWR_Basic.rul index 96413af96..9ec053c1b 100644 --- a/Controller/INRULs/OnewayroadBasic/RUL11_OWR_Basic.rul +++ b/Controller/INRULs/OnewayroadBasic/RUL11_OWR_Basic.rul @@ -828,4 +828,14 @@ 3,0,0x00000100,0,0 1,4,0,0,0 3,0,0x00000100,1,0 +; +; tiles adjacent to on-slope transitions +1,0,4,0,4 +3,0,0x09004B00,0,0 +1,4,0,4,0 +3,0,0x09004B00,1,0 +1,2,4,2,4 +3,0,0x09020700,0,0 +1,4,2,4,2 +3,0,0x09020700,0,0 ; \ No newline at end of file diff --git a/Controller/INRULs/OnewayroadBasic/RUL11_OWR_Basic_memoOWRArrowReduction.rul b/Controller/INRULs/OnewayroadBasic/RUL11_OWR_Basic_memoOWRArrowReduction.rul index 631354c89..3f8fb335a 100644 --- a/Controller/INRULs/OnewayroadBasic/RUL11_OWR_Basic_memoOWRArrowReduction.rul +++ b/Controller/INRULs/OnewayroadBasic/RUL11_OWR_Basic_memoOWRArrowReduction.rul @@ -851,3 +851,14 @@ 3,0,0x09040E00,0,1 1,13,13,13,13 3,0,0x09040D00,0,1 +; +; tiles adjacent to on-slope transitions +1,0,4,0,4 +3,0,0x09004B00,0,0 +1,4,0,4,0 +3,0,0x09004B00,1,0 +1,2,4,2,4 +3,0,0x09020700,0,0 +1,4,2,4,2 +3,0,0x09020700,0,0 +; diff --git a/Controller/RUL0/7000_Road_NWM/7F00_ElevatedViaducts.txt b/Controller/RUL0/7000_Road_NWM/7F00_ElevatedViaducts.txt index c64072174..d4757ba5c 100644 --- a/Controller/RUL0/7000_Road_NWM/7F00_ElevatedViaducts.txt +++ b/Controller/RUL0/7000_Road_NWM/7F00_ElevatedViaducts.txt @@ -20,6 +20,8 @@ AddTypes = 7F09, 17F09, 27F09, 37F09, 47F09, 57F09, 67F09, 77F09, 87F09, 97F09, AddTypes = 7F10, 17F10, 27F10, 37F10, 47F10, 57F10, 67F10, 77F10, 87F10, 97F10, A7F10, B7F10, C7F10, D7F10, E7F10, F7F10 ;Road 1-Level FLEX-HT Diag 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 AddTypes = 7F12, 17F12, 27F12, 37F12, 47F12, 57F12, 67F12, 77F12, 87F12, 97F12, A7F12, B7F12, C7F12, D7F12, E7F12, F7F12 ;Avenue 1-Level FLEX-HT Diag +AddTypes = 7F15, 17F15, 27F15, 37F15, 47F15, 57F15, 67F15, 77F15, 87F15, 97F15, A7F15, B7F15, C7F15, D7F15, E7F15, F7F15 ;One-Way Road 1-Level FLEX-OST +AddTypes = 7F16, 17F16, 27F16, 37F16, 47F16, 57F16, 67F16, 77F16, 87F16, 97F16, A7F16, B7F16, C7F16, D7F16, E7F16, F7F16 ;One-Way Road 2-Level FLEX-OST AddTypes = 7F17, 17F17, 27F17, 37F17, 47F17, 57F17, 67F17, 77F17, 87F17, 97F17, A7F17, B7F17, C7F17, D7F17, E7F17, F7F17 ;Avenue 1-Level FLEX-OST AddTypes = 7F18, 17F18, 27F18, 37F18, 47F18, 57F18, 67F18, 77F18, 87F18, 97F18, A7F18, B7F18, C7F18, D7F18, E7F18, F7F18 ;Avenue 2-Level FLEX-OST @@ -1208,6 +1210,136 @@ CopyFrom = 0x67F12 CopyFrom = 0x77F12 +[HighwayIntersectionInfo_0x00007F15] +;Added by memo 2023-07-09 +;OWR FLEXSlope-L1 +Piece = 48.0, 0.0, 1, 0, 0x5700001f +PreviewEffect = preview_ost_orth_alt_flex_001 + +CellLayout=........ +CellLayout=..zba..< +CellLayout=..^..... + +CheckType = a - rail: 0x00040000 onewayroad: 0x00020002, 0x00000000 optional +CheckType = b - onewayroad: 0x00040004, 0x000000FF optional +CheckType = z - onewayroad: 0x00040004 + +ConsLayout=........ +ConsLayout=..+....< +ConsLayout=..^..... + +AutoTileBase = 0x55387000 +PlaceQueryID = 0x5C07000F +Costs = 600 + +[HighwayIntersectionInfo_0x00017F15] +CopyFrom = 0x7F15 +Rotate = 1 + +[HighwayIntersectionInfo_0x00027F15] +; OWR FLEXSlope-L1 (rotated by 180 degrees) +; Added by memo 2023-07-09 +; Having a dedicated 180-degree rotation has the advantage that we can use an +; ordinary orthogonal tile on one side adjacent to the On-Slope Transition which +; overall behaves more intuitively than the 0x00040004 tile. +; Moreover, the use of 00-flags on the sides makes it easier to bulldoze parallel OSTs. +Piece = -48.0, 0.0, 3, 0, 0x5700001f +PreviewEffect = preview_ost_orth_alt_flex_001 + +CellLayout=........ +CellLayout=..ba.z.< +CellLayout=.....^.. + +CheckType = a - rail: 0x00000004 onewayroad: 0x00020002, 0x00000000 optional +CheckType = b - onewayroad: 0x00040004, 0x000000FF optional +CheckType = z - onewayroad: 0x00040004 + +ConsLayout=........ +ConsLayout=.....+.< +ConsLayout=.....^.. + +AutoTileBase = 0x55387000 +PlaceQueryID = 0x5C07000F +Costs = 600 + +[HighwayIntersectionInfo_0x00037F15] +CopyFrom = 0x27F15 +Rotate = 1 +[HighwayIntersectionInfo_0x00047F15] +CopyFrom = 0x7F15 +[HighwayIntersectionInfo_0x00057F15] +CopyFrom = 0x17F15 +[HighwayIntersectionInfo_0x00067F15] +CopyFrom = 0x27F15 +[HighwayIntersectionInfo_0x00077F15] +CopyFrom = 0x37F15 + + +[HighwayIntersectionInfo_0x00007F16] +;Added by memo 2023-07-09 +;OWR FLEXSlope-L2 +Piece = 48.0, 0.0, 1, 0, 0x5700002f +PreviewEffect = preview_ost_orth_alt_flex_002 + +CellLayout=........ +CellLayout=..zba..< +CellLayout=..^..... + +CheckType = a - lightrail: 0x00040000 onewayroad: 0x00020002, 0x00000000 optional +CheckType = b - onewayroad: 0x00040004, 0x000000FF optional +CheckType = z - onewayroad: 0x00040004 + +ConsLayout=........ +ConsLayout=..+....< +ConsLayout=..^..... + +AutoTileBase = 0x55387000 +PlaceQueryID = 0x5C07010F +Costs = 600 + +[HighwayIntersectionInfo_0x00017F16] +CopyFrom = 0x7F16 +Rotate = 1 + +[HighwayIntersectionInfo_0x00027F16] +; OWR FLEXSlope-L2 (rotated by 180 degrees) +; Added by memo 2023-07-09 +; Having a dedicated 180-degree rotation has the advantage that we can use an +; ordinary orthogonal tile on one side adjacent to the On-Slope Transition which +; overall behaves more intuitively than the 0x00040004 tile. +; Moreover, the use of 00-flags on the sides makes it easier to bulldoze parallel OSTs. +Piece = -48.0, 0.0, 3, 0, 0x5700002f +PreviewEffect = preview_ost_orth_alt_flex_002 + +CellLayout=........ +CellLayout=..ba.z.< +CellLayout=.....^.. + +CheckType = a - lightrail: 0x00000004 onewayroad: 0x00020002, 0x00000000 optional +CheckType = b - onewayroad: 0x00040004, 0x000000FF optional +CheckType = z - onewayroad: 0x00040004 + +ConsLayout=........ +ConsLayout=.....+.< +ConsLayout=.....^.. + +AutoTileBase = 0x55387000 +PlaceQueryID = 0x5C07010F +Costs = 600 + +[HighwayIntersectionInfo_0x00037F16] +CopyFrom = 0x27F16 +Rotate = 1 +[HighwayIntersectionInfo_0x00047F16] +CopyFrom = 0x7F16 +[HighwayIntersectionInfo_0x00057F16] +CopyFrom = 0x17F16 +[HighwayIntersectionInfo_0x00067F16] +CopyFrom = 0x27F16 +[HighwayIntersectionInfo_0x00077F16] +CopyFrom = 0x37F16 + + [HighwayIntersectionInfo_0x00007F17] ;Added by memo 2023-07-03 ;Avenue FLEXSlope-L1 diff --git a/Controller/RUL1/02_Rail/08_Rail_OneWayRoad.txt b/Controller/RUL1/02_Rail/08_Rail_OneWayRoad.txt index 0c6e81ee1..8b1bba029 100644 --- a/Controller/RUL1/02_Rail/08_Rail_OneWayRoad.txt +++ b/Controller/RUL1/02_Rail/08_Rail_OneWayRoad.txt @@ -122,12 +122,19 @@ TYPE8=0x01000001,0x03010000,0x51040200,1,1 ; ; + +; OWR L1 OST +TYPE1=0x04000000,0x02000200,0x5C070000,2,0 +TYPE2=0x00000004,0x00020002,0x5C070000,3,0 +TYPE3=0x00000400,0x02000200,0x5C070000,0,0 +TYPE4=0x00040000,0x00020002,0x5C070000,1,0 + ;Legacy code, to be removed or repurposed ~ memo ;OWR-HT Top -TYPE1=0x00000400,0x02000200,0x5C070200,0,0 -TYPE2=0x00040000,0x00020002,0x5C070200,1,0 -TYPE3=0x04000000,0x02000200,0x5C070200,2,0 -TYPE4=0x00000004,0x00020002,0x5C070200,3,0 +;TYPE1=0x00000400,0x02000200,0x5C070200,0,0 +;TYPE2=0x00040000,0x00020002,0x5C070200,1,0 +;TYPE3=0x04000000,0x02000200,0x5C070200,2,0 +;TYPE4=0x00000004,0x00020002,0x5C070200,3,0 ;OWR-HT Bottom TYPE1=0x00040404,0x02000200,0x5C070230,0,0 diff --git a/Controller/RUL1/04_Street/08_Street_OneWayRoad.txt b/Controller/RUL1/04_Street/08_Street_OneWayRoad.txt index ea74e3208..741bb0329 100644 --- a/Controller/RUL1/04_Street/08_Street_OneWayRoad.txt +++ b/Controller/RUL1/04_Street/08_Street_OneWayRoad.txt @@ -330,5 +330,7 @@ TYPE1=0x02020202,0x01010101,0x5C532100,0,0 TYPE1=0x02020202,0x03030303,0x5C534100,0,0 - - +; crossing adjacent to OWR on-slope transition +TYPE1=0x02000200,0x00040004,0x09aa0A00,0,0 +TYPE2=0x00020002,0x04000400,0x09aa0A00,1,0 +; diff --git a/Controller/RUL1/06_Lightrail/08_Lightrail_OneWayRoad.txt b/Controller/RUL1/06_Lightrail/08_Lightrail_OneWayRoad.txt index 0ec00a956..45ad9a051 100644 --- a/Controller/RUL1/06_Lightrail/08_Lightrail_OneWayRoad.txt +++ b/Controller/RUL1/06_Lightrail/08_Lightrail_OneWayRoad.txt @@ -314,3 +314,9 @@ TYPE4=0x01000004,0x00020002,0x5C040000,3,0 ;Use for semi-draggable continuation of Tram-in/on-OneWayRoad ;TYPE1=0x00000000,0x02000200,IID,0,0 ;TYPE2=0x00000000,0x00020002,IID,1,0 + +; OWR L2 OST +TYPE1=0x04000000,0x02000200,0x5C070100,2,0 +TYPE2=0x00000004,0x00020002,0x5C070100,3,0 +TYPE3=0x00000400,0x02000200,0x5C070100,0,0 +TYPE4=0x00040000,0x00020002,0x5C070100,1,0 diff --git a/Controller/RUL1/08_OneWayRoad/09_OneWayRoad_Dirtroad.txt b/Controller/RUL1/08_OneWayRoad/09_OneWayRoad_Dirtroad.txt index f59797daf..2f07321e1 100644 --- a/Controller/RUL1/08_OneWayRoad/09_OneWayRoad_Dirtroad.txt +++ b/Controller/RUL1/08_OneWayRoad/09_OneWayRoad_Dirtroad.txt @@ -140,9 +140,12 @@ TYPE4=0x02020000,0x00000202,0x5760B800,2,0 ; TYPE1=0x00020002,0x02000200,0x57001200,0,0 TYPE2=0x02000200,0x00020002,0x57001200,1,0 -;OnSlope +;OnSlope RHW TYPE1=0x00020002,0x04000400,0x57001200,0,0 TYPE2=0x02000200,0x00040004,0x57001200,1,0 +;OnSlope OWR +TYPE1=0x00040004,0x02000200,0x57001200,0,0 +TYPE2=0x04000400,0x00020002,0x57001200,1,0 ; ;piece 39 (98) ; diff --git a/ltext/puzzlepieces-viaducts.pot b/ltext/puzzlepieces-viaducts.pot index 57f477eb7..8639f3798 100644 --- a/ltext/puzzlepieces-viaducts.pot +++ b/ltext/puzzlepieces-viaducts.pot @@ -107,6 +107,20 @@ msgid "" "Drag the ROAD network up to the transition on both ends to use." msgstr "" +msgctxt "2026960B-2A592FD1-5C07000F" +msgid "" +"1-Level One-Way Road FLEX On-Slope Transition (works for L0-L1 or L1-L2)\n" +"\n" +"Drag the One-Way Road network through the transition." +msgstr "" + +msgctxt "2026960B-2A592FD1-5C07010F" +msgid "" +"2-Level One-Way Road FLEX On-Slope Transition (works for L0-L2)\n" +"\n" +"Drag the One-Way Road network through the transition." +msgstr "" + msgctxt "2026960B-2A592FD1-5C070200" msgid "" "1-Level FLEX One-Way Road Ramp-Style Height Transition (works for L0-L1 or L1-L2)\n" From c229e8ec99256a3acae88f07df365ab8e374cb97 Mon Sep 17 00:00:00 2001 From: memo Date: Sun, 9 Jul 2023 18:53:54 +0200 Subject: [PATCH 3/6] add new dedicated Road FLEX-OSTs --- .../INRULs/RoadBasic/RUL07_Road_Basic.rul | 6 + .../7000_Road_NWM/7F00_ElevatedViaducts.txt | 136 +++++++++++++++++- Controller/RUL1/01_Road/04_Road_Street.txt | 4 + Controller/RUL1/01_Road/09_Road_Dirtroad.txt | 17 +++ .../06_Lightrail/09_Lightrail_Dirtroad.txt | 4 +- ltext/puzzlepieces-viaducts.pot | 14 ++ 6 files changed, 177 insertions(+), 4 deletions(-) diff --git a/Controller/INRULs/RoadBasic/RUL07_Road_Basic.rul b/Controller/INRULs/RoadBasic/RUL07_Road_Basic.rul index 1f70ab31f..77dcc23e5 100644 --- a/Controller/INRULs/RoadBasic/RUL07_Road_Basic.rul +++ b/Controller/INRULs/RoadBasic/RUL07_Road_Basic.rul @@ -1266,3 +1266,9 @@ 3,0,0x5f098B00,1,1 +; crossing adjacent to road on-slope transition +1,02,04,02,04 +3,0,0x00020700,0,0 +1,04,02,04,02 +3,0,0x00020700,0,0 +; diff --git a/Controller/RUL0/7000_Road_NWM/7F00_ElevatedViaducts.txt b/Controller/RUL0/7000_Road_NWM/7F00_ElevatedViaducts.txt index d4757ba5c..0e940ccf0 100644 --- a/Controller/RUL0/7000_Road_NWM/7F00_ElevatedViaducts.txt +++ b/Controller/RUL0/7000_Road_NWM/7F00_ElevatedViaducts.txt @@ -15,11 +15,13 @@ AddTypes = 7F0A, 17F0A, 27F0A, 37F0A, 47F0A, 57F0A, 67F0A, 77F0A, 87F0A, 97F0A, AddTypes = 7F0B, 17F0B, 27F0B, 37F0B, 47F0B, 57F0B, 67F0B, 77F0B, 87F0B, 97F0B, A7F0B, B7F0B, C7F0B, D7F0B, E7F0B, F7F0B ;One-Way Road 2-Level FLEX-HT AddTypes = 7F0C, 17F0C, 27F0C, 37F0C, 47F0C, 57F0C, 67F0C, 77F0C, 87F0C, 97F0C, A7F0C, B7F0C, C7F0C, D7F0C, E7F0C, F7F0C ;Avenue 1-Level FLEX-HT AddTypes = 7F0D, 17F0D, 27F0D, 37F0D, 47F0D, 57F0D, 67F0D, 77F0D, 87F0D, 97F0D, A7F0D, B7F0D, C7F0D, D7F0D, E7F0D, F7F0D ;Avenue 2-Level FLEX-HT -AddTypes = 7F08, 17F08, 27F08, 37F08, 47F08, 57F08, 67F08, 77F08, 87F08, 97F08, A7F08, B7F08, C7F08, D7F08, E7F08, F7F08 ;All-Roadway 1-Level FLEX-OST -AddTypes = 7F09, 17F09, 27F09, 37F09, 47F09, 57F09, 67F09, 77F09, 87F09, 97F09, A7F09, B7F09, C7F09, D7F09, E7F09, F7F09 ;All-Roadway 2-Level FLEX-OST +;AddTypes = 7F08, 17F08, 27F08, 37F08, 47F08, 57F08, 67F08, 77F08, 87F08, 97F08, A7F08, B7F08, C7F08, D7F08, E7F08, F7F08 ;All-Roadway 1-Level FLEX-OST +;AddTypes = 7F09, 17F09, 27F09, 37F09, 47F09, 57F09, 67F09, 77F09, 87F09, 97F09, A7F09, B7F09, C7F09, D7F09, E7F09, F7F09 ;All-Roadway 2-Level FLEX-OST AddTypes = 7F10, 17F10, 27F10, 37F10, 47F10, 57F10, 67F10, 77F10, 87F10, 97F10, A7F10, B7F10, C7F10, D7F10, E7F10, F7F10 ;Road 1-Level FLEX-HT Diag 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 AddTypes = 7F12, 17F12, 27F12, 37F12, 47F12, 57F12, 67F12, 77F12, 87F12, 97F12, A7F12, B7F12, C7F12, D7F12, E7F12, F7F12 ;Avenue 1-Level FLEX-HT Diag +AddTypes = 7F13, 17F13, 27F13, 37F13, 47F13, 57F13, 67F13, 77F13, 87F13, 97F13, A7F13, B7F13, C7F13, D7F13, E7F13, F7F13 ;Road 1-Level FLEX-OST +AddTypes = 7F14, 17F14, 27F14, 37F14, 47F14, 57F14, 67F14, 77F14, 87F14, 97F14, A7F14, B7F14, C7F14, D7F14, E7F14, F7F14 ;Road 2-Level FLEX-OST AddTypes = 7F15, 17F15, 27F15, 37F15, 47F15, 57F15, 67F15, 77F15, 87F15, 97F15, A7F15, B7F15, C7F15, D7F15, E7F15, F7F15 ;One-Way Road 1-Level FLEX-OST AddTypes = 7F16, 17F16, 27F16, 37F16, 47F16, 57F16, 67F16, 77F16, 87F16, 97F16, A7F16, B7F16, C7F16, D7F16, E7F16, F7F16 ;One-Way Road 2-Level FLEX-OST 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 CopyFrom = 0x77F12 +[HighwayIntersectionInfo_0x00007F13] +;Added by memo 2023-07-09 +;Road FLEXSlope-L1 +Piece = 48.0, 0.0, 1, 0, 0x5700001f +PreviewEffect = preview_ost_orth_alt_flex_001 + +CellLayout=........ +CellLayout=..zba..< +CellLayout=..^..... + +CheckType = a - road: 0x00040004 dirtroad: 0x00020001, 0x00000000 optional +CheckType = b - road: 0x00040004, 0x000000FF optional +CheckType = z - road: 0x00040004 + +ConsLayout=........ +ConsLayout=..+....< +ConsLayout=..^..... + +AutoTileBase = 0x55387000 +PlaceQueryID = 0x5C06000F +Costs = 600 + +[HighwayIntersectionInfo_0x00017F13] +CopyFrom = 0x7F13 +Rotate = 1 + +[HighwayIntersectionInfo_0x00027F13] +; Road FLEXSlope-L1 (rotated by 180 degrees) +; Added by memo 2023-07-09 +; Having a dedicated 180-degree rotation has the advantage that we can use an +; ordinary orthogonal tile on one side adjacent to the On-Slope Transition which +; overall behaves more intuitively than the 0x00040004 tile. +; Moreover, the use of 00-flags on the sides makes it easier to bulldoze parallel OSTs. +Piece = -48.0, 0.0, 3, 0, 0x5700001f +PreviewEffect = preview_ost_orth_alt_flex_001 + +CellLayout=........ +CellLayout=..ba.z.< +CellLayout=.....^.. + +CheckType = a - road: 0x00040004 dirtroad: 0x00010002, 0x00000000 optional +CheckType = b - road: 0x00040004, 0x000000FF optional +CheckType = z - road: 0x00040004 + +ConsLayout=........ +ConsLayout=.....+.< +ConsLayout=.....^.. + +AutoTileBase = 0x55387000 +PlaceQueryID = 0x5C06000F +Costs = 600 + +[HighwayIntersectionInfo_0x00037F13] +CopyFrom = 0x27F13 +Rotate = 1 +[HighwayIntersectionInfo_0x00047F13] +CopyFrom = 0x7F13 +[HighwayIntersectionInfo_0x00057F13] +CopyFrom = 0x17F13 +[HighwayIntersectionInfo_0x00067F13] +CopyFrom = 0x27F13 +[HighwayIntersectionInfo_0x00077F13] +CopyFrom = 0x37F13 + + +[HighwayIntersectionInfo_0x00007F14] +;Added by memo 2023-07-09 +;Road FLEXSlope-L2 +Piece = 48.0, 0.0, 1, 0, 0x5700002f +PreviewEffect = preview_ost_orth_alt_flex_002 + +CellLayout=........ +CellLayout=..zba..< +CellLayout=..^..... + +CheckType = a - road: 0x00040004 dirtroad: 0x00020003, 0x00000000 optional +CheckType = b - road: 0x00040004, 0x000000FF optional +CheckType = z - road: 0x00040004 + +ConsLayout=........ +ConsLayout=..+....< +ConsLayout=..^..... + +AutoTileBase = 0x55387000 +PlaceQueryID = 0x5C06010F +Costs = 600 + +[HighwayIntersectionInfo_0x00017F14] +CopyFrom = 0x7F14 +Rotate = 1 + +[HighwayIntersectionInfo_0x00027F14] +; Road FLEXSlope-L2 (rotated by 180 degrees) +; Added by memo 2023-07-09 +; Having a dedicated 180-degree rotation has the advantage that we can use an +; ordinary orthogonal tile on one side adjacent to the On-Slope Transition which +; overall behaves more intuitively than the 0x00040004 tile. +; Moreover, the use of 00-flags on the sides makes it easier to bulldoze parallel OSTs. +Piece = -48.0, 0.0, 3, 0, 0x5700002f +PreviewEffect = preview_ost_orth_alt_flex_002 + +CellLayout=........ +CellLayout=..ba.z.< +CellLayout=.....^.. + +CheckType = a - road: 0x00040004 dirtroad: 0x00030002, 0x00000000 optional +CheckType = b - road: 0x00040004, 0x000000FF optional +CheckType = z - road: 0x00040004 + +ConsLayout=........ +ConsLayout=.....+.< +ConsLayout=.....^.. + +AutoTileBase = 0x55387000 +PlaceQueryID = 0x5C06010F +Costs = 600 + +[HighwayIntersectionInfo_0x00037F14] +CopyFrom = 0x27F14 +Rotate = 1 +[HighwayIntersectionInfo_0x00047F14] +CopyFrom = 0x7F14 +[HighwayIntersectionInfo_0x00057F14] +CopyFrom = 0x17F14 +[HighwayIntersectionInfo_0x00067F14] +CopyFrom = 0x27F14 +[HighwayIntersectionInfo_0x00077F14] +CopyFrom = 0x37F14 + + [HighwayIntersectionInfo_0x00007F15] ;Added by memo 2023-07-09 ;OWR FLEXSlope-L1 diff --git a/Controller/RUL1/01_Road/04_Road_Street.txt b/Controller/RUL1/01_Road/04_Road_Street.txt index e2e23053b..31ebbc251 100644 --- a/Controller/RUL1/01_Road/04_Road_Street.txt +++ b/Controller/RUL1/01_Road/04_Road_Street.txt @@ -681,3 +681,7 @@ TYPE8=0x01040400,0x00020000,0x5f098f00,3,1 TYPE1=0x02020202,0x01010101,0x5C531300,0,0 +; crossing adjacent to road on-slope transition +TYPE1=0x00040004,0x02000200,0x00AA0A00,0,0 +TYPE2=0x04000400,0x00020002,0x00AA0A00,1,0 +; diff --git a/Controller/RUL1/01_Road/09_Road_Dirtroad.txt b/Controller/RUL1/01_Road/09_Road_Dirtroad.txt index 4762f2890..07082a477 100644 --- a/Controller/RUL1/01_Road/09_Road_Dirtroad.txt +++ b/Controller/RUL1/01_Road/09_Road_Dirtroad.txt @@ -658,3 +658,20 @@ TYPE1=0x00000000,0x02020202,0x57D09E00,0,0 ;TYPE2=0x02020200,0x00040002,0x57E24400,1,0 ;TYPE3=0x02020002,0x04000200,0x57E24400,2,0 ;TYPE4=0x02000202,0x00020004,0x57E24400,3,0 + + +; Road L1 Onslope +TYPE1=0x04000400,0x01000200,0x5C060000,0,0 +TYPE2=0x00040004,0x00020001,0x5C060000,1,0 +TYPE3=0x04000400,0x02000100,0x5C060000,2,0 +TYPE4=0x00040004,0x00010002,0x5C060000,3,0 +; Road L2 Onslope +TYPE1=0x04000400,0x02000300,0x5C060100,2,0 +TYPE2=0x00040004,0x00030002,0x5C060100,3,0 +TYPE3=0x04000400,0x03000200,0x5C060100,0,0 +TYPE4=0x00040004,0x00020003,0x5C060100,1,0 +; +; crossing adjacent to road on-slope transition +TYPE1=0x00040004,0x02000200,0x57001100,0,0 +TYPE2=0x04000400,0x00020002,0x57001100,1,0 +; diff --git a/Controller/RUL1/06_Lightrail/09_Lightrail_Dirtroad.txt b/Controller/RUL1/06_Lightrail/09_Lightrail_Dirtroad.txt index 52c05ed0a..fef6571aa 100644 --- a/Controller/RUL1/06_Lightrail/09_Lightrail_Dirtroad.txt +++ b/Controller/RUL1/06_Lightrail/09_Lightrail_Dirtroad.txt @@ -280,13 +280,13 @@ TYPE8=0x00040200,0x00000301,0x57700810,3,1 ;TYPE7=0x04000002,0x00030100,0x57700800,2,1 ;TYPE8=0x00000204,0x00000301,0x57700800,3,1 -;L1 Onslope +;L1 Onslope (legacy, so can be repurposed ~ memo) TYPE1=0x04040000,0x00000200,0x57700000,2,0 TYPE2=0x04000004,0x00020000,0x57700000,3,0 TYPE3=0x00000404,0x02000000,0x57700000,0,0 TYPE4=0x00040400,0x00000002,0x57700000,1,0 -;L2 Onslope +;L2 Onslope (legacy, so can be repurposed ~ memo) TYPE1=0x04040400,0x00000200,0x57700100,2,0 TYPE2=0x04040004,0x00020000,0x57700100,3,0 TYPE3=0x04000404,0x02000000,0x57700100,0,0 diff --git a/ltext/puzzlepieces-viaducts.pot b/ltext/puzzlepieces-viaducts.pot index 8639f3798..a816fb2cc 100644 --- a/ltext/puzzlepieces-viaducts.pot +++ b/ltext/puzzlepieces-viaducts.pot @@ -58,6 +58,20 @@ msgid "" "Drag the ROAD network up to the transition on both ends to use." msgstr "" +msgctxt "2026960B-2A592FD1-5C06000F" +msgid "" +"1-Level Road FLEX On-Slope Transition (works for L0-L1 or L1-L2)\n" +"\n" +"Drag the Road network through the transition." +msgstr "" + +msgctxt "2026960B-2A592FD1-5C06010F" +msgid "" +"2-Level Road FLEX On-Slope Transition (works for L0-L2)\n" +"\n" +"Drag the Road network through the transition." +msgstr "" + msgctxt "2026960B-2A592FD1-5C060200" msgid "" "1-Level FLEX Road Ramp-Style Height Transition (works for L0-L1 or L1-L2)\n" From 4e1b10628809c42547f73116b179f75a4a469104 Mon Sep 17 00:00:00 2001 From: memo Date: Tue, 12 Aug 2025 16:26:10 +0200 Subject: [PATCH 4/6] remove viaduct OST RUL2 overrides In particular stub-based, T-based or any other form of disconnected OST overrides. Some RUL2 code for alt viaducts and viaduct FTLs is kept unchanged. --- Controller/RUL2/03_Turn_Lanes/Sec3d_FTL.txt | 16 - .../RUL2/03_Turn_Lanes/Sec3k_L1_FTL.txt | 12 - .../RUL2/03_Turn_Lanes/Sec3l_L2_FTL.txt | 12 - Controller/RUL2/06_Road_Viaducts/Sec6a_L1.txt | 1938 +---------------- .../07_RHW/Sec7k_FlexSPUI/Sec7kc_FlexDDI.txt | 28 - .../Sec13d_DualNetworking_Crossings.txt | 24 - 6 files changed, 19 insertions(+), 2011 deletions(-) diff --git a/Controller/RUL2/03_Turn_Lanes/Sec3d_FTL.txt b/Controller/RUL2/03_Turn_Lanes/Sec3d_FTL.txt index 1353c8ba7..5ccbc4c18 100644 --- a/Controller/RUL2/03_Turn_Lanes/Sec3d_FTL.txt +++ b/Controller/RUL2/03_Turn_Lanes/Sec3d_FTL.txt @@ -248,15 +248,7 @@ 0x5B204600,1,0,0x00004b00,3,0=0x5B204600,1,0,0x5B200F00,1,0 ;RHD 0x5B204600,3,1,0x00004b00,3,0=0x5B204600,3,1,0x5B200F00,3,1 ;LHD ;Transitions to OnSlope -0x5B204000,3,0,0x57700000,1,0=0x5B204000,3,0,0x5C060000,1,0 ;RHD -0x5B204000,1,1,0x57700000,1,0=0x5B204000,1,1,0x5C060000,1,0 ;LHD -0x5B204000,3,0,0x57700100,1,0=0x5B204000,3,0,0x5C060100,1,0 ;RHD -0x5B204000,1,1,0x57700100,1,0=0x5B204000,1,1,0x5C060100,1,0 ;LHD ; -0x5B204400,3,0,0x57700000,1,0=0x5B204400,3,0,0x5C060000,1,0 ;RHD -0x5B204400,1,1,0x57700000,1,0=0x5B204400,1,1,0x5C060000,1,0 ;LHD -0x5B204400,3,0,0x57700100,1,0=0x5B204400,3,0,0x5C060100,1,0 ;RHD -0x5B204400,1,1,0x57700100,1,0=0x5B204400,1,1,0x5C060100,1,0 ;LHD ; ;>> INTERSECTIONS ; @@ -1234,15 +1226,7 @@ 0x5B224300,1,1,0x51100100,1,0=0x5B224300,1,1,0x5B220080,3,1 ;OnSlope Adjacencies ;RHD -0x5B224080,3,0,0x57700000,1,0=0x5B224080,3,0,0x5C080000,1,0 -0x5B224000,3,0,0x57700000,1,0=0x5B224000,3,0,0x5C080000,3,1 -0x5B224080,3,0,0x57700100,1,0=0x5B224080,3,0,0x5C080100,1,0 -0x5B224000,3,0,0x57700100,1,0=0x5B224000,3,0,0x5C080100,3,1 ;LHD -0x5B224000,1,1,0x57700000,1,0=0x5B224000,1,1,0x5C080000,1,0 -0x5B224080,1,1,0x57700000,1,0=0x5B224080,1,1,0x5C080000,3,1 -0x5B224000,1,1,0x57700100,1,0=0x5B224000,1,1,0x5C080100,1,0 -0x5B224080,1,1,0x57700100,1,0=0x5B224080,1,1,0x5C080100,3,1 ;RHW Transitions ;Side Override ;RHD diff --git a/Controller/RUL2/03_Turn_Lanes/Sec3k_L1_FTL.txt b/Controller/RUL2/03_Turn_Lanes/Sec3k_L1_FTL.txt index b9bd339bd..cd7b069f9 100644 --- a/Controller/RUL2/03_Turn_Lanes/Sec3k_L1_FTL.txt +++ b/Controller/RUL2/03_Turn_Lanes/Sec3k_L1_FTL.txt @@ -956,8 +956,6 @@ ;RHD 0x5C020000,1,0,0x5B224000,1,0=0x5C020000,1,0,0x5B22401F,1,0 0x5C020000,3,0,0x5B224080,1,0=0x5C020000,3,0,0x5B22409F,1,0 -0x5C080000,1,0,0x5B224000,1,0=0x5C080000,1,0,0x5B22401F,1,0 -0x5C080000,3,1,0x5B224080,1,0=0x5C080000,3,1,0x5B22409F,1,0 ; 0x5B224000,0,0,0x5C020000,2,0=0x5B22401F,0,0,0x5B22409F,0,0 0x5C020000,0,0,0x5B224080,0,0=0x5B22401F,0,0,0x5B22409F,0,0 @@ -982,8 +980,6 @@ ;LHD 0x5C020000,1,0,0x5B224080,3,1=0x5C020000,1,0,0x5B22401F,3,1 0x5C020000,3,0,0x5B224000,3,1=0x5C020000,3,0,0x5B22409F,3,1 -0x5C080000,1,0,0x5B224080,3,1=0x5C080000,1,0,0x5B22401F,3,1; conflicting-override -0x5C080000,3,1,0x5B224000,3,1=0x5C080000,3,1,0x5B22409F,3,1; conflicting-override ; 0x5B224080,0,1,0x5C020000,2,0=0x5B22409F,0,1,0x5B22401F,0,1 0x5C020000,0,0,0x5B224000,0,1=0x5B22409F,0,1,0x5B22401F,0,1 @@ -1837,8 +1833,6 @@ ;RHD 0x5C020000,1,0,0x5B224200,1,0=0x5C020000,1,0,0x5B22421F,1,0 0x5C020000,3,0,0x5B224280,1,0=0x5C020000,3,0,0x5B22429F,1,0 -0x5C080000,1,0,0x5B224200,1,0=0x5C080000,1,0,0x5B22421F,1,0 -0x5C080000,3,1,0x5B224280,1,0=0x5C080000,3,1,0x5B22429F,1,0 ; 0x5B224200,0,0,0x5C020000,2,0=0x5B22421F,0,0,0x5B22429F,0,0 0x5C020000,0,0,0x5B224280,0,0=0x5B22421F,0,0,0x5B22429F,0,0 @@ -1877,8 +1871,6 @@ ;LHD 0x5C020000,1,0,0x5B224280,3,1=0x5C020000,1,0,0x5B22421F,3,1 0x5C020000,3,0,0x5B224200,3,1=0x5C020000,3,0,0x5B22429F,3,1 -0x5C080000,1,0,0x5B224280,3,1=0x5C080000,1,0,0x5B22421F,3,1; conflicting-override -0x5C080000,3,1,0x5B224200,3,1=0x5C080000,3,1,0x5B22429F,3,1; conflicting-override ; 0x5B224280,0,1,0x5C020000,2,0=0x5B22429F,0,1,0x5B22421F,0,1 0x5C020000,0,0,0x5B224200,0,1=0x5B22429F,0,1,0x5B22421F,0,1 @@ -2102,8 +2094,6 @@ ;RHD 0x5C020000,1,0,0x5B225100,1,0=0x5C020000,1,0,0x5B22511F,1,0 0x5C020000,3,0,0x5B225180,1,0=0x5C020000,3,0,0x5B22519F,1,0 -0x5C080000,1,0,0x5B225100,1,0=0x5C080000,1,0,0x5B22511F,1,0 -0x5C080000,3,1,0x5B225180,1,0=0x5C080000,3,1,0x5B22519F,1,0 ; 0x5B225100,0,0,0x5C020000,2,0=0x5B22511F,0,0,0x5B22519F,0,0 0x5C020000,0,0,0x5B225180,0,0=0x5B22511F,0,0,0x5B22519F,0,0 @@ -2142,8 +2132,6 @@ ;LHD 0x5C020000,1,0,0x5B225180,3,1=0x5C020000,1,0,0x5B22511F,3,1 0x5C020000,3,0,0x5B225100,3,1=0x5C020000,3,0,0x5B22519F,3,1 -0x5C080000,1,0,0x5B225180,3,1=0x5C080000,1,0,0x5B22511F,3,1; conflicting-override -0x5C080000,3,1,0x5B225100,3,1=0x5C080000,3,1,0x5B22519F,3,1; conflicting-override ; 0x5B225180,0,1,0x5C020000,2,0=0x5B22519F,0,1,0x5B22511F,0,1 0x5C020000,0,0,0x5B225100,0,1=0x5B22519F,0,1,0x5B22511F,0,1 diff --git a/Controller/RUL2/03_Turn_Lanes/Sec3l_L2_FTL.txt b/Controller/RUL2/03_Turn_Lanes/Sec3l_L2_FTL.txt index 7ed325e5e..eb8052e32 100644 --- a/Controller/RUL2/03_Turn_Lanes/Sec3l_L2_FTL.txt +++ b/Controller/RUL2/03_Turn_Lanes/Sec3l_L2_FTL.txt @@ -966,8 +966,6 @@ ;RHD 0x5C050000,1,0,0x5B224000,1,0=0x5C050000,1,0,0x5B22402F,1,0 0x5C050000,3,0,0x5B224080,1,0=0x5C050000,3,0,0x5B2240AF,1,0 -0x5C080100,1,0,0x5B224000,1,0=0x5C080100,1,0,0x5B22402F,1,0 -0x5C080100,3,1,0x5B224080,1,0=0x5C080100,3,1,0x5B2240AF,1,0 ; 0x5B224000,0,0,0x5C050000,2,0=0x5B22402F,0,0,0x5B2240AF,0,0 0x5C050000,0,0,0x5B224080,0,0=0x5B22402F,0,0,0x5B2240AF,0,0 @@ -992,8 +990,6 @@ ;LHD 0x5C050000,1,0,0x5B224080,3,1=0x5C050000,1,0,0x5B22402F,3,1 0x5C050000,3,0,0x5B224000,3,1=0x5C050000,3,0,0x5B2240AF,3,1 -0x5C080100,1,0,0x5B224080,3,1=0x5C080100,1,0,0x5B22402F,3,1; conflicting-override -0x5C080100,3,1,0x5B224000,3,1=0x5C080100,3,1,0x5B2240AF,3,1; conflicting-override ; 0x5B224080,0,1,0x5C050000,2,0=0x5B2240AF,0,1,0x5B22402F,0,1 0x5C050000,0,0,0x5B224000,0,1=0x5B2240AF,0,1,0x5B22402F,0,1 @@ -1930,8 +1926,6 @@ ;RHD 0x5C050000,1,0,0x5B224200,1,0=0x5C050000,1,0,0x5B22422F,1,0 0x5C050000,3,0,0x5B224280,1,0=0x5C050000,3,0,0x5B2242AF,1,0 -0x5C080100,1,0,0x5B224200,1,0=0x5C080100,1,0,0x5B22422F,1,0 -0x5C080100,3,1,0x5B224280,1,0=0x5C080100,3,1,0x5B2242AF,1,0 ; 0x5B224200,0,0,0x5C050000,2,0=0x5B22422F,0,0,0x5B2242AF,0,0 0x5C050000,0,0,0x5B224280,0,0=0x5B22422F,0,0,0x5B2242AF,0,0 @@ -1970,8 +1964,6 @@ ;LHD 0x5C050000,1,0,0x5B224280,3,1=0x5C050000,1,0,0x5B22422F,3,1 0x5C050000,3,0,0x5B224200,3,1=0x5C050000,3,0,0x5B2242AF,3,1 -0x5C080100,1,0,0x5B224280,3,1=0x5C080100,1,0,0x5B22422F,3,1; conflicting-override -0x5C080100,3,1,0x5B224200,3,1=0x5C080100,3,1,0x5B2242AF,3,1; conflicting-override ; 0x5B224280,0,1,0x5C050000,2,0=0x5B2242AF,0,1,0x5B22422F,0,1 0x5C050000,0,0,0x5B224200,0,1=0x5B2242AF,0,1,0x5B22422F,0,1 @@ -2199,8 +2191,6 @@ ;RHD 0x5C050000,1,0,0x5B225100,1,0=0x5C050000,1,0,0x5B22512F,1,0 0x5C050000,3,0,0x5B225180,1,0=0x5C050000,3,0,0x5B2251AF,1,0 -0x5C080100,1,0,0x5B225100,1,0=0x5C080100,1,0,0x5B22512F,1,0 -0x5C080100,3,1,0x5B225180,1,0=0x5C080100,3,1,0x5B2251AF,1,0 ; 0x5B225100,0,0,0x5C050000,2,0=0x5B22512F,0,0,0x5B2251AF,0,0 0x5C050000,0,0,0x5B225180,0,0=0x5B22512F,0,0,0x5B2251AF,0,0 @@ -2239,8 +2229,6 @@ ;LHD 0x5C050000,1,0,0x5B225180,3,1=0x5C050000,1,0,0x5B22512F,3,1 0x5C050000,3,0,0x5B225100,3,1=0x5C050000,3,0,0x5B2251AF,3,1 -0x5C080100,1,0,0x5B225180,3,1=0x5C080100,1,0,0x5B22512F,3,1; conflicting-override -0x5C080100,3,1,0x5B225100,3,1=0x5C080100,3,1,0x5B2251AF,3,1; conflicting-override ; 0x5B225180,0,1,0x5C050000,2,0=0x5B2251AF,0,1,0x5B22512F,0,1 0x5C050000,0,0,0x5B225100,0,1=0x5B2251AF,0,1,0x5B22512F,0,1 diff --git a/Controller/RUL2/06_Road_Viaducts/Sec6a_L1.txt b/Controller/RUL2/06_Road_Viaducts/Sec6a_L1.txt index 60a7c926e..af7210f5a 100644 --- a/Controller/RUL2/06_Road_Viaducts/Sec6a_L1.txt +++ b/Controller/RUL2/06_Road_Viaducts/Sec6a_L1.txt @@ -5157,31 +5157,13 @@ ;ROAD VIADUCTS ;L0-to-L1 ;L0 Stub into Onslope -0x00000300,1,0,0x57700000,1,0=0x00004B00,1,0,0x5C060000,1,0 -0x00004B00,1,0,0x57700000,1,0=0x00004B00,1,0,0x5C060000,1,0 -0x00000300,1,0,0x5C060000,1,0=0x00004B00,1,0,0x5C060000,1,0 ;Onslope into Elevated -0x57700000,1,0,0x00000300,3,0=0x5C060000,1,0,0x5C000000,1,0 -0x57700000,1,0,0x5C000000,1,0=0x5C060000,1,0,0x5C000000,1,0 -0x5C060000,1,0,0x00000300,3,0=0x5C060000,1,0,0x5C000000,1,0 ;Various Onslope Types - COPY TO OTHER NETWORKS AND HEIGHTS -0x00000F00,2,0,0x57700000,1,0=0x00005700,3,0,0x5C060000,1,0 -0x00000F00,2,0,0x5C060000,1,0=0x00005700,3,0,0x5C060000,1,0 -0x00000F00,1,0,0x57700000,1,0=0x00005700,1,0,0x5C060000,1,0 -0x00000F00,1,0,0x5C060000,1,0=0x00005700,1,0,0x5C060000,1,0 ; -0x00aa0400,2,0,0x57700000,1,0=0x00aa0a00,0,0,0x5C060000,1,0 -0x00aa0400,2,0,0x5C060000,1,0=0x00aa0a00,0,0,0x5C060000,1,0 ; -0x00005700,2,0,0x57700000,1,0=0x00020700,0,0,0x5C060000,1,0 -0x00005700,2,0,0x5C060000,1,0=0x00020700,0,0,0x5C060000,1,0 ; ; -0x04008800,0,0,0x57700000,1,0=0x04008900,2,0,0x5C060000,1,0 -0x04008800,0,0,0x5C060000,1,0=0x04008900,2,0,0x5C060000,1,0 ; -0x57600100,2,0,0x57700000,1,0=0x57001100,0,0,0x5C060000,1,0 -0x57600100,2,0,0x5C060000,1,0=0x57001100,0,0,0x5C060000,1,0 ; ; ; @@ -5189,148 +5171,21 @@ ; ; ; -0x51103180,3,0,0x57700000,1,0=0x51101100,1,0,0x5C060000,1,0 -0x51103180,3,0,0x5C060000,1,0=0x51101100,1,0,0x5C060000,1,0 ; -0x51113180,3,0,0x57700000,1,0=0x51111100,1,0,0x5C060000,1,0 -0x51113180,3,0,0x5C060000,1,0=0x51111100,1,0,0x5C060000,1,0 ; -0x51123180,3,0,0x57700000,1,0=0x51121100,1,0,0x5C060000,1,0 -0x51123180,3,0,0x5C060000,1,0=0x51121100,1,0,0x5C060000,1,0 ; -0x51133180,3,0,0x57700000,1,0=0x51131100,1,0,0x5C060000,1,0 -0x51133180,3,0,0x5C060000,1,0=0x51131100,1,0,0x5C060000,1,0 ; -0x51143180,3,0,0x57700000,1,0=0x51141100,1,0,0x5C060000,1,0 -0x51143180,3,0,0x5C060000,1,0=0x51141100,1,0,0x5C060000,1,0 ; -0x51203180,3,0,0x57700000,1,0=0x51201100,1,0,0x5C060000,1,0 -0x51203180,3,0,0x5C060000,1,0=0x51201100,1,0,0x5C060000,1,0 ; -0x51213180,3,0,0x57700000,1,0=0x51211100,1,0,0x5C060000,1,0; missing_paths -0x51213180,3,0,0x5C060000,1,0=0x51211100,1,0,0x5C060000,1,0; missing_paths ;Adjacencies -0x5C060000,1,0,0x00AA0400,0,0=0x5C060000,1,0,0x5C001000,1,0 -0x5C060000,1,0,0x00005700,0,0=0x5C060000,1,0,0x5C001100,1,0 -0x5C060000,1,0,0x09705700,0,0=0x5C060000,1,0,0x5C001200,1,0 -0x5C060000,1,0,0x04008800,2,0=0x5C060000,1,0,0x5C001300,3,0 -0x5C060000,1,0,0x0A001500,3,0=0x5C060000,1,0,0x5C001400,3,0 -0x5C060000,1,0,0x02001500,3,0=0x5C060000,1,0,0x5C001420,3,0 -0x5C060000,1,0,0x03010100,1,0=0x5C060000,1,0,0x5C001500,1,0 -0x5C060000,1,0,0x03010100,3,0=0x5C060000,1,0,0x5C001500,3,0 -0x5C060000,1,0,0x5D341000,1,0=0x5C060000,1,0,0x5C001505,1,0 -0x5C060000,1,0,0x5D341000,3,0=0x5C060000,1,0,0x5C001505,3,0 -0x5C060000,1,0,0x5F880300,1,0=0x5C060000,1,0,0x5C001700,1,0 -0x5C060000,1,0,0x5F880300,3,0=0x5C060000,1,0,0x5C001700,3,0 -0x5C060000,1,0,0x5F888300,1,0=0x5C060000,1,0,0x5C001705,1,0 -0x5C060000,1,0,0x5F888300,3,0=0x5C060000,1,0,0x5C001705,3,0 -0x5C060000,1,0,0x08DD0200,1,0=0x5C060000,1,0,0x5C001720,1,0 -0x5C060000,1,0,0x08DD0200,3,0=0x5C060000,1,0,0x5C001720,3,0 -0x5C060000,1,0,0x5F884300,1,0=0x5C060000,1,0,0x5C001800,1,0 -0x5C060000,1,0,0x5F884300,3,0=0x5C060000,1,0,0x5C001800,3,0 -0x5C060000,1,0,0x5F88C300,1,0=0x5C060000,1,0,0x5C001805,1,0 -0x5C060000,1,0,0x5F88C300,3,0=0x5C060000,1,0,0x5C001805,3,0 -0x5C060000,1,0,0x0DDD0200,1,0=0x5C060000,1,0,0x5C001920,1,0 -0x5C060000,1,0,0x0DDD0200,3,0=0x5C060000,1,0,0x5C001920,3,0 -0x5C060000,1,0,0x5DDD0300,1,0=0x5C060000,1,0,0x5C001925,1,0 -0x5C060000,1,0,0x5DDD0300,3,0=0x5C060000,1,0,0x5C001925,3,0 -0x5C060000,1,0,0x57600100,0,0=0x5C060000,1,0,0x57001110,0,0 -0x5C060000,1,0,0x57001100,0,0=0x5C060000,1,0,0x57001110,0,0 -0x5C060000,1,0,0x57001100,2,0=0x5C060000,1,0,0x57001110,2,0 -0x5C060000,1,0,0x57610100,0,0=0x5C060000,1,0,0x57011110,0,0 -0x5C060000,1,0,0x57610180,0,0=0x5C060000,1,0,0x57011110,0,0 -0x5C060000,1,0,0x57011100,0,0=0x5C060000,1,0,0x57011110,0,0 -0x5C060000,1,0,0x57620100,0,0=0x5C060000,1,0,0x57021110,0,0 -0x5C060000,1,0,0x57620190,0,0=0x5C060000,1,0,0x57021110,2,0 -0x5C060000,1,0,0x57021100,0,0=0x5C060000,1,0,0x57021110,0,0 -0x5C060000,1,0,0x57021100,2,0=0x5C060000,1,0,0x57021110,2,0 -0x5C060000,1,0,0x57630100,0,0=0x5C060000,1,0,0x57031110,0,0 -0x5C060000,1,0,0x57630180,0,0=0x5C060000,1,0,0x57031110,0,0 -0x5C060000,1,0,0x57031100,0,0=0x5C060000,1,0,0x57031110,0,0 -0x5C060000,1,0,0x57031100,0,0=0x5C060000,1,0,0x57031110,0,0 -0x5C060000,1,0,0x57041100,0,0=0x5C060000,1,0,0x57041110,0,0; missing_paths -0x5C060000,1,0,0x57041100,2,0=0x5C060000,1,0,0x57041110,2,0; missing_paths -0x5C060000,1,0,0x57051180,2,0=0x5C060000,1,0,0x57051190,2,0; missing_paths -0x5C060000,1,0,0x57051100,0,0=0x5C060000,1,0,0x57051110,0,0; missing_paths -0x5C060000,1,0,0x57050000,0,0=0x5C060000,1,0,0x57051110,0,0 -0x5C060000,1,0,0x57061100,0,0=0x5C060000,1,0,0x57061110,0,0; missing_paths -0x5C060000,1,0,0x57060000,0,0=0x5C060000,1,0,0x57061110,0,0 -0x5C060000,1,0,0x57071100,0,0=0x5C060000,1,0,0x57071110,0,0; missing_paths -0x5C060000,1,0,0x57070000,0,0=0x5C060000,1,0,0x57071110,0,0 -0x5C060000,1,0,0x57081100,0,0=0x5C060000,1,0,0x57081110,0,0; missing_paths -0x5C060000,1,0,0x57080000,0,0=0x5C060000,1,0,0x57081110,0,0 -0x5C060000,1,0,0x57091100,0,0=0x5C060000,1,0,0x57091110,0,0; missing_paths -0x5C060000,1,0,0x57090000,0,0=0x5C060000,1,0,0x57091110,0,0 -0x5C060000,1,0,0x51003100,3,0=0x5C060000,1,0,0x5C001A00,1,0 -0x5C060000,1,0,0x51013100,3,0=0x5C060000,1,0,0x5C001B00,1,0 -0x5C060000,1,0,0x51023100,3,0=0x5C060000,1,0,0x5C001C00,1,0 -0x5C060000,1,0,0x51023180,3,0=0x5C060000,1,0,0x5C001C00,3,0 -0x5C060000,1,0,0x51033100,3,0=0x5C060000,1,0,0x5C001D00,1,0 -0x5C060000,1,0,0x51043100,3,0=0x5C060000,1,0,0x5C001E00,1,0 -0x5C060000,1,0,0x51053100,3,0=0x5C060000,1,0,0x5C001F00,1,0 -0x5C060000,1,0,0x51103180,1,0=0x5C060000,1,0,0x5C002000,3,0 -0x5C060000,1,0,0x51113180,1,0=0x5C060000,1,0,0x5C002100,3,0 -0x5C060000,1,0,0x51123180,1,0=0x5C060000,1,0,0x5C002200,3,0 -0x5C060000,1,0,0x51133180,1,0=0x5C060000,1,0,0x5C002300,3,0 -0x5C060000,1,0,0x51143180,1,0=0x5C060000,1,0,0x5C002400,3,0 -0x5C060000,1,0,0x51203180,1,0=0x5C060000,1,0,0x5C002500,3,0 -0x5C060000,1,0,0x51213180,1,0=0x5C060000,1,0,0x5C002600,3,0; missing_paths ;Tight Situations -0x5C060000,1,0,0x05004b00,0,0=0x5C060000,1,0,0x5C001000,1,0 -0x5C060000,1,0,0x05004b00,2,0=0x5C060000,1,0,0x5C001000,1,0 -0x5C060000,1,0,0x00004b00,0,0=0x5C060000,1,0,0x5C001100,1,0 -0x5C060000,1,0,0x00004b00,2,0=0x5C060000,1,0,0x5C001100,1,0 -0x5C060000,1,0,0x09004b00,0,0=0x5C060000,1,0,0x5C001200,1,0 -0x5C060000,1,0,0x09004b00,2,0=0x5C060000,1,0,0x5C001200,1,0 -0x5C060000,1,0,0x5F940300,0,0=0x5C060000,1,0,0x5C001200,1,0 -0x5C060000,1,0,0x5F940300,2,0=0x5C060000,1,0,0x5C001200,1,0 -0x5C060000,1,0,0x04006100,0,0=0x5C060000,1,0,0x5C001300,3,0 0x5C001300,3,0,0x04006100,2,0=0x5C001300,3,0,0x5C001300,1,0 -0x5C060000,1,0,0x0a001500,0,0=0x5C060000,1,0,0x5C001400,3,0 0x5C001300,3,0,0x0a001500,2,0=0x5C001300,3,0,0x5C001400,1,0 -0x5C060000,1,0,0x03031500,0,0=0x5C060000,1,0,0x5C001500,1,0 -0x5C060000,1,0,0x03031500,2,0=0x5C060000,1,0,0x5C001500,1,0 -0x5C060000,1,0,0x5d540000,0,0=0x5C060000,1,0,0x5C001500,1,0 -0x5C060000,1,0,0x5d540000,2,0=0x5C060000,1,0,0x5C001500,1,0 -0x5C060000,1,0,0x5d300000,0,0=0x5C060000,1,0,0x5C001505,1,0 -0x5C060000,1,0,0x5d300000,2,0=0x5C060000,1,0,0x5C001505,1,0 -0x5C060000,1,0,0x5f880000,0,0=0x5C060000,1,0,0x5C001700,1,0 -0x5C060000,1,0,0x5f880000,2,0=0x5C060000,1,0,0x5C001700,1,0 -0x5C060000,1,0,0x5f888000,0,0=0x5C060000,1,0,0x5C001705,1,0 -0x5C060000,1,0,0x5f888000,2,0=0x5C060000,1,0,0x5C001705,1,0 -0x5C060000,1,0,0x08031500,0,0=0x5C060000,1,0,0x5C001720,1,0 -0x5C060000,1,0,0x08031500,2,0=0x5C060000,1,0,0x5C001720,1,0 -0x5C060000,1,0,0x5f884000,0,0=0x5C060000,1,0,0x5C001800,1,0 -0x5C060000,1,0,0x5f884000,2,0=0x5C060000,1,0,0x5C001800,1,0 -0x5C060000,1,0,0x5f88c000,0,0=0x5C060000,1,0,0x5C001805,1,0 -0x5C060000,1,0,0x5f88c000,2,0=0x5C060000,1,0,0x5C001805,1,0 -0x5C060000,1,0,0x5dc31500,0,0=0x5C060000,1,0,0x5C001905,1,0 -0x5C060000,1,0,0x5dc31500,2,0=0x5C060000,1,0,0x5C001905,1,0 -0x5C060000,1,0,0x0d031500,0,0=0x5C060000,1,0,0x5C001920,1,0 -0x5C060000,1,0,0x0d031500,2,0=0x5C060000,1,0,0x5C001920,1,0 -0x5C060000,1,0,0x5dd31500,0,0=0x5C060000,1,0,0x5C001925,1,0 -0x5C060000,1,0,0x5dd31500,2,0=0x5C060000,1,0,0x5C001925,1,0 -0x5C060000,1,0,0x51000000,0,0=0x5C060000,1,0,0x5C001A00,1,0 -0x5C060000,1,0,0x51000000,2,0=0x5C060000,1,0,0x5C001A00,1,0 -0x5C060000,1,0,0x51010000,0,0=0x5C060000,1,0,0x5C001B00,1,0 -0x5C060000,1,0,0x51010000,2,0=0x5C060000,1,0,0x5C001B00,1,0 -0x5C060000,1,0,0x51030000,0,0=0x5C060000,1,0,0x5C001D00,1,0 -0x5C060000,1,0,0x51030000,2,0=0x5C060000,1,0,0x5C001D00,1,0 -0x5C060000,1,0,0x51040000,0,0=0x5C060000,1,0,0x5C001E00,1,0 -0x5C060000,1,0,0x51040000,2,0=0x5C060000,1,0,0x5C001E00,1,0 -0x5C060000,1,0,0x51050000,0,0=0x5C060000,1,0,0x5C001F00,1,0 -0x5C060000,1,0,0x51050000,2,0=0x5C060000,1,0,0x5C001F00,1,0 -0x5C060000,1,0,0x51100000,0,0=0x5C060000,1,0,0x5C002000,3,0 0x5C002000,3,0,0x51100000,2,0=0x5C002000,3,0,0x5C002000,1,0 -0x5C060000,1,0,0x51110000,0,0=0x5C060000,1,0,0x5C002100,3,0 0x5C002100,3,0,0x51110000,2,0=0x5C002100,3,0,0x5C002100,1,0 -0x5C060000,1,0,0x51120000,0,0=0x5C060000,1,0,0x5C002200,3,0 0x5C002200,3,0,0x51120000,2,0=0x5C002200,3,0,0x5C002200,1,0 -0x5C060000,1,0,0x51130000,0,0=0x5C060000,1,0,0x5C002300,3,0 0x5C002300,3,0,0x51130000,2,0=0x5C002300,3,0,0x5C002300,1,0 -0x5C060000,1,0,0x51140000,0,0=0x5C060000,1,0,0x5C002400,3,0 0x5C002400,3,0,0x51140000,2,0=0x5C002400,3,0,0x5C002400,1,0 -0x5C060000,1,0,0x51200000,0,0=0x5C060000,1,0,0x5C002500,3,0 0x5C002500,3,0,0x51200080,0,0=0x5C002500,3,0,0x5C002580,1,0 0x5C002500,3,0,0x51200080,2,0=0x5C002500,3,0,0x5C002580,3,0 0x5C002500,3,0,0x51210080,0,0=0x5C002500,3,0,0x5C002680,1,0 @@ -5339,8 +5194,6 @@ 0x5C002580,3,0,0x51200000,2,0=0x5C002580,3,0,0x5C002500,1,0 0x5C002680,1,0,0x51200000,2,0=0x5C002680,1,0,0x5C002500,1,0 0x5C002680,3,0,0x51200000,2,0=0x5C002680,3,0,0x5C002500,1,0 -0x5C060000,1,0,0x51210000,0,0=0x5C060000,1,0,0x5C002600,3,0 -0x5C060000,1,0,0x51210000,2,0=0x5C060000,1,0,0x5C002600,1,0 0x5C002600,3,0,0x51200080,0,0=0x5C002600,3,0,0x5C002580,1,0 0x5C002600,3,0,0x51200080,2,0=0x5C002600,3,0,0x5C002580,3,0 0x5C002600,3,0,0x51210080,0,0=0x5C002600,3,0,0x5C002680,1,0 @@ -5350,64 +5203,13 @@ 0x5C002680,1,0,0x51210000,2,0=0x5C002680,1,0,0x5C002600,1,0 0x5C002680,3,0,0x51210000,2,0=0x5C002680,3,0,0x5C002600,1,0 ; -0x5C060000,1,0,0x584E0000,0,0=0x5C060000,1,0,0x5C002700,1,0 -0x5C060000,1,0,0x584E0000,2,0=0x5C060000,1,0,0x5C002700,1,0 -0x5C060000,1,0,0x58480000,0,0=0x5C060000,1,0,0x5C002800,1,0 -0x5C060000,1,0,0x58480000,2,0=0x5C060000,1,0,0x5C002800,1,0 -0x5C060000,1,0,0x58486C00,0,0=0x5C060000,1,0,0x5C002805,1,0 -0x5C060000,1,0,0x58486C00,2,0=0x5C060000,1,0,0x5C002805,1,0 -0x5C060000,1,0,0x58400000,0,0=0x5C060000,1,0,0x5C002A00,3,0 -; -0x5C060000,1,0,0x57000000,0,0=0x5C060000,1,0,0x57001110,0,0 -0x5C060000,1,0,0x57000000,2,0=0x5C060000,1,0,0x57001110,2,0 -0x5C060000,1,0,0x57100000,0,0=0x5C060000,1,0,0x57101110,0,0 -0x5C060000,1,0,0x57100000,2,0=0x5C060000,1,0,0x57101110,2,0 -0x5C060000,1,0,0x57200000,0,0=0x5C060000,1,0,0x57201110,0,0 -0x5C060000,1,0,0x57200000,2,0=0x5C060000,1,0,0x57201110,2,0 -0x5C060000,1,0,0x57010000,0,0=0x5C060000,1,0,0x57011110,0,0 -0x5C060000,1,0,0x57010000,2,0=0x5C060000,1,0,0x57011110,2,0 -0x5C060000,1,0,0x57210000,0,0=0x5C060000,1,0,0x57211110,0,0 -0x5C060000,1,0,0x57210000,2,0=0x5C060000,1,0,0x57211110,2,0 -0x5C060000,1,0,0x57020000,0,0=0x5C060000,1,0,0x57021110,0,0 -0x5C060000,1,0,0x57020000,2,0=0x5C060000,1,0,0x57021110,2,0 -0x5C060000,1,0,0x57120000,0,0=0x5C060000,1,0,0x57121110,0,0 -0x5C060000,1,0,0x57120000,2,0=0x5C060000,1,0,0x57121110,2,0 -0x5C060000,1,0,0x57220000,0,0=0x5C060000,1,0,0x57221110,0,0 -0x5C060000,1,0,0x57220000,2,0=0x5C060000,1,0,0x57221110,2,0 -0x5C060000,1,0,0x57320000,0,0=0x5C060000,1,0,0x57321110,0,0 -0x5C060000,1,0,0x57320000,2,0=0x5C060000,1,0,0x57321110,2,0 -0x5C060000,1,0,0x57420000,0,0=0x5C060000,1,0,0x57421110,0,0 -0x5C060000,1,0,0x57420000,2,0=0x5C060000,1,0,0x57421110,2,0 -0x5C060000,1,0,0x57030000,0,0=0x5C060000,1,0,0x57031110,0,0 -0x5C060000,1,0,0x57030000,2,0=0x5C060000,1,0,0x57031110,2,0 -0x5C060000,1,0,0x57230000,0,0=0x5C060000,1,0,0x57231110,0,0 -0x5C060000,1,0,0x57230000,2,0=0x5C060000,1,0,0x57231110,2,0 -0x5C060000,1,0,0x57330000,0,0=0x5C060000,1,0,0x57331110,0,0 -0x5C060000,1,0,0x57330000,2,0=0x5C060000,1,0,0x57331110,2,0 -0x5C060000,1,0,0x57430000,0,0=0x5C060000,1,0,0x57431110,0,0 -0x5C060000,1,0,0x57430000,2,0=0x5C060000,1,0,0x57431110,2,0 -0x5C060000,1,0,0x57040000,0,0=0x5C060000,1,0,0x57041110,0,0 -0x5C060000,1,0,0x57040000,2,0=0x5C060000,1,0,0x57041110,2,0 -0x5C060000,1,0,0x57240000,0,0=0x5C060000,1,0,0x57241110,0,0 -0x5C060000,1,0,0x57240000,2,0=0x5C060000,1,0,0x57241110,2,0 -0x5C060000,1,0,0x57340000,0,0=0x5C060000,1,0,0x57341110,0,0 -0x5C060000,1,0,0x57340000,2,0=0x5C060000,1,0,0x57341110,2,0 -0x5C060000,1,0,0x57440000,0,0=0x5C060000,1,0,0x57441110,0,0 -0x5C060000,1,0,0x57440000,2,0=0x5C060000,1,0,0x57441110,2,0 -0x5C060000,1,0,0x57050000,0,0=0x5C060000,1,0,0x57051110,0,0 -0x5C060000,1,0,0x57250000,0,0=0x5C060000,1,0,0x57251110,0,0 +; 0x57051110,0,0,0x57050080,0,0=0x57051110,0,0,0x57051190,0,0 0x57251110,0,0,0x57250080,0,0=0x57251110,0,0,0x57251190,0,0 0x57051190,0,0,0x57050080,2,0=0x57051190,0,0,0x57051190,2,0 0x57251190,0,0,0x57250080,2,0=0x57251190,0,0,0x57251190,2,0 -0x5C060000,1,0,0x57050080,2,0=0x5C060000,1,0,0x57051190,2,0 -0x5C060000,1,0,0x57250080,2,0=0x5C060000,1,0,0x57251190,2,0 0x57051190,2,0,0x57050000,2,0=0x57051190,2,0,0x57051110,2,0 0x57251190,2,0,0x57250000,2,0=0x57251190,2,0,0x57251110,2,0 -0x5C060000,1,0,0x57060000,0,0=0x5C060000,1,0,0x57061110,0,0 -0x5C060000,1,0,0x57260000,0,0=0x5C060000,1,0,0x57261110,0,0 -0x5C060000,1,0,0x57070000,0,0=0x5C060000,1,0,0x57071110,0,0 -0x5C060000,1,0,0x57270000,0,0=0x5C060000,1,0,0x57271110,0,0 0x57061110,0,0,0x57050080,0,0=0x57061110,0,0,0x57051190,0,0 0x57261110,0,0,0x57250080,0,0=0x57261110,0,0,0x57251190,0,0 0x57071110,0,0,0x57050080,0,0=0x57071110,0,0,0x57051190,0,0 @@ -5416,22 +5218,16 @@ 0x57251190,2,0,0x57260000,2,0=0x57251190,2,0,0x57261110,2,0 0x57051190,2,0,0x57070000,2,0=0x57051190,2,0,0x57071110,2,0 0x57251190,2,0,0x57270000,2,0=0x57251190,2,0,0x57271110,2,0 -0x5C060000,1,0,0x57080000,0,0=0x5C060000,1,0,0x57081110,0,0 -0x5C060000,1,0,0x57280000,0,0=0x5C060000,1,0,0x57281110,0,0 0x57081110,0,0,0x57080080,0,0=0x57081100,0,0,0x57081190,0,0; missing_paths 0x57081110,0,0,0x57080080,2,0=0x57081100,0,0,0x57081190,2,0; missing_paths 0x57081190,0,0,0x57080000,2,0=0x57081190,0,0,0x57081100,2,0; missing_paths 0x57081190,2,0,0x57080000,2,0=0x57081190,2,0,0x57081100,2,0; missing_paths -0x5C060000,1,0,0x57090000,0,0=0x5C060000,1,0,0x57091110,0,0 -0x5C060000,1,0,0x57290000,0,0=0x5C060000,1,0,0x57291110,0,0 0x57091110,0,0,0x57080080,0,0=0x57091100,0,0,0x57081190,0,0; missing_paths 0x57091110,0,0,0x57080080,2,0=0x57091100,0,0,0x57081190,2,0; missing_paths 0x57081190,0,0,0x57090000,2,0=0x57081190,0,0,0x57091110,2,0 0x57281190,0,0,0x57290000,2,0=0x57281190,0,0,0x57291110,2,0 0x57081190,2,0,0x57090000,2,0=0x57081190,2,0,0x57091110,2,0 0x57281190,2,0,0x57290000,2,0=0x57281190,2,0,0x57291110,2,0 -0x5C060000,1,0,0x57120100,0,0=0x5C060000,1,0,0x57621110,1,1 -0x5C060000,1,0,0x57120100,2,1=0x5C060000,1,0,0x57621110,3,0 ; 0x57021110,0,0,0x57000000,0,0=0x57021110,0,0,0x57001110,0,0 0x57021110,0,0,0x57000000,2,0=0x57021110,0,0,0x57001110,2,0 @@ -6261,31 +6057,13 @@ 0x57621110,3,1,0x00000100,3,0=0x57621110,3,1,0x5C000000,1,0 ;L0-to-L2 ;L0 Stub into Onslope -0x00000300,1,0,0x57700100,1,0=0x00004B00,1,0,0x5C060100,1,0 -0x00004B00,1,0,0x57700100,1,0=0x00004B00,1,0,0x5C060100,1,0 -0x00000300,1,0,0x5C060100,1,0=0x00004B00,1,0,0x5C060100,1,0 ;Onslope into Elevated -0x57700100,1,0,0x00000300,3,0=0x5C060100,1,0,0x5C030000,1,0 -0x57700100,1,0,0x5C030000,1,0=0x5C060100,1,0,0x5C030000,1,0 -0x5C060100,1,0,0x00000300,3,0=0x5C060100,1,0,0x5C030000,1,0 ;Various Onslope Types - COPY TO OTHER NETWORKS AND HEIGHTS -0x00000F00,2,0,0x57700100,1,0=0x00005700,3,0,0x5C060100,1,0 -0x00000F00,2,0,0x5C060100,1,0=0x00005700,3,0,0x5C060100,1,0 -0x00000F00,1,0,0x57700100,1,0=0x00005700,1,0,0x5C060100,1,0 -0x00000F00,1,0,0x5C060100,1,0=0x00005700,1,0,0x5C060100,1,0 ; -0x00aa0400,2,0,0x57700100,1,0=0x00aa0a00,0,0,0x5C060100,1,0 -0x00aa0400,2,0,0x5C060100,1,0=0x00aa0a00,0,0,0x5C060100,1,0 ; -0x00005700,2,0,0x57700100,1,0=0x00020700,0,0,0x5C060100,1,0 -0x00005700,2,0,0x5C060100,1,0=0x00020700,0,0,0x5C060100,1,0 ; ; -0x04008800,0,0,0x57700100,1,0=0x04008900,2,0,0x5C060100,1,0 -0x04008800,0,0,0x5C060100,1,0=0x04008900,2,0,0x5C060100,1,0 ; -0x57600100,2,0,0x57700100,1,0=0x57001100,0,0,0x5C060100,1,0 -0x57600100,2,0,0x5C060100,1,0=0x57001100,0,0,0x5C060100,1,0 ; ; ; @@ -6293,121 +6071,21 @@ ; ; ; -0x51103180,3,0,0x57700100,1,0=0x51101100,1,0,0x5C060100,1,0 -0x51103180,3,0,0x5C060100,1,0=0x51101100,1,0,0x5C060100,1,0 ; -0x51113180,3,0,0x57700100,1,0=0x51111100,1,0,0x5C060100,1,0 -0x51113180,3,0,0x5C060100,1,0=0x51111100,1,0,0x5C060100,1,0 ; -0x51123180,3,0,0x57700100,1,0=0x51121100,1,0,0x5C060100,1,0 -0x51123180,3,0,0x5C060100,1,0=0x51121100,1,0,0x5C060100,1,0 ; -0x51133180,3,0,0x57700100,1,0=0x51131100,1,0,0x5C060100,1,0 -0x51133180,3,0,0x5C060100,1,0=0x51131100,1,0,0x5C060100,1,0 ; -0x51143180,3,0,0x57700100,1,0=0x51141100,1,0,0x5C060100,1,0 -0x51143180,3,0,0x5C060100,1,0=0x51141100,1,0,0x5C060100,1,0 ; -0x51203180,3,0,0x57700100,1,0=0x51201100,1,0,0x5C060100,1,0 -0x51203180,3,0,0x5C060100,1,0=0x51201100,1,0,0x5C060100,1,0 ; -0x51213180,3,0,0x57700100,1,0=0x51211100,1,0,0x5C060100,1,0; missing_paths -0x51213180,3,0,0x5C060100,1,0=0x51211100,1,0,0x5C060100,1,0; missing_paths ;Adjacencies -0x5C060100,1,0,0x00AA0400,0,0=0x5C060100,1,0,0x5C031000,1,0 -0x5C060100,1,0,0x00005700,0,0=0x5C060100,1,0,0x5C031100,1,0 -0x5C060100,1,0,0x09705700,0,0=0x5C060100,1,0,0x5C031200,1,0 -0x5C060100,1,0,0x04008800,2,0=0x5C060100,1,0,0x5C031300,3,0 -0x5C060100,1,0,0x0A001500,3,0=0x5C060100,1,0,0x5C031400,3,0 -0x5C060100,1,0,0x02001500,3,0=0x5C060100,1,0,0x5C031420,3,0 -0x5C060100,1,0,0x03010100,1,0=0x5C060100,1,0,0x5C031500,1,0 -0x5C060100,1,0,0x03010100,3,0=0x5C060100,1,0,0x5C031500,3,0 -0x5C060100,1,0,0x5D341000,1,0=0x5C060100,1,0,0x5C031505,1,0 -0x5C060100,1,0,0x5D341000,3,0=0x5C060100,1,0,0x5C031505,3,0 -0x5C060100,1,0,0x5F880300,1,0=0x5C060100,1,0,0x5C031700,1,0 -0x5C060100,1,0,0x5F880300,3,0=0x5C060100,1,0,0x5C031700,3,0 -0x5C060100,1,0,0x5F888300,1,0=0x5C060100,1,0,0x5C031705,1,0 -0x5C060100,1,0,0x5F888300,3,0=0x5C060100,1,0,0x5C031705,3,0 -0x5C060100,1,0,0x08DD0200,1,0=0x5C060100,1,0,0x5C031720,1,0 -0x5C060100,1,0,0x08DD0200,3,0=0x5C060100,1,0,0x5C031720,3,0 -0x5C060100,1,0,0x5F884300,1,0=0x5C060100,1,0,0x5C031800,1,0 -0x5C060100,1,0,0x5F884300,3,0=0x5C060100,1,0,0x5C031800,3,0 -0x5C060100,1,0,0x5F88C300,1,0=0x5C060100,1,0,0x5C031805,1,0 -0x5C060100,1,0,0x5F88C300,3,0=0x5C060100,1,0,0x5C031805,3,0 -0x5C060100,1,0,0x0DDD0200,1,0=0x5C060100,1,0,0x5C031920,1,0 -0x5C060100,1,0,0x0DDD0200,3,0=0x5C060100,1,0,0x5C031920,3,0 -0x5C060100,1,0,0x5DDD0300,1,0=0x5C060100,1,0,0x5C031925,1,0; missing_paths -0x5C060100,1,0,0x5DDD0300,3,0=0x5C060100,1,0,0x5C031925,3,0; missing_paths -0x5C060100,1,0,0x51003100,3,0=0x5C060100,1,0,0x5C031A00,1,0 -0x5C060100,1,0,0x51013100,3,0=0x5C060100,1,0,0x5C031B00,1,0 -0x5C060100,1,0,0x51023100,3,0=0x5C060100,1,0,0x5C031C00,1,0 -0x5C060100,1,0,0x51023180,3,0=0x5C060100,1,0,0x5C031C00,3,0 -0x5C060100,1,0,0x51033100,3,0=0x5C060100,1,0,0x5C031D00,1,0 -0x5C060100,1,0,0x51043100,3,0=0x5C060100,1,0,0x5C031E00,1,0 -0x5C060100,1,0,0x51053100,3,0=0x5C060100,1,0,0x5C031F00,1,0 -0x5C060100,1,0,0x51103180,1,0=0x5C060100,1,0,0x5C032000,3,0 -0x5C060100,1,0,0x51113180,1,0=0x5C060100,1,0,0x5C032100,3,0 -0x5C060100,1,0,0x51123180,1,0=0x5C060100,1,0,0x5C032200,3,0 -0x5C060100,1,0,0x51133180,1,0=0x5C060100,1,0,0x5C032300,3,0 -0x5C060100,1,0,0x51143180,1,0=0x5C060100,1,0,0x5C032400,3,0 -0x5C060100,1,0,0x51203180,1,0=0x5C060100,1,0,0x5C032500,3,0 -0x5C060100,1,0,0x51213180,1,0=0x5C060100,1,0,0x5C032600,3,0; missing_paths ;Tight Situations -0x5C060100,1,0,0x05004b00,0,0=0x5C060100,1,0,0x5C031000,1,0 -0x5C060100,1,0,0x05004b00,2,0=0x5C060100,1,0,0x5C031000,1,0 -0x5C060100,1,0,0x00004b00,0,0=0x5C060100,1,0,0x5C031100,1,0 -0x5C060100,1,0,0x00004b00,2,0=0x5C060100,1,0,0x5C031100,1,0 -0x5C060100,1,0,0x09004b00,0,0=0x5C060100,1,0,0x5C031200,1,0 -0x5C060100,1,0,0x09004b00,2,0=0x5C060100,1,0,0x5C031200,1,0 -0x5C060100,1,0,0x5F940300,0,0=0x5C060100,1,0,0x5C031200,1,0 -0x5C060100,1,0,0x5F940300,2,0=0x5C060100,1,0,0x5C031200,1,0 -0x5C060100,1,0,0x04006100,0,0=0x5C060100,1,0,0x5C031300,3,0 0x5C031300,3,0,0x04006100,2,0=0x5C031300,3,0,0x5C031300,1,0 -0x5C060100,1,0,0x0a001500,0,0=0x5C060100,1,0,0x5C031400,3,0 0x5C031300,3,0,0x0a001500,2,0=0x5C031300,3,0,0x5C031400,1,0 -0x5C060100,1,0,0x03031500,0,0=0x5C060100,1,0,0x5C031500,1,0 -0x5C060100,1,0,0x03031500,2,0=0x5C060100,1,0,0x5C031500,1,0 -0x5C060100,1,0,0x5d540000,0,0=0x5C060100,1,0,0x5C031500,1,0 -0x5C060100,1,0,0x5d540000,2,0=0x5C060100,1,0,0x5C031500,1,0 -0x5C060100,1,0,0x5d300000,0,0=0x5C060100,1,0,0x5C031505,1,0 -0x5C060100,1,0,0x5d300000,2,0=0x5C060100,1,0,0x5C031505,1,0 -0x5C060100,1,0,0x5f880000,0,0=0x5C060100,1,0,0x5C031700,1,0 -0x5C060100,1,0,0x5f880000,2,0=0x5C060100,1,0,0x5C031700,1,0 -0x5C060100,1,0,0x5f888000,0,0=0x5C060100,1,0,0x5C031705,1,0 -0x5C060100,1,0,0x5f888000,2,0=0x5C060100,1,0,0x5C031705,1,0 -0x5C060100,1,0,0x08031500,0,0=0x5C060100,1,0,0x5C031720,1,0 -0x5C060100,1,0,0x08031500,2,0=0x5C060100,1,0,0x5C031720,1,0 -0x5C060100,1,0,0x5f884000,0,0=0x5C060100,1,0,0x5C031800,1,0 -0x5C060100,1,0,0x5f884000,2,0=0x5C060100,1,0,0x5C031800,1,0 -0x5C060100,1,0,0x5f88c000,0,0=0x5C060100,1,0,0x5C031805,1,0 -0x5C060100,1,0,0x5f88c000,2,0=0x5C060100,1,0,0x5C031805,1,0 -0x5C060100,1,0,0x5dc31500,0,0=0x5C060100,1,0,0x5C031905,1,0 -0x5C060100,1,0,0x5dc31500,2,0=0x5C060100,1,0,0x5C031905,1,0 -0x5C060100,1,0,0x0d031500,0,0=0x5C060100,1,0,0x5C031920,1,0 -0x5C060100,1,0,0x0d031500,2,0=0x5C060100,1,0,0x5C031920,1,0 -0x5C060100,1,0,0x5dd31500,0,0=0x5C060100,1,0,0x5C031925,1,0; missing_paths -0x5C060100,1,0,0x5dd31500,2,0=0x5C060100,1,0,0x5C031925,1,0; missing_paths -0x5C060100,1,0,0x51000000,0,0=0x5C060100,1,0,0x5C031A00,1,0 -0x5C060100,1,0,0x51000000,2,0=0x5C060100,1,0,0x5C031A00,1,0 -0x5C060100,1,0,0x51010000,0,0=0x5C060100,1,0,0x5C031B00,1,0 -0x5C060100,1,0,0x51010000,2,0=0x5C060100,1,0,0x5C031B00,1,0 -0x5C060100,1,0,0x51030000,0,0=0x5C060100,1,0,0x5C031D00,1,0 -0x5C060100,1,0,0x51030000,2,0=0x5C060100,1,0,0x5C031D00,1,0 -0x5C060100,1,0,0x51040000,0,0=0x5C060100,1,0,0x5C031E00,1,0 -0x5C060100,1,0,0x51040000,2,0=0x5C060100,1,0,0x5C031E00,1,0 -0x5C060100,1,0,0x51050000,0,0=0x5C060100,1,0,0x5C031F00,1,0 -0x5C060100,1,0,0x51050000,2,0=0x5C060100,1,0,0x5C031F00,1,0 -0x5C060100,1,0,0x51100000,0,0=0x5C060100,1,0,0x5C032000,3,0 0x5C032000,3,0,0x51100000,2,0=0x5C032000,3,0,0x5C032000,1,0 -0x5C060100,1,0,0x51110000,0,0=0x5C060100,1,0,0x5C032100,3,0 0x5C032100,3,0,0x51110000,2,0=0x5C032100,3,0,0x5C032100,1,0 -0x5C060100,1,0,0x51120000,0,0=0x5C060100,1,0,0x5C032200,3,0 0x5C032200,3,0,0x51120000,2,0=0x5C032200,3,0,0x5C032200,1,0 -0x5C060100,1,0,0x51130000,0,0=0x5C060100,1,0,0x5C032300,3,0 0x5C032300,3,0,0x51130000,2,0=0x5C032300,3,0,0x5C032300,1,0 -0x5C060100,1,0,0x51140000,0,0=0x5C060100,1,0,0x5C032400,3,0 0x5C032400,3,0,0x51140000,2,0=0x5C032400,3,0,0x5C032400,1,0 -0x5C060100,1,0,0x51200000,0,0=0x5C060100,1,0,0x5C032500,3,0 0x5C032500,3,0,0x51200080,0,0=0x5C032500,3,0,0x5C032580,1,0 0x5C032500,3,0,0x51200080,2,0=0x5C032500,3,0,0x5C032580,3,0 0x5C032500,3,0,0x51210080,0,0=0x5C032500,3,0,0x5C032680,1,0 @@ -6416,8 +6094,6 @@ 0x5C032580,3,0,0x51200000,2,0=0x5C032580,3,0,0x5C032500,1,0 0x5C032680,1,0,0x51200000,2,0=0x5C032680,1,0,0x5C032500,1,0 0x5C032680,3,0,0x51200000,2,0=0x5C032680,3,0,0x5C032500,1,0 -0x5C060100,1,0,0x51210000,0,0=0x5C060100,1,0,0x5C032600,3,0 -0x5C060100,1,0,0x51210000,2,0=0x5C060100,1,0,0x5C032600,1,0 0x5C032600,3,0,0x51200080,0,0=0x5C032600,3,0,0x5C032580,1,0 0x5C032600,3,0,0x51200080,2,0=0x5C032600,3,0,0x5C032580,3,0 0x5C032600,3,0,0x51210080,0,0=0x5C032600,3,0,0x5C032680,1,0 @@ -6427,88 +6103,31 @@ 0x5C032680,1,0,0x51210000,2,0=0x5C032680,1,0,0x5C032600,1,0 0x5C032680,3,0,0x51210000,2,0=0x5C032680,3,0,0x5C032600,1,0 ; -0x5C060100,1,0,0x584E0000,0,0=0x5C060100,1,0,0x5C032700,1,0 -0x5C060100,1,0,0x584E0000,2,0=0x5C060100,1,0,0x5C032700,1,0 -0x5C060100,1,0,0x58480000,0,0=0x5C060100,1,0,0x5C032800,1,0 -0x5C060100,1,0,0x58480000,2,0=0x5C060100,1,0,0x5C032800,1,0 -0x5C060100,1,0,0x58486C00,0,0=0x5C060100,1,0,0x5C032805,1,0 -0x5C060100,1,0,0x58486C00,2,0=0x5C060100,1,0,0x5C032805,1,0 -0x5C060100,1,0,0x58400000,0,0=0x5C060100,1,0,0x5C032A00,3,0 -; -0x5C060100,1,0,0x57000000,0,0=0x5C060100,1,0,0x57001120,0,0 -0x5C060100,1,0,0x57000000,2,0=0x5C060100,1,0,0x57001120,2,0 -0x5C060100,1,0,0x57100000,0,0=0x5C060100,1,0,0x57101120,0,0 -0x5C060100,1,0,0x57100000,2,0=0x5C060100,1,0,0x57101120,2,0 -0x5C060100,1,0,0x57200000,0,0=0x5C060100,1,0,0x57201120,0,0 -0x5C060100,1,0,0x57200000,2,0=0x5C060100,1,0,0x57201120,2,0 -0x5C060100,1,0,0x57010000,0,0=0x5C060100,1,0,0x57011120,0,0 -0x5C060100,1,0,0x57010000,2,0=0x5C060100,1,0,0x57011120,2,0 -0x5C060100,1,0,0x57210000,0,0=0x5C060100,1,0,0x57211120,0,0 -0x5C060100,1,0,0x57210000,2,0=0x5C060100,1,0,0x57211120,2,0 -0x5C060100,1,0,0x57020000,0,0=0x5C060100,1,0,0x57021120,0,0 -0x5C060100,1,0,0x57020000,2,0=0x5C060100,1,0,0x57021120,2,0 -0x5C060100,1,0,0x57120000,0,0=0x5C060100,1,0,0x57121120,0,0 -0x5C060100,1,0,0x57120000,2,0=0x5C060100,1,0,0x57121120,2,0 -0x5C060100,1,0,0x57220000,0,0=0x5C060100,1,0,0x57221120,0,0 -0x5C060100,1,0,0x57220000,2,0=0x5C060100,1,0,0x57221120,2,0 -0x5C060100,1,0,0x57320000,0,0=0x5C060100,1,0,0x57321120,0,0 -0x5C060100,1,0,0x57320000,2,0=0x5C060100,1,0,0x57321120,2,0 -0x5C060100,1,0,0x57420000,0,0=0x5C060100,1,0,0x57421120,0,0 -0x5C060100,1,0,0x57420000,2,0=0x5C060100,1,0,0x57421120,2,0 -0x5C060100,1,0,0x57030000,0,0=0x5C060100,1,0,0x57031120,0,0 -0x5C060100,1,0,0x57030000,2,0=0x5C060100,1,0,0x57031120,2,0 -0x5C060100,1,0,0x57130000,0,0=0x5C060100,1,0,0x57131120,0,0 -0x5C060100,1,0,0x57130000,2,0=0x5C060100,1,0,0x57131120,2,0 -0x5C060100,1,0,0x57330000,0,0=0x5C060100,1,0,0x57331120,0,0 -0x5C060100,1,0,0x57330000,2,0=0x5C060100,1,0,0x57331120,2,0 -0x5C060100,1,0,0x57430000,0,0=0x5C060100,1,0,0x57431120,0,0 -0x5C060100,1,0,0x57430000,2,0=0x5C060100,1,0,0x57431120,2,0 -0x5C060100,1,0,0x57040000,0,0=0x5C060100,1,0,0x57041120,0,0 -0x5C060100,1,0,0x57040000,2,0=0x5C060100,1,0,0x57041120,2,0 -0x5C060100,1,0,0x57240000,0,0=0x5C060100,1,0,0x57241120,0,0; missing_paths -0x5C060100,1,0,0x57240000,2,0=0x5C060100,1,0,0x57241120,2,0; missing_paths -0x5C060100,1,0,0x57340000,0,0=0x5C060100,1,0,0x57341120,0,0 -0x5C060100,1,0,0x57340000,2,0=0x5C060100,1,0,0x57341120,2,0 -0x5C060100,1,0,0x57440000,0,0=0x5C060100,1,0,0x57441120,0,0 -0x5C060100,1,0,0x57440000,2,0=0x5C060100,1,0,0x57441120,2,0 -0x5C060100,1,0,0x57050000,0,0=0x5C060100,1,0,0x57051120,0,0 -0x5C060100,1,0,0x57150000,0,0=0x5C060100,1,0,0x57151120,0,0 +; 0x57051120,0,0,0x57050080,0,0=0x57051120,0,0,0x570511A0,0,0 0x57251120,0,0,0x57150080,0,0=0x57251120,0,0,0x571511A0,0,0; missing_paths 0x570511A0,0,0,0x57050080,2,0=0x570511A0,0,0,0x570511A0,2,0 0x572511A0,0,0,0x57150080,2,0=0x572511A0,0,0,0x571511A0,2,0; missing_paths -0x5C060100,1,0,0x57050080,2,0=0x5C060100,1,0,0x570511A0,2,0 -0x5C060100,1,0,0x57150080,2,0=0x5C060100,1,0,0x571511A0,2,0 0x570511A0,2,0,0x57050000,2,0=0x570511A0,2,0,0x57051120,2,0 0x572511A0,2,0,0x57150000,2,0=0x572511A0,2,0,0x57151120,2,0; missing_paths -0x5C060100,1,0,0x57060000,0,0=0x5C060100,1,0,0x57061120,0,0 -0x5C060100,1,0,0x57160000,0,0=0x5C060100,1,0,0x57161120,0,0 -0x5C060100,1,0,0x57070000,0,0=0x5C060100,1,0,0x57071120,0,0 -0x5C060100,1,0,0x57170000,0,0=0x5C060100,1,0,0x57171120,0,0 0x57061120,0,0,0x57050080,0,0=0x57061120,0,0,0x570511A0,0,0 0x57261120,0,0,0x57150080,0,0=0x57261120,0,0,0x571511A0,0,0; missing_paths 0x570511A0,2,0,0x57060000,2,0=0x570511A0,2,0,0x57061120,2,0 0x572511A0,2,0,0x57160000,2,0=0x572511A0,2,0,0x57161120,2,0; missing_paths 0x570511A0,2,0,0x57070000,2,0=0x570511A0,2,0,0x57071120,2,0 0x572511A0,2,0,0x57170000,2,0=0x572511A0,2,0,0x57171120,2,0; missing_paths -0x5C060100,1,0,0x57080000,0,0=0x5C060100,1,0,0x57081120,0,0 -0x5C060100,1,0,0x57180000,0,0=0x5C060100,1,0,0x57181120,0,0 0x57081120,0,0,0x57080080,0,0=0x57081100,0,0,0x570811A0,0,0; missing_paths 0x57081120,0,0,0x57080080,2,0=0x57081100,0,0,0x570811A0,2,0; missing_paths 0x570811A0,0,0,0x57080000,2,0=0x570811A0,0,0,0x57081100,2,0; missing_paths 0x572811A0,0,0,0x57180000,2,0=0x572811A0,0,0,0x57181100,2,0; missing_paths 0x570811A0,2,0,0x57080000,2,0=0x570811A0,2,0,0x57081100,2,0; missing_paths 0x572811A0,2,0,0x57180000,2,0=0x572811A0,2,0,0x57181100,2,0; missing_paths -0x5C060100,1,0,0x57090000,0,0=0x5C060100,1,0,0x57091120,0,0 -0x5C060100,1,0,0x57190000,0,0=0x5C060100,1,0,0x57191120,0,0 0x57091120,0,0,0x57080080,0,0=0x57091100,0,0,0x570811A0,0,0; missing_paths 0x57091120,0,0,0x57080080,2,0=0x57091100,0,0,0x570811A0,2,0; missing_paths 0x570811A0,0,0,0x57090000,2,0=0x570811A0,0,0,0x57091100,2,0; missing_paths 0x572811A0,0,0,0x57190000,2,0=0x572811A0,0,0,0x57191100,2,0; missing_paths 0x570811A0,2,0,0x57090000,2,0=0x570811A0,2,0,0x57091100,2,0; missing_paths 0x572811A0,2,0,0x57190000,2,0=0x572811A0,2,0,0x57191100,2,0; missing_paths -0x5C060100,1,0,0x57220100,0,0=0x5C060100,1,0,0x57621120,1,1 -0x5C060100,1,0,0x57220100,2,1=0x5C060100,1,0,0x57621120,3,0 ; 0x57021120,0,0,0x57000000,0,0=0x57021120,0,0,0x57001120,0,0 0x57021120,0,0,0x57000000,2,0=0x57021120,0,0,0x57001120,2,0 @@ -7219,100 +6838,23 @@ ;L1-to-L2 ;Into ;L0 Stub into Onslope -0x5C000100,1,0,0x57700000,1,0=0x5C000100,1,0,0x5C060010,1,0 -0x5C000100,3,0,0x5C060000,1,0=0x5C000100,3,0,0x5C060010,1,0 -0x5C000100,1,0,0x57700000,1,0=0x5C000100,1,0,0x5C060010,1,0 -0x5C000100,3,0,0x5C060000,1,0=0x5C000100,3,0,0x5C060010,1,0 -0x5C000100,1,0,0x57700000,1,0=0x5C000100,1,0,0x5C060010,1,0 -0x5C000100,1,0,0x5C060000,1,0=0x5C000100,1,0,0x5C060010,1,0 ;Onslope into Elevated ;Out of -0x5C060010,1,0,0x00004B00,1,0=0x5C060010,1,0,0x5C030000,1,0 -0x5C060010,1,0,0x00004B00,3,0=0x5C060010,1,0,0x5C030000,1,0 -0x5C060010,1,0,0x00000300,3,0=0x5C060010,1,0,0x5C030000,1,0 -0x5C060010,1,0,0x5C000000,1,0=0x5C060010,1,0,0x5C030000,1,0 -0x5C060010,1,0,0x5C000000,3,0=0x5C060010,1,0,0x5C030000,1,0 0x5C030000,1,0,0x5C000000,1,0=0x5C030000,1,0,0x5C030000,1,0 0x5C030000,1,0,0x5C000000,3,0=0x5C030000,1,0,0x5C030000,1,0 0x5C030000,3,0,0x5C000000,1,0=0x5C030000,3,0,0x5C030000,3,0 0x5C030000,3,0,0x5C000000,3,0=0x5C030000,3,0,0x5C030000,3,0 ; -0x5C060010,3,0,0x00004B00,1,0=0x5C060010,3,0,0x5C000000,3,0 -0x5C060010,3,0,0x00004B00,3,0=0x5C060010,3,0,0x5C000000,3,0 ;Adjacencies ;Overriding L1 -0x5C060010,1,0,0x5C031110,0,0=0x5C060010,1,0,0x5C031120,1,0 -0x5C060010,1,0,0x5C031110,2,0=0x5C060010,1,0,0x5C031120,3,0 -0x5C060010,1,0,0x5C001400,3,0=0x5C060010,1,0,0x5C031400,3,0 -0x5C060010,1,0,0x5C001905,1,0=0x5C060010,1,0,0x5C031905,1,0 -0x5C060010,1,0,0x5C001905,3,0=0x5C060010,1,0,0x5C031905,3,0 -0x5C060010,1,0,0x5C002000,1,0=0x5C060010,1,0,0x5C032000,1,0 -0x5C060010,1,0,0x5C002100,1,0=0x5C060010,1,0,0x5C032000,1,0 -0x5C060010,1,0,0x5C002200,1,0=0x5C060010,1,0,0x5C032000,1,0 -0x5C060010,1,0,0x5C002300,1,0=0x5C060010,1,0,0x5C032000,1,0 -0x5C060010,1,0,0x5C002400,1,0=0x5C060010,1,0,0x5C032000,1,0 -0x5C060010,1,0,0x5C002500,1,0=0x5C060010,1,0,0x5C032000,1,0 -0x5C060010,1,0,0x5C002580,1,0=0x5C060010,1,0,0x5C032000,1,0 -0x5C060010,1,0,0x5C002580,3,0=0x5C060010,1,0,0x5C032000,1,0 -0x5C060010,1,0,0x5C002600,1,0=0x5C060010,1,0,0x5C032000,1,0 -0x5C060010,1,0,0x5C002680,1,0=0x5C060010,1,0,0x5C032000,1,0 -0x5C060010,1,0,0x5C002680,3,0=0x5C060010,1,0,0x5C032000,1,0 ;Tight Situations -0x5C060010,1,0,0x05004b00,0,0=0x5C060010,1,0,0x5C031000,1,0 -0x5C060010,1,0,0x05004b00,2,0=0x5C060010,1,0,0x5C031000,1,0 -0x5C060010,1,0,0x00004b00,0,0=0x5C060010,1,0,0x5C031100,1,0 -0x5C060010,1,0,0x00004b00,2,0=0x5C060010,1,0,0x5C031100,1,0 -0x5C060010,1,0,0x09004b00,0,0=0x5C060010,1,0,0x5C031200,1,0 -0x5C060010,1,0,0x09004b00,2,0=0x5C060010,1,0,0x5C031200,1,0 -0x5C060010,1,0,0x5F940300,0,0=0x5C060010,1,0,0x5C031200,1,0 -0x5C060010,1,0,0x5F940300,2,0=0x5C060010,1,0,0x5C031200,1,0 -0x5C060010,1,0,0x04006100,0,0=0x5C060010,1,0,0x5C031300,3,0 0x5C031300,3,0,0x04006100,2,0=0x5C031300,3,0,0x5C031300,1,0 -0x5C060010,1,0,0x0a001500,0,0=0x5C060010,1,0,0x5C031400,3,0 0x5C031300,3,0,0x0a001500,2,0=0x5C031300,3,0,0x5C031400,1,0 -0x5C060010,1,0,0x03031500,0,0=0x5C060010,1,0,0x5C031500,1,0 -0x5C060010,1,0,0x03031500,2,0=0x5C060010,1,0,0x5C031500,1,0 -0x5C060010,1,0,0x5d540000,0,0=0x5C060010,1,0,0x5C031500,1,0 -0x5C060010,1,0,0x5d540000,2,0=0x5C060010,1,0,0x5C031500,1,0 -0x5C060010,1,0,0x5d300000,0,0=0x5C060010,1,0,0x5C031505,1,0 -0x5C060010,1,0,0x5d300000,2,0=0x5C060010,1,0,0x5C031505,1,0 -0x5C060010,1,0,0x5f880000,0,0=0x5C060010,1,0,0x5C031700,1,0 -0x5C060010,1,0,0x5f880000,2,0=0x5C060010,1,0,0x5C031700,1,0 -0x5C060010,1,0,0x5f888000,0,0=0x5C060010,1,0,0x5C031705,1,0 -0x5C060010,1,0,0x5f888000,2,0=0x5C060010,1,0,0x5C031705,1,0 -0x5C060010,1,0,0x08031500,0,0=0x5C060010,1,0,0x5C031720,1,0 -0x5C060010,1,0,0x08031500,2,0=0x5C060010,1,0,0x5C031720,1,0 -0x5C060010,1,0,0x5f884000,0,0=0x5C060010,1,0,0x5C031800,1,0 -0x5C060010,1,0,0x5f884000,2,0=0x5C060010,1,0,0x5C031800,1,0 -0x5C060010,1,0,0x5f88c000,0,0=0x5C060010,1,0,0x5C031805,1,0 -0x5C060010,1,0,0x5f88c000,2,0=0x5C060010,1,0,0x5C031805,1,0 -0x5C060010,1,0,0x5dc31500,0,0=0x5C060010,1,0,0x5C031905,1,0 -0x5C060010,1,0,0x5dc31500,2,0=0x5C060010,1,0,0x5C031905,1,0 -0x5C060010,1,0,0x0d031500,0,0=0x5C060010,1,0,0x5C031920,1,0 -0x5C060010,1,0,0x0d031500,2,0=0x5C060010,1,0,0x5C031920,1,0 -0x5C060010,1,0,0x5dd31500,0,0=0x5C060010,1,0,0x5C031925,1,0; missing_paths -0x5C060010,1,0,0x5dd31500,2,0=0x5C060010,1,0,0x5C031925,1,0; missing_paths -0x5C060010,1,0,0x51000000,0,0=0x5C060010,1,0,0x5C031A00,1,0 -0x5C060010,1,0,0x51000000,2,0=0x5C060010,1,0,0x5C031A00,1,0 -0x5C060010,1,0,0x51010000,0,0=0x5C060010,1,0,0x5C031B00,1,0 -0x5C060010,1,0,0x51010000,2,0=0x5C060010,1,0,0x5C031B00,1,0 -0x5C060010,1,0,0x51030000,0,0=0x5C060010,1,0,0x5C031D00,1,0 -0x5C060010,1,0,0x51030000,2,0=0x5C060010,1,0,0x5C031D00,1,0 -0x5C060010,1,0,0x51040000,0,0=0x5C060010,1,0,0x5C031E00,1,0 -0x5C060010,1,0,0x51040000,2,0=0x5C060010,1,0,0x5C031E00,1,0 -0x5C060010,1,0,0x51050000,0,0=0x5C060010,1,0,0x5C031F00,1,0 -0x5C060010,1,0,0x51050000,2,0=0x5C060010,1,0,0x5C031F00,1,0 -0x5C060010,1,0,0x51100000,0,0=0x5C060010,1,0,0x5C032000,3,0 0x5C032000,3,0,0x51100000,2,0=0x5C032000,3,0,0x5C032000,1,0 -0x5C060010,1,0,0x51110000,0,0=0x5C060010,1,0,0x5C032100,3,0 0x5C032100,3,0,0x51110000,2,0=0x5C032100,3,0,0x5C032100,1,0 -0x5C060010,1,0,0x51120000,0,0=0x5C060010,1,0,0x5C032200,3,0 0x5C032200,3,0,0x51120000,2,0=0x5C032200,3,0,0x5C032200,1,0 -0x5C060010,1,0,0x51130000,0,0=0x5C060010,1,0,0x5C032300,3,0 0x5C032300,3,0,0x51130000,2,0=0x5C032300,3,0,0x5C032300,1,0 -0x5C060010,1,0,0x51140000,0,0=0x5C060010,1,0,0x5C032400,3,0 0x5C032400,3,0,0x51140000,2,0=0x5C032400,3,0,0x5C032400,1,0 -0x5C060010,1,0,0x51200000,0,0=0x5C060010,1,0,0x5C032500,3,0 0x5C032500,3,0,0x51200080,0,0=0x5C032500,3,0,0x5C032580,1,0 0x5C032500,3,0,0x51200080,2,0=0x5C032500,3,0,0x5C032580,3,0 0x5C032500,3,0,0x51210080,0,0=0x5C032500,3,0,0x5C032680,1,0 @@ -7321,8 +6863,6 @@ 0x5C032580,3,0,0x51200000,2,0=0x5C032580,3,0,0x5C032500,1,0 0x5C032680,1,0,0x51200000,2,0=0x5C032680,1,0,0x5C032500,1,0 0x5C032680,3,0,0x51200000,2,0=0x5C032680,3,0,0x5C032500,1,0 -0x5C060010,1,0,0x51210000,0,0=0x5C060010,1,0,0x5C032600,3,0 -0x5C060010,1,0,0x51210000,2,0=0x5C060010,1,0,0x5C032600,1,0 0x5C032600,3,0,0x51200080,0,0=0x5C032600,3,0,0x5C032580,1,0 0x5C032600,3,0,0x51200080,2,0=0x5C032600,3,0,0x5C032580,3,0 0x5C032600,3,0,0x51210080,0,0=0x5C032600,3,0,0x5C032680,1,0 @@ -7332,329 +6872,64 @@ 0x5C032680,1,0,0x51210000,2,0=0x5C032680,1,0,0x5C032600,1,0 0x5C032680,3,0,0x51210000,2,0=0x5C032680,3,0,0x5C032600,1,0 ; -0x5C060010,1,0,0x58480000,2,0=0x5C060010,1,0,0x5C032800,1,0 -0x5C060010,1,0,0x58486C00,2,0=0x5C060010,1,0,0x5C032805,1,0 -; -0x5C060010,1,0,0x57000000,0,0=0x5C060010,1,0,0x57001120,0,0 -0x5C060010,1,0,0x57000000,2,0=0x5C060010,1,0,0x57001120,2,0 -0x5C060010,1,0,0x57100000,0,0=0x5C060010,1,0,0x57101120,0,0 -0x5C060010,1,0,0x57100000,2,0=0x5C060010,1,0,0x57101120,2,0 -0x5C060010,1,0,0x57200000,0,0=0x5C060010,1,0,0x57201120,0,0 -0x5C060010,1,0,0x57200000,2,0=0x5C060010,1,0,0x57201120,2,0 -0x5C060010,1,0,0x57010000,0,0=0x5C060010,1,0,0x57011120,0,0 -0x5C060010,1,0,0x57010000,2,0=0x5C060010,1,0,0x57011120,2,0 -0x5C060010,1,0,0x57210000,0,0=0x5C060010,1,0,0x57211120,0,0 -0x5C060010,1,0,0x57210000,2,0=0x5C060010,1,0,0x57211120,2,0 -0x5C060010,1,0,0x57020000,0,0=0x5C060010,1,0,0x57021120,0,0 -0x5C060010,1,0,0x57020000,2,0=0x5C060010,1,0,0x57021120,2,0 -0x5C060010,1,0,0x57120000,0,0=0x5C060010,1,0,0x57121120,0,0 -0x5C060010,1,0,0x57120000,2,0=0x5C060010,1,0,0x57121120,2,0 -0x5C060010,1,0,0x57220000,0,0=0x5C060010,1,0,0x57221120,0,0 -0x5C060010,1,0,0x57220000,2,0=0x5C060010,1,0,0x57221120,2,0 -0x5C060010,1,0,0x57320000,0,0=0x5C060010,1,0,0x57321120,0,0 -0x5C060010,1,0,0x57320000,2,0=0x5C060010,1,0,0x57321120,2,0 -0x5C060010,1,0,0x57420000,0,0=0x5C060010,1,0,0x57421120,0,0 -0x5C060010,1,0,0x57420000,2,0=0x5C060010,1,0,0x57421120,2,0 -0x5C060010,1,0,0x57030000,0,0=0x5C060010,1,0,0x57031120,0,0 -0x5C060010,1,0,0x57030000,2,0=0x5C060010,1,0,0x57031120,2,0 -0x5C060010,1,0,0x57130000,0,0=0x5C060010,1,0,0x57131120,0,0 -0x5C060010,1,0,0x57130000,2,0=0x5C060010,1,0,0x57131120,2,0 -0x5C060010,1,0,0x57330000,0,0=0x5C060010,1,0,0x57331120,0,0 -0x5C060010,1,0,0x57330000,2,0=0x5C060010,1,0,0x57331120,2,0 -0x5C060010,1,0,0x57430000,0,0=0x5C060010,1,0,0x57431120,0,0 -0x5C060010,1,0,0x57430000,2,0=0x5C060010,1,0,0x57431120,2,0 -0x5C060010,1,0,0x57040000,0,0=0x5C060010,1,0,0x57041120,0,0 -0x5C060010,1,0,0x57040000,2,0=0x5C060010,1,0,0x57041120,2,0 -0x5C060010,1,0,0x57240000,0,0=0x5C060010,1,0,0x57241120,0,0; missing_paths -0x5C060010,1,0,0x57240000,2,0=0x5C060010,1,0,0x57241120,2,0; missing_paths -0x5C060010,1,0,0x57340000,0,0=0x5C060010,1,0,0x57341120,0,0 -0x5C060010,1,0,0x57340000,2,0=0x5C060010,1,0,0x57341120,2,0 -0x5C060010,1,0,0x57440000,0,0=0x5C060010,1,0,0x57441120,0,0 -0x5C060010,1,0,0x57440000,2,0=0x5C060010,1,0,0x57441120,2,0 -0x5C060010,1,0,0x57050000,0,0=0x5C060010,1,0,0x57051120,0,0 -0x5C060010,1,0,0x57150000,0,0=0x5C060010,1,0,0x57151120,0,0 +; 0x57051120,0,0,0x57050080,0,0=0x57051120,0,0,0x570511A0,0,0 0x57251120,0,0,0x57150080,0,0=0x57251120,0,0,0x571511A0,0,0; missing_paths 0x570511A0,0,0,0x57050080,2,0=0x570511A0,0,0,0x570511A0,2,0 0x572511A0,0,0,0x57150080,2,0=0x572511A0,0,0,0x571511A0,2,0; missing_paths -0x5C060010,1,0,0x57050080,2,0=0x5C060010,1,0,0x570511A0,2,0 -0x5C060010,1,0,0x57150080,2,0=0x5C060010,1,0,0x571511A0,2,0 0x570511A0,2,0,0x57050000,2,0=0x570511A0,2,0,0x57051120,2,0 0x572511A0,2,0,0x57150000,2,0=0x572511A0,2,0,0x57151120,2,0; missing_paths -0x5C060010,1,0,0x57060000,0,0=0x5C060010,1,0,0x57061120,0,0 -0x5C060010,1,0,0x57160000,0,0=0x5C060010,1,0,0x57161120,0,0 -0x5C060010,1,0,0x57070000,0,0=0x5C060010,1,0,0x57071120,0,0 -0x5C060010,1,0,0x57170000,0,0=0x5C060010,1,0,0x57171120,0,0 0x57061120,0,0,0x57050080,0,0=0x57061120,0,0,0x570511A0,0,0 0x57261120,0,0,0x57150080,0,0=0x57261120,0,0,0x571511A0,0,0; missing_paths 0x570511A0,2,0,0x57060000,2,0=0x570511A0,2,0,0x57061120,2,0 0x572511A0,2,0,0x57160000,2,0=0x572511A0,2,0,0x57161120,2,0; missing_paths 0x570511A0,2,0,0x57070000,2,0=0x570511A0,2,0,0x57071120,2,0 0x572511A0,2,0,0x57170000,2,0=0x572511A0,2,0,0x57171120,2,0; missing_paths -0x5C060010,1,0,0x57080000,0,0=0x5C060010,1,0,0x57081120,0,0 -0x5C060010,1,0,0x57180000,0,0=0x5C060010,1,0,0x57181120,0,0 0x57081120,0,0,0x57080080,0,0=0x57081100,0,0,0x570811A0,0,0; missing_paths 0x57081120,0,0,0x57080080,2,0=0x57081100,0,0,0x570811A0,2,0; missing_paths 0x570811A0,0,0,0x57080000,2,0=0x570811A0,0,0,0x57081100,2,0; missing_paths 0x572811A0,0,0,0x57180000,2,0=0x572811A0,0,0,0x57181100,2,0; missing_paths 0x570811A0,2,0,0x57080000,2,0=0x570811A0,2,0,0x57081100,2,0; missing_paths 0x572811A0,2,0,0x57180000,2,0=0x572811A0,2,0,0x57181100,2,0; missing_paths -0x5C060010,1,0,0x57090000,0,0=0x5C060010,1,0,0x57091120,0,0 -0x5C060010,1,0,0x57190000,0,0=0x5C060010,1,0,0x57191120,0,0 0x57091120,0,0,0x57080080,0,0=0x57091100,0,0,0x570811A0,0,0; missing_paths 0x57091120,0,0,0x57080080,2,0=0x57091100,0,0,0x570811A0,2,0; missing_paths 0x570811A0,0,0,0x57090000,2,0=0x570811A0,0,0,0x57091100,2,0; missing_paths 0x572811A0,0,0,0x57190000,2,0=0x572811A0,0,0,0x57191100,2,0; missing_paths 0x570811A0,2,0,0x57090000,2,0=0x570811A0,2,0,0x57091100,2,0; missing_paths 0x572811A0,2,0,0x57190000,2,0=0x572811A0,2,0,0x57191100,2,0; missing_paths -0x5C060010,1,0,0x57220100,0,0=0x5C060010,1,0,0x57621120,1,1 -0x5C060010,1,0,0x57220100,2,1=0x5C060010,1,0,0x57621120,3,0 ;ONE-WAY ROAD VIADUCTS ;L0-to-L1 ;L0 Stub into Onslope -0x09000300,1,0,0x57700000,1,0=0x09004B00,1,0,0x5C070000,1,0 -0x09004B00,1,0,0x57700000,1,0=0x09004B00,1,0,0x5C070000,1,0 -0x5F940300,1,0,0x57700000,1,0=0x09004B00,1,0,0x5C070000,1,0 -0x09000300,1,0,0x5C070000,1,0=0x09004B00,1,0,0x5C070000,1,0 ;Onslope into Elevated -0x57700000,1,0,0x09000300,3,0=0x5C070000,1,0,0x5C010000,1,0 -0x57700000,1,0,0x5C010000,1,0=0x5C070000,1,0,0x5C010000,1,0 -0x5C070000,1,0,0x09000300,3,0=0x5C070000,1,0,0x5C010000,1,0 ; -0x09000F00,2,0,0x57700000,1,0=0x09005700,3,0,0x5C070000,1,0 -0x09000F00,2,0,0x5C070000,1,0=0x09005700,3,0,0x5C070000,1,0 -0x09000F00,1,0,0x57700000,1,0=0x09005700,1,0,0x5C070000,1,0 -0x09000F00,1,0,0x5C070000,1,0=0x09005700,1,0,0x5C070000,1,0 ; -0x09aa0400,2,0,0x57700000,1,0=0x09aa0a00,0,0,0x5C070000,1,0 -0x09aa0400,2,0,0x5C070000,1,0=0x09aa0a00,0,0,0x5C070000,1,0 ; ; -0x09005700,2,0,0x57700000,1,0=0x09020700,0,0,0x5C070000,1,0 -0x09005700,2,0,0x5C070000,1,0=0x09020700,0,0,0x5C070000,1,0 ; -0x091a8800,0,0,0x57700000,1,0=0x091a8900,2,0,0x5C070000,1,0 -0x091a8800,0,0,0x5C070000,1,0=0x091a8900,2,0,0x5C070000,1,0 ; -0x57600200,2,0,0x57700000,1,0=0x57001200,0,0,0x5C070000,1,0 -0x57600200,2,0,0x5C070000,1,0=0x57001200,0,0,0x5C070000,1,0 ; ; ; ; ; -0x51043200,2,0,0x57700000,1,0=0x51041200,1,0,0x5C070000,1,0 -0x51043200,2,0,0x5C070000,1,0=0x51041200,1,0,0x5C070000,1,0 ; ; -0x51103280,3,0,0x57700000,1,0=0x51101200,1,0,0x5C070000,1,0 -0x51103280,3,0,0x5C070000,1,0=0x51101200,1,0,0x5C070000,1,0 ; -0x51113280,3,0,0x57700000,1,0=0x51111200,1,0,0x5C070000,1,0 -0x51113280,3,0,0x5C070000,1,0=0x51111200,1,0,0x5C070000,1,0 ; -0x51123280,3,0,0x57700000,1,0=0x51121200,1,0,0x5C070000,1,0 -0x51123280,3,0,0x5C070000,1,0=0x51121200,1,0,0x5C070000,1,0 ; -0x51133280,3,0,0x57700000,1,0=0x51131200,1,0,0x5C070000,1,0 -0x51133280,3,0,0x5C070000,1,0=0x51131200,1,0,0x5C070000,1,0 ; -0x51143280,3,0,0x57700000,1,0=0x51141200,1,0,0x5C070000,1,0 -0x51143280,3,0,0x5C070000,1,0=0x51141200,1,0,0x5C070000,1,0 ; -0x51203280,3,0,0x57700000,1,0=0x51201200,1,0,0x5C070000,1,0 -0x51203280,3,0,0x5C070000,1,0=0x51201200,1,0,0x5C070000,1,0 ; -0x51213280,3,0,0x57700000,1,0=0x51211200,1,0,0x5C070000,1,0; missing_paths -0x51213280,3,0,0x5C070000,1,0=0x51211200,1,0,0x5C070000,1,0; missing_paths ;Adjacencies -0x5C070000,1,0,0x09AA0400,0,0=0x5C070000,1,0,0x5C011000,1,0 -0x5C070000,1,0,0x09705400,0,0=0x5C070000,1,0,0x5C011100,1,0 -0x5C070000,1,0,0x09005700,0,0=0x5C070000,1,0,0x5C011200,1,0 -0x5C070000,1,0,0x091a8800,2,0=0x5C070000,1,0,0x5C011300,3,0 -0x5C070000,1,0,0x0A001500,3,0=0x5C070000,1,0,0x5C011400,3,0 -0x5C070000,1,0,0x091b1500,3,0=0x5C070000,1,0,0x5C011420,3,0; missing_paths -0x5C070000,1,0,0x09310100,1,0=0x5C070000,1,0,0x5C011500,1,0 -0x5C070000,1,0,0x09310100,3,0=0x5C070000,1,0,0x5C011500,3,0 -0x5C070000,1,0,0x5D342000,1,0=0x5C070000,1,0,0x5C011505,1,0 -0x5C070000,1,0,0x5D342000,3,0=0x5C070000,1,0,0x5C011505,3,0 -0x5C070000,1,0,0x5F880E00,1,0=0x5C070000,1,0,0x5C011700,1,0 -0x5C070000,1,0,0x5F880E00,3,0=0x5C070000,1,0,0x5C011700,3,0 -0x5C070000,1,0,0x5F888E00,1,0=0x5C070000,1,0,0x5C011705,1,0 -0x5C070000,1,0,0x5F888E00,3,0=0x5C070000,1,0,0x5C011705,3,0 -0x5C070000,1,0,0x091D0200,1,0=0x5C070000,1,0,0x5C011720,1,0 -0x5C070000,1,0,0x091D0200,3,0=0x5C070000,1,0,0x5C011720,3,0 -0x5C070000,1,0,0x5F884E00,1,0=0x5C070000,1,0,0x5C011800,1,0 -0x5C070000,1,0,0x5F884E00,3,0=0x5C070000,1,0,0x5C011800,3,0 -0x5C070000,1,0,0x5F88CE00,1,0=0x5C070000,1,0,0x5C011805,1,0 -0x5C070000,1,0,0x5F88CE00,3,0=0x5C070000,1,0,0x5C011805,3,0 -0x5C070000,1,0,0x092D0200,1,0=0x5C070000,1,0,0x5C011920,1,0 -0x5C070000,1,0,0x092D0200,3,0=0x5C070000,1,0,0x5C011920,3,0 -0x5C070000,1,0,0x5DDD0300,1,0=0x5C070000,1,0,0x5C011925,1,0 -0x5C070000,1,0,0x5DDD0300,3,0=0x5C070000,1,0,0x5C011925,3,0 -0x5C070000,1,0,0x57600200,0,0=0x5C070000,1,0,0x57001210,0,0 -0x5C070000,1,0,0x57001200,0,0=0x5C070000,1,0,0x57001210,0,0 -0x5C070000,1,0,0x57001200,2,0=0x5C070000,1,0,0x57001210,2,0 -0x5C070000,1,0,0x57610200,0,0=0x5C070000,1,0,0x57011210,0,0 -0x5C070000,1,0,0x57610280,0,0=0x5C070000,1,0,0x57011210,0,0 -0x5C070000,1,0,0x57011200,0,0=0x5C070000,1,0,0x57011210,0,0 -0x5C070000,1,0,0x57620100,0,0=0x5C070000,1,0,0x57021210,0,0 -0x5C070000,1,0,0x57620190,0,0=0x5C070000,1,0,0x57021210,2,0 -0x5C070000,1,0,0x57021200,0,0=0x5C070000,1,0,0x57021210,0,0 -0x5C070000,1,0,0x57021200,2,0=0x5C070000,1,0,0x57021210,2,0 -0x5C070000,1,0,0x57630200,0,0=0x5C070000,1,0,0x57031210,0,0 -0x5C070000,1,0,0x57630280,0,0=0x5C070000,1,0,0x57031210,0,0 -0x5C070000,1,0,0x57031200,0,0=0x5C070000,1,0,0x57031210,0,0 -0x5C070000,1,0,0x57031200,0,0=0x5C070000,1,0,0x57031210,0,0 -0x5C070000,1,0,0x57041200,0,0=0x5C070000,1,0,0x57041210,0,0; missing_paths -0x5C070000,1,0,0x57041200,2,0=0x5C070000,1,0,0x57041210,2,0; missing_paths -0x5C070000,1,0,0x57051280,2,0=0x5C070000,1,0,0x57051290,2,0; missing_paths -0x5C070000,1,0,0x57051200,0,0=0x5C070000,1,0,0x57051210,0,0; missing_paths -0x5C070000,1,0,0x57050000,0,0=0x5C070000,1,0,0x57051210,0,0 -0x5C070000,1,0,0x57061200,0,0=0x5C070000,1,0,0x57061210,0,0; missing_paths -0x5C070000,1,0,0x57060000,0,0=0x5C070000,1,0,0x57061210,0,0 -0x5C070000,1,0,0x57071200,0,0=0x5C070000,1,0,0x57071210,0,0; missing_paths -0x5C070000,1,0,0x57070000,0,0=0x5C070000,1,0,0x57071210,0,0 -0x5C070000,1,0,0x57081200,0,0=0x5C070000,1,0,0x57081210,0,0; missing_paths -0x5C070000,1,0,0x57080000,0,0=0x5C070000,1,0,0x57081210,0,0 -0x5C070000,1,0,0x57091200,0,0=0x5C070000,1,0,0x57091210,0,0; missing_paths -0x5C070000,1,0,0x57090000,0,0=0x5C070000,1,0,0x57091210,0,0 -0x5C070000,1,0,0x51003200,3,0=0x5C070000,1,0,0x5C011A00,1,0 -0x5C070000,1,0,0x51013200,3,0=0x5C070000,1,0,0x5C011B00,1,0 -0x5C070000,1,0,0x51023200,3,0=0x5C070000,1,0,0x5C011C00,1,0 -0x5C070000,1,0,0x51023280,3,0=0x5C070000,1,0,0x5C011C00,3,0 -0x5C070000,1,0,0x51033200,3,0=0x5C070000,1,0,0x5C011D00,1,0 -0x5C070000,1,0,0x51043200,3,0=0x5C070000,1,0,0x5C011E00,1,0 -0x5C070000,1,0,0x51053200,3,0=0x5C070000,1,0,0x5C011F00,1,0 -0x5C070000,1,0,0x51103280,1,0=0x5C070000,1,0,0x5C012000,3,0 -0x5C070000,1,0,0x51113280,1,0=0x5C070000,1,0,0x5C012100,3,0 -0x5C070000,1,0,0x51123280,1,0=0x5C070000,1,0,0x5C012200,3,0 -0x5C070000,1,0,0x51133280,1,0=0x5C070000,1,0,0x5C012300,3,0 -0x5C070000,1,0,0x51143280,1,0=0x5C070000,1,0,0x5C012400,3,0 -0x5C070000,1,0,0x51203280,1,0=0x5C070000,1,0,0x5C012500,3,0 -0x5C070000,1,0,0x51213280,1,0=0x5C070000,1,0,0x5C012600,3,0; missing_paths -; -0x5C070000,3,0,0x09705400,0,0=0x5C070000,3,0,0x09720700,0,0 -0x5C070000,3,0,0x09005700,0,0=0x5C070000,3,0,0x09020700,0,0; conflicting-override -0x5C070000,3,0,0x091a8800,2,0=0x5C070000,3,0,0x091a8900,0,0 -0x5C070000,3,0,0x03031500,1,0=0x5C070000,3,0,0x09310100,1,0 -0x5C070000,3,0,0x03031500,3,0=0x5C070000,3,0,0x09310100,3,0 -0x5C070000,3,0,0x5D540000,1,0=0x5C070000,3,0,0x09310100,1,0 -0x5C070000,3,0,0x5D540000,3,0=0x5C070000,3,0,0x09310100,3,0 -0x5C070000,3,0,0x5D500000,1,0=0x5C070000,3,0,0x5D342000,1,0 -0x5C070000,3,0,0x5D500000,3,0=0x5C070000,3,0,0x5D342000,3,0 -;0x5C070000,3,0,0x5F880E00,1,0=0x5C070000,3,0,0x5C011700,1,0 -;0x5C070000,3,0,0x5F880E00,3,0=0x5C070000,3,0,0x5C011700,3,0 -;0x5C070000,3,0,0x5F888E00,1,0=0x5C070000,3,0,0x5C011705,1,0 -;0x5C070000,3,0,0x5F888E00,3,0=0x5C070000,3,0,0x5C011705,3,0 -;0x5C070000,3,0,0x091D0200,1,0=0x5C070000,3,0,0x5C011720,1,0 -;0x5C070000,3,0,0x091D0200,3,0=0x5C070000,3,0,0x5C011720,3,0 -;0x5C070000,3,0,0x5F884E00,1,0=0x5C070000,3,0,0x5C011800,1,0 -;0x5C070000,3,0,0x5F884E00,3,0=0x5C070000,3,0,0x5C011800,3,0 -;0x5C070000,3,0,0x5F88CE00,1,0=0x5C070000,3,0,0x5C011805,1,0 -;0x5C070000,3,0,0x5F88CE00,3,0=0x5C070000,3,0,0x5C011805,3,0 -;0x5C070000,3,0,0x092D0200,1,0=0x5C070000,3,0,0x5C011920,1,0 -;0x5C070000,3,0,0x092D0200,3,0=0x5C070000,3,0,0x5C011920,3,0 -;0x5C070000,3,0,0x5DDD0300,1,0=0x5C070000,3,0,0x5C011925,1,0 -;0x5C070000,3,0,0x5DDD0300,3,0=0x5C070000,3,0,0x5C011925,3,0 -;0x5C070000,3,0,0x57600200,0,0=0x5C070000,3,0,0x57001210,0,0 -;0x5C070000,3,0,0x57001200,0,0=0x5C070000,3,0,0x57001210,0,0 -;0x5C070000,3,0,0x57001200,2,0=0x5C070000,3,0,0x57001210,2,0 -;0x5C070000,3,0,0x57610200,0,0=0x5C070000,3,0,0x57011210,0,0 -;0x5C070000,3,0,0x57610280,0,0=0x5C070000,3,0,0x57011210,0,0 -;0x5C070000,3,0,0x57011200,0,0=0x5C070000,3,0,0x57011210,0,0 -;0x5C070000,3,0,0x57011200,0,0=0x5C070000,3,0,0x57011210,2,0 -;0x5C070000,3,0,0x57620100,0,0=0x5C070000,3,0,0x57021210,0,0 -;0x5C070000,3,0,0x57620190,0,0=0x5C070000,3,0,0x57021210,2,0 -;0x5C070000,3,0,0x57021200,0,0=0x5C070000,3,0,0x57021210,0,0 -;0x5C070000,3,0,0x57021200,2,0=0x5C070000,3,0,0x57021210,2,0 -;0x5C070000,3,0,0x57630200,0,0=0x5C070000,3,0,0x57031210,0,0 -;0x5C070000,3,0,0x57630280,0,0=0x5C070000,3,0,0x57031210,0,0 -;0x5C070000,3,0,0x57031200,0,0=0x5C070000,3,0,0x57031210,0,0 -;0x5C070000,3,0,0x57031200,0,0=0x5C070000,3,0,0x57031210,0,0 -;0x5C070000,3,0,0x57041200,0,0=0x5C070000,3,0,0x57041210,0,0 -;0x5C070000,3,0,0x57041200,2,0=0x5C070000,3,0,0x57041210,2,0 -;0x5C070000,3,0,0x57051280,2,0=0x5C070000,3,0,0x57051290,2,0 -;0x5C070000,3,0,0x57051200,0,0=0x5C070000,3,0,0x57051210,0,0 -;0x5C070000,3,0,0x57050000,0,0=0x5C070000,3,0,0x57051210,0,0 -;0x5C070000,3,0,0x57061200,0,0=0x5C070000,3,0,0x57061210,0,0 -;0x5C070000,3,0,0x57060000,0,0=0x5C070000,3,0,0x57061210,0,0 -;0x5C070000,3,0,0x57071200,0,0=0x5C070000,3,0,0x57071210,0,0 -;0x5C070000,3,0,0x57070000,0,0=0x5C070000,3,0,0x57071210,0,0 -;0x5C070000,3,0,0x57081200,0,0=0x5C070000,3,0,0x57081210,0,0 -;0x5C070000,3,0,0x57080000,0,0=0x5C070000,3,0,0x57081210,0,0 -;0x5C070000,3,0,0x57091200,0,0=0x5C070000,3,0,0x57091210,0,0 -;0x5C070000,3,0,0x57090000,0,0=0x5C070000,3,0,0x57091210,0,0 -;0x5C070000,3,0,0x51003200,3,0=0x5C070000,3,0,0x5C011A00,1,0 -;0x5C070000,3,0,0x51013200,3,0=0x5C070000,3,0,0x5C011B00,1,0 -;0x5C070000,3,0,0x51023200,3,0=0x5C070000,3,0,0x5C011C00,1,0 -;0x5C070000,3,0,0x51023280,3,0=0x5C070000,3,0,0x5C011C00,3,0 -;0x5C070000,3,0,0x51033200,3,0=0x5C070000,3,0,0x5C011D00,1,0 -;0x5C070000,3,0,0x51043200,3,0=0x5C070000,3,0,0x5C011E00,1,0 -;0x5C070000,3,0,0x51053200,3,0=0x5C070000,3,0,0x5C011F00,1,0 -;0x5C070000,3,0,0x51103280,1,0=0x5C070000,3,0,0x5C012000,3,0 -;0x5C070000,3,0,0x51113280,1,0=0x5C070000,3,0,0x5C012100,3,0 -;0x5C070000,3,0,0x51123280,1,0=0x5C070000,3,0,0x5C012200,3,0 -;0x5C070000,3,0,0x51133280,1,0=0x5C070000,3,0,0x5C012300,3,0 -;0x5C070000,3,0,0x51143280,1,0=0x5C070000,3,0,0x5C012400,3,0 -;0x5C070000,3,0,0x51203280,1,0=0x5C070000,3,0,0x5C012500,3,0 -;0x5C070000,3,0,0x51213280,1,0=0x5C070000,3,0,0x5C012600,3,0 +; ;Tight Situations -0x5C070000,1,0,0x05004b00,0,0=0x5C070000,1,0,0x5C011000,1,0 -0x5C070000,1,0,0x05004b00,2,0=0x5C070000,1,0,0x5C011000,1,0 -0x5C070000,1,0,0x00004b00,0,0=0x5C070000,1,0,0x5C011100,1,0 -0x5C070000,1,0,0x00004b00,2,0=0x5C070000,1,0,0x5C011100,1,0 -0x5C070000,1,0,0x09004b00,0,0=0x5C070000,1,0,0x5C011200,1,0 -0x5C070000,1,0,0x09004b00,2,0=0x5C070000,1,0,0x5C011200,1,0 -0x5C070000,1,0,0x5F940300,0,0=0x5C070000,1,0,0x5C011200,1,0 -0x5C070000,1,0,0x5F940300,2,0=0x5C070000,1,0,0x5C011200,1,0 -0x5C070000,1,0,0x04006100,0,0=0x5C070000,1,0,0x5C011300,3,0 0x5C011300,3,0,0x04006100,2,0=0x5C011300,3,0,0x5C011300,1,0 -0x5C070000,1,0,0x0a001500,0,0=0x5C070000,1,0,0x5C011400,3,0 0x5C011300,3,0,0x0a001500,2,0=0x5C011300,3,0,0x5C011400,1,0 -0x5C070000,1,0,0x03031500,0,0=0x5C070000,1,0,0x5C011500,1,0 -0x5C070000,1,0,0x03031500,2,0=0x5C070000,1,0,0x5C011500,1,0 -0x5C070000,1,0,0x5d540000,0,0=0x5C070000,1,0,0x5C011500,1,0 -0x5C070000,1,0,0x5d540000,2,0=0x5C070000,1,0,0x5C011500,1,0 -0x5C070000,1,0,0x5d300000,0,0=0x5C070000,1,0,0x5C011505,1,0 -0x5C070000,1,0,0x5d300000,2,0=0x5C070000,1,0,0x5C011505,1,0 -0x5C070000,1,0,0x5f880000,0,0=0x5C070000,1,0,0x5C011700,1,0 -0x5C070000,1,0,0x5f880000,2,0=0x5C070000,1,0,0x5C011700,1,0 -0x5C070000,1,0,0x5f888000,0,0=0x5C070000,1,0,0x5C011705,1,0 -0x5C070000,1,0,0x5f888000,2,0=0x5C070000,1,0,0x5C011705,1,0 -0x5C070000,1,0,0x08031500,0,0=0x5C070000,1,0,0x5C011720,1,0 -0x5C070000,1,0,0x08031500,2,0=0x5C070000,1,0,0x5C011720,1,0 -0x5C070000,1,0,0x5f884000,0,0=0x5C070000,1,0,0x5C011800,1,0 -0x5C070000,1,0,0x5f884000,2,0=0x5C070000,1,0,0x5C011800,1,0 -0x5C070000,1,0,0x5f88c000,0,0=0x5C070000,1,0,0x5C011805,1,0 -0x5C070000,1,0,0x5f88c000,2,0=0x5C070000,1,0,0x5C011805,1,0 -0x5C070000,1,0,0x5dc31500,0,0=0x5C070000,1,0,0x5C011905,1,0 -0x5C070000,1,0,0x5dc31500,2,0=0x5C070000,1,0,0x5C011905,1,0 -0x5C070000,1,0,0x0d031500,0,0=0x5C070000,1,0,0x5C011920,1,0 -0x5C070000,1,0,0x0d031500,2,0=0x5C070000,1,0,0x5C011920,1,0 -0x5C070000,1,0,0x5dd31500,0,0=0x5C070000,1,0,0x5C011925,1,0 -0x5C070000,1,0,0x5dd31500,2,0=0x5C070000,1,0,0x5C011925,1,0 -0x5C070000,1,0,0x51000000,0,0=0x5C070000,1,0,0x5C011A00,1,0 -0x5C070000,1,0,0x51000000,2,0=0x5C070000,1,0,0x5C011A00,1,0 -0x5C070000,1,0,0x51010000,0,0=0x5C070000,1,0,0x5C011B00,1,0 -0x5C070000,1,0,0x51010000,2,0=0x5C070000,1,0,0x5C011B00,1,0 -0x5C070000,1,0,0x51030000,0,0=0x5C070000,1,0,0x5C011D00,1,0 -0x5C070000,1,0,0x51030000,2,0=0x5C070000,1,0,0x5C011D00,1,0 -0x5C070000,1,0,0x51040000,0,0=0x5C070000,1,0,0x5C011E00,1,0 -0x5C070000,1,0,0x51040000,2,0=0x5C070000,1,0,0x5C011E00,1,0 -0x5C070000,1,0,0x51050000,0,0=0x5C070000,1,0,0x5C011F00,1,0 -0x5C070000,1,0,0x51050000,2,0=0x5C070000,1,0,0x5C011F00,1,0 -0x5C070000,1,0,0x51100000,0,0=0x5C070000,1,0,0x5C012000,3,0 0x5C012000,3,0,0x51100000,2,0=0x5C012000,3,0,0x5C012000,1,0 -0x5C070000,1,0,0x51110000,0,0=0x5C070000,1,0,0x5C012100,3,0 0x5C012100,3,0,0x51110000,2,0=0x5C012100,3,0,0x5C012100,1,0 -0x5C070000,1,0,0x51120000,0,0=0x5C070000,1,0,0x5C012200,3,0 0x5C012200,3,0,0x51120000,2,0=0x5C012200,3,0,0x5C012200,1,0 -0x5C070000,1,0,0x51130000,0,0=0x5C070000,1,0,0x5C012300,3,0 0x5C012300,3,0,0x51130000,2,0=0x5C012300,3,0,0x5C012300,1,0 -0x5C070000,1,0,0x51140000,0,0=0x5C070000,1,0,0x5C012400,3,0 0x5C012400,3,0,0x51140000,2,0=0x5C012400,3,0,0x5C012400,1,0 -0x5C070000,1,0,0x51200000,0,0=0x5C070000,1,0,0x5C012500,3,0 0x5C012500,3,0,0x51200080,0,0=0x5C012500,3,0,0x5C012580,1,0 0x5C012500,3,0,0x51200080,2,0=0x5C012500,3,0,0x5C012580,3,0 0x5C012500,3,0,0x51210080,0,0=0x5C012500,3,0,0x5C012680,1,0 @@ -7663,8 +6938,6 @@ 0x5C012580,3,0,0x51200000,2,0=0x5C012580,3,0,0x5C012500,1,0 0x5C012680,1,0,0x51200000,2,0=0x5C012680,1,0,0x5C012500,1,0 0x5C012680,3,0,0x51200000,2,0=0x5C012680,3,0,0x5C012500,1,0 -0x5C070000,1,0,0x51210000,0,0=0x5C070000,1,0,0x5C012600,3,0 -0x5C070000,1,0,0x51210000,2,0=0x5C070000,1,0,0x5C012600,1,0 0x5C012600,3,0,0x51200080,0,0=0x5C012600,3,0,0x5C012580,1,0 0x5C012600,3,0,0x51200080,2,0=0x5C012600,3,0,0x5C012580,3,0 0x5C012600,3,0,0x51210080,0,0=0x5C012600,3,0,0x5C012680,1,0 @@ -7674,88 +6947,31 @@ 0x5C012680,1,0,0x51210000,2,0=0x5C012680,1,0,0x5C012600,1,0 0x5C012680,3,0,0x51210000,2,0=0x5C012680,3,0,0x5C012600,1,0 ; -0x5C070000,1,0,0x584E0000,0,0=0x5C070000,1,0,0x5C012700,1,0 -0x5C070000,1,0,0x584E0000,2,0=0x5C070000,1,0,0x5C012700,1,0 -0x5C070000,1,0,0x58480000,0,0=0x5C070000,1,0,0x5C012800,1,0 -0x5C070000,1,0,0x58480000,2,0=0x5C070000,1,0,0x5C012800,1,0 -0x5C070000,1,0,0x58486C00,0,0=0x5C070000,1,0,0x5C012805,1,0 -0x5C070000,1,0,0x58486C00,2,0=0x5C070000,1,0,0x5C012805,1,0 -0x5C070000,1,0,0x58400000,0,0=0x5C070000,1,0,0x5C012A00,3,0 -; -0x5C070000,1,0,0x57000000,0,0=0x5C070000,1,0,0x57001210,0,0 -0x5C070000,1,0,0x57000000,2,0=0x5C070000,1,0,0x57001210,2,0 -0x5C070000,1,0,0x57100000,0,0=0x5C070000,1,0,0x57101210,0,0 -0x5C070000,1,0,0x57100000,2,0=0x5C070000,1,0,0x57101210,2,0 -0x5C070000,1,0,0x57200000,0,0=0x5C070000,1,0,0x57201210,0,0 -0x5C070000,1,0,0x57200000,2,0=0x5C070000,1,0,0x57201210,2,0 -0x5C070000,1,0,0x57010000,0,0=0x5C070000,1,0,0x57011210,0,0 -0x5C070000,1,0,0x57010000,2,0=0x5C070000,1,0,0x57011210,2,0 -0x5C070000,1,0,0x57210000,0,0=0x5C070000,1,0,0x57211210,0,0 -0x5C070000,1,0,0x57210000,2,0=0x5C070000,1,0,0x57211210,2,0 -0x5C070000,1,0,0x57020000,0,0=0x5C070000,1,0,0x57021210,0,0 -0x5C070000,1,0,0x57020000,2,0=0x5C070000,1,0,0x57021210,2,0 -0x5C070000,1,0,0x57120000,0,0=0x5C070000,1,0,0x57121210,0,0 -0x5C070000,1,0,0x57120000,2,0=0x5C070000,1,0,0x57121210,2,0 -0x5C070000,1,0,0x57220000,0,0=0x5C070000,1,0,0x57221210,0,0 -0x5C070000,1,0,0x57220000,2,0=0x5C070000,1,0,0x57221210,2,0 -0x5C070000,1,0,0x57320000,0,0=0x5C070000,1,0,0x57321210,0,0 -0x5C070000,1,0,0x57320000,2,0=0x5C070000,1,0,0x57321210,2,0 -0x5C070000,1,0,0x57420000,0,0=0x5C070000,1,0,0x57421210,0,0 -0x5C070000,1,0,0x57420000,2,0=0x5C070000,1,0,0x57421210,2,0 -0x5C070000,1,0,0x57030000,0,0=0x5C070000,1,0,0x57031210,0,0 -0x5C070000,1,0,0x57030000,2,0=0x5C070000,1,0,0x57031210,2,0 -0x5C070000,1,0,0x57230000,0,0=0x5C070000,1,0,0x57231210,0,0 -0x5C070000,1,0,0x57230000,2,0=0x5C070000,1,0,0x57231210,2,0 -0x5C070000,1,0,0x57330000,0,0=0x5C070000,1,0,0x57331210,0,0 -0x5C070000,1,0,0x57330000,2,0=0x5C070000,1,0,0x57331210,2,0 -0x5C070000,1,0,0x57430000,0,0=0x5C070000,1,0,0x57431210,0,0 -0x5C070000,1,0,0x57430000,2,0=0x5C070000,1,0,0x57431210,2,0 -0x5C070000,1,0,0x57040000,0,0=0x5C070000,1,0,0x57041210,0,0 -0x5C070000,1,0,0x57040000,2,0=0x5C070000,1,0,0x57041210,2,0 -0x5C070000,1,0,0x57240000,0,0=0x5C070000,1,0,0x57241210,0,0 -0x5C070000,1,0,0x57240000,2,0=0x5C070000,1,0,0x57241210,2,0 -0x5C070000,1,0,0x57340000,0,0=0x5C070000,1,0,0x57341210,0,0 -0x5C070000,1,0,0x57340000,2,0=0x5C070000,1,0,0x57341210,2,0 -0x5C070000,1,0,0x57440000,0,0=0x5C070000,1,0,0x57441210,0,0 -0x5C070000,1,0,0x57440000,2,0=0x5C070000,1,0,0x57441210,2,0 -0x5C070000,1,0,0x57050000,0,0=0x5C070000,1,0,0x57051210,0,0 -0x5C070000,1,0,0x57250000,0,0=0x5C070000,1,0,0x57251210,0,0 +; 0x57051210,0,0,0x57050080,0,0=0x57051210,0,0,0x57051290,0,0 0x57251210,0,0,0x57250080,0,0=0x57251210,0,0,0x57251290,0,0 0x57051290,0,0,0x57050080,2,0=0x57051290,0,0,0x57051290,2,0 0x57251290,0,0,0x57250080,2,0=0x57251290,0,0,0x57251290,2,0 -0x5C070000,1,0,0x57050080,2,0=0x5C070000,1,0,0x57051290,2,0 -0x5C070000,1,0,0x57250080,2,0=0x5C070000,1,0,0x57251290,2,0 0x57051290,2,0,0x57050000,2,0=0x57051290,2,0,0x57051210,2,0 0x57251290,2,0,0x57250000,2,0=0x57251290,2,0,0x57251210,2,0 -0x5C070000,1,0,0x57060000,0,0=0x5C070000,1,0,0x57061210,0,0 -0x5C070000,1,0,0x57260000,0,0=0x5C070000,1,0,0x57261210,0,0 0x57061210,0,0,0x57050080,0,0=0x57061210,0,0,0x57051290,0,0 0x57261210,0,0,0x57250080,0,0=0x57261210,0,0,0x57251290,0,0 0x57051290,2,0,0x57060000,2,0=0x57051290,2,0,0x57061210,2,0 0x57251290,2,0,0x57260000,2,0=0x57251290,2,0,0x57261210,2,0 -0x5C070000,1,0,0x57070000,0,0=0x5C070000,1,0,0x57071210,0,0 -0x5C070000,1,0,0x57270000,0,0=0x5C070000,1,0,0x57271210,0,0 0x57071210,0,0,0x57050080,0,0=0x57071210,0,0,0x57051290,0,0 0x57271210,0,0,0x57250080,0,0=0x57271210,0,0,0x57251290,0,0 0x57051290,2,0,0x57070000,2,0=0x57051290,2,0,0x57071210,2,0 0x57251290,2,0,0x57270000,2,0=0x57251290,2,0,0x57271210,2,0 -0x5C070000,1,0,0x57080000,0,0=0x5C070000,1,0,0x57081210,0,0 -0x5C070000,1,0,0x57280000,0,0=0x5C070000,1,0,0x57281210,0,0 0x57081210,0,0,0x57080080,0,0=0x57081200,0,0,0x57081290,0,0; missing_paths 0x57081210,0,0,0x57080080,2,0=0x57081200,0,0,0x57081290,2,0; missing_paths 0x57081290,0,0,0x57080000,2,0=0x57081290,0,0,0x57081200,2,0; missing_paths 0x57081290,2,0,0x57080000,2,0=0x57081290,2,0,0x57081200,2,0; missing_paths -0x5C070000,1,0,0x57090000,0,0=0x5C070000,1,0,0x57091210,0,0 -0x5C070000,1,0,0x57290000,0,0=0x5C070000,1,0,0x57291210,0,0 0x57091210,0,0,0x57080080,0,0=0x57091200,0,0,0x57081290,0,0; missing_paths 0x57091210,0,0,0x57080080,2,0=0x57091200,0,0,0x57081290,2,0; missing_paths 0x57081290,0,0,0x57090000,2,0=0x57081290,0,0,0x57091210,2,0 0x57281290,0,0,0x57290000,2,0=0x57281290,0,0,0x57291210,2,0 0x57081290,2,0,0x57090000,2,0=0x57081290,2,0,0x57091210,2,0 0x57281290,2,0,0x57290000,2,0=0x57281290,2,0,0x57291210,2,0 -0x5C070000,1,0,0x57120100,0,0=0x5C070000,1,0,0x57621210,1,1 -0x5C070000,1,0,0x57120100,2,1=0x5C070000,1,0,0x57621210,3,0 ; 0x57021210,0,0,0x57000000,0,0=0x57021210,0,0,0x57001210,0,0 0x57021210,0,0,0x57000000,2,0=0x57021210,0,0,0x57001210,2,0 @@ -8455,156 +7671,35 @@ 0x57621210,3,1,0x00000100,3,0=0x57621210,3,1,0x5C010000,1,0 ;L0-to-L2 ;L0 Stub into Onslope -0x09000300,1,0,0x57700100,1,0=0x09004B00,1,0,0x5C070100,1,0 -0x09004B00,1,0,0x57700100,1,0=0x09004B00,1,0,0x5C070100,1,0 -0x5F940300,1,0,0x57700100,1,0=0x09004B00,1,0,0x5C070100,1,0 -0x09000300,1,0,0x5C070100,1,0=0x09004B00,1,0,0x5C070100,1,0 ;Onslope into Elevated -0x57700100,1,0,0x09000300,3,0=0x5C070100,1,0,0x5C040000,1,0 -0x57700100,1,0,0x5C040000,1,0=0x5C070100,1,0,0x5C040000,1,0 -0x5C070100,1,0,0x09000300,3,0=0x5C070100,1,0,0x5C040000,1,0 ; -0x09000F00,2,0,0x57700100,1,0=0x09005700,3,0,0x5C070100,1,0 -0x09000F00,2,0,0x5C070100,1,0=0x09005700,3,0,0x5C070100,1,0 -0x09000F00,1,0,0x57700100,1,0=0x09005700,1,0,0x5C070100,1,0 -0x09000F00,1,0,0x5C070100,1,0=0x09005700,1,0,0x5C070100,1,0 ; -0x09aa0400,2,0,0x57700100,1,0=0x09aa0a00,0,0,0x5C070100,1,0 -0x09aa0400,2,0,0x5C070100,1,0=0x09aa0a00,0,0,0x5C070100,1,0 ; ; -0x09005700,2,0,0x57700100,1,0=0x09020700,0,0,0x5C070100,1,0 -0x09005700,2,0,0x5C070100,1,0=0x09020700,0,0,0x5C070100,1,0 ; -0x091a8800,0,0,0x57700100,1,0=0x091a8900,2,0,0x5C070100,1,0 -0x091a8800,0,0,0x5C070100,1,0=0x091a8900,2,0,0x5C070100,1,0 ; -0x57600200,2,0,0x57700100,1,0=0x57001200,0,0,0x5C070100,1,0 -0x57600200,2,0,0x5C070100,1,0=0x57001200,0,0,0x5C070100,1,0 ; ; ; ; ; -0x51043200,2,0,0x57700100,1,0=0x51041200,1,0,0x5C070100,1,0 -0x51043200,2,0,0x5C070100,1,0=0x51041200,1,0,0x5C070100,1,0 ; ; -0x51103280,3,0,0x57700100,1,0=0x51101200,1,0,0x5C070100,1,0 -0x51103280,3,0,0x5C070100,1,0=0x51101200,1,0,0x5C070100,1,0 ; -0x51113280,3,0,0x57700100,1,0=0x51111200,1,0,0x5C070100,1,0 -0x51113280,3,0,0x5C070100,1,0=0x51111200,1,0,0x5C070100,1,0 ; -0x51123280,3,0,0x57700100,1,0=0x51121200,1,0,0x5C070100,1,0 -0x51123280,3,0,0x5C070100,1,0=0x51121200,1,0,0x5C070100,1,0 ; -0x51133280,3,0,0x57700100,1,0=0x51131200,1,0,0x5C070100,1,0 -0x51133280,3,0,0x5C070100,1,0=0x51131200,1,0,0x5C070100,1,0 ; -0x51143280,3,0,0x57700100,1,0=0x51141200,1,0,0x5C070100,1,0 -0x51143280,3,0,0x5C070100,1,0=0x51141200,1,0,0x5C070100,1,0 ; -0x51203280,3,0,0x57700100,1,0=0x51201200,1,0,0x5C070100,1,0 -0x51203280,3,0,0x5C070100,1,0=0x51201200,1,0,0x5C070100,1,0 ; -0x51213280,3,0,0x57700100,1,0=0x51211200,1,0,0x5C070100,1,0; missing_paths -0x51213280,3,0,0x5C070100,1,0=0x51211200,1,0,0x5C070100,1,0; missing_paths ;Adjacencies -0x5C070100,1,0,0x09AA0400,0,0=0x5C070100,1,0,0x5C041000,1,0 -0x5C070100,1,0,0x09005700,0,0=0x5C070100,1,0,0x5C041100,1,0 -0x5C070100,1,0,0x09705700,0,0=0x5C070100,1,0,0x5C041200,1,0 -0x5C070100,1,0,0x091a8800,2,0=0x5C070100,1,0,0x5C041300,3,0 -0x5C070100,1,0,0x0A001500,3,0=0x5C070100,1,0,0x5C041400,3,0 -0x5C070100,1,0,0x02001500,3,0=0x5C070100,1,0,0x5C041420,3,0; missing_paths -0x5C070100,1,0,0x09310100,1,0=0x5C070100,1,0,0x5C041500,1,0 -0x5C070100,1,0,0x09310100,3,0=0x5C070100,1,0,0x5C041500,3,0 -0x5C070100,1,0,0x5D342000,1,0=0x5C070100,1,0,0x5C041505,1,0 -0x5C070100,1,0,0x5D342000,3,0=0x5C070100,1,0,0x5C041505,3,0 -0x5C070100,1,0,0x5F880E00,1,0=0x5C070100,1,0,0x5C041700,1,0 -0x5C070100,1,0,0x5F880E00,3,0=0x5C070100,1,0,0x5C041700,3,0 -0x5C070100,1,0,0x5F888E00,1,0=0x5C070100,1,0,0x5C041705,1,0 -0x5C070100,1,0,0x5F888E00,3,0=0x5C070100,1,0,0x5C041705,3,0 -0x5C070100,1,0,0x091D0200,1,0=0x5C070100,1,0,0x5C041720,1,0 -0x5C070100,1,0,0x091D0200,3,0=0x5C070100,1,0,0x5C041720,3,0 -0x5C070100,1,0,0x5F884E00,1,0=0x5C070100,1,0,0x5C041800,1,0 -0x5C070100,1,0,0x5F884E00,3,0=0x5C070100,1,0,0x5C041800,3,0 -0x5C070100,1,0,0x5F88CE00,1,0=0x5C070100,1,0,0x5C041805,1,0 -0x5C070100,1,0,0x5F88CE00,3,0=0x5C070100,1,0,0x5C041805,3,0 -0x5C070100,1,0,0x092D0200,1,0=0x5C070100,1,0,0x5C041920,1,0 -0x5C070100,1,0,0x092D0200,3,0=0x5C070100,1,0,0x5C041920,3,0 -0x5C070100,1,0,0x5DDD0300,1,0=0x5C070100,1,0,0x5C041925,1,0; missing_paths -0x5C070100,1,0,0x5DDD0300,3,0=0x5C070100,1,0,0x5C041925,3,0; missing_paths -0x5C070100,1,0,0x51003200,3,0=0x5C070100,1,0,0x5C041A00,1,0 -0x5C070100,1,0,0x51013200,3,0=0x5C070100,1,0,0x5C041B00,1,0 -0x5C070100,1,0,0x51023200,3,0=0x5C070100,1,0,0x5C041C00,1,0 -0x5C070100,1,0,0x51023280,3,0=0x5C070100,1,0,0x5C041C00,3,0 -0x5C070100,1,0,0x51033200,3,0=0x5C070100,1,0,0x5C041D00,1,0 -0x5C070100,1,0,0x51043200,3,0=0x5C070100,1,0,0x5C041E00,1,0 -0x5C070100,1,0,0x51053200,3,0=0x5C070100,1,0,0x5C041F00,1,0 -0x5C070100,1,0,0x51103280,1,0=0x5C070100,1,0,0x5C042000,3,0 -0x5C070100,1,0,0x51113280,1,0=0x5C070100,1,0,0x5C042100,3,0 -0x5C070100,1,0,0x51123280,1,0=0x5C070100,1,0,0x5C042200,3,0 -0x5C070100,1,0,0x51133280,1,0=0x5C070100,1,0,0x5C042300,3,0 -0x5C070100,1,0,0x51143280,1,0=0x5C070100,1,0,0x5C042400,3,0 -0x5C070100,1,0,0x51203280,1,0=0x5C070100,1,0,0x5C042500,3,0 -0x5C070100,1,0,0x51213280,1,0=0x5C070100,1,0,0x5C042600,3,0; missing_paths ;Tight Situations -0x5C070100,1,0,0x05004b00,0,0=0x5C070100,1,0,0x5C041000,1,0 -0x5C070100,1,0,0x05004b00,2,0=0x5C070100,1,0,0x5C041000,1,0 -0x5C070100,1,0,0x00004b00,0,0=0x5C070100,1,0,0x5C041100,1,0 -0x5C070100,1,0,0x00004b00,2,0=0x5C070100,1,0,0x5C041100,1,0 -0x5C070100,1,0,0x09004b00,0,0=0x5C070100,1,0,0x5C041200,1,0 -0x5C070100,1,0,0x09004b00,2,0=0x5C070100,1,0,0x5C041200,1,0 -0x5C070100,1,0,0x5F940300,0,0=0x5C070100,1,0,0x5C041200,1,0 -0x5C070100,1,0,0x5F940300,2,0=0x5C070100,1,0,0x5C041200,1,0 -0x5C070100,1,0,0x04006100,0,0=0x5C070100,1,0,0x5C041300,3,0 0x5C041300,3,0,0x04006100,2,0=0x5C041300,3,0,0x5C041300,1,0 -0x5C070100,1,0,0x0a001500,0,0=0x5C070100,1,0,0x5C041400,3,0 0x5C041300,3,0,0x0a001500,2,0=0x5C041300,3,0,0x5C041400,1,0 -0x5C070100,1,0,0x03031500,0,0=0x5C070100,1,0,0x5C041500,1,0 -0x5C070100,1,0,0x03031500,2,0=0x5C070100,1,0,0x5C041500,1,0 -0x5C070100,1,0,0x5d540000,0,0=0x5C070100,1,0,0x5C041500,1,0 -0x5C070100,1,0,0x5d540000,2,0=0x5C070100,1,0,0x5C041500,1,0 -0x5C070100,1,0,0x5d300000,0,0=0x5C070100,1,0,0x5C041505,1,0 -0x5C070100,1,0,0x5d300000,2,0=0x5C070100,1,0,0x5C041505,1,0 -0x5C070100,1,0,0x5f880000,0,0=0x5C070100,1,0,0x5C041700,1,0 -0x5C070100,1,0,0x5f880000,2,0=0x5C070100,1,0,0x5C041700,1,0 -0x5C070100,1,0,0x5f888000,0,0=0x5C070100,1,0,0x5C041705,1,0 -0x5C070100,1,0,0x5f888000,2,0=0x5C070100,1,0,0x5C041705,1,0 -0x5C070100,1,0,0x08031500,0,0=0x5C070100,1,0,0x5C041720,1,0 -0x5C070100,1,0,0x08031500,2,0=0x5C070100,1,0,0x5C041720,1,0 -0x5C070100,1,0,0x5f884000,0,0=0x5C070100,1,0,0x5C041800,1,0 -0x5C070100,1,0,0x5f884000,2,0=0x5C070100,1,0,0x5C041800,1,0 -0x5C070100,1,0,0x5f88c000,0,0=0x5C070100,1,0,0x5C041805,1,0 -0x5C070100,1,0,0x5f88c000,2,0=0x5C070100,1,0,0x5C041805,1,0 -0x5C070100,1,0,0x5dc31500,0,0=0x5C070100,1,0,0x5C041905,1,0 -0x5C070100,1,0,0x5dc31500,2,0=0x5C070100,1,0,0x5C041905,1,0 -0x5C070100,1,0,0x0d031500,0,0=0x5C070100,1,0,0x5C041920,1,0 -0x5C070100,1,0,0x0d031500,2,0=0x5C070100,1,0,0x5C041920,1,0 -0x5C070100,1,0,0x5dd31500,0,0=0x5C070100,1,0,0x5C041925,1,0; missing_paths -0x5C070100,1,0,0x5dd31500,2,0=0x5C070100,1,0,0x5C041925,1,0; missing_paths -0x5C070100,1,0,0x51000000,0,0=0x5C070100,1,0,0x5C041A00,1,0 -0x5C070100,1,0,0x51000000,2,0=0x5C070100,1,0,0x5C041A00,1,0 -0x5C070100,1,0,0x51010000,0,0=0x5C070100,1,0,0x5C041B00,1,0 -0x5C070100,1,0,0x51010000,2,0=0x5C070100,1,0,0x5C041B00,1,0 -0x5C070100,1,0,0x51030000,0,0=0x5C070100,1,0,0x5C041D00,1,0 -0x5C070100,1,0,0x51030000,2,0=0x5C070100,1,0,0x5C041D00,1,0 -0x5C070100,1,0,0x51040000,0,0=0x5C070100,1,0,0x5C041E00,1,0 -0x5C070100,1,0,0x51040000,2,0=0x5C070100,1,0,0x5C041E00,1,0 -0x5C070100,1,0,0x51050000,0,0=0x5C070100,1,0,0x5C041F00,1,0 -0x5C070100,1,0,0x51050000,2,0=0x5C070100,1,0,0x5C041F00,1,0 -0x5C070100,1,0,0x51100000,0,0=0x5C070100,1,0,0x5C042000,3,0 0x5C042000,3,0,0x51100000,2,0=0x5C042000,3,0,0x5C042000,1,0 -0x5C070100,1,0,0x51110000,0,0=0x5C070100,1,0,0x5C042100,3,0 0x5C042100,3,0,0x51110000,2,0=0x5C042100,3,0,0x5C042100,1,0 -0x5C070100,1,0,0x51120000,0,0=0x5C070100,1,0,0x5C042200,3,0 0x5C042200,3,0,0x51120000,2,0=0x5C042200,3,0,0x5C042200,1,0 -0x5C070100,1,0,0x51130000,0,0=0x5C070100,1,0,0x5C042300,3,0 0x5C042300,3,0,0x51130000,2,0=0x5C042300,3,0,0x5C042300,1,0 -0x5C070100,1,0,0x51140000,0,0=0x5C070100,1,0,0x5C042400,3,0 0x5C042400,3,0,0x51140000,2,0=0x5C042400,3,0,0x5C042400,1,0 -0x5C070100,1,0,0x51200000,0,0=0x5C070100,1,0,0x5C042500,3,0 0x5C042500,3,0,0x51200080,0,0=0x5C042500,3,0,0x5C042580,1,0 0x5C042500,3,0,0x51200080,2,0=0x5C042500,3,0,0x5C042580,3,0 0x5C042500,3,0,0x51210080,0,0=0x5C042500,3,0,0x5C042680,1,0 @@ -8613,8 +7708,6 @@ 0x5C042580,3,0,0x51200000,2,0=0x5C042580,3,0,0x5C042500,1,0 0x5C042680,1,0,0x51200000,2,0=0x5C042680,1,0,0x5C042500,1,0 0x5C042680,3,0,0x51200000,2,0=0x5C042680,3,0,0x5C042500,1,0 -0x5C070100,1,0,0x51210000,0,0=0x5C070100,1,0,0x5C042600,3,0 -0x5C070100,1,0,0x51210000,2,0=0x5C070100,1,0,0x5C042600,1,0 0x5C042600,3,0,0x51200080,0,0=0x5C042600,3,0,0x5C042580,1,0 0x5C042600,3,0,0x51200080,2,0=0x5C042600,3,0,0x5C042580,3,0 0x5C042600,3,0,0x51210080,0,0=0x5C042600,3,0,0x5C042680,1,0 @@ -8624,64 +7717,13 @@ 0x5C042680,1,0,0x51210000,2,0=0x5C042680,1,0,0x5C042600,1,0 0x5C042680,3,0,0x51210000,2,0=0x5C042680,3,0,0x5C042600,1,0 ; -0x5C070100,1,0,0x584E0000,0,0=0x5C070100,1,0,0x5C042700,1,0 -0x5C070100,1,0,0x584E0000,2,0=0x5C070100,1,0,0x5C042700,1,0 -0x5C070100,1,0,0x58480000,0,0=0x5C070100,1,0,0x5C042800,1,0 -0x5C070100,1,0,0x58480000,2,0=0x5C070100,1,0,0x5C042800,1,0 -0x5C070100,1,0,0x58486C00,0,0=0x5C070100,1,0,0x5C042805,1,0 -0x5C070100,1,0,0x58486C00,2,0=0x5C070100,1,0,0x5C042805,1,0 -0x5C070100,1,0,0x58400000,0,0=0x5C070100,1,0,0x5C042A00,3,0 -; -0x5C070100,1,0,0x57000000,0,0=0x5C070100,1,0,0x57001220,0,0 -0x5C070100,1,0,0x57000000,2,0=0x5C070100,1,0,0x57001220,2,0 -0x5C070100,1,0,0x57100000,0,0=0x5C070100,1,0,0x57101220,0,0 -0x5C070100,1,0,0x57100000,2,0=0x5C070100,1,0,0x57101220,2,0 -0x5C070100,1,0,0x57200000,0,0=0x5C070100,1,0,0x57201220,0,0 -0x5C070100,1,0,0x57200000,2,0=0x5C070100,1,0,0x57201220,2,0 -0x5C070100,1,0,0x57010000,0,0=0x5C070100,1,0,0x57011220,0,0 -0x5C070100,1,0,0x57010000,2,0=0x5C070100,1,0,0x57011220,2,0 -0x5C070100,1,0,0x57210000,0,0=0x5C070100,1,0,0x57211220,0,0 -0x5C070100,1,0,0x57210000,2,0=0x5C070100,1,0,0x57211220,2,0 -0x5C070100,1,0,0x57020000,0,0=0x5C070100,1,0,0x57021220,0,0 -0x5C070100,1,0,0x57020000,2,0=0x5C070100,1,0,0x57021220,2,0 -0x5C070100,1,0,0x57120000,0,0=0x5C070100,1,0,0x57121220,0,0 -0x5C070100,1,0,0x57120000,2,0=0x5C070100,1,0,0x57121220,2,0 -0x5C070100,1,0,0x57220000,0,0=0x5C070100,1,0,0x57221220,0,0 -0x5C070100,1,0,0x57220000,2,0=0x5C070100,1,0,0x57221220,2,0 -0x5C070100,1,0,0x57320000,0,0=0x5C070100,1,0,0x57321220,0,0 -0x5C070100,1,0,0x57320000,2,0=0x5C070100,1,0,0x57321220,2,0 -0x5C070100,1,0,0x57420000,0,0=0x5C070100,1,0,0x57421220,0,0 -0x5C070100,1,0,0x57420000,2,0=0x5C070100,1,0,0x57421220,2,0 -0x5C070100,1,0,0x57030000,0,0=0x5C070100,1,0,0x57031220,0,0 -0x5C070100,1,0,0x57030000,2,0=0x5C070100,1,0,0x57031220,2,0 -0x5C070100,1,0,0x57130000,0,0=0x5C070100,1,0,0x57131220,0,0 -0x5C070100,1,0,0x57130000,2,0=0x5C070100,1,0,0x57131220,2,0 -0x5C070100,1,0,0x57330000,0,0=0x5C070100,1,0,0x57331220,0,0 -0x5C070100,1,0,0x57330000,2,0=0x5C070100,1,0,0x57331220,2,0 -0x5C070100,1,0,0x57430000,0,0=0x5C070100,1,0,0x57431220,0,0 -0x5C070100,1,0,0x57430000,2,0=0x5C070100,1,0,0x57431220,2,0 -0x5C070100,1,0,0x57040000,0,0=0x5C070100,1,0,0x57041220,0,0 -0x5C070100,1,0,0x57040000,2,0=0x5C070100,1,0,0x57041220,2,0 -0x5C070100,1,0,0x57240000,0,0=0x5C070100,1,0,0x57241220,0,0; missing_paths -0x5C070100,1,0,0x57240000,2,0=0x5C070100,1,0,0x57241220,2,0; missing_paths -0x5C070100,1,0,0x57340000,0,0=0x5C070100,1,0,0x57341220,0,0 -0x5C070100,1,0,0x57340000,2,0=0x5C070100,1,0,0x57341220,2,0 -0x5C070100,1,0,0x57440000,0,0=0x5C070100,1,0,0x57441220,0,0 -0x5C070100,1,0,0x57440000,2,0=0x5C070100,1,0,0x57441220,2,0 -0x5C070100,1,0,0x57050000,0,0=0x5C070100,1,0,0x57051220,0,0 -0x5C070100,1,0,0x57150000,0,0=0x5C070100,1,0,0x57151220,0,0 +; 0x57051220,0,0,0x57050080,0,0=0x57051220,0,0,0x570512A0,0,0 0x57251220,0,0,0x57150080,0,0=0x57251220,0,0,0x571512A0,0,0; missing_paths 0x570512A0,0,0,0x57050080,2,0=0x570512A0,0,0,0x570512A0,2,0 0x572512A0,0,0,0x57150080,2,0=0x572512A0,0,0,0x571512A0,2,0; missing_paths -0x5C070100,1,0,0x57050080,2,0=0x5C070100,1,0,0x570512A0,2,0 -0x5C070100,1,0,0x57150080,2,0=0x5C070100,1,0,0x571512A0,2,0 0x570512A0,2,0,0x57050000,2,0=0x570512A0,2,0,0x57051220,2,0 0x572512A0,2,0,0x57150000,2,0=0x572512A0,2,0,0x57151220,2,0; missing_paths -0x5C070100,1,0,0x57060000,0,0=0x5C070100,1,0,0x57061220,0,0 -0x5C070100,1,0,0x57160000,0,0=0x5C070100,1,0,0x57161220,0,0 -0x5C070100,1,0,0x57070000,0,0=0x5C070100,1,0,0x57071220,0,0 -0x5C070100,1,0,0x57170000,0,0=0x5C070100,1,0,0x57171220,0,0 0x57061220,0,0,0x57050080,0,0=0x57061220,0,0,0x570512A0,0,0 0x57261220,0,0,0x57150080,0,0=0x57261220,0,0,0x571512A0,0,0; missing_paths 0x57071220,0,0,0x57050080,0,0=0x57071220,0,0,0x570512A0,0,0 @@ -8690,24 +7732,18 @@ 0x572512A0,2,0,0x57160000,2,0=0x572512A0,2,0,0x57161220,2,0; missing_paths 0x570512A0,2,0,0x57070000,2,0=0x570512A0,2,0,0x57071220,2,0 0x572512A0,2,0,0x57170000,2,0=0x572512A0,2,0,0x57171220,2,0; missing_paths -0x5C070100,1,0,0x57080000,0,0=0x5C070100,1,0,0x57081220,0,0 -0x5C070100,1,0,0x57180000,0,0=0x5C070100,1,0,0x57181220,0,0 0x57081220,0,0,0x57080080,0,0=0x57081200,0,0,0x570812A0,0,0; missing_paths 0x57081220,0,0,0x57080080,2,0=0x57081200,0,0,0x570812A0,2,0; missing_paths 0x570812A0,0,0,0x57080000,2,0=0x570812A0,0,0,0x57081200,2,0; missing_paths 0x572812A0,0,0,0x57180000,2,0=0x572812A0,0,0,0x57181200,2,0; missing_paths 0x570812A0,2,0,0x57080000,2,0=0x570812A0,2,0,0x57081200,2,0; missing_paths 0x572812A0,2,0,0x57180000,2,0=0x572812A0,2,0,0x57181200,2,0; missing_paths -0x5C070100,1,0,0x57090000,0,0=0x5C070100,1,0,0x57091220,0,0 -0x5C070100,1,0,0x57190000,0,0=0x5C070100,1,0,0x57191220,0,0 0x57091220,0,0,0x57080080,0,0=0x57091200,0,0,0x570812A0,0,0; missing_paths 0x57091220,0,0,0x57080080,2,0=0x57091200,0,0,0x570812A0,2,0; missing_paths 0x570812A0,0,0,0x57090000,2,0=0x570812A0,0,0,0x57091200,2,0; missing_paths 0x572812A0,0,0,0x57190000,2,0=0x572812A0,0,0,0x57191200,2,0; missing_paths 0x570812A0,2,0,0x57090000,2,0=0x570812A0,2,0,0x57091200,2,0; missing_paths 0x572812A0,2,0,0x57190000,2,0=0x572812A0,2,0,0x57191200,2,0; missing_paths -0x5C070100,1,0,0x57220100,0,0=0x5C070100,1,0,0x57621220,1,1 -0x5C070100,1,0,0x57220100,2,1=0x5C070100,1,0,0x57621220,3,0 ; 0x57021220,0,0,0x57000000,0,0=0x57021220,0,0,0x57001220,0,0 0x57021220,0,0,0x57000000,2,0=0x57021220,0,0,0x57001220,2,0 @@ -9419,273 +8455,40 @@ ;L1-to-L2 ;Into ;L0 Stub into Onslope -0x5C010100,1,0,0x57700000,1,0=0x5C010100,1,0,0x5C070010,1,0 -0x5C010100,3,0,0x5C070000,1,0=0x5C010100,3,0,0x5C070010,1,0 -0x5C010100,1,0,0x57700000,1,0=0x5C010100,1,0,0x5C070010,1,0 -0x5C010100,3,0,0x5C070000,1,0=0x5C010100,3,0,0x5C070010,1,0 -0x5C010100,1,0,0x57700000,1,0=0x5C010100,1,0,0x5C070010,1,0 -0x5C010100,1,0,0x5C070000,1,0=0x5C010100,1,0,0x5C070010,1,0 ;Onslope into Elevated ;Out of -0x5C070010,1,0,0x09004B00,1,0=0x5C070010,1,0,0x5C040000,1,0 -0x5C070010,1,0,0x09004B00,3,0=0x5C070010,1,0,0x5C040000,1,0 -0x5C070010,1,0,0x5F940300,1,0=0x5C070010,1,0,0x5C040000,1,0 -0x5C070010,1,0,0x5F940300,3,0=0x5C070010,1,0,0x5C040000,1,0 -0x5C070010,1,0,0x09000300,3,0=0x5C070010,1,0,0x5C040000,1,0 -0x5C070010,1,0,0x5C010000,1,0=0x5C070010,1,0,0x5C040000,1,0 -0x5C070010,1,0,0x5C010000,3,0=0x5C070010,1,0,0x5C040000,1,0 0x5C040000,1,0,0x5C010000,1,0=0x5C040000,1,0,0x5C040000,1,0 0x5C040000,1,0,0x5C010000,3,0=0x5C040000,1,0,0x5C040000,1,0 0x5C040000,3,0,0x5C010000,1,0=0x5C040000,3,0,0x5C040000,3,0 0x5C040000,3,0,0x5C010000,3,0=0x5C040000,3,0,0x5C040000,3,0 ; -0x5C070010,3,0,0x09004B00,1,0=0x5C070010,3,0,0x5C010000,3,0 -0x5C070010,3,0,0x09004B00,3,0=0x5C070010,3,0,0x5C010000,3,0 -0x5C070010,3,0,0x5F940300,1,0=0x5C070010,3,0,0x5C010000,3,0 -0x5C070010,3,0,0x5F940300,3,0=0x5C070010,3,0,0x5C010000,3,0 ;Adjacencies ;Overriding L1 -0x5C070010,1,0,0x5C011000,1,0=0x5C070010,1,0,0x5C041000,1,0 -0x5C070010,1,0,0x5C011000,3,0=0x5C070010,1,0,0x5C041000,3,0 -0x5C070010,1,0,0x5C011100,1,0=0x5C070010,1,0,0x5C041100,1,0 -0x5C070010,1,0,0x5C011100,3,0=0x5C070010,1,0,0x5C041100,3,0 -0x5C070010,1,0,0x5C011110,1,0=0x5C070010,1,0,0x5C041110,1,0 -0x5C070010,1,0,0x5C011110,3,0=0x5C070010,1,0,0x5C041110,3,0 -0x5C070010,1,0,0x5C011110,0,0=0x5C070010,1,0,0x5C041110,1,0 -0x5C070010,1,0,0x5C011110,2,0=0x5C070010,1,0,0x5C041110,3,0 -0x5C070010,1,0,0x5C041110,0,0=0x5C070010,1,0,0x5C041120,1,0 -0x5C070010,1,0,0x5C041110,2,0=0x5C070010,1,0,0x5C041120,3,0 -0x5C070010,1,0,0x5C011200,1,0=0x5C070010,1,0,0x5C041200,1,0 -0x5C070010,1,0,0x5C011200,3,0=0x5C070010,1,0,0x5C041200,3,0 -0x5C070010,1,0,0x5C011300,3,0=0x5C070010,1,0,0x5C041300,3,0 -0x5C070010,1,0,0x5C011400,3,0=0x5C070010,1,0,0x5C041400,3,0 -0x5C070010,1,0,0x5C011500,1,0=0x5C070010,1,0,0x5C041500,1,0 -0x5C070010,1,0,0x5C011500,3,0=0x5C070010,1,0,0x5C041500,3,0 -0x5C070010,1,0,0x5C011505,1,0=0x5C070010,1,0,0x5C041505,1,0 -0x5C070010,1,0,0x5C011505,3,0=0x5C070010,1,0,0x5C041505,3,0 -0x5C070010,1,0,0x5C011700,1,0=0x5C070010,1,0,0x5C041700,1,0 -0x5C070010,1,0,0x5C011700,3,0=0x5C070010,1,0,0x5C041700,3,0 -0x5C070010,1,0,0x5C011705,1,0=0x5C070010,1,0,0x5C041705,1,0 -0x5C070010,1,0,0x5C011705,3,0=0x5C070010,1,0,0x5C041705,3,0 -0x5C070010,1,0,0x5C011905,1,0=0x5C070010,1,0,0x5C041905,1,0 -0x5C070010,1,0,0x5C011905,3,0=0x5C070010,1,0,0x5C041905,3,0 -0x5C070010,1,0,0x5C011A00,1,0=0x5C070010,1,0,0x5C041A00,1,0 -0x5C070010,1,0,0x5C011A00,3,0=0x5C070010,1,0,0x5C041A00,3,0 -0x5C070010,1,0,0x5C011B00,1,0=0x5C070010,1,0,0x5C041B00,1,0 -0x5C070010,1,0,0x5C011B00,3,0=0x5C070010,1,0,0x5C041B00,3,0 -0x5C070010,1,0,0x5C011C00,1,0=0x5C070010,1,0,0x5C041C00,1,0 -0x5C070010,1,0,0x5C011C00,3,0=0x5C070010,1,0,0x5C041C00,3,0 -0x5C070010,1,0,0x5C011D00,1,0=0x5C070010,1,0,0x5C041D00,1,0 -0x5C070010,1,0,0x5C011D00,3,0=0x5C070010,1,0,0x5C041D00,3,0 -0x5C070010,1,0,0x5C011E00,1,0=0x5C070010,1,0,0x5C041E00,1,0 -0x5C070010,1,0,0x5C011E00,3,0=0x5C070010,1,0,0x5C041E00,3,0 -0x5C070010,1,0,0x5C011F00,1,0=0x5C070010,1,0,0x5C041F00,1,0 -0x5C070010,1,0,0x5C011F00,3,0=0x5C070010,1,0,0x5C041F00,3,0 -0x5C070010,1,0,0x5C012000,1,0=0x5C070010,1,0,0x5C042000,1,0 -0x5C070010,1,0,0x5C012100,1,0=0x5C070010,1,0,0x5C042000,1,0 -0x5C070010,1,0,0x5C012200,1,0=0x5C070010,1,0,0x5C042000,1,0 -0x5C070010,1,0,0x5C012300,1,0=0x5C070010,1,0,0x5C042000,1,0 -0x5C070010,1,0,0x5C012400,1,0=0x5C070010,1,0,0x5C042000,1,0 -0x5C070010,1,0,0x5C012500,1,0=0x5C070010,1,0,0x5C042000,1,0 -0x5C070010,1,0,0x5C012580,1,0=0x5C070010,1,0,0x5C042000,1,0 -0x5C070010,1,0,0x5C012580,3,0=0x5C070010,1,0,0x5C042000,1,0 -0x5C070010,1,0,0x5C012600,1,0=0x5C070010,1,0,0x5C042000,1,0 -0x5C070010,1,0,0x5C012680,1,0=0x5C070010,1,0,0x5C042000,1,0 -0x5C070010,1,0,0x5C012680,3,0=0x5C070010,1,0,0x5C042000,1,0 ;Tight Situations -0x5C070010,1,0,0x05004b00,0,0=0x5C070010,1,0,0x5C041000,1,0 -0x5C070010,1,0,0x05004b00,2,0=0x5C070010,1,0,0x5C041000,1,0 -0x5C070010,1,0,0x00004b00,0,0=0x5C070010,1,0,0x5C041100,1,0 -0x5C070010,1,0,0x00004b00,2,0=0x5C070010,1,0,0x5C041100,1,0 -0x5C070010,1,0,0x09004b00,0,0=0x5C070010,1,0,0x5C041200,1,0 -0x5C070010,1,0,0x09004b00,2,0=0x5C070010,1,0,0x5C041200,1,0 -0x5C070010,1,0,0x5F940300,0,0=0x5C070010,1,0,0x5C041200,1,0 -0x5C070010,1,0,0x5F940300,2,0=0x5C070010,1,0,0x5C041200,1,0 -0x5C070010,1,0,0x04006100,0,0=0x5C070010,1,0,0x5C041300,3,0 -0x5C070010,1,0,0x0a001500,0,0=0x5C070010,1,0,0x5C041400,3,0 -0x5C070010,1,0,0x03031500,0,0=0x5C070010,1,0,0x5C041500,1,0 -0x5C070010,1,0,0x03031500,2,0=0x5C070010,1,0,0x5C041500,1,0 -0x5C070010,1,0,0x5d540000,0,0=0x5C070010,1,0,0x5C041500,1,0 -0x5C070010,1,0,0x5d540000,2,0=0x5C070010,1,0,0x5C041500,1,0 -0x5C070010,1,0,0x5d300000,0,0=0x5C070010,1,0,0x5C041505,1,0 -0x5C070010,1,0,0x5d300000,2,0=0x5C070010,1,0,0x5C041505,1,0 -0x5C070010,1,0,0x5f880000,0,0=0x5C070010,1,0,0x5C041700,1,0 -0x5C070010,1,0,0x5f880000,2,0=0x5C070010,1,0,0x5C041700,1,0 -0x5C070010,1,0,0x5f888000,0,0=0x5C070010,1,0,0x5C041705,1,0 -0x5C070010,1,0,0x5f888000,2,0=0x5C070010,1,0,0x5C041705,1,0 -0x5C070010,1,0,0x08031500,0,0=0x5C070010,1,0,0x5C041720,1,0 -0x5C070010,1,0,0x08031500,2,0=0x5C070010,1,0,0x5C041720,1,0 -0x5C070010,1,0,0x5f884000,0,0=0x5C070010,1,0,0x5C041800,1,0 -0x5C070010,1,0,0x5f884000,2,0=0x5C070010,1,0,0x5C041800,1,0 -0x5C070010,1,0,0x5f88c000,0,0=0x5C070010,1,0,0x5C041805,1,0 -0x5C070010,1,0,0x5f88c000,2,0=0x5C070010,1,0,0x5C041805,1,0 -0x5C070010,1,0,0x5dc31500,0,0=0x5C070010,1,0,0x5C041905,1,0 -0x5C070010,1,0,0x5dc31500,2,0=0x5C070010,1,0,0x5C041905,1,0 -0x5C070010,1,0,0x0d031500,0,0=0x5C070010,1,0,0x5C041920,1,0 -0x5C070010,1,0,0x0d031500,2,0=0x5C070010,1,0,0x5C041920,1,0 -0x5C070010,1,0,0x5dd31500,0,0=0x5C070010,1,0,0x5C041925,1,0; missing_paths -0x5C070010,1,0,0x5dd31500,2,0=0x5C070010,1,0,0x5C041925,1,0; missing_paths -0x5C070010,1,0,0x51000000,0,0=0x5C070010,1,0,0x5C041A00,1,0 -0x5C070010,1,0,0x51000000,2,0=0x5C070010,1,0,0x5C041A00,1,0 -0x5C070010,1,0,0x51010000,0,0=0x5C070010,1,0,0x5C041B00,1,0 -0x5C070010,1,0,0x51010000,2,0=0x5C070010,1,0,0x5C041B00,1,0 -0x5C070010,1,0,0x51030000,0,0=0x5C070010,1,0,0x5C041D00,1,0 -0x5C070010,1,0,0x51030000,2,0=0x5C070010,1,0,0x5C041D00,1,0 -0x5C070010,1,0,0x51040000,0,0=0x5C070010,1,0,0x5C041E00,1,0 -0x5C070010,1,0,0x51040000,2,0=0x5C070010,1,0,0x5C041E00,1,0 -0x5C070010,1,0,0x51050000,0,0=0x5C070010,1,0,0x5C041F00,1,0 -0x5C070010,1,0,0x51050000,2,0=0x5C070010,1,0,0x5C041F00,1,0 -0x5C070010,1,0,0x51100000,0,0=0x5C070010,1,0,0x5C042000,3,0 -0x5C070010,1,0,0x51110000,0,0=0x5C070010,1,0,0x5C042100,3,0 -0x5C070010,1,0,0x51120000,0,0=0x5C070010,1,0,0x5C042200,3,0 -0x5C070010,1,0,0x51130000,0,0=0x5C070010,1,0,0x5C042300,3,0 -0x5C070010,1,0,0x51140000,0,0=0x5C070010,1,0,0x5C042400,3,0 -0x5C070010,1,0,0x51200000,0,0=0x5C070010,1,0,0x5C042500,3,0 -0x5C070010,1,0,0x51210000,0,0=0x5C070010,1,0,0x5C042600,3,0 -0x5C070010,1,0,0x51210000,2,0=0x5C070010,1,0,0x5C042600,1,0 -; -0x5C070010,1,0,0x58480000,2,0=0x5C070010,1,0,0x5C042800,1,0 -0x5C070010,1,0,0x58486C00,2,0=0x5C070010,1,0,0x5C042805,1,0 -; -0x5C070010,1,0,0x57000000,0,0=0x5C070010,1,0,0x57001220,0,0 -0x5C070010,1,0,0x57000000,2,0=0x5C070010,1,0,0x57001220,2,0 -0x5C070010,1,0,0x57100000,0,0=0x5C070010,1,0,0x57101220,0,0 -0x5C070010,1,0,0x57100000,2,0=0x5C070010,1,0,0x57101220,2,0 -0x5C070010,1,0,0x57200000,0,0=0x5C070010,1,0,0x57201220,0,0 -0x5C070010,1,0,0x57200000,2,0=0x5C070010,1,0,0x57201220,2,0 -0x5C070010,1,0,0x57010000,0,0=0x5C070010,1,0,0x57011220,0,0 -0x5C070010,1,0,0x57010000,2,0=0x5C070010,1,0,0x57011220,2,0 -0x5C070010,1,0,0x57210000,0,0=0x5C070010,1,0,0x57211220,0,0 -0x5C070010,1,0,0x57210000,2,0=0x5C070010,1,0,0x57211220,2,0 -0x5C070010,1,0,0x57020000,0,0=0x5C070010,1,0,0x57021220,0,0 -0x5C070010,1,0,0x57020000,2,0=0x5C070010,1,0,0x57021220,2,0 -0x5C070010,1,0,0x57120000,0,0=0x5C070010,1,0,0x57121220,0,0 -0x5C070010,1,0,0x57120000,2,0=0x5C070010,1,0,0x57121220,2,0 -0x5C070010,1,0,0x57220000,0,0=0x5C070010,1,0,0x57221220,0,0 -0x5C070010,1,0,0x57220000,2,0=0x5C070010,1,0,0x57221220,2,0 -0x5C070010,1,0,0x57320000,0,0=0x5C070010,1,0,0x57321220,0,0 -0x5C070010,1,0,0x57320000,2,0=0x5C070010,1,0,0x57321220,2,0 -0x5C070010,1,0,0x57420000,0,0=0x5C070010,1,0,0x57421220,0,0 -0x5C070010,1,0,0x57420000,2,0=0x5C070010,1,0,0x57421220,2,0 -0x5C070010,1,0,0x57030000,0,0=0x5C070010,1,0,0x57031220,0,0 -0x5C070010,1,0,0x57030000,2,0=0x5C070010,1,0,0x57031220,2,0 -0x5C070010,1,0,0x57130000,0,0=0x5C070010,1,0,0x57131220,0,0 -0x5C070010,1,0,0x57130000,2,0=0x5C070010,1,0,0x57131220,2,0 -0x5C070010,1,0,0x57330000,0,0=0x5C070010,1,0,0x57331220,0,0 -0x5C070010,1,0,0x57330000,2,0=0x5C070010,1,0,0x57331220,2,0 -0x5C070010,1,0,0x57430000,0,0=0x5C070010,1,0,0x57431220,0,0 -0x5C070010,1,0,0x57430000,2,0=0x5C070010,1,0,0x57431220,2,0 -0x5C070010,1,0,0x57040000,0,0=0x5C070010,1,0,0x57041220,0,0 -0x5C070010,1,0,0x57040000,2,0=0x5C070010,1,0,0x57041220,2,0 -0x5C070010,1,0,0x57240000,0,0=0x5C070010,1,0,0x57241220,0,0; missing_paths -0x5C070010,1,0,0x57240000,2,0=0x5C070010,1,0,0x57241220,2,0; missing_paths -0x5C070010,1,0,0x57340000,0,0=0x5C070010,1,0,0x57341220,0,0 -0x5C070010,1,0,0x57340000,2,0=0x5C070010,1,0,0x57341220,2,0 -0x5C070010,1,0,0x57440000,0,0=0x5C070010,1,0,0x57441220,0,0 -0x5C070010,1,0,0x57440000,2,0=0x5C070010,1,0,0x57441220,2,0 -0x5C070010,1,0,0x57050000,0,0=0x5C070010,1,0,0x57051220,0,0 -0x5C070010,1,0,0x57150000,0,0=0x5C070010,1,0,0x57151220,0,0 -0x5C070010,1,0,0x57050080,2,0=0x5C070010,1,0,0x570512A0,2,0 -0x5C070010,1,0,0x57150080,2,0=0x5C070010,1,0,0x571512A0,2,0 -0x5C070010,1,0,0x57060000,0,0=0x5C070010,1,0,0x57061220,0,0 -0x5C070010,1,0,0x57160000,0,0=0x5C070010,1,0,0x57161220,0,0 -0x5C070010,1,0,0x57070000,0,0=0x5C070010,1,0,0x57071220,0,0 -0x5C070010,1,0,0x57170000,0,0=0x5C070010,1,0,0x57171220,0,0 -0x5C070010,1,0,0x57080000,0,0=0x5C070010,1,0,0x57081220,0,0 -0x5C070010,1,0,0x57180000,0,0=0x5C070010,1,0,0x57181220,0,0 -0x5C070010,1,0,0x57090000,0,0=0x5C070010,1,0,0x57091220,0,0 -0x5C070010,1,0,0x57190000,0,0=0x5C070010,1,0,0x57191220,0,0 -0x5C070010,1,0,0x57220100,0,0=0x5C070010,1,0,0x57621220,1,1 -0x5C070010,1,0,0x57220100,2,1=0x5C070010,1,0,0x57621220,3,0 +; +; ;----Flexible On-Slope Transition System---- ;Coded by Tarkus ;AVENUE VIADUCTS ;L0-to-L1 ;L0 Stub into Onslope -0x04007300,1,0,0x57700000,1,0=0x04006100,1,0,0x5C080000,1,0 -0x04006100,1,0,0x57700000,1,0=0x04006100,1,0,0x5C080000,1,0 -0x04007300,1,0,0x5C080000,1,0=0x04006100,1,0,0x5C080000,1,0 -0x04007300,3,1,0x57700000,1,0=0x04006100,3,0,0x5C080000,3,1 -0x04006100,3,0,0x57700000,1,0=0x04006100,3,0,0x5C080000,3,1 -0x04007300,3,1,0x5C080000,3,1=0x04006100,3,0,0x5C080000,3,1; conflicting-override ;Onslope into Elevated -0x57700000,1,0,0x04007300,1,1=0x5C080000,1,0,0x5C020000,1,0 -0x57700000,1,0,0x5C020000,1,0=0x5C080000,1,0,0x5C020000,1,0 -0x5C080000,1,0,0x04007300,1,1=0x5C080000,1,0,0x5C020000,1,0 -0x57700000,1,0,0x04007300,3,0=0x5C080000,3,1,0x5C020000,3,0 -0x57700000,1,0,0x5C020000,3,0=0x5C080000,3,1,0x5C020000,3,0 -0x5C080000,3,1,0x04007300,3,0=0x5C080000,3,1,0x5C020000,3,0; conflicting-override ;Into Onslope Stability -0x04005600,1,1,0x57700000,1,0=0x04008300,3,0,0x5C080000,1,0 -0x04005600,3,0,0x57700000,1,0=0x04008300,1,0,0x5C080000,3,1 -0x04005600,1,1,0x5C080000,1,0=0x04008300,3,0,0x5C080000,1,0 -0x04005600,3,0,0x5C080000,3,1=0x04008300,1,0,0x5C080000,3,1; conflicting-override 0x04008300,2,0,0x04006100,0,1=0x04008300,2,0,0x04008600,0,0 0x04008300,2,0,0x04006100,2,0=0x04008300,2,0,0x04008600,0,0 -0x04005500,1,1,0x57700000,1,0=0x04008900,1,0,0x5C080000,1,0 -0x04005500,3,0,0x57700000,1,0=0x04008900,3,0,0x5C080000,3,1 -0x04005500,1,1,0x5C080000,1,0=0x04008900,1,0,0x5C080000,1,0 -0x04005500,3,0,0x5C080000,3,1=0x04008900,3,0,0x5C080000,3,1; conflicting-override 0x04008900,0,0,0x04006100,0,1=0x04008900,0,0,0x04008800,0,0 0x04008900,0,0,0x04006100,2,0=0x04008900,0,0,0x04008800,0,0 -0x091a5500,1,1,0x57700000,1,0=0x091a8900,1,0,0x5C080000,1,0 -0x091a5500,3,0,0x57700000,1,0=0x091a8900,3,0,0x5C080000,3,1 -0x091a5500,1,1,0x5C080000,1,0=0x091a8900,1,0,0x5C080000,1,0 -0x091a5500,3,0,0x5C080000,3,1=0x091a8900,3,0,0x5C080000,3,1; conflicting-override 0x091a8900,0,0,0x04006100,0,1=0x091a8900,0,0,0x091a8800,0,0 0x091a8900,0,0,0x04006100,2,0=0x091a8900,0,0,0x091a8800,0,0 -0x04006500,0,0,0x57700000,1,0=0x04007100,2,0,0x5C080000,1,0 -0x04006500,1,0,0x57700000,1,0=0x04007100,0,1,0x5C080000,3,1 -0x04006500,0,0,0x5C080000,1,0=0x04007100,2,0,0x5C080000,1,0 -0x04006500,1,0,0x5C080000,3,1=0x04007100,0,1,0x5C080000,3,1 0x04007100,0,0,0x04006300,2,0=0x04007100,0,0,0x04007100,0,1 0x04007100,2,1,0x04006300,0,1=0x04007100,2,1,0x04007100,0,1; conflicting-override 0x04007100,1,0,0x04006300,0,1=0x04007100,1,0,0x04009000,2,0 0x04007100,3,1,0x04006300,2,0=0x04007100,3,1,0x04009000,3,0; conflicting-override 0x04006400,1,0,0x04009000,2,0=0x04009000,1,0,0x04009000,2,0; conflicting-override 0x04006400,2,0,0x04009000,3,0=0x04009000,0,0,0x04009000,3,0 -0x04007100,1,1,0x57700000,1,0=0x04009000,2,0,0x5C080000,1,0 -0x04007100,3,0,0x57700000,1,0=0x04009000,3,0,0x5C080000,3,1 -0x04007100,1,1,0x5C080000,1,0=0x04009000,2,0,0x5C080000,1,0 -0x04007100,3,0,0x5C080000,3,1=0x04009000,3,0,0x5C080000,3,1; conflicting-override -0x57600300,0,1,0x57700000,1,0=0x57001300,0,0,0x5C080000,1,0 -0x57600300,2,0,0x57700000,1,0=0x57001300,2,0,0x5C080000,3,1 -0x57600300,0,1,0x5C080000,1,0=0x57001300,0,0,0x5C080000,1,0 -0x57600300,2,0,0x5C080000,3,1=0x57001300,2,0,0x5C080000,3,1; conflicting-override 0x57001300,1,0,0x04006100,2,0=0x57001300,1,0,0x57601309,2,0 ;Adjacencies -0x5C080000,1,0,0x04005600,1,0=0x5C080000,1,0,0x5C021000,1,0 -0x5C080000,3,1,0x04005600,3,1=0x5C080000,3,1,0x5C021000,3,0; conflicting-override -0x5C080000,1,0,0x04005500,1,0=0x5C080000,1,0,0x5C021100,1,0 -0x5C080000,3,1,0x04005500,3,1=0x5C080000,3,1,0x5C021100,3,0; conflicting-override -0x5C080000,1,0,0x091a5500,1,0=0x5C080000,1,0,0x5C021200,1,0 -0x5C080000,3,1,0x091a5500,3,1=0x5C080000,3,1,0x5C021200,3,0; conflicting-override -0x5C080000,1,0,0x04007100,1,0=0x5C080000,1,0,0x5C021300,1,1 -0x5C080000,3,1,0x04007100,3,1=0x5C080000,3,1,0x5C021300,3,0 -0x5C080000,1,0,0x0A001500,3,0=0x5C080000,1,0,0x5C021400,1,1 -0x5C080000,3,1,0x0A001500,3,0=0x5C080000,3,1,0x5C021400,3,0 -0x5C080000,1,0,0x02001500,3,0=0x5C080000,1,0,0x5C021420,1,1 -0x5C080000,3,1,0x02001500,3,0=0x5C080000,3,1,0x5C021420,3,0 -0x5C080000,1,0,0x04010100,3,0=0x5C080000,1,0,0x5C021500,1,0 -0x5C080000,3,1,0x04010100,1,0=0x5C080000,3,1,0x5C021500,3,0 -0x5C080000,1,0,0x5D341000,3,0=0x5C080000,1,0,0x5C021505,1,0 -0x5C080000,3,1,0x5D341000,1,0=0x5C080000,3,1,0x5C021505,3,0 ;REWRITE BELOW HERE -0x5C080000,1,0,0x5F880300,1,0=0x5C080000,1,0,0x5C021700,1,0 -0x5C080000,1,0,0x5F888300,1,0=0x5C080000,1,0,0x5C021705,1,0 -0x5C080000,1,0,0x08DD0200,1,0=0x5C080000,1,0,0x5C021720,1,0 -0x5C080000,1,0,0x5F884300,1,0=0x5C080000,1,0,0x5C021800,1,0 -0x5C080000,1,0,0x5F88C300,1,0=0x5C080000,1,0,0x5C021805,1,0 -0x5C080000,1,0,0x0DDD0200,1,0=0x5C080000,1,0,0x5C021920,1,0 -0x5C080000,1,0,0x5DDD0300,1,0=0x5C080000,1,0,0x5C021925,1,0 -0x5C080000,1,0,0x57600300,0,0=0x5C080000,1,0,0x57001310,0,0 -0x5C080000,3,1,0x57600300,2,1=0x5C080000,3,1,0x57001310,2,0; conflicting-override -0x5C080000,1,0,0x51003100,3,0=0x5C080000,1,0,0x5C021A00,1,0 -0x5C080000,1,0,0x51013100,3,0=0x5C080000,1,0,0x5C021B00,1,0 -0x5C080000,1,0,0x51023100,3,0=0x5C080000,1,0,0x5C021C00,1,0 -0x5C080000,1,0,0x51033100,3,0=0x5C080000,1,0,0x5C021D00,1,0 -0x5C080000,1,0,0x51043100,3,0=0x5C080000,1,0,0x5C021E00,1,0 -0x5C080000,1,0,0x51053100,3,0=0x5C080000,1,0,0x5C021F00,1,0 ;RHW-2 T Fixes ;0x57101310,3,0,0x57000100,1,0=0x57101310,3,0,0x57100100,1,0 ;0x57601310,2,0,0x00000100,0,0=0x57601310,2,0,0x5C020000,2,0 @@ -9704,68 +8507,19 @@ 0x57621310,2,0,0x00000100,2,0=0x57621310,2,0,0x5C020000,2,0 0x57621310,2,0,0x00000100,3,0=0x57621310,2,0,0x5C020000,2,0 ;Tight Situations -0x5C080000,1,0,0x05004b00,0,0=0x5C080000,1,0,0x5C021000,1,0 -0x5C080000,1,0,0x05004b00,2,0=0x5C080000,1,0,0x5C021000,1,0 -0x5C080000,1,0,0x00004b00,0,0=0x5C080000,1,0,0x5C021100,1,0 -0x5C080000,1,0,0x00004b00,2,0=0x5C080000,1,0,0x5C021100,1,0 -0x5C080000,1,0,0x09004b00,0,0=0x5C080000,1,0,0x5C021200,1,0 -0x5C080000,1,0,0x09004b00,2,0=0x5C080000,1,0,0x5C021200,1,0 -0x5C080000,1,0,0x5F940300,0,0=0x5C080000,1,0,0x5C021200,1,0 -0x5C080000,1,0,0x5F940300,2,0=0x5C080000,1,0,0x5C021200,1,0 -0x5C080000,1,0,0x04006100,0,0=0x5C080000,1,0,0x5C021300,1,1 0x5C021300,1,1,0x04006100,2,0=0x5C021300,1,1,0x5C021300,1,0 -0x5C080000,1,0,0x0a001500,3,0=0x5C080000,1,0,0x5C021400,1,1 0x5C021400,1,1,0x0a001500,1,0=0x5C021400,1,1,0x5C021400,1,0 -0x5C080000,1,0,0x03031500,0,0=0x5C080000,1,0,0x5C021500,1,0 -0x5C080000,1,0,0x03031500,2,0=0x5C080000,1,0,0x5C021500,1,0 -0x5C080000,1,0,0x5d540000,0,0=0x5C080000,1,0,0x5C021500,1,0 -0x5C080000,1,0,0x5d540000,2,0=0x5C080000,1,0,0x5C021500,1,0 -0x5C080000,1,0,0x5d300000,0,0=0x5C080000,1,0,0x5C021505,1,0 -0x5C080000,1,0,0x5d300000,2,0=0x5C080000,1,0,0x5C021505,1,0 -0x5C080000,1,0,0x5f880000,0,0=0x5C080000,1,0,0x5C021700,1,0 -0x5C080000,1,0,0x5f880000,2,0=0x5C080000,1,0,0x5C021700,1,0 -0x5C080000,1,0,0x5f888000,0,0=0x5C080000,1,0,0x5C021705,1,0 -0x5C080000,1,0,0x5f888000,2,0=0x5C080000,1,0,0x5C021705,1,0 -0x5C080000,1,0,0x08031500,0,0=0x5C080000,1,0,0x5C021720,1,0 -0x5C080000,1,0,0x08031500,2,0=0x5C080000,1,0,0x5C021720,1,0 -0x5C080000,1,0,0x5f884000,0,0=0x5C080000,1,0,0x5C021800,1,0 -0x5C080000,1,0,0x5f884000,2,0=0x5C080000,1,0,0x5C021800,1,0 -0x5C080000,1,0,0x5f88c000,0,0=0x5C080000,1,0,0x5C021805,1,0 -0x5C080000,1,0,0x5f88c000,2,0=0x5C080000,1,0,0x5C021805,1,0 -0x5C080000,1,0,0x5dc31500,0,0=0x5C080000,1,0,0x5C021905,1,0 -0x5C080000,1,0,0x5dc31500,2,0=0x5C080000,1,0,0x5C021905,1,0 -0x5C080000,1,0,0x0d031500,0,0=0x5C080000,1,0,0x5C021920,1,0 -0x5C080000,1,0,0x0d031500,2,0=0x5C080000,1,0,0x5C021920,1,0 -0x5C080000,1,0,0x5dd31500,0,0=0x5C080000,1,0,0x5C021925,1,0 -0x5C080000,1,0,0x5dd31500,2,0=0x5C080000,1,0,0x5C021925,1,0 -0x5C080000,1,0,0x51000000,0,0=0x5C080000,1,0,0x5C021A00,1,0 -0x5C080000,1,0,0x51000000,2,0=0x5C080000,1,0,0x5C021A00,1,0 -0x5C080000,1,0,0x51010000,0,0=0x5C080000,1,0,0x5C021B00,1,0 -0x5C080000,1,0,0x51010000,2,0=0x5C080000,1,0,0x5C021B00,1,0 -0x5C080000,1,0,0x51030000,0,0=0x5C080000,1,0,0x5C021D00,1,0 -0x5C080000,1,0,0x51030000,2,0=0x5C080000,1,0,0x5C021D00,1,0 -0x5C080000,1,0,0x51040000,0,0=0x5C080000,1,0,0x5C021E00,1,0 -0x5C080000,1,0,0x51040000,2,0=0x5C080000,1,0,0x5C021E00,1,0 -0x5C080000,1,0,0x51050000,0,0=0x5C080000,1,0,0x5C021F00,1,0 -0x5C080000,1,0,0x51050000,2,0=0x5C080000,1,0,0x5C021F00,1,0 -0x5C080000,1,0,0x51100000,0,0=0x5C080000,1,0,0x5C022000,1,1 0x5C022000,1,1,0x51100000,2,0=0x5C022000,1,1,0x5C022000,1,0 -0x5C080000,1,0,0x51110000,0,0=0x5C080000,1,0,0x5C022100,1,1 0x5C022100,1,1,0x51110000,2,0=0x5C022100,1,1,0x5C022100,1,0 -0x5C080000,1,0,0x51120000,0,0=0x5C080000,1,0,0x5C022200,1,1 0x5C022200,1,1,0x51120000,2,0=0x5C022200,1,1,0x5C022200,1,0 -0x5C080000,1,0,0x51130000,0,0=0x5C080000,1,0,0x5C022300,1,1 0x5C022300,1,1,0x51130000,2,0=0x5C022300,1,1,0x5C022300,1,0 -0x5C080000,1,0,0x51140000,0,0=0x5C080000,1,0,0x5C022400,1,1 0x5C022400,1,1,0x51140000,2,0=0x5C022400,1,1,0x5C022400,1,0 -0x5C080000,1,0,0x51200000,0,0=0x5C080000,1,0,0x5C022500,1,1 0x5C022500,1,1,0x51200080,0,0=0x5C022500,1,1,0x5C022580,1,0 0x5C022500,1,1,0x51200080,2,0=0x5C022500,1,1,0x5C022580,1,0 0x5C022500,1,1,0x51210080,0,0=0x5C022500,1,1,0x5C022680,1,0 0x5C022500,1,1,0x51210080,2,0=0x5C022500,1,1,0x5C022680,1,0 0x5C022580,1,0,0x51200000,2,0=0x5C022580,1,0,0x5C022500,1,0 0x5C022680,1,0,0x51200000,2,0=0x5C022680,1,0,0x5C022500,1,0 -0x5C080000,1,0,0x51210000,0,0=0x5C080000,1,0,0x5C022600,1,1 0x5C022600,1,1,0x51200080,0,0=0x5C022600,1,1,0x5C022580,1,0 0x5C022600,1,1,0x51200080,2,0=0x5C022600,1,1,0x5C022580,1,0 0x5C022600,1,1,0x51210080,0,0=0x5C022600,1,1,0x5C022680,1,0 @@ -9773,231 +8527,66 @@ 0x5C022580,1,0,0x51210000,2,0=0x5C022580,1,0,0x5C022600,1,0 0x5C022680,1,0,0x51210000,2,0=0x5C022680,1,0,0x5C022600,1,0 ; -0x5C080000,1,0,0x584E0000,0,0=0x5C080000,1,0,0x5C022700,1,0 -0x5C080000,1,0,0x584E0000,2,0=0x5C080000,1,0,0x5C022700,1,0 -0x5C080000,1,0,0x58480000,0,0=0x5C080000,1,0,0x5C022800,1,0 -0x5C080000,1,0,0x58480000,2,0=0x5C080000,1,0,0x5C022800,1,0 -0x5C080000,1,0,0x58486C00,0,0=0x5C080000,1,0,0x5C022805,1,0 -0x5C080000,1,0,0x58486C00,2,0=0x5C080000,1,0,0x5C022805,1,0 -0x5C080000,1,0,0x58400000,0,0=0x5C080000,1,0,0x5C022A00,1,1 -; -0x5C080000,3,1,0x05004b00,0,0=0x5C080000,3,1,0x5C021000,3,0 -0x5C080000,3,1,0x05004b00,2,0=0x5C080000,3,1,0x5C021000,3,0 -0x5C080000,3,1,0x00004b00,0,0=0x5C080000,3,1,0x5C021100,3,0 -0x5C080000,3,1,0x00004b00,2,0=0x5C080000,3,1,0x5C021100,3,0 -0x5C080000,3,1,0x09004b00,0,0=0x5C080000,3,1,0x5C021200,3,0 -0x5C080000,3,1,0x09004b00,2,0=0x5C080000,3,1,0x5C021200,3,0 -0x5C080000,3,1,0x5F940300,0,0=0x5C080000,3,1,0x5C021200,3,0 -0x5C080000,3,1,0x5F940300,2,0=0x5C080000,3,1,0x5C021200,3,0 -0x5C080000,3,1,0x04006100,0,0=0x5C080000,3,1,0x5C021300,3,0 +; 0x5C021300,3,0,0x04006100,2,0=0x5C021300,3,0,0x5C021300,3,1 -0x5C080000,3,1,0x0a001500,3,0=0x5C080000,3,1,0x5C021400,3,0 0x5C021400,3,0,0x0a001500,1,0=0x5C021400,3,0,0x5C021400,3,1 -0x5C080000,3,1,0x03031500,0,0=0x5C080000,3,1,0x5C021500,3,0 -0x5C080000,3,1,0x03031500,2,0=0x5C080000,3,1,0x5C021500,3,0 -0x5C080000,3,1,0x5d540000,0,0=0x5C080000,3,1,0x5C021500,3,0 -0x5C080000,3,1,0x5d540000,2,0=0x5C080000,3,1,0x5C021500,3,0 -0x5C080000,3,1,0x5d300000,0,0=0x5C080000,3,1,0x5C021505,3,0 -0x5C080000,3,1,0x5d300000,2,0=0x5C080000,3,1,0x5C021505,3,0 -0x5C080000,3,1,0x5f880000,0,0=0x5C080000,3,1,0x5C021700,3,0 -0x5C080000,3,1,0x5f880000,2,0=0x5C080000,3,1,0x5C021700,3,0 -0x5C080000,3,1,0x5f888000,0,0=0x5C080000,3,1,0x5C021705,3,0 -0x5C080000,3,1,0x5f888000,2,0=0x5C080000,3,1,0x5C021705,3,0 -0x5C080000,3,1,0x08031500,0,0=0x5C080000,3,1,0x5C021720,3,0 -0x5C080000,3,1,0x08031500,2,0=0x5C080000,3,1,0x5C021720,3,0 -0x5C080000,3,1,0x5f884000,0,0=0x5C080000,3,1,0x5C021800,3,0 -0x5C080000,3,1,0x5f884000,2,0=0x5C080000,3,1,0x5C021800,3,0 -0x5C080000,3,1,0x5f88c000,0,0=0x5C080000,3,1,0x5C021805,3,0 -0x5C080000,3,1,0x5f88c000,2,0=0x5C080000,3,1,0x5C021805,3,0 -0x5C080000,3,1,0x5dc31500,0,0=0x5C080000,3,1,0x5C021905,3,0 -0x5C080000,3,1,0x5dc31500,2,0=0x5C080000,3,1,0x5C021905,3,0 -0x5C080000,3,1,0x0d031500,0,0=0x5C080000,3,1,0x5C021920,3,0 -0x5C080000,3,1,0x0d031500,2,0=0x5C080000,3,1,0x5C021920,3,0 -0x5C080000,3,1,0x5dd31500,0,0=0x5C080000,3,1,0x5C021925,3,0 -0x5C080000,3,1,0x5dd31500,2,0=0x5C080000,3,1,0x5C021925,3,0 -0x5C080000,3,1,0x51000000,0,0=0x5C080000,3,1,0x5C021A00,3,0 -0x5C080000,3,1,0x51000000,2,0=0x5C080000,3,1,0x5C021A00,3,0 -0x5C080000,3,1,0x51010000,0,0=0x5C080000,3,1,0x5C021B00,3,0 -0x5C080000,3,1,0x51010000,2,0=0x5C080000,3,1,0x5C021B00,3,0 -0x5C080000,3,1,0x51020000,0,0=0x5C080000,3,1,0x5C021C00,3,0 -0x5C080000,3,1,0x51020000,2,0=0x5C080000,3,1,0x5C021C00,3,1 -0x5C080000,3,1,0x51030000,0,0=0x5C080000,3,1,0x5C021D00,3,0 -0x5C080000,3,1,0x51030000,2,0=0x5C080000,3,1,0x5C021D00,3,0 -0x5C080000,3,1,0x51040000,0,0=0x5C080000,3,1,0x5C021E00,3,0 -0x5C080000,3,1,0x51040000,2,0=0x5C080000,3,1,0x5C021E00,3,0 -0x5C080000,3,1,0x51050000,0,0=0x5C080000,3,1,0x5C021F00,3,0 -0x5C080000,3,1,0x51050000,2,0=0x5C080000,3,1,0x5C021F00,3,0 -0x5C080000,3,1,0x51100000,0,0=0x5C080000,3,1,0x5C022000,3,0 0x5C022000,3,0,0x51100000,2,0=0x5C022000,3,0,0x5C022000,3,1 -0x5C080000,3,1,0x51110000,0,0=0x5C080000,3,1,0x5C022100,3,0 0x5C022100,3,0,0x51110000,2,0=0x5C022100,3,0,0x5C022100,3,1 -0x5C080000,3,1,0x51120000,0,0=0x5C080000,3,1,0x5C022200,3,0 0x5C022200,3,0,0x51120000,2,0=0x5C022200,3,0,0x5C022200,3,1 -0x5C080000,3,1,0x51130000,0,0=0x5C080000,3,1,0x5C022300,3,0 0x5C022300,3,0,0x51130000,2,0=0x5C022300,3,0,0x5C022300,3,1 -0x5C080000,3,1,0x51140000,0,0=0x5C080000,3,1,0x5C022400,3,0 0x5C022400,3,0,0x51140000,2,0=0x5C022400,3,0,0x5C022400,3,1 -0x5C080000,3,1,0x51200000,0,0=0x5C080000,3,1,0x5C022500,3,0 0x5C022500,3,0,0x51200080,0,0=0x5C022500,3,0,0x5C022580,3,0 0x5C022500,3,0,0x51200080,2,0=0x5C022500,3,0,0x5C022580,3,0 0x5C022500,3,0,0x51210080,0,0=0x5C022500,3,0,0x5C022680,3,0 0x5C022500,3,0,0x51210080,2,0=0x5C022500,3,0,0x5C022680,3,0 -0x5C080000,3,1,0x51210000,0,0=0x5C080000,3,1,0x5C022600,3,0 0x5C022600,3,0,0x51200080,0,0=0x5C022600,3,0,0x5C022580,3,0 0x5C022600,3,0,0x51200080,2,0=0x5C022600,3,0,0x5C022580,3,0 0x5C022600,3,0,0x51210080,0,0=0x5C022600,3,0,0x5C022680,3,0 0x5C022600,3,0,0x51210080,2,0=0x5C022600,3,0,0x5C022680,3,0 ; -0x5C080000,3,1,0x584E0000,0,0=0x5C080000,3,1,0x5C022700,3,0 -0x5C080000,3,1,0x584E0000,2,0=0x5C080000,3,1,0x5C022700,3,0 -0x5C080000,3,1,0x58480000,0,0=0x5C080000,3,1,0x5C022800,3,0 -0x5C080000,3,1,0x58480000,2,0=0x5C080000,3,1,0x5C022800,3,0 -0x5C080000,3,1,0x58486C00,0,0=0x5C080000,3,1,0x5C022805,3,0 -0x5C080000,3,1,0x58486C00,2,0=0x5C080000,3,1,0x5C022805,3,0 -0x5C080000,3,1,0x58400000,0,0=0x5C080000,3,1,0x5C022A00,3,0 -; -0x5C080000,1,0,0x57000000,0,0=0x5C080000,1,0,0x57001310,0,0 -0x5C080000,1,0,0x57000000,2,0=0x5C080000,1,0,0x57001310,0,0 -;0x5C080000,1,0,0x57100000,0,0=0x5C080000,1,0,0x57101310,0,0 -;0x5C080000,1,0,0x57100000,2,0=0x5C080000,1,0,0x57101310,0,0 -0x5C080000,1,0,0x57200000,0,0=0x5C080000,1,0,0x57201310,0,0 -0x5C080000,1,0,0x57200000,2,0=0x5C080000,1,0,0x57201310,0,0 -0x5C080000,1,0,0x57010000,0,0=0x5C080000,1,0,0x57011310,0,0 -0x5C080000,1,0,0x57010000,2,0=0x5C080000,1,0,0x57011310,0,1 -0x5C080000,1,0,0x57210000,0,0=0x5C080000,1,0,0x57211310,0,0 -0x5C080000,1,0,0x57210000,2,0=0x5C080000,1,0,0x57211310,0,1 -0x5C080000,1,0,0x57020000,0,0=0x5C080000,1,0,0x57021310,0,0 -0x5C080000,1,0,0x57020000,2,0=0x5C080000,1,0,0x57021310,0,1 -0x5C080000,1,0,0x57120000,0,0=0x5C080000,1,0,0x57121310,0,0 -0x5C080000,1,0,0x57120000,2,0=0x5C080000,1,0,0x57121310,0,1 -0x5C080000,1,0,0x57220000,0,0=0x5C080000,1,0,0x57221310,0,0 -0x5C080000,1,0,0x57220000,2,0=0x5C080000,1,0,0x57221310,0,1 -0x5C080000,1,0,0x57320000,0,0=0x5C080000,1,0,0x57321310,0,0 -0x5C080000,1,0,0x57320000,2,0=0x5C080000,1,0,0x57321310,0,1 -0x5C080000,1,0,0x57420000,0,0=0x5C080000,1,0,0x57421310,0,0 -0x5C080000,1,0,0x57420000,2,0=0x5C080000,1,0,0x57421310,0,1 -0x5C080000,1,0,0x57030000,0,0=0x5C080000,1,0,0x57031310,0,0 -0x5C080000,1,0,0x57030000,2,0=0x5C080000,1,0,0x57031310,0,1 -0x5C080000,1,0,0x57230000,0,0=0x5C080000,1,0,0x57231310,0,0 -0x5C080000,1,0,0x57230000,2,0=0x5C080000,1,0,0x57231310,0,1 -0x5C080000,1,0,0x57330000,0,0=0x5C080000,1,0,0x57331310,0,0 -0x5C080000,1,0,0x57330000,2,0=0x5C080000,1,0,0x57331310,0,1 -0x5C080000,1,0,0x57430000,0,0=0x5C080000,1,0,0x57431310,0,0 -0x5C080000,1,0,0x57430000,2,0=0x5C080000,1,0,0x57431310,0,1 -0x5C080000,1,0,0x57040000,0,0=0x5C080000,1,0,0x57041310,0,0 -0x5C080000,1,0,0x57040000,2,0=0x5C080000,1,0,0x57041310,0,1 -0x5C080000,1,0,0x57240000,0,0=0x5C080000,1,0,0x57241310,0,0 -0x5C080000,1,0,0x57240000,2,0=0x5C080000,1,0,0x57241310,0,1 -0x5C080000,1,0,0x57340000,0,0=0x5C080000,1,0,0x57341310,0,0 -0x5C080000,1,0,0x57340000,2,0=0x5C080000,1,0,0x57341310,0,1 -0x5C080000,1,0,0x57440000,0,0=0x5C080000,1,0,0x57441310,0,0 -0x5C080000,1,0,0x57440000,2,0=0x5C080000,1,0,0x57441310,0,1 -0x5C080000,1,0,0x57050000,0,0=0x5C080000,1,0,0x57051310,0,0 -0x5C080000,1,0,0x57250000,0,0=0x5C080000,1,0,0x57251310,0,0 +; 0x57051310,0,0,0x57050080,0,0=0x57051310,0,0,0x57051390,0,0 0x57251310,0,0,0x57250080,0,0=0x57251310,0,0,0x57251390,0,0 0x57051390,0,0,0x57050080,2,0=0x57051390,0,0,0x57051390,0,1 0x57251390,0,0,0x57250080,2,0=0x57251390,0,0,0x57251390,0,1 -0x5C080000,1,0,0x57050080,2,0=0x5C080000,1,0,0x57051390,0,1 -0x5C080000,1,0,0x57250080,2,0=0x5C080000,1,0,0x57251390,0,1 0x57051390,0,1,0x57050000,2,0=0x57051390,0,1,0x57051310,0,1 0x57251390,0,1,0x57250000,2,0=0x57251390,0,1,0x57251310,0,1 -0x5C080000,1,0,0x57060000,0,0=0x5C080000,1,0,0x57061310,0,0 -0x5C080000,1,0,0x57260000,0,0=0x5C080000,1,0,0x57261310,0,0 -0x5C080000,1,0,0x57070000,0,0=0x5C080000,1,0,0x57071310,0,0 -0x5C080000,1,0,0x57270000,0,0=0x5C080000,1,0,0x57271310,0,0 0x57061310,0,0,0x57050080,0,0=0x57061310,0,0,0x57051390,0,0 0x57261310,0,0,0x57250080,0,0=0x57261310,0,0,0x57251390,0,0 0x57051390,0,1,0x57060000,2,0=0x57051390,0,1,0x57061310,0,1 0x57251390,0,1,0x57260000,2,0=0x57251390,0,1,0x57261310,0,1 0x57051390,0,1,0x57070000,2,0=0x57051390,0,1,0x57071310,0,1 0x57251390,0,1,0x57270000,2,0=0x57251390,0,1,0x57271310,0,1 -0x5C080000,1,0,0x57080000,0,0=0x5C080000,1,0,0x57081310,0,0 -0x5C080000,1,0,0x57280000,0,0=0x5C080000,1,0,0x57281310,0,0 0x57081310,0,0,0x57080080,0,0=0x57081300,0,0,0x57081390,0,0; missing_paths 0x57081310,0,0,0x57080080,2,0=0x57081300,0,0,0x57081390,0,0; missing_paths 0x57081390,0,0,0x57080000,2,0=0x57081390,0,0,0x57081300,0,1; missing_paths -0x5C080000,1,0,0x57090000,0,0=0x5C080000,1,0,0x57091310,0,0 -0x5C080000,1,0,0x57290000,0,0=0x5C080000,1,0,0x57291310,0,0 0x57091310,0,0,0x57080080,0,0=0x57091300,0,0,0x57081390,0,0; missing_paths 0x57091310,0,0,0x57080080,2,0=0x57091300,0,0,0x57081390,0,1; missing_paths 0x57081390,0,0,0x57090000,2,0=0x57081390,0,0,0x57091310,0,1 0x57281390,0,0,0x57290000,2,0=0x57281390,0,0,0x57291310,0,1 0x57081390,0,1,0x57090000,2,0=0x57081390,0,1,0x57091310,0,1 0x57281390,0,1,0x57290000,2,0=0x57281390,0,1,0x57291310,0,1 -0x5C080000,1,0,0x57120100,0,0=0x5C080000,1,0,0x57621315,1,1 -0x5C080000,1,0,0x57120100,2,1=0x5C080000,1,0,0x57621310,3,0 -; -0x5C080000,3,1,0x57000000,0,0=0x5C080000,3,1,0x57001310,2,0 -0x5C080000,3,1,0x57000000,2,0=0x5C080000,3,1,0x57001310,2,0 -;0x5C080000,3,1,0x57100000,0,0=0x5C080000,3,1,0x57101310,2,0 -;0x5C080000,3,1,0x57100000,2,0=0x5C080000,3,1,0x57101310,2,0 -0x5C080000,3,1,0x57200000,0,0=0x5C080000,3,1,0x57201310,2,0 -0x5C080000,3,1,0x57200000,2,0=0x5C080000,3,1,0x57201310,2,0 -0x5C080000,3,1,0x57010000,0,0=0x5C080000,3,1,0x57011310,2,1 -0x5C080000,3,1,0x57010000,2,0=0x5C080000,3,1,0x57011310,2,0 -0x5C080000,3,1,0x57210000,0,0=0x5C080000,3,1,0x57211310,2,1 -0x5C080000,3,1,0x57210000,2,0=0x5C080000,3,1,0x57211310,2,0 -0x5C080000,3,1,0x57020000,0,0=0x5C080000,3,1,0x57021310,2,1 -0x5C080000,3,1,0x57020000,2,0=0x5C080000,3,1,0x57021310,2,0 -0x5C080000,3,1,0x57120000,0,0=0x5C080000,3,1,0x57121310,2,1 -0x5C080000,3,1,0x57120000,2,0=0x5C080000,3,1,0x57121310,2,0 -0x5C080000,3,1,0x57220000,0,0=0x5C080000,3,1,0x57221310,2,1 -0x5C080000,3,1,0x57220000,2,0=0x5C080000,3,1,0x57221310,2,0 -0x5C080000,3,1,0x57320000,0,0=0x5C080000,3,1,0x57321310,2,1 -0x5C080000,3,1,0x57320000,2,0=0x5C080000,3,1,0x57321310,2,0 -0x5C080000,3,1,0x57420000,0,0=0x5C080000,3,1,0x57421310,2,1 -0x5C080000,3,1,0x57420000,2,0=0x5C080000,3,1,0x57421310,2,0 -0x5C080000,3,1,0x57030000,0,0=0x5C080000,3,1,0x57031310,2,1 -0x5C080000,3,1,0x57030000,2,0=0x5C080000,3,1,0x57031310,2,0 -0x5C080000,3,1,0x57230000,0,0=0x5C080000,3,1,0x57231310,2,1 -0x5C080000,3,1,0x57230000,2,0=0x5C080000,3,1,0x57231310,2,0 -0x5C080000,3,1,0x57330000,0,0=0x5C080000,3,1,0x57331310,2,1 -0x5C080000,3,1,0x57330000,2,0=0x5C080000,3,1,0x57331310,2,0 -0x5C080000,3,1,0x57430000,0,0=0x5C080000,3,1,0x57431310,2,1 -0x5C080000,3,1,0x57430000,2,0=0x5C080000,3,1,0x57431310,2,0 -0x5C080000,3,1,0x57040000,0,0=0x5C080000,3,1,0x57041310,2,1 -0x5C080000,3,1,0x57040000,2,0=0x5C080000,3,1,0x57041310,2,0 -0x5C080000,3,1,0x57240000,0,0=0x5C080000,3,1,0x57241310,2,1 -0x5C080000,3,1,0x57240000,2,0=0x5C080000,3,1,0x57241310,2,0 -0x5C080000,3,1,0x57340000,0,0=0x5C080000,3,1,0x57341310,2,1 -0x5C080000,3,1,0x57340000,2,0=0x5C080000,3,1,0x57341310,2,0 -0x5C080000,3,1,0x57440000,0,0=0x5C080000,3,1,0x57441310,2,1 -0x5C080000,3,1,0x57440000,2,0=0x5C080000,3,1,0x57441310,2,0 -0x5C080000,3,1,0x57050000,0,0=0x5C080000,3,1,0x57051310,2,1 -0x5C080000,3,1,0x57250000,0,0=0x5C080000,3,1,0x57251310,2,1 +; 0x57051310,2,1,0x57050080,0,0=0x57051310,2,1,0x57051390,2,1 0x57251310,2,1,0x57250080,0,0=0x57251310,2,1,0x57251390,2,1 0x57051390,2,1,0x57050080,2,0=0x57051390,2,1,0x57051390,2,0 0x57251390,2,1,0x57250080,2,0=0x57251390,2,1,0x57251390,2,0 -0x5C080000,3,1,0x57050080,2,0=0x5C080000,3,1,0x57051390,2,0 -0x5C080000,3,1,0x57250080,2,0=0x5C080000,3,1,0x57251390,2,0 0x57051390,2,0,0x57050000,2,0=0x57051390,2,0,0x57051310,2,0 0x57251390,2,0,0x57250000,2,0=0x57251390,2,0,0x57251310,2,0 -0x5C080000,3,1,0x57060000,0,0=0x5C080000,3,1,0x57061310,2,1 -0x5C080000,3,1,0x57260000,0,0=0x5C080000,3,1,0x57261310,2,1 -0x5C080000,3,1,0x57070000,0,0=0x5C080000,3,1,0x57071310,2,1 -0x5C080000,3,1,0x57270000,0,0=0x5C080000,3,1,0x57271310,2,1 0x57061310,2,1,0x57050080,0,0=0x57061310,2,1,0x57051390,2,1 0x57261310,2,1,0x57250080,0,0=0x57261310,2,1,0x57251390,2,1 0x57051390,2,0,0x57060000,2,0=0x57051390,2,0,0x57061310,2,0 0x57251390,2,0,0x57260000,2,0=0x57251390,2,0,0x57261310,2,0 0x57051390,2,0,0x57070000,2,0=0x57051390,2,0,0x57071310,2,0 0x57251390,2,0,0x57270000,2,0=0x57251390,2,0,0x57271310,2,0 -0x5C080000,3,1,0x57080000,0,0=0x5C080000,3,1,0x57081310,2,1 -0x5C080000,3,1,0x57280000,0,0=0x5C080000,3,1,0x57281310,2,1 0x57081310,2,1,0x57080080,0,0=0x57081300,2,1,0x57081390,2,1; missing_paths 0x57081310,2,1,0x57080080,2,0=0x57081300,2,1,0x57081390,2,0; missing_paths 0x57081390,2,1,0x57080000,2,0=0x57081390,2,1,0x57081300,2,0; missing_paths 0x57081390,2,0,0x57080000,2,0=0x57081390,2,0,0x57081300,2,0; missing_paths -0x5C080000,3,1,0x57090000,0,0=0x5C080000,3,1,0x57091310,2,1 -0x5C080000,3,1,0x57290000,0,0=0x5C080000,3,1,0x57291310,2,1 0x57091310,2,1,0x57080080,0,0=0x57091300,2,1,0x57081390,2,0; missing_paths 0x57091310,2,1,0x57080080,2,0=0x57091300,2,1,0x57081390,2,0; missing_paths 0x57081390,2,0,0x57090000,2,0=0x57081390,2,0,0x57091310,2,0 0x57281390,2,0,0x57290000,2,0=0x57281390,2,0,0x57291310,2,0 -0x5C080000,3,1,0x57120100,0,0=0x5C080000,3,1,0x57621310,1,1 -0x5C080000,3,1,0x57120100,2,1=0x5C080000,3,1,0x57621315,3,0 ; 0x57011310,0,0,0x57000000,0,0=0x57011310,0,0,0x57001310,0,0 0x57011310,0,0,0x57000000,2,0=0x57011310,0,0,0x57001310,0,0 @@ -11703,72 +10292,20 @@ ; ;L0-to-L2 ;L0 Stub into Onslope -0x04007300,1,0,0x57700100,1,0=0x04006100,1,0,0x5C080100,1,0 -0x04006100,1,0,0x57700100,1,0=0x04006100,1,0,0x5C080100,1,0 -0x04007300,1,0,0x5C080100,1,0=0x04006100,1,0,0x5C080100,1,0 -0x04007300,3,1,0x57700100,1,0=0x04006100,3,0,0x5C080100,3,1 -0x04006100,3,0,0x57700100,1,0=0x04006100,3,0,0x5C080100,3,1 -0x04007300,3,1,0x5C080100,3,1=0x04006100,3,0,0x5C080100,3,1; conflicting-override ;Onslope into Elevated -0x57700100,1,0,0x04007300,1,1=0x5C080100,1,0,0x5C050000,1,0 -0x57700100,1,0,0x5C050000,1,0=0x5C080100,1,0,0x5C050000,1,0 -0x5C080100,1,0,0x04007300,1,1=0x5C080100,1,0,0x5C050000,1,0 -0x57700100,1,0,0x04007300,3,0=0x5C080100,3,1,0x5C050000,3,0 -0x57700100,1,0,0x5C050000,3,0=0x5C080100,3,1,0x5C050000,3,0 -0x5C080100,3,1,0x04007300,3,0=0x5C080100,3,1,0x5C050000,3,0; conflicting-override ;Into Onslope Stability -0x04005600,1,1,0x57700100,1,0=0x04008300,3,0,0x5C080100,1,0 -0x04005600,3,0,0x57700100,1,0=0x04008300,1,0,0x5C080100,3,1 -0x04005600,1,1,0x5C080100,1,0=0x04008300,3,0,0x5C080100,1,0 -0x04005600,3,0,0x5C080100,3,1=0x04008300,1,0,0x5C080100,3,1; conflicting-override 0x04008300,2,0,0x04006100,2,0=0x04008300,2,0,0x04008600,0,0 -0x04005500,1,1,0x57700100,1,0=0x04008900,1,0,0x5C080100,1,0 -0x04005500,3,0,0x57700100,1,0=0x04008900,3,0,0x5C080100,3,1 -0x04005500,1,1,0x5C080100,1,0=0x04008900,1,0,0x5C080100,1,0 -0x04005500,3,0,0x5C080100,3,1=0x04008900,3,0,0x5C080100,3,1; conflicting-override 0x04008900,0,0,0x04006100,0,1=0x04008900,0,0,0x04008800,0,0 0x04008900,0,0,0x04006100,2,0=0x04008900,0,0,0x04008800,0,0 -0x091a5500,1,1,0x57700100,1,0=0x091a8900,1,0,0x5C080100,1,0 -0x091a5500,3,0,0x57700100,1,0=0x091a8900,3,0,0x5C080100,3,1 -0x091a5500,1,1,0x5C080100,1,0=0x091a8900,1,0,0x5C080100,1,0 -0x091a5500,3,0,0x5C080100,3,1=0x091a8900,3,0,0x5C080100,3,1; conflicting-override 0x091a8900,0,0,0x04006100,2,0=0x091a8900,0,0,0x091a8800,0,0 -0x04006500,0,0,0x57700100,1,0=0x04007100,2,0,0x5C080100,1,0 -0x04006500,1,0,0x57700100,1,0=0x04007100,0,1,0x5C080100,3,1 -0x04006500,0,0,0x5C080100,1,0=0x04007100,2,0,0x5C080100,1,0 -0x04006500,1,0,0x5C080100,3,1=0x04007100,0,1,0x5C080100,3,1 0x04007100,0,0,0x04006300,2,0=0x04007100,0,0,0x04007100,0,1 0x04007100,2,1,0x04006300,0,1=0x04007100,2,1,0x04007100,0,1; conflicting-override 0x04007100,1,0,0x04006300,0,1=0x04007100,1,0,0x04009000,2,0 0x04007100,3,1,0x04006300,2,0=0x04007100,3,1,0x04009000,3,0; conflicting-override 0x04006400,1,0,0x04009000,2,0=0x04009000,1,0,0x04009000,2,0; conflicting-override 0x04006400,2,0,0x04009000,3,0=0x04009000,0,0,0x04009000,3,0 -0x04007100,1,1,0x57700100,1,0=0x04009000,2,0,0x5C080100,1,0 -0x04007100,3,0,0x57700100,1,0=0x04009000,3,0,0x5C080100,3,1 -0x04007100,1,1,0x5C080100,1,0=0x04009000,2,0,0x5C080100,1,0 -0x04007100,3,0,0x5C080100,3,1=0x04009000,3,0,0x5C080100,3,1; conflicting-override -0x57600300,0,1,0x57700100,1,0=0x57001300,0,0,0x5C080100,1,0 -0x57600300,2,0,0x57700100,1,0=0x57001300,2,0,0x5C080100,3,1 -0x57600300,0,1,0x5C080100,1,0=0x57001300,0,0,0x5C080100,1,0 -0x57600300,2,0,0x5C080100,3,1=0x57001300,2,0,0x5C080100,3,1; conflicting-override 0x57001300,1,0,0x04006100,2,0=0x57001300,1,0,0x57601309,2,0 ;Adjacencies -0x5C080100,1,0,0x04005600,1,0=0x5C080100,1,0,0x5C051000,1,0 -0x5C080100,3,1,0x04005600,3,1=0x5C080100,3,1,0x5C051000,3,0; conflicting-override -0x5C080100,1,0,0x04005500,1,0=0x5C080100,1,0,0x5C051100,1,0 -0x5C080100,3,1,0x04005500,3,1=0x5C080100,3,1,0x5C051100,3,0; conflicting-override -0x5C080100,1,0,0x091a5500,1,0=0x5C080100,1,0,0x5C051200,1,0 -0x5C080100,3,1,0x091a5500,3,1=0x5C080100,3,1,0x5C051200,3,0; conflicting-override -0x5C080100,1,0,0x04007100,1,0=0x5C080100,1,0,0x5C051300,1,1 -0x5C080100,3,1,0x04007100,3,1=0x5C080100,3,1,0x5C051300,3,0 -0x5C080100,1,0,0x0A001500,3,0=0x5C080100,1,0,0x5C051400,1,1 -0x5C080100,3,1,0x0A001500,3,0=0x5C080100,3,1,0x5C051400,3,0 -0x5C080100,1,0,0x02001500,3,0=0x5C080100,1,0,0x5C051420,1,1; missing_paths -0x5C080100,3,1,0x02001500,3,0=0x5C080100,3,1,0x5C051420,3,0; missing_paths -0x5C080100,1,0,0x04010100,3,0=0x5C080100,1,0,0x5C051500,1,0 -0x5C080100,3,1,0x04010100,1,0=0x5C080100,3,1,0x5C051500,3,0 -0x5C080100,1,0,0x5D341000,3,0=0x5C080100,1,0,0x5C051505,1,0 -0x5C080100,3,1,0x5D341000,1,0=0x5C080100,3,1,0x5C051505,3,0 ;RHW-2 T Fixes ;;0x57201320,3,0,0x57000100,1,0=0x57201320,3,0,0x57200100,1,0 ;0x57601320,2,0,0x00000100,0,0=0x57601320,2,0,0x5C050000,2,0 @@ -11787,68 +10324,19 @@ 0x57621320,2,0,0x00000100,2,0=0x57621320,2,0,0x5C050000,2,0 0x57621320,2,0,0x00000100,3,0=0x57621320,2,0,0x5C050000,2,0 ;Tight Situations -0x5C080100,1,0,0x05004b00,0,0=0x5C080100,1,0,0x5C051000,1,0 -0x5C080100,1,0,0x05004b00,2,0=0x5C080100,1,0,0x5C051000,1,0 -0x5C080100,1,0,0x00004b00,0,0=0x5C080100,1,0,0x5C051100,1,0 -0x5C080100,1,0,0x00004b00,2,0=0x5C080100,1,0,0x5C051100,1,0 -0x5C080100,1,0,0x09004b00,0,0=0x5C080100,1,0,0x5C051200,1,0 -0x5C080100,1,0,0x09004b00,2,0=0x5C080100,1,0,0x5C051200,1,0 -0x5C080100,1,0,0x5F940300,0,0=0x5C080100,1,0,0x5C051200,1,0 -0x5C080100,1,0,0x5F940300,2,0=0x5C080100,1,0,0x5C051200,1,0 -0x5C080100,1,0,0x04006100,0,0=0x5C080100,1,0,0x5C051300,1,1 0x5C051300,1,1,0x04006100,2,0=0x5C051300,1,1,0x5C051300,1,0 -0x5C080100,1,0,0x0a001500,3,0=0x5C080100,1,0,0x5C051400,1,1 0x5C051400,1,1,0x0a001500,1,0=0x5C051400,1,1,0x5C051400,1,0 -0x5C080100,1,0,0x03031500,0,0=0x5C080100,1,0,0x5C051500,1,0 -0x5C080100,1,0,0x03031500,2,0=0x5C080100,1,0,0x5C051500,1,0 -0x5C080100,1,0,0x5d540000,0,0=0x5C080100,1,0,0x5C051500,1,0 -0x5C080100,1,0,0x5d540000,2,0=0x5C080100,1,0,0x5C051500,1,0 -0x5C080100,1,0,0x5d300000,0,0=0x5C080100,1,0,0x5C051505,1,0 -0x5C080100,1,0,0x5d300000,2,0=0x5C080100,1,0,0x5C051505,1,0 -0x5C080100,1,0,0x5f880000,0,0=0x5C080100,1,0,0x5C051700,1,0 -0x5C080100,1,0,0x5f880000,2,0=0x5C080100,1,0,0x5C051700,1,0 -0x5C080100,1,0,0x5f888000,0,0=0x5C080100,1,0,0x5C051705,1,0 -0x5C080100,1,0,0x5f888000,2,0=0x5C080100,1,0,0x5C051705,1,0 -0x5C080100,1,0,0x08031500,0,0=0x5C080100,1,0,0x5C051720,1,0 -0x5C080100,1,0,0x08031500,2,0=0x5C080100,1,0,0x5C051720,1,0 -0x5C080100,1,0,0x5f884000,0,0=0x5C080100,1,0,0x5C051800,1,0 -0x5C080100,1,0,0x5f884000,2,0=0x5C080100,1,0,0x5C051800,1,0 -0x5C080100,1,0,0x5f88c000,0,0=0x5C080100,1,0,0x5C051805,1,0 -0x5C080100,1,0,0x5f88c000,2,0=0x5C080100,1,0,0x5C051805,1,0 -0x5C080100,1,0,0x5dc31500,0,0=0x5C080100,1,0,0x5C051905,1,0 -0x5C080100,1,0,0x5dc31500,2,0=0x5C080100,1,0,0x5C051905,1,0 -0x5C080100,1,0,0x0d031500,0,0=0x5C080100,1,0,0x5C051920,1,0 -0x5C080100,1,0,0x0d031500,2,0=0x5C080100,1,0,0x5C051920,1,0 -0x5C080100,1,0,0x5dd31500,0,0=0x5C080100,1,0,0x5C051925,1,0; missing_paths -0x5C080100,1,0,0x5dd31500,2,0=0x5C080100,1,0,0x5C051925,1,0; missing_paths -0x5C080100,1,0,0x51000000,0,0=0x5C080100,1,0,0x5C051A00,1,0 -0x5C080100,1,0,0x51000000,2,0=0x5C080100,1,0,0x5C051A00,1,0 -0x5C080100,1,0,0x51010000,0,0=0x5C080100,1,0,0x5C051B00,1,0 -0x5C080100,1,0,0x51010000,2,0=0x5C080100,1,0,0x5C051B00,1,0 -0x5C080100,1,0,0x51030000,0,0=0x5C080100,1,0,0x5C051D00,1,0 -0x5C080100,1,0,0x51030000,2,0=0x5C080100,1,0,0x5C051D00,1,0 -0x5C080100,1,0,0x51040000,0,0=0x5C080100,1,0,0x5C051E00,1,0 -0x5C080100,1,0,0x51040000,2,0=0x5C080100,1,0,0x5C051E00,1,0 -0x5C080100,1,0,0x51050000,0,0=0x5C080100,1,0,0x5C051F00,1,0 -0x5C080100,1,0,0x51050000,2,0=0x5C080100,1,0,0x5C051F00,1,0 -0x5C080100,1,0,0x51100000,0,0=0x5C080100,1,0,0x5C052000,1,1 0x5C052000,1,1,0x51100000,2,0=0x5C052000,1,1,0x5C052000,1,0 -0x5C080100,1,0,0x51110000,0,0=0x5C080100,1,0,0x5C052100,1,1 0x5C052100,1,1,0x51110000,2,0=0x5C052100,1,1,0x5C052100,1,0 -0x5C080100,1,0,0x51120000,0,0=0x5C080100,1,0,0x5C052200,1,1 0x5C052200,1,1,0x51120000,2,0=0x5C052200,1,1,0x5C052200,1,0 -0x5C080100,1,0,0x51130000,0,0=0x5C080100,1,0,0x5C052300,1,1 0x5C052300,1,1,0x51130000,2,0=0x5C052300,1,1,0x5C052300,1,0 -0x5C080100,1,0,0x51140000,0,0=0x5C080100,1,0,0x5C052400,1,1 0x5C052400,1,1,0x51140000,2,0=0x5C052400,1,1,0x5C052400,1,0 -0x5C080100,1,0,0x51200000,0,0=0x5C080100,1,0,0x5C052500,1,1 0x5C052500,1,1,0x51200080,0,0=0x5C052500,1,1,0x5C052580,1,0 0x5C052500,1,1,0x51200080,2,0=0x5C052500,1,1,0x5C052580,1,0 0x5C052500,1,1,0x51210080,0,0=0x5C052500,1,1,0x5C052680,1,0 0x5C052500,1,1,0x51210080,2,0=0x5C052500,1,1,0x5C052680,1,0 0x5C052580,1,0,0x51200000,2,0=0x5C052580,1,0,0x5C052500,1,0 0x5C052680,1,0,0x51200000,2,0=0x5C052680,1,0,0x5C052500,1,0 -0x5C080100,1,0,0x51210000,0,0=0x5C080100,1,0,0x5C052600,1,1 0x5C052600,1,1,0x51200080,0,0=0x5C052600,1,1,0x5C052580,1,0 0x5C052600,1,1,0x51200080,2,0=0x5C052600,1,1,0x5C052580,1,0 0x5C052600,1,1,0x51210080,0,0=0x5C052600,1,1,0x5C052680,1,0 @@ -11856,231 +10344,66 @@ 0x5C052580,1,0,0x51210000,2,0=0x5C052580,1,0,0x5C052600,1,0 0x5C052680,1,0,0x51210000,2,0=0x5C052680,1,0,0x5C052600,1,0 ; -0x5C080100,1,0,0x584E0000,0,0=0x5C080100,1,0,0x5C052700,1,0 -0x5C080100,1,0,0x584E0000,2,0=0x5C080100,1,0,0x5C052700,1,0 -0x5C080100,1,0,0x58480000,0,0=0x5C080100,1,0,0x5C052800,1,0 -0x5C080100,1,0,0x58480000,2,0=0x5C080100,1,0,0x5C052800,1,0 -0x5C080100,1,0,0x58486C00,0,0=0x5C080100,1,0,0x5C052805,1,0 -0x5C080100,1,0,0x58486C00,2,0=0x5C080100,1,0,0x5C052805,1,0 -0x5C080100,1,0,0x58400000,0,0=0x5C080100,1,0,0x5C052A00,1,1 -; -0x5C080100,3,1,0x05004b00,0,0=0x5C080100,3,1,0x5C051000,3,0 -0x5C080100,3,1,0x05004b00,2,0=0x5C080100,3,1,0x5C051000,3,0 -0x5C080100,3,1,0x00004b00,0,0=0x5C080100,3,1,0x5C051100,3,0 -0x5C080100,3,1,0x00004b00,2,0=0x5C080100,3,1,0x5C051100,3,0 -0x5C080100,3,1,0x09004b00,0,0=0x5C080100,3,1,0x5C051200,3,0 -0x5C080100,3,1,0x09004b00,2,0=0x5C080100,3,1,0x5C051200,3,0 -0x5C080100,3,1,0x5F940300,0,0=0x5C080100,3,1,0x5C051200,3,0 -0x5C080100,3,1,0x5F940300,2,0=0x5C080100,3,1,0x5C051200,3,0 -0x5C080100,3,1,0x04006100,0,0=0x5C080100,3,1,0x5C051300,3,0 +; 0x5C051300,3,0,0x04006100,2,0=0x5C051300,3,0,0x5C051300,3,1 -0x5C080100,3,1,0x0a001500,3,0=0x5C080100,3,1,0x5C051400,3,0 0x5C051400,3,0,0x0a001500,1,0=0x5C051400,3,0,0x5C051400,3,1 -0x5C080100,3,1,0x03031500,0,0=0x5C080100,3,1,0x5C051500,3,0 -0x5C080100,3,1,0x03031500,2,0=0x5C080100,3,1,0x5C051500,3,0 -0x5C080100,3,1,0x5d540000,0,0=0x5C080100,3,1,0x5C051500,3,0 -0x5C080100,3,1,0x5d540000,2,0=0x5C080100,3,1,0x5C051500,3,0 -0x5C080100,3,1,0x5d300000,0,0=0x5C080100,3,1,0x5C051505,3,0 -0x5C080100,3,1,0x5d300000,2,0=0x5C080100,3,1,0x5C051505,3,0 -0x5C080100,3,1,0x5f880000,0,0=0x5C080100,3,1,0x5C051700,3,0 -0x5C080100,3,1,0x5f880000,2,0=0x5C080100,3,1,0x5C051700,3,0 -0x5C080100,3,1,0x5f888000,0,0=0x5C080100,3,1,0x5C051705,3,0 -0x5C080100,3,1,0x5f888000,2,0=0x5C080100,3,1,0x5C051705,3,0 -0x5C080100,3,1,0x08031500,0,0=0x5C080100,3,1,0x5C051720,3,0 -0x5C080100,3,1,0x08031500,2,0=0x5C080100,3,1,0x5C051720,3,0 -0x5C080100,3,1,0x5f884000,0,0=0x5C080100,3,1,0x5C051800,3,0 -0x5C080100,3,1,0x5f884000,2,0=0x5C080100,3,1,0x5C051800,3,0 -0x5C080100,3,1,0x5f88c000,0,0=0x5C080100,3,1,0x5C051805,3,0 -0x5C080100,3,1,0x5f88c000,2,0=0x5C080100,3,1,0x5C051805,3,0 -0x5C080100,3,1,0x5dc31500,0,0=0x5C080100,3,1,0x5C051905,3,0 -0x5C080100,3,1,0x5dc31500,2,0=0x5C080100,3,1,0x5C051905,3,0 -0x5C080100,3,1,0x0d031500,0,0=0x5C080100,3,1,0x5C051920,3,0 -0x5C080100,3,1,0x0d031500,2,0=0x5C080100,3,1,0x5C051920,3,0 -0x5C080100,3,1,0x5dd31500,0,0=0x5C080100,3,1,0x5C051925,3,0; missing_paths -0x5C080100,3,1,0x5dd31500,2,0=0x5C080100,3,1,0x5C051925,3,0; missing_paths -0x5C080100,3,1,0x51000000,0,0=0x5C080100,3,1,0x5C051A00,3,0 -0x5C080100,3,1,0x51000000,2,0=0x5C080100,3,1,0x5C051A00,3,0 -0x5C080100,3,1,0x51010000,0,0=0x5C080100,3,1,0x5C051B00,3,0 -0x5C080100,3,1,0x51010000,2,0=0x5C080100,3,1,0x5C051B00,3,0 -0x5C080100,3,1,0x51020000,0,0=0x5C080100,3,1,0x5C051C00,3,0 -0x5C080100,3,1,0x51020000,2,0=0x5C080100,3,1,0x5C051C00,3,1 -0x5C080100,3,1,0x51030000,0,0=0x5C080100,3,1,0x5C051D00,3,0 -0x5C080100,3,1,0x51030000,2,0=0x5C080100,3,1,0x5C051D00,3,0 -0x5C080100,3,1,0x51040000,0,0=0x5C080100,3,1,0x5C051E00,3,0 -0x5C080100,3,1,0x51040000,2,0=0x5C080100,3,1,0x5C051E00,3,0 -0x5C080100,3,1,0x51050000,0,0=0x5C080100,3,1,0x5C051F00,3,0 -0x5C080100,3,1,0x51050000,2,0=0x5C080100,3,1,0x5C051F00,3,0 -0x5C080100,3,1,0x51100000,0,0=0x5C080100,3,1,0x5C052000,3,0 0x5C052000,3,0,0x51100000,2,0=0x5C052000,3,0,0x5C052000,3,1 -0x5C080100,3,1,0x51110000,0,0=0x5C080100,3,1,0x5C052100,3,0 0x5C052100,3,0,0x51110000,2,0=0x5C052100,3,0,0x5C052100,3,1 -0x5C080100,3,1,0x51120000,0,0=0x5C080100,3,1,0x5C052200,3,0 0x5C052200,3,0,0x51120000,2,0=0x5C052200,3,0,0x5C052200,3,1 -0x5C080100,3,1,0x51130000,0,0=0x5C080100,3,1,0x5C052300,3,0 0x5C052300,3,0,0x51130000,2,0=0x5C052300,3,0,0x5C052300,3,1 -0x5C080100,3,1,0x51140000,0,0=0x5C080100,3,1,0x5C052400,3,0 0x5C052400,3,0,0x51140000,2,0=0x5C052400,3,0,0x5C052400,3,1 -0x5C080100,3,1,0x51200000,0,0=0x5C080100,3,1,0x5C052500,3,0 0x5C052500,3,0,0x51200080,0,0=0x5C052500,3,0,0x5C052580,3,0 0x5C052500,3,0,0x51200080,2,0=0x5C052500,3,0,0x5C052580,3,0 0x5C052500,3,0,0x51210080,0,0=0x5C052500,3,0,0x5C052680,3,0 0x5C052500,3,0,0x51210080,2,0=0x5C052500,3,0,0x5C052680,3,0 -0x5C080100,3,1,0x51210000,0,0=0x5C080100,3,1,0x5C052600,3,0 0x5C052600,3,0,0x51200080,0,0=0x5C052600,3,0,0x5C052580,3,0 0x5C052600,3,0,0x51200080,2,0=0x5C052600,3,0,0x5C052580,3,0 0x5C052600,3,0,0x51210080,0,0=0x5C052600,3,0,0x5C052680,3,0 0x5C052600,3,0,0x51210080,2,0=0x5C052600,3,0,0x5C052680,3,0 ; -0x5C080100,3,1,0x584E0000,0,0=0x5C080100,3,1,0x5C052700,3,0 -0x5C080100,3,1,0x584E0000,2,0=0x5C080100,3,1,0x5C052700,3,0 -0x5C080100,3,1,0x58480000,0,0=0x5C080100,3,1,0x5C052800,3,0 -0x5C080100,3,1,0x58480000,2,0=0x5C080100,3,1,0x5C052800,3,0 -0x5C080100,3,1,0x58486C00,0,0=0x5C080100,3,1,0x5C052805,3,0 -0x5C080100,3,1,0x58486C00,2,0=0x5C080100,3,1,0x5C052805,3,0 -0x5C080100,3,1,0x58400000,0,0=0x5C080100,3,1,0x5C052A00,3,0 -; -0x5C080100,1,0,0x57000000,0,0=0x5C080100,1,0,0x57001320,0,0 -0x5C080100,1,0,0x57000000,2,0=0x5C080100,1,0,0x57001320,0,0 -;0x5C080100,1,0,0x57100000,0,0=0x5C080100,1,0,0x57101320,0,0 -;0x5C080100,1,0,0x57100000,2,0=0x5C080100,1,0,0x57101320,0,0 -;;0x5C080100,1,0,0x57200000,0,0=0x5C080100,1,0,0x57201320,0,0 -;;0x5C080100,1,0,0x57200000,2,0=0x5C080100,1,0,0x57201320,0,0 -0x5C080100,1,0,0x57010000,0,0=0x5C080100,1,0,0x57011320,0,0 -0x5C080100,1,0,0x57010000,2,0=0x5C080100,1,0,0x57011320,0,1 -0x5C080100,1,0,0x57110000,0,0=0x5C080100,1,0,0x57111320,0,0 -0x5C080100,1,0,0x57110000,2,0=0x5C080100,1,0,0x57111320,0,1 -0x5C080100,1,0,0x57020000,0,0=0x5C080100,1,0,0x57021320,0,0 -0x5C080100,1,0,0x57020000,2,0=0x5C080100,1,0,0x57021320,0,1 -0x5C080100,1,0,0x57120000,0,0=0x5C080100,1,0,0x57121320,0,0 -0x5C080100,1,0,0x57120000,2,0=0x5C080100,1,0,0x57121320,0,1 -0x5C080100,1,0,0x57220000,0,0=0x5C080100,1,0,0x57221320,0,0 -0x5C080100,1,0,0x57220000,2,0=0x5C080100,1,0,0x57221320,0,1 -0x5C080100,1,0,0x57320000,0,0=0x5C080100,1,0,0x57321320,0,0 -0x5C080100,1,0,0x57320000,2,0=0x5C080100,1,0,0x57321320,0,1 -0x5C080100,1,0,0x57420000,0,0=0x5C080100,1,0,0x57421320,0,0 -0x5C080100,1,0,0x57420000,2,0=0x5C080100,1,0,0x57421320,0,1 -0x5C080100,1,0,0x57030000,0,0=0x5C080100,1,0,0x57031320,0,0 -0x5C080100,1,0,0x57030000,2,0=0x5C080100,1,0,0x57031320,0,1 -0x5C080100,1,0,0x57130000,0,0=0x5C080100,1,0,0x57131320,0,0 -0x5C080100,1,0,0x57130000,2,0=0x5C080100,1,0,0x57131320,0,1 -0x5C080100,1,0,0x57330000,0,0=0x5C080100,1,0,0x57331320,0,0 -0x5C080100,1,0,0x57330000,2,0=0x5C080100,1,0,0x57331320,0,1 -0x5C080100,1,0,0x57430000,0,0=0x5C080100,1,0,0x57431320,0,0 -0x5C080100,1,0,0x57430000,2,0=0x5C080100,1,0,0x57431320,0,1 -0x5C080100,1,0,0x57040000,0,0=0x5C080100,1,0,0x57041320,0,0 -0x5C080100,1,0,0x57040000,2,0=0x5C080100,1,0,0x57041320,0,1 -0x5C080100,1,0,0x57140000,0,0=0x5C080100,1,0,0x57141320,0,0 -0x5C080100,1,0,0x57140000,2,0=0x5C080100,1,0,0x57141320,0,1 -0x5C080100,1,0,0x57340000,0,0=0x5C080100,1,0,0x57341320,0,0 -0x5C080100,1,0,0x57340000,2,0=0x5C080100,1,0,0x57341320,0,1 -0x5C080100,1,0,0x57440000,0,0=0x5C080100,1,0,0x57441320,0,0 -0x5C080100,1,0,0x57440000,2,0=0x5C080100,1,0,0x57441320,0,1 -0x5C080100,1,0,0x57050000,0,0=0x5C080100,1,0,0x57051320,0,0 -0x5C080100,1,0,0x57150000,0,0=0x5C080100,1,0,0x57151320,0,0 +; 0x57051320,0,0,0x57050080,0,0=0x57051320,0,0,0x570513A0,0,0 0x57151320,0,0,0x57150080,0,0=0x57151320,0,0,0x571513A0,0,0 0x570513A0,0,0,0x57050080,2,0=0x570513A0,0,0,0x570513A0,0,1 0x571513A0,0,0,0x57150080,2,0=0x571513A0,0,0,0x571513A0,0,1 -0x5C080100,1,0,0x57050080,2,0=0x5C080100,1,0,0x570513A0,0,1 -0x5C080100,1,0,0x57150080,2,0=0x5C080100,1,0,0x571513A0,0,1 0x570513A0,0,1,0x57050000,2,0=0x570513A0,0,1,0x57051320,0,1 0x571513A0,0,1,0x57150000,2,0=0x571513A0,0,1,0x57151320,0,1 -0x5C080100,1,0,0x57060000,0,0=0x5C080100,1,0,0x57061320,0,0 -0x5C080100,1,0,0x57160000,0,0=0x5C080100,1,0,0x57161320,0,0 -0x5C080100,1,0,0x57070000,0,0=0x5C080100,1,0,0x57071320,0,0 -0x5C080100,1,0,0x57170000,0,0=0x5C080100,1,0,0x57171320,0,0 0x57061320,0,0,0x57050080,0,0=0x57061320,0,0,0x570513A0,0,0 0x57161320,0,0,0x57150080,0,0=0x57161320,0,0,0x571513A0,0,0 0x570513A0,0,1,0x57060000,2,0=0x570513A0,0,1,0x57061320,0,1 0x571513A0,0,1,0x57160000,2,0=0x571513A0,0,1,0x57161320,0,1 0x570513A0,0,1,0x57070000,2,0=0x570513A0,0,1,0x57071320,0,1 0x571513A0,0,1,0x57170000,2,0=0x571513A0,0,1,0x57171320,0,1 -0x5C080100,1,0,0x57080000,0,0=0x5C080100,1,0,0x57081320,0,0 -0x5C080100,1,0,0x57180000,0,0=0x5C080100,1,0,0x57181320,0,0 0x57081320,0,0,0x57080080,0,0=0x57081300,0,0,0x570813A0,0,0; missing_paths 0x57081320,0,0,0x57080080,2,0=0x57081300,0,0,0x570813A0,0,0; missing_paths 0x570813A0,0,0,0x57080000,2,0=0x570813A0,0,0,0x57081300,0,1; missing_paths -0x5C080100,1,0,0x57090000,0,0=0x5C080100,1,0,0x57091320,0,0 -0x5C080100,1,0,0x57190000,0,0=0x5C080100,1,0,0x57191320,0,0 0x57091320,0,0,0x57080080,0,0=0x57091300,0,0,0x570813A0,0,0; missing_paths 0x57091320,0,0,0x57080080,2,0=0x57091300,0,0,0x570813A0,0,1; missing_paths 0x570813A0,0,0,0x57090000,2,0=0x570813A0,0,0,0x57091320,0,1 0x571813A0,0,0,0x57190000,2,0=0x571813A0,0,0,0x57191320,0,1 0x570813A0,0,1,0x57090000,2,0=0x570813A0,0,1,0x57091320,0,1 0x571813A0,0,1,0x57190000,2,0=0x571813A0,0,1,0x57191320,0,1 -0x5C080100,1,0,0x57220100,0,0=0x5C080100,1,0,0x57621325,1,1 -0x5C080100,1,0,0x57220100,2,1=0x5C080100,1,0,0x57621320,3,0 -; -0x5C080100,3,1,0x57000000,0,0=0x5C080100,3,1,0x57001320,2,0 -0x5C080100,3,1,0x57000000,2,0=0x5C080100,3,1,0x57001320,2,0 -;0x5C080100,3,1,0x57100000,0,0=0x5C080100,3,1,0x57101320,2,0 -;0x5C080100,3,1,0x57100000,2,0=0x5C080100,3,1,0x57101320,2,0 -;0x5C080100,3,1,0x57200000,0,0=0x5C080100,3,1,0x57201320,2,0 -;0x5C080100,3,1,0x57200000,2,0=0x5C080100,3,1,0x57201320,2,0 -0x5C080100,3,1,0x57010000,0,0=0x5C080100,3,1,0x57011320,2,1 -0x5C080100,3,1,0x57010000,2,0=0x5C080100,3,1,0x57011320,2,0 -0x5C080100,3,1,0x57110000,0,0=0x5C080100,3,1,0x57111320,2,1 -0x5C080100,3,1,0x57110000,2,0=0x5C080100,3,1,0x57111320,2,0 -0x5C080100,3,1,0x57020000,0,0=0x5C080100,3,1,0x57021320,2,1 -0x5C080100,3,1,0x57020000,2,0=0x5C080100,3,1,0x57021320,2,0 -0x5C080100,3,1,0x57120000,0,0=0x5C080100,3,1,0x57121320,2,1 -0x5C080100,3,1,0x57120000,2,0=0x5C080100,3,1,0x57121320,2,0 -0x5C080100,3,1,0x57220000,0,0=0x5C080100,3,1,0x57221320,2,1 -0x5C080100,3,1,0x57220000,2,0=0x5C080100,3,1,0x57221320,2,0 -0x5C080100,3,1,0x57320000,0,0=0x5C080100,3,1,0x57321320,2,1 -0x5C080100,3,1,0x57320000,2,0=0x5C080100,3,1,0x57321320,2,0 -0x5C080100,3,1,0x57420000,0,0=0x5C080100,3,1,0x57421320,2,1 -0x5C080100,3,1,0x57420000,2,0=0x5C080100,3,1,0x57421320,2,0 -0x5C080100,3,1,0x57030000,0,0=0x5C080100,3,1,0x57031320,2,1 -0x5C080100,3,1,0x57030000,2,0=0x5C080100,3,1,0x57031320,2,0 -0x5C080100,3,1,0x57130000,0,0=0x5C080100,3,1,0x57131320,2,1 -0x5C080100,3,1,0x57130000,2,0=0x5C080100,3,1,0x57131320,2,0 -0x5C080100,3,1,0x57330000,0,0=0x5C080100,3,1,0x57331320,2,1 -0x5C080100,3,1,0x57330000,2,0=0x5C080100,3,1,0x57331320,2,0 -0x5C080100,3,1,0x57430000,0,0=0x5C080100,3,1,0x57431320,2,1 -0x5C080100,3,1,0x57430000,2,0=0x5C080100,3,1,0x57431320,2,0 -0x5C080100,3,1,0x57040000,0,0=0x5C080100,3,1,0x57041320,2,1 -0x5C080100,3,1,0x57040000,2,0=0x5C080100,3,1,0x57041320,2,0 -0x5C080100,3,1,0x57140000,0,0=0x5C080100,3,1,0x57141320,2,1 -0x5C080100,3,1,0x57140000,2,0=0x5C080100,3,1,0x57141320,2,0 -0x5C080100,3,1,0x57340000,0,0=0x5C080100,3,1,0x57341320,2,1 -0x5C080100,3,1,0x57340000,2,0=0x5C080100,3,1,0x57341320,2,0 -0x5C080100,3,1,0x57440000,0,0=0x5C080100,3,1,0x57441320,2,1 -0x5C080100,3,1,0x57440000,2,0=0x5C080100,3,1,0x57441320,2,0 -0x5C080100,3,1,0x57050000,0,0=0x5C080100,3,1,0x57051320,2,1 -0x5C080100,3,1,0x57150000,0,0=0x5C080100,3,1,0x57151320,2,1 +; 0x57051320,2,1,0x57050080,0,0=0x57051320,2,1,0x570513A0,2,1 0x57151320,2,1,0x57150080,0,0=0x57151320,2,1,0x571513A0,2,1 0x570513A0,2,1,0x57050080,2,0=0x570513A0,2,1,0x570513A0,2,0 0x571513A0,2,1,0x57150080,2,0=0x571513A0,2,1,0x571513A0,2,0 -0x5C080100,3,1,0x57050080,2,0=0x5C080100,3,1,0x570513A0,2,0 -0x5C080100,3,1,0x57150080,2,0=0x5C080100,3,1,0x571513A0,2,0 0x570513A0,2,0,0x57050000,2,0=0x570513A0,2,0,0x57051320,2,0 0x571513A0,2,0,0x57150000,2,0=0x571513A0,2,0,0x57151320,2,0 -0x5C080100,3,1,0x57060000,0,0=0x5C080100,3,1,0x57061320,2,1 -0x5C080100,3,1,0x57160000,0,0=0x5C080100,3,1,0x57161320,2,1 -0x5C080100,3,1,0x57070000,0,0=0x5C080100,3,1,0x57071320,2,1 -0x5C080100,3,1,0x57170000,0,0=0x5C080100,3,1,0x57171320,2,1 0x57061320,2,1,0x57050080,0,0=0x57061320,2,1,0x570513A0,2,1 0x57161320,2,1,0x57150080,0,0=0x57161320,2,1,0x571513A0,2,1 0x570513A0,2,0,0x57060000,2,0=0x570513A0,2,0,0x57061320,2,0 0x571513A0,2,0,0x57160000,2,0=0x571513A0,2,0,0x57161320,2,0 0x570513A0,2,0,0x57070000,2,0=0x570513A0,2,0,0x57071320,2,0 0x571513A0,2,0,0x57170000,2,0=0x571513A0,2,0,0x57171320,2,0 -0x5C080100,3,1,0x57080000,0,0=0x5C080100,3,1,0x57081320,2,1 -0x5C080100,3,1,0x57180000,0,0=0x5C080100,3,1,0x57181320,2,1 0x57081320,2,1,0x57080080,0,0=0x57081300,2,1,0x570813A0,2,1; missing_paths 0x57081320,2,1,0x57080080,2,0=0x57081300,2,1,0x570813A0,2,0; missing_paths 0x570813A0,2,1,0x57080000,2,0=0x570813A0,2,1,0x57081300,2,0; missing_paths 0x570813A0,2,0,0x57080000,2,0=0x570813A0,2,0,0x57081300,2,0; missing_paths -0x5C080100,3,1,0x57090000,0,0=0x5C080100,3,1,0x57091320,2,1 -0x5C080100,3,1,0x57190000,0,0=0x5C080100,3,1,0x57191320,2,1 0x57091320,2,1,0x57080080,0,0=0x57091300,2,1,0x570813A0,2,0; missing_paths 0x57091320,2,1,0x57080080,2,0=0x57091300,2,1,0x570813A0,2,0; missing_paths 0x570813A0,2,0,0x57090000,2,0=0x570813A0,2,0,0x57091320,2,0 0x571813A0,2,0,0x57190000,2,0=0x571813A0,2,0,0x57191320,2,0 -0x5C080100,3,1,0x57220100,0,0=0x5C080100,3,1,0x57621320,1,1 -0x5C080100,3,1,0x57220100,2,1=0x5C080100,3,1,0x57621325,3,0 ; 0x57011320,0,0,0x57000000,0,0=0x57011320,0,0,0x57001320,0,0 0x57011320,0,0,0x57000000,2,0=0x57011320,0,0,0x57001320,0,0 @@ -13735,12 +12058,6 @@ ;L1-to-L2 ;Into ;L0 Stub into Onslope -0x5C000100,1,0,0x57700000,1,0=0x5C000100,1,0,0x5C080010,1,0; conflicting-override -0x5C000100,3,0,0x5C080000,1,0=0x5C000100,3,0,0x5C080010,1,0 -0x5C000100,1,0,0x57700000,1,0=0x5C000100,1,0,0x5C080010,1,0; conflicting-override -0x5C000100,3,0,0x5C080000,1,0=0x5C000100,3,0,0x5C080010,1,0 -0x5C000100,1,0,0x57700000,1,0=0x5C000100,1,0,0x5C080010,1,0; conflicting-override -0x5C000100,1,0,0x5C080000,1,0=0x5C000100,1,0,0x5C080010,1,0 ;Onslope into Elevated ;Out of 0x5C030000,1,0,0x5C000000,1,0=0x5C030000,1,0,0x5C030000,1,0 @@ -13749,230 +12066,13 @@ 0x5C030000,3,0,0x5C000000,3,0=0x5C030000,3,0,0x5C030000,3,0 ; ;Adjacencies -0x5C080010,1,0,0x02001500,3,0=0x5C080010,1,0,0x5C031420,3,0 -0x5C080010,1,0,0x5DDD0300,1,0=0x5C080010,1,0,0x5C031925,1,0; missing_paths -0x5C080010,1,0,0x5DDD0300,3,0=0x5C080010,1,0,0x5C031925,3,0; missing_paths ;Overriding L1 ;Tight Situations -0x5C080010,1,0,0x05004b00,0,0=0x5C080010,1,0,0x5C051000,1,0 -0x5C080010,1,0,0x05004b00,2,0=0x5C080010,1,0,0x5C051000,1,0 -0x5C080010,1,0,0x00004b00,0,0=0x5C080010,1,0,0x5C051100,1,0 -0x5C080010,1,0,0x00004b00,2,0=0x5C080010,1,0,0x5C051100,1,0 -0x5C080010,1,0,0x09004b00,0,0=0x5C080010,1,0,0x5C051200,1,0 -0x5C080010,1,0,0x09004b00,2,0=0x5C080010,1,0,0x5C051200,1,0 -0x5C080010,1,0,0x5F940300,0,0=0x5C080010,1,0,0x5C051200,1,0 -0x5C080010,1,0,0x5F940300,2,0=0x5C080010,1,0,0x5C051200,1,0 -0x5C080010,1,0,0x04006100,0,0=0x5C080010,1,0,0x5C051300,1,1 -0x5C080010,1,0,0x0a001500,3,0=0x5C080010,1,0,0x5C051400,1,1 -0x5C080010,1,0,0x03031500,0,0=0x5C080010,1,0,0x5C051500,1,0 -0x5C080010,1,0,0x03031500,2,0=0x5C080010,1,0,0x5C051500,1,0 -0x5C080010,1,0,0x5d540000,0,0=0x5C080010,1,0,0x5C051500,1,0 -0x5C080010,1,0,0x5d540000,2,0=0x5C080010,1,0,0x5C051500,1,0 -0x5C080010,1,0,0x5d300000,0,0=0x5C080010,1,0,0x5C051505,1,0 -0x5C080010,1,0,0x5d300000,2,0=0x5C080010,1,0,0x5C051505,1,0 -0x5C080010,1,0,0x5f880000,0,0=0x5C080010,1,0,0x5C051700,1,0 -0x5C080010,1,0,0x5f880000,2,0=0x5C080010,1,0,0x5C051700,1,0 -0x5C080010,1,0,0x5f888000,0,0=0x5C080010,1,0,0x5C051705,1,0 -0x5C080010,1,0,0x5f888000,2,0=0x5C080010,1,0,0x5C051705,1,0 -0x5C080010,1,0,0x08031500,0,0=0x5C080010,1,0,0x5C051720,1,0 -0x5C080010,1,0,0x08031500,2,0=0x5C080010,1,0,0x5C051720,1,0 -0x5C080010,1,0,0x5f884000,0,0=0x5C080010,1,0,0x5C051800,1,0 -0x5C080010,1,0,0x5f884000,2,0=0x5C080010,1,0,0x5C051800,1,0 -0x5C080010,1,0,0x5f88c000,0,0=0x5C080010,1,0,0x5C051805,1,0 -0x5C080010,1,0,0x5f88c000,2,0=0x5C080010,1,0,0x5C051805,1,0 -0x5C080010,1,0,0x5dc31500,0,0=0x5C080010,1,0,0x5C051905,1,0 -0x5C080010,1,0,0x5dc31500,2,0=0x5C080010,1,0,0x5C051905,1,0 -0x5C080010,1,0,0x0d031500,0,0=0x5C080010,1,0,0x5C051920,1,0 -0x5C080010,1,0,0x0d031500,2,0=0x5C080010,1,0,0x5C051920,1,0 -0x5C080010,1,0,0x5dd31500,0,0=0x5C080010,1,0,0x5C051925,1,0; missing_paths -0x5C080010,1,0,0x5dd31500,2,0=0x5C080010,1,0,0x5C051925,1,0; missing_paths -0x5C080010,1,0,0x51000000,0,0=0x5C080010,1,0,0x5C051A00,1,0 -0x5C080010,1,0,0x51000000,2,0=0x5C080010,1,0,0x5C051A00,1,0 -0x5C080010,1,0,0x51010000,0,0=0x5C080010,1,0,0x5C051B00,1,0 -0x5C080010,1,0,0x51010000,2,0=0x5C080010,1,0,0x5C051B00,1,0 -0x5C080010,1,0,0x51030000,0,0=0x5C080010,1,0,0x5C051D00,1,0 -0x5C080010,1,0,0x51030000,2,0=0x5C080010,1,0,0x5C051D00,1,0 -0x5C080010,1,0,0x51040000,0,0=0x5C080010,1,0,0x5C051E00,1,0 -0x5C080010,1,0,0x51040000,2,0=0x5C080010,1,0,0x5C051E00,1,0 -0x5C080010,1,0,0x51050000,0,0=0x5C080010,1,0,0x5C051F00,1,0 -0x5C080010,1,0,0x51050000,2,0=0x5C080010,1,0,0x5C051F00,1,0 -0x5C080010,1,0,0x51100000,0,0=0x5C080010,1,0,0x5C052000,1,1 -0x5C080010,1,0,0x51110000,0,0=0x5C080010,1,0,0x5C052100,1,1 -0x5C080010,1,0,0x51120000,0,0=0x5C080010,1,0,0x5C052200,1,1 -0x5C080010,1,0,0x51130000,0,0=0x5C080010,1,0,0x5C052300,1,1 -0x5C080010,1,0,0x51140000,0,0=0x5C080010,1,0,0x5C052400,1,1 -0x5C080010,1,0,0x51200000,0,0=0x5C080010,1,0,0x5C052500,1,1 -0x5C080010,1,0,0x51210000,0,0=0x5C080010,1,0,0x5C052600,1,1 -; -0x5C080010,1,0,0x584E0000,0,0=0x5C080010,1,0,0x5C052700,1,0 -0x5C080010,1,0,0x584E0000,2,0=0x5C080010,1,0,0x5C052700,1,0 -0x5C080010,1,0,0x58480000,0,0=0x5C080010,1,0,0x5C052800,1,0 -0x5C080010,1,0,0x58480000,2,0=0x5C080010,1,0,0x5C052800,1,0 -0x5C080010,1,0,0x58486C00,0,0=0x5C080010,1,0,0x5C052805,1,0 -0x5C080010,1,0,0x58486C00,2,0=0x5C080010,1,0,0x5C052805,1,0 -0x5C080010,1,0,0x58400000,0,0=0x5C080010,1,0,0x5C052A00,1,1 -; -0x5C080010,3,1,0x05004b00,0,0=0x5C080010,3,1,0x5C051000,3,0 -0x5C080010,3,1,0x05004b00,2,0=0x5C080010,3,1,0x5C051000,3,0 -0x5C080010,3,1,0x00004b00,0,0=0x5C080010,3,1,0x5C051100,3,0 -0x5C080010,3,1,0x00004b00,2,0=0x5C080010,3,1,0x5C051100,3,0 -0x5C080010,3,1,0x09004b00,0,0=0x5C080010,3,1,0x5C051200,3,0 -0x5C080010,3,1,0x09004b00,2,0=0x5C080010,3,1,0x5C051200,3,0 -0x5C080010,3,1,0x5F940300,0,0=0x5C080010,3,1,0x5C051200,3,0 -0x5C080010,3,1,0x5F940300,2,0=0x5C080010,3,1,0x5C051200,3,0 -0x5C080010,3,1,0x04006100,0,0=0x5C080010,3,1,0x5C051300,3,0 -0x5C080010,3,1,0x0a001500,3,0=0x5C080010,3,1,0x5C051400,3,0 -0x5C080010,3,1,0x03031500,0,0=0x5C080010,3,1,0x5C051500,3,0 -0x5C080010,3,1,0x03031500,2,0=0x5C080010,3,1,0x5C051500,3,0 -0x5C080010,3,1,0x5d540000,0,0=0x5C080010,3,1,0x5C051500,3,0 -0x5C080010,3,1,0x5d540000,2,0=0x5C080010,3,1,0x5C051500,3,0 -0x5C080010,3,1,0x5d300000,0,0=0x5C080010,3,1,0x5C051505,3,0 -0x5C080010,3,1,0x5d300000,2,0=0x5C080010,3,1,0x5C051505,3,0 -0x5C080010,3,1,0x5f880000,0,0=0x5C080010,3,1,0x5C051700,3,0 -0x5C080010,3,1,0x5f880000,2,0=0x5C080010,3,1,0x5C051700,3,0 -0x5C080010,3,1,0x5f888000,0,0=0x5C080010,3,1,0x5C051705,3,0 -0x5C080010,3,1,0x5f888000,2,0=0x5C080010,3,1,0x5C051705,3,0 -0x5C080010,3,1,0x08031500,0,0=0x5C080010,3,1,0x5C051720,3,0 -0x5C080010,3,1,0x08031500,2,0=0x5C080010,3,1,0x5C051720,3,0 -0x5C080010,3,1,0x5f884000,0,0=0x5C080010,3,1,0x5C051800,3,0 -0x5C080010,3,1,0x5f884000,2,0=0x5C080010,3,1,0x5C051800,3,0 -0x5C080010,3,1,0x5f88c000,0,0=0x5C080010,3,1,0x5C051805,3,0 -0x5C080010,3,1,0x5f88c000,2,0=0x5C080010,3,1,0x5C051805,3,0 -0x5C080010,3,1,0x5dc31500,0,0=0x5C080010,3,1,0x5C051905,3,0 -0x5C080010,3,1,0x5dc31500,2,0=0x5C080010,3,1,0x5C051905,3,0 -0x5C080010,3,1,0x0d031500,0,0=0x5C080010,3,1,0x5C051920,3,0 -0x5C080010,3,1,0x0d031500,2,0=0x5C080010,3,1,0x5C051920,3,0 -0x5C080010,3,1,0x5dd31500,0,0=0x5C080010,3,1,0x5C051925,3,0; missing_paths -0x5C080010,3,1,0x5dd31500,2,0=0x5C080010,3,1,0x5C051925,3,0; missing_paths -0x5C080010,3,1,0x51000000,0,0=0x5C080010,3,1,0x5C051A00,3,0 -0x5C080010,3,1,0x51000000,2,0=0x5C080010,3,1,0x5C051A00,3,0 -0x5C080010,3,1,0x51010000,0,0=0x5C080010,3,1,0x5C051B00,3,0 -0x5C080010,3,1,0x51010000,2,0=0x5C080010,3,1,0x5C051B00,3,0 -0x5C080010,3,1,0x51020000,0,0=0x5C080010,3,1,0x5C051C00,3,0 -0x5C080010,3,1,0x51020000,2,0=0x5C080010,3,1,0x5C051C00,3,1 -0x5C080010,3,1,0x51030000,0,0=0x5C080010,3,1,0x5C051D00,3,0 -0x5C080010,3,1,0x51030000,2,0=0x5C080010,3,1,0x5C051D00,3,0 -0x5C080010,3,1,0x51040000,0,0=0x5C080010,3,1,0x5C051E00,3,0 -0x5C080010,3,1,0x51040000,2,0=0x5C080010,3,1,0x5C051E00,3,0 -0x5C080010,3,1,0x51050000,0,0=0x5C080010,3,1,0x5C051F00,3,0 -0x5C080010,3,1,0x51050000,2,0=0x5C080010,3,1,0x5C051F00,3,0 -0x5C080010,3,1,0x51100000,0,0=0x5C080010,3,1,0x5C052000,3,0 -0x5C080010,3,1,0x51110000,0,0=0x5C080010,3,1,0x5C052100,3,0 -0x5C080010,3,1,0x51120000,0,0=0x5C080010,3,1,0x5C052200,3,0 -0x5C080010,3,1,0x51130000,0,0=0x5C080010,3,1,0x5C052300,3,0 -0x5C080010,3,1,0x51140000,0,0=0x5C080010,3,1,0x5C052400,3,0 -0x5C080010,3,1,0x51200000,0,0=0x5C080010,3,1,0x5C052500,3,0 -0x5C080010,3,1,0x51210000,0,0=0x5C080010,3,1,0x5C052600,3,0 -; -0x5C080010,3,1,0x584E0000,0,0=0x5C080010,3,1,0x5C052700,3,0 -0x5C080010,3,1,0x584E0000,2,0=0x5C080010,3,1,0x5C052700,3,0 -0x5C080010,3,1,0x58480000,0,0=0x5C080010,3,1,0x5C052800,3,0 -0x5C080010,3,1,0x58480000,2,0=0x5C080010,3,1,0x5C052800,3,0 -0x5C080010,3,1,0x58486C00,0,0=0x5C080010,3,1,0x5C052805,3,0 -0x5C080010,3,1,0x58486C00,2,0=0x5C080010,3,1,0x5C052805,3,0 -0x5C080010,3,1,0x58400000,0,0=0x5C080010,3,1,0x5C052A00,3,0 -; -0x5C080010,1,0,0x57000000,0,0=0x5C080010,1,0,0x57001320,0,0 -0x5C080010,1,0,0x57000000,2,0=0x5C080010,1,0,0x57001320,0,0 -;0x5C080010,1,0,0x57100000,0,0=0x5C080010,1,0,0x57101320,0,0 -;0x5C080010,1,0,0x57100000,2,0=0x5C080010,1,0,0x57101320,0,0 -;;0x5C080010,1,0,0x57200000,0,0=0x5C080010,1,0,0x57201320,0,0 -;;0x5C080010,1,0,0x57200000,2,0=0x5C080010,1,0,0x57201320,0,0 -0x5C080010,1,0,0x57010000,0,0=0x5C080010,1,0,0x57011320,0,0 -0x5C080010,1,0,0x57010000,2,0=0x5C080010,1,0,0x57011320,0,1 -0x5C080010,1,0,0x57110000,0,0=0x5C080010,1,0,0x57111320,0,0 -0x5C080010,1,0,0x57110000,2,0=0x5C080010,1,0,0x57111320,0,1 -0x5C080010,1,0,0x57020000,0,0=0x5C080010,1,0,0x57021320,0,0 -0x5C080010,1,0,0x57020000,2,0=0x5C080010,1,0,0x57021320,0,1 -0x5C080010,1,0,0x57120000,0,0=0x5C080010,1,0,0x57121320,0,0 -0x5C080010,1,0,0x57120000,2,0=0x5C080010,1,0,0x57121320,0,1 -0x5C080010,1,0,0x57220000,0,0=0x5C080010,1,0,0x57221320,0,0 -0x5C080010,1,0,0x57220000,2,0=0x5C080010,1,0,0x57221320,0,1 -0x5C080010,1,0,0x57320000,0,0=0x5C080010,1,0,0x57321320,0,0 -0x5C080010,1,0,0x57320000,2,0=0x5C080010,1,0,0x57321320,0,1 -0x5C080010,1,0,0x57420000,0,0=0x5C080010,1,0,0x57421320,0,0 -0x5C080010,1,0,0x57420000,2,0=0x5C080010,1,0,0x57421320,0,1 -0x5C080010,1,0,0x57030000,0,0=0x5C080010,1,0,0x57031320,0,0 -0x5C080010,1,0,0x57030000,2,0=0x5C080010,1,0,0x57031320,0,1 -0x5C080010,1,0,0x57130000,0,0=0x5C080010,1,0,0x57131320,0,0 -0x5C080010,1,0,0x57130000,2,0=0x5C080010,1,0,0x57131320,0,1 -0x5C080010,1,0,0x57330000,0,0=0x5C080010,1,0,0x57331320,0,0 -0x5C080010,1,0,0x57330000,2,0=0x5C080010,1,0,0x57331320,0,1 -0x5C080010,1,0,0x57430000,0,0=0x5C080010,1,0,0x57431320,0,0 -0x5C080010,1,0,0x57430000,2,0=0x5C080010,1,0,0x57431320,0,1 -0x5C080010,1,0,0x57040000,0,0=0x5C080010,1,0,0x57041320,0,0 -0x5C080010,1,0,0x57040000,2,0=0x5C080010,1,0,0x57041320,0,1 -0x5C080010,1,0,0x57140000,0,0=0x5C080010,1,0,0x57141320,0,0 -0x5C080010,1,0,0x57140000,2,0=0x5C080010,1,0,0x57141320,0,1 -0x5C080010,1,0,0x57340000,0,0=0x5C080010,1,0,0x57341320,0,0 -0x5C080010,1,0,0x57340000,2,0=0x5C080010,1,0,0x57341320,0,1 -0x5C080010,1,0,0x57440000,0,0=0x5C080010,1,0,0x57441320,0,0 -0x5C080010,1,0,0x57440000,2,0=0x5C080010,1,0,0x57441320,0,1 -0x5C080010,1,0,0x57050000,0,0=0x5C080010,1,0,0x57051320,0,0 -0x5C080010,1,0,0x57150000,0,0=0x5C080010,1,0,0x57151320,0,0 -0x5C080010,1,0,0x57050080,2,0=0x5C080010,1,0,0x570513A0,0,1 -0x5C080010,1,0,0x57150080,2,0=0x5C080010,1,0,0x571513A0,0,1 -0x5C080010,1,0,0x57060000,0,0=0x5C080010,1,0,0x57061320,0,0 -0x5C080010,1,0,0x57160000,0,0=0x5C080010,1,0,0x57161320,0,0 -0x5C080010,1,0,0x57070000,0,0=0x5C080010,1,0,0x57071320,0,0 -0x5C080010,1,0,0x57170000,0,0=0x5C080010,1,0,0x57171320,0,0 -0x5C080010,1,0,0x57080000,0,0=0x5C080010,1,0,0x57081320,0,0 -0x5C080010,1,0,0x57180000,0,0=0x5C080010,1,0,0x57181320,0,0 -0x5C080010,1,0,0x57090000,0,0=0x5C080010,1,0,0x57091320,0,0 -0x5C080010,1,0,0x57190000,0,0=0x5C080010,1,0,0x57191320,0,0 -0x5C080010,1,0,0x57220100,0,0=0x5C080010,1,0,0x57621325,1,1 -0x5C080010,1,0,0x57220100,2,1=0x5C080010,1,0,0x57621320,3,0 -; -0x5C080010,3,1,0x57000000,0,0=0x5C080010,3,1,0x57001320,2,0 -0x5C080010,3,1,0x57000000,2,0=0x5C080010,3,1,0x57001320,2,0 -;0x5C080010,3,1,0x57100000,0,0=0x5C080010,3,1,0x57101320,2,0 -;0x5C080010,3,1,0x57100000,2,0=0x5C080010,3,1,0x57101320,2,0 -;0x5C080010,3,1,0x57200000,0,0=0x5C080010,3,1,0x57201320,2,0 -;0x5C080010,3,1,0x57200000,2,0=0x5C080010,3,1,0x57201320,2,0 -0x5C080010,3,1,0x57010000,0,0=0x5C080010,3,1,0x57011320,2,1 -0x5C080010,3,1,0x57010000,2,0=0x5C080010,3,1,0x57011320,2,0 -0x5C080010,3,1,0x57110000,0,0=0x5C080010,3,1,0x57111320,2,1 -0x5C080010,3,1,0x57110000,2,0=0x5C080010,3,1,0x57111320,2,0 -0x5C080010,3,1,0x57020000,0,0=0x5C080010,3,1,0x57021320,2,1 -0x5C080010,3,1,0x57020000,2,0=0x5C080010,3,1,0x57021320,2,0 -0x5C080010,3,1,0x57120000,0,0=0x5C080010,3,1,0x57121320,2,1 -0x5C080010,3,1,0x57120000,2,0=0x5C080010,3,1,0x57121320,2,0 -0x5C080010,3,1,0x57220000,0,0=0x5C080010,3,1,0x57221320,2,1 -0x5C080010,3,1,0x57220000,2,0=0x5C080010,3,1,0x57221320,2,0 -0x5C080010,3,1,0x57320000,0,0=0x5C080010,3,1,0x57321320,2,1 -0x5C080010,3,1,0x57320000,2,0=0x5C080010,3,1,0x57321320,2,0 -0x5C080010,3,1,0x57420000,0,0=0x5C080010,3,1,0x57421320,2,1 -0x5C080010,3,1,0x57420000,2,0=0x5C080010,3,1,0x57421320,2,0 -0x5C080010,3,1,0x57030000,0,0=0x5C080010,3,1,0x57031320,2,1 -0x5C080010,3,1,0x57030000,2,0=0x5C080010,3,1,0x57031320,2,0 -0x5C080010,3,1,0x57130000,0,0=0x5C080010,3,1,0x57131320,2,1 -0x5C080010,3,1,0x57130000,2,0=0x5C080010,3,1,0x57131320,2,0 -0x5C080010,3,1,0x57330000,0,0=0x5C080010,3,1,0x57331320,2,1 -0x5C080010,3,1,0x57330000,2,0=0x5C080010,3,1,0x57331320,2,0 -0x5C080010,3,1,0x57430000,0,0=0x5C080010,3,1,0x57431320,2,1 -0x5C080010,3,1,0x57430000,2,0=0x5C080010,3,1,0x57431320,2,0 -0x5C080010,3,1,0x57040000,0,0=0x5C080010,3,1,0x57041320,2,1 -0x5C080010,3,1,0x57040000,2,0=0x5C080010,3,1,0x57041320,2,0 -0x5C080010,3,1,0x57140000,0,0=0x5C080010,3,1,0x57141320,2,1 -0x5C080010,3,1,0x57140000,2,0=0x5C080010,3,1,0x57141320,2,0 -0x5C080010,3,1,0x57340000,0,0=0x5C080010,3,1,0x57341320,2,1 -0x5C080010,3,1,0x57340000,2,0=0x5C080010,3,1,0x57341320,2,0 -0x5C080010,3,1,0x57440000,0,0=0x5C080010,3,1,0x57441320,2,1 -0x5C080010,3,1,0x57440000,2,0=0x5C080010,3,1,0x57441320,2,0 -0x5C080010,3,1,0x57050000,0,0=0x5C080010,3,1,0x57051320,2,1 -0x5C080010,3,1,0x57150000,0,0=0x5C080010,3,1,0x57151320,2,1 -0x5C080010,3,1,0x57050080,2,0=0x5C080010,3,1,0x570513A0,2,0 -0x5C080010,3,1,0x57150080,2,0=0x5C080010,3,1,0x571513A0,2,0 -0x5C080010,3,1,0x57060000,0,0=0x5C080010,3,1,0x57061320,2,1 -0x5C080010,3,1,0x57160000,0,0=0x5C080010,3,1,0x57161320,2,1 -0x5C080010,3,1,0x57070000,0,0=0x5C080010,3,1,0x57071320,2,1 -0x5C080010,3,1,0x57170000,0,0=0x5C080010,3,1,0x57171320,2,1 -0x5C080010,3,1,0x57080000,0,0=0x5C080010,3,1,0x57081320,2,1 -0x5C080010,3,1,0x57180000,0,0=0x5C080010,3,1,0x57181320,2,1 -0x5C080010,3,1,0x57090000,0,0=0x5C080010,3,1,0x57091320,2,1 -0x5C080010,3,1,0x57190000,0,0=0x5C080010,3,1,0x57191320,2,1 -0x5C080010,3,1,0x57220100,0,0=0x5C080010,3,1,0x57621320,1,1 -0x5C080010,3,1,0x57220100,2,1=0x5C080010,3,1,0x57621325,3,0 +; +; +; +; +; ;RRW-SIDE OVERRIDES ;ROAD diff --git a/Controller/RUL2/07_RHW/Sec7k_FlexSPUI/Sec7kc_FlexDDI.txt b/Controller/RUL2/07_RHW/Sec7k_FlexSPUI/Sec7kc_FlexDDI.txt index 6c818f43f..fdc46b911 100644 --- a/Controller/RUL2/07_RHW/Sec7k_FlexSPUI/Sec7kc_FlexDDI.txt +++ b/Controller/RUL2/07_RHW/Sec7k_FlexSPUI/Sec7kc_FlexDDI.txt @@ -6412,8 +6412,6 @@ 0x5C020000,1,0,0x57E20500,0,0=0x5C020000,1,0,0x57E24500,0,0 0x5C020000,3,0,0x57E20800,0,0=0x5C020000,3,0,0x57E24800,0,0 ;Adjacencies -0x5C080000,1,0,0x57E20500,0,0=0x5C080000,1,0,0x57E24500,0,0 -0x5C080000,3,1,0x57E20800,0,0=0x5C080000,3,1,0x57E24800,0,0 0x5C080330,1,1,0x57E20500,0,0=0x5C080330,1,1,0x57E24500,0,0 0x5C080330,3,0,0x57E20800,0,0=0x5C080330,3,0,0x57E24800,0,0 @@ -6526,8 +6524,6 @@ 0x5C020000,1,0,0x57E20800,2,1=0x5C020000,1,0,0x57E24800,2,1 0x5C020000,3,0,0x57E20500,2,1=0x5C020000,3,0,0x57E24500,2,1 ;Adjacencies -0x5C080000,1,0,0x57E20800,2,1=0x5C080000,1,0,0x57E24800,2,1 -0x5C080000,3,1,0x57E20500,2,1=0x5C080000,3,1,0x57E24500,2,1 0x5C080330,1,1,0x57E20800,2,1=0x5C080330,1,1,0x57E24800,2,1 0x5C080330,3,0,0x57E20500,2,1=0x5C080330,3,0,0x57E24500,2,1 @@ -15473,20 +15469,8 @@ 0x5C050000,1,0,0x57E24500,0,0=0x5C050000,1,0,0x57E28500,0,0 0x5C050000,3,0,0x57E24800,0,0=0x5C050000,3,0,0x57E28800,0,0 ; -0x5C080010,1,0,0x57E20500,0,0=0x5C080010,1,0,0x57E28500,0,0 -0x5C080010,1,0,0x57E24500,0,0=0x5C080010,1,0,0x57E28500,0,0 -0x5C080010,3,1,0x57E20800,0,0=0x5C080010,3,1,0x57E28800,0,0 -0x5C080010,3,1,0x57E24800,0,0=0x5C080010,3,1,0x57E28800,0,0 -0x5C080100,1,0,0x57E20500,0,0=0x5C080100,1,0,0x57E28500,0,0 -0x5C080100,1,0,0x57E24500,0,0=0x5C080100,1,0,0x57E28500,0,0 -0x5C080100,3,1,0x57E20800,0,0=0x5C080100,3,1,0x57E28800,0,0 -0x5C080100,3,1,0x57E24800,0,0=0x5C080100,3,1,0x57E28800,0,0 0x5C080300,1,0,0x57E20500,0,0=0x5C080200,1,0,0x57E28500,0,0 0x5C080300,3,1,0x57E20800,0,0=0x5C080200,3,1,0x57E28800,0,0 -0x5C080010,1,0,0x57E24500,0,0=0x5C080010,1,0,0x57E28500,0,0 -0x5C080010,3,1,0x57E24800,0,0=0x5C080010,3,1,0x57E28800,0,0 -0x5C080100,1,0,0x57E24500,0,0=0x5C080100,1,0,0x57E28500,0,0 -0x5C080100,3,1,0x57E24800,0,0=0x5C080100,3,1,0x57E28800,0,0 0x5C080300,1,0,0x57E24500,0,0=0x5C080200,1,0,0x57E28500,0,0 0x5C080300,3,1,0x57E24800,0,0=0x5C080200,3,1,0x57E28800,0,0 ;Adjacencies @@ -15555,18 +15539,6 @@ 0x5C050000,1,0,0x57E24800,2,1=0x5C050000,1,0,0x57E28800,2,1 0x5C050000,3,0,0x57E24500,2,1=0x5C050000,3,0,0x57E28500,2,1 ; -0x5C080010,1,0,0x57E20800,2,1=0x5C080010,1,0,0x57E28800,2,1 -0x5C080010,1,0,0x57E24800,2,1=0x5C080010,1,0,0x57E28800,2,1 -0x5C080010,3,1,0x57E20500,2,1=0x5C080010,3,1,0x57E28500,2,1 -0x5C080010,3,1,0x57E24500,2,1=0x5C080010,3,1,0x57E28500,2,1 -0x5C080100,1,0,0x57E20800,2,1=0x5C080100,1,0,0x57E28800,2,1 -0x5C080100,1,0,0x57E24800,2,1=0x5C080100,1,0,0x57E28800,2,1 -0x5C080100,3,1,0x57E20500,2,1=0x5C080100,3,1,0x57E28500,2,1 -0x5C080100,3,1,0x57E24500,2,1=0x5C080100,3,1,0x57E28500,2,1 -0x5C080010,1,0,0x57E24800,2,1=0x5C080010,1,0,0x57E28800,2,1 -0x5C080010,3,1,0x57E24500,2,1=0x5C080010,3,1,0x57E28500,2,1 -0x5C080100,1,0,0x57E24800,2,1=0x5C080100,1,0,0x57E28800,2,1 -0x5C080100,3,1,0x57E24500,2,1=0x5C080100,3,1,0x57E28500,2,1 ;Adjacencies 0x5C050000,1,0,0x57E20800,2,1=0x5C050000,1,0,0x57E28800,2,1 0x5C050000,1,0,0x57E24800,2,1=0x5C050000,1,0,0x57E28800,2,1 diff --git a/Controller/RUL2/13_DualNetworking/Sec13d_DualNetworking_Crossings.txt b/Controller/RUL2/13_DualNetworking/Sec13d_DualNetworking_Crossings.txt index 8c970522a..1063775ca 100644 --- a/Controller/RUL2/13_DualNetworking/Sec13d_DualNetworking_Crossings.txt +++ b/Controller/RUL2/13_DualNetworking/Sec13d_DualNetworking_Crossings.txt @@ -232,10 +232,6 @@ 0x5c000000,3,0,0x53010100,3,0=0x5c000000,3,0,0x5c001940,1,0 0x5c000000,1,0,0x53010100,1,0=0x5c000000,1,0,0x5c001940,3,0; conflicting-override 0x5c000000,3,0,0x53010100,3,0=0x5c000000,3,0,0x5c001940,3,0; conflicting-override -0x5c060000,1,0,0x5da40000,0,0=0x5c060000,1,0,0x5c001940,1,0 -0x5c060000,1,0,0x5da40000,2,0=0x5c060000,1,0,0x5c001940,3,0 -0x5c060000,1,0,0x53010100,1,0=0x5c060000,1,0,0x5c001940,1,0 -0x5c060000,1,0,0x53010100,1,0=0x5c060000,1,0,0x5c001940,3,0; conflicting-override 0x5c000100,1,0,0x5da40000,0,0=0x5c000000,1,0,0x5c001940,1,0 0x5c000100,1,0,0x5da40000,2,0=0x5c000000,1,0,0x5c001940,3,0 @@ -253,8 +249,6 @@ 0x5c010000,3,0,0x5da40000,2,0=0x5c010000,3,0,0x5c011940,3,0 0x5c010100,1,0,0x5da40000,0,0=0x5c010000,1,0,0x5c011940,1,0 0x5c010100,1,0,0x5da40000,2,0=0x5c010000,1,0,0x5c011940,3,0 -0x5c070000,1,0,0x5da40000,0,0=0x5c070000,1,0,0x5c011940,1,0 -0x5c070000,1,0,0x5da40000,2,0=0x5c070000,1,0,0x5c011940,3,0 ;Continuation 0x5c011940,1,0,0x09000300,3,0=0x5c011940,1,0,0x5c010000,1,0 0x5c011940,3,0,0x09000300,3,0=0x5c011940,3,0,0x5c010000,3,0 @@ -273,17 +267,11 @@ 0x5c020100,3,1,0x5da40000,0,0=0x5c020000,3,0,0x5c021940,3,0 0x5c020100,1,0,0x5da40000,2,0=0x5c020000,1,0,0x5c021940,1,0 0x5c020100,3,1,0x5da40000,2,0=0x5c020000,3,0,0x5c021940,3,0 -0x5c080000,1,0,0x5da40000,0,0=0x5c080000,1,0,0x5c021940,1,0 -0x5c080000,3,1,0x5da40000,0,0=0x5c080000,3,1,0x5c021940,3,0 -0x5c080000,1,0,0x5da40000,2,0=0x5c080000,1,0,0x5c021940,1,0 -0x5c080000,3,1,0x5da40000,2,0=0x5c080000,3,1,0x5c021940,3,0 ; 0x5c020000,1,0,0x54001500,1,0=0x5c020000,1,0,0x5c021940,1,0 0x5c020000,3,0,0x54001500,3,0=0x5c020000,3,0,0x5c021940,3,0 0x5c020100,1,0,0x54001500,1,0=0x5c020000,1,0,0x5c021940,1,0 0x5c020100,3,1,0x54001500,3,0=0x5c020000,3,0,0x5c021940,3,0 -0x5c080000,1,0,0x54001500,1,0=0x5c080000,1,0,0x5c021940,1,0 -0x5c080000,3,1,0x54001500,3,0=0x5c080000,3,1,0x5c021940,3,0 ;Continuation 0x5c021940,1,0,0x04007300,1,1=0x5c021940,1,0,0x5c020000,1,0 0x5c021940,3,0,0x04007300,3,0=0x5c021940,3,0,0x5c020000,3,0 @@ -301,10 +289,6 @@ 0x5c030000,3,0,0x53010100,3,0=0x5c030000,3,0,0x5c031940,1,0 0x5c030000,1,0,0x53010100,1,0=0x5c030000,1,0,0x5c031940,3,0; conflicting-override 0x5c030000,3,0,0x53010100,3,0=0x5c030000,3,0,0x5c031940,3,0; conflicting-override -0x5c060100,1,0,0x5da40000,0,0=0x5c060100,1,0,0x5c031940,1,0 -0x5c060100,1,0,0x5da40000,2,0=0x5c060100,1,0,0x5c031940,3,0 -0x5c060100,1,0,0x53010100,1,0=0x5c060100,1,0,0x5c031940,1,0 -0x5c060100,1,0,0x53010100,1,0=0x5c060100,1,0,0x5c031940,3,0; conflicting-override 0x5c030100,1,0,0x5da40000,0,0=0x5c030000,1,0,0x5c031940,1,0 0x5c030100,1,0,0x5da40000,2,0=0x5c030000,1,0,0x5c031940,3,0 @@ -327,8 +311,6 @@ 0x5c040000,3,0,0x5da40000,2,0=0x5c040000,3,0,0x5c041940,3,0 0x5c040100,1,0,0x5da40000,0,0=0x5c040000,1,0,0x5c041940,1,0 0x5c040100,1,0,0x5da40000,2,0=0x5c040000,1,0,0x5c041940,3,0 -0x5c070100,1,0,0x5da40000,0,0=0x5c070100,1,0,0x5c041940,1,0 -0x5c070100,1,0,0x5da40000,2,0=0x5c070100,1,0,0x5c041940,3,0 ;Continuation 0x5c041940,1,0,0x09000300,3,0=0x5c041940,1,0,0x5c040000,1,0 0x5c041940,3,0,0x09000300,3,0=0x5c041940,3,0,0x5c040000,3,0 @@ -347,17 +329,11 @@ 0x5c050100,3,1,0x5da40000,0,0=0x5c050000,3,0,0x5c051940,3,0 0x5c050100,1,0,0x5da40000,2,0=0x5c050000,1,0,0x5c051940,1,0 0x5c050100,3,1,0x5da40000,2,0=0x5c050000,3,0,0x5c051940,3,0 -0x5c080100,1,0,0x5da40000,0,0=0x5c080100,1,0,0x5c051940,1,0 -0x5c080100,3,1,0x5da40000,0,0=0x5c080100,3,1,0x5c051940,3,0 -0x5c080100,1,0,0x5da40000,2,0=0x5c080100,1,0,0x5c051940,1,0 -0x5c080100,3,1,0x5da40000,2,0=0x5c080100,3,1,0x5c051940,3,0 ; 0x5c050000,1,0,0x54001500,1,0=0x5c050000,1,0,0x5c051940,1,0 0x5c050000,3,0,0x54001500,3,0=0x5c050000,3,0,0x5c051940,3,0 0x5c050100,1,0,0x54001500,1,0=0x5c050000,1,0,0x5c051940,1,0 0x5c050100,3,1,0x54001500,3,0=0x5c050000,3,0,0x5c051940,3,0 -0x5c080100,1,0,0x54001500,1,0=0x5c080100,1,0,0x5c051940,1,0 -0x5c080100,3,1,0x54001500,3,0=0x5c080100,3,1,0x5c051940,3,0 ;Continuation 0x5c051940,1,0,0x04007300,1,1=0x5c051940,1,0,0x5c050000,1,0 0x5c051940,3,0,0x04007300,3,0=0x5c051940,3,0,0x5c050000,3,0 From 3d9de099c4604caf5bc980c11d1a26a57ae2fc8f Mon Sep 17 00:00:00 2001 From: memo Date: Tue, 12 Aug 2025 17:19:38 +0200 Subject: [PATCH 5/6] add metarules for new viaduct OSTs --- .../Sec7h0_OnslopeMetaGenerated_MANAGED.txt | 42 +++++++++++++++++++ src/main/scala/module/onslope.scala | 30 ++++++++++++- 2 files changed, 70 insertions(+), 2 deletions(-) diff --git a/Controller/RUL2/07_RHW/Sec7h_Flex_Transition/Sec7h0_OnslopeMetaGenerated_MANAGED.txt b/Controller/RUL2/07_RHW/Sec7h_Flex_Transition/Sec7h0_OnslopeMetaGenerated_MANAGED.txt index 8b03f66a8..1210f4940 100644 --- a/Controller/RUL2/07_RHW/Sec7h_Flex_Transition/Sec7h0_OnslopeMetaGenerated_MANAGED.txt +++ b/Controller/RUL2/07_RHW/Sec7h_Flex_Transition/Sec7h0_OnslopeMetaGenerated_MANAGED.txt @@ -535,3 +535,45 @@ 0x57000000,3,0,0x57799100,1,0=0x57090000,1,0,0x57799100,1,0 0x57000000,3,0,0x57799100,3,1=0x57090000,3,0,0x57799100,3,1 0x57000000,1,0,0x57799100,3,1=0x57090000,3,0,0x57799100,3,1 +0x5C060000,1,0,0x00004B00,1,0=0x5C060000,1,0,0x5C000000,1,0 +0x5C060000,1,0,0x00004B00,3,0=0x5C060000,1,0,0x5C000000,3,0 +0x5C060100,1,0,0x00004B00,1,0=0x5C060100,1,0,0x5C030000,1,0 +0x5C060100,1,0,0x00004B00,3,0=0x5C060100,1,0,0x5C030000,3,0 +0x5C060010,1,0,0x00004B00,1,0=0x5C060010,1,0,0x5C030000,1,0 +0x5C060010,1,0,0x00004B00,3,0=0x5C060010,1,0,0x5C030000,3,0 +0x5C060000,1,0,0x5C030000,1,0=0x5C060010,1,0,0x5C030000,1,0 +0x5C060000,1,0,0x5C030000,3,0=0x5C060010,1,0,0x5C030000,3,0 +0x5C000000,1,0,0x5C060000,1,0=0x5C000000,1,0,0x5C060010,1,0 +0x5C000000,3,0,0x5C060000,1,0=0x5C000000,3,0,0x5C060010,1,0 +0x00004B00,1,0,0x5C060010,1,0=0x5C000000,1,0,0x5C060010,1,0 +0x00004B00,3,0,0x5C060010,1,0=0x5C000000,3,0,0x5C060010,1,0 +0x5C060010,1,0,0x5C000000,1,0=0x5C060010,1,0,0x5C030000,1,0 +0x5C060010,1,0,0x5C000000,3,0=0x5C060010,1,0,0x5C030000,3,0 +0x5C070000,1,0,0x09004B00,1,0=0x5C070000,1,0,0x5C010000,1,0 +0x5C070000,1,0,0x09004B00,3,0=0x5C070000,1,0,0x5C010000,3,0 +0x5C070100,1,0,0x09004B00,1,0=0x5C070100,1,0,0x5C040000,1,0 +0x5C070100,1,0,0x09004B00,3,0=0x5C070100,1,0,0x5C040000,3,0 +0x5C070010,1,0,0x09004B00,1,0=0x5C070010,1,0,0x5C040000,1,0 +0x5C070010,1,0,0x09004B00,3,0=0x5C070010,1,0,0x5C040000,3,0 +0x5C070000,1,0,0x5C040000,1,0=0x5C070010,1,0,0x5C040000,1,0 +0x5C070000,1,0,0x5C040000,3,0=0x5C070010,1,0,0x5C040000,3,0 +0x5C010000,1,0,0x5C070000,1,0=0x5C010000,1,0,0x5C070010,1,0 +0x5C010000,3,0,0x5C070000,1,0=0x5C010000,3,0,0x5C070010,1,0 +0x09004B00,1,0,0x5C070010,1,0=0x5C010000,1,0,0x5C070010,1,0 +0x09004B00,3,0,0x5C070010,1,0=0x5C010000,3,0,0x5C070010,1,0 +0x5C070010,1,0,0x5C010000,1,0=0x5C070010,1,0,0x5C040000,1,0 +0x5C070010,1,0,0x5C010000,3,0=0x5C070010,1,0,0x5C040000,3,0 +0x5C080000,1,0,0x04006100,1,0=0x5C080000,1,0,0x5C020000,1,0 +0x5C080000,3,1,0x04006100,3,0=0x5C080000,3,1,0x5C020000,3,0 +0x5C080100,1,0,0x04006100,1,0=0x5C080100,1,0,0x5C050000,1,0 +0x5C080100,3,1,0x04006100,3,0=0x5C080100,3,1,0x5C050000,3,0 +0x5C080010,1,0,0x04006100,1,0=0x5C080010,1,0,0x5C050000,1,0 +0x5C080010,3,1,0x04006100,3,0=0x5C080010,3,1,0x5C050000,3,0 +0x5C080000,1,0,0x5C050000,1,0=0x5C080010,1,0,0x5C050000,1,0 +0x5C080000,3,1,0x5C050000,3,0=0x5C080010,3,1,0x5C050000,3,0 +0x5C020000,1,0,0x5C080000,1,0=0x5C020000,1,0,0x5C080010,1,0 +0x5C020000,3,0,0x5C080000,3,1=0x5C020000,3,0,0x5C080010,3,1 +0x04006100,1,0,0x5C080010,1,0=0x5C020000,1,0,0x5C080010,1,0 +0x04006100,3,0,0x5C080010,3,1=0x5C020000,3,0,0x5C080010,3,1 +0x5C080010,1,0,0x5C020000,1,0=0x5C080010,1,0,0x5C050000,1,0 +0x5C080010,3,1,0x5C020000,3,0=0x5C080010,3,1,0x5C050000,3,0 diff --git a/src/main/scala/module/onslope.scala b/src/main/scala/module/onslope.scala index 1a7e62e2a..b9b7ddaa2 100644 --- a/src/main/scala/module/onslope.scala +++ b/src/main/scala/module/onslope.scala @@ -11,9 +11,9 @@ import RhwRuleGenerator.HeightLevel trait Onslope { this: RuleGenerator & Curve45Generator => def createOnslopeTransition(): Unit = { + // RHW OSTs val rhw2SlopeL1 = L1Rhw2~EC & Dirtroad~CW // IdTile(0x57700000,1,0, (Dirtroad~EC).symmetries) // direction East (upper) to West (lower) val rhw2SlopeL2 = L2Rhw2~EC & Dirtroad~CW // IdTile(0x57700100,1,0, (Dirtroad~EC).symmetries) // direction East (upper) to West (lower) - for (main <- RhwNetworks - Rhw10c if main.height == 0) { val maxHeight = if ((Mis + Rhw4 + Rhw6s).contains(main)) 4 else 2 val minHeight = if (main == Dirtroad) 1 else 0 // avoiding auto-L1Rhw2 and auto-L2Rhw2 @@ -32,6 +32,32 @@ trait Onslope { this: RuleGenerator & Curve45Generator => } } + // Viaduct OSTs + val viaductCombos = Seq( + (Road, L1Road), + (Road, L2Road), + (L1Road, L2Road), // NOTE will suffer from auto-L1 issues + (Onewayroad, L1Onewayroad), + (Onewayroad, L2Onewayroad), + (L1Onewayroad, L2Onewayroad), // NOTE will suffer from auto-L1 issues + (Avenue, L1Avenue), + (Avenue, L2Avenue), + (L1Avenue, L2Avenue), // NOTE will suffer from auto-L1 issues + ) + for ((lower, upper) <- viaductCombos) { + val onslope = upper~EC & lower~CW // direction East (upper) to West (lower) + Rules += onslope | (upper.base.get ~> upper)~EW // OST > upper + if (lower.height > 0) { + assert(lower.height == 1) + val baseOnslope = lower~EC & lower.base.get~CW + Rules += baseOnslope | upper~EW | onslope | % // OST < upper + Rules += lower~EW | baseOnslope | % | onslope // lower > OST + Rules += (lower.base.get ~> lower)~EW | onslope // lower < OST + // additionally attempt to raise auto-L1 to L2 + Rules += onslope | (lower ~> upper)~EW // OST > upper (from lower at L1) + } + } + createRules() } } @@ -44,7 +70,7 @@ class OnslopeGenerator(var context: RuleTransducer.Context) extends RuleGenerato // Compile individually with `sbt "runMain com.sc4nam.module.CompileOnslopeCode"`. object CompileOnslopeCode extends AbstractMain { - lazy val resolve: IdResolver = new MiscResolver orElse new flexfly.FlexFlyResolver orElse new RhwResolver orElse new NwmResolver + lazy val resolve: IdResolver = new MiscResolver orElse new flexfly.FlexFlyResolver orElse new RhwResolver orElse new NwmResolver orElse new ViaductResolver val generator = new OnslopeGenerator(_) lazy val file = new java.io.File("target/Sec7h0_OnslopeMetaGenerated_MANAGED.txt") } From 3d711f6f3fd2fba4803ea948d55bfa1f045cc9a7 Mon Sep 17 00:00:00 2001 From: memo Date: Tue, 12 Aug 2025 20:44:37 +0200 Subject: [PATCH 6/6] create unique viaduct OST preview models per network --- .../7000_Road_NWM/7F00_ElevatedViaducts.txt | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/Controller/RUL0/7000_Road_NWM/7F00_ElevatedViaducts.txt b/Controller/RUL0/7000_Road_NWM/7F00_ElevatedViaducts.txt index 0e940ccf0..76c3a4afb 100644 --- a/Controller/RUL0/7000_Road_NWM/7F00_ElevatedViaducts.txt +++ b/Controller/RUL0/7000_Road_NWM/7F00_ElevatedViaducts.txt @@ -1215,8 +1215,8 @@ CopyFrom = 0x77F12 [HighwayIntersectionInfo_0x00007F13] ;Added by memo 2023-07-09 ;Road FLEXSlope-L1 -Piece = 48.0, 0.0, 1, 0, 0x5700001f -PreviewEffect = preview_ost_orth_alt_flex_001 +Piece = 48.0, 0.0, 1, 0, 0x5c06000f +PreviewEffect = preview_ost_orth_flex_l1_road CellLayout=........ CellLayout=..zba..< @@ -1245,8 +1245,8 @@ Rotate = 1 ; ordinary orthogonal tile on one side adjacent to the On-Slope Transition which ; overall behaves more intuitively than the 0x00040004 tile. ; Moreover, the use of 00-flags on the sides makes it easier to bulldoze parallel OSTs. -Piece = -48.0, 0.0, 3, 0, 0x5700001f -PreviewEffect = preview_ost_orth_alt_flex_001 +Piece = -48.0, 0.0, 3, 0, 0x5c06000f +PreviewEffect = preview_ost_orth_flex_l1_road CellLayout=........ CellLayout=..ba.z.< @@ -1280,8 +1280,8 @@ CopyFrom = 0x37F13 [HighwayIntersectionInfo_0x00007F14] ;Added by memo 2023-07-09 ;Road FLEXSlope-L2 -Piece = 48.0, 0.0, 1, 0, 0x5700002f -PreviewEffect = preview_ost_orth_alt_flex_002 +Piece = 48.0, 0.0, 1, 0, 0x5c06010f +PreviewEffect = preview_ost_orth_flex_l2_road CellLayout=........ CellLayout=..zba..< @@ -1310,8 +1310,8 @@ Rotate = 1 ; ordinary orthogonal tile on one side adjacent to the On-Slope Transition which ; overall behaves more intuitively than the 0x00040004 tile. ; Moreover, the use of 00-flags on the sides makes it easier to bulldoze parallel OSTs. -Piece = -48.0, 0.0, 3, 0, 0x5700002f -PreviewEffect = preview_ost_orth_alt_flex_002 +Piece = -48.0, 0.0, 3, 0, 0x5c06010f +PreviewEffect = preview_ost_orth_flex_l2_road CellLayout=........ CellLayout=..ba.z.< @@ -1345,8 +1345,8 @@ CopyFrom = 0x37F14 [HighwayIntersectionInfo_0x00007F15] ;Added by memo 2023-07-09 ;OWR FLEXSlope-L1 -Piece = 48.0, 0.0, 1, 0, 0x5700001f -PreviewEffect = preview_ost_orth_alt_flex_001 +Piece = 48.0, 0.0, 1, 0, 0x5c07000f +PreviewEffect = preview_ost_orth_flex_l1_onewayroad CellLayout=........ CellLayout=..zba..< @@ -1375,8 +1375,8 @@ Rotate = 1 ; ordinary orthogonal tile on one side adjacent to the On-Slope Transition which ; overall behaves more intuitively than the 0x00040004 tile. ; Moreover, the use of 00-flags on the sides makes it easier to bulldoze parallel OSTs. -Piece = -48.0, 0.0, 3, 0, 0x5700001f -PreviewEffect = preview_ost_orth_alt_flex_001 +Piece = -48.0, 0.0, 3, 0, 0x5c07000f +PreviewEffect = preview_ost_orth_flex_l1_onewayroad CellLayout=........ CellLayout=..ba.z.< @@ -1410,8 +1410,8 @@ CopyFrom = 0x37F15 [HighwayIntersectionInfo_0x00007F16] ;Added by memo 2023-07-09 ;OWR FLEXSlope-L2 -Piece = 48.0, 0.0, 1, 0, 0x5700002f -PreviewEffect = preview_ost_orth_alt_flex_002 +Piece = 48.0, 0.0, 1, 0, 0x5c07010f +PreviewEffect = preview_ost_orth_flex_l2_onewayroad CellLayout=........ CellLayout=..zba..< @@ -1440,8 +1440,8 @@ Rotate = 1 ; ordinary orthogonal tile on one side adjacent to the On-Slope Transition which ; overall behaves more intuitively than the 0x00040004 tile. ; Moreover, the use of 00-flags on the sides makes it easier to bulldoze parallel OSTs. -Piece = -48.0, 0.0, 3, 0, 0x5700002f -PreviewEffect = preview_ost_orth_alt_flex_002 +Piece = -48.0, 0.0, 3, 0, 0x5c07010f +PreviewEffect = preview_ost_orth_flex_l2_onewayroad CellLayout=........ CellLayout=..ba.z.< @@ -1475,8 +1475,8 @@ CopyFrom = 0x37F16 [HighwayIntersectionInfo_0x00007F17] ;Added by memo 2023-07-03 ;Avenue FLEXSlope-L1 -Piece = 48.0, 0.0, 1, 0, 0x5700002f -PreviewEffect = preview_ost_orth_alt_flex_001 +Piece = 48.0, 0.0, 1, 0, 0x5c08000f +PreviewEffect = preview_ost_orth_flex_l1_avenue CellLayout=........ CellLayout=...DA... @@ -1508,8 +1508,8 @@ Rotate = 1 ; Having a dedicated 180-degree rotation has the advantage that we can use an ; ordinary orthogonal tile adjacent to the On-Slope Transition which overall ; behaves more intuitively than the 0x00040004 tile. -Piece = -48.0, 0.0, 3, 0, 0x5700002f -PreviewEffect = preview_ost_orth_alt_flex_001 +Piece = -48.0, 0.0, 3, 0, 0x5c08000f +PreviewEffect = preview_ost_orth_flex_l1_avenue CellLayout=........ CellLayout=..DA.b.< @@ -1547,8 +1547,8 @@ CopyFrom = 0x37F17 [HighwayIntersectionInfo_0x00007F18] ;Added by memo 2023-07-03 ;Avenue FLEXSlope-L2 -Piece = 48.0, 0.0, 1, 0, 0x5700002f -PreviewEffect = preview_ost_orth_alt_flex_002 +Piece = 48.0, 0.0, 1, 0, 0x5c08010f +PreviewEffect = preview_ost_orth_flex_l2_avenue CellLayout=........ CellLayout=...DA... @@ -1580,8 +1580,8 @@ Rotate = 1 ; Having a dedicated 180-degree rotation has the advantage that we can use an ; ordinary orthogonal tile adjacent to the On-Slope Transition which overall ; behaves more intuitively than the 0x00040004 tile. -Piece = -48.0, 0.0, 3, 0, 0x5700002f -PreviewEffect = preview_ost_orth_alt_flex_002 +Piece = -48.0, 0.0, 3, 0, 0x5c08010f +PreviewEffect = preview_ost_orth_flex_l2_avenue CellLayout=........ CellLayout=..DA.b.<