X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_damage.qc;h=7b63c3866016c2dd1faf904d7e78b14f3d3c01a8;hb=0ee74987765518ffed584a790f90607c3f3f8e71;hp=c057619f6ed5b0c62c750e86d5db0b3a353de7cd;hpb=30e9db455abe691a3560555a989beb382b3b2531;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index c057619f6..7b63c3866 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -56,22 +56,6 @@ float damage_gooddamage;
 .float istypefrag;
 .float taunt_soundtime;
 
-
-float IsDifferentTeam(entity a, entity b)
-{
-	if(teamplay)
-	{
-		if(a.team == b.team)
-			return 0;
-	}
-	else
-	{
-		if(a == b)
-			return 0;
-	}
-	return 1;
-}
-
 float IsFlying(entity a)
 {
 	if(a.flags & FL_ONGROUND)
@@ -128,7 +112,7 @@ void GiveFrags (entity attacker, entity targ, float f, float deathtype)
 		culprit = DEATH_WEAPONOF(deathtype);
 		if(!culprit)
 			culprit = attacker.weapon;
-		else if(!WEPSET_CONTAINS_EW(attacker, culprit))
+		else if(!(attacker.weapons & WepSet_FromWeapon(culprit)))
 			culprit = attacker.weapon;
 
 		if(g_weaponarena_random_with_laser && culprit == WEP_LASER)
@@ -143,27 +127,27 @@ void GiveFrags (entity attacker, entity targ, float f, float deathtype)
 				GiveFrags_randomweapons.classname = "GiveFrags_randomweapons";
 			}
 
-			if(inWarmupStage)
-				WEPSET_COPY_EA(GiveFrags_randomweapons, warmup_start_weapons);
+			if(warmup_stage)
+				GiveFrags_randomweapons.weapons = WARMUP_START_WEAPONS;
 			else
-				WEPSET_COPY_EA(GiveFrags_randomweapons, start_weapons);
+				GiveFrags_randomweapons.weapons = start_weapons;
 
 			// all others (including the culprit): remove
-			WEPSET_ANDNOT_EE(GiveFrags_randomweapons, attacker);
-			WEPSET_ANDNOT_EW(GiveFrags_randomweapons, culprit);
+			GiveFrags_randomweapons.weapons &= ~attacker.weapons;
+			GiveFrags_randomweapons.weapons &= ~WepSet_FromWeapon(culprit);
 
 			// among the remaining ones, choose one by random
 			W_RandomWeapons(GiveFrags_randomweapons, 1);
 
-			if(!WEPSET_EMPTY_E(GiveFrags_randomweapons))
+			if(GiveFrags_randomweapons.weapons)
 			{
-				WEPSET_OR_EE(attacker, GiveFrags_randomweapons);
-				WEPSET_ANDNOT_EW(attacker, culprit);
+				attacker.weapons |= GiveFrags_randomweapons.weapons;
+				attacker.weapons &= ~WepSet_FromWeapon(culprit);
 			}
 		}
 
 		// after a frag, choose another random weapon set
-		if not(WEPSET_CONTAINS_EW(attacker, attacker.weapon))
+		if (!(attacker.weapons & WepSet_FromWeapon(attacker.weapon)))
 			W_SwitchWeapon_Force(attacker, w_getbestweapon(attacker));
 	}
 
@@ -182,24 +166,6 @@ void GiveFrags (entity attacker, entity targ, float f, float deathtype)
 	else
 	{
 		self = oldself;
-		if(g_lms)
-		{
-			// remove a life
-			float tl;
-			tl = PlayerScore_Add(targ, SP_LMS_LIVES, -1);
-			if(tl < lms_lowest_lives)
-				lms_lowest_lives = tl;
-			if(tl <= 0)
-			{
-				if(!lms_next_place)
-					lms_next_place = player_count;
-				else
-					lms_next_place = min(lms_next_place, player_count);
-				PlayerScore_Add(targ, SP_LMS_RANK, lms_next_place); // won't ever spawn again
-				--lms_next_place;
-			}
-			f = 0;
-		}
 	}
 
 	attacker.totalfrags += f;
