X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Fdefault%2Fnavigation.qc;h=1f5377bb388b9d86f887931bcdc8f6ca19e67d24;hb=d464b8e24227e71a33447c76220f5bf169047154;hp=01352d0e4d94ba4702fdb727a8818dc1e946d02b;hpb=0d0a2025de767dbfae0519941294f5947fe38c1f;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/bot/default/navigation.qc b/qcsrc/server/bot/default/navigation.qc index 01352d0e4..1f5377bb3 100644 --- a/qcsrc/server/bot/default/navigation.qc +++ b/qcsrc/server/bot/default/navigation.qc @@ -47,6 +47,7 @@ bool navigation_goalrating_timeout(entity this) return this.bot_strategytime < time; } +ERASEABLE void navigation_goalrating_timeout_extend_if_needed(entity this, float seconds) { this.bot_strategytime = max(this.bot_strategytime, time + seconds); @@ -239,6 +240,9 @@ bool navigation_checkladders(entity e, vector org, vector m1, vector m2, vector return false; } +// Unfortuntely we can't use trace_inwater since it doesn't hold the fraction of the total +// distance that was traveled before impact as the description in the engine (collision.h) says. +// It would have helped to speed up tracewalk underwater vector resurface_limited(vector org, float lim, vector m1) { if (WETFEET(org + eZ * (lim - org.z))) @@ -940,10 +944,7 @@ entity navigation_findnearestwaypoint_withdist_except(entity ent, float walkfrom if(boxesoverlap(pm1, pm2, it.absmin, it.absmax)) { if(walkfromwp && !ent.navigation_dynamicgoal) - { waypoint_clearlinks(ent); // initialize wpXXmincost fields - navigation_item_addlink(it, ent); - } return it; } }); @@ -962,24 +963,6 @@ entity navigation_findnearestwaypoint_withdist_except(entity ent, float walkfrom org.z = ent.origin.z + ent.mins.z - PL_MIN_CONST.z; // player height } - if(!autocvar_g_waypointeditor && walkfromwp && !ent.navigation_dynamicgoal) - { - waypoint_clearlinks(ent); // initialize wpXXmincost fields - IL_EACH(g_waypoints, it != ent, - { - if (walkfromwp && (it.wpflags & WPFLAGMASK_NORELINK)) - continue; - - set_tracewalk_dest(ent, it.origin, false); - if (vdist(tracewalk_dest - it.origin, <, 1050) - && tracewalk(ent, it.origin, PL_MIN_CONST, PL_MAX_CONST, - tracewalk_dest, tracewalk_dest_height, bot_navigation_movemode)) - { - navigation_item_addlink(it, ent); - } - }); - } - // box check failed, try walk IL_EACH(g_waypoints, it != ent, { @@ -1504,7 +1487,7 @@ bool navigation_routetogoal(entity this, entity e, vector startposition) if(e == NULL) return false; - if(nearest_wp && nearest_wp.enemy) + if(nearest_wp && nearest_wp.enemy && !(nearest_wp.enemy.wpflags & WPFLAGMASK_NORELINK)) { // often path can be optimized by not adding the nearest waypoint if (this.goalentity.navigation_dynamicgoal || autocvar_g_waypointeditor) @@ -1526,8 +1509,35 @@ bool navigation_routetogoal(entity this, entity e, vector startposition) } } } - else if(navigation_item_islinked(nearest_wp.enemy, this.goalentity)) - e = nearest_wp.enemy; + else + { + // NOTE unlike waypoints, items hold incoming links + navigation_item_initlinks_ifneeded(this.goalentity); + int link_num = navigation_item_getlinknum(this.goalentity, nearest_wp.enemy); + if (link_num >= 0) + { + if (navigation_item_iswalkablelink(this.goalentity, link_num)) + e = nearest_wp.enemy; + } + else // untested link + { + entity wp = nearest_wp.enemy; + entity goal = this.goalentity; + bool walkable = false; + if (checkpvs(wp.origin, goal)) + { + set_tracewalk_dest(goal, wp.origin, false); + if (vdist(tracewalk_dest - wp.origin, <, 1050) + && tracewalk(goal, wp.origin, PL_MIN_CONST, PL_MAX_CONST, + tracewalk_dest, tracewalk_dest_height, bot_navigation_movemode)) + { + walkable = true; + e = nearest_wp.enemy; + } + } + navigation_item_add_link(wp, goal, walkable); + } + } } for (;;) @@ -1707,11 +1717,16 @@ int navigation_poptouchedgoals(entity this) } // Loose goal touching check when running - if(this.aistatus & AI_STATUS_RUNNING) - if(this.goalcurrent.classname=="waypoint") - if(vdist(vec2(this.velocity), >=, autocvar_sv_maxspeed)) // if -really- running - { - if(vdist(this.origin - this.goalcurrent.origin, <, 150)) + // check goalstack01 to make sure waypoint isn't the final goal + if(this.aistatus & AI_STATUS_RUNNING && this.goalcurrent.classname == "waypoint" && !(this.goalcurrent.wpflags & WAYPOINTFLAG_JUMP) + && this.goalstack01 && !wasfreed(this.goalstack01) && vdist(vec2(this.velocity), >=, autocvar_sv_maxspeed)) + { + vector gco = this.goalcurrent.origin; + float min_dist = BOT_BUNNYHOP_WP_DETECTION_RANGE; + // also detect waypoints when bot is way above them but with a narrower horizontal range + // so to increase chances bot ends up in the standard range (optimizes nearest waypoint finding) + if(vdist(this.origin - gco, <, min_dist) + || (vdist(vec2(this.origin - gco), <, min_dist * 0.5) && vdist(this.origin - eZ * 1.5 * min_dist - gco, <, min_dist))) { traceline(this.origin + this.view_ofs , this.goalcurrent.origin, true, NULL); if(trace_fraction==1) @@ -1739,7 +1754,7 @@ int navigation_poptouchedgoals(entity this) if(this.goalcurrent.classname == "waypoint" && !this.goalcurrent.wpisbox) { gc_min = this.goalcurrent.origin - '1 1 1' * 12; - gc_max = this.goalcurrent.origin + '1 1 1' * 12; + gc_max = this.goalcurrent.origin + '1 1 1' * 12 + eZ * (jumpheight_vec.z + STAT(PL_MIN, this).z); } if (time < this.ladder_time) { @@ -1775,7 +1790,8 @@ entity navigation_get_really_close_waypoint(entity this) wp = this.goalcurrent_prev; if(!wp) return NULL; - if(wp != this.goalcurrent_prev && vdist(wp.origin - this.origin, >, 50)) + float min_dist = ((this.aistatus & AI_STATUS_RUNNING) ? BOT_BUNNYHOP_WP_DETECTION_RANGE : 50); + if(wp != this.goalcurrent_prev && vdist(wp.origin - this.origin, >, min_dist)) { wp = this.goalcurrent_prev; if(!wp) @@ -1787,12 +1803,12 @@ entity navigation_get_really_close_waypoint(entity this) if(!wp) return NULL; } - if(vdist(wp.origin - this.origin, >, 50)) + if(vdist(wp.origin - this.origin, >, min_dist)) { wp = NULL; IL_EACH(g_waypoints, !(it.wpflags & (WAYPOINTFLAG_TELEPORT | WAYPOINTFLAG_JUMP)), { - if(vdist(it.origin - this.origin, <, 50)) + if(vdist(it.origin - this.origin, <, min_dist)) { wp = it; break;