JYTHON: Just a medley of cleanups and fixes.

	*Cleanup of 118
	*Removing typo in 173, probably fixes #2135
	*Fixes #2550, thx Silvy for reporting and Charus for pointing out problem
	*Fixes #2318, thx Ky6uk for reporting
	*Small fix/clean in 51
	*Cleanup of SagasSuperclass

datapack_development/data/scripts/quests/118_ToLeadAndBeLed/__init__.py

@@ -75,7 +75,11 @@ class Quest (JQuest) :
                  st.playSound("ItemSound.quest_middle")
                  ap_quest.playSound("ItemSound.quest_middle")
                  htmltext = "30517-10.htm"
-     st.exitQuest(1)
+           elif DEBUG: htmltext = "30517-FE.htm"
+         elif DEBUG: htmltext = "30517-FD.htm"
+       elif DEBUG:htmltext = "30517-FC.htm"
+     elif DEBUG:htmltext = "30517-FB.htm"
+     #st.exitQuest(1) #needed?
    return htmltext 
 
  def onTalk (self,npc,player):
@@ -144,24 +148,13 @@ class Quest (JQuest) :
                     htmltext = "30517-09b.htm"
                  elif ap_cond == 5 :
                     htmltext = "30517-09c.htm"
-                 else :
-                    if DEBUG : htmltext = "30517-FF.htm"
-                    st.exitQuest(1)
-              else :
-                if DEBUG: htmltext = "30517-FE.htm"
-                st.exitQuest(1)
-           else :
-             if DEBUG: htmltext = "30517-FD.htm"
-             st.exitQuest(1)
-        else :
-           if DEBUG:htmltext = "30517-FC.htm"
-           st.exitQuest(1)
-     else :
-       if DEBUG:htmltext = "30517-FB.htm"
-       st.exitQuest(1)
-   else :
-     if DEBUG:htmltext = "30517-FA.htm"
-     st.exitQuest(1)
+                 elif DEBUG : htmltext = "30517-FF.htm"
+              elif DEBUG: htmltext = "30517-FE.htm"
+           elif DEBUG: htmltext = "30517-FD.htm"
+        elif DEBUG:htmltext = "30517-FC.htm"
+     elif DEBUG:htmltext = "30517-FB.htm"
+   elif DEBUG:htmltext = "30517-FA.htm"
+   #st.exitQuest(1) #needed?
    return htmltext
 
  def onKill(self,npc,player,isPet):

datapack_development/data/scripts/quests/173_ToTheIsleOfSouls/__init__.py

@@ -23,7 +23,7 @@ class Quest (JQuest) :
 
  def __init__(self,id,name,descr):
      JQuest.__init__(self,id,name,descr) 
-     self.questItemIds = [MARK_OF_TRAVELER, GWAINS_DOCUMENT, MAGIC_SWORD_HILT]
+     self.questItemIds = [GWAINS_DOCUMENT, MAGIC_SWORD_HILT]
 
  def onEvent (self,event,st) :
      htmltext = event

datapack_development/data/scripts/quests/236_SeedsOfChaos/__init__.py

@@ -102,6 +102,7 @@ class Quest (JQuest) :
         return
     elif event == "6" : #now go hunt splendor mobs
         st.set("cond","12")
+        htmltext = "32236_06.htm"
     elif event == "8" : #go back to Kekropus
         st.set("cond","14")
         htmltext = "32236_08.htm"

datapack_development/data/scripts/quests/51_OFullesSpecialBait/__init__.py

@@ -35,7 +35,8 @@ class Quest (JQuest) :
      st.giveItems(ICY_AIR_LURE,4)
      st.takeItems(LOST_BAIT,-1)
      st.playSound("ItemSound.quest_finish")
-     st.exitQuest(1)
+     st.exitQuest(False)
+     st.unset("cond")
    return htmltext
 
  def onTalk (Self,npc,player):

datapack_development/data/scripts/quests/663_SeductiveWhispers/__init__.py

@@ -71,13 +71,12 @@ class Quest (JQuest) :
        else: # lose practice :(
          htmltext = "Wilbert_PracticeLost.htm"
    elif event == "Wilbert_LetsPlay.htm": # "Let's play" pressed
-     round=st.getInt("round")
      beads=st.getQuestItemsCount(SPIRIT_BEAD)
      if beads<50:
        htmltext = "Wilbert_Practice_NotEnoughBeads.htm"
      else:
-       if round == 0:
-         htmltext = "Wilbert_PlayRound1.htm"
+       htmltext = "Wilbert_PlayRound1.htm"
+       st.set("round","0")
    elif event == "Wilbert_PullCard.htm": # "Pull first or next card" pressed
      round=st.getInt("round")
      beads=st.getQuestItemsCount(SPIRIT_BEAD)

datapack_development/data/scripts/quests/SagasSuperclass/__init__.py

@@ -113,10 +113,9 @@ class Quest (JQuest) :
         mob.decayMe()
     return
 
- def findRightState(self, player,mob) :
-     mobObjectId = mob.getObjectId()
+ def findRightState(self, mobObjectId) :
      st1 = None
-     playerName,mob = self.Spawn_List[mobObjectId]      #There is a possibility for an NPE here, but only if something else is wrong in the quest
+     playerName = self.Spawn_List[mobObjectId][0]      #There is a possibility for an NPE here, but only if something else is wrong in the quest
      st1 = L2World.getInstance().getPlayer(playerName)  #Therefore, placing an NPE catch here will only hide the error, not solve it.
      if st1 : st1 = st1.getQuestState(self.qn)
      return st1
@@ -130,7 +129,6 @@ class Quest (JQuest) :
             zz = int(st2.getPlayer().getZ())
             Archon = st2.addSpawn(self.Mob[1],xx,yy,zz)
             ArchonId = Archon.getObjectId()
-            st2.set("Archon",str(ArchonId))
             self.AddSpawn(st2,Archon)
             st2.set("spawned","1")
             st2.startQuestTimer("Archon Hellisha has despawned",600000,Archon)
@@ -511,7 +509,7 @@ class Quest (JQuest) :
       cond = st.getInt("cond")
       if npcId == self.NPC[4] :
           if cond == 17 :
-              st2 = self.findRightState(player,npc)
+              st2 = self.findRightState(npc.getObjectId())
               if st2 :
                   if st == st2 :
                       if st.getInt("Tab") == 1 :
@@ -540,7 +538,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onAttack (self, npc, player, damage, isPet):
-    st2 = self.findRightState(player,npc)
+    st2 = self.findRightState(npc.getObjectId())
     if not st2 : return
     cond = st2.getInt("cond")
     st = player.getQuestState(self.qn)
@@ -561,7 +559,7 @@ class Quest (JQuest) :
             self.AutoChat(npc,self.Text[5].replace('PLAYERNAME',player.getName()))
             if st2.getQuestTimer("Archon Hellisha has despawned") :
                st2.getQuestTimer("Archon Hellisha has despawned").cancel()
-            self.DeleteSpawn(st2,st2.getInt("Archon"))
+            self.DeleteSpawn(st2,npc.getObjectId())
             st2.set("spawned","0")
     return
 
@@ -570,12 +568,12 @@ class Quest (JQuest) :
      if player.getName() != name :
          quest_player = L2World.getInstance().getPlayer(name)
          if (quest_player in targets) or (npc in targets) :
-             st2 = self.findRightState(player,npc)
+             st2 = self.findRightState(npc.getObjectId())
              if not st2 : return
              self.AutoChat(npc,self.Text[5].replace('PLAYERNAME',player.getName()))
              if st2.getQuestTimer("Archon Hellisha has despawned") :
                 st2.getQuestTimer("Archon Hellisha has despawned").cancel()
-             self.DeleteSpawn(st2,st2.getInt("Archon"))
+             self.DeleteSpawn(st2,npc.getObjectId())
              st2.set("spawned","0")
 
  def onKill(self,npc,player,isPet):
@@ -619,7 +617,7 @@ class Quest (JQuest) :
                         st1.giveItems(st1.getQuest().Items[5],1)
                         st1.set("cond","7")
     elif st :
-        st2 = self.findRightState(player,npc)
+        st2 = self.findRightState(npc.getObjectId())
         if not st2 : return
         cond = st.getInt("cond")
         if npcId == self.Mob[0] and cond == 8 :
@@ -645,22 +643,22 @@ class Quest (JQuest) :
                     self.AutoChat(npc,self.Text[5].replace('PLAYERNAME',player.getName()))
             if st2.getQuestTimer("Archon Hellisha has despawned") :
                st2.getQuestTimer("Archon Hellisha has despawned").cancel()
-            self.DeleteSpawn(st2,st2.getInt("Archon"))
+            self.DeleteSpawn(st2,npc.getObjectId())
             st2.set("spawned","0")
     else :
         if npcId == self.Mob[0] :
-            st = self.findRightState(player,npc)
+            st = self.findRightState(npc.getObjectId())
             if st:
                 if st.getQuestTimer("Mob_1 has despawned") :
                    st.getQuestTimer("Mob_1 has despawned").cancel()
                 self.DeleteSpawn(st,st.getInt("Mob_1"))
                 st.set("spawned","0")
         elif npcId == self.Mob[1] :
-            st = self.findRightState(player,npc)
+            st = self.findRightState(npc.getObjectId())
             if st:
                 if st.getQuestTimer("Archon Hellisha has despawned") :
                    st.getQuestTimer("Archon Hellisha has despawned").cancel()
-                self.DeleteSpawn(st,st.getInt("Archon"))
+                self.DeleteSpawn(st,npc.getObjectId())
                 st.set("spawned","0")
     return