Power loss now configurable

3 files changed, 43 insertions, 15 deletions

diff --git a/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java b/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java
index e7eb0c0945..e16580befe 100644
--- a/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java
+++ b/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java
@@ -20,6 +20,14 @@ public class TecTechConfig extends ConfigManager {
     public boolean DISABLE_MATERIAL_LOADING_FFS;
     public float TURRET_DAMAGE_FACTOR;
     public float TURRET_EXPLOSION_FACTOR;
+    public float TESLA_MULTI_MIN_EFFICIENCY;
+    public float TESLA_MULTI_MAX_EFFICIENCY;
+    public float TESLA_MULTI_OVERDRIVE_LOSS;
+    public float TESLA_SINGLE_MIN_EFFICIENCY;
+    public float TESLA_SINGLE_MAX_EFFICIENCY;
+    public float TESLA_SINGLE_OVERDRIVE_LOSS;
+
+
 
     /**
      * This loading phases do not correspond to mod loading phases!
@@ -34,6 +42,12 @@ public class TecTechConfig extends ConfigManager {
         DISABLE_MATERIAL_LOADING_FFS=false;
         TURRET_DAMAGE_FACTOR = 10;
         TURRET_EXPLOSION_FACTOR = 1;
+        TESLA_MULTI_MIN_EFFICIENCY = 0.955F;
+        TESLA_MULTI_MAX_EFFICIENCY = 0.98F;
+        TESLA_MULTI_OVERDRIVE_LOSS = 0.005F;
+        TESLA_SINGLE_MIN_EFFICIENCY = 0.91F;
+        TESLA_SINGLE_MAX_EFFICIENCY = 0.95F;
+        TESLA_SINGLE_OVERDRIVE_LOSS = 0.010F;
     }
 
 
@@ -60,6 +74,18 @@ public class TecTechConfig extends ConfigManager {
                 "Explosion strength is multiplied by this number");
         DISABLE_MATERIAL_LOADING_FFS =  _mainConfig.getBoolean("DisableMaterialLoading", "Debug", DISABLE_MATERIAL_LOADING_FFS,
                 "Set to true to disable gregtech material processing");
+        TESLA_MULTI_MIN_EFFICIENCY =  _mainConfig.getFloat("teslaMultiMinEfficency", "Features", TESLA_MULTI_MIN_EFFICIENCY, 0, 1,
+                "Worst possible power loss per block for the multi block tesla");
+        TESLA_MULTI_MAX_EFFICIENCY =  _mainConfig.getFloat("teslaMultiMaxEfficency", "Features", TESLA_MULTI_MAX_EFFICIENCY, 0, 1,
+                "Best possible power loss per block for the multi block tesla");
+        TESLA_MULTI_OVERDRIVE_LOSS =  _mainConfig.getFloat("teslaMultiOverdriveLoss", "Features", TESLA_MULTI_OVERDRIVE_LOSS, 0, 1,
+                "Additional losses for overdrive use on the multi block tesla");
+        TESLA_SINGLE_MIN_EFFICIENCY =  _mainConfig.getFloat("teslaSingleMinEfficency", "Features", TESLA_SINGLE_MIN_EFFICIENCY, 0, 1,
+                "Worst possible power loss per block for the single block tesla");
+        TESLA_SINGLE_MAX_EFFICIENCY =  _mainConfig.getFloat("teslaSingleMaxEfficency", "Features", TESLA_SINGLE_MAX_EFFICIENCY, 0, 1,
+                "Best possible power loss per block for the single block tesla");
+        TESLA_SINGLE_OVERDRIVE_LOSS =  _mainConfig.getFloat("teslaSingleOverdriveLoss", "Features", TESLA_SINGLE_OVERDRIVE_LOSS, 0, 1,
+                "Additional losses for overdrive use on the single block tesla");
     }
 
     /**
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 122a08e075..097380d715 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
@@ -1,6 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.CommonValues;
+import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.Util;
 import com.github.technus.tectech.loader.NetworkDispatcher;
 import com.github.technus.tectech.mechanics.data.RendererMessage;
@@ -51,9 +52,9 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
 
     private float energyEfficiency = 1;
     private float overdriveEfficiency = 1;
-    private float minEfficency = 0.955F;
-    private float maxEfficency = 0.98F;
-    private float overdriveEfficiencyExtra = 0.005F;
+    private float minEfficiency = TecTech.configTecTech.TESLA_MULTI_MIN_EFFICIENCY;//Default is 0.955F
+    private float maxEfficiency = TecTech.configTecTech.TESLA_MULTI_MAX_EFFICIENCY;//Default is 0.98F;
+    private float overdriveEfficiencyExtra = TecTech.configTecTech.TESLA_MULTI_OVERDRIVE_LOSS;//Default is 0.005F
 
     private Map<IGregTechTileEntity, Integer> eTeslaMap = new HashMap<>(); //Used to store targets for power transmission
     private final ArrayList<GT_MetaTileEntity_Hatch_Capacitor> eCapacitorHatches = new ArrayList<>(); //Used to determine count and tier of capacitors present
@@ -532,7 +533,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
             zPosScanMax = zPosZap + xyzOffsets[2];
 
             //Calculate Efficiency values
-            energyEfficiency = map(mTier+1, minTier, maxTier, minEfficency, maxEfficency);
+            energyEfficiency = map(mTier+1, minTier, maxTier, minEfficiency, maxEfficiency);
             overdriveEfficiency = energyEfficiency - overdriveEfficiencyExtra;
 
             return true;
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 916032ea18..46cc1bd3ea 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
@@ -1,5 +1,6 @@
 package com.github.technus.tectech.thing.metaTileEntity.single;

 

+import com.github.technus.tectech.TecTech;

 import com.github.technus.tectech.Util;

 import com.github.technus.tectech.loader.NetworkDispatcher;

 import com.github.technus.tectech.mechanics.data.RendererMessage;

@@ -53,13 +54,13 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB
     private float histHigh = (float) histSettingHigh / histSteps; //Power pass is enabled if power is over this fraction

 

     private long outputVoltage = V[mTier];

-    private float minEfficency = 0.91F;

-    private float maxEfficency = 0.95F;

-    private float overdriveEfficiencyExtra = 0.010F;

-    private float energyEfficiency = map(mTier + 1, minTier + 1, maxTier + 1, minEfficency, maxEfficency);

+    private float minEfficiency = TecTech.configTecTech.TESLA_SINGLE_MIN_EFFICIENCY;//Default is 0.91F

+    private float maxEfficiency = TecTech.configTecTech.TESLA_SINGLE_MAX_EFFICIENCY;//Default is 0.95F

+    private float overdriveEfficiencyExtra = TecTech.configTecTech.TESLA_SINGLE_OVERDRIVE_LOSS;//Default is 0.010F

+    private float energyEfficiency = map(mTier + 1, minTier + 1, maxTier + 1, minEfficiency, maxEfficiency);

     private float overdriveEfficiency = energyEfficiency - overdriveEfficiencyExtra;

-    private boolean overDriveToggle = false; //Overdrive toggle

-    

+    private boolean overdriveToggle = false;

+

     public GT_MetaTileEntity_TeslaCoil(int aID, String aName, String aNameRegional, int aTier, int aSlotCount) {

         super(aID, aName, aNameRegional, aTier, "Tesla Coil Transceiver", aSlotCount);

         Util.setTier(aTier, this);

@@ -71,11 +72,11 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB
 

     @Override

     public boolean onSolderingToolRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {

-        if (overDriveToggle) {

-            overDriveToggle = false;

+        if (overdriveToggle) {

+            overdriveToggle = false;

             PlayerChatHelper.SendInfo(aPlayer, "Overdrive disengaged");

         } else {

-            overDriveToggle = true;

+            overdriveToggle = true;

             PlayerChatHelper.SendInfo(aPlayer, "Overdrive engaged");

         }

         return true;

@@ -255,13 +256,13 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB
             while (outputCurrent > 0) {

                 boolean idle = true;

                 for (Map.Entry<IGregTechTileEntity, Integer> Rx : entriesSortedByValues(eTeslaMap)) {

-                    if (getEUVar() >= (overDriveToggle ? outputVoltage * 2 : outputVoltage)) {

+                    if (getEUVar() >= (overdriveToggle ? outputVoltage * 2 : outputVoltage)) {

                         IGregTechTileEntity node = Rx.getKey();

                         IMetaTileEntity nodeInside = node.getMetaTileEntity();

 

                         long outputVoltageInjectable;

                         long outputVoltageConsumption;

-                        if (overDriveToggle) {

+                        if (overdriveToggle) {

                             outputVoltageInjectable = outputVoltage;

                             outputVoltageConsumption = getEnergyEfficiency(outputVoltage, Rx.getValue(), true);

                         } else {