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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java vendored
View File

@ -125,6 +125,7 @@ public final class EffectMasterHandler
EffectHandler.getInstance().registerHandler("DispelBySlotMyself", DispelBySlotMyself::new);
EffectHandler.getInstance().registerHandler("DispelBySlotProbability", DispelBySlotProbability::new);
EffectHandler.getInstance().registerHandler("DoubleCast", DoubleCast::new);
EffectHandler.getInstance().registerHandler("DuelistFury", DuelistFury::new);
EffectHandler.getInstance().registerHandler("EnableCloak", EnableCloak::new);
EffectHandler.getInstance().registerHandler("EnergyAttack", EnergyAttack::new);
EffectHandler.getInstance().registerHandler("EnlargeAbnormalSlot", EnlargeAbnormalSlot::new);

45
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java vendored Normal file
View File

@ -0,0 +1,45 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package handlers.effecthandlers;
import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.effects.AbstractEffect;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
import com.l2jmobius.gameserver.model.skills.Skill;
/**
* @author negaa
*/
public class DuelistFury extends AbstractEffect
{
public DuelistFury(StatsSet params)
{
}
@Override
public long getEffectFlags()
{
return EffectFlag.DUELIST_FURY.getMask();
}
@Override
public boolean canStart(L2Character effector, L2Character effected, Skill skill)
{
return effected.isPlayer();
}
}

14
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java vendored
View File

@ -42,18 +42,4 @@ public class Faceoff extends AbstractEffect
{
return effected.isPlayer();
}
@Override
public void onStart(L2Character effector, L2Character effected, Skill skill)
{
effector.getActingPlayer().setAttackerObjId(effected.getObjectId());
effected.getActingPlayer().setAttackerObjId(effector.getObjectId());
}
@Override
public void onExit(L2Character effector, L2Character effected, Skill skill)
{
effector.getActingPlayer().setAttackerObjId(0);
effected.getActingPlayer().setAttackerObjId(0);
}
}

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

@ -73,7 +73,7 @@ public final class Lethal extends AbstractEffect
return;
}
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.FACEOFF) && (effected.getActingPlayer().getAttackerObjId() != effector.getObjectId()))
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.DUELIST_FURY) && !effector.isAffected(EffectFlag.DUELIST_FURY))
{
return;
}

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

@ -53,7 +53,7 @@ public final class MagicalAttackMp extends AbstractEffect
return false;
}
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.FACEOFF) && (effected.getActingPlayer().getAttackerObjId() != effector.getObjectId()))
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.DUELIST_FURY) && !effector.isAffected(EffectFlag.DUELIST_FURY))
{
return false;
}

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

@ -74,7 +74,7 @@ public final class ModifyVital extends AbstractEffect
return;
}
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.FACEOFF) && (effected.getActingPlayer().getAttackerObjId() != effector.getObjectId()))
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.DUELIST_FURY) && !effector.isAffected(EffectFlag.DUELIST_FURY))
{
return;
}

1
L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10300-10399.xml vendored
View File

@ -840,6 +840,7 @@
<amount>-90</amount>
<slot>DEBUFF</slot>
</effect>
<effect name="DuelistFury" />
</effects>
</skill>
<skill id="10320" toLevel="3" name="Faceoff">

1
L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/documentation.txt vendored
View File

@ -94,6 +94,7 @@ DispelBySlot: Removes given amount of target's effects by specified AbnormalType
DispelBySlotMyself: Removes given amount of effects by specified AbnormalType
DispelBySlotProbability: Removes given amount of effects by specified AbnormalType at a given rate.
DoubleCast: Triggers Fire, Water, Wind, Earth stance and enables the ability to cast two skills at once.
DuelistFury: Synergy effect for Faceoff effect. (l2jmobius)
EnableCloak: See/unsee cloaks.
EnemyCharge: Charges towards the enemy. Rush Impact.
EnergyAttack: Physical attack based on Momentum formula. Triple Sonic Slash, Double Sonic Slash etc.

