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

Merge branch 'master' of https://github.com/Anuken/Mindustry.git

Browse Source
This commit is contained in:
Anuken
2017-12-11 23:49:18 -05:00
parent b4852247d0 73f4538f6a
commit 825251fa0a
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,6 +160,12 @@ public class HudFragment implements Fragment{
} }
} }
private String printEnemiesRemaining() {
if(control.getEnemiesRemaining() == 1) {
return " enemy left";
} else return " enemies left";
}
private void addWaveTable(){ private void addWaveTable(){
float uheight = 66f; float uheight = 66f;
@@ -173,7 +179,7 @@ public class HudFragment implements Fragment{
row(); row();
new label(()-> control.getEnemiesRemaining() > 0 ? new label(()-> control.getEnemiesRemaining() > 0 ?
control.getEnemiesRemaining() + " enemies" : control.getEnemiesRemaining() + printEnemiesRemaining() :
(control.getTutorial().active() || Vars.control.getMode() == GameMode.sandbox) ? "waiting..." : "Wave in " + (int) (control.getWaveCountdown() / 60f)) (control.getTutorial().active() || Vars.control.getMode() == GameMode.sandbox) ? "waiting..." : "Wave in " + (int) (control.getWaveCountdown() / 60f))
.minWidth(140).units(Unit.dp).left(); .minWidth(140).units(Unit.dp).left();