From ba377d21ef10bc91b89438d0722759556131dbb6 Mon Sep 17 00:00:00 2001 From: Timo Ley Date: Fri, 2 Dec 2022 11:34:29 +0100 Subject: [PATCH] fix: balance turbines --- src/main/java/atomicscience/AtomicScience.java | 4 ++-- src/main/java/atomicscience/jiqi/TTurbine.java | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/atomicscience/AtomicScience.java b/src/main/java/atomicscience/AtomicScience.java index ececec4..a7bb9e9 100644 --- a/src/main/java/atomicscience/AtomicScience.java +++ b/src/main/java/atomicscience/AtomicScience.java @@ -119,7 +119,7 @@ public class AtomicScience { public static CommonProxy proxy; @Metadata("AtomicScience") public static ModMetadata metadata; private static final String[] LANGUAGES = new String[] {"en_US"}; - public static float WOLUN_MULTIPLIER_OUTPUT = 30.0F; + public static float WOLUN_MULTIPLIER_OUTPUT = 15.0F; public static boolean ALLOW_LAYERED_TURBINES = true; public static boolean ALLOW_TOXIC_WASTE = true; public static boolean ALLOW_RADIOACTIVE_ORES = true; @@ -174,7 +174,7 @@ public class AtomicScience { EnumHelper.addArmorMaterial("HAZMAT", 0, new int[] {0, 0, 0, 0}, 0); public static OreGenBase uraniumOreGeneration; public static int URANIUM_HEXAFLOURIDE_RATIO = 200; - public static int STEAM_RATIO = 40; + public static int STEAM_RATIO = 120; public static final String QIZI_FAN_WU_SU_BAO_ZHA = FlagRegistry.registerFlag("ban_antimatter_power"); public static final Logger LOGGER = Logger.getLogger("AtomicScience"); diff --git a/src/main/java/atomicscience/jiqi/TTurbine.java b/src/main/java/atomicscience/jiqi/TTurbine.java index 781d249..812e2ba 100644 --- a/src/main/java/atomicscience/jiqi/TTurbine.java +++ b/src/main/java/atomicscience/jiqi/TTurbine.java @@ -45,10 +45,12 @@ public class TTurbine extends TileEntityUniversalProducer @Override public void updateEntity() { super.updateEntity(); - if (this.tank.getFluid() != null && - this.tank.getFluidAmount() > AtomicScience.STEAM_RATIO) { - this.onReceiveSteam(AtomicScience.STEAM_RATIO); + if (this.tank.getFluid() != null && this.tank.getFluidAmount() > AtomicScience.STEAM_RATIO && !this.isMultiblock) { + this.onReceiveSteam(1); this.tank.drain(AtomicScience.STEAM_RATIO, true); + } else if (this.tank.getFluid() != null && this.tank.getFluidAmount() > AtomicScience.STEAM_RATIO * 9 && this.isMultiblock) { + this.onReceiveSteam(9); + this.tank.drain(AtomicScience.STEAM_RATIO * 9, true); } if (this.masterTurbine != null) { @@ -242,7 +244,7 @@ public class TTurbine extends TileEntityUniversalProducer } public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - return this.tank.fill(resource, doFill); + return this.masterTurbine == null ? this.tank.fill(resource, doFill) : 0; } public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { @@ -262,7 +264,7 @@ public class TTurbine extends TileEntityUniversalProducer @Override public boolean canFill(ForgeDirection arg0, Fluid arg1) { return arg1 == AtomicScience.FLUID_STEAM && - this.tank.getFluidAmount() < this.tank.getCapacity(); + this.tank.getFluidAmount() < this.tank.getCapacity() && this.masterTurbine == null; } @Override