2
L2J_Mobius_1.0_Ertheia/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_1.0_Ertheia/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_1.0_Ertheia/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_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -491,9 +491,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;
@ -11621,7 +11618,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);
}
@ -13957,16 +13954,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_1.0_Ertheia/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_1.0_Ertheia/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()
{

1
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java vendored
View File

@ -125,6 +125,7 @@ public final class EffectMasterHandler
EffectHandler.getInstance().registerHandler("DispelBySlotMyself", DispelBySlotMyself::new);
EffectHandler.getInstance().registerHandler("DispelBySlotProbability", DispelBySlotProbability::new);
EffectHandler.getInstance().registerHandler("DoubleCast", DoubleCast::new);
EffectHandler.getInstance().registerHandler("DuelistFury", DuelistFury::new);
EffectHandler.getInstance().registerHandler("EnableCloak", EnableCloak::new);
EffectHandler.getInstance().registerHandler("EnergyAttack", EnergyAttack::new);
EffectHandler.getInstance().registerHandler("EnlargeAbnormalSlot", EnlargeAbnormalSlot::new);

45
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java vendored Normal file
View File

@ -0,0 +1,45 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package handlers.effecthandlers;
import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.effects.AbstractEffect;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
import com.l2jmobius.gameserver.model.skills.Skill;
/**
* @author negaa
*/
public class DuelistFury extends AbstractEffect
{
public DuelistFury(StatsSet params)
{
}
@Override
public long getEffectFlags()
{
return EffectFlag.DUELIST_FURY.getMask();
}
@Override
public boolean canStart(L2Character effector, L2Character effected, Skill skill)
{
return effected.isPlayer();
}
}

14
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java vendored
View File

@ -42,18 +42,4 @@ public class Faceoff extends AbstractEffect
{
return effected.isPlayer();
}
@Override
public void onStart(L2Character effector, L2Character effected, Skill skill)
{
effector.getActingPlayer().setAttackerObjId(effected.getObjectId());
effected.getActingPlayer().setAttackerObjId(effector.getObjectId());
}
@Override
public void onExit(L2Character effector, L2Character effected, Skill skill)
{
effector.getActingPlayer().setAttackerObjId(0);
effected.getActingPlayer().setAttackerObjId(0);
}
}

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

@ -73,7 +73,7 @@ public final class Lethal extends AbstractEffect
return;
}
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.FACEOFF) && (effected.getActingPlayer().getAttackerObjId() != effector.getObjectId()))
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.DUELIST_FURY) && !effector.isAffected(EffectFlag.DUELIST_FURY))
{
return;
}

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

@ -53,7 +53,7 @@ public final class MagicalAttackMp extends AbstractEffect
return false;
}
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.FACEOFF) && (effected.getActingPlayer().getAttackerObjId() != effector.getObjectId()))
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.DUELIST_FURY) && !effector.isAffected(EffectFlag.DUELIST_FURY))
{
return false;
}

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

@ -74,7 +74,7 @@ public final class ModifyVital extends AbstractEffect
return;
}
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.FACEOFF) && (effected.getActingPlayer().getAttackerObjId() != effector.getObjectId()))
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.DUELIST_FURY) && !effector.isAffected(EffectFlag.DUELIST_FURY))
{
return;
}

1
L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10300-10399.xml vendored
View File

@ -853,6 +853,7 @@
<amount>-90</amount>
<slot>DEBUFF</slot>
</effect>
<effect name="DuelistFury" />
</effects>
</skill>
<skill id="10320" toLevel="3" name="Faceoff">

1
L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/documentation.txt vendored
View File

@ -94,6 +94,7 @@ DispelBySlot: Removes given amount of target's effects by specified AbnormalType
DispelBySlotMyself: Removes given amount of effects by specified AbnormalType
DispelBySlotProbability: Removes given amount of effects by specified AbnormalType at a given rate.
DoubleCast: Triggers Fire, Water, Wind, Earth stance and enables the ability to cast two skills at once.
DuelistFury: Synergy effect for Faceoff effect. (l2jmobius)
EnableCloak: See/unsee cloaks.
EnemyCharge: Charges towards the enemy. Rush Impact.
EnergyAttack: Physical attack based on Momentum formula. Triple Sonic Slash, Double Sonic Slash etc.

