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

Addition of balancer EnergyAttack configurations.

Browse Source
This commit is contained in:
MobiusDevelopment 2020-03-19 18:16:21 +00:00
parent b5eccda27a
commit 2d4fb64b26
45 changed files with 1155 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,6 +46,12 @@ PvpBlowSkillDamageMultipliers =
PveBlowSkillDefenceMultipliers =
PvpBlowSkillDefenceMultipliers =
PveEnergySkillDamageMultipliers =
PvpEnergySkillDamageMultipliers =
PveEnergySkillDefenceMultipliers =
PvpEnergySkillDefenceMultipliers =
PlayerHealingSkillMultipliers =
SkillMasteryChanceMultipliers =

15
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.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.StatSet;
import org.l2jmobius.gameserver.model.actor.Attackable;
@ -81,9 +82,7 @@ public class EnergyAttack extends AbstractEffect
}
final PlayerInstance attacker = effector.getActingPlayer();
final int charge = Math.min(_chargeConsume, attacker.getCharges());
if (!attacker.decreaseCharges(charge))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
@ -98,7 +97,6 @@ public class EnergyAttack extends AbstractEffect
}
double defence = effected.getPDef() * _pDefMod;
if (!_ignoreShieldDefence)
{
final byte shield = Formulas.calcShldUse(attacker, effected);
@ -152,8 +150,17 @@ public class EnergyAttack extends AbstractEffect
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * energyChargesBoost * pvpPveMod;
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1));
double balanceMod = 1;
if (attacker.isPlayable())
{
balanceMod = effected.isPlayable() ? Config.PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f);
}
if (effected.isPlayable())
{
defence *= attacker.isPlayable() ? Config.PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f);
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1)) * balanceMod;
effector.doAttack(damage, effected, skill, false, false, critical, false);
}
}

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

@ -1143,6 +1143,10 @@ public class Config
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> PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PLAYER_HEALING_SKILL_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> SKILL_MASTERY_CHANCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> EXP_AMOUNT_MULTIPLIERS = new ConcurrentHashMap<>();
@ -2953,6 +2957,62 @@ public class Config
}
}
}
final String[] pveEnergySkillDamageMultipliers = ClassBalance.getString("PveEnergySkillDamageMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pveEnergySkillDamageMultipliers.length > 0)
{
for (String info : pveEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDamageMultipliers = ClassBalance.getString("PvpEnergySkillDamageMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pvpEnergySkillDamageMultipliers.length > 0)
{
for (String info : pvpEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pveEnergySkillDefenceMultipliers = ClassBalance.getString("PveEnergySkillDefenceMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pveEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pveEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDefenceMultipliers = ClassBalance.getString("PvpEnergySkillDefenceMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pvpEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pvpEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_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)

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

@ -46,6 +46,12 @@ PvpBlowSkillDamageMultipliers =
PveBlowSkillDefenceMultipliers =
PvpBlowSkillDefenceMultipliers =
PveEnergySkillDamageMultipliers =
PvpEnergySkillDamageMultipliers =
PveEnergySkillDefenceMultipliers =
PvpEnergySkillDefenceMultipliers =
PlayerHealingSkillMultipliers =
SkillMasteryChanceMultipliers =

15
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.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.StatSet;
import org.l2jmobius.gameserver.model.actor.Attackable;
@ -81,9 +82,7 @@ public class EnergyAttack extends AbstractEffect
}
final PlayerInstance attacker = effector.getActingPlayer();
final int charge = Math.min(_chargeConsume, attacker.getCharges());
if (!attacker.decreaseCharges(charge))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
@ -98,7 +97,6 @@ public class EnergyAttack extends AbstractEffect
}
double defence = effected.getPDef() * _pDefMod;
if (!_ignoreShieldDefence)
{
final byte shield = Formulas.calcShldUse(attacker, effected);
@ -152,8 +150,17 @@ public class EnergyAttack extends AbstractEffect
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * energyChargesBoost * pvpPveMod;
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1));
double balanceMod = 1;
if (attacker.isPlayable())
{
balanceMod = effected.isPlayable() ? Config.PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f);
}
if (effected.isPlayable())
{
defence *= attacker.isPlayable() ? Config.PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f);
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1)) * balanceMod;
effector.doAttack(damage, effected, skill, false, false, critical, false);
}
}

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

