lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Addition of raidboss bonus damage effects.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-04-25 11:14:05 +00:00
parent 8c77306a5c
commit 9682338343
105 changed files with 1650 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@ -1605,6 +1605,7 @@ public class Formulas
{
final double pveAttack;
final double pveDefense;
final double pveRaidAttack;
final double pveRaidDefense;
double pvePenalty = 1;
@ -1628,6 +1629,7 @@ public class Formulas
// Magical Skill PvE
pveAttack = attacker.getStat().getValue(Stat.PVE_MAGICAL_SKILL_DAMAGE, 1) * (attackerPlayer == null ? 1 : Config.PVE_MAGICAL_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attackerPlayer.getClassId(), 1f));
pveDefense = target.getStat().getValue(Stat.PVE_MAGICAL_SKILL_DEFENCE, 1) * (targetPlayer == null ? 1 : Config.PVE_MAGICAL_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(targetPlayer.getClassId(), 1f));
pveRaidAttack = attacker.isRaid() ? attacker.getStat().getValue(Stat.PVE_RAID_MAGICAL_SKILL_DAMAGE, 1) : 1;
pveRaidDefense = attacker.isRaid() ? attacker.getStat().getValue(Stat.PVE_RAID_MAGICAL_SKILL_DEFENCE, 1) : 1;
}
else
@ -1635,6 +1637,7 @@ public class Formulas
// Physical Skill PvE
pveAttack = attacker.getStat().getValue(Stat.PVE_PHYSICAL_SKILL_DAMAGE, 1) * (attackerPlayer == null ? 1 : Config.PVE_PHYSICAL_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attackerPlayer.getClassId(), 1f));
pveDefense = target.getStat().getValue(Stat.PVE_PHYSICAL_SKILL_DEFENCE, 1) * (targetPlayer == null ? 1 : Config.PVE_PHYSICAL_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(targetPlayer.getClassId(), 1f));
pveRaidAttack = attacker.isRaid() ? attacker.getStat().getValue(Stat.PVE_RAID_PHYSICAL_SKILL_DAMAGE, 1) : 1;
pveRaidDefense = attacker.isRaid() ? attacker.getStat().getValue(Stat.PVE_RAID_PHYSICAL_SKILL_DEFENCE, 1) : 1;
}
}
@ -1643,10 +1646,11 @@ public class Formulas
// Autoattack PvE
pveAttack = attacker.getStat().getValue(Stat.PVE_PHYSICAL_ATTACK_DAMAGE, 1) * (attackerPlayer == null ? 1 : Config.PVE_PHYSICAL_ATTACK_DAMAGE_MULTIPLIERS.getOrDefault(attackerPlayer.getClassId(), 1f));
pveDefense = target.getStat().getValue(Stat.PVE_PHYSICAL_ATTACK_DEFENCE, 1) * (targetPlayer == null ? 1 : Config.PVE_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS.getOrDefault(targetPlayer.getClassId(), 1f));
pveRaidAttack = attacker.isRaid() ? attacker.getStat().getValue(Stat.PVE_RAID_PHYSICAL_ATTACK_DAMAGE, 1) : 1;
pveRaidDefense = attacker.isRaid() ? attacker.getStat().getValue(Stat.PVE_RAID_PHYSICAL_ATTACK_DEFENCE, 1) : 1;
}
return Math.max(0.05, (1 + (pveAttack - (pveDefense * pveRaidDefense))) * pvePenalty); // Bonus should not be negative.
return Math.max(0.05, (1 + ((pveAttack * pveRaidAttack) - (pveDefense * pveRaidDefense))) * pvePenalty); // Bonus should not be negative.
}
return 1;

9
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Stat.java
View File

@ -98,13 +98,16 @@ public enum Stat
// PVE BONUS
PVE_PHYSICAL_ATTACK_DAMAGE("pvePhysDmg"),
PVE_PHYSICAL_SKILL_DAMAGE("pvePhysSkillsDmg"),
PVE_PHYSICAL_SKILL_DAMAGE("pvePhysSkillDmg"),
PVE_MAGICAL_SKILL_DAMAGE("pveMagicalDmg"),
PVE_PHYSICAL_ATTACK_DEFENCE("pvePhysDef"),
PVE_PHYSICAL_SKILL_DEFENCE("pvePhysSkillsDef"),
PVE_PHYSICAL_SKILL_DEFENCE("pvePhysSkillDef"),
PVE_MAGICAL_SKILL_DEFENCE("pveMagicalDef"),
PVE_RAID_PHYSICAL_ATTACK_DAMAGE("pveRaidPhysDmg"),
PVE_RAID_PHYSICAL_SKILL_DAMAGE("pveRaidPhysSkillDmg"),
PVE_RAID_MAGICAL_SKILL_DAMAGE("pveRaidMagicalDmg"),
PVE_RAID_PHYSICAL_ATTACK_DEFENCE("pveRaidPhysDef"),
PVE_RAID_PHYSICAL_SKILL_DEFENCE("pveRaidPhysSkillsDef"),
PVE_RAID_PHYSICAL_SKILL_DEFENCE("pveRaidPhysSkillDef"),
PVE_RAID_MAGICAL_SKILL_DEFENCE("pveRaidMagicalDef"),
// FIXED BONUS