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

Merge branch 'master' into crater

Browse Source 
# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites3.png
This commit is contained in:
Patrick 'Quezler' Mounier
2020-04-23 21:10:48 +02:00
parent 561198f517 7091cad704
commit 39266d23c8
140 changed files with 6579 additions and 6547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/mindustry/entities/def/TileComp.java
View File

@@ -615,12 +615,6 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc, QuadTree
}
}
public void drawLayer(){
}
public void drawLayer2(){
}
public void drawCracks(){
if(!damaged() || block.size > Block.maxCrackSize) return;
int id = pos();
@@ -824,7 +818,7 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc, QuadTree
l.clearChildren();
for(Item item : content.items()){
if(items.flownBits() != null && items.flownBits().get(item.id)){
l.addImage(item.icon(Cicon.small)).padRight(3f);
l.image(item.icon(Cicon.small)).padRight(3f);
l.label(() -> items.getFlowRate(item) < 0 ? "..." : Strings.fixed(items.getFlowRate(item), 1) + ps).color(Color.lightGray);
l.row();
}
@@ -845,7 +839,7 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc, QuadTree
table.row();
table.table(l -> {
l.left();
l.addImage(() -> liquids.current().icon(Cicon.small)).padRight(3f);
l.image(() -> liquids.current().icon(Cicon.small)).padRight(3f);
l.label(() -> liquids.getFlowRate() < 0 ? "..." : Strings.fixed(liquids.getFlowRate(), 2) + ps).color(Color.lightGray);
});
}