X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=tracks.dat;h=33f53ab6cd7bc34449f3961e44e7cf8f9cbbdffb;hb=54392d65e2053d1eacb4cfcc435f1013993f2973;hp=dafc85ba0dae18a7ddf22e42107b7c9d6a8bf8dd;hpb=651698847d5293cfb15b6fb23a394701388c0151;p=r2c2.git

diff --git a/tracks.dat b/tracks.dat
index dafc85b..33f53ab 100644
--- a/tracks.dat
+++ b/tracks.dat
@@ -1,12 +1,20 @@
-/* $Id$ */
-
 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 +25,8 @@ ballast_profile
 	point -20.0 0.0;
 };
 
+track_technique "track.technique";
+
 // Straight
 
 track 24064
@@ -35,6 +45,7 @@ track 24071
 	{
 		length 70.8;
 	};
+	autofit_preference 0;
 };
 
 track 24077
@@ -44,6 +55,7 @@ track 24077
 	{
 		length 77.5;
 	};
+	autofit_preference 2;
 };
 
 track 24094
@@ -53,6 +65,7 @@ track 24094
 	{
 		length 94.2;
 	};
+	autofit_preference 2;
 };
 
 track 24172
@@ -62,6 +75,7 @@ track 24172
 	{
 		length 171.7;
 	};
+	autofit_preference 2;
 };
 
 track 24188
@@ -71,6 +85,7 @@ track 24188
 	{
 		length 188.3;
 	};
+	autofit_preference 2;
 };
 
 track 24229
@@ -91,6 +106,15 @@ track 24236
 	};
 };
 
+track 24360
+{
+	description "Straight, 360mm";
+	part
+	{
+		length 360;
+	};
+};
+
 // Curves, R1
 
 track 24107
@@ -231,20 +255,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 +278,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 +303,13 @@ track 24611
 	part
 	{
 		length 188.3;
-		path 1;
+		path 0;
 	};
 	part
 	{
 		length 24.3;
 		radius 437.5;
-		path 0;
+		path 1;
 	};
 };
 
@@ -295,13 +319,13 @@ track 24612
 	part
 	{
 		length 188.3;
-		path 1;
+		path 0;
 	};
 	part
 	{
 		length 24.3;
 		radius -437.5;
-		path 0;
+		path 1;
 	};
 };
 
@@ -311,7 +335,7 @@ track 24630
 	part
 	{
 		length 188.3;
-		path 3;
+		path 0;
 	};
 	part
 	{
@@ -330,29 +354,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;
 	};
 };
 
@@ -364,13 +389,13 @@ track 24711
 	part
 	{
 		length 236.1;
-		path 1;
+		path 0;
 	};
 	part
 	{
 		length 12.1;
 		radius 1114.6;
-		path 0;
+		path 1;
 	};
 };
 
@@ -380,13 +405,13 @@ track 24712
 	part
 	{
 		length 236.1;
-		path 1;
+		path 0;
 	};
 	part
 	{
 		length 12.1;
 		radius -1114.6;
-		path 0;
+		path 1;
 	};
 };
 
@@ -439,13 +464,31 @@ track 24740
 track 24977
 {
 	description "Bumper";
+	object "bumper.object";
 	part
 	{
-		length 94.2;
+		length 77.5;
 		dead_end true;
 	};
 };
 
+// Signals
+
+signal \7039
+{
+	indication "Hp1"
+	{
+		aspect 0;
+		free_blocks 1;
+	};
+	indication "Hp0"
+	{
+		aspect 1;
+		free_blocks 0;
+	};
+	object "homesignal.object";
+};
+
 // Layout for selecting tracks
 
 layout
@@ -610,4 +653,14 @@ layout
 		position -0.112537 0.138174 0;
 		rotation 1.5708;
 	};
+	track 24360
+	{
+		position -0.542646 -0.0794758 0;
+		rotation 1.5708;
+	};
+	signal \7039
+	{
+		position -0.5020055 0.3153508 0.000000;
+		rotation 1.570800;
+	};
 };