Browse Source

quest htmls fixes

Kerberos 17 years ago
parent
commit
e738a93763
100 changed files with 224 additions and 173 deletions
  1. 1 1
      datapack_development/data/scripts/custom/6050_KetraOrcSupport/__init__.py
  2. 1 1
      datapack_development/data/scripts/custom/6051_VarkaSilenosSupport/__init__.py
  3. 1 1
      datapack_development/data/scripts/custom/7000_HeroItems/__init__.py
  4. 2 2
      datapack_development/data/scripts/quests/101_SwordOfSolidarity/__init__.py
  5. 2 2
      datapack_development/data/scripts/quests/102_FungusFever/__init__.py
  6. 2 2
      datapack_development/data/scripts/quests/103_SpiritOfCraftsman/__init__.py
  7. 2 2
      datapack_development/data/scripts/quests/104_SpiritOfMirrors/__init__.py
  8. 2 2
      datapack_development/data/scripts/quests/105_SkirmishWithOrcs/__init__.py
  9. 2 2
      datapack_development/data/scripts/quests/106_ForgottenTruth/__init__.py
  10. 2 2
      datapack_development/data/scripts/quests/107_MercilessPunishment/__init__.py
  11. 2 2
      datapack_development/data/scripts/quests/108_JumbleTumbleDiamondFuss/__init__.py
  12. 1 1
      datapack_development/data/scripts/quests/10_IntoTheWorld/__init__.py
  13. 2 2
      datapack_development/data/scripts/quests/110_ToThePrimevalIsle/__init__.py
  14. 2 2
      datapack_development/data/scripts/quests/117_OceanOfDistantStar/__init__.py
  15. 2 2
      datapack_development/data/scripts/quests/118_ToLeadAndBeLed/__init__.py
  16. 1 1
      datapack_development/data/scripts/quests/11_SecretMeetingWithKetraOrcs/__init__.py
  17. 2 2
      datapack_development/data/scripts/quests/121_PavelTheGiants/__init__.py
  18. 1 1
      datapack_development/data/scripts/quests/122_OminousNews/__init__.py
  19. 2 2
      datapack_development/data/scripts/quests/123_TheLeaderAndTheFollower/__init__.py
  20. 2 2
      datapack_development/data/scripts/quests/124_MeetingTheElroki/__init__.py
  21. 1 1
      datapack_development/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/__init__.py
  22. 2 2
      datapack_development/data/scripts/quests/13_ParcelDelivery/__init__.py
  23. 2 2
      datapack_development/data/scripts/quests/14_WhereaboutsOfTheArchaeologist/__init__.py
  24. 2 2
      datapack_development/data/scripts/quests/151_SaveMySister1/__init__.py
  25. 2 2
      datapack_development/data/scripts/quests/152_ShardsOfGolem/__init__.py
  26. 2 2
      datapack_development/data/scripts/quests/153_WharfOldtimersFavor/__init__.py
  27. 3 2
      datapack_development/data/scripts/quests/154_SacrificeToSea/__init__.py
  28. 3 2
      datapack_development/data/scripts/quests/155_FindSirWindawood/__init__.py
  29. 3 2
      datapack_development/data/scripts/quests/156_MillenniumLove/__init__.py
  30. 3 2
      datapack_development/data/scripts/quests/157_RecoverSmuggled/__init__.py
  31. 3 2
      datapack_development/data/scripts/quests/158_SeedOfEvil/__init__.py
  32. 3 2
      datapack_development/data/scripts/quests/159_ProtectHeadsprings/__init__.py
  33. 2 2
      datapack_development/data/scripts/quests/15_SweetWhisper/__init__.py
  34. 3 2
      datapack_development/data/scripts/quests/160_NerupasFavor/__init__.py
  35. 3 2
      datapack_development/data/scripts/quests/161_FruitsOfMothertree/__init__.py
  36. 3 2
      datapack_development/data/scripts/quests/162_CurseOfFortress/__init__.py
  37. 3 2
      datapack_development/data/scripts/quests/163_LegacyOfPoet/__init__.py
  38. 3 2
      datapack_development/data/scripts/quests/164_BloodFiend/__init__.py
  39. 3 2
      datapack_development/data/scripts/quests/165_WildHunt/__init__.py
  40. 3 2
      datapack_development/data/scripts/quests/166_DarkMass/__init__.py
  41. 3 2
      datapack_development/data/scripts/quests/167_DwarvenKinship/__init__.py
  42. 3 2
      datapack_development/data/scripts/quests/168_DeliverSupplies/__init__.py
  43. 3 2
      datapack_development/data/scripts/quests/169_NightmareChildren/__init__.py
  44. 3 2
      datapack_development/data/scripts/quests/16_TheComingDarkness/__init__.py
  45. 3 2
      datapack_development/data/scripts/quests/170_DangerousAllure/__init__.py
  46. 1 1
      datapack_development/data/scripts/quests/171_ActsOfEvil/__init__.py
  47. 3 2
      datapack_development/data/scripts/quests/17_LightAndDarkness/__init__.py
  48. 3 2
      datapack_development/data/scripts/quests/18_MeetingWithTheGoldenRam/__init__.py
  49. 3 2
      datapack_development/data/scripts/quests/19_GoToThePastureland/__init__.py
  50. 2 2
      datapack_development/data/scripts/quests/1_LettersOfLove1/__init__.py
  51. 3 2
      datapack_development/data/scripts/quests/20_BringUpWithLove/__init__.py
  52. 3 2
      datapack_development/data/scripts/quests/211_TrialOfChallenger/__init__.py
  53. 3 2
      datapack_development/data/scripts/quests/212_TrialOfDuty/__init__.py
  54. 3 2
      datapack_development/data/scripts/quests/213_TrialOfSeeker/__init__.py
  55. 3 2
      datapack_development/data/scripts/quests/214_TrialOfScholar/__init__.py
  56. 3 2
      datapack_development/data/scripts/quests/215_TrialOfPilgrim/__init__.py
  57. 3 2
      datapack_development/data/scripts/quests/216_TrialOfGuildsman/__init__.py
  58. 3 2
      datapack_development/data/scripts/quests/217_TestimonyOfTrust/__init__.py
  59. 3 2
      datapack_development/data/scripts/quests/218_TestimonyOfLife/__init__.py
  60. 3 2
      datapack_development/data/scripts/quests/219_TestimonyOfFate/__init__.py
  61. 1 1
      datapack_development/data/scripts/quests/21_HiddenTruth/__init__.py
  62. 3 2
      datapack_development/data/scripts/quests/220_TestimonyOfGlory/__init__.py
  63. 3 2
      datapack_development/data/scripts/quests/221_TestimonyOfProsperity/__init__.py
  64. 3 2
      datapack_development/data/scripts/quests/222_TestOfDuelist/__init__.py
  65. 3 2
      datapack_development/data/scripts/quests/223_TestOfChampion/__init__.py
  66. 3 2
      datapack_development/data/scripts/quests/224_TestOfSagittarius/__init__.py
  67. 3 2
      datapack_development/data/scripts/quests/225_TestOfSearcher/__init__.py
  68. 3 2
      datapack_development/data/scripts/quests/226_TestOfHealer/__init__.py
  69. 3 2
      datapack_development/data/scripts/quests/227_TestOfReformer/__init__.py
  70. 3 2
      datapack_development/data/scripts/quests/228_TestOfMagus/__init__.py
  71. 3 2
      datapack_development/data/scripts/quests/229_TestOfWitchcraft/__init__.py
  72. 3 2
      datapack_development/data/scripts/quests/22_TragedyInVonHellmannForest/__init__.py
  73. 4 3
      datapack_development/data/scripts/quests/230_TestOfSummoner/__init__.py
  74. 3 2
      datapack_development/data/scripts/quests/231_TestOfMaestro/__init__.py
  75. 3 2
      datapack_development/data/scripts/quests/232_TestOfLord/__init__.py
  76. 3 2
      datapack_development/data/scripts/quests/233_TestOfWarspirit/__init__.py
  77. 3 2
      datapack_development/data/scripts/quests/234_FatesWhisper/__init__.py
  78. 1 1
      datapack_development/data/scripts/quests/235_MimirsElixir/__init__.py
  79. 3 2
      datapack_development/data/scripts/quests/241_PossessorOfAPreciousSoul_1/__init__.py
  80. 3 2
      datapack_development/data/scripts/quests/242_PossessorOfAPreciousSoul_2/__init__.py
  81. 3 2
      datapack_development/data/scripts/quests/246_PossessorOfAPreciousSoul_3/__init__.py
  82. 3 2
      datapack_development/data/scripts/quests/247_PossessorOfAPreciousSoul_4/__init__.py
  83. 1 1
      datapack_development/data/scripts/quests/257_GuardIsBusy1/__init__.py
  84. 1 1
      datapack_development/data/scripts/quests/258_BringWolfPelt1/__init__.py
  85. 1 1
      datapack_development/data/scripts/quests/259_RanchersPlea/__init__.py
  86. 1 1
      datapack_development/data/scripts/quests/260_HuntForOrcs1/__init__.py
  87. 1 1
      datapack_development/data/scripts/quests/261_DreamOfMoneylender1/__init__.py
  88. 1 1
      datapack_development/data/scripts/quests/262_BringMeMushrooms1/__init__.py
  89. 1 1
      datapack_development/data/scripts/quests/263_KillAllSylphs1/__init__.py
  90. 1 1
      datapack_development/data/scripts/quests/264_KeenClaws/__init__.py
  91. 1 1
      datapack_development/data/scripts/quests/265_ChainsOfSlavery/__init__.py
  92. 1 1
      datapack_development/data/scripts/quests/266_PleaOfPixies/__init__.py
  93. 1 1
      datapack_development/data/scripts/quests/267_WrathOfVerdure/__init__.py
  94. 1 1
      datapack_development/data/scripts/quests/271_ProofOfValor/__init__.py
  95. 1 1
      datapack_development/data/scripts/quests/272_WrathOfAncestors/__init__.py
  96. 1 1
      datapack_development/data/scripts/quests/273_InvadersOfHolyland/__init__.py
  97. 1 1
      datapack_development/data/scripts/quests/274_AgainstWolfMen/__init__.py
  98. 1 1
      datapack_development/data/scripts/quests/275_BlackWingedSpies/__init__.py
  99. 1 1
      datapack_development/data/scripts/quests/276_HestuiTotem/__init__.py
  100. 1 1
      datapack_development/data/scripts/quests/277_GatekeepersOffering/__init__.py

