BETA: Updating external quest states (more from [9036]) Reported by: jurchiks

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

@@ -14,6 +14,8 @@
  */
 package quests.Q00016_TheComingDarkness;
 
+import quests.Q00017_LightAndDarkness.Q00017_LightAndDarkness;
+
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -86,7 +88,7 @@ public class Q00016_TheComingDarkness extends Quest
 			return htmltext;
 		}
 		
-		final QuestState st2 = player.getQuestState("17_LightAndDarkness");
+		final QuestState st2 = player.getQuestState(Q00017_LightAndDarkness.class.getSimpleName());
 		if ((st2 != null) && !st2.isCompleted())
 		{
 			return "31517-04.html";

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

@@ -14,6 +14,8 @@
  */
 package quests.Q00017_LightAndDarkness;
 
+import quests.Q00015_SweetWhispers.Q00015_SweetWhispers;
+
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -98,7 +100,7 @@ public class Q00017_LightAndDarkness extends Quest
 				htmltext = getAlreadyCompletedMsg(player);
 				break;
 			case State.CREATED:
-				final QuestState st2 = player.getQuestState("15_SweetWhispers");
+				final QuestState st2 = player.getQuestState(Q00015_SweetWhispers.class.getSimpleName());
 				htmltext = ((st2 != null) && (st2.isCompleted())) ? "31517-00.htm" : "31517-06.html";
 				break;
 			case State.STARTED:

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

@@ -14,6 +14,8 @@
  */
 package quests.Q00027_ChestCaughtWithABaitOfWind;
 
+import quests.Q00050_LanoscosSpecialBait.Q00050_LanoscosSpecialBait;
+
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -96,7 +98,7 @@ public class Q00027_ChestCaughtWithABaitOfWind extends Quest
 				htmltext = getAlreadyCompletedMsg(player);
 				break;
 			case State.CREATED:
-				final QuestState qs = player.getQuestState("50_LanoscosSpecialBait");
+				final QuestState qs = player.getQuestState(Q00050_LanoscosSpecialBait.class.getSimpleName());
 				if (npcId == LANOSCO)
 				{
 					htmltext = "31570-02.htm";

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

@@ -14,6 +14,8 @@
  */
 package quests.Q00028_ChestCaughtWithABaitOfIcyAir;
 
+import quests.Q00051_OFullesSpecialBait.Q00051_OFullesSpecialBait;
+
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -96,7 +98,7 @@ public class Q00028_ChestCaughtWithABaitOfIcyAir extends Quest
 				htmltext = getAlreadyCompletedMsg(player);
 				break;
 			case State.CREATED:
-				final QuestState qs = player.getQuestState("51_OFullesSpecialBait");
+				final QuestState qs = player.getQuestState(Q00051_OFullesSpecialBait.class.getSimpleName());
 				if (npcId == OFULLE)
 				{
 					htmltext = "31572-02.htm";

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

@@ -14,6 +14,8 @@
  */
 package quests.Q00029_ChestCaughtWithABaitOfEarth;
 
+import quests.Q00052_WilliesSpecialBait.Q00052_WilliesSpecialBait;
+
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -96,7 +98,7 @@ public class Q00029_ChestCaughtWithABaitOfEarth extends Quest
 				htmltext = getAlreadyCompletedMsg(player);
 				break;
 			case State.CREATED:
-				final QuestState qs = player.getQuestState("52_WilliesSpecialBait");
+				final QuestState qs = player.getQuestState(Q00052_WilliesSpecialBait.class.getSimpleName());
 				if (npcId == WILLIE)
 				{
 					htmltext = "31574-02.htm";

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

@@ -14,6 +14,8 @@
  */
 package quests.Q00030_ChestCaughtWithABaitOfFire;
 
+import quests.Q00053_LinnaeusSpecialBait.Q00053_LinnaeusSpecialBait;
+
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -97,7 +99,7 @@ public class Q00030_ChestCaughtWithABaitOfFire extends Quest
 				htmltext = getAlreadyCompletedMsg(player);
 				break;
 			case State.CREATED:
-				final QuestState qs = player.getQuestState("53_LinnaeusSpecialBait");
+				final QuestState qs = player.getQuestState(Q00053_LinnaeusSpecialBait.class.getSimpleName());
 				if (npcId == LINNAEUS)
 				{
 					htmltext = "31577-00.htm";

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

@@ -17,6 +17,8 @@ package quests.Q00125_TheNameOfEvil1;
 import java.util.HashMap;
 import java.util.Map;
 
+import quests.Q00124_MeetingTheElroki.Q00124_MeetingTheElroki;
+
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -259,7 +261,7 @@ public class Q00125_TheNameOfEvil1 extends Quest
 						}
 						else
 						{
-							st = player.getQuestState("124_MeetingTheElroki");
+							st = player.getQuestState(Q00124_MeetingTheElroki.class.getSimpleName());
 							htmltext = ((st != null) && st.isCompleted()) ? "32114-01.htm" : "32114-01b.htm";
 						}
 						break;

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

@@ -14,6 +14,8 @@
  */
 package quests.Q00126_TheNameOfEvil2;
 
+import quests.Q00125_TheNameOfEvil1.Q00125_TheNameOfEvil1;
+
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -343,7 +345,7 @@ public class Q00126_TheNameOfEvil2 extends Quest
 						}
 						else
 						{
-							st = player.getQuestState("125_TheNameOfEvil1");
+							st = player.getQuestState(Q00125_TheNameOfEvil1.class.getSimpleName());
 							htmltext = ((st != null) && st.isCompleted()) ? "32115-0a.htm" : "32115-0b.htm";
 						}
 						break;

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

@@ -14,6 +14,8 @@
  */
 package quests.Q00146_TheZeroHour;
 
+import quests.Q00109_InSearchOfTheNest.Q00109_InSearchOfTheNest;
+
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -69,7 +71,7 @@ public class Q00146_TheZeroHour extends Quest
 				}
 				else
 				{
-					final QuestState prev = player.getQuestState("109_InSearchOfTheNest");
+					final QuestState prev = player.getQuestState(Q00109_InSearchOfTheNest.class.getSimpleName());
 					if ((prev != null) && prev.isCompleted())
 					{
 						htmltext = "31554-01a.htm";

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

@@ -14,6 +14,8 @@
  */
 package quests.Q00148_PathtoBecominganExaltedMercenary;
 
+import quests.Q00147_PathtoBecominganEliteMercenary.Q00147_PathtoBecominganEliteMercenary;
+
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -79,7 +81,7 @@ public class Q00148_PathtoBecominganExaltedMercenary extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				QuestState _prev = player.getQuestState("147_PathtoBecominganEliteMercenary");
+				QuestState _prev = player.getQuestState(Q00147_PathtoBecominganEliteMercenary.class.getSimpleName());
 				if ((player.getClan() != null) && (player.getClan().getCastleId() > 0))
 				{
 					htmltext = "castle.htm";

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

@@ -14,6 +14,8 @@
  */
 package quests.Q00287_FiguringItOut;
 
+import quests.Q00250_WatchWhatYouEat.Q00250_WatchWhatYouEat;
+
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -215,7 +217,7 @@ public class Q00287_FiguringItOut extends Quest
 	{
 		String htmltext = getNoQuestMsg(player);
 		QuestState st = player.getQuestState(getName());
-		QuestState prev = player.getQuestState("250_WatchWhatYouEat");
+		QuestState prev = player.getQuestState(Q00250_WatchWhatYouEat.class.getSimpleName());
 		
 		if (st == null)
 		{

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

@@ -14,6 +14,8 @@
  */
 package quests.Q00289_NoMoreSoupForYou;
 
+import quests.Q00252_ItSmellsDelicious.Q00252_ItSmellsDelicious;
+
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -229,7 +231,7 @@ public class Q00289_NoMoreSoupForYou extends Quest
 			switch (st.getState())
 			{
 				case State.CREATED:
-					QuestState _prev = player.getQuestState("252_ItSmellsDelicious");
+					QuestState _prev = player.getQuestState(Q00252_ItSmellsDelicious.class.getSimpleName());
 					if ((_prev != null) && _prev.isCompleted() && (player.getLevel() >= 82))
 					{
 						htmltext = "30200-01.htm";

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

@@ -14,6 +14,8 @@
  */
 package quests.Q00290_ThreatRemoval;
 
+import quests.Q00251_NoSecrets.Q00251_NoSecrets;
+
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -150,7 +152,7 @@ public class Q00290_ThreatRemoval extends Quest
 	{
 		String htmltext = getNoQuestMsg(player);
 		QuestState st = player.getQuestState(getName());
-		QuestState _prev = player.getQuestState("251_NoSecrets");
+		QuestState _prev = player.getQuestState(Q00251_NoSecrets.class.getSimpleName());
 		if (st == null)
 		{
 			return htmltext;

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

@@ -14,6 +14,8 @@
  */
 package quests.Q00423_TakeYourBestShot;
 
+import quests.Q00249_PoisonedPlainsOfTheLizardmen.Q00249_PoisonedPlainsOfTheLizardmen;
+
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -93,7 +95,7 @@ public class Q00423_TakeYourBestShot extends Quest
 			switch (st.getState())
 			{
 				case State.CREATED:
-					QuestState _prev = player.getQuestState("249_PoisonedPlainsOfTheLizardmen");
+					QuestState _prev = player.getQuestState(Q00249_PoisonedPlainsOfTheLizardmen.class.getSimpleName());
 					if ((_prev != null) && _prev.isCompleted() && (player.getLevel() >= 82))
 					{
 						if (st.hasQuestItems(_seer_ugoros_pass))

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

@@ -14,6 +14,8 @@
  */
 package quests.Q00453_NotStrongEnoughAlone;
 
+import quests.Q10282_ToTheSeedOfAnnihilation.Q10282_ToTheSeedOfAnnihilation;
+
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -127,7 +129,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest
 	{
 		String htmltext = getNoQuestMsg(player);
 		QuestState st = player.getQuestState(getName());
-		QuestState prev = player.getQuestState("10282_ToTheSeedOfAnnihilation");
+		QuestState prev = player.getQuestState(Q10282_ToTheSeedOfAnnihilation.class.getSimpleName());
 		if (st == null)
 		{
 			return htmltext;

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

@@ -14,6 +14,8 @@
  */
 package quests.Q00461_RumbleInTheBase;
 
+import quests.Q00252_ItSmellsDelicious.Q00252_ItSmellsDelicious;
+
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -74,7 +76,7 @@ public class Q00461_RumbleInTheBase extends Quest
 			return htmltext;
 		}
 		
-		final QuestState prev = player.getQuestState("252_ItSmellsDelicious");
+		final QuestState prev = player.getQuestState(Q00252_ItSmellsDelicious.class.getSimpleName());
 		switch (st.getState())
 		{
 			case State.CREATED:

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

@@ -14,6 +14,8 @@
  */
 package quests.Q00641_AttackSailren;
 
+import quests.Q00126_TheNameOfEvil2.Q00126_TheNameOfEvil2;
+
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -88,7 +90,7 @@ public class Q00641_AttackSailren extends Quest
 				}
 				else
 				{
-					st = player.getQuestState("126_TheNameOfEvil2");
+					st = player.getQuestState(Q00126_TheNameOfEvil2.class.getSimpleName());
 					htmltext = ((st != null) && st.isCompleted()) ? "32109-0a.htm" : "32109-0b.htm";
 				}
 				break;

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

@@ -14,6 +14,8 @@
  */
 package quests.Q00702_ATrapForRevenge;
 
+import quests.Q10273_GoodDayToFly.Q10273_GoodDayToFly;
+
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -268,7 +270,7 @@ public class Q00702_ATrapForRevenge extends Quest
 			switch (st.getState())
 			{
 				case State.CREATED:
-					final QuestState prev = player.getQuestState("10273_GoodDayToFly");
+					final QuestState prev = player.getQuestState(Q10273_GoodDayToFly.class.getSimpleName());
 					htmltext = ((prev != null) && prev.isCompleted() && (player.getLevel() >= 78)) ? "32563-01.htm" : "32563-02.htm";
 					break;
 				case State.STARTED:

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

@@ -14,6 +14,8 @@
  */
 package quests.Q10271_TheEnvelopingDarkness;
 
+import quests.Q10269_ToTheSeedOfDestruction.Q10269_ToTheSeedOfDestruction;
+
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -48,7 +50,7 @@ public class Q10271_TheEnvelopingDarkness extends Quest
 				switch (st.getState())
 				{
 					case State.CREATED:
-						st = player.getQuestState("10269_ToTheSeedOfDestruction");
+						st = player.getQuestState(Q10269_ToTheSeedOfDestruction.class.getSimpleName());
 						htmltext = ((player.getLevel() >= 75) && (st != null) && st.isCompleted()) ? "32560-01.htm" : "32560-02.html";
 						break;
 					case State.STARTED:

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

@@ -14,6 +14,8 @@
  */
 package quests.Q10272_LightFragment;
 
+import quests.Q10271_TheEnvelopingDarkness.Q10271_TheEnvelopingDarkness;
+
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -81,7 +83,7 @@ public class Q10272_LightFragment extends Quest
 						}
 						else
 						{
-							final QuestState _prev = player.getQuestState("10271_TheEnvelopingDarkness");
+							final QuestState _prev = player.getQuestState(Q10271_TheEnvelopingDarkness.class.getSimpleName());
 							htmltext = ((_prev != null) && _prev.isCompleted()) ? "32560-01.htm" : "32560-02.html";
 						}
 						break;

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

@@ -14,6 +14,8 @@
  */
 package quests.Q10274_CollectingInTheAir;
 
+import quests.Q10273_GoodDayToFly.Q10273_GoodDayToFly;
+
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -67,7 +69,7 @@ public class Q10274_CollectingInTheAir extends Quest
 				htmltext = "32557-0a.html";
 				break;
 			case State.CREATED:
-				st = player.getQuestState("10273_GoodDayToFly");
+				st = player.getQuestState(Q10273_GoodDayToFly.class.getSimpleName());
 				if (st == null)
 				{
 					htmltext = "32557-00.html";

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

@@ -14,6 +14,8 @@
  */
 package quests.Q10289_FadeToBlack;
 
+import quests.Q10288_SecretMission.Q10288_SecretMission;
+
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -74,7 +76,7 @@ public class Q10289_FadeToBlack extends Quest
 	{
 		String htmltext = getNoQuestMsg(player);
 		QuestState st = player.getQuestState(getName());
-		QuestState secretMission = player.getQuestState("10288_SecretMission");
+		QuestState secretMission = player.getQuestState(Q10288_SecretMission.class.getSimpleName());
 		if (st == null)
 		{
 			return htmltext;