Merge pull request #477 from NAMTeam/nwm-t-ints

Integration of NWM Diagonal T-Ints, additional Maxis T-Ints, and NRD-4 Diagonal Starters
NAMTeam · May 2, 2024 · f97388c · f97388c
2 parents 58fdf98 + 1c1b595
commit f97388c
Show file tree

Hide file tree

Showing 18 changed files with 8,483 additions and 108 deletions.
diff --git a/Controller/RUL0/7000_Road_NWM/7A00_NWM/7B00_Starters.txt b/Controller/RUL0/7000_Road_NWM/7A00_NWM/7B00_Starters.txt
@@ -550,22 +550,49 @@ CopyFrom    = 0x17B05
 CopyFrom    = 0x27B05
 [HighwayIntersectionInfo_0x00077B05]
 CopyFrom    = 0x37B05
+
+
 [HighwayIntersectionInfo_0x00087B05]
-CopyFrom    = 0x7B05
+;Added by Tarkus 2024/03/16.
+;modified by memo 01/17/2013 for use with Vanishing Construction Lot
+;NRD-4 Diagonal Starter Piece
+Piece = 0.0, -16.0, 2, 0, 0x5135F105
+PreviewEffect = preview_draggable_nrd4__002
+
+CellLayout =.......
+CellLayout =...a...
+CellLayout =...Z<..
+CellLayout =...^...
+
+CheckType = Z - road: 0x00000301
+CheckType = a - road: 0x03010000 onewayroad: 0x02020400, 0xffffffff optional
+
+ConsLayout =........
+ConsLayout =...+...<
+ConsLayout =........
+ConsLayout =...^....
+
+AutoTileBase = 0x55387000		; former 0x5135F100
+ReplacementIntersection = 0, 0
+PlaceQueryID = 0x5135F100
+Costs       = 8
 [HighwayIntersectionInfo_0x00097B05]
-CopyFrom    = 0x17B05
+CopyFrom    = 0x87B05
+Rotate = 1
 [HighwayIntersectionInfo_0x000A7B05]
-CopyFrom    = 0x27B05
+CopyFrom    = 0x87B05
+Rotate = 2
 [HighwayIntersectionInfo_0x000B7B05]
-CopyFrom    = 0x37B05
+CopyFrom    = 0x87B05
+Rotate = 3
 [HighwayIntersectionInfo_0x000C7B05]
-CopyFrom    = 0x7B05
+CopyFrom    = 0x87B05
 [HighwayIntersectionInfo_0x000D7B05]
-CopyFrom    = 0x17B05
+CopyFrom    = 0x97B05
 [HighwayIntersectionInfo_0x000E7B05]
-CopyFrom    = 0x27B05
+CopyFrom    = 0xA7B05
 [HighwayIntersectionInfo_0x000F7B05]
-CopyFrom    = 0x37B05
+CopyFrom    = 0xB7B05
 
 
 

diff --git a/Controller/RUL1/01_Road/05_Road_Avenue.txt b/Controller/RUL1/01_Road/05_Road_Avenue.txt
@@ -250,6 +250,16 @@ TYPE1=0x02020202,0x04000004,0x5F072500,0,0
 TYPE2=0x02020202,0x00000404,0x5F072500,1,0
 TYPE3=0x02020202,0x00040400,0x5F072500,2,0
 TYPE3=0x02020202,0x04040000,0x5F072500,3,0
+; diagonal Road ending at Diagonal Avenue (Short)
+;added by Tarkus 20240219
+TYPE1=0x03000000,0x00030100,0x5F077400,3,0
+TYPE2=0x00000003,0x03010000,0x5F077400,0,0
+TYPE3=0x00000300,0x01000003,0x5F077400,1,0
+TYPE4=0x00030000,0x00000301,0x5F077400,2,0
+TYPE5=0x01000000,0x00000301,0x5F077400,3,1
+TYPE6=0x00000001,0x00030100,0x5F077400,2,1
+TYPE7=0x00000100,0x03010000,0x5F077400,1,1
+TYPE8=0x00010000,0x01000003,0x5F077400,0,1
 ;road orthogonal one side, avenue diagonal
 TYPE0=0x02000000,0x00000301,0x5F077800,0,0
 TYPE1=0x00000002,0x00030100,0x5F077800,1,0

diff --git a/Controller/RUL1/01_Road/08_Road_OneWayRoad.txt b/Controller/RUL1/01_Road/08_Road_OneWayRoad.txt
@@ -35,14 +35,14 @@ TYPE8=0x03010000,0x00030100,0x09700700,1,1
 ;
 ;piece 38
 ;
