Página inicial Explorar Ajuda
Registrar Entrar
L2j
/
l2j-server-datapack
2
0
Fork 0
Arquivos Issues 0 Pull Requests 0 Wiki
Ver código fonte

Some quest fixes

awarm 19 anos atrás
pai
4f11d6acaa
commit
693f20b8f3
12 arquivos alterados com 345 adições e 224 exclusões
Visão dividida Mostrar estatísticas do Diff
  1. 3 1
      datapack_development/data/html/default/7622.htm
  2. 4 0
      datapack_development/data/html/npcdefault.htm
  3. 128 69
      datapack_development/data/jscript/quests/214_TrialOfScholar/__init__.py
  4. 2 2
      datapack_development/data/jscript/quests/216_TrialOfGuildsman/7103-09.htm
  5. 81 56
      datapack_development/data/jscript/quests/216_TrialOfGuildsman/__init__.py
  6. 2 2
      datapack_development/data/jscript/quests/219_TestimonyOfFate/__init__.py
  7. 2 1
      datapack_development/data/jscript/quests/221_TestimonyOfProsperity/7005-01.htm
  8. 94 80
      datapack_development/data/jscript/quests/221_TestimonyOfProsperity/__init__.py
  9. 2 1
      datapack_development/data/jscript/quests/228_TestOfMagus/7409-02.htm
  10. 14 4
      datapack_development/data/jscript/quests/228_TestOfMagus/__init__.py
  11. 11 7
      datapack_development/data/jscript/quests/231_TestOfMaestro/__init__.py
  12. 2 1
      datapack_development/sql/spawnlist.sql

+ 3 - 1
datapack_development/data/html/default/7622.htm
Ver arquivo 

@@ -7,6 +7,8 @@ This box was created during the period of Titan.
 
 <br>

 <a action="bypass -h npc_%objectId%_Chat 1">

 Open the box

-</a>

+</a><br>

+<a action="bypass -h npc_%objectId%_Quest">

+Quest</a>

 </body>

 </html>

+ 4 - 0
datapack_development/data/html/npcdefault.htm
Ver arquivo 

@@ -1,5 +1,9 @@
 
 <html>

 <body>

 I have nothing to say to you

+<br>

+<a action="bypass -h npc_%objectId%_Quest">

+Quest

+</a>

 </body>

 </html>

+ 128 - 69
datapack_development/data/jscript/quests/214_TrialOfScholar/__init__.py
Ver arquivo 

@@ -63,7 +63,7 @@ class Quest (JQuest) :
 
         st.set("cond","1")
 
         st.setState(STARTED)
 
         st.playSound("ItemSound.quest_accept")
 
-        st.giveItems(MIRIENS_SIGIL1_ID)
 
+        st.giveItems(MIRIENS_SIGIL1_ID,1)
 
     elif event == "7461_1" :
 
           if st.getPlayer().getLevel()<36 :
 
             htmltext = "7461-09.htm"
 
