X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_items.qc;h=ac029e6577659f3e243a610219b9a3f290d15bc4;hb=e55b0af41ff296efc886dfaccf3f663f751f6502;hp=dfe1a5cb0bdd203d9eed0e7ab7faf72309a27159;hpb=a022216a47ca24cd1bac2ff836d4056154be7015;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index dfe1a5cb0..ac029e657 100644
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -5,7 +5,7 @@ float have_pickup_item(void)
 		if(self.classname != "minstagib")
 			return FALSE;
 
-	if(self.items == IT_STRENGTH || self.items == IT_INVINCIBLE)
+	if(self.flags & FL_POWERUP)
 	{
 		if(autocvar_g_powerups > 0)
 			return TRUE;
@@ -29,7 +29,7 @@ float have_pickup_item(void)
 		if(g_ca)
 			return FALSE;
 		if(g_weaponarena)
-			if((self.weapons & WEPBIT_ALL) || (self.items & IT_AMMO))
+			if(!WEPSET_EMPTY_E(self) || (self.items & IT_AMMO))
 				return FALSE;
 	}
 	return TRUE;
@@ -83,7 +83,7 @@ float Item_Customize()
 {
 	if(self.spawnshieldtime)
 		return TRUE;
-	if(self.weapons != (self.weapons & other.weapons))
+	if(!WEPSET_CONTAINS_ALL_EE(other, self))
 	{
 		self.colormod = '0 0 0';
 		self.glowmod = self.colormod;
@@ -131,7 +131,7 @@ void Item_Show (entity e, float mode)
 
 		e.spawnshieldtime = 1;
 	}
-	else if((e.flags & FL_WEAPON) && g_weapon_stay)
+	else if((e.flags & FL_WEAPON) && !(e.flags & FL_NO_WEAPON_STAY) && g_weapon_stay)
 	{
 		// make the item translucent and not touchable
 		e.model = e.mdl;
@@ -168,7 +168,7 @@ void Item_Show (entity e, float mode)
 		e.spawnshieldtime = 1;
 	}
 
-	if (e.strength_finished || e.invincible_finished)
+	if (e.items & (IT_STRENGTH | IT_INVINCIBLE))
 		e.effects |= EF_ADDITIVE | EF_FULLBRIGHT;
 	if (autocvar_g_nodepthtestitems)
 		e.effects |= EF_NODEPTHTEST;
@@ -209,7 +209,7 @@ void Item_RespawnCountdown (void)
 		if(self.count == 1)
 		{
 			string name;
-			vector rgb;
+			vector rgb = '1 0 1';
 			name = string_null;
 			if(g_minstagib)
 			{
@@ -233,6 +233,20 @@ void Item_RespawnCountdown (void)
 				case IT_FUEL_REGEN:     name = "item-fuelregen"; rgb = '1 0.5 0'; break;
 				case IT_JETPACK:        name = "item-jetpack"; rgb = '0.5 0.5 0.5'; break;
 			}
+			if(self.flags & FL_WEAPON)
+			{
+				entity wi = get_weaponinfo(self.weapon);
+				if(wi)
+				{
+					name = wi.model2;
+					rgb = '1 0 0';
+				}
+			}
+			if(!name)
+			{
+				print("Unknown powerup-marked item is wanting to respawn\n");
+				localcmd(sprintf("prvm_edict server %d\n", num_for_edict(self)));
+			}
 			if(name)
 			{
 				WaypointSprite_Spawn(name, 0, 0, self, '0 0 64', world, 0, self, waypointsprite_attached, TRUE, RADARICON_POWERUP, rgb);
@@ -251,7 +265,7 @@ void Item_RespawnCountdown (void)
 
 void Item_ScheduleRespawnIn(entity e, float t)
 {
-	if(e.flags & FL_POWERUP)
+	if((e.flags & FL_POWERUP) || WEPSET_CONTAINS_ANY_EA(e, WEPBIT_SUPERWEAPONS))
 	{
 		e.think = Item_RespawnCountdown;
 		e.nextthink = time + max(0, t - ITEM_RESPAWN_TICKS);
@@ -281,13 +295,59 @@ void Item_ScheduleInitialRespawn(entity e)
 	Item_ScheduleRespawnIn(e, game_starttime - time + ITEM_RESPAWNTIME_INITIAL(e));
 }
 
+float ITEM_MODE_NONE = 0;
+float ITEM_MODE_HEALTH = 1;
+float ITEM_MODE_ARMOR = 2;
+float ITEM_MODE_FUEL = 3;
+float Item_GiveAmmoTo(entity item, entity player, .float ammofield, float ammomax, float mode)
+{
+	if (!item.ammofield)
+		return FALSE;
+
+	if (item.spawnshieldtime)
+	{
+		if ((player.ammofield < ammomax) || item.pickup_anyway)
+		{
+			player.ammofield = bound(player.ammofield, ammomax, player.ammofield + item.ammofield);
+			goto YEAH;
+		}
+	}
+	else if(g_weapon_stay == 2)
+	{
+		float mi = min(item.ammofield, ammomax);
+		if (player.ammofield < mi)
+		{
+			player.ammofield = mi;
+			goto YEAH;
+		}
+	}
+
+	return FALSE;
+
+:YEAH
+	switch(mode)
+	{
+		case ITEM_MODE_FUEL:
+			player.pauserotfuel_finished = max(player.pauserotfuel_finished, time + autocvar_g_balance_pause_fuel_rot);
+			break;
+		case ITEM_MODE_HEALTH:
+			player.pauserothealth_finished = max(player.pauserothealth_finished, time + autocvar_g_balance_pause_health_rot);
+			break;
+		case ITEM_MODE_ARMOR:
+			player.pauserotarmor_finished = max(player.pauserotarmor_finished, time + autocvar_g_balance_pause_armor_rot);
+			break;
+		default:
+			break;
+	}
+	return TRUE;
+}
+
 float Item_GiveTo(entity item, entity player)
 {
 	float _switchweapon;
 	float pickedup;
 	float it;
 	float i;
-	entity e;
 
 	// if nothing happens to player, just return without taking the item
 	pickedup = FALSE;
@@ -297,23 +357,8 @@ float Item_GiveTo(entity item, entity player)
 	{
 		float prevcells = player.ammo_cells;
 
-		if(item.spawnshieldtime)
-		{
-			if (item.ammo_fuel)
-			if (player.ammo_fuel < g_pickup_fuel_max)
-			{
-				pickedup = TRUE;
-				player.ammo_fuel = bound(player.ammo_fuel, g_pickup_fuel_max, player.ammo_fuel + item.ammo_fuel);
-				player.pauserotfuel_finished = max(player.pauserotfuel_finished, time + autocvar_g_balance_pause_fuel_rot);
-			}
-
-			if (item.ammo_cells)
-			if (player.ammo_cells < g_pickup_cells_max)
-			{
-				pickedup = TRUE;
-				player.ammo_cells = bound(player.ammo_cells, g_pickup_cells_max, player.ammo_cells + item.ammo_cells);
-			}
-		}
+		pickedup |= Item_GiveAmmoTo(item, player, ammo_fuel, g_pickup_fuel_max, ITEM_MODE_FUEL);
+		pickedup |= Item_GiveAmmoTo(item, player, ammo_cells, 999, ITEM_MODE_NONE);
 
 		if(player.ammo_cells > prevcells)
 		{
@@ -331,10 +376,8 @@ float Item_GiveTo(entity item, entity player)
 			// else if(item.items == IT_CELLS)
 			//	AnnounceTo(player, "ammo");
 
-			if (item.weapons & WEPBIT_MINSTANEX)
+			if (WEPSET_CONTAINS_EW(item, WEP_MINSTANEX))
 				W_GiveWeapon (player, WEP_MINSTANEX, item.netname);
-			if (item.ammo_cells)
-				player.ammo_cells = bound(player.ammo_cells, 999, player.ammo_cells + autocvar_g_minstagib_ammo_drop);
 			player.health = 100;
 		}
 
@@ -382,53 +425,29 @@ float Item_GiveTo(entity item, entity player)
 		if (player.switchweapon == w_getbestweapon(player))
 			_switchweapon = TRUE;
 
-		if not(player.weapons & W_WeaponBit(player.switchweapon))
+		if not(WEPSET_CONTAINS_EW(player, player.switchweapon))
 			_switchweapon = TRUE;
 
-		if(item.spawnshieldtime)
-		{
-			if (item.ammo_shells)
-			if ((player.ammo_shells < g_pickup_shells_max) || item.pickup_anyway)
-			{
-				pickedup = TRUE;
-				player.ammo_shells = bound(player.ammo_shells, g_pickup_shells_max, player.ammo_shells + item.ammo_shells);
-			}
-			if (item.ammo_nails)
-			if ((player.ammo_nails < g_pickup_nails_max) || item.pickup_anyway)
-			{
-				pickedup = TRUE;
-				player.ammo_nails = bound(player.ammo_nails, g_pickup_nails_max, player.ammo_nails + item.ammo_nails);
-			}
-			if (item.ammo_rockets)
-			if ((player.ammo_rockets < g_pickup_rockets_max) || item.pickup_anyway)
-			{
-				pickedup = TRUE;
-				player.ammo_rockets = bound(player.ammo_rockets, g_pickup_rockets_max, player.ammo_rockets + item.ammo_rockets);
-			}
-			if (item.ammo_cells)
-			if ((player.ammo_cells < g_pickup_cells_max) || item.pickup_anyway)
-			{
-				pickedup = TRUE;
-				player.ammo_cells = bound(player.ammo_cells, g_pickup_cells_max, player.ammo_cells + item.ammo_cells);
-			}
-			if (item.ammo_fuel)
-			if ((player.ammo_fuel < g_pickup_fuel_max) || item.pickup_anyway)
-			{
-				pickedup = TRUE;
-				player.ammo_fuel = bound(player.ammo_fuel, g_pickup_fuel_max, player.ammo_fuel + item.ammo_fuel);
-				player.pauserotfuel_finished = max(player.pauserotfuel_finished, time + autocvar_g_balance_pause_fuel_rot);
-			}
-		}
+		pickedup |= Item_GiveAmmoTo(item, player, ammo_fuel, g_pickup_fuel_max, ITEM_MODE_FUEL);
+		pickedup |= Item_GiveAmmoTo(item, player, ammo_shells, g_pickup_shells_max, ITEM_MODE_NONE);
+		pickedup |= Item_GiveAmmoTo(item, player, ammo_nails, g_pickup_nails_max, ITEM_MODE_NONE);
+		pickedup |= Item_GiveAmmoTo(item, player, ammo_rockets, g_pickup_rockets_max, ITEM_MODE_NONE);
+		pickedup |= Item_GiveAmmoTo(item, player, ammo_cells, g_pickup_cells_max, ITEM_MODE_NONE);
+		pickedup |= Item_GiveAmmoTo(item, player, health, item.max_health, ITEM_MODE_HEALTH);
+		pickedup |= Item_GiveAmmoTo(item, player, armorvalue, item.max_armorvalue, ITEM_MODE_ARMOR);
 
 		if (item.flags & FL_WEAPON)
-		if ((it = item.weapons - (item.weapons & player.weapons)) || (g_pickup_weapons_anyway))
 		{
-			pickedup = TRUE;
-			for(i = WEP_FIRST; i <= WEP_LAST; ++i)
+			WEPSET_DECLARE_A(it);
+			WEPSET_COPY_AE(it, item);
+			WEPSET_ANDNOT_AE(it, player);
+
+			if (!WEPSET_EMPTY_A(it) || (item.spawnshieldtime && self.pickup_anyway))
 			{
-				e = get_weaponinfo(i);
-				if(it & e.weapons)
-					W_GiveWeapon (player, e.weapon, item.netname);
+				pickedup = TRUE;
+				for(i = WEP_FIRST; i <= WEP_LAST; ++i)
+					if(WEPSET_CONTAINS_AW(it, i))
+						W_GiveWeapon (player, i, item.netname);
 			}
 		}
 
@@ -439,30 +458,20 @@ float Item_GiveTo(entity item, entity player)
 			sprint (player, strcat("You got the ^2", item.netname, "\n"));
 		}
 
-			if (item.strength_finished)
+		if (item.strength_finished)
 		{
 			pickedup = TRUE;
-			player.strength_finished = max(player.strength_finished, time) + autocvar_g_balance_powerup_strength_time;
+			player.strength_finished = max(player.strength_finished, time) + item.strength_finished;
 		}
 		if (item.invincible_finished)
 		{
 			pickedup = TRUE;
-			player.invincible_finished = max(player.invincible_finished, time) + autocvar_g_balance_powerup_invincible_time;
-		}
-
-		if (item.health)
-		if ((player.health < item.max_health) || item.pickup_anyway)
-		{
-			pickedup = TRUE;
-			player.health = bound(player.health, item.max_health, player.health + item.health);
-			player.pauserothealth_finished = max(player.pauserothealth_finished, time + autocvar_g_balance_pause_health_rot);
+			player.invincible_finished = max(player.invincible_finished, time) + item.invincible_finished;
 		}
-		if (item.armorvalue)
-		if ((player.armorvalue < item.max_armorvalue) || item.pickup_anyway)
+		if (item.superweapons_finished)
 		{
 			pickedup = TRUE;
-			player.armorvalue = bound(player.armorvalue, item.max_armorvalue, player.armorvalue + item.armorvalue);
-			player.pauserotarmor_finished = max(player.pauserotarmor_finished, time + autocvar_g_balance_pause_armor_rot);
+			player.superweapons_finished = max(player.superweapons_finished, time) + item.superweapons_finished;
 		}
 	}
 
@@ -474,7 +483,6 @@ float Item_GiveTo(entity item, entity player)
 	if (!pickedup)
 		return 0;
 
-	sound (player, CH_TRIGGER, item.item_pickupsound, VOL_BASE, ATTN_NORM);
 	if (_switchweapon)
 		if (player.switchweapon != w_getbestweapon(player))
 			W_SwitchWeapon_Force(player, w_getbestweapon(player));
@@ -487,11 +495,15 @@ void Item_Touch (void)
 	entity e, head;
 
 	// remove the item if it's currnetly in a NODROP brush or hits a NOIMPACT surface (such as sky)
-	if (((trace_dpstartcontents | trace_dphitcontents) & DPCONTENTS_NODROP) || (trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT))
+	if(self.classname == "droppedweapon")
 	{
-		remove(self);
-		return;
+		if (ITEM_TOUCH_NEEDKILL())
+		{
+			remove(self);
+			return;
+		}
 	}
+
 	if (other.classname != "player")
 		return;
 	if (other.deadflag)
@@ -501,12 +513,29 @@ void Item_Touch (void)
 	if (self.owner == other)
 		return;
 
+	if (self.classname == "droppedweapon")
+	{
+		self.strength_finished = max(0, self.strength_finished - time);
+		self.invincible_finished = max(0, self.invincible_finished - time);
+		self.superweapons_finished = max(0, self.superweapons_finished - time);
+	}
+
 	if(!Item_GiveTo(self, other))
+	{
+		if (self.classname == "droppedweapon")
+		{
+			// undo what we did above
+			self.strength_finished += time;
+			self.invincible_finished += time;
+			self.superweapons_finished += time;
+		}
 		return;
+	}
 
 	other.last_pickup = time;
 
 	pointparticles(particleeffectnum("item_pickup"), self.origin, '0 0 0', 1);
+	sound (other, CH_TRIGGER, self.item_pickupsound, VOL_BASE, ATTN_NORM);
 
 	if (self.classname == "droppedweapon")
 		remove (self);
@@ -533,6 +562,24 @@ void Item_Touch (void)
 	}
 }
 
+void Item_Reset()
+{
+	Item_Show(self, !self.state);
+	setorigin (self, self.origin);
+
+	if(self.classname != "droppedweapon")
+	{
+		self.think = SUB_Null;
+		self.nextthink = 0;
+
+		if(self.waypointsprite_attached)
+			WaypointSprite_Kill(self.waypointsprite_attached);
+
+		if((self.flags & FL_POWERUP) | WEPSET_CONTAINS_ANY_EA(self, WEPBIT_SUPERWEAPONS)) // do not spawn powerups initially!
+			Item_ScheduleInitialRespawn(self);
+	}
+}
+
 void Item_FindTeam()
 {
 	entity head, e;
@@ -559,22 +606,10 @@ void Item_FindTeam()
 			head.effects &~= EF_NODRAW;
 		}
 
-		if(e.flags & FL_POWERUP) // do not spawn powerups initially!
-			Item_ScheduleInitialRespawn(e);
+		Item_Reset();
 	}
 }
 
