From bf68cfdb9169a4a2e99090efcad339dfbaec7dca Mon Sep 17 00:00:00 2001 From: div0 Date: Sat, 22 Apr 2006 20:48:28 +0000 Subject: [PATCH] New Hagar secondary - corrected aiming, made it explode at DAMAGE_AIM instead of "player" for consistency. This removed g_balance_hagar_secondary_speed_up. Not sure about avelocity yet. git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1319 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/default.cfg | 3 +-- data/qcsrc/server/gamec/w_hagar.c | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/data/default.cfg b/data/default.cfg index 45757bb8c..0e95392fa 100644 --- a/data/default.cfg +++ b/data/default.cfg @@ -456,9 +456,8 @@ set g_balance_hagar_secondary_damage 40 set g_balance_hagar_secondary_edgedamage 15 set g_balance_hagar_secondary_force 100 set g_balance_hagar_secondary_radius 70 -set g_balance_hagar_secondary_spread 0 +set g_balance_hagar_secondary_spread 0.025 set g_balance_hagar_secondary_speed 1400 -set g_balance_hagar_secondary_speed_up 100 set g_balance_hagar_secondary_lifetime 10 set g_balance_hagar_secondary_refire 0.15 set g_balance_hagar_secondary_ammo 1 diff --git a/data/qcsrc/server/gamec/w_hagar.c b/data/qcsrc/server/gamec/w_hagar.c index 59a0c5f83..9b370de43 100644 --- a/data/qcsrc/server/gamec/w_hagar.c +++ b/data/qcsrc/server/gamec/w_hagar.c @@ -100,10 +100,8 @@ void W_Hagar_Touch2 (void) remove(self); return; } - if (other == self.owner) - return; - if(self.cnt > 0 || other.classname == "player") { + if(self.cnt > 0 || other.takedamage == DAMAGE_AIM) { self.think(); } else { self.cnt++; @@ -194,7 +192,7 @@ void W_Hagar_Attack2 (void) missile.effects = EF_LOWPRECISION | EF_NOSHADOW | EF_FULLBRIGHT; missile.movetype = MOVETYPE_BOUNCEMISSILE; - missile.velocity = (v_forward + randomvec() * cvar("g_balance_hagar_secondary_spread")) * cvar("g_balance_hagar_secondary_speed") + v_up * cvar("g_balance_hagar_secondary_speed_up"); + missile.velocity = (normalize(trueaim - org) + randomvec() * cvar("g_balance_hagar_secondary_spread")) * cvar("g_balance_hagar_secondary_speed"); missile.avelocity = '100 10 10'; missile.angles = vectoangles (missile.velocity); -- 2.39.2