Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix turret shooting priority when there are multiple teams (#5299)

Browse Source
This commit is contained in:
notrealn
2021-07-20 09:00:19 -04:00
committed by GitHub
parent c18ab184b7
commit 730cb14f6a
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/mindustry/ai/BlockIndexer.java
View File

@@ -300,19 +300,30 @@ public class BlockIndexer{
breturnArray.size = 0; breturnArray.size = 0;
} }
public Building findEnemyTile(@Nullable Team team, float x, float y, float range, Boolf<Building> pred){ public Building findEnemyTile(Team team, float x, float y, float range, Boolf<Building> pred){
Building target = null;
float targetDist = 0;
for(int i = 0; i < activeTeams.size; i++){ for(int i = 0; i < activeTeams.size; i++){
Team enemy = activeTeams.items[i]; Team enemy = activeTeams.items[i];
if(enemy == team || (team == Team.derelict && !state.rules.coreCapture)) continue; if(enemy == team || (team == Team.derelict && !state.rules.coreCapture)) continue;
Building entity = indexer.findTile(enemy, x, y, range, pred, true); Building candidate = indexer.findTile(enemy, x, y, range, pred, true);
if(entity != null){ if(candidate == null) continue;
return entity;
//if a block has the same priority, the closer one should be targeted
float dist = candidate.dst(x, y) - candidate.hitSize() / 2f;
if(target == null ||
//if its closer and is at least equal priority
(dist < targetDist && candidate.block.priority.ordinal() >= target.block.priority.ordinal()) ||
// block has higher priority (so range doesnt matter)
(candidate.block.priority.ordinal() > target.block.priority.ordinal())){
target = candidate;
targetDist = dist;
} }
} }
return null; return target;
} }
public Building findTile(Team team, float x, float y, float range, Boolf<Building> pred){ public Building findTile(Team team, float x, float y, float range, Boolf<Building> pred){

2
core/src/mindustry/entities/Units.java
View File

@@ -184,7 +184,7 @@ public class Units{
} }
} }
/** Returns the closest target enemy. First, units are checked, then tile entities. */ /** Returns the closest target enemy. First, units are checked, then buildings. */
public static Teamc bestTarget(Team team, float x, float y, float range, Boolf<Unit> unitPred, Boolf<Building> tilePred, Sortf sort){ public static Teamc bestTarget(Team team, float x, float y, float range, Boolf<Unit> unitPred, Boolf<Building> tilePred, Sortf sort){
if(team == Team.derelict) return null; if(team == Team.derelict) return null;