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

Further RTS tweaks

Browse Source
This commit is contained in:
Anuken
2022-09-28 21:29:28 -04:00
parent 7557a57266
commit e9df883e10
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/mindustry/ai/RtsAI.java
View File

@@ -130,6 +130,8 @@ public class RtsAI{
} }
boolean handleSquad(Seq<Unit> units, boolean noDefenders){ boolean handleSquad(Seq<Unit> units, boolean noDefenders){
if(units.isEmpty()) return false;
float health = 0f, dps = 0f; float health = 0f, dps = 0f;
float ax = 0f, ay = 0f; float ax = 0f, ay = 0f;
boolean targetAir = true, targetGround = true; boolean targetAir = true, targetGround = true;
@@ -226,7 +228,7 @@ public class RtsAI{
boolean anyDefend = defendPos != null || defendTarget != null; boolean anyDefend = defendPos != null || defendTarget != null;
var build = anyDefend ? null : findTarget(ax, ay, units.size, dps, health); var build = anyDefend ? null : findTarget(ax, ay, units.size, dps, health, units.first().flag == 0);
if(build != null || anyDefend){ if(build != null || anyDefend){
for(var unit : units){ for(var unit : units){
@@ -246,7 +248,7 @@ public class RtsAI{
return anyDefend; return anyDefend;
} }
@Nullable Building findTarget(float x, float y, int total, float dps, float health){ @Nullable Building findTarget(float x, float y, int total, float dps, float health, boolean checkWeight){
if(total < data.team.rules().rtsMinSquad) return null; if(total < data.team.rules().rtsMinSquad) return null;
//flag priority? //flag priority?
@@ -281,7 +283,7 @@ public class RtsAI{
); );
float weight = weights.get(result, 0f); float weight = weights.get(result, 0f);
if(weight < data.team.rules().rtsMinWeight && total < Units.getCap(data.team)){ if(checkWeight && weight < data.team.rules().rtsMinWeight && total < Units.getCap(data.team)){
return null; return null;
} }