*CLEANUP* - Swords.java

This commit is contained in:
GJ 2012-03-13 15:55:42 -04:00
parent dc6a2b654e
commit 5a54d6e0c5

View File

@ -1,13 +1,16 @@
package com.gmail.nossr50.skills; package com.gmail.nossr50.skills;
import org.bukkit.entity.AnimalTamer;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.Wolf; import org.bukkit.entity.Wolf;
import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageByEntityEvent;
import com.gmail.nossr50.Combat; import com.gmail.nossr50.Combat;
import com.gmail.nossr50.ItemChecks; import com.gmail.nossr50.ItemChecks;
import com.gmail.nossr50.Users; import com.gmail.nossr50.Users;
import com.gmail.nossr50.m;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.mcPermissions;
import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.PlayerProfile;
@ -15,126 +18,131 @@ import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.mcLocale; import com.gmail.nossr50.locale.mcLocale;
import com.gmail.nossr50.party.Party; import com.gmail.nossr50.party.Party;
public class Swords public class Swords {
{
public static void bleedCheck(Player attacker, LivingEntity x, mcMMO pluginx)
{
PlayerProfile PPa = Users.getProfile(attacker);
if(x instanceof Wolf) /**
{ * Check for Bleed effect.
Wolf wolf = (Wolf)x; *
if(wolf.getOwner() instanceof Player) * @param attacker The attacking player
{ * @param entity The defending entity
Player owner = (Player) wolf.getOwner(); * @param plugin mcMMO plugin instance
if(owner == attacker) */
return; public static void bleedCheck(Player attacker, LivingEntity entity, mcMMO plugin) {
if(Party.getInstance().inSameParty(attacker, owner))
return; if (entity instanceof Wolf) {
} Wolf wolf = (Wolf) entity;
}
if(mcPermissions.getInstance().swords(attacker) && ItemChecks.isSword(attacker.getItemInHand())){ if (wolf.isTamed()) {
if(PPa.getSkillLevel(SkillType.SWORDS) >= 750) AnimalTamer tamer = wolf.getOwner();
{
if(Math.random() * 1000 <= 750) if (tamer instanceof Player) {
{ Player owner = (Player) tamer;
if(!(x instanceof Player))
pluginx.misc.addToBleedQue(x); if (owner == attacker || Party.getInstance().inSameParty(attacker, owner)) {
if(x instanceof Player) return;
{ }
Player target = (Player)x; }
Users.getProfile(target).addBleedTicks(3); }
} }
attacker.sendMessage(mcLocale.getString("Swords.EnemyBleeding"));
} final int MAX_BONUS_LEVEL = 750;
}
else if (Math.random() * 1000 <= PPa.getSkillLevel(SkillType.SWORDS)) PlayerProfile PPa = Users.getProfile(attacker);
{ int skillLevel = PPa.getSkillLevel(SkillType.SWORDS);
if(!(x instanceof Player)) int skillCheck = m.skillCheck(skillLevel, MAX_BONUS_LEVEL);
pluginx.misc.addToBleedQue(x);
if(x instanceof Player) if (Math.random() * 1000 <= skillCheck && !entity.isDead()) {
{ if (entity instanceof Player) {
Player target = (Player)x; Player target = (Player) entity;
Users.getProfile(target).addBleedTicks(2); int bleedTicks;
}
attacker.sendMessage(mcLocale.getString("Swords.EnemyBleeding")); if (skillLevel >= 750) {
} bleedTicks = 3;
} }
else {
bleedTicks = 2;
}
Users.getProfile(target).addBleedTicks(bleedTicks);
}
else {
plugin.misc.addToBleedQue(entity);
}
attacker.sendMessage(mcLocale.getString("Swords.EnemyBleeding"));
}
} }
public static void counterAttackChecks(EntityDamageByEntityEvent event) /**
{ * Counter-attack entities.
//Don't want to counter attack stuff not alive *
* @param event The event to modify
*/
public static void counterAttackChecks(EntityDamageByEntityEvent event) {
Entity attacker = event.getDamager();
if(!(event.getDamager() instanceof LivingEntity)) if (!(attacker instanceof LivingEntity)) {
return; return;
}
if(event instanceof EntityDamageByEntityEvent) Entity target = event.getEntity();
{
Entity f = ((EntityDamageByEntityEvent) event).getDamager(); if (target instanceof Player) {
if(event.getEntity() instanceof Player) Player defender = (Player) target;
{ PlayerProfile PPd = Users.getProfile(defender);
Player defender = (Player)event.getEntity();
PlayerProfile PPd = Users.getProfile(defender); if (ItemChecks.isSword(defender.getItemInHand()) && mcPermissions.getInstance().swords(defender)) {
if(ItemChecks.isSword(defender.getItemInHand()) && mcPermissions.getInstance().swords(defender)) final int MAX_BONUS_LEVEL = 600;
{ final int COUNTER_ATTACK_MODIFIER = 2;
if(PPd.getSkillLevel(SkillType.SWORDS) >= 600)
{ int skillLevel = PPd.getSkillLevel(SkillType.SWORDS);
if(Math.random() * 2000 <= 600) int skillCheck = m.skillCheck(skillLevel, MAX_BONUS_LEVEL);
{
Combat.dealDamage((LivingEntity) f, event.getDamage() / 2); if (Math.random() * 2000 <= skillCheck) {
defender.sendMessage(mcLocale.getString("Swords.CounterAttacked")); Combat.dealDamage((LivingEntity) attacker, event.getDamage() / COUNTER_ATTACK_MODIFIER);
if(f instanceof Player) defender.sendMessage(mcLocale.getString("Swords.CounterAttacked"));
((Player) f).sendMessage(mcLocale.getString("Swords.HitByCounterAttack"));
} if (attacker instanceof Player) {
} ((Player) attacker).sendMessage(mcLocale.getString("Swords.HitByCounterAttack"));
else if (Math.random() * 2000 <= PPd.getSkillLevel(SkillType.SWORDS)) }
{ }
Combat.dealDamage((LivingEntity) f, event.getDamage() / 2); }
defender.sendMessage(mcLocale.getString("Swords.CounterAttacked")); }
if(f instanceof Player)
((Player) f).sendMessage(mcLocale.getString("Swords.HitByCounterAttack"));
}
}
}
}
} }
public static void bleedSimulate(mcMMO plugin) /**
{ * Simulate a bleed.
//Add items from Que list to BleedTrack list *
* @param plugin mcMMO plugin instance
*/
public static void bleedSimulate(mcMMO plugin) {
for(LivingEntity x : plugin.misc.bleedQue) /* Add items from Que list to BleedTrack list */
{ for (LivingEntity entity : plugin.misc.bleedQue) {
plugin.misc.bleedTracker.add(x); plugin.misc.bleedTracker.add(entity);
} }
//Clear list /* Clear the BleedQue list */
plugin.misc.bleedQue = new LivingEntity[plugin.misc.bleedQue.length]; plugin.misc.bleedQue = new LivingEntity[plugin.misc.bleedQue.length];
plugin.misc.bleedQuePos = 0; plugin.misc.bleedQuePos = 0;
//Cleanup any dead entities from the list /* Cleanup any dead entities from the list */
for(LivingEntity x : plugin.misc.bleedRemovalQue) for(LivingEntity entity : plugin.misc.bleedRemovalQue) {
{ plugin.misc.bleedTracker.remove(entity);
plugin.misc.bleedTracker.remove(x); }
}
//Clear bleed removal list /* Clear bleed removal list */
plugin.misc.bleedRemovalQue = new LivingEntity[plugin.misc.bleedRemovalQue.length]; plugin.misc.bleedRemovalQue = new LivingEntity[plugin.misc.bleedRemovalQue.length];
plugin.misc.bleedRemovalQuePos = 0; plugin.misc.bleedRemovalQuePos = 0;
//Bleed monsters/animals /* Bleed monsters/animals */
for(LivingEntity x : plugin.misc.bleedTracker) for (LivingEntity entity : plugin.misc.bleedTracker) {
{ if (entity == null || entity.isDead()) {
if(x == null || x.isDead()) plugin.misc.addToBleedRemovalQue(entity);
{ continue;
plugin.misc.addToBleedRemovalQue(x); }
continue; else {
} Combat.dealDamage(entity, 2);
else }
{
Combat.dealDamage(x, 2);
}
} }
} }
} }