Selaa lähdekoodia

st.exitQuest(False) is SUPPOSED to work, based on quest code.
It sets the state to COMPLETED and deletes all junk variables. Since state is COMPLETED, the quest shouldn't be repeatable.
Repeatable quests can do st.exitQuest(True) which also clears the state and players can start anew.

If by chance this patch allows players to repeat completed quests, revert...
Otherwise, this will help keep the DB volumn lower, without junk records for completed quests...

Fulminus 17 vuotta sitten
vanhempi
sitoutus
4b0bcfb787
100 muutettua tiedostoa jossa 108 lisäystä ja 108 poistoa
  1. 1 1
      datapack_development/data/scripts/quests/101_SwordOfSolidarity/__init__.py
  2. 1 1
      datapack_development/data/scripts/quests/102_FungusFever/__init__.py
  3. 1 1
      datapack_development/data/scripts/quests/103_SpiritOfCraftsman/__init__.py
  4. 1 1
      datapack_development/data/scripts/quests/104_SpiritOfMirrors/__init__.py
  5. 1 1
      datapack_development/data/scripts/quests/105_SkirmishWithOrcs/__init__.py
  6. 1 1
      datapack_development/data/scripts/quests/106_ForgottenTruth/__init__.py
  7. 1 1
      datapack_development/data/scripts/quests/107_MercilessPunishment/__init__.py
  8. 1 1
      datapack_development/data/scripts/quests/108_JumbleTumbleDiamondFuss/__init__.py
  9. 1 1
      datapack_development/data/scripts/quests/10_IntoTheWorld/__init__.py
  10. 1 1
      datapack_development/data/scripts/quests/110_ToThePrimevalIsle/__init__.py
  11. 1 1
      datapack_development/data/scripts/quests/117_OceanOfDistantStar/__init__.py
  12. 1 1
      datapack_development/data/scripts/quests/118_ToLeadAndBeLed/__init__.py
  13. 1 1
      datapack_development/data/scripts/quests/11_SecretMeetingWithKetraOrcs/__init__.py
  14. 1 1
      datapack_development/data/scripts/quests/121_PavelTheGiants/__init__.py
  15. 1 1
      datapack_development/data/scripts/quests/122_OminousNews/__init__.py
  16. 1 1
      datapack_development/data/scripts/quests/123_TheLeaderAndTheFollower/__init__.py
  17. 1 1
      datapack_development/data/scripts/quests/124_MeetingTheElroki/__init__.py
  18. 1 1
      datapack_development/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/__init__.py
  19. 1 1
      datapack_development/data/scripts/quests/13_ParcelDelivery/__init__.py
  20. 1 1
      datapack_development/data/scripts/quests/14_WhereaboutsOfTheArchaeologist/__init__.py
  21. 1 1
      datapack_development/data/scripts/quests/151_SaveMySister1/__init__.py
  22. 1 1
      datapack_development/data/scripts/quests/152_ShardsOfGolem/__init__.py
  23. 1 1
      datapack_development/data/scripts/quests/153_WharfOldtimersFavor/__init__.py
  24. 1 1
      datapack_development/data/scripts/quests/154_SacrificeToSea/__init__.py
  25. 1 1
      datapack_development/data/scripts/quests/155_FindSirWindawood/__init__.py
  26. 2 2
      datapack_development/data/scripts/quests/156_MillenniumLove/__init__.py
  27. 1 1
      datapack_development/data/scripts/quests/157_RecoverSmuggled/__init__.py
  28. 1 1
      datapack_development/data/scripts/quests/158_SeedOfEvil/__init__.py
  29. 1 1
      datapack_development/data/scripts/quests/159_ProtectHeadsprings/__init__.py
  30. 1 1
      datapack_development/data/scripts/quests/15_SweetWhisper/__init__.py
  31. 1 1
      datapack_development/data/scripts/quests/160_NerupasFavor/__init__.py
  32. 1 1
      datapack_development/data/scripts/quests/161_FruitsOfMothertree/__init__.py
  33. 1 1
      datapack_development/data/scripts/quests/162_CurseOfFortress/__init__.py
  34. 1 1
      datapack_development/data/scripts/quests/163_LegacyOfPoet/__init__.py
  35. 1 1
      datapack_development/data/scripts/quests/164_BloodFiend/__init__.py
  36. 1 1
      datapack_development/data/scripts/quests/165_WildHunt/__init__.py
  37. 1 1
      datapack_development/data/scripts/quests/166_DarkMass/__init__.py
  38. 2 2
      datapack_development/data/scripts/quests/167_DwarvenKinship/__init__.py
  39. 1 1
      datapack_development/data/scripts/quests/168_DeliverSupplies/__init__.py
  40. 1 1
      datapack_development/data/scripts/quests/169_NightmareChildren/__init__.py
  41. 1 1
      datapack_development/data/scripts/quests/16_TheComingDarkness/__init__.py
  42. 1 1
      datapack_development/data/scripts/quests/170_DangerousAllure/__init__.py
  43. 1 1
      datapack_development/data/scripts/quests/171_ActsOfEvil/__init__.py
  44. 1 1
      datapack_development/data/scripts/quests/17_LightAndDarkness/__init__.py
  45. 1 1
      datapack_development/data/scripts/quests/18_MeetingWithTheGoldenRam/__init__.py
  46. 1 1
      datapack_development/data/scripts/quests/19_GoToThePastureland/__init__.py
  47. 1 1
      datapack_development/data/scripts/quests/1_LettersOfLove1/__init__.py
  48. 1 1
      datapack_development/data/scripts/quests/20_BringUpWithLove/__init__.py
  49. 1 1
      datapack_development/data/scripts/quests/211_TrialOfChallenger/__init__.py
  50. 1 1
      datapack_development/data/scripts/quests/212_TrialOfDuty/__init__.py
  51. 1 1
      datapack_development/data/scripts/quests/213_TrialOfSeeker/__init__.py
  52. 1 1
      datapack_development/data/scripts/quests/214_TrialOfScholar/__init__.py
  53. 1 1
      datapack_development/data/scripts/quests/215_TrialOfPilgrim/__init__.py
  54. 2 2
      datapack_development/data/scripts/quests/216_TrialOfGuildsman/__init__.py
  55. 1 1
      datapack_development/data/scripts/quests/217_TestimonyOfTrust/__init__.py
  56. 1 1
      datapack_development/data/scripts/quests/218_TestimonyOfLife/__init__.py
  57. 1 1
      datapack_development/data/scripts/quests/219_TestimonyOfFate/__init__.py
  58. 1 1
      datapack_development/data/scripts/quests/21_HiddenTruth/__init__.py
  59. 1 1
      datapack_development/data/scripts/quests/220_TestimonyOfGlory/__init__.py
  60. 1 1
      datapack_development/data/scripts/quests/221_TestimonyOfProsperity/__init__.py
  61. 1 1
      datapack_development/data/scripts/quests/222_TestOfDuelist/__init__.py
  62. 1 1
      datapack_development/data/scripts/quests/223_TestOfChampion/__init__.py
  63. 1 1
      datapack_development/data/scripts/quests/224_TestOfSagittarius/__init__.py
  64. 1 1
      datapack_development/data/scripts/quests/225_TestOfSearcher/__init__.py
  65. 2 2
      datapack_development/data/scripts/quests/226_TestOfHealer/__init__.py
  66. 1 1
      datapack_development/data/scripts/quests/227_TestOfReformer/__init__.py
  67. 1 1
      datapack_development/data/scripts/quests/228_TestOfMagus/__init__.py
  68. 1 1
      datapack_development/data/scripts/quests/229_TestOfWitchcraft/__init__.py
  69. 1 1
      datapack_development/data/scripts/quests/22_TragedyInVonHellmannForest/__init__.py
  70. 1 1
      datapack_development/data/scripts/quests/230_TestOfSummoner/__init__.py
  71. 1 1
      datapack_development/data/scripts/quests/231_TestOfMaestro/__init__.py
  72. 1 1
      datapack_development/data/scripts/quests/232_TestOfLord/__init__.py
  73. 1 1
      datapack_development/data/scripts/quests/233_TestOfWarspirit/__init__.py
  74. 1 1
      datapack_development/data/scripts/quests/234_FatesWhisper/__init__.py
  75. 1 1
      datapack_development/data/scripts/quests/235_MimirsElixir/__init__.py
  76. 1 1
      datapack_development/data/scripts/quests/241_PossessorOfAPreciousSoul_1/__init__.py
  77. 1 1
      datapack_development/data/scripts/quests/242_PossessorOfAPreciousSoul_2/__init__.py
  78. 1 1
      datapack_development/data/scripts/quests/246_PossessorOfAPreciousSoul_3/__init__.py
  79. 1 1
      datapack_development/data/scripts/quests/247_PossessorOfAPreciousSoul_4/__init__.py
  80. 1 1
      datapack_development/data/scripts/quests/271_ProofOfValor/__init__.py
  81. 1 1
      datapack_development/data/scripts/quests/27_ChestCaughtWithABaitOfWind/__init__.py
  82. 1 1
      datapack_development/data/scripts/quests/28_ChestCaughtWithABaitOfIcyAir/__init__.py
  83. 1 1
      datapack_development/data/scripts/quests/29_ChestCaughtWithABaitOfEarth/__init__.py
  84. 2 2
      datapack_development/data/scripts/quests/2_WhatWomenWant1/__init__.py
  85. 1 1
      datapack_development/data/scripts/quests/30_ChestCaughtWithABaitOfFire/__init__.py
  86. 1 1
      datapack_development/data/scripts/quests/31_SecretBuriedInTheSwamp/__init__.py
  87. 1 1
      datapack_development/data/scripts/quests/32_AnObviousLie/__init__.py
  88. 1 1
      datapack_development/data/scripts/quests/340_SubjugationOfLizardmen/__init__.py
  89. 2 2
      datapack_development/data/scripts/quests/347_GoGetTheCalculator/__init__.py
  90. 1 1
      datapack_development/data/scripts/quests/37_PleaseMakeMeFormalWear/__init__.py
  91. 1 1
      datapack_development/data/scripts/quests/38_DragonFangs/__init__.py
  92. 1 1
      datapack_development/data/scripts/quests/39_RedEyedInvaders/__init__.py
  93. 1 1
      datapack_development/data/scripts/quests/3_ReleaseDarkelfElder1/__init__.py
  94. 1 1
      datapack_development/data/scripts/quests/401_PathToWarrior/__init__.py
  95. 3 3
      datapack_development/data/scripts/quests/402_PathToKnight/__init__.py
  96. 1 1
      datapack_development/data/scripts/quests/403_PathToRogue/__init__.py
  97. 1 1
      datapack_development/data/scripts/quests/404_PathToWizard/__init__.py
  98. 1 1
      datapack_development/data/scripts/quests/405_PathToCleric/__init__.py
  99. 1 1
      datapack_development/data/scripts/quests/406_PathToElvenKnight/__init__.py
  100. 1 1
      datapack_development/data/scripts/quests/407_PathToElvenScout/__init__.py