+ 1 - 1
datapack_development/data/scripts/custom/6050_KetraOrcSupport/__init__.py

@@ -63,7 +63,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onFirstTalk (self,npc,player):
-    htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+    htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
     st = player.getQuestState(qn)
     if not st :
         st = self.newQuestState(player)

+ 1 - 1
datapack_development/data/scripts/custom/6051_VarkaSilenosSupport/__init__.py

@@ -65,7 +65,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onFirstTalk (self,npc,player):
-    htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+    htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
     st = player.getQuestState(qn)
     if not st :
         st = self.newQuestState(player)

+ 1 - 1
datapack_development/data/scripts/custom/7000_HeroItems/__init__.py

@@ -71,7 +71,7 @@ class Quest (JQuest) :
 
  def onTalk (Self,npc,player):
      st = player.getQuestState(qn)
-     htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+     htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
      if player.isHero():
         htmltext=render_list("list",0)
      else :

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

@@ -44,7 +44,7 @@ class Quest (JQuest) :
 
  def onTalk (self,npc,player) :
    npcId = npc.getNpcId()
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>" 
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>" 
    st = player.getQuestState(qn)
    if not st: return htmltext
    id = st.getState()
@@ -61,7 +61,7 @@ class Quest (JQuest) :
         htmltext = "30008-08.htm"
         st.exitQuest(1)
    elif npcId == 30008 and st.getInt("cond")==0 and st.getInt("onlyone")==1 :
-        htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+        htmltext = "<html><body>This quest has already been completed.</body></html>"
    if id == State.STARTED: 
        if npcId == 30008 and st.getInt("cond")==1 and (st.getQuestItemsCount(ROIENS_LETTER_ID)==1) :
             htmltext = "30008-05.htm"

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

@@ -48,7 +48,7 @@ class Quest (JQuest) :
 
  def onTalk (self,npc,player):
    npcId = npc.getNpcId()
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st: return htmltext
 
@@ -67,7 +67,7 @@ class Quest (JQuest) :
          htmltext = "30284-08.htm"
          st.exitQuest(1)
    elif npcId == 30284 and st.getInt("cond")==0 and st.getInt("onlyone")==1 :
-        htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+        htmltext = "<html><body>This quest has already been completed.</body></html>"
    elif id == State.STARTED :
       if npcId == 30284 and st.getInt("cond")==1 and st.getQuestItemsCount(ALBERRYUS_LETTER_ID)==1 :
            htmltext = "30284-03.htm"

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

@@ -36,7 +36,7 @@ class Quest (JQuest) :
 
  def onTalk (self,npc,player) :
    npcId = npc.getNpcId()
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st: return htmltext
    id = st.getState()
@@ -53,7 +53,7 @@ class Quest (JQuest) :
         htmltext = "30307-02.htm"
         st.exitQuest(1)
    elif npcId == 30307 and st.getInt("cond")==0 and st.getInt("onlyone")==1 :
-        htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+        htmltext = "<html><body>This quest has already been completed.</body></html>"
    elif id == State.STARTED : 
        if npcId == 30307 and st.getInt("cond")>=1 and (st.getQuestItemsCount(KAROYDS_LETTER_ID)>=1 or st.getQuestItemsCount(CECKTINONS_VOUCHER1_ID)>=1 or st.getQuestItemsCount(CECKTINONS_VOUCHER2_ID)>=1) :
             htmltext = "30307-06.htm"

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

