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

fix of diode's strange behavior (#10454)

Browse Source
This commit is contained in:
Maxiron794
2025-02-04 19:32:52 +01:00
committed by GitHub
parent 5f48ba8858
commit aa8e3b4a37
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/src/mindustry/world/blocks/power/PowerDiode.java
View File

@@ -62,20 +62,23 @@ public class PowerDiode extends Block{
PowerGraph frontGraph = front().power.graph; PowerGraph frontGraph = front().power.graph;
if(backGraph == frontGraph) return; if(backGraph == frontGraph) return;
// 0f - 1f of battery capacity in use float backStored = backGraph.getBatteryStored();
float backStored = backGraph.getBatteryStored() / backGraph.getTotalBatteryCapacity(); float backCapacity = backGraph.getTotalBatteryCapacity();
float frontStored = frontGraph.getBatteryStored() / frontGraph.getTotalBatteryCapacity(); float frontStored = frontGraph.getBatteryStored();
float frontCapacity = frontGraph.getTotalBatteryCapacity();
// try to send if the back side has more % capacity stored than the front side if(backStored/backCapacity <= frontStored/frontCapacity) return;
if(backStored > frontStored){
// send half of the difference
float amount = backGraph.getBatteryStored() * (backStored - frontStored) / 2;
// prevent sending more than the front can handle
amount = Mathf.clamp(amount, 0, frontGraph.getTotalBatteryCapacity() * (1 - frontStored));
backGraph.transferPower(-amount); float targetPercentage = (frontStored + backStored) / (frontCapacity + backCapacity);
frontGraph.transferPower(amount);
} // send half of the difference
float amount = (targetPercentage * frontCapacity - frontStored) / 2;
// prevent sending more than the front can handle
amount = Mathf.clamp(amount, 0, frontCapacity - frontStored);
backGraph.transferPower(-amount);
frontGraph.transferPower(amount);
} }
} }
} }