X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=wagons.dat;h=4f0592cf63a4d934f7c80cf2fba6ec6bacbad04a;hb=7ecefa673473c6d6ef9505ca415d5b0e4dbc3944;hp=ab789b06d593e817e5325841591e61d49569805f;hpb=45abb4c64c714cb655988a855158a22976f5e35f;p=r2c2.git

diff --git a/wagons.dat b/wagons.dat
index ab789b0..4f0592c 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;
@@ -21,6 +19,7 @@ vehicle \29820-02b
 {
 	name "BR 50 tender";
 
+	gauge 16.5;
 	length 96;
 	width 35;
 	height 47;
@@ -43,10 +42,11 @@ vehicle \29820-02b
 	};
 };
 
-vehicle 4442
+vehicle \4442
 {
 	name "Z";
 
+	gauge 16.5;
 	length 114;
 	width 32;
 	height 48;
@@ -61,6 +61,7 @@ vehicle \29859b
 {
 	name "Zas";
 
+	gauge 16.5;
 	length 180;
 	width 34;
 	height 47;
@@ -81,10 +82,11 @@ vehicle \29859b
 	};
 };
 
-vehicle 100004
+vehicle \100004
 {
 	name "Omm 52";
 
+	gauge 16.5;
 	length 116;
 	width 34;
 	height 33;
@@ -95,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;
@@ -121,10 +124,11 @@ vehicle 47001
 	};
 };
 
-vehicle 48943
+vehicle \48943
 {
 	name "BTr 10";
 
+	gauge 16.5;
 	length 112;
 	width 34;
 	height 34;
@@ -135,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;
@@ -163,6 +168,7 @@ vehicle \39230b
 {
 	name "BR 23 tender";
 
+	gauge 16.5;
 	length 92;
 	width 34;
 	height 46;
@@ -183,10 +189,11 @@ vehicle \39230b
 	};
 };
 
-vehicle 43800
+vehicle \43800
 {
 	name "B4nzb 64 \"Silberling\"";
 
+	gauge 16.5;
 	length 282;
 	width 30;
 	height 46;
@@ -210,10 +217,11 @@ vehicle 43800
 	};
 };
 
-vehicle 47072
+vehicle \47072
 {
 	name "Sgns 691";
 
+	gauge 16.5;
 	length 228;
 	width 30;
 	height 15;
@@ -236,10 +244,11 @@ vehicle 47072
 	};
 };
 
-vehicle 4624
+vehicle \4624
 {
 	name "Fals-u 176";
 
+	gauge 16.5;
 	length 134;
 	width 36;
 	height 45;
@@ -262,10 +271,11 @@ vehicle 4624
 	};
 };
 
-vehicle 4423
+vehicle \4423
 {
 	name "Kklm 505";
 
+	gauge 16.5;
 	length 115;
 	width 33;
 	height 21;
@@ -276,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;
@@ -290,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;
@@ -304,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;
@@ -318,10 +331,11 @@ vehicle 4699
 	axle { position -25; wheel_diameter 10; };
 };
 
-vehicle 46717
+vehicle \46717
 {
 	name "Railway crane";
 
+	gauge 16.5;
 	length 83;
 	width 32;
 	height 16;
@@ -333,10 +347,11 @@ vehicle 46717
 	axle { position -21.5; wheel_diameter 10; };
 };
 
-vehicle 4690
+vehicle \4690
 {
 	name "Eaos 106";
 
+	gauge 16.5;
 	length 160;
 	width 35;
 	height 38;
@@ -359,3 +374,62 @@ vehicle 4690
 		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"; };
+	};
+};