eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix AI behaviour for Snipe distance preference

This commit is contained in:
Alexander Batalov 2022-08-31 22:02:08 +03:00
parent 56d35bef0d
commit 2a17a07784
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/combat_ai.cc
View File

@ -2827,9 +2827,22 @@ int _cai_perform_distance_prefs(Object* a1, Object* a2)
break; break;
case DISTANCE_SNIPE: case DISTANCE_SNIPE:
if (a2 != NULL) { if (a2 != NULL) {
if (objectGetDistanceBetween(a1, a2) < 10) { // SFALL: Fix AI behavior for "Snipe" distance preference.
// NOTE: some odd code omitted int distance = objectGetDistanceBetween(a1, a2);
_ai_move_away(a1, a2, 10); if (distance < 10) {
int attackCost = weaponGetActionPointCost(a1, HIT_MODE_RIGHT_WEAPON_PRIMARY, false);
int movementPoints = a1->data.critter.combat.ap - attackCost;
if (movementPoints > 0) {
if (movementPoints + distance - 1 < 5) {
int attackerRating = _combatai_rating(a1);
int defenderRating = _combatai_rating(a2);
if (attackerRating < defenderRating) {
_ai_move_away(a1, a2, 10);
}
}
} else {
_ai_move_away(a1, a2, 10);
}
} }
} }
break; break;