]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/server/bot/default/havocbot/roles.qc
Bot AI: Fix buggy algorithm for deciding whether to leave an item to a human teammate...
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / bot / default / havocbot / roles.qc
index 1efdab0d3433212936ed61e5a9176b64889ee65a..de1bb92496a3e6f991d0c3890448d58bf6d469d2 100644 (file)
@@ -1,5 +1,7 @@
 #include "roles.qh"
 
+#include <server/defs.qh>
+#include <server/miscfunctions.qh>
 #include "havocbot.qh"
 
 #include "../cvars.qh"
 .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;
+       }
+};
+
+bool havocbot_goalrating_item_can_be_left_to_teammate(entity this, entity player, entity item)
+{
+       if (item.health && player.health <= this.health) {return true;}
+       if (item.armorvalue && player.armorvalue <= this.armorvalue) {return true;}
+       if (item.weapons && !(player.weapons & item.weapons)) {return true;}
+       if (item.ammo_shells && player.ammo_shells <= this.ammo_shells) {return true;}
+       if (item.ammo_nails && player.ammo_nails <= this.ammo_nails) {return true;}
+       if (item.ammo_rockets && player.ammo_rockets <= this.ammo_rockets) {return true;}
+       if (item.ammo_cells && player.ammo_cells <= this.ammo_cells) {return true;}
+       if (item.ammo_plasma && player.ammo_plasma <= this.ammo_plasma) {return true;}
+
+       return false;
+};
+
+bool havocbot_goalrating_item_pickable_check_players(entity this, vector org, entity item, vector item_org)
+{
+       if(!teamplay)
+               return true;
+
+       float friend_distance = FLOAT_MAX;
+       float enemy_distance = FLOAT_MAX;
+
+       FOREACH_CLIENT(IS_PLAYER(it) && it != this && !IS_DEAD(it),
+       {
+               if (it.team == this.team)
+               {
+                       if (!IS_REAL_CLIENT(it))
+                               continue;
+
+                       if(vdist(it.origin - item_org, >, friend_distance))
+                               continue;
+
+                       if(havocbot_goalrating_item_can_be_left_to_teammate(this, it, item))
+                       {
+                               friend_distance = vlen(it.origin - item_org);
+                               continue;
+                       }
+               }
+               else
+               {
+                       // If enemy only track distances
+                       // TODO: track only if visible ?
+                       if(vdist(it.origin - item_org, <, enemy_distance))
+                               enemy_distance = vlen(it.origin - item_org);
+               }
+       });
+
+       // Rate the item only if no one needs it, or if an enemy is closer to it
+       if ((enemy_distance < friend_distance && vdist(item_org - org, <, enemy_distance)) ||
+               (friend_distance > autocvar_bot_ai_friends_aware_pickup_radius))
+               return true;
+       return false;
+};
+
 void havocbot_goalrating_items(entity this, float ratingscale, vector org, float sradius)
 {
-       float rating, d, discard, friend_distance, enemy_distance;
+       float rating;
        vector o;
        ratingscale = ratingscale * 0.0001; // items are rated around 10000 already
 
        IL_EACH(g_items, it.bot_pickup,
        {
-               rating = 0;
-
                if(!it.solid)
                {
+                       if(!autocvar_bot_ai_timeitems)
+                               continue;
                        if(!it.scheduledrespawntime)
                                continue;
-                       if(it.respawntime < 30 || (it.respawntimejitter && !it.itemdef.instanceOfPowerup))
+                       if(it.respawntime < max(11, autocvar_bot_ai_timeitems_minrespawndelay))
+                               continue;
+                       if(it.respawntimejitter && !it.itemdef.instanceOfPowerup)
                                continue;
 
                        float t = 0;
@@ -38,6 +125,8 @@ void havocbot_goalrating_items(entity this, float ratingscale, vector org, float
 
                        if(time < it.scheduledrespawntime - t)
                                continue;
+
+                       it.bot_pickup_respawning = true;
                }
                o = (it.absmin + it.absmax) * 0.5;
                if(vdist(o - org, >, sradius) || (it == this.ignoregoal && time < this.ignoregoaltime) )
@@ -46,11 +135,13 @@ void havocbot_goalrating_items(entity this, float ratingscale, vector org, float
                // Check if the item can be picked up safely
                if(it.classname == "droppedweapon")
                {
+                       if(!IS_ONGROUND(it))
+                               continue;
                        traceline(o, o + '0 0 -1500', true, NULL);
 
-                       d = pointcontents(trace_endpos + '0 0 1');
-                       if(d == CONTENT_WATER || d == CONTENT_SLIME || d == CONTENT_LAVA)
+                       if(IN_LAVA(trace_endpos + '0 0 1'))
                                continue;
+
                        // this tracebox_hits_trigger_hurt call isn't needed:
                        // dropped weapons are removed as soon as they fall on a trigger_hurt
                        // and can't be rated while they are in the air
@@ -59,62 +150,14 @@ void havocbot_goalrating_items(entity this, float ratingscale, vector org, float
                }
                else
                {
-                       // Ignore items under water
-                       traceline(it.origin + it.maxs, it.origin + it.maxs, MOVE_NORMAL, it);
-                       if(trace_dpstartcontents & DPCONTENTS_LIQUIDSMASK)
+                       if(IN_LAVA(it.origin + (it.mins + it.maxs) * 0.5))
                                continue;
                }
 
-               if(teamplay)
-               {
-                       friend_distance = 10000; enemy_distance = 10000;
-                       discard = false;
-
-                       entity picker = it;
-                       FOREACH_CLIENT(IS_PLAYER(it) && it != this && !IS_DEAD(it),
-                       {
-                               d = vlen(it.origin - o); // distance between player and item
-
-                               if ( it.team == this.team )
-                               {
-                                       if ( !IS_REAL_CLIENT(it) || discard )
-                                               continue;
-
-                                       if( d > friend_distance)
-                                               continue;
-
-                                       friend_distance = d;
-                                       discard = true;
-
-                                       if (picker.health && it.health > this.health) continue;
-                                       if (picker.armorvalue && it.armorvalue > this.armorvalue) continue;
-
-                                       if (picker.weapons && (picker.weapons & ~it.weapons)) continue;
-
-                                       if (picker.ammo_shells && it.ammo_shells > this.ammo_shells) continue;
-                                       if (picker.ammo_nails && it.ammo_nails > this.ammo_nails) continue;
-                                       if (picker.ammo_rockets && it.ammo_rockets > this.ammo_rockets) continue;
-                                       if (picker.ammo_cells && it.ammo_cells > this.ammo_cells) continue;
-                                       if (picker.ammo_plasma && it.ammo_plasma > this.ammo_plasma) continue;
-
-                                       discard = false;
-                               }
-                               else
-                               {
-                                       // If enemy only track distances
-                                       // TODO: track only if visible ?
-                                       if( d < enemy_distance )
-                                               enemy_distance = d;
-                               }
-                       });
-
-                       // Rate the item only if no one needs it, or if an enemy is closer to it
-                       if ( (enemy_distance < friend_distance && vdist(o - org, <, enemy_distance)) ||
-                               (friend_distance > autocvar_bot_ai_friends_aware_pickup_radius ) || !discard )
-                               rating = it.bot_pickupevalfunc(this, it);
-               }
-               else
-                       rating = it.bot_pickupevalfunc(this, it);
+               if(!havocbot_goalrating_item_pickable_check_players(this, org, it, o))
+                       continue;
+               
+               rating = it.bot_pickupevalfunc(this, it);
 
                if(rating > 0)
                        navigation_routerating(this, it, rating * ratingscale, 2000);
@@ -133,9 +176,8 @@ void havocbot_goalrating_enemyplayers(entity this, float ratingscale, vector org
 
        ratingscale = ratingscale * 0.00005; // enemies are rated around 20000 already
 
-       int t;
-
-       FOREACH_CLIENT(IS_PLAYER(it) && bot_shouldattack(this, it), LAMBDA(
+       float t;
+       FOREACH_CLIENT(IS_PLAYER(it) && bot_shouldattack(this, it), {
                // TODO: Merge this logic with the bot_shouldattack function
                if(vdist(it.origin - org, <, 100) || vdist(it.origin - org, >, sradius))
                        continue;
@@ -147,37 +189,20 @@ void havocbot_goalrating_enemyplayers(entity this, float ratingscale, vector org
                        continue;
                */
 
-               if((it.flags & FL_INWATER) || (it.flags & FL_PARTIALGROUND))
-                       continue;
-
-               // 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)
-                               continue;
-                       if(tracebox_hits_trigger_hurt(it.origin, it.mins, it.maxs, trace_endpos))
-                               continue;
-               }
-
-               // TODO: rate waypoints near the targeted player at that moment, instead of the player itself
-               //               adding a player as a goal seems to be quite dangerous, especially on space maps
-               //               remove hack in navigation_poptouchedgoals() after performing this change
-
                t = ((this.health + this.armorvalue) - (it.health + it.armorvalue)) / 150;
                t = bound(0, 1 + t, 3);
                if (skill > 3)
                {
                        if (time < this.strength_finished - 1) t += 0.5;
                        if (time < it.strength_finished - 1) t -= 0.5;
+                       if (time < this.invincible_finished - 1) t += 0.2;
+                       if (time < it.invincible_finished - 1) t -= 0.4;
                }
                t += max(0, 8 - skill) * 0.05; // less skilled bots attack more mindlessly
                ratingscale *= t;
                if (ratingscale > 0)
                        navigation_routerating(this, it, ratingscale * BOT_RATING_ENEMY, 2000);
-       ));
+       });
 }
 
 // legacy bot role for standard gamemodes
@@ -187,14 +212,15 @@ void havocbot_role_generic(entity this)
        if(IS_DEAD(this))
                return;
 
-       if (this.bot_strategytime < time)
+       if (navigation_goalrating_timeout(this))
        {
-               this.bot_strategytime = time + autocvar_bot_ai_strategyinterval;
                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);
+
+               navigation_goalrating_timeout_set(this);
        }
 }
 
@@ -206,7 +232,7 @@ void havocbot_chooserole_generic(entity this)
 void havocbot_chooserole(entity this)
 {
        LOG_TRACE("choosing a role...");
-       this.bot_strategytime = 0;
+       navigation_goalrating_timeout_force(this);
        if(!MUTATOR_CALLHOOK(HavocBot_ChooseRole, this))
                havocbot_chooserole_generic(this);
 }