+ 1 - 1
datapack_development/data/scripts/quests/101_SwordOfSolidarity/__init__.py

@@ -36,7 +36,7 @@ class Quest (JQuest) :
         st.takeItems(BROKEN_SWORD_HANDLE_ID,-1)
         st.giveItems(SWORD_OF_SOLIDARITY_ID,1)
         st.set("cond","0")
-        st.setState(State.COMPLETED)
+        st.exitQuest(False)
         st.playSound("ItemSound.quest_finish")
         st.set("onlyone","1")        
     return htmltext

+ 1 - 1
datapack_development/data/scripts/quests/102_FungusFever/__init__.py

@@ -120,7 +120,7 @@ class Quest (JQuest) :
       elif npcId == 30284 and st.getInt("cond")==6 and st.getQuestItemsCount(ALBERRYUS_LIST_ID)==1 :
            st.takeItems(ALBERRYUS_LIST_ID,1)
            st.set("cond","0")
-           st.setState(State.COMPLETED)
+           st.exitQuest(False)
            st.playSound("ItemSound.quest_finish")
            htmltext = "30284-06.htm"
            st.set("onlyone","1")

+ 1 - 1
datapack_development/data/scripts/quests/103_SpiritOfCraftsman/__init__.py

@@ -98,7 +98,7 @@ class Quest (JQuest) :
             st.takeItems(STEELBENDERS_HEAD_ID,1)
             st.giveItems(BLOODSABER_ID,1)
             st.set("cond","0")
-            st.setState(State.COMPLETED)
+            st.exitQuest(False)
             st.playSound("ItemSound.quest_finish")
             st.set("onlyone","1")
    return htmltext

+ 1 - 1
datapack_development/data/scripts/quests/104_SpiritOfMirrors/__init__.py

@@ -86,7 +86,7 @@ class Quest (JQuest) :
             st.giveItems(item,int(10*Config.RATE_QUESTS_REWARD))   # Echo crystals
         htmltext = "30017-05.htm" 
         st.set("cond","0") 
-        st.setState(State.COMPLETED) 
+        st.exitQuest(False) 
         st.playSound("ItemSound.quest_finish") 
         st.set("onlyone","1")       
      elif npcId == 30045 and st.getInt("cond") : 

+ 1 - 1
datapack_development/data/scripts/quests/105_SkirmishWithOrcs/__init__.py

@@ -121,7 +121,7 @@ class Quest (JQuest) :
             st.giveItems(1060,int(100*Config.RATE_QUESTS_REWARD))     # Lesser Healing Potions 
             for item in range(4412,4417) : 
                 st.giveItems(item,int(10*Config.RATE_QUESTS_REWARD))   # Echo crystals 
-            st.setState(State.COMPLETED) 
+            st.exitQuest(False) 
             st.playSound("ItemSound.quest_finish") 
             st.set("onlyone","1") 
             st.set("cond","0") 

+ 1 - 1
datapack_development/data/scripts/quests/106_ForgottenTruth/__init__.py

@@ -92,7 +92,7 @@ class Quest (JQuest) :
          elif st.getInt("onlyone") == 0:
              st.giveItems(1835,1000)
          st.unset("cond")
-         st.setState(State.COMPLETED)
+         st.exitQuest(False)
          st.playSound("ItemSound.quest_finish")
        elif npcId == 30133 and id == State.STARTED :
          htmltext = "30133-04.htm"

+ 1 - 1
datapack_development/data/scripts/quests/107_MercilessPunishment/__init__.py

@@ -114,7 +114,7 @@ class Quest (JQuest) :
             if player.getLevel() < 25 and st.getInt("onlyone") == 0 and player.isNewbie():
                 st.giveItems(SOULSHOT_NO_GRADE_FOR_BEGINNERS_ID,7000) 
             st.set("cond","0") 
-            st.setState(State.COMPLETED) 
+            st.exitQuest(False) 
             st.playSound("ItemSound.quest_finish") 
             st.set("onlyone","1") 
    elif npcId == 30580 and st.getInt("cond")==1 and id == State.STARTED and (st.getQuestItemsCount(HATOSS_ORDER1_ID) or st.getQuestItemsCount(HATOSS_ORDER2_ID) or st.getQuestItemsCount(HATOSS_ORDER3_ID)) : 

+ 1 - 1
datapack_development/data/scripts/quests/108_JumbleTumbleDiamondFuss/__init__.py

@@ -95,7 +95,7 @@ class Quest (JQuest) :
                 st.giveItems(item,int(10*Config.RATE_QUESTS_REWARD))   # Echo crystals
             st.takeItems(STAR_DIAMOND_ID,-1) 
             st.set("cond","0") 
-            st.setState(State.COMPLETED) 
+            st.exitQuest(False) 
             st.playSound("ItemSound.quest_finish") 
    elif id == State.STARTED : 
        if npcId == 30516 and st.getInt("cond")==1 and st.getQuestItemsCount(GOUPHS_CONTRACT_ID) and st.getQuestItemsCount(REEPS_CONTRACT_ID)==0 : 

+ 1 - 1
datapack_development/data/scripts/quests/10_IntoTheWorld/__init__.py

@@ -33,7 +33,7 @@ class Quest (JQuest) :
             st.giveItems(SCROLL_OF_ESCAPE_GIRAN,1)
             st.giveItems(MARK_OF_TRAVELER, 1)
             st.unset("cond")
