Damage bonus should not be negative.

This commit is contained in:
MobiusDevelopment 2019-06-16 11:24:18 +00:00
parent e8b29cc85c
commit 8b996720a5
12 changed files with 24 additions and 24 deletions

View File

@ -1567,7 +1567,7 @@ public final class Formulas
pvpDefense = target.getStat().getValue(Stats.PVP_PHYSICAL_ATTACK_DEFENCE, 1) * Config.PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS.getOrDefault(targetPlayer.getClassId(), 1f); pvpDefense = target.getStat().getValue(Stats.PVP_PHYSICAL_ATTACK_DEFENCE, 1) * Config.PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS.getOrDefault(targetPlayer.getClassId(), 1f);
} }
return 1 + (pvpAttack - pvpDefense); return Math.max(0.05, 1 + (pvpAttack - pvpDefense)); // Bonus should not be negative.
} }
// PvE Bonus // PvE Bonus
@ -1616,7 +1616,7 @@ public final class Formulas
pveRaidDefense = attacker.isRaid() ? attacker.getStat().getValue(Stats.PVE_RAID_PHYSICAL_ATTACK_DEFENCE, 1) : 1; pveRaidDefense = attacker.isRaid() ? attacker.getStat().getValue(Stats.PVE_RAID_PHYSICAL_ATTACK_DEFENCE, 1) : 1;
} }
return (1 + (pveAttack - (pveDefense * pveRaidDefense))) * pvePenalty; return Math.max(0.05, (1 + (pveAttack - (pveDefense * pveRaidDefense))) * pvePenalty); // Bonus should not be negative.
} }
return 1; return 1;

View File

@ -1567,7 +1567,7 @@ public final class Formulas
pvpDefense = target.getStat().getValue(Stats.PVP_PHYSICAL_ATTACK_DEFENCE, 1) * Config.PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS.getOrDefault(targetPlayer.getClassId(), 1f); pvpDefense = target.getStat().getValue(Stats.PVP_PHYSICAL_ATTACK_DEFENCE, 1) * Config.PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS.getOrDefault(targetPlayer.getClassId(), 1f);
} }
return 1 + (pvpAttack - pvpDefense); return Math.max(0.05, 1 + (pvpAttack - pvpDefense)); // Bonus should not be negative.
} }
// PvE Bonus // PvE Bonus
@ -1616,7 +1616,7 @@ public final class Formulas
pveRaidDefense = attacker.isRaid() ? attacker.getStat().getValue(Stats.PVE_RAID_PHYSICAL_ATTACK_DEFENCE, 1) : 1; pveRaidDefense = attacker.isRaid() ? attacker.getStat().getValue(Stats.PVE_RAID_PHYSICAL_ATTACK_DEFENCE, 1) : 1;
} }
return (1 + (pveAttack - (pveDefense * pveRaidDefense))) * pvePenalty; return Math.max(0.05, (1 + (pveAttack - (pveDefense * pveRaidDefense))) * pvePenalty); // Bonus should not be negative.
} }
return 1; return 1;

View File

@ -1567,7 +1567,7 @@ public final class Formulas
pvpDefense = target.getStat().getValue(Stats.PVP_PHYSICAL_ATTACK_DEFENCE, 1) * Config.PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS.getOrDefault(targetPlayer.getClassId(), 1f); pvpDefense = target.getStat().getValue(Stats.PVP_PHYSICAL_ATTACK_DEFENCE, 1) * Config.PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS.getOrDefault(targetPlayer.getClassId(), 1f);
} }
return 1 + (pvpAttack - pvpDefense); return Math.max(0.05, 1 + (pvpAttack - pvpDefense)); // Bonus should not be negative.
} }
// PvE Bonus // PvE Bonus
@ -1616,7 +1616,7 @@ public final class Formulas
pveRaidDefense = attacker.isRaid() ? attacker.getStat().getValue(Stats.PVE_RAID_PHYSICAL_ATTACK_DEFENCE, 1) : 1; pveRaidDefense = attacker.isRaid() ? attacker.getStat().getValue(Stats.PVE_RAID_PHYSICAL_ATTACK_DEFENCE, 1) : 1;
} }
return (1 + (pveAttack - (pveDefense * pveRaidDefense))) * pvePenalty; return Math.max(0.05, (1 + (pveAttack - (pveDefense * pveRaidDefense))) * pvePenalty); // Bonus should not be negative.
} }
return 1; return 1;

