From 4ee2ad5f3bbcaafc6503bb351958bd73c6124c02 Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Thu, 5 Dec 2013 23:36:03 -0700 Subject: [PATCH] Add in Powersurge Zombie. --- .../src/me/kaZep/Base/PlayerBuffData.java | 10 +- .../src/me/kaZep/Base/PlayerListener.java | 95 +++++++++++++++++++ 2 files changed, 100 insertions(+), 5 deletions(-) diff --git a/BankEconomyMod/src/me/kaZep/Base/PlayerBuffData.java b/BankEconomyMod/src/me/kaZep/Base/PlayerBuffData.java index b37b4bd..1b89a26 100644 --- a/BankEconomyMod/src/me/kaZep/Base/PlayerBuffData.java +++ b/BankEconomyMod/src/me/kaZep/Base/PlayerBuffData.java @@ -209,11 +209,6 @@ public class PlayerBuffData { p.removePotionEffect(PotionEffectType.FAST_DIGGING); p.addPotionEffect(new PotionEffect(PotionEffectType.FAST_DIGGING,399,this.plugin.getStatBonus(1, this.plugin.getAccountsConfig().getInt(p.getName().toLowerCase()+".stats.stat2")/5)/20-1)); } - //p.sendMessage("Health: "+p.getHealth()+"/"+p.getMaxHealth()+" Base HP Level: "+base_hplv); - if (p.getHealth()>p.getMaxHealth()) { - p.setHealth(p.getMaxHealth()); - //p.sendMessage("Health: "+p.getHealth()+"/"+p.getMaxHealth()+" Set new health: "+p.getMaxHealth()+"+"+extra_hp); - } if (base_hplv!=p.getMaxHealth()) { double temphp=0; if (base_hplvp.getMaxHealth()) { + p.setHealth(p.getMaxHealth()); + //p.sendMessage("Health: "+p.getHealth()+"/"+p.getMaxHealth()+" Set new health: "+p.getMaxHealth()+"+"+extra_hp); + } /*if (base_hplv!=p.getMaxHealth()) { p.setMaxHealth(base_hplv-extra_hp); }*/ diff --git a/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java b/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java index 8cbb99e..6788506 100644 --- a/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java +++ b/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java @@ -8940,6 +8940,101 @@ implements Listener if (e.getEntity() instanceof LivingEntity) { final LivingEntity l = (LivingEntity)e.getEntity(); + if (e.getDamager() instanceof LivingEntity) { + LivingEntity l2 = (LivingEntity)e.getDamager(); + if (l2.getCustomName()!=null && l2.getCustomName().contains(ChatColor.RED+"Powersurge Zombie")) { + int dmgamt = 0; //How much the bonus damage rating to do. + ItemStack item = l.getEquipment().getHelmet(); + if (item!=null) { + Map map = item.getEnchantments(); + for (Map.Entry entry : map.entrySet()) { + dmgamt+=entry.getValue(); + } + if (item.getType().name().toLowerCase().contains("diamond")) { + dmgamt+=5; + } + if (item.getType().name().toLowerCase().contains("iron")) { + dmgamt+=3; + dmgamt/=1.5; + } + if (item.getType().name().toLowerCase().contains("leather")) { + dmgamt+=1; + dmgamt/=8; + } + if (item.getType().name().toLowerCase().contains("gold") || item.getType().name().toLowerCase().contains("chain")) { + dmgamt+=2; + dmgamt/=4; + } + } + item = l.getEquipment().getChestplate(); + if (item!=null) { + Map map = item.getEnchantments(); + for (Map.Entry entry : map.entrySet()) { + dmgamt+=entry.getValue(); + } + if (item.getType().name().toLowerCase().contains("diamond")) { + dmgamt+=7; + } + if (item.getType().name().toLowerCase().contains("iron")) { + dmgamt+=5; + dmgamt/=1.5; + } + if (item.getType().name().toLowerCase().contains("leather")) { + dmgamt+=2; + dmgamt/=8; + } + if (item.getType().name().toLowerCase().contains("gold") || item.getType().name().toLowerCase().contains("chain")) { + dmgamt+=4; + dmgamt/=4; + } + } + item = l.getEquipment().getLeggings(); + if (item!=null) { + Map map = item.getEnchantments(); + for (Map.Entry entry : map.entrySet()) { + dmgamt+=entry.getValue(); + } + if (item.getType().name().toLowerCase().contains("diamond")) { + dmgamt+=4; + } + if (item.getType().name().toLowerCase().contains("iron")) { + dmgamt+=2; + dmgamt/=1.5; + } + if (item.getType().name().toLowerCase().contains("leather")) { + dmgamt+=1; + dmgamt/=8; + } + if (item.getType().name().toLowerCase().contains("gold") || item.getType().name().toLowerCase().contains("chain")) { + dmgamt+=1; + dmgamt/=4; + } + } + item = l.getEquipment().getBoots(); + if (item!=null) { + Map map = item.getEnchantments(); + for (Map.Entry entry : map.entrySet()) { + dmgamt+=entry.getValue(); + } + if (item.getType().name().toLowerCase().contains("diamond")) { + dmgamt+=2; + } + if (item.getType().name().toLowerCase().contains("iron")) { + dmgamt+=1; + dmgamt/=1.5; + } + if (item.getType().name().toLowerCase().contains("leather")) { + dmgamt+=0; + dmgamt/=8; + } + if (item.getType().name().toLowerCase().contains("gold") || item.getType().name().toLowerCase().contains("chain")) { + dmgamt+=1; + dmgamt/=4; + } + } + e.setDamage(e.getDamage()+dmgamt); + } + } if (l.getCustomName()!=null && l.getCustomName().contains(ChatColor.RED+"Wolf Minion")) { e.setDamage(e.getDamage()*1.5); }