X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Fdefault%2Fhavocbot%2Fhavocbot.qc;h=8e6b3912b3da70f7ecb757bb41a3ce997c24824d;hp=d23c29675a70fa7bc5d2944922f143ee6a7c9a28;hb=451e02a2857d8c671f6dcf6a0639ea7c609b3ba9;hpb=79eebf87e68861e205a8754d6551bd0aa2229c44 diff --git a/qcsrc/server/bot/default/havocbot/havocbot.qc b/qcsrc/server/bot/default/havocbot/havocbot.qc index d23c29675..8e6b3912b 100644 --- a/qcsrc/server/bot/default/havocbot/havocbot.qc +++ b/qcsrc/server/bot/default/havocbot/havocbot.qc @@ -9,10 +9,12 @@ #include "../waypoints.qh" #include +#include #include #include #include +#include #include #include @@ -42,7 +44,7 @@ void havocbot_ai(entity this) // TODO: tracewalk() should take care of this job (better path finding under water) // if we don't have a goal and we're under water look for a waypoint near the "shore" and push it - if(IS_DEAD(this)) + if(!(IS_DEAD(this))) if(!this.goalcurrent) if(this.waterlevel == WATERLEVEL_SWIMMING || (this.aistatus & AI_STATUS_OUT_WATER)) { @@ -128,7 +130,7 @@ void havocbot_ai(entity this) //heading = this.velocity; //dprint(this.goalstack01.classname,etos(this.goalstack01),"\n"); if( - this.goalstack01 != this && this.goalstack01 != NULL && ((this.aistatus & AI_STATUS_RUNNING) == 0) && + this.goalstack01 != this && this.goalstack01 && !wasfreed(this.goalstack01) && ((this.aistatus & AI_STATUS_RUNNING) == 0) && !(this.goalcurrent.wpflags & WAYPOINTFLAG_TELEPORT) ) next = ((this.goalstack01.absmin + this.goalstack01.absmax) * 0.5) - (this.origin + this.view_ofs); @@ -319,7 +321,7 @@ void havocbot_bunnyhop(entity this, vector dir) if(this.goalcurrent.classname=="waypoint") if (!(this.goalcurrent.wpflags & WAYPOINTFLAG_PERSONAL)) if(fabs(gco.z - this.origin.z) < this.maxs.z - this.mins.z) - if(this.goalstack01!=NULL) + if(this.goalstack01 && !wasfreed(this.goalstack01)) { gno = (this.goalstack01.absmin + this.goalstack01.absmax) * 0.5; deviation = vectoangles(gno - this.origin) - vectoangles(gco - this.origin); @@ -341,7 +343,8 @@ void havocbot_bunnyhop(entity this, vector dir) if(checkdistance) { this.aistatus &= ~AI_STATUS_RUNNING; - if(bunnyhopdistance > autocvar_bot_ai_bunnyhop_stopdistance) + // increase stop distance in case the goal is on a slope or a lower platform + if(bunnyhopdistance > autocvar_bot_ai_bunnyhop_stopdistance + (this.origin.z - gco.z)) PHYS_INPUT_BUTTON_JUMP(this) = true; } else @@ -471,7 +474,7 @@ void havocbot_movetogoal(entity this) // Flying PHYS_INPUT_BUTTON_HOOK(this) = true; - if(this.navigation_jetpack_point.z - STAT(PL_MAX, NULL).z + STAT(PL_MIN, NULL).z < this.origin.z) + if(this.navigation_jetpack_point.z - STAT(PL_MAX, this).z + STAT(PL_MIN, this).z < this.origin.z) { this.movement_x = dir * v_forward * maxspeed; this.movement_y = dir * v_right * maxspeed; @@ -483,6 +486,7 @@ void havocbot_movetogoal(entity this) if(this.jumppadcount) { // If got stuck on the jump pad try to reach the farthest visible waypoint + // but with some randomness so it can try out different paths if(this.aistatus & AI_STATUS_OUT_JUMPPAD) { if(fabs(this.velocity.z)<50) @@ -495,7 +499,7 @@ void havocbot_movetogoal(entity this) if(trace_fraction < 1) continue; - if(!newgoal || vlen2(it.origin - this.origin) > vlen2(newgoal.origin - this.origin)) + if(!newgoal || ((random() < 0.8) && vlen2(it.origin - this.origin) > vlen2(newgoal.origin - this.origin))) newgoal = it; }); @@ -505,6 +509,8 @@ void havocbot_movetogoal(entity this) this.ignoregoaltime = time + autocvar_bot_ai_ignoregoal_timeout; navigation_clearroute(this); navigation_routetogoal(this, newgoal, this.origin); + if(autocvar_bot_debug_goalstack) + debuggoalstack(this); this.aistatus &= ~AI_STATUS_OUT_JUMPPAD; } } @@ -633,8 +639,7 @@ void havocbot_movetogoal(entity this) if (this.goalcurrent == NULL) return; - if (this.goalcurrent) - navigation_poptouchedgoals(this); + navigation_poptouchedgoals(this); // if ran out of goals try to use an alternative goal or get a new strategy asap if(this.goalcurrent == NULL) @@ -709,10 +714,8 @@ void havocbot_movetogoal(entity this) } // avoiding dangers and obstacles - vector dst_ahead, dst_down; - makevectors(this.v_angle.y * '0 1 0'); - dst_ahead = this.origin + this.view_ofs + (this.velocity * 0.4) + (v_forward * 32 * 3); - dst_down = dst_ahead - '0 0 1500'; + vector dst_ahead = this.origin + this.view_ofs + this.velocity * 0.5; + vector dst_down = dst_ahead - '0 0 3000'; // Look ahead traceline(this.origin + this.view_ofs, dst_ahead, true, NULL); @@ -749,12 +752,12 @@ void havocbot_movetogoal(entity this) this.aistatus &= ~AI_STATUS_DANGER_AHEAD; if(trace_fraction == 1 && this.jumppadcount == 0 && !this.goalcurrent.wphardwired ) - if((IS_ONGROUND(this)) || (this.aistatus & AI_STATUS_RUNNING) || PHYS_INPUT_BUTTON_JUMP(this)) + if((IS_ONGROUND(this)) || (this.aistatus & AI_STATUS_RUNNING) || (this.aistatus & AI_STATUS_ROAMING) || PHYS_INPUT_BUTTON_JUMP(this)) { // Look downwards traceline(dst_ahead , dst_down, true, NULL); - // te_lightning2(NULL, this.origin, dst_ahead); // Draw "ahead" look - // te_lightning2(NULL, dst_ahead, dst_down); // Draw "downwards" look + //te_lightning2(NULL, this.origin + this.view_ofs, dst_ahead); // Draw "ahead" look + //te_lightning2(NULL, dst_ahead, dst_down); // Draw "downwards" look if(trace_endpos.z < this.origin.z + this.mins.z) { s = pointcontents(trace_endpos + '0 0 1'); @@ -763,17 +766,22 @@ void havocbot_movetogoal(entity this) evadelava = normalize(this.velocity) * -1; else if (s == CONTENT_SKY) evadeobstacle = normalize(this.velocity) * -1; - else if (!boxesoverlap(dst_ahead - this.view_ofs + this.mins, dst_ahead - this.view_ofs + this.maxs, - this.goalcurrent.absmin, this.goalcurrent.absmax)) + else if (tracebox_hits_trigger_hurt(dst_ahead, this.mins, this.maxs, trace_endpos)) { - // if ain't a safe goal with "holes" (like the jumpad on soylent) - // and there is a trigger_hurt below - if(tracebox_hits_trigger_hurt(dst_ahead, this.mins, this.maxs, trace_endpos)) + // the traceline check isn't enough but is good as optimization, + // when not true (most of the time) this tracebox call is avoided + tracebox(dst_ahead, this.mins, this.maxs, dst_down, true, this); + if (tracebox_hits_trigger_hurt(dst_ahead, this.mins, this.maxs, trace_endpos)) { - // Remove dangerous dynamic goals from stack - LOG_TRACE("bot ", this.netname, " avoided the goal ", this.goalcurrent.classname, " ", etos(this.goalcurrent), " because it led to a dangerous path; goal stack cleared"); - navigation_clearroute(this); - return; + if (gco.z > this.origin.z + jumpstepheightvec.z) + { + // the goal is probably on an upper platform, assume bot can't get there + LOG_TRACE("bot ", this.netname, " avoided the goal ", this.goalcurrent.classname, " ", etos(this.goalcurrent), " because it led to a dangerous path; goal stack cleared"); + navigation_clearroute(this); + this.bot_strategytime = 0; + } + else + evadelava = normalize(this.velocity) * -1; } } } @@ -836,11 +844,28 @@ void havocbot_movetogoal(entity this) if (((dodge * v_up) < 0) && random()*frametime >= 0.5*bound(0,(10-skill-this.bot_dodgeskill)*0.1,1)) this.havocbot_ducktime=time+0.3/bound(0.1,skill+this.bot_dodgeskill,10); } +entity havocbot_gettarget(entity this, bool secondary) +{ + entity best = NULL; + vector eye = CENTER_OR_VIEWOFS(this); + IL_EACH(g_bot_targets, boolean((secondary) ? it.classname == "misc_breakablemodel" : it.classname != "misc_breakablemodel"), + { + vector v = CENTER_OR_VIEWOFS(it); + if(vdist(v - eye, <, autocvar_bot_ai_enemydetectionradius)) + if(!best || vlen2(CENTER_OR_VIEWOFS(best) - eye) > vlen2(v - eye)) + if(bot_shouldattack(this, it)) + { + traceline(eye, v, true, this); + if (trace_ent == it || trace_fraction >= 1) + best = it; + } + }); + + return best; +} + void havocbot_chooseenemy(entity this) { - entity head, best, head2; - float rating, bestrating, hf; - vector eye, v; if (autocvar_bot_nofire || IS_INDEPENDENT_PLAYER(this)) { this.enemy = NULL; @@ -879,13 +904,12 @@ void havocbot_chooseenemy(entity this) if (time < this.havocbot_chooseenemy_finished) return; this.havocbot_chooseenemy_finished = time + autocvar_bot_ai_enemydetectioninterval; - eye = this.origin + this.view_ofs; - best = NULL; - bestrating = 100000000; - head = head2 = findchainfloat(bot_attack, true); + vector eye = this.origin + this.view_ofs; + entity best = NULL; + float bestrating = 100000000; // Backup hit flags - hf = this.dphitcontentsmask; + int hf = this.dphitcontentsmask; // Search for enemies, if no enemy can be seen directly try to look through transparent objects @@ -898,42 +922,38 @@ void havocbot_chooseenemy(entity this) { scan_secondary_targets = false; LABEL(scan_targets) - for( ; head; head = head.chain) + IL_EACH(g_bot_targets, it.bot_attack, { if(!scan_secondary_targets) { - if(head.classname == "misc_breakablemodel") + if(it.classname == "misc_breakablemodel") { have_secondary_targets = true; continue; } } - else - { - if(head.classname != "misc_breakablemodel") - continue; - } + else if(it.classname != "misc_breakablemodel") + continue; - v = (head.absmin + head.absmax) * 0.5; - rating = vlen(v - eye); - if (rating rating) - if (bot_shouldattack(this, head)) + if (bot_shouldattack(this, it)) { traceline(eye, v, true, this); - if (trace_ent == head || trace_fraction >= 1) + if (trace_ent == it || trace_fraction >= 1) { - best = head; + best = it; bestrating = rating; } } - } + }); if(!best && have_secondary_targets && !scan_secondary_targets) { scan_secondary_targets = true; // restart the loop - head = head2; bestrating = 100000000; goto scan_targets; } @@ -948,7 +968,6 @@ LABEL(scan_targets) // Set flags to see through transparent objects this.dphitcontentsmask |= DPCONTENTS_OPAQUE; - head = head2; scan_transparent = true; } @@ -1214,7 +1233,7 @@ float havocbot_moveto(entity this, vector pos) this.aistatus |= AI_STATUS_WAYPOINT_PERSONAL_LINKING; // if pos is inside a teleport, then let's mark it as teleport waypoint - FOREACH_ENTITY_CLASS("trigger_teleport", WarpZoneLib_BoxTouchesBrush(pos, pos, it, NULL), + IL_EACH(g_teleporters, WarpZoneLib_BoxTouchesBrush(pos, pos, it, NULL), { wp.wpflags |= WAYPOINTFLAG_TELEPORT; this.lastteleporttime = 0;