@@ -50,7 +50,7 @@ class Quest (JQuest) :
 
  def onTalk (self,npc,player): 
    npcId = npc.getNpcId() 
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>" 
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>" 
    st = player.getQuestState(qn) 
    if not st: return htmltext 
    id = st.getState() 
@@ -67,7 +67,7 @@ class Quest (JQuest) :
         htmltext = "30017-06.htm" 
         st.exitQuest(1) 
    elif npcId == 30017 and st.getInt("cond")==0 and st.getInt("onlyone")==1 : 
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>" 
+      htmltext = "<html><body>This quest has already been completed</body></html>" 
    elif id == State.STARTED : 
      if npcId == 30017 and st.getInt("cond") and st.getQuestItemsCount(GALLINS_OAK_WAND_ID)>=1 and not HaveAllQuestItems(st) : 
         htmltext = "30017-04.htm" 

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

@@ -55,7 +55,7 @@ class Quest (JQuest) :
  def onTalk (self,npc,player): 
 
    npcId = npc.getNpcId() 
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>" 
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>" 
    st = player.getQuestState(qn) 
    if not st : return htmltext 
     
@@ -71,7 +71,7 @@ class Quest (JQuest) :
         htmltext = "30218-10.htm" 
         st.exitQuest(1) 
    elif npcId == 30218 and st.getInt("cond")==0 and st.getInt("onlyone")==1 : 
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>" 
+      htmltext = "<html><body>This quest has already been completed.</body></html>" 
    elif npcId == 30218 and st.getInt("cond") : 
       if st.getQuestItemsCount(KABOO_CHIEF_TORC1_ID) : 
         htmltext = "30218-06.htm" 

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

@@ -31,7 +31,7 @@ class Quest (JQuest) :
 
  def onTalk (self,npc,player):
    npcId = npc.getNpcId()
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -48,7 +48,7 @@ class Quest (JQuest) :
        htmltext = "30358-00.htm"
        st.exitQuest(1)
    elif id == State.COMPLETED :                                  # Check if the quest is already made
-     htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+     htmltext = "<html><body>This quest has already been completed.</body></html>"
    else :                                                  # The quest itself
      try :
        cond = st.getInt("cond")

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

@@ -73,7 +73,7 @@ class Quest (JQuest) :
  def onTalk (self,npc,player): 
 
    npcId = npc.getNpcId() 
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>" 
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>" 
    st = player.getQuestState(qn) 
    if not st : return htmltext 
 
@@ -89,7 +89,7 @@ class Quest (JQuest) :
         htmltext = "30568-01.htm" 
         st.exitQuest(1) 
    elif npcId == 30568 and st.getInt("cond")==0 and st.getInt("onlyone")==1 : 
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>" 
+      htmltext = "<html><body>This quest has already been completed.</body></html>" 
    elif npcId == 30568 and st.getInt("cond")==1 and (st.getQuestItemsCount(HATOSS_ORDER1_ID) or st.getQuestItemsCount(HATOSS_ORDER2_ID) or st.getQuestItemsCount(HATOSS_ORDER3_ID)) and ((st.getQuestItemsCount(LETTER_TO_ELF_ID)+st.getQuestItemsCount(LETTER_TO_HUMAN_ID)+st.getQuestItemsCount(LETTER_TO_DARKELF_ID))==0) : 
           htmltext = "30568-04.htm" 
    elif npcId == 30568 and st.getInt("cond")==1 and (st.getQuestItemsCount(HATOSS_ORDER1_ID) or st.getQuestItemsCount(HATOSS_ORDER2_ID) or st.getQuestItemsCount(HATOSS_ORDER3_ID)) and ((st.getQuestItemsCount(LETTER_TO_ELF_ID)+st.getQuestItemsCount(LETTER_TO_HUMAN_ID)+st.getQuestItemsCount(LETTER_TO_DARKELF_ID))==1) : 

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

@@ -53,7 +53,7 @@ class Quest (JQuest) :
  def onTalk (self,npc,player): 
 
    npcId = npc.getNpcId() 
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>" 
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>" 
    st = player.getQuestState(qn) 
    if not st : return htmltext 
 
@@ -61,7 +61,7 @@ class Quest (JQuest) :
    if id == State.CREATED : 
      st.set("cond","0") 
    if npcId == 30523 and id == State.COMPLETED : 
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>" 
+      htmltext = "<html><body>This quest has already been completed.</body></html>" 
    elif npcId == 30523 and st.getInt("cond")==0 : 
           if player.getRace().ordinal() != 4 : 
             htmltext = "30523-00.htm" 

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

@@ -39,7 +39,7 @@ class Quest (JQuest) :
 
     def onTalk (self,npc,player):
         npcId = npc.getNpcId()
-        htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+        htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
         st = player.getQuestState(qn)
         if not st: return htmltext
         id = st.getState()

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

@@ -41,7 +41,7 @@ class Quest (JQuest) :
     st = player.getQuestState(qn)
     if not st : return htmltext    
     npcId=npc.getNpcId()
-    htmltext="<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>" 
+    htmltext="<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>" 
     id = st.getState()
     if id == State.CREATED :
       if st.getPlayer().getLevel() >= 75 :
@@ -59,7 +59,7 @@ class Quest (JQuest) :
             htmltext = "2.htm"
     elif id == State.COMPLETED:
       st.exitQuest(0)
-      htmltext = "<html><body>This quest have already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest have already been completed.</body></html>"
     return htmltext    
 
 QUEST=Quest(110,qn,"To The Primeval Isle")

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

@@ -68,7 +68,7 @@ class Quest (JQuest) :
     st = player.getQuestState(qn)
     if not st : return htmltext    
     npcId=npc.getNpcId()
-    htmltext="<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+    htmltext="<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
     id = st.getState()
     if id == State.CREATED and npcId == ABEY :
       if st.getPlayer().getLevel() >= 39 :
@@ -104,7 +104,7 @@ class Quest (JQuest) :
       if npcId == GHOST_F and cond == 10 :
             htmltext = "9.htm" #link to 9a.htm so link to event 10
     elif id == State.COMPLETED:
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
     return htmltext
 
   def onKill(self,npc,player,isPet):

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

@@ -80,7 +80,7 @@ class Quest (JQuest) :
 
  def onTalk (self,npc,player):
    npcId = npc.getNpcId()
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -91,7 +91,7 @@ class Quest (JQuest) :
      st.exitQuest(1)
    elif player.getPledgeType() == -1 :
      if id==State.COMPLETED:
-       htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>" 
+       htmltext = "<html><body>This quest has already been completed.</body></html>" 
      elif player.getLevel() < 19 or not player.getSponsor() :
        htmltext = "30517-00.htm"
        st.exitQuest(1)

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

@@ -45,7 +45,7 @@ class Quest (JQuest) :
 
  def onTalk (self,npc,player):
      npcId = npc.getNpcId()
-     htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+     htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
      st = player.getQuestState(qn)
      if not st : return htmltext
 

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

