markmental/yapb-noob-edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

aim: use more prediction if enemy too close

Browse source 
fix: picking up the weapons or items
This commit is contained in:
jeefo 2023-04-11 23:58:58 +03:00
commit 82c84040bb
No known key found for this signature in database
GPG key ID: 927BCA0779BEA8ED
2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/botlib.cpp
View file

@ -160,11 +160,11 @@ void Bot::avoidGrenades () {
} }
else if (strcmp (model, "hegrenade.mdl") == 0) { else if (strcmp (model, "hegrenade.mdl") == 0) {
if (!game.isNullEntity (m_avoidGrenade)) { if (!game.isNullEntity (m_avoidGrenade)) {
return; continue;
} }
if (game.getTeam (pent->v.owner) == m_team || pent->v.owner == ent ()) { if (game.getTeam (pent->v.owner) == m_team || pent->v.owner == ent ()) {
return; continue;
} }
if (!(pent->v.flags & FL_ONGROUND)) { if (!(pent->v.flags & FL_ONGROUND)) {
@ -329,7 +329,7 @@ void Bot::updatePickups () {
// this function finds Items to collect or use in the near of a bot // this function finds Items to collect or use in the near of a bot
// don't try to pickup anything while on ladder or trying to escape from bomb... // don't try to pickup anything while on ladder or trying to escape from bomb...
if (isOnLadder () || getCurrentTaskId () == Task::EscapeFromBomb || !cv_pickup_best.bool_ () || cv_jasonmode.bool_ () || m_seeEnemyTime + 3.0f < game.time () || !game.isNullEntity (m_enemy) || !bots.hasIntrestingEntities ()) { if ((m_states & Sense::SeeingEnemy) || isOnLadder () || getCurrentTaskId () == Task::EscapeFromBomb || !cv_pickup_best.bool_ () || cv_jasonmode.bool_ () || !bots.hasIntrestingEntities ()) {
m_pickupItem = nullptr; m_pickupItem = nullptr;
m_pickupType = Pickup::None; m_pickupType = Pickup::None;
@ -1531,10 +1531,10 @@ void Bot::updateEmotions () {
} }
if (m_agressionLevel > m_baseAgressionLevel) { if (m_agressionLevel > m_baseAgressionLevel) {
m_agressionLevel -= 0.10f; m_agressionLevel -= 0.05f;
} }
else { else {
m_agressionLevel += 0.10f; m_agressionLevel += 0.05f;
} }
if (m_fearLevel > m_baseFearLevel) { if (m_fearLevel > m_baseFearLevel) {
@ -1599,11 +1599,9 @@ void Bot::overrideConditions () {
} }
// special handling for reloading // special handling for reloading
if (m_reloadState != Reload::None && m_isReloading) { if (m_reloadState != Reload::None && m_isReloading && !isInNarrowPlace ()) {
if (m_seeEnemyTime + 4.0f < game.time () && (m_states & (Sense::SuspectEnemy | Sense::HearingEnemy))) { if (m_seeEnemyTime + 2.5f < game.time () && (m_states & (Sense::SuspectEnemy | Sense::HearingEnemy))) {
m_moveSpeed = 0.0f; m_moveSpeed = m_fearLevel > m_agressionLevel ? 0.0f : getShiftSpeed ();
m_strafeSpeed = 0.0f;
m_navTimeset = game.time (); m_navTimeset = game.time ();
} }
} }

2
src/combat.cpp
View file

@ -487,7 +487,7 @@ Vector Bot::getBodyOffsetError (float distance) {
Vector compensation = nullptr; Vector compensation = nullptr;
if (!usesSniper () && distance > kDoubleSprayDistance) { if (!usesSniper () && distance > kDoubleSprayDistance) {
compensation = (m_enemy->v.velocity - pev->velocity) * m_frameInterval * 2.0f; compensation = (m_enemy->v.velocity - pev->velocity) * m_frameInterval * (distance < kSprayDistance ? 6.0f : 3.0f);
compensation.z = 0.0f; compensation.z = 0.0f;
} }
else { else {