aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBass <tudurap.com@gmail.com>2019-02-16 17:25:53 +0000
committerBass <tudurap.com@gmail.com>2019-02-16 17:25:53 +0000
commit84f686d148d11ff1edf17d928004c89ecc677d46 (patch)
tree3c79698a99087ba1bfa767c680534884e150fa5b
parentf4725ef8a1d443b3c7769d4072c29cc38fda23eb (diff)
parent43185af730706fe81db275ae73f3dc54c1a0744a (diff)
downloadGT5-Unofficial-84f686d148d11ff1edf17d928004c89ecc677d46.tar.gz
GT5-Unofficial-84f686d148d11ff1edf17d928004c89ecc677d46.tar.bz2
GT5-Unofficial-84f686d148d11ff1edf17d928004c89ecc677d46.zip
Merge remote-tracking branch 'origin/bassAdditions' into bassAdditions
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java
index 07494f4900..a0e4af074f 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java
@@ -30,9 +30,9 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB
private int scanTimeTill = scanTimeMin; //Set default scan time
private int scanRadiusMax = 20; //Tesla scan radius
private int scanRadiusMin = 4; //Tesla scan radius
- private int scanRadiusLimitTop = scanRadiusMin + (scanRadiusMax - scanRadiusMin) / (maixTier - minTier + 1) * (mTier - 1); //Tesla scan actual maximum radius Formula
- private int scanRadiusLimitBottom = 1; //Configurable Scan range minimum
- private int scanRadius = scanRadiusLimitTop; // Sets default scan radius first run
+ private int scanRadiusLimitTop = scanRadiusMin + (scanRadiusMax - scanRadiusMin) / (maixTier - minTier + 1) * (mTier - 1); //Tesla scan radius Formula
+ private int scanRadiusLimitBottom = 1;
+ private int scanRadius = scanRadiusLimitTop;
private int transferRadiusTower = 0; //Radius for transceiver to tower transfers
private int transferRadiusCover = 0; //Radius for transceiver to cover transfers
@@ -48,7 +48,7 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB
private long lossPerBlock = 2; //EU lost per block traveled
private float energyEfficiencyMax = 0.95F; //Max efficiency
private float energyEfficiencyMin = 0.75F; //Min efficiency
- private float energyEfficiency = energyEfficiencyMin + (energyEfficiencyMax - energyEfficiencyMin) / (maixTier - minTier + 1) * (mTier - 1); //Energy efficiency Formula
+ private float energyEfficiency = energyEfficiencyMin + (energyEfficiencyMax - energyEfficiencyMin) / (maixTier - minTier + 1) * (mTier - 1); //Efficiency Formula
private long outputVoltage = V[mTier]; //Tesla Voltage Output
private long outputVoltagePostEfficency = (long) (outputVoltage * energyEfficiency); //Max power a machine can actually receive