Selaa lähdekoodia

TP from dimensional rift to Festival of darkness

Kerberos 17 vuotta sitten
vanhempi
sitoutus
d0bc3c2cc7

+ 6 - 6
datapack_development/data/dimensionalRift.xml

@@ -68,7 +68,7 @@
 		</room>
 		<room id="9">
 			<!-- Anakazel -->
-			<spawn mobId="25333" count="1" delay="300"/>
+			<spawn mobId="25333" count="1" delay="600"/>
 		</room>
 	</area>
 	<!-- ########### PRIVATES AREA ########### -->
@@ -139,7 +139,7 @@
 		</room>
 		<room id="9">
 			<!-- Anakazel -->
-			<spawn mobId="25334" count="1" delay="300"/>
+			<spawn mobId="25334" count="1" delay="600"/>
 		</room>
 	</area>
 	<!-- ########### OFFICERS AREA ########### -->
@@ -210,7 +210,7 @@
 		</room>
 		<room id="9">
 			<!-- Anakazel -->
-			<spawn mobId="25335" count="1" delay="300"/>
+			<spawn mobId="25335" count="1" delay="600"/>
 		</room>
 	</area>
 	<!-- ########### CAPTAINS AREA ########### -->
@@ -281,7 +281,7 @@
 		</room>
 		<room id="9">
 			<!-- Anakazel -->
-			<spawn mobId="25336" count="1" delay="300"/>
+			<spawn mobId="25336" count="1" delay="600"/>
 		</room>
 	</area>
 	<!-- ########### COMMANDERS AREA ########### -->
@@ -352,7 +352,7 @@
 		</room>
 		<room id="9">
 			<!-- Anakazel -->
-			<spawn mobId="25337" count="1" delay="300"/>
+			<spawn mobId="25337" count="1" delay="600"/>
 		</room>
 	</area>
 	<!-- ########## HEROES AREA ########### -->
@@ -423,7 +423,7 @@
 		</room>
 		<room id="9">
 			<!-- Anakazel -->
-			<spawn mobId="25338" count="1" delay="300"/>
+			<spawn mobId="25338" count="1" delay="600"/>
 		</room>
 	</area>
 </rift>

+ 3 - 3
datapack_development/data/html/default/31488.htm

@@ -2,8 +2,8 @@
 Welcome to the rift between the dimensions of time and space! Where you're standing now is relatively safe. It was created using all available resources. By the way, I see that inner space where you're looking, and I must warn you... We can't guarantee your safety! Don't try to go there without our help!<br>
 Don't forget! You'll have a better chance of returning alive if you take some friends with you. What do you want to do?<br>
 <a action="bypass -h npc_%objectId%_EnterRift 1">"I want to go to the inner space of the rift."</a><br>
-<a action="bypass -h npc_%objectId%_Quest 1103_OracleTeleport">"I want to go back to my world."</a><br>
-<a action="bypass -h npc_%objectId%_Chat 1">"I want to go to the Blood Offering."</a><br>
+<a action="bypass -h Quest 1103_OracleTeleport Return">"I want to go back to my world."</a><br>
+<a action="bypass -h Quest 1103_OracleTeleport Festival">"I want to go to the Blood Offering."</a><br>
 <a action="bypass -h npc_%objectId%_Chat 2">"Where's a good place for me to fight?"</a><br>
 <a action="bypass -h npc_%objectId%_Chat 3">"Please tell me the rules and characteristics of this place."</a>
-</body></html>
+</body></html>

+ 0 - 3
datapack_development/data/html/default/31489-1.htm

@@ -1,3 +0,0 @@
-<html><body>Rift Post:<br>
-I can't let you attend the Blood Offering. Perhaps the priest could help you.
-</body></html>

+ 3 - 3
datapack_development/data/html/default/31489.htm

@@ -2,8 +2,8 @@
 Welcome to the rift between the dimensions of time and space! Where you're standing now is relatively safe. It was created using all available resources. By the way, I see that inner space where you're looking, and I must warn you... We can't guarantee your safety! Don't try to go there without our help!<br>
 Don't forget! You'll have a better chance of returning alive if you take some friends with you. What do you want to do?<br>
 <a action="bypass -h npc_%objectId%_EnterRift 2">"I want to go to the inner space of the rift."</a><br>
