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

Lifesteal removed from Barbarian pieces.

Browse Source
This commit is contained in:
sigonasr2 2016-08-12 22:03:49 -05:00
parent ccea62159b
commit 041f24076b
4 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
TwosideKeeper.jar
View File

Binary file not shown.

7
src/sig/plugin/TwosideKeeper/AwakenedArtifact.java
View File

@ -82,13 +82,6 @@ public class AwakenedArtifact {
double potentialred = 10.0d; double potentialred = 10.0d;
potentialred *= 1 - GenericFunctions.getAbilityValue(ArtifactAbility.PRESERVATION, artifact)/100d; potentialred *= 1 - GenericFunctions.getAbilityValue(ArtifactAbility.PRESERVATION, artifact)/100d;
TwosideKeeper.log("Potential reduction is reduced by "+(10-potentialred), 4); TwosideKeeper.log("Potential reduction is reduced by "+(10-potentialred), 4);
if (ArtifactAbility.containsEnchantment(ArtifactAbility.GREED, item)) {
if (ArtifactAbility.getEnchantmentLevel(ArtifactAbility.GREED, item)>1) {
item = ArtifactAbility.applyEnchantment(ArtifactAbility.GREED, ArtifactAbility.getEnchantmentLevel(ArtifactAbility.GREED, item)-1, item);
} else {
item = ArtifactAbility.removeEnchantment(ArtifactAbility.GREED, item);
}
}
if (getPotential(item)>potentialred) { if (getPotential(item)>potentialred) {
item = setPotential(item,(int)(getPotential(item)-potentialred)); item = setPotential(item,(int)(getPotential(item)-potentialred));
if (Math.random() < (potentialred % 1)) { if (Math.random() < (potentialred % 1)) {

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

@ -1287,15 +1287,6 @@ public class NewCombat {
public static double calculateLifeStealAmount(Player p) { public static double calculateLifeStealAmount(Player p) {
double lifestealpct = GenericFunctions.getAbilityValue(ArtifactAbility.LIFESTEAL, p.getEquipment().getItemInMainHand())/100; double lifestealpct = GenericFunctions.getAbilityValue(ArtifactAbility.LIFESTEAL, p.getEquipment().getItemInMainHand())/100;
for (int i=0;i<GenericFunctions.getEquipment(p).length;i++) {
ItemSet set = ItemSet.GetSet(GenericFunctions.getEquipment(p)[i]);
if (set!=null) {
if (set==ItemSet.DAWNTRACKER) {
lifestealpct += set.GetBaseAmount(GenericFunctions.getEquipment(p)[i])/100d;
}
}
}
lifestealpct += ItemSet.TotalBaseAmountBasedOnSetBonusCount(p, ItemSet.DAWNTRACKER, 4, 4)/100d; lifestealpct += ItemSet.TotalBaseAmountBasedOnSetBonusCount(p, ItemSet.DAWNTRACKER, 4, 4)/100d;
return lifestealpct; return lifestealpct;
} }

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

@ -3890,7 +3890,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
if (ev.getCause()==DamageCause.FIRE || ev.getCause()==DamageCause.FIRE_TICK || if (ev.getCause()==DamageCause.FIRE || ev.getCause()==DamageCause.FIRE_TICK ||
ev.getCause()==DamageCause.LAVA || ev.getCause()==DamageCause.SUFFOCATION || ev.getCause()==DamageCause.LAVA || ev.getCause()==DamageCause.SUFFOCATION ||
ev.getCause()==DamageCause.WITHER || ev.getCause()==DamageCause.POISON ev.getCause()==DamageCause.WITHER || ev.getCause()==DamageCause.POISON
|| ev.getCause()==DamageCause.THORNS) { || ev.getCause()==DamageCause.THORNS || ev.getCause()==DamageCause.VOID) {
if (ev.getEntity() instanceof LivingEntity) { if (ev.getEntity() instanceof LivingEntity) {
ev.setDamage(DamageModifier.MAGIC,0); ev.setDamage(DamageModifier.MAGIC,0);
ev.setDamage(DamageModifier.RESISTANCE,0); ev.setDamage(DamageModifier.RESISTANCE,0);