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

Progress on sector state

Browse Source
This commit is contained in:
Anuken
2020-05-30 21:04:41 -04:00
parent 8a4824e72d
commit 0842c3f0a0
20 changed files with 314 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/ui/fragments/BlockConfigFragment.java
+22 -20
View File
@@ -43,29 +43,31 @@ public class BlockConfigFragment extends Fragment{
}
public void showConfig(Tilec tile){
configTile = tile;
if(tile.configTapped()){
configTile = tile;
table.visible(true);
table.clear();
tile.buildConfiguration(table);
table.pack();
table.setTransform(true);
table.actions(Actions.scaleTo(0f, 1f), Actions.visible(true),
Actions.scaleTo(1f, 1f, 0.07f, Interp.pow3Out));
table.visible(true);
table.clear();
tile.buildConfiguration(table);
table.pack();
table.setTransform(true);
table.actions(Actions.scaleTo(0f, 1f), Actions.visible(true),
Actions.scaleTo(1f, 1f, 0.07f, Interp.pow3Out));
table.update(() -> {
if(configTile != null && configTile.shouldHideConfigure(player)){
hideConfig();
return;
}
table.update(() -> {
if(configTile != null && configTile.shouldHideConfigure(player)){
hideConfig();
return;
}
table.setOrigin(Align.center);
if(configTile == null || configTile.block() == Blocks.air || !configTile.isValid()){
hideConfig();
}else{
configTile.updateTableAlign(table);
}
});
table.setOrigin(Align.center);
if(configTile == null || configTile.block() == Blocks.air || !configTile.isValid()){
hideConfig();
}else{
configTile.updateTableAlign(table);
}
});
}
}
public boolean hasConfigMouse(){
core/src/mindustry/ui/fragments/HudFragment.java
+3 -3
View File
@@ -326,9 +326,9 @@ public class HudFragment extends Fragment{
c.clearChildren();
for(Item item : content.items()){
if(state.stats.getExport(item) >= 1){
if(state.secinfo.getExport(item) >= 1){
c.image(item.icon(Cicon.small));
c.label(() -> (int)state.stats.getExport(item) + " /s").color(Color.lightGray);
c.label(() -> (int)state.secinfo.getExport(item) + " /s").color(Color.lightGray);
c.row();
}
}
@@ -337,7 +337,7 @@ public class HudFragment extends Fragment{
c.update(() -> {
boolean wrong = false;
for(Item item : content.items()){
boolean has = state.stats.getExport(item) >= 1;
boolean has = state.secinfo.getExport(item) >= 1;
if(used.get(item.id) != has){
used.set(item.id, has);
wrong = true;