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

Revert "Moved launch button"

Browse Source 
This reverts commit 83bc3e4e
This commit is contained in:
Anuken
2020-04-07 11:29:23 -04:00
parent 83bc3e4e8d
commit 5fbe925429
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/src/mindustry/ui/dialogs/PlanetDialog.java
View File

@@ -94,16 +94,7 @@ public class PlanetDialog extends FloatingDialog{
//TODO names //TODO names
buttons.addImageTextButton("$back", Icon.left, style, this::hide).margin(bmargin); buttons.addImageTextButton("$back", Icon.left, style, this::hide).margin(bmargin);
buttons.addImageTextButton("Tech", Icon.tree, style, () -> ui.tech.show()).margin(bmargin); buttons.addImageTextButton("Tech", Icon.tree, style, () -> ui.tech.show()).margin(bmargin);
buttons.addImageTextButton("Launch", Icon.upOpen, style, () -> { buttons.addImageTextButton("Launch", Icon.upOpen, style, this::hide).margin(bmargin);
if(selected != null){
if(selected.is(SectorAttribute.naval)){
ui.showInfo("You need a naval loadout to launch here.");
return;
}
control.playSector(selected);
hide();
}
}).margin(bmargin).disabled(b -> selected == null);
buttons.addImageTextButton("Database", Icon.book, style, () -> ui.database.show()).margin(bmargin); buttons.addImageTextButton("Database", Icon.book, style, () -> ui.database.show()).margin(bmargin);
buttons.addImageTextButton("Resources", Icon.file, style, this::hide).margin(bmargin); buttons.addImageTextButton("Resources", Icon.file, style, this::hide).margin(bmargin);
@@ -367,6 +358,17 @@ public class PlanetDialog extends FloatingDialog{
stable.row(); stable.row();
stable.addButton("Launch", () -> {
if(selected != null){
if(selected.is(SectorAttribute.naval)){
ui.showInfo("You need a naval loadout to launch here.");
return;
}
control.playSector(selected);
hide();
}
}).size(120f, 50f).pad(2f);
stable.pack(); stable.pack();
stable.setPosition(x, y, Align.center); stable.setPosition(x, y, Align.center);

2
gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=f2ae212acde64f21ddc9804af0807098e797de08 archash=81dbe69779811234169486401f68ff66bc573d58