-void Item_Reset()
-{
-	Item_Show(self, !self.state);
-	setorigin (self, self.origin);
-	self.think = SUB_Null;
-	self.nextthink = 0;
-
-	if(self.flags & FL_POWERUP) // do not spawn powerups initially!
-		Item_ScheduleInitialRespawn(self);
-}
-
 // Savage: used for item garbage-collection
 // TODO: perhaps nice special effect?
 void RemoveItem(void)
@@ -589,10 +624,10 @@ float generic_pickupevalfunc(entity player, entity item) {return item.bot_pickup
 
 float weapon_pickupevalfunc(entity player, entity item)
 {
-	float c, i, j, position;
+	float c, j, position;
 
 	// See if I have it already
-	if(player.weapons & item.weapons == item.weapons)
+	if(!WEPSET_CONTAINS_ALL_EE(player, item))
 	{
 		// If I can pick it up
 		if(!item.spawnshieldtime)
@@ -611,34 +646,27 @@ float weapon_pickupevalfunc(entity player, entity item)
 	// If custom weapon priorities for bots is enabled rate most wanted weapons higher
 	if( bot_custom_weapon && c )
 	{
-		for(i = WEP_FIRST; i <= WEP_LAST ; ++i)
-		{
-			// Find weapon
-			if( (get_weaponinfo(i)).weapons & item.weapons  != item.weapons )
-				continue;
-
-			// Find the highest position on any range
-			position = -1;
-			for(j = 0; j < WEP_LAST ; ++j){
-				if(
-						bot_weapons_far[j] == i ||
-						bot_weapons_mid[j] == i ||
-						bot_weapons_close[j] == i
-				  )
-				{
-					position = j;
-					break;
-				}
-			}
-
-			// Rate it
-			if (position >= 0 )
+		// Find the highest position on any range
+		position = -1;
+		for(j = 0; j < WEP_LAST ; ++j){
+			if(
+					bot_weapons_far[j] == item.weapon ||
+					bot_weapons_mid[j] == item.weapon ||
+					bot_weapons_close[j] == item.weapon
+			  )
 			{
-				position = WEP_LAST - position;
-				// item.bot_pickupbasevalue is overwritten here
-				return (BOT_PICKUP_RATING_LOW + ( (BOT_PICKUP_RATING_HIGH - BOT_PICKUP_RATING_LOW) * (position / WEP_LAST ))) * c;
+				position = j;
+				break;
 			}
 		}
+
+		// Rate it
+		if (position >= 0 )
+		{
+			position = WEP_LAST - position;
+			// item.bot_pickupbasevalue is overwritten here
+			return (BOT_PICKUP_RATING_LOW + ( (BOT_PICKUP_RATING_HIGH - BOT_PICKUP_RATING_LOW) * (position / WEP_LAST ))) * c;
+		}
 	}
 
 	return item.bot_pickupbasevalue * c;
@@ -646,7 +674,8 @@ float weapon_pickupevalfunc(entity player, entity item)
 
 float commodity_pickupevalfunc(entity player, entity item)
 {
-	float c, i, need_shells, need_nails, need_rockets, need_cells;
+	float c, i;
+	float need_shells = FALSE, need_nails = FALSE, need_rockets = FALSE, need_cells = FALSE, need_fuel = FALSE;
 	entity wi;
 	c = 0;
 
@@ -655,7 +684,7 @@ float commodity_pickupevalfunc(entity player, entity item)
 	{
 		wi = get_weaponinfo(i);
 
-		if not(wi.weapons & player.weapons)
+		if not(WEPSET_CONTAINS_EW(player, i))
 			continue;
 
 		if(wi.items & IT_SHELLS)
@@ -666,6 +695,8 @@ float commodity_pickupevalfunc(entity player, entity item)
 			need_rockets = TRUE;
 		else if(wi.items & IT_CELLS)
 			need_cells = TRUE;
+		else if(wi.items & IT_FUEL)
+			need_cells = TRUE;
 	}
 
 	// TODO: figure out if the player even has the weapon this ammo is for?
@@ -687,6 +718,10 @@ float commodity_pickupevalfunc(entity player, entity item)
 	if (item.ammo_cells)
 	if (player.ammo_cells < g_pickup_cells_max)
 		c = c + max(0, 1 - player.ammo_cells / g_pickup_cells_max);
+	if (need_fuel)
+	if (item.ammo_fuel)
+	if (player.ammo_fuel < g_pickup_fuel_max)
+		c = c + max(0, 1 - player.ammo_fuel / g_pickup_fuel_max);
 	if (item.armorvalue)
 	if (player.armorvalue < item.max_armorvalue)
 		c = c + max(0, 1 - player.armorvalue / item.max_armorvalue);
@@ -697,14 +732,40 @@ float commodity_pickupevalfunc(entity player, entity item)
 	return item.bot_pickupbasevalue * c;
 }
 
+void Item_Damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
+{
+	if(ITEM_DAMAGE_NEEDKILL(deathtype))
+		RemoveItem();
+}
 
 .float is_item;
 void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, float defaultrespawntimejitter, string itemname, float itemid, float weaponid, float itemflags, float(entity player, entity item) pickupevalfunc, float pickupbasevalue)
 {
 	startitem_failed = FALSE;
 
+	if(self.model == "")
+		self.model = itemmodel;
+	if(self.item_pickupsound == "")
+		self.item_pickupsound = pickupsound;
+	if(!self.respawntime) // both need to be set
+	{
+		self.respawntime = defaultrespawntime;
+		self.respawntimejitter = defaultrespawntimejitter;
+	}
+
 	self.items = itemid;
-	self.weapons = weaponid;
+	self.weapon = weaponid;
+
+	if(weaponid)
+		WEPSET_COPY_EW(self, weaponid);
+	self.flags = FL_ITEM | itemflags;
+
+	if(MUTATOR_CALLHOOK(FilterItem)) // error means we do not want the item
+	{
+		startitem_failed = TRUE;
+		remove(self);
+		return;
+	}
 
 	// is it a dropped weapon?
 	if (self.classname == "droppedweapon")
@@ -712,9 +773,31 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
 		self.reset = SUB_Remove;
 		// it's a dropped weapon
 		self.movetype = MOVETYPE_TOSS;
+
 		// Savage: remove thrown items after a certain period of time ("garbage collection")
 		self.think = RemoveItem;
-		self.nextthink = time + 60;
+		self.nextthink = time + 20;
+
+		self.takedamage = DAMAGE_YES;
+		self.event_damage = Item_Damage;
+
+		if(self.strength_finished || self.invincible_finished || self.superweapons_finished)
+		/*
+		if(self.items == 0)
+		if(WEPSET_CONTAINS_ALL_AE(WEPBIT_SUPERWEAPONS, self)) // only superweapons
+		if(self.ammo_nails == 0)
+		if(self.ammo_cells == 0)
+		if(self.ammo_rockets == 0)
+		if(self.ammo_shells == 0)
+		if(self.ammo_fuel == 0)
+		if(self.health == 0)
+		if(self.armorvalue == 0)
+		*/
+		{
+			// if item is worthless after a timer, have it expire then
+			self.nextthink = max(self.strength_finished, self.invincible_finished, self.superweapons_finished);
+		}
+
 		// don't drop if in a NODROP zone (such as lava)
 		traceline(self.origin, self.origin, MOVE_NORMAL, self);
 		if (trace_dpstartcontents & DPCONTENTS_NODROP)
@@ -726,13 +809,6 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
 	}
 	else
 	{
-		if(MUTATOR_CALLHOOK(FilterItem)) // error means we do not want the item
-		{
-			startitem_failed = TRUE;
-			remove(self);
-			return;
-		}
-
 		if(!have_pickup_item())
 		{
 			startitem_failed = TRUE;
@@ -792,10 +868,10 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
 			self.is_item = TRUE;
 		}
 
-		weaponsInMap |= weaponid;
+		WEPSET_OR_AW(weaponsInMap, weaponid);
 
-		precache_model (itemmodel);
-		precache_sound (pickupsound);
+		precache_model (self.model);
+		precache_sound (self.item_pickupsound);
 
 		precache_sound ("misc/itemrespawncountdown.wav");
 		if(!g_minstagib && itemid == IT_STRENGTH)
@@ -812,16 +888,8 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
 	self.bot_pickup = TRUE;
 	self.bot_pickupevalfunc = pickupevalfunc;
 	self.bot_pickupbasevalue = pickupbasevalue;
-	self.mdl = itemmodel;
-	self.item_pickupsound = pickupsound;
-	// let mappers override respawntime
-	if(!self.respawntime) // both set
-	{
-		self.respawntime = defaultrespawntime;
-		self.respawntimejitter = defaultrespawntimejitter;
-	}
+	self.mdl = self.model;
 	self.netname = itemname;
-	self.flags = FL_ITEM | itemflags;
 	self.touch = Item_Touch;
 	setmodel (self, self.mdl); // precision set below
 	self.effects |= EF_LOWPRECISION;
@@ -839,7 +907,6 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
 		self.colormap = 1024; // color shirt=0 pants=0 grey
 	}
 
-	Item_Show(self, 1);
 	self.state = 0;
 	if(self.team)
 	{
@@ -848,8 +915,8 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
 		self.effects = self.effects | EF_NODRAW; // marker for item team search
 		InitializeEntity(self, Item_FindTeam, INITPRIO_FINDTARGET);
 	}
-	else if(self.flags & FL_POWERUP) // do not spawn powerups initially!
-		Item_ScheduleInitialRespawn(self);
+	else
+		Item_Reset();
 }
 
 /* replace items in minstagib
@@ -884,7 +951,8 @@ void minstagib_items (float itemid)
 	// replace with invis
 	if (itemid == IT_STRENGTH)
 	{
-		self.strength_finished = 30;
+		if(!self.strength_finished)
+			self.strength_finished = autocvar_g_balance_powerup_strength_time;
 		StartItem ("models/items/g_strength.md3",
 			"misc/powerup.wav", g_pickup_respawntime_powerup, g_pickup_respawntimejitter_powerup,
 			"Invisibility", IT_STRENGTH, 0, FL_POWERUP, generic_pickupevalfunc, BOT_PICKUP_RATING_MID);
@@ -900,7 +968,8 @@ void minstagib_items (float itemid)
 	// replace with speed
 	if (itemid == IT_INVINCIBLE)
 	{
-		self.invincible_finished = 30;
+		if(!self.invincible_finished)
+			self.invincible_finished = autocvar_g_balance_powerup_invincible_time;
 		StartItem ("models/items/g_invincible.md3",
 			"misc/powerup_shield.wav", g_pickup_respawntime_powerup, g_pickup_respawntimejitter_powerup,
 			"Speed", IT_INVINCIBLE, 0, FL_POWERUP, generic_pickupevalfunc, BOT_PICKUP_RATING_MID);
@@ -924,29 +993,28 @@ void weapon_defaultspawnfunc(float wpn)
 	string s;
 	entity oldself;
 	float i, j;
+	float f;
 
-	// set the respawntime in advance (so replaced weapons can copy it)
-
-	if(!self.respawntime)
+	if(self.classname != "droppedweapon" && self.classname != "replacedweapon")
 	{
 		e = get_weaponinfo(wpn);
-		if(e.items == IT_SUPERWEAPON)
-		{
-			self.respawntime = g_pickup_respawntime_powerup;
-			self.respawntimejitter = g_pickup_respawntimejitter_powerup;
-		}
-		else
+
+		if(e.spawnflags & WEP_FLAG_MUTATORBLOCKED)
 		{
-			self.respawntime = g_pickup_respawntime_weapon;
-			self.respawntimejitter = g_pickup_respawntimejitter_weapon;
+			print("Attempted to spawn a mutator-blocked weapon; these guns will in the future require a mutator\n");
+			/*
+			objerror("Attempted to spawn a mutator-blocked weapon rejected");
+			startitem_failed = TRUE;
+			return;
+			*/
 		}
-	}
 
