X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=locos.dat;h=d05b96f64f6e4ff2699648a9a755eb858f200d12;hb=2d44923e135a119fde31a7a50e5fcd3e400e4f41;hp=9a9bef91610357e792af3615320802fb81254f9c;hpb=7abd932fe2f61d2762dd7677801dd7a1ebf9b420;p=r2c2.git

diff --git a/locos.dat b/locos.dat
index 9a9bef9..d05b96f 100644
--- a/locos.dat
+++ b/locos.dat
@@ -3,36 +3,218 @@
 scale 1 87;
 gauge 16.5;
 
-locomotive 37844
+vehicle 39230
+{
+	name "BR 23";
+	locomotive true;
+	function 0 "light";
+	function 1 "smke";
+	function 2 "sfx";
+	function 3 "whst";
+
+	length 154;
+	width 38;
+	height 53;
+
+	object "br23-body.object";
+
+	bogie
+	{
+		position 33;
+		axle { position 22; wheel_diameter 11; };
+	};
+	axle { position 20; wheel_diameter 20; powered true; };
+	axle { position -3; wheel_diameter 20; powered true; };
+	axle { position -26; wheel_diameter 20; powered true; };
+	bogie
+	{
+		position -38;
+		axle { position -22; wheel_diameter 14; };
+	};
+};
+
+vehicle \29820-02
 {
 	name "BR 50";
+	locomotive true;
 	function 0 "light";
 	function 1 "smke";
 	function 2 "telex";
 	function 3 "sfx";
 	function 5 "whst";
 
-	length 158;
-	width 38;
+	length 160;
+	width 37;
 	height 50.5;
 
 	object "br50-body.object";
 
 	bogie
 	{
-		position 36;
-		axle { position 24; wheel_diameter 9; };
+		position 37;
+		object "br50-bogie-front.object";
+		axle { position 24; wheel_diameter 9; object "br50-axle-front.object"; };
+	};
+	axle { position 29; wheel_diameter 16; powered true; object "br50-axle.object"; };
+	axle { position 9.5; wheel_diameter 16; powered true; object "br50-axle.object"; };
+	axle { position -10; wheel_diameter 16; powered true; object "br50-axle-mid.object"; };
+	axle { position -29.5; wheel_diameter 16; powered true; object "br50-axle.object"; };
+	axle { position -49; wheel_diameter 16; powered true; object "br50-axle.object"; };
+
+	rod
+	{
+		pivot_axle 2;
+		position 0 -10.5 -3.5;
+		limit FIXED;
+		object "br50-rod-coupling.object";
+	};
+	rod
+	{
+		pivot_body;
+		position 27 -14 8;
+		limit SLIDE_X;
+		tag "piston";
+		object "br50-rod-piston.object";
+	};
+	rod
+	{
+		pivot_axle 2;
+		position 0 -13 -3.5;
+		limit ROTATE;
+		connect "previous" 37.5 0 0 0;
+		object "br50-rod-main.object";
+	};
+	rod
+	{
+		pivot_axle 2;
+		position 1.5 -15 0;
+		limit ROTATE;
+		object "br50-rod-eccentric.object";
+	};
+	rod
+	{
+		pivot_body;
+		position 10.5 -14.5 16.5;
+		limit ROTATE;
+		connect "previous" 0 -4.5 21 0;
+		tag "link";
+		object "br50-rod-link.object";
+	};
+	rod
+	{
+		pivot_body;
+		position 32 -16 15.5;
+		limit SLIDE_X;
+		object "br50-rod-valve.object";
+	};
+	rod
+	{
+		pivot_rod "link";
+		position 0.2 -0.5 -2.5;
+		limit ROTATE;
+		connect "previous" 22 -1.5 0 0;
+		object "br50-rod-radius.object";
+	};
+	rod
+	{
+		pivot_rod "previous";
+		position 22 -0.5 0;
+		limit ROTATE;
+		object "br50-rod-combination.object";
+	};
+	rod
+	{
+		pivot_rod "piston";
+		position 0 -1.5 -2;
+		limit ROTATE;
+		connect "previous" 5.5 0 0 -11.5;
+		object "br50-rod-union.object";
+	};
+
+	rod
+	{
+		pivot_axle 2;
+		position 3.5 10.5 0;
+		limit FIXED;
+		object "br50-rod-coupling.object";
+		mirror_object true;
+	};
+	rod
+	{
+		pivot_body;
+		position 27 14 8;
+		limit SLIDE_X;
+		tag "piston";
+		object "br50-rod-piston.object";
+		mirror_object true;
+	};
+	rod
+	{
+		pivot_axle 2;
+		position 3.5 13 0;
+		limit ROTATE;
+		connect "previous" 37.5 0 0 0;
+		object "br50-rod-main.object";
+		mirror_object true;
+	};
+	rod
+	{
+		pivot_axle 2;
+		position 0 15 1.5;
+		limit ROTATE;
+		object "br50-rod-eccentric.object";
+		mirror_object true;
+	};
+	rod
+	{
+		pivot_body;
+		position 10.5 14.5 16.5;
+		limit ROTATE;
+		connect "previous" 0 -4.5 21 0;
+		tag "link";
+		object "br50-rod-link.object";
+		mirror_object true;
+	};
+	rod
+	{
+		pivot_body;
+		position 32 16 15.5;
+		limit SLIDE_X;
+		object "br50-rod-valve.object";
+		mirror_object true;
+	};
+	rod
+	{
+		pivot_rod "link";
+		position 0.2 0.5 -2.5;
+		limit ROTATE;
+		connect "previous" 22 -1.5 0 0;
+		object "br50-rod-radius.object";
+		mirror_object true;
+	};
+	rod
+	{
+		pivot_rod "previous";
+		position 22 0.5 0;
+		limit ROTATE;
+		object "br50-rod-combination.object";
+		mirror_object true;
+	};
+	rod
+	{
+		pivot_rod "piston";
+		position 0 1.5 -2;
+		limit ROTATE;
+		connect "previous" 5.5 0 0 -11.5;
+		object "br50-rod-union.object";
+		mirror_object true;
 	};
-	axle { position 28; wheel_diameter 16; powered true; };
-	axle { position 8.5; wheel_diameter 16; powered true; };
-	axle { position -11; wheel_diameter 16; powered true; };
-	axle { position -30.5; wheel_diameter 16; powered true; };
-	axle { position -50; wheel_diameter 16; powered true; };
 };
 