@@ -79,31 +79,37 @@ class Quest (JQuest) :
 
           htmltext = "7070-02.htm"
 
           st.giveItems(HIGHPRIESTS_SIGIL_ID,1)
 
           st.giveItems(SYLVAINS_LETTER_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
     elif event == "7608_1" :
 
           htmltext = "7608-02.htm"
 
           st.giveItems(MARYAS_LETTER1_ID,1)
 
           st.takeItems(SYLVAINS_LETTER_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
     elif event == "7608_2" :
 
           htmltext = "7608-07.htm"
 
     elif event == "7608_3" :
 
           htmltext = "7608-08.htm"
 
           st.giveItems(LUCILLAS_HANDBAG_ID,1)
 
           st.takeItems(CRETAS_LETTER1_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
     elif event == "7608_4" :
 
           htmltext = "7608-14.htm"
 
           st.takeItems(BROWN_SCROLL_SCRAP_ID,st.getQuestItemsCount(BROWN_SCROLL_SCRAP_ID))
 
           st.giveItems(CRYSTAL_OF_PURITY1_ID,1)
 
           st.takeItems(CRETAS_PAINTING3_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
     elif event == "7115_1" :
 
           htmltext = "7115-02.htm"
 
     elif event == "7115_2" :
 
           htmltext = "7115-03.htm"
 
           st.giveItems(JUREKS_LIST_ID,1)
 
           st.giveItems(GMAGISTERS_SIGIL_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
     elif event == "7071_1" :
 
           htmltext = "7071-04.htm"
 
           st.giveItems(CRETAS_PAINTING3_ID,1)
 
           st.takeItems(CRETAS_PAINTING2_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
     elif event == "7609_1" :
 
           htmltext = "7609-02.htm"
 
     elif event == "7609_2" :
 
@@ -114,18 +120,21 @@ class Quest (JQuest) :
 
           htmltext = "7609-05.htm"
 
           st.giveItems(CRETAS_LETTER1_ID,1)
 
           st.takeItems(MARYAS_LETTER2_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
     elif event == "7609_5" :
 
           htmltext = "7609-08.htm"
 
     elif event == "7609_6" :
 
           htmltext = "7609-09.htm"
 
           st.giveItems(CRETAS_PAINTING1_ID,1)
 
           st.takeItems(LUCILLAS_HANDBAG_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
     elif event == "7609_7" :
 
           htmltext = "7609-13.htm"
 
     elif event == "7609_8" :
 
           htmltext = "7609-14.htm"
 
           st.giveItems(CRETAS_LETTER2_ID,1)
 
           st.takeItems(DIETERS_KEY_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
     elif event == "7610_1" :
 
           htmltext = "7610-02.htm"
 
     elif event == "7610_2" :
 
@@ -146,6 +155,7 @@ class Quest (JQuest) :
 
           htmltext = "7610-10.htm"
 
           st.giveItems(CRONOS_SIGIL_ID,1)
 
           st.giveItems(CRONOS_LETTER_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
     elif event == "7610_10" :
 
           htmltext = "7610-13.htm"
 
     elif event == "7610_11" :
 
@@ -158,6 +168,7 @@ class Quest (JQuest) :
 
           st.takeItems(TREAFS_RING_ID,1)
 
           st.giveItems(SYMBOL_OF_CRONOS_ID,1)
 
           st.takeItems(DIETERS_DIARY_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
     elif event == "7111_1" :
 
           htmltext = "7111-02.htm"
 
     elif event == "7111_2" :
 
@@ -168,24 +179,29 @@ class Quest (JQuest) :
 
           htmltext = "7111-05.htm"
 
           st.giveItems(DIETERS_KEY_ID,1)
 
           st.takeItems(CRONOS_LETTER_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
     elif event == "7111_5" :
 
           htmltext = "7111-08.htm"
 
           st.giveItems(DIETERS_KEY_ID,1)
 
           st.takeItems(CRONOS_LETTER_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
     elif event == "7111_6" :
 
           htmltext = "7111-09.htm"
 
           st.giveItems(DIETERS_LETTER_ID,1)
 
           st.takeItems(CRETAS_LETTER2_ID,1)
 
           st.giveItems(DIETERS_DIARY_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
     elif event == "7230_1" :
 
           htmltext = "7230-02.htm"
 
           st.giveItems(RAUTS_LETTER_ENVELOPE_ID,1)
 
           st.takeItems(DIETERS_LETTER_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
     elif event == "7316_1" :
 
           htmltext = "7316-02.htm"
 
           st.giveItems(SCRIPTURE_CHAPTER_1_ID,1)
 
           st.takeItems(RAUTS_LETTER_ENVELOPE_ID,1)
 
           st.giveItems(STRONG_LIQUOR_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
     elif event == "7611_1" :
 
           htmltext = "7611-02.htm"
 
     elif event == "7611_2" :
 
@@ -194,6 +210,7 @@ class Quest (JQuest) :
 
           htmltext = "7611-04.htm"
 
           st.giveItems(TREAFS_RING_ID,1)
 
           st.takeItems(STRONG_LIQUOR_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
     elif event == "7103_1" :
 
           htmltext = "7103-02.htm"
 
     elif event == "7103_2" :
 
@@ -201,11 +218,13 @@ class Quest (JQuest) :
 
     elif event == "7103_3" :
 
           htmltext = "7103-04.htm"
 
           st.giveItems(VALKONS_REQUEST_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
     elif event == "7612_1" :
 
           htmltext = "7612-03.htm"
 
     elif event == "7612_2" :
 
           htmltext = "7612-04.htm"
 
           st.giveItems(KASIANS_LIST_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
     elif event == "7612_3" :
 
           htmltext = "7612-07.htm"
 
           st.giveItems(SCRIPTURE_CHAPTER_4_ID,1)
 
@@ -215,6 +234,7 @@ class Quest (JQuest) :
 
           st.takeItems(CRIMSONBINDS_ICHOR_ID,st.getQuestItemsCount(CRIMSONBINDS_ICHOR_ID))
 
           st.takeItems(ENCHT_GARGOYLES_NAIL_ID,st.getQuestItemsCount(ENCHT_GARGOYLES_NAIL_ID))
 
           st.takeItems(POITANS_NOTES_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
     return htmltext
 
 
 
@@ -247,6 +267,7 @@ class Quest (JQuest) :
 
         st.takeItems(SYMBOL_OF_SYLVAIN_ID,1)
 
         st.giveItems(MIRIENS_SIGIL2_ID,1)
 
         st.takeItems(MIRIENS_SIGIL1_ID,1)
 
+        st.playSound("ItemSound.quest_middle")
 
    elif npcId == 7461 and int(st.get("cond"))==1 and st.getQuestItemsCount(MIRIENS_SIGIL2_ID)==1 and st.getQuestItemsCount(SYMBOL_OF_JUREK_ID)==0 :
 
         htmltext = "7461-07.htm"
 
    elif npcId == 7461 and int(st.get("cond"))==1 and st.getQuestItemsCount(MIRIENS_SIGIL2_ID)==1 and st.getQuestItemsCount(SYMBOL_OF_JUREK_ID)==1 :
 
@@ -258,6 +279,7 @@ class Quest (JQuest) :
 
           htmltext = "7461-12.htm"
 
           st.giveItems(MIRIENS_SIGIL3_ID,1)
 
           st.takeItems(MIRIENS_INSTRUCTION_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
    elif npcId == 7461 and int(st.get("cond"))==1 and st.getQuestItemsCount(MIRIENS_SIGIL3_ID)==1 :
 
         if st.getQuestItemsCount(SYMBOL_OF_CRONOS_ID) == 0 :
 
           htmltext = "7461-13.htm"
 
@@ -273,46 +295,49 @@ class Quest (JQuest) :
 
             st.takeItems(SYMBOL_OF_CRONOS_ID,1)
 
             st.giveItems(MARK_OF_SCHOLAR_ID,1)
 
             st.takeItems(MIRIENS_SIGIL3_ID,1)
 
-   elif npcId == 7070 and int(st.get("cond"))==1 and st.getQuestItemsCount(MIRIENS_SIGIL1_ID)==1 and st.getQuestItemsCount((HIGHPRIESTS_SIGIL_ID) == 0 and st.getQuestItemsCount(SYMBOL_OF_SYLVAIN_ID)) == 0 :
 
+   elif npcId == 7070 and int(st.get("cond"))==1 and st.getQuestItemsCount(MIRIENS_SIGIL1_ID)==1 and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) == 0 and st.getQuestItemsCount(SYMBOL_OF_SYLVAIN_ID) == 0 :
 
         htmltext = "7070-01.htm"
 
-   elif npcId == 7070 and int(st.get("cond"))==1 and st.getQuestItemsCount(CRYSTAL_OF_PURITY1_ID)==0 and st.getQuestItemsCount((HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(MIRIENS_SIGIL1_ID)) :
 
+   elif npcId == 7070 and int(st.get("cond"))==1 and st.getQuestItemsCount(CRYSTAL_OF_PURITY1_ID)==0 and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(MIRIENS_SIGIL1_ID) :
 
         htmltext = "7070-03.htm"
 
-   elif npcId == 7070 and int(st.get("cond"))==1 and st.getQuestItemsCount((HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(CRYSTAL_OF_PURITY1_ID)) :
 
+   elif npcId == 7070 and int(st.get("cond"))==1 and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(CRYSTAL_OF_PURITY1_ID) :
 
         htmltext = "7070-04.htm"
 
         st.giveItems(SYMBOL_OF_SYLVAIN_ID,1)
 
         st.takeItems(HIGHPRIESTS_SIGIL_ID,1)
 
         st.takeItems(CRYSTAL_OF_PURITY1_ID,1)
 
-   elif npcId == 7070 and int(st.get("cond"))==1 and st.getQuestItemsCount((MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(SYMBOL_OF_SYLVAIN_ID)) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID)==0 :
 
+        st.playSound("ItemSound.quest_middle")
 
+   elif npcId == 7070 and int(st.get("cond"))==1 and st.getQuestItemsCount(MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(SYMBOL_OF_SYLVAIN_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID)==0 :
 
         htmltext = "7070-05.htm"
 
-   elif npcId == 7070 and int(st.get("cond"))==1 and st.getQuestItemsCount((MIRIENS_SIGIL2_ID) or st.getQuestItemsCount(MIRIENS_SIGIL3_ID)) :
 
+   elif npcId == 7070 and int(st.get("cond"))==1 and (st.getQuestItemsCount(MIRIENS_SIGIL2_ID) or st.getQuestItemsCount(MIRIENS_SIGIL3_ID)) :
 
         htmltext = "7070-06.htm"
 
-   elif npcId == 7608 and int(st.get("cond"))==1 and (st.getQuestItemsCount((MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(SYLVAINS_LETTER_ID))) :
 
+   elif npcId == 7608 and int(st.get("cond"))==1 and (st.getQuestItemsCount(MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(SYLVAINS_LETTER_ID)) :
 
         htmltext = "7608-01.htm"
 
-   elif npcId == 7608 and int(st.get("cond"))==1 and (st.getQuestItemsCount((MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(MARYAS_LETTER1_ID))) :
 
+   elif npcId == 7608 and int(st.get("cond"))==1 and (st.getQuestItemsCount(MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(MARYAS_LETTER1_ID)) :
 
         htmltext = "7608-03.htm"
 
-   elif npcId == 7608 and int(st.get("cond"))==1 and (st.getQuestItemsCount((MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(LUKAS_LETTER_ID))) :
 
+   elif npcId == 7608 and int(st.get("cond"))==1 and (st.getQuestItemsCount(MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(LUKAS_LETTER_ID)) :
 
         htmltext = "7608-04.htm"
 
         st.giveItems(MARYAS_LETTER2_ID,1)
 
         st.takeItems(LUKAS_LETTER_ID,1)
 
-   elif npcId == 7608 and int(st.get("cond"))==1 and (st.getQuestItemsCount((MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(MARYAS_LETTER2_ID))) :
 
+        st.playSound("ItemSound.quest_middle")
 
+   elif npcId == 7608 and int(st.get("cond"))==1 and (st.getQuestItemsCount(MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(MARYAS_LETTER2_ID)) :
 
         htmltext = "7608-05.htm"
 
-   elif npcId == 7608 and int(st.get("cond"))==1 and (st.getQuestItemsCount((MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(CRETAS_LETTER1_ID))) :
 
+   elif npcId == 7608 and int(st.get("cond"))==1 and (st.getQuestItemsCount(MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(CRETAS_LETTER1_ID)) :
 
         htmltext = "7608-06.htm"
 
-   elif npcId == 7608 and int(st.get("cond"))==1 and (st.getQuestItemsCount((MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(LUCILLAS_HANDBAG_ID))) :
 
+   elif npcId == 7608 and int(st.get("cond"))==1 and (st.getQuestItemsCount(MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(LUCILLAS_HANDBAG_ID)) :
 
         htmltext = "7608-09.htm"
 
-   elif npcId == 7608 and int(st.get("cond"))==1 and (st.getQuestItemsCount((MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(CRETAS_PAINTING1_ID))) :
 
+   elif npcId == 7608 and int(st.get("cond"))==1 and (st.getQuestItemsCount(MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(CRETAS_PAINTING1_ID)) :
 
         htmltext = "7608-10.htm"
 
         st.giveItems(CRETAS_PAINTING2_ID,1)
 
         st.takeItems(CRETAS_PAINTING1_ID,1)
 
-   elif npcId == 7608 and int(st.get("cond"))==1 and (st.getQuestItemsCount((MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(CRETAS_PAINTING2_ID))) :
 
+        st.playSound("ItemSound.quest_middle")
 
+   elif npcId == 7608 and int(st.get("cond"))==1 and (st.getQuestItemsCount(MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(CRETAS_PAINTING2_ID)) :
 
         htmltext = "7608-11.htm"
 
-   elif npcId == 7608 and int(st.get("cond"))==1 and (st.getQuestItemsCount((MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(CRETAS_PAINTING3_ID))) and st.getQuestItemsCount(BROWN_SCROLL_SCRAP_ID)<5 :
 
+   elif npcId == 7608 and int(st.get("cond"))==1 and (st.getQuestItemsCount(MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(CRETAS_PAINTING3_ID)) and st.getQuestItemsCount(BROWN_SCROLL_SCRAP_ID)<5 :
 
         htmltext = "7608-12.htm"
 
-   elif npcId == 7608 and int(st.get("cond"))==1 and (st.getQuestItemsCount((MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(CRETAS_PAINTING3_ID))) and st.getQuestItemsCount(BROWN_SCROLL_SCRAP_ID)>=5 :
 
+   elif npcId == 7608 and int(st.get("cond"))==1 and (st.getQuestItemsCount(MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(CRETAS_PAINTING3_ID)) and st.getQuestItemsCount(BROWN_SCROLL_SCRAP_ID)>=5 :
 
         htmltext = "7608-13.htm"
 
-   elif npcId == 7608 and int(st.get("cond"))==1 and (st.getQuestItemsCount((MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(CRYSTAL_OF_PURITY1_ID))) :
 
+   elif npcId == 7608 and int(st.get("cond"))==1 and (st.getQuestItemsCount(MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(CRYSTAL_OF_PURITY1_ID)) :
 
         htmltext = "7608-15.htm"
 
-   elif npcId == 7608 and int(st.get("cond"))==1 and (st.getQuestItemsCount((SYMBOL_OF_SYLVAIN_ID) or st.getQuestItemsCount(MIRIENS_SIGIL2_ID))) :
 
+   elif npcId == 7608 and int(st.get("cond"))==1 and (st.getQuestItemsCount(SYMBOL_OF_SYLVAIN_ID) or st.getQuestItemsCount(MIRIENS_SIGIL2_ID)) :
 
         htmltext = "7608-16.htm"
 
    elif npcId == 7608 and int(st.get("cond"))==1 and st.getQuestItemsCount(MIRIENS_SIGIL3_ID)==1 and st.getQuestItemsCount(VALKONS_REQUEST_ID)==0 :
 
         htmltext = "7608-17.htm"
 
@@ -320,6 +345,7 @@ class Quest (JQuest) :
 
         htmltext = "7608-18.htm"
 
         st.giveItems(CRYSTAL_OF_PURITY2_ID,1)
 
         st.takeItems(VALKONS_REQUEST_ID,1)
 
+        st.playSound("ItemSound.quest_middle")
 
    elif npcId == 7115 and int(st.get("cond"))==1 and st.getQuestItemsCount(MIRIENS_SIGIL2_ID)==1 and st.getQuestItemsCount(GMAGISTERS_SIGIL_ID)==0 and st.getQuestItemsCount(SYMBOL_OF_JUREK_ID)==0 :
 
         htmltext = "7115-01.htm"
 
    elif npcId == 7115 and int(st.get("cond"))==1 and st.getQuestItemsCount(MIRIENS_SIGIL2_ID)==1 and st.getQuestItemsCount(JUREKS_LIST_ID)==1 :
 
@@ -333,80 +359,82 @@ class Quest (JQuest) :
 
           st.takeItems(SHACKLES_SCALP_ID,st.getQuestItemsCount(SHACKLES_SCALP_ID))
 
           st.giveItems(SYMBOL_OF_JUREK_ID,1)
 
           st.takeItems(GMAGISTERS_SIGIL_ID,1)
 
-   elif npcId == 7115 and int(st.get("cond"))==1 and (st.getQuestItemsCount((MIRIENS_SIGIL2_ID) and st.getQuestItemsCount(SYMBOL_OF_JUREK_ID))) and st.getQuestItemsCount(GMAGISTERS_SIGIL_ID)==0 :
 
+          st.playSound("ItemSound.quest_middle")
 
+   elif npcId == 7115 and int(st.get("cond"))==1 and (st.getQuestItemsCount(MIRIENS_SIGIL2_ID) and st.getQuestItemsCount(SYMBOL_OF_JUREK_ID)) and st.getQuestItemsCount(GMAGISTERS_SIGIL_ID)==0 :
 
         htmltext = "7115-06.htm"
 
-   elif npcId == 7115 and int(st.get("cond"))==1 and (st.getQuestItemsCount((MIRIENS_SIGIL1_ID) or st.getQuestItemsCount(MIRIENS_SIGIL3_ID))) :
 
+   elif npcId == 7115 and int(st.get("cond"))==1 and (st.getQuestItemsCount(MIRIENS_SIGIL1_ID) or st.getQuestItemsCount(MIRIENS_SIGIL3_ID)) :
 
         htmltext = "7115-07.htm"
 
-   elif npcId == 7071 and int(st.get("cond"))==1 and st.getQuestItemsCount((MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(MARYAS_LETTER1_ID)) :
 
+   elif npcId == 7071 and int(st.get("cond"))==1 and st.getQuestItemsCount(MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(MARYAS_LETTER1_ID) :
 
         htmltext = "7071-01.htm"
 
         st.giveItems(LUKAS_LETTER_ID,1)
 
         st.takeItems(MARYAS_LETTER1_ID,1)
 
-   elif npcId == 7071 and int(st.get("cond"))==1 and st.getQuestItemsCount((MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID)) and st.getQuestItemsCount((MARYAS_LETTER2_ID) or st.getQuestItemsCount(CRETAS_LETTER1_ID) or st.getQuestItemsCount(LUCILLAS_HANDBAG_ID) or st.getQuestItemsCount(CRETAS_PAINTING1_ID) or st.getQuestItemsCount(LUKAS_LETTER_ID)) :
 
+        st.playSound("ItemSound.quest_middle")
 
+   elif npcId == 7071 and int(st.get("cond"))==1 and st.getQuestItemsCount(MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and (st.getQuestItemsCount(MARYAS_LETTER2_ID) or st.getQuestItemsCount(CRETAS_LETTER1_ID) or st.getQuestItemsCount(LUCILLAS_HANDBAG_ID) or st.getQuestItemsCount(CRETAS_PAINTING1_ID) or st.getQuestItemsCount(LUKAS_LETTER_ID)) :
 
         htmltext = "7071-02.htm"
 
-   elif npcId == 7071 and int(st.get("cond"))==1 and st.getQuestItemsCount((MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(CRETAS_PAINTING2_ID)) :
 
+   elif npcId == 7071 and int(st.get("cond"))==1 and st.getQuestItemsCount(MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(CRETAS_PAINTING2_ID) :
 
         htmltext = "7071-03.htm"
 
-   elif npcId == 7071 and int(st.get("cond"))==1 and st.getQuestItemsCount((MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(CRETAS_PAINTING3_ID)) :
 
+   elif npcId == 7071 and int(st.get("cond"))==1 and st.getQuestItemsCount(MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(CRETAS_PAINTING3_ID) :
 
         if st.getQuestItemsCount(BROWN_SCROLL_SCRAP_ID)<5 :
 
           htmltext = "7071-05.htm"
 
         else:
 
           htmltext = "7071-06.htm"
 
-   elif npcId == 7071 and int(st.get("cond"))==1 and st.getQuestItemsCount((SYMBOL_OF_SYLVAIN_ID) or st.getQuestItemsCount(MIRIENS_SIGIL2_ID) or st.getQuestItemsCount(MIRIENS_SIGIL3_ID) or st.getQuestItemsCount(CRYSTAL_OF_PURITY1_ID)) :
 
+   elif npcId == 7071 and int(st.get("cond"))==1 and (st.getQuestItemsCount(SYMBOL_OF_SYLVAIN_ID) or st.getQuestItemsCount(MIRIENS_SIGIL2_ID) or st.getQuestItemsCount(MIRIENS_SIGIL3_ID) or st.getQuestItemsCount(CRYSTAL_OF_PURITY1_ID)) :
 
         htmltext = "7071-07.htm"
 
-   elif npcId == 7609 and int(st.get("cond"))==1 and st.getQuestItemsCount((MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(MARYAS_LETTER2_ID)) :
 
+   elif npcId == 7609 and int(st.get("cond"))==1 and st.getQuestItemsCount(MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(MARYAS_LETTER2_ID) :
 
         htmltext = "7609-01.htm"
 
-   elif npcId == 7609 and int(st.get("cond"))==1 and st.getQuestItemsCount((MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(CRETAS_LETTER1_ID)) :
 
+   elif npcId == 7609 and int(st.get("cond"))==1 and st.getQuestItemsCount(MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(CRETAS_LETTER1_ID) :
 
         htmltext = "7609-06.htm"
 
-   elif npcId == 7609 and int(st.get("cond"))==1 and st.getQuestItemsCount((MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(LUCILLAS_HANDBAG_ID)) :
 
+   elif npcId == 7609 and int(st.get("cond"))==1 and st.getQuestItemsCount(MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(LUCILLAS_HANDBAG_ID) :
 
         htmltext = "7609-07.htm"
 
-   elif npcId == 7609 and int(st.get("cond"))==1 and st.getQuestItemsCount((MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID)) and st.getQuestItemsCount((CRETAS_PAINTING1_ID) or st.getQuestItemsCount(CRETAS_PAINTING2_ID) or st.getQuestItemsCount(CRETAS_PAINTING3_ID)) :
 
+   elif npcId == 7609 and int(st.get("cond"))==1 and st.getQuestItemsCount(MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and (st.getQuestItemsCount(CRETAS_PAINTING1_ID) or st.getQuestItemsCount(CRETAS_PAINTING2_ID) or st.getQuestItemsCount(CRETAS_PAINTING3_ID)) :
 
         htmltext = "7609-10.htm"
 
-   elif npcId == 7609 and int(st.get("cond"))==1 and st.getQuestItemsCount((CRYSTAL_OF_PURITY1_ID) or st.getQuestItemsCount(SYMBOL_OF_SYLVAIN_ID) or st.getQuestItemsCount(MIRIENS_SIGIL2_ID)) :
 
+   elif npcId == 7609 and int(st.get("cond"))==1 and (st.getQuestItemsCount(CRYSTAL_OF_PURITY1_ID) or st.getQuestItemsCount(SYMBOL_OF_SYLVAIN_ID) or st.getQuestItemsCount(MIRIENS_SIGIL2_ID)) :
 
         htmltext = "7609-11.htm"
 
-   elif npcId == 7609 and int(st.get("cond"))==1 and st.getQuestItemsCount((MIRIENS_SIGIL3_ID) and st.getQuestItemsCount(DIETERS_KEY_ID)) :
 
+   elif npcId == 7609 and int(st.get("cond"))==1 and st.getQuestItemsCount(MIRIENS_SIGIL3_ID) and st.getQuestItemsCount(DIETERS_KEY_ID) :
 
         htmltext = "7609-12.htm"
 
    elif npcId == 7609 and int(st.get("cond"))==1 and st.getQuestItemsCount(MIRIENS_SIGIL3_ID)==1 and st.getQuestItemsCount(DIETERS_KEY_ID)==0 :
 
         htmltext = "7609-15.htm"
 
    elif npcId == 7610 and int(st.get("cond"))==1 and st.getQuestItemsCount(MIRIENS_SIGIL3_ID)==1 and st.getQuestItemsCount(CRONOS_SIGIL_ID)==0 and st.getQuestItemsCount(SYMBOL_OF_CRONOS_ID)==0 :
 
         htmltext = "7610-01.htm"
 
-   elif npcId == 7610 and int(st.get("cond"))==1 and (st.getQuestItemsCount((MIRIENS_SIGIL3_ID) or st.getQuestItemsCount(CRONOS_SIGIL_ID))) :
 
-        if st.getQuestItemsCount((SCRIPTURE_CHAPTER_1_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_2_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_3_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_4_ID)) :
 
+   elif npcId == 7610 and int(st.get("cond"))==1 and (st.getQuestItemsCount(MIRIENS_SIGIL3_ID) or st.getQuestItemsCount(CRONOS_SIGIL_ID)) :
 
+        if st.getQuestItemsCount(SCRIPTURE_CHAPTER_1_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_2_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_3_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_4_ID) :
 
           htmltext = "7610-12.htm"
 
         else:
 
           htmltext = "7610-11.htm"
 
    elif npcId == 7610 and int(st.get("cond"))==1 and st.getQuestItemsCount(MIRIENS_SIGIL3_ID)==1 and st.getQuestItemsCount(SYMBOL_OF_CRONOS_ID)==1 and st.getQuestItemsCount(CRONOS_SIGIL_ID)==0 :
 
         htmltext = "7610-15.htm"
 
-   elif npcId == 7111 and int(st.get("cond"))==1 and (st.getQuestItemsCount((MIRIENS_SIGIL3_ID) and st.getQuestItemsCount(CRONOS_SIGIL_ID) and st.getQuestItemsCount(CRONOS_LETTER_ID))) :
 
+   elif npcId == 7111 and int(st.get("cond"))==1 and st.getQuestItemsCount(MIRIENS_SIGIL3_ID) and st.getQuestItemsCount(CRONOS_SIGIL_ID) and st.getQuestItemsCount(CRONOS_LETTER_ID) :
 
         htmltext = "7111-01.htm"
 
-   elif npcId == 7111 and int(st.get("cond"))==1 and (st.getQuestItemsCount((MIRIENS_SIGIL3_ID) and st.getQuestItemsCount(CRONOS_SIGIL_ID) and st.getQuestItemsCount(DIETERS_KEY_ID))) :
 
+   elif npcId == 7111 and int(st.get("cond"))==1 and st.getQuestItemsCount(MIRIENS_SIGIL3_ID) and st.getQuestItemsCount(CRONOS_SIGIL_ID) and st.getQuestItemsCount(DIETERS_KEY_ID) :
 
           htmltext = "7111-06.htm"
 
-   elif npcId == 7111 and int(st.get("cond"))==1 and (st.getQuestItemsCount((MIRIENS_SIGIL3_ID) and st.getQuestItemsCount(CRONOS_SIGIL_ID) and st.getQuestItemsCount(CRETAS_LETTER2_ID))) :
 
+   elif npcId == 7111 and int(st.get("cond"))==1 and st.getQuestItemsCount(MIRIENS_SIGIL3_ID) and st.getQuestItemsCount(CRONOS_SIGIL_ID) and st.getQuestItemsCount(CRETAS_LETTER2_ID) :
 
           htmltext = "7111-07.htm"
 
-   elif npcId == 7111 and int(st.get("cond"))==1 and (st.getQuestItemsCount((MIRIENS_SIGIL3_ID) and st.getQuestItemsCount(CRONOS_SIGIL_ID) and st.getQuestItemsCount(DIETERS_DIARY_ID) and st.getQuestItemsCount(DIETERS_LETTER_ID))) :
 
+   elif npcId == 7111 and int(st.get("cond"))==1 and st.getQuestItemsCount(MIRIENS_SIGIL3_ID) and st.getQuestItemsCount(CRONOS_SIGIL_ID) and st.getQuestItemsCount(DIETERS_DIARY_ID) and st.getQuestItemsCount(DIETERS_LETTER_ID) :
 
           htmltext = "7111-10.htm"
 
-   elif npcId == 7111 and int(st.get("cond"))==1 and (st.getQuestItemsCount((MIRIENS_SIGIL3_ID) and st.getQuestItemsCount(CRONOS_SIGIL_ID) and st.getQuestItemsCount(DIETERS_DIARY_ID) and st.getQuestItemsCount(RAUTS_LETTER_ENVELOPE_ID))) :
 
+   elif npcId == 7111 and int(st.get("cond"))==1 and st.getQuestItemsCount(MIRIENS_SIGIL3_ID) and st.getQuestItemsCount(CRONOS_SIGIL_ID) and st.getQuestItemsCount(DIETERS_DIARY_ID) and st.getQuestItemsCount(RAUTS_LETTER_ENVELOPE_ID) :
 
           htmltext = "7111-11.htm"
 
-   elif npcId == 7111 and int(st.get("cond"))==1 and (st.getQuestItemsCount((MIRIENS_SIGIL3_ID) and st.getQuestItemsCount(CRONOS_SIGIL_ID) and st.getQuestItemsCount(DIETERS_DIARY_ID))) and st.getQuestItemsCount(DIETERS_LETTER_ID)==0 and st.getQuestItemsCount(RAUTS_LETTER_ENVELOPE_ID)==0 :
 
-          if st.getQuestItemsCount((SCRIPTURE_CHAPTER_1_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_2_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_3_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_4_ID)) :
 
+   elif npcId == 7111 and int(st.get("cond"))==1 and st.getQuestItemsCount(MIRIENS_SIGIL3_ID) and st.getQuestItemsCount(CRONOS_SIGIL_ID) and st.getQuestItemsCount(DIETERS_DIARY_ID) and st.getQuestItemsCount(DIETERS_LETTER_ID)==0 and st.getQuestItemsCount(RAUTS_LETTER_ENVELOPE_ID)==0 :
 
+          if st.getQuestItemsCount(SCRIPTURE_CHAPTER_1_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_2_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_3_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_4_ID) :
 
             htmltext = "7111-13.htm"
 
           else:
 
             htmltext = "7111-12.htm"
 
    elif npcId == 7111 and int(st.get("cond"))==1 and st.getQuestItemsCount(SYMBOL_OF_CRONOS_ID)==1 :
 
           htmltext = "7111-15.htm"
 
-   elif npcId == 7230 and int(st.get("cond"))==1 and (st.getQuestItemsCount((DIETERS_DIARY_ID) and st.getQuestItemsCount(DIETERS_LETTER_ID))) :
 
+   elif npcId == 7230 and int(st.get("cond"))==1 and st.getQuestItemsCount(DIETERS_DIARY_ID) and st.getQuestItemsCount(DIETERS_LETTER_ID) :
 
         htmltext = "7230-01.htm"
 
-   elif npcId == 7230 and int(st.get("cond"))==1 and (st.getQuestItemsCount((DIETERS_DIARY_ID) and st.getQuestItemsCount(RAUTS_LETTER_ENVELOPE_ID))) :
 
+   elif npcId == 7230 and int(st.get("cond"))==1 and st.getQuestItemsCount(DIETERS_DIARY_ID) and st.getQuestItemsCount(RAUTS_LETTER_ENVELOPE_ID) :
 
         htmltext = "7230-03.htm"
 
-   elif npcId == 7230 and int(st.get("cond"))==1 and st.getQuestItemsCount(DIETERS_DIARY_ID)==1 and (st.getQuestItemsCount((STRONG_LIQUOR_ID) or st.getQuestItemsCount(TREAFS_RING_ID))) :
 
+   elif npcId == 7230 and int(st.get("cond"))==1 and st.getQuestItemsCount(DIETERS_DIARY_ID)==1 and (st.getQuestItemsCount(STRONG_LIQUOR_ID) or st.getQuestItemsCount(TREAFS_RING_ID)) :
 
         htmltext = "7230-04.htm"
 
-   elif npcId == 7316 and int(st.get("cond"))==1 and (st.getQuestItemsCount((DIETERS_DIARY_ID) and st.getQuestItemsCount(RAUTS_LETTER_ENVELOPE_ID))) :
 
+   elif npcId == 7316 and int(st.get("cond"))==1 and st.getQuestItemsCount(DIETERS_DIARY_ID) and st.getQuestItemsCount(RAUTS_LETTER_ENVELOPE_ID) :
 
         htmltext = "7316-01.htm"
 
-   elif npcId == 7316 and int(st.get("cond"))==1 and (st.getQuestItemsCount((DIETERS_DIARY_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_1_ID) and st.getQuestItemsCount(STRONG_LIQUOR_ID))) :
 
+   elif npcId == 7316 and int(st.get("cond"))==1 and st.getQuestItemsCount(DIETERS_DIARY_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_1_ID) and st.getQuestItemsCount(STRONG_LIQUOR_ID) :
 
         htmltext = "7316-04.htm"
 
-   elif npcId == 7316 and int(st.get("cond"))==1 and (st.getQuestItemsCount((DIETERS_DIARY_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_1_ID) and st.getQuestItemsCount(TREAFS_RING_ID))) :
 
+   elif npcId == 7316 and int(st.get("cond"))==1 and st.getQuestItemsCount(DIETERS_DIARY_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_1_ID) and st.getQuestItemsCount(TREAFS_RING_ID) :
 
         htmltext = "7316-05.htm"
 
-   elif npcId == 7611 and int(st.get("cond"))==1 and (st.getQuestItemsCount((DIETERS_DIARY_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_1_ID) and st.getQuestItemsCount(STRONG_LIQUOR_ID))) :
 
+   elif npcId == 7611 and int(st.get("cond"))==1 and st.getQuestItemsCount(DIETERS_DIARY_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_1_ID) and st.getQuestItemsCount(STRONG_LIQUOR_ID) :
 
         htmltext = "7611-01.htm"
 
-   elif npcId == 7611 and int(st.get("cond"))==1 and (st.getQuestItemsCount((TREAFS_RING_ID) or st.getQuestItemsCount(SYMBOL_OF_CRONOS_ID))) :
 
+   elif npcId == 7611 and int(st.get("cond"))==1 and (st.getQuestItemsCount(TREAFS_RING_ID) or st.getQuestItemsCount(SYMBOL_OF_CRONOS_ID)) :
 
         htmltext = "7611-05.htm"
 
    elif npcId == 7103 and int(st.get("cond"))==1 and st.getQuestItemsCount(TREAFS_RING_ID)==1 and st.getQuestItemsCount(VALKONS_REQUEST_ID)==0 and st.getQuestItemsCount(CRYSTAL_OF_PURITY2_ID)==0 and st.getQuestItemsCount(SCRIPTURE_CHAPTER_2_ID)==0 :
 
         htmltext = "7103-01.htm"
 
@@ -416,67 +444,98 @@ class Quest (JQuest) :
 
         htmltext = "7103-06.htm"
 
         st.giveItems(SCRIPTURE_CHAPTER_2_ID,1)
 
         st.takeItems(CRYSTAL_OF_PURITY2_ID,1)
 
+        st.playSound("ItemSound.quest_middle")
 
    elif npcId == 7103 and int(st.get("cond"))==1 and st.getQuestItemsCount(TREAFS_RING_ID)==1 and st.getQuestItemsCount(VALKONS_REQUEST_ID)==0 and st.getQuestItemsCount(CRYSTAL_OF_PURITY2_ID)==0 and st.getQuestItemsCount(SCRIPTURE_CHAPTER_2_ID)==1 :
 
         htmltext = "7103-07.htm"
 
-   elif npcId == 7458 and int(st.get("cond"))==1 and st.getQuestItemsCount(TREAFS_RING_ID)==1 and st.getQuestItemsCount((POITANS_NOTES_ID) == 0 and st.getQuestItemsCount(KASIANS_LIST_ID) == 0 and st.getQuestItemsCount(SCRIPTURE_CHAPTER_4_ID)) == 0 :
 
+   elif npcId == 7458 and int(st.get("cond"))==1 and st.getQuestItemsCount(TREAFS_RING_ID)==1 and st.getQuestItemsCount(POITANS_NOTES_ID) == 0 and st.getQuestItemsCount(KASIANS_LIST_ID) == 0 and st.getQuestItemsCount(SCRIPTURE_CHAPTER_4_ID) == 0 :
 
         htmltext = "7458-01.htm"
 
         st.giveItems(POITANS_NOTES_ID,1)
 
-   elif npcId == 7458 and int(st.get("cond"))==1 and st.getQuestItemsCount((TREAFS_RING_ID) and st.getQuestItemsCount(POITANS_NOTES_ID)) and st.getQuestItemsCount((KASIANS_LIST_ID) == 0 and st.getQuestItemsCount(SCRIPTURE_CHAPTER_4_ID)) == 0 :
 
+        st.playSound("ItemSound.quest_middle")
 
+   elif npcId == 7458 and int(st.get("cond"))==1 and st.getQuestItemsCount(TREAFS_RING_ID) and st.getQuestItemsCount(POITANS_NOTES_ID) and st.getQuestItemsCount(KASIANS_LIST_ID) == 0 and st.getQuestItemsCount(SCRIPTURE_CHAPTER_4_ID) == 0 :
 
         htmltext = "7458-02.htm"
 
-   elif npcId == 7458 and int(st.get("cond"))==1 and st.getQuestItemsCount((TREAFS_RING_ID) and st.getQuestItemsCount(POITANS_NOTES_ID) and st.getQuestItemsCount(KASIANS_LIST_ID)) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_4_ID)==0 :
 
+   elif npcId == 7458 and int(st.get("cond"))==1 and st.getQuestItemsCount(TREAFS_RING_ID) and st.getQuestItemsCount(POITANS_NOTES_ID) and st.getQuestItemsCount(KASIANS_LIST_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_4_ID)==0 :
 
         htmltext = "7458-03.htm"
 
-   elif npcId == 7458 and int(st.get("cond"))==1 and st.getQuestItemsCount((TREAFS_RING_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_4_ID)) and st.getQuestItemsCount((POITANS_NOTES_ID) == 0 and st.getQuestItemsCount(KASIANS_LIST_ID)) == 0 :
 
+   elif npcId == 7458 and int(st.get("cond"))==1 and st.getQuestItemsCount(TREAFS_RING_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_4_ID) and st.getQuestItemsCount(POITANS_NOTES_ID) == 0 and st.getQuestItemsCount(KASIANS_LIST_ID) == 0 :
 
         htmltext = "7458-04.htm"
 
-   elif npcId == 7612 and int(st.get("cond"))==1 and st.getQuestItemsCount((TREAFS_RING_ID) and st.getQuestItemsCount(POITANS_NOTES_ID)) and st.getQuestItemsCount(KASIANS_LIST_ID)==0 :
 
-        if st.getQuestItemsCount((SCRIPTURE_CHAPTER_1_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_2_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_3_ID)) :
 
+   elif npcId == 7612 and int(st.get("cond"))==1 and st.getQuestItemsCount(TREAFS_RING_ID) and st.getQuestItemsCount(POITANS_NOTES_ID) and st.getQuestItemsCount(KASIANS_LIST_ID)==0 :
 
+        if st.getQuestItemsCount(SCRIPTURE_CHAPTER_1_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_2_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_3_ID) :
 
           htmltext = "7612-02.htm"
 
         else:
 
           htmltext = "7612-01.htm"
 
-   elif npcId == 7612 and int(st.get("cond"))==1 and st.getQuestItemsCount((TREAFS_RING_ID) and st.getQuestItemsCount(POITANS_NOTES_ID) and st.getQuestItemsCount(KASIANS_LIST_ID)) :
 
+   elif npcId == 7612 and int(st.get("cond"))==1 and st.getQuestItemsCount(TREAFS_RING_ID) and st.getQuestItemsCount(POITANS_NOTES_ID) and st.getQuestItemsCount(KASIANS_LIST_ID) :
 
         if st.getQuestItemsCount(GHOULS_SKIN_ID)+st.getQuestItemsCount(MEDUSAS_BLOOD_ID)+st.getQuestItemsCount(CRIMSONBINDS_ICHOR_ID)+st.getQuestItemsCount(ENCHT_GARGOYLES_NAIL_ID)<32 :
 
           htmltext = "7612-05.htm"
 
         else:
 
           htmltext = "7612-06.htm"
 
-   elif npcId == 7612 and int(st.get("cond"))==1 and st.getQuestItemsCount((st.getQuestItemsCount(POITANS_NOTES_ID) == 0) == 0 and st.getQuestItemsCount(POITANS_NOTES_ID) == 0 and st.getQuestItemsCount(KASIANS_LIST_ID)) == 0 and st.getQuestItemsCount(TREAFS_RING_ID)==1 and (st.getQuestItemsCount((SCRIPTURE_CHAPTER_1_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_2_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_3_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_4_ID))) :
 
+   elif npcId == 7612 and int(st.get("cond"))==1 and st.getQuestItemsCount(POITANS_NOTES_ID) == 0 and st.getQuestItemsCount(KASIANS_LIST_ID) == 0 and st.getQuestItemsCount(TREAFS_RING_ID)==1 and st.getQuestItemsCount(SCRIPTURE_CHAPTER_1_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_2_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_3_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_4_ID) :
 
         htmltext = "7612-08.htm"
 
    return htmltext
 
 
  def onKill (self,npcId,st):
 
    if npcId == 580 :
 
-    if int(st.get("cond")) and st.getQuestItemsCount((MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(CRETAS_PAINTING3_ID)) and st.getQuestItemsCount(BROWN_SCROLL_SCRAP_ID)<5 :
 
+    if int(st.get("cond")) and st.getQuestItemsCount(MIRIENS_SIGIL1_ID) and st.getQuestItemsCount(HIGHPRIESTS_SIGIL_ID) and st.getQuestItemsCount(CRETAS_PAINTING3_ID) and st.getQuestItemsCount(BROWN_SCROLL_SCRAP_ID)<5 :
 
       if st.getRandom(100) < 50 :
 
         st.giveItems(BROWN_SCROLL_SCRAP_ID,1)
 
+      if st.getQuestItemsCount(BROWN_SCROLL_SCRAP_ID) < 5 :
 
+	st.playSound("ItemSound.quest_itemget")
 
+      else:
 
+	st.playSound("ItemSound.quest_middle")
 
    elif npcId == 68 :
 
-    if int(st.get("cond")) and st.getQuestItemsCount((MIRIENS_SIGIL2_ID) and st.getQuestItemsCount(GMAGISTERS_SIGIL_ID) and st.getQuestItemsCount(JUREKS_LIST_ID)) and st.getQuestItemsCount(BEAMERS_SKIN_ID)<5 :
 
+    if int(st.get("cond")) and st.getQuestItemsCount(MIRIENS_SIGIL2_ID) and st.getQuestItemsCount(GMAGISTERS_SIGIL_ID) and st.getQuestItemsCount(JUREKS_LIST_ID) and st.getQuestItemsCount(BEAMERS_SKIN_ID)<5 :
 
       if st.getRandom(100) < 50 :
 
         st.giveItems(BEAMERS_SKIN_ID,1)
 
+      if st.getQuestItemsCount(BEAMERS_SKIN_ID) < 5 :
 
+	st.playSound("ItemSound.quest_itemget")
 
+      else:
 
+	st.playSound("ItemSound.quest_middle")
 
    elif npcId == 269 :
 
-    if int(st.get("cond")) and st.getQuestItemsCount((MIRIENS_SIGIL2_ID) and st.getQuestItemsCount(GMAGISTERS_SIGIL_ID) and st.getQuestItemsCount(JUREKS_LIST_ID)) and st.getQuestItemsCount(SHAMANS_NECKLACE_ID)<5 :
 
+    if int(st.get("cond")) and st.getQuestItemsCount(MIRIENS_SIGIL2_ID) and st.getQuestItemsCount(GMAGISTERS_SIGIL_ID) and st.getQuestItemsCount(JUREKS_LIST_ID) and st.getQuestItemsCount(SHAMANS_NECKLACE_ID)<5 :
 
       if st.getRandom(100) < 50 :
 
         st.giveItems(SHAMANS_NECKLACE_ID,1)
 
+      if st.getQuestItemsCount(SHAMANS_NECKLACE_ID) < 5 :
 
+	st.playSound("ItemSound.quest_itemget")
 
+      else:
 
+	st.playSound("ItemSound.quest_middle")
 
    elif npcId == 235 :
 
-    if int(st.get("cond")) and st.getQuestItemsCount((MIRIENS_SIGIL2_ID) and st.getQuestItemsCount(GMAGISTERS_SIGIL_ID) and st.getQuestItemsCount(JUREKS_LIST_ID)) and st.getQuestItemsCount(SHACKLES_SCALP_ID)<2 :
 
+    if int(st.get("cond")) and st.getQuestItemsCount(MIRIENS_SIGIL2_ID) and st.getQuestItemsCount(GMAGISTERS_SIGIL_ID) and st.getQuestItemsCount(JUREKS_LIST_ID) and st.getQuestItemsCount(SHACKLES_SCALP_ID)<2 :
 
       st.giveItems(SHACKLES_SCALP_ID,1)
 
+      if st.getQuestItemsCount(SHACKLES_SCALP_ID) < 2 :
 
+	st.playSound("ItemSound.quest_itemget")
 
+      else:
 
+	st.playSound("ItemSound.quest_middle")
 
    elif npcId == 554 :
 
-    if int(st.get("cond")) and st.getQuestItemsCount((MIRIENS_SIGIL3_ID) and st.getQuestItemsCount(CRONOS_SIGIL_ID) and st.getQuestItemsCount(TREAFS_RING_ID)) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_3_ID) == 0 :
 
+    if int(st.get("cond")) and st.getQuestItemsCount(MIRIENS_SIGIL3_ID) and st.getQuestItemsCount(CRONOS_SIGIL_ID) and st.getQuestItemsCount(TREAFS_RING_ID) and st.getQuestItemsCount(SCRIPTURE_CHAPTER_3_ID) == 0 :
 
       if st.getRandom(100) < 30 :
 
         st.giveItems(SCRIPTURE_CHAPTER_3_ID,1)
 
+	st.playSound("ItemSound.quest_middle")
 
    elif npcId == 201 :
 
-    if int(st.get("cond")) and st.getQuestItemsCount((TREAFS_RING_ID) and st.getQuestItemsCount(POITANS_NOTES_ID) and st.getQuestItemsCount(KASIANS_LIST_ID)) and st.getQuestItemsCount(GHOULS_SKIN_ID)<10 :
 
+    if int(st.get("cond")) and st.getQuestItemsCount(TREAFS_RING_ID) and st.getQuestItemsCount(POITANS_NOTES_ID) and st.getQuestItemsCount(KASIANS_LIST_ID) and st.getQuestItemsCount(GHOULS_SKIN_ID)<10 :
 
       st.giveItems(GHOULS_SKIN_ID,1)
 
-      st.playSound("ItemSound.quest_middle")
 
+      if st.getQuestItemsCount(GHOULS_SKIN_ID) < 10 :
 
+	st.playSound("ItemSound.quest_itemget")
 
+      else:
 
+	st.playSound("ItemSound.quest_middle")
 
    elif npcId == 158 :
 
-    if int(st.get("cond")) and st.getQuestItemsCount((TREAFS_RING_ID) and st.getQuestItemsCount(POITANS_NOTES_ID) and st.getQuestItemsCount(KASIANS_LIST_ID)) and st.getQuestItemsCount(MEDUSAS_BLOOD_ID)<12 :
 
+    if int(st.get("cond")) and st.getQuestItemsCount(TREAFS_RING_ID) and st.getQuestItemsCount(POITANS_NOTES_ID) and st.getQuestItemsCount(KASIANS_LIST_ID) and st.getQuestItemsCount(MEDUSAS_BLOOD_ID)<12 :
 
       st.giveItems(MEDUSAS_BLOOD_ID,1)
 
-      st.playSound("ItemSound.quest_middle")
 
+      if st.getQuestItemsCount(MEDUSAS_BLOOD_ID) < 12 :
 
+	st.playSound("ItemSound.quest_itemget")
 
+      else:
 
+        st.playSound("ItemSound.quest_middle")
 
    elif npcId == 552 :
 
-    if int(st.get("cond")) and st.getQuestItemsCount((TREAFS_RING_ID) and st.getQuestItemsCount(POITANS_NOTES_ID) and st.getQuestItemsCount(KASIANS_LIST_ID)) and st.getQuestItemsCount(CRIMSONBINDS_ICHOR_ID)<5 :
 
+    if int(st.get("cond")) and st.getQuestItemsCount(TREAFS_RING_ID) and st.getQuestItemsCount(POITANS_NOTES_ID) and st.getQuestItemsCount(KASIANS_LIST_ID) and st.getQuestItemsCount(CRIMSONBINDS_ICHOR_ID)<5 :
 
       st.giveItems(CRIMSONBINDS_ICHOR_ID,1)
 
-      st.playSound("ItemSound.quest_middle")
 
+      if st.getQuestItemsCount(CRIMSONBINDS_ICHOR_ID) < 5 :
 
+	st.playSound("ItemSound.quest_itemget")
 
+      else:
 
+        st.playSound("ItemSound.quest_middle")
 
    elif npcId == 567 :
 
-    if int(st.get("cond")) and st.getQuestItemsCount((TREAFS_RING_ID) and st.getQuestItemsCount(POITANS_NOTES_ID) and st.getQuestItemsCount(KASIANS_LIST_ID)) and st.getQuestItemsCount(ENCHT_GARGOYLES_NAIL_ID)<5 :
 
+    if int(st.get("cond")) and st.getQuestItemsCount(TREAFS_RING_ID) and st.getQuestItemsCount(POITANS_NOTES_ID) and st.getQuestItemsCount(KASIANS_LIST_ID) and st.getQuestItemsCount(ENCHT_GARGOYLES_NAIL_ID)<5 :
 
       st.giveItems(ENCHT_GARGOYLES_NAIL_ID,1)
 
-      st.playSound("ItemSound.quest_middle")
 
+      if st.getQuestItemsCount(ENCHT_GARGOYLES_NAIL_ID) < 5 :
 
+	st.playSound("ItemSound.quest_itemget")
 
+      else:
 
+        st.playSound("ItemSound.quest_middle")
 
    return
 
 
 QUEST       = Quest(214,"214_TrialOfScholar","Trial Of Scholar")

+ 2 - 2
datapack_development/data/jscript/quests/216_TrialOfGuildsman/7103-09.htm
Ver arquivo 

@@ -4,8 +4,8 @@
 
 
 Warehouse Keeper Valkon:<br>
 
 You have made all the rings. Thank you for your trouble. So, did you learn anything from the test?<br>
 
-<a action="bypass -h Quest 216_TrialOfGuildsman 1">I learned the mind attitude and virtues that one should possess as a faithful union member.</a><br>
 
-<a action="bypass -h Quest 216_TrialOfGuildsman 1">I learned how to fawn upon the authorities of the guild and ways to bribe them.</a>
 
+<a action="bypass -h Quest 216_TrialOfGuildsman 7103_3">I learned the mind attitude and virtues that one should possess as a faithful union member.</a><br>
 
+<a action="bypass -h Quest 216_TrialOfGuildsman 7103_4">I learned how to fawn upon the authorities of the guild and ways to bribe them.</a>
 
 
 
 </body>

+ 81 - 56
datapack_development/data/jscript/quests/216_TrialOfGuildsman/__init__.py
Ver arquivo 

@@ -35,13 +35,12 @@ class Quest (JQuest) :
 
  def __init__(self,id,name,descr): JQuest.__init__(self,id,name,descr)
 
 
  def onEvent (self,event,st) :
 
-    htmltext = event
 
     if event == "1" :
 
         htmlfile = "7103-06.htm"
 
         st.set("cond","1")
 
         st.setState(STARTED)
 
         st.playSound("ItemSound.quest_accept")
 
-        st.giveItems(VALKONS_RECOMMEND_ID)
 
+        st.giveItems(VALKONS_RECOMMEND_ID,1)
 
         st.takeItems(ADENA_ID,2000)
 
     elif event == "7103_1" :
 
           htmltext = "7103-04.htm"
 
@@ -144,31 +143,31 @@ class Quest (JQuest) :
 
           htmltext = "7103-01.htm"
 
    elif npcId == 7103 and int(st.get("cond"))==0 and int(st.get("onlyone"))==1 :
 
       htmltext = "<html><head><body>This quest have already been completed.</body></html>"
 
-   elif npcId == 7103 and int(st.get("cond"))==1 and st.getQuestItemsCount(VALKONS_RECOMMEND_ID)==1 :
 
+   elif npcId == 7103 and int(st.get("cond"))>=1 and st.getQuestItemsCount(VALKONS_RECOMMEND_ID)==1 :
 
         htmltext = "7103-07.htm"
 
-   elif npcId == 7103 and int(st.get("cond"))==1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID)==1 :
 
+   elif npcId == 7103 and int(st.get("cond"))>=1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID)==1 :
 
         if st.getQuestItemsCount(JOURNEYMAN_RING_ID) < 7 :
 
           htmltext = "7103-08.htm"
 
         else:
 
           htmltext = "7103-09.htm"
 
-   elif npcId == 7283 and int(st.get("cond"))==1 and st.getQuestItemsCount(VALKONS_RECOMMEND_ID)==1 and st.getQuestItemsCount(MANDRAGORA_BERRY_ID)==0 :
 
+   elif npcId == 7283 and int(st.get("cond"))>=1 and st.getQuestItemsCount(VALKONS_RECOMMEND_ID)==1 and st.getQuestItemsCount(MANDRAGORA_BERRY_ID)==0 :
 
         htmltext = "7283-01.htm"
 
-   elif npcId == 7283 and int(st.get("cond"))==1 and st.getQuestItemsCount(VALKONS_RECOMMEND_ID)==1 and st.getQuestItemsCount(MANDRAGORA_BERRY_ID)==1 :
 
+   elif npcId == 7283 and int(st.get("cond"))>=1 and st.getQuestItemsCount(VALKONS_RECOMMEND_ID)==1 and st.getQuestItemsCount(MANDRAGORA_BERRY_ID)==1 :
 
         htmltext = "7283-02.htm"
 
-   elif npcId == 7283 and int(st.get("cond"))==1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID)==1 :
 
+   elif npcId == 7283 and int(st.get("cond"))>=1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID)==1 :
 
         if st.getQuestItemsCount(JOURNEYMAN_RING_ID) < 7 :
 
           htmltext = "7283-04.htm"
 
         else:
 
           htmltext = "7283-05.htm"
 
-   elif npcId == 7210 and int(st.get("cond"))==1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID)==1 and st.getQuestItemsCount(ALLTRANS_RECOMMEND1_ID)==1 :
 
+   elif npcId == 7210 and int(st.get("cond"))>=1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID)==1 and st.getQuestItemsCount(ALLTRANS_RECOMMEND1_ID)==1 :
 
         htmltext = "7210-01.htm"
 
-   elif npcId == 7210 and int(st.get("cond"))==1 and st.getQuestItemsCount((ALLTRANS_INSTRUCTIONS_ID) and st.getQuestItemsCount(NORMANS_INSTRUCTIONS_ID) and st.getQuestItemsCount(NORMANS_RECEIPT_ID)) :
 
+   elif npcId == 7210 and int(st.get("cond"))>=1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) and st.getQuestItemsCount(NORMANS_INSTRUCTIONS_ID) and st.getQuestItemsCount(NORMANS_RECEIPT_ID) :
 
         htmltext = "7210-05.htm"
 
-   elif npcId == 7210 and int(st.get("cond"))==1 and st.getQuestItemsCount((ALLTRANS_INSTRUCTIONS_ID) and st.getQuestItemsCount(NORMANS_INSTRUCTIONS_ID) and st.getQuestItemsCount(DUNINGS_INSTRUCTIONS_ID)) :
 
+   elif npcId == 7210 and int(st.get("cond"))>=1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) and st.getQuestItemsCount(NORMANS_INSTRUCTIONS_ID) and st.getQuestItemsCount(DUNINGS_INSTRUCTIONS_ID) :
 
         htmltext = "7210-06.htm"
 
-   elif npcId == 7210 and int(st.get("cond"))==1 and st.getQuestItemsCount((ALLTRANS_INSTRUCTIONS_ID) and st.getQuestItemsCount(NORMANS_INSTRUCTIONS_ID)) and st.getQuestItemsCount(DUNINGS_KEY_ID)>=30 :
 
+   elif npcId == 7210 and int(st.get("cond"))>=1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) and st.getQuestItemsCount(NORMANS_INSTRUCTIONS_ID) and st.getQuestItemsCount(DUNINGS_KEY_ID)>=30 :
 
         htmltext = "7210-07.htm"
 
-   elif npcId == 7210 and int(st.get("cond"))==1 and st.getQuestItemsCount((ALLTRANS_INSTRUCTIONS_ID) and st.getQuestItemsCount(NORMANS_LIST_ID)) :
 
+   elif npcId == 7210 and int(st.get("cond"))>=1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) and st.getQuestItemsCount(NORMANS_LIST_ID) :
 
         if st.getQuestItemsCount(GRAY_BONE_POWDER_ID) >= 70 and st.getQuestItemsCount(GRANITE_WHETSTONE_ID) >= 70  :
 
           htmltext = "7210-12.htm"
 
           st.takeItems(NORMANS_LIST_ID,1)
 
@@ -179,22 +178,22 @@ class Quest (JQuest) :
 
           st.giveItems(JOURNEYMAN_GEM_ID,7)
 
         else:
 
           htmltext = "7210-11.htm"
 
-   elif npcId == 7210 and int(st.get("cond"))==1 and st.getQuestItemsCount((NORMANS_INSTRUCTIONS_ID) == 0 and st.getQuestItemsCount(NORMANS_LIST_ID)) == 0 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID)==1 and st.getQuestItemsCount((JOURNEYMAN_GEM_ID) or st.getQuestItemsCount(JOURNEYMAN_RING_ID)) :
 
+   elif npcId == 7210 and int(st.get("cond"))>=1 and st.getQuestItemsCount(NORMANS_INSTRUCTIONS_ID) == 0 and st.getQuestItemsCount(NORMANS_LIST_ID) == 0 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID)==1 and (st.getQuestItemsCount(JOURNEYMAN_GEM_ID) or st.getQuestItemsCount(JOURNEYMAN_RING_ID)) :
 
         htmltext = "7210-13.htm"
 
-   elif npcId == 7688 and int(st.get("cond"))==1 and st.getQuestItemsCount((ALLTRANS_INSTRUCTIONS_ID) and st.getQuestItemsCount(NORMANS_INSTRUCTIONS_ID) and st.getQuestItemsCount(NORMANS_RECEIPT_ID)) :
 
+   elif npcId == 7688 and int(st.get("cond"))>=1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) and st.getQuestItemsCount(NORMANS_INSTRUCTIONS_ID) and st.getQuestItemsCount(NORMANS_RECEIPT_ID) :
 
         htmltext = "7688-01.htm"
 
-   elif npcId == 7688 and int(st.get("cond"))==1 and st.getQuestItemsCount((ALLTRANS_INSTRUCTIONS_ID) and st.getQuestItemsCount(NORMANS_INSTRUCTIONS_ID) and st.getQuestItemsCount(DUNINGS_INSTRUCTIONS_ID)) :
 
+   elif npcId == 7688 and int(st.get("cond"))>=1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) and st.getQuestItemsCount(NORMANS_INSTRUCTIONS_ID) and st.getQuestItemsCount(DUNINGS_INSTRUCTIONS_ID) :
 
         htmltext = "7688-03.htm"
 
-   elif npcId == 7688 and int(st.get("cond"))==1 and st.getQuestItemsCount((ALLTRANS_INSTRUCTIONS_ID) and st.getQuestItemsCount(NORMANS_INSTRUCTIONS_ID)) and st.getQuestItemsCount(DUNINGS_KEY_ID)>=30 :
 
+   elif npcId == 7688 and int(st.get("cond"))>=1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) and st.getQuestItemsCount(NORMANS_INSTRUCTIONS_ID) and st.getQuestItemsCount(DUNINGS_KEY_ID)>=30 :
 
         htmltext = "7688-04.htm"
 
-   elif npcId == 7688 and int(st.get("cond"))==1 and st.getQuestItemsCount((NORMANS_RECEIPT_ID) == 0 and st.getQuestItemsCount(DUNINGS_INSTRUCTIONS_ID) == 0 and st.getQuestItemsCount(DUNINGS_KEY_ID)) == 0 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID)==1 :
 
+   elif npcId == 7688 and int(st.get("cond"))>=1 and st.getQuestItemsCount(NORMANS_RECEIPT_ID) == 0 and st.getQuestItemsCount(DUNINGS_INSTRUCTIONS_ID) == 0 and st.getQuestItemsCount(DUNINGS_KEY_ID) == 0 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID)==1 :
 
         htmltext = "7688-01.htm"
 
-   elif npcId == 7298 and int(st.get("cond"))==1 and st.getQuestItemsCount((ALLTRANS_INSTRUCTIONS_ID) and st.getQuestItemsCount(ALLTRANS_RECOMMEND2_ID)) :
 
+   elif npcId == 7298 and int(st.get("cond"))>=1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) and st.getQuestItemsCount(ALLTRANS_RECOMMEND2_ID) :
 
         if st.getPlayer().getLevel() < 36 :
 
           htmltext = "7298-01.htm"
 
         else:
 
           htmltext = "7298-02.htm"
 
-   elif npcId == 7298 and int(st.get("cond"))==1 and st.getQuestItemsCount((ALLTRANS_INSTRUCTIONS_ID) and st.getQuestItemsCount(PINTERS_INSTRUCTIONS_ID)) :
 
+   elif npcId == 7298 and int(st.get("cond"))>=1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) and st.getQuestItemsCount(PINTERS_INSTRUCTIONS_ID) :
 
         if st.getQuestItemsCount(AMBER_BEAD_ID) < 70 :
 
           htmltext = "7298-06.htm"
 
         else:
 
@@ -204,38 +203,38 @@ class Quest (JQuest) :
 
           st.takeItems(RP_AMBER_BEAD_ID,st.getQuestItemsCount(RP_AMBER_BEAD_ID))
 
           st.takeItems(AMBER_LUMP_ID,st.getQuestItemsCount(AMBER_LUMP_ID))
 
           st.giveItems(JOURNEYMAN_DECO_BEADS_ID,7)
 
-   elif npcId == 7298 and int(st.get("cond"))==1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID)==1 and st.getQuestItemsCount(PINTERS_INSTRUCTIONS_ID)==0 and st.getQuestItemsCount((JOURNEYMAN_DECO_BEADS_ID) or st.getQuestItemsCount(JOURNEYMAN_RING_ID)) :
 
+   elif npcId == 7298 and int(st.get("cond"))>=1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID)==1 and st.getQuestItemsCount(PINTERS_INSTRUCTIONS_ID)==0 and (st.getQuestItemsCount(JOURNEYMAN_DECO_BEADS_ID) or st.getQuestItemsCount(JOURNEYMAN_RING_ID)) :
 
         htmltext = "7298-08.htm"
 
    return htmltext
 
 
  def onKill (self,npcId,st):
 
    if npcId == 223 :
 
      st.set("id","0")
 
-     if int(st.get("cond")) == 1 and st.getQuestItemsCount(VALKONS_RECOMMEND_ID) == 1 and st.getQuestItemsCount(MANDRAGORA_BERRY_ID) == 0 :
 
+     if int(st.get("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 == 154 :
 
      st.set("id","0")
 
-     if int(st.get("cond")) == 1 and st.getQuestItemsCount(VALKONS_RECOMMEND_ID) == 1 and st.getQuestItemsCount(MANDRAGORA_BERRY_ID) == 0 :
 
+     if int(st.get("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 == 155 :
 
     st.set("id","0")
 
-    if int(st.get("cond")) == 1 and st.getQuestItemsCount(VALKONS_RECOMMEND_ID) == 1 and st.getQuestItemsCount(MANDRAGORA_BERRY_ID) == 0 :
 
+    if int(st.get("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 == 156 :
 
     st.set("id","0")
 
-    if int(st.get("cond")) == 1 and st.getQuestItemsCount(VALKONS_RECOMMEND_ID) == 1 and st.getQuestItemsCount(MANDRAGORA_BERRY_ID) == 0 :
 
+    if int(st.get("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 == 267 :
 
     st.set("id","0")
 
-    if int(st.get("cond")) == 1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) == 1 and st.getQuestItemsCount(NORMANS_INSTRUCTIONS_ID) == 1 and st.getQuestItemsCount(DUNINGS_INSTRUCTIONS_ID) == 1 :
 
+    if int(st.get("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) < 30 :
 
       if st.getQuestItemsCount(DUNINGS_KEY_ID) == 29 :
 
         st.giveItems(DUNINGS_KEY_ID,1)
 
@@ -243,10 +242,10 @@ class Quest (JQuest) :
 
         st.playSound("ItemSound.quest_middle")
 
       else:
 
         st.giveItems(DUNINGS_KEY_ID,1)
 
-        st.playSound("ItemSound.quest_middle")
 
+        st.playSound("ItemSound.quest_itemget")
 
    elif npcId == 268 :
 
     st.set("id","0")
 
-    if int(st.get("cond")) == 1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) == 1 and st.getQuestItemsCount(NORMANS_INSTRUCTIONS_ID) == 1 and st.getQuestItemsCount(DUNINGS_INSTRUCTIONS_ID) == 1 :
 
+    if int(st.get("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) <= 40 and st.getQuestItemsCount(DUNINGS_KEY_ID) < 30 :
 
       if st.getQuestItemsCount(DUNINGS_KEY_ID) == 29 :
 
         st.giveItems(DUNINGS_KEY_ID,1)
 
@@ -254,10 +253,10 @@ class Quest (JQuest) :
 
         st.playSound("ItemSound.quest_middle")
 
       else:
 
         st.giveItems(DUNINGS_KEY_ID,1)
 
-        st.playSound("ItemSound.quest_middle")
 
+        st.playSound("ItemSound.quest_itemget")
 
    elif npcId == 271 :
 
     st.set("id","0")
 
-    if int(st.get("cond")) == 1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) == 1 and st.getQuestItemsCount(NORMANS_INSTRUCTIONS_ID) == 1 and st.getQuestItemsCount(DUNINGS_INSTRUCTIONS_ID) == 1 :
 
+    if int(st.get("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) <= 50 and st.getQuestItemsCount(DUNINGS_KEY_ID) < 30 :
 
       if st.getQuestItemsCount(DUNINGS_KEY_ID) == 29 :
 
         st.giveItems(DUNINGS_KEY_ID,1)
 
@@ -265,10 +264,10 @@ class Quest (JQuest) :
 
         st.playSound("ItemSound.quest_middle")
 
       else:
 
         st.giveItems(DUNINGS_KEY_ID,1)
 
-        st.playSound("ItemSound.quest_middle")
 
+        st.playSound("ItemSound.quest_itemget")
 
    elif npcId == 269 :
 
     st.set("id","0")
 
-    if int(st.get("cond")) == 1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) == 1 and st.getQuestItemsCount(NORMANS_INSTRUCTIONS_ID) == 1 and st.getQuestItemsCount(DUNINGS_INSTRUCTIONS_ID) == 1 :
 
+    if int(st.get("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) <= 50 and st.getQuestItemsCount(DUNINGS_KEY_ID) < 30 :
 
       if st.getQuestItemsCount(DUNINGS_KEY_ID) == 29 :
 
         st.giveItems(DUNINGS_KEY_ID,1)
 
@@ -276,10 +275,10 @@ class Quest (JQuest) :
 
         st.playSound("ItemSound.quest_middle")
 
       else:
 
         st.giveItems(DUNINGS_KEY_ID,1)
 
-        st.playSound("ItemSound.quest_middle")
 
+        st.playSound("ItemSound.quest_itemget")
 
    elif npcId == 270 :
 
     st.set("id","0")
 
-    if int(st.get("cond")) == 1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) == 1 and st.getQuestItemsCount(NORMANS_INSTRUCTIONS_ID) == 1 and st.getQuestItemsCount(DUNINGS_INSTRUCTIONS_ID) == 1 :
 
+    if int(st.get("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) <= 50 and st.getQuestItemsCount(DUNINGS_KEY_ID) < 30 :
 
       if st.getQuestItemsCount(DUNINGS_KEY_ID) == 29 :
 
         st.giveItems(DUNINGS_KEY_ID,1)
 
@@ -287,66 +286,92 @@ class Quest (JQuest) :
 
         st.playSound("ItemSound.quest_middle")
 
       else:
 
         st.giveItems(DUNINGS_KEY_ID,1)
 
-        st.playSound("ItemSound.quest_middle")
 
+        st.playSound("ItemSound.quest_itemget")
 
    elif npcId == 201 :
 
     st.set("id","0")
 
-    if int(st.get("cond")) == 1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) == 1 and st.getQuestItemsCount(NORMANS_LIST_ID) == 1 :
 
-     if st.getQuestItemsCount(GRAY_BONE_POWDER_ID) <= 68 :
 
+    if int(st.get("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)
 
       st.playSound("ItemSound.quest_middle")
 
+     else:
 
+      st.giveItems(GRAY_BONE_POWDER_ID,2)
 
+      st.playSound("ItemSound.quest_itemget")
 
    elif npcId == 200 :
 
     st.set("id","0")
 
-    if int(st.get("cond")) == 1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) == 1 and st.getQuestItemsCount(NORMANS_LIST_ID) == 1 :
 
-     if st.getQuestItemsCount(GRAY_BONE_POWDER_ID) <= 68 :
 
+    if int(st.get("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)
 
       st.playSound("ItemSound.quest_middle")
 
+     else:
 
+      st.giveItems(GRAY_BONE_POWDER_ID,2)
 
+      st.playSound("ItemSound.quest_itemget")
 
    elif npcId == 83 :
 
     st.set("id","0")
 
-    if int(st.get("cond")) == 1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) == 1 and st.getQuestItemsCount(NORMANS_LIST_ID) == 1 :
 
-     if st.getQuestItemsCount(GRANITE_WHETSTONE_ID) <= 68 :
 
+    if int(st.get("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)
 
       st.playSound("ItemSound.quest_middle")
 
+     else:
 
+      st.giveItems(GRANITE_WHETSTONE_ID,2)
 
+      st.playSound("ItemSound.quest_itemget")
 
    elif npcId == 202 :
 
     st.set("id","0")
 
-    if int(st.get("cond")) == 1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) == 1 and st.getQuestItemsCount(NORMANS_LIST_ID) == 1 :
 
-     if st.getQuestItemsCount(RED_PIGMENT_ID) <= 68 :
 
+    if int(st.get("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)
 
       st.playSound("ItemSound.quest_middle")
 
+     else:
 
+      st.giveItems(RED_PIGMENT_ID,2)
 
+      st.playSound("ItemSound.quest_itemget")
 
    elif npcId == 168 :
 
     st.set("id","0")
 
-    if int(st.get("cond")) == 1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) == 1 and st.getQuestItemsCount(NORMANS_LIST_ID) == 1 :
 
-     if st.getQuestItemsCount(BRAIDED_YARN_ID) <= 68 :
 
+    if int(st.get("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)
 
       st.playSound("ItemSound.quest_middle")
 
+     else:
 
+      st.giveItems(BRAIDED_YARN_ID,2)
 
+      st.playSound("ItemSound.quest_itemget")
 
    elif npcId == 79 :
 
     st.set("id","0")
 
-    if int(st.get("cond")) == 1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) == 1 and st.getQuestItemsCount(PINTERS_INSTRUCTIONS_ID) == 1 :
 
+    if int(st.get("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 st.getPlayer().getClassId().getId() == 0x36 and IsSpoiled() == 1 :
 
         st.giveItems(AMBER_BEAD_ID,1)
 
-        st.playSound("ItemSound.quest_middle")
 
-      if st.getRandom(100) < 50 and st.getQuestItemsCount(AMBER_BEAD_ID) < 70 :
 
+        st.playSound("Itemsound.quest_itemget")
 
+      if st.getRandom(100) < 50 and st.getQuestItemsCount(AMBER_BEAD_ID) < 69 :
 
         st.giveItems(AMBER_BEAD_ID,1)
 
-        st.playSound("ItemSound.quest_middle")
 
+        st.playSound("Itemsound.quest_itemget")
 
+      else:
 
+        st.giveItems(AMBER_BEAD_ID,1)
 
+	st.playSound("ItemSound.quest_middle")
 
    elif npcId == 81 :
 
     st.set("id","0")
 
-    if int(st.get("cond")) == 1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) == 1 and st.getQuestItemsCount(PINTERS_INSTRUCTIONS_ID) == 1 :
 
+    if int(st.get("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 st.getPlayer().getClassId().getId() == 0x36 and IsSpoiled() == 1 :
 
         st.giveItems(AMBER_BEAD_ID,1)
 
-        st.playSound("ItemSound.quest_middle")
 
-      if st.getRandom(100) < 50 and st.getQuestItemsCount(AMBER_BEAD_ID) < 70 :
 
+        st.playSound("Itemsound.quest_itemget")
 
+      if st.getRandom(100) < 50 and st.getQuestItemsCount(AMBER_BEAD_ID) < 69 :
 
         st.giveItems(AMBER_BEAD_ID,1)
 
-        st.playSound("ItemSound.quest_middle")
 
+        st.playSound("Itemsound.quest_itemget")
 
+      else:
 
+        st.giveItems(AMBER_BEAD_ID,1)
 
+	st.playSound("ItemSound.quest_middle")
 
    elif npcId == 80 :
 
-    if int(st.get("cond")) == 1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) == 1 and st.getQuestItemsCount(PINTERS_INSTRUCTIONS_ID) == 1 :
 
+    if int(st.get("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 st.getPlayer().getClassId().getId() == 0x36 and IsSpoiled() == 1 :
 
         st.giveItems(AMBER_BEAD_ID,1)
 
-        st.playSound("ItemSound.quest_middle")
 
-      if st.getRandom(100) < 50 and st.getQuestItemsCount(AMBER_BEAD_ID) < 70 :
 
+        st.playSound("Itemsound.quest_itemget")
 
+      if st.getRandom(100) < 50 and st.getQuestItemsCount(AMBER_BEAD_ID) < 69 :
 
         st.giveItems(AMBER_BEAD_ID,1)
 
-        st.playSound("ItemSound.quest_middle")
 
+        st.playSound("Itemsound.quest_itemget")
 
+      else:
 
+        st.giveItems(AMBER_BEAD_ID,1)
 
+	st.playSound("ItemSound.quest_middle")
 
+
 
+
 
    return
 
 
 QUEST       = Quest(216,"216_TrialOfGuildsman","Trial Of Guildsman")

+ 2 - 2
datapack_development/data/jscript/quests/219_TestimonyOfFate/__init__.py
Ver arquivo 

@@ -51,7 +51,6 @@ class Quest (JQuest) :
 
       st.setState(STARTED)
 
       st.playSound("ItemSound.quest_accept")
 
       st.giveItems(KAIRAS_LETTER1_ID,1)
 
-      st.set("cond",str(0))
 
     elif event == "7476_1" :
 
           htmltext = "7476-04.htm"
 
           st.set("cond","1")
 
@@ -137,7 +136,7 @@ class Quest (JQuest) :
 
       htmltext = "7476-16.htm"
 
    elif npcId == 7476 and int(st.get("cond"))==1 and st.getQuestItemsCount(PALUS_CHARM_ID) :
 
       htmltext = "7476-17.htm"
 
-   elif npcId == 7614 and int(st.get("cond"))==1 and st.getQuestItemsCount(KAIRAS_LETTER1_ID) :
 
+   elif npcId == 7614 and int(st.get("cond"))>=1 and st.getQuestItemsCount(KAIRAS_LETTER1_ID) :
 
       htmltext = "7614-01.htm"
 
       st.giveItems(METHEUS_FUNERAL_JAR_ID,1)
 
       st.takeItems(KAIRAS_LETTER1_ID,1)
 
@@ -388,6 +387,7 @@ STARTED.addTalkId(7419)
 
 STARTED.addTalkId(7463)
 
 STARTED.addTalkId(7476)
 
 STARTED.addTalkId(7613)
 
+STARTED.addTalkId(7614)
 
 
 STARTED.addKillId(144)
 
 STARTED.addKillId(157)

+ 2 - 1
datapack_development/data/jscript/quests/221_TestimonyOfProsperity/7005-01.htm
Ver arquivo 

@@ -3,6 +3,7 @@
 
 <body>
 
 
 Warehouse Keeper Wilfred:<br>
 
-Welcome, young friend! So, you are taking an exam to promote to a higher member of the union? I took the same exam long time ago. Of course now I can't remember what it was all about, ha ha ha! Yes
 
+Welcome, young friend! So, you are taking an exam to promote to a higher member of the union? I took the same exam long time ago. Of course now I can't remember what it was all about, ha ha ha! Yes...<br>
 
+<a action="bypass -h Quest 221_TestimonyOfProsperity 7005_1">"Continue"</a><br>
 
 </body>
 
 </html>

+ 94 - 80
datapack_development/data/jscript/quests/221_TestimonyOfProsperity/__init__.py
Ver arquivo 

@@ -55,12 +55,13 @@ class Quest (JQuest) :
 
 
  def onEvent (self,event,st) :
 
     htmltext = event
 
+    print "221: QuestEvent: " + event
 
     if event == "1" :
 
         htmlfile = "7104-04.htm"
 
         st.set("cond","1")
 
         st.setState(STARTED)
 
         st.playSound("ItemSound.quest_accept")
 
-        st.giveItems(RING_OF_TESTIMONY1_ID)
 
+        st.giveItems(RING_OF_TESTIMONY1_ID,1)
 
     elif event == "7104_1" :
 
           if st.getPlayer().getLevel() < 38 :
 
             htmltext = "7104-07.htm"
 
@@ -79,9 +80,11 @@ class Quest (JQuest) :
 
             st.takeItems(RYLITH_ELVEN_WAFER_ID,1)
 
             st.giveItems(RING_OF_TESTIMONY2_ID,1)
 
             st.giveItems(PARMANS_LETTER_ID,1)
 
+    elif event == "7531_1" and st.getQuestItemsCount(COLLECTION_LICENSE_ID) :
 
+          htmltext = "7531-04.htm"
 
     elif event == "7531_1" :
 
           htmltext = "7531-02.htm"
 
-    elif event == "7531_2" :
 
+    elif event == "7531_2" and st.getQuestItemsCount(COLLECTION_LICENSE_ID) == 0 :
 
           htmltext = "7531-03.htm"
 
           st.giveItems(COLLECTION_LICENSE_ID,1)
 
           st.giveItems(LOCKIRINS_NOTICE1_ID,1)
 
@@ -147,11 +150,14 @@ class Quest (JQuest) :
 
           st.takeItems(SPIDER_THORN_ID,st.getQuestItemsCount(SPIDER_THORN_ID))
 
           st.giveItems(MAPHR_TABLET_FRAGMENT_ID,1)
 
           st.takeItems(KEY_OF_TITAN_ID,1)
 
+    print htmltext
 
     return htmltext
 
 
 
  def onTalk (Self,npcId,st):
 
    htmltext = "<html><head><body>I have nothing to say you</body></html>"
 
+   print "221: QuestTalk w NPC " 
+   print npcId
 
    id = st.getState()
 
    if id == CREATED :
 
      st.setState(STARTING)
 
@@ -173,12 +179,12 @@ class Quest (JQuest) :
 
           htmltext = "7104-03.htm"
 
    elif npcId == 7104 and int(st.get("cond"))==0 and int(st.get("onlyone"))==1 :
 
       htmltext = "<html><head><body>This quest have already been completed.</body></html>"
 
-   elif npcId == 7104 and int(st.get("cond"))==1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID)==1 :
 
-        if st.getQuestItemsCount((OLD_ACCOUNT_BOOK_ID) and st.getQuestItemsCount(BLESSED_SEED_ID) and st.getQuestItemsCount(RECIPE_OF_EMILLY_ID) and st.getQuestItemsCount(RYLITH_ELVEN_WAFER_ID)) :
 
+   elif npcId == 7104 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID)==1 :
 
+        if st.getQuestItemsCount(OLD_ACCOUNT_BOOK_ID) and st.getQuestItemsCount(BLESSED_SEED_ID) and st.getQuestItemsCount(RECIPE_OF_EMILLY_ID) and st.getQuestItemsCount(RYLITH_ELVEN_WAFER_ID) :
 
           htmltext = "7104-06.htm"
 
         else:
 
           htmltext = "7104-05.htm"
 
-   elif npcId == 7104 and int(st.get("cond"))==1 and st.getQuestItemsCount(PARMANS_INSTRUCTIONS_ID)==1 :
 
+   elif npcId == 7104 and int(st.get("cond"))>=1 and st.getQuestItemsCount(PARMANS_INSTRUCTIONS_ID)==1 :
 
         if st.getPlayer().getLevel() < 38 :
 
           htmltext = "7104-09.htm"
 
         else:
 
@@ -186,11 +192,13 @@ class Quest (JQuest) :
 
           st.giveItems(RING_OF_TESTIMONY2_ID,1)
 
           st.takeItems(PARMANS_INSTRUCTIONS_ID,1)
 
           st.giveItems(PARMANS_LETTER_ID,1)
 
-   elif npcId == 7104 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY2_ID) and st.getQuestItemsCount(PARMANS_LETTER_ID)) :
 
+   elif npcId == 7104 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID) and st.getQuestItemsCount(PARMANS_LETTER_ID) and st.getQuestItemsCount(MAPHR_TABLET_FRAGMENT_ID) == 0 :
 
         htmltext = "7104-11.htm"
 
-   elif npcId == 7104 and int(st.get("cond"))==1 and st.getQuestItemsCount((CLAY_DOUGH_ID) or st.getQuestItemsCount(PATTERN_OF_KEYHOLE_ID) or st.getQuestItemsCount(NIKOLAS_LIST_ID)) and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID)==1 :
 
+   elif npcId == 7104 and int(st.get("cond"))>=1 and (st.getQuestItemsCount(CLAY_DOUGH_ID) or st.getQuestItemsCount(PATTERN_OF_KEYHOLE_ID) or st.getQuestItemsCount(NIKOLAS_LIST_ID)) and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID)==1 :
 
         htmltext = "7104-12.htm"
 
-   elif npcId == 7104 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY2_ID) and st.getQuestItemsCount(MAPHR_TABLET_FRAGMENT_ID)) :
 
+   elif npcId == 7104 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID) and st.getQuestItemsCount(MAPHR_TABLET_FRAGMENT_ID) :
 
+	print st.getGameTicks()
 
+	print st.get("id")
 
         if st.getGameTicks() != int(st.get("id")) :
 
           st.set("id",str(st.getGameTicks()))
 
           st.addExpAndSp(25000,3100)
 
@@ -202,10 +210,10 @@ class Quest (JQuest) :
 
           st.set("onlyone","1")
 
           st.setState(COMPLETED)
 
           st.playSound("ItemSound.quest_finish")
 
-   elif npcId == 7531 and int(st.get("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 :
 
+   elif npcId == 7531 and int(st.get("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 = "7531-01.htm"
 
-   elif npcId == 7531 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID)) :
 
-        if st.getQuestItemsCount((RECEIPT_OF_CONTRIBUTION1_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION2_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION3_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION4_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION5_ID)) :
 
+   elif npcId == 7531 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) :
 
+        if st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION1_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION2_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION3_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION4_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION5_ID) :
 
           htmltext = "7531-05.htm"
 
           st.giveItems(OLD_ACCOUNT_BOOK_ID,1)
 
           st.takeItems(COLLECTION_LICENSE_ID,1)
 
@@ -216,78 +224,78 @@ class Quest (JQuest) :
 
           st.takeItems(RECEIPT_OF_CONTRIBUTION5_ID,1)
 
         else:
 
           htmltext = "7531-04.htm"
 
-   elif npcId == 7531 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(OLD_ACCOUNT_BOOK_ID)) and st.getQuestItemsCount(COLLECTION_LICENSE_ID)==0 :
 
+   elif npcId == 7531 and int(st.get("cond")) >= 1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(OLD_ACCOUNT_BOOK_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID)==0 :
 
         htmltext = "7531-06.htm"
 
-   elif npcId == 7531 and int(st.get("cond"))==1 and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID)==1 :
 
+   elif npcId == 7531 and int(st.get("cond")) >= 1 and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID) == 1 :
 
         htmltext = "7531-07.htm"
 
-   elif npcId == 7532 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(LOCKIRINS_NOTICE1_ID)) and st.getQuestItemsCount((RECEIPT_OF_CONTRIBUTION1_ID) == 0 and st.getQuestItemsCount(CONTRIBUTION_OF_CHALI_ID)) == 0 :
 
+   elif npcId == 7532 and int(st.get("cond")) >= 1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(LOCKIRINS_NOTICE1_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION1_ID) == 0 and st.getQuestItemsCount(CONTRIBUTION_OF_CHALI_ID) == 0 :
 
         htmltext = "7532-01.htm"
 
         st.takeItems(LOCKIRINS_NOTICE1_ID,1)
 
-   elif npcId == 7532 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID)) and st.getQuestItemsCount((RECEIPT_OF_CONTRIBUTION1_ID) == 0 and st.getQuestItemsCount(CONTRIBUTION_OF_CHALI_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE1_ID)) == 0 :
 
+   elif npcId == 7532 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION1_ID) == 0 and st.getQuestItemsCount(CONTRIBUTION_OF_CHALI_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE1_ID) == 0 :
 
         htmltext = "7532-02.htm"
 
-   elif npcId == 7532 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(CONTRIBUTION_OF_CHALI_ID)) and st.getQuestItemsCount((RECEIPT_OF_CONTRIBUTION1_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE1_ID)) == 0 :
 
+   elif npcId == 7532 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(CONTRIBUTION_OF_CHALI_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION1_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE1_ID) == 0 :
 
         htmltext = "7532-03.htm"
 
         st.giveItems(RECEIPT_OF_CONTRIBUTION1_ID,1)
 
         st.takeItems(CONTRIBUTION_OF_CHALI_ID,1)
 
-   elif npcId == 7532 and int(st.get("cond"))==1 and st.getQuestItemsCount((CONTRIBUTION_OF_CHALI_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE1_ID)) == 0 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION1_ID)) :
 
+   elif npcId == 7532 and int(st.get("cond"))>=1 and st.getQuestItemsCount(CONTRIBUTION_OF_CHALI_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE1_ID) == 0 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION1_ID) :
 
         htmltext = "7532-04.htm"
 
-   elif npcId == 7533 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(LOCKIRINS_NOTICE2_ID)) and st.getQuestItemsCount(LOCKIRINS_NOTICE2_ID)==1 and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION2_ID)==0 and (st.getQuestItemsCount(CONTRIBUTION_OF_MION_ID)+st.getQuestItemsCount(CONTRIBUTION_OF_MARIFE_ID)<2) :
 
+   elif npcId == 7533 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(LOCKIRINS_NOTICE2_ID) and st.getQuestItemsCount(LOCKIRINS_NOTICE2_ID)==1 and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION2_ID)==0 and (st.getQuestItemsCount(CONTRIBUTION_OF_MION_ID)+st.getQuestItemsCount(CONTRIBUTION_OF_MARIFE_ID)<2) :
 
         htmltext = "7533-01.htm"
 
         st.takeItems(LOCKIRINS_NOTICE2_ID,1)
 
-   elif npcId == 7533 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID)) and st.getQuestItemsCount(LOCKIRINS_NOTICE2_ID)==0 and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION2_ID)==0 and (st.getQuestItemsCount(CONTRIBUTION_OF_MION_ID)+st.getQuestItemsCount(CONTRIBUTION_OF_MARIFE_ID)<2) :
 
+   elif npcId == 7533 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(LOCKIRINS_NOTICE2_ID)==0 and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION2_ID)==0 and (st.getQuestItemsCount(CONTRIBUTION_OF_MION_ID)+st.getQuestItemsCount(CONTRIBUTION_OF_MARIFE_ID)<2) :
 
         htmltext = "7533-02.htm"
 
-   elif npcId == 7533 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID)) and st.getQuestItemsCount((RECEIPT_OF_CONTRIBUTION2_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE2_ID)) == 0 and (st.getQuestItemsCount(CONTRIBUTION_OF_MION_ID)+st.getQuestItemsCount(CONTRIBUTION_OF_MARIFE_ID)>=2) :
 
+   elif npcId == 7533 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION2_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE2_ID) == 0 and (st.getQuestItemsCount(CONTRIBUTION_OF_MION_ID)+st.getQuestItemsCount(CONTRIBUTION_OF_MARIFE_ID)>=2) :
 
         htmltext = "7533-03.htm"
 
         st.takeItems(CONTRIBUTION_OF_MARIFE_ID,1)
 
         st.giveItems(RECEIPT_OF_CONTRIBUTION2_ID,1)
 
         st.takeItems(CONTRIBUTION_OF_MION_ID,1)
 
-   elif npcId == 7533 and int(st.get("cond"))==1 and st.getQuestItemsCount(LOCKIRINS_NOTICE2_ID)==0 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION2_ID)) and (st.getQuestItemsCount(CONTRIBUTION_OF_MION_ID)+st.getQuestItemsCount(CONTRIBUTION_OF_MARIFE_ID)<2) :
 
+   elif npcId == 7533 and int(st.get("cond"))>=1 and st.getQuestItemsCount(LOCKIRINS_NOTICE2_ID)==0 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION2_ID) and (st.getQuestItemsCount(CONTRIBUTION_OF_MION_ID)+st.getQuestItemsCount(CONTRIBUTION_OF_MARIFE_ID)<2) :
 
         htmltext = "7533-04.htm"
 
-   elif npcId == 7534 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(LOCKIRINS_NOTICE3_ID)) and st.getQuestItemsCount((RECEIPT_OF_CONTRIBUTION3_ID) == 0 and st.getQuestItemsCount(PROCURATION_OF_TOROCCO_ID)) == 0 :
 
+   elif npcId == 7534 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(LOCKIRINS_NOTICE3_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION3_ID) == 0 and st.getQuestItemsCount(PROCURATION_OF_TOROCCO_ID) == 0 :
 
         htmltext = "7534-01.htm"
 
         st.takeItems(LOCKIRINS_NOTICE3_ID,1)
 
-   elif npcId == 7534 and int(st.get("cond"))==1 and st.getQuestItemsCount((RECEIPT_OF_CONTRIBUTION3_ID) == 0 and st.getQuestItemsCount(PROCURATION_OF_TOROCCO_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE3_ID)) == 0 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID)) :
 
+   elif npcId == 7534 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION3_ID) == 0 and st.getQuestItemsCount(PROCURATION_OF_TOROCCO_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE3_ID) == 0 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) :
 
         htmltext = "7534-02.htm"
 
-   elif npcId == 7534 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(PROCURATION_OF_TOROCCO_ID)) and st.getQuestItemsCount((LOCKIRINS_NOTICE3_ID) == 0 and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION3_ID)) == 0 :
 
+   elif npcId == 7534 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(PROCURATION_OF_TOROCCO_ID) and st.getQuestItemsCount(LOCKIRINS_NOTICE3_ID) == 0 and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION3_ID) == 0 :
 
         htmltext = "7534-03.htm"
 
-   elif npcId == 7534 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION3_ID)) and st.getQuestItemsCount((PROCURATION_OF_TOROCCO_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE3_ID)) == 0 :
 
+   elif npcId == 7534 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION3_ID) and st.getQuestItemsCount(PROCURATION_OF_TOROCCO_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE3_ID) == 0 :
 
         htmltext = "7534-04.htm"
 
-   elif npcId == 7535 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(LOCKIRINS_NOTICE4_ID)) and st.getQuestItemsCount((RECEIPT_OF_CONTRIBUTION4_ID) == 0 and st.getQuestItemsCount(RECEIPT_OF_BOLTER_ID)) == 0 :
 
+   elif npcId == 7535 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(LOCKIRINS_NOTICE4_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION4_ID) == 0 and st.getQuestItemsCount(RECEIPT_OF_BOLTER_ID) == 0 :
 
         htmltext = "7535-01.htm"
 
         st.takeItems(LOCKIRINS_NOTICE4_ID,1)
 
-   elif npcId == 7535 and int(st.get("cond"))==1 and st.getQuestItemsCount((RECEIPT_OF_CONTRIBUTION4_ID) == 0 and st.getQuestItemsCount(RECEIPT_OF_BOLTER_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE4_ID)) == 0 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID)) :
 
+   elif npcId == 7535 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION4_ID) == 0 and st.getQuestItemsCount(RECEIPT_OF_BOLTER_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE4_ID) == 0 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) :
 
         htmltext = "7535-02.htm"
 
-   elif npcId == 7535 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(RECEIPT_OF_BOLTER_ID)) and st.getQuestItemsCount((RECEIPT_OF_CONTRIBUTION4_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE4_ID)) == 0 :
 
+   elif npcId == 7535 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(RECEIPT_OF_BOLTER_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION4_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE4_ID) == 0 :
 
         htmltext = "7535-03.htm"
 
         st.giveItems(RECEIPT_OF_CONTRIBUTION4_ID,1)
 
         st.takeItems(RECEIPT_OF_BOLTER_ID,1)
 
-   elif npcId == 7535 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION4_ID)) and st.getQuestItemsCount((RECEIPT_OF_BOLTER_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE4_ID)) == 0 :
 
+   elif npcId == 7535 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION4_ID) and st.getQuestItemsCount(RECEIPT_OF_BOLTER_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE4_ID) == 0 :
 
         htmltext = "7535-04.htm"
 
-   elif npcId == 7536 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(LOCKIRINS_NOTICE5_ID)) and st.getQuestItemsCount((RECEIPT_OF_CONTRIBUTION5_ID) == 0 and st.getQuestItemsCount(CONTRIBUTION_OF_TOMA_ID)) == 0 :
 
+   elif npcId == 7536 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(LOCKIRINS_NOTICE5_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION5_ID) == 0 and st.getQuestItemsCount(CONTRIBUTION_OF_TOMA_ID) == 0 :
 
         htmltext = "7536-01.htm"
 
         st.takeItems(LOCKIRINS_NOTICE5_ID,1)
 
-   elif npcId == 7536 and int(st.get("cond"))==1 and st.getQuestItemsCount((RECEIPT_OF_CONTRIBUTION5_ID) == 0 and st.getQuestItemsCount(CONTRIBUTION_OF_TOMA_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE5_ID)) == 0 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID)) :
 
+   elif npcId == 7536 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION5_ID) == 0 and st.getQuestItemsCount(CONTRIBUTION_OF_TOMA_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE5_ID) == 0 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) :
 
         htmltext = "7536-02.htm"
 