-	if(self.classname != "droppedweapon" && self.classname != "replacedweapon")
-	{
-		e = get_weaponinfo(wpn);
-		s = cvar_string(strcat("g_weaponreplace_", e.netname));
-		if(s == "0")
+		s = W_Apply_Weaponreplace(e.netname);
+		ret_string = s;
+		other = e;
+		MUTATOR_CALLHOOK(SetWeaponreplace);
+		s = ret_string;
+		if(s == "")
 		{
 			remove(self);
 			startitem_failed = TRUE;
@@ -979,7 +1047,7 @@ void weapon_defaultspawnfunc(float wpn)
 			}
 			self = oldself;
 		}
-		if(t >= 1)
+		if(t >= 1) // always the case!
 		{
 			s = argv(0);
 			wpn = 0;
@@ -1007,7 +1075,25 @@ void weapon_defaultspawnfunc(float wpn)
 
 	e = get_weaponinfo(wpn);
 
-	if(e.items && e.items != IT_SUPERWEAPON)
+	if(!self.respawntime)
+	{
+		if(WEPSET_CONTAINS_ANY_EA(e, WEPBIT_SUPERWEAPONS))
+		{
+			self.respawntime = g_pickup_respawntime_superweapon;
+			self.respawntimejitter = g_pickup_respawntimejitter_superweapon;
+		}
+		else
+		{
+			self.respawntime = g_pickup_respawntime_weapon;
+			self.respawntimejitter = g_pickup_respawntimejitter_weapon;
+		}
+	}
+
+	if(WEPSET_CONTAINS_ANY_EA(e, WEPBIT_SUPERWEAPONS))
+		if(!self.superweapons_finished)
+			self.superweapons_finished = autocvar_g_balance_superweapons_time;
+
+	if(e.items)
 	{
 		for(i = 0, j = 1; i < 24; ++i, j *= 2)
 		{
@@ -1019,16 +1105,27 @@ void weapon_defaultspawnfunc(float wpn)
 			}
 		}
 	}
