From 55e78c9dce89668db1b87cdef9dfa47cf993ed66 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 10 Jul 2022 07:37:01 -0400 Subject: [PATCH] Minor bugfixes & requirement tweaks --- core/src/mindustry/content/Blocks.java | 6 +++--- core/src/mindustry/ui/ReqImage.java | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 5c72648fb6..22bf2960f8 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -4435,7 +4435,7 @@ public class Blocks{ }}; smite = new ItemTurret("smite"){{ - requirements(Category.turret, with(Items.beryllium, 150, Items.silicon, 150, Items.carbide, 250, Items.phaseFabric, 100)); + requirements(Category.turret, with(Items.oxide, 200, Items.surgeAlloy, 400, Items.silicon, 800, Items.carbide, 500, Items.phaseFabric, 300)); ammo( //this is really lazy @@ -4701,7 +4701,7 @@ public class Blocks{ }}; malign = new PowerTurret("malign"){{ - requirements(Category.turret, with(Items.beryllium, 150, Items.silicon, 150, Items.graphite, 250, Items.phaseFabric, 300)); + requirements(Category.turret, with(Items.carbide, 400, Items.beryllium, 2000, Items.silicon, 800, Items.graphite, 800, Items.phaseFabric, 300)); var haloProgress = PartProgress.warmup; Color haloColor = Color.valueOf("d370d3"), heatCol = Color.purple; @@ -4756,7 +4756,7 @@ public class Blocks{ sideAngle = 175f; sideWidth = 1f; sideLength = 40f; - lifetime = 16f; + lifetime = 22f; drawSize = 400f; length = 180f; pierceCap = 2; diff --git a/core/src/mindustry/ui/ReqImage.java b/core/src/mindustry/ui/ReqImage.java index a02ad7e5d0..fca6fc9cae 100644 --- a/core/src/mindustry/ui/ReqImage.java +++ b/core/src/mindustry/ui/ReqImage.java @@ -5,6 +5,7 @@ import arc.graphics.g2d.*; import arc.scene.*; import arc.scene.ui.*; import arc.scene.ui.layout.*; +import arc.util.*; import mindustry.graphics.*; public class ReqImage extends Stack{ @@ -30,7 +31,7 @@ public class ReqImage extends Stack{ } public ReqImage(TextureRegion region, Boolp valid){ - this(new Image(region), valid); + this(new Image(region).setScaling(Scaling.fit), valid); } public boolean valid(){