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

Addition of ReplaceSkillBySkill canStart transformation condition.

Browse Source 
Thanks to Liamxroy.
This commit is contained in:
MobiusDevelopment
2022-10-15 21:40:37 +00:00
parent 257ffff881
commit ba09d61dc4
11 changed files with 345 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java vendored
View File

@@ -45,9 +45,13 @@ public class ReplaceSkillBySkill extends AbstractEffect
}
@Override
public void onStart(Creature effector, Creature effected, Skill skill, Item item)
public boolean canStart(Creature effector, Creature effected, Skill skill)
{
if (effected.isPlayer())
return effected.isPlayer() && !effected.isTransformed();
}
@Override
public void onStart(Creature effector, Creature effected, Skill skill, Item item)
{
final Player player = effected.getActingPlayer();
final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
@@ -77,7 +81,6 @@ public class ReplaceSkillBySkill extends AbstractEffect
player.sendSkillList();
ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
}
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)

9
L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java vendored
View File

@@ -45,9 +45,13 @@ public class ReplaceSkillBySkill extends AbstractEffect
}
@Override
public void onStart(Creature effector, Creature effected, Skill skill, Item item)
public boolean canStart(Creature effector, Creature effected, Skill skill)
{
if (effected.isPlayer())
return effected.isPlayer() && !effected.isTransformed();
}
@Override
public void onStart(Creature effector, Creature effected, Skill skill, Item item)
{
final Player player = effected.getActingPlayer();
final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
@@ -77,7 +81,6 @@ public class ReplaceSkillBySkill extends AbstractEffect
player.sendSkillList();
ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
}
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)

9
L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java vendored
View File

@@ -45,9 +45,13 @@ public class ReplaceSkillBySkill extends AbstractEffect
}
@Override
public void onStart(Creature effector, Creature effected, Skill skill, Item item)
public boolean canStart(Creature effector, Creature effected, Skill skill)
{
if (effected.isPlayer())
return effected.isPlayer() && !effected.isTransformed();
}
@Override
public void onStart(Creature effector, Creature effected, Skill skill, Item item)
{
final Player player = effected.getActingPlayer();
final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
@@ -77,7 +81,6 @@ public class ReplaceSkillBySkill extends AbstractEffect
player.sendSkillList();
ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
}
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)

9
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java vendored
View File

@@ -45,9 +45,13 @@ public class ReplaceSkillBySkill extends AbstractEffect
}
@Override
public void onStart(Creature effector, Creature effected, Skill skill, Item item)
public boolean canStart(Creature effector, Creature effected, Skill skill)
{
if (effected.isPlayer())
return effected.isPlayer() && !effected.isTransformed();
}
@Override
public void onStart(Creature effector, Creature effected, Skill skill, Item item)
{
final Player player = effected.getActingPlayer();
final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
@@ -77,7 +81,6 @@ public class ReplaceSkillBySkill extends AbstractEffect
player.sendSkillList();
ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
}
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)

9
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java vendored
View File

@@ -45,9 +45,13 @@ public class ReplaceSkillBySkill extends AbstractEffect
}
@Override
public void onStart(Creature effector, Creature effected, Skill skill, Item item)
public boolean canStart(Creature effector, Creature effected, Skill skill)
{
if (effected.isPlayer())
return effected.isPlayer() && !effected.isTransformed();
}
@Override
public void onStart(Creature effector, Creature effected, Skill skill, Item item)
{
final Player player = effected.getActingPlayer();
final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
@@ -77,7 +81,6 @@ public class ReplaceSkillBySkill extends AbstractEffect
player.sendSkillList();
ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
}
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)

9
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java vendored
View File

@@ -45,9 +45,13 @@ public class ReplaceSkillBySkill extends AbstractEffect
}
@Override
public void onStart(Creature effector, Creature effected, Skill skill, Item item)
public boolean canStart(Creature effector, Creature effected, Skill skill)
{
if (effected.isPlayer())
return effected.isPlayer() && !effected.isTransformed();
}
@Override
public void onStart(Creature effector, Creature effected, Skill skill, Item item)
{
final Player player = effected.getActingPlayer();
final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
@@ -77,7 +81,6 @@ public class ReplaceSkillBySkill extends AbstractEffect
player.sendSkillList();
ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
}
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)

