diff options
author | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2021-01-07 17:23:46 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-07 17:23:46 +0100 |
commit | 7355c94bf2b9938765e7b2f6ccaa42e292d648c2 (patch) | |
tree | e85863333b5b2c5831ad18f354f5d1aace581ddd /src/main/java/gregtech | |
parent | 217d648805f2532658de407fb462ca663ab5a754 (diff) | |
download | GT5-Unofficial-7355c94bf2b9938765e7b2f6ccaa42e292d648c2.tar.gz GT5-Unofficial-7355c94bf2b9938765e7b2f6ccaa42e292d648c2.tar.bz2 GT5-Unofficial-7355c94bf2b9938765e7b2f6ccaa42e292d648c2.zip |
Re-tiered Mufflers for now (#391)
Diffstat (limited to 'src/main/java/gregtech')
-rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java index b3998b62e7..1e5c86108b 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java @@ -35,8 +35,8 @@ public class GT_MetaTileEntity_Hatch_Muffler extends GT_MetaTileEntity_Hatch { System.arraycopy(mDescriptionArray, 0, desc, 0, mDescriptionArray.length); desc[mDescriptionArray.length] = "DO NOT OBSTRUCT THE OUTPUT!"; desc[mDescriptionArray.length + 1] = "Reduces Pollution to " + calculatePollutionReduction(100) + "%"; - //Pollution Recovery scales from 5% at LV to 100% at MAX Voltage - desc[mDescriptionArray.length + 2] = "Recovers " + (105 - calculatePollutionReduction(100)) + "% of CO2/CO/SO2"; + //Pollution Recovery scales from 0% at LV to 100% at UHV Voltage + desc[mDescriptionArray.length + 2] = "Recovers " + (100 - calculatePollutionReduction(100)) + "% of CO2/CO/SO2"; return desc; } @@ -97,7 +97,9 @@ public class GT_MetaTileEntity_Hatch_Muffler extends GT_MetaTileEntity_Hatch { } public int calculatePollutionReduction(int aPollution) { - return (int) (aPollution * (Math.pow(0.85F, mTier - 1))); + if ((float) mTier < 2) + return aPollution; + return (int) ((float) aPollution * ((100F - (12.5F * ((float) mTier - 1F))) / 100F)); } @Override |