fix: update corpse and shield disposal for x64

Author: perry519

mod.txt

@@ -2,7 +2,7 @@
     "name" : "LowViolenceMode",
     "description" : "Reduces combat visual clutter",
     "author" : "Perry",
-    "version" : "1.0.1",
+    "version" : "1.0.2",
     "blt_version" : 2,
     "updates" : [
         {

modules/features/enemies/enemymanager/corpses.lua

@@ -101,7 +101,7 @@ local function low_violence_collect_deferred_corpses(enemy_manager)
 
     for key, corpse_data in pairs(corpses) do
         if corpse_data.low_violence_deferred_disposal then
-            if corpse_data.no_dispose and alive(corpse_data.unit) then
+            if corpse_data.no_disposal and alive(corpse_data.unit) then
                 deferred_corpses[#deferred_corpses + 1] = {
                     key = key,
                     data = corpse_data,
@@ -131,7 +131,7 @@ local function low_violence_release_deferred_corpse(enemy_manager, corpse_data)
         return false
     end
 
-    if not corpse_data.no_dispose or not alive(corpse_unit) or not enemy_manager.enable_disposal_on_corpse then
+    if not corpse_data.no_disposal or not alive(corpse_unit) or not enemy_manager.enable_disposal_on_corpse then
         corpse_data.low_violence_deferred_disposal = nil
         corpse_data.low_violence_deferred_mode = nil
         return false
@@ -140,6 +140,7 @@ local function low_violence_release_deferred_corpse(enemy_manager, corpse_data)
     corpse_data.low_violence_deferred_disposal = nil
     corpse_data.low_violence_deferred_mode = nil
     enemy_manager:enable_disposal_on_corpse(corpse_unit)
+    enemy_manager._corpse_disposal_t = low_violence_now() or enemy_manager._corpse_disposal_t
 
     return true
 end
@@ -183,17 +184,15 @@ EnemyManagerFeature.ApplyDeferredCorpsePolicy = function(enemy_manager)
     end
 end
 
-local function low_violence_unqueue_corpse_disposal_if_unneeded(enemy_manager)
-    local corpse_disposal_id = enemy_manager and enemy_manager._corpse_disposal_id
+local function low_violence_cancel_corpse_disposal_if_unneeded(enemy_manager)
     local enemy_data = enemy_manager and enemy_manager._enemy_data
 
-    if not corpse_disposal_id or not enemy_data then
+    if not enemy_data then
         return
     end
 
     if numeric_or(enemy_data.nr_corpses, 0) <= enemy_manager:corpse_limit() then
-        enemy_manager._corpse_disposal_id = nil
-        pcall(enemy_manager.unqueue_task, enemy_manager, corpse_disposal_id)
+        enemy_manager._corpse_disposal_t = nil
     end
 end
 
@@ -204,23 +203,28 @@ local function low_violence_defer_corpse_disposal(enemy_manager, dead_unit)
     local corpse_key = low_violence_unit_key(dead_unit)
     local mode = LowViolenceMode:GetMode("corpsesMode")
 
+    if LowViolenceMode:IsEnabled("blockCorpses") and mode == "timer" and LowViolenceMode:GetNumber("corpseTimerSeconds") == 0 then
+        enemy_manager._corpse_disposal_t = low_violence_now() or enemy_manager._corpse_disposal_t
+        return
+    end
+
     if not low_violence_should_defer_corpse() or not corpse_key then
         return
     end
 
     local enemy_data = enemy_manager and enemy_manager._enemy_data
     local corpse_data = low_violence_corpse_data_by_key(enemy_manager, corpse_key)
 
-    if not enemy_data or not corpse_data or corpse_data.no_dispose then
+    if not enemy_data or not corpse_data or corpse_data.no_disposal then
         return
     end
 
-    corpse_data.no_dispose = true
+    corpse_data.no_disposal = true
     corpse_data.low_violence_deferred_disposal = true
     corpse_data.low_violence_deferred_mode = mode
     enemy_data.nr_corpses = math.max(numeric_or(enemy_data.nr_corpses, 0) - 1, 0)
 
-    low_violence_unqueue_corpse_disposal_if_unneeded(enemy_manager)
+    low_violence_cancel_corpse_disposal_if_unneeded(enemy_manager)
     if mode == "after_ragdoll" and low_violence_schedule_deferred_corpse_fallback then
         low_violence_schedule_deferred_corpse_fallback(enemy_manager, corpse_key)
     elseif mode == "timer" and low_violence_schedule_timer_corpse_release then

modules/features/enemies/enemymanager/limits.lua

@@ -5,6 +5,7 @@ local fallback_corpse_limit = EnemyManagerFeature.FallbackCorpseLimit
 local remember_enemy_manager_values = EnemyManagerFeature.RememberValues
 
 local low_violence_original_enemy_manager_init = EnemyManager.init
+local low_violence_original_register_shield = EnemyManager.register_shield
 local low_violence_original_shield_limit = EnemyManager.shield_limit
 local low_violence_original_corpse_limit = EnemyManager.corpse_limit
 local low_violence_original_corpse_limit_changed_clbk = EnemyManager.corpse_limit_changed_clbk
@@ -33,6 +34,16 @@ function EnemyManager:init(...)
     LowViolenceMode.ApplyEnemyManagerSettings(self)
 end
 
+function EnemyManager:register_shield(...)
+    local result = low_violence_original_register_shield(self, ...)
+
+    if LowViolenceMode:IsEnabled("blockShields") and self._shield_disposal_t then
+        self._shield_disposal_t = self._timer:time()
+    end
+
+    return result
+end
+
 function EnemyManager:shield_limit(...)
     if LowViolenceMode:IsEnabled("blockShields") then
         return 0