View File

@ -1567,7 +1567,7 @@ public final class Formulas
pvpDefense = target.getStat().getValue(Stats.PVP_PHYSICAL_ATTACK_DEFENCE, 1) * Config.PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS.getOrDefault(targetPlayer.getClassId(), 1f); pvpDefense = target.getStat().getValue(Stats.PVP_PHYSICAL_ATTACK_DEFENCE, 1) * Config.PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS.getOrDefault(targetPlayer.getClassId(), 1f);
} }
return 1 + (pvpAttack - pvpDefense); return Math.max(0.05, 1 + (pvpAttack - pvpDefense)); // Bonus should not be negative.
} }
// PvE Bonus // PvE Bonus
@ -1616,7 +1616,7 @@ public final class Formulas
pveRaidDefense = attacker.isRaid() ? attacker.getStat().getValue(Stats.PVE_RAID_PHYSICAL_ATTACK_DEFENCE, 1) : 1; pveRaidDefense = attacker.isRaid() ? attacker.getStat().getValue(Stats.PVE_RAID_PHYSICAL_ATTACK_DEFENCE, 1) : 1;
} }
return (1 + (pveAttack - (pveDefense * pveRaidDefense))) * pvePenalty; return Math.max(0.05, (1 + (pveAttack - (pveDefense * pveRaidDefense))) * pvePenalty); // Bonus should not be negative.
} }
return 1; return 1;

View File

@ -1567,7 +1567,7 @@ public final class Formulas
pvpDefense = target.getStat().getValue(Stats.PVP_PHYSICAL_ATTACK_DEFENCE, 1) * Config.PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS.getOrDefault(targetPlayer.getClassId(), 1f); pvpDefense = target.getStat().getValue(Stats.PVP_PHYSICAL_ATTACK_DEFENCE, 1) * Config.PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS.getOrDefault(targetPlayer.getClassId(), 1f);
} }
return 1 + (pvpAttack - pvpDefense); return Math.max(0.05, 1 + (pvpAttack - pvpDefense)); // Bonus should not be negative.
} }
// PvE Bonus // PvE Bonus
@ -1616,7 +1616,7 @@ public final class Formulas
pveRaidDefense = attacker.isRaid() ? attacker.getStat().getValue(Stats.PVE_RAID_PHYSICAL_ATTACK_DEFENCE, 1) : 1; pveRaidDefense = attacker.isRaid() ? attacker.getStat().getValue(Stats.PVE_RAID_PHYSICAL_ATTACK_DEFENCE, 1) : 1;
} }
return (1 + (pveAttack - (pveDefense * pveRaidDefense))) * pvePenalty; return Math.max(0.05, (1 + (pveAttack - (pveDefense * pveRaidDefense))) * pvePenalty); // Bonus should not be negative.
} }
return 1; return 1;

View File

@ -1567,7 +1567,7 @@ public final class Formulas
pvpDefense = target.getStat().getValue(Stats.PVP_PHYSICAL_ATTACK_DEFENCE, 1) * Config.PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS.getOrDefault(targetPlayer.getClassId(), 1f); pvpDefense = target.getStat().getValue(Stats.PVP_PHYSICAL_ATTACK_DEFENCE, 1) * Config.PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS.getOrDefault(targetPlayer.getClassId(), 1f);
} }
return 1 + (pvpAttack - pvpDefense); return Math.max(0.05, 1 + (pvpAttack - pvpDefense)); // Bonus should not be negative.
} }
// PvE Bonus // PvE Bonus
@ -1616,7 +1616,7 @@ public final class Formulas
pveRaidDefense = attacker.isRaid() ? attacker.getStat().getValue(Stats.PVE_RAID_PHYSICAL_ATTACK_DEFENCE, 1) : 1; pveRaidDefense = attacker.isRaid() ? attacker.getStat().getValue(Stats.PVE_RAID_PHYSICAL_ATTACK_DEFENCE, 1) : 1;
} }
return (1 + (pveAttack - (pveDefense * pveRaidDefense))) * pvePenalty; return Math.max(0.05, (1 + (pveAttack - (pveDefense * pveRaidDefense))) * pvePenalty); // Bonus should not be negative.
} }
return 1; return 1;

