BETA: Removing old Antharas from quest.

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java

@@ -31,27 +31,24 @@ import com.l2jserver.gameserver.util.Util;
  * Dragon Trophy - Antharas (904)
  * @author Zoey76
  */
-public class Q00904_DragonTrophyAntharas extends Quest
+public final class Q00904_DragonTrophyAntharas extends Quest
 {
 	// NPC
 	private static final int THEODRIC = 30755;
-	// Monsters
-	private static final int ANTHARAS_OLD = 29019;
-	private static final int ANTHARAS_WEAK = 29066;
-	private static final int ANTHARAS_NORMAL = 29067;
-	private static final int ANTHARAS_STRONG = 29068;
+	// Monster
+	private static final int ANTHARAS = 29068;
 	// Items
 	private static final int MEDAL_OF_GLORY = 21874;
 	private static final int PORTAL_STONE = 3865;
 	// Misc
 	private static final int MIN_LEVEL = 84;
 	
-	private Q00904_DragonTrophyAntharas(int questId, String name, String descr)
+	private Q00904_DragonTrophyAntharas()
 	{
-		super(questId, name, descr);
+		super(904, Q00904_DragonTrophyAntharas.class.getSimpleName(), "Dragon Trophy - Antharas");
 		addStartNpc(THEODRIC);
 		addTalkId(THEODRIC);
-		addKillId(ANTHARAS_OLD, ANTHARAS_WEAK, ANTHARAS_NORMAL, ANTHARAS_STRONG);
+		addKillId(ANTHARAS);
 	}
 	
 	@Override
@@ -67,7 +64,7 @@ public class Q00904_DragonTrophyAntharas extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return null;
@@ -105,12 +102,7 @@ public class Q00904_DragonTrophyAntharas extends Quest
 	@Override
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
-		if (st == null)
-		{
-			return getNoQuestMsg(player);
-		}
-		
+		final QuestState st = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
 		switch (st.getState())
 		{
@@ -180,6 +172,6 @@ public class Q00904_DragonTrophyAntharas extends Quest
 	
 	public static void main(String[] args)
 	{
-		new Q00904_DragonTrophyAntharas(904, Q00904_DragonTrophyAntharas.class.getSimpleName(), "Dragon Trophy - Antharas");
+		new Q00904_DragonTrophyAntharas();
 	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java

@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.util.Util;
  * Land Dragon Conqueror (10290)
  * @author malyelfik
  */
-public class Q10290_LandDragonConqueror extends Quest
+public final class Q10290_LandDragonConqueror extends Quest
 {
 	public class RewardCheck implements IL2Procedure<L2PcInstance>
 	{
@@ -61,25 +61,20 @@ public class Q10290_LandDragonConqueror extends Quest
 	
 	// NPC
 	private static final int THEODRIC = 30755;
-	
-	private static final int[] ANTHARAS =
-	{
-		29019, // Old
-		29066, // Weak
-		29067, // Normal
-		29068
-	// Strong
-	};
+	// Monster
+	private static final int ANTHARAS = 29068;
 	// Items
 	private static final int PORTAL_STONE = 3865;
 	private static final int SHABBY_NECKLACE = 15522;
 	private static final int MIRACLE_NECKLACE = 15523;
-	
+	// Reward
 	private static final int ANTHARAS_SLAYER_CIRCLET = 8568;
+	// Misc
+	private static final int MIN_LEVEL = 83;
 	
-	public Q10290_LandDragonConqueror(int questId, String name, String descr)
+	private Q10290_LandDragonConqueror()
 	{
-		super(questId, name, descr);
+		super(10290, Q10290_LandDragonConqueror.class.getSimpleName(), "Land Dragon Conqueror");
 		addStartNpc(THEODRIC);
 		addTalkId(THEODRIC);
 		addKillId(ANTHARAS);
@@ -89,7 +84,7 @@ public class Q10290_LandDragonConqueror extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return getNoQuestMsg(player);
@@ -100,7 +95,6 @@ public class Q10290_LandDragonConqueror extends Quest
 			st.startQuest();
 			st.giveItems(SHABBY_NECKLACE, 1);
 		}
-		
 		return event;
 	}
 	
@@ -121,26 +115,19 @@ public class Q10290_LandDragonConqueror extends Quest
 		{
 			player.getParty().forEachMember(new RewardCheck(npc));
 		}
-		
 		return super.onKill(npc, player, isSummon);
 	}
 	
 	@Override
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
+		final QuestState st = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
-		final QuestState st = player.getQuestState(getName());
-		
-		if (st == null)
-		{
-			return htmltext;
-		}
-		
 		switch (st.getState())
 		{
 			case State.CREATED:
 			{
-				if (player.getLevel() < 83)
+				if (player.getLevel() < MIN_LEVEL)
 				{
 					htmltext = "30755-00.htm";
 				}
@@ -180,12 +167,11 @@ public class Q10290_LandDragonConqueror extends Quest
 				break;
 			}
 		}
-		
 		return htmltext;
 	}
 	
 	public static void main(String[] args)
 	{
-		new Q10290_LandDragonConqueror(10290, Q10290_LandDragonConqueror.class.getSimpleName(), "Land Dragon Conqueror");
+		new Q10290_LandDragonConqueror();
 	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java

@@ -30,15 +30,12 @@ import com.l2jserver.gameserver.util.Util;
  * Jewel of Antharas (10504)
  * @author Zoey76
  */
-public class Q10504_JewelOfAntharas extends Quest
+public final class Q10504_JewelOfAntharas extends Quest
 {
 	// NPC
 	private static final int THEODRIC = 30755;
-	// Monsters
-	private static final int ANTHARAS_OLD = 29019;
-	private static final int ANTHARAS_WEAK = 29066;
-	private static final int ANTHARAS_NORMAL = 29067;
-	private static final int ANTHARAS_STRONG = 29068;
+	// Monster
+	private static final int ANTHARAS = 29068;
 	// Items
 	private static final int CLEAR_CRYSTAL = 21905;
 	private static final int FILLED_CRYSTAL_ANTHARAS_ENERGY = 21907;
@@ -47,12 +44,12 @@ public class Q10504_JewelOfAntharas extends Quest
 	// Misc
 	private static final int MIN_LEVEL = 84;
 	
-	private Q10504_JewelOfAntharas(int questId, String name, String descr)
+	private Q10504_JewelOfAntharas()
 	{
-		super(questId, name, descr);
+		super(10504, Q10504_JewelOfAntharas.class.getSimpleName(), "Jewel of Antharas");
 		addStartNpc(THEODRIC);
 		addTalkId(THEODRIC);
-		addKillId(ANTHARAS_OLD, ANTHARAS_WEAK, ANTHARAS_NORMAL, ANTHARAS_STRONG);
+		addKillId(ANTHARAS);
 		registerQuestItems(CLEAR_CRYSTAL, FILLED_CRYSTAL_ANTHARAS_ENERGY);
 	}
 	
@@ -72,7 +69,7 @@ public class Q10504_JewelOfAntharas extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return null;
@@ -111,12 +108,7 @@ public class Q10504_JewelOfAntharas extends Quest
 	@Override
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
-		if (st == null)
-		{
-			return getNoQuestMsg(player);
-		}
-		
+		final QuestState st = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
 		switch (st.getState())
 		{
@@ -175,6 +167,6 @@ public class Q10504_JewelOfAntharas extends Quest
 	
 	public static void main(String[] args)
 	{
-		new Q10504_JewelOfAntharas(10504, Q10504_JewelOfAntharas.class.getSimpleName(), "Jewel of Antharas");
+		new Q10504_JewelOfAntharas();
 	}
 }