@ -1150,6 +1150,10 @@ public class Config
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> PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PLAYER_HEALING_SKILL_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> SKILL_MASTERY_CHANCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> EXP_AMOUNT_MULTIPLIERS = new ConcurrentHashMap<>();
@ -2969,6 +2973,62 @@ public class Config
}
}
}
final String[] pveEnergySkillDamageMultipliers = ClassBalance.getString("PveEnergySkillDamageMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pveEnergySkillDamageMultipliers.length > 0)
{
for (String info : pveEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDamageMultipliers = ClassBalance.getString("PvpEnergySkillDamageMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pvpEnergySkillDamageMultipliers.length > 0)
{
for (String info : pvpEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pveEnergySkillDefenceMultipliers = ClassBalance.getString("PveEnergySkillDefenceMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pveEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pveEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDefenceMultipliers = ClassBalance.getString("PvpEnergySkillDefenceMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pvpEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pvpEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_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)

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

@ -46,6 +46,12 @@ PvpBlowSkillDamageMultipliers =
PveBlowSkillDefenceMultipliers =
PvpBlowSkillDefenceMultipliers =
PveEnergySkillDamageMultipliers =
PvpEnergySkillDamageMultipliers =
PveEnergySkillDefenceMultipliers =
PvpEnergySkillDefenceMultipliers =
PlayerHealingSkillMultipliers =
SkillMasteryChanceMultipliers =

15
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.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.StatSet;
import org.l2jmobius.gameserver.model.actor.Attackable;
@ -81,9 +82,7 @@ public class EnergyAttack extends AbstractEffect
}
final PlayerInstance attacker = effector.getActingPlayer();
final int charge = Math.min(_chargeConsume, attacker.getCharges());
if (!attacker.decreaseCharges(charge))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
@ -98,7 +97,6 @@ public class EnergyAttack extends AbstractEffect
}
double defence = effected.getPDef() * _pDefMod;
if (!_ignoreShieldDefence)
{
final byte shield = Formulas.calcShldUse(attacker, effected);
@ -152,8 +150,17 @@ public class EnergyAttack extends AbstractEffect
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * energyChargesBoost * pvpPveMod;
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1));
double balanceMod = 1;
if (attacker.isPlayable())
{
balanceMod = effected.isPlayable() ? Config.PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f);
}
if (effected.isPlayable())
{
defence *= attacker.isPlayable() ? Config.PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f);
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1)) * balanceMod;
effector.doAttack(damage, effected, skill, false, false, critical, false);
}
}

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

@ -1163,6 +1163,10 @@ public class Config
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> PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PLAYER_HEALING_SKILL_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> SKILL_MASTERY_CHANCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> EXP_AMOUNT_MULTIPLIERS = new ConcurrentHashMap<>();
@ -2991,6 +2995,62 @@ public class Config
}
}
}
final String[] pveEnergySkillDamageMultipliers = ClassBalance.getString("PveEnergySkillDamageMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pveEnergySkillDamageMultipliers.length > 0)
{
for (String info : pveEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDamageMultipliers = ClassBalance.getString("PvpEnergySkillDamageMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pvpEnergySkillDamageMultipliers.length > 0)
{
for (String info : pvpEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pveEnergySkillDefenceMultipliers = ClassBalance.getString("PveEnergySkillDefenceMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pveEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pveEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDefenceMultipliers = ClassBalance.getString("PvpEnergySkillDefenceMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pvpEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pvpEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_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)

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

@ -46,6 +46,12 @@ PvpBlowSkillDamageMultipliers =
PveBlowSkillDefenceMultipliers =
PvpBlowSkillDefenceMultipliers =
PveEnergySkillDamageMultipliers =
PvpEnergySkillDamageMultipliers =
PveEnergySkillDefenceMultipliers =
PvpEnergySkillDefenceMultipliers =
PlayerHealingSkillMultipliers =
SkillMasteryChanceMultipliers =

15
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.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.StatSet;
import org.l2jmobius.gameserver.model.actor.Attackable;
@ -81,9 +82,7 @@ public class EnergyAttack extends AbstractEffect
}
final PlayerInstance attacker = effector.getActingPlayer();
final int charge = Math.min(_chargeConsume, attacker.getCharges());
if (!attacker.decreaseCharges(charge))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
@ -98,7 +97,6 @@ public class EnergyAttack extends AbstractEffect
}
double defence = effected.getPDef() * _pDefMod;
if (!_ignoreShieldDefence)
{
final byte shield = Formulas.calcShldUse(attacker, effected);
@ -152,8 +150,17 @@ public class EnergyAttack extends AbstractEffect
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * energyChargesBoost * pvpPveMod;
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1));
double balanceMod = 1;
if (attacker.isPlayable())
{
balanceMod = effected.isPlayable() ? Config.PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f);
}
if (effected.isPlayable())
{
defence *= attacker.isPlayable() ? Config.PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f);
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1)) * balanceMod;
effector.doAttack(damage, effected, skill, false, false, critical, false);
}
}

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