-	else
-	{
-		self.flags |= FL_NO_WEAPON_STAY;
-	}
+
+	// pickup anyway
+	if(g_pickup_weapons_anyway)
+		self.pickup_anyway = TRUE;
+
+	f = FL_WEAPON;
+
+	// no weapon-stay on superweapons
+	if(WEPSET_CONTAINS_ANY_EA(e, WEPBIT_SUPERWEAPONS))
+		f |= FL_NO_WEAPON_STAY;
 
 	// weapon stay isn't supported for teamed weapons
 	if(self.team)
-		self.flags |= FL_NO_WEAPON_STAY;
+		f |= FL_NO_WEAPON_STAY;
+
+	// stupid minstagib hack, don't ask
+	if(g_minstagib)
+		if(self.ammo_cells)
+			self.ammo_cells = autocvar_g_minstagib_ammo_drop;
 
-	StartItem(e.model, "weapons/weaponpickup.wav", self.respawntime, self.respawntimejitter, e.message, 0, e.weapons, FL_WEAPON, weapon_pickupevalfunc, e.bot_pickupbasevalue);
+	StartItem(e.model, "weapons/weaponpickup.wav", self.respawntime, self.respawntimejitter, e.message, 0, e.weapon, f, weapon_pickupevalfunc, e.bot_pickupbasevalue);
 	if (self.modelindex) // don't precache if self was removed
 		weapon_action(e.weapon, WR_PRECACHE);
 }
