diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar index 2e93bb9..cc5e605 100644 Binary files a/TwosideKeeper.jar and b/TwosideKeeper.jar differ diff --git a/src/sig/plugin/TwosideKeeper/EliteMonster.java b/src/sig/plugin/TwosideKeeper/EliteMonster.java index 51fe7b2..47b3b39 100644 --- a/src/sig/plugin/TwosideKeeper/EliteMonster.java +++ b/src/sig/plugin/TwosideKeeper/EliteMonster.java @@ -421,6 +421,9 @@ public class EliteMonster { m.getEquipment().setHelmet(helm); m.getEquipment().setHelmet(Loot.GenerateMegaPiece(helm.getType(), true, true, 1)); m.getEquipment().setHelmetDropChance(1.0f); + if (!leaping) { + m.removePotionEffect(PotionEffectType.LEVITATION); + } if (!enraged) { if (m.hasPotionEffect(PotionEffectType.INCREASE_DAMAGE)) { m.removePotionEffect(PotionEffectType.INCREASE_DAMAGE); diff --git a/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java b/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java index 63a59ac..3859272 100644 --- a/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java +++ b/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java @@ -2931,7 +2931,9 @@ public class GenericFunctions { double dodgechance = NewCombat.CalculateDodgeChance((Player)entity); Player p = (Player)entity; if (!p.hasPotionEffect(PotionEffectType.GLOWING)) { + TwosideKeeper.log("Dodge chance is "+dodgechance,4); if (Math.random()<=dodgechance) { + TwosideKeeper.log("Dodged.",4); p.playSound(p.getLocation(), Sound.ENTITY_PLAYER_ATTACK_SWEEP, 3.0f, 1.0f); for (int i=0;idodgechance) { //DealDamageToMob(dmg,(LivingEntity)nearbyentities.get(i),null,null,"Explosion"); TwosideKeeper.log("dmg dealt is supposed to be "+dmg, 5); subtractHealth((LivingEntity)nearbyentities.get(i),null,NewCombat.CalculateDamageReduction(dmg, (LivingEntity)nearbyentities.get(i), null)); } else { + TwosideKeeper.log("Dodged.",4); if (nearbyentities.get(i) instanceof Player) { Player p = (Player)nearbyentities.get(i); p.playSound(p.getLocation(), Sound.ENTITY_PLAYER_ATTACK_SWEEP, 3.0f, 1.0f); @@ -3425,6 +3429,7 @@ public class GenericFunctions { if (players.get(i) instanceof Player) { Player p = (Player)players.get(i); dodgechance = NewCombat.CalculateDodgeChance(p); + TwosideKeeper.log("Dodge chance is "+dodgechance,4); if (Math.random()>dodgechance) { TwosideKeeper.log("Dealt "+basedmg+" raw damage.", 5); //DealDamageToMob(NewCombat.CalculateDamageReduction(basedmg,p,null),(LivingEntity)nearbyentities.get(i),null,null,"Slam"); @@ -3433,6 +3438,7 @@ public class GenericFunctions { p.setVelocity(new Vector(0,knockupamt,0)); } } else { + TwosideKeeper.log("Dodged.",4); p.playSound(p.getLocation(), Sound.ENTITY_PLAYER_ATTACK_SWEEP, 3.0f, 1.0f); for (int j=0;j0) { + 93.182445*pd.velocity>4.317) { dodgechance+=0.2; } if (GenericFunctions.isRanger(p)) { diff --git a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java index 1bb48bd..624eb28 100644 --- a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java +++ b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java @@ -4103,9 +4103,10 @@ public class TwosideKeeper extends JavaPlugin implements Listener { } if (Math.random()<=dodgechance) { + TwosideKeeper.log("Dodged.", 4); //Cancel this event, we dodged the attack. p.playSound(p.getLocation(), Sound.ENTITY_PLAYER_ATTACK_SWEEP, 3.0f, 1.0f); - log("Triggered Dodge.",3); + log("Triggered Dodge.",4); for (int i=0;i