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

diff --git a/wagons.dat b/wagons.dat
index 51d0c79..6e11068 100644
--- a/wagons.dat
+++ b/wagons.dat
@@ -1,12 +1,10 @@
-/* $Id$ */
-
 scale 1 87;
-gauge 16.5;
 
-vehicle 46274
+vehicle "46274"
 {
 	name "Saar Railroad Gmhs 54";
 
+	gauge 16.5;
 	length 116;
 	width 33;
 	height 47;
@@ -17,11 +15,12 @@ vehicle 46274
 	axle { position -31; wheel_diameter 10; };
 };
 
-vehicle \29820-02b
+vehicle "29820-02b"
 {
 	name "BR 50 tender";
 
-	length 98;
+	gauge 16.5;
+	length 96;
 	width 35;
 	height 47;
 
@@ -30,21 +29,24 @@ 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"; };
 	};
 };
 
-vehicle 4442
+vehicle "4442"
 {
 	name "Z";
 
+	gauge 16.5;
 	length 114;
 	width 32;
 	height 48;
@@ -55,10 +57,11 @@ vehicle 4442
 	axle { position -31; wheel_diameter 10; };
 };
 
-vehicle \29859b
+vehicle "29859b"
 {
 	name "Zas";
 
+	gauge 16.5;
 	length 180;
 	width 34;
 	height 47;
@@ -79,10 +82,11 @@ vehicle \29859b
 	};
 };
 
-vehicle 100004
+vehicle "100004"
 {
 	name "Omm 52";
 
+	gauge 16.5;
 	length 116;
 	width 34;
 	height 33;
@@ -93,10 +97,11 @@ vehicle 100004
 	axle { position -31; wheel_diameter 10; };
 };
 
-vehicle 47001
+vehicle "47001"
 {
 	name "Rs 684";
 
+	gauge 16.5;
 	length 229;
 	width 34;
 	height 29;
@@ -119,10 +124,11 @@ vehicle 47001
 	};
 };
 
-vehicle 48943
+vehicle "48943"
 {
 	name "BTr 10";
 
+	gauge 16.5;
 	length 112;
 	width 34;
 	height 34;
@@ -133,10 +139,11 @@ vehicle 48943
 	axle { position -23; wheel_diameter 10; };
 };
 
-vehicle 43222
+vehicle "43222"
 {
 	name "B4üw 38 \"Schürzenwagen\"";
 
+	gauge 16.5;
 	length 244;
 	width 34;
 	height 45;
@@ -157,10 +164,11 @@ vehicle 43222
 	};
 };
 
-vehicle \39230b
+vehicle "39230b"
 {
 	name "BR 23 tender";
 
+	gauge 16.5;
 	length 92;
 	width 34;
 	height 46;
@@ -181,10 +189,11 @@ vehicle \39230b
 	};
 };
 
-vehicle 43800
+vehicle "43800"
 {
 	name "B4nzb 64 \"Silberling\"";
 
+	gauge 16.5;
 	length 282;
 	width 30;
 	height 46;
@@ -208,10 +217,11 @@ vehicle 43800
 	};
 };
 
-vehicle 47072
+vehicle "47072"
 {
 	name "Sgns 691";
 
+	gauge 16.5;
 	length 228;
 	width 30;
 	height 15;
@@ -234,10 +244,11 @@ vehicle 47072
 	};
 };
 
-vehicle 4624
+vehicle "4624"
 {
 	name "Fals-u 176";
 
+	gauge 16.5;
 	length 134;
 	width 36;
 	height 45;
@@ -260,10 +271,11 @@ vehicle 4624
 	};
 };
 
-vehicle 4423
+vehicle "4423"
 {
 	name "Kklm 505";
 
+	gauge 16.5;
 	length 115;
 	width 33;
 	height 21;
@@ -274,10 +286,11 @@ vehicle 4423
 	axle { position -31; wheel_diameter 10; };
 };
 
-vehicle 4410
+vehicle "4410"
 {
 	name "Gs 210";
 
+	gauge 16.5;
 	length 115;
 	width 33;
 	height 47;
@@ -288,10 +301,11 @@ vehicle 4410
 	axle { position -31; wheel_diameter 10; };
 };
 
-vehicle 46977
+vehicle "46977"
 {
 	name "Rlmmso 56";
 
+	gauge 16.5;
 	length 157;
 	width 31;
 	height 21;
@@ -302,10 +316,11 @@ vehicle 46977
 	axle { position -46; wheel_diameter 10; };
 };
 
-vehicle 4699
+vehicle "4699"
 {
 	name "Pwg 14";
 
+	gauge 16.5;
 	length 98;
 	width 31;
 	height 43;
@@ -315,3 +330,106 @@ vehicle 4699
 	axle { position 25; wheel_diameter 10; };
 	axle { position -25; wheel_diameter 10; };
 };
+
+vehicle "46717"
+{
+	name "Railway crane";
+
+	gauge 16.5;
+	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";
+
+	gauge 16.5;
+	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";
+
+	gauge 16.5;
+	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";
+
+	gauge 16.5;
+	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"; };
+	};
+};