diff options
| author | Johannes Gäßler <updrn@student.kit.edu> | 2017-04-15 19:05:57 +0200 |
|---|---|---|
| committer | Johannes Gäßler <updrn@student.kit.edu> | 2017-04-15 19:05:57 +0200 |
| commit | d79721085e31208d62a613ca2f4f409037ba1c01 (patch) | |
| tree | dfd6d677deaa728e63358219b91fe334ff7ea951 /src/main/java/gregtech/common/tileentities/generators | |
| parent | 234c51ac200c5c48cb00ab578f5f4860d161ea92 (diff) | |
| download | GT5-Unofficial-d79721085e31208d62a613ca2f4f409037ba1c01.tar.gz GT5-Unofficial-d79721085e31208d62a613ca2f4f409037ba1c01.tar.bz2 GT5-Unofficial-d79721085e31208d62a613ca2f4f409037ba1c01.zip | |
Tooltips have more info on Steam and pollution, adjusted pollution rates
Boilers tooltips now explicitly state the amount of Steam produced per
second.
Gas Turbine tooltips now explicitly state how much steam is needed for
them to run at full capacity.
Machine tooltips now explicitly state how much Pollution they produce
per second.
Adjusted machine pollution values to have them align better.
Diesel Generators / Engines now go 40, 80, 160, 320
Gas Turbines now go 20, 40, 80, 160
Large Boiler tooltips now mention the amount of time needed to heat up
Formatted the source code for the Cleanroom
Fixed a bug that caused Diesel Generators and Gas Turbines to not have a
tooltip.
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/generators')
3 files changed, 20 insertions, 6 deletions
diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java index 158c2dd624..47a0cbd95c 100644 --- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java +++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java @@ -18,10 +18,15 @@ import net.minecraft.item.ItemStack; public class GT_MetaTileEntity_DieselGenerator
extends GT_MetaTileEntity_BasicGenerator {
+ public static final int BASE_POLLUTION = 2;
+
public int mEfficiency;
public GT_MetaTileEntity_DieselGenerator(int aID, String aName, String aNameRegional, int aTier) {
- super(aID, aName, aNameRegional, aTier, "Requires liquid Fuel", new ITexture[0]);
+ super(aID, aName, aNameRegional, aTier, new String[]{
+ "Requires liquid Fuel",
+ "Causes " + (int) (20 * BASE_POLLUTION * Math.pow(2, aTier - 1)) + " Pollution per second"},
+ new ITexture[0]);
onConfigLoad();
}
@@ -110,6 +115,6 @@ public class GT_MetaTileEntity_DieselGenerator @Override
public int getPollution() {
- return 10;
+ return (int) (GT_MetaTileEntity_DieselGenerator.BASE_POLLUTION * Math.pow(2, mTier - 1));
}
}
diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java index ec815be51c..5ecde5a827 100644 --- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java +++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java @@ -13,10 +13,15 @@ import gregtech.api.util.GT_Recipe; public class GT_MetaTileEntity_GasTurbine
extends GT_MetaTileEntity_BasicGenerator {
+ public static final int BASE_POLLUTION = 1;
+
public int mEfficiency;
+
public GT_MetaTileEntity_GasTurbine(int aID, String aName, String aNameRegional, int aTier) {
- super(aID, aName, aNameRegional, aTier, "Requires flammable Gasses", new ITexture[0]);
+ super(aID, aName, aNameRegional, aTier, new String[]{
+ "Requires flammable Gasses",
+ "Causes " + (int) (20 * BASE_POLLUTION * Math.pow(2, aTier - 1)) + " Pollution per second"});
onConfigLoad();
}
@@ -97,6 +102,6 @@ public class GT_MetaTileEntity_GasTurbine @Override
public int getPollution() {
- return 5;
+ return (int) (GT_MetaTileEntity_GasTurbine.BASE_POLLUTION * Math.pow(2, mTier - 1));
}
}
diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java index e86a792ac3..c91ddc004b 100644 --- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java +++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java @@ -17,7 +17,9 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener public int mEfficiency;
public GT_MetaTileEntity_SteamTurbine(int aID, String aName, String aNameRegional, int aTier) {
- super(aID, aName, aNameRegional, aTier, "Requires Steam to run", new ITexture[0]);
+ super(aID, aName, aNameRegional, aTier, new String[]{
+ "Converts Steam into EU",
+ "Base rate: 2L of Steam -> 1 EU"}, new ITexture[0]);
onConfigLoad();
}
@@ -45,9 +47,11 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener @Override
public String[] getDescription() {
- String[] desc = new String[mDescription.length + 1];
+ String[] desc = new String[mDescription.length + 2];
System.arraycopy(mDescription, 0, desc, 0, mDescription.length);
desc[mDescription.length] = "Fuel Efficiency: " + (600 / getEfficiency()) + "%";
+ desc[mDescription.length + 1] = String.format("Consumes up to %sL of Steam per second",
+ (int) (4000 * (8 * Math.pow(4, mTier) + Math.pow(2, mTier)) / (600 / getEfficiency())));
return desc;
}
|