From 623fcae4a4ad3ec12cc242b29b0d781357cff3f7 Mon Sep 17 00:00:00 2001
From: Zefram <zefram@fysh.org>
Date: Sat, 24 May 2014 00:24:30 +0200
Subject: [PATCH] Fix supply converter
---
technic/tools/flashlight.lua | 58 +++++++++-------------------------------------------------
1 files changed, 9 insertions(+), 49 deletions(-)
diff --git a/technic/tools/flashlight.lua b/technic/tools/flashlight.lua
index e7e2dad..ff49c0a 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,10 +39,7 @@
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
+ if meta and meta.charge and meta.charge >= 2 then
meta.charge = meta.charge - 2;
technic.set_RE_wear(hotbar[i], meta.charge, flashlight_max_charge)
hotbar[i]:set_metadata(minetest.serialize(meta))
@@ -56,7 +55,7 @@
local player_name = player:get_player_name()
local pos = player:getpos()
local rounded_pos = vector.round(pos)
- rounded_pos.x = rounded_pos.x + 1
+ rounded_pos.y = rounded_pos.y + 1
player_positions[player_name] = rounded_pos
was_wielding[player_name] = true
end)
@@ -66,36 +65,11 @@
local player_name = player:get_player_name()
local pos = player_positions[player_name]
local nodename = minetest.get_node(pos).name
- if nodename == "technic:light_off" or nodename == "technic:light" then
+ if nodename == "technic:light" then
minetest.remove_node(pos)
end
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
@@ -103,7 +77,7 @@
local flashlight_weared = check_for_flashlight(player)
local pos = player:getpos()
local rounded_pos = vector.round(pos)
- rounded_pos.x = rounded_pos.x + 1
+ rounded_pos.y = rounded_pos.y + 1
local old_pos = player_positions[player_name]
local player_moved = not vector.equals(old_pos, rounded_pos)
@@ -112,7 +86,6 @@
was_wielding[player_name] = false
local node = minetest.get_node_or_nil(old_pos)
if node and node.name == "technic:light" then
- minetest.set_node(old_pos, {name="technic:light_off"})
minetest.remove_node(old_pos)
end
elseif (player_moved or not was_wielding[player_name]) and flashlight_weared then
@@ -122,7 +95,6 @@
end
local node = minetest.get_node_or_nil(old_pos)
if node and node.name == "technic:light" then
- minetest.set_node(old_pos, {name="technic:light_off"})
minetest.remove_node(old_pos)
end
player_positions[player_name] = rounded_pos
@@ -135,23 +107,11 @@
drawtype = "glasslike",
tile_images = {"technic_light.png"},
paramtype = "light",
+ groups = {not_in_creative_inventory=1},
+ drop = "",
walkable = false,
buildable_to = true,
sunlight_propagates = true,
- light_source = 15,
+ light_source = LIGHT_MAX,
pointable = false,
})
-
-minetest.register_node("technic:light_off", {
- drawtype = "glasslike",
- tile_images = {"technic_light.png"},
- paramtype = "light",
- walkable = false,
- buildable_to = true,
- sunlight_propagates = true,
- selection_box = {
- type = "fixed",
- fixed = {0, 0, 0, 0, 0, 0},
- },
-})
-
--
Gitblit v1.8.0