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

Improved liquid bridge throughput

Browse Source
This commit is contained in:
Anuken
2021-01-25 16:16:38 -05:00
parent 5930e3c350
commit b83c76f728
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/entities/comp/BuildingComp.java
View File

@@ -536,6 +536,10 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
} }
public void dumpLiquid(Liquid liquid){ public void dumpLiquid(Liquid liquid){
dumpLiquid(liquid, 2f);
}
public void dumpLiquid(Liquid liquid, float scaling){
int dump = this.cdump; int dump = this.cdump;
if(liquids.get(liquid) <= 0.0001f) return; if(liquids.get(liquid) <= 0.0001f) return;
@@ -551,7 +555,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
float ofract = other.liquids.get(liquid) / other.block.liquidCapacity; float ofract = other.liquids.get(liquid) / other.block.liquidCapacity;
float fract = liquids.get(liquid) / block.liquidCapacity; float fract = liquids.get(liquid) / block.liquidCapacity;
if(ofract < fract) transferLiquid(other, (fract - ofract) * block.liquidCapacity / 2f, liquid); if(ofract < fract) transferLiquid(other, (fract - ofract) * block.liquidCapacity / scaling, liquid);
} }
} }

2
core/src/mindustry/world/blocks/liquid/LiquidBridge.java
View File

@@ -29,7 +29,7 @@ public class LiquidBridge extends ItemBridge{
Building other = world.build(link); Building other = world.build(link);
if(other == null || !linkValid(tile, other.tile())){ if(other == null || !linkValid(tile, other.tile())){
dumpLiquid(liquids.current()); dumpLiquid(liquids.current(), 1f);
}else{ }else{
((ItemBridgeBuild)other).incoming.add(tile.pos()); ((ItemBridgeBuild)other).incoming.add(tile.pos());

2
core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java
View File

@@ -28,7 +28,7 @@ public class LiquidExtendingBridge extends ExtendingItemBridge{
Building other = world.build(link); Building other = world.build(link);
if(other == null || !linkValid(tile, other.tile())){ if(other == null || !linkValid(tile, other.tile())){
dumpLiquid(liquids.current()); dumpLiquid(liquids.current(), 1f);
}else{ }else{
((ItemBridgeBuild)other).incoming.add(tile.pos()); ((ItemBridgeBuild)other).incoming.add(tile.pos());