Capacitor Tiering

3 files changed, 14 insertions, 32 deletions

diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java
index 7322ec55ee..e09fe79d6c 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java
@@ -20,7 +20,7 @@ import static com.github.technus.tectech.Reference.MODID;
 
 public final class TeslaCoilCapacitor extends Item {
     public static TeslaCoilCapacitor INSTANCE;
-    public static IIcon LVicon, MVicon, HVicon, EVicon, IVicon, LuVicon, ZPMicon, UVicon;
+    public static IIcon LVicon, MVicon, HVicon, EVicon, IVicon;
 
     public TeslaCoilCapacitor() {
         setUnlocalizedName("tm.teslaCoilCapacitor");
@@ -31,9 +31,6 @@ public final class TeslaCoilCapacitor extends Item {
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "HV Tesla Capacitor");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "EV Tesla Capacitor");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "IV Tesla Capacitor");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "LuV Tesla Capacitor");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "ZPM Tesla Capacitor");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "UV Tesla Capacitor");
     }
 
     @Override
@@ -55,15 +52,6 @@ public final class TeslaCoilCapacitor extends Item {
             case 4://"IV"
                 aList.add("Stores energy for tesla towers! (IV)");
                 break;
-            case 5://"LuV"
-                aList.add("Stores energy for tesla towers! (LuV)");
-                break;
-            case 6://"ZPM"
-                aList.add("Stores energy for tesla towers! (ZPM)");
-                break;
-            case 7://"UV"
-                aList.add("Stores energy for tesla towers! (UV)");
-                break;
             default://
                 aList.add("Yeet this broken item into some spicy water!");
                 break;
@@ -90,9 +78,6 @@ public final class TeslaCoilCapacitor extends Item {
         HVicon = iconRegister.registerIcon(MODID + ":itemParametrizerMemoryCardLocked");
         EVicon = iconRegister.registerIcon(MODID + ":itemParametrizerMemoryCardLocked");
         IVicon = iconRegister.registerIcon(MODID + ":itemParametrizerMemoryCardLocked");
-        LuVicon = iconRegister.registerIcon(MODID + ":itemParametrizerMemoryCardLocked");
-        ZPMicon = iconRegister.registerIcon(MODID + ":itemParametrizerMemoryCardLocked");
-        UVicon = iconRegister.registerIcon(MODID + ":itemParametrizerMemoryCardLocked");
     }
 
     @Override
@@ -106,19 +91,13 @@ public final class TeslaCoilCapacitor extends Item {
                 return EVicon;
             case 4:
                 return IVicon;
-            case 5:
-                return LuVicon;
-            case 6:
-                return ZPMicon;
-            case 7:
-                return UVicon;
             default:
                 return LVicon;
         }
     }
 
     public void getSubItems(Item aItem, CreativeTabs par2CreativeTabs, List aList) {
-        for (int i = 0; i <= 7; i++) {
+        for (int i = 0; i <= 4; i++) {
             aList.add(new ItemStack(aItem, 1, i));
         }
     }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java
index f83a1b4269..3ea31b537e 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java
@@ -177,9 +177,6 @@ public class GT_MetaTileEntity_Hatch_Capacitor extends GT_MetaTileEntity_Hatch {
         new GT_MetaTileEntity_Hatch_Capacitor.CapacitorComponent(Reference.MODID+":item.tm.teslaCoilCapacitor.2", 2, 1, V[2]*512);//HV Capacitor
         new GT_MetaTileEntity_Hatch_Capacitor.CapacitorComponent(Reference.MODID+":item.tm.teslaCoilCapacitor.3", 3, 1, V[3]*512);//EV Capacitor
         new GT_MetaTileEntity_Hatch_Capacitor.CapacitorComponent(Reference.MODID+":item.tm.teslaCoilCapacitor.4", 4, 1, V[4]*512);//IV Capacitor
-        new GT_MetaTileEntity_Hatch_Capacitor.CapacitorComponent(Reference.MODID+":item.tm.teslaCoilCapacitor.5", 5, 1, V[5]*512);//LuV Capacitor
-        new GT_MetaTileEntity_Hatch_Capacitor.CapacitorComponent(Reference.MODID+":item.tm.teslaCoilCapacitor.6", 6, 1, V[6]*512);//ZPM Capacitor
-        new GT_MetaTileEntity_Hatch_Capacitor.CapacitorComponent(Reference.MODID+":item.tm.teslaCoilCapacitor.7", 7, 1, V[7]*512);//UV Capacitor
     }
 
     public static class CapacitorComponent implements Comparable<GT_MetaTileEntity_Hatch_Capacitor.CapacitorComponent> {
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 422d384617..1e1b2b4a34 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
@@ -56,7 +56,6 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
 
     private long energyCapacity = 0; //Total energy storage limited by capacitors
     private long outputVoltageMax = 0; //Tesla voltage output limited by capacitors
-    private long energyRestore = 0;//EU Restored on NBT Load and Recipe check
     public int vTier = -1; //Tesla voltage tier limited by capacitors
     private long outputCurrentMax = 0; //Tesla current output limited by capacitors
     private long outputVoltage = 0; //Tesla voltage output limited by settings
@@ -171,7 +170,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
         if(Double.isNaN(value)) return STATUS_WRONG;
         value=(int)value;
         if(value<0) return STATUS_TOO_LOW;
-        if(value>32) return STATUS_TOO_HIGH;
+        if(value>40) return STATUS_TOO_HIGH;
         if(value<32) return STATUS_LOW;
         return STATUS_OK;
     };
@@ -180,7 +179,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
         if(Double.isNaN(value)) return STATUS_WRONG;
         value=(int)value;
         if(value<0) return STATUS_TOO_LOW;
-        if(value>16) return STATUS_TOO_HIGH;
+        if(value>20) return STATUS_TOO_HIGH;
         if(value<16) return STATUS_LOW;
         return STATUS_OK;
     };
@@ -341,6 +340,13 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
         }
     }//Efficiency function used on power transfers
 
+    private float getRangeMulti(int mTier, int vTier){
+        if (vTier > mTier){
+            return 1.25F;
+        }
+        return 1F;
+    }
+
     @Override
     public long maxEUStore() {
         return energyCapacity * 2;
@@ -621,11 +627,11 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
         //Stuff to do if ePowerPass
         if (ePowerPass) {
             //Range calculation and display
-            transferRadiusTower = (int)(transferRadiusTowerSetting.get()*rangeFrac);
+            transferRadiusTower = (int)(transferRadiusTowerSetting.get()*getRangeMulti(mTier,vTier)*rangeFrac);
             transferRadiusTowerDisplay.set(transferRadiusTower);
-            transferRadiusTransceiver = (int)(transferRadiusTransceiverSetting.get()*rangeFrac);
+            transferRadiusTransceiver = (int)(transferRadiusTransceiverSetting.get()*getRangeMulti(mTier,vTier)*rangeFrac);
             transferRadiusTransceiverDisplay.set(transferRadiusTransceiver);
-            transferRadiusCoverUltimate=(int)(transferRadiusCoverUltimateSetting.get()*rangeFrac);
+            transferRadiusCoverUltimate=(int)(transferRadiusCoverUltimateSetting.get()*getRangeMulti(mTier,vTier)*rangeFrac);
             transferRadiusCoverUltimateDisplay.set(transferRadiusCoverUltimate);
 
             //Clean the eTeslaMap