-            st.setState(State.COMPLETED)
+            st.exitQuest(False)
             st.playSound("ItemSound.quest_finish")
         return htmltext
 

+ 1 - 1
datapack_development/data/scripts/quests/110_ToThePrimevalIsle/__init__.py

@@ -32,7 +32,7 @@ class Quest (JQuest) :
       st.playSound("ItemSound.quest_finish")
       st.giveItems(ADENA_ID,169380)
       st.takeItems(ANCIENT_BOOK,-1)
-      st.setState(State.COMPLETED)
+      st.exitQuest(False)
       st.exitQuest(0)
     return htmltext
 

+ 1 - 1
datapack_development/data/scripts/quests/117_OceanOfDistantStar/__init__.py

@@ -61,7 +61,7 @@ class Quest (JQuest) :
       htmltext="9b.htm"
       st.addExpAndSp(63591,0)
       st.playSound("ItemSound.quest_finish")
-      st.setState(State.COMPLETED)
+      st.exitQuest(False)
     return htmltext
 
   def onTalk(self, npc, player):

+ 1 - 1
datapack_development/data/scripts/quests/118_ToLeadAndBeLed/__init__.py

@@ -127,7 +127,7 @@ class Quest (JQuest) :
             st.giveItems(item,1)
          st.unset("cond")
          st.unset("settype")
-         st.setState(State.COMPLETED) 
+         st.exitQuest(False) 
          st.playSound("ItemSound.quest_finish")
    elif player.getApprentice() :
      cm_apprentice = player.getClan().getClanMember(player.getApprentice())

+ 1 - 1
datapack_development/data/scripts/quests/11_SecretMeetingWithKetraOrcs/__init__.py

@@ -39,7 +39,7 @@ class Quest (JQuest) :
          st.addExpAndSp(22787,0) #Despite what stratics may say, this is the correct reward for this quest.
          st.set("cond","0")
          st.set("onlyone","1")
-         st.setState(State.COMPLETED)
+         st.exitQuest(False)
          st.playSound("ItemSound.quest_finish")
      return htmltext
 

+ 1 - 1
datapack_development/data/scripts/quests/121_PavelTheGiants/__init__.py

@@ -21,7 +21,7 @@ class Quest (JQuest) :
       st.playSound("ItemSound.quest_finish")
       st.addExpAndSp(10000,0)
       st.unset("cond")
-      st.setState(State.COMPLETED)
+      st.exitQuest(False)
     return htmltext
 
   def onTalk(self, npc, player):

+ 1 - 1
datapack_development/data/scripts/quests/122_OminousNews/__init__.py

@@ -31,7 +31,7 @@ class Quest (JQuest) :
          st.giveItems(57,1695)
          st.unset("cond")
          st.unset("ok")
-         st.setState(State.COMPLETED)
+         st.exitQuest(False)
          st.playSound("ItemSound.quest_finish")
        else :
          htmltext=default

+ 1 - 1
datapack_development/data/scripts/quests/123_TheLeaderAndTheFollower/__init__.py

@@ -124,7 +124,7 @@ class Quest (JQuest) :
             st.giveItems(item,1)
          st.unset("cond")
          st.unset("settype")
-         st.setState(State.COMPLETED) 
+         st.exitQuest(False) 
          st.playSound("ItemSound.quest_finish")
    elif player.getApprentice() :
      cm_apprentice = player.getClan().getClanMember(player.getApprentice())

+ 1 - 1
datapack_development/data/scripts/quests/124_MeetingTheElroki/__init__.py

@@ -89,7 +89,7 @@ class Quest (JQuest) :
             htmltext = "32115-05.htm"
             st.takeItems(M_EGG,1)
             st.giveItems(57,71318)
-            st.setState(State.COMPLETED)
+            st.exitQuest(False)
             st.set("cond","0")
             st.playSound("ItemSound.quest_finish")
      elif npcId == KARAKAWEI :

+ 1 - 1
datapack_development/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/__init__.py

@@ -39,7 +39,7 @@ class Quest (JQuest) :
          st.addExpAndSp(79761,0)
          st.set("cond","0")
          st.set("onlyone","1")
-         st.setState(State.COMPLETED)
+         st.exitQuest(False)
          st.playSound("ItemSound.quest_finish")
      return htmltext
 

+ 1 - 1
datapack_development/data/scripts/quests/13_ParcelDelivery/__init__.py

@@ -32,7 +32,7 @@ class Quest (JQuest) :
      if cond == 1 and st.getQuestItemsCount(PACKAGE) == 1 :
        st.takeItems(PACKAGE,1)
        st.giveItems(57,82000)
-       st.setState(State.COMPLETED)
+       st.exitQuest(False)
        st.set("cond","0")
        st.playSound("ItemSound.quest_finish")
      else :

+ 1 - 1
datapack_development/data/scripts/quests/14_WhereaboutsOfTheArchaeologist/__init__.py

@@ -31,7 +31,7 @@ class Quest (JQuest) :
      if cond == 1 and st.getQuestItemsCount(LETTER) == 1 :
        st.takeItems(LETTER,1)
        st.giveItems(57,113228)
-       st.setState(State.COMPLETED)
+       st.exitQuest(False)
        st.set("cond","0")
        st.playSound("ItemSound.quest_finish")
      else :

+ 1 - 1
datapack_development/data/scripts/quests/151_SaveMySister1/__init__.py

@@ -51,7 +51,7 @@ class Quest (JQuest) :
         st.takeItems(FEVER_MEDICINE,1)
         htmltext = "30050-06.htm"
         st.unset("cond")
-        st.setState(State.COMPLETED)
+        st.exitQuest(False)
         st.playSound("ItemSound.quest_finish")
    elif npcId == 30032 :
       if cond == 2 or sac :

+ 1 - 1
datapack_development/data/scripts/quests/152_ShardsOfGolem/__init__.py

@@ -63,7 +63,7 @@ class Quest (JQuest) :
         st.takeItems(TOOL_BOX_ID,-1)
         st.takeItems(HARRYS_RECEIPT2_ID,-1)
         st.unset("cond")
-        st.setState(State.COMPLETED)
+        st.exitQuest(False)
         st.playSound("ItemSound.quest_finish")
         st.giveItems(WOODEN_BP_ID,1)
         st.addExpAndSp(5000,0)

+ 1 - 1
datapack_development/data/scripts/quests/153_WharfOldtimersFavor/__init__.py

@@ -87,7 +87,7 @@ class Quest (JQuest) :
             if st.getInt("id") != 153 :
               st.set("id","153")
               st.set("cond","0")
-              st.setState(State.COMPLETED)
+              st.exitQuest(False)
               st.playSound("ItemSound.quest_finish")
               st.set("onlyone","1")
               st.giveItems(RING_ID,1)

+ 1 - 1
datapack_development/data/scripts/quests/154_SacrificeToSea/__init__.py

@@ -78,7 +78,7 @@ class Quest (JQuest) :
             st.takeItems(MAIDEN_DOLL_ID,-1)
             st.addExpAndSp(100,0)
             st.set("cond","0")
-            st.setState(State.COMPLETED)
+            st.exitQuest(False)
             st.playSound("ItemSound.quest_finish")
             st.set("onlyone","1")
    return htmltext

+ 1 - 1
datapack_development/data/scripts/quests/155_FindSirWindawood/__init__.py

@@ -49,7 +49,7 @@ class Quest (JQuest) :
       st.takeItems(OFFICIAL_LETTER_ID,-1)
       st.giveItems(HASTE_POTION_ID,int(Config.RATE_QUESTS_REWARD))
       st.unset("cond")
-      st.setState(State.COMPLETED)
+      st.exitQuest(False)
       st.playSound("ItemSound.quest_finish")
       htmltext = "30311-01.htm"
    return htmltext

+ 2 - 2
datapack_development/data/scripts/quests/156_MillenniumLove/__init__.py

@@ -36,7 +36,7 @@ class Quest (JQuest) :
     elif event == "156_2" :
        st.takeItems(RYLITHS_LETTER_ID,-1)
        st.unset("cond")
