diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java index b7e79d38b6..f6ba92d67f 100644 --- a/core/src/mindustry/game/MapObjectives.java +++ b/core/src/mindustry/game/MapObjectives.java @@ -197,11 +197,24 @@ public class MapObjectives{ @Override public String text(){ if(text != null){ - int time = (int)((duration - countup) / 60f); + int i = (int)((duration - countup) / 60f); + StringBuilder timeString = new StringBuilder(); + + int m = i / 60; + int s = i % 60; + if(m > 0){ + timeString.append(m); + timeString.append(":"); + if(s < 10){ + timeString.append("0"); + } + } + timeString.append(s); + if(text.startsWith("@")){ - return Core.bundle.format(text.substring(1), time); + return Core.bundle.format(text.substring(1), timeString.toString()); }else{ - return Core.bundle.formatString(text, time); + return Core.bundle.formatString(text, timeString.toString()); } } return text; diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java index b78e68f1a1..81ea6b2d66 100644 --- a/core/src/mindustry/ui/fragments/HudFragment.java +++ b/core/src/mindustry/ui/fragments/HudFragment.java @@ -100,7 +100,7 @@ public class HudFragment{ parent.fill(t -> { t.name = "waiting"; t.visible(() -> netServer.isWaitingForPlayers()).touchable = Touchable.disabled; - t.table(Styles.black6, top -> top.add("@waiting.players").style(Styles.outlineLabel).pad(16f)); + t.table(Styles.black6, top -> top.add("@waiting.players").style(Styles.outlineLabel).pad(18f)); }); //minimap + position