From eb1a0c9d5dd9da67b7ac31f38255fd04abcf757b Mon Sep 17 00:00:00 2001
From: Mario <zacjardine@y7mail.com>
Date: Sat, 14 Mar 2015 05:42:24 +1100
Subject: [PATCH] Magnet buff: greatly increased item pickup range

---
 models/relics/relic.md3_18.skin        |   3 +++
 models/relics/sign_magnet.tga          | Bin 0 -> 65580 bytes
 models/relics/sign_magnet_glow.tga     | Bin 0 -> 65580 bytes
 mutators.cfg                           |   5 +++++
 qcsrc/common/buffs.qh                  |   2 ++
 qcsrc/server/autocvars.qh              |   1 +
 qcsrc/server/mutators/mutator_buffs.qc |  16 ++++++++++++++++
 scripts/relics.shader                  |   9 +++++++++
 8 files changed, 36 insertions(+)
 create mode 100644 models/relics/relic.md3_18.skin
 create mode 100644 models/relics/sign_magnet.tga
 create mode 100644 models/relics/sign_magnet_glow.tga

diff --git a/models/relics/relic.md3_18.skin b/models/relics/relic.md3_18.skin
new file mode 100644
index 0000000000..b89d51cecc
--- /dev/null
+++ b/models/relics/relic.md3_18.skin
@@ -0,0 +1,3 @@
+ring,models/relics/relic_ring
+mesh,models/relics/relic
+sign,models/relics/sign_magnet
\ No newline at end of file
diff --git a/models/relics/sign_magnet.tga b/models/relics/sign_magnet.tga
new file mode 100644
index 0000000000000000000000000000000000000000..fe4ffe0f81f034b0261595cc8bc0c426b25078ea
GIT binary patch
literal 65580
zcmeI4VQUjh6oyCq;vYFAgnAo9DV5+YEn5xLd&PR|E#ik_Q?;Ug2na$5B1JAOdUZEH
z*iD*kZ5y`dOlCSW$9JG+6L)9#dCu(Y?9A*MbKRVzYv$UG8z<ke00S@p126ysFaQHE
z00S@p126ysFaQHE00S@p126ysFaQHE00S@p126ysFaQHE00S@p126ysFaQHE00S@p
z126ysFaQHE00S@p126ysFaQHE00S@p12FJ=7@)@T>e{ONwAPB<9}#T~2S0L8>0#9T
zw6J#I34EIEqj>qLvH!nc_%ioc<4=_NhmV$@+I{blKi)x%@u&8GS41CU`KOhuqmPfD
z7Ct+PeK9I((`dSv$jUzrozUlbv9t1LU3w8CKP^{bncqUM`=BnpiIBhHD)?iz-h=yf
zX+JuC%G?D%L4K;v$Z25a{YWhSE!VBRr1)vEm^a?%w@-<mmd_vk{NEGer|$f?7jj64
zpB`N}cn3cu!%xp0&|b_U6@E|nskDD6yBInrza$d>wiDPHnWVwrbbj5hR3yRQblvK!
z=+n6WA&;Hg3B;eaPs8PWDFOa_&Y^$FFn)gWR`-oH?8V;yL4#kS<$ST|)en~Trh5$6
z|LN_@e@s@4>QiX`hVzhHWf&^{v}tv?&Nm9h-*ir5mti1&zm=arMIio`;1Ip88it?T
z4DvZJ6K4KLB$a>ZuM=Ya3w@d+a-;rmI2@FJ4$`N=LI{5Av%fg(5QR8mxBILHABCmh
zSxW(XX_9OPI){ro;7k5H!nl{K_mzZxavq82_Z;0)6MLKDzpshjm@QfHA1&#^H^SOq
z8NHEpdllO7&4Q%(kJRBC$$+0ieDhrp{~)dN$u-*BKa$h`y}r_K1h>B572+E~zvrsA
zLKraPKKu0lsxkcLBbz@97$tAJrb8~j#%rGuRDbWh#UNzH{MMhsYkw(zkz4$8m9?K?
zkNWDn@tK@<?D+RXo~8cweVbeUm;D_>$eizT`P(6n(%-(>GyS7~FyGD*o4;w7f9zYa
z%fHUczhTFJDfUR(9UuGp|I{x3*tcTy7qOGr9Uq%tY5SLd|D&`0&!6|UX;;7^--@{H
zzx<od0>Gd8qq7Cf@BbXCEC7PX+*RHJusZ<q{G-MKAQ}JaXcQos{H2j!^4N>UDo{`X
zl=I&7l>mMVaNJbVCqVd$r?=`#z%IK9JXulQRZvs`j1{Pw{aH?b{wgZ~dHz(_Ij}9|
z&-1n>1N?j7Q&ETa^cb*v`l;AyXi>0q8duTMx7|#I0?9qlIYCA7zTN3`?v{TpQWj>I
z$+iHTli}d&ogn>%HZ`CF*cn-D1mQO;GY%!lPhp<_H014t?m~-Up8qw5Jq|47k**$!
zpFT*B)X(~%_yrT;{D4n$4aQF!Ub(oL2jdq$2gT*7)*HQeRhz0|h;aO}2car1_UGRH
z^}6(Wno&T0ddG&bSTX+hUm5yh!NuJq0e-s&;h6$b;5Q!M0G9;6$BSSR{KnVYZ_{}H
zWqI#8*Q;Ras)97)UkW&?qp<(KRQL`5i7=6jWcWQb1JdF5QwJo(Z+x_bQ{p$YBRaP^
zD<{Qo+`kSpEq+67$33En@s|w&$;7D3&w%9k4Q0jUSnM^@<2R<spB#OuhZOk@xf>VS
zUC-*$%c;PC{a-Uj-e~XA$g)-_dT(k|l}T*;hP>SoR>)^QqvJ0x1TEnk(#`-0zeLDC
zHn1a^B`rigvwD>L<9?Bc>=&h+;gNocm493awyvNM#LGV}1hnU=cj%;;1e*Ua^V&D-
zM{0Doj|!I!!xQw$LhSs<PN@BSaPZkfI=DScI(~xz7=Qs7fB_hQ0T_S*7=Qs7fB_hQ
z0T_S*7=Qs7fB_hQ0T_S*7=Qs7fB_hQ0T_S*7=Qs7fB_hQ0T_S*7=Qs7fB_hQ0T_S*
t7=Qs7fB_hQ0T_S*7=Qs7fB_gt(7=<&|72U;&F<fS-TZgGyOI52ega0Tz)1iA

literal 0
HcmV?d00001

diff --git a/models/relics/sign_magnet_glow.tga b/models/relics/sign_magnet_glow.tga
new file mode 100644
index 0000000000000000000000000000000000000000..fe4ffe0f81f034b0261595cc8bc0c426b25078ea
GIT binary patch
literal 65580
zcmeI4VQUjh6oyCq;vYFAgnAo9DV5+YEn5xLd&PR|E#ik_Q?;Ug2na$5B1JAOdUZEH
z*iD*kZ5y`dOlCSW$9JG+6L)9#dCu(Y?9A*MbKRVzYv$UG8z<ke00S@p126ysFaQHE
z00S@p126ysFaQHE00S@p126ysFaQHE00S@p126ysFaQHE00S@p126ysFaQHE00S@p
z126ysFaQHE00S@p126ysFaQHE00S@p12FJ=7@)@T>e{ONwAPB<9}#T~2S0L8>0#9T
zw6J#I34EIEqj>qLvH!nc_%ioc<4=_NhmV$@+I{blKi)x%@u&8GS41CU`KOhuqmPfD
z7Ct+PeK9I((`dSv$jUzrozUlbv9t1LU3w8CKP^{bncqUM`=BnpiIBhHD)?iz-h=yf
zX+JuC%G?D%L4K;v$Z25a{YWhSE!VBRr1)vEm^a?%w@-<mmd_vk{NEGer|$f?7jj64
zpB`N}cn3cu!%xp0&|b_U6@E|nskDD6yBInrza$d>wiDPHnWVwrbbj5hR3yRQblvK!
z=+n6WA&;Hg3B;eaPs8PWDFOa_&Y^$FFn)gWR`-oH?8V;yL4#kS<$ST|)en~Trh5$6
z|LN_@e@s@4>QiX`hVzhHWf&^{v}tv?&Nm9h-*ir5mti1&zm=arMIio`;1Ip88it?T
z4DvZJ6K4KLB$a>ZuM=Ya3w@d+a-;rmI2@FJ4$`N=LI{5Av%fg(5QR8mxBILHABCmh
zSxW(XX_9OPI){ro;7k5H!nl{K_mzZxavq82_Z;0)6MLKDzpshjm@QfHA1&#^H^SOq
z8NHEpdllO7&4Q%(kJRBC$$+0ieDhrp{~)dN$u-*BKa$h`y}r_K1h>B572+E~zvrsA
zLKraPKKu0lsxkcLBbz@97$tAJrb8~j#%rGuRDbWh#UNzH{MMhsYkw(zkz4$8m9?K?
zkNWDn@tK@<?D+RXo~8cweVbeUm;D_>$eizT`P(6n(%-(>GyS7~FyGD*o4;w7f9zYa
z%fHUczhTFJDfUR(9UuGp|I{x3*tcTy7qOGr9Uq%tY5SLd|D&`0&!6|UX;;7^--@{H
zzx<od0>Gd8qq7Cf@BbXCEC7PX+*RHJusZ<q{G-MKAQ}JaXcQos{H2j!^4N>UDo{`X
zl=I&7l>mMVaNJbVCqVd$r?=`#z%IK9JXulQRZvs`j1{Pw{aH?b{wgZ~dHz(_Ij}9|
z&-1n>1N?j7Q&ETa^cb*v`l;AyXi>0q8duTMx7|#I0?9qlIYCA7zTN3`?v{TpQWj>I
z$+iHTli}d&ogn>%HZ`CF*cn-D1mQO;GY%!lPhp<_H014t?m~-Up8qw5Jq|47k**$!
zpFT*B)X(~%_yrT;{D4n$4aQF!Ub(oL2jdq$2gT*7)*HQeRhz0|h;aO}2car1_UGRH
z^}6(Wno&T0ddG&bSTX+hUm5yh!NuJq0e-s&;h6$b;5Q!M0G9;6$BSSR{KnVYZ_{}H
zWqI#8*Q;Ras)97)UkW&?qp<(KRQL`5i7=6jWcWQb1JdF5QwJo(Z+x_bQ{p$YBRaP^
zD<{Qo+`kSpEq+67$33En@s|w&$;7D3&w%9k4Q0jUSnM^@<2R<spB#OuhZOk@xf>VS
zUC-*$%c;PC{a-Uj-e~XA$g)-_dT(k|l}T*;hP>SoR>)^QqvJ0x1TEnk(#`-0zeLDC
zHn1a^B`rigvwD>L<9?Bc>=&h+;gNocm493awyvNM#LGV}1hnU=cj%;;1e*Ua^V&D-
zM{0Doj|!I!!xQw$LhSs<PN@BSaPZkfI=DScI(~xz7=Qs7fB_hQ0T_S*7=Qs7fB_hQ
z0T_S*7=Qs7fB_hQ0T_S*7=Qs7fB_hQ0T_S*7=Qs7fB_hQ0T_S*7=Qs7fB_hQ0T_S*
t7=Qs7fB_hQ0T_S*7=Qs7fB_gt(7=<&|72U;&F<fS-TZgGyOI52ega0Tz)1iA

literal 0
HcmV?d00001

diff --git a/mutators.cfg b/mutators.cfg
index 5bc4c57061..3bfcbf339e 100644
--- a/mutators.cfg
+++ b/mutators.cfg
@@ -338,4 +338,9 @@ set g_buffs_inferno_burntime_factor 2 "burn time logarithm base. 0 < x < 1: incr
 set g_buffs_inferno_burntime_min_time 0.5 "minimum seconds of burn time"
 set g_buffs_inferno_burntime_target_damage 150 "damage required for g_buffs_inferno_burntime_target_time seconds of burn"
 set g_buffs_inferno_burntime_target_time 5 "seconds of burn given g_buffs_inferno_burntime_target_damage damage"
+set g_buffs_swapper 1 "swapper buff: press dropweapon to switch places with a nearby enemy"
+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 450 "item pickup range"
diff --git a/qcsrc/common/buffs.qh b/qcsrc/common/buffs.qh
index 685e886525..bebf5ec59a 100644
--- a/qcsrc/common/buffs.qh
+++ b/qcsrc/common/buffs.qh
@@ -67,6 +67,7 @@ REGISTER_BUFF(_("Flight"),flight,FLIGHT,11,'1 0.2 0.5');
 REGISTER_BUFF(_("Invisible"),invisible,INVISIBLE,12,'0.9 0.9 0.9');
 REGISTER_BUFF(_("Inferno"),inferno,INFERNO,16,'2 0 0');
 REGISTER_BUFF(_("Swapper"),swapper,SWAPPER,17,'0.59 0 0.95');
+REGISTER_BUFF(_("Magnet"),magnet,MAGNET,18,'0.45 0.45 0.45');
 #undef REGISTER_BUFF
 
 #ifdef SVQC
@@ -96,6 +97,7 @@ BUFF_SPAWNFUNCS(flight,			BUFF_FLIGHT)
 BUFF_SPAWNFUNCS(invisible,		BUFF_INVISIBLE)
 BUFF_SPAWNFUNCS(inferno,		BUFF_INFERNO)
 BUFF_SPAWNFUNCS(swapper,		BUFF_SWAPPER)
+BUFF_SPAWNFUNCS(magnet,			BUFF_MAGNET)
 BUFF_SPAWNFUNCS(random,			0)
 
 BUFF_SPAWNFUNC_Q3TA_COMPAT(doubler,    BUFF_MEDIC)
diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 1e31cafa84..9cdfe5ecd0 100644
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -891,4 +891,5 @@ float autocvar_g_buffs_inferno_burntime_target_damage;
 float autocvar_g_buffs_inferno_burntime_target_time;
 float autocvar_g_buffs_inferno_damagemultiplier;
 float autocvar_g_buffs_swapper_range;
+float autocvar_g_buffs_magnet_range_item;
 #endif
diff --git a/qcsrc/server/mutators/mutator_buffs.qc b/qcsrc/server/mutators/mutator_buffs.qc
index 6fda5d39f1..5d16d94d79 100644
--- a/qcsrc/server/mutators/mutator_buffs.qc
+++ b/qcsrc/server/mutators/mutator_buffs.qc
@@ -735,6 +735,22 @@ MUTATOR_HOOKFUNCTION(buffs_PlayerThink)
 		}
 	}
 
+	if(self.buffs & BUFF_MAGNET)
+	{
+		vector pickup_size = '1 1 1' * autocvar_g_buffs_magnet_range_item;
+		for(other = world; (other = findflags(other, flags, FL_ITEM)); )
+		if(boxesoverlap(self.absmin - pickup_size, self.absmax + pickup_size, other.absmin, other.absmax))
+		{
+			entity oldself = self;
+			self = other;
+			other = oldself;
+			if(self.touch)
+				self.touch();
+			other = self;
+			self = oldself;
+		}
+	}
+
 	if((self.buffs & BUFF_INVISIBLE) && (self.oldbuffs & BUFF_INVISIBLE))
 	if(self.alpha != autocvar_g_buffs_invisible_alpha)
 		self.alpha = autocvar_g_buffs_invisible_alpha; // powerups reset alpha, so we must enforce this (TODO)
diff --git a/scripts/relics.shader b/scripts/relics.shader
index 368df19199..daa898e41e 100644
--- a/scripts/relics.shader
+++ b/scripts/relics.shader
@@ -176,3 +176,12 @@ models/relics/sign_swapper
 		rgbgen lightingDiffuse
 	}
 }
+models/relics/sign_magnet
+{
+	cull none
+ 	{
+		map models/relics/sign_magnet
+		blendfunc add
+		rgbgen lightingDiffuse
+	}
+}
-- 
2.39.2