From aafc14549585e24ec841d97362a4374d715acd35 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Fri, 29 Sep 2023 17:06:55 +0200 Subject: [PATCH] additional memo check for CUH --- src/accessories/CleanUpHelper.ttslua | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/accessories/CleanUpHelper.ttslua b/src/accessories/CleanUpHelper.ttslua index 324383f8..428cf377 100644 --- a/src/accessories/CleanUpHelper.ttslua +++ b/src/accessories/CleanUpHelper.ttslua @@ -279,7 +279,7 @@ function tidyPlayareaCoroutine() else for _, obj in ipairs(playAreaZone.getObjects()) do -- ignore these elements - if obj.hasTag(IGNORE_TAG) == false then + if obj.hasTag(IGNORE_TAG) == false and checkMemo(obj) == false then coroutine.yield(0) trash.putObject(obj) end @@ -312,7 +312,8 @@ function tidyPlayerMatCoroutine() -- ignore these elements if obj.hasTag(IGNORE_TAG) == false and obj.hasTag("ActionToken") == false - and obj.hasTag("chaosBag") == false then + and obj.hasTag("chaosBag") == false + and checkMemo(obj) == false then coroutine.yield(0) trash.putObject(obj) @@ -357,3 +358,15 @@ function findObjects(num) debug = false }) 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