Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Anuken
2019-10-25 13:05:04 -04:00
parent b7e788d529
commit 3280bceaa1
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/io/anuke/mindustry/input/DesktopInput.java
View File

@@ -308,7 +308,11 @@ public class DesktopInput extends InputHandler{
} }
if(Core.input.keyTap(Binding.schematic_menu) && !ui.chatfrag.chatOpen()){ if(Core.input.keyTap(Binding.schematic_menu) && !ui.chatfrag.chatOpen()){
ui.schematics.show(); if(ui.schematics.isShown()){
ui.schematics.hide();
}else{
ui.schematics.show();
}
} }
if(Core.input.keyTap(Binding.clear_building)){ if(Core.input.keyTap(Binding.clear_building)){

10
core/src/io/anuke/mindustry/ui/dialogs/ZoneInfoDialog.java
View File

@@ -137,15 +137,17 @@ public class ZoneInfoDialog extends FloatingDialog{
}); });
cont.row(); cont.row();
cont.addButton(zone.canConfigure() ? "$configure" : Core.bundle.format("configure.locked", zone.configureObjective.display()),
() -> loadout.show(zone.loadout.core().itemCapacity, zone.getStartingItems(), zone::resetStartingItems, zone::updateLaunchCost, rebuildItems)
).fillX().pad(3).disabled(b -> !zone.canConfigure());
} }
cont.marginRight(12f); cont.marginRight(12f);
}); });
cont.row(); cont.row();
cont.addButton(zone.canConfigure() ? "$configure" : Core.bundle.format("configure.locked", zone.configureObjective.display()),
() -> loadout.show(zone.loadout.core().itemCapacity, zone.getStartingItems(), zone::resetStartingItems, zone::updateLaunchCost, rebuildItems)
).fillX().pad(3).disabled(b -> !zone.canConfigure());
cont.row();
Button button = cont.addButton(zone.locked() ? "$uncover" : "$launch", () -> { Button button = cont.addButton(zone.locked() ? "$uncover" : "$launch", () -> {
if(!data.isUnlocked(zone)){ if(!data.isUnlocked(zone)){
Sounds.unlock.play(); Sounds.unlock.play();