-TYPE1=0x00030100,0x03000000,0x09703800,0,0
-TYPE2=0x03010000,0x00000003,0x09703800,1,0
-TYPE3=0x01000003,0x00000300,0x09703800,2,0
-TYPE4=0x00000301,0x00030000,0x09703800,3,0
-TYPE5=0x00000301,0x01000000,0x09703800,0,1
-TYPE6=0x00030100,0x00000001,0x09703800,3,1
-TYPE7=0x03010000,0x00000100,0x09703800,2,1
-TYPE8=0x01000003,0x00010000,0x09703800,1,1
+TYPE1=0x00030100,0x03000000,0x09802e00,2,1
+TYPE2=0x03010000,0x00000003,0x09802e00,1,1
+TYPE3=0x01000003,0x00000300,0x09802e00,0,1
+TYPE4=0x00000301,0x00030000,0x09802e00,3,1
+TYPE5=0x00000301,0x01000000,0x09802e00,2,0
+TYPE6=0x00030100,0x00000001,0x09802e00,3,0
+TYPE7=0x03010000,0x00000100,0x09802e00,0,0
+TYPE8=0x01000003,0x00010000,0x09802e00,1,0
 ;
 ;piece 2e
 ;
@@ -354,6 +354,12 @@ TYPE4=0x00030100,0x00020200,0x51010200,3,0
 ;TYPE6=0x00000301,0x00000202,0x51010200,3,1
 ;TYPE7=0x00030100,0x00020200,0x51010200,2,1
 ;TYPE8=0x03010000,0x02020000,0x51010200,1,1
+
+;--draggable Diagonal NRD-4--
+TYPE1=0x03010000,0x02020400,0x51050200,0,0
+TYPE2=0x01000003,0x02040002,0x51050200,1,0
+TYPE3=0x00000301,0x04000202,0x51050200,2,0
+TYPE4=0x00030100,0x00020204,0x51050200,3,0
 ;
 ;--NWM TLA-7/AVE-6 Outer-Starter--
 ;was formerly NWM Road +1-Starter

diff --git a/Controller/RUL1/05_Avenue/08_Avenue_OneWayRoad.txt b/Controller/RUL1/05_Avenue/08_Avenue_OneWayRoad.txt
@@ -296,18 +296,26 @@ TYPE5=0x03010000,0x00000002,0x5F977800,3,1
 TYPE6=0x01000003,0x00000200,0x5F977800,2,1
 TYPE7=0x00000301,0x00020000,0x5F977800,1,1
 
+; diagonal OneWayRoad ending at Diagonal Avenue (Short)
+;added by Tarkus 20240219
+TYPE1=0x00030100,0x03000000,0x5F977400,3,0
+TYPE2=0x03010000,0x00000003,0x5F977400,0,0
+TYPE3=0x01000003,0x00000300,0x5F977400,1,0
+TYPE4=0x00000301,0x00030000,0x5F977400,2,0
+TYPE5=0x00000301,0x01000000,0x5F977400,3,1
+TYPE6=0x00030100,0x00000001,0x5F977400,2,1
+TYPE7=0x03010000,0x00000100,0x5F977400,1,1
+TYPE8=0x01000003,0x00010000,0x5F977400,0,1
 
-
-;old redundant code, possbily to be deleted.
 ;Diagonal Avenue dead ending into Straight OneWayRoad
-;TYPE1=0x03000001,0x02000200,0x5F04BD00,0,0
-;TYPE2=0x01030000,0x02000200,0x5F04BD00,0,1
-;TYPE3=0x00000103,0x00020002,0x5F04BD00,1,0
-;TYPE4=0x00010300,0x00020002,0x5F04BD00,1,1
-;TYPE5=0x00010300,0x02000200,0x5F04BD00,2,0
-;TYPE6=0x00000103,0x02000200,0x5F04BD00,2,1
-;TYPE7=0x01030000,0x00020002,0x5F04BD00,3,0
-;TYPE8=0x03000001,0x00020002,0x5F04BD00,3,1
+TYPE1=0x03000001,0x02000200,0x5F971F00,0,0
+TYPE2=0x01030000,0x02000200,0x5F971F00,0,1
+TYPE3=0x00000103,0x00020002,0x5F971F00,1,0
+TYPE4=0x00010300,0x00020002,0x5F971F00,1,1
+TYPE5=0x00010300,0x02000200,0x5F971F00,2,0
+TYPE6=0x00000103,0x02000200,0x5F971F00,2,1
+TYPE7=0x01030000,0x00020002,0x5F971F00,3,0
+TYPE8=0x03000001,0x00020002,0x5F971F00,3,1
 ;
 ;
 ;
