X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Fdefault%2Fhavocbot%2Froles.qc;h=2aa11b52ca45c3df0e2df3e0c807f1be346c1f01;hb=0076d3f631e54b908b7506883c75c6d28f6b9505;hp=5ddb0f74b576ab0bcd8107dad86e1af96a5f6a27;hpb=3ee342eac91e8a0cc50f5e7517bb4c4d640a4774;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/bot/default/havocbot/roles.qc b/qcsrc/server/bot/default/havocbot/roles.qc index 5ddb0f74b..2aa11b52c 100644 --- a/qcsrc/server/bot/default/havocbot/roles.qc +++ b/qcsrc/server/bot/default/havocbot/roles.qc @@ -1,5 +1,9 @@ #include "roles.qh" +#include +#include +#include +#include #include "havocbot.qh" #include "../cvars.qh" @@ -7,6 +11,8 @@ #include "../bot.qh" #include "../navigation.qh" +.float bot_ratingscale; +.float bot_ratingscale_time; .float max_armorvalue; .float havocbot_role_timeout; @@ -42,21 +48,91 @@ void havocbot_goalrating_waypoints(entity this, float ratingscale, vector org, f } }; +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 (STAT(WEAPONS, item) && !(STAT(WEAPONS, player) & STAT(WEAPONS, item))) {return true;} + if (item.ammo_shells && GetResourceAmount(player, RESOURCE_SHELLS) <= GetResourceAmount(this, RESOURCE_SHELLS)) {return true;} + if (item.ammo_nails && GetResourceAmount(player, RESOURCE_BULLETS) <= GetResourceAmount(this, RESOURCE_BULLETS)) {return true;} + if (item.ammo_rockets && GetResourceAmount(player, RESOURCE_ROCKETS) <= GetResourceAmount(this, RESOURCE_ROCKETS)) {return true;} + if (item.ammo_cells && GetResourceAmount(player, RESOURCE_CELLS) <= GetResourceAmount(this, RESOURCE_CELLS)) {return true;} + if (item.ammo_plasma && GetResourceAmount(player, RESOURCE_PLASMA) <= GetResourceAmount(this, RESOURCE_PLASMA)) {return true;} + if (item.itemdef.instanceOfPowerup) {return true;} + + return false; +}; + +bool havocbot_goalrating_item_pickable_check_players(entity this, vector org, entity item, vector item_org) +{ + if(!teamplay) + return true; + + // actually these variables hold the squared distances in order to optimize code + float friend_distance = FLOAT_MAX; + float enemy_distance = FLOAT_MAX; + float dist; + + FOREACH_CLIENT(IS_PLAYER(it) && it != this && !IS_DEAD(it), + { + if (it.team == this.team) + { + if (!IS_REAL_CLIENT(it)) + continue; + + dist = vlen2(it.origin - item_org); + if(dist > friend_distance) + continue; + + if(havocbot_goalrating_item_can_be_left_to_teammate(this, it, item)) + { + friend_distance = dist; + continue; + } + } + else + { + // If enemy only track distances + // TODO: track only if visible ? + dist = vlen2(it.origin - item_org); + if(dist < enemy_distance) + enemy_distance = dist; + } + }); + + // Rate the item only if no one needs it, or if an enemy is closer to it + dist = vlen2(item_org - org); + if ((enemy_distance < friend_distance && dist < enemy_distance) || + (friend_distance > autocvar_bot_ai_friends_aware_pickup_radius ** 2) || + (dist < friend_distance && dist < 200 ** 2)) + 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; + // ignore if bot already rated this item with a higher ratingscale + // NOTE: this code assumes each bot rates items in a different frame + if(it.bot_ratingscale_time == time && ratingscale < it.bot_ratingscale) + continue; + it.bot_ratingscale_time = time; + it.bot_ratingscale = ratingscale; 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; @@ -75,13 +151,15 @@ void havocbot_goalrating_items(entity this, float ratingscale, vector org, float continue; // Check if the item can be picked up safely - if(it.classname == "droppedweapon") + if(Item_IsLoot(it)) { + 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 @@ -90,63 +168,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); }); @@ -165,10 +194,12 @@ void havocbot_goalrating_enemyplayers(entity this, float ratingscale, vector org ratingscale = ratingscale * 0.00005; // enemies are rated around 20000 already float t; - FOREACH_CLIENT(IS_PLAYER(it) && bot_shouldattack(this, it), LAMBDA( + 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; + if(vdist(vec2(it.velocity), >, autocvar_sv_maxspeed * 2)) + continue; // rate only visible enemies /* @@ -183,12 +214,14 @@ void havocbot_goalrating_enemyplayers(entity this, float ratingscale, vector org { 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 @@ -198,17 +231,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(this, 1, this.origin, 3000); navigation_goalrating_end(this); - if(IS_PLAYER(this.goalentity)) - this.bot_strategytime = time + min(2, autocvar_bot_ai_strategyinterval); + navigation_goalrating_timeout_set(this); } } @@ -220,7 +251,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); }