View File

@ -1567,7 +1567,7 @@ public final class Formulas
pvpDefense = target.getStat().getValue(Stats.PVP_PHYSICAL_ATTACK_DEFENCE, 1) * Config.PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS.getOrDefault(targetPlayer.getClassId(), 1f); pvpDefense = target.getStat().getValue(Stats.PVP_PHYSICAL_ATTACK_DEFENCE, 1) * Config.PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS.getOrDefault(targetPlayer.getClassId(), 1f);
} }
return 1 + (pvpAttack - pvpDefense); return Math.max(0.05, 1 + (pvpAttack - pvpDefense)); // Bonus should not be negative.
} }
// PvE Bonus // PvE Bonus
@ -1616,7 +1616,7 @@ public final class Formulas
pveRaidDefense = attacker.isRaid() ? attacker.getStat().getValue(Stats.PVE_RAID_PHYSICAL_ATTACK_DEFENCE, 1) : 1; pveRaidDefense = attacker.isRaid() ? attacker.getStat().getValue(Stats.PVE_RAID_PHYSICAL_ATTACK_DEFENCE, 1) : 1;
} }
return (1 + (pveAttack - (pveDefense * pveRaidDefense))) * pvePenalty; return Math.max(0.05, (1 + (pveAttack - (pveDefense * pveRaidDefense))) * pvePenalty); // Bonus should not be negative.
} }
return 1; return 1;

View File

@ -1567,7 +1567,7 @@ public final class Formulas
pvpDefense = target.getStat().getValue(Stats.PVP_PHYSICAL_ATTACK_DEFENCE, 1) * Config.PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS.getOrDefault(targetPlayer.getClassId(), 1f); pvpDefense = target.getStat().getValue(Stats.PVP_PHYSICAL_ATTACK_DEFENCE, 1) * Config.PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS.getOrDefault(targetPlayer.getClassId(), 1f);
} }
return 1 + (pvpAttack - pvpDefense); return Math.max(0.05, 1 + (pvpAttack - pvpDefense)); // Bonus should not be negative.
} }
// PvE Bonus // PvE Bonus
@ -1616,7 +1616,7 @@ public final class Formulas
pveRaidDefense = attacker.isRaid() ? attacker.getStat().getValue(Stats.PVE_RAID_PHYSICAL_ATTACK_DEFENCE, 1) : 1; pveRaidDefense = attacker.isRaid() ? attacker.getStat().getValue(Stats.PVE_RAID_PHYSICAL_ATTACK_DEFENCE, 1) : 1;
} }
return (1 + (pveAttack - (pveDefense * pveRaidDefense))) * pvePenalty; return Math.max(0.05, (1 + (pveAttack - (pveDefense * pveRaidDefense))) * pvePenalty); // Bonus should not be negative.
} }
return 1; return 1;

View File

@ -1567,7 +1567,7 @@ public final class Formulas
pvpDefense = target.getStat().getValue(Stats.PVP_PHYSICAL_ATTACK_DEFENCE, 1) * Config.PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS.getOrDefault(targetPlayer.getClassId(), 1f); pvpDefense = target.getStat().getValue(Stats.PVP_PHYSICAL_ATTACK_DEFENCE, 1) * Config.PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS.getOrDefault(targetPlayer.getClassId(), 1f);
} }
return 1 + (pvpAttack - pvpDefense); return Math.max(0.05, 1 + (pvpAttack - pvpDefense)); // Bonus should not be negative.
} }
// PvE Bonus // PvE Bonus
@ -1616,7 +1616,7 @@ public final class Formulas
pveRaidDefense = attacker.isRaid() ? attacker.getStat().getValue(Stats.PVE_RAID_PHYSICAL_ATTACK_DEFENCE, 1) : 1; pveRaidDefense = attacker.isRaid() ? attacker.getStat().getValue(Stats.PVE_RAID_PHYSICAL_ATTACK_DEFENCE, 1) : 1;
} }
return (1 + (pveAttack - (pveDefense * pveRaidDefense))) * pvePenalty; return Math.max(0.05, (1 + (pveAttack - (pveDefense * pveRaidDefense))) * pvePenalty); // Bonus should not be negative.
} }
return 1; return 1;