2
L2J_Mobius_2.5_Underground/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_2.5_Underground/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_2.5_Underground/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_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -493,9 +493,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;
@ -11628,7 +11625,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);
}
@ -13964,16 +13961,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_2.5_Underground/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_2.5_Underground/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()
{

1
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java vendored
View File

@ -125,6 +125,7 @@ public final class EffectMasterHandler
EffectHandler.getInstance().registerHandler("DispelBySlotMyself", DispelBySlotMyself::new);
EffectHandler.getInstance().registerHandler("DispelBySlotProbability", DispelBySlotProbability::new);
EffectHandler.getInstance().registerHandler("DoubleCast", DoubleCast::new);
EffectHandler.getInstance().registerHandler("DuelistFury", DuelistFury::new);
EffectHandler.getInstance().registerHandler("EnableCloak", EnableCloak::new);
EffectHandler.getInstance().registerHandler("EnergyAttack", EnergyAttack::new);
EffectHandler.getInstance().registerHandler("EnlargeAbnormalSlot", EnlargeAbnormalSlot::new);

45
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java vendored Normal file
View File

@ -0,0 +1,45 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package handlers.effecthandlers;
import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.effects.AbstractEffect;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
import com.l2jmobius.gameserver.model.skills.Skill;
/**
* @author negaa
*/
public class DuelistFury extends AbstractEffect
{
public DuelistFury(StatsSet params)
{
}
@Override
public long getEffectFlags()
{
return EffectFlag.DUELIST_FURY.getMask();
}
@Override
public boolean canStart(L2Character effector, L2Character effected, Skill skill)
{
return effected.isPlayer();
}
}

14
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java vendored
View File

@ -42,18 +42,4 @@ public class Faceoff extends AbstractEffect
{
return effected.isPlayer();
}
@Override
public void onStart(L2Character effector, L2Character effected, Skill skill)
{
effector.getActingPlayer().setAttackerObjId(effected.getObjectId());
effected.getActingPlayer().setAttackerObjId(effector.getObjectId());
}
@Override
public void onExit(L2Character effector, L2Character effected, Skill skill)
{
effector.getActingPlayer().setAttackerObjId(0);
effected.getActingPlayer().setAttackerObjId(0);
}
}

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

@ -73,7 +73,7 @@ public final class Lethal extends AbstractEffect
return;
}
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.FACEOFF) && (effected.getActingPlayer().getAttackerObjId() != effector.getObjectId()))
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.DUELIST_FURY) && !effector.isAffected(EffectFlag.DUELIST_FURY))
{
return;
}

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

@ -53,7 +53,7 @@ public final class MagicalAttackMp extends AbstractEffect
return false;
}
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.FACEOFF) && (effected.getActingPlayer().getAttackerObjId() != effector.getObjectId()))
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.DUELIST_FURY) && !effector.isAffected(EffectFlag.DUELIST_FURY))
{
return false;
}

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

@ -74,7 +74,7 @@ public final class ModifyVital extends AbstractEffect
return;
}
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.FACEOFF) && (effected.getActingPlayer().getAttackerObjId() != effector.getObjectId()))
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.DUELIST_FURY) && !effector.isAffected(EffectFlag.DUELIST_FURY))
{
return;
}

1
L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10300-10399.xml vendored
View File

@ -854,6 +854,7 @@
<amount>-90</amount>
<slot>DEBUFF</slot>
</effect>
<effect name="DuelistFury" />
</effects>
</skill>
<skill id="10320" toLevel="3" name="Faceoff">

1
L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/documentation.txt vendored
View File

