Skip to content

Fix targetAttackWeight() selecting targets that can't be hit #4223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 9, 2025
Merged

Fix targetAttackWeight() selecting targets that can't be hit #4223

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/ai.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
#include "projectile.h"
#include "objmem.h"
#include "order.h"
#include "visibility.h"

/* Weights used for target selection code,
* target distance is used as 'common currency'
Expand All @@ -48,6 +49,7 @@
#define WEIGHT_HEALTH_STRUCT (WEIGHT_DIST_TILE * 7)

#define WEIGHT_NOT_VISIBLE_F 10 //We really don't like objects we can't see
#define WEIGHT_NOT_LOS_VISIBLE_F 4

#define WEIGHT_SERVICE_DROIDS (WEIGHT_DIST_TILE_DROID * 5) //We don't want them to be repairing droids or structures while we are after them
#define WEIGHT_WEAPON_DROIDS (WEIGHT_DIST_TILE_DROID * 4) //We prefer to go after anything that has a gun and can hurt us
Expand Down Expand Up @@ -487,6 +489,11 @@ static SDWORD targetAttackWeight(BASE_OBJECT *psTarget, BASE_OBJECT *psAttacker,
return 1;
}

if (bDirect && !lineOfFire(psAttacker, psTarget, weapon_slot, false))
{
attackWeight /= WEIGHT_NOT_LOS_VISIBLE_F; // Prefer objects not obstructed by terrain
}

/* We prefer objects we can see and can attack immediately */
if (!visibleObject((BASE_OBJECT *)psAttacker, psTarget, true))
{
Expand Down
Loading