Hu Nieds Se Deutsche Bahn Whenn Sie ADV-Bahn Eggsists

14 files changed, 68 insertions, 80 deletions

diff --git a/moretrains_basic/blend/german_diesel.blend b/moretrains_basic/blend/german_diesel.blend
new file mode 100644
index 0000000..56e47fe
--- /dev/null
+++ b/moretrains_basic/blend/german_diesel.blend
diff --git a/moretrains_basic/blend/moretrains_basic_railroad_car.blend b/moretrains_basic/blend/moretrains_basic_railroad_car.blend
index 0dc3907..27e477b 100644
--- a/moretrains_basic/blend/moretrains_basic_railroad_car.blend
+++ b/moretrains_basic/blend/moretrains_basic_railroad_car.blend
diff --git a/moretrains_basic/init.lua b/moretrains_basic/init.lua
index 1e85112..5c1c088 100644
--- a/moretrains_basic/init.lua
+++ b/moretrains_basic/init.lua
@@ -83,3 +83,42 @@ minetest.register_craft({
 	},
 })
 
+advtrains.register_wagon("moretrains_diesel_german", {
+	mesh="moretrains_diesel_german.b3d",
+	textures = {"moretrains_diesel_german.png"},
+	drives_on={default=true},
+	max_speed=20,
+	seats = {
+		{
+			name=S("Driver Stand (right)"),
+			attach_offset={x=0, y=-1.4, z=-7.2},
+			view_offset={x=2, y=0.2, z=-8},
+			driving_ctrl_access=true,
+			group = "dstand",
+		},
+		
+	},
+	seat_groups = {
+		dstand={
+			name = "Driver Stand",
+			access_to = {},
+			driving_ctrl_access = true,
+		},
+	},
+	assign_to_seat_group = {"dstand"},
+	visual_size = {x=1, y=1},
+	wagon_span=2.8,
+	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("Old German Diesel"), "moretrains_diesel_german_inv.png")
+
+minetest.register_craft({
+	output = 'advtrains:moretrains_diesel_german',
+	recipe = {
+		{'default:glass', 'dye:red', ''},
+		{'default:steelblock', 'advtrains:driver_cab', 'default:steelblock'},
+		{'advtrains:wheel', 'advtrains:wheel', 'advtrains:wheel'},
+	},
+})
diff --git a/moretrains_basic/models/moretrains_diesel_german.b3d b/moretrains_basic/models/moretrains_diesel_german.b3d
new file mode 100644
index 0000000..48f437a
--- /dev/null
+++ b/moretrains_basic/models/moretrains_diesel_german.b3d
diff --git a/moretrains_basic/textures/moretrains_diesel_german.png b/moretrains_basic/textures/moretrains_diesel_german.png
new file mode 100644
index 0000000..638db08
--- /dev/null
+++ b/moretrains_basic/textures/moretrains_diesel_german.png
diff --git a/moretrains_basic/textures/moretrains_diesel_german_inv.png b/moretrains_basic/textures/moretrains_diesel_german_inv.png
new file mode 100755
index 0000000..5e68934
--- /dev/null
+++ b/moretrains_basic/textures/moretrains_diesel_german_inv.png
diff --git a/moretrains_basic/textures/moretrains_railroad_car.png b/moretrains_basic/textures/moretrains_railroad_car.png
index 545dc87..c002002 100644
--- a/moretrains_basic/textures/moretrains_railroad_car.png
+++ b/moretrains_basic/textures/moretrains_railroad_car.png
diff --git a/moretrains_basic/textures/moretrains_unknown_engine_inv.png b/moretrains_basic/textures/moretrains_unknown_engine_inv.png
new file mode 100644
index 0000000..26d33c1
--- /dev/null
+++ b/moretrains_basic/textures/moretrains_unknown_engine_inv.png
diff --git a/moretrains_basic/textures/moretrains_unknown_wagon_inv.png b/moretrains_basic/textures/moretrains_unknown_wagon_inv.png
index 9a0efbf..1b78ed1 100644
--- a/moretrains_basic/textures/moretrains_unknown_wagon_inv.png
+++ b/moretrains_basic/textures/moretrains_unknown_wagon_inv.png
diff --git a/moretrains_steam/init.lua b/moretrains_steam/init.lua
index 7db6c3f..b37f0ce 100644
--- a/moretrains_steam/init.lua
+++ b/moretrains_steam/init.lua
@@ -112,64 +112,6 @@ advtrains.register_wagon("moretrains_tender", {
 	},
 }, S("Tender #1"), "moretrains_steam_tender_inv.png")
 
