diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java index f25eab494b..3d3bc18fd8 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java @@ -16,12 +16,8 @@ import io.anuke.arc.scene.ui.ImageButton; import io.anuke.arc.scene.ui.TextButton; import io.anuke.arc.scene.ui.layout.Stack; import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.arc.scene.ui.layout.Unit; import io.anuke.arc.scene.utils.Elements; -import io.anuke.arc.util.Align; -import io.anuke.arc.util.Scaling; -import io.anuke.arc.util.Time; -import io.anuke.arc.util.Tmp; +import io.anuke.arc.util.*; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.game.EventType.StateChangeEvent; import io.anuke.mindustry.game.UnlockableContent; @@ -34,6 +30,8 @@ import io.anuke.mindustry.ui.Bar; import io.anuke.mindustry.ui.IntFormat; import io.anuke.mindustry.ui.dialogs.FloatingDialog; +import java.lang.StringBuilder; + import static io.anuke.mindustry.Vars.*; public class HudFragment extends Fragment{ @@ -59,24 +57,7 @@ public class HudFragment extends Fragment{ if(mobile){ { - Table select = new Table(){ - @Override - public void act(float delta){ - setSize(getPrefWidth(), getPrefHeight()); - setPosition(0, Core.graphics.getHeight(), Align.topLeft); - super.act(delta); - } - - @Override - public float getPrefWidth(){ - return Unit.dp.scl(dsize*4 + 3); - } - - @Override - public float getPrefHeight(){ - return Unit.dp.scl(dsize); - } - }; + Table select = new Table(); select.visible(() -> !state.is(State.menu)); select.left(); @@ -121,7 +102,25 @@ public class HudFragment extends Fragment{ }).get(); select.addImage("blank").color(Pal.accent).width(3f).fillY(); - Core.scene.add(select); + + float size = dsize; + Array children = new Array<>(select.getChildren()); + + int index = 0; + for(Element elem : children){ + int fi = index++; + Core.scene.add(elem); + elem.visible(() -> { + if(fi < 4){ + elem.setSize(size); + }else{ + elem.setSize(3f, size); + } + elem.setPosition(fi * size, Core.graphics.getHeight(), Align.topLeft); + return !state.is(State.menu); + }); + } + cont.add().size(dsize*4 + 3, dsize).left(); } diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java b/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java index b1b855d048..ba2f6da2e1 100644 --- a/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java +++ b/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java @@ -64,7 +64,7 @@ public class DesktopPlatform extends Platform{ (unitGroups[players[0].getTeam().ordinal()].size() + " Units Active"); if(Net.active()){ - presence.partyMax = 16; + presence.partyMax = 100; presence.partySize = playerGroup.size(); } }else{