More AI and quest cleanup

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

@@ -58,17 +58,17 @@ public class Q10501_ZakenEmbroideredSoulCloak extends Quest
 		final QuestState st = getQuestState(player, false);
 		if ((st != null) && st.isCond(1) && Util.checkIfInRange(1500, npc, player, false))
 		{
-			final long currentCount = st.getQuestItemsCount(ZAKENS_SOUL_FRAGMENT);
+			final long currentCount = getQuestItemsCount(player, ZAKENS_SOUL_FRAGMENT);
 			final long count = getRandom(1, 3);
 			if (count >= (FRAGMENT_COUNT - currentCount))
 			{
-				st.giveItems(ZAKENS_SOUL_FRAGMENT, FRAGMENT_COUNT - currentCount);
+				giveItems(player, ZAKENS_SOUL_FRAGMENT, FRAGMENT_COUNT - currentCount);
 				st.setCond(2, true);
 			}
 			else
 			{
-				st.giveItems(ZAKENS_SOUL_FRAGMENT, count);
-				st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				giveItems(player, ZAKENS_SOUL_FRAGMENT, count);
+				playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
 			}
 		}
 	}
@@ -96,11 +96,6 @@ public class Q10501_ZakenEmbroideredSoulCloak extends Quest
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState st = getQuestState(player, true);
-		if (st == null)
-		{
-			return getNoQuestMsg(player);
-		}
-		
 		String htmltext = getNoQuestMsg(player);
 		switch (st.getState())
 		{
@@ -120,10 +115,10 @@ public class Q10501_ZakenEmbroideredSoulCloak extends Quest
 					}
 					case 2:
 					{
-						if (st.getQuestItemsCount(ZAKENS_SOUL_FRAGMENT) >= FRAGMENT_COUNT)
+						if (getQuestItemsCount(player, ZAKENS_SOUL_FRAGMENT) >= FRAGMENT_COUNT)
 						{
-							st.giveItems(SOUL_CLOAK_OF_ZAKEN, 1);
-							st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							giveItems(player, SOUL_CLOAK_OF_ZAKEN, 1);
+							playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
 							st.exitQuest(false, true);
 							htmltext = "32612-06.html";
 						}

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

@@ -58,17 +58,17 @@ public class Q10502_FreyaEmbroideredSoulCloak extends Quest
 		final QuestState st = getQuestState(player, false);
 		if ((st != null) && st.isCond(1) && Util.checkIfInRange(1500, npc, player, false))
 		{
-			final long currentCount = st.getQuestItemsCount(FREYAS_SOUL_FRAGMENT);
+			final long currentCount = getQuestItemsCount(player, FREYAS_SOUL_FRAGMENT);
 			final long count = getRandom(1, 3);
 			if (count >= (FRAGMENT_COUNT - currentCount))
 			{
-				st.giveItems(FREYAS_SOUL_FRAGMENT, FRAGMENT_COUNT - currentCount);
+				giveItems(player, FREYAS_SOUL_FRAGMENT, FRAGMENT_COUNT - currentCount);
 				st.setCond(2, true);
 			}
 			else
 			{
-				st.giveItems(FREYAS_SOUL_FRAGMENT, count);
-				st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				giveItems(player, FREYAS_SOUL_FRAGMENT, count);
+				playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
 			}
 		}
 	}
@@ -120,10 +120,10 @@ public class Q10502_FreyaEmbroideredSoulCloak extends Quest
 					}
 					case 2:
 					{
-						if (st.getQuestItemsCount(FREYAS_SOUL_FRAGMENT) >= FRAGMENT_COUNT)
+						if (getQuestItemsCount(player, FREYAS_SOUL_FRAGMENT) >= FRAGMENT_COUNT)
 						{
-							st.giveItems(SOUL_CLOAK_OF_FREYA, 1);
-							st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							giveItems(player, SOUL_CLOAK_OF_FREYA, 1);
+							playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
 							st.exitQuest(false, true);
 							htmltext = "32612-06.html";
 						}

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

@@ -59,17 +59,17 @@ public class Q10503_FrintezzaEmbroideredSoulCloak extends Quest
 		final QuestState st = getQuestState(player, false);
 		if ((st != null) && st.isCond(1) && Util.checkIfInRange(1500, npc, player, false))
 		{
-			final long currentCount = st.getQuestItemsCount(FRINTEZZAS_SOUL_FRAGMENT);
+			final long currentCount = getQuestItemsCount(player, FRINTEZZAS_SOUL_FRAGMENT);
 			final long count = getRandom(1, 3);
 			if (count >= (FRAGMENT_COUNT - currentCount))
 			{
-				st.giveItems(FRINTEZZAS_SOUL_FRAGMENT, FRAGMENT_COUNT - currentCount);
+				giveItems(player, FRINTEZZAS_SOUL_FRAGMENT, FRAGMENT_COUNT - currentCount);
 				st.setCond(2, true);
 			}
 			else
 			{
-				st.giveItems(FRINTEZZAS_SOUL_FRAGMENT, count);
-				st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				giveItems(player, FRINTEZZAS_SOUL_FRAGMENT, count);
+				playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
 			}
 		}
 	}
