From 2d0b51b8970abb16c166708988e46fe4df668d47 Mon Sep 17 00:00:00 2001 From: orwell96 Date: Wed, 4 Jan 2017 19:10:03 +0100 Subject: Restructure mod directory --- advtrains/advtrains_train_subway/depends.txt | 1 + advtrains/advtrains_train_subway/init.lua | 30 +++++++++++++++++++++ .../models/advtrains_subway_train.b3d | Bin 0 -> 95856 bytes .../textures/advtrains_subway_train.png | Bin 0 -> 12002 bytes .../textures/advtrains_subway_train_inv.png | Bin 0 -> 900 bytes 5 files changed, 31 insertions(+) create mode 100644 advtrains/advtrains_train_subway/depends.txt create mode 100644 advtrains/advtrains_train_subway/init.lua create mode 100644 advtrains/advtrains_train_subway/models/advtrains_subway_train.b3d create mode 100644 advtrains/advtrains_train_subway/textures/advtrains_subway_train.png create mode 100644 advtrains/advtrains_train_subway/textures/advtrains_subway_train_inv.png (limited to 'advtrains/advtrains_train_subway') diff --git a/advtrains/advtrains_train_subway/depends.txt b/advtrains/advtrains_train_subway/depends.txt new file mode 100644 index 0000000..6f00bf6 --- /dev/null +++ b/advtrains/advtrains_train_subway/depends.txt @@ -0,0 +1 @@ +advtrains \ No newline at end of file diff --git a/advtrains/advtrains_train_subway/init.lua b/advtrains/advtrains_train_subway/init.lua new file mode 100644 index 0000000..b5bdb18 --- /dev/null +++ b/advtrains/advtrains_train_subway/init.lua @@ -0,0 +1,30 @@ + +advtrains.register_wagon("subway_wagon", { + mesh="advtrains_subway_train.b3d", + textures = {"advtrains_subway_train.png"}, + drives_on={default=true}, + max_speed=15, + seats = { + { + name="Default Seat (driver stand)", + attach_offset={x=0, y=10, z=0}, + view_offset={x=0, y=6, z=0}, + driving_ctrl_access=true, + }, + }, + visual_size = {x=1, y=1}, + wagon_span=1.8, + collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0}, + is_locomotive=true, + drops={"default:steelblock 4"}, +}, "Subway Passenger Wagon", "advtrains_subway_train_inv.png") + +--wagons +minetest.register_craft({ + output = 'advtrains:subway_wagon', + recipe = { + {'default:steelblock', 'default:steelblock', 'default:steelblock'}, + {'default:steelblock', 'dye:yellow', 'default:steelblock'}, + {'default:steelblock', 'default:steelblock', 'default:steelblock'}, + }, +}) diff --git a/advtrains/advtrains_train_subway/models/advtrains_subway_train.b3d b/advtrains/advtrains_train_subway/models/advtrains_subway_train.b3d new file mode 100644 index 0000000..a824d33 Binary files /dev/null and b/advtrains/advtrains_train_subway/models/advtrains_subway_train.b3d differ diff --git a/advtrains/advtrains_train_subway/textures/advtrains_subway_train.png b/advtrains/advtrains_train_subway/textures/advtrains_subway_train.png new file mode 100644 index 0000000..1d569f3 Binary files /dev/null and b/advtrains/advtrains_train_subway/textures/advtrains_subway_train.png differ diff --git a/advtrains/advtrains_train_subway/textures/advtrains_subway_train_inv.png b/advtrains/advtrains_train_subway/textures/advtrains_subway_train_inv.png new file mode 100644 index 0000000..1d0e809 Binary files /dev/null and b/advtrains/advtrains_train_subway/textures/advtrains_subway_train_inv.png differ -- cgit v1.2.3 From 9c400f7d435b4b1c303f1dd5ac31a8a52b263355 Mon Sep 17 00:00:00 2001 From: orwell96 Date: Tue, 17 Jan 2017 20:02:25 +0100 Subject: Model, animate, texture and integrate new subway wagon engine follows! --- advtrains/advtrains_train_subway/init.lua | 10 +++++++--- .../models/advtrains_subway_train.b3d | Bin 95856 -> 0 bytes .../models/advtrains_subway_wagon.b3d | Bin 0 -> 459309 bytes .../textures/advtrains_subway_train.png | Bin 12002 -> 0 bytes .../textures/advtrains_subway_train_inv.png | Bin 900 -> 0 bytes .../textures/advtrains_subway_wagon.png | Bin 0 -> 3618 bytes .../textures/advtrains_subway_wagon_inv.png | Bin 0 -> 900 bytes 7 files changed, 7 insertions(+), 3 deletions(-) delete mode 100644 advtrains/advtrains_train_subway/models/advtrains_subway_train.b3d create mode 100644 advtrains/advtrains_train_subway/models/advtrains_subway_wagon.b3d delete mode 100644 advtrains/advtrains_train_subway/textures/advtrains_subway_train.png delete mode 100644 advtrains/advtrains_train_subway/textures/advtrains_subway_train_inv.png create mode 100644 advtrains/advtrains_train_subway/textures/advtrains_subway_wagon.png create mode 100644 advtrains/advtrains_train_subway/textures/advtrains_subway_wagon_inv.png (limited to 'advtrains/advtrains_train_subway') diff --git a/advtrains/advtrains_train_subway/init.lua b/advtrains/advtrains_train_subway/init.lua index b5bdb18..c68395c 100644 --- a/advtrains/advtrains_train_subway/init.lua +++ b/advtrains/advtrains_train_subway/init.lua @@ -1,7 +1,7 @@ advtrains.register_wagon("subway_wagon", { - mesh="advtrains_subway_train.b3d", - textures = {"advtrains_subway_train.png"}, + mesh="advtrains_subway_wagon.b3d", + textures = {"advtrains_subway_wagon.png"}, drives_on={default=true}, max_speed=15, seats = { @@ -17,7 +17,11 @@ advtrains.register_wagon("subway_wagon", { collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0}, is_locomotive=true, drops={"default:steelblock 4"}, -}, "Subway Passenger Wagon", "advtrains_subway_train_inv.png") + --custom_on_activate = function(self, dtime_s) + -- atprint("subway custom_on_activate") + -- self.object:set_animation({x=1,y=80}, 15, 0, true) + --end, +}, "Subway Passenger Wagon", "advtrains_subway_wagon_inv.png") --wagons minetest.register_craft({ diff --git a/advtrains/advtrains_train_subway/models/advtrains_subway_train.b3d b/advtrains/advtrains_train_subway/models/advtrains_subway_train.b3d deleted file mode 100644 index a824d33..0000000 Binary files a/advtrains/advtrains_train_subway/models/advtrains_subway_train.b3d and /dev/null differ diff --git a/advtrains/advtrains_train_subway/models/advtrains_subway_wagon.b3d b/advtrains/advtrains_train_subway/models/advtrains_subway_wagon.b3d new file mode 100644 index 0000000..8f35769 Binary files /dev/null and b/advtrains/advtrains_train_subway/models/advtrains_subway_wagon.b3d differ diff --git a/advtrains/advtrains_train_subway/textures/advtrains_subway_train.png b/advtrains/advtrains_train_subway/textures/advtrains_subway_train.png deleted file mode 100644 index 1d569f3..0000000 Binary files a/advtrains/advtrains_train_subway/textures/advtrains_subway_train.png and /dev/null differ diff --git a/advtrains/advtrains_train_subway/textures/advtrains_subway_train_inv.png b/advtrains/advtrains_train_subway/textures/advtrains_subway_train_inv.png deleted file mode 100644 index 1d0e809..0000000 Binary files a/advtrains/advtrains_train_subway/textures/advtrains_subway_train_inv.png and /dev/null differ diff --git a/advtrains/advtrains_train_subway/textures/advtrains_subway_wagon.png b/advtrains/advtrains_train_subway/textures/advtrains_subway_wagon.png new file mode 100644 index 0000000..079d797 Binary files /dev/null and b/advtrains/advtrains_train_subway/textures/advtrains_subway_wagon.png differ diff --git a/advtrains/advtrains_train_subway/textures/advtrains_subway_wagon_inv.png b/advtrains/advtrains_train_subway/textures/advtrains_subway_wagon_inv.png new file mode 100644 index 0000000..1d0e809 Binary files /dev/null and b/advtrains/advtrains_train_subway/textures/advtrains_subway_wagon_inv.png differ -- cgit v1.2.3 From 262826fb8c7e2d5b64b2be1af07fcab1b24f0bd2 Mon Sep 17 00:00:00 2001 From: orwell96 Date: Tue, 17 Jan 2017 21:59:32 +0100 Subject: Correct view offset and wagon_span on new subway wagon --- advtrains/advtrains_train_subway/init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'advtrains/advtrains_train_subway') diff --git a/advtrains/advtrains_train_subway/init.lua b/advtrains/advtrains_train_subway/init.lua index c68395c..b105f1a 100644 --- a/advtrains/advtrains_train_subway/init.lua +++ b/advtrains/advtrains_train_subway/init.lua @@ -8,12 +8,12 @@ advtrains.register_wagon("subway_wagon", { { name="Default Seat (driver stand)", attach_offset={x=0, y=10, z=0}, - view_offset={x=0, y=6, z=0}, + view_offset={x=0, y=0, z=0}, driving_ctrl_access=true, }, }, visual_size = {x=1, y=1}, - wagon_span=1.8, + wagon_span=2, collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0}, is_locomotive=true, drops={"default:steelblock 4"}, -- cgit v1.2.3