X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Fdefault%2Faim.qc;h=4625d4a08ca8a0b01354ed2792c7952d31ca0096;hb=5aab6120acfc624751d20a695d1b911b3e919831;hp=5ad1295f990f0b3d16be6b989e3263e4b17b3466;hpb=88e815808cb794930e7a0d6257cfdb8b3456a9a1;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/bot/default/aim.qc b/qcsrc/server/bot/default/aim.qc index 5ad1295f9..4625d4a08 100644 --- a/qcsrc/server/bot/default/aim.qc +++ b/qcsrc/server/bot/default/aim.qc @@ -11,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, @@ -139,10 +139,12 @@ bool bot_shouldattack(entity this, entity targ) 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; @@ -178,6 +180,8 @@ 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;