Rewrite flashlight

This commit is contained in:
ShadowNinja 2013-12-17 19:57:24 -05:00
parent d8437faebc
commit dd2962aba6

@ -1,4 +1,5 @@
-- original code comes from walkin_light mod by Echo http://minetest.net/forum/viewtopic.php?id=2621 -- Original code comes from walkin_light mod by Echo
-- http://minetest.net/forum/viewtopic.php?id=2621
local flashlight_max_charge = 30000 local flashlight_max_charge = 30000
@ -6,30 +7,26 @@ local S = technic.getter
technic.register_power_tool("technic:flashlight", flashlight_max_charge) technic.register_power_tool("technic:flashlight", flashlight_max_charge)
minetest.register_alias("technic:light_off", "air")
minetest.register_tool("technic:flashlight", { minetest.register_tool("technic:flashlight", {
description = S("Flashlight"), description = S("Flashlight"),
inventory_image = "technic_flashlight.png", inventory_image = "technic_flashlight.png",
stack_max = 1, stack_max = 1,
on_use = function(itemstack, user, pointed_thing)
end,
}) })
minetest.register_craft({ minetest.register_craft({
output = "technic:flashlight", output = "technic:flashlight",
recipe = { recipe = {
{"technic:rubber", "glass", "technic:rubber"}, {"technic:rubber", "default:glass", "technic:rubber"},
{"technic:stainless_steel_ingot", "technic:battery", "technic:stainless_steel_ingot"}, {"technic:stainless_steel_ingot", "technic:battery", "technic:stainless_steel_ingot"},
{"", "technic:battery", ""} {"", "technic:battery", ""}
} }
}) })
local players = {}
local player_positions = {}
local last_wielded = {}
local function round(num) local player_positions = {}
return math.floor(num + 0.5) local was_wielding = {}
end
local function check_for_flashlight(player) local function check_for_flashlight(player)
if player == nil then if player == nil then
@ -57,82 +54,79 @@ end
minetest.register_on_joinplayer(function(player) minetest.register_on_joinplayer(function(player)
local player_name = player:get_player_name() local player_name = player:get_player_name()
table.insert(players, player_name)
local pos = player:getpos() local pos = player:getpos()
local rounded_pos = {x=round(pos.x),y=round(pos.y)+1,z=round(pos.z)} local rounded_pos = vector.round(pos)
rounded_pos.x = rounded_pos.x + 1
player_positions[player_name] = rounded_pos player_positions[player_name] = rounded_pos
was_wielding[player_name] = true
end) end)
minetest.register_on_leaveplayer(function(player) minetest.register_on_leaveplayer(function(player)
local player_name = player:get_player_name() local player_name = player:get_player_name()
for i, v in ipairs(players) do local pos = player_positions[player_name]
if v == player_name then local nodename = minetest.get_node(pos).name
table.remove(players, i)
last_wielded[player_name] = nil
-- Neuberechnung des Lichts erzwingen
local pos = player:getpos()
local rounded_pos = {x=round(pos.x),y=round(pos.y)+1,z=round(pos.z)}
local nodename = minetest.get_node(rounded_pos).name
if nodename == "technic:light_off" or nodename == "technic:light" then if nodename == "technic:light_off" or nodename == "technic:light" then
minetest.remove_node(rounded_pos) minetest.remove_node(pos)
end end
if player_positions[player_name] then
player_positions[player_name] = nil player_positions[player_name] = nil
end
end
end
end) end)
minetest.register_globalstep(function(dtime)
for i, player_name in ipairs(players) do
local player = minetest.get_player_by_name(player_name)
if player then
flashlight_weared = check_for_flashlight(player)
local pos = player:getpos()
local rounded_pos = {x=round(pos.x), y=round(pos.y)+1, z=round(pos.z)}
local old_pos = vector.new(player_positions[player_name])
if last_wielded[player_name] and not flashlight_weared then --remove light, flashlight weared out or was removed from hotbar 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()
local flashlight_weared = check_for_flashlight(player)
local pos = player:getpos()
local rounded_pos = vector.round(pos)
rounded_pos.x = rounded_pos.x + 1
local old_pos = player_positions[player_name]
local player_moved = not vector.equals(old_pos, rounded_pos)
-- Remove light, flashlight weared out or was removed from hotbar
if was_wielding[player_name] and not flashlight_weared then
was_wielding[player_name] = false
local node = minetest.get_node_or_nil(old_pos) local node = minetest.get_node_or_nil(old_pos)
if node and node.name == "technic:light" then if node and node.name == "technic:light" then
minetest.add_node(old_pos,{name="air"}) minetest.set_node(old_pos, {name="technic:light_off"})
last_wielded[player_name] = false minetest.remove_node(old_pos)
end end
elseif (player_moved or not was_wielding[player_name]) and flashlight_weared then
player_moved = not(old_pos.x == rounded_pos.x and old_pos.y == rounded_pos.y and old_pos.z == rounded_pos.z) local node = minetest.get_node_or_nil(rounded_pos)
if player_moved and last_wielded[player_name] and flashlight_weared then if node and node.name == "air" then
minetest.set_node(rounded_pos, {name="technic:light"})
local node=minetest.env:get_node_or_nil(rounded_pos)
if node then
if node.name=="air" then
minetest.env:add_node(rounded_pos,{type="node",name="technic:light"})
end 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 end
local node=minetest.env:get_node_or_nil(old_pos) player_positions[player_name] = rounded_pos
if node then was_wielding[player_name] = true
if node.name=="technic:light" then
minetest.env:add_node(old_pos,{type="node",name="technic:light_off"})
minetest.env:add_node(old_pos,{type="node",name="air"})
end
end
player_positions[player_name]["x"] = rounded_pos.x
player_positions[player_name]["y"] = rounded_pos.y
player_positions[player_name]["z"] = rounded_pos.z
elseif not last_wielded[player_name] and flashlight_weared then
local node=minetest.env:get_node_or_nil(rounded_pos)
if node then
if node.name=="air" then
minetest.env:add_node(rounded_pos,{type="node",name="technic:light"})
end
end
player_positions[player_name]["x"] = rounded_pos.x
player_positions[player_name]["y"] = rounded_pos.y
player_positions[player_name]["z"] = rounded_pos.z
last_wielded[player_name]=true
end
end
end end
end end
end) end)
@ -143,23 +137,17 @@ minetest.register_node("technic:light", {
paramtype = "light", paramtype = "light",
walkable = false, walkable = false,
buildable_to = true, buildable_to = true,
is_ground_content = true,
light_propagates = true,
sunlight_propagates = true, sunlight_propagates = true,
light_source = 15, light_source = 15,
selection_box = { pointable = false,
type = "fixed",
fixed = {0, 0, 0, 0, 0, 0},
},
}) })
minetest.register_node("technic:light_off", { minetest.register_node("technic:light_off", {
drawtype = "glasslike", drawtype = "glasslike",
tile_images = {"technic_light.png"}, tile_images = {"technic_light.png"},
paramtype = "light", paramtype = "light",
walkable = false, walkable = false,
buildable_to = true, buildable_to = true,
is_ground_content = true,
light_propagates = true,
sunlight_propagates = true, sunlight_propagates = true,
selection_box = { selection_box = {
type = "fixed", type = "fixed",