diff --git a/src/main/java/electroblob/wizardry/item/ItemFrostAxe.java b/src/main/java/electroblob/wizardry/item/ItemFrostAxe.java index cca0d046..a7f3fffc 100644 --- a/src/main/java/electroblob/wizardry/item/ItemFrostAxe.java +++ b/src/main/java/electroblob/wizardry/item/ItemFrostAxe.java @@ -3,6 +3,7 @@ package electroblob.wizardry.item; import com.google.common.collect.Multimap; import electroblob.wizardry.registry.Spells; import electroblob.wizardry.registry.WizardryPotions; +import electroblob.wizardry.spell.Spell; import electroblob.wizardry.util.MagicDamage; import electroblob.wizardry.util.MagicDamage.DamageType; import electroblob.wizardry.util.WizardryUtilities; @@ -81,6 +82,12 @@ public class ItemFrostAxe extends ItemAxe implements IConjuredItem { stack.setItemDamage(damage + 1); } + @Override + public Multimap getItemAttributeModifiers(EntityEquipmentSlot equipmentSlot){ + attackDamage = Spells.frost_axe.getProperty(Spell.DAMAGE).floatValue(); + return super.getItemAttributeModifiers(equipmentSlot); + } + @Override public boolean hitEntity(ItemStack stack, EntityLivingBase target, EntityLivingBase wielder){ if(!MagicDamage.isEntityImmune(DamageType.FROST, target)) diff --git a/src/main/java/electroblob/wizardry/spell/FrostAxe.java b/src/main/java/electroblob/wizardry/spell/FrostAxe.java index 31c104db..054b77f7 100644 --- a/src/main/java/electroblob/wizardry/spell/FrostAxe.java +++ b/src/main/java/electroblob/wizardry/spell/FrostAxe.java @@ -11,6 +11,7 @@ public class FrostAxe extends SpellConjuration { public FrostAxe(){ super("frost_axe", WizardryItems.frost_axe); + addProperties(DAMAGE); } @Override diff --git a/src/main/resources/assets/ebwizardry/spells/frost_axe.json b/src/main/resources/assets/ebwizardry/spells/frost_axe.json index b76cbfdf..e0d8912f 100644 --- a/src/main/resources/assets/ebwizardry/spells/frost_axe.json +++ b/src/main/resources/assets/ebwizardry/spells/frost_axe.json @@ -17,6 +17,7 @@ "chargeup": 0, "cooldown": 50, "base_properties": { - "item_lifetime": 1200 + "item_lifetime": 1200, + "damage": 8 } } \ No newline at end of file