From 86d473239a484e82f71ccf5ee8427fe75a0cf404 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 28 Mar 2019 13:17:45 +0000 Subject: [PATCH] Mentor Guide improvements. Contributed by champzix1. --- .../game/data/scripts/ai/others/MentorGuide/MentorGuide.java | 5 +---- .../game/data/scripts/ai/others/MentorGuide/MentorGuide.java | 5 +---- .../game/data/scripts/ai/others/MentorGuide/MentorGuide.java | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java index ce6e3bd57b..9ddcd66a0f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java @@ -34,7 +34,6 @@ import com.l2jmobius.gameserver.instancemanager.MentorManager; import com.l2jmobius.gameserver.model.Mentee; import com.l2jmobius.gameserver.model.actor.Npc; import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import com.l2jmobius.gameserver.model.base.ClassLevel; import com.l2jmobius.gameserver.model.entity.Message; import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.ListenerRegisterType; @@ -83,10 +82,8 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader { new SkillHolder(9227, 1), // Mentor's Poem of Horn new SkillHolder(9228, 1), // Mentor's Poem of Drum - new SkillHolder(9229, 1), // Mentor's Poem of Lute new SkillHolder(9230, 1), // Mentor's Poem of Organ new SkillHolder(9231, 1), // Mentor's Poem of Guitar - new SkillHolder(9232, 1), // Mentor's Poem of Harp new SkillHolder(17082, 1), // Mentor's Prevailing Sonata new SkillHolder(17083, 1), // Mentor's Daring Sonata new SkillHolder(17084, 1), // Mentor's Refreshing Sonata @@ -151,7 +148,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader if (event.equalsIgnoreCase("exchange")) { - if (hasQuestItems(player, MENTEE_CERT) && (player.getLevel() >= MAX_LEVEL) && (player.getClassId().level() == ClassLevel.AWAKEN.ordinal())) + if (hasQuestItems(player, MENTEE_CERT) && (player.getLevel() >= MAX_LEVEL) && player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { takeItems(player, MENTEE_CERT, 1); giveItems(player, DIPLOMA, 40); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java index ce6e3bd57b..9ddcd66a0f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java @@ -34,7 +34,6 @@ import com.l2jmobius.gameserver.instancemanager.MentorManager; import com.l2jmobius.gameserver.model.Mentee; import com.l2jmobius.gameserver.model.actor.Npc; import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import com.l2jmobius.gameserver.model.base.ClassLevel; import com.l2jmobius.gameserver.model.entity.Message; import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.ListenerRegisterType; @@ -83,10 +82,8 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader { new SkillHolder(9227, 1), // Mentor's Poem of Horn new SkillHolder(9228, 1), // Mentor's Poem of Drum - new SkillHolder(9229, 1), // Mentor's Poem of Lute new SkillHolder(9230, 1), // Mentor's Poem of Organ new SkillHolder(9231, 1), // Mentor's Poem of Guitar - new SkillHolder(9232, 1), // Mentor's Poem of Harp new SkillHolder(17082, 1), // Mentor's Prevailing Sonata new SkillHolder(17083, 1), // Mentor's Daring Sonata new SkillHolder(17084, 1), // Mentor's Refreshing Sonata @@ -151,7 +148,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader if (event.equalsIgnoreCase("exchange")) { - if (hasQuestItems(player, MENTEE_CERT) && (player.getLevel() >= MAX_LEVEL) && (player.getClassId().level() == ClassLevel.AWAKEN.ordinal())) + if (hasQuestItems(player, MENTEE_CERT) && (player.getLevel() >= MAX_LEVEL) && player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { takeItems(player, MENTEE_CERT, 1); giveItems(player, DIPLOMA, 40); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java index ce6e3bd57b..9ddcd66a0f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java @@ -34,7 +34,6 @@ import com.l2jmobius.gameserver.instancemanager.MentorManager; import com.l2jmobius.gameserver.model.Mentee; import com.l2jmobius.gameserver.model.actor.Npc; import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import com.l2jmobius.gameserver.model.base.ClassLevel; import com.l2jmobius.gameserver.model.entity.Message; import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.ListenerRegisterType; @@ -83,10 +82,8 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader { new SkillHolder(9227, 1), // Mentor's Poem of Horn new SkillHolder(9228, 1), // Mentor's Poem of Drum - new SkillHolder(9229, 1), // Mentor's Poem of Lute new SkillHolder(9230, 1), // Mentor's Poem of Organ new SkillHolder(9231, 1), // Mentor's Poem of Guitar - new SkillHolder(9232, 1), // Mentor's Poem of Harp new SkillHolder(17082, 1), // Mentor's Prevailing Sonata new SkillHolder(17083, 1), // Mentor's Daring Sonata new SkillHolder(17084, 1), // Mentor's Refreshing Sonata @@ -151,7 +148,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader if (event.equalsIgnoreCase("exchange")) { - if (hasQuestItems(player, MENTEE_CERT) && (player.getLevel() >= MAX_LEVEL) && (player.getClassId().level() == ClassLevel.AWAKEN.ordinal())) + if (hasQuestItems(player, MENTEE_CERT) && (player.getLevel() >= MAX_LEVEL) && player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { takeItems(player, MENTEE_CERT, 1); giveItems(player, DIPLOMA, 40);