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

Resolved some of the power-related TODOs

Browse Source
This commit is contained in:
Timmeey86
2018-11-29 00:38:53 +01:00
parent 12ccc10e83
commit 4cb72c1998
4 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,6 @@ public class DebugBlocks extends BlockList implements ContentList{
public void load(){
powerVoid = new PowerBlock("powervoid"){
{
// TODO Adapt to new power system if necessary
consumes.powerDirect(Float.MAX_VALUE);
shadow = "shadow-round-1";
}
@@ -54,8 +53,7 @@ public class DebugBlocks extends BlockList implements ContentList{
@Override
public void init(){
super.init();
// TODO Adapt to new power system if necessary
//stats.remove(BlockStat.powerCapacity);
stats.remove(BlockStat.powerUse);
}
};
@@ -67,7 +65,6 @@ public class DebugBlocks extends BlockList implements ContentList{
shadow = "shadow-round-1";
}
// TODO Adapt to new power system if necessary
@Override
public float getPowerProduction(Tile tile){
return 10000f;

4
core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java
View File

@@ -22,8 +22,6 @@ public class LiquidBlocks extends BlockList implements ContentList{
pumpAmount = 0.2f;
consumes.powerDirect(0.015f);
liquidCapacity = 30f;
// TODO Verify: No longer buffered
consumes.powerDirect(20f / 60f);
hasPower = true;
size = 2;
tier = 1;
@@ -35,8 +33,6 @@ public class LiquidBlocks extends BlockList implements ContentList{
consumes.powerDirect(0.03f);
liquidCapacity = 40f;
hasPower = true;
// TODO Verify: No longer buffered
consumes.powerDirect(20f / 60f);
size = 2;
tier = 2;
}};