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

Updated inventory menu, weapon factory mechanics

Browse Source
This commit is contained in:
Anuken
2018-06-12 22:26:16 -04:00
parent 9abbd8c158
commit 6b713b283a
8 changed files with 165 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java
View File

@@ -13,6 +13,8 @@ import io.anuke.ucore.scene.Group;
import io.anuke.ucore.scene.actions.Actions;
import io.anuke.ucore.scene.ui.layout.Table;
import static io.anuke.mindustry.Vars.tilesize;
public class BlockConfigFragment implements Fragment {
private Table table = new Table();
private Tile configTile;
@@ -43,8 +45,8 @@ public class BlockConfigFragment implements Fragment {
table.update(() -> {
table.setOrigin(Align.center);
Vector2 pos = Graphics.screen(tile.drawx(), tile.drawy());
table.setPosition(pos.x, pos.y, Align.center);
Vector2 pos = Graphics.screen(tile.drawx(), tile.drawy() - tile.block().size * tilesize/2f - 1);
table.setPosition(pos.x, pos.y, Align.top);
if(configTile == null || configTile.block() == Blocks.air){
hideConfig();
}

7
core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java
View File

@@ -27,6 +27,7 @@ import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Strings;
import static io.anuke.mindustry.Vars.state;
import static io.anuke.mindustry.Vars.tilesize;
public class BlockInventoryFragment implements Fragment {
private Table table;
@@ -127,7 +128,7 @@ public class BlockInventoryFragment implements Fragment {
}
if(row == 0){
table.addImage("icon-items-none").color(Color.LIGHT_GRAY);
table.setSize(0f, 0f);
}
updateTablePosition();
@@ -143,9 +144,9 @@ public class BlockInventoryFragment implements Fragment {
}
private void updateTablePosition(){
Vector2 v = Graphics.screen(tile.drawx(), tile.drawy());
Vector2 v = Graphics.screen(tile.drawx() + tile.block().size * tilesize/2f, tile.drawy() + tile.block().size * tilesize/2f);
table.pack();
table.setPosition(v.x, v.y, Align.center);
table.setPosition(v.x, v.y, Align.topLeft);
}
@Remote(called = Loc.server, targets = Loc.both, in = In.blocks)