13 лет назад · deb0ae141c
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-00.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-00.html
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-03.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-03.htm
@@ -2,5 +2,5 @@
 
				 Athenia must have been wrong about you. Perhaps you should go hang out with your buddies over at the Helvetica Research Base.<br>

			
 
				 You clearly do not understand our purpose here.<br>

			
 
				 <a action="bypass -h Quest 309_ForAGoodCause 32647-04.htm">"Wait, wait. It's all clear to me now. Tell me what needs to be done."</a><br>

			
 
				-<a action="bypass -h Quest 309_ForAGoodCause 32647-07.htm">"See you later. I have some dwarves to go hang out with."</a>

			
 
				+<a action="bypass -h Quest 309_ForAGoodCause 32647-07.html">"See you later. I have some dwarves to go hang out with."</a>

			
 
				 </body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-04.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-04.htm
@@ -1,4 +1,4 @@
 
				 <html><body>Apprentice Atra:<br>

			
 
				 This movement's motto is "Education, Preservation, Dedication". If you have taken our pledge, then you must help us uphold these tenets. In order to return this place back to its former glory, we need to eradicate the Mucrokians. The lands between the Fields of Silence and the Field of Whispers is overrun with them. Please help us... before it is too late.<br>

			
 
				-<a action="bypass -h Quest 309_ForAGoodCause 32647-05.htm">"I'll be happy to help."</a>

			
 
				+<a action="bypass -h Quest 309_ForAGoodCause 32647-05.html">"I'll be happy to help."</a>

			
 
				 </body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-05.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-05.html
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-06.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-06.html
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-07.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-07.html
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-08.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-08.html
@@ -2,6 +2,6 @@
 
				 Ah, you've finally returned! What would you like to do next?<br>

			
 
				 <a action="bypass -h Quest 309_ForAGoodCause claimreward">Check reward list.</a><br>

			
 
				 <a action="bypass -h Quest 309_ForAGoodCause receivepieces">Receive Moirai Robe Set ingredient item (requires 100 Mucrokian skins).</a><br>

			
 
				-<a action="bypass -h Quest 309_ForAGoodCause 32647-12.htm">Continue with the task.</a><br>

			
 
				-<a action="bypass -h Quest 309_ForAGoodCause 32647-13.htm">Stop the quest.</a>

			
 
				+<a action="bypass -h Quest 309_ForAGoodCause 32647-12.html">Continue with the task.</a><br>

			
 
				+<a action="bypass -h Quest 309_ForAGoodCause 32647-13.html">Stop the quest.</a>

			
 
				 </body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-09.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-09.htm
@@ -1,6 +0,0 @@
 
				-<html><body>Apprentice Atra:<br>

			
 
				-You have not completed the Ceremony of Purification task. We cannot trust somebody who does not preform the mission.  If you are like this, we have no choice to charge you a fee out of your reward.<br>

			
 
				-How about that? If you carry out the mission, you cannot get rewarded wholly, but do you still want to get a reward after the mission? Will you just receive your reward now with a little loss?<br>

			
 
				-<a action="bypass -h Quest 309_ForAGoodCause 32647-10.htm">"I'll settle for it now."</a><br>

			
 
				-<a action="bypass -h Quest 309_ForAGoodCause 32647-12.htm">"I'll settle it later."</a>

			
 
				-</body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-09.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-09.html
@@ -0,0 +1,6 @@
 
				+<html><body>Apprentice Atra:<br>

			
 
				+You have not completed the Ceremony of Purification task. We cannot trust somebody who does not perform the mission. If you are like this, we have no choice to charge you a fee out of your reward.<br>

			
 
				+How about that? If you carry out the mission, you cannot get rewarded wholly, but do you still want to get a reward after the mission? Will you just receive your reward now with a little loss?<br>

			
 
				+<a action="bypass -h Quest 309_ForAGoodCause 32647-10.html">"I'll settle for it now."</a><br>

			
 
				+<a action="bypass -h Quest 309_ForAGoodCause 32647-12.html">"I'll settle it later."</a>

			
 
				+</body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-10.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-10.html
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-11.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-11.html
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-12.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-12.html
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-13.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-13.html
@@ -2,5 +2,5 @@
 
				 How about receiving the reward before you quit? I'm just letting you know since there is an evidence of hunting.<br>

			
 
				 <a action="bypass -h Quest 309_ForAGoodCause claimreward">Check reward list.</a><br>

			
 
				 <a action="bypass -h Quest 309_ForAGoodCause receivepiece">Receive Moirai Robe Set ingredient item (requires 100 Mucrokian skins).</a><br>

			
 
				-<a action="bypass -h Quest 309_ForAGoodCause 32647-14.htm">Just quit the task.</a>

			
 
				+<a action="bypass -h Quest 309_ForAGoodCause 32647-14.html">Just quit the task.</a>

			
 
				 </body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-14.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-14.html
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-15.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-15.htm
@@ -1,6 +0,0 @@
 
				-<html><body>Apprentice Atra:<br>

			
 
				-Thank you for making efforts for us, but we need more pelts. It would be difficult to give you that item.<br>

			
 
				-Please try harder.<br>

			
 
				-<a action="bypass -h Quest 309_ForAGoodCause 32647-12.htm">"Alright, I'll continue to hunt."</a><br>

			
 
				-<a action="bypass -h Quest 309_ForAGoodCause 32647-14.htm">"I wish to stop the task"</a>

			
 
				-</body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-15.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-15.html
@@ -0,0 +1,6 @@
 
				+<html><body>Apprentice Atra:<br>

			
 
				+Thank you for making efforts for us, but we need more pelts. It would be difficult to give you that item.<br>

			
 
				+Please try harder.<br>

			
 
				+<a action="bypass -h Quest 309_ForAGoodCause 32647-12.html">"Alright, I'll continue to hunt."</a><br>

			
 
				+<a action="bypass -h Quest 309_ForAGoodCause 32647-14.html">"I wish to stop the task"</a>

			
 
				+</body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-16.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-16.html
@@ -1,5 +1,5 @@
 
				 <html><body>Apprentice Atra:<br>

			
 
				 I'll take those hides, and here is the item you requested.<br>

			
 
				 Are you ready for more work?<br>

			
 
				-<a action="bypass -h Quest 309_ForAGoodCause 32647-12.htm">"I'm ready for more work."</a>

			
 
				+<a action="bypass -h Quest 309_ForAGoodCause 32647-12.html">"I'm ready for more work."</a>

			
 
				 </body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-17.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/32647-17.html
@@ -1,4 +1,4 @@
 
				 <html><body>Apprentice Atra:<br>

			
 
				 I know that you've already been in charge of helping Dwarves at the Reed Field Development Base, Are you spying around? I suggest you to leave as soon as possible.<br>

			
 
				-(This quest cannot be preformed at the same time with the movement participation quest.)

			
 
				+(This quest cannot be performed at the same time with the movement participation quest.)

			
 
				 </body></html>
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/Q309_ForAGoodCause.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/Q309_ForAGoodCause.java
@@ -92,7 +92,7 @@ public class Q309_ForAGoodCause extends Quest
 
				 		}

			
 
				 		

			
 
				 		String htmltext = event;

			
 
				-		if (event.equalsIgnoreCase("32647-05.htm"))

			
 
				+		if (event.equalsIgnoreCase("32647-05.html"))

			
 
				 		{

			
 
				 			st.setState(State.STARTED);

			
 
				 			st.set("cond", "1");

			
@@ -104,11 +104,11 @@ public class Q309_ForAGoodCause extends Quest
 
				 			final QuestState qs = player.getQuestState("239_WontYouJoinUs");

			
 
				 			if (qs != null)

			
 
				 			{

			
 
				-				htmltext = (qs.isCompleted()) ? "32647-11.htm" : "32647-10.htm";

			
 
				+				htmltext = (qs.isCompleted()) ? "32647-11.html" : "32647-10.html";

			
 
				 			}

			
 
				 			else

			
 
				 			{

			
 
				-				htmltext = "32647-09.htm";

			
 
				+				htmltext = "32647-09.html";

			
 
				 			}

			
 
				 		}

			
 
				 		else if (event.equalsIgnoreCase("receivepieces"))

			
