From 8fa7164ad7dd36dad3bd363fdcfae421fde7a07b Mon Sep 17 00:00:00 2001 From: rbduck Date: Fri, 6 Mar 2020 19:02:40 +0100 Subject: new icons and recipes --- moretrains_industrial/depends.txt | 2 +- moretrains_industrial/init.lua | 61 ++++++++++++++- .../textures/moretrains_item_tank.png | Bin 0 -> 2042 bytes .../textures/moretrains_wagon_box_inv.png | Bin 1792 -> 2088 bytes .../textures/moretrains_wagon_tank2.png | Bin 80362 -> 80460 bytes .../textures/moretrains_wagon_tank2_inv.png | Bin 1776 -> 2077 bytes .../textures/moretrains_wagon_tank_inv.png | Bin 1785 -> 1984 bytes .../textures/moretrains_wagon_wood_inv.png | Bin 1877 -> 2111 bytes .../textures/moretrains_wagon_wood_loaded_inv.png | Bin 1899 -> 2072 bytes moretrains_steam/init.lua | 83 ++++++++++++++++++++- .../textures/moretrains_deprecated.png | Bin 0 -> 2249 bytes .../textures/moretrains_steam_tender_inv.png | Bin 2087 -> 2017 bytes .../textures/moretrains_steam_train_inv.png | Bin 2246 -> 2136 bytes 13 files changed, 141 insertions(+), 5 deletions(-) create mode 100644 moretrains_industrial/textures/moretrains_item_tank.png create mode 100644 moretrains_steam/textures/moretrains_deprecated.png diff --git a/moretrains_industrial/depends.txt b/moretrains_industrial/depends.txt index 1fb6665..f3443eb 100755 --- a/moretrains_industrial/depends.txt +++ b/moretrains_industrial/depends.txt @@ -1,2 +1,2 @@ advtrains -intllib? \ No newline at end of file +intllib? diff --git a/moretrains_industrial/init.lua b/moretrains_industrial/init.lua index 419bd09..2fff241 100644 --- a/moretrains_industrial/init.lua +++ b/moretrains_industrial/init.lua @@ -114,4 +114,63 @@ advtrains.register_wagon("moretrains_wagon_box", { inventory_list_sizes = { box=8*3, }, -}, S("Box wagon"), "moretrains_wagon_box_inv.png") \ No newline at end of file +}, S("Box wagon"), "moretrains_wagon_box_inv.png") + +minetest.register_craft({ + output = 'advtrains:moretrains_wagon_wood', + recipe = { + {'default:stick', 'default:stick', 'default:stick'}, + {'group:wood', 'default:chest', 'group:wood'}, + {'advtrains:wheel', '', 'advtrains:wheel'}, + }, +}) + +minetest.register_craft({ + output = "advtrains:moretrains_wagon_wood_loaded", + type = "shapeless", + recipe = {"advtrains:moretrains_wagon_wood", "group:tree", "group:tree"}, +}) + +minetest.register_craftitem("moretrains_industrial:item_tank", { + description = S("tank (for tankwagon)"), + inventory_image = "moretrains_item_tank.png" +}) + +minetest.register_craft({ + output = "moretrains_industrial:item_tank", + recipe = { + {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"}, + {"default:steel_ingot", "bucket:bucket_empty", "default:steel_ingot"}, + {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"}, + }, +}) + +minetest.register_craft({ + output = 'advtrains:moretrains_wagon_tank', + recipe = { + {'', '', ''}, + {'default:steel_ingot', 'moretrains_industrial:item_tank', 'default:steel_ingot'}, + {'advtrains:wheel', '', 'advtrains:wheel'}, + }, +}) + +minetest.register_craft({ + output = 'advtrains:moretrains_wagon_tank2', + recipe = { + {'', 'dye:blue', ''}, + {'default:steel_ingot', 'moretrains_industrial:item_tank', 'default:steel_ingot'}, + {'advtrains:wheel', '', 'advtrains:wheel'}, + }, +}) + +minetest.register_craft({ + output = 'advtrains:moretrains_wagon_box', + recipe = { + {'default:copper_ingot', 'default:copper_ingot', 'default:copper_ingot'}, + {'default:junglewood', 'default:chest', 'default:junglewood'}, + {'advtrains:wheel', '', 'advtrains:wheel'}, + }, +}) + + + diff --git a/moretrains_industrial/textures/moretrains_item_tank.png b/moretrains_industrial/textures/moretrains_item_tank.png new file mode 100644 index 0000000..0ea4e09 Binary files /dev/null and b/moretrains_industrial/textures/moretrains_item_tank.png differ diff --git a/moretrains_industrial/textures/moretrains_wagon_box_inv.png b/moretrains_industrial/textures/moretrains_wagon_box_inv.png index 8b60d71..33eaf7e 100644 Binary files a/moretrains_industrial/textures/moretrains_wagon_box_inv.png and b/moretrains_industrial/textures/moretrains_wagon_box_inv.png differ diff --git a/moretrains_industrial/textures/moretrains_wagon_tank2.png b/moretrains_industrial/textures/moretrains_wagon_tank2.png index 8f42d9c..dbee643 100644 Binary files a/moretrains_industrial/textures/moretrains_wagon_tank2.png and b/moretrains_industrial/textures/moretrains_wagon_tank2.png differ diff --git a/moretrains_industrial/textures/moretrains_wagon_tank2_inv.png b/moretrains_industrial/textures/moretrains_wagon_tank2_inv.png index df88e0f..34561ef 100644 Binary files a/moretrains_industrial/textures/moretrains_wagon_tank2_inv.png and b/moretrains_industrial/textures/moretrains_wagon_tank2_inv.png differ diff --git a/moretrains_industrial/textures/moretrains_wagon_tank_inv.png b/moretrains_industrial/textures/moretrains_wagon_tank_inv.png index 9ae4af0..e23e221 100644 Binary files a/moretrains_industrial/textures/moretrains_wagon_tank_inv.png and b/moretrains_industrial/textures/moretrains_wagon_tank_inv.png differ diff --git a/moretrains_industrial/textures/moretrains_wagon_wood_inv.png b/moretrains_industrial/textures/moretrains_wagon_wood_inv.png index 6d130ac..4138505 100644 Binary files a/moretrains_industrial/textures/moretrains_wagon_wood_inv.png and b/moretrains_industrial/textures/moretrains_wagon_wood_inv.png differ diff --git a/moretrains_industrial/textures/moretrains_wagon_wood_loaded_inv.png b/moretrains_industrial/textures/moretrains_wagon_wood_loaded_inv.png index b831e8c..c34d611 100644 Binary files a/moretrains_industrial/textures/moretrains_wagon_wood_loaded_inv.png and b/moretrains_industrial/textures/moretrains_wagon_wood_loaded_inv.png differ diff --git a/moretrains_steam/init.lua b/moretrains_steam/init.lua index 0887a30..7db6c3f 100644 --- a/moretrains_steam/init.lua +++ b/moretrains_steam/init.lua @@ -8,7 +8,7 @@ end -- length of the steam engine loop sound local SND_LOOP_LEN = 5 -advtrains.register_wagon("steam_train", { +advtrains.register_wagon("moretrains_steam_train", { mesh="moretrains_steam_train.b3d", textures = {"moretrains_steam_train.png"}, is_locomotive=true, @@ -90,7 +90,7 @@ advtrains.register_wagon("steam_train", { horn_sound = "advtrains_steam_whistle", }, S("Steam Train #1"), "moretrains_steam_train_inv.png") -advtrains.register_wagon("tender", { +advtrains.register_wagon("moretrains_tender", { mesh="moretrains_steam_tender.b3d", textures = {"moretrains_steam_tender.png"}, drives_on={default=true}, @@ -108,8 +108,85 @@ advtrains.register_wagon("tender", { "listring[]" end, inventory_list_sizes = { - box=8*3, + box=1*8, }, }, 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({ + output = 'advtrains:moretrains_steam_train', + recipe = { + {'', '', 'advtrains:chimney'}, + {'advtrains:driver_cab', 'dye:blue', 'advtrains:boiler'}, + {'advtrains:wheel', 'advtrains:wheel', 'advtrains:wheel'}, + }, +}) + +minetest.register_craft({ + output = 'advtrains:moretrains_tender', + recipe = { + {'default:steel_ingot', 'default:coalblock', 'default:steel_ingot'}, + {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, + {'advtrains:wheel', '', 'advtrains:wheel'}, + }, +}) diff --git a/moretrains_steam/textures/moretrains_deprecated.png b/moretrains_steam/textures/moretrains_deprecated.png new file mode 100644 index 0000000..922153f Binary files /dev/null and b/moretrains_steam/textures/moretrains_deprecated.png differ diff --git a/moretrains_steam/textures/moretrains_steam_tender_inv.png b/moretrains_steam/textures/moretrains_steam_tender_inv.png index d3b6593..90bb83b 100644 Binary files a/moretrains_steam/textures/moretrains_steam_tender_inv.png and b/moretrains_steam/textures/moretrains_steam_tender_inv.png differ diff --git a/moretrains_steam/textures/moretrains_steam_train_inv.png b/moretrains_steam/textures/moretrains_steam_train_inv.png index fa7cbd6..1150591 100644 Binary files a/moretrains_steam/textures/moretrains_steam_train_inv.png and b/moretrains_steam/textures/moretrains_steam_train_inv.png differ -- cgit v1.2.3