Line 88:
Line 88:
function Iterator.equipmentBy(context, n, pred, pre, nItems)
function Iterator.equipmentBy(context, n, pred, pre, nItems)
local predKey = stringKey('pred', context, n)
local predKey = stringKey('pred', context, n)
+
local pred2
if predKey then
if predKey then
−
pred = function(e)
+
pred2 = function(e)
local obj = EquipmentData(e)
local obj = EquipmentData(e)
return obj[predKey](obj)
return obj[predKey](obj)
Line 125:
Line 126:
e = collection[i]
e = collection[i]
end
end
−
if pred and not pred(e, i) then
+
if pred and not pred(e, i) or pred2 and not pred2(e, i) then
i = i + 1
i = i + 1
else
else