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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2021-09-12 20:21:59 -04:00
parent 087cd2c55a ca62deaaa9
commit edbe795aa5
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,7 @@ public class EnergyFieldAbility extends Ability{
public Sound shootSound = Sounds.spark; public Sound shootSound = Sounds.spark;
public float statusDuration = 60f * 6f; public float statusDuration = 60f * 6f;
public float x, y; public float x, y;
public boolean hitBuildings = true; public boolean targetGround = true, targetAir = true, hitBuildings = true, hitUnits = true;
public int maxTargets = 25; public int maxTargets = 25;
public float healPercent = 2.5f; public float healPercent = 2.5f;
@@ -99,13 +99,15 @@ public class EnergyFieldAbility extends Ability{
all.clear(); all.clear();
Units.nearby(null, rx, ry, range, other -> { if(hitUnits){
if(other != unit){ Units.nearby(null, rx, ry, range, other -> {
all.add(other); if(other != unit && (other.isFlying() ? targetAir : targetGround)){
} all.add(other);
}); }
});
}
if(hitBuildings){ if(hitBuildings && targetGround){
Units.nearbyBuildings(rx, ry, range, b -> { Units.nearbyBuildings(rx, ry, range, b -> {
if(b.team != Team.derelict || state.rules.coreCapture){ if(b.team != Team.derelict || state.rules.coreCapture){
all.add(b); all.add(b);

2
servers_v7.json
View File

@@ -37,7 +37,7 @@
}, },
{ {
"name": "io", "name": "io",
"address": ["mindustry.io.community", "mindustry.io.community:1000", "mindustry.io.community:2000", "mindustry.io.community:3000", "mindustry.io.community:4000", "mindustry.io.community:5000"] "address": ["mindustry.io.community", "mindustry.io.community:1000", "mindustry.io.community:2000", "mindustry.io.community:3000", "mindustry.io.community:4000", "labs.io.community"]
}, },
{ {
"name": "Korea", "name": "Korea",