@@ -25,14 +25,14 @@ class Quest (JQuest) :
     return htmltext
 
   def onTalk(self, npc, player):
-    htmltext="<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+    htmltext="<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
     st = player.getQuestState(qn)
     if not st : return htmltext    
     npcId=npc.getNpcId()
     id = st.getState()
     cond = st.getInt("cond")
     if id == State.COMPLETED:
-       htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+       htmltext = "<html><body>This quest has already been completed.</body></html>"
     elif id == State.CREATED and npcId == NEWYEAR :
       if player.getLevel() >= 46 :
         htmltext = "31961-1.htm"

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

@@ -10,7 +10,7 @@ qn = "122_OminousNews"
 MOIRA = 31979
 KARUDA = 32017
 
-default="<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+default="<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
 
 class Quest (JQuest) :
 

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

@@ -77,7 +77,7 @@ class Quest (JQuest) :
 
  def onTalk (self,npc,player):
    npcId = npc.getNpcId()
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -88,7 +88,7 @@ class Quest (JQuest) :
      st.exitQuest(1)
    elif player.getPledgeType() == -1 :
      if id==State.COMPLETED:
-       htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>" 
+       htmltext = "<html><body>This quest has already been completed.</body></html>" 
      elif player.getLevel() < 19 or not player.getSponsor() :
        htmltext = "31961-00.htm"
        st.exitQuest(1)

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

@@ -58,7 +58,7 @@ class Quest (JQuest) :
 
 
  def onTalk (self,npc,player):
-     htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+     htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
      st = player.getQuestState(qn)
      if not st : return htmltext
      npcId = npc.getNpcId()
@@ -68,7 +68,7 @@ class Quest (JQuest) :
      if id == State.CREATED :
          st.set("cond","0")
      elif id == State.COMPLETED :
-         htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+         htmltext = "<html><body>This quest has already been completed.</body></html>"
      if npcId == MARQUEZ:
          if cond == 0 :
              if player.getLevel() < 75 :

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

@@ -45,7 +45,7 @@ class Quest (JQuest) :
 
  def onTalk (self,npc,player):
      npcId = npc.getNpcId()
-     htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+     htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
      st = player.getQuestState(qn)
      if not st : return htmltext
 

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

@@ -40,7 +40,7 @@ class Quest (JQuest) :
    return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -51,7 +51,7 @@ class Quest (JQuest) :
      st.set("cond","0")
    if npcId == FUNDIN and cond == 0 :
      if id == State.COMPLETED :
-       htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+       htmltext = "<html><body>This quest has already been completed.</body></html>"
      elif player.getLevel() < 74 : 
        htmltext = "31274-1.htm"
        st.exitQuest(1)

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

@@ -39,7 +39,7 @@ class Quest (JQuest) :
    return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
    npcId = npc.getNpcId()
@@ -47,7 +47,7 @@ class Quest (JQuest) :
    cond = st.getInt("cond")
    if npcId == LIESEL and cond == 0 :
      if id == State.COMPLETED :
-       htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+       htmltext = "<html><body>This quest has already been completed.</body></html>"
      elif player.getLevel() < 74 : 
        htmltext = "31263-1.htm"
        st.exitQuest(1)

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

@@ -24,7 +24,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -35,7 +35,7 @@ class Quest (JQuest) :
    med = st.getQuestItemsCount(FEVER_MEDICINE)
    if npcId == 30050 :
       if id == State.COMPLETED :
-        htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+        htmltext = "<html><body>This quest has already been completed.</body></html>"
       elif cond == 0 :
         if player.getLevel() >= 15 :
           htmltext = "30050-02.htm"

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

@@ -37,7 +37,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -49,7 +49,7 @@ class Quest (JQuest) :
    toolbox = st.getQuestItemsCount(TOOL_BOX_ID)
    shards = st.getQuestItemsCount(GOLEM_SHARD_ID)
    if id == State.COMPLETED :
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
    elif npcId == HARRIS :
       if cond == 0 :
          if player.getLevel() >= 10 :

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

@@ -43,7 +43,7 @@ class Quest (JQuest) :
 
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext 
 
@@ -57,7 +57,7 @@ class Quest (JQuest) :
         htmltext = "30041-02.htm"
         st.exitQuest(1)
    elif npcId == 30041 and st.getInt("cond")==0 and st.getInt("onlyone")==1 :
-        htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+        htmltext = "<html><body>This quest has already been completed.</body></html>"
    elif npcId == 30041 and st.getInt("cond")!=0 and (st.getQuestItemsCount(JACKSONS_RECEIPT_ID)!=0 and st.getQuestItemsCount(SILVIAS_RECEIPT_ID)!=0 and st.getQuestItemsCount(RANTS_RECEIPT_ID)!=0)==0 :
         htmltext = "30041-05.htm"
    if id == State.STARTED :     

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

@@ -29,7 +29,7 @@ class Quest (JQuest) :
 
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -43,7 +43,8 @@ class Quest (JQuest) :
         htmltext = "30312-02.htm"
         st.exitQuest(1)
    elif npcId == 30312 and st.getInt("cond")==0 and st.getInt("onlyone")==1 :
-        htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+        htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    if id == State.STARTED:     
        if npcId == 30312 and st.getInt("cond")==1 and (st.getQuestItemsCount(FOX_FUR_YARN_ID)==0 and st.getQuestItemsCount(MAIDEN_DOLL_ID)==0) and st.getQuestItemsCount(FOX_FUR_ID)<10 :
             htmltext = "30312-05.htm"

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

@@ -27,14 +27,15 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
    npcId = npc.getNpcId()
    id = st.getState()
    if id == State.COMPLETED:
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>" 
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+ 
    elif npcId == 30042 :
       if not st.getInt("cond") :
          if player.getLevel() >= 3 :

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

@@ -44,14 +44,15 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
    npcId = npc.getNpcId()
    id = st.getState()
    if id == State.COMPLETED :
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif npcId == 30368 :
       if not st.getInt("cond") :
          htmltext = "30368-04.htm"

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

@@ -28,14 +28,15 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
    id = st.getState()
    cond = st.getInt("cond")
    if id == State.COMPLETED :
-     htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+     htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif cond == 0 :
      if player.getLevel() >= 5 :
         htmltext = "30005-03.htm"

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

@@ -27,7 +27,7 @@ class Quest (JQuest) :
 
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -41,7 +41,8 @@ class Quest (JQuest) :
         htmltext = "30031-02.htm"
         st.exitQuest(1)
    elif npcId == 30031 and st.getInt("cond")==0 and st.getInt("onlyone")==1 :
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif npcId == 30031 and st.getInt("cond")!=0 and st.getQuestItemsCount(CLAY_TABLET_ID)==0 :
         htmltext = "30031-05.htm"
    elif npcId == 30031 and st.getInt("cond")!=0 and st.getQuestItemsCount(CLAY_TABLET_ID)!=0 and st.getInt("onlyone")==0 :

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