@ -94,6 +94,7 @@ DispelBySlot: Removes given amount of target's effects by specified AbnormalType
DispelBySlotMyself: Removes given amount of effects by specified AbnormalType
DispelBySlotProbability: Removes given amount of effects by specified AbnormalType at a given rate.
DoubleCast: Triggers Fire, Water, Wind, Earth stance and enables the ability to cast two skills at once.
DuelistFury: Synergy effect for Faceoff effect. (l2jmobius)
EnableCloak: See/unsee cloaks.
EnemyCharge: Charges towards the enemy. Rush Impact.
EnergyAttack: Physical attack based on Momentum formula. Triple Sonic Slash, Double Sonic Slash etc.

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()
{

1
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/EffectMasterHandler.java vendored
View File

@ -129,6 +129,7 @@ public final class EffectMasterHandler
EffectHandler.getInstance().registerHandler("DispelBySlotMyself", DispelBySlotMyself::new);
EffectHandler.getInstance().registerHandler("DispelBySlotProbability", DispelBySlotProbability::new);
EffectHandler.getInstance().registerHandler("DoubleCast", DoubleCast::new);
EffectHandler.getInstance().registerHandler("DuelistFury", DuelistFury::new);
EffectHandler.getInstance().registerHandler("EnableCloak", EnableCloak::new);
EffectHandler.getInstance().registerHandler("EnergyAttack", EnergyAttack::new);
EffectHandler.getInstance().registerHandler("EnlargeAbnormalSlot", EnlargeAbnormalSlot::new);

45
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java vendored Normal file
View File

@ -0,0 +1,45 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package handlers.effecthandlers;
import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.effects.AbstractEffect;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
import com.l2jmobius.gameserver.model.skills.Skill;
/**
* @author negaa
*/
public class DuelistFury extends AbstractEffect
{
public DuelistFury(StatsSet params)
{
}
@Override
public long getEffectFlags()
{
return EffectFlag.DUELIST_FURY.getMask();
}
@Override
public boolean canStart(L2Character effector, L2Character effected, Skill skill)
{
return effected.isPlayer();
}
}

14
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java vendored
View File

@ -42,18 +42,4 @@ public class Faceoff extends AbstractEffect
{
return effected.isPlayer();
}
@Override
public void onStart(L2Character effector, L2Character effected, Skill skill)
{
effector.getActingPlayer().setAttackerObjId(effected.getObjectId());
effected.getActingPlayer().setAttackerObjId(effector.getObjectId());
}
@Override
public void onExit(L2Character effector, L2Character effected, Skill skill)
{
effector.getActingPlayer().setAttackerObjId(0);
effected.getActingPlayer().setAttackerObjId(0);
}
}

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

@ -73,7 +73,7 @@ public final class Lethal extends AbstractEffect
return;
}
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.FACEOFF) && (effected.getActingPlayer().getAttackerObjId() != effector.getObjectId()))
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.DUELIST_FURY) && !effector.isAffected(EffectFlag.DUELIST_FURY))
{
return;
}

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

@ -53,7 +53,7 @@ public final class MagicalAttackMp extends AbstractEffect
return false;
}
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.FACEOFF) && (effected.getActingPlayer().getAttackerObjId() != effector.getObjectId()))
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.DUELIST_FURY) && !effector.isAffected(EffectFlag.DUELIST_FURY))
{
return false;
}

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

@ -74,7 +74,7 @@ public final class ModifyVital extends AbstractEffect
return;
}
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.FACEOFF) && (effected.getActingPlayer().getAttackerObjId() != effector.getObjectId()))
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.DUELIST_FURY) && !effector.isAffected(EffectFlag.DUELIST_FURY))
{
return;
}

1
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10300-10399.xml vendored
View File

@ -866,6 +866,7 @@
<amount>-90</amount>
<slot>DEBUFF</slot>
</effect>
<effect name="DuelistFury" />
</effects>
</skill>
<skill id="10320" toLevel="3" name="Faceoff">

1
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/documentation.txt vendored
View File

@ -98,6 +98,7 @@ DispelBySlot: Removes given amount of target's effects by specified AbnormalType
DispelBySlotMyself: Removes given amount of effects by specified AbnormalType
DispelBySlotProbability: Removes given amount of effects by specified AbnormalType at a given rate.
DoubleCast: Triggers Fire, Water, Wind, Earth stance and enables the ability to cast two skills at once.
DuelistFury: Synergy effect for Faceoff effect. (l2jmobius)
EnableCloak: See/unsee cloaks.
EnemyCharge: Charges towards the enemy. Rush Impact.
EnergyAttack: Physical attack based on Momentum formula. Triple Sonic Slash, Double Sonic Slash etc.