@ -1150,6 +1150,10 @@ public class Config
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> PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PLAYER_HEALING_SKILL_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> SKILL_MASTERY_CHANCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> EXP_AMOUNT_MULTIPLIERS = new ConcurrentHashMap<>();
@ -2966,6 +2970,62 @@ public class Config
}
}
}
final String[] pveEnergySkillDamageMultipliers = ClassBalance.getString("PveEnergySkillDamageMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pveEnergySkillDamageMultipliers.length > 0)
{
for (String info : pveEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDamageMultipliers = ClassBalance.getString("PvpEnergySkillDamageMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pvpEnergySkillDamageMultipliers.length > 0)
{
for (String info : pvpEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pveEnergySkillDefenceMultipliers = ClassBalance.getString("PveEnergySkillDefenceMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pveEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pveEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDefenceMultipliers = ClassBalance.getString("PvpEnergySkillDefenceMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pvpEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pvpEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_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)

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

@ -46,6 +46,12 @@ PvpBlowSkillDamageMultipliers =
PveBlowSkillDefenceMultipliers =
PvpBlowSkillDefenceMultipliers =
PveEnergySkillDamageMultipliers =
PvpEnergySkillDamageMultipliers =
PveEnergySkillDefenceMultipliers =
PvpEnergySkillDefenceMultipliers =
PlayerHealingSkillMultipliers =
SkillMasteryChanceMultipliers =

15
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.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.StatSet;
import org.l2jmobius.gameserver.model.actor.Attackable;
@ -81,9 +82,7 @@ public class EnergyAttack extends AbstractEffect
}
final PlayerInstance attacker = effector.getActingPlayer();
final int charge = Math.min(_chargeConsume, attacker.getCharges());
if (!attacker.decreaseCharges(charge))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
@ -98,7 +97,6 @@ public class EnergyAttack extends AbstractEffect
}
double defence = effected.getPDef() * _pDefMod;
if (!_ignoreShieldDefence)
{
final byte shield = Formulas.calcShldUse(attacker, effected);
@ -152,8 +150,17 @@ public class EnergyAttack extends AbstractEffect
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * energyChargesBoost * pvpPveMod;
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1));
double balanceMod = 1;
if (attacker.isPlayable())
{
balanceMod = effected.isPlayable() ? Config.PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f);
}
if (effected.isPlayable())
{
defence *= attacker.isPlayable() ? Config.PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f);
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1)) * balanceMod;
effector.doAttack(damage, effected, skill, false, false, critical, false);
}
}

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

@ -1145,6 +1145,10 @@ public class Config
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> PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PLAYER_HEALING_SKILL_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> SKILL_MASTERY_CHANCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> EXP_AMOUNT_MULTIPLIERS = new ConcurrentHashMap<>();
@ -2966,6 +2970,62 @@ public class Config
}
}
}
final String[] pveEnergySkillDamageMultipliers = ClassBalance.getString("PveEnergySkillDamageMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pveEnergySkillDamageMultipliers.length > 0)
{
for (String info : pveEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDamageMultipliers = ClassBalance.getString("PvpEnergySkillDamageMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pvpEnergySkillDamageMultipliers.length > 0)
{
for (String info : pvpEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pveEnergySkillDefenceMultipliers = ClassBalance.getString("PveEnergySkillDefenceMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pveEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pveEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDefenceMultipliers = ClassBalance.getString("PvpEnergySkillDefenceMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pvpEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pvpEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_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)

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

@ -46,6 +46,12 @@ PvpBlowSkillDamageMultipliers =
PveBlowSkillDefenceMultipliers =
PvpBlowSkillDefenceMultipliers =
PveEnergySkillDamageMultipliers =
PvpEnergySkillDamageMultipliers =
PveEnergySkillDefenceMultipliers =
PvpEnergySkillDefenceMultipliers =
PlayerHealingSkillMultipliers =
SkillMasteryChanceMultipliers =

15
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.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.StatSet;
import org.l2jmobius.gameserver.model.actor.Attackable;
@ -81,9 +82,7 @@ public class EnergyAttack extends AbstractEffect
}
final PlayerInstance attacker = effector.getActingPlayer();
final int charge = Math.min(_chargeConsume, attacker.getCharges());
if (!attacker.decreaseCharges(charge))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
@ -98,7 +97,6 @@ public class EnergyAttack extends AbstractEffect
}
double defence = effected.getPDef() * _pDefMod;
if (!_ignoreShieldDefence)
{
final byte shield = Formulas.calcShldUse(attacker, effected);
@ -152,8 +150,17 @@ public class EnergyAttack extends AbstractEffect
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * energyChargesBoost * pvpPveMod;
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1));
double balanceMod = 1;
if (attacker.isPlayable())
{
balanceMod = effected.isPlayable() ? Config.PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f);
}
if (effected.isPlayable())
{
defence *= attacker.isPlayable() ? Config.PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f);
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1)) * balanceMod;
effector.doAttack(damage, effected, skill, false, false, critical, false);
}
}

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

