JYTHON: Fixes for various reports:

	* Adding despawn delay for Raldo in quest 211, thx _DS_ for reporting, fixes #2306
	* Clean up of 218 and use of proper conditions, thx zerghase
	* Small fix for 637, thx Azuul
	* Clean up of 216, thx me

datapack_development/data/scripts/quests/211_TrialOfChallenger/__init__.py

@@ -189,11 +189,11 @@ class Quest (JQuest) :
       st.giveItems(WATCHERS_EYE2,1)
       st.playSound("ItemSound.quest_middle")
       st.set("cond","7")
-      st.addSpawn(30646,npc,0,0)
+      st.addSpawn(30646,npc,0,300000)
    elif npcId == 27114 and cond == 9 :
       st.set("cond","10")
       st.playSound("ItemSound.quest_middle")
-      st.addSpawn(30646,npc,0,0)
+      st.addSpawn(30646,npc,0,300000)
    return
 
 QUEST       = Quest(211,qn,"Trial Of Challenger")

datapack_development/data/scripts/quests/216_TrialOfGuildsman/__init__.py

@@ -52,91 +52,86 @@ class Quest (JQuest) :
         st.giveItems(VALKONS_RECOMMEND_ID,1)
         st.takeItems(ADENA_ID,2000)
     elif event == "30103_1" :
-          htmltext = "30103-04.htm"
+        htmltext = "30103-04.htm"
     elif event == "30103_2" :
-          if st.getQuestItemsCount(ADENA_ID) >= 2000 :
+        if st.getQuestItemsCount(ADENA_ID) >= 2000 :
             htmltext = "30103-05.htm"
-          else:
+        else:
             htmltext = "30103-05a.htm"
     elif event == "30103_3" :
-          if st.getGameTicks() != st.getInt("id") :
-            st.set("id",str(st.getGameTicks()))
-            htmltext = "30103-09a.htm"
-            st.set("cond","0")
-            st.set("onlyone","1")
-            st.exitQuest(False)
-            st.playSound("ItemSound.quest_finish")
-            st.addExpAndSp(32000,3900)
-            st.takeItems(JOURNEYMAN_RING_ID,st.getQuestItemsCount(JOURNEYMAN_RING_ID))
-            st.takeItems(ALLTRANS_INSTRUCTIONS_ID,1)
-            st.takeItems(RP_JOURNEYMAN_RING_ID,1)
-            st.giveItems(MARK_OF_GUILDSMAN_ID,1)
+        htmltext = "30103-09a.htm"
+        st.set("cond","0")
+        st.set("onlyone","1")
+        st.exitQuest(False)
+        st.playSound("ItemSound.quest_finish")
+        st.addExpAndSp(32000,3900)
+        st.takeItems(JOURNEYMAN_RING_ID,st.getQuestItemsCount(JOURNEYMAN_RING_ID))
+        st.takeItems(ALLTRANS_INSTRUCTIONS_ID,1)
+        st.takeItems(RP_JOURNEYMAN_RING_ID,1)
+        st.giveItems(MARK_OF_GUILDSMAN_ID,1)
     elif event == "30103_4" :
-            st.addExpAndSp(80933,12250)
-            st.giveItems(7562,8)
-            htmltext = "30103-09b.htm"
-            st.set("cond","0")
-            st.set("onlyone","1")
-            st.exitQuest(False)
-            st.playSound("ItemSound.quest_finish")
-            st.takeItems(JOURNEYMAN_RING_ID,st.getQuestItemsCount(JOURNEYMAN_RING_ID))
-            st.takeItems(ALLTRANS_INSTRUCTIONS_ID,1)
-            st.takeItems(RP_JOURNEYMAN_RING_ID,1)
-            st.giveItems(MARK_OF_GUILDSMAN_ID,1)
+        st.addExpAndSp(80933,12250)
+        st.giveItems(7562,8)
+        htmltext = "30103-09b.htm"
+        st.set("cond","0")
+        st.set("onlyone","1")
+        st.exitQuest(False)
+        st.playSound("ItemSound.quest_finish")
+        st.takeItems(JOURNEYMAN_RING_ID,st.getQuestItemsCount(JOURNEYMAN_RING_ID))
+        st.takeItems(ALLTRANS_INSTRUCTIONS_ID,1)
+        st.takeItems(RP_JOURNEYMAN_RING_ID,1)
+        st.giveItems(MARK_OF_GUILDSMAN_ID,1)
     elif event == "30283_1" :
-          htmltext = "30283-03.htm"
-          st.giveItems(ALLTRANS_INSTRUCTIONS_ID,1)
-          st.takeItems(VALKONS_RECOMMEND_ID,1)
-          st.giveItems(RP_JOURNEYMAN_RING_ID,1)
-          st.takeItems(MANDRAGORA_BERRY_ID,1)
-          st.giveItems(ALLTRANS_RECOMMEND1_ID,1)
-          st.giveItems(ALLTRANS_RECOMMEND2_ID,1)
+        htmltext = "30283-03.htm"
+        st.giveItems(ALLTRANS_INSTRUCTIONS_ID,1)
+        st.takeItems(VALKONS_RECOMMEND_ID,1)
+        st.giveItems(RP_JOURNEYMAN_RING_ID,1)
+        st.takeItems(MANDRAGORA_BERRY_ID,1)
+        st.giveItems(ALLTRANS_RECOMMEND1_ID,1)
+        st.giveItems(ALLTRANS_RECOMMEND2_ID,1)
     elif event == "30210_1" :
-          htmltext = "30210-02.htm"
+        htmltext = "30210-02.htm"
     elif event == "30210_2" :
-          htmltext = "30210-03.htm"
+        htmltext = "30210-03.htm"
     elif event == "30210_3" :
-          htmltext = "30210-04.htm"
-          st.giveItems(NORMANS_INSTRUCTIONS_ID,1)
-          st.takeItems(ALLTRANS_RECOMMEND1_ID,1)
-          st.giveItems(NORMANS_RECEIPT_ID,1)
+        htmltext = "30210-04.htm"
+        st.giveItems(NORMANS_INSTRUCTIONS_ID,1)
+        st.takeItems(ALLTRANS_RECOMMEND1_ID,1)
+        st.giveItems(NORMANS_RECEIPT_ID,1)
     elif event == "30210_4" :
-          htmltext = "30210-08.htm"
+        htmltext = "30210-08.htm"
     elif event == "30210_5" :
-          htmltext = "30210-09.htm"
+        htmltext = "30210-09.htm"
     elif event == "30210_6" :
-          htmltext = "30210-10.htm"
-          st.takeItems(DUNINGS_KEY_ID,st.getQuestItemsCount(DUNINGS_KEY_ID))
-          st.giveItems(NORMANS_LIST_ID,1)
-          st.takeItems(NORMANS_INSTRUCTIONS_ID,1)
+        htmltext = "30210-10.htm"
+        st.takeItems(DUNINGS_KEY_ID,st.getQuestItemsCount(DUNINGS_KEY_ID))
+        st.giveItems(NORMANS_LIST_ID,1)
+        st.takeItems(NORMANS_INSTRUCTIONS_ID,1)
     elif event == "30688_1" :
