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

Merge branch 'master' of https://github.com/Anuken/Mindustry into map_4

Browse Source
This commit is contained in:
Anuken
2022-09-29 17:13:49 -04:00
parent 45ac8a1bca 4f9fe2a36f
commit df6ff248a4
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,7 +113,7 @@ public class RtsAI{
squad.truncate(data.team.rules().rtsMaxSquad); squad.truncate(data.team.rules().rtsMaxSquad);
//remove overlapping squads //remove overlapping squads
squad.removeAll(u -> (u != unit && used.contains(u.id)) || !u.isCommandable() || u.command().hasCommand()); squad.removeAll(u -> (u != unit && used.contains(u.id)) || !u.isCommandable() || u.command().hasCommand() || ((u.flag == 0) != (unit.flag == 0)));
//mark used so other squads can't steal them //mark used so other squads can't steal them
for(var item : squad){ for(var item : squad){
used.add(item.id); used.add(item.id);
@@ -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;
@@ -174,7 +176,7 @@ public class RtsAI{
//defend when close, or this is the only squad defending //defend when close, or this is the only squad defending
//TODO will always rush to defense no matter what //TODO will always rush to defense no matter what
if(best != null && (best instanceof CoreBuild || units.size >= data.team.rules().rtsMinSquad || best.within(ax, ay, 500f))){ if(best != null && (best instanceof CoreBuild || (units.size >= data.team.rules().rtsMinSquad || (units.size > 0 && units.first().flag != 0)) || best.within(ax, ay, 500f))){
defend = best; defend = best;
if(debug){ if(debug){
@@ -194,7 +196,9 @@ public class RtsAI{
//TODO could be made faster by storing bullet shooter //TODO could be made faster by storing bullet shooter
Unit aggressor = Units.closestEnemy(data.team, defend.x, defend.y, checkRange, u -> u.checkTarget(tair, tground)); Unit aggressor = Units.closestEnemy(data.team, defend.x, defend.y, checkRange, u -> u.checkTarget(tair, tground));
if(aggressor != null){ if(aggressor != null){
defendTarget = aggressor; //do not target it directly - target the position?
//defendTarget = aggressor;
defendPos = new Vec2(aggressor.x, aggressor.y);
}else if(false){ //TODO currently ignored, no use defending against nothing }else if(false){ //TODO currently ignored, no use defending against nothing
//should it even go there if there's no aggressor found? //should it even go there if there's no aggressor found?
Tile closest = defend.findClosestEdge(units.first(), Tile::solid); Tile closest = defend.findClosestEdge(units.first(), Tile::solid);
@@ -224,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){
@@ -235,6 +239,9 @@ public class RtsAI{
//TODO stopAtTarget parameter could be false, could be tweaked //TODO stopAtTarget parameter could be false, could be tweaked
unit.command().commandTarget(defendTarget == null ? build : defendTarget, defendTarget != null); unit.command().commandTarget(defendTarget == null ? build : defendTarget, defendTarget != null);
} }
//assign a flag, so it will be "mobilized" more easily later
unit.flag = 1;
} }
} }
} }
@@ -242,7 +249,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?
@@ -277,7 +284,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;
} }

2
core/src/mindustry/type/CellLiquid.java
View File

@@ -19,7 +19,7 @@ public class CellLiquid extends Liquid{
public int cells = 8; public int cells = 8;
public @Nullable Liquid spreadTarget; public @Nullable Liquid spreadTarget;
public float maxSpread = 0.75f, spreadConversion = 1f, spreadDamage = 0.1f, removeScaling = 0.25f; public float maxSpread = 0.75f, spreadConversion = 1.2f, spreadDamage = 0.11f, removeScaling = 0.25f;
public CellLiquid(String name, Color color){ public CellLiquid(String name, Color color){
super(name, color); super(name, color);