minetest-mods/mesecons
1
0
Fork 2
mirror of https://github.com/minetest-mods/mesecons.git synced 2024-11-17 07:40:29 +01:00
Code Issues Releases Wiki Activity

Merge pull request #2 from numberZero/dev-node-detector

Browse Source 
Minor fixes
This commit is contained in:
Josh Mars 2017-03-17 18:32:51 -04:00 committed by GitHub
commit 1ebff9624c
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mesecons_detector/init.lua
View File

@ -6,7 +6,7 @@ local GET_COMMAND = "GET"
local function object_detector_make_formspec(pos) local function object_detector_make_formspec(pos)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
meta:set_string("formspec", "size[9,2.5]" .. meta:set_string("formspec", "size[9,2.5]" ..
"field[0.3, 0;9,2;scanname;Name of player to scan for (empty for any):;${scanname}]".. "field[0.3, 0;9,2;scanname;Name of player to scan for (empty for any):;${scanname}]"..
"field[0.3,1.5;4,2;digiline_channel;Digiline Channel (optional):;${digiline_channel}]".. "field[0.3,1.5;4,2;digiline_channel;Digiline Channel (optional):;${digiline_channel}]"..
"button_exit[7,0.75;2,3;;Save]") "button_exit[7,0.75;2,3;;Save]")
@ -15,7 +15,7 @@ end
local function object_detector_on_receive_fields(pos, formname, fields, sender) local function object_detector_on_receive_fields(pos, formname, fields, sender)
if not fields.scanname or not fields.digiline_channel then return end if not fields.scanname or not fields.digiline_channel then return end
if minetest.is_protected(pos, sender:get_player_name()) then return end if minetest.is_protected(pos, sender:get_player_name()) then return end
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
meta:set_string("scanname", fields.scanname) meta:set_string("scanname", fields.scanname)
@ -32,22 +32,19 @@ local function object_detector_scan(pos)
local scanname = minetest.get_meta(pos):get_string("scanname") local scanname = minetest.get_meta(pos):get_string("scanname")
local sep = "," -- Begin code to split scanname into array local sep = "," -- Begin code to split scanname into array
local t={} local scan_for = {}
for str in string.gmatch(scanname, "([^"..sep.."]+)") do for str in string.gmatch(scanname, "([^"..sep.."]+)") do
t[str:gsub("%s+", "")] = true scan_for[str:gsub("%s+", "")] = true
end -- end split code end -- end split code
local every_player = scanname == "" local every_player = scanname == ""
for _, obj in pairs(objs) do for _, obj in pairs(objs) do
-- "" is returned if it is not a player; "" ~= nil; so only handle objects with foundname ~= "" -- "" is returned if it is not a player; "" ~= nil; so only handle objects with foundname ~= ""
local foundname = obj:get_player_name() local foundname = obj:get_player_name()
if foundname ~= "" then if foundname ~= "" then
for _ in pairs(t) do if every_player or scan_for[foundname] then
if t[foundname] then return true end return true
end end
end end
if scanname == "" then return true end -- Return true if no player name was specified
end end
return false return false
@ -76,7 +73,7 @@ minetest.register_node("mesecons_detector:object_detector_off", {
state = mesecon.state.off, state = mesecon.state.off,
rules = mesecon.rules.pplate rules = mesecon.rules.pplate
}}, }},
on_construct = object_detector_make_formspec, on_construct = object_detector_make_formspec,
on_receive_fields = object_detector_on_receive_fields, on_receive_fields = object_detector_on_receive_fields,
sounds = default.node_sound_stone_defaults(), sounds = default.node_sound_stone_defaults(),
digiline = object_detector_digiline digiline = object_detector_digiline
@ -143,11 +140,10 @@ local function node_detector_make_formspec(pos)
"field[0.3,1.5;2,2;distance;Distance (0-10):;${distance}]".. "field[0.3,1.5;2,2;distance;Distance (0-10):;${distance}]"..
"field[2.5,1.5;4,2;digiline_channel;Digiline Channel (optional):;${digiline_channel}]".. "field[2.5,1.5;4,2;digiline_channel;Digiline Channel (optional):;${digiline_channel}]"..
"button_exit[7,0.75;2,3;;Save]") "button_exit[7,0.75;2,3;;Save]")
if not meta:get_string("owner") then meta:set_string("owner", "") end
end end
local function node_detector_on_receive_fields(pos, fieldname, fields, sender) local function node_detector_on_receive_fields(pos, fieldname, fields, sender)
if not fields.scanname or not fields.digiline_channel or not fields.distance then return end if not fields.scanname or not fields.digiline_channel then return end
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local owner = meta:get_string("owner") local owner = meta:get_string("owner")
@ -156,7 +152,7 @@ local function node_detector_on_receive_fields(pos, fieldname, fields, sender)
return return
end end
meta:set_string("scanname", fields.scanname) meta:set_string("scanname", fields.scanname)
meta:set_string("distance", fields.distance) meta:set_string("distance", fields.distance or "0")
meta:set_string("digiline_channel", fields.digiline_channel) meta:set_string("digiline_channel", fields.digiline_channel)
node_detector_make_formspec(pos) node_detector_make_formspec(pos)
end end
@ -222,7 +218,6 @@ local function after_place_node_detector(pos, placer)
if placer then if placer then
minetest.get_meta(pos):set_string("owner", placer:get_player_name()) minetest.get_meta(pos):set_string("owner", placer:get_player_name())
end end
end end
minetest.register_node("mesecons_detector:node_detector_off", { minetest.register_node("mesecons_detector:node_detector_off", {