@@ -321,6 +329,25 @@ TYPE4=0x02040200,0x00000100,0x5F940100,0,1
 TYPE5=0x04020002,0x00010000,0x5F940100,3,1
 TYPE6=0x02000204,0x01000000,0x5F940100,2,1
 TYPE7=0x00020402,0x00000001,0x5F940100,1,1
+;Added by Tarkus 20240123
+;avenue orthogonal dead ending into road diagonal
+TYPE0=0x04000002,0x01000003,0x5F977900,0,0
+TYPE1=0x00000204,0x00000301,0x5F977900,1,0
+TYPE2=0x00020400,0x00030100,0x5F977900,2,0
+TYPE3=0x02040000,0x03010000,0x5F977900,3,0
+TYPE4=0x04020000,0x03010000,0x5F977900,0,1
+TYPE5=0x02000004,0x01000003,0x5F977900,3,1
+TYPE6=0x00000402,0x00000301,0x5F977900,2,1
+TYPE7=0x00040200,0x00030100,0x5F977900,1,1
+;
+TYPE0=0x00000402,0x00030100,0x5F977A00,0,0
+TYPE1=0x00040200,0x03010000,0x5F977A00,1,0
+TYPE2=0x04020000,0x01000003,0x5F977A00,2,0
+TYPE3=0x02000004,0x00000301,0x5F977A00,3,0
+TYPE4=0x00020400,0x00000301,0x5F977A00,0,1
+TYPE5=0x02040000,0x00030100,0x5F977A00,3,1
+TYPE6=0x04000002,0x03010000,0x5F977A00,2,1
+TYPE7=0x00000204,0x01000003,0x5F977A00,1,1
 ;
 ;
 ;Added 030611 ~ memo

diff --git a/Controller/RUL2/01_Maxis_Misc/Sec1a_Maxis.txt b/Controller/RUL2/01_Maxis_Misc/Sec1a_Maxis.txt
@@ -599,6 +599,10 @@
 ;overrides for T avenue road intersections
 0x04023900,0,0,0x00000a00,2,0=0x04023900,0,0,0x00051100,2,0
 0x04023900,3,0,0x00000a00,1,0=0x04023900,3,0,0x00051100,0,1
+
+;overrides for T avenue onewayroad intersections
+0x091a3900,0,0,0x09000a00,2,0=0x091a3900,0,0,0x09051100,2,0
+0x091a3900,3,0,0x09000a00,1,0=0x091a3900,3,0,0x09051100,0,1
 ;
 ;overrides for T avenue one-way road intersections
 0x091a3900,0,0,0x09000a00,2,0=0x091a3900,0,0,0x04003500,0,1
@@ -1447,6 +1451,13 @@
 0x00004b00,3,0,0x5F471F00,3,0=0x5F472300,3,0,0x5F471F00,3,0
 0x00004b00,1,0,0x5F471F00,1,1=0x5F472300,1,1,0x5F471F00,1,1
 0x00004b00,3,0,0x5F471F00,1,1=0x5F472300,1,1,0x5F471F00,1,1
+;avenue diagonal dead ending into orthogonal onewayroad
+0x091a5700,3,0,0x5F971F00,1,0=0x5F971D00,1,0,0x5F971F00,1,0
+0x091a5700,1,1,0x5F971F00,3,1=0x5F971D00,3,1,0x5F971F00,3,1
+0x09004b00,1,0,0x5F971F00,3,0=0x5F971E00,3,0,0x5F971F00,3,0
+0x09004b00,3,0,0x5F971F00,3,0=0x5F971E00,3,0,0x5F971F00,3,0
+0x09004b00,1,0,0x5F971F00,1,1=0x5F971E00,1,1,0x5F971F00,1,1
+0x09004b00,3,0,0x5F971F00,1,1=0x5F971E00,1,1,0x5F971F00,1,1
 
 ;avenue curve near diagonalxdiagonal avenue bugfix
 0x04003800,1,0,0x04007700,1,0=0x04007900,1,0,0x04007700,1,0

diff --git a/Controller/RUL2/01_Maxis_Misc/Sec1e_Rd_Misc.txt b/Controller/RUL2/01_Maxis_Misc/Sec1e_Rd_Misc.txt
@@ -58,6 +58,22 @@
 0x09003900,1,0,0x09003c00,1,0=0x09003a00,1,0,0x09003c00,1,0
 0x09003900,3,1,0x09003c00,3,1=0x09003a00,3,1,0x09003c00,3,1
 