-   elif npcId == 7536 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(CONTRIBUTION_OF_TOMA_ID)) and st.getQuestItemsCount((RECEIPT_OF_CONTRIBUTION5_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE5_ID)) == 0 :
 
+   elif npcId == 7536 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(CONTRIBUTION_OF_TOMA_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION5_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE5_ID) == 0 :
 
         htmltext = "7536-03.htm"
 
         st.giveItems(RECEIPT_OF_CONTRIBUTION5_ID,1)
 
         st.takeItems(CONTRIBUTION_OF_TOMA_ID,1)
 
-   elif npcId == 7536 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION5_ID)) and st.getQuestItemsCount((CONTRIBUTION_OF_TOMA_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE5_ID)) == 0 :
 
+   elif npcId == 7536 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION5_ID) and st.getQuestItemsCount(CONTRIBUTION_OF_TOMA_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE5_ID) == 0 :
 
         htmltext = "7536-04.htm"
 
-   elif npcId == 7517 and int(st.get("cond"))==1 and st.getQuestItemsCount((RECEIPT_OF_CONTRIBUTION1_ID) == 0 and st.getQuestItemsCount(CONTRIBUTION_OF_CHALI_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE1_ID)) == 0 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID)) :
 
+   elif npcId == 7517 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION1_ID) == 0 and st.getQuestItemsCount(CONTRIBUTION_OF_CHALI_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE1_ID) == 0 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) :
 
         htmltext = "7517-01.htm"
 
         st.giveItems(CONTRIBUTION_OF_CHALI_ID,1)
 
-   elif npcId == 7517 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(CONTRIBUTION_OF_CHALI_ID)) and st.getQuestItemsCount((LOCKIRINS_NOTICE1_ID) == 0 and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION1_ID)) == 0 :
 
+   elif npcId == 7517 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(CONTRIBUTION_OF_CHALI_ID) and st.getQuestItemsCount(LOCKIRINS_NOTICE1_ID) == 0 and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION1_ID) == 0 :
 
         htmltext = "7517-02.htm"
 
-   elif npcId == 7519 and int(st.get("cond"))==1 and st.getQuestItemsCount((RECEIPT_OF_CONTRIBUTION2_ID) == 0 and st.getQuestItemsCount(CONTRIBUTION_OF_MION_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE2_ID)) == 0 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID)) :
 
+   elif npcId == 7519 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION2_ID) == 0 and st.getQuestItemsCount(CONTRIBUTION_OF_MION_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE2_ID) == 0 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) :
 
         htmltext = "7519-01.htm"
 
         st.giveItems(CONTRIBUTION_OF_MION_ID,1)
 
-   elif npcId == 7519 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(CONTRIBUTION_OF_MION_ID)) and st.getQuestItemsCount((RECEIPT_OF_CONTRIBUTION2_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE2_ID)) == 0 :
 
