X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_seeker.qc;h=975449f5d10c723c5fb765204c66641ae277e0c8;hb=aba5ddce2b36b71cbd7d6f0bdf39b9cae573e6b0;hp=0a7b4761442f86026b1d0c0638ff0a243cbda8f2;hpb=4fac5ff674af4140474f6436ce63b8bd656c7577;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc index 0a7b47614..975449f5d 100644 --- a/qcsrc/server/w_seeker.qc +++ b/qcsrc/server/w_seeker.qc @@ -1,5 +1,5 @@ #ifdef REGISTER_WEAPON -REGISTER_WEAPON(SEEKER, w_seeker, IT_ROCKETS, 8, WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "seeker", "seeker", _("T.A.G. Seeker")) +REGISTER_WEAPON(SEEKER, w_seeker, IT_ROCKETS, 8, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "seeker", "seeker", _("T.A.G. Seeker")) #else #ifdef SVQC //.float proxytime; = autoswitch @@ -12,7 +12,7 @@ REGISTER_WEAPON(SEEKER, w_seeker, IT_ROCKETS, 8, WEP_FLAG_RELOADABLE | WEP_TYPE_ // ============================ void Seeker_Missile_Explode () { - self.event_damage = SUB_Null; + self.event_damage = func_null; RadiusDamage (self, self.realowner, autocvar_g_balance_seeker_missile_damage, autocvar_g_balance_seeker_missile_edgedamage, autocvar_g_balance_seeker_missile_radius, world, autocvar_g_balance_seeker_missile_force, self.projectiledeathtype, other); remove (self); @@ -78,6 +78,8 @@ void Seeker_Missile_Think() newdir = normalize(olddir + desireddir * turnrate); // take the average of the 2 directions; not the best method but simple & easy self.velocity = newdir * spd; // make me fly in the new direction at my flight speed } + else + dist = 0; // Proxy if (autocvar_g_balance_seeker_missile_proxy) @@ -124,6 +126,9 @@ void Seeker_Missile_Damage (entity inflictor, entity attacker, float damage, flo { if (self.health <= 0) return; + + if (!W_CheckProjectileDamage(inflictor.realowner, self.realowner, deathtype, -1)) // no exceptions + return; // g_projectiles_damage says to halt if (self.realowner == attacker) self.health = self.health - (damage * 0.25); @@ -161,7 +166,7 @@ void Seeker_Missile_Animate() void Seeker_Fire_Missile(vector f_diff, entity m_target) { - local entity missile; + entity missile; W_DecreaseAmmo(ammo_rockets, autocvar_g_balance_seeker_missile_ammo, autocvar_g_balance_seeker_reload_ammo); @@ -189,6 +194,7 @@ void Seeker_Fire_Missile(vector f_diff, entity m_target) missile.takedamage = DAMAGE_YES; missile.health = autocvar_g_balance_seeker_missile_health; missile.damageforcescale = autocvar_g_balance_seeker_missile_damageforcescale; + missile.damagedbycontents = TRUE; //missile.think = Seeker_Missile_Animate; // csqc projectiles. if (missile.enemy != world) @@ -201,6 +207,8 @@ void Seeker_Fire_Missile(vector f_diff, entity m_target) setsize (missile, '-4 -4 -4', '4 4 4'); missile.movetype = MOVETYPE_FLYMISSILE; missile.flags = FL_PROJECTILE; + missile.missile_flags = MIF_SPLASH | MIF_GUIDED_TAG; + W_SETUPPROJECTILEVELOCITY_UP(missile, g_balance_seeker_missile); missile.angles = vectoangles (missile.velocity); @@ -215,7 +223,7 @@ void Seeker_Fire_Missile(vector f_diff, entity m_target) // ============================ void Seeker_Flac_Explode () { - self.event_damage = SUB_Null; + self.event_damage = func_null; RadiusDamage (self, self.realowner, autocvar_g_balance_seeker_flac_damage, autocvar_g_balance_seeker_flac_edgedamage, autocvar_g_balance_seeker_flac_radius, world, autocvar_g_balance_seeker_flac_force, self.projectiledeathtype, other); @@ -231,7 +239,7 @@ void Seeker_Flac_Touch() void Seeker_Fire_Flac() { - local entity missile; + entity missile; vector f_diff; float c; @@ -273,6 +281,7 @@ void Seeker_Fire_Flac() missile.projectiledeathtype = WEP_SEEKER; missile.projectiledeathtype = WEP_SEEKER | HITTYPE_SECONDARY; missile.flags = FL_PROJECTILE; + missile.missile_flags = MIF_SPLASH; // csqc projectiles //missile.angles = vectoangles (missile.velocity); @@ -304,6 +313,7 @@ void Seeker_Attack() { entity tracker, closest_target; + closest_target = world; for(tracker = world; (tracker = find(tracker, classname, "tag_tracker")); ) if (tracker.realowner == self) { if (closest_target) @@ -389,7 +399,7 @@ void Seeker_Tag_Explode () { //if(other==self.realowner) // return; - Damage_DamageInfo(self.origin, 0, 0, 0, self.velocity, WEP_SEEKER | HITTYPE_BOUNCE, self); + Damage_DamageInfo(self.origin, 0, 0, 0, self.velocity, WEP_SEEKER | HITTYPE_BOUNCE, other.species, self); remove (self); } @@ -416,8 +426,8 @@ void Seeker_Tag_Touch() te_knightspike(org2); - self.event_damage = SUB_Null; - Damage_DamageInfo(self.origin, 0, 0, 0, self.velocity, WEP_SEEKER | HITTYPE_HEADSHOT, self); + self.event_damage = func_null; + Damage_DamageInfo(self.origin, 0, 0, 0, self.velocity, WEP_SEEKER | HITTYPE_HEADSHOT, other.species, self); if (other.takedamage == DAMAGE_AIM && other.deadflag == DEAD_NO) { @@ -468,7 +478,7 @@ void Seeker_Tag_Touch() void Seeker_Fire_Tag() { - local entity missile; + entity missile; W_DecreaseAmmo(ammo_rockets, autocvar_g_balance_seeker_tag_ammo, autocvar_g_balance_seeker_reload_ammo); W_SetupShot_ProjectileSize (self, '-2 -2 -2', '2 2 2', FALSE, 2, "weapons/tag_fire.wav", CH_WEAPON_A, autocvar_g_balance_seeker_missile_damage * autocvar_g_balance_seeker_missile_count); @@ -485,14 +495,15 @@ void Seeker_Fire_Tag() missile.solid = SOLID_BBOX; missile.takedamage = DAMAGE_YES; - missile.event_damage = Seeker_Tag_Explode; - missile.health = autocvar_g_balance_seeker_tag_health; + missile.event_damage = Seeker_Tag_Damage; + missile.health = autocvar_g_balance_seeker_tag_health; missile.damageforcescale = autocvar_g_balance_seeker_tag_damageforcescale; setorigin (missile, w_shotorg); setsize (missile, '-2 -2 -2', '2 2 2'); missile.flags = FL_PROJECTILE; + //missile.missile_flags = MIF_..?; missile.movetype = MOVETYPE_FLY; W_SETUPPROJECTILEVELOCITY(missile, g_balance_seeker_tag); @@ -602,7 +613,7 @@ float w_seeker(float req) W_Reload(min(autocvar_g_balance_seeker_missile_ammo, autocvar_g_balance_seeker_tag_ammo), autocvar_g_balance_seeker_reload_ammo, autocvar_g_balance_seeker_reload_time, "weapons/reload.wav"); } return TRUE; -}; +} #endif #ifdef CSQC float w_seeker(float req)