From 8d144b6fe33da0afa980f923313c2daf3042c8c5 Mon Sep 17 00:00:00 2001 From: GDCloud Date: Fri, 3 Mar 2023 22:44:41 +0100 Subject: Fix yield scanner info --- .../thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java index 3a1dd00c67..6d03e61068 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java @@ -1306,7 +1306,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl if (recipeRunning) { str.add(GOLD + "---------------------- Other Stats ---------------"); str.add("Recipe Success Chance: " + RED + formatNumbers(100 * successChance) + RESET + "%"); - str.add("Recipe Yield: " + RED + formatNumbers(100 * successChance) + RESET + "%"); + str.add("Recipe Yield: " + RED + formatNumbers(100 * recipeYieldCalculator()) + RESET + "%"); str.add("EU Output: " + RED + formatNumbers(euOutput) + RESET + " EU"); if (mOutputFluids.length > 0) { // Star matter is always the last element in the array. -- cgit From 7b91dfe22500a293295e75a978d418af91180f6c Mon Sep 17 00:00:00 2001 From: GDCloud Date: Fri, 3 Mar 2023 22:45:13 +0100 Subject: Fix spacetime compression bonus --- .../thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java index 6d03e61068..b620b29c8e 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java @@ -773,7 +773,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl final long spacetimeCasingDifference = (recipeSpacetimeCasingRequired - spacetimeCompressionFieldMetadata); final double recipeTimeDiscounted = recipeTime * pow(2.0, -timeAccelerationFieldMetadata) - * pow(1 - SPACETIME_CASING_DIFFERENCE_DISCOUNT_PERCENTAGE, spacetimeCasingDifference) + * pow(1 - SPACETIME_CASING_DIFFERENCE_DISCOUNT_PERCENTAGE, -spacetimeCasingDifference) / max(1, pow(2, currentCircuitMultiplier)); return (int) Math.max(recipeTimeDiscounted, 1.0); } -- cgit From 4e6cf4320bb20493055b1fe1c7212ff47d1971d7 Mon Sep 17 00:00:00 2001 From: GDCloud Date: Sat, 4 Mar 2023 00:21:03 +0100 Subject: special fluid adjustments --- .../github/technus/tectech/recipe/EyeOfHarmonyRecipe.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java index f19cb2daee..161e659d33 100644 --- a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java +++ b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java @@ -32,12 +32,12 @@ import gregtech.api.util.GT_OreDictUnificator; @SuppressWarnings("SpellCheckingInspection") public class EyeOfHarmonyRecipe { - static final FluidStack[] SPECIAL_FLUIDS = new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(576), - Materials.WhiteDwarfMatter.getMolten(576), Materials.WhiteDwarfMatter.getMolten(2_304), - Materials.WhiteDwarfMatter.getMolten(9_216), Materials.BlackDwarfMatter.getMolten(576), - Materials.BlackDwarfMatter.getMolten(2_304), Materials.BlackDwarfMatter.getMolten(9_216), - Materials.Universium.getMolten(576), Materials.Universium.getMolten(2_304), - Materials.Universium.getMolten(9_216) }; + static final FluidStack[] SPECIAL_FLUIDS = new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(1152), + Materials.WhiteDwarfMatter.getMolten(1152), Materials.WhiteDwarfMatter.getMolten(4_608), + Materials.WhiteDwarfMatter.getMolten(18_384), Materials.BlackDwarfMatter.getMolten(1152), + Materials.BlackDwarfMatter.getMolten(4_608), Materials.BlackDwarfMatter.getMolten(18_384), + Materials.Universium.getMolten(1152), Materials.Universium.getMolten(4_608), + Materials.Universium.getMolten(18_384) }; HashingStrategy itemStackHashingStrategy = new HashingStrategy() { -- cgit From 70d1a6aa2b0538f5f4f8005419b25b5dbb46eb4c Mon Sep 17 00:00:00 2001 From: GDCloud Date: Sat, 4 Mar 2023 00:22:15 +0100 Subject: Power output adjustments --- .../multi/GT_MetaTileEntity_EM_EyeOfHarmony.java | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java index b620b29c8e..4453a8a1ac 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java @@ -79,6 +79,8 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl // % Increase in recipe chance and % decrease in yield per tier. private static final double STABILITY_INCREASE_PROBABILITY_DECREASE_YIELD_PER_TIER = 0.05; + private static final int TOTAL_CASING_TIERS_WITH_POWER_PENALTY = 8; + private String userUUID = ""; private long euOutput = 0; @@ -903,7 +905,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl + " per tier (additive)") .addInfo(BLUE + "Stabilisation Field Generator:") .addInfo( - "- Increases the probability of a recipe succeeding by " + RED + "- Increases the power output and probability of a recipe succeeding by " + RED + formatNumbers(STABILITY_INCREASE_PROBABILITY_DECREASE_YIELD_PER_TIER * 100) + "%" + GRAY @@ -924,7 +926,8 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl .addInfo(TOOLTIP_BAR) .addInfo("It should be noted that base recipe chance is determined per recipe and yield always starts") .addInfo("at 1 and subtracts depending on penalities. All fluid/item outputs are multiplied by the") - .addInfo("yield. Failure fluid is exempt.").addInfo(TOOLTIP_BAR) + .addInfo("yield. Failure fluid is exempt. All power outputs start at 60% of what the recipes display.") + .addInfo(TOOLTIP_BAR) .addInfo("This multiblock can only output to ME output busses/hatches. If no space in the network") .addInfo( "is avaliable the items/fluids will be " + UNDERLINE + DARK_RED + "voided" + RESET + GRAY + ".") @@ -1227,15 +1230,17 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl destroyRenderBlock(); + // Output power with stabilization factor (5% loss per tier below gallifreyan) + addEUToGlobalEnergyMap( + userUUID, + (long) (euOutput * (1 - ((TOTAL_CASING_TIERS_WITH_POWER_PENALTY - stabilisationFieldMetadata) + * STABILITY_INCREASE_PROBABILITY_DECREASE_YIELD_PER_TIER)))); + euOutput = 0; + if (successChance < random()) { outputFailedChance(); outputItems = new ArrayList<>(); - addEUToGlobalEnergyMap( - userUUID, - (long) (currentRecipe.getEUStartCost() * pow(4, currentCircuitMultiplier) / 2L)); - } else { - addEUToGlobalEnergyMap(userUUID, euOutput); - euOutput = 0; + return; } for (ItemStackLong itemStack : outputItems) { -- cgit From 797f599a178a8fd5880214f5001f1b50275444c3 Mon Sep 17 00:00:00 2001 From: GDCloud Date: Sat, 4 Mar 2023 00:35:14 +0100 Subject: wrong numbers --- .../java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java index 161e659d33..d7c0fd1e5e 100644 --- a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java +++ b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java @@ -34,10 +34,10 @@ public class EyeOfHarmonyRecipe { static final FluidStack[] SPECIAL_FLUIDS = new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(1152), Materials.WhiteDwarfMatter.getMolten(1152), Materials.WhiteDwarfMatter.getMolten(4_608), - Materials.WhiteDwarfMatter.getMolten(18_384), Materials.BlackDwarfMatter.getMolten(1152), - Materials.BlackDwarfMatter.getMolten(4_608), Materials.BlackDwarfMatter.getMolten(18_384), + Materials.WhiteDwarfMatter.getMolten(18_432), Materials.BlackDwarfMatter.getMolten(1152), + Materials.BlackDwarfMatter.getMolten(4_608), Materials.BlackDwarfMatter.getMolten(18_432), Materials.Universium.getMolten(1152), Materials.Universium.getMolten(4_608), - Materials.Universium.getMolten(18_384) }; + Materials.Universium.getMolten(18_432) }; HashingStrategy itemStackHashingStrategy = new HashingStrategy() { -- cgit