From f242a2b2cde3bcdd6691fa54864fb0d226677f94 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 17 Sep 2020 22:25:56 -0400 Subject: [PATCH] Fixed #2585 --- .../sprites/units/omura-cannon-heat.png | Bin 0 -> 2571 bytes core/assets-raw/sprites/units/omura-cannon.png | Bin 0 -> 4831 bytes .../src/mindustry/ui/dialogs/ResearchDialog.java | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 core/assets-raw/sprites/units/omura-cannon-heat.png create mode 100644 core/assets-raw/sprites/units/omura-cannon.png diff --git a/core/assets-raw/sprites/units/omura-cannon-heat.png b/core/assets-raw/sprites/units/omura-cannon-heat.png new file mode 100644 index 0000000000000000000000000000000000000000..e7dd2560037b7840e102e88b20fab431ce91f4b0 GIT binary patch literal 2571 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 literal 0 HcmV?d00001 diff --git a/core/src/mindustry/ui/dialogs/ResearchDialog.java b/core/src/mindustry/ui/dialogs/ResearchDialog.java index d2bd13c101..d7540d2764 100644 --- a/core/src/mindustry/ui/dialogs/ResearchDialog.java +++ b/core/src/mindustry/ui/dialogs/ResearchDialog.java @@ -340,7 +340,7 @@ public class ResearchDialog extends BaseDialog{ button.update(() -> { float offset = (Core.graphics.getHeight() % 2) / 2f; button.setPosition(node.x + panX + width / 2f, node.y + panY + height / 2f + offset, Align.center); - button.getStyle().up = !locked(node.node) ? Tex.buttonOver : selectable(node.node) && !canSpend(node.node) ? Tex.buttonRed : Tex.button; + button.getStyle().up = !locked(node.node) ? Tex.buttonOver : !selectable(node.node) || !canSpend(node.node) ? Tex.buttonRed : Tex.button; ((TextureRegionDrawable)button.getStyle().imageUp).setRegion(node.selectable ? node.node.content.icon(Cicon.medium) : Icon.lock.getRegion()); button.getImage().setColor(!locked(node.node) ? Color.white : node.selectable ? Color.gray : Pal.gray);