diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 0a19f9eee7..e890c43bde 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1847,13 +1847,13 @@ public class Blocks implements ContentList{ range = 195f; reloadTime = 90f; firingMoveFract = 0.5f; - shootDuration = 220f; + shootDuration = 230f; powerUse = 17f; shootSound = Sounds.laserbig; loopSound = Sounds.beam; loopSoundVolume = 2f; - shootType = new ContinuousLaserBulletType(70){{ + shootType = new ContinuousLaserBulletType(75){{ length = 200f; hitEffect = Fx.hitMeltdown; hitColor = Pal.meltdownHit; diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index 2d26a96fc5..a68376aac8 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -430,7 +430,7 @@ public class Block extends UnlockableContent{ boolean buffered = cons.buffered; float capacity = cons.capacity; - bars.add("power", entity -> new Bar(() -> buffered ? Core.bundle.format("bar.poweramount", Float.isNaN(entity.power.status * capacity) ? "" : (int)(entity.power.status * capacity)) : + bars.add("power", entity -> new Bar(() -> buffered ? Core.bundle.format("bar.poweramount", Float.isNaN(entity.power.status * capacity) ? "" : UI.formatAmount((int)(entity.power.status * capacity))) : Core.bundle.get("bar.power"), () -> Pal.powerBar, () -> Mathf.zero(cons.requestedPower(entity)) && entity.power.graph.getPowerProduced() + entity.power.graph.getBatteryStored() > 0f ? 1f : entity.power.status)); } diff --git a/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java b/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java index 5e04456ac3..7087c5f008 100644 --- a/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java +++ b/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java @@ -60,6 +60,7 @@ public class PayloadMassDriver extends PayloadBlock{ sync = true; rotate = true; outputsPayload = true; + group = BlockGroup.units; //point2 is relative config(Point2.class, (PayloadDriverBuild tile, Point2 point) -> tile.link = Point2.pack(point.x + tile.tileX(), point.y + tile.tileY()));