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

Increased number of save slots, UI colors tweaked

Browse Source
This commit is contained in:
Anuken
2017-12-02 00:29:44 -05:00
parent 8455d48693
commit 01b431801d
20 changed files with 161 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
package io.anuke.mindustry.ui;
import com.badlogic.gdx.Input.Keys;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Colors;
import com.badlogic.gdx.utils.Align;
import io.anuke.ucore.scene.ui.Dialog;
@@ -14,7 +14,7 @@ public class FloatingDialog extends Dialog{
setFillParent(true);
title().setAlignment(Align.center);
getTitleTable().row();
getTitleTable().addImage("white", Color.ORANGE)
getTitleTable().addImage("white", Colors.get("accent"))
.growX().height(3f).pad(4f).units(Unit.dp);
}

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

@@ -59,9 +59,9 @@ public class LevelDialog extends FloatingDialog{
}
Table inset = new Table("pane-button");
inset.add("[orange]"+map.name()).pad(3f).units(Unit.dp);
inset.add("[accent]"+map.name()).pad(3f).units(Unit.dp);
inset.row();
inset.add((StringSupplier)(()->"High Score: [orange]" + Settings.getInt("hiscore" + map.name())))
inset.add((StringSupplier)(()->"High Score: [accent]" + Settings.getInt("hiscore" + map.name())))
.pad(3f).units(Unit.dp);
inset.pack();

24
core/src/io/anuke/mindustry/ui/LoadDialog.java
View File

@@ -8,13 +8,18 @@ import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.GameState;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.io.SaveIO;
import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.scene.ui.Label;
import io.anuke.ucore.scene.ui.ScrollPane;
import io.anuke.ucore.scene.ui.TextButton;
import io.anuke.ucore.scene.ui.layout.Table;
import io.anuke.ucore.scene.ui.layout.Unit;
//TODO unified save/load dialogs
public class LoadDialog extends FloatingDialog{
ScrollPane pane;
public LoadDialog(){
this("Load Game");
}
@@ -26,6 +31,7 @@ public class LoadDialog extends FloatingDialog{
shown(() -> {
setup();
Timers.runTask(2f, ()-> Core.scene.setScrollFocus(pane));
});
addCloseButton();
@@ -36,12 +42,18 @@ public class LoadDialog extends FloatingDialog{
content().add("Select a save slot.").padBottom(2);
content().row();
Table slots = new Table();
pane = new ScrollPane(slots);
pane.setFadeScrollBars(false);
slots.padRight(Unit.dp.inPixels(24));
for(int i = 0; i < Vars.saveSlots; i++){
final int slot = i;
TextButton button = new TextButton("[orange]Slot " + (i + 1));
button.pad(Unit.dp.inPixels(10));
button.pad(Unit.dp.inPixels(12));
button.getLabelCell().top().left().growX();
button.row();
@@ -51,16 +63,18 @@ public class LoadDialog extends FloatingDialog{
", Wave " + SaveIO.getWave(slot) + "\nLast Saved: " + SaveIO.getTimeString(i)));
info.setAlignment(Align.center, Align.center);
button.add(info).padBottom(2).padTop(6);
button.add(info).padBottom(3).padTop(7);
button.row();
//button.addImage("white", Color.GRAY)
//.growX().height(3f).pad(4f).units(Unit.dp);
button.row();
modifyButton(button, slot);
content().add(button).size(400, 86).units(Unit.dp).pad(2);
content().row();
slots.add(button).size(404, 104).pad(4).units(Unit.dp);
slots.row();
}
content().add(pane);
}

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

@@ -1,7 +1,7 @@
package io.anuke.mindustry.ui;
import com.badlogic.gdx.Input.Keys;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Colors;
import com.badlogic.gdx.utils.Align;
import io.anuke.ucore.scene.ui.Image;
@@ -17,7 +17,7 @@ public class MindustryKeybindDialog extends KeybindDialog{
title().setAlignment(Align.center);
getTitleTable().row();
getTitleTable().add(new Image("white"))
.growX().height(3f).pad(4f).units(Unit.dp).get().setColor(Color.ORANGE);
.growX().height(3f).pad(4f).units(Unit.dp).get().setColor(Colors.get("accent"));
}
@Override

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

@@ -1,7 +1,7 @@
package io.anuke.mindustry.ui;
import com.badlogic.gdx.Input.Keys;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Colors;
import com.badlogic.gdx.utils.Align;
import io.anuke.ucore.scene.ui.Image;
@@ -15,7 +15,7 @@ public class MindustrySettingsDialog extends SettingsDialog{
title().setAlignment(Align.center);
getTitleTable().row();
getTitleTable().add(new Image("white"))
.growX().height(3f).pad(4f).units(Unit.dp).get().setColor(Color.ORANGE);
.growX().height(3f).pad(4f).units(Unit.dp).get().setColor(Colors.get("accent"));
}
@Override