From e52070accc9a2f061781b68c9d2b713fb7be3e01 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Sun, 18 Mar 2012 16:08:01 +0200 Subject: [PATCH] Don't apply mirror damage penalty and don't play typehit sound and team damage sound for regurgitation damage --- data/qcsrc/server/g_damage.qc | 4 ++-- docs/TODO.txt | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/data/qcsrc/server/g_damage.qc b/data/qcsrc/server/g_damage.qc index 56851c07..b0270d8c 100644 --- a/data/qcsrc/server/g_damage.qc +++ b/data/qcsrc/server/g_damage.qc @@ -730,7 +730,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float { teamdamage0 = max(attacker.dmg_team, cvar("g_teamdamage_threshold")); attacker.dmg_team = attacker.dmg_team + damage; - if(attacker.dmg_team > teamdamage0 && !g_ca) + if(attacker.dmg_team > teamdamage0 && !g_ca && deathtype != DEATH_REGURGITATION) mirrordamage = cvar("g_mirrordamage") * (attacker.dmg_team - teamdamage0); mirrorforce = cvar("g_mirrordamage") * vlen(force); if(g_ca) @@ -860,7 +860,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float } } } - else + else if(deathtype != DEATH_REGURGITATION) { if(deathtype != DEATH_FIRE) attacker.typehitsound += 1; diff --git a/docs/TODO.txt b/docs/TODO.txt index 15e19f0b..789c56f7 100644 --- a/docs/TODO.txt +++ b/docs/TODO.txt @@ -158,9 +158,7 @@ - 0.8: Allow free camera rotation in the belly (no pitch bounds) -- 0.7 | 0.8: Don't play the friendly fire damage sound when you are regurgitated by a team mate. Also don't play the "same team" taunt - -- 0.8: But AI: Stop moving if someone is trying to teamheal us (if we can detact who's swallowing) +- 0.8: Bot AI: Stop moving if someone is trying to teamheal us (if we can detact who's swallowing) - 0.8: Fonic helper for speed: Account healthsize in danger detection -- 2.39.2