BETA: Improved "Special Bait" quests.

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

@@ -28,7 +28,6 @@ import com.l2jserver.gameserver.model.quest.State;
  */
 public class Q00050_LanoscosSpecialBait extends Quest
 {
-	
 	// NPCs
 	private static final int LANOSCO = 31570;
 	private static final int SINGING_WIND = 21026;
@@ -40,28 +39,25 @@ public class Q00050_LanoscosSpecialBait extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		String htmltext = event;
-		final QuestState st = player.getQuestState(getName());
+		QuestState st = player.getQuestState(getName());
 		if (st == null)
 		{
-			return htmltext;
+			return getNoQuestMsg(player);
 		}
 		
+		String htmltext = event;
+		
 		switch (event)
 		{
 			case "31570-03.htm":
-				st.set("cond", "1");
-				st.setState(State.STARTED);
-				st.playSound("ItemSound.quest_accept");
+				st.startQuest();
 				break;
 			case "31570-07.html":
-				if ((st.getInt("cond") == 2) && (st.getQuestItemsCount(ESSENCE_OF_WIND) >= 100))
+				if ((st.isCond(2)) && (st.getQuestItemsCount(ESSENCE_OF_WIND) >= 100))
 				{
 					htmltext = "31570-06.htm";
 					st.giveItems(WIND_FISHING_LURE, 4);
-					st.takeItems(ESSENCE_OF_WIND, -1);
-					st.playSound("ItemSound.quest_finish");
-					st.exitQuest(false);
+					st.exitQuest(false, true);
 				}
 				break;
 		}
@@ -87,7 +83,7 @@ public class Q00050_LanoscosSpecialBait extends Quest
 				htmltext = (player.getLevel() >= 27) ? "31570-01.htm" : "31570-02.html";
 				break;
 			case State.STARTED:
-				htmltext = (st.getInt("cond") == 2) ? "31570-04.html" : "31570-05.html";
+				htmltext = (st.isCond(1)) ? "31570-05.html" : "31570-04.html";
 				break;
 		}
 		return htmltext;
@@ -103,38 +99,23 @@ public class Q00050_LanoscosSpecialBait extends Quest
 		}
 		
 		final QuestState st = partyMember.getQuestState(getName());
-		if (st == null)
-		{
-			return null;
-		}
 		
-		final long count = st.getQuestItemsCount(ESSENCE_OF_WIND);
-		if ((st.getInt("cond") == 1) && (count < 100))
+		if (st.getQuestItemsCount(ESSENCE_OF_WIND) < 100)
 		{
 			float chance = 33 * Config.RATE_QUEST_DROP;
-			float numItems = chance / 100;
-			chance = chance % 100;
-			
 			if (getRandom(100) < chance)
 			{
-				numItems += 1;
-			}
-			if (numItems > 0)
-			{
-				if ((count + numItems) >= 100)
-				{
-					numItems = 100 - count;
-					st.set("cond", "2");
-					st.playSound("ItemSound.quest_middle");
-				}
-				else
-				{
-					st.playSound("ItemSound.quest_itemget");
-				}
-				st.giveItems(ESSENCE_OF_WIND, (int) numItems);
+				st.rewardItems(ESSENCE_OF_WIND, 1);
+				st.playSound("ItemSound.quest_itemget");
 			}
 		}
 		
+		if (st.getQuestItemsCount(ESSENCE_OF_WIND) >= 100)
+		{
+			st.setCond(2, true);
+			
+		}
+		
 		return super.onKill(npc, player, isPet);
 	}
 	
@@ -145,6 +126,10 @@ public class Q00050_LanoscosSpecialBait extends Quest
 		addStartNpc(LANOSCO);
 		addTalkId(LANOSCO);
 		addKillId(SINGING_WIND);
+		questItemIds = new int[]
+		{
+			ESSENCE_OF_WIND
+		};
 	}
 	
 	public static void main(String[] args)

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