+   elif npcId == 7519 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(CONTRIBUTION_OF_MION_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION2_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE2_ID) == 0 :
 
         htmltext = "7519-02.htm"
 
-   elif npcId == 7553 and int(st.get("cond"))==1 and st.getQuestItemsCount((RECEIPT_OF_CONTRIBUTION2_ID) == 0 and st.getQuestItemsCount(CONTRIBUTION_OF_MARIFE_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE2_ID) == 0 and st.getQuestItemsCount(MARIFES_REQUEST_ID)) == 0 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID)) :
 
+   elif npcId == 7553 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION2_ID) == 0 and st.getQuestItemsCount(CONTRIBUTION_OF_MARIFE_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE2_ID) == 0 and st.getQuestItemsCount(MARIFES_REQUEST_ID) == 0 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) :
 
         htmltext = "7553-01.htm"
 
         st.giveItems(MARIFES_REQUEST_ID,1)
 
-   elif npcId == 7553 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(MARIFES_REQUEST_ID)) and st.getQuestItemsCount((RECEIPT_OF_CONTRIBUTION2_ID) == 0 and st.getQuestItemsCount(CONTRIBUTION_OF_MARIFE_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE2_ID)) == 0 :
 
+   elif npcId == 7553 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(MARIFES_REQUEST_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION2_ID) == 0 and st.getQuestItemsCount(CONTRIBUTION_OF_MARIFE_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE2_ID) == 0 :
 
         if st.getQuestItemsCount(ANIMAL_SKIN_ID) < 100 :
 
           htmltext = "7553-02.htm"
 
         else:
 
