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

Fixed commanded units attacking invalid targets

Browse Source
This commit is contained in:
Anuken
2023-09-18 23:18:55 -04:00
parent 844894f584
commit 66ad4e1798
4 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/mindustry/input/DesktopInput.java
View File

@@ -387,8 +387,19 @@ public class DesktopInput extends InputHandler{
cursorType = ui.drillCursor;
}
if(commandMode && selectedUnits.any() && ((cursor.build != null && !cursor.build.inFogTo(player.team()) && cursor.build.team != player.team()) || (selectedEnemyUnit(input.mouseWorldX(), input.mouseWorldY()) != null))){
cursorType = ui.targetCursor;
if(commandMode && selectedUnits.any()){
boolean canAttack = (cursor.build != null && !cursor.build.inFogTo(player.team()) && cursor.build.team != player.team());
if(!canAttack){
var unit = selectedEnemyUnit(input.mouseWorldX(), input.mouseWorldY());
if(unit != null){
canAttack = selectedUnits.contains(u -> u.canTarget(unit));
}
}
if(canAttack){
cursorType = ui.targetCursor;
}
}
if(getPlan(cursor.x, cursor.y) != null && mode == none){

10
core/src/mindustry/input/InputHandler.java
View File

@@ -225,6 +225,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
}
Teamc teamTarget = buildTarget == null ? unitTarget : buildTarget;
boolean anyCommandedTarget = false;
for(int id : unitIds){
Unit unit = Groups.unit.getByID(id);
@@ -235,12 +236,15 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
ai.command(UnitCommand.moveCommand);
}
if(teamTarget != null && teamTarget.team() != player.team()){
ai.commandTarget(teamTarget);
if(teamTarget != null && teamTarget.team() != player.team() &&
!(teamTarget instanceof Unit u && !unit.canTarget(u)) && !(teamTarget instanceof Building && !unit.type.targetGround)){
anyCommandedTarget = true;
ai.commandTarget(teamTarget);
}else if(posTarget != null){
ai.commandPosition(posTarget);
}
unit.lastCommanded = player.coloredName();
//remove when other player command
@@ -251,7 +255,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
}
if(unitIds.length > 0 && player == Vars.player && !state.isPaused()){
if(teamTarget != null){
if(anyCommandedTarget){
Fx.attackCommand.at(teamTarget);
}else{
Fx.moveCommand.at(posTarget);