removed left-over memo checking code
This commit is contained in:
parent
329c2d4104
commit
083f6488fd
@ -251,7 +251,9 @@ function tidyPlayareaCoroutine()
|
|||||||
else
|
else
|
||||||
for _, obj in ipairs(playAreaZone.getObjects()) do
|
for _, obj in ipairs(playAreaZone.getObjects()) do
|
||||||
-- ignore these elements
|
-- ignore these elements
|
||||||
if obj.hasTag(IGNORE_TAG) == false and checkMemo(obj) == false then
|
if obj.hasTag(IGNORE_TAG) == false
|
||||||
|
and obj.locked == false
|
||||||
|
and obj.interactable == true then
|
||||||
coroutine.yield(0)
|
coroutine.yield(0)
|
||||||
trash.putObject(obj)
|
trash.putObject(obj)
|
||||||
end
|
end
|
||||||
@ -290,7 +292,8 @@ function tidyPlayerMatCoroutine()
|
|||||||
if obj.hasTag(IGNORE_TAG) == false
|
if obj.hasTag(IGNORE_TAG) == false
|
||||||
and obj.hasTag("ActionToken") == false
|
and obj.hasTag("ActionToken") == false
|
||||||
and obj.hasTag("chaosBag") == false
|
and obj.hasTag("chaosBag") == false
|
||||||
and checkMemo(obj) == false then
|
and obj.locked == false
|
||||||
|
and obj.interactable == true then
|
||||||
coroutine.yield(0)
|
coroutine.yield(0)
|
||||||
trash.putObject(obj)
|
trash.putObject(obj)
|
||||||
|
|
||||||
@ -342,14 +345,3 @@ function searchMythosArea()
|
|||||||
return objList
|
return objList
|
||||||
end
|
end
|
||||||
|
|
||||||
-- checks if the object is owned by a playermat or the mythos, returns boolean
|
|
||||||
function checkMemo(obj)
|
|
||||||
local memo = obj.getMemo()
|
|
||||||
if memo then
|
|
||||||
local decoded = JSON.decode(memo) or {}
|
|
||||||
if decoded.matColor then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
|
Loading…
Reference in New Issue
Block a user