diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30026.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30026.htm
index 1410513ae02429316c4a76881eefb27b1f9c5808..3c2f79867e27a7bf92a73e45c6652a7f5ea40df1 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30026.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30026.htm
@@ -5,9 +5,9 @@ Welcome to the Fighters Guild! I am Grand Master Bitz, head of this Guild. Since
<br>
<a action="bypass -h npc_%objectId%_Quest FirstClassTransferTalk">Listen to information about first class transfer.</a>
<br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a>
<br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a>
<br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30031.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30031.htm
index aedba2aa3147ee8c7e4d999bc0064d6536b599f0..068808517b8e990d86bef4912fb2d52410c7ee51 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30031.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30031.htm
@@ -5,9 +5,9 @@ I am High Priest Biotin, guardian of this temple of Einhasad. The power and auth
<br>
<a action="bypass -h npc_%objectId%_Quest FirstClassTransferTalk">Listen to information about first class transfer.</a>
<br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a>
<br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a>
<br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30037.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30037.htm
index 1aff901454aead5b7a1a10d7859f8bb121b2ac7c..d41bf6c7c42e7c61c100148e65b04c94f23c0687 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30037.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30037.htm
@@ -1,8 +1,8 @@
<html><body>High Priestess Levian:<br>
I perceive that you are wandering on a journey to seek and find your dream. Ah, my young friend...in this world, there are tens of thousands of dreams, and tens of thousands of disappointments as well. Perhaps you will one day realize the futility of chasing these dreams like a moth drawn to a flame. But what has brought you to me? In the name of Einhasad, if I am able to give you the light, I will do all that I can to assist you.<br>
<a action="bypass -h npc_%objectId%_Quest elven_human_mystics_1">Listen to information about first class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30066.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30066.htm
index 92dee489ce0c97e6c97b5a32ce3fdf8c66cadc21..4d81985181631d22f4fa73b85ef2050c3fe1644e 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30066.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30066.htm
@@ -1,8 +1,8 @@
<html><body>Grand Master Pabris:<br>
Whoever walks the path of a warrior is welcome here, friend. I am Grand Master Pabris, leader of this Warrior Guild. Training youngsters like yourself is both my greatest challenge and my finest reward.<br>
<a action="bypass -h npc_%objectId%_Quest elven_human_fighters_1">Listen to information about first class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30070.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30070.htm
index 236b1384121ac61c26c090eff396609641c731ff..aad575a5cf09a3d6858ee2fe88b1ee786c4bf341 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30070.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30070.htm
@@ -1,8 +1,8 @@
<html><body>High Priest Sylvain:<br>
Welcome to the warm bosom of Einhasad, the goddess of light. What event has brought you to me? By the holy name of Einhasad, I pray I am able to help you!<br>
<a action="bypass -h npc_%objectId%_Quest elven_human_mystics_1">Listen to information about first class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30109.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30109.htm
index 8e75b298f87d6c021f9359a19733b15d3fb97484..41695eb17d8746f8dca4fa7addcaaf91f0b19963 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30109.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30109.htm
@@ -2,8 +2,8 @@
Welcome! I am Grand Master Hannavalt, the leader of this Warriors Guild. Any warrior committed to the pursuit of physical and mental power are welcome here.<br>
<a action="bypass -h npc_%objectId%_Quest elven_human_fighters_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30115.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30115.htm
index 7f4982fb68fda38f56a3a073754984aa3fceb53a..3dda2889d9cdd265255ab48fc5fddc327831d6d1 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30115.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30115.htm
@@ -2,8 +2,8 @@
Welcome! I am Grand Magister Jurek, responsiblen for the education and training of Wizards in this Wizards Guild. What has led you to this place?<br>
<a action="bypass -h npc_%objectId%_Quest elven_human_mystics_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30120.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30120.htm
index b45420f6cb827acb596836de443a730ec9977615..00c692d1451286bf2ff5eac1fcac0abc1a09f0be 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30120.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30120.htm
@@ -2,8 +2,8 @@
Pleased to meet you. I am High Priest Maximilian of this temple, may Einhasad's light comfort your soul's distress. Why have you come here, to the heart of our faith?<br>
<a action="bypass -h npc_%objectId%_Quest elven_human_buffers_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30154.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30154.htm
index 98ff9447e229592326299b9364bf5fc1cdd39f94..3cc5b537809536665cfbb4bc6633a139de3c57d8 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30154.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30154.htm
@@ -7,9 +7,9 @@ I am Tetrarch Asterios, representative of Eva, chosen by the mother of all fores
<br>
<a action="bypass -h npc_%objectId%_Quest FirstClassTransferTalk">Listen to information about first class transfer.</a>
<br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a>
<br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a>
<br>
<a action="bypass -h npc_%objectId%_Chat 1">Ask about the current situation.</a>
<br>
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30174.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30174.htm
index da62d1d319140d1d78a169dcb8baa08213a6d553..29d7f801d7ab55a07cdd3f963a0d6b0f475c7e56 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30174.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30174.htm
@@ -2,8 +2,8 @@
Glad to see you. It is my task to mold wizards into high-level sorcerers here in this Ivory Tower. Have you come to learn how to freely manipulate the power of the elements themselves?<br>
<a action="bypass -h npc_%objectId%_Quest 30115_jurek_occupation_change">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30175.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30175.htm
index f3be4f1fbc6778684063556ec11ca57874df3f04..f6034de7718eec868420a29771464c353a7189ab 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30175.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30175.htm
@@ -1,8 +1,8 @@
<html><body>Grand Magister Fairen:<br>
I am Grand Magister Fairen! It is my task to transform dark wizards into high level sorcerers in this Ivory Tower. Have you come here to learn how to freely wield the power of the spirits?<br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30176.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30176.htm
index a96b2348eb8a39f694f861ed85a0bb61ee4d9510..27452ab0ef25cab61c20021e930f51f0b6d3d275 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30176.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30176.htm
@@ -2,8 +2,8 @@
Nice to meet you. I am Grand Magister Valleria, responsible for transforming Wizards into high-level Sorcerers here in this Ivory Tower. Hey, Did you come here to learn how to freely manipulates the power of the elements themselves?<br>
<a action="bypass -h npc_%objectId%_Quest 30115_jurek_occupation_change">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30187.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30187.htm
index fe68d4987c33683bd96180004c050576cad98f86..f9a76ea1ca41de166156794a9666ccc974e16ca3 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30187.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30187.htm
@@ -2,8 +2,8 @@
Welcome. I am Grand Master Klaus Blackbird, the leader of this Warriors Guild. It is my life's work to teach and train high level Warriors.<br>
<a action="bypass -h npc_%objectId%_Quest elven_human_fighters_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30191.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30191.htm
index c4d2a9213ab3d7682b5c5279415d91a012f985c2..33af86323eba9e6baef70602b0d04a97053af6cd 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30191.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30191.htm
@@ -2,8 +2,8 @@
Welcome! I am High Priest Hollint of this temple. Why have you come here, where Einhasad of the light is served? Do you perhaps wish to embark on the difficult path of a Priest?<br>
<a action="bypass -h npc_%objectId%_Quest elven_human_buffers_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30195.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30195.htm
index 3087c4fc0026250551a19e2424e08528a16b03b9..43a76843f9b177e3f029cb621b496c2c29292d4e 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30195.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30195.htm
@@ -2,8 +2,8 @@
I am Grand Master Brecson. It is my honor to raise up high-level Dark Elf warriors and magicians at the will of Shilen, the goddess of darkness. What question has brought you here?<br>
<a action="bypass -h npc_%objectId%_Quest dark_elven_change_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30288.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30288.htm
index 49fb128d758890742777e07137b6427cc20162e3..f86d9782f035f37bfdd50b1eb611cef054b0ea69 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30288.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30288.htm
@@ -1,8 +1,8 @@
<html><body>Grand Master Rains:<br>
You who walk the path of courage, be welcome here. I am Rains, head of the Warrior Guild in this place. If you wish to learn about class transfers, you've come to the right place.<br>
<a action="bypass -h npc_%objectId%_Quest elven_human_fighters_1">Listen to information about first class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30289.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30289.htm
index 8a82919c75e7689048b589c5993f9c19a88cf187..79fcdd87b0ebf7886eeae6352c93f1f3619e8d08 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30289.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30289.htm
@@ -1,8 +1,8 @@
<html><body>High Priest Raymond:<br>
May Einhasad's blessing be upon you... O brother, what has led you into the power of this divine light? What business has brought you to me? I will gladly help you if by doing so Einhasad's light might be further spread through this darkened world.<br>
<a action="bypass -h npc_%objectId%_Quest elven_human_mystics_1">Listen to information about first class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30290.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30290.htm
index 3b37cb48a68b5dce419df9e13e75bd838c50808d..0a948c4f4b6a3292e469f8bb9ef241417582583a 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30290.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30290.htm
@@ -1,8 +1,8 @@
<html><body>Grand Master Xenos:<br>
May the spirit of Shilen give set your mind at peace... I am Master Xenos of the Dark Elf Guild. I would be pleased to assist you. How may I help?<br>
<a action="bypass -h npc_%objectId%_Quest dark_elven_change_1">Listen to information about first class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30297.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30297.htm
index fda84dadf52aa1366bb67b76aabfbc0c06805d3f..ff6c7348d0a2d47329f45451f02ef64624c8b1a6 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30297.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30297.htm
@@ -1,8 +1,8 @@
<html><body>Grand Master Tobias:<br>
Welcome, young brethren -- may the power of Shilen grant you peace. When someone comes to a place like this, to see a person like me, there is always some pressing reason. What do you wish to ask me? I will gladly assist you in any way I can.<br>
<a action="bypass -h npc_%objectId%_Quest dark_elven_change_1">Listen to information about first class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30358.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30358.htm
index e4afaad93dac0871cb3e7cdf87aab50f982ee82a..0bbcc794886cddc55e36105f491c49a0ca44d0cf 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30358.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30358.htm
@@ -9,9 +9,9 @@ On behalf of the Hierarch, who was sealed by those despicable servants of the li
<br>
<a action="bypass -h npc_%objectId%_Chat 1">Ask about the current situation.</a>
<br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a>
<br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a>
<br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30373.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30373.htm
index bc64fd551192ee35148a5d6ecf218f9683897678..99a14123c333ea1ef94f203b29a75e43a040f4d9 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30373.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30373.htm
@@ -1,8 +1,8 @@
<html><body>Grand Master Ramos:<br>
Hail and well met, my friend! Welcome to Gludin Harbor Village; I am Grand Master Ramos. Ah, don't let the fancy title worry you. Young adventurers like yourself all remind me of my own younger brothers. Undoubtedly you've already heard of me, eh? I don't like to boast, but it's no secret that in this village I am admired by men and adored by women. You seem a likely enough lad... I imagine that you could be like me if you're willing to put in enough effort. Ha ha!<br>
<a action="bypass -h npc_%objectId%_Quest elven_human_fighters_1">Listen to information about first class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30462.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30462.htm
index 989703c7be2f4025c2233f8f6fc3bfbac1a29253..06a409df9d8c34b14b736dfba18fc2552e42afed 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30462.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30462.htm
@@ -1,8 +1,8 @@
<html><body>Grand Master Tronix:<br>
Welcome! Did Shilen, the Goddess of Dark Water, lead you to this place? No one comes to see me in a place like this without a pressing reason. Tell me, my young friend, what is your need?<br>
<a action="bypass -h npc_%objectId%_Quest dark_elven_change_1">Listen to information about first class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30474.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30474.htm
index 862caa6b810e97a5f75c51119f06acedac304f02..e60c5ec3f3e2c118974931572bd23492c14b2eb4 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30474.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30474.htm
@@ -2,8 +2,8 @@
Who would you be, then? Did the will of Shilen guide you to this place? I am Angus, a humble servant of Shilen tasked with teaching Dark Elves.<br>
<a action="bypass -h npc_%objectId%_Quest dark_elven_change_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30498.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30498.htm
index 3ed5cccef383804fdd1cb93419723ba891fd2970..f2061da16319d690d411bf6dbb57a107aadf6b0f 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30498.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30498.htm
@@ -1,8 +1,8 @@
<html><body>Warehouse Chief Moke:<br>
Hey there, traveler! Pleased to meet you; I am Warehouse Chief Moke of the Iron Gate Guild here in Gludin. You've heard our motto, right? "Sell anything to anyone, anywhere." We'll travel to frozen wastes, burning deserts, even the dangerous volcanic zones of the north, for the sake of plying our trade. Ha! Who can match that? Tell me, my friend, have you come here in order to become a member of our guild?<br>
<a action="bypass -h npc_%objectId%_Quest dwarven_occupation_change">Listen to information about first class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30499.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30499.htm
index 285d16e678f7e63dc132915aeabd1721ff6874e8..b85713ed38d42602aa01933a971643a23e85e988 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30499.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30499.htm
@@ -1,8 +1,8 @@
<html><body>Head Blacksmith Tapoy:<br>
I'm Head Blacksmith Tapoy of the Black Anvil Guild located here in Gludin territory. I'm sure that you already know of our reputation for producing highly skilled Artisans and Warsmiths. As we say back home, a Dwarven tribe without our guild is like a "a bee without honey" or an "Elf without his pride." Ha ha! So, what has brought you here?<br>
<a action="bypass -h npc_%objectId%_Quest dwarven_occupation_change">Listen to information about first class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30500.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30500.htm
index 9496e7f746226d1f88b2d383a2206440f138423a..afcfc1c4481141366cb5d38c031c5ea5cade1be2 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30500.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30500.htm
@@ -1,8 +1,8 @@
<html><body>High Prefect Osborn:<br>
I, High Prefect Osborn, teach Orcs by the authority of Pa'agrio, the father of eternal fire. It is my duty to help ensure that we may once more attain the glory of our illustrious ancestors. You, young Orc warrior, you are like a tinderbox whose spark, though small, becomes a great blaze! In you I see the hope that will revive the trampled pride of our Orc tribe. How may I be of service to you?<br>
<a action="bypass -h npc_%objectId%_Quest orc_occupation_change_1">Listen to information about first class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30503.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30503.htm
index 7aa0fcc170465e8e2620250a0ecd2c3a72368058..d3f65eea55a88cc41e04fccdabcfe56e5cb986fe 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30503.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30503.htm
@@ -1,8 +1,8 @@
<html><body>Warehouse Chief Rikadio:<br>
Hey there, traveler! Pleased to meet you; I am Warehouse Chief Rikadio of the Iron Gate Guild here in Gludin. You've heard our motto, right? "Sell anything to anyone, anywhere." We'll travel to frozen wastes, burning deserts, even the dangerous volcanic zones of the north, for the sake of plying our trade. Ha! Who can match that? Tell me, my friend, have you come here in order to become a member of our guild?<br>
<a action="bypass -h npc_%objectId%_Quest dwarven_occupation_change">Listen to information about first class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30504.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30504.htm
index a1bbee2decc7d0509cd3d87268e81c45fd190ce1..cd27c88aee895f9327935cdcc9e823b4a25cce31 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30504.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30504.htm
@@ -2,8 +2,8 @@
I'm Head Blacksmith Mendio of the Black Anvil Guild here in Gludin. In all sincerity, I can tell you that without the Black Anvil Guild, Human civilization would still be in a very primitive condition. Do you think the races could march out to war or lay siege to enemy cities without us? Not a chance! Without our siege golem and weapons, warriors would be forced to fight with sticks and stones instead of steel. How foolish would they seem then!<br>
Ah, but I didn't intend to lecture you. My apologies. What is the reason for your visit, then?<br>
<a action="bypass -h npc_%objectId%_Quest dwarven_occupation_change">Listen to information about first class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30505.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30505.htm
index 1ef2614be8f1b95cbcc8dde3bf596c56b42d2ff9..c8d7d8cbb736394d6cb2d7d0032d9cb42fb9e1af 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30505.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30505.htm
@@ -1,8 +1,8 @@
<html><body>High Prefect Drikus:<br>
I, High Prefect Drikus, teach Orcs by the authority of Pa'agrio, the father of eternal fire. It is my duty to help ensure that we may once more attain the glory of our illustrious ancestors. You, young Orc warrior, you are like a tinderbox whose spark, though small, becomes a great blaze! In you I see the hope that will revive the trampled pride of our Orc tribe. How may I be of service to you?<br>
<a action="bypass -h npc_%objectId%_Quest orc_occupation_change_1">Listen to information about first class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30508.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30508.htm
index cd4a65173138ecac1e7924c080ad9c273ccb8ca4..c88ea276e7271f14847cbe3da3af6fb4876a8c16 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30508.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30508.htm
@@ -1,8 +1,8 @@
<html><body>High Prefect Cional:<br>
I, High Prefect Cional, teach Orcs by the authority of Pa'agrio, the father of eternal fire. It is my duty to help ensure that we may once more attain the glory of our illustrious ancestors. You, young Orc warrior, you are like a tinderbox whose spark, though small, becomes a great blaze! In you I see the hope that will revive the trampled pride of our Orc tribe. How may I be of service to you?<br>
<a action="bypass -h npc_%objectId%_Quest orc_occupation_change_1">Listen to information about first class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30511.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30511.htm
index 1e8d49a00a194ac9dda0c35445fc3f6c8fcdfdc9..33a089b56b08209ed2d60ba3450045f4dc4b6dd4 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30511.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30511.htm
@@ -3,8 +3,8 @@ I am Warehouse Chief Gesto of the Iron Gate Guild here in Giran. Our motto is "W
But you're a new face around here, I see. What can I do for you?<br>
<a action="bypass -h npc_%objectId%_Quest dwarven_occupation_change">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30512.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30512.htm
index 4055be66ddf22116679f953f390c0b0022521c5e..786450a7beef9ade6094ed12f42ade4ee8bdb0f2 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30512.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30512.htm
@@ -3,8 +3,8 @@ I'm Head Blacksmith Kusto of the Black Anvil Guild here in Gludin. Unlike the Ir
Ah, but what has brought you to me, friend? I'll gladly provide what help I can.<br>
<a action="bypass -h npc_%objectId%_Quest dwarven_occupation_change">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30513.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30513.htm
index e60701c66088f9ebae6aca0d08da21628461ef47..3d4c4e5f24633b16474f64bc4103e0713787bab8 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30513.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30513.htm
@@ -2,8 +2,8 @@
I am High Prefect Penatus, and I instruct Orcs by the will of Pa'agrio, the father of eternal fire, so that we may restore the Orc race to its former glory.<br>
<a action="bypass -h npc_%objectId%_Quest orc_occupation_change_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30520.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30520.htm
index 07dd1403deaa3f31a93442b3a8abc550fdaf1c18..00ab45c5926414d0018dee7bef7329a3baca5148 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30520.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30520.htm
@@ -7,9 +7,9 @@ Greetings, traveler! I am Warehouse Chief Reed of the famous <font color="LEVEL"
<br>
<a action="bypass -h npc_%objectId%_Chat 1">Ask about the Iron Gate Guild.</a>
<br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan</a>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan</a>
<br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance</a>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance</a>
<br>
<a action="bypass -h npc_%objectId%_Quest">Quest</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30525.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30525.htm
index 0a1f88a59439bc3a9ac7927e006425811e906622..19af691df2c4bc5af5ae650758cb6fd111fc310c 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30525.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30525.htm
@@ -7,9 +7,9 @@ I am Head Blacksmith Bronk, chief craftsman of the <font color="LEVEL">Black Anv
<br>
<a action="bypass -h npc_%objectId%_Chat 1">Ask about Tapoy of the Black Anvil Guild.</a>
<br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a>
<br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a>
<br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30565.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30565.htm
index 4ef0267c76fc46f321554ad92570a63c70fe5a26..6133393891ebf79f56f2bf5fca7f7fcb4b1534af 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30565.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30565.htm
@@ -2,7 +2,7 @@
Hear me! I am Flame Lord Kakai, invested with the authority of Pa'agrio, the father of eternal flame, to lead the great Orc race. Young warrior, you are to my eyes like a flame of hope, hope that our race may yet achieve its former glory. What do you wish from me?<br>
<a action="bypass -h npc_%objectId%_Quest FirstClassTransferTalk">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Chat 1">Ask about the current situation</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30594.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30594.htm
index 2d881eb510e1f86b3cd3180efe9b18f04d150752..783a53e55d2f621ed4ada4d42791fb5f7b0730a5 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30594.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30594.htm
@@ -3,8 +3,8 @@ I'm Warehouse Chief Ranspo of the Iron Gate Guild here in Gludin. Our motto is "
But you're a new face, hmm? I don't think we've met before. What do you want?<br>
<a action="bypass -h npc_%objectId%_Quest dwarven_occupation_change">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30595.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30595.htm
index 7489f22dc5c1d7615ae00960d05c8e4d613ea870..124f550da64a77f3de196d57073d3a1ca305a8f0 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30595.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30595.htm
@@ -2,8 +2,8 @@
I'm Head Blacksmith Mendio of the Black Anvil Guild here in Gludin territory. In all sincerity, I can tell you that without the Black Anvil Guild, Human civilization would still be in a very primitive condition. Do you think the races could march out to war or lay siege to enemy cities without us? Not a chance! Without our siege golem and weapons, warriors would be forced to fight with sticks and stones instead of steel. How foolish would they seem then!<br>
Ah, but I didn't intend to lecture you. My apologies. What is the reason for your visit, then?<br>
<a action="bypass -h npc_%objectId%_Quest dwarven_occupation_change">Listen to information about first class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30676.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30676.htm
index 4c4c51d92cef5a9ab456a9536b4fe4e6649c7e23..ae44d6538705fafb5b5b26e4b5e585d0728475f0 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30676.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30676.htm
@@ -2,8 +2,8 @@
I'm Warehouse Chief Croop of the Iron Gate Guild. I deal with all the Scavengers who come into Oren, so naturally my skin's tougher than sheet metal these days!<br>
<a action="bypass -h npc_%objectId%_Quest dwarven_occupation_change">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30677.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30677.htm
index 1b83342a188de52671191d52d493903de1e3f69c..fd8ac8a17305afd726cb20260dae921b33451d90 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30677.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30677.htm
@@ -2,8 +2,8 @@
I am Head Blacksmith Flutter of the Black Anvil Guild here in the Town of Oren. Can I be of service to you? Hmm... It's been a busy season here already, what with all these Artisans coming over for a class transfer to Warsmith.<br>
<a action="bypass -h npc_%objectId%_Quest dwarven_occupation_change">Listen to information about 2nd class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30681.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30681.htm
index 14e0db3a70bbb8748d19a8a646efdce6a790b924..0162257e02a85bc106676d14e1fd47846bab21f4 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30681.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30681.htm
@@ -2,8 +2,8 @@
I am High Prefect Karia, and I teach high level Orc warriors and magicians by the will of Pa'agrio, the father of eternal fire. Why have you come to see me?<br>
<a action="bypass -h npc_%objectId%_Quest orc_occupation_change_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30685.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30685.htm
index 380a5e9cb9448b9d82f02c6c302a829de8435ae0..dd7d17c6db0574a6253b414760b91969a08e9c00 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30685.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30685.htm
@@ -2,8 +2,8 @@
I am Warehouse Chief Baxt of the Iron Gate Guild here in Hunter Village. I'm in charge of transforming Scavengers into Bounty Hunters. I'm terribly busy these days dealing all the Scavengers who come to see me. Are you here to become a Bounty Hunter, too?<br>
<a action="bypass -h npc_%objectId%_Quest dwarven_occupation_change">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30687.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30687.htm
index f488c60220f72c75702b502b5fd293a79c896e3b..a9b6dd95a2ef202c54bfce1bcdc9537ff3646e09 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30687.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30687.htm
@@ -2,8 +2,8 @@
I'm Head Blacksmith Vergara of the Black Anvil Guild here in Hunter Village. It's my job to take qualified Artisans and transform them into talented Warsmiths. If you want to make money, there's nothing better than being a Warsmith. Interested?<br>
<a action="bypass -h npc_%objectId%_Quest dwarven_occupation_change">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30689.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30689.htm
index e6692ad19603131ca8c8a2d42ad1794c5954578a..a36f0cff1faf5b5db2fe8ede25a3bd141c0b9c09 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30689.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30689.htm
@@ -2,8 +2,8 @@
Welcome. I am Grand Master Siria, the leader of this Warriors Guild. It is my duty to develop Human and Elf fighters into high-level Warriors.<br>
<a action="bypass -h npc_%objectId%_Quest elven_human_fighters_2">Listen to informations about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30694.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30694.htm
index 114c3ceb2ebc3af73a3167379ab6552272abc758..986c73b64b8296002e9404baa001e9a052295c20 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30694.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30694.htm
@@ -2,8 +2,8 @@
Welcome! I am Grand Magister Scraide, in charge of transforming the Wizards in this guild into high level Sorcerers. Have you come here to learn how to wield elemental powers freely?<br>
<a action="bypass -h npc_%objectId%_Quest elven_human_mystics_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30699.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30699.htm
index 1dfe9d5b2ae63f8c262650fb4c6d85b10971371c..98f01326025125e9feccf584db338aaee574f15a 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30699.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30699.htm
@@ -2,8 +2,8 @@
I am Grand Master Medown, who raises high-level Dark Elf Warriors and Magicians through the power of Shilen, goddess of darkness. What question has brought you here?<br>
<a action="bypass -h npc_%objectId%_Quest dark_elven_change_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30704.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30704.htm
index 469b542626fc008ce9d7030cead0cbdf7d985844..c021214bd2dcae561b553cb1f79e87c96b24cdca 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30704.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30704.htm
@@ -2,8 +2,8 @@
I am High Prefect Garvarentz, and I teach high level Orc warriors and magicians by the will of Pa'agrio, the father of eternal fire. Why have you come to see me?<br>
<a action="bypass -h npc_%objectId%_Quest orc_occupation_change_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30845.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30845.htm
index 0185eb63a72e7a3404422673e92346dbc05d8308..cd08217063d7186cd58fecb003edf9d8882c1f37 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30845.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30845.htm
@@ -2,8 +2,8 @@
Pleased to meet you. I am Warehouse Chief Klump of the Iron Gate Guild. Giran is the center of our craft, of course, but the river of wealth that flows to us here in Aden Castle Town is scarcely less deep. Of course, here we focus more on decorative and artistic pieces rather than everyday items.<br>
<a action="bypass -h npc_%objectId%_Quest dwarven_occupation_change">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30847.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30847.htm
index d1959e0f0c1d0fba4b0fa07a4bf5217b14521cfa..0540ae0f088777880f7a5ba52ba24ef277e6be6d 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30847.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30847.htm
@@ -3,8 +3,8 @@ There used to be plenty of work for us blacksmiths here in Aden Town, especially
I thought that when those wearisome wars were finally over I would have time enough for my other interests, but we seem busier than ever these days...<br>
<a action="bypass -h npc_%objectId%_Quest dwarven_occupation_change">Listen to information about 2nd class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30849.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30849.htm
index 5b3cf07e88836bad32c1d935664b97708aef9a4f..f1997a45897106427538a687dffcb4498dfb7950 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30849.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30849.htm
@@ -2,8 +2,8 @@
Welcome to Aden, young one. My name is Sedrick. I welcome you on behalf of the warriors of the Castle of Aden and its dominion.<br>
<a action="bypass -h npc_%objectId%_Quest elven_human_fighters_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30854.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30854.htm
index 2666d74a9c46f1e02fdeca5dc15236ffca5b02c7..c27e8648e9992912372cb86cd79c6d088a216c37 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30854.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30854.htm
@@ -3,8 +3,8 @@ Keuk! Oh, my aching head... It must be true what they say about those thrice-cur
Wha... oh! Ah, welcome to the, ah, magicians guild here in Aden Castle Town. I'm Grand Master Drikiyan. Who, ah, exactly are you?<br>
<a action="bypass -h npc_%objectId%_Quest elven_human_mystics_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30857.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30857.htm
index 983c1a82d783ca941984752735cc8e2200db3090..a9d31f6c375f77febfb01d923503225d4116ed5b 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30857.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30857.htm
@@ -3,8 +3,8 @@ Welcome to Aden Town, the heart of the kingdom. People speak of this place as th
But true holiness can always be found in the ordinary, the everyday, the mundane. The prayer of a commoner may resonate more deeply with the mother of light than even the prayer of a high priest, so perhaps this place is not so different from other temples.<br>
<a action="bypass -h npc_%objectId%_Quest elven_human_buffers_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30862.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30862.htm
index a3a6747c9d53814093191ce13ba02f249eabae60..ef435072da844168e2d9c8756298d325d6b6fb73 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30862.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30862.htm
@@ -2,8 +2,8 @@
You have left your village and have come a long way, young child of Shilen. How do you feel, now that you see the great castle and the ever-changing streets that are the pride of the Humans? Even though you would appreciate and admire them, do not be enticed by their allure. There is often a serpent's lair hidden beneath even the most beautiful bed of flowers. You too may one day face the hidden truth of this city...<br>
<a action="bypass -h npc_%objectId%_Quest dark_elven_change_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30865.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30865.htm
index 30bb850db7e21f62507e77c50f853e070712f591..8f47e6bcb9e145f6ee3a884eb3db89dcbea2b4c2 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30865.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30865.htm
@@ -3,8 +3,8 @@ Welcome to the Humans' city, adventurer. The Humans petitioned Flame Lord Kakai
It is ironic, is it not, that Pa'agrio's children are now here in what was once the castle of our enemy?<br>
<a action="bypass -h npc_%objectId%_Quest orc_occupation_change_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30894.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30894.htm
index b189d2b3d3f18fa36dfd8c136264f59018d62529..eb205e2bbb513ce0006b9d89fb713f83a58c347d 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30894.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30894.htm
@@ -2,8 +2,8 @@
Hmm. The world is becoming more dangerous each day. You need guards just to transport cargo from Giran's port to the village! Here in Innadril, of course, merchandise can be unload, sorted and sold right in Heine... I pity poor Gesto in Giran; the center of commerce has clearly shifted to us now.<br>
<a action="bypass -h npc_%objectId%_Quest dwarven_occupation_change">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30897.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30897.htm
index df6fba0cc15a4ae040fd86a71c86f542443da4a3..13b3ad4904fb2079e4a34f0e1ec57e51722c9f0f 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30897.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30897.htm
@@ -2,8 +2,8 @@
During Lionel Hunter's reign, Innadril was never engulfed by war. That great man singlehandedly defeated that frightful Fafurion's Golem army, you know... But now it seems as though that long-held peace is over. Just look at the orders for and sales of weaponry... Ah, trouble! And so those corrupt warmongers consider me a lazy Dwarf, because I dare to speak the truth no one else will face...<br>
<a action="bypass -h npc_%objectId%_Quest dwarven_occupation_change">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30900.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30900.htm
index 4dc53598decd5b975f516f38552fc6b9733e12ed..50a5f72635bcc4497538afa0a6420273ff537cd9 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30900.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30900.htm
@@ -2,8 +2,8 @@
Heine is one of Innadril's most beautiful cities, but you must never let your guard down, youngster, despite its beauty. Remember that Devil's Isle and the Garden of Eva are close at hand. Ah, and Fafurion's Island as well... They say that long ago, after being wounded by young Lionel Hunter, Fafurion cursed each and every stone in Innadril... How can even the Grand Master of the Warriors Guild not be constantly on guard?<br>
<a action="bypass -h npc_%objectId%_Quest elven_human_fighters_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30905.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30905.htm
index 3faa6fb98aa751077e5468d783b89714ae2cd85c..dea8ea6a8ad4a9c97dd5c23d811fd59531ec0955 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30905.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30905.htm
@@ -2,8 +2,8 @@
Welcome, traveler. May the goddess of light's providence be always with you. I am Squillari, a servant of Einhasad, who lives to help fulfill the will of the goddess of light in this land of water. Traveler, it would be a blessing if I could help you in your search for instruction.<br>
<a action="bypass -h npc_%objectId%_Quest elven_human_buffers_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30910.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30910.htm
index 6a648d930eb9a92b54b8f1dde37552e5953aaedb..eaca613dba83247a1f93e829bd8def974d258bb1 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30910.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30910.htm
@@ -2,8 +2,8 @@
Heine, the city of water... Fools with stars in their eyes seem to have forgotten that before there was Eva, there was Shilen... The Goddess of Dark Water still slumbers without sleeping, deep down in the abyss of the sea...<br>
<a action="bypass -h npc_%objectId%_Quest dark_elven_change_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30913.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30913.htm
index f635fcc49e2d257b576c201db505dee48304bfc1..ec303987e9c8052522f1621cdd6895833ff94123 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30913.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/30913.htm
@@ -3,8 +3,8 @@ Welcome to the Heine, the city of water... Eh, the truth is that Orcs like me ju
But duty calls, and we do what must be done... So, why are you looking for me?<br>
<a action="bypass -h npc_%objectId%_Quest orc_occupation_change_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31269.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31269.htm
index ba63483028b2f2b607fe5461d9b84561d1df8c81..0fb358f16d32c25bc48b3e8dc07ceb11b3e71983 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31269.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31269.htm
@@ -4,8 +4,8 @@ What motto should we use this month...? We need something that will attract cust
How about it? Sounds good, eh? Eh? Too long...? Humph! What do you know?<br>
<a action="bypass -h npc_%objectId%_Quest dwarven_occupation_change">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31272.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31272.htm
index 3394547c405da38df0779784644890ca58621d47..e1b327f9d9e3d4872e82ed12b64014dfd0f0a9a3 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31272.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31272.htm
@@ -3,8 +3,8 @@ This icy air is perfect for pounding the steel! Scorching fire and icy air -- th
Same with life -- no matter how much sorrow or turmoil you may face, if you can endure it, you will become as strong and resilient as tempered steel!<br>
<a action="bypass -h npc_%objectId%_Quest dwarven_occupation_change">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31276.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31276.htm
index 51262e9c99aa624c267fc4853814f92df6d41f8d..10110e247fb9a724d6391619ca9e10ce7e96539a 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31276.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31276.htm
@@ -4,8 +4,8 @@ Ah, you certainly look like someone worth meeting. As you can see, the best warr
I've been noticing a number of talented young people like yourself these days. Something must be in the works, eh?<br>
<a action="bypass -h npc_%objectId%_Quest elven_human_buffers_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31279.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31279.htm
index d1baa732b63a984fc3ef1368ef08afaa44e64224..8d9e664d0b925ad91ff3546d1ed7ed84e54dde61 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31279.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31279.htm
@@ -4,8 +4,8 @@ As you know, Goddard is all abuzz these days with rumors of war between the Vark
And we, the apostles of light, must provide guidance and wisdom...<br>
<a action="bypass -h npc_%objectId%_Quest elven_human_buffers_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31285.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31285.htm
index fd07f80db5bb276ccf0094abf8b6872858392e65..368408226a79f602b058a05a96853e7a77ea8c9a 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31285.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31285.htm
@@ -3,8 +3,8 @@ It is called Elmore, but it's not that different -- power rules here just as it
Heh, I understand why a man like Scraide might have settled here... Was it the battles against the Orcs that changed him, do you think, or was that always his nature?<br>
<a action="bypass -h npc_%objectId%_Quest dark_elven_change_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31288.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31288.htm
index ddf0bc43cdb670151f525f069080464da9414e8b..de4cb5c412d3f1d41df3ab303a56584a9275e5ad 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31288.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31288.htm
@@ -3,8 +3,8 @@ Welcome to Goddard, land of war and fire! In this place, blood boils as hot as t
Those disgusting Varka Silenos and Ketra Orc tribes intend to battle nearby, and it is said that the Fire Dragon Valakas has awakened from its long slumber. Soon it will be time for Pa'agrio's glorious warriors to arise, so do not be relax with your preparations!<br>
<a action="bypass -h npc_%objectId%_Quest orc_occupation_change_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31314.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31314.htm
index 2302a9cfc88efd60053fee786651e42b4d7674a1..68b6cc3d35f8da065ed6ca4183e02c71c343a2ee 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31314.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31314.htm
@@ -3,8 +3,8 @@ More than anyone else, we Dwarves know the importance of wealth -- but comraderi
What price can you put on a clan member to whom you would entrust your life? If you have someone like that nearby, they are more precious than all the jewels in the world!<br>
<a action="bypass -h npc_%objectId%_Quest dwarven_occupation_change">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31317.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31317.htm
index 3969c5793a0e82cc43c66cdbd6968de61c3b83ef..a45bae2b779e688ffece8ff9c7da67791b9e039b 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31317.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31317.htm
@@ -3,8 +3,8 @@ I haven't seen you around here before. On some kind of journey, eh?<br>
Just a friendly warning, then: this place isn't exactly the shining capital of Elmore. Sure, supplies are plentiful and trade is brisk, but steel doesn't lie. Quality isn't what it used to be. There's something bad buried deep down for sure -- I just don't know what it is...<br>
<a action="bypass -h npc_%objectId%_Quest dwarven_occupation_change">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31321.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31321.htm
index 69e2d8a8fe5e84f44f85cd3de0438c4452bcaca3..78b28d5bb439ea477d241495ef231261700b7f50 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31321.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31321.htm
@@ -3,8 +3,8 @@ What do you think, young one? As a training opportunity, would you care to match
Worried about getting hurt during training? Ah! A Magister can be quickly called from the library over there to cast a cure spell, should that be necessary.<br>
<a action="bypass -h npc_%objectId%_Quest elven_human_buffers_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31324.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31324.htm
index b5edd4ad049bf5976f2bc4015e8d704de7c9db97..f4f41da6b481e2940cc80760ae8884c5d850e99e 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31324.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31324.htm
@@ -3,8 +3,8 @@ This town... the stink of blood and death lingers about it like a fog...<br>
Those like me who have experienced so much death become very sensitive to its presence. Ah, but you know that already, don't you?<br>
<a action="bypass -h npc_%objectId%_Quest dark_elven_change_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31326.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31326.htm
index f6ec9750f066035b91d1aac337d8852e3aa7aef4..41077ab071a12f7ab0caea0d93b9cd06c3986565 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31326.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31326.htm
@@ -3,8 +3,8 @@ Even though we have the reputation as the top Warrior training camp in the entir
Tejakar Orka! True training must be between Orcs!<br>
<a action="bypass -h npc_%objectId%_Quest orc_occupation_change_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31328.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31328.htm
index ff9206f91c54825e3df4e21016de25208dc676e4..659ffc029d35b04b88f93018434bea45fcd03b2f 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31328.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31328.htm
@@ -3,8 +3,8 @@ I can no longer hear the goddess' voice; I can only recite with my lips the know
Nevertheless, if you seek my teaching, I will try to help you.<br>
<a action="bypass -h npc_%objectId%_Quest dark_elven_change_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31331.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31331.htm
index d7d552947f410beeea776388a4d3180c7b273dce..e26d1378bb5be5e90fba4b004885d94a3405d312 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31331.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31331.htm
@@ -2,8 +2,8 @@
Welcome to the continent's largest and most extensive library! The massive amount of material archived here includes everything from the authentic chronicles of the previous empire to the research notes of current magisters. Not even Oren's Ivory Tower has as many tomes as we do! The magic that you learn here is the original and true teaching, of that you can be sure!<br>
<a action="bypass -h npc_%objectId%_Quest dark_elven_change_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31334.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31334.htm
index 0d6bca07d706f4ad7074e88e56a6c3eb73058765..ba6447ae67272d24dbb6cfc9f186047da110c279 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31334.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31334.htm
@@ -4,8 +4,8 @@ Hmm? Who are you? Well... I see. Forgive my ranting. I was just speaking to myse
I am Grand Magister Tifaren, and I teach Shilen's will. Why have you come to me?<br>
<a action="bypass -h npc_%objectId%_Quest dark_elven_change_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31336.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31336.htm
index 59338bc2fa36770f37b2b5f14e4ce35a08d3b9bb..c81306bf13e04929634996c47e22aa65b8175cb1 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31336.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31336.htm
@@ -3,8 +3,8 @@ Heed the warning that our ancestors whisper in your ears! See the omens that are
Can you feel the impending calamity? What is it that we must do during these times? If you remain firm in your faith, the Spirit of Fire shall be your guide!<br>
<a action="bypass -h npc_%objectId%_Quest elven_human_buffers_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31755.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31755.htm
index 157cad694c41338aa38f1c1c91b52e1abdca2016..33658e2248b104b2115b6f6848a9f21013709070 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31755.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31755.htm
@@ -3,7 +3,7 @@ The Town of Goddard has produced many brave war heroes over the years, but it is
Do not underestimate these people simply because they live in a relatively wild and untamed region. In fact, the harsher their lives become, the greater their thirst for knowledge. That knowledge is far more than academic, you understand -- it has the power to improve their chances of survival.<br>
<a action="bypass -h npc_%objectId%_Quest elven_human_buffers_2">"Tell me about the second class transfer."</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31958.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31958.htm
index 8dfa2f25e3eb1d5bf156393145e8b7a67915830f..a20c6c1e756fabd31dafe95232cf55f8cba391c6 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31958.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31958.htm
@@ -3,8 +3,8 @@ Welcome, friend! Ah, I consider anyone who's been to my store even once a friend
Don't worry about that item. I will take excellent care for it for you. Even in the unlikely event that a thief should penetrate the inmost recesses of our warehouse, he will never lay a hand on it, of that you can rest assured! I, the Dwarf Yasheni, swear it on my father's beard!<br>
<a action="bypass -h npc_%objectId%_Quest dwarven_occupation_change">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31961.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31961.htm
index 1412f86a220061efdd6013d85201bb14cad46951..508b146c7fdad6362edf1ec8c0047c6cb119da4f 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31961.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31961.htm
@@ -3,8 +3,8 @@ Do you know when the blacksmiths of Schuttgart Territory are the happiest? It's
How many other occupations in this world can give you such an amazing feeling? That's why I really love this job. I suppose it's really my calling in life, eh?<br>
<a action="bypass -h npc_%objectId%_Quest dwarven_occupation_change">Listen to information about 2nd class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use shadow weapon exchange coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31965.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31965.htm
index 0c3c86da0862c86d57a48a263af8969f8f112ae9..73cd1dec74b0a02571d64777dd69cb9dec1630a6 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31965.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31965.htm
@@ -4,8 +4,8 @@ Actually, Schuttgart is not yet recognized as a place where warriors can hone th
Were more warriors to visit us, we would be able to assist them even as they assist us. Isn't that the best of both worlds?<br>
<a action="bypass -h npc_%objectId%_Quest elven_human_fighters_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31968.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31968.htm
index 6fe512d882d4e6617865beff8db874d3571a4d87..dc56f65c9c4590a55d3d46b2cc5608ae5d5b7302 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31968.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31968.htm
@@ -4,8 +4,8 @@ It is not exaggerating much to say that the peace is primarily kept thanks to th
In times like this, the strength of warriors and disciples like ourselves is more important than ever.<br>
<a action="bypass -h npc_%objectId%_Quest elven_human_buffers_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31974.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31974.htm
index 9cc133d63e56fa0eb81d9ce7e54192e62a6d98be..5a6a6fc768331759c1823044c631491639d4b5b6 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31974.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31974.htm
@@ -3,8 +3,8 @@ Oh, when it's so cold, everything is so bothersome and work is so tedious.<br>
I'd rather not think about this and that. Can't you just take care of it on your own? You're younger and smarter than I am, so I'm sure you know better...<br>
<a action="bypass -h npc_%objectId%_Quest dark_elven_change_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31977.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31977.htm
index 9c93309e02aa5705c43765628e04bd178caa8649..012cd2173060ddcf91868644bc85e525b64aa25a 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31977.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31977.htm
@@ -3,8 +3,8 @@ My Orc comrade! Are you ready to be reborn in blood and fire as a true warrior o
How long must we suffer the disdain of those puny Dwarves and moon-faced Elves? Young Orc! Schuttgart may well become a key strategic position for the warriors of the Elmorean kingdom. If we Orcs unite, it will be a trivial matter to occupy this defenseless place. Stoke up your smoldering vengeance! The time to strike swift and hard will soon be at hand.<br>
<a action="bypass -h npc_%objectId%_Quest orc_occupation_change_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31996.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31996.htm
index 647988553fae42451b1dfc0ee58ac0aac49419f6..849861f005adeac4919693b40e70ae456f02bb3b 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31996.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/31996.htm
@@ -4,8 +4,8 @@ Ha ha! Hmm, I see you wondering, "Is this Grand Magister really on the level?" D
Never fear, though -- I take my job seriously.<br>
<a action="bypass -h npc_%objectId%_Quest elven_human_mystics_2">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32092.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32092.htm
index 271d7a31a1923f1b95c82f04c311b643ca745f9f..35bfa3e2be4720ddb12387ac2f8fd36267e1c5ac 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32092.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32092.htm
@@ -4,8 +4,8 @@ It's bad enough that the races should war with each other, but each of them is a
If there's one thing that I've learned in my life, it's that everyone, regardless of race, really wants a prosperous life. That should naturally lead them to engage in commerce and trade.<br>
And as long as that's so, craftsmen the world over will want to learn their art from us Dwarves, the undisputed masters of craftsmanship. That's why we will never fade from the world -- we're too useful to it!<br>
<a action="bypass -h npc_%objectId%_Quest dwarven_occupation_change">Listen to information about first class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32093.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32093.htm
index f81a33c0441d44ced2cc6f1a16f763fe5fb83375..479cee12b0ee4c9723fc73be2c7ad8009cd8e226 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32093.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32093.htm
@@ -4,8 +4,8 @@ Remember that for us crafting is not simply a profession -- it is our purpose in
Let the other races brag about their armies; we know how idle their boasts really are. How would they wage battle or lay siege to fortresses without the siege golems, weapons and armor that we create? Even their greatest warriors would be as helpless as newborn babes without our labors.<br>
Mark this well, youngster, craftmanship is far more important than wielding a sword or casting some magic spell.<br>
<a action="bypass -h npc_%objectId%_Quest dwarven_occupation_change">Listen to information about first class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32094.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32094.htm
index baf8cb6e7c53ac061abc695ddfb926b506a4b154..4f048924375f0367ab4117a0b6190d6fdfd103fc 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32094.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32094.htm
@@ -1,8 +1,8 @@
<html><body>Grand Master Schule:<br>
So pleased to meet you. I am Grand Master Schule, head of the Warriors Guild here. You wish to become a warrior, perhaps? Doing so requires both natural stamina and rigorous training, but remember: pain is fleeting, but glory is eternal!<br>
<a action="bypass -h npc_%objectId%_Quest elven_human_fighters_2">Listen to information about first class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32095.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32095.htm
index 699e7fa310d525e5d27c137e3eb485adda81b03f..211a5ad5c85e21e34543435639f2281dff1f987c 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32095.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32095.htm
@@ -1,8 +1,8 @@
<html><body>High Priest Marie:<br>
Greetings, young seeker! I am but a humble servant of the Creator Einhasad, whose sole purpose is passing on her divine wisdom. I am merely an instrument in proclaiming her sacred teachings to the world.<br>
<a action="bypass -h npc_%objectId%_Quest elven_human_buffers_2">Listen to information about first class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32096.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32096.htm
index 378dadbd79a4e856621a69c53fbdd78868866aea..65847dc78d384daca321e5e9fb0497665c49672b 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32096.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32096.htm
@@ -1,8 +1,8 @@
<html><body>Grand Master Helminter:<br>
I am Grand Master Helminter, and I bid you welcome to this place. Though I know you not, I am sure that you were able to find me only through the guidance of our great goddess Shilen. Tell me, why have you come?<br>
<a action="bypass -h npc_%objectId%_Quest dark_elven_change_2">Listen to information about first class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32097.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32097.htm
index c33b41cf1ae90a29f8b14e5327caac721f38d1b3..c07b2565ade4c95bf344981f19909949fd11fa8a 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32097.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32097.htm
@@ -1,8 +1,8 @@
<html><body>High Prefect Finker:<br>
Pa'agrio Tejakar! Welcome! I am High Prefect Finker, and I teach Orcs by the authority of Pa'agrio, the father of eternal fire, that we may once more attain the lost glory of our ancestors of old. My mission is to transform talented Orcs like you, my young friend, into strong and steely Orc warriors feared by all races. Do you wish to be reborn as a powerful Orc warrior?<br>
<a action="bypass -h npc_%objectId%_Quest 30500_osborn_occupation_change">Listen to information about first class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32098.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32098.htm
index c9a25f04df6a696a0fbfd69e450ffe620a763ead..142c7d79a0e470419a90458839f5dc04402fdb9e 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32098.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32098.htm
@@ -1,8 +1,8 @@
<html><body>Grand Magister Celes:<br>
I perceive that your soul is awash in chaos. But have no fear; destiny will eventually guide your feet onto the right path. For now, I only hope that my feeble knowledge can be of assistance.<br>
<a action="bypass -h npc_%objectId%_Quest 30037_levian_occupation_change">Listen to information about first class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32145.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32145.htm
index 53f9ebbd6eb0bbd458605ab9925f87fe05b14867..8f46307fa6aa4ad1f85d692caa73ccdafb62e45d 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32145.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32145.htm
@@ -3,7 +3,7 @@ Somehow you made it here, but this is no place for a novice adventurer.<br>
I suppose that matters little now, though.<br>
<a action="bypass -h npc_%objectId%_Quest kamael_occupation_change">Ask about 2nd class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub-class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32146.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32146.htm
index 270f1d969dfd597d4728cf2e1325fed4c3125b86..953131a93a712dbdf651fd54e4455f0cd6a3837f 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32146.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32146.htm
@@ -3,7 +3,7 @@ Your curiosity must have brought you here. Unless you have some business with me
If you have advanced beyond the occupational limits as a Kamael, perhaps I can help...<br>
<a action="bypass -h npc_%objectId%_Quest kamael_occupation_change">Ask about 2nd class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub-class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32147.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32147.htm
index adb46b8ce52fb93ce143b189b7f877ed41d62f95..be199e87c0ebef97ae37d5739b14986024a85234 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32147.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32147.htm
@@ -9,9 +9,9 @@ I do not think it was an accident that we Elves -- and myself in particular -- a
<br>
<a action="bypass -h npc_%objectId%_Quest FirstClassTransferTalk">Ask about the 1st class transfer.</a>
<br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a>
<br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a>
<br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32150.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32150.htm
index 391b204563edf9e61b9dfb24d37393915be137cf..88b919aed22c30deafe41e650caacbaa339d38c1 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32150.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32150.htm
@@ -9,9 +9,9 @@ This is the starting point for many adventurers. They must prove themselves thro
<br>
<a action="bypass -h npc_%objectId%_Quest FirstClassTransferTalk">Hear information about the class transfer.</a>
<br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Blood pledge.</a>
+<a action="bypass -h npc_%objectId%_Quest Clan">Blood pledge.</a>
<br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a>
<br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32153.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32153.htm
index 05ce86f449d80f186ae69d56e4c96f3f4b67cc8d..4d3d8b3a8ddacf40c253b73c619059ad506d7f6c 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32153.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32153.htm
@@ -5,9 +5,9 @@ May the great glory of light surround you always... Life has brought me to this
<br>
<a action="bypass -h npc_%objectId%_Quest FirstClassTransferTalk">Hear information about the class transfer.</a>
<br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Blood pledge.</a>
+<a action="bypass -h npc_%objectId%_Quest Clan">Blood pledge.</a>
<br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a>
<br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32154.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32154.htm
index 57929dcab2b9324134df621506bc2c067c1482b8..6f9a80376e93cc6dc61d4ed77b8a00555a4473b5 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32154.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32154.htm
@@ -11,9 +11,9 @@ How may I help you?
<br>
<a action="bypass -h npc_%objectId%_Quest FirstClassTransferTalk">Ask about the 1st class transfer.</a>
<br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a>
<br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a>
<br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32157.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32157.htm
index 280fd70939f9879db165282c606b59863a2b518b..5fb9629b04250e790a30e53cf0fb68cef00b91bc 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32157.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32157.htm
@@ -11,9 +11,9 @@ Huh? You're still here? What is it you wanted? If it has to do with politics, go
<br>
<a action="bypass -h npc_%objectId%_Quest FirstClassTransferTalk">Listen to information about first class transfer.</a>
<br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a>
<br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a>
<br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32158.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32158.htm
index 2b30bdd61aaaf7e8f75477f94f877908b135eb10..b795f05540817a21e26226d17ccd5817a2462e18 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32158.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32158.htm
@@ -9,9 +9,9 @@ Well, if you are an adventurer, you must have come for me, the Warehouse Chief.
<br>
<a action="bypass -h npc_%objectId%_Quest FirstClassTransferTalk">Listen to information about 1st class transfer.</a>
<br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a>
<br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a>
<br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32160.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32160.htm
index e965981b23a95b36f7b07607b9970f698eb1b51c..643d7bb79ed1be77ddf94ded3ff8bb43e7c29008 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32160.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32160.htm
@@ -9,9 +9,9 @@ You know, don't you? There is a light that can only be found by those who live i
<br>
<a action="bypass -h npc_%objectId%_Quest FirstClassTransferTalk">Ask about the first prior occupation.</a>
<br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a>
<br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a>
<br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32171.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32171.htm
index 9a593435a4a49ce2ea570776d64b840e43e5bbc7..29c6fcbd5f833ce7ab4cc937d89bdbafccef1ca7 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32171.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32171.htm
@@ -7,9 +7,9 @@ So I have the contract for this Kamael Village warehouse now. You can trust me,
<br>
<a action="bypass -h npc_%objectId%_Quest FirstClassTransferTalk">Listen to information about 1st class transfer.</a>
<br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a>
<br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a>
<br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32193.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32193.htm
index 46a17620d193abdf468fdbe34902b10964213f3c..54039d925e8e0fcf7495d34ba5451ea2dfe2eaa5 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32193.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32193.htm
@@ -1,8 +1,8 @@
<html><body>Grand Master Yeniche:<br>
Are you unsatisfied with your current position? Are you willing to devote yourself to improvement? Yes? Then you have come to the right place. I am Grand Master Yeniche, head of the Kamael Guild here. It's my duty to teach those like you about the nuances of class transfer.<br>
<a action="bypass -h npc_%objectId%_Quest kamael_occupation_change">Ask about the 1st class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use a shadow weapon exchange coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32196.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32196.htm
index ed065baa114174992d00b6903d8718e22b84cf7c..8fb6aca8e9d59e2c30ccdb991acc100b36796d69 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32196.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32196.htm
@@ -2,8 +2,8 @@
Welcome, brave Kamael warrior, welcome! I am Gershwin, head of the Kamael Guild. How fine to meet a strapping young Kamael like yourself here in the middle of nowhere! I feel like showing you off to the miserable inhabitants of this place, to show them what a real adventurer looks like.<br>
You have truly brightened my day. Please let me know if I can help you in your journey.<br>
<a action="bypass -h npc_%objectId%_Quest kamael_occupation_change">Ask about the 1st class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use a shadow weapon exchange coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32199.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32199.htm
index 16fe32ff41fcf96512a81dc8c9e9ac85ba769432..1687a6e5915bc3032586479de23771e396628c12 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32199.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32199.htm
@@ -1,8 +1,8 @@
<html><body>Grand Master Holst:<br>
Welcome. I am Grand Master Holst. If you are one of the Kamael who has left his own land, you should take a moment to reflect on whether you have behaved dishonorably or endangered a fellow Kamael. Be honest, now. Search yourself...<br>
<a action="bypass -h npc_%objectId%_Quest kamael_occupation_change">Ask about the 1st class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use a shadow weapon exchange coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32202.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32202.htm
index f2a7f8949027a2924e2f2627bfa42e38a08d1923..43365bdeab2c6f11ea4b718ea95007308dff60f4 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32202.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32202.htm
@@ -1,8 +1,8 @@
<html><body>Grand Master Khadava:<br>
To be honest, it matters little to me why and how you came to this town, or why you sought me out. I simply provide a service. Tell me, then, exactly what you require.<br>
<a action="bypass -h npc_%objectId%_Quest kamael_occupation_change">Ask about the 1st class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use a shadow weapon exchange coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32205.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32205.htm
index 17550cc61c222967d664e121a3762b23d1c99c63..d1573aeaa558d5717d44ac2a300ebb38356c56c5 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32205.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32205.htm
@@ -1,8 +1,8 @@
<html><body>Grand Master Aetonic:<br>
Greetings. I am Grand Master Aetonic of the Kamael Guild. Do you have questions about the class transfer? You have come to the right person, then -- I am an expert in the Kamael class transfer. Ask me anything.<br>
<a action="bypass -h npc_%objectId%_Quest kamael_occupation_change">Ask about the 2nd class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use a shadow weapon exchange coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32206.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32206.htm
index 2c504613b64940cc9555a020277b7b0473a06b0c..1795d2d8f2be5eef5325b283cb5b2e4a0812986b 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32206.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32206.htm
@@ -1,8 +1,8 @@
<html><body>Grand Master Pieche:<br>
You look like you could use some help, my friend... No? Ha ha, oh yes you do! Don't look so surprised! Once you reach my age, you can read the truth in a person's eyes and gestures. Words only confuse the issue... How can I help you?<br>
<a action="bypass -h npc_%objectId%_Quest kamael_occupation_change">Ask about the 2nd class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use a shadow weapon exchange coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32209.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32209.htm
index 295c74f3e8a6d765d07bd0cc2e107abb57d092d9..eea8240ce6598df6ff5447e2729ebc342cdbcd9b 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32209.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32209.htm
@@ -2,8 +2,8 @@
Hello, my friend! Isn't this place wonderful? Ah, when I was young I had no time for the beauties of nature, but now that I am old I find Innadril's scenery positively intoxicating. I feel like a young boy on a picnic! Oh dear...please forgive my babbling. How can I help you?<br>
<a action="bypass -h npc_%objectId%_Quest kamael_occupation_change">Ask about the 2nd class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32210.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32210.htm
index a2c50551986af7a72ebf18e231b527d978bd770f..f855afc94662579e8c60f6e1f32b3388fc495ed0 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32210.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32210.htm
@@ -2,8 +2,8 @@
Good day. I am Grand Master Eddy of the Kamael Guild. Why are you staring at me like that? Ah...let me guess. You met Ferdinand, I suspect. Or perhaps you simply heard rumors of a sweet, gentle Grand Master of the Kamael Guild. Well, as you can see, you are mistaken. I am not Ferdinand, nor do I spend my days laughing and loafing about. If I seem grim, it is because I am more conscious of the gravity of my position that that overgrown child ever will be.<br>
<a action="bypass -h npc_%objectId%_Quest kamael_occupation_change">Ask about the 2nd class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32213.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32213.htm
index 04edc4ef36df534fe55c39d06faf52ba09842f73..83afc74b7ce9a0c6a44eafdbcff69debfd963a4f 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32213.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32213.htm
@@ -2,8 +2,8 @@
Welcome. I am Grand Master Vitus of the Kamael Guild here in the Town of Giran. If you have questions about class transfer, you have come to the right place.<br>
<a action="bypass -h npc_%objectId%_Quest kamael_occupation_change">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32214.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32214.htm
index 9e058edfcc5b866231d33fb00c55b3b99d8d59ae..035ff77731c00f37611970ec075a70238430f4df 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32214.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32214.htm
@@ -2,8 +2,8 @@
Have you heard the news? Apparently all Giran is abuzz about our Kamael Guild; everyone, it seems, is on fire to know more about the Kamael, our abilities and our intentions. And interesting situation, to be sure. I could almost wish that another held this position...<br>
<a action="bypass -h npc_%objectId%_Quest kamael_occupation_change">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32217.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32217.htm
index ea2cc2571d21647c5184f96b44ab269fa304f31c..4b93c29ebea3035e75cbe5d320133a0a62e3ddbb 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32217.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32217.htm
@@ -2,8 +2,8 @@
Greetings! Ah, this is the most pleasant moment of my day, meeting a young Kamael like yourself in a small town like this. Granted, there are other Kamael masters, but they are so stiff and formal. They have no fire in the bellies for adventure -- not like you youngsters. Tell me, have you had any exciting adventures lately?<br>
<a action="bypass -h npc_%objectId%_Quest kamael_occupation_change">Ask about the 2nd class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32218.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32218.htm
index be0d626b5b63295b6bb12e8550c1f657cf4f310b..bb5566a7409c0675b181c0485b3e2b9e230259fc 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32218.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32218.htm
@@ -2,8 +2,8 @@
I am Miya, Grand Master of the Kamael Guild here. Perhaps you remember me? I was once renowned among our people for my skill with the sword. That was long ago, however... Now I spend my days training the young.<br>
<a action="bypass -h npc_%objectId%_Quest kamael_occupation_change">Ask about the 2nd class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32221.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32221.htm
index 865209bb09e85b812787ed1218f56ea78de26c05..a742b9c2b060e8c33e36707e5b5518a6bfa872ee 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32221.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32221.htm
@@ -1,8 +1,8 @@
<html><body>Grand Master Brome:<br>
Eh, did you just say something? Apologies! My focus isn't what it used to be. Sometimes I can't even remember the date! Ah, but my absent-mindedness doesn't keep me from helping our own people. Now what was it that you asked me?<br>
<a action="bypass -h npc_%objectId%_Quest kamael_occupation_change">Listen to information about second class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use a shadow weapon exchange coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32222.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32222.htm
index f7f1bc7dae8f78035cf2d363209d477e5a2e7043..41f3bfb8cc08d03e9d149ec9d7a4b2f6e53c1f00 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32222.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32222.htm
@@ -1,8 +1,8 @@
<html><body>Grand Master Liane :<br>
Welcome to the Town of Aden. I am Grand Master Liane, head of the Kamael Guild. If you need my assistance, please do not hesitate to ask. I will do whatever I can to assist our people.<br>
<a action="bypass -h npc_%objectId%_Quest kamael_occupation_change">Listen to information about second class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use a shadow weapon exchange coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32225.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32225.htm
index 4421ccf5e60720c978b437eeea30a80e3c7aa48d..bcbe1f52e4d649b82a94f0298db64096d0703328 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32225.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32225.htm
@@ -1,8 +1,8 @@
<html><body>Grand Master Taine:<br>
What do you think of the interchanges between the Kamael and the other races? I believe that to better Kamael society relations with the other races are absolutely vital. I have heard that the best soldiers come here to Goddard. Why not interact with them to develop each other's skills? What do you think? Too progressive for you?<br>
<a action="bypass -h npc_%objectId%_Quest kamael_occupation_change">Ask about the 2nd class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use a shadow weapon exchange coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32226.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32226.htm
index 9bfaa930d61510c315934380ace60629bb8494ef..2991af0993c255036d2dd87c0a00a4dd0aa7f09f 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32226.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32226.htm
@@ -2,8 +2,8 @@
Welcome to the Town of Goddard! I am Grand Master Raula, head of the Kamael Guild here. Have you met Grand Master Taine? No? Well, if you do, try not to be overly influenced by him. He is ready to start at his own shadow, and his mind is filled with wild thoughts about the Kamael.<br>
Do you know he refuses to even speak to me these days? If you do happen to talk with him, please tell him that I am concerned -- as a colleague -- about his health.<br>
<a action="bypass -h npc_%objectId%_Quest kamael_occupation_change">Listen to information about 2nd class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32229.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32229.htm
index b8d0c5d3fee740d29bb428487ba3e8c258e2fc7c..74d5ce4acff3dcc8d35a7bfa6406946d17ab027b 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32229.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32229.htm
@@ -2,8 +2,8 @@
Welcome! I am Grand Master Hagel, head of the Kamael Guild in this town. Ah, you need not tell me -- I know why you are here. You wish to hear about class transfer, eh? You have come to the right man; I can tell you everything you need to know.<br>
<a action="bypass -h npc_%objectId%_Quest kamael_occupation_change">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32230.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32230.htm
index 0609a84304f96b0e569aa5ae0e9f6f59c969e54d..bf780bfcd0671e3a227ffd3c6c787cca44cff8ed 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32230.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32230.htm
@@ -2,8 +2,8 @@
You came just in time! Did you see those chaps who just passed by here? They're of that new race... They mistook me for an Elf, if you can believe it. Said their eye sight is bad... I don't know how they missed these wings of mine -- I wonder if their eye sight is really that bad, or if they are simply that ignorant...<br>
<a action="bypass -h npc_%objectId%_Quest kamael_occupation_change">Listen to information about second class transfer.</a><br>
<a action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32233.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32233.htm
index bd0dd8269e13f1f3281416e1714734fad0bc2c59..0a0c013086d4316ef3c8b3dbeddcd3d4ad75deb1 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32233.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32233.htm
@@ -1,8 +1,8 @@
<html><body>Grand Master Zoldart:<br>
I am Grand Master Zoldart of the Kamael Guild. Why, you look exhausted! May I give you a piece of advice? It is important for Kamael desiring class transfer to possess various abilities, but strong physical power is the most important factor. You will have to undertake a number of difficult journeys to obtain the class transfer - how will you survive them when you are already as weak as a newborn foal? Do not waste your energy - save it for when it will be needed.<br>
<a action="bypass -h npc_%objectId%_Quest kamael_occupation_change">Ask about the 2nd class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use a shadow weapon exchange coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32234.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32234.htm
index 2bf877ea36a2edcf5122fafcaaee975dafb82df6..194c7ea6abd9330343ba92ed9283744313d09d99 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32234.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/32234.htm
@@ -1,8 +1,8 @@
<html><body>Grand Master Nizer:<br>
Hmm...you look familiar. Have we met before? No? My apologies -- since I was made Grand Master, I have met so many people that I cannot remember them all. I am sure you understand... In any event, how may I help you today?<br>
<a action="bypass -h npc_%objectId%_Quest kamael_occupation_change">Ask about the 2nd class transfer.</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan</a><br>
-<a action="bypass -h npc_%objectId%_Quest 9001_alliance">Alliance</a><br>
+<a action="bypass -h npc_%objectId%_Quest Clan">Clan</a><br>
+<a action="bypass -h npc_%objectId%_Quest Alliance">Alliance</a><br>
<a action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use a shadow weapon exchange coupon.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts.cfg b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
index effaa054696957490c0cdba3a00be26d36f06abf..a292616b26036018f7d16111a51176e21fa93de3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts.cfg
+++ b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
@@ -204,8 +204,8 @@ teleports/Warpgate/Warpgate.java
# Village Master
-village_master/9000_clan/__init__.py
-village_master/9001_alliance/__init__.py
+village_master/Clan/Clan.java
+village_master/Alliance/Alliance.java
village_master/9002_SubClassCertification/__init__.py
village_master/dark_elven_change_1/__init__.py
village_master/dark_elven_change_2/__init__.py
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-01.htm
deleted file mode 100644
index 7d52e8c06b00ef0b97d142bea7b9c9d00bd089ff..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-01.htm
+++ /dev/null
@@ -1,12 +0,0 @@
-<html><body>
-What would you like to do?<br>
-<a action="bypass -h Quest 9000_clan 9000-02.htm">Create New Clan.</a><br>
-<a action="bypass -h Quest 9000_clan 9000-03.htm">Increase Clan Level.</a><br>
-<a action="bypass -h Quest 9000_clan 9000-04.htm">Disband Clan.</a><br>
-<a action="bypass -h Quest 9000_clan 9000-05.htm">Restore Clan.</a><br>
-<a action="bypass -h npc_%objectId%_learn_clan_skills">Acquire Clan Skill.</a><br>
-<a action="bypass -h Quest 9000_clan 9000-06.htm">Delegate Clan Leader.</a><br>
-<a action="bypass -h Quest 9000_clan 9000-12.htm">Manage Academy.</a><br>
-<a action="bypass -h Quest 9000_clan 9000-13.htm">Manage Guards.</a><br>
-<a action="bypass -h Quest 9000_clan 9000-14.htm">Manage Knights.</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-13b.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-13b.htm
deleted file mode 100644
index 14168a2ea552d51eef431263bdc4df1071cf9a36..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-13b.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<body><html>
-<a action="bypass -h Quest 9000_clan 9000-13c.htm">Rename the First Royal Guard.</a><br>
-<a action="bypass -h Quest 9000_clan 9000-13d.htm">Rename the Second Royal Guard.</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-14b.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-14b.htm
deleted file mode 100644
index 925d05f1023cd40390372890fa3ea9b0310df39a..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-14b.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<body><html>
-<a action="bypass -h Quest 9000_clan 9000-14c.htm">Rename First Order of Knights.</a><br>
-<a action="bypass -h Quest 9000_clan 9000-14d.htm">Rename Second Order of Knights.</a><br>
-<a action="bypass -h Quest 9000_clan 9000-14e.htm">Rename Third Order of Knights.</a><br>
-<a action="bypass -h Quest 9000_clan 9000-14f.htm">Rename Fourth Order of Knights.</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/__init__.py
deleted file mode 100644
index fd388a89ff32ca2ce095ea28232bbec2cb373550..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/__init__.py
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# Created by DraX on 2005.08.12
-# minor fixes by DrLecter 2005.09.10
-
-import sys
-
-from com.l2jserver.gameserver.model.quest import State
-from com.l2jserver.gameserver.model.quest import QuestState
-from com.l2jserver.gameserver.model.quest.jython import QuestJython as JQuest
-qn = "9000_clan"
-NPC=[30026,30031,30037,30066,30070,30109,30115,30120,30154,30174, \
- 30175,30176,30187,30191,30195,30288,30289,30290,30297,30358, \
- 30373,30462,30474,30498,30499,30500,30503,30504,30505,30508, \
- 30511,30512,30513,30520,30525,30565,30594,30595,30676,30677, \
- 30681,30685,30687,30689,30694,30699,30704,30845,30847,30849, \
- 30854,30857,30862,30865,30894,30897,30900,30905,30910,30913, \
- 31269,31272,31276,31279,31285,31288,31314,31317,31321,31324, \
- 31326,31328,31331,31334,31336,31755,31958,31961,31965,31968, \
- 31974,31977,31996,32092,32093,32094,32095,32096,32097,32098, \
- 32145,32146,32147,32150,32153,32154,32157,32158,32160,32171, \
- 32193,32196,32199,32202,32205,32206,32209,32210,32213,32214, \
- 32217,32218,32221,32222,32225,32226,32229,32230,32233,32234]
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr): JQuest.__init__(self,id,name,descr)
-
- def onAdvEvent (self,event,npc, player) :
- htmltext = event
- if event == "9000-03.htm" :
- if player.getClan() == None or not player.isClanLeader():
- return "9000-03-no.htm"
- elif event == "9000-04.htm" :
- if player.getClan() == None or not player.isClanLeader():
- return "9000-04-no.htm"
- elif event == "9000-05.htm" :
- if player.getClan() == None or not player.isClanLeader():
- return "9000-05-no.htm"
- elif event == "9000-07.htm" :
- if player.getClan() == None or not player.isClanLeader():
- return "9000-07-no.htm"
- elif event == "9000-06a.htm" :
- if player.getClan() == None or not player.isClanLeader():
- return "9000-07-no.htm"
- elif event == "9000-12a.htm" :
- if player.getClan() == None or not player.isClanLeader():
- return "9000-07-no.htm"
- elif event == "9000-12b.htm" :
- if player.getClan() == None or not player.isClanLeader():
- return "9000-07-no.htm"
- elif event == "9000-13a.htm" :
- if player.getClan() == None or not player.isClanLeader():
- return "9000-07-no.htm"
- elif event == "9000-13b.htm" :
- if player.getClan() == None or not player.isClanLeader():
- return "9000-07-no.htm"
- elif event == "9000-14a.htm" :
- if player.getClan() == None or not player.isClanLeader():
- return "9000-07-no.htm"
- elif event == "9000-14b.htm" :
- if player.getClan() == None or not player.isClanLeader():
- return "9000-07-no.htm"
- elif event == "9000-15.htm" :
- if player.getClan() == None or not player.isClanLeader():
- return "9000-07-no.htm"
- return htmltext
-
- def onTalk (Self,npc,player):
- st = player.getQuestState(qn)
- npcId = npc.getNpcId()
- if npcId in NPC:
- st.set("cond","0")
- st.setState(State.STARTED)
- return "9000-01.htm"
-
-QUEST = Quest(-1,qn,"village_master")
-
-for item in NPC:
-### Quest NPC starter initialization
- QUEST.addStartNpc(item)
-### Quest NPC initialization
- QUEST.addTalkId(item)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9001_alliance/9001-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9001_alliance/9001-01.htm
deleted file mode 100644
index cd93483bb9be196f2395a91fa4af13d4c3d42e9e..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9001_alliance/9001-01.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>
-What do you want to do?<br>
-<a action="bypass -h Quest 9001_alliance 9001-02.htm">Create an Alliance</a><br>
-<a action="bypass -h Quest 9001_alliance 9001-03.htm">Dissolve Alliance</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9001_alliance/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9001_alliance/__init__.py
deleted file mode 100644
index cc97318c4995a9cda25af2ba287b39b79605f958..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9001_alliance/__init__.py
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Created by DraX on 2005.08.12
-# minor fixes by DrLecter 2005.09.10
-
-import sys
-
-from com.l2jserver.gameserver.model.quest import State
-from com.l2jserver.gameserver.model.quest import QuestState
-from com.l2jserver.gameserver.model.quest.jython import QuestJython as JQuest
-qn = "9001_alliance"
-NPC=[30026,30031,30037,30066,30070,30109,30115,30120,30154,30174, \
- 30175,30176,30187,30191,30195,30288,30289,30290,30297,30358, \
- 30373,30462,30474,30498,30499,30500,30503,30504,30505,30508, \
- 30511,30512,30513,30520,30525,30565,30594,30595,30676,30677, \
- 30681,30685,30687,30689,30694,30699,30704,30845,30847,30849, \
- 30854,30857,30862,30865,30894,30897,30900,30905,30910,30913, \
- 31269,31272,31276,31279,31285,31288,31314,31317,31321,31324, \
- 31326,31328,31331,31334,31336,31755,31958,31961,31965,31968, \
- 31974,31977,31996,32092,32093,32094,32095,32096,32097,32098, \
- 32145,32146,32147,32150,32153,32154,32157,32158,32160,32171, \
- 32193,32196,32199,32202,32205,32206,32209,32210,32213,32214, \
- 32217,32218,32221,32222,32225,32226,32229,32230,32233,32234]
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr): JQuest.__init__(self,id,name,descr)
-
- def onAdvEvent (self,event,npc, player) :
- htmltext = event
- st = player.getQuestState(qn)
- if not st : return
- Clan = player.getClanId()
- if event == "9001-01.htm":
- htmltext = "9001-01.htm"
- elif (Clan == 0):
- htmltext = "<html><body>You must be in Clan.</body></html"
- st.exitQuest(1)
- elif event == "9001-02.htm":
- htmltext = "9001-02.htm"
- return htmltext
-
- def onTalk (Self,npc,player):
- st = player.getQuestState(qn)
- npcId = npc.getNpcId()
- if npcId in NPC:
- st.set("cond","0")
- st.setState(State.STARTED)
- return "9001-01.htm"
-
-QUEST = Quest(-1,qn,"village_master")
-
-for item in NPC:
-### Quest NPC starter initialization
- QUEST.addStartNpc(item)
-### Quest NPC initialization
- QUEST.addTalkId(item)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Alliance/9001-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Alliance/9001-01.htm
new file mode 100644
index 0000000000000000000000000000000000000000..aaadd52e525c2cfbf0d0d741368c51949b1dccbb
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Alliance/9001-01.htm
@@ -0,0 +1,5 @@
+<html><body>
+What do you want to do?<br>
+<a action="bypass -h Quest Alliance 9001-02.htm">Create an Alliance</a><br>
+<a action="bypass -h Quest Alliance 9001-03.htm">Dissolve Alliance</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9001_alliance/9001-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Alliance/9001-02.htm
similarity index 62%
rename from L2J_DataPack_BETA/dist/game/data/scripts/village_master/9001_alliance/9001-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/village_master/Alliance/9001-02.htm
index f69b1fa17402a16c24e87f697d396f16a93533b9..a009b06677839c9b74476e5d80576e662a2706d0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9001_alliance/9001-02.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Alliance/9001-02.htm
@@ -3,5 +3,5 @@ Create Alliance:<br>
Enter Alliance Name:<br>
<edit var="name" width=80><br>
<button value="Enter" action="bypass -h npc_%objectId%_create_ally $name" width=40 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"><br>
-<button value="Cancel" action="bypass -h Quest 9001_alliance 9001-01.htm" width=40 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button value="Cancel" action="bypass -h Quest Alliance 9001-01.htm" width=40 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9001_alliance/9001-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Alliance/9001-03.htm
similarity index 61%
rename from L2J_DataPack_BETA/dist/game/data/scripts/village_master/9001_alliance/9001-03.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/village_master/Alliance/9001-03.htm
index 40334cddc13777d592c783f838b5c10fac796e28..eaf59ddfbda82b17fa85abd04377263c3564428a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9001_alliance/9001-03.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Alliance/9001-03.htm
@@ -1,5 +1,5 @@
<html><body>
At your command the alliance will be dissolved.<br>
<button value="Request Dissolution" action="bypass -h npc_%objectId%_dissolve_ally" width=100 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"><br>
-<button value="Cancel" action="bypass -h Quest 9001_alliance 9001-01.htm" width=40 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button value="Cancel" action="bypass -h Quest Alliance 9001-01.htm" width=40 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Alliance/Alliance.java b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Alliance/Alliance.java
new file mode 100644
index 0000000000000000000000000000000000000000..22c2726f20a5e3de3e64afb8ee0d8aff9d66d5e1
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Alliance/Alliance.java
@@ -0,0 +1,72 @@
+/*
+ * This program 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.
+ *
+ * This program 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 village_master.Alliance;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+
+/**
+ * @author UnAfraid
+ */
+public class Alliance extends Quest
+{
+ // @formatter:off
+ private static final int[] NPCS =
+ {
+ 30026,30031,30037,30066,30070,30109,30115,30120,30154,30174,
+ 30175,30176,30187,30191,30195,30288,30289,30290,30297,30358,
+ 30373,30462,30474,30498,30499,30500,30503,30504,30505,30508,
+ 30511,30512,30513,30520,30525,30565,30594,30595,30676,30677,
+ 30681,30685,30687,30689,30694,30699,30704,30845,30847,30849,
+ 30854,30857,30862,30865,30894,30897,30900,30905,30910,30913,
+ 31269,31272,31276,31279,31285,31288,31314,31317,31321,31324,
+ 31326,31328,31331,31334,31336,31755,31958,31961,31965,31968,
+ 31974,31977,31996,32092,32093,32094,32095,32096,32097,32098,
+ 32145,32146,32147,32150,32153,32154,32157,32158,32160,32171,
+ 32193,32196,32199,32202,32205,32206,32209,32210,32213,32214,
+ 32217,32218,32221,32222,32225,32226,32229,32230,32233,32234
+ };
+ // @formatter:on
+
+ public Alliance(int questId, String name, String descr)
+ {
+ super(questId, name, descr);
+ addStartNpc(NPCS);
+ addTalkId(NPCS);
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance talker)
+ {
+ return "9001-01.htm";
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ String htmltext = event;
+ if (!"9001-01.htm".equals(event) && player.getClan() == null)
+ {
+ htmltext = "<html><body>You must be in Clan.</body></html>";
+ }
+ return htmltext;
+ }
+
+ public static void main(String[] args)
+ {
+ new Alliance(-1, Alliance.class.getSimpleName(), "village_master");
+ }
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-01.htm
new file mode 100644
index 0000000000000000000000000000000000000000..b691fc4ff1e161be310e5b20b736b49589f03c92
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-01.htm
@@ -0,0 +1,12 @@
+<html><body>
+What would you like to do?<br>
+<a action="bypass -h Quest Clan 9000-02.htm">Create New Clan.</a><br>
+<a action="bypass -h Quest Clan 9000-03.htm">Increase Clan Level.</a><br>
+<a action="bypass -h Quest Clan 9000-04.htm">Disband Clan.</a><br>
+<a action="bypass -h Quest Clan 9000-05.htm">Restore Clan.</a><br>
+<a action="bypass -h npc_%objectId%_learn_clan_skills">Acquire Clan Skill.</a><br>
+<a action="bypass -h Quest Clan 9000-06.htm">Delegate Clan Leader.</a><br>
+<a action="bypass -h Quest Clan 9000-12.htm">Manage Academy.</a><br>
+<a action="bypass -h Quest Clan 9000-13.htm">Manage Guards.</a><br>
+<a action="bypass -h Quest Clan 9000-14.htm">Manage Knights.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-02.htm
similarity index 60%
rename from L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-02.htm
index 6b44cdcd00c1099f2516cd7b485ffe040c6addca..c15d05fb7f68287af3eca702b3803b1c358d942a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-02.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-02.htm
@@ -1,5 +1,5 @@
<html><body>Enter clan name:<br>
<edit var="name" width=120><br>
<button value="Enter" action="bypass -h npc_%objectId%_create_clan $name" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_ct1.button_df"><br>
-<button value="Cancel" action="bypass -h Quest 9000_clan 9000-01.htm" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_ct1.button_df">
+<button value="Cancel" action="bypass -h Quest Clan 9000-01.htm" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_ct1.button_df">
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-03-no.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-03-no.htm
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-03-no.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-03-no.htm
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-03.htm
similarity index 85%
rename from L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-03.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-03.htm
index 54b9cec54867a1f5cecb35cce4552e8f70ee442c..6f283678ca77d87228091eb2a209dba1371f01e2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-03.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-03.htm
@@ -16,7 +16,7 @@ To obtain an Alliance Manifesto, meet sir Christopher Rodemai of Giran Castle To
To obtain a Seal of Aspiration, see Sir Gustav Athebaldt in the Town of Oren.<br>
To obtain Blood Oath, acquire a fortress and prove that the territories are being protected.<br>
To obtain the Determination of Blood, possess a castle and prove that the territories are being protected and citizens are being taken care of. <br>
-<a action="bypass -h Quest 9000_clan 9000-16.htm">How to obtain Clan Fame</a><br>
+<a action="bypass -h Quest Clan 9000-16.htm">How to obtain Clan Fame</a><br>
<button value="Level Up" action="bypass -h npc_%objectId%_increase_clan_level" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
-<button value="Cancel" action="bypass -h Quest 9000_clan 9000-01.htm" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
+<button value="Cancel" action="bypass -h Quest Clan 9000-01.htm" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-04-no.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-04-no.htm
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-04-no.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-04-no.htm
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-04.htm
similarity index 89%
rename from L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-04.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-04.htm
index b839f988f7a6f9e9f52d14af61a934348c40b032..1a773fda35ca0e6d00168ab9af9de26970380cec 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-04.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-04.htm
@@ -5,6 +5,6 @@ If you apply for clan dissolution, the clan lord will lose experience equal to t
Please note that any items remaining in the clan warehouse at the time of clan dissolution will immediately disappear.<br>
<table width="270"><tr>
<td><button value="Dissolution" action="bypass -h npc_%objectId%_dissolve_clan" width=100 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-<td align="right"><button value="Cancel" action="bypass -h Quest 9000_clan 9000-01.htm" width=100 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td align="right"><button value="Cancel" action="bypass -h Quest Clan 9000-01.htm" width=100 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
</tr></table>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-05-no.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-05-no.htm
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-05-no.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-05-no.htm
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-05.htm
similarity index 77%
rename from L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-05.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-05.htm
index a29d1c2434ed56c0d32a15c74898a53460607077..1a319c0961e1c4c6075d556901539defd284b26f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-05.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-05.htm
@@ -2,6 +2,6 @@
If you request a restoration, your clan dissolution request will be canceled.<br>
<table width="270"><tr>
<td><button value="Restoration" action="bypass -h npc_%objectId%_recover_clan" width=100 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-<td align="right"><button value="Cancel" action="bypass -h Quest 9000_clan 9000-01.htm" width=100 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td align="right"><button value="Cancel" action="bypass -h Quest Clan 9000-01.htm" width=100 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
</tr></table>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-06.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-06.htm
similarity index 62%
rename from L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-06.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-06.htm
index a39fdd2cfa0cd512a97a24421bdb2fc3fb5032fc..eeac223dd204cf03bdf1d348914d5130c06e1e3e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-06.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-06.htm
@@ -2,7 +2,7 @@
One of the Clan members can be selected and be delegated the role of Clan Leader.<br>
Please consider your decision carefully before making the request.<br>
I'll say this once more. Since the delegation of a Clan Lord is the process in which all the rights of a Clan Leader are transferred to another Clan member, you need to consider your decision very carefully before submitting your request.<br>
-<a action="bypass -h Quest 9000_clan 9000-07.htm">Clan Leader Delegation Request</a><br>
-<a action="bypass -h Quest 9000_clan 9000-06a.htm">Cancel the Clan Leader Delegation Request</a><br>
-<a action="bypass -h Quest 9000_clan 9000-01.htm">Return</a>
+<a action="bypass -h Quest Clan 9000-07.htm">Clan Leader Delegation Request</a><br>
+<a action="bypass -h Quest Clan 9000-06a.htm">Cancel the Clan Leader Delegation Request</a><br>
+<a action="bypass -h Quest Clan 9000-01.htm">Return</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-06a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-06a.htm
similarity index 75%
rename from L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-06a.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-06a.htm
index f4b8b3154684c478a9603a0ac305e59866eec2f2..2952bbdc844434ec5dbcb6bbbd3eeb4fb2778497 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-06a.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-06a.htm
@@ -1,5 +1,5 @@
<html><body>
Cancel the application for Clan Leader transfer. Once the Clan Leader transfer is complete, it cannot be canceled.<br>
Cancel application for Clan Leader transfer [not done]<br>
-<a action="bypass -h Quest 9000_clan 9000-01.htm">Return</a>
+<a action="bypass -h Quest Clan 9000-01.htm">Return</a>
</html></body>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-07-no.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-07-no.htm
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-07-no.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-07-no.htm
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-07.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-07.htm
similarity index 64%
rename from L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-07.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-07.htm
index 9edc8ba3587d92fe379c5cd71228e1438ec531a9..4d713d528042ea1f12e65a3674bd15220e640dda 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-07.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-07.htm
@@ -2,5 +2,5 @@
Insert the name of the Clan member to commit:<br>
<edit var="name" width=120><br>
<button value="Submit" action="bypass -h npc_%objectId%_change_clan_leader $name" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"><br>
-<button value="Cancel" action="bypass -h Quest 9000_clan 9000-01.htm" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button value="Cancel" action="bypass -h Quest Clan 9000-01.htm" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-12.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-12.htm
similarity index 84%
rename from L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-12.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-12.htm
index 9fea0f437a7a27f929a81f2e4d5cdb02cd4c7db6..4cf19941f879ae5709a621b8e599c72f59aee920 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-12.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-12.htm
@@ -5,6 +5,6 @@ Up to 20 people can be members of an Academy at one time. The individual level o
A D-Grade armor acquisition quest is available exclusively for Academy members. At graduation, members also receive an Academy Circlet as a reward.<br>
An existing clan member can be appointed as an Academy member's sponsor. sponsors can view whether the academy member is logged in, as well as assist the member during the armor acquistion quest.<br>
Academy members may wear the D-Grade armor only while still a member.<br>
-<a action="bypass -h Quest 9000_clan 9000-12a.htm">Found an Academy.</a><br>
-<a action="bypass -h Quest 9000_clan 9000-12b.htm">Rename the existing Academy.</a>
+<a action="bypass -h Quest Clan 9000-12a.htm">Found an Academy.</a><br>
+<a action="bypass -h Quest Clan 9000-12b.htm">Rename the existing Academy.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-12a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-12a.htm
similarity index 63%
rename from L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-12a.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-12a.htm
index a3c0ac055d6f999ce2c1f4d2568ad180b464f652..72358afbf270d41ae54b4b255414034c3c2d934e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-12a.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-12a.htm
@@ -2,5 +2,5 @@
Enter Academy Name:<br>
<edit var="name" width=120><br>
<button value="Enter" action="bypass -h npc_%objectId%_create_academy $name" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"><br>
-<button value="Cancel" action="bypass -h Quest 9000_clan 9000-01.htm" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button value="Cancel" action="bypass -h Quest Clan 9000-01.htm" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-12b.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-12b.htm
similarity index 65%
rename from L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-12b.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-12b.htm
index 7bc2d8d9ccc89806fa8f49913bac5520157c818e..c827a19313c7c1c1d9794d15ec77c4b78bbfc2a5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-12b.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-12b.htm
@@ -2,5 +2,5 @@
Enter new name for Academy:<br>
<edit var="name" width=120><br>
<button value="Enter" action="bypass -h npc_%objectId%_rename_pledge -1 $name" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"><br>
-<button value="Cancel" action="bypass -h Quest 9000_clan 9000-01.htm" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button value="Cancel" action="bypass -h Quest Clan 9000-01.htm" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-13.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-13.htm
similarity index 57%
rename from L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-13.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-13.htm
index df40b8d25fb784ed0138c82d8a711d4afba745fe..0e2d6c72a526c6a71e4fa69563321c89f50d6416 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-13.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-13.htm
@@ -2,8 +2,8 @@
A level six or higher clan may found a Royal Guard at a cost of 5,000 reputation points.<br>
As many as two Royal Guards may be formated this way. 20 eligible clan members must be able to assume positions in the Royal Guard at the time it is formed.<br>
A single clan member must be appointed as Captain of the Royal Guard for each Royal Guard formed. the Captain's social status will improve with the appointment.<br><br>
-<a action="bypass -h Quest 9000_clan 9000-13a.htm">Found a Royal Guard.</a><br>
-<a action="bypass -h Quest 9000_clan 9000-13b.htm">Rename an existing Royal Guard.</a><br>
-<a action="bypass -h Quest 9000_clan 9000-15.htm">Change the Captain of the Royal Guard.</a><br>
-<a action="bypass -h Quest 9000_clan 9000-01.htm">Return</a>
+<a action="bypass -h Quest Clan 9000-13a.htm">Found a Royal Guard.</a><br>
+<a action="bypass -h Quest Clan 9000-13b.htm">Rename an existing Royal Guard.</a><br>
+<a action="bypass -h Quest Clan 9000-15.htm">Change the Captain of the Royal Guard.</a><br>
+<a action="bypass -h Quest Clan 9000-01.htm">Return</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-13a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-13a.htm
similarity index 68%
rename from L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-13a.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-13a.htm
index ddee7d21d7a9156dc6ee657d4fef5fe23959cfec..83be673773be3182afcd24dbb57197b3e8eea6e3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-13a.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-13a.htm
@@ -5,5 +5,5 @@ Enter Unit Name:<br>
Enter Unit Leader Name:<br>
<edit var="lname" width=120><br>
<button value="Enter" action="bypass -h npc_%objectId%_create_royal $name $lname" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"><br>
-<button value="Cancel" action="bypass -h Quest 9000_clan 9000-01.htm" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button value="Cancel" action="bypass -h Quest Clan 9000-01.htm" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-13b.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-13b.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f8fba50693be692be4ffc501352d1db2f5b6547c
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-13b.htm
@@ -0,0 +1,4 @@
+<body><html>
+<a action="bypass -h Quest Clan 9000-13c.htm">Rename the First Royal Guard.</a><br>
+<a action="bypass -h Quest Clan 9000-13d.htm">Rename the Second Royal Guard.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-13c.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-13c.htm
similarity index 66%
rename from L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-13c.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-13c.htm
index 1059a8c3ca270181f0313e8ba0eb63e66b58fbe4..ba999de0097a39e3c51df78a7d097230aa29291b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-13c.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-13c.htm
@@ -2,5 +2,5 @@
Enter new name for First Royal Guard:<br>
<edit var="name" width=120><br>
<button value="Enter" action="bypass -h npc_%objectId%_rename_pledge 100 $name" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"><br>
-<button value="Cancel" action="bypass -h Quest 9000_clan 9000-01.htm" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button value="Cancel" action="bypass -h Quest Clan 9000-01.htm" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-13d.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-13d.htm
similarity index 66%
rename from L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-13d.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-13d.htm
index 1de05e20a2ebe07a09010c9268fc5524bf5f0c0f..1bcfd05f497d6e2d5564f46f0afce5622cfb6ddf 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-13d.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-13d.htm
@@ -2,5 +2,5 @@
Enter new name for Second Royal Guard:<br>
<edit var="name" width=120><br>
<button value="Enter" action="bypass -h npc_%objectId%_rename_pledge 200 $name" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"><br>
-<button value="Cancel" action="bypass -h Quest 9000_clan 9000-01.htm" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button value="Cancel" action="bypass -h Quest Clan 9000-01.htm" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-14.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-14.htm
similarity index 63%
rename from L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-14.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-14.htm
index 4b23ff8e0948107e51b39ea9f3ace175520d0a87..20ede0b5219a1064a2d02bb929614e7dc0aca8ee 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-14.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-14.htm
@@ -3,9 +3,9 @@ A clan that is clan level 7 or above may use 10,000 reputation points to create
Up to 4 Knights units may be created in this way. At the time of creation, 10 clan members may be accepted per Knight unit.<br>
Clans at level 9 may use a reputation score of 5,000 to increase the Order of Knights.<br>
Each Knight unit created must appoint one direct clan member as a Knight Commander. The social rank of the appointed clan commander will be accordingly raised.<br><br>
-<a action="bypass -h Quest 9000_clan 9000-14a.htm">Create Knights.</a><br>
+<a action="bypass -h Quest Clan 9000-14a.htm">Create Knights.</a><br>
Reinforce Knights. [not done]<br>
-<a action="bypass -h Quest 9000_clan 9000-14b.htm">Change the name of Knights.</a><br>
-<a action="bypass -h Quest 9000_clan 9000-15.htm">Change the Knight Commander.</a><br>
-<a action="bypass -h Quest 9000_clan 9000-01.htm">back.</a>
+<a action="bypass -h Quest Clan 9000-14b.htm">Change the name of Knights.</a><br>
+<a action="bypass -h Quest Clan 9000-15.htm">Change the Knight Commander.</a><br>
+<a action="bypass -h Quest Clan 9000-01.htm">back.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-14a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-14a.htm
similarity index 69%
rename from L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-14a.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-14a.htm
index 610ee5401f6d4595f350e8d25327371d61bcd80a..02cc1805864682cf8e179752f6a027132c2b860a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-14a.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-14a.htm
@@ -5,5 +5,5 @@ Enter Unit Name:<br>
Enter Unit Leader Name:<br>
<edit var="lname" width=120><br>
<button value="Enter" action="bypass -h npc_%objectId%_create_knight $name $lname" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"><br>
-<button value="Cancel" action="bypass -h Quest 9000_clan 9000-01.htm" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button value="Cancel" action="bypass -h Quest Clan 9000-01.htm" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-14b.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-14b.htm
new file mode 100644
index 0000000000000000000000000000000000000000..ae14e95be712919335d1eac90bc829fb74bce3f5
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-14b.htm
@@ -0,0 +1,6 @@
+<body><html>
+<a action="bypass -h Quest Clan 9000-14c.htm">Rename First Order of Knights.</a><br>
+<a action="bypass -h Quest Clan 9000-14d.htm">Rename Second Order of Knights.</a><br>
+<a action="bypass -h Quest Clan 9000-14e.htm">Rename Third Order of Knights.</a><br>
+<a action="bypass -h Quest Clan 9000-14f.htm">Rename Fourth Order of Knights.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-14c.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-14c.htm
similarity index 66%
rename from L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-14c.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-14c.htm
index db330d041ed37628e1b5fb8450226fb942d0fdd6..46e27f0cb926d53374b522ca36601a473b192a08 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-14c.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-14c.htm
@@ -2,5 +2,5 @@
Enter new name for first Order of Knights:<br>
<edit var="name" width=120><br>
<button value="Enter" action="bypass -h npc_%objectId%_rename_pledge 1001 $name" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"><br>
-<button value="Cancel" action="bypass -h Quest 9000_clan 9000-01.htm" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button value="Cancel" action="bypass -h Quest Clan 9000-01.htm" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-14d.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-14d.htm
similarity index 67%
rename from L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-14d.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-14d.htm
index 3b8d35ca9a92745df02852f7fb169b900497e120..c3107181e7bce6921ee08596c642012b2c01e89e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-14d.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-14d.htm
@@ -2,5 +2,5 @@
Enter new name for second Order of Knights:<br>
<edit var="name" width=120><br>
<button value="Enter" action="bypass -h npc_%objectId%_rename_pledge 1002 $name" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"><br>
-<button value="Cancel" action="bypass -h Quest 9000_clan 9000-01.htm" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button value="Cancel" action="bypass -h Quest Clan 9000-01.htm" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-14e.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-14e.htm
similarity index 66%
rename from L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-14e.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-14e.htm
index 114c53b5a1e2e91e0f0c4fd65f07001ba2ac86bf..6ad0a4c573a650270cced7e2a2977783b0eef1d6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-14e.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-14e.htm
@@ -2,5 +2,5 @@
Enter new name for third Order of Knights:<br>
<edit var="name" width=120><br>
<button value="Enter" action="bypass -h npc_%objectId%_rename_pledge 2001 $name" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"><br>
-<button value="Cancel" action="bypass -h Quest 9000_clan 9000-01.htm" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button value="Cancel" action="bypass -h Quest Clan 9000-01.htm" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-14f.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-14f.htm
similarity index 67%
rename from L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-14f.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-14f.htm
index 5c5647e489448020a35b4f092996b5a5cac71136..53160c36ebf6680d06ae221330f5a143cf2f5b52 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-14f.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-14f.htm
@@ -2,5 +2,5 @@
Enter new name for fourth Order of Knights:<br>
<edit var="name" width=120><br>
<button value="Enter" action="bypass -h npc_%objectId%_rename_pledge 2002 $name" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"><br>
-<button value="Cancel" action="bypass -h Quest 9000_clan 9000-01.htm" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button value="Cancel" action="bypass -h Quest Clan 9000-01.htm" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-15.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-15.htm
similarity index 69%
rename from L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-15.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-15.htm
index 6fdd4289dc26d785c4904abdc170416d95e73ce6..8145e8a85cc1b4a2f72d25083c4d9f20a55366e7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-15.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-15.htm
@@ -5,5 +5,5 @@ Enter unit name:<br>
Enter new unit leader name:<br>
<edit var="lname" width=120><br>
<button value="Enter" action="bypass -h npc_%objectId%_assign_subpl_leader $name $lname" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"><br>
-<button value="Cancel" action="bypass -h Quest 9000_clan 9000-01.htm" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button value="Cancel" action="bypass -h Quest Clan 9000-01.htm" width=80 height=27 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-16.htm b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-16.htm
similarity index 96%
rename from L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-16.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-16.htm
index d4715eb67f66e988351b4e776148642cbe05264a..f5ef5b5be74f587d89ccc350b5db708a2537363d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9000_clan/9000-16.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/9000-16.htm
@@ -18,5 +18,5 @@
3. If an allied clan member is killed by an enemy clan member during a clan war (dual declared state) or a castle siege, <font color="00FFFF">1 point</font> is lost per clan member.<br>
4. Fame points can be used to purchase items to help raise the clan's level, or to acquire clan skills.<br>
*Fame is not lost if the clan is below level 5 or its fame is less than 0.<br><br>
-<a action="bypass -h Quest 9000_clan 9000-03.htm">Back</a>
+<a action="bypass -h Quest Clan 9000-03.htm">Back</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/Clan.java b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/Clan.java
new file mode 100644
index 0000000000000000000000000000000000000000..e4416ead9d81f45a8b9496d040d9d44f1925649d
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/Clan.java
@@ -0,0 +1,95 @@
+/*
+ * This program 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.
+ *
+ * This program 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 village_master.Clan;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+
+/**
+ * @author UnAfraid
+ */
+public class Clan extends Quest
+{
+ // @formatter:off
+ private static final int[] NPCS =
+ {
+ 30026,30031,30037,30066,30070,30109,30115,30120,30154,30174,
+ 30175,30176,30187,30191,30195,30288,30289,30290,30297,30358,
+ 30373,30462,30474,30498,30499,30500,30503,30504,30505,30508,
+ 30511,30512,30513,30520,30525,30565,30594,30595,30676,30677,
+ 30681,30685,30687,30689,30694,30699,30704,30845,30847,30849,
+ 30854,30857,30862,30865,30894,30897,30900,30905,30910,30913,
+ 31269,31272,31276,31279,31285,31288,31314,31317,31321,31324,
+ 31326,31328,31331,31334,31336,31755,31958,31961,31965,31968,
+ 31974,31977,31996,32092,32093,32094,32095,32096,32097,32098,
+ 32145,32146,32147,32150,32153,32154,32157,32158,32160,32171,
+ 32193,32196,32199,32202,32205,32206,32209,32210,32213,32214,
+ 32217,32218,32221,32222,32225,32226,32229,32230,32233,32234
+ };
+ // @formatter:on
+
+ private static final Map<String, String> LEADER_REQUIRED = new HashMap<>();
+ static
+ {
+ LEADER_REQUIRED.put("9000-03.htm", "9000-03-no.htm");
+ LEADER_REQUIRED.put("9000-04.htm", "9000-04-no.htm");
+ LEADER_REQUIRED.put("9000-05.htm", "9000-05-no.htm");
+ LEADER_REQUIRED.put("9000-06a.htm", "9000-07-no.htm");
+ LEADER_REQUIRED.put("9000-07.htm", "9000-07-no.htm");
+ LEADER_REQUIRED.put("9000-12a.htm", "9000-07-no.htm");
+ LEADER_REQUIRED.put("9000-12b.htm", "9000-07-no.htm");
+ LEADER_REQUIRED.put("9000-13a.htm", "9000-07-no.htm");
+ LEADER_REQUIRED.put("9000-13b.htm", "9000-07-no.htm");
+ LEADER_REQUIRED.put("9000-14a.htm", "9000-07-no.htm");
+ LEADER_REQUIRED.put("9000-14b.htm", "9000-07-no.htm");
+ LEADER_REQUIRED.put("9000-15.htm", "9000-07-no.htm");
+ }
+
+ public Clan(int questId, String name, String descr)
+ {
+ super(questId, name, descr);
+ addStartNpc(NPCS);
+ addTalkId(NPCS);
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance talker)
+ {
+ return "9000-01.htm";
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ String htmltext = event;
+ if (LEADER_REQUIRED.containsKey(event))
+ {
+ if (player.getClan() == null || !player.isClanLeader())
+ {
+ htmltext = LEADER_REQUIRED.get(event);
+ }
+ }
+ return htmltext;
+ }
+
+ public static void main(String[] args)
+ {
+ new Clan(-1, Clan.class.getSimpleName(), "village_master");
+ }
+}