@ -1145,6 +1145,10 @@ public class Config
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> PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PLAYER_HEALING_SKILL_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> SKILL_MASTERY_CHANCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> EXP_AMOUNT_MULTIPLIERS = new ConcurrentHashMap<>();
@ -2966,6 +2970,62 @@ public class Config
}
}
}
final String[] pveEnergySkillDamageMultipliers = ClassBalance.getString("PveEnergySkillDamageMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pveEnergySkillDamageMultipliers.length > 0)
{
for (String info : pveEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDamageMultipliers = ClassBalance.getString("PvpEnergySkillDamageMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pvpEnergySkillDamageMultipliers.length > 0)
{
for (String info : pvpEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pveEnergySkillDefenceMultipliers = ClassBalance.getString("PveEnergySkillDefenceMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pveEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pveEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDefenceMultipliers = ClassBalance.getString("PvpEnergySkillDefenceMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pvpEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pvpEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_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)

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

@ -46,6 +46,12 @@ PvpBlowSkillDamageMultipliers =
PveBlowSkillDefenceMultipliers =
PvpBlowSkillDefenceMultipliers =
PveEnergySkillDamageMultipliers =
PvpEnergySkillDamageMultipliers =
PveEnergySkillDefenceMultipliers =
PvpEnergySkillDefenceMultipliers =
PlayerHealingSkillMultipliers =
SkillMasteryChanceMultipliers =

15
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.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.StatSet;
import org.l2jmobius.gameserver.model.actor.Attackable;
@ -81,9 +82,7 @@ public class EnergyAttack extends AbstractEffect
}
final PlayerInstance attacker = effector.getActingPlayer();
final int charge = Math.min(_chargeConsume, attacker.getCharges());
if (!attacker.decreaseCharges(charge))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
@ -98,7 +97,6 @@ public class EnergyAttack extends AbstractEffect
}
double defence = effected.getPDef() * _pDefMod;
if (!_ignoreShieldDefence)
{
final byte shield = Formulas.calcShldUse(attacker, effected);
@ -152,8 +150,17 @@ public class EnergyAttack extends AbstractEffect
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * energyChargesBoost * pvpPveMod;
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1));
double balanceMod = 1;
if (attacker.isPlayable())
{
balanceMod = effected.isPlayable() ? Config.PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f);
}
if (effected.isPlayable())
{
defence *= attacker.isPlayable() ? Config.PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f);
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1)) * balanceMod;
effector.doAttack(damage, effected, skill, false, false, critical, false);
}
}

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

@ -1167,6 +1167,10 @@ public class Config
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> PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PLAYER_HEALING_SKILL_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> SKILL_MASTERY_CHANCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> EXP_AMOUNT_MULTIPLIERS = new ConcurrentHashMap<>();
@ -3009,6 +3013,62 @@ public class Config
}
}
}
final String[] pveEnergySkillDamageMultipliers = ClassBalance.getString("PveEnergySkillDamageMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pveEnergySkillDamageMultipliers.length > 0)
{
for (String info : pveEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDamageMultipliers = ClassBalance.getString("PvpEnergySkillDamageMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pvpEnergySkillDamageMultipliers.length > 0)
{
for (String info : pvpEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pveEnergySkillDefenceMultipliers = ClassBalance.getString("PveEnergySkillDefenceMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pveEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pveEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDefenceMultipliers = ClassBalance.getString("PvpEnergySkillDefenceMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pvpEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pvpEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_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)

6
L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Custom/ClassBalance.ini vendored
View File

@ -46,6 +46,12 @@ PvpBlowSkillDamageMultipliers =
PveBlowSkillDefenceMultipliers =
PvpBlowSkillDefenceMultipliers =
PveEnergySkillDamageMultipliers =
PvpEnergySkillDamageMultipliers =
PveEnergySkillDefenceMultipliers =
PvpEnergySkillDefenceMultipliers =
PlayerHealingSkillMultipliers =
SkillMasteryChanceMultipliers =

15
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.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.StatSet;
import org.l2jmobius.gameserver.model.actor.Attackable;
@ -81,9 +82,7 @@ public class EnergyAttack extends AbstractEffect
}
final PlayerInstance attacker = effector.getActingPlayer();
final int charge = Math.min(_chargeConsume, attacker.getCharges());
if (!attacker.decreaseCharges(charge))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
@ -98,7 +97,6 @@ public class EnergyAttack extends AbstractEffect
}
double defence = effected.getPDef() * _pDefMod;
if (!_ignoreShieldDefence)
{
final byte shield = Formulas.calcShldUse(attacker, effected);
@ -152,8 +150,17 @@ public class EnergyAttack extends AbstractEffect
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * energyChargesBoost * pvpPveMod;
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1));
double balanceMod = 1;
if (attacker.isPlayable())
{
balanceMod = effected.isPlayable() ? Config.PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f);
}
if (effected.isPlayable())
{
defence *= attacker.isPlayable() ? Config.PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f);
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1)) * balanceMod;
effector.doAttack(damage, effected, skill, false, false, critical, false);
}
}

60
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/Config.java
View File

