Incomplete tutorial basics

This commit is contained in:
Anuken
2019-08-08 17:03:45 -04:00
parent 0a07c62b63
commit 4811578c95
17 changed files with 825 additions and 660 deletions
@@ -1,7 +1,7 @@
package io.anuke.mindustry.ui;
import io.anuke.arc.collection.FloatArray;
import io.anuke.arc.math.geom.Rectangle;
import io.anuke.arc.collection.*;
import io.anuke.arc.math.geom.*;
/**
* Algorithm taken from <a href="https://github.com/abego/treelayout">TreeLayout</a>.
@@ -312,16 +312,21 @@ public class HudFragment extends Fragment{
.update(label -> label.getColor().set(Color.ORANGE).lerp(Color.SCARLET, Mathf.absin(Time.time(), 2f, 1f)))).touchable(Touchable.disabled);
});
parent.fill(t -> {
t.top().visible(() -> state.rules.tutorial);
t.table("button-trans", f -> f.labelWrap(() -> control.tutorial.stage.text()).width(400f).pad(3f));
});
//paused table
parent.fill(t -> {
t.top().visible(() -> state.isPaused());
t.table("button", top -> top.add("$paused").pad(6f));
t.table("button-trans", top -> top.add("$paused").pad(5f));
});
//'saving' indicator
parent.fill(t -> {
t.bottom().visible(() -> control.saves.isSaving());
t.add("$saveload");
t.add("$saveload").style("outline");
});
blockfrag.build(parent);
@@ -146,7 +146,7 @@ public class PlacementFragment extends Fragment{
if(unlocked(block)){
input.block = input.block == block ? null : block;
}
}).size(46f).group(group).get();
}).size(46f).group(group).name("block-" + block.name).get();
button.getStyle().imageUp = new TextureRegionDrawable(block.icon(Icon.medium));
@@ -282,7 +282,7 @@ public class PlacementFragment extends Fragment{
categories.addImageButton("icon-" + cat.name() + "-med", "clear-toggle-trans", iconsizemed, () -> {
currentCategory = cat;
rebuildCategory.run();
}).group(group).update(i -> i.setChecked(currentCategory == cat));
}).group(group).update(i -> i.setChecked(currentCategory == cat)).name("category-" + cat.name());
}
}).touchable(Touchable.enabled);
@@ -43,7 +43,7 @@ public class PlayerListFragment extends Fragment{
}
});
cont.table("button", pane -> {
cont.table("button-trans", pane -> {
pane.label(() -> Core.bundle.format(playerGroup.size() == 1 ? "players.single" : "players", playerGroup.size()));
pane.row();
pane.pane(content).grow().get().setScrollingDisabled(true, false);