From 7b00d1160eedd0e4c40694523c896c0f6eff21a8 Mon Sep 17 00:00:00 2001 From: Luxray5474 Date: Mon, 11 Dec 2017 20:22:16 -0500 Subject: [PATCH] Grammatical correction for remaining enemies label Noticed that when the remaining enemy count comes down to 1, the word 'enemies' persists on the label, so i corrected that to show 'enemy' or 'enemies' instead, depending on the remaining enemy count. ~~also first dialogue JSON coming soon~~ --- core/src/io/anuke/mindustry/ui/fragments/HudFragment.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java index f6b8ef2750..e276f1e2b9 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java @@ -159,6 +159,12 @@ public class HudFragment implements Fragment{ } } } + + private String printEnemiesRemaining() { + if(control.getEnemiesRemaining() == 1) { + return " enemy left"; + } else return " enemies left"; + } private void addWaveTable(){ float uheight = 66f; @@ -173,7 +179,7 @@ public class HudFragment implements Fragment{ row(); 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)) .minWidth(140).units(Unit.dp).left();