X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_seeker.qc;h=a110c003fdada021479974cbf2b057668d88026e;hb=be85be6dad6016ed7d50ae5b7f8e5e4057692e8b;hp=20519606910a5f45985cfa949431d6fc38d7829e;hpb=45db5478d2638074619c0661c4539e90c87dd6e8;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc index 205196069..a110c003f 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_NORMAL | 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_RELOADABLE | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "seeker", "seeker", _("T.A.G. Seeker")) #else #ifdef SVQC //.float proxytime; = autoswitch @@ -7,10 +7,13 @@ REGISTER_WEAPON(SEEKER, w_seeker, IT_ROCKETS, 8, WEP_FLAG_NORMAL | WEP_FLAG_RELO .entity tag_target, wps_tag_tracker; .float tag_time; +// ============================ +// Begin: Missile functions, these are general functions to be manipulated by other code +// ============================ void Seeker_Missile_Explode () { self.event_damage = SUB_Null; - RadiusDamage (self, self.owner, 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); + 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); } @@ -122,7 +125,7 @@ void Seeker_Missile_Damage (entity inflictor, entity attacker, float damage, flo if (self.health <= 0) return; - if (self.owner == attacker) + if (self.realowner == attacker) self.health = self.health - (damage * 0.25); else self.health = self.health - damage; @@ -163,14 +166,14 @@ void Seeker_Fire_Missile(vector f_diff, entity m_target) W_DecreaseAmmo(ammo_rockets, autocvar_g_balance_seeker_missile_ammo, autocvar_g_balance_seeker_reload_ammo); makevectors(self.v_angle); - W_SetupShot_ProjectileSize (self, '-2 -2 -2', '2 2 2', FALSE, 2, "weapons/seeker_fire.wav", CHAN_WEAPON, 0); + W_SetupShot_ProjectileSize (self, '-2 -2 -2', '2 2 2', FALSE, 2, "weapons/seeker_fire.wav", CH_WEAPON_A, 0); w_shotorg += f_diff; pointparticles(particleeffectnum("seeker_muzzleflash"), w_shotorg, w_shotdir * 1000, 1); //self.detornator = FALSE; missile = spawn(); - missile.owner = self; + missile.owner = missile.realowner = self; missile.classname = "seeker_missile"; missile.bot_dodge = TRUE; missile.bot_dodgerating = autocvar_g_balance_seeker_missile_damage; @@ -207,11 +210,91 @@ void Seeker_Fire_Missile(vector f_diff, entity m_target) other = missile; MUTATOR_CALLHOOK(EditProjectile); } +// ============================ +// Begin: FLAC, close range attack meant for defeating rockets which are coming at you. +// ============================ +void Seeker_Flac_Explode () +{ + self.event_damage = SUB_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); + + remove (self); +} + +void Seeker_Flac_Touch() +{ + PROJECTILE_TOUCH; + + Seeker_Flac_Explode(); +} + +void Seeker_Fire_Flac() +{ + local entity missile; + vector f_diff; + float c; + + W_DecreaseAmmo(ammo_rockets, autocvar_g_balance_seeker_flac_ammo, autocvar_g_balance_seeker_reload_ammo); + + c = mod(self.bulletcounter, 4); + switch(c) + { + case 0: + f_diff = '-1.25 -3.75 0'; + break; + case 1: + f_diff = '+1.25 -3.75 0'; + break; + case 2: + f_diff = '-1.25 +3.75 0'; + break; + case 3: + default: + f_diff = '+1.25 +3.75 0'; + break; + } + W_SetupShot_ProjectileSize (self, '-2 -2 -2', '2 2 2', FALSE, 2, "weapons/flac_fire.wav", CH_WEAPON_A, autocvar_g_balance_seeker_flac_damage); + w_shotorg += f_diff; + + pointparticles(particleeffectnum("hagar_muzzleflash"), w_shotorg, w_shotdir * 1000, 1); + + missile = spawn (); + missile.owner = missile.realowner = self; + missile.classname = "missile"; + missile.bot_dodge = TRUE; + missile.bot_dodgerating = autocvar_g_balance_seeker_flac_damage; + missile.touch = Seeker_Flac_Explode; + missile.use = Seeker_Flac_Explode; + missile.think = adaptor_think2use_hittype_splash; + missile.nextthink = time + autocvar_g_balance_seeker_flac_lifetime + autocvar_g_balance_seeker_flac_lifetime_rand; + missile.solid = SOLID_BBOX; + missile.movetype = MOVETYPE_FLY; + missile.projectiledeathtype = WEP_SEEKER; + missile.projectiledeathtype = WEP_SEEKER | HITTYPE_SECONDARY; + missile.flags = FL_PROJECTILE; + + // csqc projectiles + //missile.angles = vectoangles (missile.velocity); + //missile.scale = 0.4; // BUG: the model is too big + + setorigin (missile, w_shotorg); + setsize (missile, '-2 -2 -2', '2 2 2'); + + W_SETUPPROJECTILEVELOCITY_UP(missile, g_balance_seeker_flac); + CSQCProjectile(missile, TRUE, PROJECTILE_FLAC, TRUE); + + other = missile; MUTATOR_CALLHOOK(EditProjectile); +} + +// ============================ +// Begin: Tag and rocket controllers +// ============================ entity Seeker_Tagged_Info(entity isowner, entity istarget) { entity tag; for(tag = world; (tag = find(tag, classname, "tag_tracker")); ) - if ((tag.owner == isowner) && (tag.tag_target == istarget)) + if ((tag.realowner == isowner) && (tag.tag_target == istarget)) return tag; return world; @@ -221,7 +304,7 @@ void Seeker_Attack() { entity tracker, closest_target; - for(tracker = world; (tracker = find(tracker, classname, "tag_tracker")); ) if (tracker.owner == self) + for(tracker = world; (tracker = find(tracker, classname, "tag_tracker")); ) if (tracker.realowner == self) { if (closest_target) { @@ -235,35 +318,56 @@ void Seeker_Attack() traceline(self.origin + self.view_ofs, closest_target.origin, MOVE_NOMONSTERS, self); if ((!closest_target) || ((trace_fraction < 1) && (trace_ent != closest_target))) closest_target = world; - - // we don't need to do this because the model is going to be changed anyway. - // CLEAN THIS UP IN THE FUTURE !!!!!!!!!!! - /* - switch(mod(self.bulletcounter, 4)) + + Seeker_Fire_Missile('0 0 0', closest_target); +} + +void Seeker_Vollycontroller_Think() // TODO: Merge this with Seeker_Attack +{ + float c; + entity oldself,oldenemy; + self.cnt = self.cnt - 1; + + if((!(self.realowner.items & IT_UNLIMITED_AMMO) && self.realowner.ammo_rockets < autocvar_g_balance_seeker_missile_ammo) || (self.cnt <= -1) || (self.realowner.deadflag != DEAD_NO) || (self.realowner.switchweapon != WEP_SEEKER)) + { + remove(self); + return; + } + + self.nextthink = time + autocvar_g_balance_seeker_missile_delay * W_WeaponRateFactor(); + + oldself = self; + self = self.realowner; + + oldenemy = self.enemy; + self.enemy = oldself.enemy; + + c = mod(self.cnt, 4); + switch(c) { case 0: - Seeker_Fire_Missile('-1.25 -3.75 0', closest_target); + Seeker_Fire_Missile('-1.25 -3.75 0', self.enemy); break; case 1: - Seeker_Fire_Missile('+1.25 -3.75 0', closest_target); + Seeker_Fire_Missile('+1.25 -3.75 0', self.enemy); break; case 2: - Seeker_Fire_Missile('-1.25 +3.75 0', closest_target); + Seeker_Fire_Missile('-1.25 +3.75 0', self.enemy); break; case 3: default: - Seeker_Fire_Missile('+1.25 +3.75 0', closest_target); + Seeker_Fire_Missile('+1.25 +3.75 0', self.enemy); break; } - */ - - Seeker_Fire_Missile('0 0 0', closest_target); + + self.enemy = oldenemy; + self = oldself; } void Seeker_Tracker_Think() { // commit suicide if: You die OR target dies OR you switch away from the seeker OR commit suicide if lifetime is up - if ((self.owner.deadflag != DEAD_NO) || (self.tag_target.deadflag != DEAD_NO) || (self.owner.switchweapon != WEP_SEEKER) + if ((self.realowner.deadflag != DEAD_NO) || (self.tag_target.deadflag != DEAD_NO) || (self.realowner.switchweapon != WEP_SEEKER) || (time > self.tag_time + autocvar_g_balance_seeker_tag_tracker_lifetime)) { if (self) @@ -278,9 +382,12 @@ void Seeker_Tracker_Think() self.nextthink = time; } +// ============================ +// Begin: Tag projectile +// ============================ void Seeker_Tag_Explode () { - //if(other==self.owner) + //if(other==self.realowner) // return; Damage_DamageInfo(self.origin, 0, 0, 0, self.velocity, WEP_SEEKER | HITTYPE_BOUNCE, self); @@ -302,7 +409,9 @@ void Seeker_Tag_Touch() vector org2; entity e; - dir = normalize (self.owner.origin - self.origin); + PROJECTILE_TOUCH; + + dir = normalize (self.realowner.origin - self.origin); org2 = findbetterlocation (self.origin, 8); te_knightspike(org2); @@ -313,29 +422,44 @@ void Seeker_Tag_Touch() if (other.takedamage == DAMAGE_AIM && other.deadflag == DEAD_NO) { // check to see if this person is already tagged by me - entity tag = Seeker_Tagged_Info(self.owner, other); + entity tag = Seeker_Tagged_Info(self.realowner, other); if (tag != world) { - if (other.wps_tag_tracker) // don't attach another waypointsprite without killing the old one first + if (other.wps_tag_tracker && (autocvar_g_balance_seeker_type == 1)) // don't attach another waypointsprite without killing the old one first WaypointSprite_Kill(other.wps_tag_tracker); tag.tag_time = time; } else { - sprint(self.owner, strcat("You just tagged ^2", other.netname, "^7 with a tracking device!\n")); + //sprint(self.realowner, strcat("You just tagged ^2", other.netname, "^7 with a tracking device!\n")); e = spawn(); + e.cnt = autocvar_g_balance_seeker_missile_count; e.classname = "tag_tracker"; e.owner = self.owner; - e.think = Seeker_Tracker_Think; + e.realowner = self.realowner; + + if (autocvar_g_balance_seeker_type == 1) + { + e.tag_target = other; + e.tag_time = time; + e.think = Seeker_Tracker_Think; + } + else + { + e.enemy = other; + e.think = Seeker_Vollycontroller_Think; + } + e.nextthink = time; - e.tag_target = other; - e.tag_time = time; } - - WaypointSprite_Spawn("tagged-target", autocvar_g_balance_seeker_tag_tracker_lifetime, 0, other, '0 0 64', self.owner, 0, other, wps_tag_tracker, TRUE); - WaypointSprite_UpdateRule(other.wps_tag_tracker, 0, SPRITERULE_DEFAULT); + + if (autocvar_g_balance_seeker_type == 1) + { + WaypointSprite_Spawn("tagged-target", autocvar_g_balance_seeker_tag_tracker_lifetime, 0, other, '0 0 64', self.realowner, 0, other, wps_tag_tracker, TRUE, RADARICON_TAGGED, '0.5 1 0'); + WaypointSprite_UpdateRule(other.wps_tag_tracker, 0, SPRITERULE_DEFAULT); + } } remove(self); @@ -347,10 +471,10 @@ void Seeker_Fire_Tag() local 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", CHAN_WEAPON, autocvar_g_balance_seeker_missile_damage * autocvar_g_balance_seeker_missile_count); + 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); missile = spawn(); - missile.owner = self; + missile.owner = missile.realowner = self; missile.classname = "seeker_tag"; missile.bot_dodge = TRUE; missile.bot_dodgerating = 50; @@ -359,7 +483,6 @@ void Seeker_Fire_Tag() missile.nextthink = time + autocvar_g_balance_seeker_tag_lifetime; missile.movetype = MOVETYPE_FLY; missile.solid = SOLID_BBOX; - missile.owner = self; missile.takedamage = DAMAGE_YES; missile.event_damage = Seeker_Tag_Explode; @@ -380,6 +503,9 @@ void Seeker_Fire_Tag() other = missile; MUTATOR_CALLHOOK(EditProjectile); } +// ============================ +// Begin: Genereal weapon functions +// ============================ void spawnfunc_weapon_seeker (void) { weapon_defaultspawnfunc(WEP_SEEKER); @@ -391,10 +517,13 @@ float w_seeker(float req) if (req == WR_AIM) { - if (Seeker_Tagged_Info(self, self.enemy) != world) - self.BUTTON_ATCK = bot_aim(autocvar_g_balance_seeker_missile_speed_max, 0, autocvar_g_balance_seeker_missile_lifetime, FALSE); + if (autocvar_g_balance_seeker_type == 1) + if (Seeker_Tagged_Info(self, self.enemy) != world) + self.BUTTON_ATCK = bot_aim(autocvar_g_balance_seeker_missile_speed_max, 0, autocvar_g_balance_seeker_missile_lifetime, FALSE); + else + self.BUTTON_ATCK2 = bot_aim(autocvar_g_balance_seeker_tag_speed, 0, autocvar_g_balance_seeker_tag_lifetime, FALSE); else - self.BUTTON_ATCK2 = bot_aim(autocvar_g_balance_seeker_tag_speed, 0, autocvar_g_balance_seeker_tag_lifetime, FALSE); + self.BUTTON_ATCK = bot_aim(autocvar_g_balance_seeker_tag_speed, 0, autocvar_g_balance_seeker_tag_lifetime, FALSE); } else if (req == WR_THINK) { @@ -403,19 +532,41 @@ float w_seeker(float req) else if (self.BUTTON_ATCK) { - if (weapon_prepareattack(0, autocvar_g_balance_seeker_missile_refire)) + if (autocvar_g_balance_seeker_type == 1) { - Seeker_Attack(); - weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_seeker_missile_animtime, w_ready); + if (weapon_prepareattack(0, autocvar_g_balance_seeker_missile_refire)) + { + Seeker_Attack(); + weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_seeker_missile_animtime, w_ready); + } + } + else + { + if (weapon_prepareattack(0, autocvar_g_balance_seeker_tag_refire)) + { + Seeker_Fire_Tag(); + weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_seeker_tag_animtime, w_ready); + } } } else if (self.BUTTON_ATCK2) { - if (weapon_prepareattack(1, autocvar_g_balance_seeker_tag_refire)) + if (autocvar_g_balance_seeker_type == 1) { - Seeker_Fire_Tag(); - weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_seeker_tag_animtime, w_ready); + if (weapon_prepareattack(0, autocvar_g_balance_seeker_tag_refire)) + { + Seeker_Fire_Tag(); + weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_seeker_tag_animtime, w_ready); + } + } + else + { + if (weapon_prepareattack(0, autocvar_g_balance_seeker_flac_refire)) + { + Seeker_Fire_Flac(); + weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_seeker_flac_animtime, w_ready); + } } } } @@ -425,7 +576,7 @@ float w_seeker(float req) precache_model ("models/weapons/v_seeker.md3"); precache_model ("models/weapons/h_seeker.iqm"); precache_sound ("weapons/tag_fire.wav"); - //precache_sound ("weapons/flac_fire.wav"); + precache_sound ("weapons/flac_fire.wav"); precache_sound ("weapons/seeker_fire.wav"); //precache_sound ("weapons/reload.wav"); // until weapons have individual reload sounds, precache the reload sound somewhere else } @@ -437,13 +588,13 @@ float w_seeker(float req) else if (req == WR_CHECKAMMO1) { ammo_amount = self.ammo_rockets >= autocvar_g_balance_seeker_missile_ammo; - ammo_amount += self.weapon_load[WEP_SEEKER] >= autocvar_g_balance_seeker_missile_ammo; + ammo_amount += self.(weapon_load[WEP_SEEKER]) >= autocvar_g_balance_seeker_missile_ammo; return ammo_amount; } else if (req == WR_CHECKAMMO2) { ammo_amount = self.ammo_rockets >= autocvar_g_balance_seeker_tag_ammo; - ammo_amount += self.weapon_load[WEP_SEEKER] >= autocvar_g_balance_seeker_tag_ammo; + ammo_amount += self.(weapon_load[WEP_SEEKER]) >= autocvar_g_balance_seeker_tag_ammo; return ammo_amount; } else if (req == WR_RELOAD) @@ -466,17 +617,17 @@ float w_seeker(float req) if(!w_issilent) { if (w_random<0.15) - sound(self, CHAN_PROJECTILE, "weapons/tagexp1.wav", 1, ATTN_NORM); + sound(self, CH_SHOTS, "weapons/tagexp1.wav", 1, ATTN_NORM); else if (w_random<0.7) - sound(self, CHAN_PROJECTILE, "weapons/tagexp2.wav", 1, ATTN_NORM); + sound(self, CH_SHOTS, "weapons/tagexp2.wav", 1, ATTN_NORM); else - sound(self, CHAN_PROJECTILE, "weapons/tagexp3.wav", 1, ATTN_NORM); + sound(self, CH_SHOTS, "weapons/tagexp3.wav", 1, ATTN_NORM); } } else if(w_deathtype & HITTYPE_HEADSHOT) { if(!w_issilent) - sound(self, CHAN_PROJECTILE, "weapons/tag_impact.wav", 1, ATTN_NORM); + sound(self, CH_SHOTS, "weapons/tag_impact.wav", 1, ATTN_NORM); } else { @@ -484,11 +635,11 @@ float w_seeker(float req) if(!w_issilent) { if (w_random<0.15) - sound(self, CHAN_PROJECTILE, "weapons/seekerexp1.wav", 1, ATTN_NORM); + sound(self, CH_SHOTS, "weapons/seekerexp1.wav", 1, ATTN_NORM); else if (w_random<0.7) - sound(self, CHAN_PROJECTILE, "weapons/seekerexp2.wav", 1, ATTN_NORM); + sound(self, CH_SHOTS, "weapons/seekerexp2.wav", 1, ATTN_NORM); else - sound(self, CHAN_PROJECTILE, "weapons/seekerexp3.wav", 1, ATTN_NORM); + sound(self, CH_SHOTS, "weapons/seekerexp3.wav", 1, ATTN_NORM); } } }