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

Finished first unit test (equal power input and output) and fixed bugs detected by it

Browse Source
This commit is contained in:
Timmeey86
2018-11-21 00:04:26 +01:00
parent 222d41c84a
commit 558c89cc30
3 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,8 +25,8 @@ public abstract class BaseBlock extends MappableContent{
public boolean outputsLiquid = false;
public boolean singleLiquid = true;
public boolean consumesPower;
public boolean outputsPower;
public boolean consumesPower = true;
public boolean outputsPower = false;
public boolean bufferedPowerConsumer = false;
/** In case of unbuffered consumers, this stores the amount of power which is required per tick in order to work at maximum efficiency.

10
core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java
View File

@@ -109,10 +109,12 @@ public class PowerGraph{
float powerNeeded = getPowerNeeded();
float powerProduced = getPowerProduced();
if(powerNeeded > powerProduced){
powerProduced += useBatteries(powerNeeded - powerProduced);
}else if(powerProduced > powerNeeded){
powerProduced -= chargeBatteries(powerProduced - powerNeeded);
if(Math.abs(powerNeeded - powerProduced) > 0.0001f){
if(powerNeeded > powerProduced){
powerProduced += useBatteries(powerNeeded-powerProduced);
}else if(powerProduced > powerNeeded){
powerProduced -= chargeBatteries(powerProduced-powerNeeded);
}
}
distributePower(powerNeeded, powerProduced);