From 2d0b51b8970abb16c166708988e46fe4df668d47 Mon Sep 17 00:00:00 2001 From: orwell96 Date: Wed, 4 Jan 2017 19:10:03 +0100 Subject: Restructure mod directory --- .../textures/advtrains_newlocomotive.png | Bin 0 -> 31800 bytes .../textures/advtrains_newlocomotive_inv.png | Bin 0 -> 469 bytes .../advtrains_train_steam/textures/advtrains_wagon.png | Bin 0 -> 35724 bytes .../textures/advtrains_wagon_box.png | Bin 0 -> 22503 bytes .../textures/advtrains_wagon_box_inv.png | Bin 0 -> 347 bytes .../textures/advtrains_wagon_inv.png | Bin 0 -> 709 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 advtrains/advtrains_train_steam/textures/advtrains_newlocomotive.png create mode 100644 advtrains/advtrains_train_steam/textures/advtrains_newlocomotive_inv.png create mode 100644 advtrains/advtrains_train_steam/textures/advtrains_wagon.png create mode 100644 advtrains/advtrains_train_steam/textures/advtrains_wagon_box.png create mode 100644 advtrains/advtrains_train_steam/textures/advtrains_wagon_box_inv.png create mode 100644 advtrains/advtrains_train_steam/textures/advtrains_wagon_inv.png (limited to 'advtrains/advtrains_train_steam/textures') diff --git a/advtrains/advtrains_train_steam/textures/advtrains_newlocomotive.png b/advtrains/advtrains_train_steam/textures/advtrains_newlocomotive.png new file mode 100644 index 0000000..e461bc7 Binary files /dev/null and b/advtrains/advtrains_train_steam/textures/advtrains_newlocomotive.png differ diff --git a/advtrains/advtrains_train_steam/textures/advtrains_newlocomotive_inv.png b/advtrains/advtrains_train_steam/textures/advtrains_newlocomotive_inv.png new file mode 100644 index 0000000..8d3fafb Binary files /dev/null and b/advtrains/advtrains_train_steam/textures/advtrains_newlocomotive_inv.png differ diff --git a/advtrains/advtrains_train_steam/textures/advtrains_wagon.png b/advtrains/advtrains_train_steam/textures/advtrains_wagon.png new file mode 100644 index 0000000..c37c979 Binary files /dev/null and b/advtrains/advtrains_train_steam/textures/advtrains_wagon.png differ diff --git a/advtrains/advtrains_train_steam/textures/advtrains_wagon_box.png b/advtrains/advtrains_train_steam/textures/advtrains_wagon_box.png new file mode 100644 index 0000000..8bfbe06 Binary files /dev/null and b/advtrains/advtrains_train_steam/textures/advtrains_wagon_box.png differ diff --git a/advtrains/advtrains_train_steam/textures/advtrains_wagon_box_inv.png b/advtrains/advtrains_train_steam/textures/advtrains_wagon_box_inv.png new file mode 100644 index 0000000..480f245 Binary files /dev/null and b/advtrains/advtrains_train_steam/textures/advtrains_wagon_box_inv.png differ diff --git a/advtrains/advtrains_train_steam/textures/advtrains_wagon_inv.png b/advtrains/advtrains_train_steam/textures/advtrains_wagon_inv.png new file mode 100644 index 0000000..0b72ac3 Binary files /dev/null and b/advtrains/advtrains_train_steam/textures/advtrains_wagon_inv.png differ -- cgit v1.2.3 From 9bc069f825daded364b2b52d443c8cb7b45a5a15 Mon Sep 17 00:00:00 2001 From: orwell96 Date: Fri, 6 Jan 2017 17:54:16 +0100 Subject: Add fancy passenger wagon --- advtrains/advtrains_train_steam/init.lua | 25 ++++++++++++++++----- .../models/advtrains_passenger_wagon.b3d | Bin 0 -> 341965 bytes .../textures/advtrains_wagon.png | Bin 35724 -> 42023 bytes assets/wagonfancytexture.png | Bin 0 -> 42023 bytes assets/wagong_fancy.blend | Bin 0 -> 1044484 bytes assets/wagong_fancy.blend1 | Bin 0 -> 1044524 bytes 6 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 advtrains/advtrains_train_steam/models/advtrains_passenger_wagon.b3d create mode 100644 assets/wagonfancytexture.png create mode 100644 assets/wagong_fancy.blend create mode 100644 assets/wagong_fancy.blend1 (limited to 'advtrains/advtrains_train_steam/textures') diff --git a/advtrains/advtrains_train_steam/init.lua b/advtrains/advtrains_train_steam/init.lua index ca52516..5010902 100644 --- a/advtrains/advtrains_train_steam/init.lua +++ b/advtrains/advtrains_train_steam/init.lua @@ -57,19 +57,34 @@ advtrains.register_wagon("newlocomotive", { drops={"default:steelblock 4"}, }, "Steam Engine", "advtrains_newlocomotive_inv.png") advtrains.register_wagon("wagon_default", { - mesh="advtrains_wagon.b3d", + mesh="advtrains_passenger_wagon.b3d", textures = {"advtrains_wagon.png"}, drives_on={default=true}, max_speed=10, seats = { { - name="Default Seat", - attach_offset={x=0, y=10, z=0}, - view_offset={x=0, y=6, z=0}, + name="1", + attach_offset={x=-4, y=8, z=8}, + view_offset={x=0, y=0, z=0}, + }, + { + name="2", + attach_offset={x=4, y=8, z=8}, + view_offset={x=0, y=0, z=0}, + }, + { + name="3", + attach_offset={x=-4, y=8, z=-8}, + view_offset={x=0, y=0, z=0}, + }, + { + name="4", + attach_offset={x=4, y=8, z=-8}, + view_offset={x=0, y=0, z=0}, }, }, visual_size = {x=1, y=1}, - wagon_span=1.8, + wagon_span=3.1, collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0}, drops={"default:steelblock 4"}, }, "Passenger Wagon", "advtrains_wagon_inv.png") diff --git a/advtrains/advtrains_train_steam/models/advtrains_passenger_wagon.b3d b/advtrains/advtrains_train_steam/models/advtrains_passenger_wagon.b3d new file mode 100644 index 0000000..bb057f8 Binary files /dev/null and b/advtrains/advtrains_train_steam/models/advtrains_passenger_wagon.b3d differ diff --git a/advtrains/advtrains_train_steam/textures/advtrains_wagon.png b/advtrains/advtrains_train_steam/textures/advtrains_wagon.png index c37c979..c850518 100644 Binary files a/advtrains/advtrains_train_steam/textures/advtrains_wagon.png and b/advtrains/advtrains_train_steam/textures/advtrains_wagon.png differ diff --git a/assets/wagonfancytexture.png b/assets/wagonfancytexture.png new file mode 100644 index 0000000..c850518 Binary files /dev/null and b/assets/wagonfancytexture.png differ diff --git a/assets/wagong_fancy.blend b/assets/wagong_fancy.blend new file mode 100644 index 0000000..f9e44d5 Binary files /dev/null and b/assets/wagong_fancy.blend differ diff --git a/assets/wagong_fancy.blend1 b/assets/wagong_fancy.blend1 new file mode 100644 index 0000000..5c6c328 Binary files /dev/null and b/assets/wagong_fancy.blend1 differ -- cgit v1.2.3 From b6e2aeea71394431889e9b554f190dda4adb0305 Mon Sep 17 00:00:00 2001 From: orwell96 Date: Tue, 17 Jan 2017 21:54:50 +0100 Subject: Add animation for steam engine I needed to completely rewrite the animation because irrlicht couldn't handle the animation NathanS created. --- advtrains/advtrains_train_steam/init.lua | 13 +++++++------ .../models/advtrains_engine_steam.b3d | Bin 298687 -> 437126 bytes .../textures/advtrains_newlocomotive.png | Bin 31800 -> 31915 bytes assets/blender/engine-with-animation_newtry.blend | Bin 0 -> 638904 bytes assets/blender/engine-with-animation_newtry.blend1 | Bin 0 -> 615608 bytes 5 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 assets/blender/engine-with-animation_newtry.blend create mode 100644 assets/blender/engine-with-animation_newtry.blend1 (limited to 'advtrains/advtrains_train_steam/textures') diff --git a/advtrains/advtrains_train_steam/init.lua b/advtrains/advtrains_train_steam/init.lua index 5010902..232ffe1 100644 --- a/advtrains/advtrains_train_steam/init.lua +++ b/advtrains/advtrains_train_steam/init.lua @@ -21,12 +21,13 @@ advtrains.register_wagon("newlocomotive", { visual_size = {x=1, y=1}, wagon_span=1.85, collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0}, - --update_animation=function(self, velocity) - --if self.old_anim_velocity~=advtrains.abs_ceil(velocity) then - -- self.object:set_animation({x=1,y=60}, 100)--math.floor(velocity)) - --self.old_anim_velocity=advtrains.abs_ceil(velocity) - --end - --end, + update_animation=function(self, velocity) + if self.old_anim_velocity~=advtrains.abs_ceil(velocity) then + atprint("set_anim",advtrains.abs_ceil(velocity)*15) + self.object:set_animation({x=1,y=80}, advtrains.abs_ceil(velocity)*15, 0, true) + self.old_anim_velocity=advtrains.abs_ceil(velocity) + end + end, custom_on_activate = function(self, staticdata_table, dtime_s) minetest.add_particlespawner({ amount = 10, diff --git a/advtrains/advtrains_train_steam/models/advtrains_engine_steam.b3d b/advtrains/advtrains_train_steam/models/advtrains_engine_steam.b3d index 36bdd15..6a92f57 100644 Binary files a/advtrains/advtrains_train_steam/models/advtrains_engine_steam.b3d and b/advtrains/advtrains_train_steam/models/advtrains_engine_steam.b3d differ diff --git a/advtrains/advtrains_train_steam/textures/advtrains_newlocomotive.png b/advtrains/advtrains_train_steam/textures/advtrains_newlocomotive.png index e461bc7..4b27e77 100644 Binary files a/advtrains/advtrains_train_steam/textures/advtrains_newlocomotive.png and b/advtrains/advtrains_train_steam/textures/advtrains_newlocomotive.png differ diff --git a/assets/blender/engine-with-animation_newtry.blend b/assets/blender/engine-with-animation_newtry.blend new file mode 100644 index 0000000..101dc71 Binary files /dev/null and b/assets/blender/engine-with-animation_newtry.blend differ diff --git a/assets/blender/engine-with-animation_newtry.blend1 b/assets/blender/engine-with-animation_newtry.blend1 new file mode 100644 index 0000000..77d82d4 Binary files /dev/null and b/assets/blender/engine-with-animation_newtry.blend1 differ -- cgit v1.2.3 From 2f5ebd63c38932dbda30b96e8ce20e70474b1f15 Mon Sep 17 00:00:00 2001 From: orwell96 Date: Tue, 17 Jan 2017 22:31:29 +0100 Subject: Add detailed steam engine contributed by mbb and Krokoschlange --- advtrains/advtrains_train_steam/init.lua | 65 ++++++++++++++++++++- .../models/advtrains_detailed_steam_engine.b3d | Bin 0 -> 468002 bytes .../textures/advtrains_detailed_steam_engine.png | Bin 0 -> 61988 bytes .../textures/advtrains_engine_steam.png | Bin 0 -> 31915 bytes .../textures/advtrains_engine_steam_inv.png | Bin 0 -> 469 bytes .../textures/advtrains_newlocomotive.png | Bin 31915 -> 0 bytes .../textures/advtrains_newlocomotive_inv.png | Bin 469 -> 0 bytes .../dampflock4pipe_animated.blend | Bin 0 -> 859028 bytes .../dampflock4pipe_animated.blend1 | Bin 0 -> 859028 bytes 9 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 advtrains/advtrains_train_steam/models/advtrains_detailed_steam_engine.b3d create mode 100644 advtrains/advtrains_train_steam/textures/advtrains_detailed_steam_engine.png create mode 100644 advtrains/advtrains_train_steam/textures/advtrains_engine_steam.png create mode 100644 advtrains/advtrains_train_steam/textures/advtrains_engine_steam_inv.png delete mode 100644 advtrains/advtrains_train_steam/textures/advtrains_newlocomotive.png delete mode 100644 advtrains/advtrains_train_steam/textures/advtrains_newlocomotive_inv.png create mode 100644 assets/Weichenhebel-CooleLokAnimiert/dampflock4pipe_animated.blend create mode 100644 assets/Weichenhebel-CooleLokAnimiert/dampflock4pipe_animated.blend1 (limited to 'advtrains/advtrains_train_steam/textures') diff --git a/advtrains/advtrains_train_steam/init.lua b/advtrains/advtrains_train_steam/init.lua index 232ffe1..22f525f 100644 --- a/advtrains/advtrains_train_steam/init.lua +++ b/advtrains/advtrains_train_steam/init.lua @@ -1,6 +1,6 @@ advtrains.register_wagon("newlocomotive", { mesh="advtrains_engine_steam.b3d", - textures = {"advtrains_newlocomotive.png"}, + textures = {"advtrains_engine_steam.png"}, is_locomotive=true, drives_on={default=true}, max_speed=10, @@ -23,7 +23,6 @@ advtrains.register_wagon("newlocomotive", { collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0}, update_animation=function(self, velocity) if self.old_anim_velocity~=advtrains.abs_ceil(velocity) then - atprint("set_anim",advtrains.abs_ceil(velocity)*15) self.object:set_animation({x=1,y=80}, advtrains.abs_ceil(velocity)*15, 0, true) self.old_anim_velocity=advtrains.abs_ceil(velocity) end @@ -56,7 +55,67 @@ advtrains.register_wagon("newlocomotive", { }) end, drops={"default:steelblock 4"}, -}, "Steam Engine", "advtrains_newlocomotive_inv.png") +}, "Steam Engine", "advtrains_engine_steam_inv.png") + +advtrains.register_wagon("detailed_steam_engine", { + mesh="advtrains_detailed_steam_engine.b3d", + textures = {"advtrains_detailed_steam_engine.png"}, + is_locomotive=true, + drives_on={default=true}, + max_speed=10, + seats = { + { + name="Driver Stand (left)", + attach_offset={x=-5, y=10, z=-10}, + view_offset={x=0, y=6, z=0}, + driving_ctrl_access=true, + }, + { + name="Driver Stand (right)", + attach_offset={x=5, y=10, z=-10}, + view_offset={x=0, y=6, z=0}, + driving_ctrl_access=true, + }, + }, + visual_size = {x=1, y=1}, + wagon_span=2.05, + collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0}, + update_animation=function(self, velocity) + if self.old_anim_velocity~=advtrains.abs_ceil(velocity) then + self.object:set_animation({x=1,y=80}, advtrains.abs_ceil(velocity)*15, 0, true) + self.old_anim_velocity=advtrains.abs_ceil(velocity) + end + end, + custom_on_activate = function(self, staticdata_table, dtime_s) + minetest.add_particlespawner({ + amount = 10, + time = 0, + -- ^ If time is 0 has infinite lifespan and spawns the amount on a per-second base + minpos = {x=0, y=2.3, z=1.45}, + maxpos = {x=0, y=2.3, z=1.4}, + minvel = {x=-0.2, y=1.8, z=-0.2}, + maxvel = {x=0.2, y=2, z=0.2}, + minacc = {x=0, y=-0.1, z=0}, + maxacc = {x=0, y=-0.3, z=0}, + minexptime = 2, + maxexptime = 4, + minsize = 1, + maxsize = 5, + -- ^ The particle's properties are random values in between the bounds: + -- ^ minpos/maxpos, minvel/maxvel (velocity), minacc/maxacc (acceleration), + -- ^ minsize/maxsize, minexptime/maxexptime (expirationtime) + collisiondetection = true, + -- ^ collisiondetection: if true uses collision detection + vertical = false, + -- ^ vertical: if true faces player using y axis only + texture = "smoke_puff.png", + -- ^ Uses texture (string) + attached = self.object, + }) + end, + drops={"default:steelblock 4"}, +}, "Detailed Steam Engine", "advtrains_engine_steam_inv.png") + advtrains.register_wagon("wagon_default", { mesh="advtrains_passenger_wagon.b3d", textures = {"advtrains_wagon.png"}, diff --git a/advtrains/advtrains_train_steam/models/advtrains_detailed_steam_engine.b3d b/advtrains/advtrains_train_steam/models/advtrains_detailed_steam_engine.b3d new file mode 100644 index 0000000..7418d8a Binary files /dev/null and b/advtrains/advtrains_train_steam/models/advtrains_detailed_steam_engine.b3d differ diff --git a/advtrains/advtrains_train_steam/textures/advtrains_detailed_steam_engine.png b/advtrains/advtrains_train_steam/textures/advtrains_detailed_steam_engine.png new file mode 100644 index 0000000..eab4dc8 Binary files /dev/null and b/advtrains/advtrains_train_steam/textures/advtrains_detailed_steam_engine.png differ diff --git a/advtrains/advtrains_train_steam/textures/advtrains_engine_steam.png b/advtrains/advtrains_train_steam/textures/advtrains_engine_steam.png new file mode 100644 index 0000000..4b27e77 Binary files /dev/null and b/advtrains/advtrains_train_steam/textures/advtrains_engine_steam.png differ diff --git a/advtrains/advtrains_train_steam/textures/advtrains_engine_steam_inv.png b/advtrains/advtrains_train_steam/textures/advtrains_engine_steam_inv.png new file mode 100644 index 0000000..8d3fafb Binary files /dev/null and b/advtrains/advtrains_train_steam/textures/advtrains_engine_steam_inv.png differ diff --git a/advtrains/advtrains_train_steam/textures/advtrains_newlocomotive.png b/advtrains/advtrains_train_steam/textures/advtrains_newlocomotive.png deleted file mode 100644 index 4b27e77..0000000 Binary files a/advtrains/advtrains_train_steam/textures/advtrains_newlocomotive.png and /dev/null differ diff --git a/advtrains/advtrains_train_steam/textures/advtrains_newlocomotive_inv.png b/advtrains/advtrains_train_steam/textures/advtrains_newlocomotive_inv.png deleted file mode 100644 index 8d3fafb..0000000 Binary files a/advtrains/advtrains_train_steam/textures/advtrains_newlocomotive_inv.png and /dev/null differ diff --git a/assets/Weichenhebel-CooleLokAnimiert/dampflock4pipe_animated.blend b/assets/Weichenhebel-CooleLokAnimiert/dampflock4pipe_animated.blend new file mode 100644 index 0000000..cf3b1da Binary files /dev/null and b/assets/Weichenhebel-CooleLokAnimiert/dampflock4pipe_animated.blend differ diff --git a/assets/Weichenhebel-CooleLokAnimiert/dampflock4pipe_animated.blend1 b/assets/Weichenhebel-CooleLokAnimiert/dampflock4pipe_animated.blend1 new file mode 100644 index 0000000..cbc247b Binary files /dev/null and b/assets/Weichenhebel-CooleLokAnimiert/dampflock4pipe_animated.blend1 differ -- cgit v1.2.3