|
|
@ -836,7 +836,50 @@ public class PlayerCombatStats { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if(this.owner.bonuses != null) |
|
|
|
if(this.owner.charItemManager != null){ |
|
|
|
|
|
|
|
if(this.owner.charItemManager.getEquipped(7) != null){ |
|
|
|
|
|
|
|
for(String effID : this.owner.charItemManager.getEquipped(7).effects.keySet()) { |
|
|
|
|
|
|
|
for (AbstractEffectModifier mod : this.owner.effects.get(effID).getEffectModifiers()) { |
|
|
|
|
|
|
|
if (mod.modType.equals(Enum.ModType.DCV)) { |
|
|
|
|
|
|
|
if (mod.getPercentMod() == 0) { |
|
|
|
|
|
|
|
float value = mod.getMinMod(); |
|
|
|
|
|
|
|
int trains = this.owner.effects.get(effID).getTrains(); |
|
|
|
|
|
|
|
float modValue = value + (trains * mod.getRamp()); |
|
|
|
|
|
|
|
flatBonuses += modValue; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if(this.owner.charItemManager.getEquipped(8) != null){ |
|
|
|
|
|
|
|
for(String effID : this.owner.charItemManager.getEquipped(8).effects.keySet()) { |
|
|
|
|
|
|
|
for (AbstractEffectModifier mod : this.owner.effects.get(effID).getEffectModifiers()) { |
|
|
|
|
|
|
|
if (mod.modType.equals(Enum.ModType.DCV)) { |
|
|
|
|
|
|
|
if (mod.getPercentMod() == 0) { |
|
|
|
|
|
|
|
float value = mod.getMinMod(); |
|
|
|
|
|
|
|
int trains = this.owner.effects.get(effID).getTrains(); |
|
|
|
|
|
|
|
float modValue = value + (trains * mod.getRamp()); |
|
|
|
|
|
|
|
flatBonuses += modValue; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if(this.owner.charItemManager.getEquipped(9) != null){ |
|
|
|
|
|
|
|
for(String effID : this.owner.charItemManager.getEquipped(9).effects.keySet()) { |
|
|
|
|
|
|
|
for (AbstractEffectModifier mod : this.owner.effects.get(effID).getEffectModifiers()) { |
|
|
|
|
|
|
|
if (mod.modType.equals(Enum.ModType.DCV)) { |
|
|
|
|
|
|
|
if (mod.getPercentMod() == 0) { |
|
|
|
|
|
|
|
float value = mod.getMinMod(); |
|
|
|
|
|
|
|
int trains = this.owner.effects.get(effID).getTrains(); |
|
|
|
|
|
|
|
float modValue = value + (trains * mod.getRamp()); |
|
|
|
|
|
|
|
flatBonuses += modValue; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
flatBonuses += this.owner.bonuses.getFloat(Enum.ModType.DCV, Enum.SourceType.None); |
|
|
|
flatBonuses += this.owner.bonuses.getFloat(Enum.ModType.DCV, Enum.SourceType.None); |
|
|
|
|
|
|
|
|
|
|
|
if(this.owner.charItemManager.getEquipped(2) == null) |
|
|
|
if(this.owner.charItemManager.getEquipped(2) == null) |
|
|
|