diff --git a/core/assets/maps/impact0079.mmap b/core/assets/maps/impact0079.mmap index a8036f1bb2..0451d04b2a 100644 Binary files a/core/assets/maps/impact0079.mmap and b/core/assets/maps/impact0079.mmap differ diff --git a/core/assets/maps/nuclearProductionComplex.mmap b/core/assets/maps/nuclearProductionComplex.mmap index afb13fb5a6..ad90b921fd 100644 Binary files a/core/assets/maps/nuclearProductionComplex.mmap and b/core/assets/maps/nuclearProductionComplex.mmap differ 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