diff --git a/core/src/mindustry/ai/types/CargoAI.java b/core/src/mindustry/ai/types/CargoAI.java index 49b6d8f419..bc5aca07f6 100644 --- a/core/src/mindustry/ai/types/CargoAI.java +++ b/core/src/mindustry/ai/types/CargoAI.java @@ -179,6 +179,7 @@ public class CargoAI extends AIController{ } } + //unused, might change later void sortTargets(Seq targets){ //find sort by "most desirable" first targets.sort(Structs.comps(Structs.comparingInt(b -> b.items.total()), Structs.comparingFloat(b -> b.dst2(unit)))); diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 83c01006ae..8f5656e23e 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -2112,7 +2112,7 @@ public class UnitTypes{ buildSpeed = 3f; - abilities.add(new EnergyFieldAbility(35f, 65f, 180f){{ + abilities.add(new EnergyFieldAbility(40f, 65f, 180f){{ statusDuration = 60f * 6f; maxTargets = 25; }}); @@ -2129,7 +2129,7 @@ public class UnitTypes{ shootEffect = Fx.sparkShoot; hitEffect = Fx.pointHit; maxRange = 180f; - damage = 24f; + damage = 25f; }}; }}); } diff --git a/core/src/mindustry/entities/abilities/EnergyFieldAbility.java b/core/src/mindustry/entities/abilities/EnergyFieldAbility.java index e4b24b15f4..b60fd42cff 100644 --- a/core/src/mindustry/entities/abilities/EnergyFieldAbility.java +++ b/core/src/mindustry/entities/abilities/EnergyFieldAbility.java @@ -28,7 +28,7 @@ public class EnergyFieldAbility extends Ability{ public float x, y; public boolean targetGround = true, targetAir = true, hitBuildings = true, hitUnits = true; public int maxTargets = 25; - public float healPercent = 2.5f; + public float healPercent = 3f; public float layer = Layer.bullet - 0.001f, blinkScl = 20f, blinkSize = 0.1f; public float effectRadius = 5f, sectorRad = 0.14f, rotateSpeed = 0.5f; diff --git a/core/src/mindustry/world/meta/StatValues.java b/core/src/mindustry/world/meta/StatValues.java index 39b99a1c6f..69139a08ce 100644 --- a/core/src/mindustry/world/meta/StatValues.java +++ b/core/src/mindustry/world/meta/StatValues.java @@ -143,7 +143,7 @@ public class StatValues{ if(state.isGame()){ var blocks = Vars.content.blocks() .select(block -> (!checkFloors || block instanceof Floor) && indexer.isBlockPresent(block) && block.attributes.get(attr) != 0 && !((block instanceof Floor f && f.isDeep()) && !floating)) - .as().with(s -> s.sort(f -> f.attributes.get(attr))); + .with(s -> s.sort(f -> f.attributes.get(attr))); if(blocks.any()){ int i = 0;