fix death notify

Author: bgkillas

ewext/src/lib.rs

@@ -517,10 +517,9 @@ pub unsafe extern "C" fn luaopen_ewext1(lua: *mut lua_State) -> c_int {
                     .as_mut()
                     .ok_or_eyre("No entity sync module loaded")?;
                 #[allow(clippy::type_complexity)]
-                let (entity_killed, wait_on_kill, drops_gold, x, y, file, entity_responsible): (
+                let (entity_killed, wait_on_kill, x, y, file, entity_responsible): (
                     Option<EntityID>,
                     Option<bool>,
-                    Option<bool>,
                     Option<f64>,
                     Option<f64>,
                     Option<Cow<'_, str>>,
@@ -530,14 +529,12 @@ pub unsafe extern "C" fn luaopen_ewext1(lua: *mut lua_State) -> c_int {
                     entity_killed.ok_or_eyre("Expected to have a valid entity_killed")?;
                 let file = file.ok_or_eyre("Expected to have a valid file")?;
                 let wait_on_kill = wait_on_kill.ok_or_eyre("Expected to have a valid pos")?;
-                let drops_gold = drops_gold.ok_or_eyre("Expected to have a valid pos")?;
                 let x = x.ok_or_eyre("Expected to have a valid pos")?;
                 let y = y.ok_or_eyre("Expected to have a valid pos")?;
                 let pos = WorldPos::from_f64(x, y);
                 entity_sync.cross_death_notify(
                     entity_killed,
                     wait_on_kill,
-                    drops_gold,
                     pos,
                     file.to_string(),
                     entity_responsible,

ewext/src/modules/entity_sync.rs

@@ -292,15 +292,13 @@ impl EntitySync {
         &mut self,
         entity_killed: EntityID,
         wait_on_kill: bool,
-        drops_gold: bool,
         pos: WorldPos,
         file: String,
         entity_responsible: Option<EntityID>,
     ) -> eyre::Result<()> {
         self.local_diff_model.death_notify(
             entity_killed,
             wait_on_kill,
-            drops_gold,
             pos,
             file,
             entity_responsible,

ewext/src/modules/entity_sync/diff_model.rs

@@ -41,7 +41,7 @@ struct LocalDiffModelTracker {
     pending_authority: Vec<FullEntityData>,
     pending_localize: Vec<(Lid, PeerId)>,
     /// Stores pairs of entity killed and optionally the responsible entity.
-    pending_death_notify: Vec<(EntityID, bool, bool, WorldPos, String, Option<EntityID>)>,
+    pending_death_notify: Vec<(EntityID, bool, WorldPos, String, Option<EntityID>)>,
     authority_radius: f32,
     global_entities: FxHashSet<EntityID>,
 }
@@ -164,7 +164,7 @@ impl LocalDiffModelTracker {
                 && self
                     .pending_death_notify
                     .iter()
-                    .all(|(e, _, _, _, _, _)| *e != entity)
+                    .all(|(e, _, _, _, _)| *e != entity)
             {
                 self.pending_removal.push(lid);
                 ctx.net.send(&NoitaOutbound::DesToProxy(
@@ -917,7 +917,7 @@ impl LocalDiffModel {
         }
 
         let mut dead = Vec::new();
-        for (killed, wait_on_kill, drops_gold, pos, file, responsible) in
+        for (killed, wait_on_kill, pos, file, responsible) in
             self.tracker.pending_death_notify.drain(..)
         {
             let responsible_peer = responsible
@@ -926,6 +926,11 @@ impl LocalDiffModel {
             let Some(lid) = self.tracker.tracked.get_by_right(&killed).copied() else {
                 continue;
             };
+            let drops_gold = if let Some(info) = self.entity_entries.get(&lid) {
+                info.current.drops_gold
+            } else {
+                false
+            };
             res.push(EntityUpdate::KillEntity {
                 lid,
                 wait_on_kill,
@@ -994,15 +999,13 @@ impl LocalDiffModel {
         &mut self,
         entity_killed: EntityID,
         wait_on_kill: bool,
-        drops_gold: bool,
         pos: WorldPos,
         file: String,
         entity_responsible: Option<EntityID>,
     ) {
         self.tracker.pending_death_notify.push((
             entity_killed,
             wait_on_kill,
-            drops_gold,
             pos,
             file,
             entity_responsible,

quant.ew/files/system/entity_sync_helper/death_notify.lua

@@ -6,19 +6,5 @@ function death(damage_type_bit_field, damage_message, entity_thats_responsible,
     if damage ~= nil then
         wait_on_kill = ComponentGetValue2(damage, "wait_for_kill_flag_on_death")
     end
-    local drops_gold = false
-    for _, lua in ipairs(EntityGetComponent(ent, "LuaComponent") or {}) do
-        local s = ComponentGetValue2(lua, "script_death")
-        if
-            s == "data/scripts/items/drop_money.lua"
-            or (EntityHasTag(ent, "boss_dragon") and s == "data/scripts/animals/boss_dragon_death.lua")
-        then
-            drops_gold = true
-            break
-        end
-    end
-    if EntityGetFirstComponentIncludingDisabled(ent, "VariableStorageComponent", "no_gold_drop") ~= nil then
-        drops_gold = false
-    end
-    CrossCall("ew_death_notify", ent, wait_on_kill, drops_gold, x, y, EntityGetFilename(ent), entity_thats_responsible)
+    CrossCall("ew_death_notify", ent, wait_on_kill, x, y, EntityGetFilename(ent), entity_thats_responsible)
 end

quant.ew/files/system/entity_sync_helper/entity_sync_helper.lua

@@ -41,8 +41,8 @@ util.add_cross_call("ew_thrown", function(thrown_item)
     end
 end)
 
-util.add_cross_call("ew_death_notify", function(entity, wait_on_kill, drops_gold, x, y, file, responsible)
-    table.insert(dead, { entity, wait_on_kill, drops_gold, x, y, file, responsible })
+util.add_cross_call("ew_death_notify", function(entity, wait_on_kill, x, y, file, responsible)
+    table.insert(dead, { entity, wait_on_kill, x, y, file, responsible })
 end)
 
 util.add_cross_call("ew_chest_opened", function(x, y, rx, ry, file, entity, dont)
@@ -86,7 +86,7 @@ function mod.on_world_update_post()
         end
     end
     for _, data in ipairs(dead) do
-        ewext.des_death_notify(data[1], data[2], data[3], data[4], data[5], data[6], data[7])
+        ewext.des_death_notify(data[1], data[2], data[3], data[4], data[5], data[6])
     end
     for _, data in ipairs(chest) do
         ewext.des_chest_opened(data[1], data[2], data[3], data[4], data[5], data[6])