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

Patrol + pursue target stances

Browse Source
This commit is contained in:
Anuken
2023-09-20 22:45:45 -04:00
parent fccf6847c1
commit 9d9d5d2e18
7 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/ai/UnitStance.java
View File

@@ -13,7 +13,9 @@ public class UnitStance{
stopStance = new UnitStance("stop", "cancel"), //not a real stance, cannot be selected, just cancels ordewrs
shootStance = new UnitStance("shoot", "commandAttack"),
holdFireStance = new UnitStance("holdfire", "none");
holdFireStance = new UnitStance("holdfire", "none"),
pursueTarget = new UnitStance("pursuetarget", "right"),
patrol = new UnitStance("patrol", "refresh");
/** Unique ID number. */
public final int id;

13
core/src/mindustry/ai/types/CommandAI.java
View File

@@ -67,6 +67,10 @@ public class CommandAI extends AIController{
//this should not be possible
if(stance == UnitStance.stopStance) stance = UnitStance.shootStance;
if(stance == UnitStance.pursueTarget && target != null && attackTarget == null && targetPos == null){
commandTarget(target, false);
}
//remove invalid targets
if(commandQueue.any()){
commandQueue.removeAll(e -> e instanceof Healthc h && !h.isValid());
@@ -194,11 +198,13 @@ public class CommandAI extends AIController{
target = attackTarget;
circleAttack(80f);
}else{
boolean isFinalPoint = targetPos.epsilonEquals(vecOut, 4.1f) && commandQueue.size == 0;
moveTo(vecOut,
attackTarget != null && unit.within(attackTarget, engageRange) ? engageRange :
unit.isGrounded() ? 0f :
attackTarget != null ? engageRange :
0f, unit.isFlying() ? 40f : 100f, false, null, targetPos.epsilonEquals(vecOut, 4.1f));
0f, unit.isFlying() ? 40f : 100f, false, null, isFinalPoint);
}
}
@@ -243,6 +249,7 @@ public class CommandAI extends AIController{
}
void finishPath(){
Vec2 prev = targetPos;
targetPos = null;
if(commandQueue.size > 0){
var next = commandQueue.remove(0);
@@ -251,6 +258,10 @@ public class CommandAI extends AIController{
}else if(next instanceof Vec2 position){
commandPosition(position);
}
if(prev != null && stance == UnitStance.patrol){
commandQueue.add(prev.cpy());
}
}
}