@@ -1239,7 +1336,8 @@ void spawnfunc_item_strength (void) {
 		minstagib_items(IT_STRENGTH);
 	} else {
 		precache_sound("weapons/strength_fire.wav");
-		self.strength_finished = 30;
+		if(!self.strength_finished)
+			self.strength_finished = autocvar_g_balance_powerup_strength_time;
 		StartItem ("models/items/g_strength.md3", "misc/powerup.wav", g_pickup_respawntime_powerup, g_pickup_respawntimejitter_powerup, "Strength Powerup", IT_STRENGTH, 0, FL_POWERUP, generic_pickupevalfunc, 100000);
 	}
 }
@@ -1248,7 +1346,8 @@ void spawnfunc_item_invincible (void) {
 	if(g_minstagib) {
 		minstagib_items(IT_INVINCIBLE);
 	} else {
-		self.invincible_finished = 30;
+		if(!self.invincible_finished)
+			self.invincible_finished = autocvar_g_balance_powerup_invincible_time;
 		StartItem ("models/items/g_invincible.md3", "misc/powerup_shield.wav", g_pickup_respawntime_powerup, g_pickup_respawntimejitter_powerup, "Shield", IT_INVINCIBLE, 0, FL_POWERUP, generic_pickupevalfunc, 100000);
 	}
 }
