set g_buffs_swapper_range 1500 "maximum range of swapping with enemy"
set g_buffs_magnet 1 "magnet buff: greatly increased item pickup range"
set g_buffs_magnet_time 60 "magnet buff carry time"
-set g_buffs_magnet_range_item 350 "range around player that items are automatically picked up (excludes other buffs)"
-set g_buffs_magnet_range_buff 200 "range around player that only buffs are picked up (drops magnet buff)"
+set g_buffs_magnet_range_item 250 "range around player that items are automatically picked up (excludes other buffs)"
+set g_buffs_magnet_range_buff 100 "range around player that only buffs are picked up (drops magnet buff)"
// ==============
if(boxesoverlap(self.absmin - pickup_size, self.absmax + pickup_size, it.absmin, it.absmax))
{
- setself(other);
- other = this;
- if(self.touch)
- self.touch();
- other = self;
- setself(this);
+ if(it.touch)
+ {
+ entity oldother = other;
+ other = self;
+ WITH(entity, self, it, it.touch());
+
+ other = oldother;
+ }
}
});
}