Kerberos 17 жил өмнө
parent
commit
39127817fa

+ 5 - 4
datapack_development/data/scripts/quests/112_WalkOfFate/30572-01.htm

@@ -1,4 +1,5 @@
-<html><body>Seer Livina:<br>
-I would ask you to meet Karuda! And tell him to send a Progress Report.<br>
-He is located at the Crypts of Disgrace, in the schuttgart area.<br>
-</body></html>
+<HTML><BODY> Seer Livina: <br>
+Come in! I've been waiting for you. <br>
+I knew you were coming! It's the will of Pa'agrio. You won't feel it, but I can feel a very positive energy from far beyond the eastern horizon!  Could you check out what's going on over there?  I know I'm being vague like most psychics are, but please trust me. <br>
+<a action="bypass -h quest_accept?quest_id=112">"I'll do it."</a>
+</BODY></HTML>

+ 3 - 0
datapack_development/data/scripts/quests/112_WalkOfFate/30572-02.htm

@@ -0,0 +1,3 @@
+<HTML><BODY>Seer Livina:<br>
+Alas, fate isn't to be trifled with! To the east of here, there's a passage from the Cave of Trials to the Valley of the Lords. Take that passage towards the <font color="LEVEL">Crypts of Disgrace</font> where the Orcs are buried. You'll meet someone named <font color="LEVEL">Karuda</font>. Tell him to come to me and give me a status report!
+</BODY></HTML>

+ 3 - 0
datapack_development/data/scripts/quests/112_WalkOfFate/30572-03.htm

@@ -0,0 +1,3 @@
+<HTML><BODY>Seer Livina:<br>
+You haven't left yet? You will soon go there as dictated by your fate. Go to the <font color="LEVEL">Crypts of Disgrace</font> and meet <font color="LEVEL">Karuda</font>.
+</BODY></HTML>

+ 12 - 11
datapack_development/data/scripts/quests/112_WalkOfFate/__init__.py

@@ -29,6 +29,10 @@ class Quest (JQuest) :
         st.giveItems(EnchantD,1)
         st.exitQuest(False)
         st.playSound("ItemSound.quest_finish")
+    elif event == "30572-02.htm"
+        st.playSound("ItemSound.quest_accept")
+        st.setState(State.STARTED)
+        st.set("cond","1")
     return htmltext
 
  def onTalk (self,npc,player):        
@@ -41,19 +45,16 @@ class Quest (JQuest) :
     if state == State.COMPLETED :
         htmltext = "<html><body>This quest has already been completed.</body></html>"
     elif state == State.CREATED :
-        if player.getLevel() >= 20 and player.getLevel() <= 36 and npcId == Livina :
-            htmltext = "30572-01.htm" # quest start
-            st.playSound("ItemSound.quest_accept")
-            st.setState(State.STARTED)
-            st.set("cond","1")
-        else:
-            htmltext = "30572-00.htm"
-            st.exitQuest(1)
-            st.playSound("ItemSound.quest_giveup")
+        if npcId == Livina :
+            if player.getLevel() >= 20 :
+               htmltext = "30572-01.htm"
+            else:
+               htmltext = "30572-00.htm"
+               st.exitQuest(1)
     elif state == State.STARTED :
         if npcId == Livina :
-            htmltext = "<html><body>Seer Livina:<br>Go talk to Karuda!</body></html>"#this is custom, need official html Contrib
-        if npcId == Karuda :
+            htmltext = "30572-03.htm"
+        elif npcId == Karuda :
             htmltext = "32017-01.htm"
     return htmltext
 

+ 2 - 1
datapack_development/data/scripts/quests/650_ABrokenDream/100.htm

@@ -1,3 +1,4 @@
 <html><body>Ghost Of A Railroad Engineer:<br>
-Sorry, but you're not ready to fight alongside us yet. Your enthusiasm is great, but your skills are lacking.
+How did you come to be here? I have nothing to tell you.<br>
+(You must be above level 39 and have cleared the Beyond the Sea of Stars quest in order to perform this quest.)
 </body></html>

+ 2 - 1
datapack_development/data/scripts/quests/650_ABrokenDream/600.htm

@@ -1,3 +1,4 @@
 <html><body>Ghost Of A Railroad Engineer:<br>
-Sorry, but you are not qualified to carry out this quest. Go see <font color="LEVEL">Railroad Worker Abey</font> and talk to her.
+How did you come to be here? I have nothing to tell you.<br>
+(You must be above level 39 and have cleared the Beyond the Sea of Stars quest in order to perform this quest.)
 </body></html>

+ 10 - 4
datapack_development/data/scripts/quests/650_ABrokenDream/__init__.py

@@ -45,17 +45,23 @@ class Quest (JQuest) :
         if id == State.CREATED :
             Ocean = player.getQuestState("117_OceanOfDistantStar")
             if st.getPlayer().getLevel() < 39:
-                st.exitQuest(1)
                 htmltext="100.htm"
+                st.exitQuest(1)
             elif Ocean:
                 if Ocean.getState() == 'State.COMPLETED':
                     htmltext="200.htm"
+
                 else :
-                	htmltext = "600.htm"#TODO: This is custom, need to get official text from retail
+                    htmltext = "600.htm"
+                    st.exitQuest(1)
             else :
-            	htmltext = "600.htm" #TODO: This is custom, need to get official text from retail
+            	htmltext = "600.htm"
+                st.exitQuest(1)
         elif id == State.STARTED :
-            htmltext = "400.htm"
+            if st.getQuestItemsCount(DREAM_FRAGMENT_ID):
+               htmltext = "2a.htm"
+            else :
+               htmltext = "400.htm"
    return htmltext
 
  def onKill(self,npc,player,isPet):