nalc/pipeworks
1
0
Fork 0
forked from mtcontrib/pipeworks
Code Issues Pull Requests Releases Wiki Activity

add exact mode to the filter

Browse Source
This commit is contained in:
Prot EuPhobos 2016-03-05 21:22:44 +03:00 committed by Auke Kok
parent b1b9a7e994
commit 82c03466d7
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
filter-injector.lua
View File

@ -12,6 +12,13 @@ end
local function set_filter_formspec(data, meta) local function set_filter_formspec(data, meta)
local itemname = data.wise_desc.." Filter-Injector" local itemname = data.wise_desc.." Filter-Injector"
local exmatch_button = ""
if data.stackwise then
exmatch_button =
fs_helpers.cycling_button(meta, "button[4,3.5;4,1", "exmatch_mode",
{"Exact match - off",
"Exact match - on "})
end
local formspec = "size[8,8.5]".. local formspec = "size[8,8.5]"..
"item_image[0,0;1,1;pipeworks:"..data.name.."]".. "item_image[0,0;1,1;pipeworks:"..data.name.."]"..
"label[1,0;"..minetest.formspec_escape(itemname).."]".. "label[1,0;"..minetest.formspec_escape(itemname).."]"..
@ -21,12 +28,13 @@ local function set_filter_formspec(data, meta)
{"Sequence slots by Priority", {"Sequence slots by Priority",
"Sequence slots Randomly", "Sequence slots Randomly",
"Sequence slots by Rotation"}).. "Sequence slots by Rotation"})..
exmatch_button..
"list[current_player;main;0,4.5;8,4;]" "list[current_player;main;0,4.5;8,4;]"
meta:set_string("formspec", formspec) meta:set_string("formspec", formspec)
end end
-- todo SOON: this function has *way too many* parameters -- todo SOON: this function has *way too many* parameters
local function grabAndFire(data,slotseq_mode,filtmeta,frominv,frominvname,frompos,fromnode,filterfor,fromtube,fromdef,dir,fakePlayer,all) local function grabAndFire(data,slotseq_mode,exmatch_mode,filtmeta,frominv,frominvname,frompos,fromnode,filterfor,fromtube,fromdef,dir,fakePlayer,all)
local sposes = {} local sposes = {}
for spos,stack in ipairs(frominv:get_list(frominvname)) do for spos,stack in ipairs(frominv:get_list(frominvname)) do
local matches local matches
@ -79,8 +87,12 @@ local function grabAndFire(data,slotseq_mode,filtmeta,frominv,frominvname,frompo
if all then if all then
count = math.min(stack:get_count(), doRemove) count = math.min(stack:get_count(), doRemove)
if filterfor.count and filterfor.count > 1 then if filterfor.count and filterfor.count > 1 then
if exmatch_mode ~= 0 and filterfor.count > count then
return false
else
count = math.min(filterfor.count, count) count = math.min(filterfor.count, count)
end end
end
else else
count = 1 count = 1
end end
@ -127,13 +139,14 @@ local function punch_filter(data, filtpos, filtnode)
end end
if #filters == 0 then table.insert(filters, "") end if #filters == 0 then table.insert(filters, "") end
local slotseq_mode = filtmeta:get_int("slotseq_mode") local slotseq_mode = filtmeta:get_int("slotseq_mode")
local exact_match = filtmeta:get_int("exmatch_mode")
local frommeta = minetest.get_meta(frompos) local frommeta = minetest.get_meta(frompos)
local frominv = frommeta:get_inventory() local frominv = frommeta:get_inventory()
if fromtube.before_filter then fromtube.before_filter(frompos) end if fromtube.before_filter then fromtube.before_filter(frompos) end
for _, frominvname in ipairs(type(fromtube.input_inventory) == "table" and fromtube.input_inventory or {fromtube.input_inventory}) do for _, frominvname in ipairs(type(fromtube.input_inventory) == "table" and fromtube.input_inventory or {fromtube.input_inventory}) do
local done = false local done = false
for _, filterfor in ipairs(filters) do for _, filterfor in ipairs(filters) do
if grabAndFire(data, slotseq_mode, filtmeta, frominv, frominvname, frompos, fromnode, filterfor, fromtube, fromdef, dir, fakePlayer, data.stackwise) then if grabAndFire(data, slotseq_mode, exact_match, filtmeta, frominv, frominvname, frompos, fromnode, filterfor, fromtube, fromdef, dir, fakePlayer, data.stackwise) then
done = true done = true
break break
end end