@@ -32,7 +32,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -41,7 +41,8 @@ class Quest (JQuest) :
    cond = st.getInt("cond")
    count = st.getQuestItemsCount(PLAGUE_DUST)
    if id == State.COMPLETED :
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif cond == 0 :
       if player.getRace().ordinal() != 1 :
          htmltext = "30154-00.htm"

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

@@ -34,7 +34,7 @@ class Quest (JQuest) :
    return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -48,7 +48,7 @@ class Quest (JQuest) :
        htmltext = "31302-0.htm"
        return htmltext
      if id == State.COMPLETED :
-       htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+       htmltext = "<html><body>This quest has already been completed.</body></html>"
        return htmltext
      else:
        htmltext = "31302-0a.htm"

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

@@ -30,7 +30,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -46,7 +46,8 @@ class Quest (JQuest) :
        htmltext = "30370-02.htm"
        st.exitQuest(1)
    elif id == State.COMPLETED :
-     htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+     htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif id == State.STARTED :
      try :
        cond = st.getInt("cond")

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

@@ -27,7 +27,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -43,7 +43,8 @@ class Quest (JQuest) :
        htmltext = "30362-02.htm"
        st.exitQuest(1)
    elif id == State.COMPLETED :
-     htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+     htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif id == State.STARTED :
      try :
        cond = st.getInt("cond")

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

@@ -25,7 +25,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -34,7 +34,8 @@ class Quest (JQuest) :
    if id == State.CREATED :
      st.set("cond","0")
    if id == State.COMPLETED :
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif st.getInt("cond") == 0 :
       if player.getRace().ordinal() == 2 :
          htmltext = "30147-00.htm"

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

@@ -30,7 +30,7 @@ class Quest (JQuest) :
 
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -46,7 +46,8 @@ class Quest (JQuest) :
        htmltext = "30220-02.htm"
        st.exitQuest(1)
    elif npcId == 30220 and st.getInt("cond")==0 and st.getInt("onlyone")==1 :
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif npcId == 30220 and st.getInt("cond") :
       if st.getQuestItemsCount(RUMIELS_POEM_1_ID) == 1 and st.getQuestItemsCount(RUMIELS_POEM_3_ID) == 1 and st.getQuestItemsCount(RUMIELS_POEM_4_ID) == 1 and st.getQuestItemsCount(RUMIELS_POEM_5_ID) == 1 and st.getInt("onlyone") == 0 :
         if st.getInt("id") != 163 :

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

@@ -27,7 +27,7 @@ class Quest (JQuest) :
 
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -43,7 +43,8 @@ class Quest (JQuest) :
        htmltext = "30149-02.htm"
        st.exitQuest(1)
    elif npcId == 30149 and st.getInt("cond")==0 and st.getInt("onlyone")==1 :
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif npcId == 30149 and st.getInt("cond") :
       if st.getQuestItemsCount(KIRUNAK_SKULL_ID)<1 :
         htmltext = "30149-05.htm"

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

@@ -28,7 +28,7 @@ class Quest (JQuest) :
 
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -44,7 +44,8 @@ class Quest (JQuest) :
        htmltext = "30348-01.htm"
        st.exitQuest(1)
    elif npcId == 30348 and st.getInt("cond")==0 and st.getInt("onlyone")==1 :
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif npcId == 30348 and st.getInt("cond")==1 :
       if st.getQuestItemsCount(DARK_BEZOAR_ID)<13 :
         htmltext = "30348-04.htm"

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

@@ -29,7 +29,7 @@ class Quest (JQuest) :
 
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -48,7 +48,8 @@ class Quest (JQuest) :
         htmltext = "30130-02.htm"
         st.exitQuest(1)
    elif id == State.COMPLETED :
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif npcId == 30130 :
       if st.getInt("cond") and st.getQuestItemsCount(UNDRES_LETTER_ID):
          if (st.getQuestItemsCount(GARMIELS_SCRIPTURE_ID)+st.getQuestItemsCount(DREVIANT_WINE_ID)+st.getQuestItemsCount(CEREMONIAL_DAGGER_ID)==0) :

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

@@ -49,7 +49,7 @@ class Quest (JQuest) :
 
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -59,7 +59,8 @@ class Quest (JQuest) :
    id = st.getState()
    cond = st.getInt("cond")
    if id == State.COMPLETED :
-     htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+     htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif npcId == COLLETTE :
      if cond == 0 :
        if player.getLevel() >= 15 :

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

@@ -31,7 +31,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -47,7 +47,8 @@ class Quest (JQuest) :
        htmltext = "30349-01.htm"
        st.exitQuest(1)
    elif npcId == 30349 and st.getInt("cond")==0 and st.getInt("onlyone")==1 :
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif npcId == 30349 and st.getInt("cond")==1 and st.getQuestItemsCount(JENNIES_LETTER_ID) :
         htmltext = "30349-04.htm"
    elif npcId == 30349 and st.getInt("cond")==1 and st.getQuestItemsCount(SENTRY_BLADE1_ID)==1 and st.getQuestItemsCount(SENTRY_BLADE2_ID)==1 and st.getQuestItemsCount(SENTRY_BLADE3_ID)==1 :

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

@@ -40,7 +40,7 @@ class Quest (JQuest) :
 
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -56,7 +56,8 @@ class Quest (JQuest) :
        htmltext = "30145-02.htm"
        st.exitQuest(1)
    elif npcId == 30145 and st.getInt("cond")==0 and st.getInt("onlyone")==1 :
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif npcId == 30145 and st.getInt("cond") :
       if st.getQuestItemsCount(CRACKED_SKULL_ID) >= 1 and st.getQuestItemsCount(PERFECT_SKULL_ID) == 0 :
         htmltext = "30145-06.htm"

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

@@ -59,7 +59,7 @@ class Quest (JQuest) :
    return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -72,7 +72,8 @@ class Quest (JQuest) :
      if player.getLevel() >= 62 :
        htmltext = "31517-0.htm"
      if id == State.COMPLETED :
-       htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+       htmltext = "<html><body>This quest has already been completed.</body></html>"
+
      else:
        return htmltext
        st.exitQuest(1)

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

@@ -25,7 +25,7 @@ class Quest (JQuest) :
 
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -33,7 +33,8 @@ class Quest (JQuest) :
    id = st.getState()
    cond=st.getInt("cond")
    if id == State.COMPLETED :
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif cond == 0 :
       if player.getRace().ordinal() != 2 :
          htmltext = "30305-00.htm"

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

@@ -57,7 +57,7 @@ class Quest (JQuest) :
      return htmltext
 
  def onTalk (self,npc,player):
-     htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+     htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
      st = player.getQuestState(qn)
      if not st : return htmltext
 

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

@@ -60,7 +60,7 @@ class Quest (JQuest) :
    return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
    npcId = npc.getNpcId()
