osmarks/dragon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor slightly

Browse Source
This commit is contained in:
osmarks 2018-04-29 17:11:59 +01:00
parent 5a4e0bd632
commit b9faa51406
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server.lua
View File

@ -71,6 +71,15 @@ function findSpace()
end end
end end
function search(msg)
return find(function(item)
return
(not msg.meta or item.damage == msg.meta) and
(not msg.name or item.name == msg.name) and
(not msg.dname or string.find(item.displayName:lower(), msg.dname:lower()))
end)
end
function processRequest(msg) function processRequest(msg)
print(textutils.serialise(msg)) print(textutils.serialise(msg))
@ -78,12 +87,7 @@ function processRequest(msg)
-- Applies a fuzzy search to display names -- Applies a fuzzy search to display names
-- Extracted items are either deposited in buffer or directly in target inventory. -- Extracted items are either deposited in buffer or directly in target inventory.
if msg.cmd == "extract" then if msg.cmd == "extract" then
local inv, slot, item = find(function(item) local inv, slot, item = search(msg)
return
(not msg.meta or item.damage == msg.meta) and
(not msg.name or item.name == msg.name) and
(not msg.dname or string.find(item.displayName:lower(), msg.dname:lower()))
end)
index[inv][slot] = nil index[inv][slot] = nil