X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Fbuffs%2Fsv_buffs.qc;h=21ce55bcc4d674f6130f39bca2336f87dd7c9d1d;hp=d9223b302a13b771f34e11b55c8bb7077e08f01c;hb=cbca1a79315fe08c4796273a490a4d12b7d3291d;hpb=4ee2807b2d8f808928ef14b3e814945b3edb4350

diff --git a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
index d9223b302..21ce55bcc 100644
--- a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
+++ b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
@@ -216,7 +216,7 @@ void buff_NewType(entity ent, float cb)
 	FOREACH(Buffs, buff_Available(it), LAMBDA(
 		it.buff_seencount += 1;
 		// if it's already been chosen, give it a lower priority
-		RandomSelection_Add(NULL, it.m_itemid, string_null, 1, max(0.2, 1 / it.buff_seencount));
+		RandomSelection_AddFloat(it.m_itemid, 1, max(0.2, 1 / it.buff_seencount));
 	));
 	ent.buffs = RandomSelection_chosen_float;
 }
@@ -345,6 +345,10 @@ void buff_Init(entity this)
 	this.classname = "item_buff";
 	this.solid = SOLID_TRIGGER;
 	this.flags = FL_ITEM;
+	this.bot_pickup = true;
+	this.bot_pickupevalfunc = commodity_pickupevalfunc;
+	this.bot_pickupbasevalue = 1000;
+	IL_PUSH(g_items, this);
 	setthink(this, buff_Think);
 	settouch(this, buff_Touch);
 	this.reset = buff_Reset;
@@ -420,9 +424,9 @@ void buff_Medic_Heal(entity this)
 	});
 }
 
-float buff_Inferno_CalculateTime(float x, float offset_x, float offset_y, float intersect_x, float intersect_y, float base)
+float buff_Inferno_CalculateTime(float damg, float offset_x, float offset_y, float intersect_x, float intersect_y, float base)
 {
-	return offset_y + (intersect_y - offset_y) * logn(((x - offset_x) * ((base - 1) / intersect_x)) + 1, base);
+	return offset_y + (intersect_y - offset_y) * logn(((damg - offset_x) * ((base - 1) / intersect_x)) + 1, base);
 }
 
 // mutator hooks
@@ -822,7 +826,7 @@ MUTATOR_HOOKFUNCTION(buffs, PlayerPreThink)
 	if(player.buffs & BUFF_MAGNET.m_itemid)
 	{
 		vector pickup_size;
-		FOREACH_ENTITY_FLAGS(flags, FL_ITEM,
+		IL_EACH(g_items, it.itemdef,
 		{
 			if(it.buffs)
 				pickup_size = '1 1 1' * autocvar_g_buffs_magnet_range_buff;
@@ -838,8 +842,14 @@ MUTATOR_HOOKFUNCTION(buffs, PlayerPreThink)
 	}
 
 	if(player.buffs & BUFF_AMMO.m_itemid)
-	if(player.clip_size)
-		player.clip_load = player.(weapon_load[PS(player).m_switchweapon.m_id]) = player.clip_size;
+	{
+		for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+		{
+			.entity weaponentity = weaponentities[slot];
+			if(player.(weaponentity).clip_size)
+				player.(weaponentity).clip_load = player.(weaponentity).(weapon_load[player.(weaponentity).m_switchweapon.m_id]) = player.(weaponentity).clip_size;
+		}
+	}
 
 	if((player.buffs & BUFF_INVISIBLE.m_itemid) && (player.oldbuffs & BUFF_INVISIBLE.m_itemid))
 	if(player.alpha != autocvar_g_buffs_invisible_alpha)
@@ -866,9 +876,17 @@ MUTATOR_HOOKFUNCTION(buffs, PlayerPreThink)
 			player.buff_ammo_prev_infitems = (player.items & IT_UNLIMITED_WEAPON_AMMO);
 			player.items |= IT_UNLIMITED_WEAPON_AMMO;
 
-			if(player.clip_load)
-				player.buff_ammo_prev_clipload = player.clip_load;
-			player.clip_load = player.(weapon_load[PS(player).m_switchweapon.m_id]) = player.clip_size;
+			if(player.buffs & BUFF_AMMO.m_itemid)
+			{
+				for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+				{
+					.entity weaponentity = weaponentities[slot];
+					if(player.(weaponentity).clip_load)
+						player.(weaponentity).buff_ammo_prev_clipload = player.(weaponentity).clip_load;
+					if(player.(weaponentity).clip_size)
+						player.(weaponentity).clip_load = player.(weaponentity).(weapon_load[player.(weaponentity).m_switchweapon.m_id]) = player.(weaponentity).clip_size;
+				}
+			}
 		}
 
 		BUFF_ONREM(BUFF_AMMO)
@@ -878,8 +896,15 @@ MUTATOR_HOOKFUNCTION(buffs, PlayerPreThink)
 			else
 				player.items &= ~IT_UNLIMITED_WEAPON_AMMO;
 
-			if(player.buff_ammo_prev_clipload)
-				player.clip_load = player.buff_ammo_prev_clipload;
+			if(player.buffs & BUFF_AMMO.m_itemid)
+			{
+				for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+				{
+					.entity weaponentity = weaponentities[slot];
+					if(player.(weaponentity).buff_ammo_prev_clipload)
+						player.(weaponentity).clip_load = player.(weaponentity).buff_ammo_prev_clipload;
+				}
+			}
 		}
 
 		BUFF_ONADD(BUFF_INVISIBLE)