-<a action="bypass -h npc_%objectId%_Quest 1103_OracleTeleport">"I want to go back to my world."</a><br>
-<a action="bypass -h npc_%objectId%_Chat 1">"I want to go to the Blood Offering."</a><br>
+<a action="bypass -h Quest 1103_OracleTeleport Return">"I want to go back to my world."</a><br>
+<a action="bypass -h Quest 1103_OracleTeleport Festival">"I want to go to the Blood Offering."</a><br>
 <a action="bypass -h npc_%objectId%_Chat 2">"Where's a good place for me to fight?"</a><br>
 <a action="bypass -h npc_%objectId%_Chat 3">"Please tell me the rules and characteristics of this place."</a>
-</body></html>
+</body></html>

+ 0 - 3
datapack_development/data/html/default/31490-1.htm

@@ -1,3 +0,0 @@
-<html><body>Rift Post:<br>
-I can't let you attend the Blood Offering. Perhaps the priest could help you.
-</body></html>

+ 3 - 3
datapack_development/data/html/default/31490.htm

@@ -2,8 +2,8 @@
 Welcome to the rift between the dimensions of time and space! Where you're standing now is relatively safe. It was created using all available resources. By the way, I see that inner space where you're looking, and I must warn you... We can't guarantee your safety! Don't try to go there without our help!<br>
 Don't forget! You'll have a better chance of returning alive if you take some friends with you. What do you want to do?<br>
 <a action="bypass -h npc_%objectId%_EnterRift 3">"I want to go to the inner space of the rift."</a><br>
-<a action="bypass -h npc_%objectId%_Quest 1103_OracleTeleport">"I want to go back to my world."</a><br>
-<a action="bypass -h npc_%objectId%_Chat 1">"I want to go to the Blood Offering."</a><br>
+<a action="bypass -h Quest 1103_OracleTeleport Return">"I want to go back to my world."</a><br>
+<a action="bypass -h Quest 1103_OracleTeleport Festival">"I want to go to the Blood Offering."</a><br>
 <a action="bypass -h npc_%objectId%_Chat 2">"Where's a good place for me to fight?"</a><br>
 <a action="bypass -h npc_%objectId%_Chat 3">"Please tell me the rules and characteristics of this place."</a>
-</body></html>
+</body></html>

+ 0 - 3
datapack_development/data/html/default/31491-1.htm

@@ -1,3 +0,0 @@
-<html><body>Rift Post:<br>
-I can't let you attend the Blood Offering. Perhaps the priest could help you.
-</body></html>

+ 3 - 3
datapack_development/data/html/default/31491.htm

@@ -2,8 +2,8 @@
 Welcome to the rift between the dimensions of time and space! Where you're standing now is relatively safe. It was created using all available resources. By the way, I see that inner space where you're looking, and I must warn you... We can't guarantee your safety! Don't try to go there without our help!<br>
 Don't forget! You'll have a better chance of returning alive if you take some friends with you. What do you want to do?<br>
 <a action="bypass -h npc_%objectId%_EnterRift 4">"I want to go to the inner space of the rift."</a><br>
-<a action="bypass -h npc_%objectId%_Quest 1103_OracleTeleport">"I want to go back to my world."</a><br>
-<a action="bypass -h npc_%objectId%_Chat 1">"I want to go to the Blood Offering."</a><br>
+<a action="bypass -h Quest 1103_OracleTeleport Return">"I want to go back to my world."</a><br>
+<a action="bypass -h Quest 1103_OracleTeleport Festival">"I want to go to the Blood Offering."</a><br>
 <a action="bypass -h npc_%objectId%_Chat 2">"Where's a good place for me to fight?"</a><br>
 <a action="bypass -h npc_%objectId%_Chat 3">"Please tell me the rules and characteristics of this place."</a>
-</body></html>
+</body></html>

+ 0 - 3
datapack_development/data/html/default/31492-1.htm

@@ -1,3 +0,0 @@
-<html><body>Rift Post:<br>
-I can't let you attend the Blood Offering. Perhaps the priest could help you.
-</body></html>

+ 3 - 3
datapack_development/data/html/default/31492.htm

@@ -2,8 +2,8 @@
 Welcome to the rift between the dimensions of time and space! Where you're standing now is relatively safe. It was created using all available resources. By the way, I see that inner space where you're looking, and I must warn you... We can't guarantee your safety! Don't try to go there without our help!<br>
 Don't forget! You'll have a better chance of returning alive if you take some friends with you. What do you want to do?<br>
 <a action="bypass -h npc_%objectId%_EnterRift 5">"I want to go to the inner space of the rift."</a><br>
