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

Addition of DuelistFury effect.

Browse Source 
Contributed by kiwimen.
This commit is contained in:
MobiusDev
2018-05-28 12:12:26 +00:00
parent 786a256c59
commit 0c60d140c3
95 changed files with 410 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/CharEffectList.java
View File

@ -796,7 +796,7 @@ public final class CharEffectList
return;
}
if (info.getEffector().isPlayer() && info.getEffected().isPlayer() && info.getEffected().isAffected(EffectFlag.FACEOFF) && (info.getEffected().getActingPlayer().getAttackerObjId() != info.getEffector().getObjectId()))
if (info.getEffector().isPlayer() && info.getEffected().isPlayer() && info.getEffected().isAffected(EffectFlag.DUELIST_FURY) && !info.getEffector().isAffected(EffectFlag.DUELIST_FURY))
{
return;
}

4
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@ -715,7 +715,7 @@ public abstract class L2Summon extends L2Playable
final SystemMessage sm;
if ((target.isHpBlocked() && !target.isNpc()) || (target.isPlayer() && target.isAffected(EffectFlag.FACEOFF) && (target.getActingPlayer().getAttackerObjId() != getObjectId())))
if ((target.isHpBlocked() && !target.isNpc()) || (target.isPlayer() && target.isAffected(EffectFlag.DUELIST_FURY) && !getActingPlayer().isAffected(EffectFlag.FACEOFF)))
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_ATTACK_HAS_BEEN_BLOCKED);
}
@ -737,7 +737,7 @@ public abstract class L2Summon extends L2Playable
{
super.reduceCurrentHp(damage, attacker, skill);
if (!isDead() && !isHpBlocked() && (getOwner() != null) && (attacker != null) && (!getOwner().isAffected(EffectFlag.FACEOFF) || (getOwner().getAttackerObjId() == attacker.getObjectId())))
if (!isDead() && !isHpBlocked() && (getOwner() != null) && (attacker != null) && (!getOwner().isAffected(EffectFlag.DUELIST_FURY) || attacker.isAffected(EffectFlag.FACEOFF)))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RECEIVED_S3_DAMAGE_FROM_C2);
sm.addNpcName(this);

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/DoppelgangerInstance.java
View File

@ -146,7 +146,7 @@ public class DoppelgangerInstance extends L2Npc
final SystemMessage sm;
if ((target.isHpBlocked() && !target.isNpc()) || (target.isPlayer() && target.isAffected(EffectFlag.FACEOFF) && (target.getActingPlayer().getAttackerObjId() != getObjectId())))
if ((target.isHpBlocked() && !target.isNpc()) || (target.isPlayer() && target.isAffected(EffectFlag.DUELIST_FURY) && !getActingPlayer().isAffected(EffectFlag.FACEOFF)))
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_ATTACK_HAS_BEEN_BLOCKED);
}

15
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -495,9 +495,6 @@ public final class L2PcInstance extends L2Playable
private int _duelId = 0;
private SystemMessageId _noDuelReason = SystemMessageId.THERE_IS_NO_OPPONENT_TO_RECEIVE_YOUR_CHALLENGE_FOR_A_DUEL;
/** Faceoff */
private int _attackerObjId = 0;
/** Boat and AirShip */
private L2Vehicle _vehicle = null;
private Location _inVehiclePosition;
@ -11638,7 +11635,7 @@ public final class L2PcInstance extends L2Playable
final SystemMessage sm;
if ((target.isHpBlocked() && !target.isNpc()) || (target.isPlayer() && target.isAffected(EffectFlag.FACEOFF) && (target.getActingPlayer().getAttackerObjId() != getObjectId())))
if ((target.isHpBlocked() && !target.isNpc()) || (target.isPlayer() && target.isAffected(EffectFlag.DUELIST_FURY) && !isAffected(EffectFlag.FACEOFF)))
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_ATTACK_HAS_BEEN_BLOCKED);
}
@ -13975,16 +13972,6 @@ public final class L2PcInstance extends L2Playable
return _events.containsKey(clazz);
}
public void setAttackerObjId(int attackerObjId)
{
_attackerObjId = attackerObjId;
}
public int getAttackerObjId()
{
return _attackerObjId;
}
public Fishing getFishing()
{
return _fishing;

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java
View File

@ -88,7 +88,7 @@ public class PcStatus extends PlayableStatus
return;
}
if (getActiveChar().isAffected(EffectFlag.FACEOFF) && (getActiveChar().getAttackerObjId() != attacker.getObjectId()))
if (getActiveChar().isAffected(EffectFlag.DUELIST_FURY) && !attacker.isAffected(EffectFlag.FACEOFF))
{
return;
}

3
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/effects/EffectFlag.java
View File

@ -55,7 +55,8 @@ public enum EffectFlag
HPCPHEAL_CRITICAL,
PROTECT_DEATH_PENALTY,
CHAT_BLOCK,
FAKE_DEATH;
FAKE_DEATH,
DUELIST_FURY;
public long getMask()
{