X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=wagons.dat;h=fab49a49c6d547a9a421880fbcf8cdeaf7d7af02;hb=e5c244baa4058dbfc0c5caee64e6c83523751924;hp=ea9d1583cc79b0c7b10eb7aefe5f0108ecd624c2;hpb=e392d397f6b86a49a05e9738357ccbfc2a922f01;p=r2c2.git

diff --git a/wagons.dat b/wagons.dat
index ea9d158..fab49a4 100644
--- a/wagons.dat
+++ b/wagons.dat
@@ -1,9 +1,7 @@
-/* $Id$ */
-
 scale 1 87;
 gauge 16.5;
 
-vehicle 46274
+vehicle \46274
 {
 	name "Saar Railroad Gmhs 54";
 
@@ -17,11 +15,11 @@ vehicle 46274
 	axle { position -31; wheel_diameter 10; };
 };
 
-vehicle \37844b
+vehicle \29820-02b
 {
 	name "BR 50 tender";
 
-	length 98;
+	length 96;
 	width 35;
 	height 47;
 
@@ -30,20 +28,22 @@ vehicle \37844b
 	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"; };
 	};
 };
 
-vehicle 100002
+vehicle \4442
 {
-	name "Z-999";
+	name "Z";
 
 	length 114;
 	width 32;
@@ -55,9 +55,9 @@ vehicle 100002
 	axle { position -31; wheel_diameter 10; };
 };
 
-vehicle 100003
+vehicle \29859b
 {
-	name "Zas-999";
+	name "Zas";
 
 	length 180;
 	width 34;
@@ -79,7 +79,7 @@ vehicle 100003
 	};
 };
 
-vehicle 100004
+vehicle \100004
 {
 	name "Omm 52";
 
@@ -93,11 +93,11 @@ vehicle 100004
 	axle { position -31; wheel_diameter 10; };
 };
 
-vehicle 47001
+vehicle \47001
 {
 	name "Rs 684";
 
-	length 228;
+	length 229;
 	width 34;
 	height 29;
 
@@ -106,18 +106,20 @@ vehicle 47001
 	bogie
 	{
 		position 85;
-		axle { position 10; wheel_diameter 10; };
-		axle { position -10; wheel_diameter 10; };
+		object "mindensiegen-bogie.object";
+		axle { position 10.5; wheel_diameter 10; object "wagon-axle.object"; };
+		axle { position -10.5; wheel_diameter 10; object "wagon-axle.object"; };
 	};
 	bogie
 	{
 		position -85;
-		axle { position 10; wheel_diameter 10; };
-		axle { position -10; wheel_diameter 10; };
+		object "mindensiegen-bogie.object";
+		axle { position 10.5; wheel_diameter 10; object "wagon-axle.object"; };
+		axle { position -10.5; wheel_diameter 10; object "wagon-axle.object"; };
 	};
 };
 
-vehicle 48943
+vehicle \48943
 {
 	name "BTr 10";
 
@@ -131,9 +133,9 @@ vehicle 48943
 	axle { position -23; wheel_diameter 10; };
 };
 
-vehicle 43222
+vehicle \43222
 {
-	name "B4üw-38 \"Schürzenwagen\"";
+	name "B4üw 38 \"Schürzenwagen\"";
 
 	length 244;
 	width 34;
@@ -179,9 +181,9 @@ vehicle \39230b
 	};
 };
 
-vehicle 43800
+vehicle \43800
 {
-	name "B4nzb-64 \"Silberling\"";
+	name "B4nzb 64 \"Silberling\"";
 
 	length 282;
 	width 30;
@@ -206,7 +208,7 @@ vehicle 43800
 	};
 };
 
-vehicle 47072
+vehicle \47072
 {
 	name "Sgns 691";
 
@@ -232,7 +234,7 @@ vehicle 47072
 	};
 };
 
-vehicle 4624
+vehicle \4624
 {
 	name "Fals-u 176";
 
@@ -257,3 +259,158 @@ vehicle 4624
 		axle { position -10.5; wheel_diameter 10; object "wagon-axle.object"; };
 	};
 };
+
+vehicle \4423
+{
+	name "Kklm 505";
+
+	length 115;
+	width 33;
+	height 21;
+
+	object ":openwagon:length=100,border=1,color=983800";
+
+	axle { position 31; wheel_diameter 10; };
+	axle { position -31; wheel_diameter 10; };
+};
+
+vehicle \4410
+{
+	name "Gs 210";
+
+	length 115;
+	width 33;
+	height 47;
+
+	object ":coveredwagon:length=101,roof=9,color=983800,color2=B2B2B2";
+
+	axle { position 31; wheel_diameter 10; };
+	axle { position -31; wheel_diameter 10; };
+};
+
+vehicle \46977
+{
+	name "Rlmmso 56";
+
+	length 157;
+	width 31;
+	height 21;
+
+	object ":openwagon:length=144,border=1,color=983800";
+
+	axle { position 46; wheel_diameter 10; };
+	axle { position -46; wheel_diameter 10; };
+};
+
+vehicle \4699
+{
+	name "Pwg 14";
+
+	length 98;
+	width 31;
+	height 43;
+
+	object ":coveredwagon:length=84,roof=5,color=264C1A,color2=B2B2B2";
+
+	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"; };
+	};
+};