X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=wagons.dat;h=f6200b43f0a93bea296edde60331093065da0ce0;hb=ca9d278f9472206ad9a01190dcef9f0eb1bcc274;hp=51d0c79fdf4e8e73820f58f34054cb709f5e1035;hpb=2de4efc339c56b16f8e969023ad619b62c186501;p=r2c2.git

diff --git a/wagons.dat b/wagons.dat
index 51d0c79..f6200b4 100644
--- a/wagons.dat
+++ b/wagons.dat
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 scale 1 87;
 gauge 16.5;
 
@@ -21,7 +19,7 @@ vehicle \29820-02b
 {
 	name "BR 50 tender";
 
-	length 98;
+	length 96;
 	width 35;
 	height 47;
 
@@ -30,14 +28,16 @@ vehicle \29820-02b
 	bogie
 	{
 		position 26;
-		axle { position 11; wheel_diameter 10; };
-		axle { position -11; wheel_diameter 10; };
+		object "br50-tender-bogie.object";
+		axle { position 11; wheel_diameter 10; object "wagon-axle.object"; };
+		axle { position -11; wheel_diameter 10; object "wagon-axle.object"; };
 	};
 	bogie
 	{
 		position -18;
-		axle { position 11; wheel_diameter 10; };
-		axle { position -11; wheel_diameter 10; };
+		object "br50-tender-bogie.object";
+		axle { position 11; wheel_diameter 10; object "wagon-axle.object"; };
+		axle { position -11; wheel_diameter 10; object "wagon-axle.object"; };
 	};
 };
 
@@ -315,3 +315,102 @@ vehicle 4699
 	axle { position 25; wheel_diameter 10; };
 	axle { position -25; wheel_diameter 10; };
 };
+
+vehicle 46717
+{
+	name "Railway crane";
+
+	length 83;
+	width 32;
+	height 16;
+
+	object ":flatwagon:length=71,color=000000";
+
+	axle { position 21.5; wheel_diameter 10; };
+	axle { position 0; wheel_diameter 10; };
+	axle { position -21.5; wheel_diameter 10; };
+};
+
+vehicle 4690
+{
+	name "Eaos 106";
+
+	length 160;
+	width 35;
+	height 38;
+
+	object ":openwagon:length=149,border=2,color=983800";
+
+	bogie
+	{
+		position 51.5;
+
+		axle { position 10.5; wheel_diameter 10; };
+		axle { position -10.5; wheel_diameter 10; };
+	};
+
+	bogie
+	{
+		position -51.5;
+
+		axle { position 10.5; wheel_diameter 10; };
+		axle { position -10.5; wheel_diameter 10; };
+	};
+};
+
+vehicle \37504b
+{
+	// XXX The power car is really in the middle, but that configuration isn't supported yet
+	name "BR 421 S-bahn";
+
+	length 238;
+	width 33;
+	height 44;
+
+	object "br421-body.object";
+
+	bogie
+	{
+		position 80;
+		object "br420-bogie.object";
+		axle { position 14.5; wheel_diameter 10; object "br420-axle.object"; };
+		axle { position -14.5; wheel_diameter 10; object "br420-axle.object"; };
+	};
+	bogie
+	{
+		position -80;
+		object "br420-bogie.object";
+		rotate_object true;
+		axle { position 14.5; wheel_diameter 10; object "br420-axle.object"; };
+		axle { position -14.5; wheel_diameter 10; object "br420-axle.object"; };
+	};
+};
+
+vehicle \37504c
+{
+	// XXX Better solution would be to allow flipping of vehicles
+	name "BR 420 S-bahn";
+
+	length 268;
+	width 33;
+	height 44;
+
+	object "br420-body.object";
+	rotate_object true;
+
+	bogie
+	{
+		position 96;
+		object "br420-bogie.object";
+		axle { position 14.5; wheel_diameter 10; object "br420-axle.object"; };
+		axle { position -14.5; wheel_diameter 10; object "br420-axle.object"; };
+	};
+	bogie
+	{
+		position -94;
+		object "br420-bogie.object";
+		rotate_object true;
+		axle { position 14.5; wheel_diameter 10; object "br420-axle.object"; };
+		axle { position -14.5; wheel_diameter 10; object "br420-axle.object"; };
+	};
+};