X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=locos.dat;h=f330a818eedf485a81c2fab6ee20e9031d77fce7;hb=b860a56bd9bc8894311c02d7673f379beff3220b;hp=2fb9181192ceb0d868ff89e206433a2c4bf37eb7;hpb=dd05e8ed55a9072daaf18e4c63c3b66e386ba7f4;p=r2c2.git

diff --git a/locos.dat b/locos.dat
index 2fb9181..f330a81 100644
--- a/locos.dat
+++ b/locos.dat
@@ -1,8 +1,12 @@
 scale 1 87;
-gauge 16.5;
 
-vehicle \39230
+vehicle "39230"
 {
+	article_number
+	{
+		vendor "Märklin";
+		article "39230";
+	};
 	name "BR 23";
 	locomotive true;
 	function 0 "light";
@@ -10,6 +14,7 @@ vehicle \39230
 	function 2 "sfx";
 	function 3 "whst";
 
+	gauge 16.5;
 	length 154;
 	width 38;
 	height 53;
@@ -31,8 +36,14 @@ vehicle \39230
 	};
 };
 
-vehicle \29820-02
+vehicle "29820-02"
 {
+	article_number
+	{
+		vendor "Märklin";
+		article "29820";
+		part "02";
+	};
 	name "BR 50";
 	locomotive true;
 	function 0 "light";
@@ -40,7 +51,9 @@ vehicle \29820-02
 	function 2 "telex";
 	function 3 "sfx";
 	function 5 "whst";
+	maximum_speed 0.255;
 
+	gauge 16.5;
 	length 160;
 	width 37;
 	height 50.5;
@@ -129,6 +142,69 @@ vehicle \29820-02
 		object "br50-rod-link.object";
 	};
 
+	rod "reach"
+	{
+		initial_position 7 -9.5 27.5;
+		object "br50-rod-reach.object";
+	};
+
+	rod "transfer"
+	{
+		initial_position 4 0 22;
+		rotate
+		{
+			target_rod "reach";
+			local_position -1 -9.5 5.5;
+		};
+		object "br50-rod-transfer.object";
+	};
+
+	rod "expansion_guide_r"
+	{
+		move
+		{
+			target_rod "expansion_r";
+			target_position 20.5 0 0;
+		};
+		rotate
+		{
+			target_rod "radius_r";
+			target_position 3.2 0 0.5;
+			local_position -20.5 0 0;
+		};
+	};
+
+	rod "lifting_guide_r"
+	{
+		move
+		{
+			target_rod "expansion_guide_r";
+			target_position -20.5 0 0;
+		};
+		rotate
+		{
+			target_rod "lifting_r";
+			target_position 0 1 -5.5;
+			local_position -3.2 0 -0.5;
+		};
+	};
+
+	rod "lifting_r"
+	{
+		move
+		{
+			target_rod "transfer";
+			target_position 4.5 -15.5 0;
+		};
+		rotate
+		{
+			target_rod "lifting_guide_r";
+			target_position -3.2 -1 -0.5;
+			local_position 0 0 -5.5;
+		};
+		object "br50-rod-lifting.object";
+	};
+
 	rod "radius_guide_r"
 	{
 		initial_position 33 -16 15.5;
@@ -139,7 +215,7 @@ vehicle \29820-02
 		rotate
 		{
 			target_rod "radius_r";
-			target_position 22 -1 0;
+			target_position 25 -1 0.5;
 			local_position 0 0 1.5;
 		};
 	};
@@ -149,14 +225,14 @@ vehicle \29820-02
 		initial_position 11 -15 17;
 		move
 		{
-			target_rod "expansion_r";
-			target_position 0.2 -0.5 -2.5;
+			target_rod "lifting_r";
+			target_position 0 0.5 -5.5;
 		};
 		rotate
 		{
 			target_rod "radius_guide_r";
 			target_position 0 1 1.5;
-			local_position 22 0 0;
+			local_position 25 0 0.5;
 		};
 		object "br50-rod-radius.object";
 	};
@@ -183,7 +259,7 @@ vehicle \29820-02
 		move
 		{
 			target_rod "radius_r";
-			target_position 22 -0.5 0;
+			target_position 25 -0.5 0.5;
 		};
 		rotate
 		{
@@ -212,17 +288,26 @@ vehicle \29820-02
 
 	mirror_rods
 	{
+		filter "_r$";
 		phase_offset -90;
 	};
 };
 
-vehicle \29530-01
+vehicle "29530-01"
 {
+	article_number
+	{
+		vendor "Märklin";
+		article "29530";
+		part "01";
+	};
 	name "BR 86";
 	locomotive true;
 	function 0 "light";
 	function 2 "telex";
+	maximum_speed 0.255;
 
+	gauge 16.5;
 	length 144;
 	width 33;
 	height 33;
@@ -245,12 +330,19 @@ vehicle \29530-01
 	};
 };
 
