diff --git a/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java b/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java index 1b4f17d..254d167 100644 --- a/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java +++ b/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java @@ -85,7 +85,7 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric { private static boolean lastJetpackUsed = false; public ItemInfusedQuantumChestplate(InternalName internalName, int armorType) { - super(internalName, InternalName.quantum, armorType, 2000000, 12000.0D, 4); + super(internalName, InternalName.quantum, armorType, 20000000, 12000.0D, 4); MinecraftForge.EVENT_BUS.register(this); this.setCreativeTab(EMT.TAB); } diff --git a/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java b/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java index ab9bdc6..120a957 100644 --- a/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java +++ b/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java @@ -29,8 +29,8 @@ import java.util.List; public class ItemElectricGoggles extends ItemArmor implements IElectricItem, IVisDiscountGear, IGoggles, IRevealer, IMetalArmor, ISpecialArmor { - public double maxCharge = 10000; - public double transferLimit = 10; + public double maxCharge = 100000; + public double transferLimit = 100; public int tier = 2; public int energyPerDamage = 100; public int visDiscount = 5; diff --git a/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java b/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java index 4e5b2ba..f1cc5d1 100644 --- a/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java +++ b/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java @@ -24,7 +24,7 @@ public class ItemNanoGoggles extends ItemElectricGoggles { this.setMaxStackSize(1); visDiscount = 6; tier = 3; - maxCharge = 100000; + maxCharge = 1000000; energyPerDamage = 1000; transferLimit = 100; } diff --git a/src/main/java/emt/item/armor/wings/ItemNanoWing.java b/src/main/java/emt/item/armor/wings/ItemNanoWing.java index 028bb81..6595d23 100644 --- a/src/main/java/emt/item/armor/wings/ItemNanoWing.java +++ b/src/main/java/emt/item/armor/wings/ItemNanoWing.java @@ -136,11 +136,11 @@ public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectri } public double getDamageAbsorptionRatio() { - return 1.1000000000000001D; + return 1.5999999999999991D; } private double getBaseAbsorptionRatio() { - return 0.14999999999999999D; + return 0.17999999999999999D; } /* IC2 API METHODS */ diff --git a/src/main/java/emt/item/armor/wings/ItemQuantumWing.java b/src/main/java/emt/item/armor/wings/ItemQuantumWing.java index 9efbef8..8bf0e4b 100644 --- a/src/main/java/emt/item/armor/wings/ItemQuantumWing.java +++ b/src/main/java/emt/item/armor/wings/ItemQuantumWing.java @@ -4,11 +4,14 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; import emt.util.EMTConfigHandler; +import ic2.api.item.ElectricItem; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.DamageSource; import net.minecraft.world.World; public class ItemQuantumWing extends ItemNanoWing { @@ -50,4 +53,29 @@ public class ItemQuantumWing extends ItemNanoWing { public double getMaxCharge(ItemStack itemStack) { return maxCharge; } + + @Override + public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) { + ElectricItem.manager.discharge(stack, damage * getEnergyPerDamage(), 0x7fffffff, true, false, false); + } + + public double getDamageAbsorptionRatio() { + return 2.099990000000001D; + } + + private double getBaseAbsorptionRatio() { + return 0.20999999999999999D; + } + @Override + public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { + if (source.isUnblockable()) { + return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(0, 0.0D, 3); + } else { + double absorptionRatio = getBaseAbsorptionRatio() * getDamageAbsorptionRatio(); + int energyPerDamage = getEnergyPerDamage(); + double damageLimit = energyPerDamage <= 0 ? 0 : (25 * ElectricItem.manager.getCharge(armor)) / energyPerDamage; + return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(3, absorptionRatio, (int) damageLimit); + } + + } }