diff --git a/changelog.txt b/changelog.txt index 2db74920..3ec3786e 100644 --- a/changelog.txt +++ b/changelog.txt @@ -3,6 +3,8 @@ Version 2.0.0-32 ------------------------------------------------------ - Changed Tome of Peritia's recipe - Added step assist living armour upgrade tracker. +- Added new Living Armour upgrades: + - Added Charging Strike, which increases knockback and damage for attacks while sprinting ------------------------------------------------------ Version 2.0.0-31 diff --git a/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourUpgrade.java b/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourUpgrade.java index f380a96f..34522759 100644 --- a/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourUpgrade.java +++ b/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourUpgrade.java @@ -40,6 +40,11 @@ public abstract class LivingArmourUpgrade return 0; } + public double getKnockbackOnHit(EntityPlayer wearer, EntityLivingBase hitEntity, ItemStack weapon) + { + return 0; + } + /** * Percentage of damage blocked. This stacks multiplicities with other * upgrades. diff --git a/src/main/java/WayofTime/bloodmagic/api/soul/PlayerDemonWillHandler.java b/src/main/java/WayofTime/bloodmagic/api/soul/PlayerDemonWillHandler.java index 839d1f4d..6ef7d298 100644 --- a/src/main/java/WayofTime/bloodmagic/api/soul/PlayerDemonWillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/api/soul/PlayerDemonWillHandler.java @@ -46,7 +46,7 @@ public class PlayerDemonWillHandler public static EnumDemonWillType getLargestWillType(EntityPlayer player) { EnumDemonWillType type = EnumDemonWillType.DEFAULT; - double max = 0; + double max = getTotalDemonWill(type, player); for (EnumDemonWillType testType : EnumDemonWillType.values()) { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java index 1e844102..303cfc90 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java @@ -57,6 +57,17 @@ public class LivingArmour implements ILivingArmour return total; } + public double getKnockbackOnHit(EntityPlayer wearer, EntityLivingBase hitEntity, ItemStack weapon) + { + double total = 0; + for (Entry entry : upgradeMap.entrySet()) + { + total += entry.getValue().getKnockbackOnHit(wearer, hitEntity, weapon); + } + + return total; + } + @Override public Multimap getAttributeModifiers() { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java new file mode 100644 index 00000000..6f27954a --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.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.LivingArmourUpgradeSprintAttack; + +public class StatTrackerSprintAttack extends StatTracker +{ + public double totalDamageDealt = 0; + + public static HashMap changeMap = new HashMap(); + public static int[] damageRequired = new int[] { 200, 800, 1300, 2500, 3800 }; + + 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.sprintAttack"; + } + + @Override + public void resetTracker() + { + this.totalDamageDealt = 0; + } + + @Override + public void readFromNBT(NBTTagCompound tag) + { + totalDamageDealt = tag.getDouble(Constants.Mod.MODID + ".tracker.sprintAttack"); + } + + @Override + public void writeToNBT(NBTTagCompound tag) + { + tag.setDouble(Constants.Mod.MODID + ".tracker.sprintAttack", totalDamageDealt); + } + + @Override + public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour) + { + if (changeMap.containsKey(livingArmour)) + { + double change = Math.abs(changeMap.get(livingArmour)); + if (change > 0) + { + totalDamageDealt += 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 (totalDamageDealt >= damageRequired[i]) + { + upgradeList.add(new LivingArmourUpgradeSprintAttack(i)); + } + } + + return upgradeList; + } + + @Override + public boolean providesUpgrade(String key) + { + return key.equals(Constants.Mod.MODID + ".upgrade.sprintAttack"); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java new file mode 100644 index 00000000..eda498bf --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java @@ -0,0 +1,88 @@ +package WayofTime.bloodmagic.livingArmour.upgrade; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; + +public class LivingArmourUpgradeSprintAttack extends LivingArmourUpgrade +{ + public static final int[] costs = new int[] { 3, 7, 15, 35, 49 }; + public static final double[] damageBoost = new double[] { 0.5, 1, 1.5, 2, 2.5 }; + public static final double[] knockbackModifier = new double[] { 1, 2, 3, 4, 5 }; + + public LivingArmourUpgradeSprintAttack(int level) + { + super(level); + } + + @Override + public double getAdditionalDamageOnHit(double damage, EntityPlayer wearer, EntityLivingBase hitEntity, ItemStack weapon) + { + if (wearer.isSprinting()) + { + return getDamageModifier(); + } + + return 0; + } + + @Override + public double getKnockbackOnHit(EntityPlayer wearer, EntityLivingBase hitEntity, ItemStack weapon) + { + if (wearer.isSprinting()) + { + return getKnockbackModifier(); + } + + return 0; + } + + public double getDamageModifier() + { + return damageBoost[this.level]; + } + + public double getKnockbackModifier() + { + return knockbackModifier[this.level]; + } + + @Override + public String getUniqueIdentifier() + { + return Constants.Mod.MODID + ".upgrade.sprintAttack"; + } + + @Override + public int getMaxTier() + { + return 5; + } + + @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 + "sprintAttack"; + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java b/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java index 2b40e2c6..032177fc 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java @@ -1,8 +1,40 @@ package WayofTime.bloodmagic.registry; import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.livingArmour.tracker.*; -import WayofTime.bloodmagic.livingArmour.upgrade.*; +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.StatTrackerFood; +import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerGraveDigger; +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.StatTrackerMovement; +import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerPhysicalProtect; +import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerPoison; +import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerSelfSacrifice; +import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerSolarPowered; +import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerSprintAttack; +import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerStepAssist; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeArrowShot; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeDigging; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeExperience; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeFallProtect; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeGraveDigger; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeGrimReaperSprint; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeHealthboost; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeJump; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeKnockbackResist; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeMeleeDamage; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradePhysicalProtect; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradePoisonResist; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSelfSacrifice; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSolarPowered; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSpeed; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSprintAttack; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeStepAssist; public class ModArmourTrackers { @@ -24,6 +56,7 @@ public class ModArmourTrackers LivingArmourHandler.registerStatTracker(StatTrackerFallProtect.class); LivingArmourHandler.registerStatTracker(StatTrackerGraveDigger.class); LivingArmourHandler.registerStatTracker(StatTrackerStepAssist.class); + LivingArmourHandler.registerStatTracker(StatTrackerSprintAttack.class); LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeSpeed(0)); LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeDigging(0)); @@ -41,5 +74,6 @@ public class ModArmourTrackers LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeJump(0)); LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeFallProtect(0)); LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeGraveDigger(0)); + LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeSprintAttack(0)); } } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java index 3ddea3c9..34a17cf3 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java @@ -27,6 +27,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -99,6 +100,7 @@ import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerMeleeDamage; import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerPhysicalProtect; import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerSelfSacrifice; import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerSolarPowered; +import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerSprintAttack; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeArrowShot; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeDigging; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeExperience; @@ -676,6 +678,17 @@ public class EventHandler { StatTrackerGraveDigger.incrementCounter(armour, amount); } + + if (player.isSprinting()) + { + StatTrackerSprintAttack.incrementCounter(armour, amount); + } + + double kb = armour.getKnockbackOnHit(player, attackedEntity, mainWeapon); + if (kb > 0) + { + ((EntityLivingBase) attackedEntity).knockBack(player, (float) kb * 0.5F, (double) MathHelper.sin(player.rotationYaw * 0.017453292F), (double) (-MathHelper.cos(player.rotationYaw * 0.017453292F))); + } } } } diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 4e476c13..c0536ea8 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -322,6 +322,7 @@ tooltip.BloodMagic.livingArmour.upgrade.experienced=Experienced tooltip.BloodMagic.livingArmour.upgrade.jump=Strong Legs tooltip.BloodMagic.livingArmour.upgrade.fallProtect=Soft Fall tooltip.BloodMagic.livingArmour.upgrade.graveDigger=Grave Digger +tooltip.BloodMagic.livingArmour.upgrade.sprintAttack=Charging Strike tooltip.BloodMagic.livingArmour.upgrade.level=%s (Level %d) tooltip.BloodMagic.livingArmour.upgrade.points=&6Upgrade points: %s / %s