diff --git a/L2J_DataPack/dist/game/data/scripts.cfg b/L2J_DataPack/dist/game/data/scripts.cfg
index 7cae3586dddc3720027d2bf2706ff1f436a29053..92a488e474e6d38c495f354155015bc0512e9f4d 100644
--- a/L2J_DataPack/dist/game/data/scripts.cfg
+++ b/L2J_DataPack/dist/game/data/scripts.cfg
@@ -255,7 +255,6 @@ quests/386_StolenDignity/__init__.py
quests/419_GetAPet/__init__.py
quests/422_RepentYourSins/__init__.py
quests/426_FishingShot/__init__.py
-quests/501_ProofOfClanAlliance/__init__.py
quests/503_PursuitClanAmbition/__init__.py
quests/604_DaimontheWhiteEyedPart2/__init__.py
quests/620_FourGoblets/__init__.py
diff --git a/L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
index c73455531ed2a040da09935c18001874a53385fa..1cdd146521d64b95e5e5d27041a79f772a92a2d2 100644
--- a/L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
+++ b/L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
@@ -147,6 +147,12 @@ public class AdminAdmin implements IAdminCommandHandler
activeChar.sendMessage("This player has already claimed the hero status.");
return false;
}
+
+ if (!Hero.getInstance().isUnclaimedHero(target.getObjectId()))
+ {
+ activeChar.sendMessage("This player cannot claim the hero status.");
+ return false;
+ }
Hero.getInstance().claimHero(target);
}
else if (command.startsWith("admin_diet"))
diff --git a/L2J_DataPack/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java b/L2J_DataPack/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java
index c0b4013ad4f7f490088890a3bdc86751e162918b..a62cfefb0920031bb30341de62de6e9467173a7b 100644
--- a/L2J_DataPack/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java
+++ b/L2J_DataPack/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java
@@ -343,7 +343,7 @@ public class OlympiadManagerLink implements IBypassHandler
activeChar.sendPacket(new ExHeroList());
break;
case 5: // Hero Certification
- if (!Hero.getInstance().isHero(activeChar.getObjectId()))
+ if (Hero.getInstance().isUnclaimedHero(activeChar.getObjectId()))
{
Hero.getInstance().claimHero(activeChar);
reply.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "hero_receive.htm");
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-03.htm
deleted file mode 100644
index ac2119837d6bae0454aa26de41af94004c1ed478..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-03.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Sir Kristof Rodemai:<br>
-Ah, the Proof of Alliance! Good work! However you mustn't forget that this is only your first step towards changing the world. We still have many daunting tasks ahead of us.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-04.htm
deleted file mode 100644
index 063776636bab4ea0b3ddda26101ea8059825e0ee..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-04.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Sir Kristof Rodemai:<br>
-Will you join me in creating a new world order?<br>
-<a action="bypass -h Quest 501_ProofOfClanAlliance 30756-06.htm">"I will join you."</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-06.htm b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-06.htm
deleted file mode 100644
index 0405e52c109a486c45859316b4017bf0e6c11b5f..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-06.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Sir Kristof Rodemai:<br>
-I can see that you have what it takes to be a great leader, but to earn the respect of your peers your clan must demonstrate its ability. <br>How about this? There is a witch named Kalis who lives near the Ivory Tower. She administers a test that determines one's heroism. Those who have passed this test are widely regarded as true heroes. If your clan passes the test, there will be no doubt of your abilities. What do you think? Will you and your clan take the test?<br>
-<a action="bypass -h Quest 501_ProofOfClanAlliance 30756-07.htm">"We shall take the test!"</a><br>
-<a action="bypass -h Quest 501_ProofOfClanAlliance 30756-08.htm">"We will not take the test."</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-07.htm b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-07.htm
deleted file mode 100644
index 1b5ea49c02092b645560b70aa20edacc51e22906..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-07.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Sir Kristof Rodemai:<br>
-Your courage is impressive. Good luck on the test.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30757-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30757-01.htm
deleted file mode 100644
index 5ca176b3cd811fb917fa35eda914b5d47552a165..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30757-01.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Statue of Offering:<br>
-Do you wish to take the test for your clan lord? You should consider your answer carefully. It could cost you your life.<br>Only those with the firmest resolve should step forward and answer my question.<br>Would you die for your clan lord? Now, give me an answer!<br>
-<a action="bypass -h Quest 501_ProofOfClanAlliance 30757-05.htm">"I will sacrifice my life to prove loyalty to my clan lord."</a><br>
-<a action="bypass -h Quest 501_ProofOfClanAlliance 30757-07.htm">Quit the test</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30757-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30757-02.htm
deleted file mode 100644
index 951a78eb7445de9067d69f487f5b9ee55d840432..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30757-02.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Statue of Offering:<br>
-A clan lord cannot take this test.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30757-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30757-03.htm
deleted file mode 100644
index 7eae968db30ccc34721ea1fb1fcda8c3d615bec4..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30757-03.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Statue of Offering:<br>
-Haven't you already proven your loyalty?</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30757-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30757-04.htm
deleted file mode 100644
index 328c60ddd224a984bb0caf41a884b0295dd4f4cd..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30757-04.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Statue of Offering:<br>
-You lack even the experience to be be killed by this test! Count your blessings! You will live to die another day.<br>(Only a clan member of level 40 or above can take this test.)</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30757-05.htm b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30757-05.htm
deleted file mode 100644
index b1c5ca8be67c1c38d208bd3caaede3afed6baaf9..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30757-05.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>
-Statue of Offering:<br>Death shall be your reward. Now prove your loyalty!</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30757-07.htm b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30757-07.htm
deleted file mode 100644
index 55f50cc6875d220fe06f9da7a9aaaa24e8968d25..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30757-07.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>
-Statue of Offering:<br>...</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30757-08.htm b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30757-08.htm
deleted file mode 100644
index 58b8af51e8e672d805ead83d61ea55492fb864ef..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30757-08.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Statue of Offering:<br>
-Does your clan lord truly wish to take the test?</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-01.htm
deleted file mode 100644
index 402477efa537db1d0b4f8c0f337a8c1d2af66df9..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-01.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Witch Athrea:<br>
-I cannot give the <font color="LEVEL">Blood of Eva</font> to just anyone who asks for it! My older sister Kalis would be furious!<br>If you wish to obtain the Blood of Eva, you must pass the test I will give you.<br>
-<a action="bypass -h Quest 501_ProofOfClanAlliance 30758-02.htm">"I will take the test."</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-02.htm
deleted file mode 100644
index 42f83d8003489e1cb3d386ce8177ad422621b34c..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-02.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Witch Athrea:<br>
-You seem quick-witted enough. I will explain the test to you.<br>It's very simple. I trust you have drawn lots before? Think of this as drawing boxes.<br>First I will summon 16 boxes. Among them, four boxes are enchanted and shout when they are broken. You must find all the enchanted boxes and break them so that they will shout four times. It is possible to break all the boxes, but there is a time limit. If you cannot break the boxes within the given time, they will all disappear.<br>Shall we start the game?<br>
-<a action="bypass -h Quest 501_ProofOfClanAlliance 30758-03.htm">"Start the game."</a><br>
-<a action="bypass -h Quest 501_ProofOfClanAlliance 30758-05.htm">"I am not ready yet."</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-03.htm
deleted file mode 100644
index 8dcf293a56aba6bba9f21a6235f7dafe1faeae30..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-03.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>
-Witch Athrea:<br>Each one of the four enchanted boxes will say <font color="LEVEL">"Bingo!"</font> when broken. Funny, huh?<br>Why are you making a face?<br>Oh well, keep it in mind. <font color="LEVEL">Let's begin!</font></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-04.htm
deleted file mode 100644
index 41c21b7091b406328c34b5f6f06af270f26c6247..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-04.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>
-Witch Athrea:<br>Are you ready to begin the test? Well, we must wait until those people over there are finished. It shouldn't take long. You would do well to observe them and learn more about the test.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-05.htm b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-05.htm
deleted file mode 100644
index 535161d1b599d673fdf03d788c9038efa7183830..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-05.htm
+++ /dev/null
@@ -1 +0,0 @@
-<html><body>Witch Athrea:<br>Call upon all your abilities!</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-06.htm b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-06.htm
deleted file mode 100644
index 08a386fd4a876360f6d4eaeb7cac8b788af7e882..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-06.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Witch Athrea:<br>
-What? No boxes? Utter failure!<br>Well, well, well. I should just throw you out of here, but I'm too soft-hearted for that. You shall have one more chance to take the test, but it will be expensive.<br>These boxes aren't free, you understand? Give me 10,000 adena and I will make the boxes again. Is this agreeable?<br>
-<a action="bypass -h Quest 501_ProofOfClanAlliance 30758-07.htm">"I will pay you 10,000 adena."</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-08.htm b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-08.htm
deleted file mode 100644
index 953853da7f128518a1f51fe3932eab49a848e14c..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-08.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Witch Athrea:<br>
-Would you care to play the game again?<br>
-<a action="bypass -h Quest 501_ProofOfClanAlliance 30758-03.htm">"I want to play the game again."</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-10.htm b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-10.htm
deleted file mode 100644
index dafc91de37e9f47877ea9ffa0ab02ffcfeda2699..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-10.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Witch Athrea:<br>
-Do you really have the time to stand around gabbing like this? Unless you bring me the ingredients for the Antidote soon, your clan leader will surely die.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-01.htm
deleted file mode 100644
index ed659c8235ce71fb96172b23e389c9dbf153141b..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-01.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Witch Kalis:<br>
-Would you choose to be a star shining brightly in the midst of chaos?<br>Behold the graves of those who have fallen attempting to do this...<br>Are you prepared to rest alongside them?<br>
-<a action="bypass -h Quest 501_ProofOfClanAlliance 30759-02.htm">"I want to be a star."</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-02.htm
deleted file mode 100644
index fea9a4f45ceb2e2b6655583b14a86943853c824b..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-02.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Witch Kalis:<br>
-You fool! Do you think that you are immortal? The test begins! Are there any among your clan who would die for you?<br>
-<a action="bypass -h Quest 501_ProofOfClanAlliance 30759-03.htm">"There is one who will."</a><br>
-<a action="bypass -h Quest 501_ProofOfClanAlliance 30759-04.htm">"There are none who will."</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-04.htm
deleted file mode 100644
index afd9ed05ce8e728dfe31ef88888d3c9037ba5b2c..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-04.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Witch Kalis:<br>
-Just as I expected. All talk and no action.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-05.htm b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-05.htm
deleted file mode 100644
index b944bc4043791cfeddf116a7dbc7f19dc3cf4e80..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-05.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Witch Kalis:<br>
-Where is the confidence you so reeked of earlier? No comrades willing to risk their lives, eh?<br>Unless you bring me <font color="LEVEL">three symbols of loyalty</font>, you will never pass the test. In order to obtain the symbols, three of your clan must take an oath of their life at the <font color="LEVEL">table of sacrifice</font> and pledge complete loyalty to you.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-06.htm b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-06.htm
deleted file mode 100644
index f892c766f387e2951fd0b5487db13ffa47ff093d..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-06.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Witch Kalis:<br>
-Your comrades must have firm resolve and unfailing loyalty. In these days of the endless pursuit of profit, these are rare and noble qualities.<br>Now, do you trust your clan members? Would you bet your life on them? If so, then drink this poison and ask your clan members to gather the ingredients and bring back the Antidote! Here is a list of the ingredients needed for the Antidote. If your comrades can find and bring back all of the ingredients within one hour your life will be saved.<br>I wonder how hard your clan will try to save your life? Do you care to find out?<br>
-<a action="bypass -h Quest 501_ProofOfClanAlliance 30759-07.htm">Drink the poison</a><br>
-<a action="bypass -h Quest 501_ProofOfClanAlliance 30759-04.htm">Do not drink the poison</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-07.htm b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-07.htm
deleted file mode 100644
index 1c884def320b8184fb9e553b8d72bd88cd7e2f81..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-07.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Witch Kalis:<br>
-Tell me, how does the poison taste? Everything growing dark, is it? That would be death coming for you. I fear that soon we will need to add another grave here... Will your comrades find and bring back all the ingredients in time?<br>Oh, I do hate to see you in such pain. Would you care for some hints? <br>Herb of Vanor can be obtained from <font color="LEVEL">vanor silenos</font>. Herb of Harit can be obtained from <font color="LEVEL">harit lizardmen</font>. Herb of ol mahum can be obtained from <font color="LEVEL">ol mahums</font>. <font color="LEVEL">The Shamans</font> will have the herbs.<br>In order to obtain the Blood of Eva, you must visit <font color="LEVEL">Witch Athrea</font>. She is my younger sister. Some time ago she left for <font color="LEVEL">Hardin's Academy</font> to meet with Grand Magus Hardin.<br>Remember that <font color="LEVEL">when your clan members bring back all the ingredients, you must gather them up and bring them to me. I will create the Antidote for you.</font></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-08.htm b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-08.htm
deleted file mode 100644
index 8c4ea010ba993bb447c983cd4a98cecdcd7a6c78..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-08.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Witch Kalis:<br>
-Ah, all the ingredients of the Antidote! It has been a long time since this has happened. It is heartening to learn that there are still people like you and your clan with firm resolve and common trust! You are truly the soldiers of the new age! A bright star illuminating the darkness of this time! Please pardon my previous rudeness amd accept this Antidote and mark.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-10.htm b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-10.htm
deleted file mode 100644
index 0eb24a66df40c34a7de2b7a7d8ee309fe8cfd788..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-10.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Witch Kalis:<br>
-Your time among the living grows short. What has become of your comrades? Will they return in time to save your life?<br>Let me remind you again, <font color="LEVEL">when your clan members bring back all the ingredients, you must gather them and bring them to me personally. I will use them to make the Antidote.</font></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-12.htm b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-12.htm
deleted file mode 100644
index 69bddff13b93ab6b66414665e1e0beb11316c8bc..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-12.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Witch Kalis:<br>
-The lives of those who do not know their place often end prematurely. People should always live their lives within the proper boundaries. I don't have time to speak with you. Ask your clan lord to come and see me...</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/__init__.py
deleted file mode 100644
index 9c4605fe6bf109a290fbbf13650ff90aa60ccf5e..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/__init__.py
+++ /dev/null
@@ -1,339 +0,0 @@
-# Made by QuestDevs Team: DraX, DrLecter, Rolarga
-# With invaluable support from: [TI]Blue, warrax
-# v0.1.r0 2005.12.05
-# v1.1.r0 2008.03.27: Update/Rewrite by Emperorc
-import sys
-from com.l2jserver.gameserver.datatables import SkillData
-from com.l2jserver.gameserver.network.serverpackets import NpcSay
-from com.l2jserver.gameserver.network.serverpackets import MagicSkillUse
-from com.l2jserver.gameserver.model.quest import State
-from com.l2jserver.gameserver.model.quest import QuestState
-from com.l2jserver.gameserver.model.quest import Quest as JQuest
-
-qn="501_ProofOfClanAlliance"
-
-# debug facility, turn this to 0 to disable
-DEBUG = 0
-
-# Quest Npcs
-SIR_KRISTOF_RODEMAI = 30756
-STATUE_OF_OFFERING = 30757
-WITCH_ATHREA = 30758
-WITCH_KALIS = 30759
-
-# Quest Items
-HERB_OF_HARIT = 3832
-HERB_OF_VANOR = 3833
-HERB_OF_OEL_MAHUM = 3834
-BLOOD_OF_EVA = 3835
-SYMBOL_OF_LOYALTY = 3837
-PROOF_OF_ALLIANCE = 3874
-VOUCHER_OF_FAITH = 3873
-ANTIDOTE_RECIPE = 3872
-POTION_OF_RECOVERY= 3889
-
-#Quest mobs, locs and drop
-CHESTS = range(27173,27178)
-CHEST_LOCS = [
- [102273,103433,-3512],
- [102190,103379,-3524],
- [102107,103325,-3533],
- [102024,103271,-3500],
- [102327,103350,-3511],
- [102244,103296,-3518],
- [102161,103242,-3529],
- [102078,103188,-3500],
- [102381,103267,-3538],
- [102298,103213,-3532],
- [102215,103159,-3520],
- [102132,103105,-3513],
- [102435,103184,-3515],
- [102352,103130,-3522],
- [102269,103076,-3533],
- [102186,103022,-3541]
- ]
-
-MOBS={
- 20685 : HERB_OF_VANOR,
- 20644 : HERB_OF_HARIT,
- 20576 : HERB_OF_OEL_MAHUM
- }
-
-def leader(player) :
- leaderst = None
- clan = player.getClan()
- if clan :
- leader=clan.getLeader().getPlayerInstance()
- if leader :
- leaderst = leader.getQuestState(qn)
- return leaderst
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr) :
- JQuest.__init__(self,id,name,descr)
- self.questItemIds = [HERB_OF_VANOR, HERB_OF_HARIT, HERB_OF_OEL_MAHUM, BLOOD_OF_EVA, SYMBOL_OF_LOYALTY, ANTIDOTE_RECIPE, VOUCHER_OF_FAITH, POTION_OF_RECOVERY]
- self.athrea = self.chests = 0
-
- def onAdvEvent (self,event,npc,player) :
- if event == "chest_timer" :
- self.athrea = 0
- return
- if player.isClanLeader() : leaderst = st = player.getQuestState(qn)
- else :
- # non-leaders doing this quest need both their own quest state and the leader's
- st = player.getQuestState(qn)
- if not st: return
- leaderst = leader(player)
-
- if not leaderst :
- if DEBUG :
- debug = "Event can't find leader"
- print debug
- return debug
- return
- debug = ""
- htmltext = event
- if player.isClanLeader() :
- if event == "30756-07.htm" :
- st.playSound("ItemSound.quest_accept")
- st.set("cond","1")
- st.setState(State.STARTED)
- st.set("part","1")
- elif event == "30759-03.htm" :
- st.set("part","2")
- st.set("cond","2")
- st.set("dead_list"," ")
- elif event == "30759-07.htm" :
- st.takeItems(SYMBOL_OF_LOYALTY,1) #Item is not stackable, thus need to do this for each item
- st.takeItems(SYMBOL_OF_LOYALTY,1)
- st.takeItems(SYMBOL_OF_LOYALTY,1)
- st.giveItems(ANTIDOTE_RECIPE,1)
- st.set("part","3")
- st.set("cond","3")
- st.startQuestTimer("poison_timer",3600000)
- st.addNotifyOfDeath(player)
- SkillData.getInstance().getSkill(4082,1).applyEffects(npc,player);
- elif event == "poison_timer" :
- st.exitQuest(1)
- if DEBUG :
- debug = "Times Up! Quest failed!"
- print debug
- return debug
- return
- elif event == "30757-05.htm" :
- if player.isClanLeader() : return "Only Clan Members can sacrifice themselves!"
- if self.getRandom(10) > 5 :
- htmltext = "30757-06.htm"
- st.giveItems(SYMBOL_OF_LOYALTY,1)
- deadlist = leaderst.get("dead_list").split()
- deadlist.append(player.getName())
- leaderst.set("dead_list"," ".join(deadlist))
- else :
- skill = SkillData.getInstance().getSkill(4083,1)
- npc.setTarget(player)
- npc.doCast(skill)
- self.startQuestTimer(player.getName(),4000,npc,player,0)
- elif event == player.getName() :
- if player.isDead() :
- st.giveItems(SYMBOL_OF_LOYALTY,1)
- deadlist = leaderst.get("dead_list").split()
- deadlist.append(player.getName())
- leaderst.set("dead_list"," ".join(deadlist))
- elif DEBUG :
- debug = "player " + player.getName() + " didn't die!"
- print debug
- return debug
- return
- elif event == "30758-03.htm" :
- if not self.athrea :
- self.athrea = 1
- self.chests = 0
- leaderst.set("part","4")
- leaderst.set("chest_wins","0")
- for x,y,z in CHEST_LOCS :
- rand = self.getRandom(5)
- self.addSpawn(27173+rand,x,y,z,0,0,300000)
- self.startQuestTimer("chest_timer",300000,npc,player,0)
- else :
- htmltext = "30758-04.htm"
- elif event == "30758-07.htm" :
- if st.getQuestItemsCount(57) >= 10000 and not self.athrea :
- htmltext = "30758-08.htm"
- st.takeItems(57,10000)
- if DEBUG and debug :
- print debug
- return debug
- return htmltext
-
- def onTalk (self,npc,player) :
- htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
- if not st : return htmltext
- npcId = npc.getId()
- id = st.getState()
- clan = player.getClan()
- part = st.getInt("part")
- debug = ""
- if npcId == SIR_KRISTOF_RODEMAI :
- if id == State.CREATED :
- if player.isClanLeader() and clan :
- level = clan.getLevel()
- if level <= 2 :
- htmltext = "01"
- elif level >= 4 :
- htmltext = "02"
- elif level == 3 :
- if st.getQuestItemsCount(PROOF_OF_ALLIANCE) : #you already have the item, no need to complete the quest!
- htmltext = "03"
- else :
- htmltext = "04"
- else :
- htmltext = "05"
- elif id == State.STARTED :
- htmltext = "10"
- if st.getQuestItemsCount(VOUCHER_OF_FAITH) and part == 6 :
- st.playSound("ItemSound.quest_finish")
- st.takeItems(VOUCHER_OF_FAITH,1)
- st.giveItems(PROOF_OF_ALLIANCE,1)
- st.addExpAndSp(0,120000)
- st.exitQuest(False)
- htmltext = "09"
- elif npcId == WITCH_KALIS :
- if id == State.CREATED : #not a valid leader (has not started the quest yet) or a clan member
- leaderst = leader(player)
- if leaderst :
- if player.isClanLeader() or leaderst == st : return "You must see Rodemai to start the quest! I cannot help you!"
- elif leaderst.getState() == State.STARTED :
- htmltext = "12"
- elif DEBUG: debug = "Leader needs to start the quest!"
- elif DEBUG : debug = "Kalis cannot find leader"
- elif id == State.STARTED :
- symbol = st.getQuestItemsCount(SYMBOL_OF_LOYALTY)
- if part == 1 :#and not symbol :
- htmltext = "01"
- elif part == 2 and symbol < 3 :
- htmltext = "05"
- elif symbol >= 3 and not player.isAffectedBySkill(4082) :
- htmltext = "06"
- elif part == 5 and st.getQuestItemsCount(HERB_OF_HARIT) and st.getQuestItemsCount(HERB_OF_VANOR) and \
- st.getQuestItemsCount(HERB_OF_OEL_MAHUM) and st.getQuestItemsCount(BLOOD_OF_EVA) and player.isAffectedBySkill(4082):
- htmltext = "08"
- st.giveItems(VOUCHER_OF_FAITH,1)
- st.giveItems(POTION_OF_RECOVERY,1)
- for item in range(3832,3836) + [ANTIDOTE_RECIPE] :
- st.takeItems(item,-1)
- st.set("part","6")
- st.set("cond","4")
- timer = st.getQuestTimer("poison_timer")
- if timer != None : timer.cancel()
- elif part == 3 or part == 4 or part == 5 :
- if not player.isAffectedBySkill(4082) :
- htmltext = "09"
- st.set("part","1")
- st.takeItems(ANTIDOTE_RECIPE,-1)
- else :
- htmltext = "10"
- elif part == 6 :
- htmltext = "11"
- elif DEBUG : debug = "Uhhh....Kalis is confused by player: " + str(player)
- elif DEBUG : debug = "Leader has already finished the quest!"
- elif npcId == STATUE_OF_OFFERING :
- leaderst = leader(player)
- if leaderst :
- id = leaderst.getState()
- if id == State.STARTED :
- if leaderst.getInt("part") == 2 :
- if player.isClanLeader() or leaderst == st :
- htmltext = "02"
- else :
- if player.getLevel() >= 40 :
- dlist = leaderst.get("dead_list").split()
- if player.getName() not in dlist and len(dlist) < 3:
- htmltext = "01"
- else :
- htmltext = "03"
- else :
- htmltext = "04"
- elif DEBUG : debug = "wrong state for sacrifice"
- else :
- htmltext = "08"
- if DEBUG : debug = "Leader must start the quest or has already finished the quest!"
- elif DEBUG : debug = "Statue can't find leader"
- elif npcId == WITCH_ATHREA :
- leaderst = leader(player)
- if leaderst :
- id = leaderst.getState()
- if id == State.STARTED :
- part = leaderst.getInt("part")
- if part == 3 and leaderst.getQuestItemsCount(ANTIDOTE_RECIPE) and not leaderst.getQuestItemsCount(BLOOD_OF_EVA) :
- htmltext = "01"
- elif part == 5 :
- htmltext = "10"
- elif part == 4 :
- htmltext = "06"
- if leaderst.getInt("chest_wins") >= 4 :
- htmltext = "09"
- st.giveItems(BLOOD_OF_EVA,1)
- leaderst.set("part","5")
- elif DEBUG : debug = "You should go seek help elsewhere! I cannot help you in your current state!"
- elif DEBUG : debug = "You must have the quest started!"
- elif DEBUG : debug = "Athrea can't find your leader!"
- if DEBUG and debug :
- print debug
- return debug
- if htmltext.isdigit() :
- htmltext = str(npcId) + "-" + htmltext + ".htm"
- return htmltext
-
- def onKill(self,npc,player,isPet) :
- leaderst = leader(player)
- if not leaderst : return
- if not leaderst.getState() == State.STARTED :
- if DEBUG :
- print "onKill says leader needs to start quest"
- return "Need to start quest!"
- return
- part = leaderst.getInt("part")
- npcId = npc.getId()
- if npcId in CHESTS and part == 4 :
- wins = leaderst.getInt("chest_wins")
- if (self.chests - wins) == 12 or (wins < 4 and not self.getRandom(4)) :
- wins += 1
- leaderst.set("chest_wins",str(wins))
- npc.broadcastPacket(NpcSay(npc.getObjectId(),0,npc.getId(),"###### BINGO! ######"))
- self.chests += 1
- elif npcId in MOBS.keys() :
- st = player.getQuestState(qn)
- if not st : st = self.newQuestState(player)
- if st == leaderst : return
- if part >=3 and part < 6 :
- if not self.getRandom(10) :
- st.giveItems(MOBS[npcId],1)
- st.playSound("ItemSound.quest_itemget")
- elif DEBUG :
- print "onKill says leader is not correct state"+str(part)
- return "leader is not correct state"
- return
-
- # only leaders are registered for onDeath. Therefore, st should always match that of the leader
- def onDeath(self, npc, pc, st) :
- if st.getPlayer() == pc :
- timer1 = st.getQuestTimer("poison_timer")
- if timer1 != None : timer1.cancel()
- st.exitQuest(1)
- if DEBUG :
- print "leader died, quest failed"
- return "Leader died, quest failed"
- return
-
-QUEST = Quest(501,qn,"Proof of Clan Alliance")
-
-QUEST.addStartNpc(SIR_KRISTOF_RODEMAI)
-QUEST.addStartNpc(STATUE_OF_OFFERING)
-
-for i in [SIR_KRISTOF_RODEMAI,STATUE_OF_OFFERING,WITCH_KALIS,WITCH_ATHREA] :
- QUEST.addTalkId(i)
-
-for i in MOBS.keys() + CHESTS :
- QUEST.addKillId(i)
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-01.html
similarity index 67%
rename from L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-01.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-01.html
index 4bdc9614de99c4def4745eada4c50aa0b1c4b7f4..7f3a6de06276d2bf141402a8594ccfe007439490 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-01.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-01.html
@@ -1,2 +1,4 @@
<html><body>Sir Kristof Rodemai:<br>
-What is your opinion on the current state of affairs? The disintegration of royal authority has been disastrous for the kingdom, with chaos and dissent running rampant throughout the land. Now even the evil spirits are acting with impunity. When your clan becomes stronger, you should join with me to change the world! <br>(This quest may only be undertaken by a level 3 clan.)</body></html>
\ No newline at end of file
+What is your opinion on the current state of affairs? The disintegration of royal authority has been disastrous for the kingdom, with chaos and dissent running rampant throughout the land. Now even the evil spirits are acting with impunity. When your clan becomes stronger, you should join with me to change the world!<br>
+(This quest may only be undertaken by a level 3 clan.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-02.html
similarity index 55%
rename from L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-02.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-02.html
index 912de01a08d176ad89c70cb082d40bbd2c936db0..a9231dec7acd6fbe72be630dc274ebbdf9506115 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-02.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-02.html
@@ -1,2 +1,4 @@
<html><body>Sir Kristof Rodemai:<br>
-In these difficult times we must call upon a new generation to restore order! All right-thinking young people such as you and your clan must join in this effort if we are to survive. <br>(This quest may only be undertaken by a level 3 clan.)</body></html>
\ No newline at end of file
+In these difficult times we must call upon a new generation to restore order! All right-thinking young people such as you and your clan must join in this effort if we are to survive.<br>
+(This quest may only be undertaken by a level 3 clan.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-03.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..e2ccdb4aba3f179c089880faa7a02c1b2f5c0125
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-03.html
@@ -0,0 +1,3 @@
+<html><body>Sir Kristof Rodemai:<br>
+Ah, the Alliance Manifesto! Good work! However you mustn't forget that this is only your first step towards changing the world. We still have many daunting tasks ahead of us.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-04.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-04.html
new file mode 100644
index 0000000000000000000000000000000000000000..c577639e51bd73923080e05abc8e04a1682f8554
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-04.html
@@ -0,0 +1,4 @@
+<html><body>Sir Kristof Rodemai:<br>
+Will you join me in creating a new world order?<br>
+<a action="bypass -h Quest Q00501_ProofOfClanAlliance 30756-06.html">"I will join you."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-05.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-05.html
similarity index 50%
rename from L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-05.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-05.html
index 48e95f8cdc7efb819219ba3e03c4c8143edcd12d..fb56d9847bfba21cff16cb479fc25e3652e61164 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-05.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-05.html
@@ -1,2 +1,5 @@
<html><body>Sir Kristof Rodemai:<br>
-What is your opinion on the current state of affairs? The disintegration of royal authority has been disastrous for the kingdom, with chaos and dissent running rampant throughout the land. Now even the evil spirits are acting with impunity. <br>Why am am wasting time talking to you? I demand to speak with your clan leader!<br>(This quest may only be undertaken by a clan leader of a level 3 clan.)</body></html>
\ No newline at end of file
+What is your opinion on the current state of affairs? The disintegration of royal authority has been disastrous for the kingdom, with chaos and dissent running rampant throughout the land. Now even the evil spirits are acting with impunity.<br>
+Why am am wasting time talking to you? I demand to speak with your clan leader!<br>
+(This quest may only be undertaken by a clan leader of a level 3 clan.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-06.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-06.html
new file mode 100644
index 0000000000000000000000000000000000000000..7667cb3dab3898e3141e89214d8e9646dd048513
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-06.html
@@ -0,0 +1,6 @@
+<html><body>Sir Kristof Rodemai:<br>
+I can see that you have what it takes to be a great leader, but to earn the respect of your peers your clan must demonstrate its ability.<br>
+How about this? There is a witch named Kalis who lives near the Ivory Tower. She administers a test that determines one's heroism. Those who have passed this test are widely regarded as true heroes. If your clan passes the test, there will be no doubt of your abilities. What do you think? Will you and your clan take the test?<br>
+<a action="bypass -h Quest Q00501_ProofOfClanAlliance 30756-07.html">"We shall take the test!"</a><br>
+<a action="bypass -h Quest Q00501_ProofOfClanAlliance 30756-08.html">"We will not take the test."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-07.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-07.html
new file mode 100644
index 0000000000000000000000000000000000000000..1bd7520412f835b52d61960ad4a1fb519bfbfb91
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-07.html
@@ -0,0 +1,3 @@
+<html><body>Sir Kristof Rodemai:<br>
+Your courage is impressive. Good luck on the test.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-08.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-08.html
similarity index 84%
rename from L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-08.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-08.html
index 465ebb22ba7cc17010abfcf2aed35afe9d9ed6d3..b0c6a863e745a468ac661eee6bf127d5559c09b1 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-08.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-08.html
@@ -1,2 +1,3 @@
<html><body>Sir Kristof Rodemai:<br>
-Oh well, I understand your reluctance. May you live a long life...</body></html>
\ No newline at end of file
+Oh well, I understand your reluctance. May you live a long life...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-09.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-09.html
similarity index 77%
rename from L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-09.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-09.html
index 3650473ddc168a31157dad117b99065b0e8b0e98..64cf54fd29aa560a48e1aa574a5348a5b11b70c4 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-09.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-09.html
@@ -1,2 +1,3 @@
<html><body>Sir Kristof Rodemai:<br>
-I judged wisely when I selected you. We are of equal caliber, and I'm sure we will become fast friends. Of course this is not to say it will always be so. For now, let's enjoy each other's company. Here, as promised, is the Proof of Alliance.</body></html>
\ No newline at end of file
+I judged wisely when I selected you. We are of equal caliber, and I'm sure we will become fast friends. Of course this is not to say it will always be so. For now, let's enjoy each other's company. Here, as promised, is the Alliance Manifesto.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-10.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-10.html
similarity index 89%
rename from L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-10.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-10.html
index 2972632a495a949b109923b8620ee2ec08320ca7..1d3fd91be661a4680c11567241cdf69cfef1c07f 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30756-10.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30756-10.html
@@ -1,2 +1,3 @@
<html><body>Sir Kristof Rodemai:<br>
-There is talk of vagabonds banding together and calling themselves a clan... I hope that is not what you are. Time is short! If you will not prove your abilities, I shall look elsewhere for assistance.</body></html>
\ No newline at end of file
+There is talk of vagabonds banding together and calling themselves a clan... I hope that is not what you are. Time is short! If you will not prove your abilities, I shall look elsewhere for assistance.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30757-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30757-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..e895311c85d14c4c5824ad2b03023d22c33f38ed
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30757-01.html
@@ -0,0 +1,7 @@
+<html><body>Statue of Offering:<br>
+Do you wish to take the test for your clan lord? You should consider your answer carefully. It could cost you your life.<br>
+Only those with the firmest resolve should step forward and answer my question.<br>
+Would you die for your clan lord? Now, give me an answer!<br>
+<a action="bypass -h Quest Q00501_ProofOfClanAlliance 30757-04.html">"I will sacrifice my life to prove loyalty to my clan lord."</a><br>
+<a action="bypass -h Quest Q00501_ProofOfClanAlliance 30757-05.html">Quit the test</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30757-01a.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30757-01a.html
new file mode 100644
index 0000000000000000000000000000000000000000..f862cbfadb7bf60cec0215ede019ac5932f42b0a
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30757-01a.html
@@ -0,0 +1,3 @@
+<html><body>Statue of Offering:<br>
+A clan lord cannot take this test.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30757-01b.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30757-01b.html
new file mode 100644
index 0000000000000000000000000000000000000000..bcaa50c67791fc88ca6afc3669b4483ebc9b1dfc
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30757-01b.html
@@ -0,0 +1,3 @@
+<html><body>Statue of Offering:<br>
+Haven't you already proven your loyalty?
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30757-02.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30757-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..c7c54f2a134993b196a059531c2a1b474adf3d91
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30757-02.html
@@ -0,0 +1,4 @@
+<html><body>Statue of Offering:<br>
+You lack even the experience to be be killed by this test! Count your blessings! You will live to die another day.<br>
+(Only a clan member of level 40 or above can take this test.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30757-03.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30757-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..6d011b74bbc0218441b96ad874c74072002ab797
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30757-03.html
@@ -0,0 +1,3 @@
+<html><body>Statue of Offering:<br>
+Death shall be your reward. Now prove your loyalty!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30757-06.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30757-04.html
similarity index 74%
rename from L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30757-06.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30757-04.html
index cb67e95f55ec0c376e6c48304b510d65d008437b..31686b44f84c6e929f249ffb5a485bd2c494ec95 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30757-06.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30757-04.html
@@ -1,2 +1,3 @@
<html><body>Statue of Offering:<br>
-Your loyalty is impressive! Now return to your clan lord with your head held high.</body></html>
\ No newline at end of file
+Your loyalty is impressive! Now return to your clan lord with your head held high.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30757-05.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30757-05.html
new file mode 100644
index 0000000000000000000000000000000000000000..6414a3206249732c4c9afad687cb6419ca06ae3c
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30757-05.html
@@ -0,0 +1,3 @@
+<html><body>Statue of Offering:<br>
+...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30757-06.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30757-06.html
new file mode 100644
index 0000000000000000000000000000000000000000..b13a55294f8aa24ad75e296d78c3c2f508609de3
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30757-06.html
@@ -0,0 +1,3 @@
+<html><body>Statue of Offering:<br>
+Does your clan lord truly wish to take the test?
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..66bb7b5374e3aae383316ead83f4c58cbd6b9518
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-01.html
@@ -0,0 +1,5 @@
+<html><body>Witch Athrea:<br>
+I cannot give the <font color="LEVEL">Blood of Eva</font> to just anyone who asks for it! My older sister Kalis would be furious!<br>
+If you wish to obtain the Blood of Eva, you must pass the test I will give you.<br>
+<a action="bypass -h Quest Q00501_ProofOfClanAlliance 30758-02.html">"I will take the test."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-02.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..5cf202280d0d5bb111d7f7817454587837cb0891
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-02.html
@@ -0,0 +1,8 @@
+<html><body>Witch Athrea:<br>
+You seem quick-witted enough. I will explain the test to you.<br>
+It's very simple. I trust you have drawn lots before? Think of this as drawing boxes.<br>
+First I will summon 16 boxes. Among them, four boxes are enchanted and shout when they are broken. You must find all the enchanted boxes and break them so that they will shout four times. It is possible to break all the boxes, but there is a time limit. If you cannot break the boxes within the given time, they will all disappear.<br>
+Shall we start the game?<br>
+<a action="bypass -h Quest Q00501_ProofOfClanAlliance 30758-03.html">"Start the game."</a><br>
+<a action="bypass -h Quest Q00501_ProofOfClanAlliance 30758-04.html">"I am not ready yet."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-03.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..b129c15e274385d21109e73dfac7717ff44be401
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-03.html
@@ -0,0 +1,5 @@
+<html><body>Witch Athrea:<br>
+Each one of the four enchanted boxes will say <font color="LEVEL">"Bingo!"</font> when broken. Funny, huh?<br>
+Why are you making a face?<br>
+Oh well, keep it in mind. <font color="LEVEL">Let's begin!</font>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-03a.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-03a.html
new file mode 100644
index 0000000000000000000000000000000000000000..527e1efa1d84f65e86981719216c890ea79b9a7b
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-03a.html
@@ -0,0 +1,3 @@
+<html><body>Witch Athrea:<br>
+Are you ready to begin the test? Well, we must wait until those people over there are finished. It shouldn't take long. You would do well to observe them and learn more about the test.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-04.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-04.html
new file mode 100644
index 0000000000000000000000000000000000000000..e2cc9cbfe8a9890c38bcd32bd9d63511b8503665
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-04.html
@@ -0,0 +1,3 @@
+<html><body>Witch Athrea:<br>
+Call upon all your abilities!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-05.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-05.html
new file mode 100644
index 0000000000000000000000000000000000000000..1cdf5418e7f9ea8698690f1ef65f67c908eb9c8c
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-05.html
@@ -0,0 +1,6 @@
+<html><body>Witch Athrea:<br>
+What? No boxes? Utter failure!<br>
+Well, well, well. I should just throw you out of here, but I'm too soft-hearted for that. You shall have one more chance to take the test, but it will be expensive.<br>
+These boxes aren't free, you understand? Give me 10,000 Adena and I will make the boxes again. Is this agreeable?<br>
+<a action="bypass -h Quest Q00501_ProofOfClanAlliance 30758-07.html">"I will pay you 10,000 Adena."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-07.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-06.html
similarity index 65%
rename from L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-07.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-06.html
index 0ef272ad17d8b2e75d6aa096d29465859723fc40..5c506923db84506d6651dd81d46d7b06e2ee905b 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-07.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-06.html
@@ -1,2 +1,3 @@
<html><body>Witch Athrea:<br>
-That isn't enough money! Perhaps you could raise the funds among clan members, catch some monsters, sell your swords, whatever it takes. You should be able to come up with 10,000 adena in no time!</body></html>
\ No newline at end of file
+That isn't enough money! Perhaps you could raise the funds among clan members, catch some monsters, sell your swords, whatever it takes. You should be able to come up with 10,000 Adena in no time!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-07.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-07.html
new file mode 100644
index 0000000000000000000000000000000000000000..129263a3b2fc137daf87da621d672c20202400d9
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-07.html
@@ -0,0 +1,4 @@
+<html><body>Witch Athrea:<br>
+Would you care to play the game again?<br>
+<a action="bypass -h Quest Q00501_ProofOfClanAlliance 30758-03.html">"I want to play the game again."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-09.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-08.html
similarity index 83%
rename from L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-09.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-08.html
index 4b2698f496fa451f62f6ce72f2bb215a9d9f62eb..1033ae83ee638906a11f335aa82721a5d4bb3c55 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30758-09.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-08.html
@@ -1,2 +1,3 @@
<html><body>Witch Athrea:<br>
-Ah, a quite unexpected success! Well, true to my word, here is the <font color="LEVEL">Blood of Eva</font>. Be careful not to break the bottle.</body></html>
\ No newline at end of file
+Ah, a quite unexpected success! Well, true to my word, here is the <font color="LEVEL">Blood of Eva</font>. Be careful not to break the bottle.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-09.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-09.html
new file mode 100644
index 0000000000000000000000000000000000000000..fa04b88ed051f66e3c14ded5b130d1c30eb3529a
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30758-09.html
@@ -0,0 +1,3 @@
+<html><body>Witch Athrea:<br>
+Do you really have the time to stand around gabbing like this? Unless you bring me the ingredients for the Antidote soon, your clan leader will surely die.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..ee5b9613be0c6ff7e603d8bd1998e9321ac52574
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-01.html
@@ -0,0 +1,6 @@
+<html><body>Witch Kalis:<br>
+Would you choose to be a star shining brightly in the midst of chaos?<br>
+Behold the graves of those who have fallen attempting to do this...<br>
+Are you prepared to rest alongside them?<br>
+<a action="bypass -h Quest Q00501_ProofOfClanAlliance 30759-02.html">"I want to be a star."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-02.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..b611e5370c59cfbea46c6599bcb1f33e8d3ea39c
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-02.html
@@ -0,0 +1,5 @@
+<html><body>Witch Kalis:<br>
+You fool! Do you think that you are immortal? The test begins! Are there any among your clan who would die for you?<br>
+<a action="bypass -h Quest Q00501_ProofOfClanAlliance 30759-03.html">"There is one who will."</a><br>
+<a action="bypass -h Quest Q00501_ProofOfClanAlliance 30759-04.html">"There are none who will."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-03.html
similarity index 59%
rename from L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-03.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-03.html
index ed3bcba7922d12fb2e99670421d86c3c4de334fd..bd5dcce5d2785885ff7f49ce66436da40d36f73f 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-03.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-03.html
@@ -1,2 +1,4 @@
<html><body>Witch Kalis:<br>
-Ah, we shall see... Tell those who would lay down their lives for you to join me at the <font color="LEVEL">table of sacrifice</font>! If they are truly loyal they will not hesitate to sacrifice their lives.<br>Bring me <font color="LEVEL">three symbols of loyalty</font>, I will recognize the resolve of you and your clan!</body></html>
\ No newline at end of file
+Ah, we shall see... Tell those who would lay down their lives for you to join me at the <font color="LEVEL">table of sacrifice</font>! If they are truly loyal they will not hesitate to sacrifice their lives.<br>
+Bring me <font color="LEVEL">three symbols of loyalty</font>, I will recognize the resolve of you and your clan!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-04.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-04.html
new file mode 100644
index 0000000000000000000000000000000000000000..57b643977478fffe246e66cb7bcbde3cd1e8084f
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-04.html
@@ -0,0 +1,3 @@
+<html><body>Witch Kalis:<br>
+Just as I expected. All talk and no action.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-05.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-05.html
new file mode 100644
index 0000000000000000000000000000000000000000..2643fc719bbb651df11991e1071a7dddf737f24e
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-05.html
@@ -0,0 +1,4 @@
+<html><body>Witch Kalis:<br>
+Where is the confidence you so reeked of earlier? No comrades willing to risk their lives, eh?<br>
+Unless you bring me <font color="LEVEL">three symbols of loyalty</font>, you will never pass the test. In order to obtain the symbols, three of your clan must take an oath of their life at the <font color="LEVEL">table of sacrifice</font> and pledge complete loyalty to you.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-06.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-06.html
new file mode 100644
index 0000000000000000000000000000000000000000..8d2c53fc1ee93b1f2647bb7015d9eb2491cfe2d0
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-06.html
@@ -0,0 +1,7 @@
+<html><body>Witch Kalis:<br>
+Your comrades must have firm resolve and unfailing loyalty. In these days of the endless pursuit of profit, these are rare and noble qualities.<br>
+Now, do you trust your clan members? Would you bet your life on them? If so, then drink this poison and ask your clan members to gather the ingredients and bring back the Antidote! Here is a list of the ingredients needed for the Antidote. If your comrades can find and bring back all of the ingredients within one hour your life will be saved.<br>
+I wonder how hard your clan will try to save your life? Do you care to find out?<br>
+<a action="bypass -h Quest Q00501_ProofOfClanAlliance 30759-07.html">Drink the poison</a><br>
+<a action="bypass -h Quest Q00501_ProofOfClanAlliance 30759-04.html">Do not drink the poison</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-07.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-07.html
new file mode 100644
index 0000000000000000000000000000000000000000..d063262a01322c758650bea5e876feb49f6ed20c
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-07.html
@@ -0,0 +1,7 @@
+<html><body>Witch Kalis:<br>
+Tell me, how does the poison taste? Everything growing dark, is it? That would be death coming for you. I fear that soon we will need to add another grave here... Will your comrades find and bring back all the ingredients in time?<br>
+Oh, I do hate to see you in such pain. Would you care for some hints?<br>
+Herb of Vanor can be obtained from <font color="LEVEL">vanor silenos</font>. Herb of Harit can be obtained from <font color="LEVEL">Harit Lizardmen</font>. Herb of Ol Mahum can be obtained from <font color="LEVEL">Ol Mahums</font>. <font color="LEVEL">The Shamans</font> will have the herbs.<br>
+In order to obtain the Blood of Eva, you must visit <font color="LEVEL">Witch Athrea</font>. She is my younger sister. Some time ago she left for <font color="LEVEL">Hardin's Academy</font> to meet with Grand Magus Hardin.<br>
+Remember that <font color="LEVEL">when your clan members bring back all the ingredients, you must gather them up and bring them to me. I will create the Antidote for you.</font>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-08.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-08.html
new file mode 100644
index 0000000000000000000000000000000000000000..37b65b4ccac7132bbc50515962878e0b49b5c079
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-08.html
@@ -0,0 +1,3 @@
+<html><body>Witch Kalis:<br>
+Ah, all the ingredients of the Antidote! It has been a long time since this has happened. It is heartening to learn that there are still people like you and your clan with firm resolve and common trust! You are truly the soldiers of the new age! A bright star illuminating the darkness of this time! Please pardon my previous rudeness and accept this Antidote and mark.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-09.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-09.html
similarity index 73%
rename from L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-09.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-09.html
index 9d6e56a444ff762bd1a4fa984985329544de7188..d407bf5d60c61e9be113d520a7824759205d37a7 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-09.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-09.html
@@ -1,2 +1,3 @@
<html><body>Witch Kalis:<br>
-You are a liar and a cheat! Your sort can never become a shining star. You are dead to me now. Do you have regrets? If so, you can start over from the very beginning...</body></html>
\ No newline at end of file
+You are a liar and a cheat! Your sort can never become a shining star. You are dead to me now. Do you have regrets? If so, you can start over from the very beginning...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-10.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-10.html
new file mode 100644
index 0000000000000000000000000000000000000000..b2505a899888ac97e5e8ec4fbc1a1adc60d953fe
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-10.html
@@ -0,0 +1,4 @@
+<html><body>Witch Kalis:<br>
+Your time among the living grows short. What has become of your comrades? Will they return in time to save your life?<br>
+Let me remind you again, <font color="LEVEL">when your clan members bring back all the ingredients, you must gather them and bring them to me personally. I will use them to make the Antidote.</font>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-11.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-11.html
similarity index 52%
rename from L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-11.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-11.html
index a349be4f6564664b24d763a7f2b25105c1f2433e..405f4f1ac82d717bfa26456cfa777018c794c386 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/501_ProofOfClanAlliance/30759-11.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-11.html
@@ -1,2 +1,4 @@
<html><body>Witch Kalis:<br>
-Haven't you already passed my test? Why do you return to my humble abode?<br>Have you come to punish me for my previous rudeness?</body></html>
\ No newline at end of file
+Haven't you already passed my test? Why do you return to my humble abode?<br>
+Have you come to punish me for my previous rudeness?
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-12.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-12.html
new file mode 100644
index 0000000000000000000000000000000000000000..008a9fce10e7a41a55e9c6b1e6c691487ea19419
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/30759-12.html
@@ -0,0 +1,3 @@
+<html><body>Witch Kalis:<br>
+The lives of those who do not know their place often end prematurely. People should always live their lives within the proper boundaries. I don't have time to speak with you. Ask your clan lord to come and see me...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java
new file mode 100644
index 0000000000000000000000000000000000000000..0154decffee121b9fde2262908e77372ee4f1c73
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java
@@ -0,0 +1,608 @@
+/*
+ * Copyright (C) 2004-2014 L2J DataPack
+ *
+ * This file is part of L2J DataPack.
+ *
+ * L2J DataPack is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J DataPack is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.Q00501_ProofOfClanAlliance;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.quest.State;
+import com.l2jserver.gameserver.model.skills.AbnormalType;
+import com.l2jserver.gameserver.network.NpcStringId;
+import com.l2jserver.gameserver.network.clientpackets.Say2;
+import com.l2jserver.gameserver.network.serverpackets.NpcSay;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Proof of Clan Alliance (501)
+ * @author Zoey76
+ */
+public final class Q00501_ProofOfClanAlliance extends Quest
+{
+ // NPCs
+ private static final int SIR_KRISTOF_RODEMAI = 30756;
+ private static final int STATUE_OF_OFFERING = 30757;
+ private static final int ATHREA = 30758;
+ private static final int KALIS = 30759;
+ // Monsters
+ private static final int OEL_MAHUM_WITCH_DOCTOR = 20576;
+ private static final int HARIT_LIZARDMAN_SHAMAN = 20644;
+ private static final int VANOR_SILENOS_SHAMAN = 20685;
+ private static final int BOX_OF_ATHREA_1 = 27173;
+ private static final int BOX_OF_ATHREA_2 = 27174;
+ private static final int BOX_OF_ATHREA_3 = 27175;
+ private static final int BOX_OF_ATHREA_4 = 27176;
+ private static final int BOX_OF_ATHREA_5 = 27177;
+ // Items
+ private static final int HERB_OF_HARIT = 3832;
+ private static final int HERB_OF_VANOR = 3833;
+ private static final int HERB_OF_OEL_MAHUM = 3834;
+ private static final int BLOOD_OF_EVA = 3835;
+ private static final int ATHREAS_COIN = 3836;
+ private static final int SYMBOL_OF_LOYALTY = 3837;
+ private static final int ANTIDOTE_RECIPE_LIST = 3872;
+ private static final int VOUCHER_OF_FAITH = 3873;
+ private static final int ALLIANCE_MANIFESTO = 3874;
+ private static final int POTION_OF_RECOVERY = 3889;
+ // Skills
+ private static final SkillHolder POISON_OF_DEATH = new SkillHolder(4082, 1);
+ private static final SkillHolder DIE_YOU_FOOL = new SkillHolder(4083, 1);
+ // Locations
+ // @formatter:off
+ private static final List<Location> LOCS = Arrays.asList(
+ new Location(102273, 103433, -3512),
+ new Location(102190, 103379, -3524),
+ new Location(102107, 103325, -3533),
+ new Location(102024, 103271, -3500),
+ new Location(102327, 103350, -3511),
+ new Location(102244, 103296, -3518),
+ new Location(102161, 103242, -3529),
+ new Location(102078, 103188, -3500),
+ new Location(102381, 103267, -3538),
+ new Location(102298, 103213, -3532),
+ new Location(102215, 103159, -3520),
+ new Location(102132, 103105, -3513),
+ new Location(102435, 103184, -3515),
+ new Location(102352, 103130, -3522),
+ new Location(102269, 103076, -3533),
+ new Location(102186, 103022, -3541));
+ // @formatter:on
+ // Misc
+ private static final int CLAN_MIN_LEVEL = 3;
+ private static final int CLAN_MEMBER_MIN_LEVEL = 40;
+ private static final int ADENA_TO_RESTART_GAME = 10000;
+
+ public Q00501_ProofOfClanAlliance()
+ {
+ super(501, Q00501_ProofOfClanAlliance.class.getSimpleName(), "Proof of Clan Alliance");
+ addStartNpc(SIR_KRISTOF_RODEMAI, STATUE_OF_OFFERING);
+ addTalkId(SIR_KRISTOF_RODEMAI, STATUE_OF_OFFERING, ATHREA, KALIS);
+ addKillId(OEL_MAHUM_WITCH_DOCTOR, HARIT_LIZARDMAN_SHAMAN, VANOR_SILENOS_SHAMAN, BOX_OF_ATHREA_1, BOX_OF_ATHREA_2, BOX_OF_ATHREA_3, BOX_OF_ATHREA_4, BOX_OF_ATHREA_5);
+ addSpawnId(BOX_OF_ATHREA_1, BOX_OF_ATHREA_2, BOX_OF_ATHREA_3, BOX_OF_ATHREA_4, BOX_OF_ATHREA_5);
+ registerQuestItems(ANTIDOTE_RECIPE_LIST, VOUCHER_OF_FAITH, HERB_OF_HARIT, HERB_OF_VANOR, HERB_OF_OEL_MAHUM, BLOOD_OF_EVA, ATHREAS_COIN, SYMBOL_OF_LOYALTY);
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ final QuestState qs = getQuestState(player, false);
+ String htmltext = getNoQuestMsg(player);
+ if (qs == null)
+ {
+ return htmltext;
+ }
+
+ switch (event)
+ {
+ case "30756-06.html":
+ case "30756-08.html":
+ case "30757-05.html":
+ case "30758-02.html":
+ case "30758-04.html":
+ case "30759-02.html":
+ case "30759-04.html":
+ {
+ htmltext = event;
+ break;
+ }
+ case "30756-07.html":
+ {
+ if (qs.isCreated() && player.isClanLeader() && (player.getClan().getLevel() == CLAN_MIN_LEVEL))
+ {
+ qs.startQuest();
+ qs.setMemoState(1);
+ htmltext = event;
+ }
+ break;
+ }
+ case "30757-04.html":
+ {
+ if (getRandom(10) > 5)
+ {
+ if (qs.getInt("flag") != 2501)
+ {
+ giveItems(player, SYMBOL_OF_LOYALTY, 1);
+ qs.set("flag", 2501);
+ }
+ htmltext = event;
+ }
+ else
+ {
+ npc.setTarget(player);
+ npc.doCast(DIE_YOU_FOOL.getSkill());
+ startQuestTimer("2501010", 4000, npc, player);
+ htmltext = "30757-03.html";
+ }
+ break;
+ }
+ case "30758-03.html":
+ {
+ final QuestState lqs = getLeaderQuestState(player, getName());
+ if (lqs != null)
+ {
+ if (npc.getSummonedNpcCount() < 4)
+ {
+ lqs.setMemoState(4);
+ lqs.set("flag", 0);
+ npc.setScriptValue(0);
+ for (Location loc : LOCS)
+ {
+ npc.addSummonedNpc(addSpawn(getRandom(BOX_OF_ATHREA_1, BOX_OF_ATHREA_5), loc));
+ }
+ htmltext = event;
+ }
+ else
+ {
+ htmltext = "30758-03a.html";
+ }
+ }
+ break;
+ }
+ case "30758-07.html":
+ {
+ if (player.getAdena() >= ADENA_TO_RESTART_GAME)
+ {
+ if (npc.getSummonedNpcCount() < 4)
+ {
+ takeItems(player, ADENA_TO_RESTART_GAME, Inventory.ADENA_ID);
+ }
+ htmltext = event;
+ }
+ else
+ {
+ htmltext = "30758-06.html";
+ }
+ break;
+ }
+ case "30759-03.html":
+ {
+ if (qs.isMemoState(1))
+ {
+ qs.setCond(2, true);
+ qs.setMemoState(2);
+ htmltext = event;
+ }
+ break;
+ }
+ case "30759-07.html":
+ {
+ takeItems(player, SYMBOL_OF_LOYALTY, -1);
+ giveItems(player, ANTIDOTE_RECIPE_LIST, 1);
+ npc.setTarget(player);
+ npc.doCast(POISON_OF_DEATH.getSkill());
+ qs.setCond(3, true);
+ qs.setMemoState(3);
+ htmltext = event;
+ break;
+ }
+ case "2501010":
+ {
+ if (player.isDead() && (qs.getInt("flag") != 2501))
+ {
+ giveItems(player, SYMBOL_OF_LOYALTY, 1);
+ qs.set("flag", 2501);
+ }
+ htmltext = null;
+ break;
+ }
+ case "DESPAWN_BOX":
+ {
+ npc.deleteMe();
+ final L2Character summoner = npc.getSummoner();
+ if ((summoner != null) && summoner.isNpc())
+ {
+ ((L2Npc) summoner).removeSummonedNpc(npc.getObjectId());
+ }
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
+ {
+ final QuestState qs = getRandomPartyMemberState(killer, -1, 3, npc);
+ if (qs == null)
+ {
+ return super.onKill(npc, killer, isSummon);
+ }
+
+ final L2PcInstance player = qs.getPlayer();
+ final QuestState lqs = getLeaderQuestState(player, getName());
+ if (lqs != null)
+ {
+ switch (npc.getId())
+ {
+ case OEL_MAHUM_WITCH_DOCTOR:
+ {
+ if ((getRandom(10) == 1) && (lqs.getMemoState() >= 3) && (lqs.getMemoState() < 6))
+ {
+ giveItemRandomly(player, npc, HERB_OF_OEL_MAHUM, 1, 0, 1.0, true);
+ }
+ break;
+ }
+ case HARIT_LIZARDMAN_SHAMAN:
+ {
+ if ((getRandom(10) == 1) && (lqs.getMemoState() >= 3) && (lqs.getMemoState() < 6))
+ {
+ giveItemRandomly(player, npc, HERB_OF_HARIT, 1, 0, 1.0, true);
+ }
+ break;
+ }
+ case VANOR_SILENOS_SHAMAN:
+ {
+ if ((getRandom(10) == 1) && (lqs.getMemoState() >= 3) && (lqs.getMemoState() < 6))
+ {
+ giveItemRandomly(player, npc, HERB_OF_VANOR, 1, 0, 1.0, true);
+ }
+ break;
+ }
+ case BOX_OF_ATHREA_1:
+ case BOX_OF_ATHREA_2:
+ case BOX_OF_ATHREA_3:
+ case BOX_OF_ATHREA_4:
+ case BOX_OF_ATHREA_5:
+ {
+ final L2Character summoner = npc.getSummoner();
+ if ((summoner != null) && summoner.isNpc())
+ {
+ if (lqs.isMemoState(4))
+ {
+ final L2Npc arthea = (L2Npc) summoner;
+ if ((lqs.getInt("flag") == 3) && arthea.isScriptValue(15))
+ {
+ lqs.set("flag", lqs.getInt("flag") + 1);
+ npc.broadcastPacket(new NpcSay(npc, Say2.NPC_ALL, NpcStringId.BINGO));
+ }
+ else if ((lqs.getInt("flag") == 2) && arthea.isScriptValue(14))
+ {
+ lqs.set("flag", lqs.getInt("flag") + 1);
+ npc.broadcastPacket(new NpcSay(npc, Say2.NPC_ALL, NpcStringId.BINGO));
+ }
+ else if ((lqs.getInt("flag") == 1) && arthea.isScriptValue(13))
+ {
+ lqs.set("flag", lqs.getInt("flag") + 1);
+ npc.broadcastPacket(new NpcSay(npc, Say2.NPC_ALL, NpcStringId.BINGO));
+ }
+ else if ((lqs.getInt("flag") == 0) && arthea.isScriptValue(12))
+ {
+ lqs.set("flag", lqs.getInt("flag") + 1);
+ npc.broadcastPacket(new NpcSay(npc, Say2.NPC_ALL, NpcStringId.BINGO));
+ }
+ else if (lqs.getInt("flag") < 4)
+ {
+ if (getRandom(4) == 0)
+ {
+ lqs.set("flag", lqs.getInt("flag") + 1);
+ npc.broadcastPacket(new NpcSay(npc, Say2.NPC_ALL, NpcStringId.BINGO));
+ }
+ }
+ arthea.setScriptValue(arthea.getScriptValue() + 1);
+ }
+ ((L2Npc) summoner).removeSummonedNpc(npc.getObjectId());
+ }
+ break;
+ }
+ }
+ }
+ return super.onKill(npc, killer, isSummon);
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ final QuestState qs = player.getQuestState(getName());
+ final QuestState lqs = getLeaderQuestState(player, getName());
+ String htmltext = getNoQuestMsg(player);
+ if (qs == null)
+ {
+ return htmltext;
+ }
+
+ switch (npc.getId())
+ {
+ case SIR_KRISTOF_RODEMAI:
+ {
+ switch (qs.getState())
+ {
+ case State.CREATED:
+ {
+ if (player.isClanLeader())
+ {
+ final L2Clan clan = player.getClan();
+ if (clan.getLevel() < CLAN_MIN_LEVEL)
+ {
+ htmltext = "30756-01.html";
+ }
+ else if (clan.getLevel() == CLAN_MIN_LEVEL)
+ {
+ if (hasQuestItems(player, ALLIANCE_MANIFESTO))
+ {
+ htmltext = "30756-03.html";
+ }
+ else
+ {
+ htmltext = "30756-04.html";
+ }
+ }
+ else
+ {
+ htmltext = "30756-02.html";
+ }
+ }
+ else
+ {
+ htmltext = "30756-05.html";
+ }
+ break;
+ }
+ case State.STARTED:
+ {
+ if (qs.isMemoState(6) && hasQuestItems(player, VOUCHER_OF_FAITH))
+ {
+ takeItems(player, VOUCHER_OF_FAITH, -1);
+ giveItems(player, ALLIANCE_MANIFESTO, 1);
+ addExpAndSp(player, 0, 120000);
+ qs.exitQuest(false);
+ htmltext = "30756-09.html";
+ }
+ else if ((qs.getMemoState() >= 1) && !hasQuestItems(player, VOUCHER_OF_FAITH))
+ {
+ htmltext = "30756-10.html";
+ }
+ break;
+ }
+ }
+ break;
+ }
+ case STATUE_OF_OFFERING:
+ {
+ if ((lqs != null) && lqs.isMemoState(2))
+ {
+ if (!player.isClanLeader())
+ {
+ if (player.getLevel() >= CLAN_MEMBER_MIN_LEVEL)
+ {
+ htmltext = (qs.getInt("flag") != 2501) ? "30757-01.html" : "30757-01b.html";
+ }
+ else
+ {
+ htmltext = "30757-02.html";
+ }
+ }
+ else
+ {
+ htmltext = "30757-01a.html";
+ }
+ }
+ else
+ {
+ htmltext = "30757-06.html";
+ }
+ break;
+ }
+ case ATHREA:
+ {
+ if (lqs != null)
+ {
+ switch (lqs.getMemoState())
+ {
+ case 3:
+ {
+ if (hasQuestItems(lqs.getPlayer(), ANTIDOTE_RECIPE_LIST) && !hasQuestItems(lqs.getPlayer(), BLOOD_OF_EVA))
+ {
+ lqs.set("flag", 0);
+ htmltext = "30758-01.html";
+ }
+ break;
+ }
+ case 4:
+ {
+ if (lqs.getInt("flag") < 4)
+ {
+ htmltext = "30758-05.html";
+ }
+ else
+ {
+ giveItems(player, BLOOD_OF_EVA, 1);
+ lqs.setMemoState(5);
+ htmltext = "30758-08.html";
+ }
+ break;
+ }
+ case 5:
+ {
+ htmltext = "30758-09.html";
+ break;
+ }
+ }
+ }
+ break;
+ }
+ case KALIS:
+ {
+ if (qs.isMemoState(1) && !hasQuestItems(player, SYMBOL_OF_LOYALTY))
+ {
+ htmltext = "30759-01.html";
+ }
+ else if (qs.isMemoState(2) && (getQuestItemsCount(player, SYMBOL_OF_LOYALTY) < 3))
+ {
+ htmltext = "30759-05.html";
+ }
+ else if ((getQuestItemsCount(player, SYMBOL_OF_LOYALTY) >= 3) && !hasAbnormal(player))
+ {
+ htmltext = "30759-06.html";
+ }
+ else if (qs.isMemoState(5) && hasQuestItems(player, BLOOD_OF_EVA) && hasQuestItems(player, HERB_OF_VANOR) && hasQuestItems(player, HERB_OF_HARIT) && hasQuestItems(player, HERB_OF_OEL_MAHUM) && hasAbnormal(player))
+ {
+ giveItems(player, VOUCHER_OF_FAITH, 1);
+ giveItems(player, POTION_OF_RECOVERY, 1);
+ takeItems(player, BLOOD_OF_EVA, -1);
+ takeItems(player, ANTIDOTE_RECIPE_LIST, -1);
+ takeItems(player, HERB_OF_OEL_MAHUM, -1);
+ takeItems(player, HERB_OF_HARIT, -1);
+ takeItems(player, HERB_OF_VANOR, -1);
+ qs.setCond(4, true);
+ qs.setMemoState(6);
+ htmltext = "30759-08.html";
+ }
+ else if ((qs.isMemoState(3) || qs.isMemoState(4) || qs.isMemoState(5)) && !hasAbnormal(player))
+ {
+ takeItems(player, ANTIDOTE_RECIPE_LIST, -1);
+ qs.setMemoState(1);
+ htmltext = "30759-09.html";
+ }
+ else if ((qs.getMemoState() < 6) && (getQuestItemsCount(player, SYMBOL_OF_LOYALTY) >= 3) && !hasAtLeastOneQuestItem(player, BLOOD_OF_EVA, HERB_OF_VANOR, HERB_OF_HARIT, HERB_OF_OEL_MAHUM) && hasAbnormal(player))
+ {
+ htmltext = "30759-10.html";
+ }
+ else if (qs.isMemoState(6))
+ {
+ htmltext = "30759-11.html";
+ }
+ else if ((lqs != null) && !player.isClanLeader())
+ {
+ htmltext = "30759-12.html";
+ }
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onSpawn(L2Npc npc)
+ {
+ startQuestTimer("DESPAWN_BOX", 300000, npc, null);
+ return super.onSpawn(npc);
+ }
+
+ /**
+ * Verifies if the player has the poison.
+ * @param player the player to check
+ * @return {@code true} if the player has {@link AbnormalType#FATAL_POISON} abnormal
+ */
+ private static boolean hasAbnormal(L2PcInstance player)
+ {
+ return player.getEffectList().getBuffInfoByAbnormalType(AbnormalType.FATAL_POISON) != null;
+ }
+
+ /**
+ * Gets the clan leader's quest state.
+ * @param player the player
+ * @param quest the quest name
+ * @return the clan leader's quest state
+ */
+ private static QuestState getLeaderQuestState(L2PcInstance player, String quest)
+ {
+ if (player.getClan() != null)
+ {
+ final L2PcInstance leader = player.getClan().getLeader().getPlayerInstance();
+ if (leader != null)
+ {
+ return leader.getQuestState(quest);
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public QuestState getRandomPartyMemberState(L2PcInstance player, int condition, int playerChance, L2Npc target)
+ {
+ if ((player == null) || (playerChance < 1))
+ {
+ return null;
+ }
+
+ QuestState qs = player.getQuestState(getName());
+ if (!player.isInParty())
+ {
+ if (!Util.checkIfInRange(1500, player, target, true))
+ {
+ return null;
+ }
+ return qs;
+ }
+
+ final List<QuestState> candidates = new ArrayList<>();
+ if ((qs != null) && (playerChance > 0))
+ {
+ for (int i = 0; i < playerChance; i++)
+ {
+ candidates.add(qs);
+ }
+ }
+
+ for (L2PcInstance member : player.getParty().getMembers())
+ {
+ if (member == player)
+ {
+ continue;
+ }
+
+ qs = member.getQuestState(getName());
+ if (qs != null)
+ {
+ candidates.add(qs);
+ }
+ }
+
+ if (candidates.isEmpty())
+ {
+ return null;
+ }
+
+ qs = candidates.get(getRandom(candidates.size()));
+ if (!Util.checkIfInRange(1500, qs.getPlayer(), target, true))
+ {
+ return null;
+ }
+ return qs;
+ }
+}
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/QuestMasterHandler.java b/L2J_DataPack/dist/game/data/scripts/quests/QuestMasterHandler.java
index 317b5f40366d859fa11240e463fdfd061e694f04..2df67ae3cba23c1cf5e3fdcc1e8fb44b359e0b7c 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/QuestMasterHandler.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/QuestMasterHandler.java
@@ -339,6 +339,7 @@ import quests.Q00458_PerfectForm.Q00458_PerfectForm;
import quests.Q00461_RumbleInTheBase.Q00461_RumbleInTheBase;
import quests.Q00463_IMustBeaGenius.Q00463_IMustBeaGenius;
import quests.Q00464_Oath.Q00464_Oath;
+import quests.Q00501_ProofOfClanAlliance.Q00501_ProofOfClanAlliance;
import quests.Q00504_CompetitionForTheBanditStronghold.Q00504_CompetitionForTheBanditStronghold;
import quests.Q00508_AClansReputation.Q00508_AClansReputation;
import quests.Q00509_AClansFame.Q00509_AClansFame;
@@ -777,6 +778,7 @@ public class QuestMasterHandler
Q00461_RumbleInTheBase.class,
Q00463_IMustBeaGenius.class,
Q00464_Oath.class,
+ Q00501_ProofOfClanAlliance.class,
Q00504_CompetitionForTheBanditStronghold.class,
Q00508_AClansReputation.class,
Q00509_AClansFame.class,
diff --git a/L2J_DataPack/dist/game/data/stats/skills/04000-04099.xml b/L2J_DataPack/dist/game/data/stats/skills/04000-04099.xml
index 07355419c632f6434b247d621b4c07b59a420f2b..d2c8fe17e0724098d194a9dbd036d554df12e0e0 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/04000-04099.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/04000-04099.xml
@@ -1538,7 +1538,7 @@
</for>
</skill>
<skill id="4083" levels="1" name="Die! You fool!">
- <!-- Freya retail confirmed -->
+ <!-- Confirmed CT2.5 -->
<set name="castRange" val="600" />
<set name="coolTime" val="800" />
<set name="effectPoint" val="-100" />
diff --git a/L2J_DataPack/dist/sql/game/updates/20141115update.sql b/L2J_DataPack/dist/sql/game/updates/20141115update.sql
new file mode 100644
index 0000000000000000000000000000000000000000..e06090f77bec21eb26093863a9409656ce8f0197
--- /dev/null
+++ b/L2J_DataPack/dist/sql/game/updates/20141115update.sql
@@ -0,0 +1 @@
+UPDATE character_quests SET name='Q00501_ProofOfClanAlliance' WHERE name='501_ProofOfClanAlliance';
\ No newline at end of file