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

Fixed core selection in preset sectors

Browse Source
This commit is contained in:
Anuken
2020-05-18 15:38:56 -04:00
parent a12ff624e5
commit 530ff9761b
13 changed files with 57 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -285,6 +285,8 @@ public class PlanetDialog extends FloatingDialog{
float stroke = 0.026f;
if(sec.hasBase()){
drawSelection(sec, Tmp.c1.set(Team.sharded.color).mul(0.8f).a(selectAlpha), stroke, -0.01f);
}else if(sec.preset != null){
drawSelection(sec, Tmp.c1.set(Team.derelict.color).mul(0.8f).a(selectAlpha), stroke, -0.02f);
}else if(sec.hasEnemyBase()){
drawSelection(sec, Tmp.c1.set(Team.crux.color).mul(0.8f).a(selectAlpha), stroke, -0.02f);
}

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

@@ -49,6 +49,7 @@ public class HudFragment extends Fragment{
showToast("New turn: [accent]" + universe.getTurn() + "[]" + (attacked > 0 ? "\n[scarlet]" + Iconc.warning + " " + attacked + " sectors attacked!": ""));
});
//TODO tear this all down
//menu at top left
parent.fill(cont -> {
cont.setName("overlaymarker");
@@ -133,6 +134,13 @@ public class HudFragment extends Fragment{
cont.row();
}
//TODO BUTTONS FOR VIEWING EXPORTS/IMPORTS/RESEARCH
/*
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();