mirror of
https://github.com/GTNewHorizons/Electro-Magic-Tools.git
synced 2026-11-21 04:22:09 +00:00
Equalize armor absorption values with IC2
This commit is contained in:
1 parent
7b5782af5d
commit
b7d30223a0
9 files changed
+33
-24
No files matched your search
@@ -97,11 +97,11 @@ public class ItemElectricBootsTraveller extends ItemArmor implements IElectricIt
|
||||
}
|
||||
|
||||
public double getDamageAbsorptionRatio() {
|
||||
return 1.1000000000000001D;
|
||||
return 0.5D;
|
||||
}
|
||||
|
||||
private double getBaseAbsorptionRatio() {
|
||||
return 0.14999999999999999D;
|
||||
return 0.15D;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -20,6 +20,11 @@ public class ItemNanoBootsTraveller extends ItemElectricBootsTraveller {
|
||||
energyPerDamage = 5000;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getDamageAbsorptionRatio() {
|
||||
return 0.9D;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerIcons(IIconRegister iconRegister) {
|
||||
|
||||
@@ -20,6 +20,11 @@ public class ItemQuantumBootsTraveller extends ItemElectricBootsTraveller {
|
||||
energyPerDamage = 20000;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getDamageAbsorptionRatio() {
|
||||
return 1D;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerIcons(IIconRegister iconRegister) {
|
||||
|
||||
@@ -148,7 +148,7 @@ public class ItemElectricGoggles extends ItemArmor implements IElectricItem, IVi
|
||||
}
|
||||
|
||||
public double getDamageAbsorptionRatio() {
|
||||
return 1.1000000000000001D;
|
||||
return 0.5D;
|
||||
}
|
||||
|
||||
public int getEnergyPerDamage() {
|
||||
@@ -156,7 +156,7 @@ public class ItemElectricGoggles extends ItemArmor implements IElectricItem, IVi
|
||||
}
|
||||
|
||||
private double getBaseAbsorptionRatio() {
|
||||
return 0.14999999999999999D;
|
||||
return 0.15D;
|
||||
}
|
||||
|
||||
/* IC2 API METHODS */
|
||||
|
||||
@@ -40,6 +40,11 @@ public class ItemNanoGoggles extends ItemElectricGoggles {
|
||||
return EMT.TEXTURE_PATH + ":textures/models/thaumicnanohelmet.png";
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getDamageAbsorptionRatio() {
|
||||
return 0.9D;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) {
|
||||
if (EMTConfigHandler.nightVisionOff == false) {
|
||||
|
||||
@@ -52,6 +52,11 @@ public class ItemQuantumGoggles extends ItemNanoGoggles {
|
||||
return EMT.TEXTURE_PATH + ":textures/models/thaumicquantumhelmet.png";
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getDamageAbsorptionRatio() {
|
||||
return 1D;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) {
|
||||
int refill = player.getAir();
|
||||
|
||||
@@ -66,6 +66,11 @@ public class ItemSolarHelmetRevealing extends ItemQuantumGoggles {
|
||||
return EMT.TEXTURE_PATH + ":textures/models/solarrevealinghelmet.png";
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getDamageAbsorptionRatio() {
|
||||
return 1D;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
public void onArmorTick(World worldObj, EntityPlayer player, ItemStack itemStack) {
|
||||
|
||||
@@ -136,11 +136,11 @@ public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectri
|
||||
}
|
||||
|
||||
public double getDamageAbsorptionRatio() {
|
||||
return 1.5999999999999991D;
|
||||
return 0.9D;
|
||||
}
|
||||
|
||||
private double getBaseAbsorptionRatio() {
|
||||
return 0.17999999999999999D;
|
||||
return 0.25D;
|
||||
}
|
||||
|
||||
/* IC2 API METHODS */
|
||||
|
||||
@@ -55,28 +55,12 @@ public class ItemQuantumWing extends ItemNanoWing {
|
||||
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;
|
||||
return 1D;
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
return 0.25D;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user