diff options
| author | Martin Robertz <dream-master@gmx.net> | 2018-12-28 22:47:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-28 22:47:44 +0100 |
| commit | 55cff40b6b72996eae1eb17561d456c779799941 (patch) | |
| tree | a954c744fccc7e8a9f1b8cae468ab11d5c8eb6b7 /src | |
| parent | 05cc5ab80d225406350b32f001529809c07dcc56 (diff) | |
| parent | bee0356396ceca535d986cc22535cee87bc7e19d (diff) | |
| download | GT5-Unofficial-55cff40b6b72996eae1eb17561d456c779799941.tar.gz GT5-Unofficial-55cff40b6b72996eae1eb17561d456c779799941.tar.bz2 GT5-Unofficial-55cff40b6b72996eae1eb17561d456c779799941.zip | |
Merge pull request #169 from phyzzylime/lce-fix
Fix Large combustion engine outputs 9x energy when boosted
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java index 46778d7a45..1dfdf0f58d 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java @@ -96,7 +96,7 @@ public class GT_MetaTileEntity_DieselEngine extends GT_MetaTileEntity_MultiBlock fuelValue = aFuel.mSpecialValue; fuelRemaining = hatchFluid1.amount; //Record available fuel - this.mEUt = mEfficiency < 2000 ? 0 : (int) ((boostEu?6144:2048) * (((float) Math.min(mEfficiency,10000)) / 10000)); //Output 0 if startup is less than 20% + this.mEUt = mEfficiency < 2000 ? 0 : 2048; //Output 0 if startup is less than 20% this.mProgresstime = 1; this.mMaxProgresstime = 1; this.mEfficiencyIncrease = 15; @@ -266,7 +266,7 @@ public class GT_MetaTileEntity_DieselEngine extends GT_MetaTileEntity_MultiBlock StatCollector.translateToLocal("GT5U.multiblock.energy")+": " + EnumChatFormatting.GREEN + Long.toString(storedEnergy) + EnumChatFormatting.RESET +" EU / "+ EnumChatFormatting.YELLOW + Long.toString(maxEnergy) + EnumChatFormatting.RESET +" EU", - StatCollector.translateToLocal("GT5U.engine.output")+": " +EnumChatFormatting.RED+(-mEUt)+EnumChatFormatting.RESET+" EU/t", + StatCollector.translateToLocal("GT5U.engine.output")+": " +EnumChatFormatting.RED+(-mEUt*mEfficiency/10000)+EnumChatFormatting.RESET+" EU/t", StatCollector.translateToLocal("GT5U.engine.consumption")+": " +EnumChatFormatting.YELLOW+fuelConsumption+EnumChatFormatting.RESET+" L/t", StatCollector.translateToLocal("GT5U.engine.value")+": " +EnumChatFormatting.YELLOW+fuelValue+EnumChatFormatting.RESET+" EU/L", StatCollector.translateToLocal("GT5U.turbine.fuel")+": " +EnumChatFormatting.GOLD+fuelRemaining+EnumChatFormatting.RESET+" L", |