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

Addition of blow skill damage and heal balance configurations.

Browse Source
This commit is contained in:
MobiusDevelopment 2019-06-13 10:54:55 +00:00
parent 3cd882c007
commit cbf630302e
60 changed files with 1188 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
L2J_Mobius_1.0_Ertheia/dist/game/config/Custom/ClassBalance.ini vendored
View File

@ -1,8 +1,7 @@
# ---------------------------------------------------------------------------
# Class Balance
# ---------------------------------------------------------------------------
# Multiply attack and defence based on player class.
# Multiply parameters based on player class.
# Example: ClassId1,Multiplier1;ClassId2,Multiplier2;...
PveMagicalSkillDamageMultipliers =
@ -22,3 +21,11 @@ PvpPhysicalAttackDamageMultipliers =
PvePhysicalAttackDefenceMultipliers =
PvpPhysicalAttackDefenceMultipliers =
PveBlowSkillDamageMultipliers =
PvpBlowSkillDamageMultipliers =
PveBlowSkillDefenceMultipliers =
PvpBlowSkillDefenceMultipliers =
PlayerHealingSkillMultipliers =

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
@ -109,6 +110,7 @@ public final class Heal extends AbstractEffect
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk());
amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1);
amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0);
amount *= (item == null) && effector.isPlayable() ? Config.PLAYER_HEALING_SKILL_MULTIPLIERS.getOrDefault(effector.getActingPlayer().getClassId(), 1f) : 1;
// Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill))
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java vendored
View File

