Cleaning up some quests

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

@@ -76,7 +76,7 @@ public class Q00001_LettersOfLove extends Quest
 				if (player.getLevel() >= MIN_LEVEL)
 				{
 					st.startQuest();
-					st.giveItems(DARINS_LETTER, 1);
+					giveItems(player, DARINS_LETTER, 1);
 					htmltext = event;
 				}
 				break;
@@ -89,11 +89,6 @@ public class Q00001_LettersOfLove 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())
 		{
@@ -117,10 +112,10 @@ public class Q00001_LettersOfLove extends Quest
 							}
 							case ROXXY:
 							{
-								if (st.hasQuestItems(DARINS_LETTER) && !st.hasQuestItems(ROXXYS_KERCHIEF))
+								if (hasQuestItems(player, DARINS_LETTER) && !hasQuestItems(player, ROXXYS_KERCHIEF))
 								{
-									st.takeItems(DARINS_LETTER, -1);
-									st.giveItems(ROXXYS_KERCHIEF, 1);
+									takeItems(player, DARINS_LETTER, -1);
+									giveItems(player, ROXXYS_KERCHIEF, 1);
 									st.setCond(2, true);
 									htmltext = "30006-01.html";
 								}
@@ -135,10 +130,10 @@ public class Q00001_LettersOfLove extends Quest
 						{
 							case DARIN:
 							{
-								if (st.hasQuestItems(ROXXYS_KERCHIEF))
+								if (hasQuestItems(player, ROXXYS_KERCHIEF))
 								{
-									st.takeItems(ROXXYS_KERCHIEF, -1);
-									st.giveItems(DARINS_RECEIPT, 1);
+									takeItems(player, ROXXYS_KERCHIEF, -1);
+									giveItems(player, DARINS_RECEIPT, 1);
 									st.setCond(3, true);
 									htmltext = "30048-08.html";
 								}
@@ -146,7 +141,7 @@ public class Q00001_LettersOfLove extends Quest
 							}
 							case ROXXY:
 							{
-								if (st.hasQuestItems(ROXXYS_KERCHIEF))
+								if (hasQuestItems(player, ROXXYS_KERCHIEF))
 								{
 									htmltext = "30006-02.html";
 								}
@@ -161,7 +156,7 @@ public class Q00001_LettersOfLove extends Quest
 						{
 							case DARIN:
 							{
-								if (st.hasQuestItems(DARINS_RECEIPT) || !st.hasQuestItems(BAULROS_POTION))
+								if (hasQuestItems(player, DARINS_RECEIPT) || !hasQuestItems(player, BAULROS_POTION))
 								{
 									htmltext = "30048-09.html";
 								}
@@ -169,7 +164,7 @@ public class Q00001_LettersOfLove extends Quest
 							}
 							case ROXXY:
 							{
-								if (st.hasQuestItems(DARINS_RECEIPT) || st.hasQuestItems(BAULROS_POTION))
+								if (hasQuestItems(player, DARINS_RECEIPT) || hasQuestItems(player, BAULROS_POTION))
 								{
 									htmltext = "30006-03.html";
 								}
@@ -177,14 +172,14 @@ public class Q00001_LettersOfLove extends Quest
 							}
 							case BAULRO:
 							{
-								if (st.hasQuestItems(DARINS_RECEIPT))
+								if (hasQuestItems(player, DARINS_RECEIPT))
 								{
-									st.takeItems(DARINS_RECEIPT, -1);
-									st.giveItems(BAULROS_POTION, 1);
+									takeItems(player, DARINS_RECEIPT, -1);
+									giveItems(player, BAULROS_POTION, 1);
 									st.setCond(4, true);
 									htmltext = "30033-01.html";
 								}
-								else if (st.hasQuestItems(BAULROS_POTION))
+								else if (hasQuestItems(player, BAULROS_POTION))
 								{
 									htmltext = "30033-02.html";
 								}
@@ -201,16 +196,16 @@ public class Q00001_LettersOfLove extends Quest
 							{
 								// TODO: Beside this message something should be set for the Newbie Guide.
 								showOnScreenMsg(player, NpcStringId.DELIVERY_DUTY_COMPLETE_N_GO_FIND_THE_NEWBIE_GUIDE, 2, 5000);
-								st.giveItems(NECKLACE_OF_KNOWLEDGE, 1);
-								st.addExpAndSp(5672, 446);
-								st.giveAdena(2466, false);
+								giveItems(player, NECKLACE_OF_KNOWLEDGE, 1);
+								addExpAndSp(player, 5672, 446);
+								giveAdena(player, 2466, false);
 								st.exitQuest(false, true);
 								htmltext = "30048-10.html";
 								break;
 							}
 							case BAULRO:
 							{
-								if (st.hasQuestItems(BAULROS_POTION))
+								if (hasQuestItems(player, BAULROS_POTION))
 								{
 									htmltext = "30033-02.html";
 								}
@@ -218,7 +213,7 @@ public class Q00001_LettersOfLove extends Quest
 							}
 							case ROXXY:
 							{
-								if (st.hasQuestItems(BAULROS_POTION))
+								if (hasQuestItems(player, BAULROS_POTION))
 								{
 									htmltext = "30006-03.html";
 								}

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

@@ -69,20 +69,20 @@ public class Q00002_WhatWomenWant extends Quest
 		{
 			case "30223-04.htm":
 				st.startQuest();
-				st.giveItems(ARUJIENS_LETTER1, 1);
+				giveItems(player, ARUJIENS_LETTER1, 1);
 				break;
 			case "30223-08.html":
-				st.takeItems(ARUJIENS_LETTER3, -1);
-				st.giveItems(POETRY_BOOK, 1);
+				takeItems(player, ARUJIENS_LETTER3, -1);
+				giveItems(player, POETRY_BOOK, 1);
 				st.setCond(4, true);
 				break;
 			case "30223-09.html":
-				st.giveAdena(450, true);
+				giveAdena(player, 450, true);
 				st.exitQuest(false, true);
 				// Newbie Guide
 				showOnScreenMsg(player, NpcStringId.DELIVERY_DUTY_COMPLETE_N_GO_FIND_THE_NEWBIE_GUIDE, 2, 5000);
-				st.addExpAndSp(4254, 335);
-				st.giveAdena(1850, true);
+				addExpAndSp(player, 4254, 335);
+				giveAdena(player, 1850, true);
 				break;
 			case "30223-03.html":
 				break;
@@ -98,11 +98,6 @@ public class Q00002_WhatWomenWant extends Quest
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);
-		if (st == null)
-		{
-			return htmltext;
-		}
-		
 		switch (npc.getId())
 		{
 			case ARUJIEN:
@@ -127,13 +122,13 @@ public class Q00002_WhatWomenWant extends Quest
 								htmltext = "30223-10.html";
 								break;
 							case 5:
-								st.giveItems(EARRING, 1);
+								giveItems(player, EARRING, 1);
 								st.exitQuest(false, true);
 								htmltext = "30223-11.html";
 								// Newbie Guide
 								showOnScreenMsg(player, NpcStringId.DELIVERY_DUTY_COMPLETE_N_GO_FIND_THE_NEWBIE_GUIDE, 2, 5000);
-								st.addExpAndSp(4254, 335);
-								st.giveAdena(1850, true);
+								addExpAndSp(player, 4254, 335);
+								giveAdena(player, 1850, true);
 								break;
 						}
 						break;
@@ -148,8 +143,8 @@ public class Q00002_WhatWomenWant extends Quest
 					if (st.isCond(1))
 					{
 						st.setCond(2, true);
-						st.takeItems(ARUJIENS_LETTER1, -1);
-						st.giveItems(ARUJIENS_LETTER2, 1);
+						takeItems(player, ARUJIENS_LETTER1, -1);
+						giveItems(player, ARUJIENS_LETTER2, 1);
 						htmltext = "30146-01.html";
 					}
 					else
@@ -164,8 +159,8 @@ public class Q00002_WhatWomenWant extends Quest
 					if (st.isCond(2))
 					{
 						st.setCond(3, true);
-						st.takeItems(ARUJIENS_LETTER2, -1);
-						st.giveItems(ARUJIENS_LETTER3, 1);
+						takeItems(player, ARUJIENS_LETTER2, -1);
+						giveItems(player, ARUJIENS_LETTER3, 1);
 						htmltext = "30150-01.html";
 					}
 					else
@@ -180,8 +175,8 @@ public class Q00002_WhatWomenWant extends Quest
 					if (st.isCond(4))
 					{
 						st.setCond(5, true);
-						st.takeItems(POETRY_BOOK, -1);
-						st.giveItems(GREENIS_LETTER, 1);
+						takeItems(player, POETRY_BOOK, -1);
+						giveItems(player, GREENIS_LETTER, 1);
 						htmltext = "30157-02.html";
 					}
 					else if (st.isCond(5))

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

@@ -94,16 +94,16 @@ public class Q00003_WillTheSealBeBroken extends Quest
 		switch (npc.getId())
 		{
 			case OMEN_BEAST:
-				giveItem(st, OMEN_BEAST_EYE, getRegisteredItemIds());
+				giveItem(member, st, OMEN_BEAST_EYE, getRegisteredItemIds());
 				break;
 			case STINK_ZOMBIE:
 			case TAINTED_ZOMBIE:
-				giveItem(st, TAINT_STONE, getRegisteredItemIds());
+				giveItem(member, st, TAINT_STONE, getRegisteredItemIds());
 				break;
 			case LESSER_SUCCUBUS:
 			case LESSER_SUCCUBUS_TILFO:
 			case LESSER_SUCCUBUS_TUREN:
-				giveItem(st, SUCCUBUS_BLOOD, getRegisteredItemIds());
+				giveItem(member, st, SUCCUBUS_BLOOD, getRegisteredItemIds());
 				break;
 		}
 		return super.onKill(npc, player, isSummon);
@@ -114,11 +114,6 @@ public class Q00003_WillTheSealBeBroken extends Quest
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);
-		if (st == null)
-		{
-			return htmltext;
-		}
-		
 		switch (st.getState())
 		{
 			case State.CREATED:
@@ -131,7 +126,7 @@ public class Q00003_WillTheSealBeBroken extends Quest
 				}
 				else
 				{
-					st.giveItems(ENCHANT, 1);
+					giveItems(player, ENCHANT, 1);
 					st.exitQuest(false, true);
 					htmltext = "30141-06.html";
 				}
@@ -143,13 +138,13 @@ public class Q00003_WillTheSealBeBroken extends Quest
 		return htmltext;
 	}
 	
-	private static void giveItem(QuestState st, int item, int... items)
+	private static void giveItem(L2PcInstance player, QuestState st, int item, int... items)
 	{
-		if (!st.hasQuestItems(item))
+		if (!hasQuestItems(player, item))
 		{
-			st.giveItems(item, 1);
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
-			if (st.hasQuestItems(items))
+			giveItems(player, item, 1);
+			playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			if (hasQuestItems(player, items))
 			{
 				st.setCond(2, true);
 			}

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

@@ -89,11 +89,6 @@ public class Q00004_LongLiveThePaagrioLord extends Quest
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);
-		if (st == null)
-		{
-			return htmltext;
-		}
-		
 		switch (npc.getId())
 		{
 			case NAKUSIN:
@@ -109,11 +104,11 @@ public class Q00004_LongLiveThePaagrioLord extends Quest
 						}
 						else
 						{
-							st.giveItems(CLUB, 1);
+							giveItems(player, CLUB, 1);
 							// Newbie Guide
 							showOnScreenMsg(player, NpcStringId.DELIVERY_DUTY_COMPLETE_N_GO_FIND_THE_NEWBIE_GUIDE, 2, 5000);
-							st.addExpAndSp(4254, 335);
-							st.giveAdena(1850, true);
+							addExpAndSp(player, 4254, 335);
+							giveAdena(player, 1850, true);
 							st.exitQuest(false, true);
 							htmltext = "30578-06.html";
 						}
@@ -124,40 +119,40 @@ public class Q00004_LongLiveThePaagrioLord extends Quest
 				}
 				break;
 			case VARKEES:
-				htmltext = giveItem(st, npc.getId(), HONEY_KHANDAR, getRegisteredItemIds());
+				htmltext = giveItem(player, st, npc.getId(), HONEY_KHANDAR, getRegisteredItemIds());
 				break;
 			case URUTU:
-				htmltext = giveItem(st, npc.getId(), DEEP_SEA_ORB, getRegisteredItemIds());
+				htmltext = giveItem(player, st, npc.getId(), DEEP_SEA_ORB, getRegisteredItemIds());
 				break;
 			case HESTUI:
-				htmltext = giveItem(st, npc.getId(), BEAR_FUR_CLOAK, getRegisteredItemIds());
+				htmltext = giveItem(player, st, npc.getId(), BEAR_FUR_CLOAK, getRegisteredItemIds());
 				break;
 			case KUNAI:
-				htmltext = giveItem(st, npc.getId(), SPIDER_DUST, getRegisteredItemIds());
+				htmltext = giveItem(player, st, npc.getId(), SPIDER_DUST, getRegisteredItemIds());
 				break;
 			case USKA:
-				htmltext = giveItem(st, npc.getId(), ANCESTOR_SKULL, getRegisteredItemIds());
+				htmltext = giveItem(player, st, npc.getId(), ANCESTOR_SKULL, getRegisteredItemIds());
 				break;
 			case GROOKIN:
-				htmltext = giveItem(st, npc.getId(), BLOODY_AXE, getRegisteredItemIds());
+				htmltext = giveItem(player, st, npc.getId(), BLOODY_AXE, getRegisteredItemIds());
 				break;
 		}
 		return htmltext;
 	}
 	
-	private static String giveItem(QuestState st, int npcId, int itemId, int... items)
+	private static String giveItem(L2PcInstance player, QuestState st, int npcId, int itemId, int... items)
 	{
 		if (!st.isStarted())
 		{
-			return getNoQuestMsg(st.getPlayer());
+			return getNoQuestMsg(player);
 		}
-		else if (st.hasQuestItems(itemId))
+		else if (hasQuestItems(player, itemId))
 		{
 			return npcId + "-02.html";
 		}
-		st.giveItems(itemId, 1);
-		st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
-		if (st.hasQuestItems(items))
+		giveItems(player, itemId, 1);
+		playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+		if (hasQuestItems(player, items))
 		{
 			st.setCond(2, true);
 		}

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

@@ -71,17 +71,17 @@ public class Q00005_MinersFavor extends Quest
 		{
 			case "30554-03.htm":
 				st.startQuest();
-				st.giveItems(BOLTERS_LIST, 1);
-				st.giveItems(BOLTERS_SMELLY_SOCKS, 1);
+				giveItems(player, BOLTERS_LIST, 1);
+				giveItems(player, BOLTERS_SMELLY_SOCKS, 1);
 				break;
 			case "30526-02.html":
-				if (!st.hasQuestItems(BOLTERS_SMELLY_SOCKS))
+				if (!hasQuestItems(player, BOLTERS_SMELLY_SOCKS))
 				{
 					return "30526-04.html";
 				}
-				st.takeItems(BOLTERS_SMELLY_SOCKS, -1);
-				st.giveItems(MINERS_PICK, 1);
-				checkProgress(st);
+				takeItems(player, BOLTERS_SMELLY_SOCKS, -1);
+				giveItems(player, MINERS_PICK, 1);
+				checkProgress(player, st);
 				break;
 			case "30554-05.html":
 				break;
@@ -97,11 +97,6 @@ public class Q00005_MinersFavor extends Quest
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);
-		if (st == null)
-		{
-			return htmltext;
-		}
-		
 		switch (npc.getId())
 		{
 			case BOLTER:
@@ -117,9 +112,9 @@ public class Q00005_MinersFavor extends Quest
 						}
 						else
 						{
-							st.giveAdena(2466, true);
-							st.addExpAndSp(5672, 446);
-							st.giveItems(NECKLACE, 1);
+							giveAdena(player, 2466, true);
+							addExpAndSp(player, 5672, 446);
+							giveItems(player, NECKLACE, 1);
 							st.exitQuest(false, true);
 							// Newbie Guide
 							showOnScreenMsg(player, NpcStringId.DELIVERY_DUTY_COMPLETE_N_GO_FIND_THE_NEWBIE_GUIDE, 2, 5000);
@@ -134,43 +129,43 @@ public class Q00005_MinersFavor extends Quest
 			case BRUNON:
 				if (st.isStarted())
 				{
-					htmltext = (st.hasQuestItems(MINERS_PICK)) ? "30526-03.html" : "30526-01.html";
+					htmltext = (hasQuestItems(player, MINERS_PICK)) ? "30526-03.html" : "30526-01.html";
 				}
 				break;
 			case REED:
-				htmltext = giveItem(st, npc.getId(), REDSTONE_BEER);
+				htmltext = giveItem(player, st, npc.getId(), REDSTONE_BEER);
 				break;
 			case SHARI:
-				htmltext = giveItem(st, npc.getId(), BOOMBOOM_POWDER);
+				htmltext = giveItem(player, st, npc.getId(), BOOMBOOM_POWDER);
 				break;
 			case GARITA:
-				htmltext = giveItem(st, npc.getId(), MINING_BOOTS);
+				htmltext = giveItem(player, st, npc.getId(), MINING_BOOTS);
 				break;
 		}
 		return htmltext;
 	}
 	
-	private static void checkProgress(QuestState st)
+	private static void checkProgress(L2PcInstance player, QuestState st)
 	{
-		if (st.hasQuestItems(BOLTERS_LIST, MINING_BOOTS, MINERS_PICK, BOOMBOOM_POWDER, REDSTONE_BEER))
+		if (hasQuestItems(player, BOLTERS_LIST, MINING_BOOTS, MINERS_PICK, BOOMBOOM_POWDER, REDSTONE_BEER))
 		{
 			st.setCond(2, true);
 		}
 	}
 	
-	private static String giveItem(QuestState st, int npcId, int itemId)
+	private static String giveItem(L2PcInstance player, QuestState st, int npcId, int itemId)
 	{
 		if (!st.isStarted())
 		{
 			return getNoQuestMsg(st.getPlayer());
 		}
-		else if (st.hasQuestItems(itemId))
+		else if (hasQuestItems(player, itemId))
 		{
 			return npcId + "-02.html";
 		}
-		st.giveItems(itemId, 1);
-		st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
-		checkProgress(st);
+		giveItems(player, itemId, 1);
+		playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+		checkProgress(player, st);
 		return npcId + "-01.html";
 	}
 }