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

Added campaign target wave

Browse Source
This commit is contained in:
Anuken
2020-06-17 21:41:39 -04:00
parent e88ff1a358
commit ae47f37b27
6 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/mindustry/ui/WarningBar.java
View File

@@ -27,7 +27,10 @@ public class WarningBar extends Element{
rx + barWidth, y
);
}
Lines.stroke(3f);
Lines.line(x, y, x + width, y);
Lines.line(x, y + height, x + width, y + height);
Draw.color();
Draw.reset();
}
}

12
core/src/mindustry/ui/dialogs/SaveDialog.java
View File

@@ -24,13 +24,11 @@ public class SaveDialog extends LoadDialog{
public void addSetup(){
buttons.button("$save.new", Icon.add, () ->
ui.showTextInput("$save", "$save.newslot", 30, "", text -> {
ui.loadAnd("$saving", () -> {
control.saves.addSave(text);
Core.app.post(() -> Core.app.post(this::setup));
});
})
).fillX().margin(10f);
ui.showTextInput("$save", "$save.newslot", 30, "",
text -> ui.loadAnd("$saving", () -> {
control.saves.addSave(text);
Core.app.post(() -> Core.app.post(this::setup));
}))).fillX().margin(10f);
}
@Override

2
core/src/mindustry/ui/fragments/HudFragment.java
View File

@@ -644,7 +644,7 @@ public class HudFragment extends Fragment{
}
if(state.rules.waveTimer){
builder.append((state.rules.waitEnemies && state.enemies > 0 ? Core.bundle.get("wave.waveInProgress") : ( waitingf.get((int)(state.wavetime/60)))));
builder.append((logic.isWaitingWave() ? Core.bundle.get("wave.waveInProgress") : ( waitingf.get((int)(state.wavetime/60)))));
}else if(state.enemies == 0){
builder.append(Core.bundle.get("waiting"));
}

6
core/src/mindustry/ui/fragments/LoadingFragment.java
View File

@@ -21,13 +21,11 @@ public class LoadingFragment extends Fragment{
t.visible(false);
t.touchable(Touchable.enabled);
t.add().height(133f).row();
//t.image().growX().height(3f).pad(4f).growX().get().setColor(Pal.accent);
t.add(new WarningBar()).growX().height(30f);
t.add(new WarningBar()).growX().height(24f);
t.row();
t.add("$loading").name("namelabel").pad(10f).style(Styles.techLabel);
t.row();
t.add(new WarningBar()).growX().height(30f);
//t.image().growX().height(3f).pad(4f).growX().get().setColor(Pal.accent);
t.add(new WarningBar()).growX().height(24f);
t.row();
bar = t.add(new Bar()).pad(3).size(500f, 40f).visible(false).get();