X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_rocketlauncher.qc;h=ae1718aba428c5e08e6fcb720c5e8e6c0e6c9c8c;hp=4abfa0d5000d19b173039a2c44dc8d761cf374bd;hb=cfdec7de4f6fff90a2142be820eaeb43a5f7f572;hpb=1e098e2969192fd941e4b5119b0f596510a106ad diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc index 4abfa0d50..ae1718aba 100644 --- a/qcsrc/server/w_rocketlauncher.qc +++ b/qcsrc/server/w_rocketlauncher.qc @@ -28,7 +28,7 @@ void W_Rocket_Explode () self.event_damage = SUB_Null; self.takedamage = DAMAGE_NO; - RadiusDamage (self, self.realowner, autocvar_g_balance_rocketlauncher_damage, autocvar_g_balance_rocketlauncher_edgedamage, autocvar_g_balance_rocketlauncher_radius, world, autocvar_g_balance_rocketlauncher_force, self.projectiledeathtype, other); + RadiusDamage (self, self.realowner, autocvar_g_balance_rocketlauncher_damage, autocvar_g_balance_rocketlauncher_edgedamage, autocvar_g_balance_rocketlauncher_radius, world, world, autocvar_g_balance_rocketlauncher_force, self.projectiledeathtype, other); if (self.realowner.weapon == WEP_ROCKET_LAUNCHER) { @@ -49,7 +49,7 @@ void W_Rocket_DoRemoteExplode () self.event_damage = SUB_Null; self.takedamage = DAMAGE_NO; - RadiusDamage (self, self.realowner, autocvar_g_balance_rocketlauncher_remote_damage, autocvar_g_balance_rocketlauncher_remote_edgedamage, autocvar_g_balance_rocketlauncher_remote_radius, world, autocvar_g_balance_rocketlauncher_remote_force, self.projectiledeathtype | HITTYPE_BOUNCE, world); + RadiusDamage (self, self.realowner, autocvar_g_balance_rocketlauncher_remote_damage, autocvar_g_balance_rocketlauncher_remote_edgedamage, autocvar_g_balance_rocketlauncher_remote_radius, world, world, autocvar_g_balance_rocketlauncher_remote_force, self.projectiledeathtype | HITTYPE_BOUNCE, world); if (self.realowner.weapon == WEP_ROCKET_LAUNCHER) { @@ -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) { @@ -251,8 +210,8 @@ void W_Rocket_Damage (entity inflictor, entity attacker, float damage, float dea 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); @@ -320,9 +279,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; @@ -355,7 +314,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; @@ -384,7 +343,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) @@ -486,7 +445,7 @@ 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"); } return TRUE; -}; +} #endif #ifdef CSQC float w_rlauncher(float req) @@ -504,7 +463,7 @@ float w_rlauncher(float req) precache_sound("weapons/rocket_impact.wav"); } else if (req == WR_SUICIDEMESSAGE) - w_deathtypestring = _("%s exploded"); + w_deathtypestring = _("%s blew themself up with their rocketlauncher"); else if (req == WR_KILLMESSAGE) { if(w_deathtype & HITTYPE_BOUNCE) // (remote detonation)