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

Configurations for using vampiric effects on PvP.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-06-22 11:46:01 +00:00
parent 258713950d
commit fd9f8794ef
36 changed files with 435 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,6 +53,17 @@ AntiFeedDisconnectedAsDualbox = True
AntiFeedInterval = 120
# ---------------------------------------------------------------------------
# Skills
# ---------------------------------------------------------------------------
# Enable VampiricAttack for PvP targets.
VampiricAttackAffectsPvP = True
# Enable MpVampiricAttack for PvP targets.
MpVampiricAttackAffectsPvP = True
# ---------------------------------------------------------------------------
# Misc.
# ---------------------------------------------------------------------------

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

@@ -651,6 +651,8 @@ public final class Config
public static boolean ANTIFEED_DUALBOX;
public static boolean ANTIFEED_DISCONNECTED_AS_DUALBOX;
public static int ANTIFEED_INTERVAL;
public static boolean VAMPIRIC_ATTACK_AFFECTS_PVP;
public static boolean MP_VAMPIRIC_ATTACK_AFFECTS_PVP;
public static boolean ANNOUNCE_GAINAK_SIEGE;
// --------------------------------------------------
@@ -2157,6 +2159,9 @@ public final class Config
ANTIFEED_DISCONNECTED_AS_DUALBOX = PVPSettings.getBoolean("AntiFeedDisconnectedAsDualbox", true);
ANTIFEED_INTERVAL = PVPSettings.getInt("AntiFeedInterval", 120) * 1000;
VAMPIRIC_ATTACK_AFFECTS_PVP = PVPSettings.getBoolean("VampiricAttackAffectsPvP", false);
MP_VAMPIRIC_ATTACK_AFFECTS_PVP = PVPSettings.getBoolean("MpVampiricAttackAffectsPvP", false);
// sorting so binarySearch can be used later
Arrays.sort(KARMA_LIST_NONDROPPABLE_PET_ITEMS);
Arrays.sort(KARMA_LIST_NONDROPPABLE_ITEMS);

38
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@@ -179,7 +179,6 @@ import org.l2jmobius.gameserver.util.Util;
public abstract class Creature extends WorldObject implements ISkillsHolder, IDeletable
{
public static final Logger LOGGER = Logger.getLogger(Creature.class.getName());
private volatile Set<WeakReference<Creature>> _attackByList;
private boolean _isDead = false;
@@ -4428,33 +4427,40 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
}
// Absorb HP from the damage inflicted
if (skill == null) // Classic: Skills counted with the Vampiric Rage effect was introduced on GoD chronicles.
final boolean isPvP = isPlayable() && target.isPlayable();
if (!isPvP || Config.VAMPIRIC_ATTACK_AFFECTS_PVP)
{
double absorbPercent = getStat().getValue(Stats.ABSORB_DAMAGE_PERCENT, 0) * target.getStat().getValue(Stats.ABSORB_DAMAGE_DEFENCE, 1);
if ((absorbPercent > 0) && (Rnd.nextDouble() < _stat.getValue(Stats.ABSORB_DAMAGE_CHANCE)))
if (skill == null) // Classic: Skills counted with the Vampiric Rage effect was introduced on GoD chronicles.
{
int absorbDamage = (int) Math.min(absorbPercent * damage, _stat.getMaxRecoverableHp() - _status.getCurrentHp());
absorbDamage = Math.min(absorbDamage, (int) target.getCurrentHp());
if (absorbDamage > 0)
final double absorbHpPercent = getStat().getValue(Stats.ABSORB_DAMAGE_PERCENT, 0) * target.getStat().getValue(Stats.ABSORB_DAMAGE_DEFENCE, 1);
if ((absorbHpPercent > 0) && (Rnd.nextDouble() < _stat.getValue(Stats.ABSORB_DAMAGE_CHANCE)))
{
setCurrentHp(_status.getCurrentHp() + absorbDamage);
int absorbDamage = (int) Math.min(absorbHpPercent * damage, _stat.getMaxRecoverableHp() - _status.getCurrentHp());
absorbDamage = Math.min(absorbDamage, (int) target.getCurrentHp());
if (absorbDamage > 0)
{
setCurrentHp(_status.getCurrentHp() + absorbDamage);
}
}
}
}
// Absorb MP from the damage inflicted.
if (skill != null) // Classic: Used to reduce skill MP consumption. See Orfen's Earring.
if (!isPvP || Config.MP_VAMPIRIC_ATTACK_AFFECTS_PVP)
{
if (Rnd.get(10) < 3) // Classic: Static 30% change.
if (skill != null) // Classic: Used to reduce skill MP consumption. See Orfen's Earring.
{
double absorbPercent = _stat.getValue(Stats.ABSORB_MANA_DAMAGE_PERCENT, 0);
if (absorbPercent > 0)
if (Rnd.get(10) < 3) // Classic: Static 30% change.
{
int absorbDamage = (int) Math.min((absorbPercent / 100.) * damage, _stat.getMaxRecoverableMp() - _status.getCurrentMp());
absorbDamage = Math.min(absorbDamage, (int) target.getCurrentMp());
if (absorbDamage > 0)
final double absorbMpPercent = _stat.getValue(Stats.ABSORB_MANA_DAMAGE_PERCENT, 0);
if (absorbMpPercent > 0)
{
setCurrentMp(_status.getCurrentMp() + absorbDamage);
int absorbDamage = (int) Math.min((absorbMpPercent / 100.) * damage, _stat.getMaxRecoverableMp() - _status.getCurrentMp());
absorbDamage = Math.min(absorbDamage, (int) target.getCurrentMp());
if (absorbDamage > 0)
{
setCurrentMp(_status.getCurrentMp() + absorbDamage);
}
}
}
}