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

UI bug cleanup, testing, balancing of repair turrets

Browse Source
This commit is contained in:
Anuken
2018-01-26 18:29:31 -05:00
parent 6c30fe9fcf
commit 8e6f628f5b
14 changed files with 47 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java
View File

@@ -26,6 +26,12 @@ public class PausedDialog extends FloatingDialog{
}
void setup(){
update(() -> {
if(GameState.is(State.menu) && isShown()){
hide();
}
});
shown(() -> {
wasPaused = GameState.is(State.paused);
if(!Net.active()) GameState.set(State.paused);
@@ -36,7 +42,7 @@ public class PausedDialog extends FloatingDialog{
content().addButton("$text.back", () -> {
hide();
if(!wasPaused || Net.active())
if((!wasPaused || Net.active()) && !GameState.is(State.menu))
GameState.set(State.playing);
});
@@ -46,7 +52,7 @@ public class PausedDialog extends FloatingDialog{
content().row();
content().addButton("$text.savegame", () -> {
save.show();
});
}).disabled(b -> Vars.world.getMap().id == -1);
content().row();
content().addButton("$text.loadgame", () -> {
@@ -81,13 +87,15 @@ public class PausedDialog extends FloatingDialog{
new imagebutton("icon-play-2", isize, () -> {
hide();
if(!wasPaused)
if(!wasPaused && !GameState.is(State.menu))
GameState.set(State.playing);
}).text("$text.back").padTop(4f);
new imagebutton("icon-tools", isize, ui.settings::show).text("$text.settings").padTop(4f);
new imagebutton("icon-save", isize, save::show).text("$text.save").padTop(4f);
imagebutton sa = new imagebutton("icon-save", isize, save::show);
sa.text("$text.save").padTop(4f);
sa.cell.disabled(b -> Vars.world.getMap().id == -1);
content().row();

9
core/src/io/anuke/mindustry/ui/dialogs/SaveDialog.java
View File

@@ -1,8 +1,9 @@
package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.utils.reflect.ClassReflection;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.GameState;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.io.Saves.SaveSlot;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.scene.ui.TextButton;
@@ -12,6 +13,12 @@ public class SaveDialog extends LoadDialog{
public SaveDialog() {
super("$text.savegame");
update(() -> {
if(GameState.is(State.menu) && isShown()){
hide();
}
});
}
public void addSetup(){

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

@@ -223,10 +223,10 @@ public class HudFragment implements Fragment{
}
private void playButton(float uheight){
new imagebutton("icon-play", 30f, ()->{
new imagebutton("icon-play", 30f, () -> {
Vars.control.runWave();
}).height(uheight).fillX().right().padTop(-8f).padBottom(-12f).padRight(-36).width(40f).update(l->{
boolean vis = Vars.control.getMode().toggleWaves && Vars.control.getEnemiesRemaining() <= 0 && (Net.server() || !Net.active());
boolean vis = Vars.control.getEnemiesRemaining() <= 0 && (Net.server() || !Net.active());
boolean paused = GameState.is(State.paused) || !vis;
l.setVisible(vis);