From 2f6a38995b5c7e92a0695b8c2476b94a64f0a2f9 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 25 Nov 2019 18:32:46 +0000 Subject: [PATCH] Reworked quest Where Fates Intersect (10589). Contributed by NightBR. --- .../Q10589_WhereFatesIntersect/30137-01.html | 7 +- .../Q10589_WhereFatesIntersect/30137-02.html | 8 +- .../Q10589_WhereFatesIntersect/30137-03.html | 6 +- .../Q10589_WhereFatesIntersect/30137-04.html | 6 +- .../Q10589_WhereFatesIntersect/34362-01.html | 7 +- .../Q10589_WhereFatesIntersect/34362-02.html | 7 +- .../Q10589_WhereFatesIntersect/34362-03.html | 7 +- .../Q10589_WhereFatesIntersect/34362-04.html | 6 +- .../Q10589_WhereFatesIntersect/34362-05.html | 5 +- .../Q10589_WhereFatesIntersect/34362-06.html | 4 +- .../Q10589_WhereFatesIntersect/34362-07.html | 4 + .../Q10589_WhereFatesIntersect/34505-00.htm | 5 + .../Q10589_WhereFatesIntersect/34505-01.htm | 5 + .../Q10589_WhereFatesIntersect/34505-01.html | 4 - .../Q10589_WhereFatesIntersect/34505-02.htm | 5 + .../Q10589_WhereFatesIntersect/34505-02.html | 4 - .../Q10589_WhereFatesIntersect/34505-03.htm | 7 + .../Q10589_WhereFatesIntersect/34505-03.html | 4 - .../Q10589_WhereFatesIntersect/34505-04.html | 5 +- .../Q10589_WhereFatesIntersect/34513-01.html | 6 +- .../Q10589_WhereFatesIntersect/34513-02.html | 6 +- .../Q10589_WhereFatesIntersect/34513-03.html | 4 +- .../Q10589_WhereFatesIntersect.java | 200 ++++++++++-------- .../dist/game/data/spawns/Aden/TownOfAden.xml | 2 +- 24 files changed, 183 insertions(+), 141 deletions(-) create mode 100644 L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34362-07.html create mode 100644 L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-00.htm create mode 100644 L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-01.htm delete mode 100644 L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-01.html create mode 100644 L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-02.htm delete mode 100644 L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-02.html create mode 100644 L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-03.htm delete mode 100644 L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-03.html diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/30137-01.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/30137-01.html index 1113c2ae1e..23d2ea05c2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/30137-01.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/30137-01.html @@ -1,4 +1,5 @@ -Tarti:
-Your're the one that Hephah has sent, right? If not, you should go meet Herphah and receive a mission from her before you continue. If you think it doesn't matter, I can continue anyway. Do you want me to continue?
- +Grocer Vollodos:
+Ha! How could this happen? I thought that the contamination in the Altar of Evil was reduced thanks to the adventurers!
+I'm frustrated that all that effort was for nothing!
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/30137-02.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/30137-02.html index 1936da53a5..42c1b7ff1f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/30137-02.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/30137-02.html @@ -1,4 +1,6 @@ -Tarti:
-Your're the one that Hephah has sent, right? If not, you should go meet Herphah and receive a mission from her before you continue. If you think it doesn't matter, I can continue anyway. Do you want me to continue?
- +Grocer Vollodos:
+Oh... Sony, I didn't mean to scream at you. But take a look around. As soon as this contaminated land was about to come back to life, new monsters started appearing and have now taken over.
+Actually, I had to run away from my previous post. If you don't help me, I'm dead.
+Please help me.
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/30137-03.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/30137-03.html index b5530f8177..3df72554b0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/30137-03.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/30137-03.html @@ -1,3 +1,5 @@ -Tarti:
-Your're the one that Hephah has sent, right? If not, you should go meet Herphah and receive a mission from her before you continue. If you think it doesn't matter, I can continue anyway. Do you want me to continue?
+Grocer Vollodos:
+Really? Okay. I'll calm down. Then please defeat the new monsters in the Altar of Evil Defeat the Doom Soldier, Doom Servant, Doom Berserker, and Doom Seer and bring me 200 of the Undead Blood.
+And Herphah said that if an adventurer comes, to tell them that they have to reach level 95.
+Once you collect it, you can go back to Herphah. The Altar of Evil is right here, so I won't be teleporting you.
\ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/30137-04.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/30137-04.html index b5530f8177..c241f4445a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/30137-04.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/30137-04.html @@ -1,3 +1,5 @@ -Tarti:
-Your're the one that Hephah has sent, right? If not, you should go meet Herphah and receive a mission from her before you continue. If you think it doesn't matter, I can continue anyway. Do you want me to continue?
+Grocer Vollodos:
+Please defeat the new monsters in the Altar of Evil Defeat the Doom Soldier, Doom Servant, Doom Berserker, and Doom Seer and bring me 200 of the Undead Blood.
+And Herphah said that if an adventurer comes, to tell them that they have to reach level 95.
+Once you are done, go back to Herphah. The Altar of Evil is right here, so I won't be teleporting you.
\ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34362-01.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34362-01.html index 2251b5b88b..c768a1b026 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34362-01.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34362-01.html @@ -1,4 +1,5 @@ -Tarti:
-Your're the one that Hephah has sent, right? If not, you should go meet Herphah and receive a mission from her before you continue. If you think it doesn't matter, I can continue anyway. Do you want me to continue?
- +Herphah:
+So it was you? The one that trained in the Ertheia training method with Tarti in Gludio.
+It sounds interesting, but I can't have you waste time when you came all the way here. Now is the time to test that power and obtain a new power as well.
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34362-02.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34362-02.html index dabe28ccef..27c8f5e394 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34362-02.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34362-02.html @@ -1,4 +1,5 @@ -Tarti:
-Your're the one that Hephah has sent, right? If not, you should go meet Herphah and receive a mission from her before you continue. If you think it doesn't matter, I can continue anyway. Do you want me to continue?
- +Herphah:
+I have the perfect mission for you, and I'm sure it will help you.
+But just completing the mission is not enough. You have to come back much stronger than now.
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34362-03.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34362-03.html index 0bd687f759..cbbcad7cae 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34362-03.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34362-03.html @@ -1,4 +1,5 @@ -Tarti:
-Your're the one that Hephah has sent, right? If not, you should go meet Herphah and receive a mission from her before you continue. If you think it doesn't matter, I can continue anyway. Do you want me to continue?
- +Herphah:
+Then go to the Altar of Evil, and complete the mission from Trader Vollodos.
+And if the mission gets too long, don't forget to get some buffs from the Adventurer Helper. I'll send you there once you are ready.
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34362-04.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34362-04.html index 4166ece518..507ea74674 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34362-04.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34362-04.html @@ -1,4 +1,4 @@ -Tarti:
-Your're the one that Hephah has sent, right? If not, you should go meet Herphah and receive a mission from her before you continue. If you think it doesn't matter, I can continue anyway. Do you want me to continue? - +Herphah:
+It looks like you've grown much stronger. Did you also complete the mission?
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34362-05.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34362-05.html index b5530f8177..bcbdc2d95c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34362-05.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34362-05.html @@ -1,3 +1,4 @@ -Tarti:
-Your're the one that Hephah has sent, right? If not, you should go meet Herphah and receive a mission from her before you continue. If you think it doesn't matter, I can continue anyway. Do you want me to continue?
+Herphah:
+The fact that you grew this strong means that you used the new power well. And that also means that you are ready to acquire a new power. Give me the items you brought back, and let's move on to the next mission.
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34362-06.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34362-06.html index b5530f8177..0ada8a89ae 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34362-06.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34362-06.html @@ -1,3 +1,3 @@ -Tarti:
-Your're the one that Hephah has sent, right? If not, you should go meet Herphah and receive a mission from her before you continue. If you think it doesn't matter, I can continue anyway. Do you want me to continue?
+Herphah:
+Your next mission will be taken care of by Dual Class Master Joachim, next to me. Talk to him.
\ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34362-07.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34362-07.html new file mode 100644 index 0000000000..cba2ab3875 --- /dev/null +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34362-07.html @@ -0,0 +1,4 @@ +Herphah:
+Are you ready? Once you get to the Altar of Evil, complete the mission from Trader Vollodos.
+ + \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-00.htm b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-00.htm new file mode 100644 index 0000000000..6c1faf7edf --- /dev/null +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-00.htm @@ -0,0 +1,5 @@ +Taiti:
+So how is the Ertheia training method coming along? Isn't it amazing? Since you grew this much.
+But you can't just settle for this. You have to continue advancing.
+ + \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-01.htm b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-01.htm new file mode 100644 index 0000000000..741926a53d --- /dev/null +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-01.htm @@ -0,0 +1,5 @@ +Taiti:
+It's true that you've grown, but you are just getting started. Any adventurer could reach the level you've reached.
+So now it's time to go on to the next level.
+ + \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-01.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-01.html deleted file mode 100644 index 6deaeffe62..0000000000 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-01.html +++ /dev/null @@ -1,4 +0,0 @@ -Tarti:
-Your're the one that Hephah has sent, right? If not, you should go meet Herphah and receive a mission from her before you continue. If you think it doesn't matter, I can continue anyway. Do you want me to continue?
- - \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-02.htm b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-02.htm new file mode 100644 index 0000000000..03ddbba83b --- /dev/null +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-02.htm @@ -0,0 +1,5 @@ +Taiti:
+It's time to leave this place full of beginners. Once you go there, you'll find some very skilled adventurers.
+It's time for you to do new missions in new places. Once you finish those missions, you'll obtain a new power.
+ + \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-02.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-02.html deleted file mode 100644 index 8aee26d6ee..0000000000 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-02.html +++ /dev/null @@ -1,4 +0,0 @@ -Tarti:
-Your're the one that Hephah has sent, right? If not, you should go meet Herphah and receive a mission from her before you continue. If you think it doesn't matter, I can continue anyway. Do you want me to continue?
- - \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-03.htm b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-03.htm new file mode 100644 index 0000000000..f46c1d0df0 --- /dev/null +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-03.htm @@ -0,0 +1,7 @@ +Tarti:
+Now, go to the Town of Aden.
+By the way, it's your first time outside the Town of Gludio, right? Then you'll have to take a look at the map.
+You can find out a lot of things through the map. Your current location, the place where you need to go, and recommendations as well. Use it well, and you will never get lost.
+Anyway, go to the Town of Aden and talk to Herphah. Ill be there too, so Ill see you there.
+ + \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-03.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-03.html deleted file mode 100644 index 01a3bfdc3a..0000000000 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-03.html +++ /dev/null @@ -1,4 +0,0 @@ -Tarti:
-Your're the one that Hephah has sent, right? If not, you should go meet Herphah and receive a mission from her before you continue. If you think it doesn't matter, I can continue anyway. Do you want me to continue?
- - \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-04.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-04.html index 421fdddd14..ed12819eb5 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-04.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34505-04.html @@ -1,4 +1,5 @@ Tarti:
-Your're the one that Hephah has sent, right? If not, you should go meet Herphah and receive a mission from her before you continue. If you think it doesn't matter, I can continue anyway. Do you want me to continue?
- +You have to go to Town of Aden for the mission.
+Once there talk to Herphah. I'll be there too, so I'll see you there.
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34513-01.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34513-01.html index e5ed9f012e..773485cc26 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34513-01.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34513-01.html @@ -1,4 +1,4 @@ -Tarti:
-Your're the one that Hephah has sent, right? If not, you should go meet Herphah and receive a mission from her before you continue. If you think it doesn't matter, I can continue anyway. Do you want me to continue?
- +Dual Class Master Joachim:
+You've grown strong. Your power and the new power have been balanced well. You can become even stronger, depending on how you do.
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34513-02.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34513-02.html index d8b49ec7a4..721555949e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34513-02.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34513-02.html @@ -1,3 +1,5 @@ -Tarti:
-Your're the one that Hephah has sent, right? If not, you should go meet Herphah and receive a mission from her before you continue. If you think it doesn't matter, I can continue anyway. Do you want me to continue? +Dual Class Master Joachim:
+But since you've worked so hard until now, how about we talk a little as you rest?
+And I can reward you for your growth as well.
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34513-03.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34513-03.html index d8b49ec7a4..0a6b5b59b5 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34513-03.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/34513-03.html @@ -1,3 +1,3 @@ -Tarti:
-Your're the one that Hephah has sent, right? If not, you should go meet Herphah and receive a mission from her before you continue. If you think it doesn't matter, I can continue anyway. Do you want me to continue? +Dual Class Master Joachim:
+Let's talk once you've rested some. You can't rest forever, after all. \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/Q10589_WhereFatesIntersect.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/Q10589_WhereFatesIntersect.java index a2d3e37bf8..b5d2c94fe1 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/Q10589_WhereFatesIntersect.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/Q10589_WhereFatesIntersect.java @@ -16,28 +16,31 @@ */ package quests.Q10589_WhereFatesIntersect; -import org.l2jmobius.Config; -import org.l2jmobius.gameserver.enums.QuestSound; +import java.util.HashSet; +import java.util.Set; + +import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; +import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExTutorialShowId; -import org.l2jmobius.gameserver.util.Util; /** * Where Fates Intersect (10589) * @URL https://l2wiki.com/Where_Fates_Intersect - * @author Dmitri + * @author NightBR */ public class Q10589_WhereFatesIntersect extends Quest { // NPCs private static final int TARTI = 34505; - private static final int HERPA = 34362; - private static final int WALLODOS = 30137; + private static final int HERPHAH = 34362; + private static final int VOLLODOS = 30137; private static final int JOACHIM = 34513; private static final int[] MONSTERS = { @@ -47,33 +50,38 @@ public class Q10589_WhereFatesIntersect extends Quest 24455, // Doom Seer }; // Item - private static final int MONSTER_DROP = 80853; // Traces of Evil Spirit - // Rewards - private static final long EXP = 1; - private static final int SP = 1; - private static final int ADENA_AMOUNT = 5050; - private static final int ACHIEVEMENT_BOX = 80908; + private static final int MONSTER_DROP = 80853; // Undead Blood // Misc - private static final int MIN_LEVEL = 95; + private static final int REQUIRED_DROP_COUNT = 200; + private static final int KILLING_NPCSTRING_ID1 = NpcStringId.LV_85_WHERE_FATES_INTERSECT_IN_PROGRESS.getId(); + private static final int KILLING_NPCSTRING_ID2 = NpcStringId.LV_85_WHERE_FATES_INTERSECT_2.getId(); + private static final int REACH_LV_95 = NpcStringId.REACH_LV_95.getId(); + private static final QuestType QUEST_TYPE = QuestType.ONE_TIME; // REPEATABLE, ONE_TIME, DAILY + private static final boolean PARTY_QUEST = true; + private static final int KILLING_COND = 3; + private static final int FINISH_COND = 4; + private static final int MIN_LEVEL = 85; + // Rewards + private static final int REWARD_ITEM1 = 80908; // Lv. 95 Achievement Reward Box + private static final int REWARD_ITEM1_AMOUNT = 1; // Location - private static final Location ALTAR_OF_EVIL = new Location(-13982, 22124, -3611); - private static final Location TOWN_OF_ADEN = new Location(146632, 26760, -2213); + private static final Location TOWN_OF_ADEN = new Location(146568, 26808, -2208); + private static final Location ALTAR_OF_EVIL = new Location(-14088, 22168, -3626); public Q10589_WhereFatesIntersect() { super(10589); addStartNpc(TARTI); - addTalkId(TARTI, HERPA, WALLODOS, JOACHIM); + addTalkId(TARTI, HERPHAH, VOLLODOS, JOACHIM); addKillId(MONSTERS); registerQuestItems(MONSTER_DROP); - addCondMinLevel(85, "34505-06.html"); + addCondMinLevel(MIN_LEVEL, getNoQuestMsg(null)); } @Override public String onAdvEvent(String event, Npc npc, PlayerInstance player) { final QuestState qs = getQuestState(player, false); - if (qs == null) { return null; @@ -82,60 +90,69 @@ public class Q10589_WhereFatesIntersect extends Quest String htmltext = null; switch (event) { + case "34505-01.htm": // TARTI + case "34505-02.htm": case "34505-04.html": - case "34505-02.html": - case "30137-03.html": - case "30137-02.html": - case "34362-03.html": + case "34362-02.html": // HERPHAH case "34362-05.html": + case "30137-02.html": // VOLLODOS + case "34513-02.html": // JOACHIM { htmltext = event; break; } - case "34505-03.html": + case "34505-03.htm": { + // Show Service/Help/View Map page + player.sendPacket(new ExTutorialShowId(12)); qs.startQuest(); htmltext = event; break; } - case "teleport": - { - if (qs.isCond(1)) - { - player.teleToLocation(TOWN_OF_ADEN); - } - break; - } - case "34362-02.html": + case "34362-03.html": { + // Show Service/Help/Adventure's Guide page + player.sendPacket(new ExTutorialShowId(25)); qs.setCond(2, true); - player.sendPacket(new ExTutorialShowId(37)); // Adventurers Guide htmltext = event; break; } - case "teleport_d": + case "34362-06.html": { - if (qs.isCond(2)) + if (qs.isCond(4)) { - player.teleToLocation(ALTAR_OF_EVIL); + // Check player level it must be 95+ + qs.setCond(5, true); + htmltext = event; } break; } - case "34513-02.html": + case "30137-03.html": + { + qs.setCond(3, true); + htmltext = event; + break; + } + case "34513-03.html": { if (qs.isCond(5)) { - if (player.getLevel() >= MIN_LEVEL) - { - // Reward. - addExpAndSp(player, EXP, SP); - giveAdena(player, ADENA_AMOUNT, false); - giveItems(player, ACHIEVEMENT_BOX, 1); - qs.exitQuest(false, true); - htmltext = event; - } - break; + takeItems(player, MONSTER_DROP, -1); + // Reward. + rewardItems(player, REWARD_ITEM1, REWARD_ITEM1_AMOUNT); + qs.exitQuest(QUEST_TYPE, true); } + break; + } + case "townofaden": + { + player.teleToLocation(TOWN_OF_ADEN); // Town of Aden near Npc Herphah + break; + } + case "altarofevil": + { + player.teleToLocation(ALTAR_OF_EVIL); // Altar of Evil near Npc Vollodos + break; } } return htmltext; @@ -151,10 +168,7 @@ public class Q10589_WhereFatesIntersect extends Quest { case State.CREATED: { - if (npc.getId() == TARTI) - { - htmltext = "34505-01.html"; - } + htmltext = "34505-00.htm"; break; } case State.STARTED: @@ -165,15 +179,11 @@ public class Q10589_WhereFatesIntersect extends Quest { if (qs.isCond(1)) { - htmltext = "34505-03.html"; - } - else if (qs.isCond(5)) - { - htmltext = "34505-05.html"; + htmltext = "34505-04.html"; } break; } - case HERPA: + case HERPHAH: { if (qs.isCond(1)) { @@ -181,11 +191,10 @@ public class Q10589_WhereFatesIntersect extends Quest } else if (qs.isCond(2)) { - htmltext = "34362-03.html"; + htmltext = "34362-07.html"; } else if (qs.isCond(4)) { - qs.setCond(5, true); htmltext = "34362-04.html"; } else if (qs.isCond(5)) @@ -194,49 +203,40 @@ public class Q10589_WhereFatesIntersect extends Quest } break; } - case WALLODOS: + case VOLLODOS: { if (qs.isCond(2)) { - qs.setCond(3, true); htmltext = "30137-01.html"; } else if (qs.isCond(3)) { htmltext = "30137-04.html"; } - else if (qs.isCond(4)) - { - htmltext = "30137-05.html"; - } break; } case JOACHIM: { - if (qs.isCond(2)) - { - htmltext = "34513-03.html"; - } - else if (qs.isCond(3)) - { - htmltext = "34513-04.html"; - } - else if (qs.isCond(4)) - { - htmltext = "34513-05.html"; - } - else if (qs.isCond(5)) + if (qs.isCond(5)) { htmltext = "34513-01.html"; + break; } - break; } } break; } case State.COMPLETED: { - htmltext = getAlreadyCompletedMsg(player); + if (qs.isNowAvailable()) + { + qs.setState(State.CREATED); + htmltext = "34505-00.htm"; + } + else + { + htmltext = getAlreadyCompletedMsg(player, QUEST_TYPE); + } break; } } @@ -244,27 +244,41 @@ public class Q10589_WhereFatesIntersect extends Quest } @Override - public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) + public String onKill(Npc npc, PlayerInstance killer, boolean isSummon) { - final QuestState qs = getQuestState(player, false); - if ((qs != null) && qs.isCond(3) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false)) + QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false); + if ((qs != null) && qs.isCond(KILLING_COND)) { - if ((getQuestItemsCount(player, MONSTER_DROP) < 200) && (getRandom(100) < 90)) + final PlayerInstance player = qs.getPlayer(); + giveItemRandomly(player, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true); + + if ((getQuestItemsCount(player, MONSTER_DROP) >= REQUIRED_DROP_COUNT) && (player.getLevel() >= 95)) { - giveItems(player, MONSTER_DROP, 1); - playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); - } - if ((getQuestItemsCount(player, MONSTER_DROP) >= 200) && (player.getLevel() >= MIN_LEVEL)) - { - qs.setCond(4, true); + qs.setCond(FINISH_COND, true); } + + sendNpcLogList(player); } + + return super.onKill(npc, killer, isSummon); } @Override - public String onKill(Npc npc, PlayerInstance killer, boolean isSummon) + public Set getNpcLogList(PlayerInstance player) { - executeForEachPlayer(killer, npc, isSummon, true, false); - return super.onKill(npc, killer, isSummon); + final QuestState qs = getQuestState(player, false); + + if ((qs != null) && qs.isCond(KILLING_COND)) + { + final Set holder = new HashSet<>(); + if (player.getLevel() >= 95) + { + holder.add(new NpcLogListHolder(REACH_LV_95, true, 1)); + } + holder.add(new NpcLogListHolder(KILLING_NPCSTRING_ID1, true, (int) getQuestItemsCount(player, MONSTER_DROP))); + holder.add(new NpcLogListHolder(KILLING_NPCSTRING_ID2, true, (int) getQuestItemsCount(player, MONSTER_DROP))); + return holder; + } + return super.getNpcLogList(player); } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Aden/TownOfAden.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Aden/TownOfAden.xml index 056a46b91f..52565f91aa 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Aden/TownOfAden.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Aden/TownOfAden.xml @@ -110,9 +110,9 @@ - + \ No newline at end of file