@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
@ -105,6 +106,7 @@ public final class HpCpHeal extends AbstractEffect
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk());
amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1);
amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0);
amount *= (item == null) && effector.isPlayable() ? Config.PLAYER_HEALING_SKILL_MULTIPLIERS.getOrDefault(effector.getActingPlayer().getClassId(), 1f) : 1;
// Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL)))
{

75
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/Config.java
View File

@ -1119,6 +1119,11 @@ public final class Config
public static Map<ClassId, Float> PVP_PHYSICAL_ATTACK_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PLAYER_HEALING_SKILL_MULTIPLIERS = new ConcurrentHashMap<>();
public static boolean MULTILANG_ENABLE;
public static List<String> MULTILANG_ALLOWED = new ArrayList<>();
public static String MULTILANG_DEFAULT;
@ -2679,6 +2684,76 @@ public final class Config
}
}
}
final String[] pveBlowSkillDamageMultipliers = ClassBalance.getString("PveBlowSkillDamageMultipliers", "").trim().split(";");
PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pveBlowSkillDamageMultipliers.length > 0)
{
for (String info : pveBlowSkillDamageMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpBlowSkillDamageMultipliers = ClassBalance.getString("PvpBlowSkillDamageMultipliers", "").trim().split(";");
PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pvpBlowSkillDamageMultipliers.length > 0)
{
for (String info : pvpBlowSkillDamageMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pveBlowSkillDefenceMultipliers = ClassBalance.getString("PveBlowSkillDefenceMultipliers", "").trim().split(";");
PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pveBlowSkillDefenceMultipliers.length > 0)
{
for (String info : pveBlowSkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpBlowSkillDefenceMultipliers = ClassBalance.getString("PvpBlowSkillDefenceMultipliers", "").trim().split(";");
PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pvpBlowSkillDefenceMultipliers.length > 0)
{
for (String info : pvpBlowSkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] playerHealingSkillMultipliers = ClassBalance.getString("PlayerHealingSkillMultipliers", "").trim().split(";");
PLAYER_HEALING_SKILL_MULTIPLIERS.clear();
if (playerHealingSkillMultipliers.length > 0)
{
for (String info : playerHealingSkillMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PLAYER_HEALING_SKILL_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
// Load CommunityBoard config file (if exists)
final PropertiesParser CommunityBoard = new PropertiesParser(CUSTOM_COMMUNITY_BOARD_CONFIG_FILE);

12
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@ -120,11 +120,21 @@ public final class Formulas
// power *= 1 - (Math.min(target.getLevel() - attacker.getLevel(), 9) / 10);
// }
double balanceMod = 1;
if (attacker.isPlayable())
{
balanceMod = target.isPlayable() ? Config.PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f) : Config.PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f);
}
if (target.isPlayable())
{
defence *= attacker.isPlayable() ? Config.PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(target.getActingPlayer().getClassId(), 1f) : Config.PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(target.getActingPlayer().getClassId(), 1f);
}
// ........................_____________________________Initial Damage____________________________...___________Position Additional Damage___________..._CriticalAdd_
// ATTACK CALCULATION 77 * [(skillpower+patk) * 0.666 * cdbonus * cdPosBonusHalf * cdVulnHalf * ss + isBack0.2Side0.05 * (skillpower+patk*ss) * random + 6 * cd_patk] / pdef
// ````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^
final double baseMod = (77 * (((power + attacker.getPAtk()) * 0.666) + (isPosition * (power + attacker.getPAtk()) * randomMod) + (6 * cdPatk))) / defence;
final double damage = baseMod * ssmod * cdMult * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod;
final double damage = baseMod * ssmod * cdMult * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod * balanceMod;
return damage;
}

11
L2J_Mobius_2.5_Underground/dist/game/config/Custom/ClassBalance.ini vendored
View File

@ -1,8 +1,7 @@
# ---------------------------------------------------------------------------
# Class Balance
# ---------------------------------------------------------------------------
# Multiply attack and defence based on player class.
# Multiply parameters based on player class.
# Example: ClassId1,Multiplier1;ClassId2,Multiplier2;...
PveMagicalSkillDamageMultipliers =
@ -22,3 +21,11 @@ PvpPhysicalAttackDamageMultipliers =
PvePhysicalAttackDefenceMultipliers =
PvpPhysicalAttackDefenceMultipliers =
PveBlowSkillDamageMultipliers =
PvpBlowSkillDamageMultipliers =
PveBlowSkillDefenceMultipliers =
PvpBlowSkillDefenceMultipliers =
PlayerHealingSkillMultipliers =

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
@ -109,6 +110,7 @@ public final class Heal extends AbstractEffect
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk());
amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1);
amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0);
amount *= (item == null) && effector.isPlayable() ? Config.PLAYER_HEALING_SKILL_MULTIPLIERS.getOrDefault(effector.getActingPlayer().getClassId(), 1f) : 1;
// Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill))
{

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java vendored
View File

@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
@ -105,6 +106,7 @@ public final class HpCpHeal extends AbstractEffect
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk());
amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1);
amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0);
amount *= (item == null) && effector.isPlayable() ? Config.PLAYER_HEALING_SKILL_MULTIPLIERS.getOrDefault(effector.getActingPlayer().getClassId(), 1f) : 1;
// Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL)))
{

75
L2J_Mobius_2.5_Underground/java/org/l2jmobius/Config.java
View File

@ -1126,6 +1126,11 @@ public final class Config
public static Map<ClassId, Float> PVP_PHYSICAL_ATTACK_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PLAYER_HEALING_SKILL_MULTIPLIERS = new ConcurrentHashMap<>();
public static boolean MULTILANG_ENABLE;
public static List<String> MULTILANG_ALLOWED = new ArrayList<>();
public static String MULTILANG_DEFAULT;
@ -2696,6 +2701,76 @@ public final class Config
}
}
}
final String[] pveBlowSkillDamageMultipliers = ClassBalance.getString("PveBlowSkillDamageMultipliers", "").trim().split(";");
PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pveBlowSkillDamageMultipliers.length > 0)
{
for (String info : pveBlowSkillDamageMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpBlowSkillDamageMultipliers = ClassBalance.getString("PvpBlowSkillDamageMultipliers", "").trim().split(";");
PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pvpBlowSkillDamageMultipliers.length > 0)
{
for (String info : pvpBlowSkillDamageMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pveBlowSkillDefenceMultipliers = ClassBalance.getString("PveBlowSkillDefenceMultipliers", "").trim().split(";");
PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pveBlowSkillDefenceMultipliers.length > 0)
{
for (String info : pveBlowSkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpBlowSkillDefenceMultipliers = ClassBalance.getString("PvpBlowSkillDefenceMultipliers", "").trim().split(";");
PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pvpBlowSkillDefenceMultipliers.length > 0)
{
for (String info : pvpBlowSkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] playerHealingSkillMultipliers = ClassBalance.getString("PlayerHealingSkillMultipliers", "").trim().split(";");
PLAYER_HEALING_SKILL_MULTIPLIERS.clear();
if (playerHealingSkillMultipliers.length > 0)
{
for (String info : playerHealingSkillMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PLAYER_HEALING_SKILL_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
// Load CommunityBoard config file (if exists)
final PropertiesParser CommunityBoard = new PropertiesParser(CUSTOM_COMMUNITY_BOARD_CONFIG_FILE);

12
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@ -120,11 +120,21 @@ public final class Formulas
// power *= 1 - (Math.min(target.getLevel() - attacker.getLevel(), 9) / 10);
// }
double balanceMod = 1;
if (attacker.isPlayable())
{
balanceMod = target.isPlayable() ? Config.PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f) : Config.PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f);
}
if (target.isPlayable())
{
defence *= attacker.isPlayable() ? Config.PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(target.getActingPlayer().getClassId(), 1f) : Config.PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(target.getActingPlayer().getClassId(), 1f);
}
// ........................_____________________________Initial Damage____________________________...___________Position Additional Damage___________..._CriticalAdd_
// ATTACK CALCULATION 77 * [(skillpower+patk) * 0.666 * cdbonus * cdPosBonusHalf * cdVulnHalf * ss + isBack0.2Side0.05 * (skillpower+patk*ss) * random + 6 * cd_patk] / pdef
// ````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^
final double baseMod = (77 * (((power + attacker.getPAtk()) * 0.666) + (isPosition * (power + attacker.getPAtk()) * randomMod) + (6 * cdPatk))) / defence;
final double damage = baseMod * ssmod * cdMult * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod;
final double damage = baseMod * ssmod * cdMult * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod * balanceMod;
return damage;
}

11
L2J_Mobius_3.0_Helios/dist/game/config/Custom/ClassBalance.ini vendored
View File

@ -1,8 +1,7 @@
# ---------------------------------------------------------------------------
# Class Balance
# ---------------------------------------------------------------------------
# Multiply attack and defence based on player class.
# Multiply parameters based on player class.
# Example: ClassId1,Multiplier1;ClassId2,Multiplier2;...
PveMagicalSkillDamageMultipliers =
@ -22,3 +21,11 @@ PvpPhysicalAttackDamageMultipliers =
PvePhysicalAttackDefenceMultipliers =
PvpPhysicalAttackDefenceMultipliers =
PveBlowSkillDamageMultipliers =
PvpBlowSkillDamageMultipliers =
PveBlowSkillDefenceMultipliers =
PvpBlowSkillDefenceMultipliers =
PlayerHealingSkillMultipliers =

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
@ -109,6 +110,7 @@ public final class Heal extends AbstractEffect
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk());
amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1);
amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0);
amount *= (item == null) && effector.isPlayable() ? Config.PLAYER_HEALING_SKILL_MULTIPLIERS.getOrDefault(effector.getActingPlayer().getClassId(), 1f) : 1;
// Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill))
{

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java vendored
View File

@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
@ -105,6 +106,7 @@ public final class HpCpHeal extends AbstractEffect
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk());
amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1);
amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0);
amount *= (item == null) && effector.isPlayable() ? Config.PLAYER_HEALING_SKILL_MULTIPLIERS.getOrDefault(effector.getActingPlayer().getClassId(), 1f) : 1;
// Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL)))
{

75
L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java
View File

@ -1134,6 +1134,11 @@ public final class Config
public static Map<ClassId, Float> PVP_PHYSICAL_ATTACK_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PLAYER_HEALING_SKILL_MULTIPLIERS = new ConcurrentHashMap<>();
public static boolean MULTILANG_ENABLE;
public static List<String> MULTILANG_ALLOWED = new ArrayList<>();
public static String MULTILANG_DEFAULT;
@ -2711,6 +2716,76 @@ public final class Config
}
}
}
final String[] pveBlowSkillDamageMultipliers = ClassBalance.getString("PveBlowSkillDamageMultipliers", "").trim().split(";");
PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pveBlowSkillDamageMultipliers.length > 0)
{
for (String info : pveBlowSkillDamageMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpBlowSkillDamageMultipliers = ClassBalance.getString("PvpBlowSkillDamageMultipliers", "").trim().split(";");
PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pvpBlowSkillDamageMultipliers.length > 0)
{
for (String info : pvpBlowSkillDamageMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pveBlowSkillDefenceMultipliers = ClassBalance.getString("PveBlowSkillDefenceMultipliers", "").trim().split(";");
PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pveBlowSkillDefenceMultipliers.length > 0)
{
for (String info : pveBlowSkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpBlowSkillDefenceMultipliers = ClassBalance.getString("PvpBlowSkillDefenceMultipliers", "").trim().split(";");
PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pvpBlowSkillDefenceMultipliers.length > 0)
{
for (String info : pvpBlowSkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] playerHealingSkillMultipliers = ClassBalance.getString("PlayerHealingSkillMultipliers", "").trim().split(";");
PLAYER_HEALING_SKILL_MULTIPLIERS.clear();
if (playerHealingSkillMultipliers.length > 0)
{
for (String info : playerHealingSkillMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PLAYER_HEALING_SKILL_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
// Load CommunityBoard config file (if exists)
final PropertiesParser CommunityBoard = new PropertiesParser(CUSTOM_COMMUNITY_BOARD_CONFIG_FILE);

12
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@ -120,11 +120,21 @@ public final class Formulas
// power *= 1 - (Math.min(target.getLevel() - attacker.getLevel(), 9) / 10);
// }
double balanceMod = 1;
if (attacker.isPlayable())
{
balanceMod = target.isPlayable() ? Config.PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f) : Config.PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f);
}
if (target.isPlayable())
{
defence *= attacker.isPlayable() ? Config.PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(target.getActingPlayer().getClassId(), 1f) : Config.PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(target.getActingPlayer().getClassId(), 1f);
}
// ........................_____________________________Initial Damage____________________________...___________Position Additional Damage___________..._CriticalAdd_
// ATTACK CALCULATION 77 * [(skillpower+patk) * 0.666 * cdbonus * cdPosBonusHalf * cdVulnHalf * ss + isBack0.2Side0.05 * (skillpower+patk*ss) * random + 6 * cd_patk] / pdef
// ````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^
final double baseMod = (77 * (((power + attacker.getPAtk()) * 0.666) + (isPosition * (power + attacker.getPAtk()) * randomMod) + (6 * cdPatk))) / defence;
final double damage = baseMod * ssmod * cdMult * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod;
final double damage = baseMod * ssmod * cdMult * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod * balanceMod;
return damage;
}

11
L2J_Mobius_4.0_GrandCrusade/dist/game/config/Custom/ClassBalance.ini vendored
View File

@ -1,8 +1,7 @@
# ---------------------------------------------------------------------------
# Class Balance
# ---------------------------------------------------------------------------
# Multiply attack and defence based on player class.
# Multiply parameters based on player class.
# Example: ClassId1,Multiplier1;ClassId2,Multiplier2;...
PveMagicalSkillDamageMultipliers =
@ -22,3 +21,11 @@ PvpPhysicalAttackDamageMultipliers =
PvePhysicalAttackDefenceMultipliers =
PvpPhysicalAttackDefenceMultipliers =
PveBlowSkillDamageMultipliers =
PvpBlowSkillDamageMultipliers =
PveBlowSkillDefenceMultipliers =
PvpBlowSkillDefenceMultipliers =
PlayerHealingSkillMultipliers =

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
@ -109,6 +110,7 @@ public final class Heal extends AbstractEffect
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk());
amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1);
amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0);
amount *= (item == null) && effector.isPlayable() ? Config.PLAYER_HEALING_SKILL_MULTIPLIERS.getOrDefault(effector.getActingPlayer().getClassId(), 1f) : 1;
// Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill))
{

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java vendored
View File

@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
@ -105,6 +106,7 @@ public final class HpCpHeal extends AbstractEffect
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk());
amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1);
amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0);
amount *= (item == null) && effector.isPlayable() ? Config.PLAYER_HEALING_SKILL_MULTIPLIERS.getOrDefault(effector.getActingPlayer().getClassId(), 1f) : 1;
// Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL)))
{

75
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/Config.java
View File

@ -1121,6 +1121,11 @@ public final class Config
public static Map<ClassId, Float> PVP_PHYSICAL_ATTACK_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PLAYER_HEALING_SKILL_MULTIPLIERS = new ConcurrentHashMap<>();
public static boolean MULTILANG_ENABLE;
public static List<String> MULTILANG_ALLOWED = new ArrayList<>();
public static String MULTILANG_DEFAULT;
@ -2685,6 +2690,76 @@ public final class Config
}
}
}
final String[] pveBlowSkillDamageMultipliers = ClassBalance.getString("PveBlowSkillDamageMultipliers", "").trim().split(";");
PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pveBlowSkillDamageMultipliers.length > 0)
{
for (String info : pveBlowSkillDamageMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpBlowSkillDamageMultipliers = ClassBalance.getString("PvpBlowSkillDamageMultipliers", "").trim().split(";");
PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pvpBlowSkillDamageMultipliers.length > 0)
{
for (String info : pvpBlowSkillDamageMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pveBlowSkillDefenceMultipliers = ClassBalance.getString("PveBlowSkillDefenceMultipliers", "").trim().split(";");
PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pveBlowSkillDefenceMultipliers.length > 0)
{
for (String info : pveBlowSkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpBlowSkillDefenceMultipliers = ClassBalance.getString("PvpBlowSkillDefenceMultipliers", "").trim().split(";");
PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pvpBlowSkillDefenceMultipliers.length > 0)
{
for (String info : pvpBlowSkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] playerHealingSkillMultipliers = ClassBalance.getString("PlayerHealingSkillMultipliers", "").trim().split(";");
PLAYER_HEALING_SKILL_MULTIPLIERS.clear();
if (playerHealingSkillMultipliers.length > 0)
{
for (String info : playerHealingSkillMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PLAYER_HEALING_SKILL_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
// Load CommunityBoard config file (if exists)
final PropertiesParser CommunityBoard = new PropertiesParser(CUSTOM_COMMUNITY_BOARD_CONFIG_FILE);

12
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@ -120,11 +120,21 @@ public final class Formulas
// power *= 1 - (Math.min(target.getLevel() - attacker.getLevel(), 9) / 10);
// }
double balanceMod = 1;
if (attacker.isPlayable())
{
balanceMod = target.isPlayable() ? Config.PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f) : Config.PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f);
}
if (target.isPlayable())
{
defence *= attacker.isPlayable() ? Config.PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(target.getActingPlayer().getClassId(), 1f) : Config.PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(target.getActingPlayer().getClassId(), 1f);
}
// ........................_____________________________Initial Damage____________________________...___________Position Additional Damage___________..._CriticalAdd_
// ATTACK CALCULATION 77 * [(skillpower+patk) * 0.666 * cdbonus * cdPosBonusHalf * cdVulnHalf * ss + isBack0.2Side0.05 * (skillpower+patk*ss) * random + 6 * cd_patk] / pdef
// ````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^
final double baseMod = (77 * (((power + attacker.getPAtk()) * 0.666) + (isPosition * (power + attacker.getPAtk()) * randomMod) + (6 * cdPatk))) / defence;
final double damage = baseMod * ssmod * cdMult * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod;
final double damage = baseMod * ssmod * cdMult * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod * balanceMod;
return damage;
}

11
L2J_Mobius_5.0_Salvation/dist/game/config/Custom/ClassBalance.ini vendored
View File

@ -1,8 +1,7 @@
# ---------------------------------------------------------------------------
# Class Balance
# ---------------------------------------------------------------------------
# Multiply attack and defence based on player class.
# Multiply parameters based on player class.
# Example: ClassId1,Multiplier1;ClassId2,Multiplier2;...
PveMagicalSkillDamageMultipliers =
@ -22,3 +21,11 @@ PvpPhysicalAttackDamageMultipliers =
PvePhysicalAttackDefenceMultipliers =
PvpPhysicalAttackDefenceMultipliers =
PveBlowSkillDamageMultipliers =
PvpBlowSkillDamageMultipliers =
PveBlowSkillDefenceMultipliers =
PvpBlowSkillDefenceMultipliers =
PlayerHealingSkillMultipliers =

2
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
@ -109,6 +110,7 @@ public final class Heal extends AbstractEffect
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk());
amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1);
amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0);
amount *= (item == null) && effector.isPlayable() ? Config.PLAYER_HEALING_SKILL_MULTIPLIERS.getOrDefault(effector.getActingPlayer().getClassId(), 1f) : 1;
// Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill))
{

2
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java vendored
View File

@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
@ -105,6 +106,7 @@ public final class HpCpHeal extends AbstractEffect
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk());
amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1);
amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0);
amount *= (item == null) && effector.isPlayable() ? Config.PLAYER_HEALING_SKILL_MULTIPLIERS.getOrDefault(effector.getActingPlayer().getClassId(), 1f) : 1;
// Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL)))
{

75
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/Config.java
View File

@ -1117,6 +1117,11 @@ public final class Config
public static Map<ClassId, Float> PVP_PHYSICAL_ATTACK_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PLAYER_HEALING_SKILL_MULTIPLIERS = new ConcurrentHashMap<>();
public static boolean MULTILANG_ENABLE;
public static List<String> MULTILANG_ALLOWED = new ArrayList<>();
public static String MULTILANG_DEFAULT;
@ -2761,6 +2766,76 @@ public final class Config
}
}
}
final String[] pveBlowSkillDamageMultipliers = ClassBalance.getString("PveBlowSkillDamageMultipliers", "").trim().split(";");
PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pveBlowSkillDamageMultipliers.length > 0)
{
for (String info : pveBlowSkillDamageMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpBlowSkillDamageMultipliers = ClassBalance.getString("PvpBlowSkillDamageMultipliers", "").trim().split(";");
PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pvpBlowSkillDamageMultipliers.length > 0)
{
for (String info : pvpBlowSkillDamageMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pveBlowSkillDefenceMultipliers = ClassBalance.getString("PveBlowSkillDefenceMultipliers", "").trim().split(";");
PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pveBlowSkillDefenceMultipliers.length > 0)
{
for (String info : pveBlowSkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpBlowSkillDefenceMultipliers = ClassBalance.getString("PvpBlowSkillDefenceMultipliers", "").trim().split(";");
PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pvpBlowSkillDefenceMultipliers.length > 0)
{
for (String info : pvpBlowSkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] playerHealingSkillMultipliers = ClassBalance.getString("PlayerHealingSkillMultipliers", "").trim().split(";");
PLAYER_HEALING_SKILL_MULTIPLIERS.clear();
if (playerHealingSkillMultipliers.length > 0)
{
for (String info : playerHealingSkillMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PLAYER_HEALING_SKILL_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
// Load CommunityBoard config file (if exists)
final PropertiesParser CommunityBoard = new PropertiesParser(CUSTOM_COMMUNITY_BOARD_CONFIG_FILE);

12
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@ -120,11 +120,21 @@ public final class Formulas
// power *= 1 - (Math.min(target.getLevel() - attacker.getLevel(), 9) / 10);
// }
double balanceMod = 1;
if (attacker.isPlayable())
{
balanceMod = target.isPlayable() ? Config.PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f) : Config.PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f);
}
if (target.isPlayable())
{
defence *= attacker.isPlayable() ? Config.PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(target.getActingPlayer().getClassId(), 1f) : Config.PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(target.getActingPlayer().getClassId(), 1f);
}
// ........................_____________________________Initial Damage____________________________...___________Position Additional Damage___________..._CriticalAdd_
// ATTACK CALCULATION 77 * [(skillpower+patk) * 0.666 * cdbonus * cdPosBonusHalf * cdVulnHalf * ss + isBack0.2Side0.05 * (skillpower+patk*ss) * random + 6 * cd_patk] / pdef
// ````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^
final double baseMod = (77 * (((power + attacker.getPAtk()) * 0.666) + (isPosition * (power + attacker.getPAtk()) * randomMod) + (6 * cdPatk))) / defence;
final double damage = baseMod * ssmod * cdMult * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod;
final double damage = baseMod * ssmod * cdMult * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod * balanceMod;
return damage;
}

11
L2J_Mobius_5.5_EtinasFate/dist/game/config/Custom/ClassBalance.ini vendored
View File

@ -1,8 +1,7 @@
# ---------------------------------------------------------------------------
# Class Balance
# ---------------------------------------------------------------------------
# Multiply attack and defence based on player class.
# Multiply parameters based on player class.
# Example: ClassId1,Multiplier1;ClassId2,Multiplier2;...
PveMagicalSkillDamageMultipliers =
@ -22,3 +21,11 @@ PvpPhysicalAttackDamageMultipliers =
PvePhysicalAttackDefenceMultipliers =
PvpPhysicalAttackDefenceMultipliers =
PveBlowSkillDamageMultipliers =
PvpBlowSkillDamageMultipliers =
PveBlowSkillDefenceMultipliers =
PvpBlowSkillDefenceMultipliers =
PlayerHealingSkillMultipliers =

2
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
@ -109,6 +110,7 @@ public final class Heal extends AbstractEffect
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk());
amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1);
amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0);
amount *= (item == null) && effector.isPlayable() ? Config.PLAYER_HEALING_SKILL_MULTIPLIERS.getOrDefault(effector.getActingPlayer().getClassId(), 1f) : 1;
// Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill))
{

2
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java vendored
View File

@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
@ -105,6 +106,7 @@ public final class HpCpHeal extends AbstractEffect
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk());
amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1);
amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0);
amount *= (item == null) && effector.isPlayable() ? Config.PLAYER_HEALING_SKILL_MULTIPLIERS.getOrDefault(effector.getActingPlayer().getClassId(), 1f) : 1;
// Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL)))
{

75
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/Config.java
View File

@ -1117,6 +1117,11 @@ public final class Config
public static Map<ClassId, Float> PVP_PHYSICAL_ATTACK_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PLAYER_HEALING_SKILL_MULTIPLIERS = new ConcurrentHashMap<>();
public static boolean MULTILANG_ENABLE;
public static List<String> MULTILANG_ALLOWED = new ArrayList<>();
public static String MULTILANG_DEFAULT;
@ -2761,6 +2766,76 @@ public final class Config
}
}
}
final String[] pveBlowSkillDamageMultipliers = ClassBalance.getString("PveBlowSkillDamageMultipliers", "").trim().split(";");
PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pveBlowSkillDamageMultipliers.length > 0)
{
for (String info : pveBlowSkillDamageMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpBlowSkillDamageMultipliers = ClassBalance.getString("PvpBlowSkillDamageMultipliers", "").trim().split(";");
PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pvpBlowSkillDamageMultipliers.length > 0)
{
for (String info : pvpBlowSkillDamageMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pveBlowSkillDefenceMultipliers = ClassBalance.getString("PveBlowSkillDefenceMultipliers", "").trim().split(";");
PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pveBlowSkillDefenceMultipliers.length > 0)
{
for (String info : pveBlowSkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpBlowSkillDefenceMultipliers = ClassBalance.getString("PvpBlowSkillDefenceMultipliers", "").trim().split(";");
PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pvpBlowSkillDefenceMultipliers.length > 0)
{
for (String info : pvpBlowSkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] playerHealingSkillMultipliers = ClassBalance.getString("PlayerHealingSkillMultipliers", "").trim().split(";");
PLAYER_HEALING_SKILL_MULTIPLIERS.clear();
if (playerHealingSkillMultipliers.length > 0)
{
for (String info : playerHealingSkillMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PLAYER_HEALING_SKILL_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
// Load CommunityBoard config file (if exists)
final PropertiesParser CommunityBoard = new PropertiesParser(CUSTOM_COMMUNITY_BOARD_CONFIG_FILE);

12
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@ -120,11 +120,21 @@ public final class Formulas
// power *= 1 - (Math.min(target.getLevel() - attacker.getLevel(), 9) / 10);
// }
double balanceMod = 1;
if (attacker.isPlayable())
{
balanceMod = target.isPlayable() ? Config.PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f) : Config.PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f);
}
if (target.isPlayable())
{
defence *= attacker.isPlayable() ? Config.PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(target.getActingPlayer().getClassId(), 1f) : Config.PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(target.getActingPlayer().getClassId(), 1f);
}
// ........................_____________________________Initial Damage____________________________...___________Position Additional Damage___________..._CriticalAdd_
// ATTACK CALCULATION 77 * [(skillpower+patk) * 0.666 * cdbonus * cdPosBonusHalf * cdVulnHalf * ss + isBack0.2Side0.05 * (skillpower+patk*ss) * random + 6 * cd_patk] / pdef
// ````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^
final double baseMod = (77 * (((power + attacker.getPAtk()) * 0.666) + (isPosition * (power + attacker.getPAtk()) * randomMod) + (6 * cdPatk))) / defence;
final double damage = baseMod * ssmod * cdMult * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod;
final double damage = baseMod * ssmod * cdMult * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod * balanceMod;
return damage;
}

11
L2J_Mobius_6.0_Fafurion/dist/game/config/Custom/ClassBalance.ini vendored
View File

@ -1,8 +1,7 @@
# ---------------------------------------------------------------------------
# Class Balance
# ---------------------------------------------------------------------------
# Multiply attack and defence based on player class.
# Multiply parameters based on player class.
# Example: ClassId1,Multiplier1;ClassId2,Multiplier2;...
PveMagicalSkillDamageMultipliers =
@ -22,3 +21,11 @@ PvpPhysicalAttackDamageMultipliers =
PvePhysicalAttackDefenceMultipliers =
PvpPhysicalAttackDefenceMultipliers =
PveBlowSkillDamageMultipliers =
PvpBlowSkillDamageMultipliers =
PveBlowSkillDefenceMultipliers =
PvpBlowSkillDefenceMultipliers =
PlayerHealingSkillMultipliers =

2
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
@ -109,6 +110,7 @@ public final class Heal extends AbstractEffect
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk());
amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1);
amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0);
amount *= (item == null) && effector.isPlayable() ? Config.PLAYER_HEALING_SKILL_MULTIPLIERS.getOrDefault(effector.getActingPlayer().getClassId(), 1f) : 1;
// Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill))
{

2
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java vendored
View File

@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
@ -105,6 +106,7 @@ public final class HpCpHeal extends AbstractEffect
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk());
amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1);
amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0);
amount *= (item == null) && effector.isPlayable() ? Config.PLAYER_HEALING_SKILL_MULTIPLIERS.getOrDefault(effector.getActingPlayer().getClassId(), 1f) : 1;
// Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL)))
{

75
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/Config.java
View File

@ -1134,6 +1134,11 @@ public final class Config
public static Map<ClassId, Float> PVP_PHYSICAL_ATTACK_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PLAYER_HEALING_SKILL_MULTIPLIERS = new ConcurrentHashMap<>();
public static boolean MULTILANG_ENABLE;
public static List<String> MULTILANG_ALLOWED = new ArrayList<>();
public static String MULTILANG_DEFAULT;
@ -2796,6 +2801,76 @@ public final class Config
}
}
}
final String[] pveBlowSkillDamageMultipliers = ClassBalance.getString("PveBlowSkillDamageMultipliers", "").trim().split(";");
PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pveBlowSkillDamageMultipliers.length > 0)
{
for (String info : pveBlowSkillDamageMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpBlowSkillDamageMultipliers = ClassBalance.getString("PvpBlowSkillDamageMultipliers", "").trim().split(";");
PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pvpBlowSkillDamageMultipliers.length > 0)
{
for (String info : pvpBlowSkillDamageMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pveBlowSkillDefenceMultipliers = ClassBalance.getString("PveBlowSkillDefenceMultipliers", "").trim().split(";");
PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pveBlowSkillDefenceMultipliers.length > 0)
{
for (String info : pveBlowSkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpBlowSkillDefenceMultipliers = ClassBalance.getString("PvpBlowSkillDefenceMultipliers", "").trim().split(";");
PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pvpBlowSkillDefenceMultipliers.length > 0)
{
for (String info : pvpBlowSkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] playerHealingSkillMultipliers = ClassBalance.getString("PlayerHealingSkillMultipliers", "").trim().split(";");
PLAYER_HEALING_SKILL_MULTIPLIERS.clear();
if (playerHealingSkillMultipliers.length > 0)
{
for (String info : playerHealingSkillMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PLAYER_HEALING_SKILL_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
// Load CommunityBoard config file (if exists)
final PropertiesParser CommunityBoard = new PropertiesParser(CUSTOM_COMMUNITY_BOARD_CONFIG_FILE);

12
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@ -120,11 +120,21 @@ public final class Formulas
// power *= 1 - (Math.min(target.getLevel() - attacker.getLevel(), 9) / 10);
// }
double balanceMod = 1;
if (attacker.isPlayable())
{
balanceMod = target.isPlayable() ? Config.PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f) : Config.PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f);
}
if (target.isPlayable())
{
defence *= attacker.isPlayable() ? Config.PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(target.getActingPlayer().getClassId(), 1f) : Config.PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(target.getActingPlayer().getClassId(), 1f);
}
// ........................_____________________________Initial Damage____________________________...___________Position Additional Damage___________..._CriticalAdd_
// ATTACK CALCULATION 77 * [(skillpower+patk) * 0.666 * cdbonus * cdPosBonusHalf * cdVulnHalf * ss + isBack0.2Side0.05 * (skillpower+patk*ss) * random + 6 * cd_patk] / pdef
// ````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^
final double baseMod = (77 * (((power + attacker.getPAtk()) * 0.666) + (isPosition * (power + attacker.getPAtk()) * randomMod) + (6 * cdPatk))) / defence;
final double damage = baseMod * ssmod * cdMult * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod;
final double damage = baseMod * ssmod * cdMult * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod * balanceMod;
return damage;
}

11
L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Custom/ClassBalance.ini vendored
View File

@ -1,8 +1,7 @@
# ---------------------------------------------------------------------------
# Class Balance
# ---------------------------------------------------------------------------
# Multiply attack and defence based on player class.
# Multiply parameters based on player class.
# Example: ClassId1,Multiplier1;ClassId2,Multiplier2;...
PveMagicalSkillDamageMultipliers =
@ -22,3 +21,11 @@ PvpPhysicalAttackDamageMultipliers =
PvePhysicalAttackDefenceMultipliers =
PvpPhysicalAttackDefenceMultipliers =
PveBlowSkillDamageMultipliers =
PvpBlowSkillDamageMultipliers =
PveBlowSkillDefenceMultipliers =
PvpBlowSkillDefenceMultipliers =
PlayerHealingSkillMultipliers =

2
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
@ -109,6 +110,7 @@ public final class Heal extends AbstractEffect
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk());
amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1);
amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0);
amount *= (item == null) && effector.isPlayable() ? Config.PLAYER_HEALING_SKILL_MULTIPLIERS.getOrDefault(effector.getActingPlayer().getClassId(), 1f) : 1;
// Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill))
{

2
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java vendored
View File

@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
@ -105,6 +106,7 @@ public final class HpCpHeal extends AbstractEffect
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk());
amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1);
amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0);
amount *= (item == null) && effector.isPlayable() ? Config.PLAYER_HEALING_SKILL_MULTIPLIERS.getOrDefault(effector.getActingPlayer().getClassId(), 1f) : 1;
// Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL)))
{

75
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java
View File

@ -1063,6 +1063,11 @@ public final class Config
public static Map<ClassId, Float> PVP_PHYSICAL_ATTACK_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PLAYER_HEALING_SKILL_MULTIPLIERS = new ConcurrentHashMap<>();
public static boolean MULTILANG_ENABLE;
public static List<String> MULTILANG_ALLOWED = new ArrayList<>();
public static String MULTILANG_DEFAULT;
@ -2558,6 +2563,76 @@ public final class Config
}
}
}
final String[] pveBlowSkillDamageMultipliers = ClassBalance.getString("PveBlowSkillDamageMultipliers", "").trim().split(";");
PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pveBlowSkillDamageMultipliers.length > 0)
{
for (String info : pveBlowSkillDamageMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpBlowSkillDamageMultipliers = ClassBalance.getString("PvpBlowSkillDamageMultipliers", "").trim().split(";");
PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pvpBlowSkillDamageMultipliers.length > 0)
{
for (String info : pvpBlowSkillDamageMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pveBlowSkillDefenceMultipliers = ClassBalance.getString("PveBlowSkillDefenceMultipliers", "").trim().split(";");
PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pveBlowSkillDefenceMultipliers.length > 0)
{
for (String info : pveBlowSkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpBlowSkillDefenceMultipliers = ClassBalance.getString("PvpBlowSkillDefenceMultipliers", "").trim().split(";");
PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pvpBlowSkillDefenceMultipliers.length > 0)
{
for (String info : pvpBlowSkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] playerHealingSkillMultipliers = ClassBalance.getString("PlayerHealingSkillMultipliers", "").trim().split(";");
PLAYER_HEALING_SKILL_MULTIPLIERS.clear();
if (playerHealingSkillMultipliers.length > 0)
{
for (String info : playerHealingSkillMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PLAYER_HEALING_SKILL_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
// Load CommunityBoard config file (if exists)
final PropertiesParser CommunityBoard = new PropertiesParser(CUSTOM_COMMUNITY_BOARD_CONFIG_FILE);

12
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@ -120,11 +120,21 @@ public final class Formulas
// power *= 1 - (Math.min(target.getLevel() - attacker.getLevel(), 9) / 10);
// }
double balanceMod = 1;
if (attacker.isPlayable())
{
balanceMod = target.isPlayable() ? Config.PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f) : Config.PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f);
}
if (target.isPlayable())
{
defence *= attacker.isPlayable() ? Config.PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(target.getActingPlayer().getClassId(), 1f) : Config.PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(target.getActingPlayer().getClassId(), 1f);
}
// ........................_____________________________Initial Damage____________________________...___________Position Additional Damage___________..._CriticalAdd_
// ATTACK CALCULATION 77 * [(skillpower+patk) * 0.666 * cdbonus * cdPosBonusHalf * cdVulnHalf * ss + isBack0.2Side0.05 * (skillpower+patk*ss) * random + 6 * cd_patk] / pdef
// ````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^
final double baseMod = (77 * (((power + attacker.getPAtk()) * 0.666) + (isPosition * (power + attacker.getPAtk()) * randomMod) + (6 * cdPatk))) / defence;
final double damage = baseMod * ssmod * cdMult * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod;
final double damage = baseMod * ssmod * cdMult * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod * balanceMod;
return damage;
}

11
L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Custom/ClassBalance.ini vendored
View File

@ -1,8 +1,7 @@
# ---------------------------------------------------------------------------
# Class Balance
# ---------------------------------------------------------------------------
# Multiply attack and defence based on player class.
# Multiply parameters based on player class.
# Example: ClassId1,Multiplier1;ClassId2,Multiplier2;...
PveMagicalSkillDamageMultipliers =
@ -22,3 +21,11 @@ PvpPhysicalAttackDamageMultipliers =
PvePhysicalAttackDefenceMultipliers =
PvpPhysicalAttackDefenceMultipliers =
PveBlowSkillDamageMultipliers =
PvpBlowSkillDamageMultipliers =
PveBlowSkillDefenceMultipliers =
PvpBlowSkillDefenceMultipliers =
PlayerHealingSkillMultipliers =

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
@ -109,6 +110,7 @@ public final class Heal extends AbstractEffect
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk());
amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1);
amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0);
amount *= (item == null) && effector.isPlayable() ? Config.PLAYER_HEALING_SKILL_MULTIPLIERS.getOrDefault(effector.getActingPlayer().getClassId(), 1f) : 1;
// Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill))
{

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java vendored
View File

@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
@ -105,6 +106,7 @@ public final class HpCpHeal extends AbstractEffect
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk());
amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1);
amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0);
amount *= (item == null) && effector.isPlayable() ? Config.PLAYER_HEALING_SKILL_MULTIPLIERS.getOrDefault(effector.getActingPlayer().getClassId(), 1f) : 1;
// Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL)))
{

75
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/Config.java
View File

@ -1067,6 +1067,11 @@ public final class Config
public static Map<ClassId, Float> PVP_PHYSICAL_ATTACK_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PLAYER_HEALING_SKILL_MULTIPLIERS = new ConcurrentHashMap<>();
public static boolean MULTILANG_ENABLE;
public static List<String> MULTILANG_ALLOWED = new ArrayList<>();
public static String MULTILANG_DEFAULT;
@ -2565,6 +2570,76 @@ public final class Config
}
}
}
final String[] pveBlowSkillDamageMultipliers = ClassBalance.getString("PveBlowSkillDamageMultipliers", "").trim().split(";");
PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pveBlowSkillDamageMultipliers.length > 0)
{
for (String info : pveBlowSkillDamageMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpBlowSkillDamageMultipliers = ClassBalance.getString("PvpBlowSkillDamageMultipliers", "").trim().split(";");
PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pvpBlowSkillDamageMultipliers.length > 0)
{
for (String info : pvpBlowSkillDamageMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pveBlowSkillDefenceMultipliers = ClassBalance.getString("PveBlowSkillDefenceMultipliers", "").trim().split(";");
PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pveBlowSkillDefenceMultipliers.length > 0)
{
for (String info : pveBlowSkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpBlowSkillDefenceMultipliers = ClassBalance.getString("PvpBlowSkillDefenceMultipliers", "").trim().split(";");
PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pvpBlowSkillDefenceMultipliers.length > 0)
{
for (String info : pvpBlowSkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] playerHealingSkillMultipliers = ClassBalance.getString("PlayerHealingSkillMultipliers", "").trim().split(";");
PLAYER_HEALING_SKILL_MULTIPLIERS.clear();
if (playerHealingSkillMultipliers.length > 0)
{
for (String info : playerHealingSkillMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PLAYER_HEALING_SKILL_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
// Load CommunityBoard config file (if exists)
final PropertiesParser CommunityBoard = new PropertiesParser(CUSTOM_COMMUNITY_BOARD_CONFIG_FILE);

12
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@ -120,11 +120,21 @@ public final class Formulas
// power *= 1 - (Math.min(target.getLevel() - attacker.getLevel(), 9) / 10);
// }
double balanceMod = 1;
if (attacker.isPlayable())
{
balanceMod = target.isPlayable() ? Config.PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f) : Config.PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f);
}
if (target.isPlayable())
{
defence *= attacker.isPlayable() ? Config.PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(target.getActingPlayer().getClassId(), 1f) : Config.PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(target.getActingPlayer().getClassId(), 1f);
}
// ........................_____________________________Initial Damage____________________________...___________Position Additional Damage___________..._CriticalAdd_
// ATTACK CALCULATION 77 * [(skillpower+patk) * 0.666 * cdbonus * cdPosBonusHalf * cdVulnHalf * ss + isBack0.2Side0.05 * (skillpower+patk*ss) * random + 6 * cd_patk] / pdef
// ````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^
final double baseMod = (77 * (((power + attacker.getPAtk()) * 0.666) + (isPosition * (power + attacker.getPAtk()) * randomMod) + (6 * cdPatk))) / defence;
final double damage = baseMod * ssmod * cdMult * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod;
final double damage = baseMod * ssmod * cdMult * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod * balanceMod;
return damage;
}

11
L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Custom/ClassBalance.ini vendored
View File

@ -1,8 +1,7 @@
# ---------------------------------------------------------------------------
# Class Balance
# ---------------------------------------------------------------------------
# Multiply attack and defence based on player class.
# Multiply parameters based on player class.
# Example: ClassId1,Multiplier1;ClassId2,Multiplier2;...
PveMagicalSkillDamageMultipliers =
@ -22,3 +21,11 @@ PvpPhysicalAttackDamageMultipliers =
PvePhysicalAttackDefenceMultipliers =
PvpPhysicalAttackDefenceMultipliers =
PveBlowSkillDamageMultipliers =
PvpBlowSkillDamageMultipliers =
PveBlowSkillDefenceMultipliers =
PvpBlowSkillDefenceMultipliers =
PlayerHealingSkillMultipliers =

2
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
@ -109,6 +110,7 @@ public final class Heal extends AbstractEffect
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk());
amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1);
amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0);
amount *= (item == null) && effector.isPlayable() ? Config.PLAYER_HEALING_SKILL_MULTIPLIERS.getOrDefault(effector.getActingPlayer().getClassId(), 1f) : 1;
// Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill))
{

2
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java vendored
View File

@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
@ -105,6 +106,7 @@ public final class HpCpHeal extends AbstractEffect
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk());
amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1);
amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0);
amount *= (item == null) && effector.isPlayable() ? Config.PLAYER_HEALING_SKILL_MULTIPLIERS.getOrDefault(effector.getActingPlayer().getClassId(), 1f) : 1;
// Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL)))
{

75
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/Config.java
View File

@ -1067,6 +1067,11 @@ public final class Config
public static Map<ClassId, Float> PVP_PHYSICAL_ATTACK_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PLAYER_HEALING_SKILL_MULTIPLIERS = new ConcurrentHashMap<>();
public static boolean MULTILANG_ENABLE;
public static List<String> MULTILANG_ALLOWED = new ArrayList<>();
public static String MULTILANG_DEFAULT;
@ -2565,6 +2570,76 @@ public final class Config
}
}
}
final String[] pveBlowSkillDamageMultipliers = ClassBalance.getString("PveBlowSkillDamageMultipliers", "").trim().split(";");
PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pveBlowSkillDamageMultipliers.length > 0)
{
for (String info : pveBlowSkillDamageMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpBlowSkillDamageMultipliers = ClassBalance.getString("PvpBlowSkillDamageMultipliers", "").trim().split(";");
PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pvpBlowSkillDamageMultipliers.length > 0)
{
for (String info : pvpBlowSkillDamageMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pveBlowSkillDefenceMultipliers = ClassBalance.getString("PveBlowSkillDefenceMultipliers", "").trim().split(";");
PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pveBlowSkillDefenceMultipliers.length > 0)
{
for (String info : pveBlowSkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpBlowSkillDefenceMultipliers = ClassBalance.getString("PvpBlowSkillDefenceMultipliers", "").trim().split(";");
PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pvpBlowSkillDefenceMultipliers.length > 0)
{
for (String info : pvpBlowSkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] playerHealingSkillMultipliers = ClassBalance.getString("PlayerHealingSkillMultipliers", "").trim().split(";");
PLAYER_HEALING_SKILL_MULTIPLIERS.clear();
if (playerHealingSkillMultipliers.length > 0)
{
for (String info : playerHealingSkillMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PLAYER_HEALING_SKILL_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
// Load CommunityBoard config file (if exists)
final PropertiesParser CommunityBoard = new PropertiesParser(CUSTOM_COMMUNITY_BOARD_CONFIG_FILE);

12
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@ -120,11 +120,21 @@ public final class Formulas
// power *= 1 - (Math.min(target.getLevel() - attacker.getLevel(), 9) / 10);
// }
double balanceMod = 1;
if (attacker.isPlayable())
{
balanceMod = target.isPlayable() ? Config.PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f) : Config.PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f);
}
if (target.isPlayable())
{
defence *= attacker.isPlayable() ? Config.PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(target.getActingPlayer().getClassId(), 1f) : Config.PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(target.getActingPlayer().getClassId(), 1f);
}
// ........................_____________________________Initial Damage____________________________...___________Position Additional Damage___________..._CriticalAdd_
// ATTACK CALCULATION 77 * [(skillpower+patk) * 0.666 * cdbonus * cdPosBonusHalf * cdVulnHalf * ss + isBack0.2Side0.05 * (skillpower+patk*ss) * random + 6 * cd_patk] / pdef
// ````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^
final double baseMod = (77 * (((power + attacker.getPAtk()) * 0.666) + (isPosition * (power + attacker.getPAtk()) * randomMod) + (6 * cdPatk))) / defence;
final double damage = baseMod * ssmod * cdMult * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod;
final double damage = baseMod * ssmod * cdMult * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod * balanceMod;
return damage;
}

11
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Custom/ClassBalance.ini vendored
View File

@ -1,8 +1,7 @@
# ---------------------------------------------------------------------------
# Class Balance
# ---------------------------------------------------------------------------
# Multiply attack and defence based on player class.
# Multiply parameters based on player class.
# Example: ClassId1,Multiplier1;ClassId2,Multiplier2;...
PveMagicalSkillDamageMultipliers =
@ -22,3 +21,11 @@ PvpPhysicalAttackDamageMultipliers =
PvePhysicalAttackDefenceMultipliers =
PvpPhysicalAttackDefenceMultipliers =
PveBlowSkillDamageMultipliers =
PvpBlowSkillDamageMultipliers =
PveBlowSkillDefenceMultipliers =
PvpBlowSkillDefenceMultipliers =
PlayerHealingSkillMultipliers =

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
@ -109,6 +110,7 @@ public final class Heal extends AbstractEffect
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk());
amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1);
amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0);
amount *= (item == null) && effector.isPlayable() ? Config.PLAYER_HEALING_SKILL_MULTIPLIERS.getOrDefault(effector.getActingPlayer().getClassId(), 1f) : 1;
// Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill))
{

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java vendored
View File

@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
@ -105,6 +106,7 @@ public final class HpCpHeal extends AbstractEffect
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk());
amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1);
amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0);
amount *= (item == null) && effector.isPlayable() ? Config.PLAYER_HEALING_SKILL_MULTIPLIERS.getOrDefault(effector.getActingPlayer().getClassId(), 1f) : 1;
// Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL)))
{

75
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/Config.java
View File

@ -1067,6 +1067,11 @@ public final class Config
public static Map<ClassId, Float> PVP_PHYSICAL_ATTACK_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PLAYER_HEALING_SKILL_MULTIPLIERS = new ConcurrentHashMap<>();
public static boolean MULTILANG_ENABLE;
public static List<String> MULTILANG_ALLOWED = new ArrayList<>();
public static String MULTILANG_DEFAULT;
@ -2565,6 +2570,76 @@ public final class Config
}
}
}
final String[] pveBlowSkillDamageMultipliers = ClassBalance.getString("PveBlowSkillDamageMultipliers", "").trim().split(";");
PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pveBlowSkillDamageMultipliers.length > 0)
{
for (String info : pveBlowSkillDamageMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpBlowSkillDamageMultipliers = ClassBalance.getString("PvpBlowSkillDamageMultipliers", "").trim().split(";");
PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pvpBlowSkillDamageMultipliers.length > 0)
{
for (String info : pvpBlowSkillDamageMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pveBlowSkillDefenceMultipliers = ClassBalance.getString("PveBlowSkillDefenceMultipliers", "").trim().split(";");
PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pveBlowSkillDefenceMultipliers.length > 0)
{
for (String info : pveBlowSkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpBlowSkillDefenceMultipliers = ClassBalance.getString("PvpBlowSkillDefenceMultipliers", "").trim().split(";");
PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pvpBlowSkillDefenceMultipliers.length > 0)
{
for (String info : pvpBlowSkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] playerHealingSkillMultipliers = ClassBalance.getString("PlayerHealingSkillMultipliers", "").trim().split(";");
PLAYER_HEALING_SKILL_MULTIPLIERS.clear();
if (playerHealingSkillMultipliers.length > 0)
{
for (String info : playerHealingSkillMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PLAYER_HEALING_SKILL_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
// Load CommunityBoard config file (if exists)
final PropertiesParser CommunityBoard = new PropertiesParser(CUSTOM_COMMUNITY_BOARD_CONFIG_FILE);

12
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@ -120,11 +120,21 @@ public final class Formulas
// power *= 1 - (Math.min(target.getLevel() - attacker.getLevel(), 9) / 10);
// }
double balanceMod = 1;
if (attacker.isPlayable())
{
balanceMod = target.isPlayable() ? Config.PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f) : Config.PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f);
}
if (target.isPlayable())
{
defence *= attacker.isPlayable() ? Config.PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(target.getActingPlayer().getClassId(), 1f) : Config.PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(target.getActingPlayer().getClassId(), 1f);
}
// ........................_____________________________Initial Damage____________________________...___________Position Additional Damage___________..._CriticalAdd_
// ATTACK CALCULATION 77 * [(skillpower+patk) * 0.666 * cdbonus * cdPosBonusHalf * cdVulnHalf * ss + isBack0.2Side0.05 * (skillpower+patk*ss) * random + 6 * cd_patk] / pdef
// ````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^
final double baseMod = (77 * (((power + attacker.getPAtk()) * 0.666) + (isPosition * (power + attacker.getPAtk()) * randomMod) + (6 * cdPatk))) / defence;
final double damage = baseMod * ssmod * cdMult * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod;
final double damage = baseMod * ssmod * cdMult * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod * balanceMod;
return damage;
}

11
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/config/Custom/ClassBalance.ini vendored
View File

@ -1,8 +1,7 @@
# ---------------------------------------------------------------------------
# Class Balance
# ---------------------------------------------------------------------------
# Multiply attack and defence based on player class.
# Multiply parameters based on player class.
# Example: ClassId1,Multiplier1;ClassId2,Multiplier2;...
PveMagicalSkillDamageMultipliers =
@ -22,3 +21,11 @@ PvpPhysicalAttackDamageMultipliers =
PvePhysicalAttackDefenceMultipliers =
PvpPhysicalAttackDefenceMultipliers =
PveBlowSkillDamageMultipliers =
PvpBlowSkillDamageMultipliers =
PveBlowSkillDefenceMultipliers =
PvpBlowSkillDefenceMultipliers =
PlayerHealingSkillMultipliers =

2
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
@ -109,6 +110,7 @@ public final class Heal extends AbstractEffect
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk());
amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1);
amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0);
amount *= (item == null) && effector.isPlayable() ? Config.PLAYER_HEALING_SKILL_MULTIPLIERS.getOrDefault(effector.getActingPlayer().getClassId(), 1f) : 1;
// Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill))
{

2
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java vendored
View File

@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
@ -105,6 +106,7 @@ public final class HpCpHeal extends AbstractEffect
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk());
amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1);
amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0);
amount *= (item == null) && effector.isPlayable() ? Config.PLAYER_HEALING_SKILL_MULTIPLIERS.getOrDefault(effector.getActingPlayer().getClassId(), 1f) : 1;
// Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL)))
{

75
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/Config.java
View File

@ -1067,6 +1067,11 @@ public final class Config
public static Map<ClassId, Float> PVP_PHYSICAL_ATTACK_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_PHYSICAL_ATTACK_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PLAYER_HEALING_SKILL_MULTIPLIERS = new ConcurrentHashMap<>();
public static boolean MULTILANG_ENABLE;
public static List<String> MULTILANG_ALLOWED = new ArrayList<>();
public static String MULTILANG_DEFAULT;
@ -2565,6 +2570,76 @@ public final class Config
}
}
}
final String[] pveBlowSkillDamageMultipliers = ClassBalance.getString("PveBlowSkillDamageMultipliers", "").trim().split(";");
PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pveBlowSkillDamageMultipliers.length > 0)
{
for (String info : pveBlowSkillDamageMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpBlowSkillDamageMultipliers = ClassBalance.getString("PvpBlowSkillDamageMultipliers", "").trim().split(";");
PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pvpBlowSkillDamageMultipliers.length > 0)
{
for (String info : pvpBlowSkillDamageMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pveBlowSkillDefenceMultipliers = ClassBalance.getString("PveBlowSkillDefenceMultipliers", "").trim().split(";");
PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pveBlowSkillDefenceMultipliers.length > 0)
{
for (String info : pveBlowSkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpBlowSkillDefenceMultipliers = ClassBalance.getString("PvpBlowSkillDefenceMultipliers", "").trim().split(";");
PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pvpBlowSkillDefenceMultipliers.length > 0)
{
for (String info : pvpBlowSkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] playerHealingSkillMultipliers = ClassBalance.getString("PlayerHealingSkillMultipliers", "").trim().split(";");
PLAYER_HEALING_SKILL_MULTIPLIERS.clear();
if (playerHealingSkillMultipliers.length > 0)
{
for (String info : playerHealingSkillMultipliers)
{
final String[] classInfo = info.trim().split(",");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PLAYER_HEALING_SKILL_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
// Load CommunityBoard config file (if exists)
final PropertiesParser CommunityBoard = new PropertiesParser(CUSTOM_COMMUNITY_BOARD_CONFIG_FILE);

12
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@ -120,11 +120,21 @@ public final class Formulas
// power *= 1 - (Math.min(target.getLevel() - attacker.getLevel(), 9) / 10);
// }
double balanceMod = 1;
if (attacker.isPlayable())
{
balanceMod = target.isPlayable() ? Config.PVP_BLOW_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f) : Config.PVE_BLOW_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f);
}
if (target.isPlayable())
{
defence *= attacker.isPlayable() ? Config.PVP_BLOW_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(target.getActingPlayer().getClassId(), 1f) : Config.PVE_BLOW_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(target.getActingPlayer().getClassId(), 1f);
}
// ........................_____________________________Initial Damage____________________________...___________Position Additional Damage___________..._CriticalAdd_
// ATTACK CALCULATION 77 * [(skillpower+patk) * 0.666 * cdbonus * cdPosBonusHalf * cdVulnHalf * ss + isBack0.2Side0.05 * (skillpower+patk*ss) * random + 6 * cd_patk] / pdef
// ````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^
final double baseMod = (77 * (((power + attacker.getPAtk()) * 0.666) + (isPosition * (power + attacker.getPAtk()) * randomMod) + (6 * cdPatk))) / defence;
final double damage = baseMod * ssmod * cdMult * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod;
final double damage = baseMod * ssmod * cdMult * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod * balanceMod;
return damage;
}