aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbasdxz <tudurap.com@gmail.com>2020-07-11 13:37:02 +0100
committerbasdxz <tudurap.com@gmail.com>2020-07-11 13:37:02 +0100
commit3b388cd947255ccef57215862591228cb4421997 (patch)
tree3c303360393c126f6e5f051d15229b1d86a43b6e
parent8e3024edfde8317f4f0073842563c45a3cb41ab6 (diff)
downloadGT5-Unofficial-3b388cd947255ccef57215862591228cb4421997.tar.gz
GT5-Unofficial-3b388cd947255ccef57215862591228cb4421997.tar.bz2
GT5-Unofficial-3b388cd947255ccef57215862591228cb4421997.zip
Plasma range boosting now helps with loss
Very generous imo, might need to be scaled back
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java20
1 files changed, 15 insertions, 5 deletions
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
index dac8800894..5ae1d86895 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
@@ -252,10 +252,22 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
}
private long getEnergyEfficiency(long voltage, int distance, boolean overDriveToggle) {
+ //Helium and Nitrogen Plasmas will half the effective distance
+ //Radon will half it again
+ int effectiveDistance = distance;
+ switch (plasmaTier) {
+ case 2:
+ effectiveDistance = distance / 4;
+ break;
+ case 1:
+ effectiveDistance = distance / 2;
+ break;
+ }
+
if (overDriveToggle) {
- return (long) ((voltage * 2) - (voltage * Math.pow(overdriveEfficiency, distance)));
+ return (long) ((voltage * 2) - (voltage * Math.pow(overdriveEfficiency, effectiveDistance)));
} else {
- return (long) (voltage * Math.pow(energyEfficiency, distance));
+ return (long) (voltage * Math.pow(energyEfficiency, effectiveDistance));
}
}
@@ -333,7 +345,6 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
for (GT_MetaTileEntity_Hatch_Input fluidHatch : mInputHatches) {
if (fluidHatch.mFluid != null) {
if (fluidHatch.mFluid.isFluidEqual(Materials.Helium.getPlasma(1)) && fluidHatch.mFluid.amount >= 100) {
- System.out.print("HELIUM\n");
fluidHatch.mFluid.amount = fluidHatch.mFluid.amount - 100;
if (doFluidOutput) {
mOutputFluidsQueue = new FluidStack[]{Materials.Helium.getGas(100)};
@@ -341,7 +352,6 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
plasmaTier = 1;
return;
} else if (fluidHatch.mFluid.isFluidEqual(Materials.Nitrogen.getPlasma(1)) && fluidHatch.mFluid.amount >= 50) {
- System.out.print("NITRO\n");
fluidHatch.mFluid.amount = fluidHatch.mFluid.amount - 50;
if (doFluidOutput) {
mOutputFluidsQueue = new FluidStack[]{Materials.Nitrogen.getGas(50)};
@@ -349,7 +359,6 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
plasmaTier = 1;
return;
} else if (fluidHatch.mFluid.isFluidEqual(Materials.Radon.getPlasma(1)) && fluidHatch.mFluid.amount >= 50) {
- System.out.print("RADON\n");
fluidHatch.mFluid.amount = fluidHatch.mFluid.amount - 50;
if (doFluidOutput) {
mOutputFluidsQueue = new FluidStack[]{Materials.Radon.getGas(50)};
@@ -450,6 +459,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
//Calculate Efficiency values
energyEfficiency = map(mTier + 1, 1, maxTier, minEfficiency, maxEfficiency);
+ //OD Eff calc
overdriveEfficiency = energyEfficiency - overdriveEfficiencyExtra;
energyCapacity = 0;