View File

@ -1567,7 +1567,7 @@ public final class Formulas
pvpDefense = target.getStat().getValue(Stats.PVP_PHYSICAL_ATTACK_DEFENCE, 1) * Config.PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS.getOrDefault(targetPlayer.getClassId(), 1f); pvpDefense = target.getStat().getValue(Stats.PVP_PHYSICAL_ATTACK_DEFENCE, 1) * Config.PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS.getOrDefault(targetPlayer.getClassId(), 1f);
} }
return 1 + (pvpAttack - pvpDefense); return Math.max(0.05, 1 + (pvpAttack - pvpDefense)); // Bonus should not be negative.
} }
// PvE Bonus // PvE Bonus
@ -1616,7 +1616,7 @@ public final class Formulas
pveRaidDefense = attacker.isRaid() ? attacker.getStat().getValue(Stats.PVE_RAID_PHYSICAL_ATTACK_DEFENCE, 1) : 1; pveRaidDefense = attacker.isRaid() ? attacker.getStat().getValue(Stats.PVE_RAID_PHYSICAL_ATTACK_DEFENCE, 1) : 1;
} }
return (1 + (pveAttack - (pveDefense * pveRaidDefense))) * pvePenalty; return Math.max(0.05, (1 + (pveAttack - (pveDefense * pveRaidDefense))) * pvePenalty); // Bonus should not be negative.
} }
return 1; return 1;

View File

@ -1567,7 +1567,7 @@ public final class Formulas
pvpDefense = target.getStat().getValue(Stats.PVP_PHYSICAL_ATTACK_DEFENCE, 1) * Config.PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS.getOrDefault(targetPlayer.getClassId(), 1f); pvpDefense = target.getStat().getValue(Stats.PVP_PHYSICAL_ATTACK_DEFENCE, 1) * Config.PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS.getOrDefault(targetPlayer.getClassId(), 1f);
} }
return 1 + (pvpAttack - pvpDefense); return Math.max(0.05, 1 + (pvpAttack - pvpDefense)); // Bonus should not be negative.
} }
// PvE Bonus // PvE Bonus
@ -1616,7 +1616,7 @@ public final class Formulas
pveRaidDefense = attacker.isRaid() ? attacker.getStat().getValue(Stats.PVE_RAID_PHYSICAL_ATTACK_DEFENCE, 1) : 1; pveRaidDefense = attacker.isRaid() ? attacker.getStat().getValue(Stats.PVE_RAID_PHYSICAL_ATTACK_DEFENCE, 1) : 1;
} }
return (1 + (pveAttack - (pveDefense * pveRaidDefense))) * pvePenalty; return Math.max(0.05, (1 + (pveAttack - (pveDefense * pveRaidDefense))) * pvePenalty); // Bonus should not be negative.
} }
return 1; return 1;

View File

@ -1567,7 +1567,7 @@ public final class Formulas
pvpDefense = target.getStat().getValue(Stats.PVP_PHYSICAL_ATTACK_DEFENCE, 1) * Config.PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS.getOrDefault(targetPlayer.getClassId(), 1f); pvpDefense = target.getStat().getValue(Stats.PVP_PHYSICAL_ATTACK_DEFENCE, 1) * Config.PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS.getOrDefault(targetPlayer.getClassId(), 1f);
} }
return 1 + (pvpAttack - pvpDefense); return Math.max(0.05, 1 + (pvpAttack - pvpDefense)); // Bonus should not be negative.
} }
// PvE Bonus // PvE Bonus
@ -1616,7 +1616,7 @@ public final class Formulas
pveRaidDefense = attacker.isRaid() ? attacker.getStat().getValue(Stats.PVE_RAID_PHYSICAL_ATTACK_DEFENCE, 1) : 1; pveRaidDefense = attacker.isRaid() ? attacker.getStat().getValue(Stats.PVE_RAID_PHYSICAL_ATTACK_DEFENCE, 1) : 1;
} }
return (1 + (pveAttack - (pveDefense * pveRaidDefense))) * pvePenalty; return Math.max(0.05, (1 + (pveAttack - (pveDefense * pveRaidDefense))) * pvePenalty); // Bonus should not be negative.
} }
return 1; return 1;