@@ -68,7 +68,8 @@ class Quest (JQuest) :
    blood = st.getQuestItemsCount(BLOOD_OF_SAINT)
    id = st.getState()
    if id == State.COMPLETED :
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif npcId == HIERARCH :
      if cond == 0 :
         htmltext = "31517-00.htm"

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

@@ -43,13 +43,14 @@ class Quest (JQuest) :
 
  def onTalk (self,npc,player):
      npcId = npc.getNpcId()
-     htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+     htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
      st = player.getQuestState(qn)
      if not st : return htmltext
      id = st.getState()
      cond = st.getInt("cond")
      if id == State.COMPLETED :
-       htmltext = htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+       htmltext = htmltext = "<html><body>This quest has already been completed.</body></html>"
+
      elif id == State.CREATED and npcId == DONAL :
        htmltext = "31314-01.htm"
      elif id == State.STARTED :

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

@@ -35,7 +35,7 @@ class Quest (JQuest) :
    return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -45,7 +45,8 @@ class Quest (JQuest) :
    if npcId == VLADIMIR :
      if cond == 0 :
        if id == State.COMPLETED :
-         htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+         htmltext = "<html><body>This quest has already been completed.</body></html>"
+
        elif player.getLevel() >= 63 :
          htmltext = "31302-0.htm"
        else:

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

@@ -39,7 +39,7 @@ class Quest (JQuest) :
 
  def onTalk (self,npc,player):
    st = player.getQuestState(qn)
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>" 
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>" 
    if not st: return htmltext
 
    npcId = npc.getNpcId()
@@ -63,7 +63,7 @@ class Quest (JQuest) :
        htmltext = "<html><body>Quest for characters level 2 and above.</body></html>" 
        st.exitQuest(1) 
    elif npcId == DARIN and cond == 0 and onlyone == 1 : 
-     htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+     htmltext = "<html><body>This quest has already been completed.</body></html>"
    elif id == State.STARTED :
        if npcId == ROXXY and cond and onlyone == 0: 
          if ItemsCount_RK == 0 and ItemsCount_DL : 

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

@@ -35,7 +35,7 @@ class Quest (JQuest) :
 
  def onTalk (self,npc,player):
    st = player.getQuestState(qn)
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>" 
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>" 
    if not st: return htmltext
    npcId = npc.getNpcId()
    id = st.getState()
@@ -43,7 +43,8 @@ class Quest (JQuest) :
    onlyone = st.getInt("onlyone")
    GEM_COUNT = st.getQuestItemsCount(GEM)
    if id == State.COMPLETED :
-       htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+       htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif id == State.CREATED and onlyone == 0 : 
      if player.getLevel() >= 65 :
          htmltext = "31537-01.htm" 

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

@@ -94,7 +94,7 @@ class Quest (JQuest) :
 
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
    npcId = npc.getNpcId()
@@ -113,7 +113,8 @@ class Quest (JQuest) :
            htmltext = "30644-02.htm"
            st.exitQuest(1)
    elif npcId == 30644 and id == State.COMPLETED :
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif npcId == 30644 and cond == 1 :
       htmltext = "30644-06.htm"
    elif npcId == 30644 and cond == 2 and st.getQuestItemsCount(SCROLL_OF_SHYSLASSY) == 1 :

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

@@ -52,7 +52,7 @@ class Quest (JQuest) :
 
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
    cond=st.getInt("cond")
@@ -74,7 +74,8 @@ class Quest (JQuest) :
          htmltext = "30109-02.htm"
          st.exitQuest(1)
    elif npcId == 30109 and cond == 0 and st.getInt("onlyone")==1 :
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif npcId == 30109 and cond == 18  and st.getQuestItemsCount(LETTER_OF_DUSTIN):
       st.addExpAndSp(79832,3750)
       st.giveItems(7562,8)

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

@@ -107,7 +107,7 @@ class Quest (JQuest) :
 
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
    cond = st.getInt("cond")
@@ -116,7 +116,8 @@ class Quest (JQuest) :
    if npcId != 30106 and id != State.STARTED : return htmltext
 
    if id == State.COMPLETED :
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif id == State.CREATED :
      st.set("cond","0")
      st.set("id","0")

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

@@ -232,7 +232,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
    cond = st.getInt("cond")
@@ -252,7 +252,8 @@ class Quest (JQuest) :
            htmltext = "30461-01.htm"
            st.exitQuest(1)
      else:
-        htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+        htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif npcId == 30461 and cond == 1 :
         htmltext = "30461-05.htm"
    elif npcId == 30461 and cond == 14 :

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

@@ -85,7 +85,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -105,7 +105,8 @@ class Quest (JQuest) :
           htmltext = "30648-02.htm"
           st.exitQuest(1)
    elif npcId == 30648 and cond==0 and id == State.COMPLETED :
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif npcId == 30648 and cond==1 and st.getQuestItemsCount(VOUCHER_OF_TRIAL) :
       htmltext = "30648-09.htm"
    elif npcId == 30648 and cond==17 and st.getQuestItemsCount(BOOK_OF_SAGE) :

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

@@ -129,7 +129,7 @@ class Quest (JQuest) :
 
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -148,7 +148,8 @@ class Quest (JQuest) :
             htmltext = "30103-01.htm"
             st.exitQuest(1)
    elif npcId == 30103 and st.getInt("cond")==0 and st.getInt("onlyone")==1 :
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif npcId == 30103 and st.getInt("cond")>=1 and st.getQuestItemsCount(VALKONS_RECOMMEND_ID)==1 :
         htmltext = "30103-07.htm"
    elif npcId == 30103 and st.getInt("cond")>=1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID)==1 :

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

@@ -93,7 +93,7 @@ class Quest (JQuest) :
 
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -116,7 +116,8 @@ class Quest (JQuest) :
          st.exitQuest(1)
    elif id == State.COMPLETED :                                  # Check if the quest is already made
       if npcId == 30191 :
-        htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+        htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    else :                                                  # The quest it self
      try :
        cond = st.getInt("cond")

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

@@ -132,7 +132,7 @@ class Quest (JQuest) :
 
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -152,7 +152,8 @@ class Quest (JQuest) :
           st.set("cond","1")
           return htmltext
    elif npcId == 30460 and st.getInt("cond")==0 and st.getInt("onlyone")==1 :
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif npcId == 30460 and st.getInt("cond")==1 and st.getQuestItemsCount(CARDIENS_LETTER_ID)==1 :
         htmltext = "30460-05.htm"
    elif npcId == 30460 and st.getInt("cond")==1 and st.getQuestItemsCount(MOONFLOWER_CHARM_ID)==1 :

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

@@ -98,7 +98,7 @@ class Quest (JQuest) :
 
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -116,7 +116,8 @@ class Quest (JQuest) :
        htmltext = "30476-01.htm"
        st.exitQuest(1)
    elif npcId == 30476 and st.getInt("cond")==0 and st.getInt("onlyone")==1 :
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif npcId == 30476 and st.getInt("cond")==1 and st.getQuestItemsCount(KAIRAS_LETTER1_ID) :
       htmltext = "30476-06.htm"
    elif npcId == 30476 and st.getInt("cond")==1 and (st.getQuestItemsCount(METHEUS_FUNERAL_JAR_ID) or st.getQuestItemsCount(KASANDRAS_REMAINS_ID)) :

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

