From 1b1780946edebfbf1e8ec2cf095b56fa76733e2b Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com> Date: Sat, 12 Sep 2015 07:18:16 +0200 Subject: [PATCH] add facedir to tool workshop --- technic/tools/flashlight.lua | 48 ++++++++++++++---------------------------------- 1 files changed, 14 insertions(+), 34 deletions(-) diff --git a/technic/tools/flashlight.lua b/technic/tools/flashlight.lua index 02f3299..7b43d70 100644 --- a/technic/tools/flashlight.lua +++ b/technic/tools/flashlight.lua @@ -13,6 +13,8 @@ description = S("Flashlight"), inventory_image = "technic_flashlight.png", stack_max = 1, + wear_represents = "technic_RE_charge", + on_refill = technic.refill_RE_charge, }) minetest.register_craft({ @@ -37,14 +39,13 @@ for i = 1, 8 do if hotbar[i]:get_name() == "technic:flashlight" then local meta = minetest.deserialize(hotbar[i]:get_metadata()) - if not meta or not meta.charge then - return false - end - if meta.charge - 2 > 0 then - meta.charge = meta.charge - 2; - technic.set_RE_wear(hotbar[i], meta.charge, flashlight_max_charge) - hotbar[i]:set_metadata(minetest.serialize(meta)) - inv:set_stack("main", i, hotbar[i]) + if meta and meta.charge and meta.charge >= 2 then + if not technic.creative_mode then + meta.charge = meta.charge - 2; + technic.set_RE_wear(hotbar[i], meta.charge, flashlight_max_charge) + hotbar[i]:set_metadata(minetest.serialize(meta)) + inv:set_stack("main", i, hotbar[i]) + end return true end end @@ -72,31 +73,6 @@ player_positions[player_name] = nil end) - -local function check_for_flashlight(player) - if player == nil then - return false - end - local inv = player:get_inventory() - local hotbar = inv:get_list("main") - for i = 1, 8 do - if hotbar[i]:get_name() == "technic:flashlight" then - local meta = minetest.deserialize(hotbar[i]:get_metadata()) - if not meta or not meta.charge then - return false - end - if meta.charge - 2 > 0 then - meta.charge = meta.charge - 2; - technic.set_RE_wear(hotbar[i], meta.charge, flashlight_max_charge) - hotbar[i]:set_metadata(minetest.serialize(meta)) - inv:set_stack("main", i, hotbar[i]) - return true - end - end - end - return false -end - minetest.register_globalstep(function(dtime) for i, player in pairs(minetest.get_connected_players()) do local player_name = player:get_player_name() @@ -105,7 +81,11 @@ local rounded_pos = vector.round(pos) rounded_pos.y = rounded_pos.y + 1 local old_pos = player_positions[player_name] - local player_moved = not vector.equals(old_pos, rounded_pos) + local player_moved = old_pos and not vector.equals(old_pos, rounded_pos) + if not old_pos then + old_pos = rounded_pos + player_moved = true + end -- Remove light, flashlight weared out or was removed from hotbar if was_wielding[player_name] and not flashlight_weared then -- Gitblit v1.8.0