@@ -1301,6 +1400,8 @@ void spawnfunc_target_items (void)
 		self.strength_finished = autocvar_g_balance_powerup_strength_time;
 	if(!self.invincible_finished)
 		self.invincible_finished = autocvar_g_balance_powerup_invincible_time;
+	if(!self.superweapons_finished)
+		self.superweapons_finished = autocvar_g_balance_superweapons_time;
 
 	precache_sound("misc/itempickup.wav");
 	precache_sound("misc/megahealth.wav");
@@ -1323,22 +1424,25 @@ void spawnfunc_target_items (void)
 			else if(argv(i) == "unlimited_superweapons") self.items |= IT_UNLIMITED_SUPERWEAPONS;
 			else if(argv(i) == "strength")               self.items |= IT_STRENGTH;
 			else if(argv(i) == "invincible")             self.items |= IT_INVINCIBLE;
+			else if(argv(i) == "superweapons")           self.items |= IT_SUPERWEAPON;
 			else if(argv(i) == "jetpack")                self.items |= IT_JETPACK;
 			else if(argv(i) == "fuel_regen")             self.items |= IT_FUEL_REGEN;
 			else
-			for(j = WEP_FIRST; j <= WEP_LAST; ++j)
 			{
-				e = get_weaponinfo(j);
-				if(argv(i) == e.netname)
+				for(j = WEP_FIRST; j <= WEP_LAST; ++j)
 				{
-					self.weapons |= e.weapons;
-					if(self.spawnflags == 0 || self.spawnflags == 2)
-						weapon_action(e.weapon, WR_PRECACHE);
-					break;
+					e = get_weaponinfo(j);
+					if(argv(i) == e.netname)
+					{
+						WEPSET_OR_EW(self, j);
+						if(self.spawnflags == 0 || self.spawnflags == 2)
+							weapon_action(e.weapon, WR_PRECACHE);
+						break;
+					}
 				}
+				if(j > WEP_LAST)
+					print("target_items: invalid item ", argv(i), "\n");
 			}
