mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-09 20:29:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #5797

Browse Source
This commit is contained in:
Anuken 2021-08-18 11:41:38 -04:00
parent 63795d9df8
commit 356c2cfa80
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/mindustry/entities/abilities/EnergyFieldAbility.java
View File

@ -10,6 +10,7 @@ import arc.util.*;
import mindustry.*; import mindustry.*;
import mindustry.content.*; import mindustry.content.*;
import mindustry.entities.*; import mindustry.entities.*;
import mindustry.game.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.graphics.*; import mindustry.graphics.*;
import mindustry.type.*; import mindustry.type.*;
@ -105,11 +106,15 @@ public class EnergyFieldAbility extends Ability{
}); });
if(hitBuildings){ if(hitBuildings){
Units.nearbyBuildings(rx, ry, range, all::add); Units.nearbyBuildings(rx, ry, range, b -> {
if(b.team != Team.derelict || state.rules.coreCapture){
all.add(b);
}
});
} }
all.sort(h -> h.dst2(rx, ry)); all.sort(h -> h.dst2(rx, ry));
int len = Math.min(all.size, maxTargets); int len = Math.min(all.size, maxTargets);//
for(int i = 0; i < len; i++){ for(int i = 0; i < len; i++){
Healthc other = all.get(i); Healthc other = all.get(i);

4
core/src/mindustry/game/Gamemode.java
View File

@ -5,8 +5,6 @@ import arc.func.*;
import arc.util.*; import arc.util.*;
import mindustry.maps.*; import mindustry.maps.*;
import static mindustry.Vars.*;
/** Defines preset rule sets. */ /** Defines preset rule sets. */
public enum Gamemode{ public enum Gamemode{
survival(rules -> { survival(rules -> {
@ -25,7 +23,7 @@ public enum Gamemode{
rules.waveSpacing = 2f * Time.toMinutes; rules.waveSpacing = 2f * Time.toMinutes;
rules.teams.get(rules.waveTeam).infiniteResources = true; rules.teams.get(rules.waveTeam).infiniteResources = true;
}, map -> map.teams.contains(state.rules.waveTeam.id)), }, map -> map.teams.size > 1),
pvp(rules -> { pvp(rules -> {
rules.pvp = true; rules.pvp = true;
rules.enemyCoreBuildRadius = 600f; rules.enemyCoreBuildRadius = 600f;