9
L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java vendored
View File

@@ -45,9 +45,13 @@ public class ReplaceSkillBySkill extends AbstractEffect
}
@Override
public void onStart(Creature effector, Creature effected, Skill skill, Item item)
public boolean canStart(Creature effector, Creature effected, Skill skill)
{
if (effected.isPlayer())
return effected.isPlayer() && !effected.isTransformed();
}
@Override
public void onStart(Creature effector, Creature effected, Skill skill, Item item)
{
final Player player = effected.getActingPlayer();
final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
@@ -77,7 +81,6 @@ public class ReplaceSkillBySkill extends AbstractEffect
player.sendSkillList();
ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
}
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)

10
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java vendored
View File

@@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.AbnormalType;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
@@ -45,9 +46,13 @@ public class ReplaceSkillBySkill extends AbstractEffect
}
@Override
public void onStart(Creature effector, Creature effected, Skill skill, Item item)
public boolean canStart(Creature effector, Creature effected, Skill skill)
{
if (effected.isPlayer())
return effected.isPlayer() && (!effected.isTransformed() || effected.hasAbnormalType(AbnormalType.KAMAEL_TRANSFORM));
}
@Override
public void onStart(Creature effector, Creature effected, Skill skill, Item item)
{
final Player player = effected.getActingPlayer();
final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
@@ -77,7 +82,6 @@ public class ReplaceSkillBySkill extends AbstractEffect
player.sendSkillList();
ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
}
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)

10
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java vendored
View File

@@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.AbnormalType;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
@@ -45,9 +46,13 @@ public class ReplaceSkillBySkill extends AbstractEffect
}
@Override
public void onStart(Creature effector, Creature effected, Skill skill, Item item)
public boolean canStart(Creature effector, Creature effected, Skill skill)
{
if (effected.isPlayer())
return effected.isPlayer() && (!effected.isTransformed() || effected.hasAbnormalType(AbnormalType.KAMAEL_TRANSFORM));
}
@Override
public void onStart(Creature effector, Creature effected, Skill skill, Item item)
{
final Player player = effected.getActingPlayer();
final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
@@ -77,7 +82,6 @@ public class ReplaceSkillBySkill extends AbstractEffect
player.sendSkillList();
ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
}
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)

10
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java vendored
View File

@@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.AbnormalType;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
@@ -45,9 +46,13 @@ public class ReplaceSkillBySkill extends AbstractEffect
}
@Override
public void onStart(Creature effector, Creature effected, Skill skill, Item item)
public boolean canStart(Creature effector, Creature effected, Skill skill)
{
if (effected.isPlayer())
return effected.isPlayer() && (!effected.isTransformed() || effected.hasAbnormalType(AbnormalType.KAMAEL_TRANSFORM));
}
@Override
public void onStart(Creature effector, Creature effected, Skill skill, Item item)
{
final Player player = effected.getActingPlayer();
final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
@@ -77,7 +82,6 @@ public class ReplaceSkillBySkill extends AbstractEffect
player.sendSkillList();
ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
}
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)

10
L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java vendored
View File

@@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.AbnormalType;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
@@ -45,9 +46,13 @@ public class ReplaceSkillBySkill extends AbstractEffect
}
@Override
public void onStart(Creature effector, Creature effected, Skill skill, Item item)
public boolean canStart(Creature effector, Creature effected, Skill skill)
{
if (effected.isPlayer())
return effected.isPlayer() && (!effected.isTransformed() || effected.hasAbnormalType(AbnormalType.KAMAEL_TRANSFORM));
}
@Override
public void onStart(Creature effector, Creature effected, Skill skill, Item item)
{
final Player player = effected.getActingPlayer();
final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
@@ -77,7 +82,6 @@ public class ReplaceSkillBySkill extends AbstractEffect
player.sendSkillList();
ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
}
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)