@@ -28,7 +28,6 @@ import com.l2jserver.gameserver.model.quest.State;
  */
 public class Q00051_OFullesSpecialBait extends Quest
 {
-	
 	// NPCs
 	private static final int OFULLE = 31572;
 	private static final int FETTERED_SOUL = 20552;
@@ -40,28 +39,25 @@ public class Q00051_OFullesSpecialBait extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		String htmltext = event;
-		final QuestState st = player.getQuestState(getName());
+		QuestState st = player.getQuestState(getName());
 		if (st == null)
 		{
-			return htmltext;
+			return getNoQuestMsg(player);
 		}
 		
+		String htmltext = event;
+		
 		switch (event)
 		{
 			case "31572-03.htm":
-				st.set("cond", "1");
-				st.setState(State.STARTED);
-				st.playSound("ItemSound.quest_accept");
+				st.startQuest();
 				break;
 			case "31572-07.html":
-				if ((st.getInt("cond") == 2) && (st.getQuestItemsCount(LOST_BAIT) >= 100))
+				if ((st.isCond(2)) && (st.getQuestItemsCount(LOST_BAIT) >= 100))
 				{
 					htmltext = "31572-06.htm";
 					st.giveItems(ICY_AIR_LURE, 4);
-					st.takeItems(LOST_BAIT, -1);
-					st.playSound("ItemSound.quest_finish");
-					st.exitQuest(false);
+					st.exitQuest(false, true);
 				}
 				break;
 		}
@@ -87,7 +83,7 @@ public class Q00051_OFullesSpecialBait extends Quest
 				htmltext = (player.getLevel() >= 36) ? "31572-01.htm" : "31572-02.html";
 				break;
 			case State.STARTED:
-				htmltext = (st.getInt("cond") == 1) ? "31572-04.html" : "31572-05.html";
+				htmltext = (st.isCond(1)) ? "31572-05.html" : "31572-04.html";
 				break;
 		}
 		return htmltext;
@@ -103,36 +99,21 @@ public class Q00051_OFullesSpecialBait extends Quest
 		}
 		
 		final QuestState st = partyMember.getQuestState(getName());
-		if (st == null)
-		{
-			return null;
-		}
 		
-		final long count = st.getQuestItemsCount(LOST_BAIT);
-		if ((st.getInt("cond") == 1) && (count < 100))
+		if (st.getQuestItemsCount(LOST_BAIT) < 100)
 		{
 			float chance = 33 * Config.RATE_QUEST_DROP;
-			float numItems = chance / 100;
-			chance = chance % 100;
-			
 			if (getRandom(100) < chance)
 			{
-				numItems += 1;
-			}
-			if (numItems > 0)
-			{
-				if ((count + numItems) >= 100)
-				{
-					numItems = 100 - count;
-				}
-				st.set("cond", "2");
-				st.playSound("ItemSound.quest_middle");
-			}
-			else
-			{
+				st.rewardItems(LOST_BAIT, 1);
 				st.playSound("ItemSound.quest_itemget");
 			}
-			st.giveItems(LOST_BAIT, (int) numItems);
+		}
+		
+		if (st.getQuestItemsCount(LOST_BAIT) >= 100)
+		{
+			st.setCond(2, true);
+			
 		}
 		
 		return super.onKill(npc, player, isPet);
@@ -145,6 +126,10 @@ public class Q00051_OFullesSpecialBait extends Quest
 		addStartNpc(OFULLE);
 		addTalkId(OFULLE);
 		addKillId(FETTERED_SOUL);
+		questItemIds = new int[]
+		{
+			LOST_BAIT
+		};
 	}
 	
 	public static void main(String[] args)

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

