diff --git a/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java b/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java index 233d733a09..e909306086 100644 --- a/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java @@ -60,7 +60,6 @@ public class DebugBlocks extends BlockList implements ContentList{ powerInfinite = new PowerNode("powerinfinite"){ { powerCapacity = 10000f; - powerSpeed = 100f; maxNodes = 100; outputsPower = true; consumesPower = false; diff --git a/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java b/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java index dab1de8033..fb43623e58 100644 --- a/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java @@ -74,15 +74,14 @@ public class PowerBlocks extends BlockList implements ContentList{ powerNode = new PowerNode("power-node"){{ shadow = "shadow-round-1"; - powerSpeed = 0.5f; maxNodes = 4; + laserRange = 6; }}; powerNodeLarge = new PowerNode("power-node-large"){{ size = 2; - powerSpeed = 1.5f; maxNodes = 6; - laserRange = 7.5f; + laserRange = 9.5f; shadow = "shadow-round-2"; }}; diff --git a/core/src/io/anuke/mindustry/entities/Unit.java b/core/src/io/anuke/mindustry/entities/Unit.java index d8a0cbe323..80fe2a4454 100644 --- a/core/src/io/anuke/mindustry/entities/Unit.java +++ b/core/src/io/anuke/mindustry/entities/Unit.java @@ -198,6 +198,11 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ return tile == null ? (Floor) Blocks.air : tile.floor(); } + @Override + public boolean isValid(){ + return !isDead() && isAdded(); + } + /**Updates velocity and status effects.*/ public void updateVelocityStatus(){ Floor floor = getFloorOn(); diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java index 5cb5f77c2d..38e9963441 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java @@ -35,7 +35,6 @@ public class PowerNode extends PowerBlock{ protected Translator t2 = new Translator(); protected float laserRange = 6; - protected float powerSpeed = 0.5f; protected int maxNodes = 3; public PowerNode(String name){ @@ -111,7 +110,6 @@ public class PowerNode extends PowerBlock{ super.setStats(); stats.add(BlockStat.powerRange, laserRange, StatUnit.blocks); - stats.add(BlockStat.powerTransferSpeed, powerSpeed * 60 / 2f, StatUnit.powerSecond); //divided by 2 since passback exists } @Override