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

#5729

Browse Source
This commit is contained in:
Anuken
2021-08-10 10:16:15 -04:00
parent 9c1063c7cc
commit be38bba0e4
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/content/Blocks.java
View File

@@ -1847,13 +1847,13 @@ public class Blocks implements ContentList{
range = 195f; range = 195f;
reloadTime = 90f; reloadTime = 90f;
firingMoveFract = 0.5f; firingMoveFract = 0.5f;
shootDuration = 220f; shootDuration = 230f;
powerUse = 17f; powerUse = 17f;
shootSound = Sounds.laserbig; shootSound = Sounds.laserbig;
loopSound = Sounds.beam; loopSound = Sounds.beam;
loopSoundVolume = 2f; loopSoundVolume = 2f;
shootType = new ContinuousLaserBulletType(70){{ shootType = new ContinuousLaserBulletType(75){{
length = 200f; length = 200f;
hitEffect = Fx.hitMeltdown; hitEffect = Fx.hitMeltdown;
hitColor = Pal.meltdownHit; hitColor = Pal.meltdownHit;

2
core/src/mindustry/world/Block.java
View File

@@ -430,7 +430,7 @@ public class Block extends UnlockableContent{
boolean buffered = cons.buffered; boolean buffered = cons.buffered;
float capacity = cons.capacity; float capacity = cons.capacity;
bars.add("power", entity -> new Bar(() -> buffered ? Core.bundle.format("bar.poweramount", Float.isNaN(entity.power.status * capacity) ? "<ERROR>" : (int)(entity.power.status * capacity)) : bars.add("power", entity -> new Bar(() -> buffered ? Core.bundle.format("bar.poweramount", Float.isNaN(entity.power.status * capacity) ? "<ERROR>" : 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)); 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));
} }

1
core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java
View File

@@ -60,6 +60,7 @@ public class PayloadMassDriver extends PayloadBlock{
sync = true; sync = true;
rotate = true; rotate = true;
outputsPayload = true; outputsPayload = true;
group = BlockGroup.units;
//point2 is relative //point2 is relative
config(Point2.class, (PayloadDriverBuild tile, Point2 point) -> tile.link = Point2.pack(point.x + tile.tileX(), point.y + tile.tileY())); config(Point2.class, (PayloadDriverBuild tile, Point2 point) -> tile.link = Point2.pack(point.x + tile.tileX(), point.y + tile.tileY()));