use the more robust item removal method

instead of just marking for garbage collection directly

Author: myk002

deteriorate.lua

@@ -109,8 +109,7 @@ local function deteriorate(opts, get_item_vectors_fn, is_valid_fn, increment_wea
         for _,item in ipairs(v) do
             if is_valid_fn(opts, item) and increment_wear_fn(item)
                     and not item.flags.garbage_collect then
-                item.flags.garbage_collect = true
-                item.flags.hidden = true
+                dfhack.items.remove(item)
                 count = count + 1
             end
         end

devel/nuke-items.lua

@@ -4,10 +4,9 @@ local count = 0
 
 for _,v in ipairs(df.global.world.items.all) do
     if not (v.flags.in_building or v.flags.construction or v.flags.in_job
-            or dfhack.items.getGeneralRef(v,df.general_ref_type.UNIT_HOLDER))  then
+            or dfhack.items.getGeneralRef(v,df.general_ref_type.UNIT_HOLDER)) then
         count = count + 1
-        v.flags.forbid = true
-        v.flags.garbage_collect = true
+        dfhack.items.remove(v)
     end
 end
 

full-heal.lua

@@ -83,9 +83,7 @@ function heal(unit, resurrect, keep_corpse)
                 for i = #corpses-1,0,-1 do
                     local corpse = corpses[i] --as:df.item_body_component
                     if corpse.unit_id == unit.id then
-                        corpse.flags.garbage_collect = true
-                        corpse.flags.forbid = true
-                        corpse.flags.hidden = true
+                        dfhack.items.remove(corpse)
                     end
                 end
             end

gui/autodump.lua

@@ -350,7 +350,6 @@ function Autodump:do_destroy()
     print(('destroying %d items'):format(#items))
     for _,item in ipairs(items) do
         table.insert(self.destroyed_items, {item=item, flags=copyall(item.flags)})
-        item.flags.garbage_collect = true
         item.flags.forbid = true
         item.flags.hidden = true
     end
@@ -363,7 +362,6 @@ function Autodump:undo_destroy()
     print(('undestroying %d items'):format(#self.destroyed_items))
     for _,item_spec in ipairs(self.destroyed_items) do
         local item = item_spec.item
-        item.flags.garbage_collect = false
         item.flags.forbid = item_spec.flags.forbid
         item.flags.hidden = item_spec.flags.hidden
     end
@@ -384,16 +382,19 @@ AutodumpScreen.ATTRS {
 }
 
 function AutodumpScreen:init()
-    local window = Autodump{}
+    self.window = Autodump{}
     self:addviews{
-        window,
+        self.window,
         widgets.DimensionsTooltip{
-            get_anchor_pos_fn=function() return window.mark end,
+            get_anchor_pos_fn=function() return self.window.mark end,
         },
     }
 end
 
 function AutodumpScreen:onDismiss()
+    for _,item_spec in ipairs(self.window.destroyed_items) do
+        dfhack.items.remove(item_spec.item)
+    end
     view = nil
 end
 

modtools/invader-item-destroyer.lua

@@ -84,9 +84,7 @@ eventful.onUnitDeath.invaderItemDestroyer = function(unitId)
   if item.pos.z ~= unit.pos.z then
    return
   end
-  item.flags.garbage_collect = true
-  item.flags.forbid = true
-  item.flags.hidden = true
+  dfhack.items.remove(item)
  end
 
  for _,item in ipairs(unit.inventory) do