@ -1173,6 +1173,10 @@ public class Config
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> PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PLAYER_HEALING_SKILL_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> SKILL_MASTERY_CHANCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> EXP_AMOUNT_MULTIPLIERS = new ConcurrentHashMap<>();
@ -3023,6 +3027,62 @@ public class Config
}
}
}
final String[] pveEnergySkillDamageMultipliers = ClassBalance.getString("PveEnergySkillDamageMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pveEnergySkillDamageMultipliers.length > 0)
{
for (String info : pveEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDamageMultipliers = ClassBalance.getString("PvpEnergySkillDamageMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pvpEnergySkillDamageMultipliers.length > 0)
{
for (String info : pvpEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pveEnergySkillDefenceMultipliers = ClassBalance.getString("PveEnergySkillDefenceMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pveEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pveEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDefenceMultipliers = ClassBalance.getString("PvpEnergySkillDefenceMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pvpEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pvpEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_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)

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

@ -46,6 +46,12 @@ PvpBlowSkillDamageMultipliers =
PveBlowSkillDefenceMultipliers =
PvpBlowSkillDefenceMultipliers =
PveEnergySkillDamageMultipliers =
PvpEnergySkillDamageMultipliers =
PveEnergySkillDefenceMultipliers =
PvpEnergySkillDefenceMultipliers =
PlayerHealingSkillMultipliers =
SkillMasteryChanceMultipliers =

15
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.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.StatSet;
import org.l2jmobius.gameserver.model.actor.Attackable;
@ -81,9 +82,7 @@ public class EnergyAttack extends AbstractEffect
}
final PlayerInstance attacker = effector.getActingPlayer();
final int charge = Math.min(_chargeConsume, attacker.getCharges());
if (!attacker.decreaseCharges(charge))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
@ -98,7 +97,6 @@ public class EnergyAttack extends AbstractEffect
}
double defence = effected.getPDef() * _pDefMod;
if (!_ignoreShieldDefence)
{
final byte shield = Formulas.calcShldUse(attacker, effected);
@ -152,8 +150,17 @@ public class EnergyAttack extends AbstractEffect
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * energyChargesBoost * pvpPveMod;
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1));
double balanceMod = 1;
if (attacker.isPlayable())
{
balanceMod = effected.isPlayable() ? Config.PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f);
}
if (effected.isPlayable())
{
defence *= attacker.isPlayable() ? Config.PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f);
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1)) * balanceMod;
effector.doAttack(damage, effected, skill, false, false, critical, false);
}
}

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

@ -1087,6 +1087,10 @@ public class Config
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> PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PLAYER_HEALING_SKILL_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> SKILL_MASTERY_CHANCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> EXP_AMOUNT_MULTIPLIERS = new ConcurrentHashMap<>();
@ -2838,6 +2842,62 @@ public class Config
}
}
}
final String[] pveEnergySkillDamageMultipliers = ClassBalance.getString("PveEnergySkillDamageMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pveEnergySkillDamageMultipliers.length > 0)
{
for (String info : pveEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDamageMultipliers = ClassBalance.getString("PvpEnergySkillDamageMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pvpEnergySkillDamageMultipliers.length > 0)
{
for (String info : pvpEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pveEnergySkillDefenceMultipliers = ClassBalance.getString("PveEnergySkillDefenceMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pveEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pveEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDefenceMultipliers = ClassBalance.getString("PvpEnergySkillDefenceMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pvpEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pvpEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_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)

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

@ -46,6 +46,12 @@ PvpBlowSkillDamageMultipliers =
PveBlowSkillDefenceMultipliers =
PvpBlowSkillDefenceMultipliers =
PveEnergySkillDamageMultipliers =
PvpEnergySkillDamageMultipliers =
PveEnergySkillDefenceMultipliers =
PvpEnergySkillDefenceMultipliers =
PlayerHealingSkillMultipliers =
SkillMasteryChanceMultipliers =

15
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.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.StatSet;
import org.l2jmobius.gameserver.model.actor.Attackable;
@ -81,9 +82,7 @@ public class EnergyAttack extends AbstractEffect
}
final PlayerInstance attacker = effector.getActingPlayer();
final int charge = Math.min(_chargeConsume, attacker.getCharges());
if (!attacker.decreaseCharges(charge))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
@ -98,7 +97,6 @@ public class EnergyAttack extends AbstractEffect
}
double defence = effected.getPDef() * _pDefMod;
if (!_ignoreShieldDefence)
{
final byte shield = Formulas.calcShldUse(attacker, effected);
@ -152,8 +150,17 @@ public class EnergyAttack extends AbstractEffect
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * energyChargesBoost * pvpPveMod;
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1));
double balanceMod = 1;
if (attacker.isPlayable())
{
balanceMod = effected.isPlayable() ? Config.PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f);
}
if (effected.isPlayable())
{
defence *= attacker.isPlayable() ? Config.PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f);
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1)) * balanceMod;
effector.doAttack(damage, effected, skill, false, false, critical, false);
}
}

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

