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

Fixed #9714

Browse Source
This commit is contained in:
Anuken
2024-04-06 18:20:45 -04:00
parent 08c8ab08a2
commit 33f01112ca
5 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/blocks/payloads/PayloadLoader.java
View File

@@ -76,7 +76,7 @@ public class PayloadLoader extends PayloadBlock{
public void init(){
if(loadPowerDynamic){
basePowerUse = consPower != null ? consPower.usage : 0f;
consumePowerDynamic((PayloadLoaderBuild loader) -> loader.shouldConsume() ? (loader.hasBattery() && !loader.exporting ? maxPowerConsumption + basePowerUse : basePowerUse) : 0f);
consumePowerDynamic(basePowerUse, (PayloadLoaderBuild loader) -> loader.shouldConsume() ? (loader.hasBattery() && !loader.exporting ? maxPowerConsumption + basePowerUse : basePowerUse) : 0f);
}
super.init();

2
core/src/mindustry/world/blocks/payloads/PayloadUnloader.java
View File

@@ -87,7 +87,7 @@ public class PayloadUnloader extends PayloadLoader{
(liquids.current() == payload.build.liquids.current() || liquids.currentAmount() <= 0.2f)){
var liq = payload.build.liquids.current();
float remaining = liquidCapacity - liquids.currentAmount();
float flow = Math.min(Math.min(liquidsLoaded * delta(), remaining), payload.build.liquids.currentAmount());
float flow = Math.min(Math.min(liquidsLoaded * edelta(), remaining), payload.build.liquids.currentAmount());
liquids.add(liq, flow);
payload.build.liquids.remove(liq, flow);

2
core/src/mindustry/world/blocks/units/UnitFactory.java
View File

@@ -137,7 +137,7 @@ public class UnitFactory extends UnitBlock{
}
ItemStack stack = plan.requirements[i];
req.add(new ItemDisplay(stack.item, stack.amount, false)).pad(5);
req.add(new ItemDisplay(stack.item, stack.amount, plan.time, true)).pad(5);
}
}).right().grow().pad(10f);
}else{