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

Research tweaks

Browse Source
This commit is contained in:
Anuken
2020-07-08 12:11:27 -04:00
parent 26e70fa585
commit a9333baa78
13 changed files with 66 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/mindustry/ui/fragments/HudFragment.java
View File

@@ -114,7 +114,7 @@ public class HudFragment extends Fragment{
ui.chatfrag.toggle();
}
}else if(state.isCampaign()){
ui.tech.show();
ui.research.show();
}else{
ui.database.show();
}
@@ -134,13 +134,6 @@ public class HudFragment extends Fragment{
cont.row();
}
//TODO BUTTONS FOR VIEWING EXPORTS/IMPORTS/RESEARCH/MAP/ETC
/*
cont.table(t -> {
});
cont.row();*/
cont.update(() -> {
if(Core.input.keyTap(Binding.toggle_menus) && !ui.chatfrag.shown() && !Core.scene.hasDialog() && !(Core.scene.getKeyboardFocus() instanceof TextField)){
toggleMenus();
@@ -683,9 +676,9 @@ public class HudFragment extends Fragment{
if(net.client() && player.admin){
Call.adminRequest(player, AdminAction.wave);
}else if(inLaunchWave()){
ui.showConfirm("$confirm", "$launch.skip.confirm", () -> !canSkipWave(), () -> state.wavetime = 0f);
ui.showConfirm("$confirm", "$launch.skip.confirm", () -> !canSkipWave(), () -> logic.skipWave());
}else{
state.wavetime = 0f;
logic.skipWave();
}
}).growY().fillX().right().width(40f)
.visible(this::canSkipWave);