Add damage property to frost axe spell, fixes #322
This commit is contained in:
@@ -3,6 +3,7 @@ package electroblob.wizardry.item;
|
|||||||
import com.google.common.collect.Multimap;
|
import com.google.common.collect.Multimap;
|
||||||
import electroblob.wizardry.registry.Spells;
|
import electroblob.wizardry.registry.Spells;
|
||||||
import electroblob.wizardry.registry.WizardryPotions;
|
import electroblob.wizardry.registry.WizardryPotions;
|
||||||
|
import electroblob.wizardry.spell.Spell;
|
||||||
import electroblob.wizardry.util.MagicDamage;
|
import electroblob.wizardry.util.MagicDamage;
|
||||||
import electroblob.wizardry.util.MagicDamage.DamageType;
|
import electroblob.wizardry.util.MagicDamage.DamageType;
|
||||||
import electroblob.wizardry.util.WizardryUtilities;
|
import electroblob.wizardry.util.WizardryUtilities;
|
||||||
@@ -81,6 +82,12 @@ public class ItemFrostAxe extends ItemAxe implements IConjuredItem {
|
|||||||
stack.setItemDamage(damage + 1);
|
stack.setItemDamage(damage + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Multimap<String, AttributeModifier> getItemAttributeModifiers(EntityEquipmentSlot equipmentSlot){
|
||||||
|
attackDamage = Spells.frost_axe.getProperty(Spell.DAMAGE).floatValue();
|
||||||
|
return super.getItemAttributeModifiers(equipmentSlot);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean hitEntity(ItemStack stack, EntityLivingBase target, EntityLivingBase wielder){
|
public boolean hitEntity(ItemStack stack, EntityLivingBase target, EntityLivingBase wielder){
|
||||||
if(!MagicDamage.isEntityImmune(DamageType.FROST, target))
|
if(!MagicDamage.isEntityImmune(DamageType.FROST, target))
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ public class FrostAxe extends SpellConjuration {
|
|||||||
|
|
||||||
public FrostAxe(){
|
public FrostAxe(){
|
||||||
super("frost_axe", WizardryItems.frost_axe);
|
super("frost_axe", WizardryItems.frost_axe);
|
||||||
|
addProperties(DAMAGE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
"chargeup": 0,
|
"chargeup": 0,
|
||||||
"cooldown": 50,
|
"cooldown": 50,
|
||||||
"base_properties": {
|
"base_properties": {
|
||||||
"item_lifetime": 1200
|
"item_lifetime": 1200,
|
||||||
|
"damage": 8
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user