diff options
Diffstat (limited to 'src/Java/gtPlusPlus/xmod')
3 files changed, 21 insertions, 17 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java index db787c5e80..bef16c0bf7 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java @@ -60,16 +60,18 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_ @Override public String[] getDescription() { if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - String aPollution = "Causes " + getPollution() + " Pollution per second"; + int pollMin = mTier == 4 ? 250 : (mTier == 5 ? 500 : 750); + int pollMax = mTier == 4 ? 2000 : (mTier == 5 ? 4000 : 6000); + String aPollution = "Causes between "+pollMin+" and "+pollMax+ " Pollution per second"; return new String[]{ this.mDescription, - "Fuel Efficiency: " + this.getEfficiency() + "%", + "Fuel Efficiency: " + this.getEfficiency()*2 + "%", aPollution, CORE.GT_Tooltip}; } return new String[]{ this.mDescription, - "Fuel Efficiency: " + this.getEfficiency() + "%", + "Fuel Efficiency: " + this.getEfficiency()*2 + "%", CORE.GT_Tooltip}; } @@ -160,7 +162,7 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_ @Override public long maxEUStore() { - return Math.max(this.getEUVar(), (V[this.mTier] * 80) + this.getMinimumStoredEU()); + return Math.max(this.getEUVar(), (V[this.mTier] * 500) + this.getMinimumStoredEU()); } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java index 2ddb2f90f0..facba4fb57 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java @@ -136,4 +136,9 @@ extends GregtechRocketFuelGeneratorBase { public ITexture[] getSidesActive(final byte aColor) { return new ITexture[]{super.getSidesActive(aColor)[0], this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal_Active)}; } + + @Override + public int getPollution() { + return 250; + } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java index b3a1fb4cee..288501086b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java @@ -14,8 +14,8 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Recipe; -import gregtech.common.tileentities.generators.GT_MetaTileEntity_DieselGenerator; -import gtPlusPlus.core.lib.CORE; +import gregtech.api.util.Recipe_GT; +import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechRocketFuelGeneratorBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -25,7 +25,7 @@ extends GregtechRocketFuelGeneratorBase { public int mEfficiency; public GregtechMetaTileEntityRocketFuelGenerator(final int aID, final String aName, final String aNameRegional, final int aTier) { - super(aID, aName, aNameRegional, aTier, "Requires Diesel-type liquid Fuels.", new ITexture[0]); + super(aID, aName, aNameRegional, aTier, "Requires Rocket Fuels.", new ITexture[0]); this.onConfigLoad(); } @@ -33,11 +33,6 @@ extends GregtechRocketFuelGeneratorBase { super(aName, aTier, aDescription, aTextures); this.onConfigLoad(); } - - @Override - public String[] getDescription() { - return new String[]{this.mDescription, "Generates power at " + (this.getEfficiency() * 2) + "% Efficiency per tick", CORE.GT_Tooltip}; - } @Override public boolean isOutputFacing(final byte aSide) { @@ -51,7 +46,7 @@ extends GregtechRocketFuelGeneratorBase { @Override public GT_Recipe.GT_Recipe_Map getRecipes() { - return GT_Recipe.GT_Recipe_Map.sDieselFuels; + return Recipe_GT.Gregtech_Recipe_Map.sRocketFuels; } @Override @@ -60,12 +55,12 @@ extends GregtechRocketFuelGeneratorBase { } public void onConfigLoad() { - this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "RocketEngine.efficiency.tier." + this.mTier, (100 - (this.mTier * 8))); + this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "RocketEngine.efficiency.tier." + this.mTier, ((40+((this.mTier) * 16))/4)+(this.mTier)); } @Override public int getEfficiency() { - return this.mEfficiency; + return ((40+((this.mTier) * 16))/4)+(this.mTier); } @Override @@ -143,7 +138,9 @@ extends GregtechRocketFuelGeneratorBase { return new ITexture[]{super.getSidesActive(aColor)[0], this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal_Active)}; } - public int getPollution() { - return (int) (GT_MetaTileEntity_DieselGenerator.BASE_POLLUTION * Math.pow(8, mTier + 1)); + public int getPollution() { + int pollMin = mTier == 4 ? 250 : (mTier == 5 ? 500 : 750); + int pollMax = mTier == 4 ? 2000 : (mTier == 5 ? 4000 : 6000); + return (int) (MathUtils.randInt(pollMin, pollMax)/20); } } |