12 年之前 · 2fb3cc73df
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/30721-1.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/30721-1.html
@@ -1,3 +1,4 @@
 
				 <html><body>Magister Ladd:<br>
			
 
				 You came back with the three relics! Good job. We should hurry, you never know when our enemies might attack.<br>
			
 
				-<a action="bypass -h Quest Q00246_PossessorOfAPreciousSoul3 30721-2.html">"Here's the box."</a></body></html>
			
 
				+<a action="bypass -h Quest Q00246_PossessorOfAPreciousSoul3 30721-2.html">"Here's the box."</a>
			
 
				+</body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/30721-2.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/30721-2.html
@@ -1,3 +1,5 @@
 
				 <html><body>Magister Ladd:<br>
			
 
				 I have successfully removed the Soultrap spells on Waterbinder, Evergreen and Rain Song. Now I will send them where they belong. 
			
 
				-I have no doubt that your destiny will be great.<br>Caradine left a letter for you.</body></html>
			
 
				+I have no doubt that your destiny will be great.<br>
			
 
				+Caradine left a letter for you.
			
 
				+</body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/31740-1.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/31740-1.htm
@@ -1,4 +1,5 @@
 
				 <html><body>Caradine:<br>
			
 
				 Welcome back! I heard what happened. Thank you on behalf of the group! I never imagined that there would be such resistance to our work!<br>
			
 
				 We're probably safe now, but the Lady of the Lake hasn't completely recovered yet. She still needs some more rest. Could you please help us some more?<br>
			
 
				-<a action="bypass -h Quest Q00246_PossessorOfAPreciousSoul3 31740-4.html">"I'll wait."</a></body></html>
			
 
				+<a action="bypass -h Quest Q00246_PossessorOfAPreciousSoul3 31740-4.html">"I'll wait."</a>
			
 
				+</body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/31741-1.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/31741-1.html
@@ -1,5 +1,5 @@
 
				 <html><body>Ossian:<br>
			
 
				-You've seen the Lady of the Lake in person. She's not an ordinary Human. She can't appear in her original state in this world, 
			
 
				-so she used magic to place her essence into three objects. She isn't able to recover her strength without them, and they were stolen during the attack.<br>
			
 
				+You've seen the Lady of the Lake in person. She's not an ordinary Human. She can't appear in her original state in this world, so she used magic to place her essence into three objects. She isn't able to recover her strength without them, and they were stolen during the attack.<br>
			
 
				 You must help us recover them!<br>
			
 
				-<a action="bypass -h Quest Q00246_PossessorOfAPreciousSoul3 31741-2.html">"I'll help."</a></body></html>
			
 
				+<a action="bypass -h Quest Q00246_PossessorOfAPreciousSoul3 31741-2.html">"I'll help."</a>
			
 
				+</body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/31741-11.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/31741-11.html
@@ -1,2 +1,3 @@
 
				 <html><body>Ossian:<br>
			
 
				-There's no time to lose! Hurry up and take the box containing the three sacred relics to Magister Ladd in the Ivory Tower.</body></html>
			
 
				+There's no time to lose! Hurry up and take the box containing the three sacred relics to Magister Ladd in the Ivory Tower.
			
 
				+</body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/31741-2.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/31741-2.html
@@ -1,4 +1,3 @@
 
				 <html><body>Ossian:<br>
			
 
				-We have learned that two of the three items that contain his power, the Waterbinder ring and the Evergreen necklace, can be found in the Valley of Saints. The <font color="LEVEL">Pilgrims of Splendor</font> possess the Waterbinder, 
			
 
				-and the <font color="LEVEL">Judges of Splendor</font> possess the Evergreen. Please immediately for the Valley of Saints and bring back the ring and necklace. You're the only one who can do this. Then, I will entrust you with this task.
			
 
				+We have learned that two of the three items that contain his power, the Waterbinder ring and the Evergreen necklace, can be found in the Valley of Saints. The <font color="LEVEL">Pilgrims of Splendor</font> possess the Waterbinder, and the <font color="LEVEL">Judges of Splendor</font> possess the Evergreen. Please immediately for the Valley of Saints and bring back the ring and necklace. You're the only one who can do this. Then, I will entrust you with this task.
			
 
				 </body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/31741-3.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/31741-3.html
@@ -1,3 +1,4 @@
 
				 <html><body>Ossian:<br>
			
 
				 You got them! Your soul is truly holy.<br>Unfortunately, they still have the Soultrap spell on them, and she's too weak to break it.<br>
			
 
				-<a action="bypass -h Quest Q00246_PossessorOfAPreciousSoul3 31741-5.html">"What should I do?"</a></body></html>
			
 
				+<a action="bypass -h Quest Q00246_PossessorOfAPreciousSoul3 31741-5.html">"What should I do?"</a>
			
 
				+</body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/31741-4.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/31741-4.html