@ -1091,6 +1091,10 @@ public class Config
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> PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PLAYER_HEALING_SKILL_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> SKILL_MASTERY_CHANCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> EXP_AMOUNT_MULTIPLIERS = new ConcurrentHashMap<>();
@ -2844,6 +2848,62 @@ public class Config
}
}
}
final String[] pveEnergySkillDamageMultipliers = ClassBalance.getString("PveEnergySkillDamageMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pveEnergySkillDamageMultipliers.length > 0)
{
for (String info : pveEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDamageMultipliers = ClassBalance.getString("PvpEnergySkillDamageMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pvpEnergySkillDamageMultipliers.length > 0)
{
for (String info : pvpEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pveEnergySkillDefenceMultipliers = ClassBalance.getString("PveEnergySkillDefenceMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pveEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pveEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDefenceMultipliers = ClassBalance.getString("PvpEnergySkillDefenceMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pvpEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pvpEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_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)

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

@ -46,6 +46,12 @@ PvpBlowSkillDamageMultipliers =
PveBlowSkillDefenceMultipliers =
PvpBlowSkillDefenceMultipliers =
PveEnergySkillDamageMultipliers =
PvpEnergySkillDamageMultipliers =
PveEnergySkillDefenceMultipliers =
PvpEnergySkillDefenceMultipliers =
PlayerHealingSkillMultipliers =
SkillMasteryChanceMultipliers =

15
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.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.StatSet;
import org.l2jmobius.gameserver.model.actor.Attackable;
@ -81,9 +82,7 @@ public class EnergyAttack extends AbstractEffect
}
final PlayerInstance attacker = effector.getActingPlayer();
final int charge = Math.min(_chargeConsume, attacker.getCharges());
if (!attacker.decreaseCharges(charge))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
@ -98,7 +97,6 @@ public class EnergyAttack extends AbstractEffect
}
double defence = effected.getPDef() * _pDefMod;
if (!_ignoreShieldDefence)
{
final byte shield = Formulas.calcShldUse(attacker, effected);
@ -152,8 +150,17 @@ public class EnergyAttack extends AbstractEffect
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * energyChargesBoost * pvpPveMod;
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1));
double balanceMod = 1;
if (attacker.isPlayable())
{
balanceMod = effected.isPlayable() ? Config.PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f);
}
if (effected.isPlayable())
{
defence *= attacker.isPlayable() ? Config.PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f);
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1)) * balanceMod;
effector.doAttack(damage, effected, skill, false, false, critical, false);
}
}

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

@ -1091,6 +1091,10 @@ public class Config
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> PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PLAYER_HEALING_SKILL_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> SKILL_MASTERY_CHANCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> EXP_AMOUNT_MULTIPLIERS = new ConcurrentHashMap<>();
@ -2844,6 +2848,62 @@ public class Config
}
}
}
final String[] pveEnergySkillDamageMultipliers = ClassBalance.getString("PveEnergySkillDamageMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pveEnergySkillDamageMultipliers.length > 0)
{
for (String info : pveEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDamageMultipliers = ClassBalance.getString("PvpEnergySkillDamageMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pvpEnergySkillDamageMultipliers.length > 0)
{
for (String info : pvpEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pveEnergySkillDefenceMultipliers = ClassBalance.getString("PveEnergySkillDefenceMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pveEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pveEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDefenceMultipliers = ClassBalance.getString("PvpEnergySkillDefenceMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pvpEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pvpEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_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)

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

@ -46,6 +46,12 @@ PvpBlowSkillDamageMultipliers =
PveBlowSkillDefenceMultipliers =
PvpBlowSkillDefenceMultipliers =
PveEnergySkillDamageMultipliers =
PvpEnergySkillDamageMultipliers =
PveEnergySkillDefenceMultipliers =
PvpEnergySkillDefenceMultipliers =
PlayerHealingSkillMultipliers =
SkillMasteryChanceMultipliers =

15
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.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.StatSet;
import org.l2jmobius.gameserver.model.actor.Attackable;
@ -81,9 +82,7 @@ public class EnergyAttack extends AbstractEffect
}
final PlayerInstance attacker = effector.getActingPlayer();
final int charge = Math.min(_chargeConsume, attacker.getCharges());
if (!attacker.decreaseCharges(charge))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
@ -98,7 +97,6 @@ public class EnergyAttack extends AbstractEffect
}
double defence = effected.getPDef() * _pDefMod;
if (!_ignoreShieldDefence)
{
final byte shield = Formulas.calcShldUse(attacker, effected);
@ -152,8 +150,17 @@ public class EnergyAttack extends AbstractEffect
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * energyChargesBoost * pvpPveMod;
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1));
double balanceMod = 1;
if (attacker.isPlayable())
{
balanceMod = effected.isPlayable() ? Config.PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f);
}
if (effected.isPlayable())
{
defence *= attacker.isPlayable() ? Config.PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f);
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1)) * balanceMod;
effector.doAttack(damage, effected, skill, false, false, critical, false);
}
}

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

