From 8ed878b1b31e44ee050ec342a3cd83f888efaa63 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 21 Jun 2022 10:49:30 -0400 Subject: [PATCH] Aligned reconstructor unit labels --- .../turrets/fracture/fracture-blade-heat.png | Bin 0 -> 2467 bytes .../turrets/fracture/fracture-inner-heat.png | Bin 0 -> 1382 bytes .../turrets/fracture/fracture-mid-heat.png | Bin 0 -> 1522 bytes .../blocks/turrets/fracture/fracture-mid.png | Bin 0 -> 783 bytes .../world/blocks/units/Reconstructor.java | 9 ++++----- 5 files changed, 4 insertions(+), 5 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/turrets/fracture/fracture-blade-heat.png create mode 100644 core/assets-raw/sprites/blocks/turrets/fracture/fracture-inner-heat.png create mode 100644 core/assets-raw/sprites/blocks/turrets/fracture/fracture-mid-heat.png create mode 100644 core/assets-raw/sprites/blocks/turrets/fracture/fracture-mid.png diff --git a/core/assets-raw/sprites/blocks/turrets/fracture/fracture-blade-heat.png b/core/assets-raw/sprites/blocks/turrets/fracture/fracture-blade-heat.png new file mode 100644 index 0000000000000000000000000000000000000000..f37c68ff1054e1dee0386a3f301aef293e8c10e6 GIT binary patch literal 2467 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 X%Eytig{VBH{=@;M-%j5K1}pn-t2Vln literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/turrets/fracture/fracture-mid.png b/core/assets-raw/sprites/blocks/turrets/fracture/fracture-mid.png new file mode 100644 index 0000000000000000000000000000000000000000..aa246f41cfe34975301bc4f9118d3b4bf48a7be9 GIT binary patch literal 783 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-HD>U^?mP;uumf z=j|Q;yvq(U?jPA73D`2cImH{Gx^0Oxi+Mulk@>3Hr#KtD?li5MJ&jo*kHOl4VSB^X z3ny-P%Je^;`E&32WmC1T=I!_In`Oo5IY|X4O5M5j3+J0hM^|sQ-?{Jl&-Tr|_MaDD zot$(0S5a-?pZD8;2%oX6GZJw;_i^$iWsP4?o=MohbTc^q!}Fw|NOe+i-~M;k&%bZC z@YyJMC+-)^79D1ea|}(!4G(w}ED+2c*530EOmMb!F8_Y-Z?g=$9$(3v!aYnZ=?n)Y z9SYb4<}k8^Kl#66vSt3IiVr_58S>}ZvOIYDy1ZC6>ve91x7IH%gX_K`nSV;<@9&@c zIKZ`^zm=Wgr}7JF`;)ScFCROzGCJ(zFzcQFq-#Oj$Ayy^if*L-NmmdKI;Vst0P{#x2><{9 literal 0 HcmV?d00001 diff --git a/core/src/mindustry/world/blocks/units/Reconstructor.java b/core/src/mindustry/world/blocks/units/Reconstructor.java index c7503ea3f2..e3cc5a7068 100644 --- a/core/src/mindustry/world/blocks/units/Reconstructor.java +++ b/core/src/mindustry/world/blocks/units/Reconstructor.java @@ -1,7 +1,6 @@ package mindustry.world.blocks.units; import arc.*; -import arc.graphics.*; import arc.graphics.g2d.*; import arc.math.*; import arc.math.geom.*; @@ -78,8 +77,8 @@ public class Reconstructor extends UnitBlock{ table.row(); for(var upgrade : upgrades){ if(upgrade[0].unlockedNow() && upgrade[1].unlockedNow()){ - table.table(t -> { - t.setBackground(Tex.whiteui); + table.table(Tex.whiteui, t -> { + t.left(); t.setColor(Pal.darkestGray); t.image(upgrade[0].uiIcon).size(40).pad(10f).left(); @@ -96,8 +95,8 @@ public class Reconstructor extends UnitBlock{ t.image(Icon.right).color(Pal.darkishGray).size(40).pad(10f); }).fill().padTop(5).padBottom(5); - table.table(t -> { - t.setBackground(Tex.whiteui); + table.table(Tex.whiteui, t -> { + t.left(); t.setColor(Pal.darkestGray); t.image(upgrade[1].uiIcon).size(40).pad(10f).right();