lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Reverted changes to Living Armour - waiting on change to Forge's armour to balance properly.

Browse source
This commit is contained in:
WayofTime 2016-04-07 10:07:55 -04:00
parent aa480af518
commit 7d9312b2f8
2 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java
View file

@ -69,17 +69,17 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
} }
} }
public double getRemainderForDamage(double damage, double plating) //TODO: Add plating, which shifts the damage // public double getRemainderForDamage(double damage, double plating) //TODO: Add plating, which shifts the damage
{ // {
if (damage <= 0) // if (damage <= 0)
{ // {
return 1; // return 1;
} // }
//
double protectionAmount = 1 - Math.max(3, 15 - damage / 2) / 25; //This puts the base armour protection at vanilla iron level // double protectionAmount = 1 - Math.max(3, 15 - damage / 2) / 25; //This puts the base armour protection at vanilla iron level
//
return 0; // return 0;
} // }
@Override @Override
public ArmorProperties getProperties(EntityLivingBase player, ItemStack stack, DamageSource source, double damage, int slot) public ArmorProperties getProperties(EntityLivingBase player, ItemStack stack, DamageSource source, double damage, int slot)

4
src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java
View file

@ -602,10 +602,6 @@ public class EventHandler
{ {
EntityPlayer attackedPlayer = (EntityPlayer) attackedEntity; EntityPlayer attackedPlayer = (EntityPlayer) attackedEntity;
System.out.println("Damage: " + event.getAmount());
System.out.println("New damage: " + net.minecraftforge.common.ISpecialArmor.ArmorProperties.applyArmor(attackedPlayer, attackedPlayer.inventory.armorInventory, event.getSource(), event.getAmount()));
// Living Armor Handling // Living Armor Handling
if (LivingArmour.hasFullSet(attackedPlayer)) if (LivingArmour.hasFullSet(attackedPlayer))
{ {