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

Merge pull request #1 from Timmeey86/baltitenger

Browse Source 
Fixed compiler errors/typos in PowerGraph
This commit is contained in:
Baltazár Radics
2018-11-19 22:17:06 +01:00
committed by GitHub
parent 8218cfc72c f5b8d8a60c
commit c1bb05c0a4
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,12 +34,12 @@ public class PowerGraph{
public float getPowerProduced(){ public float getPowerProduced(){
float powerProduced = 0f; float powerProduced = 0f;
for(Tile producer : producers){ for(Tile producer : producers){
totalInput += producer.block().getPowerProduction(producer); powerProduced += producer.block().getPowerProduction(producer);
} }
return powerProduced; return powerProduced;
} }
public float getPowrerNeeded(){ public float getPowerNeeded(){
float powerNeeded = 0f; float powerNeeded = 0f;
for(Tile consumer : consumers){ for(Tile consumer : consumers){
if(consumer.block().bufferedPowerConsumer){ if(consumer.block().bufferedPowerConsumer){
@@ -56,6 +56,7 @@ public class PowerGraph{
for(Tile battery : batteries){ for(Tile battery : batteries){
totalAccumulator += battery.entity.power.satisfaction * battery.block().basePowerUse; totalAccumulator += battery.entity.power.satisfaction * battery.block().basePowerUse;
} }
return totalAccumulator;
} }
public float getBatteryCapacity(){ public float getBatteryCapacity(){
@@ -63,6 +64,7 @@ public class PowerGraph{
for(Tile battery : batteries){ for(Tile battery : batteries){
totalCapacity += (1f - battery.entity.power.satisfaction) * battery.block().basePowerUse; totalCapacity += (1f - battery.entity.power.satisfaction) * battery.block().basePowerUse;
} }
return totalCapacity;
} }
public float useBatteries(float needed){ public float useBatteries(float needed){
@@ -78,8 +80,8 @@ public class PowerGraph{
public float chargeBatteries(float excess){ public float chargeBatteries(float excess){
float capacity = getBatteryCapacity(); float capacity = getBatteryCapacity();
float thing = Math.min(1, excess / capacity); float thing = Math.min(1, excess / capacity);
for(tile battery : batteries){ for(Tile battery : batteries){
battery.power.satisfaction += (1 - battery.power.satisfaction) * thing; battery.entity.power.satisfaction += (1 - battery.entity.power.satisfaction) * thing;
} }
return Math.min(excess, capacity); return Math.min(excess, capacity);
} }
@@ -88,9 +90,9 @@ public class PowerGraph{
float satisfaction = Math.min(1, produced / needed); float satisfaction = Math.min(1, produced / needed);
for(Tile consumer : consumers){ for(Tile consumer : consumers){
if(consumer.block().bufferedPowerConsumer){ if(consumer.block().bufferedPowerConsumer){
consumer.power.satisfaction += (1 - consumer.power.satisfaction) * satisfaction; consumer.entity.power.satisfaction += (1 - consumer.entity.power.satisfaction) * satisfaction;
}else{ }else{
consumer.power.satisfaction = satisfaction; consumer.entity.power.satisfaction = satisfaction;
} }
} }
} }
@@ -102,7 +104,7 @@ public class PowerGraph{
lastFrameUpdated = threads.getFrameID(); lastFrameUpdated = threads.getFrameID();
float powerNeeded = getPowrerNeeded(); float powerNeeded = getPowerNeeded();
float powerProduced = getPowerProduced(); float powerProduced = getPowerProduced();
if(powerNeeded > powerProduced){ if(powerNeeded > powerProduced){