From dc0689018d27a68ae2987194285558b3add09be2 Mon Sep 17 00:00:00 2001
From: Vanessa Dannenberg <vanessa.e.dannenberg@gmail.com>
Date: Sun, 25 Nov 2018 16:10:23 +0100
Subject: [PATCH] move CNC machine into its own mod
---
technic/tools/flashlight.lua | 221 +++++++++++++++++++++----------------------------------
1 files changed, 85 insertions(+), 136 deletions(-)
diff --git a/technic/tools/flashlight.lua b/technic/tools/flashlight.lua
index 5f3ea96..252dc8c 100644
--- a/technic/tools/flashlight.lua
+++ b/technic/tools/flashlight.lua
@@ -1,174 +1,123 @@
--- 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
-technic.register_LV_power_tool ("technic:flashlight",flashlight_max_charge)
+local flashlight_max_charge = 30000
+
+local S = technic.getter
+
+technic.register_power_tool("technic:flashlight", flashlight_max_charge)
+
+minetest.register_alias("technic:light_off", "air")
minetest.register_tool("technic:flashlight", {
- description = "Flashlight",
+ description = S("Flashlight"),
inventory_image = "technic_flashlight.png",
stack_max = 1,
- on_use = function(itemstack, user, pointed_thing)
- end,
- })
-
+ wear_represents = "technic_RE_charge",
+ on_refill = technic.refill_RE_charge,
+})
+
minetest.register_craft({
-output = "technic:flashlight",
-recipe = {
- {"technic:rubber","glass","technic:rubber"},
- {"technic:stainless_steel_ingot","technic:battery","technic:stainless_steel_ingot"},
- {"","technic:battery",""}
+ output = "technic:flashlight",
+ recipe = {
+ {"technic:rubber", "default:glass", "technic:rubber"},
+ {"technic:stainless_steel_ingot", "technic:battery", "technic:stainless_steel_ingot"},
+ {"", "technic:battery", ""}
}
})
-local players = {}
-local player_positions = {}
-local last_wielded = {}
-function round(num)
- return math.floor(num + 0.5)
+local player_positions = {}
+local was_wielding = {}
+
+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 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
+ end
+ return false
end
minetest.register_on_joinplayer(function(player)
local player_name = player:get_player_name()
- table.insert(players, player_name)
local pos = player:getpos()
- local rounded_pos = {x=round(pos.x),y=round(pos.y)+1,z=round(pos.z)}
- player_positions[player_name] = {}
- player_positions[player_name]["x"] = rounded_pos.x;
- player_positions[player_name]["y"] = rounded_pos.y;
- player_positions[player_name]["z"] = rounded_pos.z;
+ local rounded_pos = vector.round(pos)
+ rounded_pos.y = rounded_pos.y + 1
+ player_positions[player_name] = rounded_pos
+ was_wielding[player_name] = true
end)
+
minetest.register_on_leaveplayer(function(player)
local player_name = player:get_player_name()
- for i,v in ipairs(players) do
- if v == player_name then
- 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)}
- minetest.env:add_node(rounded_pos,{type="node",name="technic:light_off"})
- minetest.env:add_node(rounded_pos,{type="node",name="air"})
- player_positions[player_name]["x"] = nil
- player_positions[player_name]["y"] = nil
- player_positions[player_name]["z"] = nil
- player_positions[player_name]["m"] = nil
- player_positions[player_name] = nil
- end
+ local pos = player_positions[player_name]
+ local nodename = minetest.get_node(pos).name
+ if nodename == "technic:light" then
+ minetest.remove_node(pos)
end
+ player_positions[player_name] = nil
end)
minetest.register_globalstep(function(dtime)
- for i,player_name in ipairs(players) do
- local player = minetest.env:get_player_by_name(player_name)
- if player then
- flashlight_weared=check_for_flashlight(player)
+ 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 = {x=round(pos.x),y=round(pos.y)+1,z=round(pos.z)}
- local old_pos = {x=player_positions[player_name]["x"], y=player_positions[player_name]["y"], z=player_positions[player_name]["z"]}
-
- if last_wielded[player_name] and not flashlight_weared then --remove light, flashlight weared out or was removed from hotbar
- local node=minetest.env:get_node_or_nil(old_pos)
- if node then
- 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"})
- last_wielded[player_name]=false
- end
- end
- end
+ local rounded_pos = vector.round(pos)
+ rounded_pos.y = rounded_pos.y + 1
+ local old_pos = player_positions[player_name]
+ 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
- player_moved=not(old_pos.x==rounded_pos.x and old_pos.y==rounded_pos.y and old_pos.z==rounded_pos.z)
- if player_moved and 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
+ -- 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)
+ if node and node.name == "technic:light" then
+ minetest.remove_node(old_pos)
end
- local node=minetest.env:get_node_or_nil(old_pos)
- if node then
- 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
+ elseif (player_moved or not was_wielding[player_name]) and flashlight_weared then
+ local node = minetest.get_node_or_nil(rounded_pos)
+ if node and node.name == "air" then
+ minetest.set_node(rounded_pos, {name="technic:light"})
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
-
- else if 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
+ local node = minetest.get_node_or_nil(old_pos)
+ if node and node.name == "technic:light" then
+ minetest.remove_node(old_pos)
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
+ player_positions[player_name] = rounded_pos
+ was_wielding[player_name] = true
+ end
end
end)
minetest.register_node("technic:light", {
drawtype = "glasslike",
- tile_images = {"technic_light.png"},
+ tiles = {"technic_light.png"},
paramtype = "light",
+ groups = {not_in_creative_inventory=1},
+ drop = "",
walkable = false,
buildable_to = true,
- is_ground_content = true,
- light_propagates = true,
sunlight_propagates = true,
- light_source = 15,
- selection_box = {
- type = "fixed",
- fixed = {0, 0, 0, 0, 0, 0},
- },
+ 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,
- is_ground_content = true,
- light_propagates = true,
- sunlight_propagates = true,
- selection_box = {
- type = "fixed",
- fixed = {0, 0, 0, 0, 0, 0},
- },
-})
-
-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,1 do
-
- if hotbar[i]:get_name() == "technic:flashlight" then
- local item=hotbar[i]:to_table()
- local meta=get_item_meta(item["metadata"])
- if meta==nil then return false end --flashlight not charghed
- if meta["charge"]==nil then return false end
- charge=meta["charge"]
- if charge-2>0 then
- charge =charge-2;
- technic.set_RE_wear(item,charge,flashlight_max_charge)
- meta["charge"]=charge
- item["metadata"]=set_item_meta(meta)
- hotbar[i]:replace(item)
- inv:set_stack("main",i,hotbar[i])
- return true
- end
- end
- end
-return false
-end
--
Gitblit v1.8.0