@@ -295,45 +303,45 @@ class Quest (JQuest) :
 
           st.takeItems(ANIMAL_SKIN_ID,st.getQuestItemsCount(ANIMAL_SKIN_ID))
 
           st.giveItems(CONTRIBUTION_OF_MARIFE_ID,1)
 
           st.takeItems(MARIFES_REQUEST_ID,1)
 
-   elif npcId == 7553 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(CONTRIBUTION_OF_MARIFE_ID)) and st.getQuestItemsCount((RECEIPT_OF_CONTRIBUTION2_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE2_ID) == 0 and st.getQuestItemsCount(MARIFES_REQUEST_ID)) == 0 :
 
+   elif npcId == 7553 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(CONTRIBUTION_OF_MARIFE_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION2_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE2_ID) == 0 and st.getQuestItemsCount(MARIFES_REQUEST_ID) == 0 :
 
         htmltext = "7553-04.htm"
 
-   elif npcId == 7555 and int(st.get("cond"))==1 and st.getQuestItemsCount((RECEIPT_OF_CONTRIBUTION3_ID) == 0 and st.getQuestItemsCount(PROCURATION_OF_TOROCCO_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE3_ID)) == 0 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID)) :
 
+   elif npcId == 7555 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION3_ID) == 0 and st.getQuestItemsCount(PROCURATION_OF_TOROCCO_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE3_ID) == 0 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) :
 
         htmltext = "7555-01.htm"
 
-   elif npcId == 7555 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(PROCURATION_OF_TOROCCO_ID)) and st.getQuestItemsCount((RECEIPT_OF_CONTRIBUTION3_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE3_ID)) == 0 :
 
+   elif npcId == 7555 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(PROCURATION_OF_TOROCCO_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION3_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE3_ID) == 0 :
 
         htmltext = "7555-03.htm"
 
-   elif npcId == 7554 and int(st.get("cond"))==1 and st.getQuestItemsCount((RECEIPT_OF_CONTRIBUTION4_ID) == 0 and st.getQuestItemsCount(RECEIPT_OF_BOLTER_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE4_ID)) == 0 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID)) :
 
+   elif npcId == 7554 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION4_ID) == 0 and st.getQuestItemsCount(RECEIPT_OF_BOLTER_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE4_ID) == 0 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) :
 
         htmltext = "7554-01.htm"
 
         st.giveItems(RECEIPT_OF_BOLTER_ID,1)
 
-   elif npcId == 7554 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(RECEIPT_OF_BOLTER_ID)) and st.getQuestItemsCount((RECEIPT_OF_CONTRIBUTION4_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE4_ID)) == 0 :
 
+   elif npcId == 7554 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(RECEIPT_OF_BOLTER_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION4_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE4_ID) == 0 :
 
         htmltext = "7554-02.htm"
 
-   elif npcId == 7556 and int(st.get("cond"))==1 and st.getQuestItemsCount((RECEIPT_OF_CONTRIBUTION5_ID) == 0 and st.getQuestItemsCount(CONTRIBUTION_OF_TOMA_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE5_ID)) == 0 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID)) :
 
+   elif npcId == 7556 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION5_ID) == 0 and st.getQuestItemsCount(CONTRIBUTION_OF_TOMA_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE5_ID) == 0 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) :
 
         htmltext = "7556-01.htm"
 
         st.giveItems(CONTRIBUTION_OF_TOMA_ID,1)
 
-   elif npcId == 7556 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(CONTRIBUTION_OF_TOMA_ID)) and st.getQuestItemsCount((RECEIPT_OF_CONTRIBUTION5_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE5_ID)) == 0 :
 
+   elif npcId == 7556 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(COLLECTION_LICENSE_ID) and st.getQuestItemsCount(CONTRIBUTION_OF_TOMA_ID) and st.getQuestItemsCount(RECEIPT_OF_CONTRIBUTION5_ID) == 0 and st.getQuestItemsCount(LOCKIRINS_NOTICE5_ID) == 0 :
 
         htmltext = "7556-02.htm"
 
-   elif npcId == 7597 and int(st.get("cond"))==1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID)==1 and st.getQuestItemsCount(BLESSED_SEED_ID)==0 :
 
+   elif npcId == 7597 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID)==1 and st.getQuestItemsCount(BLESSED_SEED_ID)==0 :
 
         htmltext = "7597-01.htm"
 
-   elif npcId == 7597 and int(st.get("cond"))==1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID)==1 and st.getQuestItemsCount(BLESSED_SEED_ID)==1 :
 
+   elif npcId == 7597 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID)==1 and st.getQuestItemsCount(BLESSED_SEED_ID)==1 :
 
         htmltext = "7597-03.htm"
 
-   elif npcId == 7597 and int(st.get("cond"))==1 and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID)==1 :
 
+   elif npcId == 7597 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID)==1 :
 
         htmltext = "7597-04.htm"
 
-   elif npcId == 7005 and int(st.get("cond"))==1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID)==1 and st.getQuestItemsCount((RYLITH_ELVEN_WAFER_ID) == 0 and st.getQuestItemsCount(CRYSTAL_BROOCH_ID)) == 0 :
 
+   elif npcId == 7005 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID)==1 and st.getQuestItemsCount(RYLITH_ELVEN_WAFER_ID) == 0 and st.getQuestItemsCount(CRYSTAL_BROOCH_ID) == 0 :
 
         htmltext = "7005-01.htm"
 
-   elif npcId == 7005 and int(st.get("cond"))==1 and st.getQuestItemsCount(RYLITH_ELVEN_WAFER_ID)==0 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(CRYSTAL_BROOCH_ID)) :
 
+   elif npcId == 7005 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RYLITH_ELVEN_WAFER_ID)==0 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(CRYSTAL_BROOCH_ID) :
 
         htmltext = "7005-05.htm"
 
-   elif npcId == 7005 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(RYLITH_ELVEN_WAFER_ID)) :
 
+   elif npcId == 7005 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(RYLITH_ELVEN_WAFER_ID) :
 
         htmltext = "7005-06.htm"
 
-   elif npcId == 7005 and int(st.get("cond"))==1 and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID)==1 :
 
+   elif npcId == 7005 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID)==1 :
 
         htmltext = "7005-07.htm"
 
-   elif npcId == 7368 and int(st.get("cond"))==1 and st.getQuestItemsCount((CRYSTAL_BROOCH_ID) and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID)) and st.getQuestItemsCount(RYLITH_ELVEN_WAFER_ID)==0 :
 
+   elif npcId == 7368 and int(st.get("cond"))>=1 and st.getQuestItemsCount(CRYSTAL_BROOCH_ID) and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(RYLITH_ELVEN_WAFER_ID)==0 :
 
         htmltext = "7368-01.htm"
 
-   elif npcId == 7368 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(RYLITH_ELVEN_WAFER_ID)) and st.getQuestItemsCount(CRYSTAL_BROOCH_ID)==0 :
 
+   elif npcId == 7368 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(RYLITH_ELVEN_WAFER_ID) and st.getQuestItemsCount(CRYSTAL_BROOCH_ID)==0 :
 
         htmltext = "7368-04.htm"
 
-   elif npcId == 7368 and int(st.get("cond"))==1 and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID)==1 :
 
+   elif npcId == 7368 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID)==1 :
 
         htmltext = "7368-05.htm"
 
-   elif npcId == 7466 and int(st.get("cond"))==1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID)==1 and st.getQuestItemsCount((RECIPE_OF_EMILLY_ID) == 0 and st.getQuestItemsCount(BRIGHTS_LIST_ID) == 0 and st.getQuestItemsCount(MANDRAGORA_BOUQUET_ID)) == 0 :
 
+   elif npcId == 7466 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID)==1 and st.getQuestItemsCount(RECIPE_OF_EMILLY_ID) == 0 and st.getQuestItemsCount(BRIGHTS_LIST_ID) == 0 and st.getQuestItemsCount(MANDRAGORA_BOUQUET_ID) == 0 :
 
         htmltext = "7466-01.htm"
 
-   elif npcId == 7466 and int(st.get("cond"))==1 and st.getQuestItemsCount(RECIPE_OF_EMILLY_ID)==0 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(BRIGHTS_LIST_ID)) :
 
+   elif npcId == 7466 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RECIPE_OF_EMILLY_ID)==0 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(BRIGHTS_LIST_ID) :
 
         if st.getQuestItemsCount(MANDRAGORA_PETAL_ID) < 20 or st.getQuestItemsCount(CRIMSON_MOSS_ID) < 10 :
 
           htmltext = "7466-04.htm"
 
         else:
 
@@ -342,40 +350,43 @@ class Quest (JQuest) :
 
           st.takeItems(CRIMSON_MOSS_ID,st.getQuestItemsCount(CRIMSON_MOSS_ID))
 
           st.giveItems(MANDRAGORA_BOUQUET_ID,1)
 
           st.takeItems(BRIGHTS_LIST_ID,1)
 
-   elif npcId == 7466 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(MANDRAGORA_BOUQUET_ID)) and st.getQuestItemsCount((RECIPE_OF_EMILLY_ID) == 0 and st.getQuestItemsCount(BRIGHTS_LIST_ID)) == 0 :
 
+   elif npcId == 7466 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(MANDRAGORA_BOUQUET_ID) and st.getQuestItemsCount(RECIPE_OF_EMILLY_ID) == 0 and st.getQuestItemsCount(BRIGHTS_LIST_ID) == 0 :
 
         htmltext = "7466-06.htm"
 
-   elif npcId == 7466 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(RECIPE_OF_EMILLY_ID)) :
 
+   elif npcId == 7466 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(RECIPE_OF_EMILLY_ID) :
 
         htmltext = "7466-07.htm"
 
-   elif npcId == 7466 and int(st.get("cond"))==1 and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID)==1 :
 
+   elif npcId == 7466 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID)==1 :
 
         htmltext = "7466-08.htm"
 
-   elif npcId == 7620 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(MANDRAGORA_BOUQUET_ID)) and st.getQuestItemsCount((RECIPE_OF_EMILLY_ID) == 0 and st.getQuestItemsCount(BRIGHTS_LIST_ID)) == 0 :
 
+   elif npcId == 7620 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(MANDRAGORA_BOUQUET_ID) and st.getQuestItemsCount(RECIPE_OF_EMILLY_ID) == 0 and st.getQuestItemsCount(BRIGHTS_LIST_ID) == 0 :
 
         htmltext = "7620-01.htm"
 
-   elif npcId == 7620 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(RECIPE_OF_EMILLY_ID)) :
 
+   elif npcId == 7620 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) and st.getQuestItemsCount(RECIPE_OF_EMILLY_ID) :
 
         htmltext = "7620-04.htm"
 
-   elif npcId == 7620 and int(st.get("cond"))==1 and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID)==1 :
 
+   elif npcId == 7620 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID)==1 :
 
         htmltext = "7620-05.htm"
 
-   elif npcId == 7621 and int(st.get("cond"))==1 and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID)==1 and st.getQuestItemsCount((CLAY_DOUGH_ID) == 0 and st.getQuestItemsCount(PATTERN_OF_KEYHOLE_ID) == 0 and st.getQuestItemsCount(NIKOLAS_LIST_ID) == 0 and st.getQuestItemsCount(MAPHR_TABLET_FRAGMENT_ID)) == 0 :
 
+   elif npcId == 7621 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID)==1 and st.getQuestItemsCount(CLAY_DOUGH_ID) == 0 and st.getQuestItemsCount(PATTERN_OF_KEYHOLE_ID) == 0 and st.getQuestItemsCount(NIKOLAS_LIST_ID) == 0 and st.getQuestItemsCount(MAPHR_TABLET_FRAGMENT_ID) == 0 :
 
         htmltext = "7621-01.htm"
 
-   elif npcId == 7621 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY2_ID) and st.getQuestItemsCount(CLAY_DOUGH_ID)) and st.getQuestItemsCount((PATTERN_OF_KEYHOLE_ID) == 0 and st.getQuestItemsCount(NIKOLAS_LIST_ID) == 0 and st.getQuestItemsCount(MAPHR_TABLET_FRAGMENT_ID)) == 0 :
 
+   elif npcId == 7621 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID) and st.getQuestItemsCount(CLAY_DOUGH_ID) and st.getQuestItemsCount(PATTERN_OF_KEYHOLE_ID) == 0 and st.getQuestItemsCount(NIKOLAS_LIST_ID) == 0 and st.getQuestItemsCount(MAPHR_TABLET_FRAGMENT_ID) == 0 :
 
         htmltext = "7621-05.htm"
 
-   elif npcId == 7621 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY2_ID) and st.getQuestItemsCount(PATTERN_OF_KEYHOLE_ID)) and st.getQuestItemsCount((CLAY_DOUGH_ID) == 0 and st.getQuestItemsCount(NIKOLAS_LIST_ID) == 0 and st.getQuestItemsCount(MAPHR_TABLET_FRAGMENT_ID)) == 0 :
 
+   elif npcId == 7621 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID) and st.getQuestItemsCount(PATTERN_OF_KEYHOLE_ID) and st.getQuestItemsCount(CLAY_DOUGH_ID) == 0 and st.getQuestItemsCount(NIKOLAS_LIST_ID) == 0 and st.getQuestItemsCount(MAPHR_TABLET_FRAGMENT_ID) == 0 :
 
         htmltext = "7621-06.htm"
 
         st.giveItems(NIKOLAS_LIST_ID,1)
 
         st.takeItems(PATTERN_OF_KEYHOLE_ID,1)
 
         st.giveItems(RP_TITAN_KEY_ID,1)
 
-   elif npcId == 7621 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY2_ID) and st.getQuestItemsCount(NIKOLAS_LIST_ID)) and st.getQuestItemsCount((CLAY_DOUGH_ID) == 0 and st.getQuestItemsCount(PATTERN_OF_KEYHOLE_ID) == 0 and st.getQuestItemsCount(MAPHR_TABLET_FRAGMENT_ID) == 0 and st.getQuestItemsCount(KEY_OF_TITAN_ID)) == 0 :
 
+   elif npcId == 7621 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID) and st.getQuestItemsCount(NIKOLAS_LIST_ID) and st.getQuestItemsCount(CLAY_DOUGH_ID) == 0 and st.getQuestItemsCount(PATTERN_OF_KEYHOLE_ID) == 0 and st.getQuestItemsCount(MAPHR_TABLET_FRAGMENT_ID) == 0 and st.getQuestItemsCount(KEY_OF_TITAN_ID) == 0 :
 
         htmltext = "7621-07.htm"
 
-   elif npcId == 7621 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY2_ID) and st.getQuestItemsCount(NIKOLAS_LIST_ID) and st.getQuestItemsCount(KEY_OF_TITAN_ID)) and st.getQuestItemsCount((CLAY_DOUGH_ID) == 0 and st.getQuestItemsCount(PATTERN_OF_KEYHOLE_ID) == 0 and st.getQuestItemsCount(MAPHR_TABLET_FRAGMENT_ID)) == 0 :
 
+   elif npcId == 7621 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID) and st.getQuestItemsCount(NIKOLAS_LIST_ID) and st.getQuestItemsCount(KEY_OF_TITAN_ID) and st.getQuestItemsCount(CLAY_DOUGH_ID) == 0 and st.getQuestItemsCount(PATTERN_OF_KEYHOLE_ID) == 0 and st.getQuestItemsCount(MAPHR_TABLET_FRAGMENT_ID) == 0 :
 
         htmltext = "7621-08.htm"
 
-   elif npcId == 7621 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY2_ID) and st.getQuestItemsCount(MAPHR_TABLET_FRAGMENT_ID)) and st.getQuestItemsCount((CLAY_DOUGH_ID) == 0 and st.getQuestItemsCount(PATTERN_OF_KEYHOLE_ID) == 0 and st.getQuestItemsCount(NIKOLAS_LIST_ID)) == 0 :
 
+   elif npcId == 7621 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID) and st.getQuestItemsCount(MAPHR_TABLET_FRAGMENT_ID) and st.getQuestItemsCount(CLAY_DOUGH_ID) == 0 and st.getQuestItemsCount(PATTERN_OF_KEYHOLE_ID) == 0 and st.getQuestItemsCount(NIKOLAS_LIST_ID) == 0 :
 
         htmltext = "7621-09.htm"
 
-   elif npcId == 7622 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY2_ID) and st.getQuestItemsCount(CLAY_DOUGH_ID)) and st.getQuestItemsCount(PATTERN_OF_KEYHOLE_ID)==0 :
 
+   elif npcId == 7622 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID) and st.getQuestItemsCount(CLAY_DOUGH_ID) and st.getQuestItemsCount(PATTERN_OF_KEYHOLE_ID)==0 :
 
         htmltext = "7622-01.htm"
 
-   elif npcId == 7622 and int(st.get("cond"))==1 and st.getQuestItemsCount((RING_OF_TESTIMONY2_ID) and st.getQuestItemsCount(KEY_OF_TITAN_ID)) and st.getQuestItemsCount(MAPHR_TABLET_FRAGMENT_ID)==0 :
 
+   elif npcId == 7622 and int(st.get("cond"))>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID) and st.getQuestItemsCount(KEY_OF_TITAN_ID) and st.getQuestItemsCount(MAPHR_TABLET_FRAGMENT_ID)==0 :
 
         htmltext = "7622-03.htm"
 
+   print htmltext
 
    return htmltext
 
 
  def onKill (self,npcId,st):
 
+   print "221: QuestKill:"
 
+   print npcId
 
    if npcId == 223 :
 
     st.set("id","0")
 
     if int(st.get("cond")) and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) == 1  :
 
@@ -402,43 +413,46 @@ class Quest (JQuest) :
 
       st.playSound("ItemSound.quest_middle")
 
    elif npcId == 228 :
 
     st.set("id","0")
 
-    if int(st.get("cond")) and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) == 1  :
 
-     if st.getQuestItemsCount(CRIMSON_MOSS_ID)<10 :
 
+    if int(st.get("cond")) and st.getQuestItemsCount(RING_OF_TESTIMONY1_ID) == 1 and st.getQuestItemsCount(CRIMSON_MOSS_ID)<10 :
 
