it.solid = it.railgunhitsolidbackup;
});
- // spawn a temporary explosion entity for RadiusDamage calls
- //explosion = spawn();
-
- // Find all non-hit players the beam passed close by
+ // Find all players the beam passed close by (even those hit)
float length = vlen(endpoint - start);
entity pseudoprojectile = NULL;
FOREACH_CLIENT(IS_REAL_CLIENT(it) && it != this, {
- if (!it.railgunhit && !(IS_SPEC(it) && it.enemy == this))
- {
- // nearest point on the beam
- vector beampos = start + dir * bound(0, (it.origin - start) * dir, length);
+ // not when spectating the shooter
+ if (IS_SPEC(it) && it.enemy == this) continue;
- float f = bound(0, 1 - vlen(beampos - it.origin) / 512, 1);
- if(f <= 0)
- continue;
+ // nearest point on the beam
+ vector beampos = start + dir * bound(0, (it.origin - start) * dir, length);
- if(!pseudoprojectile)
- pseudoprojectile = spawn(); // we need this so the sound uses the "entchannel4" volume
- msg_entity = it;
- soundtoat(MSG_ONE, pseudoprojectile, beampos, CH_SHOTS, SND(NEXWHOOSH_RANDOM()), VOL_BASE * f, ATTEN_NONE);
- }
- });
+ if(!pseudoprojectile)
+ pseudoprojectile = spawn(); // we need this so the sound uses the "entchannel4" volume
+ msg_entity = it;
+ // we want this to be very loud when close but fall off quickly -> using max base volume and high attenuation
+ soundtoat(MSG_ONE, pseudoprojectile, beampos, CH_SHOTS, SND(NEXWHOOSH_RANDOM()), VOL_BASEVOICE, ATTEN_IDLE);
+ });
if(pseudoprojectile)
delete(pseudoprojectile);
{
// removal from the list is handled below
- // get the details we need to call the damage function
- vector hitloc = it.railgunhitloc;
-
float foff = ExponentialFalloff(mindist, maxdist, halflifedist, it.railgundistance);
float ffs = ExponentialFalloff(mindist, maxdist, forcehalflifedist, it.railgundistance);
// apply the damage
if (it.takedamage)
- Damage (it, this, this, bdamage * foff, deathtype, weaponentity, hitloc, it.railgunforce * ffs);
-
- // create a small explosion to throw gibs around (if applicable)
- //setorigin(explosion, hitloc);
- //RadiusDamage (explosion, this, 10, 0, 50, NULL, NULL, 300, deathtype);
+ Damage(it, this, this, bdamage * foff, deathtype, weaponentity, it.railgunhitloc, it.railgunforce * ffs);
it.railgunhitloc = '0 0 0';
it.railgunhitsolidbackup = SOLID_NOT;
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);
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);
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).
{
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);
}
}
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;
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))
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)
projects / xonotic / xonotic-data.pk3dir.git / blobdiff