-       st.setState(State.COMPLETED)
+       st.exitQuest(False)
        st.playSound("ItemSound.quest_finish")
        st.giveItems(5250,1)
        st.addExpAndSp(3000,0)
@@ -62,7 +62,7 @@ class Quest (JQuest) :
         elif st.getQuestItemsCount(THEONS_DIARY_ID) :
            st.takeItems(THEONS_DIARY_ID,-1)
            st.unset("cond")
-           st.setState(State.COMPLETED)
+           st.exitQuest(False)
            st.playSound("ItemSound.quest_finish")
            st.addExpAndSp(3000,0)
            st.giveItems(5250,1)

+ 1 - 1
datapack_development/data/scripts/quests/157_RecoverSmuggled/__init__.py

@@ -46,7 +46,7 @@ class Quest (JQuest) :
    elif cond :
      if st.getQuestItemsCount(ADAMANTITE_ORE)>=20 :
         st.takeItems(ADAMANTITE_ORE,-1)
-        st.setState(State.COMPLETED)
+        st.exitQuest(False)
         st.playSound("ItemSound.quest_finish")
         st.giveItems(BUCKLER,1)
         htmltext = "30005-07.htm"

+ 1 - 1
datapack_development/data/scripts/quests/158_SeedOfEvil/__init__.py

@@ -50,7 +50,7 @@ class Quest (JQuest) :
           st.set("id","158")
           st.takeItems(CLAY_TABLET_ID,st.getQuestItemsCount(CLAY_TABLET_ID))
           st.set("cond","0")
-          st.setState(State.COMPLETED)
+          st.exitQuest(False)
           st.playSound("ItemSound.quest_finish")
           st.set("onlyone","1")
           st.giveItems(ENCHANT_ARMOR_D,1)

+ 1 - 1
datapack_development/data/scripts/quests/159_ProtectHeadsprings/__init__.py

@@ -68,7 +68,7 @@ class Quest (JQuest) :
       st.giveItems(ADENA,18250)
       htmltext = "30154-08.htm"
       st.unset("cond")
-      st.setState(State.COMPLETED)
+      st.exitQuest(False)
       st.playSound("ItemSound.quest_finish")
    return htmltext
 

+ 1 - 1
datapack_development/data/scripts/quests/15_SweetWhisper/__init__.py

@@ -30,7 +30,7 @@ class Quest (JQuest) :
        st.addExpAndSp(60217,0)
        st.set("cond","0")
        st.playSound("ItemSound.quest_finish")
-       st.setState(State.COMPLETED)
+       st.exitQuest(False)
    return htmltext
 
  def onTalk (self,npc,player):

+ 1 - 1
datapack_development/data/scripts/quests/160_NerupasFavor/__init__.py

@@ -93,7 +93,7 @@ class Quest (JQuest) :
           st.giveItems(LESSER_HEALING_POTION,int(Config.RATE_QUESTS_REWARD))
           st.addExpAndSp(1000,0)
           st.unset("cond")
-          st.setState(State.COMPLETED)
+          st.exitQuest(False)
           st.playSound("ItemSound.quest_finish")
           htmltext = "30370-06.htm"
    return htmltext

+ 1 - 1
datapack_development/data/scripts/quests/161_FruitsOfMothertree/__init__.py

@@ -65,7 +65,7 @@ class Quest (JQuest) :
          st.takeItems(MOTHERTREE_FRUIT,1)
          st.addExpAndSp(1000,0)
          st.unset("cond")
-         st.setState(State.COMPLETED)
+         st.exitQuest(False)
          st.playSound("ItemSound.quest_finish")
        elif npcId == 30371 and st.getQuestItemsCount(MOTHERTREE_FRUIT) :
          htmltext = "30371-02.htm"

+ 1 - 1
datapack_development/data/scripts/quests/162_CurseOfFortress/__init__.py

@@ -55,7 +55,7 @@ class Quest (JQuest) :
          st.takeItems(ELF_SKULL,-1)
          st.takeItems(BONE_FRAGMENT3,-1)
          st.unset("cond")
-         st.setState(State.COMPLETED)
+         st.exitQuest(False)
          st.playSound("ItemSound.quest_finish")
    return htmltext
 

+ 1 - 1
datapack_development/data/scripts/quests/163_LegacyOfPoet/__init__.py

@@ -59,7 +59,7 @@ class Quest (JQuest) :
           st.takeItems(RUMIELS_POEM_4_ID,1)
           st.takeItems(RUMIELS_POEM_5_ID,1)
           st.set("cond","0")
-          st.setState(State.COMPLETED)
+          st.exitQuest(False)
           st.playSound("ItemSound.quest_finish")
           st.set("onlyone","1")
       else:

+ 1 - 1
datapack_development/data/scripts/quests/164_BloodFiend/__init__.py

@@ -55,7 +55,7 @@ class Quest (JQuest) :
             st.giveItems(ADENA_ID,42000)
             st.takeItems(KIRUNAK_SKULL_ID,1)
             st.set("cond","0")
-            st.setState(State.COMPLETED)
+            st.exitQuest(False)
             st.playSound("ItemSound.quest_finish")
             st.set("onlyone","1")
    return htmltext

+ 1 - 1
datapack_development/data/scripts/quests/165_WildHunt/__init__.py

@@ -57,7 +57,7 @@ class Quest (JQuest) :
             st.giveItems(LESSER_HEALING_POTION_ID,int(5*Config.RATE_QUESTS_REWARD))
             st.addExpAndSp(1000,0)
             st.set("cond","0")
-            st.setState(State.COMPLETED)
+            st.exitQuest(False)
             st.playSound("ItemSound.quest_finish")
             st.set("onlyone","1")
    return htmltext

+ 1 - 1
datapack_development/data/scripts/quests/166_DarkMass/__init__.py

@@ -63,7 +63,7 @@ class Quest (JQuest) :
             st.giveItems(ADENA_ID,500)
             st.addExpAndSp(500,0)
             st.set("cond","0")
-            st.setState(State.COMPLETED)
+            st.exitQuest(False)
             st.playSound("ItemSound.quest_finish")
    elif id == State.STARTED: 
        if npcId == 30135 :

+ 2 - 2
datapack_development/data/scripts/quests/167_DwarvenKinship/__init__.py

@@ -37,13 +37,13 @@ class Quest (JQuest) :
        st.takeItems(COLLETTE_LETTER,1)
        st.giveItems(ADENA,3000)
        st.unset("cond")
-       st.setState(State.COMPLETED)
+       st.exitQuest(False)
        st.playSound("ItemSound.quest_finish")
      elif event == "30210-02.htm" and cond == 2 and st.getQuestItemsCount(NORMANS_LETTER) :
        st.takeItems(NORMANS_LETTER,1)
        st.giveItems(ADENA,20000)
        st.unset("cond")
-       st.setState(State.COMPLETED)
+       st.exitQuest(False)
        st.playSound("ItemSound.quest_finish")
     return htmltext
 

+ 1 - 1
datapack_development/data/scripts/quests/168_DeliverSupplies/__init__.py

@@ -62,7 +62,7 @@ class Quest (JQuest) :
           htmltext = "30349-06.htm"
           st.takeItems(OLD_BRONZE_SWORD_ID,2)
           st.set("cond","0")
-          st.setState(State.COMPLETED)
+          st.exitQuest(False)
           st.playSound("ItemSound.quest_finish")
           st.set("onlyone","1")
           st.giveItems(ADENA_ID,820)

+ 1 - 1
datapack_development/data/scripts/quests/169_NightmareChildren/__init__.py

@@ -33,7 +33,7 @@ class Quest (JQuest) :
             st.takeItems(CRACKED_SKULL_ID,st.getQuestItemsCount(CRACKED_SKULL_ID))
             st.takeItems(PERFECT_SKULL_ID,st.getQuestItemsCount(PERFECT_SKULL_ID))
             st.set("cond","0")
-            st.setState(State.COMPLETED)
+            st.exitQuest(False)
             st.playSound("ItemSound.quest_finish")
             st.set("onlyone","1")
     return htmltext

+ 1 - 1
datapack_development/data/scripts/quests/16_TheComingDarkness/__init__.py