+     if st.getQuestItemsCount(CRIMSON_MOSS_ID) == 9 :
 
       st.giveItems(CRIMSON_MOSS_ID,1)
 
       st.playSound("ItemSound.quest_middle")
 
+     else :
 
+      st.giveItems(CRIMSON_MOSS_ID,1)
 
+      st.playSound("ItemSound.quest_itemget")
 
    elif npcId == 157 :
 
     st.set("id","0")
 
-    if int(st.get("cond")) and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID) == 1  :
 
+    if int(st.get("cond")) and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID) == 1 and st.getQuestItemsCount(STAKATO_SHELL_ID) <20  :
 
      if st.getRandom(100)<20 :
 
       st.giveItems(STAKATO_SHELL_ID,1)
 
       st.playSound("ItemSound.quest_middle")
 
    elif npcId == 230 :
 
     st.set("id","0")
 
-    if int(st.get("cond")) and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID) == 1  :
 
+    if int(st.get("cond")) and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID) == 1 and st.getQuestItemsCount(STAKATO_SHELL_ID) <20  :
 
      if st.getRandom(100)<30 :
 
       st.giveItems(STAKATO_SHELL_ID,1)
 
       st.playSound("ItemSound.quest_middle")
 
    elif npcId == 232 :
 
     st.set("id","0")
 
-    if int(st.get("cond")) and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID) == 1  :
 
+    if int(st.get("cond")) and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID) == 1 and st.getQuestItemsCount(STAKATO_SHELL_ID) <20  :
 
      if st.getRandom(100)<50 :
 
       st.giveItems(STAKATO_SHELL_ID,1)
 
       st.playSound("ItemSound.quest_middle")
 
    elif npcId == 234 :
 
     st.set("id","0")
 
-    if int(st.get("cond")) and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID) == 1  :
 
+    if int(st.get("cond")) and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID) == 1 and st.getQuestItemsCount(STAKATO_SHELL_ID) <20 :
 
      if st.getRandom(100)<60 :
 
       st.giveItems(STAKATO_SHELL_ID,1)
 
       st.playSound("ItemSound.quest_middle")
 
    elif npcId == 231 :
 
     st.set("id","0")
 
-    if int(st.get("cond")) and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID) == 1  :
 
+    if int(st.get("cond")) and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID) == 1 and st.getQuestItemsCount(INPICIO_SAC_ID) <20  :
 
      if st.getRandom(100)<50 :
 
       st.giveItems(INPICIO_SAC_ID,1)
 
       st.playSound("ItemSound.quest_middle")
 
    elif npcId == 233 :
 
     st.set("id","0")
 
-    if int(st.get("cond")) and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID) == 1  :
 
+    if int(st.get("cond")) and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID) == 1 and st.getQuestItemsCount(SPIDER_THORN_ID) <20  :
 
      if st.getRandom(100)<50 :
 
       st.giveItems(SPIDER_THORN_ID,1)
 
       st.playSound("ItemSound.quest_middle")

+ 2 - 1
datapack_development/data/jscript/quests/228_TestOfMagus/7409-02.htm
Ver arquivo 

@@ -3,6 +3,7 @@
 
 <body>
 
 
 Earth Snake:<br>
 
-Ahhh, the thousand year flower! I see
 
+Ahhh, the thousand year flower! I see<br>
 
+<a action="bypass -h Quest 228_TestOfMagus 7409_2">"Yes!"</a>
 
 </body>
 
 </html>

+ 14 - 4
datapack_development/data/jscript/quests/228_TestOfMagus/__init__.py
Ver arquivo 

@@ -41,7 +41,7 @@ class Quest (JQuest) :
 
         st.set("cond","1")
 
         st.setState(STARTED)
 
         st.playSound("ItemSound.quest_accept")
 
-        st.giveItems(RUKALS_LETTER_ID)
 
+        st.giveItems(RUKALS_LETTER_ID,1)
 
     elif event == "7629_1" :
 
           htmltext = "7629-09.htm"
 
     elif event == "7629_2" :
 
@@ -51,22 +51,27 @@ class Quest (JQuest) :
 
           st.takeItems(GOLDEN_SEED2_ID,1)
 
           st.giveItems(SCORE_OF_ELEMENTS_ID,1)
 
           st.takeItems(GOLDEN_SEED3_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
     elif event == "7391_1" :
 
           htmltext = "7391-02.htm"
 
           st.giveItems(PARINAS_LETTER_ID,1)
 
           st.takeItems(RUKALS_LETTER_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
     elif event == "7612_1" :
 
           htmltext = "7612-02.htm"
 
           st.giveItems(LILAC_CHARM_ID,1)
 
           st.takeItems(PARINAS_LETTER_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
     elif event == "7412_1" :
 
           htmltext = "7412-02.htm"
 
           st.giveItems(SYLPH_CHARM_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
     elif event == "7409_1" :
 
           htmltext = "7409-02.htm"
 
     elif event == "7409_2" :
 
           htmltext = "7409-03.htm"
 
           st.giveItems(SERPENT_CHARM_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
     return htmltext
 
 
 
@@ -98,12 +103,12 @@ class Quest (JQuest) :
 
    elif npcId == 7629 and int(st.get("cond"))==1 and st.getQuestItemsCount(PARINAS_LETTER_ID)==1 :
 
         htmltext = "7629-06.htm"
 
    elif npcId == 7629 and int(st.get("cond"))==1 and st.getQuestItemsCount(LILAC_CHARM_ID)==1 :
 
-        if st.getQuestItemsCount((GOLDEN_SEED1_ID) and st.getQuestItemsCount(GOLDEN_SEED2_ID) and st.getQuestItemsCount(GOLDEN_SEED3_ID)) :
 
+        if st.getQuestItemsCount(GOLDEN_SEED1_ID) and st.getQuestItemsCount(GOLDEN_SEED2_ID) and st.getQuestItemsCount(GOLDEN_SEED3_ID) :
 
           htmltext = "7629-08.htm"
 
         else:
 
           htmltext = "7629-07.htm"
 
    elif npcId == 7629 and int(st.get("cond"))==1 and st.getQuestItemsCount(SCORE_OF_ELEMENTS_ID)==1 :
 
-        if st.getQuestItemsCount((TONE_OF_WATER_ID) and st.getQuestItemsCount(TONE_OF_FIRE_ID) and st.getQuestItemsCount(TONE_OF_WIND_ID) and st.getQuestItemsCount(TONE_OF_EARTH_ID)) :
 
+        if st.getQuestItemsCount(TONE_OF_WATER_ID) and st.getQuestItemsCount(TONE_OF_FIRE_ID) and st.getQuestItemsCount(TONE_OF_WIND_ID) and st.getQuestItemsCount(TONE_OF_EARTH_ID) :
 
           if st.getGameTicks() != int(st.get("id")) :
 
             st.set("id",str(st.getGameTicks()))
 
             st.takeItems(SCORE_OF_ELEMENTS_ID,1)
 
@@ -131,7 +136,7 @@ class Quest (JQuest) :
 
    elif npcId == 7612 and int(st.get("cond"))==1 and st.getQuestItemsCount(PARINAS_LETTER_ID)==1 :
 
         htmltext = "7612-01.htm"
 
    elif npcId == 7612 and int(st.get("cond"))==1 and st.getQuestItemsCount(LILAC_CHARM_ID)==1 :
 
-        if st.getQuestItemsCount((GOLDEN_SEED1_ID) and st.getQuestItemsCount(GOLDEN_SEED2_ID) and st.getQuestItemsCount(GOLDEN_SEED3_ID)) :
 
+        if st.getQuestItemsCount(GOLDEN_SEED1_ID) and st.getQuestItemsCount(GOLDEN_SEED2_ID) and st.getQuestItemsCount(GOLDEN_SEED3_ID) :
 
           htmltext = "7612-04.htm"
 
         else:
 
           htmltext = "7612-03.htm"
 
@@ -148,11 +153,13 @@ class Quest (JQuest) :
 
           st.takeItems(DAZZLING_DROP_ID,st.getQuestItemsCount(DAZZLING_DROP_ID))
 
           st.giveItems(TONE_OF_WATER_ID,1)
 
           st.takeItems(UNDINE_CHARM_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
    elif npcId == 7413 and int(st.get("cond"))==1 and st.getQuestItemsCount(SCORE_OF_ELEMENTS_ID)==1 and st.getQuestItemsCount(TONE_OF_WATER_ID)==1 and st.getQuestItemsCount(UNDINE_CHARM_ID)==0 :
 
         htmltext = "7413-04.htm"
 
    elif npcId == 7411 and int(st.get("cond"))==1 and st.getQuestItemsCount(SCORE_OF_ELEMENTS_ID)==1 and st.getQuestItemsCount(TONE_OF_FIRE_ID)==0 and st.getQuestItemsCount(SALAMANDER_CHARM_ID)==0 :
 
         htmltext = "7411-01.htm"
 
         st.giveItems(SALAMANDER_CHARM_ID,1)
 
+        st.playSound("ItemSound.quest_middle")
 
    elif npcId == 7411 and int(st.get("cond"))==1 and st.getQuestItemsCount(SCORE_OF_ELEMENTS_ID)==1 and st.getQuestItemsCount(SALAMANDER_CHARM_ID)==1 :
 
         if st.getQuestItemsCount(FLAME_CRYSTAL_ID) < 5 :
 
           htmltext = "7411-02.htm"
 
@@ -161,6 +168,7 @@ class Quest (JQuest) :
 
           st.takeItems(FLAME_CRYSTAL_ID,st.getQuestItemsCount(FLAME_CRYSTAL_ID))
 
           st.giveItems(TONE_OF_FIRE_ID,1)
 
           st.takeItems(SALAMANDER_CHARM_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
    elif npcId == 7411 and int(st.get("cond"))==1 and st.getQuestItemsCount(SCORE_OF_ELEMENTS_ID)==1 and st.getQuestItemsCount(TONE_OF_FIRE_ID)==1 and st.getQuestItemsCount(SALAMANDER_CHARM_ID)==0 :
 
         htmltext = "7411-04.htm"
 
    elif npcId == 7412 and int(st.get("cond"))==1 and st.getQuestItemsCount(SCORE_OF_ELEMENTS_ID)==1 and st.getQuestItemsCount(TONE_OF_WIND_ID)==0 and st.getQuestItemsCount(SYLPH_CHARM_ID)==0 :
 
@@ -175,6 +183,7 @@ class Quest (JQuest) :
 
           st.takeItems(WINDSUS_MANE_ID,st.getQuestItemsCount(WINDSUS_MANE_ID))
 
           st.giveItems(TONE_OF_WIND_ID,1)
 
           st.takeItems(SYLPH_CHARM_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
    elif npcId == 7412 and int(st.get("cond"))==1 and st.getQuestItemsCount(SCORE_OF_ELEMENTS_ID)==1 and st.getQuestItemsCount(TONE_OF_WIND_ID)==1 and st.getQuestItemsCount(SYLPH_CHARM_ID)==0 :
 
         htmltext = "7412-05.htm"
 
    elif npcId == 7409 and int(st.get("cond"))==1 and st.getQuestItemsCount(SCORE_OF_ELEMENTS_ID)==1 and st.getQuestItemsCount(TONE_OF_EARTH_ID)==0 and st.getQuestItemsCount(SERPENT_CHARM_ID)==0 :
 
@@ -189,6 +198,7 @@ class Quest (JQuest) :
 
           st.takeItems(EN_IRONGOLEM_SCRAP_ID,st.getQuestItemsCount(EN_IRONGOLEM_SCRAP_ID))
 
           st.giveItems(TONE_OF_EARTH_ID,1)
 
           st.takeItems(SERPENT_CHARM_ID,1)
 
+          st.playSound("ItemSound.quest_middle")
 
    elif npcId == 7409 and int(st.get("cond"))==1 and st.getQuestItemsCount(SCORE_OF_ELEMENTS_ID)==1 and st.getQuestItemsCount(TONE_OF_EARTH_ID)==1 and st.getQuestItemsCount(SERPENT_CHARM_ID)==0 :
 
         htmltext = "7409-06.htm"
 
    return htmltext

+ 11 - 7
datapack_development/data/jscript/quests/231_TestOfMaestro/__init__.py
Ver arquivo 

@@ -30,11 +30,9 @@ class Quest (JQuest) :
 
     htmltext = event
 
     if event == "1" :
 
       htmlfile = "7531-04.htm"
 
-      st.set("cond","1")
 
       st.setState(STARTED)
 
       st.playSound("ItemSound.quest_accept")
 
       st.set("cond","1")
 
-      st.set("cond",str(0))
 
     elif event == "7533_1" :
 
           htmltext = "7533-02.htm"
 
           st.set("cond","2")
 
@@ -47,8 +45,8 @@ class Quest (JQuest) :
 
           htmltext = "7556-03.htm"
 
     elif event == "7556_3" :
 
           htmltext = "7556-05.htm"
 
-          st.giveItems(BROKEN_TELEPORT_DEVICE_ID,1)
 
           st.takeItems(PAINT_OF_TELEPORT_DEVICE_ID,1)
 
+	  st.set("id","0")
 
           st.getPlayer().teleToLocation(140352,-194133,-2028);
 
           st.spawnNpc(150,140402,-194133,-1950)
 
           st.spawnNpc(150,140352,-194183,-1950)
 
@@ -115,16 +113,16 @@ class Quest (JQuest) :
 
       htmltext = "7533-05.htm"
 
    elif npcId == 7671 and int(st.get("cond"))==2 and st.getQuestItemsCount(PAINT_OF_KAMURU_ID)==0 and st.getQuestItemsCount(NECKLACE_OF_KAMURU_ID)==0 and st.getQuestItemsCount(LETTER_OF_SOLDER_DETACHMENT_ID)==0 :
 
       htmltext = "7671-01.htm"
 
-   elif npcId == 7671 and int(st.get("cond"))==1 and st.getQuestItemsCount(PAINT_OF_KAMURU_ID) and st.getQuestItemsCount(NECKLACE_OF_KAMURU_ID)==0 :
 
+   elif npcId == 7671 and int(st.get("cond"))==2 and st.getQuestItemsCount(PAINT_OF_KAMURU_ID) and st.getQuestItemsCount(NECKLACE_OF_KAMURU_ID)==0 :
 
       htmltext = "7671-03.htm"
 
-   elif npcId == 7671 and int(st.get("cond"))==1 and st.getQuestItemsCount(NECKLACE_OF_KAMURU_ID) :
 
+   elif npcId == 7671 and int(st.get("cond"))==2 and st.getQuestItemsCount(NECKLACE_OF_KAMURU_ID) :
 
       htmltext = "7671-04.htm"
 
       st.giveItems(LETTER_OF_SOLDER_DETACHMENT_ID,1)
 
       st.takeItems(NECKLACE_OF_KAMURU_ID,1)
 
       st.takeItems(PAINT_OF_KAMURU_ID,1)
 
-   elif npcId == 7671 and int(st.get("cond"))==1 and st.getQuestItemsCount(LETTER_OF_SOLDER_DETACHMENT_ID) :
 
+   elif npcId == 7671 and int(st.get("cond"))==2 and st.getQuestItemsCount(LETTER_OF_SOLDER_DETACHMENT_ID) :
 
       htmltext = "7671-05.htm"
 
-   elif npcId == 7672 and int(st.get("cond"))==1 and st.getQuestItemsCount(PAINT_OF_KAMURU_ID) :
 
+   elif npcId == 7672 and int(st.get("cond"))==2 and st.getQuestItemsCount(PAINT_OF_KAMURU_ID) :
 
       htmltext = "7672-01.htm"
 
    elif npcId == 7536 and int(st.get("cond"))==1 and st.getQuestItemsCount(RECOMMENDATION_OF_ARIN_ID)==0 :
 
       htmltext = "7536-01.htm"
 
@@ -183,6 +181,12 @@ class Quest (JQuest) :
 
         else:
 
           st.giveItems(BLOOD_OF_LEECH_ID,1)
 
           st.playSound("Itemsound.quest_itemget")
 
+   elif npcId == 150 :
 
+	if int(st.get("cond"))>=1 and int(st.get("id")) < 3 :
 
+	  st.set("id",int(st.get("id"))+1)
 
+	  if int(st.get("id")) == 3 :
 
+            st.giveItems(BROKEN_TELEPORT_DEVICE_ID,1)
 
+            st.playSound("Itemsound.quest_middle")
 
    elif npcId == 229 :
 
       if int(st.get("cond")) and int(st.get("cond")) == 4 and st.getQuestItemsCount(WEIRD_BEES_NEEDLE_ID) < 10 :
 
         if st.getQuestItemsCount(WEIRD_BEES_NEEDLE_ID) == 9 :

+ 2 - 1
datapack_development/sql/spawnlist.sql
Ver arquivo 

@@ -32137,5 +32137,6 @@ insert  into spawnlist values
 
 (32117,'WorshipersNecropoli',1,8097,110848,174016,-5437,0,0,32500,15,0),

 (32118,'WorshipersNecropoli',1,1218,115654,177457,-5432,0,0,4390,15,0),

 (32119,'WorshipersNecropoli',1,1217,115857,177120,-5432,0,0,23536,15,0),

-(32120,'unset',1,21,-62206,100056,-3558,0,0,23536,35,0);

+(32120,'unset',1,21,-62206,100056,-3558,0,0,23536,35,0),

+(1249013867,'unset',1,7463,17376,146614,-3112,0,0,21799,60,0);