-          htmltext = "30688-02.htm"
-          st.giveItems(DUNINGS_INSTRUCTIONS_ID,1)
-          st.takeItems(NORMANS_RECEIPT_ID,1)
+        htmltext = "30688-02.htm"
+        st.giveItems(DUNINGS_INSTRUCTIONS_ID,1)
+        st.takeItems(NORMANS_RECEIPT_ID,1)
     elif event == "30298_1" :
-          htmltext = "30298-03.htm"
+        htmltext = "30298-03.htm"
     elif event == "30298_2" :
-          if st.getPlayer().getClassId().getId() == 0x36 :
+        if st.getPlayer().getClassId().getId() == 0x36 :
             htmltext = "30298-04.htm"
             st.giveItems(PINTERS_INSTRUCTIONS_ID,1)
             st.takeItems(ALLTRANS_RECOMMEND2_ID,1)
-          else:
+        else:
             htmltext = "30298-05.htm"
             st.giveItems(RP_AMBER_BEAD_ID,1)
             st.takeItems(ALLTRANS_RECOMMEND2_ID,1)
             st.giveItems(PINTERS_INSTRUCTIONS_ID,1)
     return htmltext
 
-
  def onTalk (self,npc,player):
    htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
-
    npcId = npc.getNpcId()
    id = st.getState()
    if npcId != 30103 and id != State.STARTED : return htmltext
-
    if npcId == 30103 and st.getInt("cond")==0 and st.getInt("onlyone")==0 :
           if player.getClassId().getId() in [0x38, 0x36] :
             if player.getLevel() < 35 :
@@ -221,19 +216,16 @@ class Quest (JQuest) :
 
    npcId = npc.getNpcId()
    if npcId == 20223 :
-     st.set("id","0")
      if st.getInt("cond") >= 1 and st.getQuestItemsCount(VALKONS_RECOMMEND_ID) == 1 and st.getQuestItemsCount(MANDRAGORA_BERRY_ID) == 0 :
        if st.getRandom(100) <= 20 :
          st.giveItems(MANDRAGORA_BERRY_ID,1)
          st.playSound("ItemSound.quest_middle")
    elif npcId in range(20154,20157):
-     st.set("id","0")
      if st.getInt("cond") >= 1 and st.getQuestItemsCount(VALKONS_RECOMMEND_ID) == 1 and st.getQuestItemsCount(MANDRAGORA_BERRY_ID) == 0 :
        if st.getRandom(100) <= 50 :
         st.giveItems(MANDRAGORA_BERRY_ID,1)
         st.playSound("ItemSound.quest_middle")
    elif npcId in range(20267,20272):
-    st.set("id","0")
     if st.getInt("cond") >= 1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) == 1 and st.getQuestItemsCount(NORMANS_INSTRUCTIONS_ID) == 1 and st.getQuestItemsCount(DUNINGS_INSTRUCTIONS_ID) == 1 :
      if st.getRandom(100) <= 30 and st.getQuestItemsCount(DUNINGS_KEY_ID) <= 29 :
       if st.getQuestItemsCount(DUNINGS_KEY_ID) == 29 :
@@ -244,7 +236,6 @@ class Quest (JQuest) :
         st.giveItems(DUNINGS_KEY_ID,1)
         st.playSound("ItemSound.quest_itemget")
    elif npcId in [20201,20200]:
-    st.set("id","0")
     if st.getInt("cond") >= 1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) == 1 and st.getQuestItemsCount(NORMANS_LIST_ID) == 1 and st.getQuestItemsCount(GRAY_BONE_POWDER_ID) <= 68 :
      if st.getQuestItemsCount(GRAY_BONE_POWDER_ID) == 68 :
       st.giveItems(GRAY_BONE_POWDER_ID,2)
@@ -253,7 +244,6 @@ class Quest (JQuest) :
       st.giveItems(GRAY_BONE_POWDER_ID,2)
       st.playSound("ItemSound.quest_itemget")
    elif npcId == 20083 :
-    st.set("id","0")
     if st.getInt("cond") >= 1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) == 1 and st.getQuestItemsCount(NORMANS_LIST_ID) == 1 and st.getQuestItemsCount(GRANITE_WHETSTONE_ID) <= 68 :
      if st.getQuestItemsCount(GRANITE_WHETSTONE_ID) == 68 :
       st.giveItems(GRANITE_WHETSTONE_ID,2)
@@ -262,7 +252,6 @@ class Quest (JQuest) :
       st.giveItems(GRANITE_WHETSTONE_ID,2)
       st.playSound("ItemSound.quest_itemget")
    elif npcId == 20202 :
-    st.set("id","0")
     if st.getInt("cond") >= 1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) == 1 and st.getQuestItemsCount(NORMANS_LIST_ID) == 1 and st.getQuestItemsCount(RED_PIGMENT_ID) <= 68 :
      if st.getQuestItemsCount(RED_PIGMENT_ID) == 68 :
       st.giveItems(RED_PIGMENT_ID,2)
@@ -271,7 +260,6 @@ class Quest (JQuest) :
       st.giveItems(RED_PIGMENT_ID,2)
       st.playSound("ItemSound.quest_itemget")
    elif npcId == 20168 :
-    st.set("id","0")
     if st.getInt("cond") >= 1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) == 1 and st.getQuestItemsCount(NORMANS_LIST_ID) == 1 and st.getQuestItemsCount(BRAIDED_YARN_ID) <= 68 :
      if st.getQuestItemsCount(BRAIDED_YARN_ID) == 68 :
       st.giveItems(BRAIDED_YARN_ID,2)
@@ -280,7 +268,6 @@ class Quest (JQuest) :
       st.giveItems(BRAIDED_YARN_ID,2)
       st.playSound("ItemSound.quest_itemget")
    elif npcId in range(20079,20082) :
-    st.set("id","0")
     if st.getInt("cond") >= 1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) == 1 and st.getQuestItemsCount(PINTERS_INSTRUCTIONS_ID) == 1 :
      if st.getQuestItemsCount(AMBER_BEAD_ID) < 70 :
       if st.getRandom(100) < 50 and player.getClassId().getId() == 0x36: #and IsSpoiled() == 1 :

datapack_development/data/scripts/quests/218_TestimonyOfLife/__init__.py

@@ -1,6 +1,7 @@
 # Made by Mr. Have fun! Version 0.2
 # Quest: Testimony Of Life
 # Fixed by Artful (http://L2PLanet.ru Lineage2 C3 Server)
+# rewritten and conditions added by zerghase
 import sys
 from net.sf.l2j.gameserver.model.quest import State
 from net.sf.l2j.gameserver.model.quest import QuestState
@@ -42,333 +43,340 @@ TALINS_AMETHYST_ID = 3170
 TALINS_PERIDOT_ID = 3171
 TALINS_SPEAR_ID = 3026
 
-class Quest (JQuest) :
+class Quest(JQuest):
+	def __init__(self,id,name,descr):
+		JQuest.__init__(self,id,name,descr)
+		self.questItemIds = [CAMOMILE_CHARM_ID, CARDIENS_LETTER_ID, WATER_OF_LIFE_ID, MOONFLOWER_CHARM_ID, HIERARCHS_LETTER_ID, STARDUST_ID,
+			PURE_MITHRIL_CUP_ID, THALIAS_INSTRUCTIONS_ID, ISAELS_LETTER_ID, TEARS_OF_UNICORN_ID, GRAIL_DIAGRAM_ID, PUSHKINS_LIST_ID,
+			THALIAS_LETTER1_ID, ARKENIAS_CONTRACT_ID, ANDARIEL_SCRIPTURE_COPY_ID, ARKENIAS_INSTRUCTIONS_ID, ADONIUS_LIST_ID,
+			THALIAS_LETTER2_ID, TALINS_SPEAR_BLADE_ID, TALINS_SPEAR_SHAFT_ID, TALINS_RUBY_ID, TALINS_AQUAMARINE_ID, TALINS_AMETHYST_ID,
+			TALINS_PERIDOT_ID, ISAELS_INSTRUCTIONS_ID, GRAIL_OF_PURITY_ID]
 
- def __init__(self,id,name,descr):
-     JQuest.__init__(self,id,name,descr)
-     self.questItemIds = [CAMOMILE_CHARM_ID, CARDIENS_LETTER_ID, WATER_OF_LIFE_ID, MOONFLOWER_CHARM_ID, HIERARCHS_LETTER_ID, STARDUST_ID,
-                PURE_MITHRIL_CUP_ID, THALIAS_INSTRUCTIONS_ID, ISAELS_LETTER_ID, TEARS_OF_UNICORN_ID, GRAIL_DIAGRAM_ID, PUSHKINS_LIST_ID,
-                THALIAS_LETTER1_ID, ARKENIAS_CONTRACT_ID, ANDARIEL_SCRIPTURE_COPY_ID, ARKENIAS_INSTRUCTIONS_ID, ADONIUS_LIST_ID,
-                THALIAS_LETTER2_ID, TALINS_SPEAR_BLADE_ID, TALINS_SPEAR_SHAFT_ID, TALINS_RUBY_ID, TALINS_AQUAMARINE_ID, TALINS_AMETHYST_ID,
-                TALINS_PERIDOT_ID, ISAELS_INSTRUCTIONS_ID, GRAIL_OF_PURITY_ID]
+	def onEvent (self,event,st):
+		htmltext = event
+		if event == "1":
+			htmltext = "30460-04.htm"
+			st.set("cond","1")
+			st.setState(State.STARTED)
+			st.playSound("ItemSound.quest_accept")
+			st.giveItems(CARDIENS_LETTER_ID,1)
+		elif event == "30154_1" :
+			htmltext = "30154-02.htm"
+		elif event == "30154_2" :
+			htmltext = "30154-03.htm"
+		elif event == "30154_3" :
+			htmltext = "30154-04.htm"
+		elif event == "30154_4" :
+			htmltext = "30154-05.htm"
+		elif event == "30154_5" :
+			htmltext = "30154-06.htm"
+		elif event == "30154_6" :
+			htmltext = "30154-07.htm"
+			st.set("cond","2")
+			st.takeItems(CARDIENS_LETTER_ID,1)
+			st.giveItems(MOONFLOWER_CHARM_ID,1)
+			st.giveItems(HIERARCHS_LETTER_ID,1)
+		elif event == "30371_1" :
+			htmltext = "30371-02.htm"
+		elif event == "30371_2" :
+			htmltext = "30371-03.htm"
+			st.set("cond","3")
+			st.takeItems(HIERARCHS_LETTER_ID,1)
+			st.giveItems(GRAIL_DIAGRAM_ID,1)
+		elif event == "30371_3" :
+			if st.getPlayer().getLevel() < 38 :
+				htmltext = "30371-10.htm"
+				st.set("cond","13")
+				st.takeItems(STARDUST_ID,1)
+				st.giveItems(THALIAS_INSTRUCTIONS_ID,1)
+			else:
+				htmltext = "30371-11.htm"
+				st.set("cond","14")
+				st.takeItems(STARDUST_ID,1)
+				st.giveItems(THALIAS_LETTER2_ID,1)
+		elif event == "30300_1" :
+			htmltext = "30300-02.htm"
+		elif event == "30300_2" :
+			htmltext = "30300-03.htm"
+		elif event == "30300_3" :
+			htmltext = "30300-04.htm"
+		elif event == "30300_4" :
+			htmltext = "30300-05.htm"
+		elif event == "30300_5" :
+			htmltext = "30300-06.htm"
+			st.set("cond","4")
+			st.takeItems(GRAIL_DIAGRAM_ID,1)
+			st.giveItems(PUSHKINS_LIST_ID,1)
+		elif event == "30300_6" :
+			htmltext = "30300-09.htm"
+		elif event == "30300_7" :
+			htmltext = "30300-10.htm"
+			st.set("cond","6")
+			st.takeItems(PURE_MITHRIL_ORE_ID,st.getQuestItemsCount(PURE_MITHRIL_ORE_ID))
+			st.takeItems(ANT_SOLDIER_ACID_ID,st.getQuestItemsCount(ANT_SOLDIER_ACID_ID))
+			st.takeItems(WYRMS_TALON1_ID,st.getQuestItemsCount(WYRMS_TALON1_ID))
+			st.takeItems(PUSHKINS_LIST_ID,1)
+			st.giveItems(PURE_MITHRIL_CUP_ID,1)
+		elif event == "30419_1" :
+			htmltext = "30419-02.htm"
+		elif event == "30419_2" :
+			htmltext = "30419-03.htm"
+		elif event == "30419_3" :
+			htmltext = "30419-04.htm"
+			st.set("cond","8")
+			st.takeItems(THALIAS_LETTER1_ID,1)
+			st.giveItems(ARKENIAS_CONTRACT_ID,1)
+			st.giveItems(ARKENIAS_INSTRUCTIONS_ID,1)
+		elif event == "30375_1" :
+			htmltext = "30375-02.htm"
+			st.set("cond","9")
+			st.takeItems(ARKENIAS_INSTRUCTIONS_ID,1)
+			st.giveItems(ADONIUS_LIST_ID,1)
+		elif event == "30655_1" :
+			htmltext = "30655-02.htm"
+			st.set("cond","15")
+			st.takeItems(THALIAS_LETTER2_ID,1)
+			st.giveItems(ISAELS_INSTRUCTIONS_ID,1)
+		return htmltext
 
- def onEvent (self,event,st) :
-    htmltext = event
-    if event == "1":
-        htmltext = "30460-04.htm"
-        st.set("cond","1")
-        st.setState(State.STARTED)
-        st.playSound("ItemSound.quest_accept")
-        st.giveItems(CARDIENS_LETTER_ID,1)
-    elif event == "30154_1" :
-          htmltext = "30154-02.htm"
-    elif event == "30154_2" :
-          htmltext = "30154-03.htm"
-    elif event == "30154_3" :
-          htmltext = "30154-04.htm"
-    elif event == "30154_4" :
-          htmltext = "30154-05.htm"
-    elif event == "30154_5" :
-          htmltext = "30154-06.htm"
-    elif event == "30154_6" :
-          htmltext = "30154-07.htm"
-          st.takeItems(CARDIENS_LETTER_ID,1)
-          st.giveItems(MOONFLOWER_CHARM_ID,1)
-          st.giveItems(HIERARCHS_LETTER_ID,1)
-    elif event == "30371_1" :
-          htmltext = "30371-02.htm"
-    elif event == "30371_2" :
-          htmltext = "30371-03.htm"
-          st.takeItems(HIERARCHS_LETTER_ID,1)
-          st.giveItems(GRAIL_DIAGRAM_ID,1)
-    elif event == "30371_3" :
-          if st.getPlayer().getLevel() < 38 :
-            htmltext = "30371-10.htm"
-            st.takeItems(STARDUST_ID,1)
-            st.giveItems(THALIAS_INSTRUCTIONS_ID,1)
-          else:
-            htmltext = "30371-11.htm"
-            st.takeItems(STARDUST_ID,1)
-            st.giveItems(THALIAS_LETTER2_ID,1)
-    elif event == "30300_1" :
-          htmltext = "30300-02.htm"
-    elif event == "30300_2" :
-          htmltext = "30300-03.htm"
-    elif event == "30300_3" :
-          htmltext = "30300-04.htm"
-    elif event == "30300_4" :
-          htmltext = "30300-05.htm"
-    elif event == "30300_5" :
-          htmltext = "30300-06.htm"
-          st.takeItems(GRAIL_DIAGRAM_ID,1)
-          st.giveItems(PUSHKINS_LIST_ID,1)
-    elif event == "30300_6" :
-          htmltext = "30300-09.htm"
-    elif event == "30300_7" :
-          htmltext = "30300-10.htm"
-          st.takeItems(PURE_MITHRIL_ORE_ID,st.getQuestItemsCount(PURE_MITHRIL_ORE_ID))
-          st.takeItems(ANT_SOLDIER_ACID_ID,st.getQuestItemsCount(ANT_SOLDIER_ACID_ID))
-          st.takeItems(WYRMS_TALON1_ID,st.getQuestItemsCount(WYRMS_TALON1_ID))
-          st.takeItems(PUSHKINS_LIST_ID,1)
-          st.giveItems(PURE_MITHRIL_CUP_ID,1)
-    elif event == "30419_1" :
-          htmltext = "30419-02.htm"
-    elif event == "30419_2" :
-          htmltext = "30419-03.htm"
-    elif event == "30419_3" :
-          htmltext = "30419-04.htm"
-          st.takeItems(THALIAS_LETTER1_ID,1)
-          st.giveItems(ARKENIAS_CONTRACT_ID,1)
-          st.giveItems(ARKENIAS_INSTRUCTIONS_ID,1)
-    elif event == "30375_1" :
-          htmltext = "30375-02.htm"
-          st.takeItems(ARKENIAS_INSTRUCTIONS_ID,1)
-          st.giveItems(ADONIUS_LIST_ID,1)
-    elif event == "30655_1" :
-          htmltext = "30655-02.htm"
-          st.takeItems(THALIAS_LETTER2_ID,1)
-          st.giveItems(ISAELS_INSTRUCTIONS_ID,1)
-    return htmltext
+	def onTalk (self,npc,player):
+		htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
+		st = player.getQuestState(qn)
+		if not st: return htmltext
+		npcId = npc.getNpcId()
+		id = st.getState()
+		if npcId != 30460 and id!=State.STARTED: return htmltext
+		if npcId == 30460:
+			if st.getInt("cond")==0:
+				if id==State.COMPLETED:
+					htmltext = "<html><body>This quest has already been completed.</body></html>"
+				else:
+					if player.getRace().ordinal()==1:
+						if player.getLevel() < 37:
+							htmltext = "30460-02.htm"
+							st.exitQuest(1)
+						else:
+							htmltext = "30460-03.htm"
+					else:
+						htmltext = "30460-01.htm"
+			elif st.getQuestItemsCount(CARDIENS_LETTER_ID):
+				htmltext = "30460-05.htm"
+			elif st.getQuestItemsCount(MOONFLOWER_CHARM_ID):
+				htmltext = "30460-06.htm"
+			elif st.getQuestItemsCount(CAMOMILE_CHARM_ID):
+				if st.getGameTicks() != st.getInt("id"):
+					st.set("id",str(st.getGameTicks()))
+					st.addExpAndSp(104591,11250)
+					st.giveItems(7562,16)
+					st.giveItems(MARK_OF_LIFE_ID,1)
+					st.takeItems(CAMOMILE_CHARM_ID,1)
+					htmltext = "30460-07.htm"
+					st.set("cond","22")
+					st.exitQuest(False)
+					st.playSound("ItemSound.quest_finish")
+		elif npcId == 30154:
+			if st.getQuestItemsCount(CARDIENS_LETTER_ID):
+				htmltext = "30154-01.htm"
+			elif st.getQuestItemsCount(WATER_OF_LIFE_ID):
+				htmltext = "30154-09.htm"
+				st.set("cond","21")
+				st.takeItems(WATER_OF_LIFE_ID,1)
+				st.takeItems(MOONFLOWER_CHARM_ID,1)
+				st.giveItems(CAMOMILE_CHARM_ID,1)
+			elif st.getQuestItemsCount(MOONFLOWER_CHARM_ID):
+				htmltext = "30154-08.htm"
+			elif st.getQuestItemsCount(CAMOMILE_CHARM_ID):
+				htmltext = "30154-10.htm"
+		elif npcId == 30371:
+			if st.getQuestItemsCount(HIERARCHS_LETTER_ID):
+				htmltext = "30371-01.htm"
+			elif st.getQuestItemsCount(GRAIL_DIAGRAM_ID):
+				htmltext = "30371-04.htm"
+			elif st.getQuestItemsCount(PUSHKINS_LIST_ID):
+				htmltext = "30371-05.htm"
+			elif st.getQuestItemsCount(PURE_MITHRIL_CUP_ID):
+				htmltext = "30371-06.htm"
+				st.set("cond","7")
+				st.takeItems(PURE_MITHRIL_CUP_ID,1)
+				st.giveItems(THALIAS_LETTER1_ID,1)
+			elif st.getQuestItemsCount(THALIAS_LETTER1_ID):
+				htmltext = "30371-07.htm"
+			elif st.getQuestItemsCount(ARKENIAS_CONTRACT_ID):
+				htmltext = "30371-08.htm"
+			elif st.getQuestItemsCount(STARDUST_ID):
+				htmltext = "30371-09.htm"
+			elif st.getQuestItemsCount(THALIAS_INSTRUCTIONS_ID):
+				if player.getLevel() < 38:
+					htmltext = "30371-12.htm"
+					st.set("cond","13")
+				else:
+					st.set("cond","14")
+					st.takeItems(THALIAS_INSTRUCTIONS_ID,1)
+					st.giveItems(THALIAS_LETTER2_ID,1)
+			elif st.getQuestItemsCount(THALIAS_LETTER2_ID):
+				htmltext = "30371-14.htm"
+			elif st.getQuestItemsCount(ISAELS_INSTRUCTIONS_ID):
+				htmltext = "30371-15.htm"
+			elif st.getQuestItemsCount(ISAELS_LETTER_ID):
+				htmltext = "30371-16.htm"
+				st.set("cond","18")
+				st.takeItems(ISAELS_LETTER_ID,1)
+				st.giveItems(GRAIL_OF_PURITY_ID,1)
+			elif st.getQuestItemsCount(GRAIL_OF_PURITY_ID):
+				htmltext = "30371-17.htm"
+			elif st.getQuestItemsCount(TEARS_OF_UNICORN_ID):
+				htmltext = "30371-18.htm"
+				st.set("cond","20")
+				st.takeItems(TEARS_OF_UNICORN_ID,1)
+				st.giveItems(WATER_OF_LIFE_ID,1)
+			elif st.getQuestItemsCount(WATER_OF_LIFE_ID):
+				htmltext = "30371-19.htm"
+		elif npcId == 30300:
+			if st.getQuestItemsCount(GRAIL_DIAGRAM_ID):
+				htmltext = "30300-01.htm"
+			elif st.getQuestItemsCount(PUSHKINS_LIST_ID):
+				if st.getInt("cond")==5:
+					htmltext = "30300-08.htm"
+				else:
+					htmltext = "30300-07.htm"
+			elif st.getQuestItemsCount(PURE_MITHRIL_CUP_ID):
+				htmltext = "30300-11.htm"
+			elif st.getInt("cond")>5:
+				htmltext = "30300-12.htm"
+		elif npcId == 30419:
+			if st.getQuestItemsCount(THALIAS_LETTER1_ID):
+				htmltext = "30419-01.htm"
+			elif st.getQuestItemsCount(ARKENIAS_INSTRUCTIONS_ID) or st.getQuestItemsCount(ADONIUS_LIST_ID):
+				htmltext = "30419-05.htm"
+			elif st.getQuestItemsCount(ANDARIEL_SCRIPTURE_COPY_ID):
+				htmltext = "30419-06.htm"
+				st.set("cond","12")
+				st.takeItems(ARKENIAS_CONTRACT_ID,1)
+				st.takeItems(ANDARIEL_SCRIPTURE_COPY_ID,1)
+				st.giveItems(STARDUST_ID,1)
+			elif st.getQuestItemsCount(STARDUST_ID):
+				htmltext = "30419-07.htm"
+			else:
+				htmltext = "30419-08.htm"
+		elif npcId == 30375:
+			if st.getQuestItemsCount(ARKENIAS_INSTRUCTIONS_ID):
+				htmltext = "30375-01.htm"
+			elif st.getQuestItemsCount(ADONIUS_LIST_ID):
+				if st.getInt("cond")==10:
+					htmltext = "30375-04.htm"
+					st.set("cond","11")
+					st.takeItems(SPIDER_ICHOR_ID,st.getQuestItemsCount(SPIDER_ICHOR_ID))
+					st.takeItems(HARPYS_DOWN_ID,st.getQuestItemsCount(HARPYS_DOWN_ID))
+					st.takeItems(ADONIUS_LIST_ID,1)
+					st.giveItems(ANDARIEL_SCRIPTURE_COPY_ID,1)
+				else:
+					htmltext = "30375-03.htm"
+			elif st.getQuestItemsCount(ANDARIEL_SCRIPTURE_COPY_ID):
+				htmltext = "30375-05.htm"
+			else:
+				htmltext = "30375-06.htm"
+		elif npcId == 30655:
+			if st.getQuestItemsCount(THALIAS_LETTER2_ID):
+				htmltext = "30655-01.htm"
+			elif st.getQuestItemsCount(ISAELS_INSTRUCTIONS_ID):
+				if self.isSpearComplete(st):
+					htmltext = "30655-04.htm"
+					st.set("cond","17")
+					st.takeItems(TALINS_SPEAR_BLADE_ID,1)
+					st.takeItems(TALINS_SPEAR_SHAFT_ID,1)
+					st.takeItems(TALINS_RUBY_ID,1)
+					st.takeItems(TALINS_AQUAMARINE_ID,1)
+					st.takeItems(TALINS_AMETHYST_ID,1)
+					st.takeItems(TALINS_PERIDOT_ID,1)
+					st.takeItems(ISAELS_INSTRUCTIONS_ID,1)
+					st.giveItems(ISAELS_LETTER_ID,1)
+					st.giveItems(TALINS_SPEAR_ID,1)
+				else:
+					htmltext = "30655-03.htm"
+			elif st.getQuestItemsCount(TALINS_SPEAR_ID) and st.getQuestItemsCount(ISAELS_LETTER_ID):
+				htmltext = "30655-05.htm"
+			elif st.getQuestItemsCount(GRAIL_OF_PURITY_ID) or st.getQuestItemsCount(CAMOMILE_CHARM_ID):
+				htmltext = "30655-06.htm"
+		return htmltext
 
+	def onKill(self,npc,player,isPet):
+		st = player.getQuestState(qn)
+		if not st : return
+		if st.getState() != State.STARTED : return
+		npcId = npc.getNpcId()
+		if npcId == 20550:
+			if st.getQuestItemsCount(PUSHKINS_LIST_ID) and st.getQuestItemsCount(PURE_MITHRIL_ORE_ID)<10:
+				if st.getRandom(100)<50:
+					st.giveItems(PURE_MITHRIL_ORE_ID,1)
+					if st.getQuestItemsCount(PURE_MITHRIL_ORE_ID) < 10:
+						st.playSound("ItemSound.quest_itemget")
+					else:
+						st.playSound("ItemSound.quest_middle")
+						if st.getQuestItemsCount(WYRMS_TALON1_ID)>=20 and st.getQuestItemsCount(ANT_SOLDIER_ACID_ID)>=20:
+							st.set("cond","5")
+		elif npcId == 20176:
+			if st.getQuestItemsCount(PUSHKINS_LIST_ID) and st.getQuestItemsCount(WYRMS_TALON1_ID)<20:
+				if st.getRandom(100)<50 :
+					st.giveItems(WYRMS_TALON1_ID,1)
+					if st.getQuestItemsCount(WYRMS_TALON1_ID) < 20:
+						st.playSound("ItemSound.quest_itemget")
+					else:
+						st.playSound("ItemSound.quest_middle")
+						if st.getQuestItemsCount(PURE_MITHRIL_ORE_ID)>=10 and st.getQuestItemsCount(ANT_SOLDIER_ACID_ID)>=20:
+							st.set("cond","5")
+		elif npcId in [20082,20084,20086,20087,20088]:
+			if st.getQuestItemsCount(PUSHKINS_LIST_ID) and st.getQuestItemsCount(ANT_SOLDIER_ACID_ID)<20:
+				chance=80
+				if npcId in [20087,20088]:
+					chance=50
+				if st.getRandom(100)<80:
+					st.giveItems(ANT_SOLDIER_ACID_ID,1)
+					if st.getQuestItemsCount(ANT_SOLDIER_ACID_ID) < 20:
+						st.playSound("ItemSound.quest_itemget")
+					else:
+						st.playSound("ItemSound.quest_middle")
+						if st.getQuestItemsCount(PURE_MITHRIL_ORE_ID)>=10 and st.getQuestItemsCount(WYRMS_TALON1_ID)>=20:
+							st.set("cond","5")
+		elif npcId == 20233:
+			if st.getQuestItemsCount(ADONIUS_LIST_ID) and st.getQuestItemsCount(SPIDER_ICHOR_ID)<20:
+				if st.getRandom(100)<50:
+					st.giveItems(SPIDER_ICHOR_ID,1)
+					if st.getQuestItemsCount(SPIDER_ICHOR_ID) < 20:
+						st.playSound("ItemSound.quest_itemget")
+					else:
+						st.playSound("ItemSound.quest_middle")
+						if st.getQuestItemsCount(HARPYS_DOWN_ID)>=20:
+							st.set("cond","10")
+		elif npcId == 20145 :
+			if st.getQuestItemsCount(ADONIUS_LIST_ID) and st.getQuestItemsCount(HARPYS_DOWN_ID)<20:
+				if st.getRandom(100)<50:
+					st.giveItems(HARPYS_DOWN_ID,1)
+					if st.getQuestItemsCount(HARPYS_DOWN_ID) < 20:
+						st.playSound("ItemSound.quest_itemget")
+					else:
+						st.playSound("ItemSound.quest_middle")
+						if st.getQuestItemsCount(SPIDER_ICHOR_ID)>=20:
+							st.set("cond","10")
+		elif npcId == 27077:
+			if st.getQuestItemsCount(TALINS_SPEAR_ID) and st.getQuestItemsCount(GRAIL_OF_PURITY_ID) and not st.getQuestItemsCount(TEARS_OF_UNICORN_ID):
+				st.takeItems(GRAIL_OF_PURITY_ID,1)
+				st.takeItems(TALINS_SPEAR_ID,1)
+				st.giveItems(TEARS_OF_UNICORN_ID,1)
+				st.set("cond","19")
+		elif npcId in [20581,20582]:
+			if st.getQuestItemsCount(ISAELS_INSTRUCTIONS_ID) and st.getRandom(100) < 50 :
+				for id in [TALINS_SPEAR_BLADE_ID, TALINS_SPEAR_SHAFT_ID, TALINS_RUBY_ID, TALINS_AQUAMARINE_ID, TALINS_AMETHYST_ID]:
+					if not st.getQuestItemsCount(id):
+						st.giveItems(id,1)
+						st.playSound("ItemSound.quest_itemget")
+						return
+				if not st.getQuestItemsCount(TALINS_PERIDOT_ID) :
+					st.giveItems(ALINS_PERIDOT_ID,1)
+					st.playSound("ItemSound.quest_itemget")
+					st.set("cond","16")
+		return
 
- def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
-   st = player.getQuestState(qn)
-   if not st : return htmltext
-
-   npcId = npc.getNpcId()
-   id = st.getState()
-   if npcId != 30460 and id != State.STARTED : return htmltext
-
-   if npcId == 30460 and st.getInt("cond")==0 and st.getInt("onlyone")==0 :
-      if player.getRace().ordinal() != 1 :
-        htmltext = "30460-01.htm"
-      else:
-        if player.getLevel() < 37 :
-          htmltext = "30460-02.htm"
-          st.exitQuest(1)
-        else:
-          htmltext = "30460-03.htm"
-          return htmltext
-   elif npcId == 30460 and st.getInt("cond")==0 and st.getInt("onlyone")==1 :
-      htmltext = "<html><body>This quest has already been completed.</body></html>"
-
-   elif npcId == 30460 and st.getInt("cond")==1 and st.getQuestItemsCount(CARDIENS_LETTER_ID)==1 :
-        htmltext = "30460-05.htm"
-   elif npcId == 30460 and st.getInt("cond")==1 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID)==1 :
-        htmltext = "30460-06.htm"
-   elif npcId == 30460 and st.getInt("cond")==1 and st.getQuestItemsCount(CAMOMILE_CHARM_ID)==1 :
-        if st.getGameTicks() != st.getInt("id") :
-          st.set("id",str(st.getGameTicks()))
-          st.addExpAndSp(104591,11250)
-          st.giveItems(7562,16)
-          st.giveItems(MARK_OF_LIFE_ID,1)
-          st.takeItems(CAMOMILE_CHARM_ID,1)
-          htmltext = "30460-07.htm"
-          st.set("cond","0")
-          st.set("onlyone","1")
-          st.exitQuest(False)
-          st.playSound("ItemSound.quest_finish")
-   elif npcId == 30154 and st.getInt("cond")==1 and st.getQuestItemsCount(CARDIENS_LETTER_ID)==1 :
-        htmltext = "30154-01.htm"
-   elif npcId == 30154 and st.getInt("cond")==1 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID)==1 and st.getQuestItemsCount(WATER_OF_LIFE_ID)==0 :
-        htmltext = "30154-08.htm"
-   elif npcId == 30154 and st.getInt("cond")==1 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) and st.getQuestItemsCount(WATER_OF_LIFE_ID) :
-        htmltext = "30154-09.htm"
-        st.takeItems(WATER_OF_LIFE_ID,1)
-        st.takeItems(MOONFLOWER_CHARM_ID,1)
-        st.giveItems(CAMOMILE_CHARM_ID,1)
-   elif npcId == 30154 and st.getInt("cond")==1 and st.getQuestItemsCount(CAMOMILE_CHARM_ID)==1 :
-        htmltext = "30154-10.htm"
-   elif npcId == 30371 and st.getInt("cond")==1 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) and st.getQuestItemsCount(HIERARCHS_LETTER_ID) :
-        htmltext = "30371-01.htm"
-   elif npcId == 30371 and st.getInt("cond")==1 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) and st.getQuestItemsCount(GRAIL_DIAGRAM_ID) :
-        htmltext = "30371-04.htm"
-   elif npcId == 30371 and st.getInt("cond")==1 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) and st.getQuestItemsCount(PUSHKINS_LIST_ID) :
-        htmltext = "30371-05.htm"
-   elif npcId == 30371 and st.getInt("cond")==1 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) and st.getQuestItemsCount(PURE_MITHRIL_CUP_ID) :
-        htmltext = "30371-06.htm"
-        st.takeItems(PURE_MITHRIL_CUP_ID,1)
-        st.giveItems(THALIAS_LETTER1_ID,1)
-   elif npcId == 30371 and st.getInt("cond")==1 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) and st.getQuestItemsCount(THALIAS_LETTER1_ID) :
-        htmltext = "30371-07.htm"
-   elif npcId == 30371 and st.getInt("cond")==1 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) and st.getQuestItemsCount(ARKENIAS_CONTRACT_ID) :
-        htmltext = "30371-08.htm"
-   elif npcId == 30371 and st.getInt("cond")==1 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) and st.getQuestItemsCount(STARDUST_ID) :
-        htmltext = "30371-09.htm"
-   elif npcId == 30371 and st.getInt("cond")==1 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) and st.getQuestItemsCount(THALIAS_INSTRUCTIONS_ID) :
-        if player.getLevel() < 38 :
-          htmltext = "30371-12.htm"
-        else:
-          htmltext = "30371-13.htm"
-          st.takeItems(THALIAS_INSTRUCTIONS_ID,1)
-          st.giveItems(THALIAS_LETTER2_ID,1)
-   elif npcId == 30371 and st.getInt("cond")==1 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) and st.getQuestItemsCount(THALIAS_LETTER2_ID) :
-        htmltext = "30371-14.htm"
-   elif npcId == 30371 and st.getInt("cond")==1 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) and st.getQuestItemsCount(ISAELS_INSTRUCTIONS_ID) :
-        htmltext = "30371-15.htm"
-   elif npcId == 30371 and st.getInt("cond")==1 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) and st.getQuestItemsCount(TALINS_SPEAR_ID) and st.getQuestItemsCount(ISAELS_LETTER_ID) :
-        htmltext = "30371-16.htm"
-        st.takeItems(ISAELS_LETTER_ID,1)
-        st.giveItems(GRAIL_OF_PURITY_ID,1)
-   elif npcId == 30371 and st.getInt("cond")==1 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) and st.getQuestItemsCount(TALINS_SPEAR_ID) and st.getQuestItemsCount(GRAIL_OF_PURITY_ID) :
-        htmltext = "30371-17.htm"
-   elif npcId == 30371 and st.getInt("cond")==1 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) and st.getQuestItemsCount(TEARS_OF_UNICORN_ID) :
-        htmltext = "30371-18.htm"
-        st.takeItems(TEARS_OF_UNICORN_ID,1)
-        st.giveItems(WATER_OF_LIFE_ID,1)
-   elif npcId == 30371 and st.getInt("cond")==1 and st.getQuestItemsCount(CAMOMILE_CHARM_ID) or st.getQuestItemsCount(WATER_OF_LIFE_ID) and st.getQuestItemsCount(MOONFLOWER_CHARM_ID)==1 :
-        htmltext = "30371-19.htm"
-   elif npcId == 30300 and st.getInt("cond")==1 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) and st.getQuestItemsCount(GRAIL_DIAGRAM_ID) :
-        htmltext = "30300-01.htm"
-   elif npcId == 30300 and st.getInt("cond")==1 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) and st.getQuestItemsCount(PUSHKINS_LIST_ID) :
-        if st.getQuestItemsCount(PURE_MITHRIL_ORE_ID) >= 10 and st.getQuestItemsCount(ANT_SOLDIER_ACID_ID) >= 20 and st.getQuestItemsCount(WYRMS_TALON1_ID) >= 20 :
-          htmltext = "30300-08.htm"
-        else:
-          htmltext = "30300-07.htm"
-   elif npcId == 30300 and st.getInt("cond")==1 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) and st.getQuestItemsCount(PURE_MITHRIL_CUP_ID) :
-        htmltext = "30300-11.htm"
-   elif npcId == 30300 and st.getInt("cond")==1 and st.getQuestItemsCount(GRAIL_DIAGRAM_ID) == 0 and st.getQuestItemsCount(PUSHKINS_LIST_ID) == 0 and st.getQuestItemsCount(PURE_MITHRIL_CUP_ID) == 0 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID)==1 :
-        htmltext = "30300-12.htm"
-   elif npcId == 30419 and st.getInt("cond")==1 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) and st.getQuestItemsCount(THALIAS_LETTER1_ID) :
-        htmltext = "30419-01.htm"
-   elif npcId == 30419 and st.getInt("cond")==1 and (st.getQuestItemsCount(ARKENIAS_INSTRUCTIONS_ID) or st.getQuestItemsCount(ADONIUS_LIST_ID)) and st.getQuestItemsCount(MOONFLOWER_CHARM_ID)==1 :
-        htmltext = "30419-05.htm"
-   elif npcId == 30419 and st.getInt("cond")==1 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) and st.getQuestItemsCount(ANDARIEL_SCRIPTURE_COPY_ID) :
-        htmltext = "30419-06.htm"
-        st.takeItems(ARKENIAS_CONTRACT_ID,1)
-        st.takeItems(ANDARIEL_SCRIPTURE_COPY_ID,1)
-        st.giveItems(STARDUST_ID,1)
-   elif npcId == 30419 and st.getInt("cond")==1 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) and st.getQuestItemsCount(STARDUST_ID) :
-        htmltext = "30419-07.htm"
-   elif npcId == 30419 and st.getInt("cond")==1 and st.getQuestItemsCount(THALIAS_LETTER1_ID) == 0 and st.getQuestItemsCount(ARKENIAS_CONTRACT_ID) == 0 and st.getQuestItemsCount(ANDARIEL_SCRIPTURE_COPY_ID) == 0 and st.getQuestItemsCount(STARDUST_ID) == 0 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID)==1 :
-        htmltext = "30419-08.htm"
-   elif npcId == 30375 and st.getInt("cond")==1 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) and st.getQuestItemsCount(ARKENIAS_INSTRUCTIONS_ID) :
-        htmltext = "30375-01.htm"
-   elif npcId == 30375 and st.getInt("cond")==1 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) and st.getQuestItemsCount(ADONIUS_LIST_ID) :
-        if st.getQuestItemsCount(SPIDER_ICHOR_ID) >= 20 and st.getQuestItemsCount(HARPYS_DOWN_ID) >= 20 :
-          htmltext = "30375-04.htm"
-          st.takeItems(SPIDER_ICHOR_ID,st.getQuestItemsCount(SPIDER_ICHOR_ID))
-          st.takeItems(HARPYS_DOWN_ID,st.getQuestItemsCount(HARPYS_DOWN_ID))
-          st.takeItems(ADONIUS_LIST_ID,1)
-          st.giveItems(ANDARIEL_SCRIPTURE_COPY_ID,1)
-        else:
-          htmltext = "30375-03.htm"
-   elif npcId == 30375 and st.getInt("cond")==1 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) and st.getQuestItemsCount(ANDARIEL_SCRIPTURE_COPY_ID) :
-        htmltext = "30375-05.htm"
-   elif npcId == 30375 and st.getInt("cond")==1 and st.getQuestItemsCount(ARKENIAS_INSTRUCTIONS_ID) == 0 and st.getQuestItemsCount(ADONIUS_LIST_ID) == 0 and st.getQuestItemsCount(ANDARIEL_SCRIPTURE_COPY_ID) == 0 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID)==1 :
-        htmltext = "30375-06.htm"
-   elif npcId == 30655 and st.getInt("cond")==1 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) and st.getQuestItemsCount(THALIAS_LETTER2_ID) :
-        htmltext = "30655-01.htm"
-   elif npcId == 30655 and st.getInt("cond")==1 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) and st.getQuestItemsCount(ISAELS_INSTRUCTIONS_ID) :
-        if st.getQuestItemsCount(TALINS_SPEAR_BLADE_ID) and st.getQuestItemsCount(TALINS_SPEAR_SHAFT_ID) and st.getQuestItemsCount(TALINS_RUBY_ID) and st.getQuestItemsCount(TALINS_AQUAMARINE_ID) and st.getQuestItemsCount(TALINS_AMETHYST_ID) and st.getQuestItemsCount(TALINS_PERIDOT_ID) :
-          htmltext = "30655-04.htm"
-          st.takeItems(TALINS_SPEAR_BLADE_ID,1)
-          st.takeItems(TALINS_SPEAR_SHAFT_ID,1)
-          st.takeItems(TALINS_RUBY_ID,1)
-          st.takeItems(TALINS_AQUAMARINE_ID,1)
-          st.takeItems(TALINS_AMETHYST_ID,1)
-          st.takeItems(TALINS_PERIDOT_ID,1)
-          st.takeItems(ISAELS_INSTRUCTIONS_ID,1)
-          st.giveItems(ISAELS_LETTER_ID,1)
-          st.giveItems(TALINS_SPEAR_ID,1)
-        else:
-          htmltext = "30655-03.htm"
-   elif npcId == 30655 and st.getInt("cond")==1 and st.getQuestItemsCount(TALINS_SPEAR_ID) and st.getQuestItemsCount(ISAELS_LETTER_ID) :
-        htmltext = "30655-05.htm"
-   elif npcId == 30655 and st.getInt("cond")==1 and st.getQuestItemsCount(GRAIL_OF_PURITY_ID) or st.getQuestItemsCount(WATER_OF_LIFE_ID) or st.getQuestItemsCount(CAMOMILE_CHARM_ID) and st.getQuestItemsCount(MOONFLOWER_CHARM_ID)==1 :
-        htmltext = "30655-06.htm"
-   return htmltext
-
- def onKill(self,npc,player,isPet):
-   st = player.getQuestState(qn)
-   if not st : return
-   if st.getState() != State.STARTED : return
-   npcId = npc.getNpcId()
-   if npcId == 20550 :
-    st.set("id","0")
-    if st.getInt("cond") and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) == 1 and st.getQuestItemsCount(PUSHKINS_LIST_ID) == 1 and st.getQuestItemsCount(PURE_MITHRIL_ORE_ID)<10 :
-     if st.getRandom(100)<50 :
-       st.giveItems(PURE_MITHRIL_ORE_ID,1)
-       if st.getQuestItemsCount(PURE_MITHRIL_ORE_ID) < 10 :
-         st.playSound("ItemSound.quest_itemget")
-       else:
-         st.playSound("ItemSound.quest_middle")
-   elif npcId == 20176 :
-    st.set("id","0")
-    if st.getInt("cond") and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) == 1 and st.getQuestItemsCount(PUSHKINS_LIST_ID) == 1 and st.getQuestItemsCount(WYRMS_TALON1_ID)<20 :
-     if st.getRandom(100)<50 :
-      st.giveItems(WYRMS_TALON1_ID,1)
-      if st.getQuestItemsCount(WYRMS_TALON1_ID) < 20 :
-        st.playSound("ItemSound.quest_itemget")
-      else:
-        st.playSound("ItemSound.quest_middle")
-   elif npcId in [ 20082,20084,20086] :
-    st.set("id","0")
-    if st.getInt("cond") and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) == 1 and st.getQuestItemsCount(PUSHKINS_LIST_ID) == 1 and st.getQuestItemsCount(ANT_SOLDIER_ACID_ID)<20 :
-     if st.getRandom(100)<80 :
-      st.giveItems(ANT_SOLDIER_ACID_ID,1)
-      if st.getQuestItemsCount(ANT_SOLDIER_ACID_ID) < 20 :
-        st.playSound("ItemSound.quest_itemget")
-      else:
-        st.playSound("ItemSound.quest_middle")
-   elif npcId in [20087,20088] :
-    st.set("id","0")
-    if st.getInt("cond") and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) == 1 and st.getQuestItemsCount(PUSHKINS_LIST_ID) == 1 and st.getQuestItemsCount(ANT_SOLDIER_ACID_ID)<20 :
-     if st.getRandom(100)<50 :
-      st.giveItems(ANT_SOLDIER_ACID_ID,1)
-      if st.getQuestItemsCount(ANT_SOLDIER_ACID_ID) < 20 :
-        st.playSound("ItemSound.quest_itemget")
-      else:
-        st.playSound("ItemSound.quest_middle")
-   elif npcId == 20233 :
-    st.set("id","0")
-    if st.getInt("cond") and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) == 1 and st.getQuestItemsCount(ADONIUS_LIST_ID) == 1 and st.getQuestItemsCount(SPIDER_ICHOR_ID)<20 :
-     if st.getRandom(100)<50 :
-      st.giveItems(SPIDER_ICHOR_ID,1)
-      if st.getQuestItemsCount(SPIDER_ICHOR_ID) < 20 :
-        st.playSound("ItemSound.quest_itemget")
-      else:
-        st.playSound("ItemSound.quest_middle")
-   elif npcId == 20145 :
-    st.set("id","0")
-    if st.getInt("cond") and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) == 1 and st.getQuestItemsCount(ADONIUS_LIST_ID) == 1 and st.getQuestItemsCount(HARPYS_DOWN_ID)<20 :
-     if st.getRandom(100)<50 :
-      st.giveItems(HARPYS_DOWN_ID,1)
-      if st.getQuestItemsCount(HARPYS_DOWN_ID) < 20 :
-        st.playSound("ItemSound.quest_itemget")
-      else:
-        st.playSound("ItemSound.quest_middle")
-   elif npcId == 27077 :
-    if st.getInt("cond") and st.getQuestItemsCount(MOONFLOWER_CHARM_ID) == 1 and st.getQuestItemsCount(TALINS_SPEAR_ID) == 1 and st.getQuestItemsCount(GRAIL_OF_PURITY_ID) == 1 and st.getQuestItemsCount(TEARS_OF_UNICORN_ID) == 0 :
-      if st.getQuestItemsCount(TALINS_SPEAR_ID) > 0 :
-        st.takeItems(GRAIL_OF_PURITY_ID,1)
-        st.takeItems(TALINS_SPEAR_ID,1)
-        st.giveItems(TEARS_OF_UNICORN_ID,1)
-   elif npcId in [20581,20582] :
-    st.set("id","0")
-    if st.getInt("cond") and st.getQuestItemsCount(ISAELS_INSTRUCTIONS_ID) == 1 and st.getRandom(100) < 50 :
-     if st.getQuestItemsCount(TALINS_SPEAR_BLADE_ID) == 0 :
-      st.giveItems(TALINS_SPEAR_BLADE_ID,1)
-      st.playSound("ItemSound.quest_itemget")
-     elif st.getQuestItemsCount(TALINS_SPEAR_SHAFT_ID) == 0 :
-      st.giveItems(TALINS_SPEAR_SHAFT_ID,1)
-      st.playSound("ItemSound.quest_itemget")
-     elif st.getQuestItemsCount(TALINS_RUBY_ID) == 0 :
-      st.giveItems(TALINS_RUBY_ID,1)
-      st.playSound("ItemSound.quest_itemget")
-     elif st.getQuestItemsCount(TALINS_AQUAMARINE_ID) == 0 :
-      st.giveItems(TALINS_AQUAMARINE_ID,1)
-      st.playSound("ItemSound.quest_itemget")
-     elif st.getQuestItemsCount(TALINS_AMETHYST_ID) == 0 :
-      st.giveItems(TALINS_AMETHYST_ID,1)
-      st.playSound("ItemSound.quest_itemget")
-     elif st.getQuestItemsCount(TALINS_PERIDOT_ID) == 0 :
-      st.giveItems(TALINS_PERIDOT_ID,1)
-      st.playSound("ItemSound.quest_middle")
-   return
-
-QUEST       = Quest(218,qn,"Testimony of Life")
+QUEST = Quest(218,qn,"Testimony of Life")
 
 QUEST.addStartNpc(30460)
 

datapack_development/data/scripts/quests/637_ThroughOnceMore/__init__.py

@@ -27,7 +27,6 @@ class Quest (JQuest) :
     if htmltext == "32010-03.htm" :
        st.set("cond","1")
        st.setState(State.STARTED)
-       st.takeItems(FADEDMARK,1)
        st.playSound("ItemSound.quest_accept")
     return htmltext
 
@@ -50,6 +49,7 @@ class Quest (JQuest) :
        if cond == 2 and st.getQuestItemsCount(NECROHEART)==10:
           htmltext = "32010-05.htm"
           st.takeItems(NECROHEART,10)
+          st.takeItems(FADEDMARK,1)
           st.giveItems(MARK,1)
           st.giveItems(8273,10)
           st.exitQuest(False)