Tooltip information on pollution is now dynamic, adjusted GT_Pollution

documentation

8 files changed, 10 insertions, 10 deletions

diff --git a/src/main/java/gregtech/common/GT_Pollution.java b/src/main/java/gregtech/common/GT_Pollution.java
index 2a2673379e..a950e8a2f2 100644
--- a/src/main/java/gregtech/common/GT_Pollution.java
+++ b/src/main/java/gregtech/common/GT_Pollution.java
@@ -32,11 +32,11 @@ public class GT_Pollution {
 	 * Lava Boiler(20)
 	 * High Pressure Boiler(20)
 	 * Bronze Blast Furnace(50)
-	 * Diesel Generator(14/28/75)
-	 * Gas Turbine(7/14/37)
+	 * Diesel Generator(40/80/160)
+	 * Gas Turbine(20/40/80)
 	 * Charcoal Pile(100)
 	 * 
-	 * Large Diesel Generator(300)
+	 * Large Diesel Engine(320)
 	 * Electric Blast Furnace(100)
 	 * Implosion Compressor(2000)
 	 * Large Boiler(240)
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 dd2a3a6848..b423ef92f8 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
@@ -51,7 +51,7 @@ public class GT_MetaTileEntity_DieselEngine extends GT_MetaTileEntity_MultiBlock
                 "Supply Diesel Fuel and Lubricant to run. Supply Oxygen to boost output (optional).",
                 "Default: Produces 2048EU/t at 100% efficiency",
                 "Boosted: Produces 6144EU/t at 150% efficiency",
-                "Causes 320 Pollution per second"};
+                "Causes " + 20 * getPollutionPerTick(null) + " Pollution per second"};
     }
 
     public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
index ef7701c490..5a596bf014 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
@@ -45,7 +45,7 @@ public class GT_MetaTileEntity_ElectricBlastFurnace
                 "1x Maintenance Hatch (Any bottom layer casing)",

                 "1x Muffler Hatch (Top middle)",

                 "Heat Proof Machine Casings for the rest",

-                "Causes 100 Pollution per second"};

+                "Causes " + 20 * getPollutionPerTick(null) + " Pollution per second"};

     }

 

     public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java
index 36aa52f7e9..81e9485ecf 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java
@@ -42,7 +42,7 @@ public class GT_MetaTileEntity_ImplosionCompressor
                 "1x Muffler Hatch (Any casing)",

                 "1x Energy Hatch (Any casing)",

                 "Solid Steel Casings for the rest (16 at least!)",

-                "Causes 2000 Pollution per second"};

+                "Causes " + 20 * getPollutionPerTick(null) + " Pollution per second"};

     }

 

     public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
index 5181e0418b..4a9130c761 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
@@ -49,7 +49,7 @@ public abstract class GT_MetaTileEntity_LargeBoiler
                 "1x Muffler Hatch (Any Firebox)",

                 "Diesel fuels have 1/4 efficiency",

                 String.format("Takes %.2f seconds to heat up", 500.0 / getEfficiencyIncrease()),

-                "Causes up to 360 Pollution per second"};

+                "Causes up to " + 20 * getPollutionPerTick(null) + " Pollution per second"};

     }

 

     public abstract Block getCasingBlock();

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java
index 081c50159a..8e98444472 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java
@@ -43,7 +43,7 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT
                 "Stainless Steel Turbine Casings for the rest (24 at least!)",
                 "Needs a Turbine Item (Inside controller GUI)",
                 "Output depending on Rotor: 102-6720EU/t",
-                "Causes 160 Pollution per second"};
+                "Causes " + 20 * getPollutionPerTick(null) + " Pollution per second"};
     }
 
     public int getFuelValue(FluidStack aLiquid) {
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
index 2feecb3271..71fcfceaa2 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
@@ -46,7 +46,7 @@ public class GT_MetaTileEntity_MultiFurnace
                 "1x Muffler Hatch (Top middle)",

                 "1x Energy Hatch (One of bottom)",

                 "Heat Proof Machine Casings for the rest",

-                "Causes 100 Pollution per second"};

+                "Causes " + 20 * getPollutionPerTick(null) + " Pollution per second"};

     }

 

     public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java
index ad09a1ae37..00ce54c9f6 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java
@@ -40,7 +40,7 @@ public class GT_MetaTileEntity_PyrolyseOven extends GT_MetaTileEntity_MultiBlock
                 "1x Muffler Hatch (Centered 3x1x3 area in Top layer)",
                 "1x Energy Hatch (Any bottom layer casing)",
                 "ULV Machine Casings for the rest (60 at least!)",
-                "Causes 400 Pollution per second"};
+                "Causes " + 20 * getPollutionPerTick(null) + " Pollution per second"};
     }
 
     public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {