Просмотр исходного кода

JYTHON: Handful of random fixes. Fixes #1725 and #1726. Thanks for reporting.

Emperorc 17 лет назад
Родитель
Сommit
85e4825b19

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

@@ -28,7 +28,7 @@ class Quest (JQuest) :
 
  def __init__(self,id,name,descr):
      JQuest.__init__(self,id,name,descr)
-     self.questItemIds = range(2633, 2647)+[3027]
+     self.questItemIds = range(2634, 2647)+[3027]
 
  def onEvent (self,event,st) :
     htmltext = event

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

@@ -34,7 +34,7 @@ class Quest (JQuest) :
 
  def __init__(self,id,name,descr):
      JQuest.__init__(self,id,name,descr)
-     self.questItemIds = range(2647,2674)
+     self.questItemIds = range(2647,2673)
 
  def onEvent (self,event,st) :
     htmltext = event

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

@@ -31,7 +31,7 @@ class Quest (JQuest) :
 
  def __init__(self,id,name,descr):
      JQuest.__init__(self,id,name,descr)
-     self.questItemIds = range (2713,2721)
+     self.questItemIds = range (2714,2721)
 
  def onEvent (self,event,st) :
     htmltext = event

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

@@ -30,7 +30,7 @@ class Quest (JQuest) :
 
  def __init__(self,id,name,descr):
      JQuest.__init__(self,id,name,descr)
-     self.questItemIds = range(2721,2734)
+     self.questItemIds = range(2722,2734)
 
  def onEvent (self,event,st) :
     htmltext = event

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

@@ -32,8 +32,6 @@ class Quest (JQuest) :
             st.setState(State.STARTED)
             st.playSound("ItemSound.quest_accept") 
             st.set("cond","1")
-        elif event == "timer" :
-            htmltext = "31328-05.htm"
         elif event == "31328-05.htm":
             st.set("cond","0")
             st.set("onlyone","1")
@@ -45,11 +43,7 @@ class Quest (JQuest) :
             if st.getQuestItemsCount(7141) == 0 :
                 st.giveItems(7141,1)
             st.playSound("ItemSound.quest_finish")
-            st.startQuestTimer("timer",1)
-            htmltext = "Congratulations! You are State.COMPLETED this quest!"     + \
-                       " \n The Quest \"Tragedy In Von Hellmann Forest\""   + \
-                       " become available.\n Show Cross of Einhasad to High"+ \
-                       " Priest Tifaren."
+            htmltext = "31328-05.htm"
         elif event == "31523-03.htm" :
             st.playSound("SkillSound5.horror_02")
             st.playSound("ItemSound.quest_middle")
@@ -73,9 +67,8 @@ class Quest (JQuest) :
             st.playSound("ItemSound.quest_middle")
         elif event == "despawn" :
             npc.deleteMe()
-            htmltext = None
+            return
         elif event.isdigit() :
-            htmltext = None
             loc = int(event)
             x,y,z,heading=ROUTES[loc]
             if event == "1" :
@@ -92,6 +85,7 @@ class Quest (JQuest) :
                 self.startQuestTimer("5",5000,npc,player)
             elif event == "5" :
                 npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, L2CharPosition(x,y,z,heading))
+            return
         return htmltext
 
  def onTalk (self,npc,player):
@@ -114,7 +108,7 @@ class Quest (JQuest) :
            htmltext = "31522-03.htm"
            st.exitQuest(1)
        else:
-         htmltext = "This quest have already been State.COMPLETED."
+         htmltext = "This quest has already been completed."
      elif cond == 1:
        htmltext = "31522-05.htm"       
    elif npcId == 31523 :

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

@@ -39,7 +39,9 @@ DROPLIST={
 
 class Quest (JQuest) :
 
- def __init__(self,id,name,descr): JQuest.__init__(self,id,name,descr)
+ def __init__(self,id,name,descr):
+ 	JQuest.__init__(self,id,name,descr)
+ 	self.questItemIds = range(2763,2784)
 
  def onEvent (self,event,st) :
     htmltext = event

+ 3 - 3
datapack_development/data/scripts/quests/419_GetAPet/419_q14.htm

@@ -2,8 +2,8 @@
 The pet shall disappear forever if you can't resurrect it within a certain amount of time. 
 What is the maximum amount of time to resurrect a pet?<br>
 <a action="bypass -h Quest 419_GetAPet wrong">1 minute</a><br>
-<a action="bypass -h Quest 419_GetAPet wrong">2 minutes</a><br>
-<a action="bypass -h Quest 419_GetAPet right">3 minutes</a><br>
-<a action="bypass -h Quest 419_GetAPet wrong">4 minutes</a><br>
+<a action="bypass -h Quest 419_GetAPet wrong">5 minutes</a><br>
+<a action="bypass -h Quest 419_GetAPet right">20 minutes</a><br>
+<a action="bypass -h Quest 419_GetAPet wrong">60 minutes</a><br>
 <a action="bypass -h Quest 419_GetAPet wrong">No answer</a><br>
 </body></html>

+ 1 - 0
datapack_development/data/scripts/quests/609_MagicalPowerOfWaterPart1/__init__.py

@@ -77,6 +77,7 @@ class Quest (JQuest) :
         AutoChat(npc,"I'll be waiting for your return")
         npc.reduceCurrentHp(9999999,npc)
         st.set("spawned","0")
+        return
    return htmltext
 
  def onTalk (self, npc, player):

+ 1 - 0
datapack_development/data/scripts/quests/610_MagicalPowerOfWaterPart2/__init__.py

@@ -100,6 +100,7 @@ class Quest (JQuest) :
        FindTemplate(Alter).setBusy(False)
        st.exitQuest(1)
        AutoChat(npc,"May the gods forever condemn you! Udan Mardui, your power weakens!") #this is only a temp message until we find out what it actually is! string = 61051
+       return
    return htmltext
 
  def onTalk (self, npc, player):

+ 1 - 0
datapack_development/data/scripts/quests/615_MagicalPowerOfFirePart1/__init__.py

@@ -77,6 +77,7 @@ class Quest (JQuest) :
         AutoChat(npc,"I'll be waiting for your return")
         npc.reduceCurrentHp(9999999,npc)
         st.set("spawned","0")
+        return
    return htmltext
 
  def onTalk (self, npc, player):

+ 1 - 0
datapack_development/data/scripts/quests/616_MagicalPowerOfFirePart2/__init__.py

@@ -100,6 +100,7 @@ class Quest (JQuest) :
        FindTemplate(Alter).setBusy(False)
        st.exitQuest(1)
        AutoChat(npc,"May the gods forever condemn you! Udan Mardui, your power weakens!") #this is only a temp message until we find out what it actually is! string = 61051
+       return
    return htmltext
 
  def onTalk (self, npc, player):