@@ -97,11 +97,6 @@ public class Q10503_FrintezzaEmbroideredSoulCloak extends Quest
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState st = getQuestState(player, true);
-		if (st == null)
-		{
-			return getNoQuestMsg(player);
-		}
-		
 		String htmltext = getNoQuestMsg(player);
 		switch (st.getState())
 		{
@@ -121,10 +116,10 @@ public class Q10503_FrintezzaEmbroideredSoulCloak extends Quest
 					}
 					case 2:
 					{
-						if (st.getQuestItemsCount(FRINTEZZAS_SOUL_FRAGMENT) >= FRAGMENT_COUNT)
+						if (getQuestItemsCount(player, FRINTEZZAS_SOUL_FRAGMENT) >= FRAGMENT_COUNT)
 						{
-							st.giveItems(SOUL_CLOAK_OF_FRINTEZZA, 1);
-							st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							giveItems(player, SOUL_CLOAK_OF_FRINTEZZA, 1);
+							playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
 							st.exitQuest(false, true);
 							htmltext = "32612-06.html";
 						}

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

@@ -59,9 +59,9 @@ public final class Q10504_JewelOfAntharas extends Quest
 		final QuestState st = getQuestState(player, false);
 		if ((st != null) && st.isCond(1) && Util.checkIfInRange(1500, npc, player, false))
 		{
-			st.takeItems(CLEAR_CRYSTAL, -1);
-			st.giveItems(FILLED_CRYSTAL_ANTHARAS_ENERGY, 1);
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			takeItems(player, CLEAR_CRYSTAL, -1);
+			giveItems(player, FILLED_CRYSTAL_ANTHARAS_ENERGY, 1);
+			playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
 			st.setCond(2, true);
 		}
 	}
@@ -76,7 +76,7 @@ public final class Q10504_JewelOfAntharas extends Quest
 		}
 		
 		String htmltext = null;