@ -1091,6 +1091,10 @@ public class Config
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> PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PLAYER_HEALING_SKILL_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> SKILL_MASTERY_CHANCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> EXP_AMOUNT_MULTIPLIERS = new ConcurrentHashMap<>();
@ -2845,6 +2849,62 @@ public class Config
}
}
}
final String[] pveEnergySkillDamageMultipliers = ClassBalance.getString("PveEnergySkillDamageMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pveEnergySkillDamageMultipliers.length > 0)
{
for (String info : pveEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDamageMultipliers = ClassBalance.getString("PvpEnergySkillDamageMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pvpEnergySkillDamageMultipliers.length > 0)
{
for (String info : pvpEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pveEnergySkillDefenceMultipliers = ClassBalance.getString("PveEnergySkillDefenceMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pveEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pveEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDefenceMultipliers = ClassBalance.getString("PvpEnergySkillDefenceMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pvpEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pvpEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_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)

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

@ -46,6 +46,12 @@ PvpBlowSkillDamageMultipliers =
PveBlowSkillDefenceMultipliers =
PvpBlowSkillDefenceMultipliers =
PveEnergySkillDamageMultipliers =
PvpEnergySkillDamageMultipliers =
PveEnergySkillDefenceMultipliers =
PvpEnergySkillDefenceMultipliers =
PlayerHealingSkillMultipliers =
SkillMasteryChanceMultipliers =

15
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.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.StatSet;
import org.l2jmobius.gameserver.model.actor.Attackable;
@ -81,9 +82,7 @@ public class EnergyAttack extends AbstractEffect
}
final PlayerInstance attacker = effector.getActingPlayer();
final int charge = Math.min(_chargeConsume, attacker.getCharges());
if (!attacker.decreaseCharges(charge))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
@ -98,7 +97,6 @@ public class EnergyAttack extends AbstractEffect
}
double defence = effected.getPDef() * _pDefMod;
if (!_ignoreShieldDefence)
{
final byte shield = Formulas.calcShldUse(attacker, effected);
@ -152,8 +150,17 @@ public class EnergyAttack extends AbstractEffect
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * energyChargesBoost * pvpPveMod;
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1));
double balanceMod = 1;
if (attacker.isPlayable())
{
balanceMod = effected.isPlayable() ? Config.PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f);
}
if (effected.isPlayable())
{
defence *= attacker.isPlayable() ? Config.PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f);
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1)) * balanceMod;
effector.doAttack(damage, effected, skill, false, false, critical, false);
}
}

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

@ -1096,6 +1096,10 @@ public class Config
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> PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PLAYER_HEALING_SKILL_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> SKILL_MASTERY_CHANCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> EXP_AMOUNT_MULTIPLIERS = new ConcurrentHashMap<>();
@ -2854,6 +2858,62 @@ public class Config
}
}
}
final String[] pveEnergySkillDamageMultipliers = ClassBalance.getString("PveEnergySkillDamageMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pveEnergySkillDamageMultipliers.length > 0)
{
for (String info : pveEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDamageMultipliers = ClassBalance.getString("PvpEnergySkillDamageMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pvpEnergySkillDamageMultipliers.length > 0)
{
for (String info : pvpEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pveEnergySkillDefenceMultipliers = ClassBalance.getString("PveEnergySkillDefenceMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pveEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pveEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDefenceMultipliers = ClassBalance.getString("PvpEnergySkillDefenceMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pvpEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pvpEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_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)

6
L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Custom/ClassBalance.ini vendored
View File

@ -46,6 +46,12 @@ PvpBlowSkillDamageMultipliers =
PveBlowSkillDefenceMultipliers =
PvpBlowSkillDefenceMultipliers =
PveEnergySkillDamageMultipliers =
PvpEnergySkillDamageMultipliers =
PveEnergySkillDefenceMultipliers =
PvpEnergySkillDefenceMultipliers =
PlayerHealingSkillMultipliers =
SkillMasteryChanceMultipliers =

15
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.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.StatSet;
import org.l2jmobius.gameserver.model.actor.Attackable;
@ -81,9 +82,7 @@ public class EnergyAttack extends AbstractEffect
}
final PlayerInstance attacker = effector.getActingPlayer();
final int charge = Math.min(_chargeConsume, attacker.getCharges());
if (!attacker.decreaseCharges(charge))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
@ -98,7 +97,6 @@ public class EnergyAttack extends AbstractEffect
}
double defence = effected.getPDef() * _pDefMod;
if (!_ignoreShieldDefence)
{
final byte shield = Formulas.calcShldUse(attacker, effected);
@ -152,8 +150,17 @@ public class EnergyAttack extends AbstractEffect
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * energyChargesBoost * pvpPveMod;
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1));
double balanceMod = 1;
if (attacker.isPlayable())
{
balanceMod = effected.isPlayable() ? Config.PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f);
}
if (effected.isPlayable())
{
defence *= attacker.isPlayable() ? Config.PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f);
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1)) * balanceMod;
effector.doAttack(damage, effected, skill, false, false, critical, false);
}
}

60
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java
View File

@ -1100,6 +1100,10 @@ public class Config
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> PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PLAYER_HEALING_SKILL_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> SKILL_MASTERY_CHANCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> EXP_AMOUNT_MULTIPLIERS = new ConcurrentHashMap<>();
@ -2863,6 +2867,62 @@ public class Config
}
}
}
final String[] pveEnergySkillDamageMultipliers = ClassBalance.getString("PveEnergySkillDamageMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pveEnergySkillDamageMultipliers.length > 0)
{
for (String info : pveEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDamageMultipliers = ClassBalance.getString("PvpEnergySkillDamageMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pvpEnergySkillDamageMultipliers.length > 0)
{
for (String info : pvpEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pveEnergySkillDefenceMultipliers = ClassBalance.getString("PveEnergySkillDefenceMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pveEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pveEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDefenceMultipliers = ClassBalance.getString("PvpEnergySkillDefenceMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pvpEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pvpEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_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)

6
L2J_Mobius_Classic_Interlude/dist/game/config/Custom/ClassBalance.ini vendored
View File

@ -46,6 +46,12 @@ PvpBlowSkillDamageMultipliers =
PveBlowSkillDefenceMultipliers =
PvpBlowSkillDefenceMultipliers =
PveEnergySkillDamageMultipliers =
PvpEnergySkillDamageMultipliers =
PveEnergySkillDefenceMultipliers =
PvpEnergySkillDefenceMultipliers =
PlayerHealingSkillMultipliers =
SkillMasteryChanceMultipliers =

15
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.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.StatSet;
import org.l2jmobius.gameserver.model.actor.Attackable;
@ -81,9 +82,7 @@ public class EnergyAttack extends AbstractEffect
}
final PlayerInstance attacker = effector.getActingPlayer();
final int charge = Math.min(_chargeConsume, attacker.getCharges());
if (!attacker.decreaseCharges(charge))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
@ -98,7 +97,6 @@ public class EnergyAttack extends AbstractEffect
}
double defence = effected.getPDef() * _pDefMod;
if (!_ignoreShieldDefence)
{
final byte shield = Formulas.calcShldUse(attacker, effected);
@ -152,8 +150,17 @@ public class EnergyAttack extends AbstractEffect
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * energyChargesBoost * pvpPveMod;
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1));
double balanceMod = 1;
if (attacker.isPlayable())
{
balanceMod = effected.isPlayable() ? Config.PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.getOrDefault(attacker.getActingPlayer().getClassId(), 1f);
}
if (effected.isPlayable())
{
defence *= attacker.isPlayable() ? Config.PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f) : Config.PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.getOrDefault(effected.getActingPlayer().getClassId(), 1f);
}
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1)) * balanceMod;
effector.doAttack(damage, effected, skill, false, false, critical, false);
}
}

60
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java
View File

@ -1105,6 +1105,10 @@ public class Config
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> PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> PLAYER_HEALING_SKILL_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> SKILL_MASTERY_CHANCE_MULTIPLIERS = new ConcurrentHashMap<>();
public static Map<ClassId, Float> EXP_AMOUNT_MULTIPLIERS = new ConcurrentHashMap<>();
@ -2869,6 +2873,62 @@ public class Config
}
}
}
final String[] pveEnergySkillDamageMultipliers = ClassBalance.getString("PveEnergySkillDamageMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pveEnergySkillDamageMultipliers.length > 0)
{
for (String info : pveEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDamageMultipliers = ClassBalance.getString("PvpEnergySkillDamageMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.clear();
if (pvpEnergySkillDamageMultipliers.length > 0)
{
for (String info : pvpEnergySkillDamageMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_SKILL_DAMAGE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pveEnergySkillDefenceMultipliers = ClassBalance.getString("PveEnergySkillDefenceMultipliers", "").trim().split(";");
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pveEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pveEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVE_ENERGY_SKILL_DEFENCE_MULTIPLIERS.put(Util.isDigit(id) ? ClassId.getClassId(Integer.parseInt(id)) : Enum.valueOf(ClassId.class, id), Float.parseFloat(classInfo[1].trim()));
}
}
}
final String[] pvpEnergySkillDefenceMultipliers = ClassBalance.getString("PvpEnergySkillDefenceMultipliers", "").trim().split(";");
PVP_ENERGY_SKILL_DEFENCE_MULTIPLIERS.clear();
if (pvpEnergySkillDefenceMultipliers.length > 0)
{
for (String info : pvpEnergySkillDefenceMultipliers)
{
final String[] classInfo = info.trim().split("[*]");
if (classInfo.length == 2)
{
final String id = classInfo[0].trim();
PVP_ENERGY_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)