From d218fb926aa75af66b7d13b8a6fbdda1a044a310 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 11 Feb 2019 17:32:44 -0500 Subject: [PATCH] Bugfixes --- core/assets/maps/impact0079.mmap | Bin 515284 -> 515268 bytes .../assets/maps/nuclearProductionComplex.mmap | Bin 315801 -> 315782 bytes .../mindustry/ui/dialogs/TechTreeDialog.java | 4 ++-- .../world/blocks/power/PowerGraph.java | 2 +- .../world/blocks/units/RepairPoint.java | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/assets/maps/impact0079.mmap b/core/assets/maps/impact0079.mmap index a8036f1bb25cae58d8e190867349df0b9e76a469..0451d04b2ae0763fd372750353aa7a9626d912c8 100644 GIT binary patch delta 16014 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 diff --git a/core/assets/maps/nuclearProductionComplex.mmap b/core/assets/maps/nuclearProductionComplex.mmap index afb13fb5a645a46e8cb2b86467ff874bce08b988..ad90b921fd1a723fde60a782973f54f9c313551e 100644 GIT binary patch delta 11500 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 delta 11235 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 MjkY(qv#@mm0O1sZ3jhEB diff --git a/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java index de6d3d0a34..83274b4359 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java @@ -58,7 +58,7 @@ public class TechTreeDialog extends FloatingDialog{ boolean locked = locked(node.node); if(!locked) node.visible = true; for(TechTreeNode l : node.children){ - l.visible = !locked && l.node.block.isVisible(); + l.visible = !locked; checkNodes(l); } @@ -89,7 +89,7 @@ public class TechTreeDialog extends FloatingDialog{ } boolean locked(TechNode node){ - return !data.isUnlocked(node.block); + return node.block.locked(); } class TechTreeNode extends TreeNode{ diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java b/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java index 132dfb5b1a..c1ad348d2e 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java @@ -237,7 +237,7 @@ public class PowerGraph{ } } - //currently ignores all other values and consumes power anyway. + //currently ignores all other consumers and consumes power anyway. private boolean otherConsumersAreValid(Tile tile, Consume consumePower){ /* for(Consume cons : tile.block().consumes.all()){ diff --git a/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java b/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java index f53641b9b6..7b3beb34c6 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java @@ -98,7 +98,7 @@ public class RepairPoint extends Block{ @Override public TextureRegion[] generateIcons(){ - return new TextureRegion[]{Core.atlas.find(name + "-base"), Core.atlas.find(name + "-turret")}; + return new TextureRegion[]{Core.atlas.find(name + "-base"), Core.atlas.find(name)}; } @Override