Quest: Seal Removal (188) update.

Reviewed by: @Zoey76

L2J_DataPack/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java

@@ -18,6 +18,8 @@
  */
 package quests.Q00188_SealRemoval;
 
+import quests.Q00184_ArtOfPersuasion.Q00184_ArtOfPersuasion;
+import quests.Q00185_NikolasCooperation.Q00185_NikolasCooperation;
 import quests.Q00186_ContractExecution.Q00186_ContractExecution;
 import quests.Q00187_NikolasHeart.Q00187_NikolasHeart;
 
@@ -25,7 +27,6 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.model.quest.State;
 
 /**
  * Seal Removal (188)
@@ -55,50 +56,70 @@ public final class Q00188_SealRemoval extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = getQuestState(player, false);
-		if (st == null)
+		final QuestState qs = getQuestState(player, false);
+		if (qs == null)
 		{
 			return null;
 		}
+		
 		String htmltext = null;
 		switch (event)
 		{
-			case "30970-02.html":
-			case "30621-02.html":
-			case "30621-04.html":
+			case "30673-03.htm":
 			{
-				htmltext = event;
+				if (qs.isCreated())
+				{
+					qs.startQuest();
+					qs.setMemoState(1);
+					giveItems(player, BROKEN_METAL_PIECES, 1);
+					htmltext = event;
+				}
 				break;
 			}
-			case "30673-03.htm":
+			case "30621-02.html":
 			{
-				if (st.isCreated())
+				if (qs.isMemoState(1))
 				{
-					st.startQuest();
-					st.giveItems(BROKEN_METAL_PIECES, 1);
 					htmltext = event;
 				}
 				break;
 			}
 			case "30621-03.html":
 			{
-				if (st.isCond(1))
+				if (qs.isMemoState(1))
+				{
+					qs.setMemoState(2);
+					qs.setCond(2, true);
+					htmltext = event;
+				}
+				break;
+			}
+			case "30621-04.html":
+			{
+				if (qs.isMemoState(2))
+				{
+					htmltext = event;
+				}
+				break;
+			}
+			case "30970-02.html":
+			{
+				if (qs.isMemoState(2))
 				{
-					st.setCond(2, true);
 					htmltext = event;
 				}
 				break;
 			}
 			case "30970-03.html":
 			{
-				if (st.isCond(2))
+				if (qs.isMemoState(2))
 				{
-					st.giveAdena(98583, true);
+					giveAdena(player, 98583, true);
 					if (player.getLevel() < MAX_LEVEL_FOR_EXP_SP)
 					{
-						st.addExpAndSp(285935, 18711);
+						addExpAndSp(player, 285935, 18711);
 					}
-					st.exitQuest(false, true);
+					qs.exitQuest(false, true);
 					htmltext = event;
 				}
 				break;
@@ -110,72 +131,61 @@ public final class Q00188_SealRemoval extends Quest
 	@Override
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
+		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
-		final QuestState st = getQuestState(player, true);
-		if (st == null)
-		{
-			return htmltext;
-		}
-		
-		switch (npc.getId())
+		if (qs.isCreated())
 		{
-			case RESEARCHER_LORAIN:
+			if (npc.getId() == RESEARCHER_LORAIN)
 			{
-				switch (st.getState())
+				if (!hasQuestItems(player, LORAINES_CERTIFICATE))
 				{
-					case State.CREATED:
+					final QuestState q184 = player.getQuestState(Q00184_ArtOfPersuasion.class.getSimpleName());
+					final QuestState q185 = player.getQuestState(Q00185_NikolasCooperation.class.getSimpleName());
+					final QuestState q186 = player.getQuestState(Q00186_ContractExecution.class.getSimpleName());
+					final QuestState q187 = player.getQuestState(Q00187_NikolasHeart.class.getSimpleName());
+					if (((q184 != null) && q184.isCompleted()) || ((q185 != null) && q185.isCompleted() && (q186 == null) && (q187 == null)))
 					{
-						if (st.hasQuestItems(LORAINES_CERTIFICATE))
-						{
-							final QuestState q184 = player.getQuestState("184_Nikolas_Cooperation_Contract"); // TODO: Update.
-							if ((q184 != null) && q184.isCompleted())
-							{
-								htmltext = (player.getLevel() >= MIN_LEVEL) ? "30673-01.htm" : "30673-02.htm";
-							}
-						}
-						else
-						{
-							final QuestState q185 = player.getQuestState("185_Nikolas_Cooperation_Consideration"); // TODO: Update.
-							final QuestState q186 = player.getQuestState(Q00186_ContractExecution.class.getSimpleName());
-							final QuestState q187 = player.getQuestState(Q00187_NikolasHeart.class.getSimpleName());
-							if ((q185 != null) && q185.isCompleted() && (q186 != null) && q186.isCompleted() && (q187 != null) && q187.isCompleted())
-							{
-								htmltext = (player.getLevel() >= MIN_LEVEL) ? "30673-01.htm" : "30673-02.htm";
-							}
-						}
-						break;
+						htmltext = (player.getLevel() >= MIN_LEVEL) ? "30673-01.htm" : "30673-02.htm";
 					}
-					case State.STARTED:
+				}
+			}
+		}
+		else if (qs.isStarted())
+		{
+			switch (npc.getId())
+			{
+				case RESEARCHER_LORAIN:
+				{
+					htmltext = "30673-04.html";
+					break;
+				}
+				case MAESTRO_NIKOLA:
+				{
+					if (qs.isMemoState(1))
 					{
-						if (st.getCond() >= 1)
-						{
-							htmltext = "30673-04.html";
-						}
-						break;
+						htmltext = "30621-01.html";
 					}
-					case State.COMPLETED:
+					else if (qs.isMemoState(2))
 					{
-						htmltext = getAlreadyCompletedMsg(player);
-						break;
+						htmltext = "30621-05.html";
 					}
+					break;
 				}
-				break;
-			}
-			case MAESTRO_NIKOLA:
-			{
-				if (st.isStarted())
+				case DOROTHY_LOCKSMITH:
 				{
-					htmltext = st.isCond(1) ? "30621-01.html" : "30621-05.html";
+					if (qs.isMemoState(2))
+					{
+						htmltext = "30970-01.html";
+					}
+					break;
 				}
-				break;
 			}
-			case DOROTHY_LOCKSMITH:
+		}
+		else if (qs.isCompleted())
+		{
+			if (npc.getId() == RESEARCHER_LORAIN)
 			{
-				if (st.isCond(2))
-				{
-					htmltext = "30970-01.html";
-				}
-				break;
+				htmltext = getAlreadyCompletedMsg(player);
 			}
 		}
 		return htmltext;