Merge pull request #386 from GTNewHorizons/OilCrackerSync

Added wrong boni to Oil Cracker

2 files changed, 5 insertions, 6 deletions

diff --git a/src/main/java/gregtech/api/enums/HeatingCoilLevel.java b/src/main/java/gregtech/api/enums/HeatingCoilLevel.java
index db94a3fe62..f4b28ede2b 100644
--- a/src/main/java/gregtech/api/enums/HeatingCoilLevel.java
+++ b/src/main/java/gregtech/api/enums/HeatingCoilLevel.java
@@ -50,14 +50,14 @@ public enum HeatingCoilLevel {
          * @return the coil Level, used for Parallels in the Multi Furnace for example
          */
         public byte getLevel() {
-            return (byte) Math.max(16, 2 << (this.ordinal() - 2));
+            return (byte) Math.min(16, 2 << (this.ordinal() - 2));
         }
 
         /**
          * @return the coil Discount, used for discount in the Multi Furnace for example
          */
         public byte getCostDiscount() {
-            return (byte) Math.min(1, 2 << (this.ordinal() - 1 - 6)); //-1 bcs. of none, -4 = offset
+            return (byte) Math.max(1, 2 << (this.ordinal() - 1 - 6)); //-1 bcs. of none, -4 = offset
         }
 
         public static HeatingCoilLevel getFromTier(byte tier){
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java
index 302a76b7b7..d0c3f1f8a0 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java
@@ -55,8 +55,7 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_MultiBlockBa
 		.addController("Front center")
 		.addCasingInfo("Clean Stainless Steel Machine Casing", 18)
 		.addOtherStructurePart("2 Rings of 8 Coils", "Each side of the controller")
-        .addInfo("Processing speed scales linearly with Coil tier:")
-        .addInfo("CuNi: 100%, FeAlCr: 150%, Ni4Cr: 200%, Fe50CW: 250%, etc.")
+        .addInfo("Gets 5% energy cost reduction per coil tier")
 		.addEnergyHatch("Any casing")
 		.addMaintenanceHatch("Any casing")
 		.addInputHatch("Steam/Hydrogen, Any middle ring casing")
@@ -108,11 +107,11 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_MultiBlockBa
                 this.mMaxProgresstime /= 2;
             }
 
+            this.mEUt *= Math.pow(0.95D, this.heatLevel.getTier());
+
             if (this.mEUt > 0)
                 this.mEUt = (-this.mEUt);
 
-            this.mMaxProgresstime = Math.max(mMaxProgresstime / heatLevel.getTier(), 1);
-
             this.mOutputFluids = new FluidStack[]{tRecipe.getFluidOutput(0)};
             return true;
         }