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

Almost ready for final 1.2.0 push

Browse source
This commit is contained in:
WayofTime 2014-10-13 10:33:43 -04:00
parent 4a1f13d988
commit 3d6d7bcdd6
12 changed files with 136 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

6
1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/BoundArmour.java
View file

@ -180,7 +180,7 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles,ISpecialAr
if(player.isPotionActive(AlchemicalWizardry.customPotionSoulHarden))
{
int i = player.getActivePotionEffect(AlchemicalWizardry.customPotionSoulHarden).getAmplifier() + 1;
damageAmount /= (1 - i*0.1);
damageAmount /= Math.max((1 - i*0.1), 0.1);
}else
{
damageAmount *= 0.9;
@ -309,8 +309,8 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles,ISpecialAr
{
return "alchemicalwizardry:models/armor/BloodArmour_WIP.png";
}
//TODO Make the armour invisible when the player has Invisibility on.
if (entity instanceof EntityLivingBase)
if (entity instanceof EntityLivingBase)
{
if (this.getIsInvisible(stack))
{

10
1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/thaumcraft/ItemSanguineArmour.java
View file

@ -86,12 +86,12 @@ public class ItemSanguineArmour extends ItemArmor implements ArmourUpgrade, IGog
if (this == ModItems.sanguineRobe || this == ModItems.sanguineBoots)
{
return "alchemicalwizardry:models/armor/boundArmour_layer_1.png";
return "alchemicalwizardry:models/armor/sanguineArmour_layer_1.png";
}
if (this == ModItems.sanguinePants)
{
return "alchemicalwizardry:models/armor/boundArmour_layer_2.png";
return "alchemicalwizardry:models/armor/sanguineArmour_layer_2.png";
} else
{
return null;
@ -106,16 +106,16 @@ public class ItemSanguineArmour extends ItemArmor implements ArmourUpgrade, IGog
switch(this.armorType)
{
case 0:
discount = 8;
discount = 6;
break;
case 1:
discount = 4;
discount = 3;
break;
case 2:
discount = 3;
break;
case 3:
discount = 3;
discount = 2;
break;
}