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

Bugfixes / Mender block / Extra stats / Balancing

Browse Source
This commit is contained in:
Anuken
2019-03-26 11:05:47 -04:00
parent 0b1e2bf19b
commit 10c999a4a2
29 changed files with 1957 additions and 1822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java
View File

@@ -35,9 +35,9 @@ public class CustomRulesDialog extends FloatingDialog{
main.row();
main.addCheck("$rules.wavetimer", b -> rules.waveTimer = b).checked(b -> rules.waveTimer);
main.row();
main.addCheck("$rules.waves", b -> rules.waves = b).checked(b -> rules.waves).disabled(b -> rules.pvp);
main.addCheck("$rules.waves", b -> rules.waves = b).checked(b -> rules.waves);
main.row();
main.addCheck("$rules.pvp", b -> rules.pvp = b).checked(b -> rules.pvp).disabled(b -> rules.waves);
main.addCheck("$rules.pvp", b -> rules.pvp = b).checked(b -> rules.pvp);
main.row();
main.addCheck("$rules.unitdrops", b -> rules.unitDrops = b).checked(b -> rules.unitDrops);
main.row();

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

@@ -449,15 +449,17 @@ public class HudFragment extends Fragment{
builder.append(wavef.get(state.wave));
builder.append("\n");
if(state.enemies() > 0 && !state.rules.waveTimer){
if(state.enemies() > 0){
if(state.enemies() == 1){
builder.append(enemyf.get(state.enemies()));
}else{
builder.append(enemiesf.get(state.enemies()));
}
}else if(state.rules.waveTimer){
}
if(state.rules.waveTimer){
builder.append(waitingf.get((int)(state.wavetime/60)));
}else{
}else if(state.enemies() == 0){
builder.append(Core.bundle.get("waiting"));
}