surely fix last not working

Author: bgkillas

ewext/noita_api/src/lua.rs

@@ -625,6 +625,37 @@ impl<
     }
 }
 
+impl<
+        T0: LuaGetValue,
+        T1: LuaGetValue,
+        T2: LuaGetValue,
+        T3: LuaGetValue,
+        T4: LuaGetValue,
+        T5: LuaGetValue,
+        T6: LuaGetValue,
+    > LuaGetValue for (T0, T1, T2, T3, T4, T5, T6)
+{
+    fn get(lua: LuaState, index: i32) -> eyre::Result<Self>
+    where
+        Self: Sized,
+    {
+        let prev = <(T0, T1, T2, T3, T4, T5)>::get(lua, index - T6::size_on_stack())?;
+        Ok((
+            prev.0,
+            prev.1,
+            prev.2,
+            prev.3,
+            prev.4,
+            prev.5,
+            T6::get(lua, index)?,
+        ))
+    }
+
+    fn size_on_stack() -> i32 {
+        <(T0, T1, T2, T3, T4, T5)>::size_on_stack() + T6::size_on_stack()
+    }
+}
+
 impl LuaGetValue for (bool, bool, bool, f64, f64, f64, f64, f64, f64, f64, f64) {
     fn get(lua: LuaState, index: i32) -> eyre::Result<Self> {
         Ok((

ewext/src/lib.rs

@@ -473,8 +473,10 @@ pub unsafe extern "C" fn luaopen_ewext0(lua: *mut lua_State) -> c_int {
                     .as_mut()
                     .ok_or_eyre("No entity sync module loaded")?;
                 #[allow(clippy::type_complexity)]
-                let (entity_killed, x, y, file, entity_responsible): (
+                let (entity_killed, wait_on_kill, drops_gold, x, y, file, entity_responsible): (
                     Option<EntityID>,
+                    Option<bool>,
+                    Option<bool>,
                     Option<f64>,
                     Option<f64>,
                     Option<Cow<'_, str>>,
@@ -483,11 +485,15 @@ pub unsafe extern "C" fn luaopen_ewext0(lua: *mut lua_State) -> c_int {
                 let entity_killed =
                     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

@@ -281,12 +281,20 @@ impl EntitySync {
     pub(crate) fn cross_death_notify(
         &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, pos, file, entity_responsible);
+        self.local_diff_model.death_notify(
+            entity_killed,
+            wait_on_kill,
+            drops_gold,
+            pos,
+            file,
+            entity_responsible,
+        );
         Ok(())
     }
 
@@ -346,14 +354,15 @@ impl Module for EntitySync {
             let (pos, data) = &self.spawn_once[i];
             if pos.contains(x, y, 512 + 256) {
                 match data {
-                    shared::SpawnOnce::Enemy(file, offending_peer) => {
+                    shared::SpawnOnce::Enemy(file, drops_gold, offending_peer) => {
                         if let Ok(Some(entity)) =
                             noita_api::raw::entity_load(file.into(), Some(x), Some(y))
                         {
+                            diff_model::init_remote_entity(entity, None, None, *drops_gold)?;
                             if let Some(damage) =
                                 entity.try_get_first_component::<DamageModelComponent>(None)?
                             {
-                                damage.set_wait_for_kill_flag_on_death(false)?; //TODO deal with this better
+                                damage.set_wait_for_kill_flag_on_death(false)?;
                                 damage.set_ui_report_damage(false)?;
                                 damage.set_hp(f32::MIN_POSITIVE as f64)?;
                                 let responsible_entity = offending_peer
@@ -394,7 +403,7 @@ impl Module for EntitySync {
                             }
                         }
                     }
-                    shared::SpawnOnce::BrokenWand(_file) => {
+                    shared::SpawnOnce::BrokenWand => {
                         todo!()
                     }
                 }