From 95202136dfa9afebe7afe9ecf9c6b48c2a717878 Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 16 Jan 2016 20:50:52 +1000 Subject: [PATCH] Further reduce magnet buff's range, also fix it --- mutators.cfg | 4 ++-- qcsrc/common/mutators/mutator/buffs/buffs.qc | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/mutators.cfg b/mutators.cfg index 60f4c4c314..229d656f23 100644 --- a/mutators.cfg +++ b/mutators.cfg @@ -353,8 +353,8 @@ set g_buffs_swapper_time 60 "swapper buff carry time" 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)" // ============== diff --git a/qcsrc/common/mutators/mutator/buffs/buffs.qc b/qcsrc/common/mutators/mutator/buffs/buffs.qc index 111490669b..59f189c24a 100644 --- a/qcsrc/common/mutators/mutator/buffs/buffs.qc +++ b/qcsrc/common/mutators/mutator/buffs/buffs.qc @@ -898,12 +898,14 @@ MUTATOR_HOOKFUNCTION(buffs, PlayerPreThink) 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; + } } }); } -- 2.39.2