sigonasr2/TwosideKeeper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix issues with Strikers always having 20% dodge chance.

Browse Source
This commit is contained in:
sigonasr2 2016-08-14 16:09:42 -05:00
parent a287f66df7
commit 91a7aadcd0
5 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
TwosideKeeper.jar
View File

Binary file not shown.

3
src/sig/plugin/TwosideKeeper/EliteMonster.java
View File

@ -421,6 +421,9 @@ public class EliteMonster {
m.getEquipment().setHelmet(helm); m.getEquipment().setHelmet(helm);
m.getEquipment().setHelmet(Loot.GenerateMegaPiece(helm.getType(), true, true, 1)); m.getEquipment().setHelmet(Loot.GenerateMegaPiece(helm.getType(), true, true, 1));
m.getEquipment().setHelmetDropChance(1.0f); m.getEquipment().setHelmetDropChance(1.0f);
if (!leaping) {
m.removePotionEffect(PotionEffectType.LEVITATION);
}
if (!enraged) { if (!enraged) {
if (m.hasPotionEffect(PotionEffectType.INCREASE_DAMAGE)) { if (m.hasPotionEffect(PotionEffectType.INCREASE_DAMAGE)) {
m.removePotionEffect(PotionEffectType.INCREASE_DAMAGE); m.removePotionEffect(PotionEffectType.INCREASE_DAMAGE);

6
src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java
View File

@ -2931,7 +2931,9 @@ public class GenericFunctions {
double dodgechance = NewCombat.CalculateDodgeChance((Player)entity); double dodgechance = NewCombat.CalculateDodgeChance((Player)entity);
Player p = (Player)entity; Player p = (Player)entity;
if (!p.hasPotionEffect(PotionEffectType.GLOWING)) { if (!p.hasPotionEffect(PotionEffectType.GLOWING)) {
TwosideKeeper.log("Dodge chance is "+dodgechance,4);
if (Math.random()<=dodgechance) { if (Math.random()<=dodgechance) {
TwosideKeeper.log("Dodged.",4);
p.playSound(p.getLocation(), Sound.ENTITY_PLAYER_ATTACK_SWEEP, 3.0f, 1.0f); p.playSound(p.getLocation(), Sound.ENTITY_PLAYER_ATTACK_SWEEP, 3.0f, 1.0f);
for (int i=0;i<p.getEquipment().getArmorContents().length;i++) { for (int i=0;i<p.getEquipment().getArmorContents().length;i++) {
ItemStack equip = p.getEquipment().getArmorContents()[i]; ItemStack equip = p.getEquipment().getArmorContents()[i];
@ -3307,11 +3309,13 @@ public class GenericFunctions {
Player p = (Player)nearbyentities.get(i); Player p = (Player)nearbyentities.get(i);
dodgechance = NewCombat.CalculateDodgeChance(p); dodgechance = NewCombat.CalculateDodgeChance(p);
} }
TwosideKeeper.log("Dodge chance is "+dodgechance,4);
if (Math.random()>dodgechance) { if (Math.random()>dodgechance) {
//DealDamageToMob(dmg,(LivingEntity)nearbyentities.get(i),null,null,"Explosion"); //DealDamageToMob(dmg,(LivingEntity)nearbyentities.get(i),null,null,"Explosion");
TwosideKeeper.log("dmg dealt is supposed to be "+dmg, 5); TwosideKeeper.log("dmg dealt is supposed to be "+dmg, 5);
subtractHealth((LivingEntity)nearbyentities.get(i),null,NewCombat.CalculateDamageReduction(dmg, (LivingEntity)nearbyentities.get(i), null)); subtractHealth((LivingEntity)nearbyentities.get(i),null,NewCombat.CalculateDamageReduction(dmg, (LivingEntity)nearbyentities.get(i), null));
} else { } else {
TwosideKeeper.log("Dodged.",4);
if (nearbyentities.get(i) instanceof Player) { if (nearbyentities.get(i) instanceof Player) {
Player p = (Player)nearbyentities.get(i); Player p = (Player)nearbyentities.get(i);
p.playSound(p.getLocation(), Sound.ENTITY_PLAYER_ATTACK_SWEEP, 3.0f, 1.0f); 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) { if (players.get(i) instanceof Player) {
Player p = (Player)players.get(i); Player p = (Player)players.get(i);
dodgechance = NewCombat.CalculateDodgeChance(p); dodgechance = NewCombat.CalculateDodgeChance(p);
TwosideKeeper.log("Dodge chance is "+dodgechance,4);
if (Math.random()>dodgechance) { if (Math.random()>dodgechance) {
TwosideKeeper.log("Dealt "+basedmg+" raw damage.", 5); TwosideKeeper.log("Dealt "+basedmg+" raw damage.", 5);
//DealDamageToMob(NewCombat.CalculateDamageReduction(basedmg,p,null),(LivingEntity)nearbyentities.get(i),null,null,"Slam"); //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)); p.setVelocity(new Vector(0,knockupamt,0));
} }
} else { } else {
TwosideKeeper.log("Dodged.",4);
p.playSound(p.getLocation(), Sound.ENTITY_PLAYER_ATTACK_SWEEP, 3.0f, 1.0f); p.playSound(p.getLocation(), Sound.ENTITY_PLAYER_ATTACK_SWEEP, 3.0f, 1.0f);
for (int j=0;j<p.getEquipment().getArmorContents().length;j++) { for (int j=0;j<p.getEquipment().getArmorContents().length;j++) {
ItemStack equip = p.getEquipment().getArmorContents()[j]; ItemStack equip = p.getEquipment().getArmorContents()[j];

2
src/sig/plugin/TwosideKeeper/NewCombat.java
View File

@ -1653,7 +1653,7 @@ public class NewCombat {
} }
if (GenericFunctions.isStriker(p) && if (GenericFunctions.isStriker(p) &&
pd.velocity>0) { 93.182445*pd.velocity>4.317) {
dodgechance+=0.2; dodgechance+=0.2;
} }
if (GenericFunctions.isRanger(p)) { if (GenericFunctions.isRanger(p)) {

8
src/sig/plugin/TwosideKeeper/TwosideKeeper.java
View File

@ -4103,9 +4103,10 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
} }
if (Math.random()<=dodgechance) { if (Math.random()<=dodgechance) {
TwosideKeeper.log("Dodged.", 4);
//Cancel this event, we dodged the attack. //Cancel this event, we dodged the attack.
p.playSound(p.getLocation(), Sound.ENTITY_PLAYER_ATTACK_SWEEP, 3.0f, 1.0f); 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<p.getEquipment().getArmorContents().length;i++) { for (int i=0;i<p.getEquipment().getArmorContents().length;i++) {
ItemStack equip = p.getEquipment().getArmorContents()[i]; ItemStack equip = p.getEquipment().getArmorContents()[i];
if (ArtifactAbility.containsEnchantment(ArtifactAbility.GRACEFULDODGE, equip)) { if (ArtifactAbility.containsEnchantment(ArtifactAbility.GRACEFULDODGE, equip)) {
@ -4124,7 +4125,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
p.setNoDamageTicks(10); p.setNoDamageTicks(10);
ev.setCancelled(true); ev.setCancelled(true);
} }
log("Dodge chance is "+dodgechance,5); log("Dodge chance is "+dodgechance,4);
} }
@ -4417,7 +4418,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
if (Math.random()<=dodgechance) { if (Math.random()<=dodgechance) {
//Cancel this event, we dodged the attack. //Cancel this event, we dodged the attack.
p.playSound(p.getLocation(), Sound.ENTITY_PLAYER_ATTACK_SWEEP, 3.0f, 1.0f); 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<p.getEquipment().getArmorContents().length;i++) { for (int i=0;i<p.getEquipment().getArmorContents().length;i++) {
ItemStack equip = p.getEquipment().getArmorContents()[i]; ItemStack equip = p.getEquipment().getArmorContents()[i];
if (ArtifactAbility.containsEnchantment(ArtifactAbility.GRACEFULDODGE, equip)) { if (ArtifactAbility.containsEnchantment(ArtifactAbility.GRACEFULDODGE, equip)) {
@ -4435,6 +4436,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
} }
p.setNoDamageTicks(10); p.setNoDamageTicks(10);
ev.setCancelled(true); ev.setCancelled(true);
log("Dodge chance is "+dodgechance,4);
} }
} }
} }