From 089ffc626012ac5e5ec61c4454104c1c2bef235a Mon Sep 17 00:00:00 2001 From: Martin Taibr Date: Fri, 16 Feb 2018 09:06:50 +0100 Subject: [PATCH] wrong, broken, infuriating yes i am talking about QC --- qcsrc/common/mutators/mutator/overkill/rpc.qc | 35 +++++++++++++++---- qcsrc/server/g_damage.qc | 18 +++++----- qcsrc/server/weapons/accuracy.qc | 1 + qcsrc/server/weapons/tracing.qc | 2 +- 4 files changed, 40 insertions(+), 16 deletions(-) diff --git a/qcsrc/common/mutators/mutator/overkill/rpc.qc b/qcsrc/common/mutators/mutator/overkill/rpc.qc index fc83febf1..042b03923 100644 --- a/qcsrc/common/mutators/mutator/overkill/rpc.qc +++ b/qcsrc/common/mutators/mutator/overkill/rpc.qc @@ -2,12 +2,15 @@ #ifdef SVQC +.float m_chainsaw_damage; // accumulated damage of the missile as it passes trough enemies +.float m_explosion_damage; + void W_RocketPropelledChainsaw_Explode(entity this, entity directhitentity) { this.event_damage = func_null; this.takedamage = DAMAGE_NO; - RadiusDamage (this, this.realowner, WEP_CVAR(rpc, damage), WEP_CVAR(rpc, edgedamage), WEP_CVAR(rpc, radius), NULL, NULL, WEP_CVAR(rpc, force), this.projectiledeathtype, directhitentity); + this.m_explosion_damage = RadiusDamage(this, this.realowner, WEP_CVAR(rpc, damage), WEP_CVAR(rpc, edgedamage), WEP_CVAR(rpc, radius), NULL, NULL, WEP_CVAR(rpc, force), this.projectiledeathtype, directhitentity); delete(this); } @@ -17,7 +20,7 @@ void W_RocketPropelledChainsaw_Explode_think(entity this) W_RocketPropelledChainsaw_Explode(this, NULL); } -void W_RocketPropelledChainsaw_Touch (entity this, entity toucher) +void W_RocketPropelledChainsaw_Touch(entity this, entity toucher) { if(WarpZone_Projectile_Touch(this, toucher)) if(wasfreed(this)) @@ -53,8 +56,12 @@ void W_RocketPropelledChainsaw_Think(entity this) vector mydir = normalize(this.velocity); tracebox(this.origin, this.mins, this.maxs, this.origin + mydir * (2 * myspeed_accel), MOVE_NORMAL, this); - if(IS_PLAYER(trace_ent)) - Damage (trace_ent, this, this.realowner, WEP_CVAR(rpc, damage2), this.projectiledeathtype, this.origin, normalize(this.origin - trace_ent.origin) * WEP_CVAR(rpc, force)); + if (IS_PLAYER(trace_ent)) { + if (accuracy_isgooddamage(this.realowner, trace_ent)) { + this.m_chainsaw_damage += WEP_CVAR(rpc, damage2); + } + Damage(trace_ent, this, this.realowner, WEP_CVAR(rpc, damage2), this.projectiledeathtype, this.origin, normalize(this.origin - trace_ent.origin) * WEP_CVAR(rpc, force)); + } this.velocity = mydir * (myspeed + (WEP_CVAR(rpc, speedaccel) * sys_frametime)); @@ -62,13 +69,26 @@ void W_RocketPropelledChainsaw_Think(entity this) this.nextthink = time; } -void W_RocketPropelledChainsaw_Attack (Weapon thiswep, entity actor, .entity weaponentity) +void chainsaw_dtor(entity this) { + if (this.m_chainsaw_damage > 0) { + float damage_fired = WEP_CVAR(rpc, damage2); + float damage_hit = WEP_CVAR(rpc, damage2); // never go above 100% even if we hit multiple enemies + if (!this.m_explosion_damage) { + // The fired damage of the explosion (WEP_CVAR(rpc, damage)) is already counted in the statistics (when launching the chainsaw). + // We remove it here so that a direct hit that passes through and doesn't damage anytihng by the explosion later is still 100%. + damage_fired -= WEP_CVAR(rpc, damage); + } + accuracy_add(this.realowner, DEATH_WEAPONOF(this.projectiledeathtype).m_id, damage_fired, damage_hit); + } +} + +void W_RocketPropelledChainsaw_Attack(Weapon thiswep, entity actor, .entity weaponentity) { entity missile = spawn(); //WarpZone_RefSys_SpawnSameRefSys(actor); entity flash = spawn (); W_DecreaseAmmo(thiswep, actor, WEP_CVAR(rpc, ammo), weaponentity); - W_SetupShot_ProjectileSize (actor, weaponentity, '-3 -3 -3', '3 3 3', false, 5, SND_ROCKET_FIRE, CH_WEAPON_A, WEP_CVAR(rpc, damage)); + W_SetupShot_ProjectileSize(actor, weaponentity, '-3 -3 -3', '3 3 3', false, 5, SND_ROCKET_FIRE, CH_WEAPON_A, WEP_CVAR(rpc, damage)); Send_Effect(EFFECT_ROCKET_MUZZLEFLASH, w_shotorg, w_shotdir * 1000, 1); PROJECTILE_MAKETRIGGER(missile); @@ -105,6 +125,9 @@ void W_RocketPropelledChainsaw_Attack (Weapon thiswep, entity actor, .entity wea SUB_SetFade (flash, time, 0.1); flash.effects = EF_ADDITIVE | EF_FULLBRIGHT | EF_LOWPRECISION; W_AttachToShotorg(actor, weaponentity, flash, '5 0 0'); + missile.m_chainsaw_damage = 0; + missile.m_explosion_damage = 0; + missile.dtor = chainsaw_dtor; MUTATOR_CALLHOOK(EditProjectile, actor, missile); } diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 75bf81f8a..5f04185ed 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -32,7 +32,7 @@ void UpdateFrags(entity player, int f) GameRules_scoring_add_team(player, SCORE, f); } -void GiveFrags (entity attacker, entity targ, float f, int deathtype) +void GiveFrags(entity attacker, entity targ, float f, int deathtype) { // TODO route through PlayerScores instead if(game_stopped) return; @@ -521,7 +521,7 @@ void Ice_Think(entity this) this.nextthink = time; } -void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypoint) +void Freeze(entity targ, float freeze_time, float frozen_type, float show_waypoint) { if(!IS_PLAYER(targ) && !IS_MONSTER(targ)) // only specified entities can be freezed return; @@ -571,7 +571,7 @@ void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypo WaypointSprite_Spawn(WP_Frozen, 0, 0, targ, '0 0 64', NULL, targ.team, targ, waypointsprite_attached, true, RADARICON_WAYPOINT); } -void Unfreeze (entity targ) +void Unfreeze(entity targ) { if(!STAT(FROZEN, targ)) return; @@ -607,7 +607,7 @@ void Unfreeze (entity targ) targ.iceblock = NULL; } -void Damage (entity targ, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force) +void Damage(entity targ, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force) { float complainteamdamage = 0; float mirrordamage = 0; @@ -909,7 +909,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d } } -float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector inflictorvelocity, entity attacker, float coredamage, float edgedamage, float rad, entity cantbe, entity mustbe, float inflictorselfdamage, float forceintensity, int 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, int deathtype, entity directhitentity) // Returns total damage applies to creatures { entity targ; @@ -1080,9 +1080,9 @@ float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector in } if(targ == directhitentity || DEATH_ISSPECIAL(deathtype)) - Damage (targ, inflictor, attacker, finaldmg, deathtype, nearest, force); + Damage(targ, inflictor, attacker, finaldmg, deathtype, nearest, force); else - Damage (targ, inflictor, attacker, finaldmg, deathtype | HITTYPE_SPLASH, nearest, force); + Damage(targ, inflictor, attacker, finaldmg, deathtype | HITTYPE_SPLASH, nearest, force); } } } @@ -1098,9 +1098,9 @@ float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector in return total_damage_to_creatures; } -float RadiusDamage (entity inflictor, entity attacker, float coredamage, float edgedamage, float rad, entity cantbe, entity mustbe, float forceintensity, int deathtype, entity directhitentity) +float RadiusDamage(entity inflictor, entity attacker, float coredamage, float edgedamage, float rad, entity cantbe, entity mustbe, float forceintensity, int 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); + 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_IsBurning(entity e) diff --git a/qcsrc/server/weapons/accuracy.qc b/qcsrc/server/weapons/accuracy.qc index 0d6ecf066..0de64673d 100644 --- a/qcsrc/server/weapons/accuracy.qc +++ b/qcsrc/server/weapons/accuracy.qc @@ -63,6 +63,7 @@ void accuracy_resend(entity e) void accuracy_add(entity this, int w, int fired, int hit) { + LOG_INFOF("fired %d hit %d\n", fired, hit); if (IS_INDEPENDENT_PLAYER(this)) return; entity a = CS(this).accuracy; if (!a) return; diff --git a/qcsrc/server/weapons/tracing.qc b/qcsrc/server/weapons/tracing.qc index de9f20402..ddc13b70e 100644 --- a/qcsrc/server/weapons/tracing.qc +++ b/qcsrc/server/weapons/tracing.qc @@ -135,7 +135,7 @@ void W_SetupShot_Dir_ProjectileSize_Range(entity ent, .entity weaponentity, vect ent.punchangle_x = recoil * -1; if (snd != SND_Null) { - sound (ent, chan, snd, (W_DualWielding(ent) ? VOL_BASE * 0.7 : VOL_BASE), ATTN_NORM); + sound(ent, chan, snd, (W_DualWielding(ent) ? VOL_BASE * 0.7 : VOL_BASE), ATTN_NORM); W_PlayStrengthSound(ent); } -- 2.39.2