X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_crylink.qc;h=ce68dbeba1644e38ea465ce9f6b01188b0f1a30e;hp=d80317a346ef1a1b3a3be3479b3c67e038133aad;hb=bb75b98315e73b476d074f86fdee46888d8d56d3;hpb=0a6ce0928d11c81f66a7d3b63d2e6375169b6f47 diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc index d80317a346..ce68dbeba1 100644 --- a/qcsrc/server/w_crylink.qc +++ b/qcsrc/server/w_crylink.qc @@ -3,25 +3,179 @@ REGISTER_WEAPON(CRYLINK, w_crylink, IT_CELLS, 6, WEP_FLAG_NORMAL | WEP_TYPE_SPLA #else #ifdef SVQC .float gravity; +.float crylink_waitrelease; +.entity crylink_lastgroup; -.entity realowner; +.entity queuenext; +.entity queueprev; + +void W_Crylink_Dequeue_Raw(entity own, entity prev, entity me, entity next) +{ + if(me == own.crylink_lastgroup) + own.crylink_lastgroup = ((me == next) ? world : next); + prev.queuenext = next; + next.queueprev = prev; +} + +void W_Crylink_Dequeue(entity e) +{ + W_Crylink_Dequeue_Raw(e.realowner, e.queueprev, e, e.queuenext); +} + +// force projectile to explode +void W_Crylink_LinkExplode (entity e, entity e2) +{ + float a; + a = bound(0, 1 - (time - e.fade_time) * e.fade_rate, 1); + + if(e == e.realowner.crylink_lastgroup) + e.realowner.crylink_lastgroup = world; + + RadiusDamage (e, e.realowner, cvar("g_balance_crylink_primary_damage") * a, cvar("g_balance_crylink_primary_edgedamage") * a, cvar("g_balance_crylink_primary_radius"), world, cvar("g_balance_crylink_primary_force") * a, e.projectiledeathtype, other); + + if(e.queuenext != e2) + W_Crylink_LinkExplode(e.queuenext, e2); + + remove (e); +} + +// adjust towards center +// returns the origin where they will meet... and the time till the meeting is +// stored in w_crylink_linkjoin_time. +// could possibly network this origin and time, and display a special particle +// effect when projectiles meet there :P +float w_crylink_linkjoin_time; +vector W_Crylink_LinkJoin(entity e, float joinspeed) +{ + vector avg_origin, avg_velocity; + vector targ_origin; + float avg_dist, n; + entity p; + + w_crylink_linkjoin_time = 0; + + avg_origin = e.origin; + avg_velocity = e.velocity; + n = 1; + for(p = e; (p = p.queuenext) != e; ) + { + avg_origin += p.origin; + avg_velocity += p.velocity; + ++n; + } + avg_origin *= (1.0 / n); + avg_velocity *= (1.0 / n); + + if(n < 2) + return avg_origin; // nothing to do + + // yes, mathematically we can do this in ONE step, but beware of 32bit floats... + avg_dist = pow(vlen(e.origin - avg_origin), 2); + for(p = e; (p = p.queuenext) != e; ) + avg_dist += pow(vlen(e.origin - avg_origin), 2); + avg_dist *= (1.0 / n); + avg_dist = sqrt(avg_dist); + + if(avg_dist == 0) + return avg_origin; // no change needed + + if(joinspeed == 0) + { + e.velocity = avg_velocity; + UpdateCSQCProjectile(e); + for(p = e; (p = p.queuenext) != e; ) + { + p.velocity = avg_velocity; + UpdateCSQCProjectile(p); + } + } + else + { + w_crylink_linkjoin_time = avg_dist / joinspeed; + targ_origin = avg_origin + w_crylink_linkjoin_time * avg_velocity; + + e.velocity = (targ_origin - e.origin) * (joinspeed / avg_dist); + UpdateCSQCProjectile(e); + for(p = e; (p = p.queuenext) != e; ) + { + p.velocity = (targ_origin - p.origin) * (joinspeed / avg_dist); + UpdateCSQCProjectile(p); + } + + // analysis: + // joinspeed -> +infinity: + // w_crylink_linkjoin_time -> +0 + // targ_origin -> avg_origin + // p->velocity -> HUEG towards center + // joinspeed -> 0: + // w_crylink_linkjoin_time -> +/- infinity + // targ_origin -> avg_velocity * +/- infinity + // p->velocity -> avg_velocity + // joinspeed -> -infinity: + // w_crylink_linkjoin_time -> -0 + // targ_origin -> avg_origin + // p->velocity -> HUEG away from center + } + + return targ_origin; +} + +void W_Crylink_LinkJoinEffect_Think() +{ + // is there at least 2 projectiles very close? + entity e, p; + float n; + e = self.owner.crylink_lastgroup; + n = 0; + if(e) + { + if(vlen(e.origin - self.origin) < vlen(e.velocity) * frametime) + ++n; + for(p = e; (p = p.queuenext) != e; ) + { + if(vlen(p.origin - self.origin) < vlen(p.velocity) * frametime) + ++n; + } + if(n >= 2) + { + // they seem to touch... + // TODO make a specific particle effect for this + pointparticles(particleeffectnum("crylink_linkjoin"), self.origin, '0 0 0', 1); + } + } + remove(self); +} // NO bounce protection, as bounces are limited! void W_Crylink_Touch (void) { float finalhit; float f; - PROJECTILE_TOUCH; + //PROJECTILE_TOUCH; + local entity savenext, saveprev, saveown; + saveown = self.realowner; + savenext = self.queuenext; + saveprev = self.queueprev; + if(WarpZone_Projectile_Touch()) + { + if(wasfreed(self)) + W_Crylink_Dequeue_Raw(saveown, saveprev, self, savenext); + return; + } + + float a; + a = bound(0, 1 - (time - self.fade_time) * self.fade_rate, 1); + finalhit = ((self.cnt <= 0) || (other.takedamage != DAMAGE_NO)); if(finalhit) f = 1; else f = cvar("g_balance_crylink_primary_bouncedamagefactor"); - if(self.alpha) - f *= self.alpha; - RadiusDamage (self, self.realowner, cvar("g_balance_crylink_primary_damage") * f, cvar("g_balance_crylink_primary_edgedamage") * f, cvar("g_balance_crylink_primary_radius"), world, cvar("g_balance_crylink_primary_force") * f, self.projectiledeathtype, other); - if (finalhit) + if(a) + f *= a; + if (RadiusDamage (self, self.realowner, cvar("g_balance_crylink_primary_damage") * f, cvar("g_balance_crylink_primary_edgedamage") * f, cvar("g_balance_crylink_primary_radius"), world, cvar("g_balance_crylink_primary_force") * f, self.projectiledeathtype, other) || finalhit) { + W_Crylink_LinkExplode(self.queuenext, self); remove (self); return; } @@ -38,20 +192,41 @@ void W_Crylink_Touch2 (void) { float finalhit; float f; - PROJECTILE_TOUCH; + //PROJECTILE_TOUCH; + local entity savenext, saveprev, saveown; + savenext = self.queuenext; + saveprev = self.queueprev; + saveown = self.realowner; + if(WarpZone_Projectile_Touch()) + { + if(wasfreed(self)) + W_Crylink_Dequeue_Raw(saveown, saveprev, self, savenext); + return; + } + + float a; + a = 1 - (time - self.fade_time) * self.fade_rate; + finalhit = ((self.cnt <= 0) || (other.takedamage != DAMAGE_NO)); if(finalhit) f = 1; else f = cvar("g_balance_crylink_secondary_bouncedamagefactor"); - if(self.alpha) - f *= self.alpha; - RadiusDamage (self, self.realowner, cvar("g_balance_crylink_secondary_damage") * f, cvar("g_balance_crylink_secondary_edgedamage") * f, cvar("g_balance_crylink_secondary_radius"), world, cvar("g_balance_crylink_secondary_force") * f, self.projectiledeathtype, other); - if (finalhit) + if(a) + f *= a; + if (RadiusDamage (self, self.realowner, cvar("g_balance_crylink_secondary_damage") * f, cvar("g_balance_crylink_secondary_edgedamage") * f, cvar("g_balance_crylink_secondary_radius"), world, cvar("g_balance_crylink_secondary_force") * f, self.projectiledeathtype, other)) { + W_Crylink_LinkExplode(self.queuenext, self); remove (self); return; } + else if(finalhit) + { + // just unlink + W_Crylink_Dequeue(self); + remove(self); + return; + } self.cnt = self.cnt - 1; self.angles = vectoangles(self.velocity); self.owner = world; @@ -61,10 +236,16 @@ void W_Crylink_Touch2 (void) // CSQCProjectile(proj, TRUE, PROJECTILE_CRYLINK, TRUE); } +void W_Crylink_Fadethink (void) +{ + W_Crylink_Dequeue(self); + remove(self); +} + void W_Crylink_Attack (void) { local float counter, shots; - local entity proj; + local entity proj, prevproj, firstproj; local vector s; vector forward, right, up; @@ -78,6 +259,7 @@ void W_Crylink_Attack (void) shots = cvar("g_balance_crylink_primary_shots"); pointparticles(particleeffectnum("crylink_muzzleflash"), w_shotorg, w_shotdir * 1000, shots); + proj = world; while (counter < shots) { proj = spawn (); @@ -85,6 +267,21 @@ void W_Crylink_Attack (void) proj.classname = "spike"; proj.bot_dodge = TRUE; proj.bot_dodgerating = cvar("g_balance_crylink_primary_damage"); + if(counter == 0) { // first projectile, store in firstproj for now + firstproj = proj; + } + else if(counter == shots - 1) { // last projectile, link up with first projectile + prevproj.queuenext = proj; + firstproj.queueprev = proj; + proj.queuenext = firstproj; + proj.queueprev = prevproj; + } + else { // else link up with previous projectile + prevproj.queuenext = proj; + proj.queueprev = prevproj; + } + + prevproj = proj; proj.movetype = MOVETYPE_BOUNCEMISSILE; PROJECTILE_MAKETRIGGER(proj); @@ -107,12 +304,26 @@ void W_Crylink_Attack (void) s = s * cvar("g_balance_crylink_primary_spread") * g_weaponspreadfactor; W_SetupProjectileVelocityEx(proj, w_shotdir + right * s_y + up * s_z, v_up, cvar("g_balance_crylink_primary_speed"), 0, 0, 0); proj.touch = W_Crylink_Touch; + + proj.think = W_Crylink_Fadethink; if(counter == 0) - SUB_SetFade(proj, time + cvar("g_balance_crylink_primary_middle_lifetime"), cvar("g_balance_crylink_primary_middle_fadetime")); + { + proj.fade_time = time + cvar("g_balance_crylink_primary_middle_lifetime"); + self.fade_rate = 1 / cvar("g_balance_crylink_primary_middle_fadetime"); + proj.nextthink = time + cvar("g_balance_crylink_primary_middle_lifetime") + cvar("g_balance_crylink_primary_middle_fadetime"); + } else if(counter <= 3) - SUB_SetFade(proj, time + cvar("g_balance_crylink_primary_star_lifetime"), cvar("g_balance_crylink_primary_star_fadetime")); + { + proj.fade_time = time + cvar("g_balance_crylink_primary_star_lifetime"); + self.fade_rate = 1 / cvar("g_balance_crylink_primary_star_fadetime"); + proj.nextthink = time + cvar("g_balance_crylink_primary_star_lifetime") + cvar("g_balance_crylink_primary_star_fadetime"); + } else - SUB_SetFade(proj, time + cvar("g_balance_crylink_primary_other_lifetime"), cvar("g_balance_crylink_primary_other_fadetime")); + { + proj.fade_time = time + cvar("g_balance_crylink_primary_other_lifetime"); + self.fade_rate = 1 / cvar("g_balance_crylink_primary_other_fadetime"); + proj.nextthink = time + cvar("g_balance_crylink_primary_other_lifetime") + cvar("g_balance_crylink_primary_other_fadetime"); + } proj.cnt = cvar("g_balance_crylink_primary_bounces"); //proj.scale = 1 + 1 * proj.cnt; @@ -124,14 +335,17 @@ void W_Crylink_Attack (void) CSQCProjectile(proj, TRUE, (proj.cnt ? PROJECTILE_CRYLINK_BOUNCING : PROJECTILE_CRYLINK), TRUE); + other = proj; MUTATOR_CALLHOOK(EditProjectile); + counter = counter + 1; } + self.crylink_lastgroup = proj; } void W_Crylink_Attack2 (void) { local float counter, shots; - local entity proj; + local entity proj, prevproj, firstproj; if not(self.items & IT_UNLIMITED_WEAPON_AMMO) self.ammo_cells = self.ammo_cells - cvar("g_balance_crylink_secondary_ammo"); @@ -140,6 +354,7 @@ void W_Crylink_Attack2 (void) shots = cvar("g_balance_crylink_secondary_shots"); pointparticles(particleeffectnum("crylink_muzzleflash"), w_shotorg, w_shotdir * 1000, shots); + proj = world; while (counter < shots) { proj = spawn (); @@ -147,6 +362,21 @@ void W_Crylink_Attack2 (void) proj.classname = "spike"; proj.bot_dodge = TRUE; proj.bot_dodgerating = cvar("g_balance_crylink_secondary_damage"); + if(counter == 0) { // first projectile, store in firstproj for now + firstproj = proj; + } + else if(counter == shots - 1) { // last projectile, link up with first projectile + prevproj.queuenext = proj; + firstproj.queueprev = proj; + proj.queuenext = firstproj; + proj.queueprev = prevproj; + } + else { // else link up with previous projectile + prevproj.queuenext = proj; + proj.queueprev = prevproj; + } + + prevproj = proj; proj.movetype = MOVETYPE_BOUNCEMISSILE; PROJECTILE_MAKETRIGGER(proj); @@ -158,10 +388,19 @@ void W_Crylink_Attack2 (void) W_SetupProjectileVelocityEx(proj, (w_shotdir + (((counter + 0.5) / shots) * 2 - 1) * v_right * cvar("g_balance_crylink_secondary_spread") * g_weaponspreadfactor), v_up, cvar("g_balance_crylink_secondary_speed"), 0, 0, 0); proj.touch = W_Crylink_Touch2; + proj.think = W_Crylink_Fadethink; if(counter == (shots - 1) / 2) - SUB_SetFade(proj, time + cvar("g_balance_crylink_secondary_middle_lifetime"), cvar("g_balance_crylink_secondary_middle_fadetime")); + { + proj.fade_time = time + cvar("g_balance_crylink_secondary_middle_lifetime"); + self.fade_rate = 1 / cvar("g_balance_crylink_secondary_middle_fadetime"); + proj.nextthink = time + cvar("g_balance_crylink_secondary_middle_lifetime") + cvar("g_balance_crylink_secondary_middle_fadetime"); + } else - SUB_SetFade(proj, time + cvar("g_balance_crylink_secondary_line_lifetime"), cvar("g_balance_crylink_secondary_line_fadetime")); + { + proj.fade_time = time + cvar("g_balance_crylink_secondary_line_lifetime"); + self.fade_rate = 1 / cvar("g_balance_crylink_secondary_line_fadetime"); + proj.nextthink = time + cvar("g_balance_crylink_secondary_line_lifetime") + cvar("g_balance_crylink_secondary_line_fadetime"); + } proj.cnt = cvar("g_balance_crylink_secondary_bounces"); //proj.scale = 1 + 1 * proj.cnt; @@ -173,8 +412,11 @@ void W_Crylink_Attack2 (void) CSQCProjectile(proj, TRUE, (proj.cnt ? PROJECTILE_CRYLINK_BOUNCING : PROJECTILE_CRYLINK), TRUE); + other = proj; MUTATOR_CALLHOOK(EditProjectile); + counter = counter + 1; } + self.crylink_lastgroup = proj; } void spawnfunc_weapon_crylink (void) @@ -194,16 +436,60 @@ float w_crylink(float req) else if (req == WR_THINK) { if (self.BUTTON_ATCK) - if (weapon_prepareattack(0, cvar("g_balance_crylink_primary_refire"))) { - W_Crylink_Attack(); - weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_crylink_primary_animtime"), w_ready); + if (!self.crylink_waitrelease) + if (weapon_prepareattack(0, cvar("g_balance_crylink_primary_refire"))) + { + W_Crylink_Attack(); + weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_crylink_primary_animtime"), w_ready); + if(cvar("g_balance_crylink_primary_joinspeed") != 0) + self.crylink_waitrelease = 1; + } } - if (self.BUTTON_ATCK2 && cvar("g_balance_crylink_secondary")) - if (weapon_prepareattack(1, cvar("g_balance_crylink_secondary_refire"))) + else if(self.BUTTON_ATCK2 && cvar("g_balance_crylink_secondary")) { - W_Crylink_Attack2(); - weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_crylink_secondary_animtime"), w_ready); + if (!self.crylink_waitrelease) + if (weapon_prepareattack(1, cvar("g_balance_crylink_secondary_refire"))) + { + W_Crylink_Attack2(); + weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_crylink_secondary_animtime"), w_ready); + if(cvar("g_balance_crylink_secondary_joinspeed") != 0) + self.crylink_waitrelease = 2; + } + } + else + { + if (self.crylink_waitrelease) + { + // fired and released now! + if(self.crylink_lastgroup) + { + vector pos; + if(self.crylink_waitrelease == 1) + { + pos = W_Crylink_LinkJoin(self.crylink_lastgroup, cvar("g_balance_crylink_primary_joinspeed")); + } + else + { + pos = W_Crylink_LinkJoin(self.crylink_lastgroup, cvar("g_balance_crylink_secondary_joinspeed")); + } + + entity linkjoineffect; + linkjoineffect = spawn(); + linkjoineffect.classname = "linkjoineffect"; + linkjoineffect.think = W_Crylink_LinkJoinEffect_Think; + linkjoineffect.nextthink = time + w_crylink_linkjoin_time; + linkjoineffect.owner = self; + setorigin(linkjoineffect, pos); + } + self.crylink_waitrelease = 0; + if(!w_crylink(WR_CHECKAMMO1) && !w_crylink(WR_CHECKAMMO2)) + { + // ran out of ammo! + self.cnt = WEP_CRYLINK; + self.switchweapon = w_getbestweapon(self); + } + } } } else if (req == WR_PRECACHE) @@ -213,13 +499,24 @@ float w_crylink(float req) precache_model ("models/weapons/h_crylink.iqm"); precache_sound ("weapons/crylink_fire.wav"); precache_sound ("weapons/crylink_fire2.wav"); + precache_sound ("weapons/crylink_linkjoin.wav"); } else if (req == WR_SETUP) weapon_setup(WEP_CRYLINK); else if (req == WR_CHECKAMMO1) + { + // don't "run out of ammo" and switch weapons while waiting for release + if(self.crylink_lastgroup && self.crylink_waitrelease) + return TRUE; return self.ammo_cells >= cvar("g_balance_crylink_primary_ammo"); + } else if (req == WR_CHECKAMMO2) + { + // don't "run out of ammo" and switch weapons while waiting for release + if(self.crylink_lastgroup && self.crylink_waitrelease) + return TRUE; return self.ammo_cells >= cvar("g_balance_crylink_secondary_ammo"); + } return TRUE; }; #endif @@ -250,16 +547,16 @@ float w_crylink(float req) } else if (req == WR_SUICIDEMESSAGE) { - w_deathtypestring = "succeeded at self-destructing themself with the Crylink"; + w_deathtypestring = "%s succeeded at self-destructing themself with the Crylink"; } else if (req == WR_KILLMESSAGE) { if(w_deathtype & HITTYPE_BOUNCE) - w_deathtypestring = "could not hide from #'s Crylink"; // unchecked: SPLASH (SECONDARY can't be) + w_deathtypestring = "%s could not hide from %s's Crylink"; // unchecked: SPLASH (SECONDARY can't be) else if(w_deathtype & HITTYPE_SPLASH) - w_deathtypestring = "was too close to #'s Crylink"; // unchecked: SECONDARY + w_deathtypestring = "%s was too close to %s's Crylink"; // unchecked: SECONDARY else - w_deathtypestring = "took a close look at #'s Crylink"; // unchecked: SECONDARY + w_deathtypestring = "%s took a close look at %s's Crylink"; // unchecked: SECONDARY } return TRUE; }