@@ -247,7 +247,7 @@ public class Q309_ForAGoodCause extends Quest
 
				 				htmltext = onRecipeExchangeRequest(st, REC_DYNASTY_RING_70, MUCROKIAN_HIDE, 128);

			
 
				 			}

			
 
				 		}

			
 
				-		else if (event.equalsIgnoreCase("32647-14.htm") || event.equalsIgnoreCase("32647-07.htm"))

			
 
				+		else if (event.equalsIgnoreCase("32647-14.html") || event.equalsIgnoreCase("32647-07.html"))

			
 
				 		{

			
 
				 			st.playSound("ItemSound.quest_finish");

			
 
				 			st.exitQuest(true);

			
@@ -270,7 +270,7 @@ public class Q309_ForAGoodCause extends Quest
 
				 			final QuestState qs = player.getQuestState("308_ReedFieldMaintenance");

			
 
				 			if ((qs != null) && qs.isStarted())

			
 
				 			{

			
 
				-				htmltext = "32647-17.htm";

			
 
				+				htmltext = "32647-17.html";

			
 
				 			}

			
 
				 			else if (st.isStarted())

			
 
				 			{

			
@@ -278,7 +278,7 @@ public class Q309_ForAGoodCause extends Quest
 
				 			}

			
 
				 			else

			
 
				 			{

			
 
				-				htmltext = (player.getLevel() >= 82) ? "32647-01.htm" : "32647-00.htm";

			
 
				+				htmltext = (player.getLevel() >= 82) ? "32647-01.htm" : "32647-00.html";

			
 
				 			}

			
 
				 		}

			
 
				 		return htmltext;

			
@@ -288,12 +288,7 @@ public class Q309_ForAGoodCause extends Quest
 
				 	public String onKill(L2Npc npc, L2PcInstance player, boolean isPet)

			
 
				 	{

			
 
				 		final QuestState st = player.getQuestState(qn);

			
 
				-		if (st == null)

			
 
				-		{

			
 
				-			return null;

			
 
				-		}

			
 
				-		

			
 
				-		if (st.getInt("cond") == 1)

			
 
				+		if ((st != null) && (st.getInt("cond") == 1))

			
 
				 		{

			
 
				 			if (Util.contains(MUCROKIANS, npc.getNpcId()))

			
 
				 			{

			
@@ -324,9 +319,9 @@ public class Q309_ForAGoodCause extends Quest
 
				 			st.giveItems(pieces, getRandom(1, 4));

			
 
				 			st.takeItems(MUCROKIAN_HIDE, event);

			
 
				 			st.playSound("ItemSound.quest_finish");

			
 
				-			return "32647-16.htm";

			
 
				+			return "32647-16.html";

			
 
				 		}

			
 
				-		return "32647-15.htm";

			
 
				+		return "32647-15.html";

			
 
				 	}

			
 
				 	

			
 
				 	private String onRecipeExchangeRequest(QuestState st, int recipe, int takeid, int quanty)

			
@@ -336,9 +331,9 @@ public class Q309_ForAGoodCause extends Quest
 
				 			st.giveItems(recipe, 1);

			
 
				 			st.takeItems(takeid, quanty);

			
 
				 			st.playSound("ItemSound.quest_finish");

			
 
				-			return "32647-16.htm";

			
 
				+			return "32647-16.html";

			
 
				 		}

			
 
				-		return "32647-15.htm";

			
 
				+		return "32647-15.html";

			
 
				 	}

			
 
				 	

			
 
				 	public Q309_ForAGoodCause(int id, String name, String descr)

			
@@ -352,6 +347,6 @@ public class Q309_ForAGoodCause extends Quest
 
				 	

			
 
				 	public static void main(String[] args)

			
 
				 	{

			
 
				-		new Q309_ForAGoodCause(309, "309_ForAGoodCause", "For A Good Cause");

			
 
				+		new Q309_ForAGoodCause(309, qn, "For A Good Cause");

			
 
				 	}

			
 
				 }
			
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q376_ExplorationOfTheGiantsCavePart1/31147-03.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q376_ExplorationOfTheGiantsCavePart1/31147-03.html