-vehicle \36850
+vehicle "36850"
 {
+	article_number
+	{
+		vendor "Märklin";
+		article "36850";
+	};
 	name "BR 185";
 	locomotive true;
 	function 0 "light";
+	maximum_speed 0.447;
 
+	gauge 16.5;
 	length 218;
 	width 34;
 	height 43;
@@ -273,12 +365,20 @@ vehicle \36850
 	};
 };
 
-vehicle \37225-02
+vehicle "37225-02"
 {
+	article_number
+	{
+		vendor "Märklin";
+		article "37225";
+		part "02";
+	};
 	name "BR 194";
 	locomotive true;
 	function 0 "light";
+	maximum_speed 0.287;
 
+	gauge 16.5;
 	length 212;
 	width 34;
 	height 45;
@@ -305,14 +405,21 @@ vehicle \37225-02
 	};
 };
 
-vehicle \39410
+vehicle "39410"
 {
+	article_number
+	{
+		vendor "Märklin";
+		article "39410";
+	};
 	name "BR E 41";
 	locomotive true;
 	function 0 "light";
 	function 3 "sfx";
 	function 5 "whstl";
+	maximum_speed 0.383;
 
+	gauge 16.5;
 	length 180;
 	width 35;
 	height 44;
@@ -336,15 +443,23 @@ vehicle \39410
 	};
 };
 
-vehicle \37574-01
+vehicle "37574-01"
 {
+	article_number
+	{
+		vendor "Märklin";
+		article "37574";
+		part "01";
+	};
 	name "BR E 03";
 	locomotive true;
 	function 0 "light";
 	function 2 "sfx";
 	function 3 "whstl";
 	swap_direction true;
+	maximum_speed 0.639;
 
+	gauge 16.5;
 	length 219;
 	width 35;
 	height 49;
@@ -369,16 +484,23 @@ vehicle \37574-01
 	};
 };
 
-vehicle \37504
+vehicle "37504"
 {
 	// XXX The power car is really in the middle, but that configuration isn't supported yet
+	article_number
+	{
+		vendor "Märklin";
+		article "37504";
+	};
 	name "BR 420 S-bahn";
 	locomotive true;
 	function 0 "light";
 	function 1 "intlt";
 	function 2 "sfx";
 	function 3 "whstl";
+	maximum_speed 0.383;
 
+	gauge 16.5;
 	length 268;
 	width 33;
 	height 44;
@@ -401,3 +523,81 @@ vehicle \37504
 		axle { position -14.5; wheel_diameter 10; object "br420-axle.object"; };
 	};
 };
+
+vehicle "37851"
+{
+	article_number
+	{
+		vendor "Märklin";
+		article "37851";
+	};
+	name "BR 150";
+	locomotive true;
+	function 0 "light";
+	function 1 "telex";
+	function 3 "whstl";
+	maximum_speed 0.319;
+
+	gauge 16.5;
+	length 224;
+	width 35;
+	height 47;
+
+	object "br150-body.object";
+
+	bogie
+	{
+		position 50.5;
+		axle { position 25.5; wheel_diameter 10; };
+		axle { position -3; wheel_diameter 10; };
+		axle { position -25.5; wheel_diameter 10; };
+	};
+	bogie
+	{
+		position -50.5;
+		axle { position 25.5; wheel_diameter 10; };
+		axle { position 3; wheel_diameter 10; };
+		axle { position -25.5; wheel_diameter 10; };
+	};
+};
+
+vehicle "37968"
+{
+	article_number
+	{
+		vendor "Märklin";
+		article "37968";
+	};
+	name "BR 96";
+	locomotive true;
+	function 0 "light";
+	function 2 "sfx";
+	function 3 "whstl";
+	maximum_speed 0.160;
+
+	gauge 16.5;
+	length 203;
+	width 35;
+	height 49;
+
+	object "br96-body.object";
+
+	bogie
+	{
+		position 32;
+		object "br96-bogie-front.object";
+		axle { position 35; wheel_diameter 13; };
+		axle { position 17.5; wheel_diameter 13; };
+		axle { position 0; wheel_diameter 13; };
+		axle { position -17.5; wheel_diameter 13; };
+	};
+	bogie
+	{
+		position -49;
+		object "br96-bogie-back.object";
+		axle { position 26.25; wheel_diameter 13; };
+		axle { position 8.75; wheel_diameter 13; };
+		axle { position -8.75; wheel_diameter 13; };
+		axle { position -26.25; wheel_diameter 13; };
+	};
+};