@@ -1,3 +1,3 @@
 
				 <html><body>Ossian:<br>
			
 
				-Find the ring called Waterbinder and the necklace Evergreen, they hold his strength. 
			
 
				-Pilgrims of Splendor and Judges of Splendor in the Valley of Saints have them.</body></html>
			
 
				+Find the ring called Waterbinder and the necklace Evergreen, they hold his strength. Pilgrims of Splendor and Judges of Splendor in the Valley of Saints have them.
			
 
				+</body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/31741-5.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/31741-5.html
@@ -1,10 +1,4 @@
 
				 <html><body>Ossian:<br>
			
 
				-The Rain Song staff, the most powerful of her three items, must be retrieved. If the staff is found, 
			
 
				-the restraining magics can be broken, and the three items will regain their full strength. <br>However, 
			
 
				-since it is the most powerful item, it is guarded by the most powerful foe. 
			
 
				-The <font color="LEVEL">Flame of Splendor, the Archangel Barakiel</font>, guards the staff himself. 
			
 
				-You must prepare thoroughly in order to fight him.<br> Your mission is to defeat the Flame of Splendor, 
			
 
				-and retrieve the Rain Song staff. <br>If you are not yet ready to go against Barakiel, there is another 
			
 
				-way to get your hands on the staff. Go to the <font color="LEVEL">Valley of Saints</font>, defeat the 
			
 
				-<font color="LEVEL">Wailing of Splendor, Fang of Splendor, Crown of Splendor, and Signet of Splendor</font>, 
			
 
				-and bring <font color="LEVEL">100 Staff Fragments</font> from their corpses. </body></html>
			
 
				+The Rain Song staff, the most powerful of her three items, must be retrieved. If the staff is found, the restraining magics can be broken, and the three items will regain their full strength.<br>
			
 
				+However, since it is the most powerful item, it is guarded by the most powerful foe. The <font color="LEVEL">Flame of Splendor, the Archangel Barakiel</font>, guards the staff himself. You must prepare thoroughly in order to fight him.<br> Your mission is to defeat the Flame of Splendor, and retrieve the Rain Song staff. <br>If you are not yet ready to go against Barakiel, there is another way to get your hands on the staff. Go to the <font color="LEVEL">Valley of Saints</font>, defeat the <font color="LEVEL">Wailing of Splendor, Fang of Splendor, Crown of Splendor, and Signet of Splendor</font>, and bring <font color="LEVEL">100 Staff Fragments</font> from their corpses.
			
 
				+</body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/31741-7.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/31741-7.html
@@ -1,4 +1,5 @@
 
				 <html><body>Ossian:<br>
			
 
				 Rain Song! You've defeated Barakiel. You've proven your worth.<br>
			
 
				 I have discovered that a colleague of mine may be able to break the Soultrap spell. Get the objects to him and he will attempt it.<br>
			
 
				-<a action="bypass -h Quest Q00246_PossessorOfAPreciousSoul3 31741-9.html">"I'll take them in person."</a></body></html>
			
 
				+<a action="bypass -h Quest Q00246_PossessorOfAPreciousSoul3 31741-9.html">"I'll take them in person."</a>
			
 
				+</body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/31741-8.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/31741-8.html
@@ -1,5 +1,4 @@
 
				 <html><body>Ossian:<br> 
			
 
				-The only thing left now is the Rain Song Staff. Please defeat <font color="LEVEL">Barakiel, the Flame of Splendor</font>, 
			
 
				-and retrive the Rain Song Staff. <br>If you are not yet ready to go against Barakiel, go to the <font color="LEVEL">Valley of Saints</font>, 
			
 
				-defeat the <font color="LEVEL">Wailing of Splendor, Fang of Splendor, Crown of Splendor, and Shout of Splendor</font>, who are searching 
			
 
				-for the Rain Song Staff fragments, and bring <font color="LEVEL">100 Staff Fragments</font> from their corpses.</body></html>
			
 
				+The only thing left now is the Rain Song Staff. Please defeat <font color="LEVEL">Barakiel, the Flame of Splendor</font>, and retrieve the Rain Song Staff.<br>
			
 
				+If you are not yet ready to go against Barakiel, go to the <font color="LEVEL">Valley of Saints</font>, defeat the <font color="LEVEL">Wailing of Splendor, Fang of Splendor, Crown of Splendor, and Shout of Splendor</font>, who are searching for the Rain Song Staff fragments, and bring <font color="LEVEL">100 Staff Fragments</font> from their corpses.
			
 
				+</body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/31741-9.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/31741-9.html