-			if(j > WEP_LAST)
-				print("target_items: invalid item ", argv(i), "\n");
 		}
 
 		string itemprefix, valueprefix;
@@ -1370,6 +1474,7 @@ void spawnfunc_target_items (void)
 		self.netname = sprintf("%s %s%d %s", self.netname, itemprefix, !!(self.items & IT_UNLIMITED_SUPERWEAPONS), "unlimited_superweapons");
 		self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, self.strength_finished * !!(self.items & IT_STRENGTH), "strength");
 		self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, self.invincible_finished * !!(self.items & IT_INVINCIBLE), "invincible");
+		self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, self.superweapons_finished * !!(self.items & IT_SUPERWEAPON), "superweapons");
 		self.netname = sprintf("%s %s%d %s", self.netname, itemprefix, !!(self.items & IT_JETPACK), "jetpack");
 		self.netname = sprintf("%s %s%d %s", self.netname, itemprefix, !!(self.items & IT_FUEL_REGEN), "fuel_regen");
 		if(self.ammo_shells != 0) self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, max(0, self.ammo_shells), "shells");
@@ -1382,8 +1487,8 @@ void spawnfunc_target_items (void)
 		for(j = WEP_FIRST; j <= WEP_LAST; ++j)
 		{
 			e = get_weaponinfo(j);
-			if(e.weapons)
-				self.netname = sprintf("%s %s%d %s", self.netname, itemprefix, !!(self.weapons & e.weapons), e.netname);
+			if(e.weapon)
+				self.netname = sprintf("%s %s%d %s", self.netname, itemprefix, WEPSET_CONTAINS_EW(self, j), e.netname);
 		}
 	}
 	self.netname = strzone(self.netname);
@@ -1444,6 +1549,36 @@ void spawnfunc_item_jetpack(void)
 #define OP_PLUS 3
 #define OP_MINUS 4
 