-advtrains.register_wagon("steam_train", {
-	mesh="moretrains_steam_train.b3d",
-	textures = {"moretrains_steam_train.png"},
-	is_locomotive=true,
-	drives_on={default=true},
-	max_speed=11,
-	seats = {
-		{
-			name=S("Driver Stand (left)"),
-			attach_offset={x=-5, y=0, z=-15},
-			view_offset={x=0, y=6, z=0},
-			group = "dstand",
-		},
-		{
-			name=S("Driver Stand (right)"),
-			attach_offset={x=5, y=0, z=-15},
-			view_offset={x=0, y=6, z=0},
-			group = "dstand",
-		},
-	},
-	seat_groups = {
-		dstand={
-			name = "Driver Stand",
-			driving_ctrl_access=true,
-			access_to = {},
-		},
-	},
-	assign_to_seat_group = {"dstand"},
-	visual_size = {x=1, y=1},
-	wagon_span=2.567,
-	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},
-	drops={"default:steelblock 1"},
-	horn_sound = "advtrains_steam_whistle",
-}, S("Steam Train (Deprecated) will be removed soon"), "moretrains_deprecated.png")
-
-advtrains.register_wagon("tender", {
-	mesh="moretrains_steam_tender.b3d",
-	textures = {"moretrains_steam_tender.png"},
-	drives_on={default=true},
-	max_speed=30,
-	seats = {},
-	visual_size = {x=1, y=1},
-	wagon_span=1.667,
-	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},
-	drops={"default:steelblock 1"},
-	has_inventory = true,
-	get_inventory_formspec = function(self, pname, invname)
-		return "size[8,11]"..
-			"list["..invname..";box;0,0;8,3;]"..
-			"list[current_player;main;0,5;8,4;]"..
-			"listring[]"
-	end,
-	inventory_list_sizes = {
-		box=1*8,
-	},
-}, S("Tender (Deprecated) will be removed soon"), "moretrains_deprecated.png")
-
-
 
 
 minetest.register_craft({
diff --git a/moretrains_steam/textures/legacy/moretrains_steam_tender.xcf b/moretrains_steam/textures/legacy/moretrains_steam_tender.xcf
deleted file mode 100644
index b81521b..0000000
--- a/moretrains_steam/textures/legacy/moretrains_steam_tender.xcf
+++ /dev/null
diff --git a/moretrains_steam/textures/legacy/moretrains_steam_train.xcf b/moretrains_steam/textures/legacy/moretrains_steam_train.xcf
deleted file mode 100644
index 4e521d3..0000000
--- a/moretrains_steam/textures/legacy/moretrains_steam_train.xcf
+++ /dev/null
diff --git a/moretrains_steam/textures/moretrains_deprecated.png b/moretrains_steam/textures/moretrains_deprecated.png
deleted file mode 100644
index 922153f..0000000
--- a/moretrains_steam/textures/moretrains_deprecated.png
+++ /dev/null
diff --git a/readme.txt b/readme.txt
index 11abff2..e20d300 100644
--- a/readme.txt
+++ b/readme.txt
@@ -5,44 +5,51 @@ License of code: LGPL 2.1
 

 mod - moretrains_steam:

 

-moretrains_steam

-	model: based on https://archive.org/download/dampflock_better/dampflock_better.blend / mbb

-	texture: own

-	icon: based on advtrains_engine_steam_inv.png from advtrains / mbb

+	moretrains_steam

+		model: based on https://archive.org/download/dampflock_better/dampflock_better.blend / mbb

+		texture: own

+		icon: based on advtrains_engine_steam_inv.png from advtrains / mbb

 

 

-moretrains_steam_tender

-	model: own 

-	texture: own, uses default_coal_block.png from minetest game (Zeg9)

-	icon: based on advtrains_engine_steam_inv.png from advtrains / mbb

+	moretrains_steam_tender

+		model: own 

+		texture: own, uses default_coal_block.png from minetest game (Zeg9)

+		icon: based on advtrains_engine_steam_inv.png from advtrains / mbb

 

 mod - moretrains_industrial:

 

-moretrains_wagon_*

-	models: own

-	textures: own

-		wood wagon uses default tree texture from default (Cisoun)

-	icons: based on icons from advtrains

+	moretrains_wagon_*

+		models: own

+		textures: own

+			wood wagon uses default tree texture from default (Cisoun)

+		icons: based on icons from advtrains

 

 mod - moretrains_japan:

 

-	models and textures: own

-	icons: based on icons from advtrains

+		models and textures: own

+		icons: based on icons from advtrains

 

 mod - moretrains_vintage:

 

-	models: own 

-	texture: own, uses default_coal_block.png from minetest game (Zeg9)

-	icons: own

+		models: own 

+		texture: own, uses default_coal_block.png from minetest game (Zeg9)

+		icons: own

 

 mod -moretrains_basic:

 

-	model: own

-	texture: own

-	icons: based on icons from advtrains

+	railroad_car

+

+		model: own 

+		texture: own

+		icon: own

+

+	diesel train

+		model: own 

+		texture: own

+		icon: based on advtrains_engine_industrial_inv from advtrains / mbb

 

 

 planned wagons / trains:

 hopper car (industrial)

 more steam engine types

-diesel trains
\ No newline at end of file
+MOAR diesel trains
\ No newline at end of file