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

Fixed #1215 - made all valid floors show up in drill mine list

Browse Source
This commit is contained in:
Anuken
2019-12-15 16:29:11 -05:00
parent 7d2354a653
commit 9f3dcdf727
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/src/io/anuke/mindustry/world/blocks/production/Drill.java
View File

@@ -14,7 +14,6 @@ import io.anuke.mindustry.gen.*;
import io.anuke.mindustry.graphics.*; import io.anuke.mindustry.graphics.*;
import io.anuke.mindustry.type.*; import io.anuke.mindustry.type.*;
import io.anuke.mindustry.ui.*; import io.anuke.mindustry.ui.*;
import io.anuke.mindustry.ui.Cicon;
import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.*;
import io.anuke.mindustry.world.meta.*; import io.anuke.mindustry.world.meta.*;
@@ -179,23 +178,23 @@ public class Drill extends Block{
super.setStats(); super.setStats();
stats.add(BlockStat.drillTier, table -> { stats.add(BlockStat.drillTier, table -> {
Array<Item> list = new Array<>(); Array<Block> list = content.blocks().select(b -> b.isFloor() && b.asFloor().itemDrop != null && b.asFloor().itemDrop.hardness <= tier);
for(Item item : content.items()){ table.table(l -> {
if(tier >= item.hardness && Core.atlas.has(item.name + "1")){ l.left();
list.add(item);
for(int i = 0; i < list.size; i++){
Block item = list.get(i);
l.addImage(item.icon(Cicon.small)).size(8 * 3).padRight(2).padLeft(2).padTop(3).padBottom(3);
l.add(item.localizedName).left().padLeft(1).padRight(4);
if(i % 5 == 4){
l.row();
}
} }
} });
for(int i = 0; i < list.size; i++){
Item item = list.get(i);
table.addImage(Core.atlas.find(item.name + "1")).size(8 * 3).padRight(2).padLeft(2).padTop(3).padBottom(3);
table.add(item.localizedName);
if(i != list.size - 1){
table.add("/").padLeft(5).padRight(5);
}
}
}); });
stats.add(BlockStat.drillSpeed, 60f / drillTime * size * size, StatUnit.itemsSecond); stats.add(BlockStat.drillSpeed, 60f / drillTime * size * size, StatUnit.itemsSecond);