X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Fbot%2Fdefault%2Fhavocbot%2Fhavocbot.qc;h=9321d388c52e6b129990538fb038fa21e6b1d7c2;hb=f03ecd022b871d302176764d819b1a07eeda7997;hp=0047a26283ba485710c5cb3630fc4af7b16a20da;hpb=c757b2b2307fcc48ebdbf10b590142bd4d42f759;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/bot/default/havocbot/havocbot.qc b/qcsrc/server/bot/default/havocbot/havocbot.qc index 0047a2628..9321d388c 100644 --- a/qcsrc/server/bot/default/havocbot/havocbot.qc +++ b/qcsrc/server/bot/default/havocbot/havocbot.qc @@ -30,13 +30,6 @@ void havocbot_ai(entity this) if(bot_execute_commands(this)) return; - while(this.goalcurrent && wasfreed(this.goalcurrent)) - { - navigation_poproute(this); - if(!this.goalcurrent) - this.bot_strategytime = 0; - } - if (bot_strategytoken == this) if (!bot_strategytoken_taken) { @@ -371,7 +364,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 @@ -501,7 +495,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; @@ -513,6 +507,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) @@ -525,7 +520,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; }); @@ -535,6 +530,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; } } @@ -673,8 +670,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) @@ -749,10 +745,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); @@ -789,12 +783,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'); @@ -803,17 +797,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; } } }