From 955c2eff68e5f57b42f246f144591810c004ccdc Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 5 Apr 2019 17:13:50 +0000 Subject: [PATCH] Monk of Chaos should remove any level of revelation skill. --- .../ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java | 7 ++----- .../ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java | 7 ++----- .../ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java | 7 ++----- .../ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java | 7 ++----- .../ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java | 7 ++----- .../ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java | 7 ++----- .../ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java | 7 ++----- 7 files changed, 14 insertions(+), 35 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java index 68a28142c2..3096420220 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java @@ -18,7 +18,6 @@ package ai.areas.TalkingIsland.MonkOfChaos; import java.util.List; -import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import com.l2jmobius.gameserver.enums.CategoryType; import com.l2jmobius.gameserver.enums.SubclassType; @@ -26,7 +25,6 @@ import com.l2jmobius.gameserver.model.SkillLearn; import com.l2jmobius.gameserver.model.actor.Npc; import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import com.l2jmobius.gameserver.model.base.AcquireSkillType; -import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.variables.PlayerVariables; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; @@ -154,10 +152,9 @@ public final class MonkOfChaos extends AbstractNpcAI for (String varName : varNames) { final int skillId = player.getVariables().getInt(varName, 0); - final Skill sk = SkillData.getInstance().getSkill(skillId, 1); - if (sk != null) + if (skillId > 0) { - player.removeSkill(sk); + player.removeSkill(skillId); player.getVariables().remove(varName); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java index 68a28142c2..3096420220 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java @@ -18,7 +18,6 @@ package ai.areas.TalkingIsland.MonkOfChaos; import java.util.List; -import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import com.l2jmobius.gameserver.enums.CategoryType; import com.l2jmobius.gameserver.enums.SubclassType; @@ -26,7 +25,6 @@ import com.l2jmobius.gameserver.model.SkillLearn; import com.l2jmobius.gameserver.model.actor.Npc; import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import com.l2jmobius.gameserver.model.base.AcquireSkillType; -import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.variables.PlayerVariables; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; @@ -154,10 +152,9 @@ public final class MonkOfChaos extends AbstractNpcAI for (String varName : varNames) { final int skillId = player.getVariables().getInt(varName, 0); - final Skill sk = SkillData.getInstance().getSkill(skillId, 1); - if (sk != null) + if (skillId > 0) { - player.removeSkill(sk); + player.removeSkill(skillId); player.getVariables().remove(varName); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java index 68a28142c2..3096420220 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java @@ -18,7 +18,6 @@ package ai.areas.TalkingIsland.MonkOfChaos; import java.util.List; -import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import com.l2jmobius.gameserver.enums.CategoryType; import com.l2jmobius.gameserver.enums.SubclassType; @@ -26,7 +25,6 @@ import com.l2jmobius.gameserver.model.SkillLearn; import com.l2jmobius.gameserver.model.actor.Npc; import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import com.l2jmobius.gameserver.model.base.AcquireSkillType; -import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.variables.PlayerVariables; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; @@ -154,10 +152,9 @@ public final class MonkOfChaos extends AbstractNpcAI for (String varName : varNames) { final int skillId = player.getVariables().getInt(varName, 0); - final Skill sk = SkillData.getInstance().getSkill(skillId, 1); - if (sk != null) + if (skillId > 0) { - player.removeSkill(sk); + player.removeSkill(skillId); player.getVariables().remove(varName); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java index 68a28142c2..3096420220 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java @@ -18,7 +18,6 @@ package ai.areas.TalkingIsland.MonkOfChaos; import java.util.List; -import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import com.l2jmobius.gameserver.enums.CategoryType; import com.l2jmobius.gameserver.enums.SubclassType; @@ -26,7 +25,6 @@ import com.l2jmobius.gameserver.model.SkillLearn; import com.l2jmobius.gameserver.model.actor.Npc; import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import com.l2jmobius.gameserver.model.base.AcquireSkillType; -import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.variables.PlayerVariables; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; @@ -154,10 +152,9 @@ public final class MonkOfChaos extends AbstractNpcAI for (String varName : varNames) { final int skillId = player.getVariables().getInt(varName, 0); - final Skill sk = SkillData.getInstance().getSkill(skillId, 1); - if (sk != null) + if (skillId > 0) { - player.removeSkill(sk); + player.removeSkill(skillId); player.getVariables().remove(varName); } } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java index 68a28142c2..3096420220 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java @@ -18,7 +18,6 @@ package ai.areas.TalkingIsland.MonkOfChaos; import java.util.List; -import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import com.l2jmobius.gameserver.enums.CategoryType; import com.l2jmobius.gameserver.enums.SubclassType; @@ -26,7 +25,6 @@ import com.l2jmobius.gameserver.model.SkillLearn; import com.l2jmobius.gameserver.model.actor.Npc; import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import com.l2jmobius.gameserver.model.base.AcquireSkillType; -import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.variables.PlayerVariables; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; @@ -154,10 +152,9 @@ public final class MonkOfChaos extends AbstractNpcAI for (String varName : varNames) { final int skillId = player.getVariables().getInt(varName, 0); - final Skill sk = SkillData.getInstance().getSkill(skillId, 1); - if (sk != null) + if (skillId > 0) { - player.removeSkill(sk); + player.removeSkill(skillId); player.getVariables().remove(varName); } } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java index 68a28142c2..3096420220 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java @@ -18,7 +18,6 @@ package ai.areas.TalkingIsland.MonkOfChaos; import java.util.List; -import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import com.l2jmobius.gameserver.enums.CategoryType; import com.l2jmobius.gameserver.enums.SubclassType; @@ -26,7 +25,6 @@ import com.l2jmobius.gameserver.model.SkillLearn; import com.l2jmobius.gameserver.model.actor.Npc; import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import com.l2jmobius.gameserver.model.base.AcquireSkillType; -import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.variables.PlayerVariables; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; @@ -154,10 +152,9 @@ public final class MonkOfChaos extends AbstractNpcAI for (String varName : varNames) { final int skillId = player.getVariables().getInt(varName, 0); - final Skill sk = SkillData.getInstance().getSkill(skillId, 1); - if (sk != null) + if (skillId > 0) { - player.removeSkill(sk); + player.removeSkill(skillId); player.getVariables().remove(varName); } } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java index 68a28142c2..3096420220 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java @@ -18,7 +18,6 @@ package ai.areas.TalkingIsland.MonkOfChaos; import java.util.List; -import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import com.l2jmobius.gameserver.enums.CategoryType; import com.l2jmobius.gameserver.enums.SubclassType; @@ -26,7 +25,6 @@ import com.l2jmobius.gameserver.model.SkillLearn; import com.l2jmobius.gameserver.model.actor.Npc; import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import com.l2jmobius.gameserver.model.base.AcquireSkillType; -import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.variables.PlayerVariables; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; @@ -154,10 +152,9 @@ public final class MonkOfChaos extends AbstractNpcAI for (String varName : varNames) { final int skillId = player.getVariables().getInt(varName, 0); - final Skill sk = SkillData.getInstance().getSkill(skillId, 1); - if (sk != null) + if (skillId > 0) { - player.removeSkill(sk); + player.removeSkill(skillId); player.getVariables().remove(varName); } }