diff options
| author | Daniel Mendes <70096037+Steelux8@users.noreply.github.com> | 2023-06-07 09:20:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-07 10:20:52 +0200 |
| commit | 776b26be55c726a240ae227e60892d44addc0d28 (patch) | |
| tree | 973446fe0188e117c896418273d65c31d5d55fc4 /src | |
| parent | 058432c024f1ab19571d74b20ca9155544344afb (diff) | |
| download | GT5-Unofficial-776b26be55c726a240ae227e60892d44addc0d28.tar.gz GT5-Unofficial-776b26be55c726a240ae227e60892d44addc0d28.tar.bz2 GT5-Unofficial-776b26be55c726a240ae227e60892d44addc0d28.zip | |
Change XL Plasma Penalty Formula and Fuel Values for New Plasmas (#656)
* Add plasma fuel value generation for Runite
* Change XL penalty formula's magic value
* Add new fuel values for the new plasmas
* spotlessApply (#657)
Co-authored-by: GitHub GTNH Actions <>
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src')
3 files changed, 18 insertions, 7 deletions
diff --git a/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java index 3f1b695869..3cebd55e00 100644 --- a/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java +++ b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java @@ -422,6 +422,7 @@ public class MaterialGenerator { new RecipeGen_MaterialProcessing(matInfo); new RecipeGen_DustGeneration(matInfo); new RecipeGen_Recycling(matInfo); + new RecipeGen_Plasma(matInfo); return true; } catch (final Throwable t) { Logger.MATERIALS("" + matInfo.getLocalizedName() + " failed to generate."); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java index ee61956770..108787f958 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java @@ -159,9 +159,9 @@ public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTur // Reduce produced power depending on the ratio between fuel value and turbine EU/t with the following // formula: - // EU/t = EU/t * MIN(1, ( ( (FuelValue / 100) ^ 2 ) / EUPerTurbine)) + // EU/t = EU/t * MIN(1, ( ( (FuelValue / 200) ^ 2 ) / EUPerTurbine)) int fuelValue = getFuelValue(new FluidStack(tFluids.get(0), 0)); - float magicValue = (fuelValue * 0.01f) * (fuelValue * 0.01f); + float magicValue = (fuelValue * 0.005f) * (fuelValue * 0.005f); float efficiencyLoss = Math.min(1.0f, magicValue / euPerTurbine); newPower *= efficiencyLoss; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java index ea77ce1761..1ce0a0524f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java @@ -40,11 +40,21 @@ public class RecipeGen_Plasma extends RecipeGen_Base { ? GT_Utility.getContainerItem(aPlasmaCell, true) : CI.emptyCells(1); if (ItemUtils.checkForInvalidItems(new ItemStack[] { aPlasmaCell, aContainerItem })) { - GT_Values.RA.addFuel( - GT_Utility.copyAmount(1L, aPlasmaCell), - aContainerItem, - (int) Math.max(1024L, 1024L * material.getMass()), - 4); + switch (material.getUnlocalizedName()) { + case "Force": + GT_Values.RA.addFuel(GT_Utility.copyAmount(1L, aPlasmaCell), aContainerItem, 150_000, 4); + case "Runite": + GT_Values.RA.addFuel(GT_Utility.copyAmount(1L, aPlasmaCell), aContainerItem, 350_000, 4); + case "CelestialTungsten": + GT_Values.RA.addFuel(GT_Utility.copyAmount(1L, aPlasmaCell), aContainerItem, 600_000, 4); + default: + GT_Values.RA.addFuel( + GT_Utility.copyAmount(1L, aPlasmaCell), + aContainerItem, + (int) Math.max(1024L, 1024L * material.getMass()), + 4); + + } } if (ItemUtils.checkForInvalidItems(new ItemStack[] { aCell, aPlasmaCell })) { GT_Values.RA.addVacuumFreezerRecipe(aPlasmaCell, aCell, (int) Math.max(material.getMass() * 2L, 1L)); |