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

Edge cleanup / Spawn warn / Bugfixes

Browse Source
This commit is contained in:
Anuken
2019-01-29 11:51:41 -05:00
parent 76af3e3077
commit d268d94f76
8 changed files with 48 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java
View File

@@ -152,7 +152,7 @@ public class DeployDialog extends FloatingDialog{
}
void buildButton(Zone zone, TextButton button){
button.setDisabled(() -> !canUnlock(zone));
button.setDisabled(() -> !canUnlock(zone) || !data.hasItems(zone.itemRequirements));
button.clicked(() -> {
if(!data.isUnlocked(zone)){
data.removeItems(zone.itemRequirements);

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

@@ -154,6 +154,16 @@ public class HudFragment extends Fragment{
t.table("button", top -> top.add("$paused").pad(6f));
});
parent.fill(t -> {
t.visible(() -> !state.is(State.menu));
t.table("flat", c -> c.add("$nearpoint")
.update(l -> l.setColor(Tmp.c1.set(Color.WHITE).lerp(Color.SCARLET, Mathf.absin(Time.time(), 10f, 1f))))
.get().setAlignment(Align.center, Align.center))
.margin(6).update(u -> {
u.color.a = Mathf.lerpDelta(u.color.a, Mathf.num(world.spawner.playerNear()), 0.1f);
}).get().color.a = 0f;
});
parent.fill(t -> {
t.visible(() -> netServer.isWaitingForPlayers() && !state.is(State.menu));
t.table("button", c -> c.add("$waiting.players"));
@@ -199,7 +209,7 @@ public class HudFragment extends Fragment{
});
parent.fill(t -> {
t.top().right();
t.top().right().visible(() -> !state.is(State.menu));
TextButton button = Elements.newButton("$launch", Call::launchZone);