X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=wagons.dat;h=5ba888ef643e6ae1ac08dc58bf2ab46b3f40845c;hb=1a213318d4f26ef7bc3a82fc805ecbfec9f1c74a;hp=ee3d46bf01d42dcf2730b94cecc32feac96e04f4;hpb=6968273080fa2a1cbcfc506610d5f249299611e9;p=r2c2.git

diff --git a/wagons.dat b/wagons.dat
index ee3d46b..5ba888e 100644
--- a/wagons.dat
+++ b/wagons.dat
@@ -1,38 +1,541 @@
-/* $Id$ */
-
 scale 1 87;
-gauge 16.5;
 
-vehicle 46274
+vehicle "46274"
 {
+	article_number
+	{
+		vendor "Märklin";
+		article "46274";
+	};
 	name "Saar Railroad Gmhs 54";
 
-	length 101;
+	gauge 16.5;
+	length 116;
 	width 33;
-	height 33;
+	height 47;
+
+	object "gmhs54-body.object";
 
 	axle { position 31; wheel_diameter 10; };
 	axle { position -31; wheel_diameter 10; };
 };
 
-vehicle 100001
+vehicle "29820-02b"
 {
+	article_number
+	{
+		vendor "Märklin";
+		article "29820";
+		part "02b";
+	};
 	name "BR 50 tender";
 
-	length 90;
-	width 33;
+	gauge 16.5;
+	length 96;
+	width 35;
+	height 47;
+
+	object "br50-tender-body.object";
+
+	bogie
+	{
+		position 26;
+		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;
+		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"
+{
+	article_number
+	{
+		vendor "Märklin";
+		article "4442";
+	};
+	name "Z";
+
+	gauge 16.5;
+	length 114;
+	width 32;
+	height 48;
+
+	object "z999.object";
+
+	axle { position 31; wheel_diameter 10; };
+	axle { position -31; wheel_diameter 10; };
+};
+
+vehicle "29859b"
+{
+	article_number
+	{
+		vendor "Märklin";
+		article "29859";
+		part "b";
+	};
+	name "Zas";
+
+	gauge 16.5;
+	length 180;
+	width 34;
+	height 47;
+
+	object "zas999.object";
+
+	bogie
+	{
+		position 61;
+		axle { position 10.5; wheel_diameter 10; };
+		axle { position -10.5; wheel_diameter 10; };
+	};
+	bogie
+	{
+		position -61;
+		axle { position 10.5; wheel_diameter 10; };
+		axle { position -10.5; wheel_diameter 10; };
+	};
+};
+
+vehicle "46034e"
+{
+	article_number
+	{
+		vendor "Märklin";
+		article "46034";
+		part "e";
+	};
+	name "Omm 52";
+
+	gauge 16.5;
+	length 116;
+	width 34;
 	height 33;
 
+	object "omm52-body.object";
+
+	axle { position 31; wheel_diameter 10; };
+	axle { position -31; wheel_diameter 10; };
+};
+
+vehicle "47001"
+{
+	article_number
+	{
+		vendor "Märklin";
+		article "47001";
+	};
+	name "Rs 684";
+
+	gauge 16.5;
+	length 229;
+	width 34;
+	height 29;
+
+	object "rs684-body.object";
+
 	bogie
 	{
-		position 23;
+		position 85;
+		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;
+		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"
+{
+	article_number
+	{
+		vendor "Märklin";
+		article "48943";
+	};
+	name "BTr 10";
+
+	gauge 16.5;
+	length 112;
+	width 34;
+	height 34;
+
+	object "btr10-body.object";
+
+	axle { position 29; wheel_diameter 10; };
+	axle { position -23; wheel_diameter 10; };
+};
+
+vehicle "43222"
+{
+	article_number
+	{
+		vendor "Märklin";
+		article "43222";
+	};
+	name "B4üw 38 \"Schürzenwagen\"";
+
+	gauge 16.5;
+	length 244;
+	width 34;
+	height 45;
+
+	object "schurzenwagen-body.object";
+
+	bogie
+	{
+		position 82;
+		axle { position 17; wheel_diameter 10; };
+		axle { position -17; wheel_diameter 10; };
+	};
+	bogie
+	{
+		position -82;
+		axle { position 17; wheel_diameter 10; };
+		axle { position -17; wheel_diameter 10; };
+	};
+};
+
+vehicle "39230b"
+{
+	article_number
+	{
+		vendor "Märklin";
+		article "39230";
+		part "b";
+	};
+	name "BR 23 tender";
+
+	gauge 16.5;
+	length 92;
+	width 34;
+	height 46;
+
+	object "br23-tender-body.object";
+
+	bogie
+	{
+		position 28;
 		axle { position 11; wheel_diameter 10; };
 		axle { position -11; wheel_diameter 10; };
 	};
 	bogie
 	{
-		position -21;
+		position -16;
 		axle { position 11; wheel_diameter 10; };
 		axle { position -11; wheel_diameter 10; };
 	};
 };
+
+vehicle "43800"
+{
+	article_number
+	{
+		vendor "Märklin";
+		article "43800";
+	};
+	name "B4nzb 64 \"Silberling\"";
+
+	gauge 16.5;
+	length 282;
+	width 30;
+	height 46;
+
+	object "b4nzb64-body.object";
+
+	bogie
+	{
+		position 95;
+		object "b4nzb64-bogie.object";
+		axle { position 20; wheel_diameter 10; object "wagon-axle.object"; };
+		axle { position -7; wheel_diameter 10; object "wagon-axle.object"; };
+	};
+	bogie
+	{
+		position -95;
+		object "b4nzb64-bogie.object";
+		rotate_object true;
+		axle { position 7; wheel_diameter 10; object "wagon-axle.object"; };
+		axle { position -20; wheel_diameter 10; object "wagon-axle.object"; };
+	};
+};
+
+vehicle "47072"
+{
+	article_number
+	{
+		vendor "Märklin";
+		article "47042";
+	};
+	name "Sgns 691";
+
+	gauge 16.5;
+	length 228;
+	width 30;
+	height 15;
+
+	object "sgns691-body.object";
+
+	bogie
+	{
+		position 81.5;
+		object "y25-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 -81.5;
+		object "y25-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 "4624"
+{
+	article_number
+	{
+		vendor "Märklin";
+		article "4624";
+	};
+	name "Fals-u 176";
+
+	gauge 16.5;
+	length 134;
+	width 36;
+	height 45;
+
+	object "falsu176-body.object";
+
+	bogie
+	{
+		position 35;
+		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 -35;
+		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 "4423"
+{
+	article_number
+	{
+		vendor "Märklin";
+		article "4423";
+	};
+	name "Kklm 505";
+
+	gauge 16.5;
+	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"
+{
+	article_number
+	{
+		vendor "Märklin";
+		article "4410";
+	};
+	name "Gs 210";
+
+	gauge 16.5;
+	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"
+{
+	article_number
+	{
+		vendor "Märklin";
+		article "46977";
+	};
+	name "Rlmmso 56";
+
+	gauge 16.5;
+	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"
+{
+	article_number
+	{
+		vendor "Märklin";
+		article "4699";
+	};
+	name "Pwg 14";
+
+	gauge 16.5;
+	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"
+{
+	article_number
+	{
+		vendor "Märklin";
+		article "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"
+{
+	article_number
+	{
+		vendor "Märklin";
+		article "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
+	article_number
+	{
+		vendor "Märklin";
+		article "37504";
+		part "b";
+	};
+	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
+	article_number
+	{
+		vendor "Märklin";
+		article "37504";
+		part "c";
+	};
+	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"; };
+	};
+};