-		if ((player.getLevel() >= MIN_LEVEL) && st.hasQuestItems(PORTAL_STONE))
+		if ((player.getLevel() >= MIN_LEVEL) && hasQuestItems(player, PORTAL_STONE))
 		{
 			switch (event)
 			{
@@ -89,7 +89,7 @@ public final class Q10504_JewelOfAntharas extends Quest
 				case "30755-07.html":
 				{
 					st.startQuest();
-					st.giveItems(CLEAR_CRYSTAL, 1);
+					giveItems(player, CLEAR_CRYSTAL, 1);
 					htmltext = event;
 					break;
 				}
@@ -118,7 +118,7 @@ public final class Q10504_JewelOfAntharas extends Quest
 				{
 					htmltext = "30755-02.html";
 				}
-				else if (!st.hasQuestItems(PORTAL_STONE))
+				else if (!hasQuestItems(player, PORTAL_STONE))
 				{
 					htmltext = "30755-04.html";
 				}
@@ -134,21 +134,21 @@ public final class Q10504_JewelOfAntharas extends Quest
 				{
 					case 1:
 					{
-						if (st.hasQuestItems(CLEAR_CRYSTAL))
+						if (hasQuestItems(player, CLEAR_CRYSTAL))
 						{
 							htmltext = "30755-08.html";
 						}
 						else
 						{
-							st.giveItems(CLEAR_CRYSTAL, 1);
+							giveItems(player, CLEAR_CRYSTAL, 1);
 							htmltext = "30755-09.html";
 						}
 						break;
 					}
 					case 2:
 					{
-						st.giveItems(JEWEL_OF_ANTHARAS, 1);
-						st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						giveItems(player, JEWEL_OF_ANTHARAS, 1);
+						playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
 						st.exitQuest(false, true);
 						htmltext = "30755-10.html";
 						break;

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

@@ -59,9 +59,9 @@ public class Q10505_JewelOfValakas extends Quest
 		final QuestState st = getQuestState(player, false);
 		if ((st != null) && st.isCond(1) && Util.checkIfInRange(1500, npc, player, false))
 		{
-			st.takeItems(EMPTY_CRYSTAL, -1);
-			st.giveItems(FILLED_CRYSTAL_VALAKAS_ENERGY, 1);
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			takeItems(player, EMPTY_CRYSTAL, -1);
+			giveItems(player, FILLED_CRYSTAL_VALAKAS_ENERGY, 1);
+			playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
 			st.setCond(2, true);
 		}
 	}
@@ -76,7 +76,7 @@ public class Q10505_JewelOfValakas extends Quest
 		}
 		
 		String htmltext = null;
-		if ((player.getLevel() >= MIN_LEVEL) && st.hasQuestItems(VACUALITE_FLOATING_STONE))
+		if ((player.getLevel() >= MIN_LEVEL) && hasQuestItems(player, VACUALITE_FLOATING_STONE))
 		{
 			switch (event)
 			{
@@ -89,7 +89,7 @@ public class Q10505_JewelOfValakas extends Quest
 				case "31540-07.html":
 				{
 					st.startQuest();
-					st.giveItems(EMPTY_CRYSTAL, 1);
+					giveItems(player, EMPTY_CRYSTAL, 1);
 					htmltext = event;
 					break;
 				}
@@ -108,12 +108,7 @@ public class Q10505_JewelOfValakas extends Quest
 	@Override
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
-		QuestState st = getQuestState(player, true);
-		if (st == null)
-		{
-			return getNoQuestMsg(player);
-		}
-		
+		final QuestState st = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
 		switch (st.getState())
 		{
@@ -123,7 +118,7 @@ public class Q10505_JewelOfValakas extends Quest
 				{
 					htmltext = "31540-02.html";
 				}
-				else if (!st.hasQuestItems(VACUALITE_FLOATING_STONE))
+				else if (!hasQuestItems(player, VACUALITE_FLOATING_STONE))
 				{
 					htmltext = "31540-04.html";
 				}
@@ -139,21 +134,21 @@ public class Q10505_JewelOfValakas extends Quest
 				{
 					case 1:
 					{
-						if (st.hasQuestItems(EMPTY_CRYSTAL))
+						if (hasQuestItems(player, EMPTY_CRYSTAL))
 						{
 							htmltext = "31540-08.html";
 						}
 						else
 						{
-							st.giveItems(EMPTY_CRYSTAL, 1);
+							giveItems(player, EMPTY_CRYSTAL, 1);
 							htmltext = "31540-09.html";
 						}
 						break;
 					}
 					case 2:
 					{
-						st.giveItems(JEWEL_OF_VALAKAS, 1);
-						st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						giveItems(player, JEWEL_OF_VALAKAS, 1);
+						playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
 						st.exitQuest(false, true);
 						htmltext = "31540-10.html";
 						break;

L2J_DataPack/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java

@@ -140,7 +140,7 @@ public class TerritoryWarSuperClass extends Quest
 			if (kill >= max)
 			{
 				TerritoryWarManager.getInstance().giveTWQuestPoint(player);
-				st.addExpAndSp(534000, 51000);
+				addExpAndSp(player, 534000, 51000);
 				st.set("doneDate", String.valueOf(Calendar.getInstance().get(Calendar.DAY_OF_YEAR)));
 				st.exitQuest(true);
 				player.sendPacket(new ExShowScreenMessage(npcString[1], 2, 10000));

L2J_DataPack/dist/game/data/scripts/village_master/DarkElvenChange1/DarkElvenChange1.java

@@ -24,12 +24,10 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
 import com.l2jserver.gameserver.model.quest.Quest;
-import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.util.Util;
 
 /**
- * Dark Elven Change Part 1<br>
- * Original Jython script by DraX and DrLecter
+ * Dark Elven Change Part 1.
  * @author nonom
  */
 public final class DarkElvenChange1 extends Quest
@@ -68,12 +66,6 @@ public final class DarkElvenChange1 extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		QuestState st = getQuestState(player, false);
-		if (st == null)
-		{
-			return getNoQuestMsg(player);
-		}
-		
 		if (Util.isDigit(event))
 		{
 			int i = Integer.valueOf(event);
@@ -81,7 +73,7 @@ public final class DarkElvenChange1 extends Quest
 			if ((cid.getRace() == Race.DARK_ELF) && (cid.getId() == CLASSES[i][1]))
 			{
 				int suffix;
-				final boolean item = st.hasQuestItems(CLASSES[i][6]);
+				final boolean item = hasQuestItems(player, CLASSES[i][6]);
 				if (player.getLevel() < 20)
 				{
 					suffix = (!item) ? CLASSES[i][2] : CLASSES[i][3];
@@ -95,13 +87,12 @@ public final class DarkElvenChange1 extends Quest
 					else
 					{
 						suffix = CLASSES[i][5];
-						st.giveItems(SHADOW_WEAPON_COUPON_DGRADE, 15);
-						st.takeItems(CLASSES[i][6], -1);
+						giveItems(player, SHADOW_WEAPON_COUPON_DGRADE, 15);
+						takeItems(player, CLASSES[i][6], -1);
 						player.setClassId(CLASSES[i][0]);
 						player.setBaseClass(CLASSES[i][0]);
-						st.playSound(QuestSound.ITEMSOUND_QUEST_FANFARE_2);
+						playSound(player, QuestSound.ITEMSOUND_QUEST_FANFARE_2);
 						player.broadcastUserInfo();
-						st.exitQuest(false);
 					}
 				}
 				event = npc.getId() + "-" + suffix + ".html";
@@ -114,7 +105,6 @@ public final class DarkElvenChange1 extends Quest
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
-		getQuestState(player, true);
 		if (player.isSubClassActive())
 		{
 			return htmltext;

L2J_DataPack/dist/game/data/scripts/village_master/DarkElvenChange2/DarkElvenChange2.java

@@ -24,12 +24,10 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
 import com.l2jserver.gameserver.model.quest.Quest;
-import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.util.Util;
 
 /**
- * Dark Elven Change Part 2<br>
- * Original Jython script by DraX and DrLecter
+ * Dark Elven Change Part 2.
  * @author nonom
  */
 public final class DarkElvenChange2 extends Quest
@@ -86,12 +84,6 @@ public final class DarkElvenChange2 extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		QuestState st = getQuestState(player, false);
-		if (st == null)
-		{
-			return getNoQuestMsg(player);
-		}
-		
 		if (Util.isDigit(event))
 		{
 			int i = Integer.valueOf(event);
@@ -99,9 +91,9 @@ public final class DarkElvenChange2 extends Quest
 			if ((cid.getRace() == Race.DARK_ELF) && (cid.getId() == CLASSES[i][1]))
 			{
 				int suffix;
-				final boolean item1 = st.hasQuestItems(CLASSES[i][6]);
-				final boolean item2 = st.hasQuestItems(CLASSES[i][7]);
-				final boolean item3 = st.hasQuestItems(CLASSES[i][8]);
+				final boolean item1 = hasQuestItems(player, CLASSES[i][6]);
+				final boolean item2 = hasQuestItems(player, CLASSES[i][7]);
+				final boolean item3 = hasQuestItems(player, CLASSES[i][8]);
 				if (player.getLevel() < 40)
 				{
 					suffix = (!item1 || !item2 || !item3) ? CLASSES[i][2] : CLASSES[i][3];
@@ -115,14 +107,13 @@ public final class DarkElvenChange2 extends Quest
 					else
 					{
 						suffix = CLASSES[i][5];
-						st.takeItems(CLASSES[i][6], -1);
-						st.takeItems(CLASSES[i][7], -1);
-						st.takeItems(CLASSES[i][8], -1);
-						st.playSound(QuestSound.ITEMSOUND_QUEST_FANFARE_2);
+						takeItems(player, CLASSES[i][6], -1);
+						takeItems(player, CLASSES[i][7], -1);
+						takeItems(player, CLASSES[i][8], -1);
+						playSound(player, QuestSound.ITEMSOUND_QUEST_FANFARE_2);
 						player.setClassId(CLASSES[i][0]);
 						player.setBaseClass(CLASSES[i][0]);
 						player.broadcastUserInfo();
-						st.exitQuest(false);
 					}
 				}
 				event = "30474-" + suffix + ".html";
@@ -135,8 +126,6 @@ public final class DarkElvenChange2 extends Quest
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
-		getQuestState(player, true);
-		
 		if (player.isSubClassActive())
 		{
 			return htmltext;