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

Trickshot - Sentient Arrows Implementation (#1540)

Browse source 
* The onArrowFire event handler for LivingArmour now checks whether the arrows were fired from a sentient bow, and if they are it calls a getDuplicateArrows method in ItemSentientBow. Said method gets the will and potion types, without changing the bow's durability or consuming will or arrows.

* Extra line breaks removed
This commit is contained in:
Phil 2019-02-13 19:27:41 -05:00 • committed by Nick Ignoffo
parent 4a59dede53
commit 2d49fab893
2 changed files with 39 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java
View file

@ -305,6 +305,33 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien
return entityArrow;
}
public EntitySentientArrow getDuplicateArrow(ItemStack bowStack, World world, EntityPlayer player, double reimburseMultiplier) {
EnumDemonWillType willType = this.getCurrentType(bowStack);
ItemStack arrow = this.getFiredArrow(player);
ItemArrow itemarrow = ((ItemArrow) (arrow.getItem() instanceof ItemArrow ? arrow.getItem() : Items.ARROW));
EntitySentientArrow entityArrow;
double reimburseAmount = (this.getDropOfActivatedBow(bowStack) * world.rand.nextDouble() + this.getStaticDropOfActivatedBow(bowStack)) * reimburseMultiplier;
if (itemarrow == Items.ARROW) {
double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(willType, player);
entityArrow = new EntitySentientArrow(world, player, willType, reimburseAmount, getLevel(soulsRemaining), (PotionType) null);
} else if (itemarrow == Items.TIPPED_ARROW) {
double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(willType, player);
entityArrow = new EntitySentientArrow(world, player, willType, reimburseAmount, getLevel(soulsRemaining), arrow);
} else if (itemarrow == Items.SPECTRAL_ARROW) {
double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(willType, player);
entityArrow = new EntitySentientArrow(world, player, willType, reimburseAmount, getLevel(soulsRemaining), new PotionType(new PotionEffect(MobEffects.GLOWING, 200, 0)));
} else {
double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(willType, player);
entityArrow = new EntitySentientArrow(world, player, willType, reimburseAmount, getLevel(soulsRemaining), itemarrow.createArrow(world, bowStack, player));
}
player.addStat(StatList.getObjectUseStats(this));
return entityArrow;
}
@Override
public void onPlayerStoppedUsing(ItemStack stack, World world, EntityLivingBase entityLiving, int timeLeft) {
if (entityLiving instanceof EntityPlayer) {