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

Mobile placement guide / Bugfixes / Switched mobile test to arg

Browse Source
This commit is contained in:
Anuken
2018-07-02 13:06:52 -04:00
parent e9436426b7
commit cf0a25fdfc
9 changed files with 101 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
core/src/io/anuke/mindustry/ui/ContentDisplay.java
View File

@@ -106,6 +106,37 @@ public class ContentDisplay {
public static void displayLiquid(Table table, Liquid liquid){
table.table(title -> {
title.addImage(liquid.getContentIcon()).size(8 * 6);
title.add("[accent]" + liquid.localizedName()).padLeft(5);
});
table.row();
table.addImage("white").height(3).color(Color.LIGHT_GRAY).pad(15).padLeft(0).padRight(0).fillX();
table.row();
if(liquid.description != null){
table.add(liquid.description).padLeft(5).padRight(5).width(400f).wrap().fillX();
table.row();
table.addImage("white").height(3).color(Color.LIGHT_GRAY).pad(15).padLeft(0).padRight(0).fillX();
table.row();
}
table.left().defaults().fillX();
table.add(Bundles.format("text.item.explosiveness", (int)(liquid.explosiveness * 100)));
table.row();
table.add(Bundles.format("text.item.flammability", (int)(liquid.flammability * 100)));
table.row();
table.add(Bundles.format("text.liquid.heatcapacity", (int)(liquid.heatCapacity * 100)));
table.row();
table.add(Bundles.format("text.liquid.temperature", (int)(liquid.temperature * 100)));
table.row();
table.add(Bundles.format("text.liquid.viscosity", (int)(liquid.viscosity * 100)));
table.row();
}
public static void displayMech(Table table, Mech mech){

2
core/src/io/anuke/mindustry/ui/fragments/LoadingFragment.java
View File

@@ -18,6 +18,8 @@ public class LoadingFragment implements Fragment {
public void build(Group parent) {
table = new table("loadDim"){{
add().height(70f).row();
touchable(Touchable.enabled);
get().addImage("white").growX()
.height(3f).pad(4f).growX().get().setColor(Palette.accent);