2
L2J_Mobius_4.0_GrandCrusade/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_4.0_GrandCrusade/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_4.0_GrandCrusade/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_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -500,9 +500,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;
@ -11621,7 +11618,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);
}
@ -13949,16 +13946,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_4.0_GrandCrusade/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_4.0_GrandCrusade/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()
{

1
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/EffectMasterHandler.java vendored
View File

@ -124,6 +124,7 @@ public final class EffectMasterHandler
EffectHandler.getInstance().registerHandler("DispelBySlotMyself", DispelBySlotMyself::new);
EffectHandler.getInstance().registerHandler("DispelBySlotProbability", DispelBySlotProbability::new);
EffectHandler.getInstance().registerHandler("DoubleCast", DoubleCast::new);
EffectHandler.getInstance().registerHandler("DuelistFury", DuelistFury::new);
EffectHandler.getInstance().registerHandler("EnableCloak", EnableCloak::new);
EffectHandler.getInstance().registerHandler("EnergyAttack", EnergyAttack::new);
EffectHandler.getInstance().registerHandler("EnlargeAbnormalSlot", EnlargeAbnormalSlot::new);

45
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java vendored Normal file
View File

@ -0,0 +1,45 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package handlers.effecthandlers;
import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.effects.AbstractEffect;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
import com.l2jmobius.gameserver.model.skills.Skill;
/**
* @author negaa
*/
public class DuelistFury extends AbstractEffect
{
public DuelistFury(StatsSet params)
{
}
@Override
public long getEffectFlags()
{
return EffectFlag.DUELIST_FURY.getMask();
}
@Override
public boolean canStart(L2Character effector, L2Character effected, Skill skill)
{
return effected.isPlayer();
}
}

14
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java vendored
View File

@ -42,18 +42,4 @@ public class Faceoff extends AbstractEffect
{
return effected.isPlayer();
}
@Override
public void onStart(L2Character effector, L2Character effected, Skill skill)
{
effector.getActingPlayer().setAttackerObjId(effected.getObjectId());
effected.getActingPlayer().setAttackerObjId(effector.getObjectId());
}
@Override
public void onExit(L2Character effector, L2Character effected, Skill skill)
{
effector.getActingPlayer().setAttackerObjId(0);
effected.getActingPlayer().setAttackerObjId(0);
}
}

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

@ -73,7 +73,7 @@ public final class Lethal extends AbstractEffect
return;
}
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.FACEOFF) && (effected.getActingPlayer().getAttackerObjId() != effector.getObjectId()))
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.DUELIST_FURY) && !effector.isAffected(EffectFlag.DUELIST_FURY))
{
return;
}

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

@ -53,7 +53,7 @@ public final class MagicalAttackMp extends AbstractEffect
return false;
}
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.FACEOFF) && (effected.getActingPlayer().getAttackerObjId() != effector.getObjectId()))
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.DUELIST_FURY) && !effector.isAffected(EffectFlag.DUELIST_FURY))
{
return false;
}

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

@ -74,7 +74,7 @@ public final class ModifyVital extends AbstractEffect
return;
}
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.FACEOFF) && (effected.getActingPlayer().getAttackerObjId() != effector.getObjectId()))
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.DUELIST_FURY) && !effector.isAffected(EffectFlag.DUELIST_FURY))
{
return;
}

1
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/documentation.txt vendored
View File

@ -93,6 +93,7 @@ DispelBySlot: Removes given amount of target's effects by specified AbnormalType
DispelBySlotMyself: Removes given amount of effects by specified AbnormalType
DispelBySlotProbability: Removes given amount of effects by specified AbnormalType at a given rate.
DoubleCast: Triggers Fire, Water, Wind, Earth stance and enables the ability to cast two skills at once.
DuelistFury: Synergy effect for Faceoff effect. (l2jmobius)
EnableCloak: See/unsee cloaks.
EnemyCharge: Charges towards the enemy. Rush Impact.
EnergyAttack: Physical attack based on Momentum formula. Triple Sonic Slash, Double Sonic Slash etc.

