X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fanticheat.qc;h=79442299e197343ccd6b4c32aa769c0f7bf5e173;hb=f2741730af3cbdb03dc3a3e1bd10c1b881f5a75d;hp=370ef844e8263bf7840153ad51d80a654b7f6653;hpb=802d673ea15260b02ce6760839cc40a2a57b21b1;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/anticheat.qc b/qcsrc/server/anticheat.qc index 370ef844e..79442299e 100644 --- a/qcsrc/server/anticheat.qc +++ b/qcsrc/server/anticheat.qc @@ -5,8 +5,6 @@ #include "defs.qh" #include "miscfunctions.qh" -#include "../dpdefs/progsdefs.qh" -#include "../dpdefs/dpextensions.qh" #include "command/common.qh" @@ -62,39 +60,39 @@ float movement_oddity(vector m0, vector m1) // returns 0 for: -1, -sqrt(0.5), 0 (angles that commonly happen with kbd) } -void anticheat_physics() -{SELFPARAM(); +void anticheat_physics(entity this) +{ float f; // div0_evade -> SPECTATORS - makevectors(self.v_angle); - if(self.anticheat_div0_evade_offset == 0) + makevectors(this.v_angle); + if(this.anticheat_div0_evade_offset == 0) { f = fabs(anticheat_div0_evade_evasion_delta - floor(anticheat_div0_evade_evasion_delta) - 0.5) * 2; // triangle function - self.anticheat_div0_evade_offset = servertime + sys_frametime * (3 * f - 1); - self.anticheat_div0_evade_v_angle = self.v_angle; - self.anticheat_div0_evade_forward_initial = v_forward; - MEAN_ACCUMULATE(anticheat_div0_evade, 0, 1); + this.anticheat_div0_evade_offset = servertime + sys_frametime * (3 * f - 1); + this.anticheat_div0_evade_v_angle = this.v_angle; + this.anticheat_div0_evade_forward_initial = v_forward; + MEAN_ACCUMULATE(this, anticheat_div0_evade, 0, 1); } else { - if(time < self.anticheat_div0_evade_offset) - self.anticheat_div0_evade_v_angle = self.v_angle; - MEAN_ACCUMULATE(anticheat_div0_evade, 0.5 - 0.5 * (self.anticheat_div0_evade_forward_initial * v_forward), 1); + if(time < this.anticheat_div0_evade_offset) + this.anticheat_div0_evade_v_angle = this.v_angle; + MEAN_ACCUMULATE(this, anticheat_div0_evade, 0.5 - 0.5 * (this.anticheat_div0_evade_forward_initial * v_forward), 1); } - MEAN_ACCUMULATE(anticheat_div0_strafebot_old, movement_oddity(self.movement, self.anticheat_div0_strafebot_movement_prev), 1); - self.anticheat_div0_strafebot_movement_prev = self.movement; + MEAN_ACCUMULATE(this, anticheat_div0_strafebot_old, movement_oddity(this.movement, this.anticheat_div0_strafebot_movement_prev), 1); + this.anticheat_div0_strafebot_movement_prev = this.movement; // Note: this actually tries to detect snap-aim. - if(vlen(self.anticheat_div0_strafebot_forward_prev) && time > self.anticheat_fixangle_endtime) { - float cosangle = self.anticheat_div0_strafebot_forward_prev * v_forward; + if(vlen(this.anticheat_div0_strafebot_forward_prev) && time > this.anticheat_fixangle_endtime) { + float cosangle = this.anticheat_div0_strafebot_forward_prev * v_forward; float angle = cosangle < -1 ? M_PI : cosangle > 1 ? 0 : acos(cosangle); /* if (angle >= 10 * M_PI / 180) - printf("SNAP %s: %f for %f, %f since fixangle\n", self.netname, angle * 180 / M_PI, cosangle, time - self.anticheat_fixangle_endtime); + printf("SNAP %s: %f for %f, %f since fixangle\n", this.netname, angle * 180 / M_PI, cosangle, time - this.anticheat_fixangle_endtime); */ - MEAN_ACCUMULATE(anticheat_div0_strafebot_new, angle / M_PI, 1); + MEAN_ACCUMULATE(this, anticheat_div0_strafebot_new, angle / M_PI, 1); if (autocvar_slowmo > 0) { // Technically this is a NOP, as the engine should be ensuring @@ -103,49 +101,49 @@ void anticheat_physics() float dt = max(0.001, frametime) / autocvar_slowmo; float anglespeed = angle / dt; - MEAN_ACCUMULATE(anticheat_idle_snapaim_signal, anglespeed, dt); - MEAN_ACCUMULATE(anticheat_idle_snapaim_noise, anglespeed, dt); - MEAN_ACCUMULATE(anticheat_idle_snapaim_m2, anglespeed, dt); - MEAN_ACCUMULATE(anticheat_idle_snapaim_m3, anglespeed, dt); - MEAN_ACCUMULATE(anticheat_idle_snapaim_m4, anglespeed, dt); - MEAN_ACCUMULATE(anticheat_idle_snapaim_m7, anglespeed, dt); - MEAN_ACCUMULATE(anticheat_idle_snapaim_m10, anglespeed, dt); + MEAN_ACCUMULATE(this, anticheat_idle_snapaim_signal, anglespeed, dt); + MEAN_ACCUMULATE(this, anticheat_idle_snapaim_noise, anglespeed, dt); + MEAN_ACCUMULATE(this, anticheat_idle_snapaim_m2, anglespeed, dt); + MEAN_ACCUMULATE(this, anticheat_idle_snapaim_m3, anglespeed, dt); + MEAN_ACCUMULATE(this, anticheat_idle_snapaim_m4, anglespeed, dt); + MEAN_ACCUMULATE(this, anticheat_idle_snapaim_m7, anglespeed, dt); + MEAN_ACCUMULATE(this, anticheat_idle_snapaim_m10, anglespeed, dt); } } - self.anticheat_div0_strafebot_forward_prev = v_forward; + this.anticheat_div0_strafebot_forward_prev = v_forward; // generic speedhack detection: correlate anticheat_speedhack_movetime (UPDATED BEFORE THIS) and server time - self.anticheat_speedhack_movetime_frac += frametime; - f = floor(self.anticheat_speedhack_movetime_frac); - self.anticheat_speedhack_movetime_frac -= f; - self.anticheat_speedhack_movetime_count += f; - self.anticheat_speedhack_movetime = self.anticheat_speedhack_movetime_frac + self.anticheat_speedhack_movetime_count; - f = self.anticheat_speedhack_movetime - servertime; - if(self.anticheat_speedhack_offset == 0) - self.anticheat_speedhack_offset = f; + this.anticheat_speedhack_movetime_frac += frametime; + f = floor(this.anticheat_speedhack_movetime_frac); + this.anticheat_speedhack_movetime_frac -= f; + this.anticheat_speedhack_movetime_count += f; + this.anticheat_speedhack_movetime = this.anticheat_speedhack_movetime_frac + this.anticheat_speedhack_movetime_count; + f = this.anticheat_speedhack_movetime - servertime; + if(this.anticheat_speedhack_offset == 0) + this.anticheat_speedhack_offset = f; else { - MEAN_ACCUMULATE(anticheat_speedhack, max(0, f - self.anticheat_speedhack_offset), 1); - self.anticheat_speedhack_offset += (f - self.anticheat_speedhack_offset) * frametime * 0.1; + MEAN_ACCUMULATE(this, anticheat_speedhack, max(0, f - this.anticheat_speedhack_offset), 1); + this.anticheat_speedhack_offset += (f - this.anticheat_speedhack_offset) * frametime * 0.1; } // new generic speedhack detection - if (self.anticheat_speedhack_lasttime > 0) { - float dt = servertime - self.anticheat_speedhack_lasttime; + if (this.anticheat_speedhack_lasttime > 0) { + float dt = servertime - this.anticheat_speedhack_lasttime; const float falloff = 0.2; - self.anticheat_speedhack_accu *= exp(-dt * falloff); - self.anticheat_speedhack_accu += frametime * falloff; + this.anticheat_speedhack_accu *= exp(-dt * falloff); + this.anticheat_speedhack_accu += frametime * falloff; // NOTE: at cl_netfps x, this actually averages not to 1, but to 1/x * falloff / (1 - exp(-1/x * falloff)) // For 15 netfps (absolute minimum bearable), and 0.2 falloff, this is: 1.0067 - self.anticheat_speedhack_lasttime = servertime; - MEAN_ACCUMULATE(anticheat_speedhack_m1, self.anticheat_speedhack_accu, frametime); - MEAN_ACCUMULATE(anticheat_speedhack_m2, self.anticheat_speedhack_accu, frametime); - MEAN_ACCUMULATE(anticheat_speedhack_m3, self.anticheat_speedhack_accu, frametime); - MEAN_ACCUMULATE(anticheat_speedhack_m4, self.anticheat_speedhack_accu, frametime); - MEAN_ACCUMULATE(anticheat_speedhack_m5, self.anticheat_speedhack_accu, frametime); + this.anticheat_speedhack_lasttime = servertime; + MEAN_ACCUMULATE(this, anticheat_speedhack_m1, this.anticheat_speedhack_accu, frametime); + MEAN_ACCUMULATE(this, anticheat_speedhack_m2, this.anticheat_speedhack_accu, frametime); + MEAN_ACCUMULATE(this, anticheat_speedhack_m3, this.anticheat_speedhack_accu, frametime); + MEAN_ACCUMULATE(this, anticheat_speedhack_m4, this.anticheat_speedhack_accu, frametime); + MEAN_ACCUMULATE(this, anticheat_speedhack_m5, this.anticheat_speedhack_accu, frametime); } else { - self.anticheat_speedhack_accu = 1; - self.anticheat_speedhack_lasttime = servertime; + this.anticheat_speedhack_accu = 1; + this.anticheat_speedhack_lasttime = servertime; } } @@ -178,46 +176,46 @@ void anticheat_report() return; // TODO(divVerent): Use xonstat to acquire good thresholds. GameLogEcho(strcat(":anticheat:_time:", ftos(self.playerid), ":", ftos(servertime - self.anticheat_jointime))); - GameLogEcho(strcat(":anticheat:speedhack:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(anticheat_speedhack), 240, 0, 9999))); // Actually this one seems broken. - GameLogEcho(strcat(":anticheat:speedhack_m1:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(anticheat_speedhack_m1), 240, 1.01, 1.25))); - GameLogEcho(strcat(":anticheat:speedhack_m2:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(anticheat_speedhack_m2), 240, 1.01, 1.25))); - GameLogEcho(strcat(":anticheat:speedhack_m3:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(anticheat_speedhack_m3), 240, 1.01, 1.25))); - GameLogEcho(strcat(":anticheat:speedhack_m4:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(anticheat_speedhack_m4), 240, 1.01, 1.25))); - GameLogEcho(strcat(":anticheat:speedhack_m5:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(anticheat_speedhack_m5), 240, 1.01, 1.25))); - GameLogEcho(strcat(":anticheat:div0_strafebot_old:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(anticheat_div0_strafebot_old), 120, 0.15, 0.4))); - GameLogEcho(strcat(":anticheat:div0_strafebot_new:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(anticheat_div0_strafebot_new), 120, 0.25, 0.8))); - GameLogEcho(strcat(":anticheat:div0_evade:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(anticheat_div0_evade), 120, 0.2, 0.5))); - GameLogEcho(strcat(":anticheat:idle_snapaim:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(anticheat_idle_snapaim_signal) - MEAN_EVALUATE(anticheat_idle_snapaim_noise), 120, 0, 9999))); - GameLogEcho(strcat(":anticheat:idle_snapaim_signal:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(anticheat_idle_snapaim_signal), 120, 0, 9999))); - GameLogEcho(strcat(":anticheat:idle_snapaim_noise:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(anticheat_idle_snapaim_noise), 120, 0, 9999))); - GameLogEcho(strcat(":anticheat:idle_snapaim_m2:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(anticheat_idle_snapaim_m2), 120, 0, 9999))); - GameLogEcho(strcat(":anticheat:idle_snapaim_m3:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(anticheat_idle_snapaim_m3), 120, 0, 9999))); - GameLogEcho(strcat(":anticheat:idle_snapaim_m4:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(anticheat_idle_snapaim_m4), 120, 0, 9999))); - GameLogEcho(strcat(":anticheat:idle_snapaim_m7:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(anticheat_idle_snapaim_m7), 120, 0, 9999))); - GameLogEcho(strcat(":anticheat:idle_snapaim_m10:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(anticheat_idle_snapaim_m10), 120, 0, 9999))); + GameLogEcho(strcat(":anticheat:speedhack:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(self, anticheat_speedhack), 240, 0, 9999))); // Actually this one seems broken. + GameLogEcho(strcat(":anticheat:speedhack_m1:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(self, anticheat_speedhack_m1), 240, 1.01, 1.25))); + GameLogEcho(strcat(":anticheat:speedhack_m2:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(self, anticheat_speedhack_m2), 240, 1.01, 1.25))); + GameLogEcho(strcat(":anticheat:speedhack_m3:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(self, anticheat_speedhack_m3), 240, 1.01, 1.25))); + GameLogEcho(strcat(":anticheat:speedhack_m4:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(self, anticheat_speedhack_m4), 240, 1.01, 1.25))); + GameLogEcho(strcat(":anticheat:speedhack_m5:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(self, anticheat_speedhack_m5), 240, 1.01, 1.25))); + GameLogEcho(strcat(":anticheat:div0_strafebot_old:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(self, anticheat_div0_strafebot_old), 120, 0.15, 0.4))); + GameLogEcho(strcat(":anticheat:div0_strafebot_new:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(self, anticheat_div0_strafebot_new), 120, 0.25, 0.8))); + GameLogEcho(strcat(":anticheat:div0_evade:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(self, anticheat_div0_evade), 120, 0.2, 0.5))); + GameLogEcho(strcat(":anticheat:idle_snapaim:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(self, anticheat_idle_snapaim_signal) - MEAN_EVALUATE(self, anticheat_idle_snapaim_noise), 120, 0, 9999))); + GameLogEcho(strcat(":anticheat:idle_snapaim_signal:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(self, anticheat_idle_snapaim_signal), 120, 0, 9999))); + GameLogEcho(strcat(":anticheat:idle_snapaim_noise:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(self, anticheat_idle_snapaim_noise), 120, 0, 9999))); + GameLogEcho(strcat(":anticheat:idle_snapaim_m2:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(self, anticheat_idle_snapaim_m2), 120, 0, 9999))); + GameLogEcho(strcat(":anticheat:idle_snapaim_m3:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(self, anticheat_idle_snapaim_m3), 120, 0, 9999))); + GameLogEcho(strcat(":anticheat:idle_snapaim_m4:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(self, anticheat_idle_snapaim_m4), 120, 0, 9999))); + GameLogEcho(strcat(":anticheat:idle_snapaim_m7:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(self, anticheat_idle_snapaim_m7), 120, 0, 9999))); + GameLogEcho(strcat(":anticheat:idle_snapaim_m10:", ftos(self.playerid), ":", anticheat_display(MEAN_EVALUATE(self, anticheat_idle_snapaim_m10), 120, 0, 9999))); } float anticheat_getvalue(string id) {SELFPARAM(); switch(id) { case "_time": return servertime - self.anticheat_jointime; - case "speedhack": return MEAN_EVALUATE(anticheat_speedhack); - case "speedhack_m1": return MEAN_EVALUATE(anticheat_speedhack_m1); - case "speedhack_m2": return MEAN_EVALUATE(anticheat_speedhack_m2); - case "speedhack_m3": return MEAN_EVALUATE(anticheat_speedhack_m3); - case "speedhack_m4": return MEAN_EVALUATE(anticheat_speedhack_m4); - case "speedhack_m5": return MEAN_EVALUATE(anticheat_speedhack_m5); - case "div0_strafebot_old": return MEAN_EVALUATE(anticheat_div0_strafebot_old); - case "div0_strafebot_new": return MEAN_EVALUATE(anticheat_div0_strafebot_new); - case "div0_evade": return MEAN_EVALUATE(anticheat_div0_evade); - case "idle_snapaim": return MEAN_EVALUATE(anticheat_idle_snapaim_signal) - MEAN_EVALUATE(anticheat_idle_snapaim_noise); - case "idle_snapaim_signal": return MEAN_EVALUATE(anticheat_idle_snapaim_signal); - case "idle_snapaim_noise": return MEAN_EVALUATE(anticheat_idle_snapaim_noise); - case "idle_snapaim_m2": return MEAN_EVALUATE(anticheat_idle_snapaim_m2); - case "idle_snapaim_m3": return MEAN_EVALUATE(anticheat_idle_snapaim_m3); - case "idle_snapaim_m4": return MEAN_EVALUATE(anticheat_idle_snapaim_m4); - case "idle_snapaim_m7": return MEAN_EVALUATE(anticheat_idle_snapaim_m7); - case "idle_snapaim_m10": return MEAN_EVALUATE(anticheat_idle_snapaim_m10); + case "speedhack": return MEAN_EVALUATE(self, anticheat_speedhack); + case "speedhack_m1": return MEAN_EVALUATE(self, anticheat_speedhack_m1); + case "speedhack_m2": return MEAN_EVALUATE(self, anticheat_speedhack_m2); + case "speedhack_m3": return MEAN_EVALUATE(self, anticheat_speedhack_m3); + case "speedhack_m4": return MEAN_EVALUATE(self, anticheat_speedhack_m4); + case "speedhack_m5": return MEAN_EVALUATE(self, anticheat_speedhack_m5); + case "div0_strafebot_old": return MEAN_EVALUATE(self, anticheat_div0_strafebot_old); + case "div0_strafebot_new": return MEAN_EVALUATE(self, anticheat_div0_strafebot_new); + case "div0_evade": return MEAN_EVALUATE(self, anticheat_div0_evade); + case "idle_snapaim": return MEAN_EVALUATE(self, anticheat_idle_snapaim_signal) - MEAN_EVALUATE(self, anticheat_idle_snapaim_noise); + case "idle_snapaim_signal": return MEAN_EVALUATE(self, anticheat_idle_snapaim_signal); + case "idle_snapaim_noise": return MEAN_EVALUATE(self, anticheat_idle_snapaim_noise); + case "idle_snapaim_m2": return MEAN_EVALUATE(self, anticheat_idle_snapaim_m2); + case "idle_snapaim_m3": return MEAN_EVALUATE(self, anticheat_idle_snapaim_m3); + case "idle_snapaim_m4": return MEAN_EVALUATE(self, anticheat_idle_snapaim_m4); + case "idle_snapaim_m7": return MEAN_EVALUATE(self, anticheat_idle_snapaim_m7); + case "idle_snapaim_m10": return MEAN_EVALUATE(self, anticheat_idle_snapaim_m10); } return -1; } @@ -234,12 +232,10 @@ void anticheat_fixangle() void anticheat_endframe() {SELFPARAM(); - entity e; - FOR_EACH_CLIENT(e) - if (e.fixangle) { - SELFCALL(e, anticheat_fixangle()); - SELFCALL_DONE(); - } + FOREACH_CLIENT(true, LAMBDA( + if(it.fixangle) + WITH(entity, self, it, anticheat_fixangle()); + )); anticheat_div0_evade_evasion_delta += frametime * (0.5 + random()); }