X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=tracks.dat;h=8a3c9ec0287185fbbc37c48be831c2e081eb71a9;hb=a72309e64614bb1e230f9842d94dc261be1301e6;hp=fac3dfc8e676375e1188d1c74377686ac8aed576;hpb=378f04522aa762729c0d5651fb60ad7e4d8ba9f3;p=r2c2.git

diff --git a/tracks.dat b/tracks.dat
index fac3dfc..8a3c9ec 100644
--- a/tracks.dat
+++ b/tracks.dat
@@ -4,9 +4,19 @@ scale 1 87;
 gauge 16.5;
 rail_profile
 {
-	point 0.5 0.0;
-	point 0.5 2.3;
-	point -0.5 2.3;
+	point 1.5 0.0;
+	smooth_point 1.5 0.3;
+	smooth_point 0.8 0.4;
+	smooth_point 0.8 1.4;
+	smooth_point 1.0 1.6;
+	smooth_point 1.0 2.1;
+	smooth_point 0.8 2.3;
+	smooth_point 0.2 2.3;
+	smooth_point 0.0 2.1;
+	smooth_point 0.0 1.6;
+	smooth_point 0.2 1.4;
+	smooth_point 0.2 0.4;
+	smooth_point -0.5 0.3;
 	point -0.5 0.0;
 };
 ballast_profile
@@ -17,6 +27,8 @@ ballast_profile
 	point -20.0 0.0;
 };
 
+track_technique "track.technique";
+
 // Straight
 
 track 24064
@@ -35,6 +47,7 @@ track 24071
 	{
 		length 70.8;
 	};
+	autofit_preference 0;
 };
 
 track 24077
@@ -44,6 +57,7 @@ track 24077
 	{
 		length 77.5;
 	};
+	autofit_preference 2;
 };
 
 track 24094
@@ -53,6 +67,7 @@ track 24094
 	{
 		length 94.2;
 	};
+	autofit_preference 2;
 };
 
 track 24172
@@ -62,6 +77,7 @@ track 24172
 	{
 		length 171.7;
 	};
+	autofit_preference 2;
 };
 
 track 24188
@@ -71,6 +87,7 @@ track 24188
 	{
 		length 188.3;
 	};
+	autofit_preference 2;
 };
 
 track 24229
@@ -91,6 +108,15 @@ track 24236
 	};
 };
 
+track 24360
+{
+	description "Straight, 360mm";
+	part
+	{
+		length 360;
+	};
+};
+
 // Curves, R1
 
 track 24107
@@ -231,20 +257,20 @@ track 24671
 	part
 	{
 		length 77.5;
-		path 1;
+		path 0;
 	};
 	part
 	{
 		start 77.5 0 0;
 		length 30;
 		radius 360;
-		path 1;
+		path 0;
 	};
 	part
 	{
 		length 30;
 		radius 360;
-		path 0;
+		path 1;
 	};
 };
 
@@ -254,20 +280,20 @@ track 24672
 	part
 	{
 		length 77.5;
-		path 1;
+		path 0;
 	};
 	part
 	{
 		start 77.5 0 0;
 		length 30;
 		radius -360;
-		path 1;
+		path 0;
 	};
 	part
 	{
 		length 30;
 		radius -360;
-		path 0;
+		path 1;
 	};
 };
 
@@ -279,13 +305,13 @@ track 24611
 	part
 	{
 		length 188.3;
-		path 1;
+		path 0;
 	};
 	part
 	{
 		length 24.3;
 		radius 437.5;
-		path 0;
+		path 1;
 	};
 };
 
@@ -295,24 +321,23 @@ track 24612
 	part
 	{
 		length 188.3;
-		path 1;
+		path 0;
 	};
 	part
 	{
 		length 24.3;
 		radius -437.5;
-		path 0;
+		path 1;
 	};
 };
 
 track 24630
 {
 	description "Turnout, 3-way";
-	double_address true;
 	part
 	{
 		length 188.3;
-		path 3;
+		path 0;
 	};
 	part
 	{
@@ -331,29 +356,30 @@ track 24630
 track 24624
 {
 	description "Turnout, double slip";
+	state_bits 1;
 	part
 	{
 		length 188.3;
-		path 3;
+		path 0;
 	};
 	part
 	{
 		length 24.3;
 		radius -437.5;
-		path 2;
+		path 1;
 	};
 	part
 	{
 		start 8.34 38.74 -24.3;
 		length 188.3;
-		path 1;
+		path 2;
 	};
 	part
 	{
 		start 8.34 38.74 -24.3;
 		length 24.3;
 		radius 437.5;
-		path 0;
+		path 3;
 	};
 };
 
@@ -365,13 +391,13 @@ track 24711
 	part
 	{
 		length 236.1;
-		path 1;
+		path 0;
 	};
 	part
 	{
 		length 12.1;
 		radius 1114.6;
-		path 0;
+		path 1;
 	};
 };
 
@@ -381,13 +407,13 @@ track 24712
 	part
 	{
 		length 236.1;
-		path 1;
+		path 0;
 	};
 	part
 	{
 		length 12.1;
 		radius -1114.6;
-		path 0;
+		path 1;
 	};
 };
 
@@ -440,6 +466,7 @@ track 24740
 track 24977
 {
 	description "Bumper";
+	object "bumper.object";
 	part
 	{
 		length 77.5;
@@ -611,4 +638,9 @@ layout
 		position -0.112537 0.138174 0;
 		rotation 1.5708;
 	};
+	track 24360
+	{
+		position -0.542646 -0.0794758 0;
+		rotation 1.5708;
+	};
 };