fix pickup radius of wands, try to make spells not slip into walls

Author: bgkillas

ewext/src/modules/entity_sync/diff_model.rs

@@ -297,6 +297,19 @@ impl LocalDiffModelTracker {
             (info.vx, info.vy) = vel.m_velocity()?;
         }
 
+        if entity.has_tag("card_action") {
+            if let Some(vel) = entity.try_get_first_component::<VelocityComponent>(None)? {
+                let (cx, cy) = noita_api::raw::game_get_camera_pos()?;
+                if (cx as f32 - x).powi(2) + (cy as f32 - y).powi(2) > 256.0 * 256.0 {
+                    vel.set_gravity_y(0.0)?;
+                    vel.set_air_friction(10.0)?;
+                } else {
+                    vel.set_gravity_y(400.0)?;
+                    vel.set_air_friction(0.55)?;
+                }
+            }
+        }
+
         if let Some(damage) = entity.try_get_first_component::<DamageModelComponent>(None)? {
             let hp = damage.hp()?;
             info.hp = hp as f32;
@@ -588,6 +601,13 @@ impl LocalDiffModel {
         var.set_value_int(i32::from_le_bytes(lid.0.to_le_bytes()))?;
         var.set_value_bool(true)?;
 
+        if entity.has_tag("card_action") {
+            if let Some(vel) = entity.try_get_first_component::<VelocityComponent>(None)? {
+                vel.set_gravity_y(0.0)?;
+                vel.set_air_friction(10.0)?;
+            }
+        }
+
         if entity
             .try_get_first_component::<BossDragonComponent>(None)?
             .is_some()

quant.ew/files/system/explosion_cuts/explosion_cuts.lua

@@ -226,13 +226,6 @@ function mod.on_world_update()
     for ent = last + 1, n do
         if EntityGetIsAlive(ent) then
             update(ent, 1)
-            local com = EntityGetFirstComponentIncludingDisabled(ent, "AbilityComponent")
-            if com ~= nil and ComponentGetValue2(com, "use_gun_script") then
-                com = EntityGetFirstComponentIncludingDisabled(ent, "ItemComponent")
-                if com ~= nil then
-                    ComponentSetValue2(com, "item_pickup_radius", 256)
-                end
-            end
         end
     end
     if exists then

quant.ew/files/system/orb_sync/orb_sync.lua

@@ -60,28 +60,33 @@ end
 local last = 0
 
 function module.on_world_update()
-    if GameGetFrameNum() % 4 == 3 then
-        local found_local = orbs_found_this_run()
-        local n = EntitiesGetMaxID()
-        for ent = last + 1, n do
-            if EntityGetIsAlive(ent) then
-                local comp = EntityGetFirstComponent(ent, "OrbComponent")
-                if comp ~= nil then
-                    local orb = ComponentGetValue2(comp, "orb_id")
-                    if table.contains(found_local, orb) then
-                        EntityKill(ent)
-                    end
-                elseif EntityGetFilename(ent) == "data/entities/base_item.xml" then
+    local found_local = orbs_found_this_run()
+    local n = EntitiesGetMaxID()
+    for ent = last + 1, n do
+        if EntityGetIsAlive(ent) then
+            local comp = EntityGetFirstComponent(ent, "OrbComponent")
+            if comp ~= nil then
+                local orb = ComponentGetValue2(comp, "orb_id")
+                if table.contains(found_local, orb) then
                     EntityKill(ent)
                 end
+            elseif EntityGetFilename(ent) == "data/entities/base_item.xml" then
+                EntityKill(ent)
+            end
+            local com = EntityGetFirstComponentIncludingDisabled(ent, "AbilityComponent")
+            if com ~= nil and ComponentGetValue2(com, "use_gun_script") then
+                com = EntityGetFirstComponentIncludingDisabled(ent, "ItemComponent")
+                if com ~= nil then
+                    ComponentSetValue2(com, "item_pickup_radius", 256)
+                end
             end
         end
-        last = n
     end
+    last = n
     if wait_for_these ~= nil and not EntityHasTag(ctx.my_player.entity, "polymorphed") then
         actual_orbs_update(wait_for_these)
         wait_for_these = nil
-    elseif last_orb_count ~= GameGetOrbCountThisRun() or GameGetFrameNum() % (60 * 60) == 20 then
+    elseif last_orb_count ~= GameGetOrbCountThisRun() or GameGetFrameNum() % (60 * 5) == 23 then
         last_orb_count = GameGetOrbCountThisRun()
         rpc.update_orbs(orbs_found_this_run())
     end