-<a action="bypass -h npc_%objectId%_Quest 1103_OracleTeleport">"I want to go back to my world."</a><br>
-<a action="bypass -h npc_%objectId%_Chat 1">"I want to go to the Blood Offering."</a><br>
+<a action="bypass -h Quest 1103_OracleTeleport Return">"I want to go back to my world."</a><br>
+<a action="bypass -h Quest 1103_OracleTeleport Festival">"I want to go to the Blood Offering."</a><br>
 <a action="bypass -h npc_%objectId%_Chat 2">"Where's a good place for me to fight?"</a><br>
 <a action="bypass -h npc_%objectId%_Chat 3">"Please tell me the rules and characteristics of this place."</a>
-</body></html>
+</body></html>

+ 0 - 3
datapack_development/data/html/default/31493-1.htm

@@ -1,3 +0,0 @@
-<html><body>Rift Post:<br>
-I can't let you attend the Blood Offering. Perhaps the priest could help you.
-</body></html>

+ 3 - 3
datapack_development/data/html/default/31493.htm

@@ -2,8 +2,8 @@
 Welcome to the rift between the dimensions of time and space! Where you're standing now is relatively safe. It was created using all available resources. By the way, I see that inner space where you're looking, and I must warn you... We can't guarantee your safety! Don't try to go there without our help!<br>
 Don't forget! You'll have a better chance of returning alive if you take some friends with you. What do you want to do?<br>
 <a action="bypass -h npc_%objectId%_EnterRift 6">"I want to go to the inner space of the rift."</a><br>
-<a action="bypass -h npc_%objectId%_Quest 1103_OracleTeleport">"I want to go back to my world."</a><br>
-<a action="bypass -h npc_%objectId%_Chat 1">"I want to go to the Blood Offering."</a><br>
+<a action="bypass -h Quest 1103_OracleTeleport Return">"I want to go back to my world."</a><br>
+<a action="bypass -h Quest 1103_OracleTeleport Festival">"I want to go to the Blood Offering."</a><br>
 <a action="bypass -h npc_%objectId%_Chat 2">"Where's a good place for me to fight?"</a><br>
 <a action="bypass -h npc_%objectId%_Chat 3">"Please tell me the rules and characteristics of this place."</a>
-</body></html>
+</body></html>

+ 1 - 1
datapack_development/data/html/seven_signs/festival/dawn_guide.htm

@@ -18,5 +18,5 @@ Glory to the twilight empire!  Welcome, my friend, to the Oracle of Dawn!  The F
 <font color="LEVEL">[ Return to the village. ]</font><br1>
 <a action="bypass -h npc_%objectId%_Festival 7">Return</a><br>
 <font color="LEVEL">[Move to the Dimensional Rift]</font><br1>
-<a action="bypass -h npc_%objectId%_Quest 1103_OracleTeleport">Move to the Dimensional Rift</a>
+<a action="bypass -h Quest 1103_OracleTeleport Dimensional">Move to the Dimensional Rift</a>
 </body></html>

+ 20 - 22
datapack_development/data/html/seven_signs/festival/dusk_guide.htm

@@ -1,24 +1,22 @@
-<html><body>
-Festival Guide:<br>
+<html><body>Festival Guide:<br>
 The time for revolution is now! Welcome, comrade, to the Oracle of Dusk! The Festival of Darkness is held here in order to awaken the power of the seven seals.<br>
-%festivalMins%
-<table width="350">
-<tr><td><font color="LEVEL">[ Information about the Festival of Darkness ]</font></td></tr>
-<tr><td><a action="bypass -h npc_%objectId%_FestivalDesc 1">"What is the festival of darkness?"</a></td></tr>
-<tr><td><a action="bypass -h npc_%objectId%_FestivalDesc 2">"What are the rules?"</a></td></tr>
-<tr><td><a action="bypass -h npc_%objectId%_FestivalDesc 3">"What are the rules regarding bonuses?"</a></td></tr>
-<tr><td><a action="bypass -h npc_%objectId%_Festival 1">"I wish to participate."</a></td></tr>
-<tr><td></td></tr>
-<tr><td><font color="LEVEL">[ How do I register and find out the scores? ]</font></td></tr>
-<tr><td><a action="bypass -h npc_%objectId%_Festival 3">"I wish to register a score."</a></td></tr>
-<tr><td><a action="bypass -h npc_%objectId%_Festival 4">"Show me the high scores."</a></td></tr>
-<tr><td><a action="bypass -h npc_%objectId%_Festival 5">"What is the status of the festival?"</a></td></tr>
-<tr><td></td></tr>
-<tr><td><font color="LEVEL">[ How do I settle and find out the bonus? ]</font></td></tr>
-<tr><td><a action="bypass -h npc_%objectId%_FestivalDesc 4">"What is my bonus?"</a></td></tr>
-<tr><td><a action="bypass -h npc_%objectId%_Festival 6">"What about my accumulated bonus?"</a></td></tr>
-<tr><td></td></tr>
-<tr><td><font color="LEVEL">[ Return to the village ]</font></td></tr>
-<tr><td><a action="bypass -h npc_%objectId%_Festival 7">Return</a></td></tr>
-</table>
+%festivalMins% <br>
+<font color="LEVEL">[ Information about the Festival of Darkness ]</font><br1>
+<a action="bypass -h npc_%objectId%_FestivalDesc 1">"What is the festival of darkness?"</a><br1>
+<a action="bypass -h npc_%objectId%_FestivalDesc 2">"What are the rules?"</a><br1>
+<a action="bypass -h npc_%objectId%_FestivalDesc 5">"What are the rules regarding bonuses?"</a><br>
+<font color="LEVEL">[ "How can I participate?" ]</font><br1>
+<a action="bypass -h npc_%objectId%_FestivalDesc 3">"What are the prerequisites?"</a><br1>
+<a action="bypass -h npc_%objectId%_Festival 1">"I wish to participate."</a><br>
+<font color="LEVEL"> [ "How do I register and obtain the scores?" ]</font><br1>
+<a action="bypass -h npc_%objectId%_Festival 3">"I wish to register a score."</a><br1>
+<a action="bypass -h npc_%objectId%_Festival 4">"Show me the high scores."</a><br1>
+<a action="bypass -h npc_%objectId%_Festival 5">"What is the status of the festival?"</a><br>
+<font color="LEVEL">[ "How can I settle and inquire about the bonus?" ]</font><br1>
+<a action="bypass -h npc_%objectId%_FestivalDesc 4">"What is my bonus?"</a><br1>
+<a action="bypass -h npc_%objectId%_Festival 6">"What is my accumulated bonus?"</a><br>
+<font color="LEVEL">[ Return to the village. ]</font><br1>
+<a action="bypass -h npc_%objectId%_Festival 7">Return</a><br>
+<font color="LEVEL">[Move to the Dimensional Rift]</font><br1>
+<a action="bypass -h Quest 1103_OracleTeleport Dimensional">Move to the Dimensional Rift</a>
 </body></html>

+ 11 - 2
datapack_development/data/scripts/teleports/1103_OracleTeleport/__init__.py

@@ -67,7 +67,7 @@ RETURN_LOCS = [[-80555,150337,-3040],[-13953,121404,-2984],[16354,142820,-2696],
               [45256,123906,-5411],[46192,170290,-4981],[111273,174015,-5437],[-20604,-250789,-8165], \
               [-21726, 77385,-5171],[140405, 79679,-5427],[-52366, 79097,-4741],[118311,132797,-4829], \
               [172185,-17602,-4901],[ 83000,209213,-5439],[-19500, 13508,-4901],[113865, 84543,-6541]]
-              
+
 class Quest (JQuest) :
 
  def __init__(self, id, name, descr): JQuest.__init__(self, id, name, descr)
@@ -78,13 +78,22 @@ class Quest (JQuest) :
        st = self.newQuestState(player)
     npcId = npc.getNpcId()
     htmltext = event
-    count=st.getInt("count")
     if event == "Return":
        if npcId in TEMPLE_PRIEST and st.getState() == State.STARTED :
           x,y,z = RETURN_LOCS[st.getInt("id")]
           player.teleToLocation(x,y,z)
           st.exitQuest(1)
        return
+    elif event == "Festival":
+       id = st.getInt("id")
+       if id in TOWN_DAWN:
+          player.teleToLocation(-80157,111344,-4901)
+          return
+       elif id in TOWN_DUSK:
+          player.teleToLocation(-81261,86531,-5157)
+          return
+       else :
+          htmltext = "oracle1.htm"
     elif event == "Dimensional":
        htmltext = "oracle.htm"
        player.teleToLocation(-114755,-179466,-6752)

+ 1 - 1
datapack_development/data/html/default/31488-1.htm → datapack_development/data/scripts/teleports/1103_OracleTeleport/oracle1.htm

@@ -1,3 +1,3 @@
 <html><body>Rift Post:<br>
 I can't let you attend the Blood Offering. Perhaps the priest could help you.
-</body></html>
+</body></html>