X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Fdefault%2Faim.qc;h=4625d4a08ca8a0b01354ed2792c7952d31ca0096;hp=c278be915a2278a3eabd89966c990cf6ad44c75e;hb=5aab6120acfc624751d20a695d1b911b3e919831;hpb=cbca1a79315fe08c4796273a490a4d12b7d3291d diff --git a/qcsrc/server/bot/default/aim.qc b/qcsrc/server/bot/default/aim.qc index c278be915a..4625d4a08c 100644 --- a/qcsrc/server/bot/default/aim.qc +++ b/qcsrc/server/bot/default/aim.qc @@ -1,5 +1,7 @@ #include "aim.qh" +#include + #include "cvars.qh" #include "bot.qh" @@ -9,7 +11,7 @@ #include "../../weapons/weaponsystem.qh" -#include "../../mutators/_mod.qh" +#include // traces multiple trajectories to find one that will impact the target // 'end' vector is the place it aims for, @@ -130,18 +132,19 @@ bool bot_shouldattack(entity this, entity targ) if(targ.team==0) return false; } - else if(bot_ignore_bots) - if(IS_BOT_CLIENT(targ)) - return false; + else if (autocvar_bot_ignore_bots && IS_BOT_CLIENT(targ)) + return false; if (!targ.takedamage) return false; if (IS_DEAD(targ)) return false; - if (PHYS_INPUT_BUTTON_CHAT(targ)) + if (PHYS_INPUT_BUTTON_CHAT(targ) && !autocvar_bot_typefrag) return false; if(targ.flags & FL_NOTARGET) return false; + if(targ.alpha <= 0.1 && targ.alpha != 0) + return false; // invisible via alpha if(MUTATOR_CALLHOOK(BotShouldAttack, this, targ)) return false; @@ -157,7 +160,7 @@ void bot_lagfunc(entity this, float t, float f1, float f2, entity e1, vector v1, return; } this.bot_aimtarg = e1; - this.bot_aimlatency = this.ping; // FIXME? Shouldn't this be in the lag item? + this.bot_aimlatency = CS(this).ping; // FIXME? Shouldn't this be in the lag item? //this.bot_aimorigin = v1; //this.bot_aimvelocity = v2; this.bot_aimtargorigin = v3; @@ -172,16 +175,21 @@ void bot_lagfunc(entity this, float t, float f1, float f2, entity e1, vector v1, this.bot_canfire = 1; } -float bot_aimdir(entity this, vector v, float maxfiredeviation) +void bot_aimdir(entity this, vector v, float maxfiredeviation) { float dist, delta_t, blend; vector desiredang, diffang; + this.bot_aimdir_executed = true; + //dprint("aim ", this.netname, ": old:", vtos(this.v_angle)); // make sure v_angle is sane first this.v_angle_y = this.v_angle.y - floor(this.v_angle.y / 360) * 360; this.v_angle_z = 0; + // invalid aim dir (can happen when bot overlaps target) + if(!v) return; + // get the desired angles to aim at //dprint(" at:", vtos(v)); v = normalize(v); @@ -229,7 +237,7 @@ float bot_aimdir(entity this, vector v, float maxfiredeviation) this.bot_5th_order_aimfilter= this.bot_5th_order_aimfilter + (this.bot_4th_order_aimfilter - this.bot_5th_order_aimfilter) * bound(0, autocvar_bot_ai_aimskill_order_filter_5th,1); - //blend = (bound(0,skill,10)*0.1)*pow(1-bound(0,skill,10)*0.05,2.5)*5.656854249; //Plot formule before changing ! + //blend = (bound(0,skill,10)*0.1)*((1-bound(0,skill,10)*0.05) ** 2.5)*5.656854249; //Plot formule before changing ! blend = bound(0,skill+this.bot_aimskill,10)*0.1; desiredang = desiredang + blend * ( @@ -281,7 +289,7 @@ float bot_aimdir(entity this, vector v, float maxfiredeviation) blendrate = autocvar_bot_ai_aimskill_blendrate; r = max(fixedrate, blendrate); //this.v_angle = this.v_angle + diffang * bound(frametime, r * frametime * (2+skill*skill*0.05-random()*0.05*(10-skill)), 1); - this.v_angle = this.v_angle + diffang * bound(delta_t, r * delta_t * (2+pow(skill+this.bot_mouseskill,3)*0.005-random()), 1); + this.v_angle = this.v_angle + diffang * bound(delta_t, r * delta_t * (2 + ((skill + this.bot_mouseskill) ** 3) * 0.005 - random()), 1); this.v_angle = this.v_angle * bound(0,autocvar_bot_ai_aimskill_mouse,1) + desiredang * bound(0,(1-autocvar_bot_ai_aimskill_mouse),1); //this.v_angle = this.v_angle + diffang * bound(0, r * frametime * (skill * 0.5 + 2), 1); //this.v_angle = this.v_angle + diffang * (1/ blendrate); @@ -305,16 +313,14 @@ float bot_aimdir(entity this, vector v, float maxfiredeviation) //dprint("e ", vtos(diffang), " < ", ftos(maxfiredeviation), "\n"); // decide whether to fire this time - // note the maxfiredeviation is in degrees so this has to convert to radians first - //if ((normalize(v) * shotdir) >= cos(maxfiredeviation * (3.14159265358979323846 / 180))) - if ((normalize(v) * shotdir) >= cos(maxfiredeviation * (3.14159265358979323846 / 180))) + if (v * shotdir >= cos(maxfiredeviation * DEG2RAD)) if(vdist(trace_endpos-shotorg, <, 500 + 500 * bound(0, skill + this.bot_aggresskill, 10)) || random()*random()>bound(0,(skill+this.bot_aggresskill)*0.05,1)) this.bot_firetimer = time + bound(0.1, 0.5-(skill+this.bot_aggresskill)*0.05, 0.5); //traceline(shotorg,shotorg+shotdir*1000,false,NULL); //dprint(ftos(maxfiredeviation),"\n"); //dprint(" diff:", vtos(diffang), "\n"); - return this.bot_canfire && (time < this.bot_firetimer); + //return this.bot_canfire && (time < this.bot_firetimer); } vector bot_shotlead(vector targorigin, vector targvelocity, float shotspeed, float shotdelay) @@ -325,7 +331,7 @@ vector bot_shotlead(vector targorigin, vector targvelocity, float shotspeed, flo bool bot_aim(entity this, .entity weaponentity, float shotspeed, float shotspeedupward, float maxshottime, bool applygravity) { - float f, r, hf, distanceratio; + float r, hf, distanceratio; vector v; /* eprint(this); @@ -367,11 +373,11 @@ bool bot_aim(entity this, .entity weaponentity, float shotspeed, float shotspeed return false; } - f = bot_aimdir(this, findtrajectory_velocity - shotspeedupward * '0 0 1', r); + bot_aimdir(this, findtrajectory_velocity - shotspeedupward * '0 0 1', r); } else { - f = bot_aimdir(this, v - shotorg, r); + bot_aimdir(this, v - shotorg, r); //dprint("AIM: ");dprint(vtos(this.bot_aimtargorigin));dprint(" + ");dprint(vtos(this.bot_aimtargvelocity));dprint(" * ");dprint(ftos(this.bot_aimlatency + vlen(this.bot_aimtargorigin - shotorg) / shotspeed));dprint(" = ");dprint(vtos(v));dprint(" : aimdir = ");dprint(vtos(normalize(v - shotorg)));dprint(" : ");dprint(vtos(shotdir));dprint("\n"); //traceline(shotorg, shotorg + shotdir * 10000, false, this); //if (trace_ent.takedamage)