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

Mobile schematics / Randomized projector reloads

Browse Source
This commit is contained in:
Anuken
2019-10-31 22:44:07 -04:00
parent 3be3253a08
commit 91dc25f69d
16 changed files with 10456 additions and 10299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ public class HudFragment extends Fragment{
private Table lastUnlockTable;
private Table lastUnlockLayout;
private boolean shown = true;
private float dsize = 59;
private float dsize = 47.2f;
private float coreAttackTime;
private float lastCoreHP;
@@ -65,10 +65,14 @@ public class HudFragment extends Fragment{
ImageButtonStyle style = Styles.clearTransi;
select.addImageButton(Icon.menuLarge, style, ui.paused::show);
flip = select.addImageButton(Icon.arrowUp, style, this::toggleMenus).get();
select.addImageButton(Icon.menuLargeSmall, style, ui.paused::show);
flip = select.addImageButton(Icon.arrowUpSmall, style, this::toggleMenus).get();
select.addImageButton(Icon.pause, style, () -> {
select.addImageButton(Icon.wikiSmall, style, () -> {
ui.schematics.show();
});
select.addImageButton(Icon.pauseSmall, style, () -> {
if(net.active()){
ui.listfrag.toggle();
}else{
@@ -76,14 +80,14 @@ public class HudFragment extends Fragment{
}
}).name("pause").update(i -> {
if(net.active()){
i.getStyle().imageUp = Icon.players;
i.getStyle().imageUp = Icon.playersSmall;
}else{
i.setDisabled(false);
i.getStyle().imageUp = state.is(State.paused) ? Icon.play : Icon.pause;
i.getStyle().imageUp = state.is(State.paused) ? Icon.playSmall : Icon.pauseSmall;
}
}).get();
});
select.addImageButton(Icon.settings, style,() -> {
select.addImageButton(Icon.chatSmall, style,() -> {
if(net.active() && mobile){
if(ui.chatfrag.chatOpen()){
ui.chatfrag.hide();
@@ -97,11 +101,11 @@ public class HudFragment extends Fragment{
}
}).update(i -> {
if(net.active() && mobile){
i.getStyle().imageUp = Icon.chat;
i.getStyle().imageUp = Icon.chatSmall;
}else{
i.getStyle().imageUp = Icon.database;
i.getStyle().imageUp = Icon.databaseSmall;
}
}).get();
});
select.addImage().color(Pal.gray).width(4f).fillY();
@@ -114,7 +118,7 @@ public class HudFragment extends Fragment{
int fi = index++;
parent.addChild(elem);
elem.visible(() -> {
if(fi < 4){
if(fi < 5){
elem.setSize(size);
}else{
elem.setSize(Scl.scl(4f), size);
@@ -124,7 +128,7 @@ public class HudFragment extends Fragment{
});
}
cont.add().size(dsize * 4 + 3, dsize).left();
cont.add().size(dsize * 5 + 3, dsize).left();
}
cont.row();
@@ -154,7 +158,7 @@ public class HudFragment extends Fragment{
addWaveTable(waves);
addPlayButton(btable);
wavesMain.add(stack).width(dsize * 4 + 4f);
wavesMain.add(stack).width(dsize * 5 + 4f);
wavesMain.row();
wavesMain.table(Tex.button, t -> t.margin(10f).add(new Bar("boss.health", Pal.health, () -> state.boss() == null ? 0f : state.boss().healthf()).blink(Color.white))
.grow()).fillX().visible(() -> state.rules.waves && state.boss() != null).height(60f).get();
@@ -578,7 +582,7 @@ public class HudFragment extends Fragment{
private void toggleMenus(){
if(flip != null){
flip.getStyle().imageUp = shown ? Icon.arrowDown : Icon.arrowUp;
flip.getStyle().imageUp = shown ? Icon.arrowDownSmall : Icon.arrowUpSmall;
}
shown = !shown;

21
core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
View File

@@ -238,7 +238,14 @@ public class PlacementFragment extends Fragment{
frame.row();
frame.table(Tex.pane2, blocksSelect -> {
blocksSelect.margin(4).marginTop(0);
blocksSelect.pane(blocks -> blockTable = blocks).height(194f).grow().get().setStyle(Styles.smallPane);
blocksSelect.pane(blocks -> blockTable = blocks).height(194f).update(pane -> {
if(pane.hasScroll()){
Element result = Core.scene.hit(Core.input.mouseX(), Core.input.mouseY(), true);
if(result == null || !result.isDescendantOf(pane)){
Core.scene.setScrollFocus(null);
}
}
}).grow().get().setStyle(Styles.smallPane);
blocksSelect.row();
blocksSelect.table(control.input::buildPlacementUI).name("inputTable").growX();
}).fillY().bottom().touchable(Touchable.enabled);
@@ -274,7 +281,7 @@ public class PlacementFragment extends Fragment{
currentCategory = cat;
if(control.input.block != null){
if(selectedBlocks.get(currentCategory) == null){
selectFirstBlock(currentCategory);
selectedBlocks.put(currentCategory, getByCategory(currentCategory).find(this::unlocked));
}
control.input.block = selectedBlocks.get(currentCategory);
}
@@ -313,16 +320,6 @@ public class PlacementFragment extends Fragment{
return returnArray;
}
Block selectFirstBlock(Category cat) {
for(Block block : getByCategory(currentCategory)){
if(unlocked(block)){
selectedBlocks.put(currentCategory, block);
return block;
}
}
return null;
}
boolean unlocked(Block block){
return !world.isZone() || data.isUnlocked(block);
}