Godforge afterparty (#3345)

Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: serenibyss <10861407+serenibyss@users.noreply.github.com>

1 files changed, 15 insertions, 16 deletions

diff --git a/src/main/java/tectech/util/GodforgeMath.java b/src/main/java/tectech/util/GodforgeMath.java
index 1a0fa96805..d4d43f01cf 100644
--- a/src/main/java/tectech/util/GodforgeMath.java
+++ b/src/main/java/tectech/util/GodforgeMath.java
@@ -2,12 +2,12 @@ package tectech.util;
 
 import java.math.BigInteger;
 
-import tectech.thing.metaTileEntity.multi.MTEForgeOfGods;
-import tectech.thing.metaTileEntity.multi.godforge_modules.MTEBaseModule;
-import tectech.thing.metaTileEntity.multi.godforge_modules.MTEExoticModule;
-import tectech.thing.metaTileEntity.multi.godforge_modules.MTEMoltenModule;
-import tectech.thing.metaTileEntity.multi.godforge_modules.MTEPlasmaModule;
-import tectech.thing.metaTileEntity.multi.godforge_modules.MTESmeltingModule;
+import tectech.thing.metaTileEntity.multi.godforge.MTEBaseModule;
+import tectech.thing.metaTileEntity.multi.godforge.MTEExoticModule;
+import tectech.thing.metaTileEntity.multi.godforge.MTEForgeOfGods;
+import tectech.thing.metaTileEntity.multi.godforge.MTEMoltenModule;
+import tectech.thing.metaTileEntity.multi.godforge.MTEPlasmaModule;
+import tectech.thing.metaTileEntity.multi.godforge.MTESmeltingModule;
 
 public class GodforgeMath {
 
@@ -150,14 +150,13 @@ public class GodforgeMath {
         }
 
         if (godforge.isUpgradeActive(6)) {
+            fuelFactorMultiplier = 1 + calculateEffectiveFuelFactor(godforge) / 15f;
             if (godforge.isUpgradeActive(13)) {
                 if (isMoltenOrSmeltingWithUpgrade) {
-                    fuelFactorMultiplier = 1 + calculateEffectiveFuelFactor(godforge) / 15f * 3;
+                    fuelFactorMultiplier *= 3;
                 } else {
-                    fuelFactorMultiplier = 1 + calculateEffectiveFuelFactor(godforge) / 15f * 2;
+                    fuelFactorMultiplier *= 2;
                 }
-            } else {
-                fuelFactorMultiplier = 1 + calculateEffectiveFuelFactor(godforge) / 15f;
             }
         }
 
@@ -197,7 +196,7 @@ public class GodforgeMath {
         double maxBatteryDiscount = 1;
 
         if (godforge.isUpgradeActive(8)) {
-            maxBatteryDiscount = 1 - (1 - Math.pow(1.001, -0.01 * godforge.getMaxBatteryCharge())) / 20;
+            maxBatteryDiscount = 1 - (1 - Math.pow(1.05, -0.05 * godforge.getMaxBatteryCharge())) / 20;
         }
 
         if (godforge.isUpgradeActive(19)) {
@@ -211,12 +210,12 @@ public class GodforgeMath {
         }
 
         if (module instanceof MTEExoticModule) {
-            if (!godforge.isUpgradeActive(25)) {
-                fillRatioDiscount = 1;
-                maxBatteryDiscount = 1;
-            } else {
+            if (godforge.isUpgradeActive(25)) {
                 fillRatioDiscount = Math.sqrt(fillRatioDiscount);
                 maxBatteryDiscount = Math.sqrt(maxBatteryDiscount);
+            } else {
+                fillRatioDiscount = 1;
+                maxBatteryDiscount = 1;
             }
         }
 
@@ -224,7 +223,7 @@ public class GodforgeMath {
     }
 
     public static void calculateProcessingVoltageForModules(MTEBaseModule module, MTEForgeOfGods godforge) {
-        long voltage = Integer.MAX_VALUE;
+        long voltage = 2_000_000_000;
 
         if (godforge.isUpgradeActive(4)) {
             voltage += calculateEffectiveFuelFactor(godforge) * 100_000_000L;