@@ -91,7 +91,7 @@ class Quest (JQuest) :
        if npcId == HIERARCH and cond == 6 :
          st.addExpAndSp(221958,0)
          st.set("cond","0")
-         st.setState(State.COMPLETED)
+         st.exitQuest(False)
          st.playSound("ItemSound.quest_finish")
          htmltext = "31517-3.htm"
    return htmltext

+ 1 - 1
datapack_development/data/scripts/quests/170_DangerousAllure/__init__.py

@@ -49,7 +49,7 @@ class Quest (JQuest) :
          htmltext = "30305-06.htm"
          st.giveItems(57,102680)
          st.takeItems(NIGHTMARE_CRYSTAL,-1)
-         st.setState(State.COMPLETED)
+         st.exitQuest(False)
          st.playSound("ItemSound.quest_finish")
       else :
          htmltext = "30305-05.htm"

+ 1 - 1
datapack_development/data/scripts/quests/171_ActsOfEvil/__init__.py

@@ -99,7 +99,7 @@ class Quest (JQuest) :
              htmltext = "30381-08.htm"
              st.giveItems(ADENA,90000)
              st.playSound("ItemSound.quest_finish")
-             st.setState(State.COMPLETED)
+             st.exitQuest(False)
      elif id == State.STARTED :
          if npcId==ARODIN :
              if cond==1 :

+ 1 - 1
datapack_development/data/scripts/quests/17_LightAndDarkness/__init__.py

@@ -83,7 +83,7 @@ class Quest (JQuest) :
      else :
         st.addExpAndSp(105527,0)
         st.unset("cond")
-        st.setState(State.COMPLETED)
+        st.exitQuest(False)
         st.playSound("ItemSound.quest_finish")
         htmltext = "31517-03.htm"
    elif id == State.STARTED :    

+ 1 - 1
datapack_development/data/scripts/quests/18_MeetingWithTheGoldenRam/__init__.py

@@ -38,7 +38,7 @@ class Quest (JQuest) :
        st.addExpAndSp(50000,0)
        st.unset("cond")
        st.playSound("ItemSound.quest_finish")
-       st.setState(State.COMPLETED)
+       st.exitQuest(False)
      return htmltext
 
  def onTalk (self,npc,player):

+ 1 - 1
datapack_development/data/scripts/quests/19_GoToThePastureland/__init__.py

@@ -30,7 +30,7 @@ class Quest (JQuest) :
      st.takeItems(BEAST_MEAT,1)
      st.giveItems(57,30000)
      st.unset("cond")
-     st.setState(State.COMPLETED)
+     st.exitQuest(False)
      st.playSound("ItemSound.quest_finish")
    return htmltext
 

+ 1 - 1
datapack_development/data/scripts/quests/1_LettersOfLove1/__init__.py

@@ -103,7 +103,7 @@ class Quest (JQuest) :
            st.giveItems(NECKLACE,1) 
            st.set("cond","0") 
            st.set("onlyone","1") 
-           st.setState(State.COMPLETED)
+           st.exitQuest(False)
            st.playSound("ItemSound.quest_finish") 
          else: 
            htmltext = "30048-07.htm" 

+ 1 - 1
datapack_development/data/scripts/quests/20_BringUpWithLove/__init__.py

@@ -29,7 +29,7 @@ class Quest (JQuest) :
        st.giveItems(57,68500)
        st.takeItems(GEM,-1)
        st.playSound("ItemSound.quest_finish")
-       st.setState(State.COMPLETED)
+       st.exitQuest(False)
        st.set("onlyone","1")
    return htmltext 
 

+ 1 - 1
datapack_development/data/scripts/quests/211_TrialOfChallenger/__init__.py

@@ -152,7 +152,7 @@ class Quest (JQuest) :
       htmltext = "30646-07.htm"
       st.takeItems(BROKEN_KEY,1)
       st.giveItems(MARK_OF_CHALLENGER,1)
-      st.setState(State.COMPLETED)
+      st.exitQuest(False)
       st.playSound("ItemSound.quest_finish")
       st.set("cond","0")
    elif npcId == 30535 and cond == 7 :

+ 1 - 1
datapack_development/data/scripts/quests/212_TrialOfDuty/__init__.py

@@ -82,7 +82,7 @@ class Quest (JQuest) :
       htmltext = "30109-05.htm"
       st.takeItems(LETTER_OF_DUSTIN,1)
       st.giveItems(MARK_OF_DUTY,1)
-      st.setState(State.COMPLETED)
+      st.exitQuest(False)
       st.playSound("ItemSound.quest_finish")
       st.set("onlyone","1")
       st.set("cond","0")

+ 1 - 1
datapack_development/data/scripts/quests/213_TrialOfSeeker/__init__.py

@@ -145,7 +145,7 @@ class Quest (JQuest) :
               st.set("cond","0")
               st.set("onlyone","1")
               st.set("id","0")
-              st.setState(State.COMPLETED)
+              st.exitQuest(False)
               st.playSound("ItemSound.quest_finish")
               st.takeItems(TERYS_REPORT_ID,1)
               st.giveItems(MARK_OF_SEEKER_ID,1)

+ 1 - 1
datapack_development/data/scripts/quests/214_TrialOfScholar/__init__.py

@@ -287,7 +287,7 @@ class Quest (JQuest) :
             st.giveItems(MARK_OF_SCHOLAR_ID,1)
             st.set("cond","0")
             st.set("onlyone","1")
-            st.setState(State.COMPLETED)
+            st.exitQuest(False)
             st.playSound("ItemSound.quest_finish")
    elif npcId == 30070 and cond == 1 :
         htmltext = "30070-01.htm"

+ 1 - 1
datapack_development/data/scripts/quests/215_TrialOfPilgrim/__init__.py

@@ -115,7 +115,7 @@ class Quest (JQuest) :
       htmltext = "30648-10.htm"
       st.giveItems(MARK_OF_PILGRIM,1)
       st.takeItems(BOOK_OF_SAGE,1)
-      st.setState(State.COMPLETED)
+      st.exitQuest(False)
       st.playSound("ItemSound.quest_finish")
       st.unset("cond")
    elif npcId == 30571 and cond==1 and st.getQuestItemsCount(VOUCHER_OF_TRIAL) :

+ 2 - 2
datapack_development/data/scripts/quests/216_TrialOfGuildsman/__init__.py

@@ -64,7 +64,7 @@ class Quest (JQuest) :
             htmltext = "30103-09a.htm"
             st.set("cond","0")
             st.set("onlyone","1")
-            st.setState(State.COMPLETED)
+            st.exitQuest(False)
             st.playSound("ItemSound.quest_finish")
             st.addExpAndSp(32000,3900)
             st.takeItems(JOURNEYMAN_RING_ID,st.getQuestItemsCount(JOURNEYMAN_RING_ID))
@@ -77,7 +77,7 @@ class Quest (JQuest) :
             htmltext = "30103-09b.htm"
             st.set("cond","0")
             st.set("onlyone","1")
-            st.setState(State.COMPLETED)
+            st.exitQuest(False)
             st.playSound("ItemSound.quest_finish")
             st.takeItems(JOURNEYMAN_RING_ID,st.getQuestItemsCount(JOURNEYMAN_RING_ID))
             st.takeItems(ALLTRANS_INSTRUCTIONS_ID,1)

+ 1 - 1
datapack_development/data/scripts/quests/217_TestimonyOfTrust/__init__.py

@@ -257,7 +257,7 @@ class Quest (JQuest) :
            st.giveItems(MARK_OF_TRUST_ID,1)
            st.unset("cond")
            st.unset("id")
-           st.setState(State.COMPLETED)
+           st.exitQuest(False)
            st.playSound("ItemSound.quest_finish")
    return htmltext
 

+ 1 - 1
datapack_development/data/scripts/quests/218_TestimonyOfLife/__init__.py

@@ -168,7 +168,7 @@ class Quest (JQuest) :
           htmltext = "30460-07.htm"
           st.set("cond","0")
           st.set("onlyone","1")
-          st.setState(State.COMPLETED)
+          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"

+ 1 - 1
datapack_development/data/scripts/quests/219_TestimonyOfFate/__init__.py

@@ -211,7 +211,7 @@ class Quest (JQuest) :
       st.takeItems(ARKENIAS_LETTER_ID,1)
       st.takeItems(PALUS_CHARM_ID,1)
       st.set("cond","0")
-      st.setState(State.COMPLETED)
+      st.exitQuest(False)
       st.playSound("ItemSound.quest_finish")
       st.set("onlyone","1")
    elif npcId == 30419 and st.getInt("cond")==1 and st.getQuestItemsCount(PALUS_CHARM_ID) and st.getQuestItemsCount(THIFIELS_LETTER_ID) :

+ 1 - 1
datapack_development/data/scripts/quests/21_HiddenTruth/__init__.py

@@ -40,7 +40,7 @@ class Quest (JQuest) :
             st.unset("AGRIPEL")
             st.unset("DOMINIC")
             st.unset("BENEDICT")
-            st.setState(State.COMPLETED)
+            st.exitQuest(False)
             st.takeItems(7140,-1)
             if st.getQuestItemsCount(7141) == 0 :
                 st.giveItems(7141,1)

+ 1 - 1
datapack_development/data/scripts/quests/220_TestimonyOfGlory/__init__.py

@@ -433,7 +433,7 @@ class Quest (JQuest) :
          st.giveItems(MARK_OF_GLORY,1)
          st.takeItems(RITUAL_BOX,1)
          st.set("cond","0")
-         st.setState(State.COMPLETED)
+         st.exitQuest(False)
          st.playSound("ItemSound.quest_finish")
        else :
          htmltext = "30565-01.htm"

+ 1 - 1
datapack_development/data/scripts/quests/221_TestimonyOfProsperity/__init__.py

@@ -203,7 +203,7 @@ class Quest (JQuest) :
           htmltext = "30104-13.htm"
           st.set("cond","0")
           st.set("onlyone","1")
-          st.setState(State.COMPLETED)
+          st.exitQuest(False)
           st.playSound("ItemSound.quest_finish")
    elif npcId == 30531 and st.getInt("cond")>=1 and st.getQuestItemsCount(OLD_ACCOUNT_BOOK_ID) == 0 and st.getQuestItemsCount(COLLECTION_LICENSE_ID) == 0 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID)==1 :
         htmltext = "30531-01.htm"

+ 1 - 1
datapack_development/data/scripts/quests/222_TestOfDuelist/__init__.py

@@ -130,7 +130,7 @@ class Quest (JQuest) :
             htmltext = "30623-18.htm"
             st.unset("step")
             st.set("cond","0")
-            st.setState(State.COMPLETED)
+            st.exitQuest(False)
             st.playSound("ItemSound.quest_finish")
         else :
           htmltext = "30623-17.htm"

+ 1 - 1
datapack_development/data/scripts/quests/223_TestOfChampion/__init__.py

@@ -152,7 +152,7 @@ class Quest (JQuest) :
       st.giveItems(SHADOW_WEAPON_COUPON_CGRADE,15)
       st.takeItems(MOUENS_LETTER,1)
       st.set("cond","0")
-      st.setState(State.COMPLETED)
+      st.exitQuest(False)
       st.playSound("ItemSound.quest_finish")
    elif npcId == 30624 and st.getInt("step") in [10,11,12,13] :
       htmltext = "30624-16.htm"

+ 1 - 1
datapack_development/data/scripts/quests/224_TestOfSagittarius/__init__.py

@@ -182,7 +182,7 @@ class Quest (JQuest) :
       st.addExpAndSp(54726,20250)
       st.unset("step")
       st.set("cond","0")
-      st.setState(State.COMPLETED)
+      st.exitQuest(False)
       st.playSound("ItemSound.quest_finish")
       st.set("onlyone","1")
    elif npcId == 30653 and step==2 and st.getQuestItemsCount(LETTER_OF_HAMIL1) :

+ 1 - 1
datapack_development/data/scripts/quests/225_TestOfSearcher/__init__.py

@@ -117,7 +117,7 @@ class Quest (JQuest) :
          st.addExpAndSp(37831,18750)
          htmltext = "30690-08.htm"
          st.set("cond","0")
-         st.setState(State.COMPLETED)
+         st.exitQuest(False)
          st.playSound("ItemSound.quest_finish")
          st.takeItems(ALANKELLS_RECOMMEND,1)
          st.giveItems(MARK_OF_SEARCHER,1)

+ 2 - 2
datapack_development/data/scripts/quests/226_TestOfHealer/__init__.py

@@ -67,7 +67,7 @@ class Quest (JQuest) :
           st.giveItems(SHADOW_WEAPON_COUPON_CGRADE,15)
           st.takeItems(GOLDEN_STATUE,1)
           st.set("cond","0")
-          st.setState(State.COMPLETED)
+          st.exitQuest(False)
           st.playSound("ItemSound.quest_finish")
           st.set("onlyone","1")
     elif event == "30428_1" :
@@ -135,7 +135,7 @@ class Quest (JQuest) :
       st.addExpAndSp(32000,4100)
       st.giveItems(MARK_OF_HEALER,1)
       st.set("cond","0")
-      st.setState(State.COMPLETED)
+      st.exitQuest(False)
       st.playSound("ItemSound.quest_finish")
       st.set("onlyone","1")
      elif st.getInt("cond")==15 and st.getQuestItemsCount(GOLDEN_STATUE) :

+ 1 - 1
datapack_development/data/scripts/quests/227_TestOfReformer/__init__.py

@@ -118,7 +118,7 @@ class Quest (JQuest) :
           htmltext = "30666-07.htm"
           st.set("cond","0")
           st.set("onlyone","1")
-          st.setState(State.COMPLETED)
+          st.exitQuest(False)
           st.playSound("ItemSound.quest_finish")
           st.takeItems(KATARIS_LETTER,1)
           st.takeItems(KAKANS_LETTER,1)

+ 1 - 1
datapack_development/data/scripts/quests/228_TestOfMagus/__init__.py

@@ -149,7 +149,7 @@ class Quest (JQuest) :
             htmltext = "30629-12.htm"
             st.set("cond","0")
             st.set("onlyone","1")
-            st.setState(State.COMPLETED)
+            st.exitQuest(False)
             st.playSound("ItemSound.quest_finish")
         else:
           htmltext = "30629-11.htm"

+ 1 - 1
datapack_development/data/scripts/quests/229_TestOfWitchcraft/__init__.py

@@ -124,7 +124,7 @@ class Quest (JQuest) :
       htmltext = "30630-22.htm"
       for var in STATS:
         st.unset(var)
-      st.setState(State.COMPLETED)
+      st.exitQuest(False)
       st.playSound("ItemSound.quest_finish")
     # Alexandrias Events
     elif event == "30098_1" :

+ 1 - 1
datapack_development/data/scripts/quests/22_TragedyInVonHellmannForest/__init__.py

@@ -191,7 +191,7 @@ class Quest (JQuest) :
            htmltext = "31328-14.htm"
        elif id == 14 :
            st.playSound("ItemSound.quest_finish")
-           st.setState(State.COMPLETED)
+           st.exitQuest(False)
            st.unset("id")
            if player.getLevel() < 64 :
                htmltext = "31328-23.htm"

+ 1 - 1
datapack_development/data/scripts/quests/230_TestOfSummoner/__init__.py

@@ -231,7 +231,7 @@ class Quest (JQuest) :
                   st.addExpAndSp(148409,30000)
                   for var in STATS:
                      st.unset(var)
-                  st.setState(State.COMPLETED)
+                  st.exitQuest(False)
                   st.playSound("ItemSound.quest_finish")
                   st.giveItems(MARK_OF_SUMMONER,1)
                   st.giveItems(SHADOW_WEAPON_COUPON_CGRADE,15)

+ 1 - 1
datapack_development/data/scripts/quests/231_TestOfMaestro/__init__.py

@@ -123,7 +123,7 @@ class Quest (JQuest) :
        st.takeItems(RECOMMENDATION_OF_FILAUR,1)
        st.takeItems(RECOMMENDATION_OF_ARIN,1)
        st.unset("progress")
-       st.setState(State.COMPLETED)
+       st.exitQuest(False)
        st.playSound("ItemSound.quest_finish")
    elif npcId == 30533:
      if progress in [1,11,16] and not st.getQuestItemsCount(RECOMMENDATION_OF_BALANKI):

+ 1 - 1
datapack_development/data/scripts/quests/232_TestOfLord/__init__.py

@@ -130,7 +130,7 @@ class Quest (JQuest) :
           st.unset(var)
         for var in STATS[1]:
           st.unset(var)
-        st.setState(State.COMPLETED)
+        st.exitQuest(False)
       elif event == "30649_1" :
         htmltext = "30649-02.htm"
       elif event == "30649_2" :

+ 1 - 1
datapack_development/data/scripts/quests/233_TestOfWarspirit/__init__.py

@@ -136,7 +136,7 @@ class Quest (JQuest) :
       htmltext = "30649-03.htm"
       for var in STATS:
         st.unset(var)
-      st.setState(State.COMPLETED)
+      st.exitQuest(False)
       st.playSound("ItemSound.quest_finish")
     return htmltext
 

+ 1 - 1
datapack_development/data/scripts/quests/234_FatesWhisper/__init__.py

@@ -120,7 +120,7 @@ class Quest (JQuest) :
           htmltext = "31002-12.htm"
           st.giveItems(aGradeItemId,1)
           st.giveItems(STAR_OF_DESTINY,1)
-          st.setState(State.COMPLETED)
+          st.exitQuest(False)
           st.unset("cond")
           st.unset("bypass")
         else:

+ 1 - 1
datapack_development/data/scripts/quests/235_MimirsElixir/__init__.py

@@ -99,7 +99,7 @@ class Quest (JQuest) :
             htmltext = "30166-10.htm"     # here's what you do...
             st.takeItems(MIMIRS_ELIXIR,-1)  #remove this line for compatibility with L2JServer revisions prior to 376
             st.giveItems(SCROLL_ENCHANT_WEAPON_A,1)
-            st.setState(State.COMPLETED)
+            st.exitQuest(False)
             st.unset("cond")
     elif npcId == JOAN and id == State.STARTED:
        # first time talking to Joan: You ask for True Gold, she sends you for Sage's stone

+ 1 - 1
datapack_development/data/scripts/quests/241_PossessorOfAPreciousSoul_1/__init__.py

@@ -137,7 +137,7 @@ class Quest (JQuest) :
        st.addExpAndSp(263043,0)
        st.set("cond","0")
        st.playSound("ItemSound.quest_finish")
-       st.setState(State.COMPLETED)
+       st.exitQuest(False)
    return htmltext
 
  def onTalk (self,npc,player):

+ 1 - 1
datapack_development/data/scripts/quests/242_PossessorOfAPreciousSoul_2/__init__.py

@@ -182,7 +182,7 @@ class Quest (JQuest) :
        st.set("cornerstones","0")
        st.giveItems(CARADINE_LETTER,1)
        st.playSound("ItemSound.quest_finish")
-       st.setState(State.COMPLETED)
+       st.exitQuest(False)
    return htmltext
 
  def onKill(self,npc,player,isPet):

+ 1 - 1
datapack_development/data/scripts/quests/246_PossessorOfAPreciousSoul_3/__init__.py

@@ -66,7 +66,7 @@ class Quest (JQuest) :
        st.takeItems(RELIC_BOX,1)
        st.giveItems(CARADINE_LETTER_LAST,1)
        st.playSound("ItemSound.quest_finish")
-       st.setState(State.COMPLETED)
+       st.exitQuest(False)
    return htmltext
 
  def onTalk (self,npc,player):

+ 1 - 1
datapack_development/data/scripts/quests/247_PossessorOfAPreciousSoul_4/__init__.py

@@ -53,7 +53,7 @@ class Quest (JQuest) :
        st.getPlayer().setNoble(True)
        st.giveItems(NOBLESS_TIARA,1)
        st.playSound("ItemSound.quest_finish")
-       st.setState(State.COMPLETED)
+       st.exitQuest(False)
    return htmltext
 
  def onTalk (self,npc,player):

+ 1 - 1
datapack_development/data/scripts/quests/271_ProofOfValor/__init__.py

@@ -52,7 +52,7 @@ class Quest (JQuest) :
      htmltext = "30577-04.htm"
    elif st.getQuestItemsCount(KASHA_WOLF_FANG) >= 50 :
      st.set("cond","0")
-     st.setState(State.COMPLETED)
+     st.exitQuest(False)
      st.playSound("ItemSound.quest_finish")
      st.takeItems(KASHA_WOLF_FANG,-1)
      if st.getRandom(100) <= 13 :

+ 1 - 1
datapack_development/data/scripts/quests/27_ChestCaughtWithABaitOfWind/__init__.py

@@ -40,7 +40,7 @@ class Quest (JQuest) :
       st.giveItems(BLACK_PEARL_RING, 1)
       st.takeItems(STRANGE_BLUESPRINT,-1)
       st.unset("cond")
-      st.setState(State.COMPLETED)
+      st.exitQuest(False)
     return htmltext
 
   def onTalk(self, npc, player):

+ 1 - 1
datapack_development/data/scripts/quests/28_ChestCaughtWithABaitOfIcyAir/__init__.py

@@ -37,7 +37,7 @@ class Quest (JQuest) :
                 st.takeItems(KikisLetter,-1)
                 st.giveItems(ElvenRing,1)
                 st.set("cond","0")
-                st.setState(State.COMPLETED)
+                st.exitQuest(False)
                 st.playSound("ItemSound.quest_finish")
             else :
                 htmltext="31442-03.htm"

+ 1 - 1
datapack_development/data/scripts/quests/29_ChestCaughtWithABaitOfEarth/__init__.py

@@ -36,7 +36,7 @@ class Quest (JQuest) :
                 st.takeItems(SmallGlassBox,-1)
                 st.giveItems(PlatedLeatherGloves,1)
                 st.set("cond","0")
-                st.setState(State.COMPLETED)
+                st.exitQuest(False)
                 st.playSound("ItemSound.quest_finish")
             else :
                 htmltext ="30909-03.htm"

+ 2 - 2
datapack_development/data/scripts/quests/2_WhatWomenWant1/__init__.py

@@ -48,7 +48,7 @@ class Quest (JQuest) :
      st.takeItems(ARUJIENS_LETTER3,-1) 
      st.giveItems(113,1) 
      st.set("cond","0") 
-     st.setState(State.COMPLETED) 
+     st.exitQuest(False) 
      st.playSound("ItemSound.quest_finish") 
    return htmltext 
 
@@ -91,7 +91,7 @@ class Quest (JQuest) :
        st.takeItems(GREENIS_LETTER,-1) 
        st.giveItems(113,1)
        st.set("cond","0") 
-       st.setState(State.COMPLETED) 
+       st.exitQuest(False) 
        st.playSound("ItemSound.quest_finish")
    elif id == State.STARTED :    
        if npcId == MIRABEL and cond == 1 : 

+ 1 - 1
datapack_development/data/scripts/quests/30_ChestCaughtWithABaitOfFire/__init__.py

@@ -40,7 +40,7 @@ class Quest (JQuest) :
       st.giveItems(PROTECTION_NECKLACE, 1)
       st.takeItems(RUKAL_MUSICAL,-1)
       st.unset("cond")
-      st.setState(State.COMPLETED)
+      st.exitQuest(False)
     return htmltext
 
   def onTalk(self, npc, player):

+ 1 - 1
datapack_development/data/scripts/quests/31_SecretBuriedInTheSwamp/__init__.py

@@ -47,7 +47,7 @@ class Quest (JQuest) :
      st.addExpAndSp(130000,0)
      st.giveItems(57,40000)
      st.playSound("ItemSound.quest_finish")
-     st.setState(State.COMPLETED)
+     st.exitQuest(False)
    elif event != "31663-0a.htm":
      htmltext = default
    return htmltext

+ 1 - 1
datapack_development/data/scripts/quests/32_AnObviousLie/__init__.py

@@ -79,7 +79,7 @@ class Quest (JQuest) :
        elif event=="rabbit":
          item=RABBIT_EAR
        st.giveItems(item,1)
-       st.setState(State.COMPLETED)
+       st.exitQuest(False)
        st.unset("cond")
        st.playSound("ItemSound.quest_finish")
        htmltext = "30094-14.htm"

+ 1 - 1
datapack_development/data/scripts/quests/340_SubjugationOfLizardmen/__init__.py

@@ -94,7 +94,7 @@ class Quest (JQuest) :
            st.giveItems(57,14700)
            htmltext = "30385-13.htm"
            st.set("cond","0")
-           st.setState(State.COMPLETED)
+           st.exitQuest(False)
            st.playSound("ItemSound.quest_finish")
        elif npcId == ADONIUS :
          if cond == 2 :

+ 2 - 2
datapack_development/data/scripts/quests/347_GoGetTheCalculator/__init__.py

@@ -61,7 +61,7 @@ class Quest (JQuest) :
         st.giveItems(CALCULATOR,1)
         st.takeItems(CALCULATOR_Q,1)
         st.playSound("ItemSound.quest_middle")
-        st.setState(State.COMPLETED)
+        st.exitQuest(False)
         st.set("cond","0")
         st.exitQuest(1)
         htmltext = str(BRUNON)+"-05.htm"
@@ -69,7 +69,7 @@ class Quest (JQuest) :
         st.giveItems(ADENA,1000)
         st.takeItems(CALCULATOR_Q,1)
         st.playSound("ItemSound.quest_middle")
-        st.setState(State.COMPLETED)
+        st.exitQuest(False)
         st.set("cond","0")
         st.exitQuest(1)
         htmltext = str(BRUNON)+"-06.htm"

+ 1 - 1
datapack_development/data/scripts/quests/37_PleaseMakeMeFormalWear/__init__.py

@@ -56,7 +56,7 @@ class Quest (JQuest) :
        if st.getQuestItemsCount(DRESS_SHOES_BOX) :
          st.takeItems(DRESS_SHOES_BOX,1)
          st.giveItems(FORMAL_WEAR,1)
-         st.setState(State.COMPLETED)
+         st.exitQuest(False)
          st.unset("cond")
          st.playSound("ItemSound.quest_finish")
        else :

+ 1 - 1
datapack_development/data/scripts/quests/38_DragonFangs/__init__.py

@@ -63,7 +63,7 @@ class Quest (JQuest) :
        item,adena=REWARDS[st.getRandom(len(REWARDS))]
        st.giveItems(item,1)
        st.giveItems(57,adena)
-       st.setState(State.COMPLETED)
+       st.exitQuest(False)
     return htmltext
 
 

+ 1 - 1
datapack_development/data/scripts/quests/39_RedEyedInvaders/__init__.py

@@ -85,7 +85,7 @@ class Quest (JQuest) :
        st.giveItems(FISHING_SHOT_NG,500)
        st.unset("cond")
        st.playSound("ItemSound.quest_finish")
-       st.setState(State.COMPLETED)
+       st.exitQuest(False)
      else :
        htmltext = "You don't have required items"
    return htmltext

+ 1 - 1
datapack_development/data/scripts/quests/3_ReleaseDarkelfElder1/__init__.py

@@ -66,7 +66,7 @@ class Quest (JQuest) :
      st.takeItems(SUCCUBUS_BLOOD,-1)
      st.giveItems(956,1)
      st.unset("cond")
-     st.setState(State.COMPLETED)
+     st.exitQuest(False)
      st.playSound("ItemSound.quest_finish")
    return htmltext
 

+ 1 - 1
datapack_development/data/scripts/quests/401_PathToWarrior/__init__.py

@@ -108,7 +108,7 @@ class Quest (JQuest) :
           st.giveItems(MEDALLION_OF_WARRIOR,1)
           htmltext = "30010-13.htm"
           st.set("cond","0")
-          st.setState(State.COMPLETED)
+          st.exitQuest(False)
           st.playSound("ItemSound.quest_finish")
    return htmltext
 

+ 3 - 3
datapack_development/data/scripts/quests/402_PathToKnight/__init__.py

@@ -103,7 +103,7 @@ class Quest (JQuest) :
           st.takeItems(MARK_OF_ESQUIRE,-1)
           st.giveItems(SWORD_OF_RITUAL,1)
           st.set("cond","0")
-          st.setState(State.COMPLETED)
+          st.exitQuest(False)
           st.playSound("ItemSound.quest_finish")
         else:
           htmltext=default
@@ -114,7 +114,7 @@ class Quest (JQuest) :
           st.takeItems(MARK_OF_ESQUIRE,-1)
           st.giveItems(SWORD_OF_RITUAL,1)
           st.set("cond","0")
-          st.setState(State.COMPLETED)
+          st.exitQuest(False)
           st.playSound("ItemSound.quest_finish")
         else:
           htmltext=default
@@ -155,7 +155,7 @@ class Quest (JQuest) :
            st.takeItems(MARK_OF_ESQUIRE,-1)
            st.giveItems(SWORD_OF_RITUAL,1)
            st.set("cond","0")
-           st.setState(State.COMPLETED)
+           st.exitQuest(False)
            st.playSound("ItemSound.quest_finish")
    elif npcId == 30332 and cond==1 and squire :
        if not guards_mark1 and not coin1 :

+ 1 - 1
datapack_development/data/scripts/quests/403_PathToRogue/__init__.py

@@ -100,7 +100,7 @@ class Quest (JQuest) :
           for i in STOLEN_ITEM.keys() :
             st.takeItems(STOLEN_ITEM[i],-1)
           st.set("cond","0")
-          st.setState(State.COMPLETED)
+          st.exitQuest(False)
           st.playSound("ItemSound.quest_finish")
         elif st.getQuestItemsCount(HORSESHOE_OF_LIGHT) == 0 and st.getQuestItemsCount(BEZIQUES_LETTER)>0 :
           htmltext = "30379-07.htm"

+ 1 - 1
datapack_development/data/scripts/quests/404_PathToWizard/__init__.py

@@ -204,7 +204,7 @@ class Quest (JQuest) :
         st.takeItems(WATER_NECKLACE,st.getQuestItemsCount(WATER_NECKLACE))
         st.takeItems(EARTH_RING,st.getQuestItemsCount(EARTH_RING))
         st.set("cond","0")
-        st.setState(State.COMPLETED)
+        st.exitQuest(False)
         st.playSound("ItemSound.quest_finish")
         if st.getQuestItemsCount(BEAD_OF_SEASON) == 0 :
           st.giveItems(BEAD_OF_SEASON,1)

+ 1 - 1
datapack_development/data/scripts/quests/405_PathToCleric/__init__.py

@@ -76,7 +76,7 @@ class Quest (JQuest) :
         st.takeItems(LETTER_OF_ORDER2,1)
         st.giveItems(MARK_OF_FAITH,1)
         st.set("cond","0")
-        st.setState(State.COMPLETED)
+        st.exitQuest(False)
         st.playSound("ItemSound.quest_finish")
    elif npcId == 30022 and st.getInt("cond") and st.getQuestItemsCount(LETTER_OF_ORDER1)==1 :
         if st.getQuestItemsCount(BOOK_OF_VIVI) == 1 and st.getQuestItemsCount(BOOK_OF_SIMLON)>0 and st.getQuestItemsCount(BOOK_OF_PRAGA) == 1 :

+ 1 - 1
datapack_development/data/scripts/quests/406_PathToElvenKnight/__init__.py

@@ -88,7 +88,7 @@ class Quest (JQuest) :
         elif cond == 6 :
             st.takeItems(KLUTO_BOX,-1)
             st.set("cond","0")
-            st.setState(State.COMPLETED)
+            st.exitQuest(False)
             st.playSound("ItemSound.quest_finish")
             if st.getQuestItemsCount(ELVEN_KNIGHT_BROOCH) == 0 :
               st.giveItems(ELVEN_KNIGHT_BROOCH,1)

+ 1 - 1
datapack_development/data/scripts/quests/407_PathToElvenScout/__init__.py

@@ -118,7 +118,7 @@ class Quest (JQuest) :
         st.takeItems(HONORARY_GUARD,1)
         st.giveItems(REORIA_RECOMMENDATION,1)
         st.set("cond","0")
-        st.setState(State.COMPLETED)
+        st.exitQuest(False)
         st.playSound("ItemSound.quest_finish")
    return htmltext
 

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä