From 96ecd73286be18d1fd40d6c954e449c2076c2453 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sun, 3 Apr 2016 12:17:42 -0400 Subject: [PATCH] Added Soft Fall and Strong Legs living armour upgrades. --- changelog.txt | 3 + .../item/armour/ItemLivingArmour.java | 9 +- .../tracker/StatTrackerFallProtect.java | 103 +++++++++++++++++ .../livingArmour/tracker/StatTrackerJump.java | 104 ++++++++++++++++++ .../tracker/StatTrackerPhysicalProtect.java | 2 +- .../upgrade/LivingArmourUpgradeDigging.java | 15 ++- .../LivingArmourUpgradeFallProtect.java | 65 +++++++++++ .../upgrade/LivingArmourUpgradeJump.java | 57 ++++++++++ .../LivingArmourUpgradePhysicalProtect.java | 2 +- .../registry/ModArmourTrackers.java | 4 + .../bloodmagic/ritual/RitualPlacer.java | 2 +- .../bloodmagic/ritual/RitualPortal.java | 2 +- .../bloodmagic/util/handler/EventHandler.java | 39 ++++++- .../assets/bloodmagic/lang/en_US.lang | 2 + 14 files changed, 392 insertions(+), 17 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java create mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java create mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java create mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java diff --git a/changelog.txt b/changelog.txt index 56ac7433..f43c4b66 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,6 +2,9 @@ Version 2.0.0-31 ------------------------------------------------------ - Fixed NPE when using an empty bucket. +- Added Living Armour Upgrades: + - Strong Legs increases jump height. Pro tip: hold shift to bypass this jump boost. + - Soft Fall decreases all fall damage, up to 100% at level 5. ------------------------------------------------------ Version 2.0.0-30 diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java index 6d5abf52..e4b04347 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java @@ -125,6 +125,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP { LivingArmourUpgrade upgrade = entry.getValue(); remainder *= (1 - upgrade.getArmourProtection(player, source)); + /* * Just as a side note, if one upgrade provides * upgrade.getArmourProtection(source) = 0.5, the @@ -137,10 +138,10 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP armourReduction = armourReduction + (1 - remainder) * (1 - armourReduction); damageAmount *= (armourReduction); - if (source.isUnblockable()) - { - return new ArmorProperties(-1, damageAmount * armourPenetrationReduction, maxAbsorption); - } +// if (source.isUnblockable()) +// { +// return new ArmorProperties(-1, damageAmount * armourPenetrationReduction, maxAbsorption); +// } return new ArmorProperties(-1, damageAmount, maxAbsorption); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java new file mode 100644 index 00000000..556bd2d4 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java @@ -0,0 +1,103 @@ +package WayofTime.bloodmagic.livingArmour.tracker; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmour; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeFallProtect; + +public class StatTrackerFallProtect extends StatTracker +{ + public int totalDamage = 0; + + public static HashMap changeMap = new HashMap(); + public static int[] damageRequired = new int[] { 30, 200, 400, 800, 1500 }; + + public static void incrementCounter(LivingArmour armour, double damage) + { + changeMap.put(armour, changeMap.containsKey(armour) ? changeMap.get(armour) + damage : damage); + } + + @Override + public String getUniqueIdentifier() + { + return Constants.Mod.MODID + ".tracker.fallProtect"; + } + + @Override + public void resetTracker() + { + this.totalDamage = 0; + } + + @Override + public void readFromNBT(NBTTagCompound tag) + { + totalDamage = tag.getInteger(Constants.Mod.MODID + ".tracker.fallProtect"); + } + + @Override + public void writeToNBT(NBTTagCompound tag) + { + tag.setInteger(Constants.Mod.MODID + ".tracker.fallProtect", totalDamage); + } + + @Override + public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour) + { + if (changeMap.containsKey(livingArmour)) + { + double change = Math.abs(changeMap.get(livingArmour)); + if (change > 0) + { + totalDamage += Math.abs(changeMap.get(livingArmour)); + + changeMap.put(livingArmour, 0d); + + this.markDirty(); + + return true; + } + } + + return false; + } + + @Override + public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour) + { + if (changeMap.containsKey(livingArmour)) + { + changeMap.remove(livingArmour); + } + } + + @Override + public List getUpgrades() + { + List upgradeList = new ArrayList(); + + for (int i = 0; i < 5; i++) + { + if (totalDamage >= damageRequired[i]) + { + upgradeList.add(new LivingArmourUpgradeFallProtect(i)); + } + } + + return upgradeList; + } + + @Override + public boolean providesUpgrade(String key) + { + return key.equals(Constants.Mod.MODID + ".upgrade.fallProtect"); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java new file mode 100644 index 00000000..c91d570b --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java @@ -0,0 +1,104 @@ +package WayofTime.bloodmagic.livingArmour.tracker; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmour; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeJump; + +public class StatTrackerJump extends StatTracker +{ + public static HashMap changeMap = new HashMap(); + public static int[] jumpsRequired = new int[] { 30, 200, 400, 700, 1100, 1500, 2000, 2800, 3600, 5000 }; //testing + + public int totalJumps = 0; + + public static void incrementCounter(LivingArmour armour) + { + changeMap.put(armour, changeMap.containsKey(armour) ? changeMap.get(armour) + 1 : 1); + } + + @Override + public String getUniqueIdentifier() + { + return Constants.Mod.MODID + ".tracker.jump"; + } + + @Override + public void resetTracker() + { + this.totalJumps = 0; + } + + @Override + public void readFromNBT(NBTTagCompound tag) + { + totalJumps = tag.getInteger(Constants.Mod.MODID + ".tracker.jump"); + } + + @Override + public void writeToNBT(NBTTagCompound tag) + { + tag.setInteger(Constants.Mod.MODID + ".tracker.jump", totalJumps); + + } + + @Override + public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour) + { + if (changeMap.containsKey(livingArmour)) + { + int change = Math.abs(changeMap.get(livingArmour)); + if (change > 0) + { + totalJumps += Math.abs(changeMap.get(livingArmour)); + + changeMap.put(livingArmour, 0); + + this.markDirty(); + + return true; + } + } + + return false; + } + + @Override + public void onDeactivatedTick(World world, EntityPlayer player, LivingArmour livingArmour) + { + if (changeMap.containsKey(livingArmour)) + { + changeMap.remove(livingArmour); + } + } + + @Override + public List getUpgrades() + { + List upgradeList = new ArrayList(); + + for (int i = 0; i < 10; i++) + { + if (totalJumps >= jumpsRequired[i]) + { + upgradeList.add(new LivingArmourUpgradeJump(i)); + } + } + + return upgradeList; + } + + @Override + public boolean providesUpgrade(String key) + { + return key.equals(Constants.Mod.MODID + ".upgrade.jump"); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java index 74bf9414..cebff061 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java @@ -84,7 +84,7 @@ public class StatTrackerPhysicalProtect extends StatTracker { List upgradeList = new ArrayList(); - for (int i = 0; i < 1; i++) + for (int i = 0; i < 10; i++) { if (totalDamage >= damageRequired[i]) { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java index a0596b9c..bebe1715 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java @@ -1,17 +1,16 @@ package WayofTime.bloodmagic.livingArmour.upgrade; +import java.util.HashMap; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.PotionEffect; +import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.livingArmour.LivingArmour; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.world.World; - -import java.util.HashMap; public class LivingArmourUpgradeDigging extends LivingArmourUpgrade { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java new file mode 100644 index 00000000..3ac7abc9 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java @@ -0,0 +1,65 @@ +package WayofTime.bloodmagic.livingArmour.upgrade; + +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.DamageSource; + +public class LivingArmourUpgradeFallProtect extends LivingArmourUpgrade +{ + public static final int[] costs = new int[] { 5, 10, 18, 35, 65, 100, 160, 220, 280, 350 }; + public static final double[] protectionLevel = new double[] { 0.2, 0.4, 0.6, 0.8, 1 }; + + public LivingArmourUpgradeFallProtect(int level) + { + super(level); + } + + @Override + public double getArmourProtection(EntityLivingBase wearer, DamageSource source) + { + if (source.equals(DamageSource.fall)) + { + return protectionLevel[this.level]; + } + + return 0; + } + + @Override + public String getUniqueIdentifier() + { + return Constants.Mod.MODID + ".upgrade.fallProtect"; + } + + @Override + public int getMaxTier() + { + return 5; // Set to here until I can add more upgrades to it. + } + + @Override + public int getCostOfUpgrade() + { + return costs[this.level]; + } + + @Override + public void writeToNBT(NBTTagCompound tag) + { + // EMPTY + } + + @Override + public void readFromNBT(NBTTagCompound tag) + { + // EMPTY + } + + @Override + public String getUnlocalizedName() + { + return tooltipBase + "fallProtect"; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java new file mode 100644 index 00000000..ae643bee --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java @@ -0,0 +1,57 @@ +package WayofTime.bloodmagic.livingArmour.upgrade; + +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import net.minecraft.nbt.NBTTagCompound; + +public class LivingArmourUpgradeJump extends LivingArmourUpgrade +{ + public static final int[] costs = new int[] { 7, 13, 22, 40, 65, 90, 130, 180, 250, 350 }; + public static final double[] jumpModifier = new double[] { 0.15, 0.3, 0.45, 0.6, 0.75, 0.9, 1.05, 1.2, 1.35, 1.5 }; + + public LivingArmourUpgradeJump(int level) + { + super(level); + } + + public double getJumpModifier() + { + return jumpModifier[this.level]; + } + + @Override + public String getUniqueIdentifier() + { + return Constants.Mod.MODID + ".upgrade.jump"; + } + + @Override + public int getMaxTier() + { + return 10; // Set to here until I can add more upgrades to it. + } + + @Override + public int getCostOfUpgrade() + { + return costs[this.level]; + } + + @Override + public void writeToNBT(NBTTagCompound tag) + { + // EMPTY + } + + @Override + public void readFromNBT(NBTTagCompound tag) + { + // EMPTY + } + + @Override + public String getUnlocalizedName() + { + return tooltipBase + "jump"; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java index 395b1054..210c6b7a 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java @@ -19,7 +19,7 @@ public class LivingArmourUpgradePhysicalProtect extends LivingArmourUpgrade @Override public double getArmourProtection(EntityLivingBase wearer, DamageSource source) { - if (source.getEntity() != null) + if (source.getEntity() != null && !source.isMagicDamage() && !source.isProjectile()) { return protectionLevel[this.level]; } diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java b/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java index 93fa2ec7..158c18d4 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java @@ -20,6 +20,8 @@ public class ModArmourTrackers LivingArmourHandler.registerStatTracker(StatTrackerGrimReaperSprint.class); LivingArmourHandler.registerStatTracker(StatTrackerSolarPowered.class); LivingArmourHandler.registerStatTracker(StatTrackerExperience.class); + LivingArmourHandler.registerStatTracker(StatTrackerJump.class); + LivingArmourHandler.registerStatTracker(StatTrackerFallProtect.class); LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeSpeed(0)); LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeDigging(0)); @@ -34,5 +36,7 @@ public class ModArmourTrackers LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeGrimReaperSprint(0)); LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeSolarPowered(0)); LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeExperience(0)); + LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeJump(0)); + LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeFallProtect(0)); } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java index 4e126f63..7e5402e2 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java @@ -23,7 +23,7 @@ public class RitualPlacer extends Ritual public RitualPlacer() { super("ritualPlacer", 0, 5000, "ritual." + Constants.Mod.MODID + ".placerRitual"); - addBlockRange(PLACER_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-2, 0, -2), new BlockPos(3, 1, 3))); + addBlockRange(PLACER_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-2, 0, -2), 5, 1, 5)); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java index 48792e6e..560e1f60 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java @@ -29,7 +29,7 @@ public class RitualPortal extends Ritual public RitualPortal() { - super("ritualPortal", 0, 500, "ritual." + Constants.Mod.MODID + ".portalRitual"); + super("ritualPortal", 0, 50000, "ritual." + Constants.Mod.MODID + ".portalRitual"); portalRitualTag = new NBTTagCompound(); } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java index 887aae9e..55410342 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java @@ -88,8 +88,10 @@ import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerArrowShot; import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerDigging; import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerExperience; +import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerFallProtect; import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerGrimReaperSprint; import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerHealthboost; +import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerJump; import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerMeleeDamage; import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerPhysicalProtect; import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerSelfSacrifice; @@ -98,6 +100,7 @@ import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeArrowShot; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeDigging; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeExperience; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeGrimReaperSprint; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeJump; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSelfSacrifice; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSpeed; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeStepAssist; @@ -145,6 +148,35 @@ public class EventHandler } } + @SubscribeEvent + public void onJumpEvent(LivingEvent.LivingJumpEvent event) + { + if (event.getEntityLiving() instanceof EntityPlayer) + { + EntityPlayer player = (EntityPlayer) event.getEntityLiving(); + + if (LivingArmour.hasFullSet(player)) + { + ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + LivingArmour armour = ItemLivingArmour.armourMap.get(chestStack); + if (armour != null) + { + StatTrackerJump.incrementCounter(armour); + + if (!player.isSneaking()) + { + LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(Constants.Mod.MODID + ".upgrade.jump", chestStack); + + if (upgrade instanceof LivingArmourUpgradeJump) + { + player.motionY += ((LivingArmourUpgradeJump) upgrade).getJumpModifier(); + } + } + } + } + } + } + @SubscribeEvent public void onServerWorldTick(TickEvent.WorldTickEvent event) { @@ -583,11 +615,16 @@ public class EventHandler LivingArmour armour = ItemLivingArmour.armourMap.get(chestStack); if (armour != null) { - if (sourceEntity != null && !source.isMagicDamage()) + if (sourceEntity != null && !source.isMagicDamage() && !source.isProjectile()) { // Add resistance to the upgrade that protects against non-magic damage StatTrackerPhysicalProtect.incrementCounter(armour, amount); } + + if (source.equals(DamageSource.fall)) + { + StatTrackerFallProtect.incrementCounter(armour, amount); + } } } else { diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index f3ef9eb8..cfc07508 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -319,6 +319,8 @@ tooltip.BloodMagic.livingArmour.upgrade.solarPowered=Solar Powered tooltip.BloodMagic.livingArmour.upgrade.thaumRunicShielding=Runic Shielding tooltip.BloodMagic.livingArmour.upgrade.revealing=Revealing tooltip.BloodMagic.livingArmour.upgrade.experienced=Experienced +tooltip.BloodMagic.livingArmour.upgrade.jump=Strong Legs +tooltip.BloodMagic.livingArmour.upgrade.fallProtect=Soft Fall tooltip.BloodMagic.livingArmour.upgrade.level=%s (Level %d) tooltip.BloodMagic.livingArmour.upgrade.points=&6Upgrade points: %s / %s