@@ -102,7 +102,7 @@ public class Q00052_WilliesSpecialBait extends Quest
 		
 		if (st.getQuestItemsCount(TARLK_EYE) < 100)
 		{
-			float chance = (33 * Config.RATE_QUEST_DROP) % 100;
+			float chance = 33 * Config.RATE_QUEST_DROP;
 			if (getRandom(100) < chance)
 			{
 				st.rewardItems(TARLK_EYE, 1);

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

@@ -29,7 +29,6 @@ import com.l2jserver.gameserver.model.quest.State;
  */
 public class Q00053_LinnaeusSpecialBait extends Quest
 {
-	
 	// NPCs
 	private static final int LINNAEUS = 31577;
 	private static final int CRIMSON_DRAKE = 20670;
@@ -46,27 +45,24 @@ public class Q00053_LinnaeusSpecialBait extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		String htmltext = event;
-		final QuestState st = player.getQuestState(getName());
+		QuestState st = player.getQuestState(getName());
 		if (st == null)
 		{
-			return htmltext;
+			return getNoQuestMsg(player);
 		}
 		
+		String htmltext = event;
+		
 		switch (event)
 		{
 			case "31577-1.htm":
-				st.set("cond", "1");
-				st.setState(State.STARTED);
-				st.playSound("ItemSound.quest_accept");
+				st.startQuest();
 				break;
 			case "31577-3.htm":
-				if ((st.getInt("cond") == 2) && (st.getQuestItemsCount(CRIMSON_DRAKE_HEART) >= 100))
+				if (st.isCond(2) && (st.getQuestItemsCount(CRIMSON_DRAKE_HEART) >= 100))
 				{
 					st.giveItems(FLAMING_FISHING_LURE, 4);
-					st.takeItems(CRIMSON_DRAKE_HEART, -1);
-					st.playSound("ItemSound.quest_finish");
-					st.exitQuest(false);
+					st.exitQuest(false, true);
 				}
 				else
 				{
@@ -96,7 +92,7 @@ public class Q00053_LinnaeusSpecialBait extends Quest
 				htmltext = ((player.getLevel() > 59) && (fishingLevel(player) > 19)) ? "31577-0.htm" : "31577-0a.html";
 				break;
 			case State.STARTED:
-				htmltext = (st.getInt("cond") == 1) ? "31577-4.html" : "31577-2.html";
+				htmltext = (st.isCond(1)) ? "31577-4.html" : "31577-2.html";
 				break;
 		}
 		return htmltext;
@@ -112,36 +108,21 @@ public class Q00053_LinnaeusSpecialBait extends Quest
 		}
 		
 		final QuestState st = partyMember.getQuestState(getName());
-		if (st == null)
-		{
-			return null;
-		}
 		
-		final long count = st.getQuestItemsCount(CRIMSON_DRAKE_HEART);
-		if ((st.getInt("cond") == 1) && (count < 100))
+		if (st.getQuestItemsCount(CRIMSON_DRAKE_HEART) < 100)
 		{
 			float chance = 33 * Config.RATE_QUEST_DROP;
-			float numItems = chance / 100;
-			chance = chance % 100;
-			
 			if (getRandom(100) < chance)
 			{
-				numItems += 1;
-			}
-			if (numItems > 0)
-			{
-				if ((count + numItems) >= 100)
-				{
-					numItems = 100 - count;
-				}
-				st.set("cond", "2");
-				st.playSound("ItemSound.quest_middle");
-			}
-			else
-			{
+				st.rewardItems(CRIMSON_DRAKE_HEART, 1);
 				st.playSound("ItemSound.quest_itemget");
 			}
-			st.giveItems(CRIMSON_DRAKE_HEART, (int) numItems);
+		}
+		
+		if (st.getQuestItemsCount(CRIMSON_DRAKE_HEART) >= 100)
+		{
+			st.setCond(2, true);
+			
 		}
 		
 		return super.onKill(npc, player, isPet);
@@ -170,6 +151,10 @@ public class Q00053_LinnaeusSpecialBait extends Quest
 		addStartNpc(LINNAEUS);
 		addTalkId(LINNAEUS);
 		addKillId(CRIMSON_DRAKE);
+		questItemIds = new int[]
+		{
+			CRIMSON_DRAKE_HEART
+		};
 	}
 	
 	public static void main(String[] args)