diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index 6470788eb1..d95fa55176 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -862,6 +862,7 @@ public class Blocks implements ContentList{ requirements(Category.effect, ItemStack.with(Items.lead, 200, Items.titanium, 150, Items.silicon, 250)); size = 3; consumes.item(Items.phasefabric).boost(); + consumes.power(3f); }}; shockMine = new ShockMine("shock-mine"){{ @@ -1539,7 +1540,7 @@ public class Blocks implements ContentList{ reload = 50f; firingMoveFract = 0.5f; shootDuration = 220f; - powerUse = 8f; + powerUse = 10f; health = 200 * size * size; consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 0.5f)).update(false); diff --git a/core/src/io/anuke/mindustry/entities/type/Player.java b/core/src/io/anuke/mindustry/entities/type/Player.java index 353ebfd538..6a4e40125b 100644 --- a/core/src/io/anuke/mindustry/entities/type/Player.java +++ b/core/src/io/anuke/mindustry/entities/type/Player.java @@ -492,6 +492,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{ @Override public void update(){ hitTime -= Time.delta(); + textFadeTime -= Time.delta() / (60 * 5); if(Float.isNaN(x) || Float.isNaN(y)){ velocity.set(0f, 0f); diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java index 77d8c5207f..6b9e611893 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java @@ -127,7 +127,6 @@ public class ForceProjector extends Block{ } }else{ entity.warmup = Mathf.lerpDelta(entity.warmup, 1f, 0.1f); - entity.power.satisfaction -= Math.min(entity.power.satisfaction, relativePowerDraw * Time.delta()); } if(entity.buildup > 0){