diff --git a/common/mekanism/common/CommonProxy.java b/common/mekanism/common/CommonProxy.java index f78a198de..f4ccce63f 100644 --- a/common/mekanism/common/CommonProxy.java +++ b/common/mekanism/common/CommonProxy.java @@ -190,6 +190,7 @@ public class CommonProxy Mekanism.TO_BC = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "MJToJoules", .04D).getDouble(.04D); Mekanism.ENERGY_PER_REDSTONE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyPerRedstone", 10000D).getDouble(10000D); Mekanism.VOICE_PORT = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "VoicePort", 36123).getInt(); + Mekanism.upgradeModifier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL,"UpgradeModifier", 10).getInt(); Mekanism.TO_TE = Mekanism.TO_BC*10; Mekanism.FROM_TE = Mekanism.FROM_BC/10; diff --git a/common/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java index a6e15276d..2c31e301e 100644 --- a/common/mekanism/common/Mekanism.java +++ b/common/mekanism/common/Mekanism.java @@ -264,6 +264,7 @@ public class Mekanism public static int obsidianTNTDelay = 100; public static int UPDATE_DELAY = 10; public static int VOICE_PORT = 36123; + public static int upgradeModifier = 10; public static double ENERGY_PER_REDSTONE = 10000; public static double TO_IC2; diff --git a/common/mekanism/common/util/MekanismUtils.java b/common/mekanism/common/util/MekanismUtils.java index e3722f5fc..5128214bd 100644 --- a/common/mekanism/common/util/MekanismUtils.java +++ b/common/mekanism/common/util/MekanismUtils.java @@ -606,7 +606,7 @@ public final class MekanismUtils */ public static int getTicks(int speedUpgrade, int def) { - return (int)(def * Math.pow(10, (-speedUpgrade/9.0))); + return (int)(def * Math.pow(Mekanism.upgradeModifier, (-speedUpgrade/(double)(Mekanism.upgradeModifier-1)))); } /** @@ -618,7 +618,7 @@ public final class MekanismUtils */ public static double getEnergyPerTick(int speedUpgrade, int energyUpgrade, double def) { - return def * Math.pow(10, ((speedUpgrade-energyUpgrade)/9.0)); + return def * Math.pow(Mekanism.upgradeModifier, ((speedUpgrade-energyUpgrade)/(double)(Mekanism.upgradeModifier-1))); } /** @@ -629,7 +629,7 @@ public final class MekanismUtils */ public static double getMaxEnergy(int energyUpgrade, double def) { - return def * Math.pow(10, (energyUpgrade/9.0)); + return def * Math.pow(Mekanism.upgradeModifier, (energyUpgrade/(double)(Mekanism.upgradeModifier-1))); } /**