silberling engine done

11 files changed, 118 insertions, 28 deletions

diff --git a/moretrains_basic/blend/legacy/moretrains_basic_silberling_train.blend b/moretrains_basic/blend/legacy/moretrains_basic_silberling_train.blend
new file mode 100644
index 0000000..31bf184
--- /dev/null
+++ b/moretrains_basic/blend/legacy/moretrains_basic_silberling_train.blend
diff --git a/moretrains_basic/blend/moretrains_basic_silberling_anim.blend b/moretrains_basic/blend/moretrains_basic_silberling_anim.blend
index 2fdc0ea..4ed4d92 100644
--- a/moretrains_basic/blend/moretrains_basic_silberling_anim.blend
+++ b/moretrains_basic/blend/moretrains_basic_silberling_anim.blend
diff --git a/moretrains_basic/blend/moretrains_basic_silberling_train_anim.blend b/moretrains_basic/blend/moretrains_basic_silberling_train_anim.blend
new file mode 100644
index 0000000..5b68f54
--- /dev/null
+++ b/moretrains_basic/blend/moretrains_basic_silberling_train_anim.blend
diff --git a/moretrains_basic/init.lua b/moretrains_basic/init.lua
index 588d7c8..b524622 100644
--- a/moretrains_basic/init.lua
+++ b/moretrains_basic/init.lua
@@ -140,34 +140,7 @@ advtrains.register_wagon("moretrains_silberling", {
 	wagon_span=3,
 	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},
 	drops={"default:steelblock"},
-}, S("MT Silberling"), "moretrains_silberling_inv.png")
-
-minetest.register_craft({
-	output = 'advtrains:moretrains_railroad_car',
-	recipe = {
-		{'default:steelblock', 'default:tin_ingot', 'default:steelblock'},
-		{'default:steelblock', 'default:glass', 'default:steelblock'},
-		{'advtrains:wheel', '', 'advtrains:wheel'},
-	},
-})
-
-local block = 'default:steelblock'
-local ingot = 'default:steel_ingot'
-if  minetest.get_modpath("moreores") then
-	block = 'moreores:silver_block'
-	ingot = 'moreores:silver_ingot'
-	
-end
-
-minetest.register_craft({
-	output = 'advtrains:moretrains_silberling',
-	recipe = {
-		{'default:steelblock', block, 'default:steelblock'},
-		{ingot, 'default:glass', ingot},
-		{'advtrains:wheel', '', 'advtrains:wheel'},
-	},
-})
-
+}, S("MT Silberling Wagon"), "moretrains_silberling_inv.png")
 
 advtrains.register_wagon("moretrains_diesel_german", {
 	mesh="moretrains_diesel_german.b3d",
@@ -200,6 +173,88 @@ advtrains.register_wagon("moretrains_diesel_german", {
 	horn_sound = "advtrains_industrial_horn",
 }, S("Old German Diesel"), "moretrains_diesel_german_inv.png")
 
+advtrains.register_wagon("moretrains_silberling_train", {
+	mesh="moretrains_silberling_train.b3d",
+	textures = {"moretrains_silberling_train.png"},
+	drives_on={default=true},
+	max_speed=20,
+	seats = {
+		{
+			name=S("Driver stand"),
+			attach_offset={x=0, y=-0.4, z=21},
+			view_offset={x=10.4, y=9, z=0},
+			group="dstand",
+		},
+		{
+			name="1",
+			attach_offset={x=-4, y=-2, z=8},
+			view_offset={x=0, y=-2, z=0},
+			group="pass",
+		},
+		{
+			name="2",
+			attach_offset={x=4, y=-2, z=8},
+			view_offset={x=0, y=-2, z=0},
+			group="pass",
+		},
+		{
+			name="1a",
+			attach_offset={x=-4, y=-2, z=0},
+			view_offset={x=0, y=-2, z=0},
+			group="pass",
+		},
+		{
+			name="2a",
+			attach_offset={x=4, y=-2, z=0},
+			view_offset={x=0, y=-2, z=0},
+			group="pass",
+		},
+		{
+			name="3",
+			attach_offset={x=-4, y=-2, z=-8},
+			view_offset={x=0, y=-2, z=0},
+			group="pass",
+		},
+		{
+			name="4",
+			attach_offset={x=4, y=8, z=-8},
+			view_offset={x=0, y=-2, z=0},
+			group="pass",
+		},
+	},
+	seat_groups = {
+		dstand={
+			name = "Driver Stand",
+			access_to = {"pass"},
+			driving_ctrl_access=true,
+		},
+		pass={
+			name = "Passenger area",
+			access_to = {"dstand"},
+			require_doors_open=true,
+		},
+	},
+	assign_to_seat_group = {"dstand", "pass"},
+	doors={
+		open={
+			[-1]={frames={x=0, y=10}, time=1},
+			[1]={frames={x=20, y=30}, time=1}
+		},
+		close={
+			[-1]={frames={x=10, y=20}, time=1},
+			[1]={frames={x=30, y=40}, time=1}
+		}
+	},
+	assign_to_seat_group = {"dstand"},
+	visual_size = {x=1, y=1},
+	wagon_span=3,
+	is_locomotive=true,
+	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},
+	drops={"default:steelblock 4"},
+	horn_sound = "advtrains_industrial_horn",
+}, S("MT Silberling Engine"), "moretrains_silberling_train_inv.png")
+
+
 minetest.register_craft({
 	output = 'advtrains:moretrains_diesel_german',
 	recipe = {
@@ -208,3 +263,38 @@ minetest.register_craft({
 		{'advtrains:wheel', 'advtrains:wheel', 'advtrains:wheel'},
 	},
 })
+
+local block = 'default:steelblock'
+local ingot = 'default:steel_ingot'
+if  minetest.get_modpath("moreores") then
+	block = 'moreores:silver_block'
+	ingot = 'moreores:silver_ingot'
+	
+end
+
+minetest.register_craft({
+	output = 'advtrains:moretrains_silberling',
+	recipe = {
+		{'default:steelblock', block, 'default:steelblock'},
+		{ingot, 'default:glass', ingot},
+		{'advtrains:wheel', '', 'advtrains:wheel'},
+	},
+})
+
+minetest.register_craft({
+	output = 'advtrains:moretrains_silberling_train',
+	recipe = {
+		{'default:steelblock', block, 'default:steelblock'},
+		{block, 'default:glass', ingot},
+		{'advtrains:wheel', 'advtrains:wheel', 'advtrains:wheel'},
+	},
+})
+
+minetest.register_craft({
+	output = 'advtrains:moretrains_railroad_car',
+	recipe = {
+		{'default:steelblock', 'default:tin_ingot', 'default:steelblock'},
+		{'default:steelblock', 'default:glass', 'default:steelblock'},
+		{'advtrains:wheel', '', 'advtrains:wheel'},
+	},
+})
diff --git a/moretrains_basic/models/moretrains_silberling.b3d b/moretrains_basic/models/moretrains_silberling.b3d
index 025f3d0..d14739e 100644
--- a/moretrains_basic/models/moretrains_silberling.b3d
+++ b/moretrains_basic/models/moretrains_silberling.b3d
diff --git a/moretrains_basic/models/moretrains_silberling_train.b3d b/moretrains_basic/models/moretrains_silberling_train.b3d
new file mode 100644
index 0000000..f345786
--- /dev/null
+++ b/moretrains_basic/models/moretrains_silberling_train.b3d
diff --git a/moretrains_basic/textures/dev/moretrains_silberling.xcf b/moretrains_basic/textures/dev/moretrains_silberling.xcf
index 1313e41..cf8fd2b 100644
--- a/moretrains_basic/textures/dev/moretrains_silberling.xcf
+++ b/moretrains_basic/textures/dev/moretrains_silberling.xcf
diff --git a/moretrains_basic/textures/dev/moretrains_silberling_train.xcf b/moretrains_basic/textures/dev/moretrains_silberling_train.xcf
new file mode 100644
index 0000000..f5a4e3b
--- /dev/null
+++ b/moretrains_basic/textures/dev/moretrains_silberling_train.xcf
diff --git a/moretrains_basic/textures/moretrains_silberling.png b/moretrains_basic/textures/moretrains_silberling.png
index 9107677..013cc3d 100644
--- a/moretrains_basic/textures/moretrains_silberling.png
+++ b/moretrains_basic/textures/moretrains_silberling.png
diff --git a/moretrains_basic/textures/moretrains_silberling_train.png b/moretrains_basic/textures/moretrains_silberling_train.png
new file mode 100644
index 0000000..64554d7
--- /dev/null
+++ b/moretrains_basic/textures/moretrains_silberling_train.png
diff --git a/moretrains_basic/textures/moretrains_silberling_train_inv.png b/moretrains_basic/textures/moretrains_silberling_train_inv.png
new file mode 100644
index 0000000..131c71a
--- /dev/null
+++ b/moretrains_basic/textures/moretrains_silberling_train_inv.png