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

Better consumption display

Browse Source
This commit is contained in:
Anuken
2019-07-30 10:20:49 -04:00
parent 9db86f212f
commit 1340b8d4d8
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/io/anuke/mindustry/content/Blocks.java
View File

@@ -768,7 +768,6 @@ public class Blocks implements ContentList{
}}; }};
thruster = new Wall("thruster"){{ thruster = new Wall("thruster"){{
requirements(Category.defense, () -> state.rules.infiniteResources, ItemStack.with());
health = 55 * 16 * wallHealthMultiplier; health = 55 * 16 * wallHealthMultiplier;
size = 4; size = 4;
}}; }};
@@ -1079,12 +1078,12 @@ public class Blocks implements ContentList{
differentialGenerator = new SingleTypeGenerator(true, false, "differential-generator"){{ differentialGenerator = new SingleTypeGenerator(true, false, "differential-generator"){{
requirements(Category.power, ItemStack.with(Items.copper, 140, Items.titanium, 100, Items.lead, 200, Items.silicon, 130, Items.metaglass, 100)); requirements(Category.power, ItemStack.with(Items.copper, 140, Items.titanium, 100, Items.lead, 200, Items.silicon, 130, Items.metaglass, 100));
powerProduction = 16f; powerProduction = 16f;
itemDuration = 50f; itemDuration = 60f;
hasLiquids = true; hasLiquids = true;
size = 3; size = 3;
consumes.item(Items.pyratite).optional(true, false); consumes.item(Items.pyratite).optional(true, false);
consumes.liquid(Liquids.cryofluid, 0.2f); consumes.liquid(Liquids.cryofluid, 0.18f);
}}; }};
rtgGenerator = new DecayGenerator("rtg-generator"){{ rtgGenerator = new DecayGenerator("rtg-generator"){{

2
core/src/io/anuke/mindustry/world/Block.java
View File

@@ -584,7 +584,7 @@ public class Block extends BlockStorage{
public void displayConsumption(Tile tile, Table table){ public void displayConsumption(Tile tile, Table table){
table.left(); table.left();
for(Consume cons : consumes.all()){ for(Consume cons : consumes.all()){
if(cons.isOptional()) continue; if(cons.isOptional() && cons.isBoost()) continue;
cons.build(tile, table); cons.build(tile, table);
} }
} }

4
core/src/io/anuke/mindustry/world/consumers/Consume.java
View File

@@ -48,6 +48,10 @@ public abstract class Consume{
return optional; return optional;
} }
public boolean isBoost(){
return booster;
}
public boolean isUpdate(){ public boolean isUpdate(){
return update; return update;
} }