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

Reverted to power system that wasn't broken

Browse Source
This commit is contained in:
Anuken
2018-11-07 20:30:02 -05:00
parent 9785745384
commit b449847ad1
1 changed files with 24 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,7 @@ import com.badlogic.gdx.utils.IntSet;
import com.badlogic.gdx.utils.ObjectSet; import com.badlogic.gdx.utils.ObjectSet;
import com.badlogic.gdx.utils.Queue; import com.badlogic.gdx.utils.Queue;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import io.anuke.ucore.core.Timers;
import static io.anuke.mindustry.Vars.threads; import static io.anuke.mindustry.Vars.threads;
@@ -37,63 +38,38 @@ public class PowerGraph{
lastFrameUpdated = threads.getFrameID(); lastFrameUpdated = threads.getFrameID();
boolean charge = false;
float totalInput = 0f; float totalInput = 0f;
float bufferInput = 0f;
for(Tile producer : producers){ for(Tile producer : producers){
if (producer.block().consumesPower) { totalInput += producer.entity.power.amount;
bufferInput += producer.entity.power.amount;
} else {
totalInput += producer.entity.power.amount;
}
} }
float maxOutput = 0f;
float bufferOutput = 0f;
for(Tile consumer : consumers){
if (consumer.block().outputsPower) {
bufferOutput += consumer.block().powerCapacity - consumer.entity.power.amount;
} else {
maxOutput += consumer.block().powerCapacity - consumer.entity.power.amount;
}
}
if (maxOutput < totalInput) {
charge = true;
}
if (totalInput + bufferInput <= 0.0001f || maxOutput + bufferOutput <= 0.0001f) {
return;
}
float bufferUsed = 0;
if (charge) {
bufferUsed = Math.min((totalInput - maxOutput) / bufferOutput, 1f);
} else {
bufferUsed = Math.min((maxOutput - totalInput) / bufferInput, 1f);
}
float inputUsed = charge ? Math.min((maxOutput + bufferOutput) / totalInput, 1f) : 1f;
for(Tile producer : producers){ for(Tile producer : producers){
if (producer.block().consumesPower) { float accumulator = producer.entity.power.amount;
if (!charge) {
producer.entity.power.amount -= producer.entity.power.amount * bufferUsed; if(accumulator <= 0.0001f) continue;
}
float toEach = accumulator / consumers.size;
float outputs = 0f;
for(Tile tile : consumers){
outputs += Math.min(tile.block().powerCapacity - tile.entity.power.amount, toEach) / toEach;
}
float finalEach = toEach / outputs * Timers.delta();
float buffer = 0f;
if(Float.isNaN(finalEach) || Float.isInfinite(finalEach)){
continue; continue;
} }
producer.entity.power.amount -= producer.entity.power.amount * inputUsed;
}
float outputSatisfied = charge ? 1f : Math.min((totalInput + bufferInput) / maxOutput, 1f); for(Tile tile : consumers){
for(Tile consumer : consumers){ float used = Math.min(tile.block().powerCapacity - tile.entity.power.amount, finalEach) * accumulator / totalInput;
if (consumer.block().outputsPower) { buffer += used;
if (charge) { tile.entity.power.amount += used;
consumer.entity.power.amount += (consumer.block().powerCapacity - consumer.entity.power.amount) * bufferUsed;
}
continue;
} }
consumer.entity.power.amount += (consumer.block().powerCapacity - consumer.entity.power.amount) * outputSatisfied;
producer.entity.power.amount -= buffer;
} }
} }