+float GiveWeapon(entity e, float wpn, float op, float val)
+{
+	float v0, v1;
+	v0 = WEPSET_CONTAINS_EW(e, wpn);
+	switch(op)
+	{
+		case OP_SET:
+			if(val > 0)
+				WEPSET_OR_EW(e, wpn);
+			else
+				WEPSET_ANDNOT_EW(e, wpn);
+			break;
+		case OP_MIN:
+		case OP_PLUS:
+			if(val > 0)
+				WEPSET_OR_EW(e, wpn);
+			break;
+		case OP_MAX:
+			if(val <= 0)
+				WEPSET_ANDNOT_EW(e, wpn);
+			break;
+		case OP_MINUS:
+			if(val > 0)
+				WEPSET_ANDNOT_EW(e, wpn);
+			break;
+	}
+	v1 = WEPSET_CONTAINS_EW(e, wpn);
+	return (v0 != v1);
+}
+
 float GiveBit(entity e, .float fld, float bit, float op, float val)
 {
 	float v0, v1;
@@ -1524,7 +1659,9 @@ void GiveRot(entity e, float v0, float v1, .float rotfield, float rottime, .floa
 		e.regenfield = max(e.regenfield, time + regentime);
 }
 
+#define PREGIVE_WEAPONS(e) WEPSET_DECLARE_A(save_weapons); WEPSET_COPY_AE(save_weapons, e)
 #define PREGIVE(e,f) float save_##f; save_##f = (e).f
+#define POSTGIVE_WEAPON(e,b,snd_incr,snd_decr) GiveSound((e), WEPSET_CONTAINS_AW(save_weapons, b), WEPSET_CONTAINS_EW(e, b), 0, snd_incr, snd_decr)
 #define POSTGIVE_BIT(e,f,b,snd_incr,snd_decr) GiveSound((e), save_##f & (b), (e).f & (b), 0, snd_incr, snd_decr)
 #define POSTGIVE_VALUE(e,f,t,snd_incr,snd_decr) GiveSound((e), save_##f, (e).f, t, snd_incr, snd_decr)
 #define POSTGIVE_VALUE_ROT(e,f,t,rotfield,rottime,regenfield,regentime,snd_incr,snd_decr) GiveRot((e), save_##f, (e).f, rotfield, rottime, regenfield, regentime); GiveSound((e), save_##f, (e).f, t, snd_incr, snd_decr)
@@ -1548,11 +1685,13 @@ float GiveItems(entity e, float beginarg, float endarg)
 
 	e.strength_finished = max(0, e.strength_finished - time);
 	e.invincible_finished = max(0, e.invincible_finished - time);
+	e.superweapons_finished = max(0, e.superweapons_finished - time);
 	
 	PREGIVE(e, items);
-	PREGIVE(e, weapons);
+	PREGIVE_WEAPONS(e);
 	PREGIVE(e, strength_finished);
 	PREGIVE(e, invincible_finished);
+	PREGIVE(e, superweapons_finished);
 	PREGIVE(e, ammo_nails);
 	PREGIVE(e, ammo_cells);
 	PREGIVE(e, ammo_shells);
@@ -1590,8 +1729,9 @@ float GiveItems(entity e, float beginarg, float endarg)
 				continue;
 			case "ALL":
 				got += GiveBit(e, items, IT_FUEL_REGEN, op, val);
-				got += GiveValue(e, strength_finished, op, time);
-				got += GiveValue(e, invincible_finished, op, time);
+				got += GiveValue(e, strength_finished, op, val);
+				got += GiveValue(e, invincible_finished, op, val);
+				got += GiveValue(e, superweapons_finished, op, val);
 				got += GiveBit(e, items, IT_UNLIMITED_AMMO, op, val);
 			case "all":
 				got += GiveBit(e, items, IT_JETPACK, op, val);
@@ -1601,8 +1741,9 @@ float GiveItems(entity e, float beginarg, float endarg)
 				for(j = WEP_FIRST; j <= WEP_LAST; ++j)
 				{
 					wi = get_weaponinfo(j);
-					if(wi.weapons)
-						got += GiveBit(e, weapons, wi.weapons, op, val);
+					if(wi.weapon)
+						if not(wi.spawnflags & WEP_FLAG_MUTATORBLOCKED)
+							got += GiveWeapon(e, j, op, val);
 				}
 			case "allammo":
 				got += GiveValue(e, ammo_cells, op, val);
@@ -1632,6 +1773,9 @@ float GiveItems(entity e, float beginarg, float endarg)
 			case "invincible":
 				got += GiveValue(e, invincible_finished, op, val);
 				break;
+			case "superweapons":
+				got += GiveValue(e, superweapons_finished, op, val);
+				break;
 			case "cells":
 				got += GiveValue(e, ammo_cells, op, val);
 				break;
@@ -1660,7 +1804,7 @@ float GiveItems(entity e, float beginarg, float endarg)
 					wi = get_weaponinfo(j);
 					if(cmd == wi.netname)
 					{
-						got += GiveBit(e, weapons, wi.weapons, op, val);
+						got += GiveWeapon(e, j, op, val);
 						break;
 					}
 				}
@@ -1679,11 +1823,11 @@ float GiveItems(entity e, float beginarg, float endarg)
 	for(j = WEP_FIRST; j <= WEP_LAST; ++j)
 	{
 		wi = get_weaponinfo(j);
-		if(wi.weapons)
+		if(wi.weapon)
 		{
-			POSTGIVE_BIT(e, weapons, wi.weapons, "weapons/weaponpickup.wav", string_null);
-			if not(save_weapons & wi.weapons)
-				if(e.weapons & wi.weapons)
+			POSTGIVE_WEAPON(e, j, "weapons/weaponpickup.wav", string_null);
+			if not(WEPSET_CONTAINS_AW(save_weapons, j))
+				if(WEPSET_CONTAINS_EW(e, j))
 					weapon_action(wi.weapon, WR_PRECACHE);
 		}
 	}
@@ -1697,6 +1841,10 @@ float GiveItems(entity e, float beginarg, float endarg)
 	POSTGIVE_VALUE_ROT(e, armorvalue, 1, pauserotarmor_finished, autocvar_g_balance_pause_armor_rot, pauseregen_finished, autocvar_g_balance_pause_health_regen, "misc/armor25.wav", string_null);
 	POSTGIVE_VALUE_ROT(e, health, 1, pauserothealth_finished, autocvar_g_balance_pause_health_rot, pauseregen_finished, autocvar_g_balance_pause_health_regen, "misc/megahealth.wav", string_null);
 
+	if(e.superweapons_finished <= 0)
+		if(WEPSET_CONTAINS_ANY_EA(self, WEPBIT_SUPERWEAPONS))
+			e.superweapons_finished = autocvar_g_balance_superweapons_time;
+
 	if (g_minstagib)
 	{
 		e.health = bound(0, e.health, 100);
@@ -1711,8 +1859,12 @@ float GiveItems(entity e, float beginarg, float endarg)
 		e.invincible_finished = 0;
 	else
 		e.invincible_finished += time;
+	if(e.superweapons_finished <= 0)
+		e.superweapons_finished = 0;
+	else
+		e.superweapons_finished += time;
 
-	if not(e.weapons & W_WeaponBit(e.switchweapon))
+	if not(WEPSET_CONTAINS_EW(e, e.switchweapon))
 		_switchweapon = TRUE;
 	if(_switchweapon)
 		W_SwitchWeapon_Force(e, w_getbestweapon(e));