@@ -95,7 +95,7 @@ class Quest (JQuest) :
         return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
    npcId = npc.getNpcId()

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

@@ -188,7 +188,7 @@ class Quest (JQuest) :
 
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -211,7 +211,8 @@ class Quest (JQuest) :
          st.exitQuest(1)
    elif id == State.COMPLETED :                                   # Check if the quest is already made
       if npcId == 30514 :
-        htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+        htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    else :                                                   # The quest it self
      try :
        cond = st.getInt("cond")

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

@@ -156,7 +156,7 @@ class Quest (JQuest) :
 
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -175,7 +175,8 @@ class Quest (JQuest) :
           else:
             htmltext = "30104-03.htm"
    elif npcId == 30104 and st.getInt("cond")==0 and st.getInt("onlyone")==1 :
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif npcId == 30104 and st.getInt("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(LILITH_ELVEN_WAFER_ID) :
           htmltext = "30104-06.htm"

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

@@ -83,7 +83,7 @@ class Quest (JQuest) :
 
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -93,7 +93,8 @@ class Quest (JQuest) :
      st.set("step","0")
      st.set("cond","0")
    if id == State.COMPLETED :
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif st.getInt("step")==0 :
       if player.getClassId().getId() in [0x01,0x2f,0x13,0x20] :
          if player.getLevel() >= 39 :

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

@@ -109,14 +109,15 @@ class Quest (JQuest) :
 
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
    npcId = npc.getNpcId()
    id = st.getState()
    if npcId != 30624 and id != State.STARTED : return htmltext
    if id == State.COMPLETED :
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif id == State.CREATED :
      st.set("cond","0")
    if npcId == 30624 and st.getInt("cond") == 0 :

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

@@ -124,7 +124,7 @@ class Quest (JQuest) :
 
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -149,7 +149,8 @@ class Quest (JQuest) :
           htmltext = "30702-02.htm"
           st.exitQuest(1)
    elif id == State.COMPLETED :
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif npcId == 30702 and step==1 and st.getQuestItemsCount(BERNARDS_INTRODUCTION) :
       htmltext = "30702-05.htm"
    elif npcId == 30626 and step==1 and st.getQuestItemsCount(BERNARDS_INTRODUCTION) :

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

@@ -81,7 +81,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
    cond = st.getInt("cond")
@@ -90,7 +90,8 @@ class Quest (JQuest) :
    if npcId != 30690 and id != State.STARTED : return htmltext
 
    if id == State.COMPLETED :
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif id == State.CREATED :
      st.set("cond","0")
      if npcId == NPC[3]:

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

@@ -108,7 +108,7 @@ class Quest (JQuest) :
 
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -126,7 +126,8 @@ class Quest (JQuest) :
           htmltext = "30473-02.htm"
           st.exitQuest(1)
      elif st.getInt("cond")==0 and st.getInt("onlyone")==1 :
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+
      elif npcId == 30473 and st.getInt("cond")<10 and st.getInt("cond")>0 :
       htmltext = "30473-05.htm"
      elif st.getInt("cond")==15 and st.getQuestItemsCount(GOLDEN_STATUE)==0 :

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

@@ -77,7 +77,7 @@ class Quest (JQuest) :
 
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -96,7 +96,8 @@ class Quest (JQuest) :
          htmltext = "30118-02.htm"
          st.exitQuest(1)
    elif npcId == 30118 and st.getInt("cond")==0 and st.getInt("onlyone")==1 :
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif npcId == 30118 and st.getInt("cond")==3 and st.getQuestItemsCount(HUGE_NAIL)>=1:
         htmltext = "30118-05.htm"
    elif npcId == 30118 and st.getInt("cond")>=4 :

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

@@ -107,7 +107,7 @@ class Quest (JQuest) :
 
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -126,7 +126,8 @@ class Quest (JQuest) :
             htmltext = "30629-01.htm"
             st.exitQuest(1)
      elif st.getInt("cond")==0 and st.getInt("onlyone")==1 :
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+
      elif st.getInt("cond")==1:
         htmltext = "30629-05.htm"
      elif st.getInt("cond")==2:

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

@@ -185,7 +185,7 @@ class Quest (JQuest) :
 
 
   def onTalk (self,npc,player):
-    htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+    htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
     
     st = player.getQuestState(qn)
     if not st : return htmltext
@@ -213,7 +213,8 @@ class Quest (JQuest) :
       return htmltext
     # already done
     elif id == State.COMPLETED:
-      return "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      return "<html><body>This quest has already been completed.</body></html>"
+
     # in progress, player is working on the quest
     else:
       step = st.getInt("step")        # var init for easier working with it

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

@@ -155,7 +155,7 @@ class Quest (JQuest) :
 
  def onTalk (self,npc,player):
    st = player.getQuestState(qn)
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>" 
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>" 
    if not st: return htmltext
    npcId = npc.getNpcId()
    state = st.getState()
@@ -164,7 +164,8 @@ class Quest (JQuest) :
    cond = st.getInt("cond") 
    onlyone = st.getInt("onlyone")
    if state == State.COMPLETED :
-       htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+       htmltext = "<html><body>This quest has already been completed.</body></html>"
+
    elif npcId == INNOCENTIN :
        if state == State.CREATED :
            st2 = player.getQuestState("21_HiddenTruth")

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

@@ -190,7 +190,7 @@ class Quest (JQuest) :
       return htmltext
 
    def onTalk (self,npc,player):
-      htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+      htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
       st = player.getQuestState(qn)
       if not st : return htmltext
 
@@ -198,7 +198,7 @@ class Quest (JQuest) :
       id = st.getState()
       if npcId != NPC[1] and id != State.STARTED : return htmltext
       
-      htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>" 
+      htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>" 
       id = st.getState()
       npcId = npc.getNpcId()
       Lara, Galatea, Almors, Camoniell, Belthus, Basilla, Celestiel, Brynthea = NPC
@@ -215,7 +215,8 @@ class Quest (JQuest) :
             htmltext = "30634-01.htm"
             st.exitQuest(1)
       elif id == State.COMPLETED:                     # quest already done, not repeatable
-         htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+         htmltext = "<html><body>This quest has already been completed.</body></html>"
+
       elif id == State.STARTED:
          step = st.getInt("step")             # stats as short vars if the player has state <Started>
          LaraPart = st.getInt("Lara_Part")

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

@@ -91,7 +91,7 @@ class Quest (JQuest) :
 
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -102,7 +102,8 @@ class Quest (JQuest) :
    progress = st.getInt("progress")
    if npcId == 30531:
      if id == State.COMPLETED :
-       htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+       htmltext = "<html><body>This quest has already been completed.</body></html>"
+
      elif progress==0 :
         if player.getClassId().getId() == 0x38 and player.getLevel() > 38 :
           htmltext = "30531-03.htm"

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

@@ -151,7 +151,7 @@ class Quest (JQuest) :
     return htmltext
     
   def onTalk (self,npc,player):
-    htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+    htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
     st = player.getQuestState(qn)
     if not st : return htmltext
 
@@ -178,7 +178,8 @@ class Quest (JQuest) :
               else:
                 htmltext = "30565-04.htm"
     elif id == State.COMPLETED:
-      htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      htmltext = "<html><body>This quest has already been completed.</body></html>"
+
     else:
       if st.getInt("phase") == 1:
         atuba=st.getInt("atubaStat")

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

@@ -143,7 +143,7 @@ class Quest (JQuest) :
 
 
   def onTalk (self,npc,player):
-    htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+    htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
     st = player.getQuestState(qn)
     if not st : return htmltext
 
@@ -169,7 +169,8 @@ class Quest (JQuest) :
       return htmltext
     # if quest is already State.COMPLETED
     elif id == State.COMPLETED:
-      return "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      return "<html><body>This quest has already been completed.</body></html>"
+
     # if quest is accepted and in progress
     elif id == State.STARTED and st.get("progress") == "PART1":
         step=st.getInt("step")

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

@@ -132,7 +132,7 @@ class Quest (JQuest) :
     return htmltext
 
   def onTalk (self,npc,player):
-    htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+    htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
     st = player.getQuestState(qn)
     if not st : return htmltext
 
@@ -149,7 +149,8 @@ class Quest (JQuest) :
       return htmltext
     # if quest is already State.COMPLETED
     elif id == State.COMPLETED:
-      return "<html><body>This quest has already been State.COMPLETED.</body></html>"
+      return "<html><body>This quest has already been completed.</body></html>"
+
     # if quest is accepted and in progress
     elif id == State.STARTED:
       cond =st.getInt("cond")

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

@@ -47,7 +47,7 @@ class Quest (JQuest) :
     return htmltext
  
  def onTalk (self,npc,player):
-    htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+    htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
     st = player.getQuestState(qn)
     if not st : return htmltext
 

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

@@ -141,7 +141,7 @@ class Quest (JQuest) :
    return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
    npcId = npc.getNpcId()
@@ -153,7 +153,8 @@ class Quest (JQuest) :
      if npcId == TALIEN :
        if cond == 0 :
          if id == State.COMPLETED :
-           htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+           htmltext = "<html><body>This quest has already been completed.</body></html>"
+
          elif player.getLevel() < 50 : 
            htmltext = "31739-2.htm"
            st.exitQuest(1)

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

@@ -84,7 +84,7 @@ class Quest (JQuest) :
    return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -101,7 +101,8 @@ class Quest (JQuest) :
    if player.isSubClassActive() :
      if npcId == VIRGIL and cond == 0 and st.getQuestItemsCount(VIRGILS_LETTER) == 1 :
        if id == State.COMPLETED :
-         htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+         htmltext = "<html><body>This quest has already been completed.</body></html>"
+
        elif player.getLevel() < 60 : 
          htmltext = "31742-2.htm"
          st.exitQuest(1)

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

@@ -70,7 +70,7 @@ class Quest (JQuest) :
    return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -82,7 +82,8 @@ class Quest (JQuest) :
    if player.isSubClassActive() :
      if npcId == CARADINE and cond == 0 and st.getQuestItemsCount(CARADINE_LETTER) == 1 :
        if id == State.COMPLETED :
-         htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+         htmltext = "<html><body>This quest has already been completed.</body></html>"
+
        elif player.getLevel() < 65 : 
          htmltext = "31740-2.htm"
          st.exitQuest(1)

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

@@ -57,7 +57,7 @@ class Quest (JQuest) :
    return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 
@@ -72,7 +72,8 @@ class Quest (JQuest) :
      if npcId == CARADINE and st.getQuestItemsCount(CARADINE_LETTER_LAST) == 1 :
        if cond in [0,1] :
          if id == State.COMPLETED :
-           htmltext = "<html><body>This quest has already been State.COMPLETED.</body></html>"
+           htmltext = "<html><body>This quest has already been completed.</body></html>"
+
          elif player.getLevel() < 75 : 
            htmltext = "31740-2.htm"
            st.exitQuest(1)

+ 1 - 1
datapack_development/data/scripts/quests/257_GuardIsBusy1/__init__.py

@@ -32,7 +32,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 

+ 1 - 1
datapack_development/data/scripts/quests/258_BringWolfPelt1/__init__.py

@@ -25,7 +25,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 

+ 1 - 1
datapack_development/data/scripts/quests/259_RanchersPlea/__init__.py

@@ -45,7 +45,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 

+ 1 - 1
datapack_development/data/scripts/quests/260_HuntForOrcs1/__init__.py

@@ -28,7 +28,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 

+ 1 - 1
datapack_development/data/scripts/quests/261_DreamOfMoneylender1/__init__.py

@@ -24,7 +24,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 

+ 1 - 1
datapack_development/data/scripts/quests/262_BringMeMushrooms1/__init__.py

@@ -24,7 +24,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 

+ 1 - 1
datapack_development/data/scripts/quests/263_KillAllSylphs1/__init__.py

@@ -28,7 +28,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 

+ 1 - 1
datapack_development/data/scripts/quests/264_KeenClaws/__init__.py

@@ -25,7 +25,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 

+ 1 - 1
datapack_development/data/scripts/quests/265_ChainsOfSlavery/__init__.py

@@ -27,7 +27,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 

+ 1 - 1
datapack_development/data/scripts/quests/266_PleaOfPixies/__init__.py

@@ -31,7 +31,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 

+ 1 - 1
datapack_development/data/scripts/quests/267_WrathOfVerdure/__init__.py

@@ -27,7 +27,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 

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

@@ -28,7 +28,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 

+ 1 - 1
datapack_development/data/scripts/quests/272_WrathOfAncestors/__init__.py

@@ -24,7 +24,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 

+ 1 - 1
datapack_development/data/scripts/quests/273_InvadersOfHolyland/__init__.py

@@ -28,7 +28,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 

+ 1 - 1
datapack_development/data/scripts/quests/274_AgainstWolfMen/__init__.py

@@ -28,7 +28,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 

+ 1 - 1
datapack_development/data/scripts/quests/275_BlackWingedSpies/__init__.py

@@ -26,7 +26,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 

+ 1 - 1
datapack_development/data/scripts/quests/276_HestuiTotem/__init__.py

@@ -27,7 +27,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 

+ 1 - 1
datapack_development/data/scripts/quests/277_GatekeepersOffering/__init__.py

@@ -29,7 +29,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onTalk (self,npc,player):
-   htmltext = "<html><body>You are either not carrying out your quest or don't meet the criteria.</body></html>"
+   htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
    st = player.getQuestState(qn)
    if not st : return htmltext
 

Some files were not shown because too many files changed in this diff