2
L2J_Mobius_Classic_2.0_Saviors/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_Classic_2.0_Saviors/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_Classic_2.0_Saviors/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_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -490,9 +490,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;
@ -11469,7 +11466,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);
}
@ -13806,16 +13803,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_Classic_2.0_Saviors/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_Classic_2.0_Saviors/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()
{

1
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/EffectMasterHandler.java vendored
View File

@ -124,6 +124,7 @@ public final class EffectMasterHandler
EffectHandler.getInstance().registerHandler("DispelBySlotMyself", DispelBySlotMyself::new);
EffectHandler.getInstance().registerHandler("DispelBySlotProbability", DispelBySlotProbability::new);
EffectHandler.getInstance().registerHandler("DoubleCast", DoubleCast::new);
EffectHandler.getInstance().registerHandler("DuelistFury", DuelistFury::new);
EffectHandler.getInstance().registerHandler("EnableCloak", EnableCloak::new);
EffectHandler.getInstance().registerHandler("EnergyAttack", EnergyAttack::new);
EffectHandler.getInstance().registerHandler("EnlargeAbnormalSlot", EnlargeAbnormalSlot::new);

45
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java vendored Normal file
View File

@ -0,0 +1,45 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package handlers.effecthandlers;
import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.effects.AbstractEffect;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
import com.l2jmobius.gameserver.model.skills.Skill;
/**
* @author negaa
*/
public class DuelistFury extends AbstractEffect
{
public DuelistFury(StatsSet params)
{
}
@Override
public long getEffectFlags()
{
return EffectFlag.DUELIST_FURY.getMask();
}
@Override
public boolean canStart(L2Character effector, L2Character effected, Skill skill)
{
return effected.isPlayer();
}
}

14
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java vendored
View File

@ -42,18 +42,4 @@ public class Faceoff extends AbstractEffect
{
return effected.isPlayer();
}
@Override
public void onStart(L2Character effector, L2Character effected, Skill skill)
{
effector.getActingPlayer().setAttackerObjId(effected.getObjectId());
effected.getActingPlayer().setAttackerObjId(effector.getObjectId());
}
@Override
public void onExit(L2Character effector, L2Character effected, Skill skill)
{
effector.getActingPlayer().setAttackerObjId(0);
effected.getActingPlayer().setAttackerObjId(0);
}
}

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

@ -73,7 +73,7 @@ public final class Lethal extends AbstractEffect
return;
}
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.FACEOFF) && (effected.getActingPlayer().getAttackerObjId() != effector.getObjectId()))
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.DUELIST_FURY) && !effector.isAffected(EffectFlag.DUELIST_FURY))
{
return;
}

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

@ -53,7 +53,7 @@ public final class MagicalAttackMp extends AbstractEffect
return false;
}
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.FACEOFF) && (effected.getActingPlayer().getAttackerObjId() != effector.getObjectId()))
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.DUELIST_FURY) && !effector.isAffected(EffectFlag.DUELIST_FURY))
{
return false;
}

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

@ -74,7 +74,7 @@ public final class ModifyVital extends AbstractEffect
return;
}
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.FACEOFF) && (effected.getActingPlayer().getAttackerObjId() != effector.getObjectId()))
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.DUELIST_FURY) && !effector.isAffected(EffectFlag.DUELIST_FURY))
{
return;
}

1
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/documentation.txt vendored
View File

@ -93,6 +93,7 @@ DispelBySlot: Removes given amount of target's effects by specified AbnormalType
DispelBySlotMyself: Removes given amount of effects by specified AbnormalType
DispelBySlotProbability: Removes given amount of effects by specified AbnormalType at a given rate.
DoubleCast: Triggers Fire, Water, Wind, Earth stance and enables the ability to cast two skills at once.
DuelistFury: Synergy effect for Faceoff effect. (l2jmobius)
EnableCloak: See/unsee cloaks.
EnemyCharge: Charges towards the enemy. Rush Impact.
EnergyAttack: Physical attack based on Momentum formula. Triple Sonic Slash, Double Sonic Slash etc.

