From 0f7810e53895f5742ab577559584539e6533a0dc Mon Sep 17 00:00:00 2001
From: auouymous <5005204+auouymous@users.noreply.github.com>
Date: Sat, 06 Feb 2021 12:41:09 +0100
Subject: [PATCH] Public/private mode for self-contained injector (#567)
---
technic/tools/flashlight.lua | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/technic/tools/flashlight.lua b/technic/tools/flashlight.lua
index 1be550e..84decbb 100644
--- a/technic/tools/flashlight.lua
+++ b/technic/tools/flashlight.lua
@@ -8,11 +8,13 @@
technic.register_power_tool("technic:flashlight", flashlight_max_charge)
minetest.register_alias("technic:light_off", "air")
-
+
minetest.register_tool("technic:flashlight", {
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 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
@@ -54,7 +55,7 @@
minetest.register_on_joinplayer(function(player)
local player_name = player:get_player_name()
- local pos = player:getpos()
+ local pos = player:get_pos()
local rounded_pos = vector.round(pos)
rounded_pos.y = rounded_pos.y + 1
player_positions[player_name] = rounded_pos
@@ -76,11 +77,15 @@
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 pos = player:get_pos()
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
@@ -94,7 +99,7 @@
if node and node.name == "air" then
minetest.set_node(rounded_pos, {name="technic:light"})
end
- local node = minetest.get_node_or_nil(old_pos)
+ node = minetest.get_node_or_nil(old_pos)
if node and node.name == "technic:light" then
minetest.remove_node(old_pos)
end
@@ -106,13 +111,13 @@
minetest.register_node("technic:light", {
drawtype = "glasslike",
- tile_images = {"technic_light.png"},
+ tiles = {"technic_light.png"},
paramtype = "light",
- groups = {not_in_creative_inventory=1},
+ groups = {not_in_creative_inventory = 1},
drop = "",
walkable = false,
buildable_to = true,
sunlight_propagates = true,
- light_source = LIGHT_MAX,
+ light_source = minetest.LIGHT_MAX,
pointable = false,
})
--
Gitblit v1.8.0