X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Fdefault%2Fhavocbot%2Fhavocbot.qc;h=a8e10194ef96debb1107ce0e37aba05ae84fc00c;hp=f5ba20c8a41b1acbe04a1368748eb8cbede98d30;hb=0ce76eff4ca3109a9353a316fe0276297501bc15;hpb=739f57f209edf456d1f2b3418eeb48545eb5b267 diff --git a/qcsrc/server/bot/default/havocbot/havocbot.qc b/qcsrc/server/bot/default/havocbot/havocbot.qc index f5ba20c8a..a8e10194e 100644 --- a/qcsrc/server/bot/default/havocbot/havocbot.qc +++ b/qcsrc/server/bot/default/havocbot/havocbot.qc @@ -31,6 +31,8 @@ void havocbot_ai(entity this) if(this.draggedby) return; + this.bot_aimdir_executed = false; + if(bot_execute_commands(this)) return; @@ -106,8 +108,6 @@ void havocbot_ai(entity this) havocbot_aim(this); lag_update(this); - this.bot_aimdir_executed = false; - if (this.bot_aimtarg) { this.aistatus |= AI_STATUS_ATTACKING; @@ -137,7 +137,7 @@ void havocbot_ai(entity this) else { if(IS_PLAYER(this.bot_aimtarg)) - bot_aimdir(this, this.bot_aimtarg.origin + this.bot_aimtarg.view_ofs - this.origin - this.view_ofs , -1); + bot_aimdir(this, this.bot_aimtarg.origin + this.bot_aimtarg.view_ofs - this.origin - this.view_ofs, 0); } } else if (this.goalcurrent) @@ -153,7 +153,7 @@ void havocbot_ai(entity this) vector dir = get_closer_dest(this.goalcurrent, this.origin); dir -= this.origin + this.view_ofs; dir.z = 0; - bot_aimdir(this, dir, -1); + bot_aimdir(this, dir, 0); } // if the bot is not attacking, consider reloading weapons @@ -779,7 +779,9 @@ void havocbot_movetogoal(entity this) { if (vdist(this.origin - this.goalcurrent_prev.origin, <, 50) && navigation_goalrating_timeout_can_be_anticipated(this)) + { navigation_goalrating_timeout_force(this); + } } bool goalcurrent_can_be_removed = false; @@ -792,8 +794,26 @@ void havocbot_movetogoal(entity this) // don't remove if not visible if (checkpvs(this.origin + this.view_ofs, this.goalcurrent)) { - navigation_goalrating_timeout_force(this); - return; + if (IS_DEAD(this.goalcurrent)) + { + IL_EACH(g_items, it.enemy == this.goalcurrent && Item_IsLoot(it), + { + if (vdist(it.origin - this.goalcurrent.death_origin, <, 50)) + { + navigation_clearroute(this); + navigation_pushroute(this, it); + // loot can't be immediately rated since it isn't on ground yet + // it will be rated after a second when on ground, meanwhile head to it + navigation_goalrating_timeout_expire(this, 1); + return; + } + }); + } + if (!Item_IsLoot(this.goalcurrent)) + { + navigation_goalrating_timeout_force(this); + return; + } } } else if (!(STAT(FROZEN, this.goalentity)) && this.bot_tracewalk_time < time) @@ -879,7 +899,8 @@ void havocbot_movetogoal(entity this) diff = destorg - this.origin; - if (this.goalcurrent == this.goalentity && time < this.goalentity_lock_timeout && vdist(diff, <, 10)) + if (time < this.bot_stop_moving_timeout + || (this.goalcurrent == this.goalentity && time < this.goalentity_lock_timeout && vdist(diff, <, 10))) { // stop if the locked goal has been reached destorg = this.origin; @@ -926,12 +947,18 @@ void havocbot_movetogoal(entity this) } else { - dir = flatdir; if(this.velocity.z >= 0 && !(this.watertype == CONTENT_WATER && destorg.z < this.origin.z) && (this.aistatus & AI_STATUS_OUT_WATER)) + { PHYS_INPUT_BUTTON_JUMP(this) = true; + dir = flatdir; + } else + { PHYS_INPUT_BUTTON_JUMP(this) = false; + if (destorg.z > this.origin.z) + dir = flatdir; + } } } else @@ -961,8 +988,16 @@ void havocbot_movetogoal(entity this) { if (vlen2(flat_diff) < vlen2(offset)) { - actual_destorg.x = destorg.x; - actual_destorg.y = destorg.y; + if (this.goalcurrent.wpflags & WAYPOINTFLAG_JUMP && this.goalstack01) + { + // oblique warpzones need a jump otherwise bots gets stuck + PHYS_INPUT_BUTTON_JUMP(this) = true; + } + else + { + actual_destorg.x = destorg.x; + actual_destorg.y = destorg.y; + } } } else if (vdist(flat_diff, <, 32) && diff.z < -16) // destination is under the bot @@ -1055,6 +1090,12 @@ void havocbot_movetogoal(entity this) // Check for water/slime/lava and dangerous edges // (only when the bot is on the ground or jumping intentionally) + if (skill + this.bot_moveskill <= 3 && time > this.bot_stop_moving_timeout + && current_speed > maxspeed * 0.9 && fabs(deviation.y) > 70) + { + this.bot_stop_moving_timeout = time + 0.4 + random() * 0.2; + } + offset = (vdist(this.velocity, >, 32) ? this.velocity * 0.2 : v_forward * 32); vector dst_ahead = this.origin + this.view_ofs + offset; vector dst_down = dst_ahead - '0 0 3000'; @@ -1158,13 +1199,11 @@ void havocbot_movetogoal(entity this) } if (ladder_zdir) { - if (vdist(flatdir, <, 15)) - dir = ladder_zdir * '0 0 1'; + if (vdist(vec2(diff), <, 40)) + dir.z = ladder_zdir * 4; else - { - dir.z = ladder_zdir * 1.3; - dir = normalize(dir); - } + dir.z = ladder_zdir * 2; + dir = normalize(dir); } } @@ -1178,8 +1217,14 @@ void havocbot_movetogoal(entity this) dir = normalize(dir); } + // already executed when bot targets an enemy if (!this.bot_aimdir_executed) - bot_aimdir(this, dir, -1); + { + if (time < this.bot_stop_moving_timeout) + bot_aimdir(this, normalize(this.goalcurrent.origin - this.origin), 0); + else + bot_aimdir(this, dir, 0); + } if (!ladder_zdir) { @@ -1187,6 +1232,7 @@ void havocbot_movetogoal(entity this) dir = normalize(dir + dodge); } + makevectors(this.v_angle); //dir = this.bot_dodgevector; //if (this.bot_dodgevector_jumpbutton) // PHYS_INPUT_BUTTON_JUMP(this) = true; @@ -1402,7 +1448,7 @@ void havocbot_chooseweapon(entity this, .entity weaponentity) // Should it do a weapon combo? float af, ct, combo_time, combo; - af = ATTACK_FINISHED(this, 0); + af = ATTACK_FINISHED(this, weaponentity); ct = autocvar_bot_ai_weapon_combo_threshold; // Bots with no skill will be 4 times more slower than "godlike" bots when doing weapon combos @@ -1550,14 +1596,14 @@ float havocbot_moveto(entity this, vector pos) vector dir = get_closer_dest(this.goalcurrent, this.origin); dir -= this.origin + this.view_ofs; dir.z = 0; - bot_aimdir(this, dir, -1); + bot_aimdir(this, dir, 0); } if(this.aistatus & AI_STATUS_WAYPOINT_PERSONAL_REACHED) { // Step 5: Waypoint reached LOG_TRACE(this.netname, "'s personal waypoint reached"); - delete(this.havocbot_personal_waypoint); + waypoint_remove(this.havocbot_personal_waypoint); this.aistatus &= ~AI_STATUS_WAYPOINT_PERSONAL_REACHED; return CMD_STATUS_FINISHED; }