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

Make diode send power overflow

Browse Source 
Diode keeps one-way equalizing while the sending graph has batteries that are ¬ yet fully filled.
This commit is contained in:
Patrick 'Quezler' Mounier
2019-10-31 18:02:55 +01:00
parent e06ef72899
commit 3c6b2c9dbb
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/io/anuke/mindustry/world/blocks/power/PowerDiode.java
View File

@@ -3,6 +3,7 @@ package io.anuke.mindustry.world.blocks.power;
import io.anuke.arc.Core; import io.anuke.arc.Core;
import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.graphics.g2d.Draw;
import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.arc.math.Mathf;
import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
@@ -26,20 +27,30 @@ public class PowerDiode extends Block{
Tile back = getNearby(tile, (tile.rotation() + 2) % 4); Tile back = getNearby(tile, (tile.rotation() + 2) % 4);
Tile front = getNearby(tile, tile.rotation()); Tile front = getNearby(tile, tile.rotation());
if(back.block() == null || front.block() == null) return; if(back.block() == null || front.block() == null) return;
if(!back.block().hasPower || !front.block().hasPower) return;
if(!back.block().hasPower || !front.block().hasPower) return;
PowerGraph backGraph = back.entity.power.graph; PowerGraph backGraph = back.entity.power.graph;
PowerGraph frontGraph = front.entity.power.graph; PowerGraph frontGraph = front.entity.power.graph;
if(backGraph == frontGraph) return; if(backGraph == frontGraph) return;
if(backGraph.getBatteryStored() > 0f && backGraph.getBatteryStored() > frontGraph.getBatteryStored()){ // skip if the receiving graph is already full
float send = (backGraph.getBatteryStored() - frontGraph.getBatteryStored()) / 2; if(frontGraph.getBatteryStored() == frontGraph.getTotalBatteryCapacity()) return;
backGraph.useBatteries(send); // half the difference
frontGraph.chargeBatteries(send); float send = Mathf.clamp((backGraph.getBatteryStored() - frontGraph.getBatteryStored()) / 2, 0f, Integer.MAX_VALUE);
// send all overflow if all batteries of the sending graph are full
if(backGraph.getBatteryStored() == backGraph.getTotalBatteryCapacity()){
send += backGraph.getLastPowerProduced() - backGraph.getPowerNeeded();
} }
// limit offering to space available
send = Mathf.clamp(send, 0f, frontGraph.getTotalBatteryCapacity() - frontGraph.getBatteryStored());
if (send == 0f) return;
backGraph.useBatteries(send);
frontGraph.chargeBatteries(send);
} }
@Override @Override