SOFC Tweaks

- Improved the output of the Mk I and reduced oxygen consumption to make it more viable compared to using singleblock gas turbines;
- Tweaked the fuel consumption calculation to always round down;
- Clarified the fuel consumption speed in the tooltip;
- Changed the Mk II fuel consumption to save fuel if its fuel value is above 1M per bucket (Nitrobenzene gives 125% fuel efficiency instead of 100%).

2 files changed, 8 insertions, 7 deletions

diff --git a/src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java b/src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java
index 74162907f3..f244064282 100644
--- a/src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java
+++ b/src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java
@@ -32,9 +32,9 @@ import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
 
 public class GTMTE_SOFuelCellMK1  extends GT_MetaTileEntity_EnhancedMultiBlockBase<GTMTE_SOFuelCellMK1> {
 
-	private final int OXYGEN_PER_SEC = 400;
-	private final int EU_PER_TICK = 1024;
-	private final int STEAM_PER_SEC = 18000;
+	private final int OXYGEN_PER_SEC = 100;
+	private final int EU_PER_TICK = 2000;
+	private final int STEAM_PER_SEC = 20000;
 
 	public GTMTE_SOFuelCellMK1(int aID, String aName, String aNameRegional) {
 		super(aID, aName, aNameRegional);
@@ -81,7 +81,7 @@ public class GTMTE_SOFuelCellMK1  extends GT_MetaTileEntity_EnhancedMultiBlockBa
         final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
         tt.addMachineType("Gas Turbine")
             .addInfo("Oxidizes gas fuels to generate electricity without polluting the environment")
-            .addInfo("Consumes 29,480EU worth of fuel with up to 97% efficiency each second")
+            .addInfo("Consumes up to" + (EU_PER_TICK * 20) + "EU worth of fuel with up to 100% efficiency each second")
             .addInfo("Steam production requires the SOFC to heat up completely first")
             .addInfo("Outputs " + EU_PER_TICK + "EU/t and " + STEAM_PER_SEC + "L/s Steam")
             .addInfo("Additionally, requires " + OXYGEN_PER_SEC + "L/s Oxygen gas")
@@ -146,7 +146,7 @@ public class GTMTE_SOFuelCellMK1  extends GT_MetaTileEntity_EnhancedMultiBlockBa
 					if((liquid = GT_Utility.getFluidForFilledItem(aFuel.getRepresentativeInput(0), true)) != null
 							&& hatchFluid.isFluidEqual(liquid)) {
 
-						liquid.amount = Math.round((EU_PER_TICK * 20) / aFuel.mSpecialValue);
+						liquid.amount = (int) Math.floor((EU_PER_TICK * 20) / aFuel.mSpecialValue);
 
 						if(super.depleteInput(liquid)) {
 
diff --git a/src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java b/src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java
index a527730d70..de1e9cc82f 100644
--- a/src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java
+++ b/src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java
@@ -83,7 +83,8 @@ public class GTMTE_SOFuelCellMK2  extends GT_MetaTileEntity_EnhancedMultiBlockBa
         final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
         tt.addMachineType("Gas Turbine")
             .addInfo("Oxidizes gas fuels to generate electricity without polluting the environment")
-            .addInfo("Consumes 442,200EU worth of fuel with up to 97% efficiency each second")
+            .addInfo("Consumes up to" + (EU_PER_TICK * 20) + "EU worth of fuel with up to 100% efficiency each second")
+            .addInfo("Nitrobenzene and other gas fuels above 1M EU/bucket are more efficient")
             .addInfo("Steam production requires the SOFC to heat up completely first")
             .addInfo("Outputs " + EU_PER_TICK + "EU/t and " + STEAM_PER_SEC + "L/s Steam")
             .addInfo("Additionally, requires " + OXYGEN_PER_SEC + "L/s Oxygen gas")
@@ -148,7 +149,7 @@ public class GTMTE_SOFuelCellMK2  extends GT_MetaTileEntity_EnhancedMultiBlockBa
 					if((liquid = GT_Utility.getFluidForFilledItem(aFuel.getRepresentativeInput(0), true)) != null
 							&& hatchFluid.isFluidEqual(liquid)) {
 
-						liquid.amount = Math.round((EU_PER_TICK * 20) / aFuel.mSpecialValue);
+                        liquid.amount = (int) (Math.floor((EU_PER_TICK * 20) / aFuel.mSpecialValue) / Math.max(1, aFuel.mSpecialValue / 1000));
 
 						if(super.depleteInput(liquid)) {