@@ -258,14 +224,14 @@ void Obituary_SpecialDeath(
 {
 	if(DEATH_ISSPECIAL(deathtype))
 	{
-		entity deathent = deathtypes[(deathtype - DT_FIRST) - 1];
-		if not(deathent) { backtrace("Obituary_SpecialDeath: Could not find deathtype entity!\n"); return; }
+		entity deathent = deathtypes[(deathtype - DT_FIRST)];
+		if (!deathent) { backtrace("Obituary_SpecialDeath: Could not find deathtype entity!\n"); return; }
 
 		if(murder)
 		{
 			if(deathent.death_msgmurder)
 			{
-				Send_Notification_WOVA(
+				Send_Notification_WOCOVA(
 					NOTIF_ONE,
 					notif_target,
 					MSG_MULTI,
@@ -273,7 +239,7 @@ void Obituary_SpecialDeath(
 					s1, s2, s3, "",
 					f1, f2, f3, 0
 				);
-				Send_Notification_WOVA(
+				Send_Notification_WOCOVA(
 					NOTIF_ALL_EXCEPT,
 					notif_target,
 					MSG_INFO,
@@ -287,7 +253,7 @@ void Obituary_SpecialDeath(
 		{
 			if(deathent.death_msgself)
 			{
-				Send_Notification_WOVA(
+				Send_Notification_WOCOVA(
 					NOTIF_ONE,
 					notif_target,
 					MSG_MULTI,
@@ -295,7 +261,7 @@ void Obituary_SpecialDeath(
 					s1, s2, s3, "",
 					f1, f2, f3, 0
 				);
-				Send_Notification_WOVA(
+				Send_Notification_WOCOVA(
 					NOTIF_ALL_EXCEPT,
 					notif_target,
 					MSG_INFO,
@@ -321,12 +287,12 @@ float Obituary_WeaponDeath(
 	if(death_weapon)
 	{
 		w_deathtype = deathtype;
-		float death_message = weapon_action(death_weapon, ((murder) ? WR_KILLMESSAGE : WR_SUICIDEMESSAGE));
+		float death_message = WEP_ACTION(death_weapon, ((murder) ? WR_KILLMESSAGE : WR_SUICIDEMESSAGE));
 		w_deathtype = FALSE;
 
 		if(death_message)
 		{
-			Send_Notification_WOVA(
+			Send_Notification_WOCOVA(
 				NOTIF_ONE,
 				notif_target,
 				MSG_MULTI,
@@ -334,7 +300,7 @@ float Obituary_WeaponDeath(
 				s1, s2, s3, "",
 				f1, f2, 0, 0
 			);
-			Send_Notification_WOVA(
+			Send_Notification_WOCOVA(
 				NOTIF_ALL_EXCEPT,
 				notif_target,
 				MSG_INFO,
@@ -360,7 +326,7 @@ float Obituary_WeaponDeath(
 void Obituary(entity attacker, entity inflictor, entity targ, float deathtype)
 {
 	// Sanity check
-	if not(IS_PLAYER(targ)) { backtrace("Obituary called on non-player?!\n"); return; }
+	if (!IS_PLAYER(targ)) { backtrace("Obituary called on non-player?!\n"); return; }
 
 	// Declarations
 	float notif_firstblood = FALSE;
@@ -383,7 +349,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype)
 		)
 	);
 	#endif
-	
+
 	// =======
 	// SUICIDE
 	// =======
@@ -404,7 +370,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype)
 						Obituary_SpecialDeath(targ, FALSE, deathtype, targ.netname, deathlocation, "", targ.killcount, 0, 0);
 						break;
 					}
-					
+
 					default:
 					{
 						Obituary_SpecialDeath(targ, FALSE, deathtype, targ.netname, deathlocation, "", targ.killcount, 0, 0);
@@ -413,7 +379,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype)
 				}
 			}
 		}
-		else if not(Obituary_WeaponDeath(targ, FALSE, deathtype, targ.netname, deathlocation, "", targ.killcount, 0))
+		else if (!Obituary_WeaponDeath(targ, FALSE, deathtype, targ.netname, deathlocation, "", targ.killcount, 0))
 		{
 			backtrace("SUICIDE: what the hell happened here?\n");
 			return;
@@ -427,13 +393,13 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype)
 	// ======
 	else if(IS_PLAYER(attacker))
 	{
-		if(!IsDifferentTeam(attacker, targ))
+		if(SAME_TEAM(attacker, targ))
 		{
 			LogDeath("tk", deathtype, attacker, targ);
 			GiveFrags(attacker, targ, -1, deathtype);
 
 			attacker.killcount = 0;
-			
+
 			Send_Notification(NOTIF_ONE, attacker, MSG_CENTER, CENTER_DEATH_TEAMKILL_FRAG, targ.netname);
 			Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_DEATH_TEAMKILL_FRAGGED, attacker.netname);
 			Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_NUM_4(targ.team, INFO_DEATH_TEAMKILL_), targ.netname, attacker.netname, deathlocation, targ.killcount);
@@ -480,33 +446,54 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype)
 				kill_count_to_target = 0;
 			}
 
-			float verbose_allowed = (autocvar_notification_server_allows_frag_verbose && ((autocvar_notification_server_allows_frag_verbose == 2) || inWarmupStage));
 			if(targ.istypefrag)
 			{
-				if(attacker.FRAG_VERBOSE && verbose_allowed)
-					Send_Notification(NOTIF_ONE, attacker, MSG_CENTER, CENTER_DEATH_MURDER_TYPEFRAG_VERBOSE, targ.netname, kill_count_to_attacker, (IS_BOT_CLIENT(targ) ? NO_MSG : targ.ping));
-				else
-					Send_Notification(NOTIF_ONE, attacker, MSG_CENTER, CENTER_DEATH_MURDER_TYPEFRAG, targ.netname, kill_count_to_attacker);
-
-				if(targ.FRAG_VERBOSE && verbose_allowed)
-					Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_DEATH_MURDER_TYPEFRAGGED_VERBOSE, attacker.netname, kill_count_to_target, attacker.health, attacker.armorvalue, (IS_BOT_CLIENT(attacker) ? NO_MSG : attacker.ping));
-				else
-					Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_DEATH_MURDER_TYPEFRAGGED, attacker.netname, kill_count_to_target);
+				Send_Notification(
+					NOTIF_ONE,
+					attacker,
+					MSG_CHOICE,
+					CHOICE_TYPEFRAG,
+					targ.netname,
+					kill_count_to_attacker,
+					(IS_BOT_CLIENT(targ) ? NO_MSG : targ.ping)
+				);
+				Send_Notification(
+					NOTIF_ONE,
+					targ,
+					MSG_CHOICE,
+					CHOICE_TYPEFRAGGED,
+					attacker.netname,
+					kill_count_to_target,
+					attacker.health,
+					attacker.armorvalue,
+					(IS_BOT_CLIENT(attacker) ? NO_MSG : attacker.ping)
+				);
 			}
 			else
 			{
-				if(attacker.FRAG_VERBOSE && verbose_allowed)
-					Send_Notification(NOTIF_ONE, attacker, MSG_CENTER, CENTER_DEATH_MURDER_FRAG_VERBOSE, targ.netname, kill_count_to_attacker, (IS_BOT_CLIENT(targ) ? NO_MSG : targ.ping));
-				else
-					Send_Notification(NOTIF_ONE, attacker, MSG_CENTER, CENTER_DEATH_MURDER_FRAG, targ.netname, kill_count_to_attacker);
-
-				if(targ.FRAG_VERBOSE && verbose_allowed)
-					Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_DEATH_MURDER_FRAGGED_VERBOSE, attacker.netname, kill_count_to_target, attacker.health, attacker.armorvalue, (IS_BOT_CLIENT(attacker) ? NO_MSG : attacker.ping));
-				else
-					Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_DEATH_MURDER_FRAGGED, attacker.netname, kill_count_to_target);
+				Send_Notification(
+					NOTIF_ONE,
+					attacker,
+					MSG_CHOICE,
+					CHOICE_FRAG,
+					targ.netname,
+					kill_count_to_attacker,
+					(IS_BOT_CLIENT(targ) ? NO_MSG : targ.ping)
+				);
+				Send_Notification(
+					NOTIF_ONE,
+					targ,
+					MSG_CHOICE,
+					CHOICE_FRAGGED,
+					attacker.netname,
+					kill_count_to_target,
+					attacker.health,
+					attacker.armorvalue,
+					(IS_BOT_CLIENT(attacker) ? NO_MSG : attacker.ping)
+				);
 			}
 
-			if not(Obituary_WeaponDeath(targ, TRUE, deathtype, targ.netname, attacker.netname, deathlocation, targ.killcount, kill_count_to_attacker))
+			if (!Obituary_WeaponDeath(targ, TRUE, deathtype, targ.netname, attacker.netname, deathlocation, targ.killcount, kill_count_to_attacker))
 				Obituary_SpecialDeath(targ, TRUE, deathtype, targ.netname, attacker.netname, deathlocation, targ.killcount, kill_count_to_attacker, 0);
 		}
 	}
@@ -540,7 +527,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype)
 					0);
 				break;
 			}
-			
+
 			default:
 			{
 				Obituary_SpecialDeath(targ, FALSE, deathtype, targ.netname, deathlocation, "", targ.killcount, 0, 0);
@@ -571,7 +558,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 {
 	float mirrordamage;
 	float mirrorforce;
-	float complainteamdamage = 0; 
+	float complainteamdamage = 0;
 	entity attacker_save;
 	mirrordamage = 0;
 	mirrorforce = 0;
@@ -597,7 +584,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 	if(DEATH_ISWEAPON(deathtype, WEP_HOOK) || DEATH_ISWEAPON(deathtype, WEP_TUBA))
 	{
 		if(IS_PLAYER(targ))
-			if not(IsDifferentTeam(targ, attacker))
+			if(SAME_TEAM(targ, attacker))
 			{
 				self = oldself;
 				return;
@@ -606,6 +593,10 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 
 	if(deathtype == DEATH_KILL || deathtype == DEATH_TEAMCHANGE || deathtype == DEATH_AUTOTEAMCHANGE)
 	{
+		// exit the vehicle before killing (fixes a crash)
+		if(IS_PLAYER(targ) && targ.vehicle)
+			vehicles_exit(VHEF_RELESE);
+
 		// These are ALWAYS lethal
 		// No damage modification here
 		// Instead, prepare the victim for his death...
@@ -630,7 +621,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 				damage = 0;
 				force = '0 0 0';
 			}
-			else if(!IsDifferentTeam(attacker, targ))
+			else if(SAME_TEAM(attacker, targ))
 			{
 				if(autocvar_teamplay_mode == 1)
 					damage = 0;
@@ -644,23 +635,15 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 						{
 							attacker.dmg_team = attacker.dmg_team + damage;
 							complainteamdamage = attacker.dmg_team - autocvar_g_teamdamage_threshold;
-							if(complainteamdamage > 0 && !g_ca) // FIXME why is g_ca ruled out here? Why not just g_mirrordamage 0 on CA servers?
+							if(complainteamdamage > 0)
 								mirrordamage = autocvar_g_mirrordamage * complainteamdamage;
 							mirrorforce = autocvar_g_mirrordamage * vlen(force);
-							if(g_minstagib)
-							{
-								if(autocvar_g_friendlyfire == 0)
-									damage = 0;
-							}
-							else if(g_ca)
-								damage = 0;
-							else
-								damage = autocvar_g_friendlyfire * damage;
+							damage = autocvar_g_friendlyfire * damage;
 							// mirrordamage will be used LATER
 
 							if(autocvar_g_mirrordamage_virtual)
 							{
-								vector v  = healtharmor_applydamage(attacker.armorvalue, autocvar_g_balance_armor_blockpercent, mirrordamage);
+								vector v  = healtharmor_applydamage(attacker.armorvalue, autocvar_g_balance_armor_blockpercent, deathtype, mirrordamage);
 								attacker.dmg_take += v_x;
 								attacker.dmg_save += v_y;
 								attacker.dmg_inflictor = inflictor;
@@ -670,7 +653,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 
 							if(autocvar_g_friendlyfire_virtual)
 							{
-								vector v = healtharmor_applydamage(targ.armorvalue, autocvar_g_balance_armor_blockpercent, damage);
+								vector v = healtharmor_applydamage(targ.armorvalue, autocvar_g_balance_armor_blockpercent, deathtype, damage);
 								targ.dmg_take += v_x;
 								targ.dmg_save += v_y;
 								targ.dmg_inflictor = inflictor;
@@ -686,53 +669,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 			}
 		}
 
-		if(IS_PLAYER(targ))
-		if(IS_PLAYER(attacker))
-		if(attacker != targ)
-		{
-			targ.lms_traveled_distance = autocvar_g_lms_campcheck_distance;
-			attacker.lms_traveled_distance = autocvar_g_lms_campcheck_distance;
-		}
-
-		if(IS_PLAYER(targ))
-		if (g_minstagib)
-		{
-			if ((deathtype == DEATH_FALL)  ||
-				(deathtype == DEATH_DROWN) ||
-				(deathtype == DEATH_SLIME) ||
-				(deathtype == DEATH_LAVA)  ||
-				(!DEATH_ISWEAPON(deathtype, WEP_LASER) && damage > 0 && damage < 100))
-			{
-				self = oldself;
-				return;
-			}
-			if(damage > 0)
-			    damage = 10000;
-			if (targ.armorvalue && (deathtype == WEP_MINSTANEX) && damage)
-			{
-				targ.armorvalue -= 1;
-				centerprint(targ, strcat("^3Remaining extra lives: ",ftos(targ.armorvalue)));
-				damage = 0;
-				targ.hitsound += 1;
-				attacker.hitsound += 1; // TODO change this to a future specific hitsound for armor hit
-			}
-			if (DEATH_ISWEAPON(deathtype, WEP_LASER))
-			{
-				damage = 0;
-				mirrordamage = 0;
-				complainteamdamage = 0;
-				if (targ != attacker)
-				{
-					if ((targ.health >= 1) && (IS_PLAYER(targ)))
-						centerprint(attacker, "Secondary fire inflicts no damage!");
-					force = '0 0 0';
-					// keep mirrorforce
-					attacker = targ;
-				}
-			}
-		}
-
-		if not(DEATH_ISSPECIAL(deathtype))
+		if (!DEATH_ISSPECIAL(deathtype))
 		{
 			damage *= g_weapondamagefactor;
 			mirrordamage *= g_weapondamagefactor;
@@ -740,39 +677,44 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 			force = force * g_weaponforcefactor;
 			mirrorforce *= g_weaponforcefactor;
 		}
-		
+
 		// should this be changed at all? If so, in what way?
 		frag_attacker = attacker;
 		frag_target = targ;
 		frag_damage = damage;
 		frag_force = force;
         frag_deathtype = deathtype;
+		frag_mirrordamage = mirrordamage;
 		MUTATOR_CALLHOOK(PlayerDamage_Calculate);
 		damage = frag_damage;
+		mirrordamage = frag_mirrordamage;
 		force = frag_force;
-		
-		// apply strength multiplier
-		if ((attacker.items & IT_STRENGTH) && !g_minstagib)
+
+		if (!g_minstagib)
 		{
-			if(targ == attacker)
+			// apply strength multiplier
+			if (attacker.items & IT_STRENGTH)
 			{
-				damage = damage * autocvar_g_balance_powerup_strength_selfdamage;
-				force = force * autocvar_g_balance_powerup_strength_selfforce;
-			}
-			else
-			{
-				damage = damage * autocvar_g_balance_powerup_strength_damage;
-				force = force * autocvar_g_balance_powerup_strength_force;
+				if(targ == attacker)
+				{
+					damage = damage * autocvar_g_balance_powerup_strength_selfdamage;
+					force = force * autocvar_g_balance_powerup_strength_selfforce;
+				}
+				else
+				{
+					damage = damage * autocvar_g_balance_powerup_strength_damage;
+					force = force * autocvar_g_balance_powerup_strength_force;
+				}
 			}
-		}
 
-		// apply invincibility multiplier
-		if (targ.items & IT_INVINCIBLE && !g_minstagib)
-			damage = damage * autocvar_g_balance_powerup_invincible_takedamage;
+			// apply invincibility multiplier
+			if (targ.items & IT_INVINCIBLE)
+				damage = damage * autocvar_g_balance_powerup_invincible_takedamage;
+		}
 
 		if (targ == attacker)
 		{
-			if(g_ca || (g_cts && !autocvar_g_cts_selfdamage))
+			if(g_cts && !autocvar_g_cts_selfdamage)
 				damage = 0;
 			else
 				damage = damage * autocvar_g_balance_selfdamagepercent;	// Partial damage if the attacker hits himself
@@ -792,7 +734,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 
 			if(IS_PLAYER(victim) || victim.turrcaps_flags & TFL_TURRCAPS_ISTURRET)
 			{
-				if(IsDifferentTeam(victim, attacker))
+				if(DIFF_TEAM(victim, attacker))
 				{
 					if(damage > 0)
 					{
@@ -807,16 +749,11 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 						damage_goodhits += 1;
 						damage_gooddamage += damage;
 
-						if not(DEATH_ISSPECIAL(deathtype))
+						if (!DEATH_ISSPECIAL(deathtype))
 						{
 							if(IS_PLAYER(targ)) // don't do this for vehicles
-							if(!g_minstagib)
 							if(IsFlying(victim))
 								yoda = 1;
-
-							if(g_minstagib)
-							if(victim.items & IT_STRENGTH)
-								yoda = 1;
 						}
 					}
 				}
@@ -841,7 +778,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 	// apply push
 	if (self.damageforcescale)
 	if (vlen(force))
-	if (!IS_PLAYER(self) || time >= self.spawnshieldtime || g_midair)
+	if (!IS_PLAYER(self) || time >= self.spawnshieldtime)
 	{
 		vector farce = damage_explosion_calcpush(self.damageforcescale * force, self.velocity, autocvar_g_balance_damagepush_speedfactor);
 		if(self.movetype == MOVETYPE_PHYSICS)
@@ -860,7 +797,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 		}
 		else
 			self.velocity = self.velocity + farce;
-		self.flags &~= FL_ONGROUND;
+		self.flags &= ~FL_ONGROUND;
 		UpdateCSQCProjectile(self);
 	}
 	// apply damage
@@ -873,18 +810,6 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 	if(mirrordamage > 0 || mirrorforce > 0)
 	{
 		attacker = attacker_save;
-		if(g_minstagib)
-		if(mirrordamage > 0)
-		{
-			// just lose extra LIVES, don't kill the player for mirror damage
-			if(attacker.armorvalue > 0)
-			{
-				attacker.armorvalue = attacker.armorvalue - 1;
-				centerprint(attacker, strcat("^3Remaining extra lives: ",ftos(attacker.armorvalue)));
-				attacker.hitsound += 1;
-			}
-			mirrordamage = 0;
-		}
 
 		force = normalize(attacker.origin + attacker.view_ofs - hitloc) * mirrorforce;
 		Damage(attacker, inflictor, attacker, mirrordamage, DEATH_MIRRORDAMAGE, attacker.origin, force);
@@ -892,11 +817,10 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 }
 
 float RadiusDamage_running;
-float RadiusDamage (entity inflictor, entity attacker, float coredamage, float edgedamage, float rad, entity ignore, float forceintensity, float deathtype, entity directhitentity)
+float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector inflictorvelocity, entity attacker, float coredamage, float edgedamage, float rad, entity cantbe, entity mustbe, float inflictorselfdamage, float forceintensity, float deathtype, entity directhitentity)
 	// Returns total damage applies to creatures
 {
 	entity	targ;
-	vector	blastorigin;
 	vector	force;
 	float   total_damage_to_creatures;
 	entity  next;
@@ -916,202 +840,156 @@ float RadiusDamage (entity inflictor, entity attacker, float coredamage, float e
 	tfloordmg = autocvar_g_throughfloor_damage;
 	tfloorforce = autocvar_g_throughfloor_force;
 
-	blastorigin = (inflictor.origin + (inflictor.mins + inflictor.maxs) * 0.5);
 	total_damage_to_creatures = 0;
 
 	if(deathtype != (WEP_HOOK | HITTYPE_SECONDARY | HITTYPE_BOUNCE)) // only send gravity bomb damage once
 		if(DEATH_WEAPONOF(deathtype) != WEP_TUBA) // do not send tuba damage (bandwidth hog)
 		{
-			force = inflictor.velocity;
+			force = inflictorvelocity;
 			if(vlen(force) == 0)
 				force = '0 0 -1';
 			else
 				force = normalize(force);
 			if(forceintensity >= 0)
-				Damage_DamageInfo(blastorigin, coredamage, edgedamage, rad, forceintensity * force, deathtype, 0, attacker);
+				Damage_DamageInfo(inflictororigin, coredamage, edgedamage, rad, forceintensity * force, deathtype, 0, attacker);
 			else
-				Damage_DamageInfo(blastorigin, coredamage, edgedamage, -rad, (-forceintensity) * force, deathtype, 0, attacker);
+				Damage_DamageInfo(inflictororigin, coredamage, edgedamage, -rad, (-forceintensity) * force, deathtype, 0, attacker);
 		}
 
 	stat_damagedone = 0;
 
-	targ = WarpZone_FindRadius (blastorigin, rad + MAX_DAMAGEEXTRARADIUS, FALSE);
+	targ = WarpZone_FindRadius (inflictororigin, rad + MAX_DAMAGEEXTRARADIUS, FALSE);
 	while (targ)
 	{
 		next = targ.chain;
-		if (targ != inflictor)
-			if (ignore != targ) if(targ.takedamage)
+		if ((targ != inflictor) || inflictorselfdamage)
+		if (((cantbe != targ) && !mustbe) || (mustbe == targ))
+		if (targ.takedamage)
+		{
+			vector nearest;
+			vector diff;
+			float power;
+
+			// LordHavoc: measure distance to nearest point on target (not origin)
+			// (this guarentees 100% damage on a touch impact)
+			nearest = targ.WarpZone_findradius_nearest;
+			diff = targ.WarpZone_findradius_dist;
+			// round up a little on the damage to ensure full damage on impacts
+			// and turn the distance into a fraction of the radius
+			power = 1 - ((vlen (diff) - bound(MIN_DAMAGEEXTRARADIUS, targ.damageextraradius, MAX_DAMAGEEXTRARADIUS)) / rad);
+			//bprint(" ");
+			//bprint(ftos(power));
+			//if (targ == attacker)
+			//	print(ftos(power), "\n");
+			if (power > 0)
 			{
-				vector nearest;
-				vector diff;
-				float power;
-
-				// LordHavoc: measure distance to nearest point on target (not origin)
-				// (this guarentees 100% damage on a touch impact)
-				nearest = targ.WarpZone_findradius_nearest;
-				diff = targ.WarpZone_findradius_dist;
-				// round up a little on the damage to ensure full damage on impacts
-				// and turn the distance into a fraction of the radius
-				power = 1 - ((vlen (diff) - bound(MIN_DAMAGEEXTRARADIUS, targ.damageextraradius, MAX_DAMAGEEXTRARADIUS)) / rad);
-				//bprint(" ");
-				//bprint(ftos(power));
-				//if (targ == attacker)
-				//	print(ftos(power), "\n");
-				if (power > 0)
+				float finaldmg;
+				if (power > 1)
+					power = 1;
+				finaldmg = coredamage * power + edgedamage * (1 - power);
+				if (finaldmg > 0)
 				{
-					float finaldmg;
-					if (power > 1)
-						power = 1;
-					finaldmg = coredamage * power + edgedamage * (1 - power);
-					if (finaldmg > 0)
-					{
-						float a;
-						float c;
-						vector hitloc;
-						vector myblastorigin;
-						vector center;
-
-						myblastorigin = WarpZone_TransformOrigin(targ, blastorigin);
+					float a;
+					float c;
+					vector hitloc;
+					vector myblastorigin;
+					vector center;
 
-						// if it's a player, use the view origin as reference
-						center = CENTER_OR_VIEWOFS(targ);
+					myblastorigin = WarpZone_TransformOrigin(targ, inflictororigin);
 
-						force = normalize(center - myblastorigin);
-						force = force * (finaldmg / coredamage) * forceintensity;
-						hitloc = nearest;
+					// if it's a player, use the view origin as reference
+					center = CENTER_OR_VIEWOFS(targ);
 
-						if(targ != directhitentity)
-						{
-							float hits;
-							float total;
-							float hitratio;
-							float mininv_f, mininv_d;
-
-							// test line of sight to multiple positions on box,
-							// and do damage if any of them hit
-							hits = 0;
+					force = normalize(center - myblastorigin);
+					force = force * (finaldmg / coredamage) * forceintensity;
+					hitloc = nearest;
 
-							// we know: max stddev of hitratio = 1 / (2 * sqrt(n))
-							// so for a given max stddev:
-							// n = (1 / (2 * max stddev of hitratio))^2
+					if(targ != directhitentity)
+					{
+						float hits;
+						float total;
+						float hitratio;
+						float mininv_f, mininv_d;
 
-							mininv_d = (finaldmg * (1-tfloordmg)) / autocvar_g_throughfloor_damage_max_stddev;
-							mininv_f = (vlen(force) * (1-tfloorforce)) / autocvar_g_throughfloor_force_max_stddev;
+						// test line of sight to multiple positions on box,
+						// and do damage if any of them hit
+						hits = 0;
 
-							if(autocvar_g_throughfloor_debug)
-								print(sprintf("THROUGHFLOOR: D=%f F=%f max(dD)=1/%f max(dF)=1/%f", finaldmg, vlen(force), mininv_d, mininv_f));
+						// we know: max stddev of hitratio = 1 / (2 * sqrt(n))
+						// so for a given max stddev:
+						// n = (1 / (2 * max stddev of hitratio))^2
 
-							total = 0.25 * pow(max(mininv_f, mininv_d), 2);
+						mininv_d = (finaldmg * (1-tfloordmg)) / autocvar_g_throughfloor_damage_max_stddev;
+						mininv_f = (vlen(force) * (1-tfloorforce)) / autocvar_g_throughfloor_force_max_stddev;
 
-							if(autocvar_g_throughfloor_debug)
-								print(sprintf(" steps=%f", total));
+						if(autocvar_g_throughfloor_debug)
+							print(sprintf("THROUGHFLOOR: D=%f F=%f max(dD)=1/%f max(dF)=1/%f", finaldmg, vlen(force), mininv_d, mininv_f));
 
-							if (IS_PLAYER(targ))
-								total = ceil(bound(autocvar_g_throughfloor_min_steps_player, total, autocvar_g_throughfloor_max_steps_player));
-							else
-								total = ceil(bound(autocvar_g_throughfloor_min_steps_other, total, autocvar_g_throughfloor_max_steps_other));
+						total = 0.25 * pow(max(mininv_f, mininv_d), 2);
 
-							if(autocvar_g_throughfloor_debug)
-								print(sprintf(" steps=%f dD=%f dF=%f", total, finaldmg * (1-tfloordmg) / (2 * sqrt(total)), vlen(force) * (1-tfloorforce) / (2 * sqrt(total))));
-
-							for(c = 0; c < total; ++c)
-							{
-								//traceline(targ.WarpZone_findradius_findorigin, nearest, MOVE_NOMONSTERS, inflictor);
-								WarpZone_TraceLine(blastorigin, WarpZone_UnTransformOrigin(targ, nearest), MOVE_NOMONSTERS, inflictor);
-								if (trace_fraction == 1 || trace_ent == targ)
-								{
-									++hits;
-									if (hits > 1)
-										hitloc = hitloc + nearest;
-									else
-										hitloc = nearest;
-								}
-								nearest_x = targ.origin_x + targ.mins_x + random() * targ.size_x;
-								nearest_y = targ.origin_y + targ.mins_y + random() * targ.size_y;
-								nearest_z = targ.origin_z + targ.mins_z + random() * targ.size_z;
-							}
+						if(autocvar_g_throughfloor_debug)
+							print(sprintf(" steps=%f", total));
 
-							nearest = hitloc * (1 / max(1, hits));
-							hitratio = (hits / total);
-							a = bound(0, tfloordmg + (1-tfloordmg) * hitratio, 1);
-							finaldmg = finaldmg * a;
-							a = bound(0, tfloorforce + (1-tfloorforce) * hitratio, 1);
-							force = force * a;
+						if (IS_PLAYER(targ))
+							total = ceil(bound(autocvar_g_throughfloor_min_steps_player, total, autocvar_g_throughfloor_max_steps_player));
+						else
+							total = ceil(bound(autocvar_g_throughfloor_min_steps_other, total, autocvar_g_throughfloor_max_steps_other));
 
-							if(autocvar_g_throughfloor_debug)
-								print(sprintf(" D=%f F=%f\n", finaldmg, vlen(force)));
-						}
+						if(autocvar_g_throughfloor_debug)
+							print(sprintf(" steps=%f dD=%f dF=%f", total, finaldmg * (1-tfloordmg) / (2 * sqrt(total)), vlen(force) * (1-tfloorforce) / (2 * sqrt(total))));
 
-						// laser force adjustments :P
-						if(DEATH_WEAPONOF(deathtype) == WEP_LASER)
+						for(c = 0; c < total; ++c)
 						{
-							if (targ == attacker)
+							//traceline(targ.WarpZone_findradius_findorigin, nearest, MOVE_NOMONSTERS, inflictor);
+							WarpZone_TraceLine(inflictororigin, WarpZone_UnTransformOrigin(targ, nearest), MOVE_NOMONSTERS, inflictor);
+							if (trace_fraction == 1 || trace_ent == targ)
 							{
-								vector vel;
-
-								float force_zscale;
-								float force_velocitybiasramp;
-								float force_velocitybias;
-
-								force_velocitybiasramp = autocvar_sv_maxspeed;
-								if(deathtype & HITTYPE_SECONDARY)
-								{
-									force_zscale = autocvar_g_balance_laser_secondary_force_zscale;
-									force_velocitybias = autocvar_g_balance_laser_secondary_force_velocitybias;
-								}
+								++hits;
+								if (hits > 1)
+									hitloc = hitloc + nearest;
 								else
-								{
-									force_zscale = autocvar_g_balance_laser_primary_force_zscale;
-									force_velocitybias = autocvar_g_balance_laser_primary_force_velocitybias;
-								}
-
-								vel = targ.velocity;
-								vel_z = 0;
-								vel = normalize(vel) * bound(0, vlen(vel) / force_velocitybiasramp, 1) * force_velocitybias;
-								force =
-									vlen(force)
-									*
-									normalize(normalize(force) + vel);
-
-								force_z *= force_zscale;
-							}
-							else
-							{
-								if(deathtype & HITTYPE_SECONDARY)
-								{
-									force *= autocvar_g_balance_laser_secondary_force_other_scale;
-								}
-								else
-								{
-									force *= autocvar_g_balance_laser_primary_force_other_scale;
-								}
+									hitloc = nearest;
 							}
+							nearest_x = targ.origin_x + targ.mins_x + random() * targ.size_x;
+							nearest_y = targ.origin_y + targ.mins_y + random() * targ.size_y;
+							nearest_z = targ.origin_z + targ.mins_z + random() * targ.size_z;
 						}
 
-						//if (targ == attacker)
-						//{
-						//	print("hits ", ftos(hits), " / ", ftos(total));
-						//	print(" finaldmg ", ftos(finaldmg), " force ", vtos(force));
-						//	print(" (", ftos(a), ")\n");
-						//}
-						if(finaldmg || vlen(force))
-						{
-							if(targ.iscreature)
-							{
-								total_damage_to_creatures += finaldmg;
+						nearest = hitloc * (1 / max(1, hits));
+						hitratio = (hits / total);
+						a = bound(0, tfloordmg + (1-tfloordmg) * hitratio, 1);
+						finaldmg = finaldmg * a;
+						a = bound(0, tfloorforce + (1-tfloorforce) * hitratio, 1);
+						force = force * a;
 
-								if(accuracy_isgooddamage(attacker, targ))
-									stat_damagedone += finaldmg;
-							}
+						if(autocvar_g_throughfloor_debug)
+							print(sprintf(" D=%f F=%f\n", finaldmg, vlen(force)));
+					}
 
-							if(targ == directhitentity || DEATH_ISSPECIAL(deathtype))
-								Damage (targ, inflictor, attacker, finaldmg, deathtype, nearest, force);
-							else
-								Damage (targ, inflictor, attacker, finaldmg, deathtype | HITTYPE_SPLASH, nearest, force);
+					//if (targ == attacker)
+					//{
+					//	print("hits ", ftos(hits), " / ", ftos(total));
+					//	print(" finaldmg ", ftos(finaldmg), " force ", vtos(force));
+					//	print(" (", ftos(a), ")\n");
+					//}
+					if(finaldmg || vlen(force))
+					{
+						if(targ.iscreature)
+						{
+							total_damage_to_creatures += finaldmg;
+
+							if(accuracy_isgooddamage(attacker, targ))
+								stat_damagedone += finaldmg;
 						}
+
+						if(targ == directhitentity || DEATH_ISSPECIAL(deathtype))
+							Damage (targ, inflictor, attacker, finaldmg, deathtype, nearest, force);
+						else
+							Damage (targ, inflictor, attacker, finaldmg, deathtype | HITTYPE_SPLASH, nearest, force);
 					}
 				}
 			}
+		}
 		targ = next;
 	}
 
@@ -1123,6 +1001,11 @@ float RadiusDamage (entity inflictor, entity attacker, float coredamage, float e
 	return total_damage_to_creatures;
 }
 
+float RadiusDamage (entity inflictor, entity attacker, float coredamage, float edgedamage, float rad, entity cantbe, entity mustbe, float forceintensity, float deathtype, entity directhitentity)
+{
+	return RadiusDamageForSource (inflictor, (inflictor.origin + (inflictor.mins + inflictor.maxs) * 0.5), inflictor.velocity, attacker, coredamage, edgedamage, rad, cantbe, mustbe, FALSE, forceintensity, deathtype, directhitentity);
+}
+
 .float fire_damagepersec;
 .float fire_endtime;
 .float fire_deathtype;
@@ -1173,7 +1056,7 @@ float Fire_AddDamage(entity e, entity o, float d, float t, float dt)
 		if(maxtime > mintime || maxdps > mindps)
 		{
 			// Constraints:
-			
+
 			// damage we have right now
 			mindamage = mindps * mintime;
 
@@ -1262,7 +1145,7 @@ void Fire_ApplyDamage(entity e)
 	float t, d, hi, ty;
 	entity o;
 
-	if not(Fire_IsBurning(e))
+	if (!Fire_IsBurning(e))
 		return;
 
 	for(t = 0, o = e.owner; o.owner && t < 16; o = o.owner, ++t);
@@ -1291,12 +1174,12 @@ void Fire_ApplyDamage(entity e)
 	}
 	e.fire_hitsound = TRUE;
 
-	if not(IS_INDEPENDENT_PLAYER(e))
+	if (!IS_INDEPENDENT_PLAYER(e))
 	FOR_EACH_PLAYER(other) if(e != other)
 	{
 		if(IS_PLAYER(other))
 		if(other.deadflag == DEAD_NO)
-		if not(IS_INDEPENDENT_PLAYER(other))
+		if (!IS_INDEPENDENT_PLAYER(other))
 		if(boxesoverlap(e.absmin, e.absmax, other.absmin, other.absmax))
 		{
 			t = autocvar_g_balance_firetransfer_time * (e.fire_endtime - time);
@@ -1311,7 +1194,7 @@ void Fire_ApplyEffect(entity e)
 	if(Fire_IsBurning(e))
 		e.effects |= EF_FLAME;
 	else
-		e.effects &~= EF_FLAME;
+		e.effects &= ~EF_FLAME;
 }
 
 void fireburner_think()