X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=tracks.dat;h=414329a78fc920cce049f9257c77a8c70583988b;hb=e621dd4120cb253417167b4295e436cee095ccb0;hp=7b7ba57dcc44b77385cba5700cda5b168aaa41d0;hpb=7e382cc3cad8c4f6945b0c9d89e2ca917b42b740;p=r2c2.git

diff --git a/tracks.dat b/tracks.dat
index 7b7ba57..414329a 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
@@ -30,11 +40,12 @@ track 24064
 
 track 24071
 {
-	description "Straight, 70.3mm (for slim turnouts)";
+	description "Straight, 70.8mm (for slim turnouts)";
 	part
 	{
 		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
@@ -317,19 +341,20 @@ track 24630
 	{
 		length 24.3;
 		radius 437.5;
-		path 1;
+		path 2;
 	};
 	part
 	{
 		length 24.3;
 		radius -437.5;
-		path 2;
+		path 1;
 	};
 };
 
 track 24624
 {
 	description "Turnout, double slip";
+	state_bits 1;
 	part
 	{
 		length 188.3;
@@ -439,10 +464,198 @@ 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
+{
+	track 24115
+	{
+		position 0.0806517 0.139002 0;
+		rotation 2.22529;
+	};
+	track 24612
+	{
+		position -0.310086 -0.38055 0;
+		rotation 1.5708;
+	};
+	track 24172
+	{
+		position -0.232565 -0.0797749 0;
+		rotation 1.5708;
+	};
+	track 24611
+	{
+		position -0.387608 -0.380475 0;
+		rotation 1.5708;
+	};
+	track 24130
+	{
+		position 0.155044 -0.08015 0;
+		rotation 1.5708;
+	};
+	track 24230
+	{
+		position 0.232566 -0.0802249 0;
+		rotation 1.5708;
+	};
+	track 24107
+	{
+		position -0.0249545 0.231617 0;
+		rotation 2.61799;
+	};
+	track 24224
+	{
+		position -0.465131 -0.38055 0;
+		rotation 1.5708;
+	};
+	track 24330
+	{
+		position 0.310088 -0.0803 0;
+		rotation 1.5708;
+	};
+	track 24215
+	{
+		position 0.142158 0.186105 0;
+		rotation 2.2253;
+	};
+	track 24207
+	{
+		position 0.0138165 0.298658 0;
+		rotation 2.61799;
+	};
+	track 24711
+	{
+		position 0.374455 -0.381008 0;
+		rotation 1.5708;
+	};
+	track 24530
+	{
+		position 0.438821 -0.0809179 0;
+		rotation 1.5708;
+	};
+	track 24430
+	{
+		position 0.374455 -0.080609 0;
+		rotation 1.5708;
+	};
+	track 24630
+	{
+		position -0.19005 -0.380551 0;
+		rotation 1.5708;
+	};
+	track 24712
+	{
+		position 0.438821 -0.381316 0;
+		rotation 1.5708;
+	};
+	track 24624
+	{
+		position -0.0775215 -0.380625 0;
+		rotation 1.5708;
+	};
+	track 24640
+	{
+		position -0.232565 0.185972 0;
+		rotation 1.5708;
+	};
+	track 24671
+	{
+		position 0.0775225 -0.380624 0;
+		rotation 1.5708;
+	};
+	track 24977
+	{
+		position -0.465131 0.186196 0;
+		rotation 1.5708;
+	};
+	track 24672
+	{
+		position 0.155044 -0.380699 0;
+		rotation 1.5708;
+	};
+	track 24649
+	{
+		position -0.348827 0.194312 0;
+		rotation 1.99491;
+	};
+	track 24064
+	{
+		position 0.0775223 -0.080075 0;
+		rotation 1.5708;
+	};
+	track 24077
+	{
+		position -0.0775215 -0.079925 0;
+		rotation 1.5708;
+	};
+	track 24229
+	{
+		position -0.387609 -0.079626 0;
+		rotation 1.5708;
+	};
+	track 24071
+	{
+		position 2.56295e-07 -0.0799999 0;
+		rotation 1.5708;
+	};
+	track 24094
+	{
+		position -0.155042 -0.07985 0;
+		rotation 1.5708;
+	};
+	track 24188
+	{
+		position -0.310087 -0.0797 0;
+		rotation 1.5708;
+	};
+	track 24236
+	{
+		position -0.465131 -0.0795509 0;
+		rotation 1.5708;
+	};
+	track 24912
+	{
+		position 0.310088 -0.380699 0;
+		rotation 1.5708;
+	};
+	track 24206
+	{
+		position -0.446223 -0.161726 0;
+		rotation 2.0944;
+	};
+	track 24740
+	{
+		position -0.112537 0.138174 0;
+		rotation 1.5708;
+	};
+	track 24360
+	{
+		position -0.542646 -0.0794758 0;
+		rotation 1.5708;
+	};
+};