adam/SCED
1
0
Fork 0
Code Actions Releases 8 Activity

Merge pull request #949 from argonui/doom-removal

Browse Source 
Updated doom counter reset to remove ignored doom
This commit is contained in:
dscarpac 2024-11-01 18:31:10 -05:00 committed by GitHub
commit cc4ac900f2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/DoomInPlayCounter.ttslua
View File

@ -84,9 +84,9 @@ function getDoomCount()
end end
-- gets quantity (for stacks) of doom -- gets quantity (for stacks) of doom
function getDoomAmount(obj) function getDoomAmount(obj, disregardIgnoreTag)
if (obj.is_face_down and obj.getCustomObject().image_bottom == doomURL) if (obj.is_face_down and obj.getCustomObject().image_bottom == doomURL)
and not obj.hasTag(IGNORE_TAG) and (not obj.hasTag(IGNORE_TAG) or disregardIgnoreTag)
and inArea(obj.getPosition(), TOTAL_PLAY_AREA) then and inArea(obj.getPosition(), TOTAL_PLAY_AREA) then
return math.abs(obj.getQuantity()) return math.abs(obj.getQuantity())
else else
@ -115,7 +115,7 @@ end
function removeDoomFromList(objList) function removeDoomFromList(objList)
local count = 0 local count = 0
for _, obj in ipairs(objList) do for _, obj in ipairs(objList) do
local amount = getDoomAmount(obj) local amount = getDoomAmount(obj, true)
if amount > 0 then if amount > 0 then
TRASH.putObject(obj) TRASH.putObject(obj)
count = count + amount count = count + amount