|
|
@ -852,6 +852,7 @@ public class PlayerCombatStats { |
|
|
|
|
|
|
|
|
|
|
|
//right ring
|
|
|
|
//right ring
|
|
|
|
if(this.owner.charItemManager != null){ |
|
|
|
if(this.owner.charItemManager != null){ |
|
|
|
|
|
|
|
try{ |
|
|
|
if(this.owner.charItemManager.getEquipped(7) != null){ |
|
|
|
if(this.owner.charItemManager.getEquipped(7) != null){ |
|
|
|
for(String effID : this.owner.charItemManager.getEquipped(7).effects.keySet()) { |
|
|
|
for(String effID : this.owner.charItemManager.getEquipped(7).effects.keySet()) { |
|
|
|
for (AbstractEffectModifier mod : this.owner.charItemManager.getEquipped(7).effects.get(effID).getEffectModifiers()) { |
|
|
|
for (AbstractEffectModifier mod : this.owner.charItemManager.getEquipped(7).effects.get(effID).getEffectModifiers()) { |
|
|
@ -866,24 +867,30 @@ public class PlayerCombatStats { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
}catch(Exception e){ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
//left ring
|
|
|
|
//left ring
|
|
|
|
if(this.owner.charItemManager.getEquipped(8) != null){ |
|
|
|
try { |
|
|
|
for(String effID : this.owner.charItemManager.getEquipped(8).effects.keySet()) { |
|
|
|
if (this.owner.charItemManager.getEquipped(8) != null) { |
|
|
|
for (AbstractEffectModifier mod : this.owner.charItemManager.getEquipped(8).effects.get(effID).getEffectModifiers()) { |
|
|
|
for (String effID : this.owner.charItemManager.getEquipped(8).effects.keySet()) { |
|
|
|
if (mod.modType.equals(Enum.ModType.DCV)) { |
|
|
|
for (AbstractEffectModifier mod : this.owner.charItemManager.getEquipped(8).effects.get(effID).getEffectModifiers()) { |
|
|
|
if (mod.getPercentMod() == 0) { |
|
|
|
if (mod.modType.equals(Enum.ModType.DCV)) { |
|
|
|
float value = mod.getMinMod(); |
|
|
|
if (mod.getPercentMod() == 0) { |
|
|
|
int trains = this.owner.effects.get(effID).getTrains(); |
|
|
|
float value = mod.getMinMod(); |
|
|
|
float modValue = value + (trains * mod.getRamp()); |
|
|
|
int trains = this.owner.effects.get(effID).getTrains(); |
|
|
|
flatBonuses += modValue; |
|
|
|
float modValue = value + (trains * mod.getRamp()); |
|
|
|
|
|
|
|
flatBonuses += modValue; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
}catch(Exception e){ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
//necklace
|
|
|
|
//necklace
|
|
|
|
|
|
|
|
try{ |
|
|
|
if(this.owner.charItemManager.getEquipped(9) != null){ |
|
|
|
if(this.owner.charItemManager.getEquipped(9) != null){ |
|
|
|
for(String effID : this.owner.charItemManager.getEquipped(9).effects.keySet()) { |
|
|
|
for(String effID : this.owner.charItemManager.getEquipped(9).effects.keySet()) { |
|
|
|
for (AbstractEffectModifier mod : this.owner.charItemManager.getEquipped(9).effects.get(effID).getEffectModifiers()) { |
|
|
|
for (AbstractEffectModifier mod : this.owner.charItemManager.getEquipped(9).effects.get(effID).getEffectModifiers()) { |
|
|
@ -898,10 +905,17 @@ public class PlayerCombatStats { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
}catch(Exception e){ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
try{ |
|
|
|
if(this.owner.charItemManager.getEquipped(2) == null) |
|
|
|
if(this.owner.charItemManager.getEquipped(2) == null) |
|
|
|
blockSkill = 0; |
|
|
|
blockSkill = 0; |
|
|
|
else if(this.owner.charItemManager != null && this.owner.charItemManager.getEquipped(2) != null && !this.owner.charItemManager.getEquipped(2).getItemBase().isShield()) |
|
|
|
else if(this.owner.charItemManager != null && this.owner.charItemManager.getEquipped(2) != null && !this.owner.charItemManager.getEquipped(2).getItemBase().isShield()) |
|
|
|
blockSkill = 0; |
|
|
|
blockSkill = 0; |
|
|
|
|
|
|
|
}catch(Exception e){ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|