From 636b0f20df4fef3eef821c23ccc2f606828f5c6f Mon Sep 17 00:00:00 2001 From: Zefram <zefram@fysh.org> Date: Mon, 07 Jul 2014 15:15:05 +0200 Subject: [PATCH] Handheld prospecting tool --- technic/machines/LV/coal_alloy_furnace.lua | 121 +++++++++++++++++----------------------- 1 files changed, 52 insertions(+), 69 deletions(-) diff --git a/technic/machines/LV/coal_alloy_furnace.lua b/technic/machines/LV/coal_alloy_furnace.lua index e2baeea..d1b7fae 100644 --- a/technic/machines/LV/coal_alloy_furnace.lua +++ b/technic/machines/LV/coal_alloy_furnace.lua @@ -1,5 +1,5 @@ --- Coal driven alloy furnace. This uses no EUs: +-- Fuel driven alloy furnace. This uses no EUs: local S = technic.getter @@ -12,53 +12,55 @@ } }) +local machine_name = S("Fuel-Fired Alloy Furnace") +local formspec = + "size[8,9]".. + "label[0,0;"..machine_name.."]".. + "image[2,2;1,1;default_furnace_fire_bg.png]".. + "list[current_name;fuel;2,3;1,1;]".. + "list[current_name;src;2,1;2,1;]".. + "list[current_name;dst;5,1;2,2;]".. + "list[current_player;main;0,5;8,4;]" + minetest.register_node("technic:coal_alloy_furnace", { - description = S("Coal Alloy Furnace"), - tiles = {"technic_coal_alloy_furnace_top.png", "technic_coal_alloy_furnace_bottom.png", "technic_coal_alloy_furnace_side.png", - "technic_coal_alloy_furnace_side.png", "technic_coal_alloy_furnace_side.png", "technic_coal_alloy_furnace_front.png"}, + description = machine_name, + tiles = {"technic_coal_alloy_furnace_top.png", "technic_coal_alloy_furnace_bottom.png", + "technic_coal_alloy_furnace_side.png", "technic_coal_alloy_furnace_side.png", + "technic_coal_alloy_furnace_side.png", "technic_coal_alloy_furnace_front.png"}, paramtype2 = "facedir", groups = {cracky=2}, legacy_facedir_simple = true, sounds = default.node_sound_stone_defaults(), on_construct = function(pos) local meta = minetest.env:get_meta(pos) - meta:set_string("formspec", coal_alloy_furnace_formspec) - meta:set_string("infotext", S("Coal Alloy Furnace")) + meta:set_string("formspec", formspec) + meta:set_string("infotext", machine_name) local inv = meta:get_inventory() inv:set_size("fuel", 1) - inv:set_size("src", 1) - inv:set_size("src2", 1) + inv:set_size("src", 2) inv:set_size("dst", 4) end, - can_dig = function(pos,player) - local meta = minetest.env:get_meta(pos); - local inv = meta:get_inventory() - if not (inv:is_empty("fuel") or inv:is_empty("dst") or inv:is_empty("src") or inv:is_empty("src2") )then - return false - end - return true - end, + can_dig = technic.machine_can_dig, + allow_metadata_inventory_put = technic.machine_inventory_put, + allow_metadata_inventory_take = technic.machine_inventory_take, + allow_metadata_inventory_move = technic.machine_inventory_move, }) minetest.register_node("technic:coal_alloy_furnace_active", { - description = "Alloy Furnace", - tiles = {"technic_coal_alloy_furnace_top.png", "technic_coal_alloy_furnace_bottom.png", "technic_coal_alloy_furnace_side.png", - "technic_coal_alloy_furnace_side.png", "technic_coal_alloy_furnace_side.png", "technic_coal_alloy_furnace_front_active.png"}, + description = machine_name, + tiles = {"technic_coal_alloy_furnace_top.png", "technic_coal_alloy_furnace_bottom.png", + "technic_coal_alloy_furnace_side.png", "technic_coal_alloy_furnace_side.png", + "technic_coal_alloy_furnace_side.png", "technic_coal_alloy_furnace_front_active.png"}, paramtype2 = "facedir", light_source = 8, drop = "technic:coal_alloy_furnace", groups = {cracky=2, not_in_creative_inventory=1}, legacy_facedir_simple = true, sounds = default.node_sound_stone_defaults(), - can_dig = function(pos,player) - local meta = minetest.env:get_meta(pos); - local inv = meta:get_inventory() - if not (inv:is_empty("fuel") or inv:is_empty("dst") or - inv:is_empty("src") or inv:is_empty("src2")) then - return false - end - return true - end, + can_dig = technic.machine_can_dig, + allow_metadata_inventory_put = technic.machine_inventory_put, + allow_metadata_inventory_take = technic.machine_inventory_take, + allow_metadata_inventory_move = technic.machine_inventory_move, }) minetest.register_abm({ @@ -68,17 +70,14 @@ action = function(pos, node, active_object_count, active_object_count_wider) local meta = minetest.get_meta(pos) local inv = meta:get_inventory() + + if inv:get_size("src") == 1 then -- Old furnace -> convert it + inv:set_size("src", 2) + inv:set_stack("src", 2, inv:get_stack("src2", 1)) + inv:set_size("src2", 0) + end + local recipe = nil - local machine_name = S("Coal Alloy Furnace") - local formspec = - "size[8,9]".. - "label[0,0;"..machine_name.."]".. - "image[2,2;1,1;default_furnace_fire_bg.png]".. - "list[current_name;fuel;2,3;1,1;]".. - "list[current_name;src;2,1;1,1;]".. - "list[current_name;src2;3,1;1,1;]".. - "list[current_name;dst;5,1;2,2;]".. - "list[current_player;main;0,5;8,4;]" for i, name in pairs({ "fuel_totaltime", @@ -91,33 +90,22 @@ end -- Get what to cook if anything - local srcstack = inv:get_stack("src", 1) - local src2stack = inv:get_stack("src2", 1) - local recipe = technic.get_alloy_recipe(srcstack, src2stack) - if srcstack:get_name() > src2stack:get_name() then - local temp = srcstack - srcstack = src2stack - src2stack = temp - end + local result = technic.get_recipe("alloy", inv:get_list("src")) local was_active = false if meta:get_float("fuel_time") < meta:get_float("fuel_totaltime") then was_active = true meta:set_int("fuel_time", meta:get_int("fuel_time") + 1) - if recipe then + if result then meta:set_int("src_time", meta:get_int("src_time") + 1) - if meta:get_int("src_time") == 6 then - -- check if there's room for output in "dst" list - local dst_stack = ItemStack(recipe.output) - if inv:room_for_item("dst", dst_stack) then - srcstack:take_item(recipe.input[1].count) - inv:set_stack("src", 1, srcstack) - src2stack:take_item(recipe.input[2].count) - inv:set_stack("src2", 1, src2stack) - inv:add_item("dst", dst_stack) - end + if meta:get_int("src_time") >= result.time then meta:set_int("src_time", 0) + local result_stack = ItemStack(result.output) + if inv:room_for_item("dst", result_stack) then + inv:set_list("src", result.new_input) + inv:add_item("dst", result_stack) + end end else meta:set_int("src_time", 0) @@ -128,30 +116,25 @@ local percent = math.floor(meta:get_float("fuel_time") / meta:get_float("fuel_totaltime") * 100) meta:set_string("infotext", S("%s Active"):format(machine_name).." ("..percent.."%)") - hacky_swap_node(pos, "technic:coal_alloy_furnace_active") + technic.swap_node(pos, "technic:coal_alloy_furnace_active") meta:set_string("formspec", "size[8,9]".. "label[0,0;"..machine_name.."]".. "image[2,2;1,1;default_furnace_fire_bg.png^[lowpart:".. (100 - percent)..":default_furnace_fire_fg.png]".. "list[current_name;fuel;2,3;1,1;]".. - "list[current_name;src;2,1;1,1;]".. - "list[current_name;src2;3,1;1,1;]".. + "list[current_name;src;2,1;2,1;]".. "list[current_name;dst;5,1;2,2;]".. "list[current_player;main;0,5;8,4;]") return end - -- FIXME: Make this look more like the electrical version. - -- This code refetches the recipe to see if it can be done again after the iteration - srcstack = inv:get_stack("src", 1) - srcstack = inv:get_stack("src2", 1) - local recipe = technic.get_alloy_recipe(srcstack, src2stack) + local recipe = technic.get_recipe("alloy", inv:get_list("src")) - if recipe then + if not recipe then if was_active then - meta:set_string("infotext", "Furnace is empty") - hacky_swap_node(pos, "technic:coal_alloy_furnace") + meta:set_string("infotext", S("%s is empty"):format(machine_name)) + technic.swap_node(pos, "technic:coal_alloy_furnace") meta:set_string("formspec", formspec) end return @@ -167,7 +150,7 @@ if fuel.time <= 0 then meta:set_string("infotext", S("%s Out Of Fuel"):format(machine_name)) - hacky_swap_node(pos, "technic:coal_alloy_furnace") + technic.swap_node(pos, "technic:coal_alloy_furnace") meta:set_string("formspec", formspec) return end -- Gitblit v1.8.0