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

diff --git a/wagons.dat b/wagons.dat
index 9c99edb..5ba888e 100644
--- a/wagons.dat
+++ b/wagons.dat
@@ -1,12 +1,15 @@
-/* $Id$ */
-
 scale 1 87;
-gauge 16.5;
 
-vehicle 46274
+vehicle "46274"
 {
+	article_number
+	{
+		vendor "Märklin";
+		article "46274";
+	};
 	name "Saar Railroad Gmhs 54";
 
+	gauge 16.5;
 	length 116;
 	width 33;
 	height 47;
@@ -17,11 +20,18 @@ vehicle 46274
 	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 98;
+	gauge 16.5;
+	length 96;
 	width 35;
 	height 47;
 
@@ -30,21 +40,29 @@ vehicle 100001
 	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";
+	article_number
+	{
+		vendor "Märklin";
+		article "4442";
+	};
+	name "Z";
 
+	gauge 16.5;
 	length 114;
 	width 32;
 	height 48;
@@ -55,10 +73,17 @@ vehicle 100002
 	axle { position -31; wheel_diameter 10; };
 };
 
-vehicle 100003
+vehicle "29859b"
 {
-	name "Zas-999";
+	article_number
+	{
+		vendor "Märklin";
+		article "29859";
+		part "b";
+	};
+	name "Zas";
 
+	gauge 16.5;
 	length 180;
 	width 34;
 	height 47;
@@ -79,10 +104,17 @@ vehicle 100003
 	};
 };
 
-vehicle 100004
+vehicle "46034e"
 {
+	article_number
+	{
+		vendor "Märklin";
+		article "46034";
+		part "e";
+	};
 	name "Omm 52";
 
+	gauge 16.5;
 	length 116;
 	width 34;
 	height 33;
@@ -93,11 +125,17 @@ vehicle 100004
 	axle { position -31; wheel_diameter 10; };
 };
 
-vehicle 47001
+vehicle "47001"
 {
+	article_number
+	{
+		vendor "Märklin";
+		article "47001";
+	};
 	name "Rs 684";
 
-	length 228;
+	gauge 16.5;
+	length 229;
 	width 34;
 	height 29;
 
@@ -106,21 +144,29 @@ 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"
 {
+	article_number
+	{
+		vendor "Märklin";
+		article "48943";
+	};
 	name "BTr 10";
 
+	gauge 16.5;
 	length 112;
 	width 34;
 	height 34;
@@ -131,10 +177,16 @@ vehicle 48943
 	axle { position -23; wheel_diameter 10; };
 };
 
-vehicle 43222
+vehicle "43222"
 {
-	name "B4üw-38 \"Schürzenwagen\"";
+	article_number
+	{
+		vendor "Märklin";
+		article "43222";
+	};
+	name "B4üw 38 \"Schürzenwagen\"";
 
+	gauge 16.5;
 	length 244;
 	width 34;
 	height 45;
@@ -155,10 +207,17 @@ vehicle 43222
 	};
 };
 
-vehicle 100005
+vehicle "39230b"
 {
+	article_number
+	{
+		vendor "Märklin";
+		article "39230";
+		part "b";
+	};
 	name "BR 23 tender";
 
+	gauge 16.5;
 	length 92;
 	width 34;
 	height 46;
@@ -179,10 +238,16 @@ vehicle 100005
 	};
 };
 
-vehicle 43800
+vehicle "43800"
 {
-	name "B4nzb-64 \"Silberling\"";
+	article_number
+	{
+		vendor "Märklin";
+		article "43800";
+	};
+	name "B4nzb 64 \"Silberling\"";
 
+	gauge 16.5;
 	length 282;
 	width 30;
 	height 46;
@@ -206,10 +271,16 @@ vehicle 43800
 	};
 };
 
-vehicle 47072
+vehicle "47072"
 {
+	article_number
+	{
+		vendor "Märklin";
+		article "47042";
+	};
 	name "Sgns 691";
 
+	gauge 16.5;
 	length 228;
 	width 30;
 	height 15;
@@ -232,10 +303,16 @@ vehicle 47072
 	};
 };
 
-vehicle 4624
+vehicle "4624"
 {
+	article_number
+	{
+		vendor "Märklin";
+		article "4624";
+	};
 	name "Fals-u 176";
 
+	gauge 16.5;
 	length 134;
 	width 36;
 	height 45;
@@ -257,3 +334,208 @@ vehicle 4624
 		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"; };
+	};
+};