+;Road Diag (Thru) x Avenue Orth (End)
+0x5F077900,2,0,0x04001300,1,0=0x5F077900,2,0,0x5F077B00,2,0
+0x5F077900,0,1,0x04001300,3,1=0x5F077900,0,1,0x5F077B00,0,1
+;
+0x5F077A00,0,0,0x00000a00,1,0=0x5F077A00,0,0,0x5F077C00,0,0
+0x5F077A00,2,1,0x00000a00,2,0=0x5F077A00,2,1,0x5F077C00,2,1
+
+;One-Way Road Diag (Thru) x Avenue Orth (End)
+0x5F977900,2,0,0x091a1300,1,0=0x5F977900,2,0,0x5F977B00,2,0
+0x5F977900,0,1,0x091a1300,3,1=0x5F977900,0,1,0x5F977B00,0,1
+;
+0x5F977A00,0,0,0x09000a00,1,0=0x5F977A00,0,0,0x5F977C00,0,0
+0x5F977A00,2,1,0x09000a00,2,0=0x5F977A00,2,1,0x5F977C00,2,1
+
+
+
 ;DxD
 ;Road x Road
 0x00002e00,0,0,0x00000a00,2,0=0x00002e00,0,0,0x00002f00,0,0
@@ -71,6 +87,11 @@
 0x09000a00,0,0,0x09702e00,2,0=0x09702f00,2,0,0x09702e00,2,0
 0x09000a00,3,0,0x09702e00,0,1=0x09702f00,0,1,0x09702e00,0,1
 
+0x09802e00,0,0,0x00000a00,2,0=0x09802e00,0,0,0x09802f00,0,0
+0x09802e00,2,1,0x00000a00,1,0=0x09802e00,2,1,0x09802f00,2,1
+0x00000a00,0,0,0x09802e00,2,0=0x09802f00,2,0,0x09802e00,2,0
+0x00000a00,3,0,0x09802e00,0,1=0x09802f00,0,1,0x09802e00,0,1
+
 0x09703800,2,1,0x00000a00,2,0=0x09802e00,0,0,0x09802f00,0,0
 0x09703800,0,0,0x00000a00,1,0=0x09802e00,2,1,0x09802f00,2,1
 0x00000a00,0,0,0x09703800,0,1=0x09802f00,2,0,0x09802e00,2,0

diff --git a/Controller/RUL2/01_Maxis_Misc/Sec1f_Avenue_Misc.txt b/Controller/RUL2/01_Maxis_Misc/Sec1f_Avenue_Misc.txt
@@ -35,4 +35,20 @@
   ; row 0 from row 1
   0x5f47f400,1,0,0x00000a00,2,0=0x5f47f400,1,0,0x5f47f300,1,0
     ; mirror
-    0x5f47f400,3,1,0x00000a00,1,0=0x5f47f400,3,1,0x5f47f300,3,1
+    0x5f47f400,3,1,0x00000a00,1,0=0x5f47f400,3,1,0x5f47f300,3,1
+
+;----Diagonal Road x Orth Avenue-Short Fix----
+0x00000A00,3,0,0x5F473200,3,0=0x00000C00,3,0,0x5F473200,3,0
+0x00000A00,0,0,0x5F473200,1,1=0x00000C00,1,1,0x5F473200,1,1
+
+;----Diagonal Road x Diag Avenue-Short Fix (T74)----
+0x5F077400,3,0,0x04003800,0,0=0x5F077400,3,0,0x5F077409,0,0
+0x5F077400,1,1,0x04003800,1,0=0x5F077400,1,1,0x5F077409,2,1
+0x5F077400,3,0,0x04003800,2,0=0x5F077400,3,0,0x5F077409,0,0
+0x5F077400,1,1,0x04003800,3,0=0x5F077400,1,1,0x5F077409,2,1
+
+;----Diagonal One-Way Road x Diag Avenue-Short Fix (T74)----
+0x5F977400,3,0,0x04003800,0,0=0x5F977400,3,0,0x5F977409,0,0
+0x5F977400,1,1,0x04003800,1,0=0x5F977400,1,1,0x5F977409,2,1
+0x5F977400,3,0,0x04003800,2,0=0x5F977400,3,0,0x5F977409,0,0
+0x5F977400,1,1,0x04003800,3,0=0x5F977400,1,1,0x5F977409,2,1