Merge branch 'staging' into street-sam-revisions-v50

Author: clarencechen

Controller/RUL0/4000_RAM/4000_STR.txt

@@ -21,8 +21,8 @@ AddTypes     = 400B, 1400B, 2400B, 3400B, 4400B, 5400B, 6400B, 7400B ;Diagonal S
 AddTypes     = 400C, 1400C, 2400C, 3400C, 4400C, 5400C, 6400C, 7400C ;Diagonal Dual Rail to Ortho STR Switch
 AddTypes     = 400D, 1400D, 2400D, 3400D, 4400D, 5400D, 6400D, 7400D ;Diagonal S-Curve STR
 AddTypes     = 400E, 1400E, 2400E, 3400E, 4400E, 5400E, 6400E, 7400E ;FARR-STR Crossover ;moved from FARR button by ebina 06172009
-Addtypes     = 400F, 1400F, 2400F, 3400F, 4400F, 5400F, 6400F, 7400F ;Filler Straight Piece (1x1)
-Addtypes     = 4010, 14010, 24010, 34010, 44010, 54010, 64010, 74010 ;Filler Diagonal Piece (1x1)
+AddTypes     = 400F, 1400F, 2400F, 3400F, 4400F, 5400F, 6400F, 7400F ;Filler Straight Piece (1x1)
+AddTypes     = 4010, 14010, 24010, 34010, 44010, 54010, 64010, 74010 ;Filler Diagonal Piece (1x1)
 AddTypes     = 4011, 14011, 24011, 34011, 44011, 54011, 64011, 74011 ;Double Track to STR Long Transition;;;placed here by dedgren 090214 in order to move to later in menu
 AddTypes     = 4012, 14012, 24012, 34012, 44012, 54012, 64012, 74012 ;Double Track to STR Short Transition;;;added by dedgren 090214
 ;AddTypes     = 4013, 14013, 24013, 34013, 44013, 54013, 64013, 74013

Controller/RUL0/5000_RHW/5400_Cosmetics/5400_1TileCPs.txt

@@ -164,7 +164,7 @@ ConsLayout =.........
 ConsLayout =...^.....
 
 AutoTileBase=	0x57C00020
-ReplacementIntersecti0on = 0, 0
+ReplacementIntersection = 0, 0
 PlaceQueryID =0x57C00020
 Costs = 15;
 

Controller/RUL0/5000_RHW/5AF3_FlexFly.txt

@@ -184,8 +184,8 @@ CopyFrom=0x5AF5
 Rotate=3
 
 [HighwayIntersectionInfo_0x00045AF5]
-Added by Jondor 09/30/11
-MIS (0M) FLEXCurve A2
+;Added by Jondor 09/30/11
+;MIS (0M) FLEXCurve A2
 Piece = 32.0, -32.0, 0, 0, 0x5CA61005
 PreviewEffect = preview_emis00wrc90flyovr01
 

Controller/RUL0/5000_RHW/5F00_FARHW/5F20_FARHW_Curves.txt

@@ -749,7 +749,7 @@ CopyFrom = 0x45F54
 Rotate = 3
 
 [HighwayIntersectionInfo_0x00085F54]
-MandelSoft 05/20/2013
+;MandelSoft 05/20/2013
 ;FARHW-6S to Diag Curve Inner
 Piece = 0.0, 0.0, 0, 0, 0x5e150525
 PreviewEffect = preview_farhw6_diagc_inner_001

Controller/RUL0/7000_Road_NWM/7800_RoadxRHW.txt

@@ -1397,7 +1397,7 @@ ConsLayout =....+...<
 ConsLayout =....^....
 
 AutoTileBase=	0x53e6a600
-ReplacementIntersection0 = 0, 0
+ReplacementIntersection = 0, 0
 PlaceQueryID = 0x53e6a600
 Costs       = 50
 [HighwayIntersectionInfo_0x00017816]
@@ -1427,7 +1427,7 @@ ConsLayout =....+...<
 ConsLayout =....^....
 
 AutoTileBase=	0x53e6a000
-ReplacementIntersection0 = 0, 0
+ReplacementIntersection = 0, 0
 PlaceQueryID = 0x53e6a000
 Costs       = 50
 [HighwayIntersectionInfo_0x00057816]
@@ -1451,7 +1451,7 @@ ConsLayout =....+...<
 ConsLayout =....^....
 
 AutoTileBase=	0x53e6a100
-ReplacementIntersection0 = 0, 0
+ReplacementIntersection = 0, 0
 PlaceQueryID = 0x53e6a100
 Costs       = 50
 [HighwayIntersectionInfo_0x00077816]
@@ -1485,7 +1485,7 @@ ConsLayout =....+....
 ConsLayout =....^....
 
 AutoTileBase=	0x53e6a300
-ReplacementIntersection0 = 0, 0
+ReplacementIntersection = 0, 0
 PlaceQueryID = 0x53e6a300
 Costs       = 50
 [HighwayIntersectionInfo_0x000B7816]
@@ -1521,7 +1521,7 @@ ConsLayout =....+....
 ConsLayout =....^....
 
 AutoTileBase=	0x53e6a200
-ReplacementIntersection0 = 0, 0
+ReplacementIntersection = 0, 0
 PlaceQueryID = 0x53e6a200
 Costs       = 50
 [HighwayIntersectionInfo_0x00017817]
@@ -1554,7 +1554,7 @@ ConsLayout =....+....
 ConsLayout =....^....
 
 AutoTileBase=	0x53e6a400
-ReplacementIntersection0 = 0, 0
+ReplacementIntersection = 0, 0
 PlaceQueryID = 0x53e6a400
 Costs       = 50
 [HighwayIntersectionInfo_0x00057817]
@@ -1586,7 +1586,7 @@ ConsLayout =....+....
 ConsLayout =....^....
 
 AutoTileBase=	0x53e6a500
-ReplacementIntersection0 = 0, 0
+ReplacementIntersection = 0, 0
 PlaceQueryID = 0x53e6a500
 Costs       = 50
 [HighwayIntersectionInfo_0x00097817]