-locomotive 33961
+vehicle \29530-01
 {
 	name "BR 86";
+	locomotive true;
 	function 0 "light";
 	function 2 "telex";
 
@@ -40,6 +222,8 @@ locomotive 33961
 	width 33;
 	height 33;
 
+	object "br86-body.object";
+
 	bogie
 	{
 		position 36;
@@ -56,9 +240,10 @@ locomotive 33961
 	};
 };
 
-locomotive 36850
+vehicle 36850
 {
 	name "BR 185";
+	locomotive true;
 	function 0 "light";
 
 	length 218;
@@ -70,20 +255,23 @@ locomotive 36850
 	bogie
 	{
 		position 60;
-		axle { position  15; wheel_diameter 14; powered true; };
-		axle { position -15; wheel_diameter 14; powered true; };
+		object "br185-bogie.object";
+		axle { position  15; wheel_diameter 14; powered true; object "br185-axle.object"; };
+		axle { position -15; wheel_diameter 14; powered true; object "br185-axle.object"; };
 	};
 	bogie
 	{
 		position -60;
-		axle { position  15; wheel_diameter 14; powered true; };
-		axle { position -15; wheel_diameter 14; powered true; };
+		object "br185-bogie.object";
+		axle { position  15; wheel_diameter 14; powered true; object "br185-axle.object"; };
+		axle { position -15; wheel_diameter 14; powered true; object "br185-axle.object"; };
 	};
 };
 
-locomotive 37225
+vehicle \37225-02
 {
 	name "BR 194";
+	locomotive true;
 	function 0 "light";
 
 	length 212;
@@ -111,3 +299,67 @@ locomotive 37225
 		axle { position -34; wheel_diameter 14; powered true; };
 	};
 };
+
+vehicle 39410
+{
+	name "BR E 41";
+	locomotive true;
+	function 0 "light";
+	function 3 "sfx";
+	function 5 "whstl";
+
+	length 180;
+	width 35;
+	height 44;
+
+	object "bre41-body.object";
+
+	bogie
+	{
+		position 42;
+		object "bre41-bogie.object";
+		axle { position  18.5; wheel_diameter 14; powered true; object "bre41-axle.object"; };
+		axle { position -18.5; wheel_diameter 14; powered true; object "bre41-axle.object"; };
+	};
+	bogie
+	{
+		position -42;
+		object "bre41-bogie.object";
+		rotate_object true;
+		axle { position  18.5; wheel_diameter 14; powered true; object "bre41-axle.object"; };
+		axle { position -18.5; wheel_diameter 14; powered true; object "bre41-axle.object"; };
+	};
+};
+
+vehicle \37574-01
+{
+	name "BR E 03";
+	locomotive true;
+	function 0 "light";
+	function 2 "sfx";
+	function 3 "whstl";
+	swap_direction true;
+
+	length 219;
+	width 35;
+	height 49;
+
+	// XXX Create proper 3D model for this
+	object "br185-body.object";
+
+	bogie
+	{
+		position 62;
+		axle { position 17; wheel_diameter 14; powered true; };
+		axle { position -8.5; wheel_diameter 14; powered true; };
+		axle { position -34; wheel_diameter 14; powered true; };
+	};
+
+	bogie
+	{
+		position -62;
+		axle { position 34; wheel_diameter 14; powered true; };
+		axle { position 8.5; wheel_diameter 14; powered true; };
+		axle { position -17; wheel_diameter 14; powered true; };
+	};
+};