X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_rocketlauncher.qc;h=29426699c06e6c5746f2d06f818b8655102b0e5e;hb=1bcc2b0ab546b103392c9fd838f634a4f6c0e44e;hp=d582229da4756d8b0e9d4f2e463a67d6ffbe4384;hpb=4fac5ff674af4140474f6436ce63b8bd656c7577;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc index d582229da..29426699c 100644 --- a/qcsrc/server/w_rocketlauncher.qc +++ b/qcsrc/server/w_rocketlauncher.qc @@ -63,58 +63,6 @@ void W_Rocket_DoRemoteExplode () remove (self); } -entity FindLaserTarget(entity e, float dist_variance, float dot_variance) -{ - entity head, selected; - vector dir; - float dist, maxdist,// bestdist, - dot,// bestdot, - points, bestpoints; - //bestdist = 9999; - //bestdot = -2; - bestpoints = 0; - maxdist = 800; - selected = world; - - makevectors(e.angles); - - head = find(world, classname, "laser_target"); - while(head) - { - points = 0; - dir = normalize(head.origin - self.origin); - dot = dir * v_forward; - dist = vlen(head.origin - self.origin); - if(dist > maxdist) - dist = maxdist; - - // gain points for being in front - points = points + ((dot+1)*0.5) * 500 - * (1 + crandom()*dot_variance); - // gain points for being close away - points = points + (1 - dist/maxdist) * 1000 - * (1 + crandom()*dot_variance); - - traceline(e.origin, head.origin, TRUE, self); - if(trace_fraction < 1) - { - points = 0; - } - - if(points > bestpoints)//random() > 0.5)// - { - bestpoints = points; - selected = head; - } - - head = find(head, classname, "laser_target"); - } - - //bprint(selected.realowner.netname); - //bprint("\n"); - return selected; -} - void W_Rocket_RemoteExplode() { if(self.realowner.deadflag == DEAD_NO) @@ -134,6 +82,8 @@ vector rocket_steerto(vector thisdir, vector goaldir, float maxturn_cos) { if(thisdir * goaldir > maxturn_cos) return goaldir; + if(thisdir * goaldir < -0.9998) // less than 1 degree and opposite + return thisdir; // refuse to guide (better than letting a numerical error happen) float f, m2; vector v; // solve: @@ -151,6 +101,15 @@ vector rocket_steerto(vector thisdir, vector goaldir, float maxturn_cos) v = solve_quadratic(m2 - f * f, 2 * f * (m2 - 1), m2 - 1); return normalize(thisdir + goaldir * v_y); // the larger solution! } +// assume thisdir == -goaldir: +// f == -1 +// v = solve_qadratic(m2 - 1, -2 * (m2 - 1), m2 - 1) +// (m2 - 1) x^2 - 2 * (m2 - 1) * x + (m2 - 1) = 0 +// x^2 - 2 * x + 1 = 0 +// (x - 1)^2 = 0 +// x = 1 +// normalize(thisdir + goaldir) +// normalize(0) void W_Rocket_Think (void) { @@ -238,16 +197,21 @@ void W_Rocket_Damage (entity inflictor, entity attacker, float damage, float dea { if (self.health <= 0) return; + + if (!W_CheckProjectileDamage(inflictor.realowner, self.realowner, deathtype, -1)) // no exceptions + return; // g_projectiles_damage says to halt + self.health = self.health - damage; self.angles = vectoangles(self.velocity); + if (self.health <= 0) W_PrepareExplosionByDamage(attacker, W_Rocket_Explode); } void W_Rocket_Attack (void) { - local entity missile; - local entity flash; + entity missile; + entity flash; W_DecreaseAmmo(ammo_rockets, autocvar_g_balance_rocketlauncher_ammo, autocvar_g_balance_rocketlauncher_reload_ammo); @@ -270,6 +234,7 @@ void W_Rocket_Attack (void) missile.damageforcescale = autocvar_g_balance_rocketlauncher_damageforcescale; missile.health = autocvar_g_balance_rocketlauncher_health; missile.event_damage = W_Rocket_Damage; + missile.damagedbycontents = TRUE; missile.movetype = MOVETYPE_FLY; PROJECTILE_MAKETRIGGER(missile); @@ -285,6 +250,7 @@ void W_Rocket_Attack (void) missile.nextthink = time; missile.cnt = time + autocvar_g_balance_rocketlauncher_lifetime; missile.flags = FL_PROJECTILE; + missile.missile_flags = MIF_SPLASH; CSQCProjectile(missile, autocvar_g_balance_rocketlauncher_guiderate == 0 && autocvar_g_balance_rocketlauncher_speedaccel == 0, PROJECTILE_ROCKET, FALSE); // because of fly sound @@ -314,9 +280,9 @@ float w_rlauncher(float req) if(skill >= 2) // skill 0 and 1 bots won't detonate rockets! { // decide whether to detonate rockets - local entity missile, targetlist, targ; - local float edgedamage, coredamage, edgeradius, recipricoledgeradius, d; - local float selfdamage, teamdamage, enemydamage; + entity missile, targetlist, targ; + float edgedamage, coredamage, edgeradius, recipricoledgeradius, d; + float selfdamage, teamdamage, enemydamage; edgedamage = autocvar_g_balance_rocketlauncher_edgedamage; coredamage = autocvar_g_balance_rocketlauncher_damage; edgeradius = autocvar_g_balance_rocketlauncher_radius; @@ -349,7 +315,7 @@ float w_rlauncher(float req) } missile = find(missile, classname, "rocket"); } - local float desirabledamage; + float desirabledamage; desirabledamage = enemydamage; if (time > self.invincible_finished && time > self.spawnshieldtime) desirabledamage = desirabledamage - selfdamage * autocvar_g_balance_selfdamagepercent; @@ -378,7 +344,7 @@ float w_rlauncher(float req) targ = targ.chain; } }else{ - local float distance; distance= bound(300,vlen(self.origin-self.enemy.origin),30000); + float distance; distance= bound(300,vlen(self.origin-self.enemy.origin),30000); //As the distance gets larger, a correct detonation gets near imposible //Bots are assumed to use the rocket spawnfunc_light to see if the rocket gets near a player if(v_forward * normalize(missile.origin - self.enemy.origin)< 0.1) @@ -479,8 +445,19 @@ float w_rlauncher(float req) { W_Reload(autocvar_g_balance_rocketlauncher_ammo, autocvar_g_balance_rocketlauncher_reload_ammo, autocvar_g_balance_rocketlauncher_reload_time, "weapons/reload.wav"); } + else if (req == WR_SUICIDEMESSAGE) + { + return WEAPON_ROCKETLAUNCHER_SUICIDE; + } + else if (req == WR_KILLMESSAGE) + { + if((w_deathtype & HITTYPE_BOUNCE) || (w_deathtype & HITTYPE_SPLASH)) + return WEAPON_ROCKETLAUNCHER_MURDER_SPLASH; + else + return WEAPON_ROCKETLAUNCHER_MURDER_DIRECT; + } return TRUE; -}; +} #endif #ifdef CSQC float w_rlauncher(float req) @@ -497,17 +474,6 @@ float w_rlauncher(float req) { precache_sound("weapons/rocket_impact.wav"); } - else if (req == WR_SUICIDEMESSAGE) - w_deathtypestring = _("%s blew themself up with their rocketlauncher"); - else if (req == WR_KILLMESSAGE) - { - if(w_deathtype & HITTYPE_BOUNCE) // (remote detonation) - w_deathtypestring = _("%s got too close to %s's rocket"); - else if(w_deathtype & HITTYPE_SPLASH) - w_deathtypestring = _("%s almost dodged %s's rocket"); - else - w_deathtypestring = _("%s ate %s's rocket"); - } return TRUE; } #endif