X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fweapons%2Ftracing.qc;h=09e9eab980e7ad51c1859542af51da1ccbc19f65;hp=99fa2df749eb9215c09789e86ec24bfd22d6fad5;hb=af43b181a15f348a4de2045b716ebc7765ce8f9f;hpb=eef8ad5e4970d0476e0d7c6e65a5c36e1bac2282

diff --git a/qcsrc/server/weapons/tracing.qc b/qcsrc/server/weapons/tracing.qc
index 99fa2df749..09e9eab980 100644
--- a/qcsrc/server/weapons/tracing.qc
+++ b/qcsrc/server/weapons/tracing.qc
@@ -332,15 +332,14 @@ void fireBullet_trace_callback(vector start, vector hit, vector end)
 
 void fireBullet(entity this, .entity weaponentity, vector start, vector dir, float spread, float max_solid_penetration, float damage, float force, float dtype, entity tracer_effect)
 {
-	vector  end;
-
 	dir = normalize(dir + randomvec() * spread);
-	end = start + dir * max_shot_distance;
+	vector end = start + dir * max_shot_distance;
 
 	fireBullet_last_hit = NULL;
 	fireBullet_trace_callback_eff = tracer_effect;
 
-	float solid_penetration_left = 1;
+	float solid_penetration_fraction = 1;
+	float damage_fraction = 1;
 	float total_damage = 0;
 
 	float lag = ((IS_REAL_CLIENT(this)) ? ANTILAG_LATENCY(this) : 0);
@@ -361,7 +360,6 @@ void fireBullet(entity this, .entity weaponentity, vector start, vector dir, flo
 
 	for (;;)
 	{
-		// TODO also show effect while tracing
 		WarpZone_TraceBox_ThroughZone(start, '0 0 0', '0 0 0', end, false, WarpZone_trace_forent, NULL, fireBullet_trace_callback);
 		dir = WarpZone_TransformVelocity(WarpZone_trace_transform, dir);
 		end = WarpZone_TransformOrigin(WarpZone_trace_transform, end);
@@ -399,7 +397,7 @@ void fireBullet(entity this, .entity weaponentity, vector start, vector dir, flo
 			is_weapclip = true;
 
 		if(!hit || hit.solid == SOLID_BSP || hit.solid == SOLID_SLIDEBOX)
-			Damage_DamageInfo(start, damage * solid_penetration_left, 0, 0, max(1, force) * dir * solid_penetration_left, dtype, hit.species, this);
+			Damage_DamageInfo(start, damage * damage_fraction, 0, 0, max(1, force) * dir * damage_fraction, dtype, hit.species, this);
 
 		if (hit && hit != WarpZone_trace_forent && hit != fireBullet_last_hit)  // Avoid self-damage (except after going through a warp); avoid hitting the same entity twice (engine bug).
 		{
@@ -408,13 +406,13 @@ void fireBullet(entity this, .entity weaponentity, vector start, vector dir, flo
 			MUTATOR_CALLHOOK(FireBullet_Hit, this, hit, start, end, damage, this.(weaponentity));
 			damage = M_ARGV(4, float);
 			bool gooddamage = accuracy_isgooddamage(this, hit);
-			Damage(hit, this, this, damage * solid_penetration_left, dtype, weaponentity, start, force * dir * solid_penetration_left);
+			Damage(hit, this, this, damage * damage_fraction, dtype, weaponentity, start, force * dir * damage_fraction);
 			// calculate hits for ballistic weapons
 			if(gooddamage)
 			{
 				// do not exceed 100%
-				float added_damage = min(damage - total_damage, damage * solid_penetration_left);
-				total_damage += damage * solid_penetration_left;
+				float added_damage = min(damage - total_damage, damage * damage_fraction);
+				total_damage += damage * damage_fraction;
 				accuracy_add(this, this.(weaponentity).m_weapon, 0, added_damage);
 			}
 		}
@@ -436,9 +434,9 @@ void fireBullet(entity this, .entity weaponentity, vector start, vector dir, flo
 		else if(hitstore.ballistics_density < 0)
 			maxdist = vlen(hit.maxs - hit.mins) + 1; // -1: infinite travel distance
 		else if(hitstore.ballistics_density == 0)
-			maxdist = max_solid_penetration * solid_penetration_left;
+			maxdist = max_solid_penetration * solid_penetration_fraction;
 		else
-			maxdist = max_solid_penetration * solid_penetration_left * hitstore.ballistics_density;
+			maxdist = max_solid_penetration * solid_penetration_fraction / hitstore.ballistics_density;
 
 		if(maxdist <= autocvar_g_ballistics_mindistance)
 			break;
@@ -450,10 +448,10 @@ void fireBullet(entity this, .entity weaponentity, vector start, vector dir, flo
 			break;
 
 		float dist_taken = max(autocvar_g_ballistics_mindistance, vlen(trace_endpos - start));
-		// fraction_used_of_what_is_left = dist_taken / maxdist
-		// solid_penetration_left = solid_penetration_left - solid_penetration_left * fraction_used_of_what_is_left
-		solid_penetration_left *= 1 - dist_taken / maxdist;
-		solid_penetration_left = max(solid_penetration_left, 0);
+		float fraction_used_of_what_is_left = dist_taken / maxdist;
+		solid_penetration_fraction -= solid_penetration_fraction * fraction_used_of_what_is_left;
+		solid_penetration_fraction = max(solid_penetration_fraction, 0);
+		damage_fraction = pow(solid_penetration_fraction, autocvar_g_ballistics_solidpenetration_exponent);
 
 		// Only show effect when going through a player (invisible otherwise)
 		if (hit && (hit.solid != SOLID_BSP))
@@ -463,7 +461,7 @@ void fireBullet(entity this, .entity weaponentity, vector start, vector dir, flo
 		start = trace_endpos;
 
 		if(hit.solid == SOLID_BSP)
-			Damage_DamageInfo(start, 0, 0, 0, max(1, force) * normalize(dir) * -solid_penetration_left, dtype, 0, this);
+			Damage_DamageInfo(start, 0, 0, 0, max(1, force) * normalize(dir) * -damage_fraction, dtype, 0, this);
 	}
 
 	if(lag)