.void(entity this) havocbot_previous_role;
.void(entity this) havocbot_role;
+void havocbot_goalrating_waypoints(entity this, float ratingscale, vector org, float sradius)
+{
+ // rate waypoints only if there's no alternative goal
+ if(navigation_bestgoal)
+ return;
+
+ float f;
+ float range = 500;
+ sradius = max(range, (0.5 + random() * 0.5) * sradius);
+ while(sradius > 100)
+ {
+ IL_EACH(g_waypoints, vdist(it.origin - org, <, sradius)
+ && vdist(it.origin - org, >, max(100, sradius - range))
+ && !(it.wpflags & WAYPOINTFLAG_TELEPORT),
+ {
+ if(vdist(it.origin - this.wp_goal_prev0.origin, <, range * 1.5))
+ f = 0.1;
+ else if(vdist(it.origin - this.wp_goal_prev1.origin, <, range * 1.5))
+ f = 0.1;
+ else
+ f = 0.5 + random() * 0.5;
+ navigation_routerating(this, it, ratingscale * f, 2000);
+ });
+ if(navigation_bestgoal)
+ break;
+ sradius -= range;
+ }
+};
+
void havocbot_goalrating_items(entity this, float ratingscale, vector org, float sradius)
{
float rating, d, discard, friend_distance, enemy_distance;
ratingscale = ratingscale * 0.00005; // enemies are rated around 20000 already
- int t;
+ float t;
FOREACH_CLIENT(IS_PLAYER(it) && bot_shouldattack(this, it), LAMBDA(
// TODO: Merge this logic with the bot_shouldattack function
if(vdist(it.origin - org, <, 100) || vdist(it.origin - org, >, sradius))
continue;
*/
- bool rate_wps = false;
- if((it.flags & FL_INWATER) || (it.flags & FL_PARTIALGROUND))
- rate_wps = true;
-
- // not falling
- if(!IS_ONGROUND(it))
- {
- traceline(it.origin, it.origin + '0 0 -1500', true, NULL);
- t = pointcontents(trace_endpos + '0 0 1');
- if(t != CONTENT_SOLID )
- {
- if(t == CONTENT_WATER || t == CONTENT_SLIME || t == CONTENT_LAVA)
- rate_wps = true;
- else if(tracebox_hits_trigger_hurt(it.origin, it.mins, it.maxs, trace_endpos))
- continue;
- }
- }
-
t = ((this.health + this.armorvalue) - (it.health + it.armorvalue)) / 150;
t = bound(0, 1 + t, 3);
if (skill > 3)
t += max(0, 8 - skill) * 0.05; // less skilled bots attack more mindlessly
ratingscale *= t;
if (ratingscale > 0)
- {
- if(rate_wps)
- {
- entity theEnemy = it;
- entity best_wp = NULL;
- float best_dist = 10000;
- IL_EACH(g_waypoints, vdist(it.origin - theEnemy.origin, <, 500) && vdist(it.origin - this.origin, >, 100),
- {
- float dist = vlen(it.origin - theEnemy.origin);
- if (dist < best_dist)
- {
- best_wp = it;
- best_dist = dist;
- }
- });
- if (best_wp)
- navigation_routerating(this, best_wp, ratingscale * BOT_RATING_ENEMY, 2000);
- }
- else
- navigation_routerating(this, it, ratingscale * BOT_RATING_ENEMY, 2000);
- }
+ navigation_routerating(this, it, ratingscale * BOT_RATING_ENEMY, 2000);
));
}
navigation_goalrating_start(this);
havocbot_goalrating_items(this, 10000, this.origin, 10000);
havocbot_goalrating_enemyplayers(this, 20000, this.origin, 10000);
- //havocbot_goalrating_waypoints(1, this.origin, 1000);
+ havocbot_goalrating_waypoints(this, 1, this.origin, 3000);
navigation_goalrating_end(this);
+
+ if(IS_PLAYER(this.goalentity))
+ this.bot_strategytime = time + min(2, autocvar_bot_ai_strategyinterval);
}
}