@@ -1,3 +1,4 @@
 
				-<html><body>Ossian:<br>I hope you can come along, you never know when they'll attack again.<br>
			
 
				-Magister Ladd in the Ivory Tower is the Mage who can liberate the three relics in this box. 
			
 
				-Bring them to him! Hurry, his enemies are on our heels.</body></html>
			
 
				+<html><body>Ossian:<br>
			
 
				+I hope you can come along, you never know when they'll attack again.<br>
			
 
				+Magister Ladd in the Ivory Tower is the Mage who can liberate the three relics in this box. Bring them to him! Hurry, his enemies are on our heels.
			
 
				+</body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java
@@ -101,19 +101,17 @@ public class Q00246_PossessorOfAPreciousSoul3 extends Quest
 
				 				}
			
 
				 				break;
			
 
				 			case "31741-9.html":
			
 
				-				if (st.isCond(5))
			
 
				+				if (st.isCond(5) && (st.hasQuestItems(RAIN_SONG) || (st.getQuestItemsCount(FRAGMENTS) >= 100)))
			
 
				 				{
			
 
				-					if (st.hasQuestItems(RAIN_SONG))
			
 
				-					{
			
 
				-						st.takeItems(RAIN_SONG, -1);
			
 
				-					}
			
 
				-					if (st.getQuestItemsCount(FRAGMENTS) >= 100)
			
 
				-					{
			
 
				-						st.takeItems(FRAGMENTS, -1);
			
 
				-					}
			
 
				+					st.takeItems(RAIN_SONG, -1);
			
 
				+					st.takeItems(FRAGMENTS, -1);
			
 
				 					st.giveItems(RELIC_BOX, 1);
			
 
				 					st.setCond(6, true);
			
 
				 				}
			
 
				+				else
			
 
				+				{
			
 
				+					return "31741-8.html";
			
 
				+				}
			
 
				 				break;
			
 
				 			case "30721-2.html":
			
 
				 				if (st.isCond(6) && st.hasQuestItems(RELIC_BOX))
			
@@ -181,12 +179,17 @@ public class Q00246_PossessorOfAPreciousSoul3 extends Quest
 
				 								{
			
 
				 									htmltext = "31741-7.html";
			
 
				 								}
			
 
				+								else
			
 
				+								{
			
 
				+									htmltext = "31741-8.html";
			
 
				+								}
			
 
				+								break;
			
 
				 							case 6:
			
 
				 								if (st.getQuestItemsCount(RELIC_BOX) == 1)
			
 
				 								{
			
 
				 									htmltext = "31741-11.html";
			
 
				 								}
			
 
				-								
			
 
				+								break;
			
 
				 						}
			
 
				 				}
			
 
				 				break;
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/no_sub.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/no_sub.html
@@ -1,3 +1,3 @@
 
				 <html><body>
			
 
				 Quest may only be undertaken by a character of the proper sub-class.
			
 
				-</body></html>
			
 
				+</body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/31740-1.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/31740-1.htm
@@ -2,4 +2,5 @@
 
				 Thank you for coming. I asked you here because the time has come for you to meet her.<br>
			
 
				 Isn't that what you wanted? Prepare to have all your questions answered and your horizons broadened!<br>
			
 
				 Are you ready to change your life?<br>
			
 
				-<a action="bypass -h Quest Q00247_PossessorOfAPreciousSoul4 31740-3.html">"Yes, I am!"</a></body></html>
			
 
				+<a action="bypass -h Quest Q00247_PossessorOfAPreciousSoul4 31740-3.html">"Yes, I am!"</a>
			
 
				+</body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/31740-3.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/31740-3.html
@@ -2,4 +2,5 @@
 
				 You must meet her alone. My only role is to open the way for you.<br>Don't be frightened!<br>
			
 
				 She just wants to talk to you. What she'll say, I don't know, but you need to listen!<br>
			
 
				 Now, close your eyes and relax.<br>
			
 
				-<a action="bypass -h Quest Q00247_PossessorOfAPreciousSoul4 31740-4.html">"I'm ready."</a></body></html>
			
 
				+<a action="bypass -h Quest Q00247_PossessorOfAPreciousSoul4 31740-4.html">"I'm ready."</a>
			
 
				+</body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/31740-4.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/31740-4.html
@@ -1,3 +1,4 @@
 
				 <html><body>Caradine:<br>
			
 
				 My master wants to meet you. Are you ready? Close your eyes...<br>
			
 
				-<a action="bypass -h Quest Q00247_PossessorOfAPreciousSoul4 31740-5.html">"I'm ready."</a></body></html>
			
 
				+<a action="bypass -h Quest Q00247_PossessorOfAPreciousSoul4 31740-5.html">"I'm ready."</a>
			
 
				+</body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/31745-1.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/31745-1.html
