From 436d983b1e80ef065ca1f2899a50ed4c83e736b6 Mon Sep 17 00:00:00 2001 From: rbduck Date: Sat, 25 Apr 2020 12:24:06 +0200 Subject: draisine and minecart - done --- moretrains_japan/init.lua | 2 +- .../blend/legacy/moretrains_draisine.blend | Bin 0 -> 709104 bytes moretrains_vintage/blend/moretrains_draisine.blend | Bin 709104 -> 0 bytes .../blend/moretrains_draisine.blend1 | Bin 709104 -> 0 bytes .../blend/moretrains_draisine_anim.blend | Bin 0 -> 736836 bytes .../blend/moretrains_minecart.blend1 | Bin 706520 -> 0 bytes .../blend/moretrains_minecart_engine.blend | Bin 0 -> 706564 bytes .../blend/moretrains_minecart_loaded.blend1 | Bin 713452 -> 0 bytes moretrains_vintage/init.lua | 147 ++++++++++++--------- moretrains_vintage/models/moretrains_draisine.b3d | Bin 35329 -> 64169 bytes .../models/moretrains_minecart_engine.b3d | Bin 0 -> 34389 bytes .../textures/moretrains_draisine_inv.png | Bin 1505 -> 1889 bytes .../textures/moretrains_item_lever.png | Bin 0 -> 2270 bytes .../textures/moretrains_minecart_engine_inv.png | Bin 0 -> 2161 bytes .../textures/moretrains_minecart_inv.png | Bin 1819 -> 2165 bytes .../textures/moretrains_minecart_loaded_inv.png | Bin 0 -> 2213 bytes moretrains_vintage/textures/moretrains_vintage.png | Bin 60600 -> 62572 bytes moretrains_vintage/textures/moretrains_vintage.xcf | Bin 222463 -> 0 bytes readme.txt | 4 +- 19 files changed, 86 insertions(+), 67 deletions(-) create mode 100644 moretrains_vintage/blend/legacy/moretrains_draisine.blend delete mode 100644 moretrains_vintage/blend/moretrains_draisine.blend delete mode 100644 moretrains_vintage/blend/moretrains_draisine.blend1 create mode 100644 moretrains_vintage/blend/moretrains_draisine_anim.blend delete mode 100644 moretrains_vintage/blend/moretrains_minecart.blend1 create mode 100644 moretrains_vintage/blend/moretrains_minecart_engine.blend delete mode 100644 moretrains_vintage/blend/moretrains_minecart_loaded.blend1 create mode 100644 moretrains_vintage/models/moretrains_minecart_engine.b3d create mode 100644 moretrains_vintage/textures/moretrains_item_lever.png create mode 100644 moretrains_vintage/textures/moretrains_minecart_engine_inv.png create mode 100644 moretrains_vintage/textures/moretrains_minecart_loaded_inv.png delete mode 100644 moretrains_vintage/textures/moretrains_vintage.xcf diff --git a/moretrains_japan/init.lua b/moretrains_japan/init.lua index 268b18a..d1abc2b 100644 --- a/moretrains_japan/init.lua +++ b/moretrains_japan/init.lua @@ -13,7 +13,7 @@ advtrains.register_wagon("moretrains_engine_japan", { seats = { { name=S("Driver stand"), - attach_offset={x=0, y=-2, z=13}, + attach_offset={x=1, y=1, z=0}, view_offset={x=0, y=1.5, z=0}, group="dstand", }, diff --git a/moretrains_vintage/blend/legacy/moretrains_draisine.blend b/moretrains_vintage/blend/legacy/moretrains_draisine.blend new file mode 100644 index 0000000..8b25acc Binary files /dev/null and b/moretrains_vintage/blend/legacy/moretrains_draisine.blend differ diff --git a/moretrains_vintage/blend/moretrains_draisine.blend b/moretrains_vintage/blend/moretrains_draisine.blend deleted file mode 100644 index 8b25acc..0000000 Binary files a/moretrains_vintage/blend/moretrains_draisine.blend and /dev/null differ diff --git a/moretrains_vintage/blend/moretrains_draisine.blend1 b/moretrains_vintage/blend/moretrains_draisine.blend1 deleted file mode 100644 index 09f4c0e..0000000 Binary files a/moretrains_vintage/blend/moretrains_draisine.blend1 and /dev/null differ diff --git a/moretrains_vintage/blend/moretrains_draisine_anim.blend b/moretrains_vintage/blend/moretrains_draisine_anim.blend new file mode 100644 index 0000000..bb396cb Binary files /dev/null and b/moretrains_vintage/blend/moretrains_draisine_anim.blend differ diff --git a/moretrains_vintage/blend/moretrains_minecart.blend1 b/moretrains_vintage/blend/moretrains_minecart.blend1 deleted file mode 100644 index b0a575d..0000000 Binary files a/moretrains_vintage/blend/moretrains_minecart.blend1 and /dev/null differ diff --git a/moretrains_vintage/blend/moretrains_minecart_engine.blend b/moretrains_vintage/blend/moretrains_minecart_engine.blend new file mode 100644 index 0000000..c3318dc Binary files /dev/null and b/moretrains_vintage/blend/moretrains_minecart_engine.blend differ diff --git a/moretrains_vintage/blend/moretrains_minecart_loaded.blend1 b/moretrains_vintage/blend/moretrains_minecart_loaded.blend1 deleted file mode 100644 index a9dd1bc..0000000 Binary files a/moretrains_vintage/blend/moretrains_minecart_loaded.blend1 and /dev/null differ diff --git a/moretrains_vintage/init.lua b/moretrains_vintage/init.lua index 6d5faa9..881ba13 100644 --- a/moretrains_vintage/init.lua +++ b/moretrains_vintage/init.lua @@ -5,6 +5,8 @@ else S = function(s,a,...)a={a,...}return s:gsub("@(%d+)",function(n)return a[tonumber(n)]end)end end + + advtrains.register_wagon("moretrains_draisine", { mesh="moretrains_draisine.b3d", textures = {"moretrains_vintage.png"}, @@ -13,32 +15,14 @@ advtrains.register_wagon("moretrains_draisine", { seats = { { name=S("Driver stand"), - attach_offset={x=0, y=-2, z=13}, - view_offset={x=0, y=1.5, z=0}, + attach_offset={x=0, y=1, z=-8.7}, + view_offset={x=0, y=1.5, z=-1}, group="dstand", }, { name="1", - attach_offset={x=-4, y=-2, z=0}, - view_offset={x=0, y=-2, z=0}, - group="pass", - }, - { - name="2", - 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=-2, z=-8}, - view_offset={x=0, y=-2, z=0}, + attach_offset={x=0, y=1, z=8.7}, + view_offset={x=0, y=1.5, z=1}, group="pass", }, }, @@ -60,6 +44,12 @@ advtrains.register_wagon("moretrains_draisine", { wagon_span=1.06, is_locomotive=true, collisionbox = {-0.8,-0.5,-0.7, 0.8,2,0.7}, + custom_on_velocity_change=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)*14, 0, true) + self.old_anim_velocity=advtrains.abs_ceil(velocity) + end + end, drops={"default:wood"}, }, S("Draisine"), "moretrains_draisine_inv.png") @@ -107,43 +97,25 @@ advtrains.register_wagon("moretrains_minecart_loaded", { box=1*4, }, -}, S("Minecart (loaded)"), "moretrains_minecart_inv.png") +}, S("Minecart (loaded)"), "moretrains_minecart_loaded_inv.png") advtrains.register_wagon("moretrains_minecart_engine", { - mesh="moretrains_minecart.b3d", + mesh="moretrains_minecart_engine.b3d", textures = {"moretrains_vintage.png"}, drives_on={default=true}, max_speed=6, seats = { { name=S("Driver stand"), - attach_offset={x=0, y=-2, z=13}, - view_offset={x=0, y=1.5, z=0}, + attach_offset={x=0, y=2, z=5.5}, + view_offset={x=0, y=1.5, z=-1}, group="dstand", }, { name="1", - attach_offset={x=-4, y=-2, z=0}, - view_offset={x=0, y=-2, z=0}, - group="pass", - }, - { - name="2", - 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=-2, z=-8}, - view_offset={x=0, y=-2, z=0}, + attach_offset={x=0, y=2, z=0.5}, + view_offset={x=0, y=1.5, z=1}, group="pass", }, }, @@ -168,23 +140,68 @@ advtrains.register_wagon("moretrains_minecart_engine", { collisionbox = {-0.8,-0.5,-0.7, 0.8,2,0.7}, drops={"default:wood"}, -}, S("Minecart with Engine"), "moretrains_minecart_inv.png") - ---minetest.register_craft({ --- output = 'advtrains:moretrains_draisine', --- recipe = { --- {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, --- {'default:glass', 'dye:green', 'default:glass'}, --- {'advtrains:wheel', '', 'advtrains:wheel'}, --- }, ---}) - ---minetest.register_craft({ --- output = 'advtrains:moretrains_minecart', --- recipe = { --- {'default:steel_ingot', 'default:steel_ingot', ''}, --- {'default:glass', 'dye:green', 'default:glass'}, --- {'advtrains:wheel', 'advtrains:wheel', 'advtrains:wheel'}, --- }, ---}) +}, S("Minecart with Engine"), "moretrains_minecart_engine_inv.png") + +minetest.register_craftitem("moretrains_vintage:item_draisine_lever", { + description = S("lever for draisine"), + inventory_image = "moretrains_item_lever.png" +}) + +minetest.register_craft({ + output = "moretrains_vintage:item_draisine_lever", + recipe = { + {"default:steel_ingot", "default:stick", "default:steel_ingot"}, + {"", "default:stick", ""}, + {"", "default:steel_ingot", ""}, + }, +}) + +minetest.register_craft({ + output = 'advtrains:moretrains_draisine', + recipe = { + {'', 'moretrains_vintage:item_draisine_lever', ''}, + {'group:wood', 'group:wood', 'group:wood'}, + {'advtrains:wheel', '', 'advtrains:wheel'}, + }, +}) + +minetest.register_craft({ + output = 'advtrains:moretrains_minecart', + recipe = { + {'group:wood', '', 'group:wood'}, + {'default:steel_ingot', 'group:wood', 'default:steel_ingot'}, + {'advtrains:wheel', '', 'advtrains:wheel'}, + }, +}) + +minetest.register_craft({ + output = 'advtrains:moretrains_minecart_loaded', + recipe = { + {'group:wood', 'default:coalblock', 'group:wood'}, + {'default:steel_ingot', 'group:wood', 'default:steel_ingot'}, + {'advtrains:wheel', '', 'advtrains:wheel'}, + }, +}) + +minetest.register_craft({ + output = 'advtrains:moretrains_minecart_engine', + recipe = { + {'group:wood', '', 'group:wood'}, + {'default:steel_ingot', 'group:wood', 'default:steel_ingot'}, + {'advtrains:wheel', 'default:steelblock', 'advtrains:wheel'}, + }, +}) + +minetest.register_craft({ + output = "advtrains:moretrains_minecart_loaded", + type = "shapeless", + recipe = {"advtrains:moretrains_minecart", "default:coalblock"}, +}) + +minetest.register_craft({ + output = "advtrains:moretrains_minecart_engine", + type = "shapeless", + recipe = {"advtrains:moretrains_minecart", "default:steelblock"}, +}) + diff --git a/moretrains_vintage/models/moretrains_draisine.b3d b/moretrains_vintage/models/moretrains_draisine.b3d index d1a7362..230c354 100644 Binary files a/moretrains_vintage/models/moretrains_draisine.b3d and b/moretrains_vintage/models/moretrains_draisine.b3d differ diff --git a/moretrains_vintage/models/moretrains_minecart_engine.b3d b/moretrains_vintage/models/moretrains_minecart_engine.b3d new file mode 100644 index 0000000..966c75f Binary files /dev/null and b/moretrains_vintage/models/moretrains_minecart_engine.b3d differ diff --git a/moretrains_vintage/textures/moretrains_draisine_inv.png b/moretrains_vintage/textures/moretrains_draisine_inv.png index 5ec3c88..7a5b201 100755 Binary files a/moretrains_vintage/textures/moretrains_draisine_inv.png and b/moretrains_vintage/textures/moretrains_draisine_inv.png differ diff --git a/moretrains_vintage/textures/moretrains_item_lever.png b/moretrains_vintage/textures/moretrains_item_lever.png new file mode 100644 index 0000000..8b7b40d Binary files /dev/null and b/moretrains_vintage/textures/moretrains_item_lever.png differ diff --git a/moretrains_vintage/textures/moretrains_minecart_engine_inv.png b/moretrains_vintage/textures/moretrains_minecart_engine_inv.png new file mode 100644 index 0000000..12654fd Binary files /dev/null and b/moretrains_vintage/textures/moretrains_minecart_engine_inv.png differ diff --git a/moretrains_vintage/textures/moretrains_minecart_inv.png b/moretrains_vintage/textures/moretrains_minecart_inv.png index 13b247e..189e973 100755 Binary files a/moretrains_vintage/textures/moretrains_minecart_inv.png and b/moretrains_vintage/textures/moretrains_minecart_inv.png differ diff --git a/moretrains_vintage/textures/moretrains_minecart_loaded_inv.png b/moretrains_vintage/textures/moretrains_minecart_loaded_inv.png new file mode 100644 index 0000000..d9c041e Binary files /dev/null and b/moretrains_vintage/textures/moretrains_minecart_loaded_inv.png differ diff --git a/moretrains_vintage/textures/moretrains_vintage.png b/moretrains_vintage/textures/moretrains_vintage.png index 2a0b08d..f88fce0 100755 Binary files a/moretrains_vintage/textures/moretrains_vintage.png and b/moretrains_vintage/textures/moretrains_vintage.png differ diff --git a/moretrains_vintage/textures/moretrains_vintage.xcf b/moretrains_vintage/textures/moretrains_vintage.xcf deleted file mode 100644 index f8909e8..0000000 Binary files a/moretrains_vintage/textures/moretrains_vintage.xcf and /dev/null differ diff --git a/readme.txt b/readme.txt index d884fbc..2ee813d 100644 --- a/readme.txt +++ b/readme.txt @@ -31,5 +31,7 @@ mod - moretrains_japan: mod - moretrains_vintage: - todo + models: own + texture: own, uses default_coal_block.png from minetest game (Zeg9) + icons: own -- cgit v1.2.3