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

- Fixed it so that the Sentient weaponry is actually repairable using any demon will crystals in an anvil

Browse source 
- Changed the stat tracker for Tough Palms so that it counts number of hearts sacrificed, not number of sacrifices
This commit is contained in:
WayofTime 2016-05-12 14:51:42 -04:00
parent 328b566064
commit e363ba8ffb
5 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
changelog.txt
View file

@ -1,3 +1,9 @@
------------------------------------------------------
Version 2.0.0-38
------------------------------------------------------
- Fixed it so that the Sentient weaponry is actually repairable using any demon will crystals in an anvil
- Changed the stat tracker for Tough Palms so that it counts number of hearts sacrificed, not number of sacrifices
------------------------------------------------------
Version 2.0.0-37
------------------------------------------------------

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

@ -73,6 +73,12 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool//, IMeshP
});
}
@Override
public boolean getIsRepairable(ItemStack toRepair, ItemStack repair)
{
return ModItems.itemDemonCrystal == repair.getItem() ? true : super.getIsRepairable(toRepair, repair);
}
public void recalculatePowers(ItemStack stack, World world, EntityPlayer player)
{
EnumDemonWillType type = PlayerDemonWillHandler.getLargestWillType(player);

6
src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java
View file

@ -76,6 +76,12 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM
setCreativeTab(BloodMagic.tabBloodMagic);
}
@Override
public boolean getIsRepairable(ItemStack toRepair, ItemStack repair)
{
return ModItems.itemDemonCrystal == repair.getItem() ? true : super.getIsRepairable(toRepair, repair);
}
public void recalculatePowers(ItemStack stack, World world, EntityPlayer player)
{
EnumDemonWillType type = PlayerDemonWillHandler.getLargestWillType(player);

4
src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java
View file

@ -20,9 +20,9 @@ public class StatTrackerSelfSacrifice extends StatTracker
public int totalSacrifices = 0;
public static void incrementCounter(LivingArmour armour)
public static void incrementCounter(LivingArmour armour, int hearts)
{
changeMap.put(armour, changeMap.containsKey(armour) ? changeMap.get(armour) + 1 : 1);
changeMap.put(armour, changeMap.containsKey(armour) ? changeMap.get(armour) + hearts : hearts);
}
@Override

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

@ -483,13 +483,15 @@ public class EventHandler
}
@SubscribeEvent
public void onTeleposeEntity(TeleposeEvent.Ent event) {
public void onTeleposeEntity(TeleposeEvent.Ent event)
{
if (ConfigHandler.teleposerBlacklistEntity.contains(event.entity.getClass().getSimpleName()))
event.setCanceled(true);
}
@SubscribeEvent
public void onTeleposeEntityPost(TeleposeEvent.Ent.Post event) {
public void onTeleposeEntityPost(TeleposeEvent.Ent.Post event)
{
event.entity.timeUntilPortal = 5;
}
@ -577,7 +579,7 @@ public class EventHandler
LivingArmour armour = ItemLivingArmour.armourMap.get(chestStack);
if (armour != null)
{
StatTrackerSelfSacrifice.incrementCounter(armour);
StatTrackerSelfSacrifice.incrementCounter(armour, event.healthDrained / 2);
LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(Constants.Mod.MODID + ".upgrade.selfSacrifice", chestStack);
if (upgrade instanceof LivingArmourUpgradeSelfSacrifice)