@@ -1,3 +1,4 @@
 
				 <html><body>Lady of the Lake:<br>
			
 
				 Finally I meet the one who bears a holy soul.<br>I've been waiting.<br>
			
 
				-<a action="bypass -h Quest Q00247_PossessorOfAPreciousSoul4 31745-2.html">"I've been waiting to meet you, too."</a></body></html>
			
 
				+<a action="bypass -h Quest Q00247_PossessorOfAPreciousSoul4 31745-2.html">"I've been waiting to meet you, to."</a>
			
 
				+</body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/31745-2.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/31745-2.html
@@ -2,4 +2,5 @@
 
				 Your path has been difficult, but your journey is not over yet. You must fulfill your destiny.<br>
			
 
				 I came here to find a new future, but my mother's wishes kept me from it. I can't help you much either.<br>
			
 
				 I will answer the question that you've had on your mind.<br>
			
 
				-<a action="bypass -h Quest Q00247_PossessorOfAPreciousSoul4 31745-3.html">"Who are you and why are you here?"</a></body></html>
			
 
				+<a action="bypass -h Quest Q00247_PossessorOfAPreciousSoul4 31745-3.html">"Who are you and why are you here?"</a>
			
 
				+</body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/31745-3.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/31745-3.html
@@ -1,7 +1,6 @@
 
				 <html><body>Lady of the Lake:<br>
			
 
				 Don't you know who I am?<br>
			
 
				-My mother lost everything that she loved, and her grief over the betrayal was overpowering. 
			
 
				-I am the child who holds hope and faith in the future. Some call me the Goddess of Water, but that title really belongs to my sister. 
			
 
				-My name is Eva.<br>
			
 
				+My mother lost everything that she loved, and her grief over the betrayal was overpowering. I am the child who holds hope and faith in the future. Some call me the Goddess of Water, but that title really belongs to my sister. My name is Eva.<br>
			
 
				 I will give my trust to a mortal over my own siblings, if they recite with conviction, and believe in that new future. Can you do that?<br>
			
 
				-<a action="bypass -h Quest Q00247_PossessorOfAPreciousSoul4 31745-4.html">"I will with my entire body and soul."</a></body></html>
			
 
				+<a action="bypass -h Quest Q00247_PossessorOfAPreciousSoul4 31745-4.html">"I will with my entire body and soul."</a>
			
 
				+</body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/31745-4.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/31745-4.html
@@ -1,3 +1,4 @@
 
				 <html><body>Lady of the Lake:<br>
			
 
				 The world is a battleground, where everyone fights for themselves. Can you allow your love for Humans to blossom even in this sad state?<br>
			
 
				-<a action="bypass -h Quest Q00247_PossessorOfAPreciousSoul4 31745-5.html">"Of course. As you wish."</a></body></html>
			
 
				+<a action="bypass -h Quest Q00247_PossessorOfAPreciousSoul4 31745-5.html">"Of course. As you wish."</a>
			
 
				+</body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/31745-5.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/31745-5.html
@@ -1,2 +1,3 @@
 
				 <html><body>Lady of the Lake:<br>
			
 
				-You and I will open a new future for this world with infinite possibilities! May you be eternally blessed.</body></html>
			
 
				+You and I will open a new future for this world with infinite possibilities! May you be eternally blessed.
			
 
				+</body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java
@@ -99,10 +99,20 @@ public class Q00247_PossessorOfAPreciousSoul4 extends Quest
 
				 		{
			
 
				 			case CARADINE:
			
 
				 			{
			
 
				-				htmltext = ((player.getLevel() >= 75) ? "31740-1.htm" : "31740-2.html");
			
 
				-				if (st.getState() == State.COMPLETED)
			
 
				+				switch (st.getState())
			
 
				 				{
			
 
				-					htmltext = getAlreadyCompletedMsg(player);
			
 
				+					case State.CREATED:
			
 
				+						htmltext = ((player.getLevel() >= 75) ? "31740-1.htm" : "31740-2.html");
			
 
				+						break;
			
 
				+					case State.STARTED:
			
 
				+						if (st.isCond(1) && st.hasQuestItems(CARADINE_LETTER_LAST))
			
 
				+						{
			
 
				+							htmltext = "31740-6.html";
			
 
				+						}
			
 
				+						break;
			
 
				+					case State.COMPLETED:
			
 
				+						htmltext = getAlreadyCompletedMsg(player);
			
 
				+						break;
			
 
				 				}
			
 
				 				break;
			
 
				 			}
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/no_sub.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/no_sub.html
@@ -1,3 +1,3 @@
 
				 <html><body>
			
 
				 Quest may only be undertaken by a character of the proper sub-class.
			
 
				-</body></html>
			
 
				+</body></html>