2
L2J_Mobius_Classic_2.1_Zaken/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_Classic_2.1_Zaken/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_Classic_2.1_Zaken/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_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -490,9 +490,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;
@ -11469,7 +11466,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);
}
@ -13806,16 +13803,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_Classic_2.1_Zaken/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_Classic_2.1_Zaken/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()
{

1
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/EffectMasterHandler.java vendored
View File

@ -124,6 +124,7 @@ public final class EffectMasterHandler
EffectHandler.getInstance().registerHandler("DispelBySlotMyself", DispelBySlotMyself::new);
EffectHandler.getInstance().registerHandler("DispelBySlotProbability", DispelBySlotProbability::new);
EffectHandler.getInstance().registerHandler("DoubleCast", DoubleCast::new);
EffectHandler.getInstance().registerHandler("DuelistFury", DuelistFury::new);
EffectHandler.getInstance().registerHandler("EnableCloak", EnableCloak::new);
EffectHandler.getInstance().registerHandler("EnergyAttack", EnergyAttack::new);
EffectHandler.getInstance().registerHandler("EnlargeAbnormalSlot", EnlargeAbnormalSlot::new);

45
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java vendored Normal file
View File

@ -0,0 +1,45 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package handlers.effecthandlers;
import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.effects.AbstractEffect;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
import com.l2jmobius.gameserver.model.skills.Skill;
/**
* @author negaa
*/
public class DuelistFury extends AbstractEffect
{
public DuelistFury(StatsSet params)
{
}
@Override
public long getEffectFlags()
{
return EffectFlag.DUELIST_FURY.getMask();
}
@Override
public boolean canStart(L2Character effector, L2Character effected, Skill skill)
{
return effected.isPlayer();
}
}

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

@ -42,18 +42,4 @@ public class Faceoff extends AbstractEffect
{
return effected.isPlayer();
}
@Override
public void onStart(L2Character effector, L2Character effected, Skill skill)
{
effector.getActingPlayer().setAttackerObjId(effected.getObjectId());
effected.getActingPlayer().setAttackerObjId(effector.getObjectId());
}
@Override
public void onExit(L2Character effector, L2Character effected, Skill skill)
{
effector.getActingPlayer().setAttackerObjId(0);
effected.getActingPlayer().setAttackerObjId(0);
}
}

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

@ -73,7 +73,7 @@ public final class Lethal extends AbstractEffect
return;
}
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.FACEOFF) && (effected.getActingPlayer().getAttackerObjId() != effector.getObjectId()))
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.DUELIST_FURY) && !effector.isAffected(EffectFlag.DUELIST_FURY))
{
return;
}

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

@ -53,7 +53,7 @@ public final class MagicalAttackMp extends AbstractEffect
return false;
}
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.FACEOFF) && (effected.getActingPlayer().getAttackerObjId() != effector.getObjectId()))
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.DUELIST_FURY) && !effector.isAffected(EffectFlag.DUELIST_FURY))
{
return false;
}

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

@ -74,7 +74,7 @@ public final class ModifyVital extends AbstractEffect
return;
}
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.FACEOFF) && (effected.getActingPlayer().getAttackerObjId() != effector.getObjectId()))
if (effector.isPlayer() && effected.isPlayer() && effected.isAffected(EffectFlag.DUELIST_FURY) && !effector.isAffected(EffectFlag.DUELIST_FURY))
{
return;
}

1
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/documentation.txt vendored
View File

@ -93,6 +93,7 @@ DispelBySlot: Removes given amount of target's effects by specified AbnormalType
DispelBySlotMyself: Removes given amount of effects by specified AbnormalType
DispelBySlotProbability: Removes given amount of effects by specified AbnormalType at a given rate.
DoubleCast: Triggers Fire, Water, Wind, Earth stance and enables the ability to cast two skills at once.
DuelistFury: Synergy effect for Faceoff effect. (l2jmobius)
EnableCloak: See/unsee cloaks.
EnemyCharge: Charges towards the enemy. Rush Impact.
EnergyAttack: Physical attack based on Momentum formula. Triple Sonic Slash, Double Sonic Slash etc.

2
L2J_Mobius_Classic_2.2_Antharas/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_Classic_2.2_Antharas/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_Classic_2.2_Antharas/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_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -490,9 +490,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;
@ -11471,7 +11468,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);
}
@ -13810,16 +13807,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_Classic_2.2_Antharas/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_Classic_2.2_Antharas/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()
{