Răsfoiți Sursa

DP side for clanhall update
require [L1912]

Kerberos 17 ani în urmă
părinte
comite
0642d7c8ac
59 a modificat fișierele cu 476 adăugiri și 465 ștergeri
  1. 7 0
      datapack_development/data/html/clanHallManager/banish-list.htm
  2. 4 0
      datapack_development/data/html/clanHallManager/banish.htm
  3. 1 1
      datapack_development/data/html/clanHallManager/chamberlain-busy.htm
  4. 4 3
      datapack_development/data/html/clanHallManager/chamberlain-nac.htm
  5. 2 2
      datapack_development/data/html/clanHallManager/chamberlain-no.htm
  6. 5 4
      datapack_development/data/html/clanHallManager/chamberlain.htm
  7. 13 10
      datapack_development/data/html/clanHallManager/deco.htm
  8. 8 0
      datapack_development/data/html/clanHallManager/door-close.htm
  9. 8 0
      datapack_development/data/html/clanHallManager/door-open.htm
  10. 6 7
      datapack_development/data/html/clanHallManager/door.htm
  11. 19 13
      datapack_development/data/html/clanHallManager/edit_other.htm
  12. 0 13
      datapack_development/data/html/clanHallManager/edit_other0.htm
  13. 0 13
      datapack_development/data/html/clanHallManager/edit_other1.htm
  14. 0 13
      datapack_development/data/html/clanHallManager/edit_other2.htm
  15. 0 13
      datapack_development/data/html/clanHallManager/edit_other3.htm
  16. 17 12
      datapack_development/data/html/clanHallManager/edit_recovery.htm
  17. 0 13
      datapack_development/data/html/clanHallManager/edit_recovery0.htm
  18. 0 13
      datapack_development/data/html/clanHallManager/edit_recovery1.htm
  19. 0 13
      datapack_development/data/html/clanHallManager/edit_recovery2.htm
  20. 0 13
      datapack_development/data/html/clanHallManager/edit_recovery3.htm
  21. 14 0
      datapack_development/data/html/clanHallManager/functions-apply.htm
  22. 8 0
      datapack_development/data/html/clanHallManager/functions-apply_confirmed.htm
  23. 10 0
      datapack_development/data/html/clanHallManager/functions-cancel.htm
  24. 8 0
      datapack_development/data/html/clanHallManager/functions-cancel_confirmed.htm
  25. 7 0
      datapack_development/data/html/clanHallManager/functions-used.htm
  26. 11 11
      datapack_development/data/html/clanHallManager/functions.htm
  27. 4 0
      datapack_development/data/html/clanHallManager/low_adena.htm
  28. 6 6
      datapack_development/data/html/clanHallManager/manage.htm
  29. 3 0
      datapack_development/data/html/clanHallManager/not_authorized.htm
  30. 5 0
      datapack_development/data/html/clanHallManager/support-done.htm
  31. 6 0
      datapack_development/data/html/clanHallManager/support-no_mana.htm
  32. 11 7
      datapack_development/data/html/clanHallManager/support1.htm
  33. 11 7
      datapack_development/data/html/clanHallManager/support2.htm
  34. 11 7
      datapack_development/data/html/clanHallManager/support3.htm
  35. 15 11
      datapack_development/data/html/clanHallManager/support4.htm
  36. 20 16
      datapack_development/data/html/clanHallManager/support5.htm
  37. 25 22
      datapack_development/data/html/clanHallManager/support6.htm
  38. 20 16
      datapack_development/data/html/clanHallManager/support7.htm
  39. 25 22
      datapack_development/data/html/clanHallManager/support8.htm
  40. 25 22
      datapack_development/data/html/clanHallManager/support9.htm
  41. 6 6
      datapack_development/data/html/clanHallManager/teleAden1.htm
  42. 17 26
      datapack_development/data/html/clanHallManager/teleAden2.htm
  43. 6 6
      datapack_development/data/html/clanHallManager/teleDion1.htm
  44. 11 16
      datapack_development/data/html/clanHallManager/teleDion2.htm
  45. 1 1
      datapack_development/data/html/clanHallManager/teleGiran1.htm
  46. 1 1
      datapack_development/data/html/clanHallManager/teleGiran2.htm
  47. 6 6
      datapack_development/data/html/clanHallManager/teleGludin1.htm
  48. 11 22
      datapack_development/data/html/clanHallManager/teleGludin2.htm
  49. 1 1
      datapack_development/data/html/clanHallManager/teleGludio1.htm
  50. 1 1
      datapack_development/data/html/clanHallManager/teleGludio2.htm
  51. 1 1
      datapack_development/data/html/clanHallManager/teleGoddard1.htm
  52. 1 1
      datapack_development/data/html/clanHallManager/teleGoddard2.htm
  53. 1 2
      datapack_development/data/html/clanHallManager/teleRune1.htm
  54. 1 2
      datapack_development/data/html/clanHallManager/teleRune2.htm
  55. 1 1
      datapack_development/data/html/clanHallManager/teleSchuttgart1.htm
  56. 1 1
      datapack_development/data/html/clanHallManager/teleSchuttgart2.htm
  57. 8 7
      datapack_development/data/html/clanHallManager/vault.htm
  58. 44 44
      datapack_development/sql/clanhall.sql
  59. 18 17
      datapack_development/sql/teleport.sql

+ 7 - 0
datapack_development/data/html/clanHallManager/banish-list.htm

@@ -0,0 +1,7 @@
+<html><body>
+I can expel any uninvited guests that might be present.<br>Do you wish for me to do so now?<br>
+<center>
+<br><button action="bypass -h npc_%objectId%_banish_foreigner banish" value="Dismiss" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
+<br><button action="bypass -h npc_%objectId%_list_back" value="Cancel" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
+</center>
+</body></html>

+ 4 - 0
datapack_development/data/html/clanHallManager/banish.htm

@@ -0,0 +1,4 @@
+<html><body>
+All uninvited guests have been shown out.<center><br><br>
+<button action="bypass -h npc_%objectId%_list_back" value="Initial Screen" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
+</center></body></html>

+ 1 - 1
datapack_development/data/html/clanHallManager/chamberlain-busy.htm

@@ -1,3 +1,3 @@
-<html><body>%npcname%:<br>
+<html><body><br>
 Oh! Our castle is being attacked. I can't do anything for you right now.<br>
 </body></html>

+ 4 - 3
datapack_development/data/html/clanHallManager/chamberlain-nac.htm

@@ -1,6 +1,7 @@
-<html><body>%npcname%:<br>
-That function has not been activated.<br><a action="bypass -h npc_%objectId%_manage">Use the Clan Hall Management menu to activate functions.</a><br>
+<html><body>
+That function has not been activated.<br>
+Use the &nbsp;<a action="bypass -h npc_%objectId%_manage">Manage Clan Hall</A>&nbsp; menu to activate functions.<br>
 <center>
-<button value="Initial Screen" action="bypass -h npc_%objectId%_functions back" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal"><br>
+<button value="Go Back" action="bypass -h npc_%objectId%_functions back"  width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
 </center>
 </body></html>

+ 2 - 2
datapack_development/data/html/clanHallManager/chamberlain-no.htm

@@ -1,3 +1,3 @@
-<html><body>%npcname%:<br>
-How dare you talk to me! I am not interested in anything you have to say. I only answer to the owners of this clan hall!<br>
+<html><body>
+Would you care for a nice cup of tea? 
 </body></html>

+ 5 - 4
datapack_development/data/html/clanHallManager/chamberlain.htm

@@ -1,9 +1,10 @@
-<html><body>%npcname%:<br>
-Greetings, my Lord.<br>
-Awaiting your order!<br><br>
+<html><body>
+Greetings, my lord.<BR1>
+Awaiting your order!<BR>
+<BR><BR>
 <CENTER>
 <a action="bypass -h npc_%objectId%_door">Open and close the door</a><br>
-<a action="bypass -h npc_%objectId%_banish_foreigner">Expel outsiders</a><br>
+<a action="bypass -h npc_%objectId%_banish_foreigner list">Expel outsiders</a><br>
 <a action="bypass -h npc_%objectId%_functions">Clan hall functions</a><br>
 <a action="bypass -h npc_%objectId%_manage_vault">Clan hall warehouse</a><br>
 <a action="bypass -h npc_%objectId%_manage">Clan hall managment</a><br>

+ 13 - 10
datapack_development/data/html/clanHallManager/deco.htm

@@ -1,11 +1,14 @@
-<html><body>%npcname%:
-<br>
-[Clan Hall Facilities Managment]<br><br>
-Function Curtains <font color="55FFFF">Level %curtain%</font> (<font color="LEVEL">%curtainPrice%</font>Adena/1 Day)<br>
-Period	 Withdraw the fee for the next time at %curtainDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage deco curtains 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage deco curtains 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage deco curtains 2">Level 2</a>]<br><br>
-Function Front Porch <font color="55FFFF">Level %porch%</font> (<font color="LEVEL">%porchPrice%</font>Adena/1 Day)<br>
-Period	 Withdraw the fee for the next time at %porchDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage deco porch 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage deco porch 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage deco porch 2">Level 2</a>]<br><br>
-<button value="To List" action="bypass -h npc_%objectId%_manage" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal">
+<html><body><br>
+<font color="LEVEL">[Manage Clan Hall]</font> <br>
+<table width=100% cellspacing=2 cellpadding=0><tr>
+<td width=45><font color="999999">Facility</font></td>
+<td width=230><font color="LEVEL">Curtains </font><font color="00FFFF">%curtain%</font></td></tr>
+<tr><td><font color="999999">Period  </font></td><td>%curtain_period%</td></tr>
+<tr><td><font color="999999">Change  </font><br></td><td>%change_curtain%<br></td></tr>
+<tr><td><font color="999999">Facility</font></td>
+<td><font color="LEVEL">Fixtures </font><font color="00FFFF">%fixture%</font></td></tr>
+<tr><td><font color="999999">Period  </font></td><td>%fixture_period%</td></tr>
+<tr><td><font color="999999">Change</font><br></td><td>%change_fixture%<br></td></tr>
+</table><br>
+<button action="bypass -h npc_%objectId%_manage" value="Back" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
 </body></html>

+ 8 - 0
datapack_development/data/html/clanHallManager/door-close.htm

@@ -0,0 +1,8 @@
+<html><body>
+The clan hall door is now <font color="FF9955">closed</font>.<br>
+Use the "Dismiss" function to expel anyone who is not a clan member.<br>
+<center><br>
+<button action="bypass -h npc_%objectId%_banish_foreigner banish" value="Dismiss" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br>
+<button action="bypass -h npc_%objectId%_list_back" value="Initial Screen" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
+</center>
+</body></html>

+ 8 - 0
datapack_development/data/html/clanHallManager/door-open.htm

@@ -0,0 +1,8 @@
+<html><body>
+The clan hall door is now <font color="FF9955">open</font>.<br>
+Anyone can enter as long as it remains open, even those who are not clan members. For security's sake, you should close the door as soon as possible.<br>
+<center><br>
+<button action="bypass -h npc_%objectId%_door close" value="Close" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br>
+<button action="bypass -h npc_%objectId%_list_back" value="Initial Screen" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
+</center>
+</body></html>

+ 6 - 7
datapack_development/data/html/clanHallManager/door.htm

@@ -1,11 +1,10 @@
-<html><body>%npcname%:<br>
+<html><body>
 The function controls the clan hall door.<br1>
-If you leave the door open, non-clan members can enter.<br1>
-The door should remain closed as much as passible.<br>
-If you wish to expel non-clan members, use the&nbsp;<a action="bypass -h npc_%objectId%_banish_foreigner">Expel Outsider</a>&nbsp;menu.<br><br><br>
+When the door open, anyone can enter -- even those who are not members of the clan. For security purposes, you should keep the door closed as much as possible.<br>
+If you wish to expel non-clan members, use the &nbsp;<a action="bypass -h npc_%objectId%_banish_foreigner banish">Expel Outsider</a>&nbsp; menu.<br><br>
 <center>
-<button value="Open doors" action="bypass -h npc_%objectId%_door open" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal"><br><br>
-<button value="Close doors" action="bypass -h npc_%objectId%_door close" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal"><br><br>
-<button value="Initial Screen" action="bypass -h npc_%objectId%_functions back" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal"><br>
+<button value="Open" action="bypass -h npc_%objectId%_door open" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br><br>
+<button value="Close" action="bypass -h npc_%objectId%_door close" width=80 height=27 back=L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br><br>
+<button value="Initial Screen" action="bypass -h npc_%objectId%_list_back" width=80 height=27 back=L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br>
 </center>
 </html>

+ 19 - 13
datapack_development/data/html/clanHallManager/edit_other.htm

@@ -1,13 +1,19 @@
-<html><body>%npcname%:<br>
-[Clan Hall Facilities Managment]<br><br>
-Function Teleport <font color="55FFFF">Level %tele%</font> (<font color="LEVEL">%telePrice%</font>Adena/1 Day)<br>
-Period	 Withdraw the fee for the next time at %teleDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage other tele 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other tele 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage other tele 2">Level 2</a>][<a action="bypass -h npc_%objectId%_manage other tele 3">Level 3</a>]<br><br>
-Function Support Magic <font color="55FFFF">Level %support%</font> (<font color="LEVEL">%supportPrice%</font>Adena/1 Day)<br>
-Period	 Withdraw the fee for the next time at %supportDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage other support 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other support 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage other support 2">Level 2</a>][<a action="bypass -h npc_%objectId%_manage other support 3">Level 3</a>]<br><br>
-Function Item Production <font color="55FFFF">Level %item%</font> (<font color="LEVEL">%itemPrice%</font>Adena/1 Day)<br>
-Period	 Withdraw the fee for the next time at %itemDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage other item 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other item 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage other item 2">Level 2</a>][<a action="bypass -h npc_%objectId%_manage other item 3">Level 3</a>]<br><br>
-<button value="To List" action="bypass -h npc_%objectId%_manage" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal">
-</body></html>
+<html><body><br>
+<font color="LEVEL">[Manage Clan Hall]</font> <br>
+<table width=100% cellspacing=2 cellpadding=0><tr>
+<td width=45><font color="999999">Facility</font></td>
+<td width=230><font color="LEVEL">Teleport</font> <font color="00FFFF">%tele%</font></td></tr>
+<tr><td><font color="999999">Period  </font></td><td>%tele_period%</td></tr>
+<tr><td><font color="999999">Change  </font><br></td><td>%change_tele%<br></td></tr>
+<tr><td><font color="999999">Facility</font></td>
+<td><font color="LEVEL">Support Magic</font> <font color="00FFFF">%support%</font></td></tr>
+<tr><td><font color="999999">Period</font></td><td>%support_period%</td></tr>
+<tr><td><font color="999999">Change</font><br></td><td>%change_support%<br></td></tr>
+<tr><td><font color="999999">Facility</font></td>
+<td><font color="LEVEL">Item Creation</font> <font color="00FFFF">%item%</font> </td></tr>
+<tr><td><font color="999999">Period</font></td><td>%item_period%</td></tr><tr>
+<td><font color="999999">Change</font><br></td><td>%change_item%<br></td></tr>
+</table><br>
+<button action="bypass -h npc_%objectId%_manage" value="Back" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
+</body>
+</html>

+ 0 - 13
datapack_development/data/html/clanHallManager/edit_other0.htm

@@ -1,13 +0,0 @@
-<html><body>%npcname%:<br>
-[Clan Hall Facilities Managment]<br><br>
-Function Teleport <font color="55FFFF">Level %tele%</font> (<font color="LEVEL">%telePrice%</font>Adena/1 Day)<br>
-Period	 Withdraw the fee for the next time at %teleDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage other tele 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other tele 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage other tele 2">Level 2</a>]<br><br>
-Function Support Magic <font color="55FFFF">Level %support%</font> (<font color="LEVEL">%supportPrice%</font>Adena/1 Day)<br>
-Period	 Withdraw the fee for the next time at %supportDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage other support 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other support 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage other support 2">Level 2</a>]<br><br>
-Function Item Production <font color="55FFFF">Level %item%</font> (<font color="LEVEL">%itemPrice%</font>Adena/1 Day)<br>
-Period	 Withdraw the fee for the next time at %itemDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage other item 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other item 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage other item 2">Level 2</a>]<br><br>
-<button value="To List" action="bypass -h npc_%objectId%_manage" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal">
-</body></html>

+ 0 - 13
datapack_development/data/html/clanHallManager/edit_other1.htm

@@ -1,13 +0,0 @@
-<html><body>%npcname%:<br>
-[Clan Hall Facilities Managment]<br><br>
-Function Teleport <font color="55FFFF">Level %tele%</font> (<font color="LEVEL">%telePrice%</font>Adena/1 Day)<br>
-Period	 Withdraw the fee for the next time at %teleDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage other tele 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other tele 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage other tele 2">Level 2</a>]<br><br>
-Function Support Magic <font color="55FFFF">Level %support%</font> (<font color="LEVEL">%supportPrice%</font>Adena/1 Day)<br>
-Period	 Withdraw the fee for the next time at %supportDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage other support 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other support 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage other support 2">Level 2</a>][<a action="bypass -h npc_%objectId%_manage other support 4">Level 4</a>]<br><br>
-Function Item Production <font color="55FFFF">Level %item%</font> (<font color="LEVEL">%itemPrice%</font>Adena/1 Day)<br>
-Period	 Withdraw the fee for the next time at %itemDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage other item 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other item 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage other item 2">Level 2</a>][<a action="bypass -h npc_%objectId%_manage other item 3">Level 3</a>]<br><br>
-<button value="To List" action="bypass -h npc_%objectId%_manage" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal">
-</body></html>

+ 0 - 13
datapack_development/data/html/clanHallManager/edit_other2.htm

@@ -1,13 +0,0 @@
-<html><body>%npcname%:<br>
-[Clan Hall Facilities Managment]<br><br>
-Function Teleport <font color="55FFFF">Level %tele%</font> (<font color="LEVEL">%telePrice%</font>Adena/1 Day)<br>
-Period	 Withdraw the fee for the next time at %teleDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage other tele 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other tele 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage other tele 2">Level 2</a>]<br><br>
-Function Support Magic <font color="55FFFF">Level %support%</font> (<font color="LEVEL">%supportPrice%</font>Adena/1 Day)<br>
-Period	 Withdraw the fee for the next time at %supportDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage other support 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other support 3">Level 3</a>][<a action="bypass -h npc_%objectId%_manage other support 4">Level 4</a>][<a action="bypass -h npc_%objectId%_manage other support 5">Level 5</a>]<br><br>
-Function Item Production <font color="55FFFF">Level %item%</font> (<font color="LEVEL">%itemPrice%</font>Adena/1 Day)<br>
-Period	 Withdraw the fee for the next time at %itemDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage other item 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other item 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage other item 2">Level 2</a>][<a action="bypass -h npc_%objectId%_manage other item 3">Level 3</a>]<br><br>
-<button value="To List" action="bypass -h npc_%objectId%_manage" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal">
-</body></html>

+ 0 - 13
datapack_development/data/html/clanHallManager/edit_other3.htm

@@ -1,13 +0,0 @@
-<html><body>%npcname%:<br>
-[Clan Hall Facilities Managment]<br><br>
-Function Teleport <font color="55FFFF">Level %tele%</font> (<font color="LEVEL">%telePrice%</font>Adena/1 Day)<br>
-Period	 Withdraw the fee for the next time at %teleDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage other tele 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other tele 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage other tele 2">Level 2</a>]<br><br>
-Function Support Magic <font color="55FFFF">Level %support%</font> (<font color="LEVEL">%supportPrice%</font>Adena/1 Day)<br>
-Period	 Withdraw the fee for the next time at %supportDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage other support 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other support 3">Level 3</a>][<a action="bypass -h npc_%objectId%_manage other support 5">Level 5</a>][<a action="bypass -h npc_%objectId%_manage other support 7">Level 7</a>][<a action="bypass -h npc_%objectId%_manage other support 8">Level 8</a>]<br><br>
-Function Item Production <font color="55FFFF">Level %item%</font> (<font color="LEVEL">%itemPrice%</font>Adena/1 Day)<br>
-Period	 Withdraw the fee for the next time at %itemDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage other item 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other item 1">Level 1</a>][<a action="bypass -h npc_%objectId%_manage other item 2">Level 2</a>][<a action="bypass -h npc_%objectId%_manage other item 3">Level 3</a>]<br><br>
-<button value="To List" action="bypass -h npc_%objectId%_manage" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal">
-</body></html>

+ 17 - 12
datapack_development/data/html/clanHallManager/edit_recovery.htm

@@ -1,13 +1,18 @@
-<html><body>%npcname%:<br>
-<font color="LEVEL">[Clan Hall Facilities Managment]</font><br>
-Function HP Recovery <font color="55FFFF">%hp%</font> (<font color="LEVEL">%hpPrice%</font>Adena/1 Day)<br>
-Period:	 Withdraw the fee for the next time at %hpDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage recovery hp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 80">80%</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 140">140%</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 200">200%</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 260">260%</a>]<br>
-Function MP Recovery <font color="55FFFF">%mp%</font> (<font color="LEVEL">%mpPrice%</font>Adena/1 Day)<br>
-Period	 Withdraw the fee for the next time at %mpDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage recovery mp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 5">5%</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 15">15%</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 30">30%</a>]<br>
-Function Exp Recovery <font color="55FFFF">%exp%</font> (<font color="LEVEL">%expPrice%</font>Adena/1 Day)<br>
-Period	 Withdraw the fee for the next time at %expDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage recovery exp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 5">5%</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 15">15%</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 25">25%</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 40">40%</a>]<br>
-<button value="To List" action="bypass -h npc_%objectId%_manage" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal">
+<html><body><br>
+<font color="LEVEL">[Manage Clan Hall]</font><br>
+<table width=100% cellspacing=2 cellpadding=0><tr>
+<td width=45><font color="999999">Facility</font></td>
+<td width=230><font color="LEVEL">HP Recovery</font> <font color="00FFFF">%hp_recovery%</font></td></tr>
+<tr><td><font color="999999">Period</font></td><td>%hp_period%</td></tr>
+<tr><td><font color="999999">Change</font><br></td><td>%change_hp%<br></td></tr>
+<tr><td><font color="999999">Facility</font></td>
+<td><font color="LEVEL">MP Recovery</font> <font color="00FFFF">%mp_recovery% </font></td></tr>
+<tr><td><font color="999999">Period</font></td><td>%mp_period%</td></tr>
+<tr><td><font color="999999">Change</font><br></td><td>%change_mp%<br></td></tr>
+<tr><td><font color="999999">Facility</font></td>
+<td><font color="LEVEL">Exp Recovery</font> <font color="00FFFF">%exp_recovery%</font></td></tr>
+<tr><td><font color="999999">Period</font></td><td>%exp_period%</td></tr>
+<tr><td><font color="999999">Change</font><br></td><td>%change_exp%<br></td></tr>
+</table><br>
+<button action="bypass -h npc_%objectId%_manage" value="Back" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
 </body></html>

+ 0 - 13
datapack_development/data/html/clanHallManager/edit_recovery0.htm

@@ -1,13 +0,0 @@
-<html><body>%npcname%:<br>
-<font color="LEVEL">[Clan Hall Facilities Managment]</font><br>
-Function HP Recovery <font color="55FFFF">%hp%</font> (<font color="LEVEL">%hpPrice%</font>Adena/1 Day)<br>
-Period:	 Withdraw the fee for the next time at %hpDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage recovery hp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 20">20%</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 40">40%</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 220">220%</a>]<br>
-Function MP Recovery <font color="55FFFF">%mp%</font> (<font color="LEVEL">%mpPrice%</font>Adena/1 Day)<br>
-Period	 Withdraw the fee for the next time at %mpDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage recovery mp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 5">5%</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 10">10%</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 25">25%</a>]<br>
-Function Exp Recovery <font color="55FFFF">%exp%</font> (<font color="LEVEL">%expPrice%</font>Adena/1 Day)<br>
-Period	 Withdraw the fee for the next time at %expDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage recovery exp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 5">5%</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 10">10%</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 25">25%</a>]<br>
-<button value="To List" action="bypass -h npc_%objectId%_manage" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal">
-</body></html>

+ 0 - 13
datapack_development/data/html/clanHallManager/edit_recovery1.htm

@@ -1,13 +0,0 @@
-<html><body>%npcname%:<br>
-<font color="LEVEL">[Clan Hall Facilities Managment]</font><br>
-Function HP Recovery <font color="55FFFF">%hp%</font> (<font color="LEVEL">%hpPrice%</font>Adena/1 Day)<br>
-Period:	 Withdraw the fee for the next time at %hpDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage recovery hp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 40">40%</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 100">100%</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 160">160%</a>]<br>
-Function MP Recovery <font color="55FFFF">%mp%</font> (<font color="LEVEL">%mpPrice%</font>Adena/1 Day)<br>
-Period	 Withdraw the fee for the next time at %mpDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage recovery mp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 5">5%</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 15">15%</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 25">25%</a>]<br>
-Function Exp Recovery <font color="55FFFF">%exp%</font> (<font color="LEVEL">%expPrice%</font>Adena/1 Day)<br>
-Period	 Withdraw the fee for the next time at %expDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage recovery exp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 5">5%</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 15">15%</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 30">30%</a>]<br>
-<button value="To List" action="bypass -h npc_%objectId%_manage" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal">
-</body></html>

+ 0 - 13
datapack_development/data/html/clanHallManager/edit_recovery2.htm

@@ -1,13 +0,0 @@
-<html><body>%npcname%:<br>
-<font color="LEVEL">[Clan Hall Facilities Managment]</font><br>
-Function HP Recovery <font color="55FFFF">%hp%</font> (<font color="LEVEL">%hpPrice%</font>Adena/1 Day)<br>
-Period:	 Withdraw the fee for the next time at %hpDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage recovery hp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 80">80%</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 140">140%</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 200">200%</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 260">260%</a>]<br>
-Function MP Recovery <font color="55FFFF">%mp%</font> (<font color="LEVEL">%mpPrice%</font>Adena/1 Day)<br>
-Period	 Withdraw the fee for the next time at %mpDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage recovery mp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 5">5%</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 15">15%</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 30">30%</a>]<br>
-Function Exp Recovery <font color="55FFFF">%exp%</font> (<font color="LEVEL">%expPrice%</font>Adena/1 Day)<br>
-Period	 Withdraw the fee for the next time at %expDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage recovery exp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 5">5%</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 15">15%</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 25">25%</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 40">40%</a>]<br>
-<button value="To List" action="bypass -h npc_%objectId%_manage" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal">
-</body></html>

+ 0 - 13
datapack_development/data/html/clanHallManager/edit_recovery3.htm

@@ -1,13 +0,0 @@
-<html><body>%npcname%:<br>
-<font color="LEVEL">[Clan Hall Facilities Managment]</font><br>
-Function HP Recovery <font color="55FFFF">%hp%</font> (<font color="LEVEL">%hpPrice%</font>Adena/1 Day)<br>
-Period:	 Withdraw the fee for the next time at %hpDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage recovery hp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 80">80%</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 120">120%</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 180">180%</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 240">240%</a>][<a action="bypass -h npc_%objectId%_manage recovery hp 300">300%</a>]<br>
-Function MP Recovery <font color="55FFFF">%mp%</font> (<font color="LEVEL">%mpPrice%</font>Adena/1 Day)<br>
-Period	 Withdraw the fee for the next time at %mpDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage recovery mp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 5">5%</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 15">15%</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 30">30%</a>][<a action="bypass -h npc_%objectId%_manage recovery mp 40">40%</a>]<br>
-Function Exp Recovery <font color="55FFFF">%exp%</font> (<font color="LEVEL">%expPrice%</font>Adena/1 Day)<br>
-Period	 Withdraw the fee for the next time at %expDate%<br>
-Change	 [<a action="bypass -h npc_%objectId%_manage recovery exp 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 15">15%</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 25">25%</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 35">35%</a>][<a action="bypass -h npc_%objectId%_manage recovery exp 50">50%</a>]<br>
-<button value="To List" action="bypass -h npc_%objectId%_manage" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal">
-</body></html>

+ 14 - 0
datapack_development/data/html/clanHallManager/functions-apply.htm

@@ -0,0 +1,14 @@
+<html><body><br>
+<font color="LEVEL">[Manage Clan Hall]</font><br>
+<table width=275 cellspacing=3 cellpadding=0><tr>
+<td FIXWIDTH=45><font color="999999">Name</font></td><td FIXWIDTH=230>%name%</td></tr>
+<tr><td><font color="999999">Cost</font></td><td><font color="00FFFF"><font color="FFAABB">%cost%</td></tr>
+<tr><td valign=top><font color="999999">Use</font></td><td>%use%</td></tr></table><br>
+The fee for using this feature must be paid in advance.<br>
+The initial fee will be deducted from the clan lord's <font color="LEVEL">inventory</font>, and subsequent fees will be withdrawn from the  <font color="LEVEL">clan warehouse</font>.<br>
+If there is not sufficient Adena in the clan warehouse,<font color="LEVEL"> the facility will be reset</font>.<br>
+<center><table width=200><tr>
+<td align=center><button action="bypass -h npc_%objectId%_manage %apply%" value="OK" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td align=center><button action="bypass -h npc_%objectId%_manage" value="Cancel" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr></table></center>
+</body></html>

+ 8 - 0
datapack_development/data/html/clanHallManager/functions-apply_confirmed.htm

@@ -0,0 +1,8 @@
+<html><body>
+Clan hall functions have been activated.<br>
+The usage fee for each function will be automatically deducted from the clan warehouse account for each time period. If there are no more funds in the account, the applicable function will be reset.<br>
+To check the remaining time available for each function, use the clan hall Management menu.<br>
+<center><br>
+<button action="bypass -h npc_%objectId%_manage" value="Management" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
+</center>
+</body></html>

+ 10 - 0
datapack_development/data/html/clanHallManager/functions-cancel.htm

@@ -0,0 +1,10 @@
+<html><body>
+<font color="LEVEL">[Manage Clan Hall]</font><br>
+This function will be reset.<br>
+The fee will no longer be automatically withdrawn from the clan warehouse.<br>
+Do you wish to continue?<br>
+<center><table width=200><tr>
+<td align=center><button action="bypass -h npc_%objectId%_manage %apply%" value="OK" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td align=center><button action="bypass -h npc_%objectId%_manage" value="Cancel" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr></table></center>
+</body></html>

+ 8 - 0
datapack_development/data/html/clanHallManager/functions-cancel_confirmed.htm

@@ -0,0 +1,8 @@
+<html><body>
+Clan hall functions have been initialized.<br>
+The usage fee will no longer be deducted from the clan warehouse account.<br>
+You can use the Clan Hall Management menu to manage functions.<br>
+<center><br>
+<button action="bypass -h npc_%objectId%_manage" value="Management" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
+</center>
+</body></html>

+ 7 - 0
datapack_development/data/html/clanHallManager/functions-used.htm

@@ -0,0 +1,7 @@
+<html><body>
+The facility is already set as <font color="00FFFF">%val%</font>.<br>  
+The facility setting has not been changed.<br>
+<center><br>
+<button action="bypass -h npc_%objectId%_manage" value="Management" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
+</center>
+</body></html>

+ 11 - 11
datapack_development/data/html/clanHallManager/functions.htm

@@ -1,13 +1,13 @@
-<html><body>%npcname%:<br>
-The clan hall's special functions are being used.<br>
-In order to use the following functions each function must be activated from the <a action="bypass -h npc_%objectId%_manage"><font color="LEVEL"> Clan Hall Managment menu</font></a>.<br>
-<CENTER>
-<font color="LEVEL">Hp recovery:</font> <font color="55FFFF">%hp_regen%</font> is currently applied.<br>
-<font color="LEVEL">Mp recovery:</font> <font color="55FFFF">%mp_regen%</font> is currently applied.<br>
-<font color="LEVEL">Exp. recovery upon resurrection:</font> <font color="55FFFF">%xp_regen%</font> is currently applied.<br><br>
-<button value="Teleport" action="bypass -h npc_%objectId%_functions tele" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal"><br><br>
-<button value="Support Magic" action="bypass -h npc_%objectId%_functions support" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal"><br><br>
-<button value="Item Creation" action="bypass -h npc_%objectId%_functions item_creation %npcId%" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal"><br><br>
-<button value="Initial Screen" action="bypass -h npc_%objectId%_functions back" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal"><br>
+<html><body>
+The clan hall's special facilities are active.<br>
+Each of the following facilities must be activated from the &nbsp;<a action="bypass -h npc_%objectId%_manage">Manage Clan Hall </a>&nbsp; menu prior to use.<br>
+<CENTER><br>
+<font color="LEVEL">Hp Recovery:</font> <font color="00FFFF">%hp_regen%</font>%<br>
+<font color="LEVEL">Mp Recovery:</font> <font color="00FFFF">%mp_regen%</font>%<br>
+<font color="LEVEL">Resurrection Exp. Recovery:</font> <font color="00FFFF">%xp_regen%</font>%<br>
+<button value="Teleport" action="bypass -h npc_%objectId%_functions tele" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br>
+<button value="Support Magic" action="bypass -h npc_%objectId%_functions support" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br>
+<button value="Create Item" action="bypass -h npc_%objectId%_functions item_creation %npcId%" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br>
+<button value="Main Screen" action="bypass -h npc_%objectId%_list_back" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
 </CENTER>
 </body></html>

+ 4 - 0
datapack_development/data/html/clanHallManager/low_adena.htm

@@ -0,0 +1,4 @@
+<html><body>
+You don't have enough adena.<center><br>
+<a action="bypass -h npc_%objectId%_list_back">Back</a></center>
+</body></html>

+ 6 - 6
datapack_development/data/html/clanHallManager/manage.htm

@@ -1,9 +1,9 @@
-<html><body>%npcname%:<br>
-[Manage clan hall facilities]<br><br>
+<html><body><br>
+<font color="LEVEL">[Manage Clan Hall]</font><br><br>
 <CENTER>
-<button value="Recovery" action="bypass -h npc_%objectId%_manage recovery" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal"><br><br>
-<button value="Other" action="bypass -h npc_%objectId%_manage other" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal"><br><br>
-<button value="Decor" action="bypass -h npc_%objectId%_manage deco" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal"><br><br>
-<button value="Initial Screen" action="bypass -h npc_%objectId%_functions back" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal">
+<button value="Recovery" action="bypass -h npc_%objectId%_manage recovery" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br>
+<button value="Other" action="bypass -h npc_%objectId%_manage other" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br>
+<button value="Decor" action="bypass -h npc_%objectId%_manage deco" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br><br>
+<button value="Main Screen" action="bypass -h npc_%objectId%_list_back" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
 </CENTER>
 </body></html>

+ 3 - 0
datapack_development/data/html/clanHallManager/not_authorized.htm

@@ -0,0 +1,3 @@
+<html><body>
+You are not authorized to do this!
+</body></html>

+ 5 - 0
datapack_development/data/html/clanHallManager/support-done.htm

@@ -0,0 +1,5 @@
+<html><body>
+You have cast support magic.<br>
+You have <font color="55FFFF">%mp%</font> MP remaining.<br><br>
+<center><button value="To List" action="bypass -h npc_%objectId%_support_back" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center>
+</body></html>

+ 6 - 0
datapack_development/data/html/clanHallManager/support-no_mana.htm

@@ -0,0 +1,6 @@
+<html><body>
+<font color="LEVEL">Your attempt to cast support magic has failed.</font><br><br>
+You do not have sufficient MP for the spell selected. <br1>
+Please try again later.<br>(You have <font color="00FFFF">%mp%</font> MP remaining.)<br><br>
+<center><button action="bypass -h npc_%objectId%_support_back" value="To List" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center>
+</body></html>

+ 11 - 7
datapack_development/data/html/clanHallManager/support1.htm

@@ -1,9 +1,13 @@
-<html><body>The clan hall manager currently has %mp% MP remaining.<br>
-<CENTER>
-<a action="bypass -h npc_%objectId%_support 4342 1">Wind Walk Lvl.1</a><br>
-<a action="bypass -h npc_%objectId%_support 4343 1">Decrease Weight Lvl.1</a><br>
-<a action="bypass -h npc_%objectId%_support 4344 1">Shield Lvl.1</a><br>
-<a action="bypass -h npc_%objectId%_support 4345 1">Might Lvl.1</a><br>
-<a action="bypass -h npc_%objectId%_support 4346 1">Mental Shield Lvl.1</a><br>
+<html><body>
+Select the support magic that you wish to cast.<br1>
+The amount of magic that can be cast is limited by the Manager's MP.<br>
+The Manager's MP is currently <font color="00FFFF">%mp%</font>.<br>
+<CENTER><br>
+<a action="bypass -h npc_%objectId%_support 4342 1">Wind Walk Lv.1</a><br1>
+<a action="bypass -h npc_%objectId%_support 4343 1">Decrease Weight Lv.1</a><br1>
+<a action="bypass -h npc_%objectId%_support 4344 1">Shield Lv.1</a><br1>
+<a action="bypass -h npc_%objectId%_support 4346 1">Mental Shield Lv.1</a><br1>
+<a action="bypass -h npc_%objectId%_support 4345 1">Might Lv.1</a><br1><br>
+<button action="bypass -h npc_%objectId%_list_back" value="List" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
 </CENTER>
 </body></html>

+ 11 - 7
datapack_development/data/html/clanHallManager/support2.htm

@@ -1,9 +1,13 @@
-<html><body>The clan hall manager currently has %mp% MP remaining.<br>
-<CENTER>
-<a action="bypass -h npc_%objectId%_support 4342 2">Wind Walk Lvl.2</a><br>
-<a action="bypass -h npc_%objectId%_support 4343 3">Decrease Weight Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4344 3">Shield Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4345 3">Might Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4346 4">Mental Shield Lvl.4</a><br>
+<html><body>
+Select the support magic that you wish to cast.<br1>
+The amount of magic that can be cast is limited by the Manager's MP.<br>
+The Manager's MP is currently <font color="00FFFF">%mp%</font>.<br>
+<CENTER><br>
+<a action="bypass -h npc_%objectId%_support 4342 2">Wind Walk Lv.2</a><br1>
+<a action="bypass -h npc_%objectId%_support 4343 3">Decrease Weight Lv.3</a><br1>
+<a action="bypass -h npc_%objectId%_support 4344 3">Shield Lv.3</a><br1>
+<a action="bypass -h npc_%objectId%_support 4346 4">Mental Shield Lv.4</a><br1>
+<a action="bypass -h npc_%objectId%_support 4345 3">Might Lv.3</a><br1><br>
+<button action="bypass -h npc_%objectId%_list_back" value="List" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
 </CENTER>
 </body></html>

+ 11 - 7
datapack_development/data/html/clanHallManager/support3.htm

@@ -1,9 +1,13 @@
-<html><body>The clan hall manager currently has %mp% MP remaining.<br>
-<CENTER>
-<a action="bypass -h npc_%objectId%_support 4342 2">Wind Walk Lvl.2</a><br>
-<a action="bypass -h npc_%objectId%_support 4343 3">Decrease Weight Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4344 3">Shield Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4345 3">Might Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4346 4">Mental Shield Lvl.4</a><br>
+<html><body>
+Select the support magic that you wish to cast.<br1>
+The amount of magic that can be cast is limited by the Manager's MP.<br>
+The Manager's MP is currently <font color="00FFFF">%mp%</font>.<br>
+<CENTER><br>
+<a action="bypass -h npc_%objectId%_support 4342 2">Wind Walk Lv.2</a><br1>
+<a action="bypass -h npc_%objectId%_support 4343 3">Decrease Weight Lv.3</a><br1>
+<a action="bypass -h npc_%objectId%_support 4344 3">Shield Lv.3</a><br1>
+<a action="bypass -h npc_%objectId%_support 4346 4">Mental Shield Lv.4</a><br1>
+<a action="bypass -h npc_%objectId%_support 4345 3">Might Lv.3</a><br1><br>
+<button action="bypass -h npc_%objectId%_list_back" value="List" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
 </CENTER>
 </body></html>

+ 15 - 11
datapack_development/data/html/clanHallManager/support4.htm

@@ -1,13 +1,17 @@
-<html><body>The clan hall manager currently has %mp% MP remaining.<br>
-<CENTER>
-<a action="bypass -h npc_%objectId%_support 4342 2">Wind Walk Lvl.2</a><br>
-<a action="bypass -h npc_%objectId%_support 4343 3">Decrease Weight Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4344 3">Shield Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4345 3">Might Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4346 4">Mental Shield Lvl.4</a><br>
-<a action="bypass -h npc_%objectId%_support 4347 2">Bless The Body Lvl.2</a><br>
-<a action="bypass -h npc_%objectId%_support 4349 1">Magic Barrier Lvl.1</a><br>
-<a action="bypass -h npc_%objectId%_support 4350 1">Resist Shock Lvl.1</a><br>
-<a action="bypass -h npc_%objectId%_support 4348 2">Bless the Soul Lvl.2</a><br>
+<html><body>
+Select the support magic that you wish to cast.<br1>
+The amount of magic that can be cast is limited by the Manager's MP.<br>
+The Manager's MP is currently <font color="00FFFF">%mp%</font>.<br>
+<CENTER><br>
+<a action="bypass -h npc_%objectId%_support 4342 2">Wind Walk Lv.2</a><br1>
+<a action="bypass -h npc_%objectId%_support 4343 3">Decrease Weight Lv.3</a><br1>
+<a action="bypass -h npc_%objectId%_support 4344 3">Shield Lv.3</a><br1>
+<a action="bypass -h npc_%objectId%_support 4346 4">Mental Shield Lv.4</a><br1>
+<a action="bypass -h npc_%objectId%_support 4345 3">Might Lv.3</a><br1><br>
+<a action="bypass -h npc_%objectId%_support 4347 2">Bless The Body Lv.2</a><br1>
+<a action="bypass -h npc_%objectId%_support 4349 1">Magic Barrier Lv.1</a><br1>
+<a action="bypass -h npc_%objectId%_support 4350 1">Resist Shock Lv.1</a><br1>
+<a action="bypass -h npc_%objectId%_support 4348 2">Bless the Soul Lv.2</a><br1><br>
+<button action="bypass -h npc_%objectId%_list_back" value="List" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
 </CENTER>
 </body></html>

+ 20 - 16
datapack_development/data/html/clanHallManager/support5.htm

@@ -1,18 +1,22 @@
-<html><body>The clan hall manager currently has %mp% MP remaining.<br>
-<CENTER>
-<a action="bypass -h npc_%objectId%_support 4342 2">Wind Walk Lvl.2</a><br>
-<a action="bypass -h npc_%objectId%_support 4343 3">Decrease Weight Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4344 3">Shield Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4345 3">Might Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4346 4">Mental Shield Lvl.4</a><br>
-<a action="bypass -h npc_%objectId%_support 4347 2">Bless The Body Lvl.2</a><br>
-<a action="bypass -h npc_%objectId%_support 4349 1">Magic Barrier Lvl.1</a><br>
-<a action="bypass -h npc_%objectId%_support 4350 1">Resist Shock Lvl.1</a><br>
-<a action="bypass -h npc_%objectId%_support 4348 2">Bless the Soul Lvl.2</a><br>
-<a action="bypass -h npc_%objectId%_support 4351 2">Greater Concentration Lvl.2</a><br>
-<a action="bypass -h npc_%objectId%_support 4352 1">Berserk Spirit Lvl.1</a><br>
-<a action="bypass -h npc_%objectId%_support 4353 2">Bless Shield Lvl.2</a><br>
-<a action="bypass -h npc_%objectId%_support 4358 1">Guidance Lvl.1</a><br>
-<a action="bypass -h npc_%objectId%_support 4354 1">Vampiric Rage Lvl.1</a><br>
+<html><body>
+Select the support magic that you wish to cast.<br1>
+The amount of magic that can be cast is limited by the Manager's MP.<br>
+The Manager's MP is currently <font color="00FFFF">%mp%</font>.<br>
+<CENTER><br>
+<a action="bypass -h npc_%objectId%_support 4342 2">Wind Walk Lv.2</a><br1>
+<a action="bypass -h npc_%objectId%_support 4343 3">Decrease Weight Lv.3</a><br1>
+<a action="bypass -h npc_%objectId%_support 4344 3">Shield Lv.3</a><br1>
+<a action="bypass -h npc_%objectId%_support 4346 4">Mental Shield Lv.4</a><br1>
+<a action="bypass -h npc_%objectId%_support 4345 3">Might Lv.3</a><br1><br>
+<a action="bypass -h npc_%objectId%_support 4347 2">Bless The Body Lv.2</a><br1>
+<a action="bypass -h npc_%objectId%_support 4349 1">Magic Barrier Lv.1</a><br1>
+<a action="bypass -h npc_%objectId%_support 4350 1">Resist Shock Lv.1</a><br1>
+<a action="bypass -h npc_%objectId%_support 4348 2">Bless the Soul Lv.2</a><br1><br>
+<a action="bypass -h npc_%objectId%_support 4351 2">Concentration Lv.2</a><br1>
+<a action="bypass -h npc_%objectId%_support 4352 1">Berserk Spirit Lv.1</a><br1>
+<a action="bypass -h npc_%objectId%_support 4353 2">Bless Shield Lv.2</a><br1>
+<a action="bypass -h npc_%objectId%_support 4358 1">Guidance Lv.1</a><br1>
+<a action="bypass -h npc_%objectId%_support 4354 1">Vampiric Rage Lv.1</a><br1><br>
+<button action="bypass -h npc_%objectId%_list_back" value="List" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
 </CENTER>
 </body></html>

+ 25 - 22
datapack_development/data/html/clanHallManager/support6.htm

@@ -1,24 +1,27 @@
-<html><body>The clan hall manager currently has %mp% MP remaining.<br>
-<CENTER>
-<a action="bypass -h npc_%objectId%_support 4342 2">Wind Walk Lvl.2</a><br>
-<a action="bypass -h npc_%objectId%_support 4343 3">Decrease Weight Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4344 3">Shield Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4345 3">Might Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4346 4">Mental Shield Lvl.4</a><br>
-<a action="bypass -h npc_%objectId%_support 4347 2">Bless The Body Lvl.2</a><br>
-<a action="bypass -h npc_%objectId%_support 4349 1">Magic Barrier Lvl.1</a><br>
-<a action="bypass -h npc_%objectId%_support 4350 1">Resist Shock Lvl.1</a><br>
-<a action="bypass -h npc_%objectId%_support 4348 2">Bless the Soul Lvl.2</a><br>
-<a action="bypass -h npc_%objectId%_support 4351 2">Greater Concentration Lvl.2</a><br>
-<a action="bypass -h npc_%objectId%_support 4352 1">Berserk Spirit Lvl.1</a><br>
-<a action="bypass -h npc_%objectId%_support 4353 2">Bless Shield Lvl.2</a><br>
-<a action="bypass -h npc_%objectId%_support 4358 1">Guidance Lvl.1</a><br>
-<a action="bypass -h npc_%objectId%_support 4354 1">Vampiric Rage Lvl.1</a><br>
-<br>
-<a action="bypass -h npc_%objectId%_support 4355 1">Acumen Lvl.1</a><br>
-<a action="bypass -h npc_%objectId%_support 4356 1">Empower Lvl.1</a><br>
-<a action="bypass -h npc_%objectId%_support 4357 1">Haste Lvl.1</a><br>
-<a action="bypass -h npc_%objectId%_support 4359 1">Focus Lvl.1</a><br>
-<a action="bypass -h npc_%objectId%_support 4360 1">Death Whisper Lvl.1</a><br>
+<html><body>
+Select the support magic that you wish to cast.<br1>
+The amount of magic that can be cast is limited by the Manager's MP.<br>
+The Manager's MP is currently <font color="00FFFF">%mp%</font>.<br>
+<CENTER><br>
+<a action="bypass -h npc_%objectId%_support 4342 2">Wind Walk Lv.2</a><br1>
+<a action="bypass -h npc_%objectId%_support 4343 3">Decrease Weight Lv.3</a><br1>
+<a action="bypass -h npc_%objectId%_support 4344 3">Shield Lv.3</a><br1>
+<a action="bypass -h npc_%objectId%_support 4346 4">Mental Shield Lv.4</a><br1>
+<a action="bypass -h npc_%objectId%_support 4345 3">Might Lv.3</a><br1><br>
+<a action="bypass -h npc_%objectId%_support 4347 2">Bless The Body Lv.2</a><br1>
+<a action="bypass -h npc_%objectId%_support 4349 1">Magic Barrier Lv.1</a><br1>
+<a action="bypass -h npc_%objectId%_support 4350 1">Resist Shock Lv.1</a><br1>
+<a action="bypass -h npc_%objectId%_support 4348 2">Bless the Soul Lv.2</a><br1><br>
+<a action="bypass -h npc_%objectId%_support 4351 2">Concentration Lv.2</a><br1>
+<a action="bypass -h npc_%objectId%_support 4352 1">Berserk Spirit Lv.1</a><br1>
+<a action="bypass -h npc_%objectId%_support 4353 2">Bless Shield Lv.2</a><br1>
+<a action="bypass -h npc_%objectId%_support 4358 1">Guidance Lv.1</a><br1>
+<a action="bypass -h npc_%objectId%_support 4354 1">Vampiric Rage Lv.1</a><br1><br>
+<a action="bypass -h npc_%objectId%_support 4355 1">Acumen Lv.1</a><br1>
+<a action="bypass -h npc_%objectId%_support 4356 1">Empower Lv.1</a><br1>
+<a action="bypass -h npc_%objectId%_support 4357 1">Haste Lv.1</a><br1>
+<a action="bypass -h npc_%objectId%_support 4359 1">Focus Lv.1</a><br1>
+<a action="bypass -h npc_%objectId%_support 4360 1">Death Whisper Lv.1</a><br1><br>
+<button action="bypass -h npc_%objectId%_list_back" value="List" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
 </CENTER>
 </body></html>

+ 20 - 16
datapack_development/data/html/clanHallManager/support7.htm

@@ -1,18 +1,22 @@
-<html><body>The clan hall manager currently has %mp% MP remaining.<br>
-<CENTER>
-<a action="bypass -h npc_%objectId%_support 4342 2">Wind Walk Lvl.2</a><br>
-<a action="bypass -h npc_%objectId%_support 4343 3">Decrease Weight Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4344 3">Shield Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4345 3">Might Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4346 4">Mental Shield Lvl.4</a><br>
-<a action="bypass -h npc_%objectId%_support 4347 6">Bless The Body Lvl.6</a><br>
-<a action="bypass -h npc_%objectId%_support 4349 2">Magic Barrier Lvl.2</a><br>
-<a action="bypass -h npc_%objectId%_support 4350 4">Resist Shock Lvl.4</a><br>
-<a action="bypass -h npc_%objectId%_support 4348 6">Bless the Soul Lvl.6</a><br>
-<a action="bypass -h npc_%objectId%_support 4351 6">Greater Concentration Lvl.6</a><br>
-<a action="bypass -h npc_%objectId%_support 4352 2">Berserk Spirit Lvl.2</a><br>
-<a action="bypass -h npc_%objectId%_support 4353 6">Bless Shield Lvl.6</a><br>
-<a action="bypass -h npc_%objectId%_support 4358 3">Guidance Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4354 4">Vampiric Rage Lvl.4</a><br>
+<html><body>
+Select the support magic that you wish to cast.<br1>
+The amount of magic that can be cast is limited by the Manager's MP.<br>
+The Manager's MP is currently <font color="00FFFF">%mp%</font>.<br>
+<CENTER><br>
+<a action="bypass -h npc_%objectId%_support 4342 2">Wind Walk Lv.2</a><br1>
+<a action="bypass -h npc_%objectId%_support 4343 3">Decrease Weight Lv.3</a><br1>
+<a action="bypass -h npc_%objectId%_support 4344 3">Shield Lv.3</a><br1>
+<a action="bypass -h npc_%objectId%_support 4346 4">Mental Shield Lv.4</a><br1>
+<a action="bypass -h npc_%objectId%_support 4345 3">Might Lv.3</a><br1><br>
+<a action="bypass -h npc_%objectId%_support 4347 6">Bless The Body Lv.6</a><br1>
+<a action="bypass -h npc_%objectId%_support 4349 2">Magic Barrier Lv.2</a><br1>
+<a action="bypass -h npc_%objectId%_support 4350 4">Resist Shock Lv.4</a><br1>
+<a action="bypass -h npc_%objectId%_support 4348 6">Bless the Soul Lv.6</a><br1><br>
+<a action="bypass -h npc_%objectId%_support 4351 6">Concentration Lv.6</a><br1>
+<a action="bypass -h npc_%objectId%_support 4352 2">Berserk Spirit Lv.2</a><br1>
+<a action="bypass -h npc_%objectId%_support 4353 6">Bless Shield Lv.6</a><br1>
+<a action="bypass -h npc_%objectId%_support 4358 3">Guidance Lv.3</a><br1>
+<a action="bypass -h npc_%objectId%_support 4354 4">Vampiric Rage Lv.4</a><br1><br>
+<button action="bypass -h npc_%objectId%_list_back" value="List" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
 </CENTER>
 </body></html>

+ 25 - 22
datapack_development/data/html/clanHallManager/support8.htm

@@ -1,24 +1,27 @@
-<html><body>The clan hall manager currently has %mp% MP remaining.<br>
-<CENTER>
-<a action="bypass -h npc_%objectId%_support 4342 2">Wind Walk Lvl.2</a><br>
-<a action="bypass -h npc_%objectId%_support 4343 3">Decrease Weight Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4344 3">Shield Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4345 3">Might Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4346 4">Mental Shield Lvl.4</a><br>
-<a action="bypass -h npc_%objectId%_support 4347 6">Bless The Body Lvl.6</a><br>
-<a action="bypass -h npc_%objectId%_support 4349 2">Magic Barrier Lvl.2</a><br>
-<a action="bypass -h npc_%objectId%_support 4350 4">Resist Shock Lvl.4</a><br>
-<a action="bypass -h npc_%objectId%_support 4348 6">Bless the Soul Lvl.6</a><br>
-<a action="bypass -h npc_%objectId%_support 4351 6">Greater Concentration Lvl.6</a><br>
-<a action="bypass -h npc_%objectId%_support 4352 2">Berserk Spirit Lvl.2</a><br>
-<a action="bypass -h npc_%objectId%_support 4353 6">Bless Shield Lvl.6</a><br>
-<a action="bypass -h npc_%objectId%_support 4358 3">Guidance Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4354 4">Vampiric Rage Lvl.4</a><br>
-<br>
-<a action="bypass -h npc_%objectId%_support 4355 1">Acumen Lvl.1</a><br>
-<a action="bypass -h npc_%objectId%_support 4356 1">Empower Lvl.1</a><br>
-<a action="bypass -h npc_%objectId%_support 4357 1">Haste Lvl.1</a><br>
-<a action="bypass -h npc_%objectId%_support 4359 1">Focus Lvl.1</a><br>
-<a action="bypass -h npc_%objectId%_support 4360 1">Death Whisper Lvl.1</a><br>
+<html><body>
+Select the support magic that you wish to cast.<br1>
+The amount of magic that can be cast is limited by the Manager's MP.<br>
+The Manager's MP is currently <font color="00FFFF">%mp%</font>.<br>
+<CENTER><br>
+<a action="bypass -h npc_%objectId%_support 4342 2">Wind Walk Lv.2</a><br1>
+<a action="bypass -h npc_%objectId%_support 4343 3">Decrease Weight Lv.3</a><br1>
+<a action="bypass -h npc_%objectId%_support 4344 3">Shield Lv.3</a><br1>
+<a action="bypass -h npc_%objectId%_support 4346 4">Mental Shield Lv.4</a><br1>
+<a action="bypass -h npc_%objectId%_support 4345 3">Might Lv.3</a><br1><br>
+<a action="bypass -h npc_%objectId%_support 4347 6">Bless The Body Lv.6</a><br1>
+<a action="bypass -h npc_%objectId%_support 4349 2">Magic Barrier Lv.2</a><br1>
+<a action="bypass -h npc_%objectId%_support 4350 4">Resist Shock Lv.4</a><br1>
+<a action="bypass -h npc_%objectId%_support 4348 6">Bless the Soul Lv.6</a><br1><br>
+<a action="bypass -h npc_%objectId%_support 4351 6">Concentration Lv.6</a><br1>
+<a action="bypass -h npc_%objectId%_support 4352 2">Berserk Spirit Lv.2</a><br1>
+<a action="bypass -h npc_%objectId%_support 4353 6">Bless Shield Lv.6</a><br1>
+<a action="bypass -h npc_%objectId%_support 4358 3">Guidance Lv.3</a><br1>
+<a action="bypass -h npc_%objectId%_support 4354 4">Vampiric Rage Lv.4</a><br1><br>
+<a action="bypass -h npc_%objectId%_support 4355 1">Acumen Lv.1</a><br1>
+<a action="bypass -h npc_%objectId%_support 4356 1">Empower Lv.1</a><br1>
+<a action="bypass -h npc_%objectId%_support 4357 1">Haste Lv.1</a><br1>
+<a action="bypass -h npc_%objectId%_support 4359 1">Focus Lv.1</a><br1>
+<a action="bypass -h npc_%objectId%_support 4360 1">Death Whisper Lv.1</a><br1><br>
+<button action="bypass -h npc_%objectId%_list_back" value="List" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
 </CENTER>
 </body></html>

+ 25 - 22
datapack_development/data/html/clanHallManager/support9.htm

@@ -1,24 +1,27 @@
-<html><body>The clan hall manager currently has %mp% MP remaining.<br>
-<CENTER>
-<a action="bypass -h npc_%objectId%_support 4342 2">Wind Walk Lvl.2</a><br>
-<a action="bypass -h npc_%objectId%_support 4343 3">Decrease Weight Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4344 3">Shield Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4345 3">Might Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4346 4">Mental Shield Lvl.4</a><br>
-<a action="bypass -h npc_%objectId%_support 4347 6">Bless The Body Lvl.6</a><br>
-<a action="bypass -h npc_%objectId%_support 4349 2">Magic Barrier Lvl.2</a><br>
-<a action="bypass -h npc_%objectId%_support 4350 4">Resist Shock Lvl.4</a><br>
-<a action="bypass -h npc_%objectId%_support 4348 6">Bless the Soul Lvl.6</a><br>
-<a action="bypass -h npc_%objectId%_support 4351 6">Greater Concentration Lvl.6</a><br>
-<a action="bypass -h npc_%objectId%_support 4352 2">Berserk Spirit Lvl.2</a><br>
-<a action="bypass -h npc_%objectId%_support 4353 6">Bless Shield Lvl.6</a><br>
-<a action="bypass -h npc_%objectId%_support 4358 3">Guidance Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4354 4">Vampiric Rage Lvl.4</a><br>
-<br>
-<a action="bypass -h npc_%objectId%_support 4355 3">Acumen Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4356 3">Empower Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4357 2">Haste Lvl.2</a><br>
-<a action="bypass -h npc_%objectId%_support 4359 3">Focus Lvl.3</a><br>
-<a action="bypass -h npc_%objectId%_support 4360 3">Death Whisper Lvl.3</a><br>
+<html><body>
+Select the support magic that you wish to cast.<br1>
+The amount of magic that can be cast is limited by the Manager's MP.<br>
+The Manager's MP is currently <font color="00FFFF">%mp%</font>.<br>
+<CENTER><br>
+<a action="bypass -h npc_%objectId%_support 4342 2">Wind Walk Lv.2</a><br1>
+<a action="bypass -h npc_%objectId%_support 4343 3">Decrease Weight Lv.3</a><br1>
+<a action="bypass -h npc_%objectId%_support 4344 3">Shield Lv.3</a><br1>
+<a action="bypass -h npc_%objectId%_support 4346 4">Mental Shield Lv.4</a><br1>
+<a action="bypass -h npc_%objectId%_support 4345 3">Might Lv.3</a><br1><br>
+<a action="bypass -h npc_%objectId%_support 4347 6">Bless The Body Lv.6</a><br1>
+<a action="bypass -h npc_%objectId%_support 4349 2">Magic Barrier Lv.2</a><br1>
+<a action="bypass -h npc_%objectId%_support 4350 4">Resist Shock Lv.4</a><br1>
+<a action="bypass -h npc_%objectId%_support 4348 6">Bless the Soul Lv.6</a><br1><br>
+<a action="bypass -h npc_%objectId%_support 4351 6">Concentration Lv.6</a><br1>
+<a action="bypass -h npc_%objectId%_support 4352 2">Berserk Spirit Lv.2</a><br1>
+<a action="bypass -h npc_%objectId%_support 4353 6">Bless Shield Lv.6</a><br1>
+<a action="bypass -h npc_%objectId%_support 4358 3">Guidance Lv.3</a><br1>
+<a action="bypass -h npc_%objectId%_support 4354 4">Vampiric Rage Lv.4</a><br1><br>
+<a action="bypass -h npc_%objectId%_support 4355 3">Acumen Lv.3</a><br1>
+<a action="bypass -h npc_%objectId%_support 4356 3">Empower Lv.3</a><br1>
+<a action="bypass -h npc_%objectId%_support 4357 2">Haste Lv.2</a><br1>
+<a action="bypass -h npc_%objectId%_support 4359 3">Focus Lv.3</a><br1>
+<a action="bypass -h npc_%objectId%_support 4360 3">Death Whisper Lv.3</a><br1><br>
+<button action="bypass -h npc_%objectId%_list_back" value="List" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
 </CENTER>
 </body></html>

+ 6 - 6
datapack_development/data/html/clanHallManager/teleAden1.htm

@@ -1,7 +1,7 @@
-<html><body>%npcname%:<br>
-<a action="bypass -h npc_%objectId%_goto 12000" msg="811;Center Town of Aden">Center Town of Aden-0 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12001" msg="811;North Town of Aden">North Town of Aden-0 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12002" msg="811;East Town of Aden">East Town of Aden-0 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12003" msg="811;South Town of Aden">South Town of Aden-0 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12004" msg="811;West Town of Aden">West Town of Aden-0 Adena</a><br1>
+<html><body>&$556;<br><br>
+<a action="bypass -h npc_%objectId%_goto 12000" msg="811;Village Square">Village Square</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12002" msg="811;East Gate Entrance">East Gate Entrance</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12004" msg="811;West Gate Entrance">West Gate Entrance</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12003" msg="811;South Gate Entrance">South Gate Entrance</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12001" msg="811;North Gate Entrance">North Gate Entrance</a><br1>
 </body></html>

+ 17 - 26
datapack_development/data/html/clanHallManager/teleAden2.htm

@@ -1,27 +1,18 @@
-<html><body>%npcname%:<br>
-<a action="bypass -h npc_%objectId%_goto 12000" msg="811;Center Town of Aden">Center Town of Aden-0 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12001" msg="811;North Town of Aden">North Town of Aden-0 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12002" msg="811;East Town of Aden">East Town of Aden-0 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12003" msg="811;South Town of Aden">South Town of Aden-0 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12004" msg="811;West Town of Aden">West Town of Aden-0 Adena</a><br1>
-<br1>
-<a action="bypass -h npc_%objectId%_goto 613" msg="811;Ancient Battleground">Ancient Battleground-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 603" msg="811;Northern Pathway of Enchanted Valley">Northern Pathway of Enchanted Valley-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12005" msg="811;Southern Pathway of Enchanted Valley">Southern Pathway of Enchanted Valley-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 608" msg="811;Path to Hunters Village">Path to Hunters Village-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 599" msg="811;Blazing Swamp">Blazing Swamp-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12006" msg="811;East of Blazing Swamp">East of Blazing Swamp-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12007" msg="811;Plains of Glory">Plains of Glory-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12008" msg="811;Plains of Fierce Battle">Plains of Fierce Battle-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12009" msg="811;Path to Forest of Wirrors">Path to Forest of Wirrors-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12010" msg="811;The Front of Anghel Waterfall">The Front of Anghel Waterfall-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 618" msg="811;Fields of Massacre">Fields of Massacre-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12011" msg="811;Disciples Necropolis">Disciples Necropolis-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12012" msg="811;North Path to The Cementery">North Path to The Cementery-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12013" msg="811;South Path to The Cementery">South Path to The Cementery-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12014" msg="811;West Path to The Cementery">West Path to The Cementery-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 601" msg="811;Forbidden Gateway">Forbidden Gateway-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 614" msg="811;Forsaken Plains ">Forsaken Plains -500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 598" msg="811;Tower of Insolence">Tower of Insolence-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 602" msg="811;The Giant's Cave">The Giant's Cave-500 Adena</a><br1>
+<html><body>&$556;<br><br>
+<a action="bypass -h npc_%objectId%_goto 12000" msg="811;Village Square">Village Square</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12002" msg="811;East Gate Entrance">East Gate Entrance</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12004" msg="811;West Gate Entrance">West Gate Entrance</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12003" msg="811;South Gate Entrance">South Gate Entrance</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12001" msg="811;North Gate Entrance">North Gate Entrance</a><br1>
+<a action="bypass -h npc_%objectId%_goto 613" msg="811;Ancient Battleground">Ancient Battleground - 500</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12005" msg="811;Enchanted Valley, Southern Region">Enchanted Valley, Southern Region - 500</a><br1>
+<a action="bypass -h npc_%objectId%_goto 603" msg="811;Enchanted Valley, Northern Region">Enchanted Valley, Northern Region - 500</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12006" msg="811;Blazing Swamp">Blazing Swamp - 500</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12009" msg="811;Forest of Mirrors">Forest of Wirrors - 500</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12010" msg="811;Anghel Waterfall">Anghel Waterfall - 500</a><br1>
+<a action="bypass -h npc_%objectId%_goto 618" msg="811;South Entrance of Devastated Castle">South Entrance of Devastated Castle - 500</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12011" msg="811;West Area of the Devastated Castle">West Area of the Devastated Castle - 500</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12014" msg="811;Seal of Shilen">Seal of Shilen - 500</a><br1>
+<a action="bypass -h npc_%objectId%_goto 614" msg="811;Forsaken Plains ">Forsaken Plains - 500</a><br1>
+<a action="bypass -h npc_%objectId%_goto 598" msg="811;Tower of Insolence">Tower of Insolence - 500</a><br1>
 </body></html>

+ 6 - 6
datapack_development/data/html/clanHallManager/teleDion1.htm

@@ -1,7 +1,7 @@
-<html><body>%npcname%:<br>
-<a action="bypass -h npc_%objectId%_goto 12040" msg="811;Center of Dion Castle Town">Center of Dion Castle Town-0 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12041" msg="811;North of Dion Castle Town">North of Dion Castle Town-0 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12042" msg="811;East of Dion Castle Town">East of Dion Castle Town-0 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12043" msg="811;South of Dion Castle Town">South of Dion Castle Town-0 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12044" msg="811;West of Dion Castle Town">West of Dion Castle Town-0 Adena</a><br1>
+<html><body>&$556;<br><br>
+<a action="bypass -h npc_%objectId%_goto 12040" msg="811;Village Square">Village Square</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12042" msg="811;East Gate Entrance">East Gate Entrance</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12041" msg="811;North Gate Entrance">North Gate Entrance</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12043" msg="811;South Gate Entrance">South Gate Entrance</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12044" msg="811;West Gate Entrance">West Gate Entrance</a><br1>
 </body></html>

+ 11 - 16
datapack_development/data/html/clanHallManager/teleDion2.htm

@@ -1,17 +1,12 @@
-<html><body>%npcname%:<br>
-<a action="bypass -h npc_%objectId%_goto 12040" msg="811;Center of Dion Castle Town">Center of Dion Castle Town-0 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12041" msg="811;North of Dion Castle Town">North of Dion Castle Town-0 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12042" msg="811;East of Dion Castle Town">East of Dion Castle Town-0 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12043" msg="811;South of Dion Castle Town">South of Dion Castle Town-0 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12044" msg="811;West of Dion Castle Town">West of Dion Castle Town-0 Adena</a><br1>
-<br1>
-<a action="bypass -h npc_%objectId%_goto 504" msg="811;Cruma Marshlands">Cruma Marshlands-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12031" msg="811;Plains of Dion">Plains of Dion-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 522" msg="811;Pirate Tunnel">Pirate Tunnel - 500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12032" msg="811;Piligrims Necropolis">Piligrims Necropolis - 500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 502" msg="811;Execution Ground">Execution Ground - 500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12045" msg="811;Giran Territory">Giran Territory - 500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 505" msg="811;Cruma Tower">Cruma Tower - 500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 665" msg="811;Ant Cave East Entrance">Ant Cave East Entrance - 500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 661" msg="811;The Ant Nest">The Ant Nest - 500 Adena</a><br1>
+<html><body>&$556;<br><br>
+<a action="bypass -h npc_%objectId%_goto 12040" msg="811;Village Square">Village Square</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12042" msg="811;East Gate Entrance">East Gate Entrance</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12041" msg="811;North Gate Entrance">North Gate Entrance</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12043" msg="811;South Gate Entrance">South Gate Entrance</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12044" msg="811;West Gate Entrance">West Gate Entrance</a><br1>
+<a action="bypass -h npc_%objectId%_goto 504" msg="811;Cruma Marshlands">Cruma Marshlands - 500</a><br1>
+<a action="bypass -h npc_%objectId%_goto 503" msg="811;Fortress of Resistance">Fortress of Resistance - 500</a><br1>
+<a action="bypass -h npc_%objectId%_goto 514" msg="811;Plains of Dion">Plains of Dion - 500</a><br1>
+<a action="bypass -h npc_%objectId%_goto 510" msg="811;Tanor Canyon">Tanor Canyon - 500</a><br1>
+<a action="bypass -h npc_%objectId%_goto 508" msg="811;Entrance to Floran Village">Entrance to Floran Village - 500</a><br1>
 </body></html>

+ 1 - 1
datapack_development/data/html/clanHallManager/teleGiran1.htm

@@ -1,4 +1,4 @@
-<html><body>%npcname%:<br>
+<html><body>&$556;<br><br>
 <a action="bypass -h npc_%objectId%_goto 12015" msg="811;Center of Giran Castle Town">Center of Giran Castle Town-0 Adena</a><br1>
 <a action="bypass -h npc_%objectId%_goto 12016" msg="811;North of Giran Castle Town">North of Giran Castle Town-0 Adena</a><br1>
 <a action="bypass -h npc_%objectId%_goto 12017" msg="811;East of Giran Castle Town">East of Giran Castle Town-0 Adena</a><br1>

+ 1 - 1
datapack_development/data/html/clanHallManager/teleGiran2.htm

@@ -1,4 +1,4 @@
-<html><body>%npcname%:<br>
+<html><body>&$556;<br><br>
 <a action="bypass -h npc_%objectId%_goto 12015" msg="811;Center of Giran Castle Town">Center of Giran Castle Town-0 Adena</a><br1>
 <a action="bypass -h npc_%objectId%_goto 12016" msg="811;North of Giran Castle Town">North of Giran Castle Town-0 Adena</a><br1>
 <a action="bypass -h npc_%objectId%_goto 12017" msg="811;East of Giran Castle Town">East of Giran Castle Town-0 Adena</a><br1>

+ 6 - 6
datapack_development/data/html/clanHallManager/teleGludin1.htm

@@ -1,7 +1,7 @@
-<html><body>%npcname%:<br>
-<a action="bypass -h npc_%objectId%_goto 12021" msg="811;Center of Gludin Village">Center of Gludin Village-0 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12022" msg="811;North of Gludin Village">North of Gludin Village-0 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12023" msg="811;East of Gludin Village">East of Gludin Village-0 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12024" msg="811;South of Gludin Village">South of Gludin Village-0 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12025" msg="811;West of Gludin Village">West of Gludin Village-0 Adena</a><br1>
+<html><body>&$556;<br><br>
+<a action="bypass -h npc_%objectId%_goto 12021" msg="811;Village Square">Village Square</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12022" msg="811;North Gate Entrance">North Gate Entrance</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12023" msg="811;East Gate Entrance">East Gate Entrance</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12024" msg="811;South Gate Entrance">South Gate Entrance</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12025" msg="811;West Gate entrance">West Gate entrance</a><br1>
 </body></html>

+ 11 - 22
datapack_development/data/html/clanHallManager/teleGludin2.htm

@@ -1,23 +1,12 @@
-<html><body>%npcname%:<br>
-<a action="bypass -h npc_%objectId%_goto 12021" msg="811;Center of Gludin Village">Center of Gludin Village-0 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12022" msg="811;North of Gludin Village">North of Gludin Village-0 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12023" msg="811;East of Gludin Village">East of Gludin Village-0 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12024" msg="811;South of Gludin Village">South of Gludin Village-0 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12025" msg="811;West of Gludin Village">West of Gludin Village-0 Adena</a><br1>
-<br1>
-<a action="bypass -h npc_%objectId%_goto 653" msg="811;Neutral Zone">Neutral Zone-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12026" msg="811;Necropolis of Sacrifice">Necropolis of Sacrifice-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12027" msg="811;Oracle Dusk">Oracle Dusk-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12028" msg="811;Oracle of Dawn">Oracle of Dawn-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 657" msg="811;Fellmere Harvesting Ground">Fellmere Harvesting Ground-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 658" msg="811;Ruins of Agony">Ruins of Agony-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 659" msg="811;Abandoned Camp">Abandoned Camp-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 660" msg="811;Forgotten Temple">Forgotten Temple-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 661" msg="811;The Ant Nest">The Ant Nest-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 662" msg="811;Western Pathway to the Wasterland">Western Pathway to the Wasterland-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12029" msg="811;South Pathway to the Wasterland">South Pathway to the Wasterland-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 12030" msg="811;Wasterland">Wasterland-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 665" msg="811;East Gate of Ant Nest">East Gate of Ant Nest-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 666" msg="811;West Gate of Ant Nest">West Gate of Ant Nest-500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 667" msg="811; Altar of Rites"> Altar of Rites-500 Adena</a><br1>
+<html><body>&$556;<br><br>
+<a action="bypass -h npc_%objectId%_goto 12021" msg="811;Village Square">Village Square</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12022" msg="811;North Gate Entrance">North Gate Entrance</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12023" msg="811;East Gate Entrance">East Gate Entrance</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12024" msg="811;South Gate Entrance">South Gate Entrance</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12025" msg="811;West Gate entrance">West Gate entrance</a><br1>
+<a action="bypass -h npc_%objectId%_goto 668" msg="811;Windmill Hill">Windmill Hill - 500</a><br1>
+<a action="bypass -h npc_%objectId%_goto 657" msg="811;Fellmere Harvesting Grounds">Fellmere Harvesting Grounds - 500</a><br1>
+<a action="bypass -h npc_%objectId%_goto 655" msg="811;Windy Hill">Windy Hill - 500</a><br1>
+<a action="bypass -h npc_%objectId%_goto 659" msg="811;Abandoned Camp">Abandoned Camp - 500</a><br1>
+<a action="bypass -h npc_%objectId%_goto 12030" msg="811;Wastelands">Wastelands - 500</a><br1>
 </body></html>

+ 1 - 1
datapack_development/data/html/clanHallManager/teleGludio1.htm

@@ -1,4 +1,4 @@
-<html><body>%npcname%:<br>
+<html><body>&$556;<br><br>
 <a action="bypass -h npc_%objectId%_goto 12033" msg="811;Center of Gludio Village">Center of Gludio Village-0 Adena</a><br1>
 <a action="bypass -h npc_%objectId%_goto 12034" msg="811;North of Gludio Village">North of Gludio Village-0 Adena</a><br1>
 <a action="bypass -h npc_%objectId%_goto 12035" msg="811;East of Gludio Village">East of Gludio Village-0 Adena</a><br1>

+ 1 - 1
datapack_development/data/html/clanHallManager/teleGludio2.htm

@@ -1,4 +1,4 @@
-<html><body>%npcname%:<br>
+<html><body>&$556;<br><br>
 <a action="bypass -h npc_%objectId%_goto 12033" msg="811;Center of Gludio Village">Center of Gludio Village-0 Adena</a><br1>
 <a action="bypass -h npc_%objectId%_goto 12034" msg="811;North of Gludio Village">North of Gludio Village-0 Adena</a><br1>
 <a action="bypass -h npc_%objectId%_goto 12035" msg="811;East of Gludio Village">East of Gludio Village-0 Adena</a><br1>

+ 1 - 1
datapack_development/data/html/clanHallManager/teleGoddard1.htm

@@ -1,4 +1,4 @@
-<html><body>%npcname%:<br>
+<html><body>&$556;<br><br>
 <a action="bypass -h npc_%objectId%_goto 12046" msg="811;Center of Goddard Castle Town">Center of Goddard Castle Town-0 Adena</a><br1>
 <a action="bypass -h npc_%objectId%_goto 12047" msg="811;North of Goddard Castle Town">North of Goddard Castle Town-0 Adena</a><br1>
 <a action="bypass -h npc_%objectId%_goto 12048" msg="811;East of Goddard Castle Town">East of Goddard Castle Town-0 Adena</a><br1>

+ 1 - 1
datapack_development/data/html/clanHallManager/teleGoddard2.htm

@@ -1,4 +1,4 @@
-<html><body>%npcname%:<br>
+<html><body>&$556;<br><br>
 <a action="bypass -h npc_%objectId%_goto 12046" msg="811;Center of Goddard Castle Town">Center of Goddard Castle Town-0 Adena</a><br1>
 <a action="bypass -h npc_%objectId%_goto 12047" msg="811;North of Goddard Castle Town">North of Goddard Castle Town-0 Adena</a><br1>
 <a action="bypass -h npc_%objectId%_goto 12048" msg="811;East of Goddard Castle Town">East of Goddard Castle Town-0 Adena</a><br1>

+ 1 - 2
datapack_development/data/html/clanHallManager/teleRune1.htm

@@ -1,5 +1,4 @@
-<html><body>
-&$556;<br>
+<html><body>&$556;<br><br>
 <a action="bypass -h npc_%objectId%_goto 621" msg="811;Rune Castle Town Store">Rune Castle Town Store</a><br1>
 <a action="bypass -h npc_%objectId%_goto 622" msg="811;Rune Castle Town Temple">Castle Town Temple</a><br1>
 <a action="bypass -h npc_%objectId%_goto 623" msg="811;Rune North Gate">North Gate</a><br1> 

+ 1 - 2
datapack_development/data/html/clanHallManager/teleRune2.htm

@@ -1,5 +1,4 @@
-<html><body>
-&$556;<br>
+<html><body>&$556;<br><br>
 <a action="bypass -h npc_%objectId%_goto 621" msg="811;Rune Castle Town Store">Rune Castle Town Store</a><br1>
 <a action="bypass -h npc_%objectId%_goto 622" msg="811;Rune Castle Town Temple">Castle Town Temple</a><br1>
 <a action="bypass -h npc_%objectId%_goto 623" msg="811;Rune North Gate">North Gate</a><br1>

+ 1 - 1
datapack_development/data/html/clanHallManager/teleSchuttgart1.htm

@@ -1,3 +1,3 @@
-<html><body>%npcname%:<br>
+<html><body>&$556;<br><br>
 Sorry, not working yet<br>
 </body></html>

+ 1 - 1
datapack_development/data/html/clanHallManager/teleSchuttgart2.htm

@@ -1,3 +1,3 @@
-<html><body>%npcname%:<br>
+<html><body>&$556;<br><br>
 Sorry, not working yet<br>
 </body></html>

+ 8 - 7
datapack_development/data/html/clanHallManager/vault.htm

@@ -1,9 +1,10 @@
-<html><body>%npcname%:<br>
-This warehouse is for clan members only.<br><br>
-All rents and fees for using the facilities are withdrawn here, so you must pay special attention to the balance of adena.<br><br>
-<CENTER>
-<button value="Deposit" action="bypass -h npc_%objectId%_manage_vault deposit" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal"><br>
-<button value="Withdraw" action="bypass -h npc_%objectId%_manage_vault withdraw" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal"><br>
-<button value="Initial Screen" action="bypass -h npc_%objectId%_functions back" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal"><br>
+<html><body>
+This warehouse may only be used by clan members.<br>
+Please be mindful of your Adena balance remaining, as both the rental fee and usage fee for this clan hall will automatically withdrawn from this account.<br>
+The current Clan Hall Rental Fee is <font color="LEVEL">%rent% Adena</font>, and the scheduled withdrawal time for the Clan Hall Rental Fee is <font color="LEVEL">%date%</font>.<br>
+<CENTER><br>
+<button value="Deposit" action="bypass -h npc_%objectId%_manage_vault deposit" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br>
+<button value="Withdraw" action="bypass -h npc_%objectId%_manage_vault withdraw" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br>
+<button value="Initial Screen" action="bypass -h npc_%objectId%_list_back" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br>
 </CENTER>
 </body></html>

+ 44 - 44
datapack_development/sql/clanhall.sql

@@ -17,47 +17,47 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
 -- ----------------------------
 -- Records 
 -- ----------------------------
-INSERT IGNORE INTO `clanhall` VALUES ('21','Fortress of Resistance','0','100000','Ol Mahum Fortress of Resistance','Dion','0','0','0');
-INSERT IGNORE INTO `clanhall` VALUES ('22','Moonstone Hall','0','100000','Clan hall located in the Town of Gludio','Gludio','0','2','0');
-INSERT IGNORE INTO `clanhall` VALUES ('23','Onyx Hall','0','100000','Clan hall located in the Town of Gludio','Gludio','0','2','0');
-INSERT IGNORE INTO `clanhall` VALUES ('24','Topaz Hall','0','100000','Clan hall located in the Town of Gludio','Gludio','0','2','0');
-INSERT IGNORE INTO `clanhall` VALUES ('25','Ruby Hall','0','100000','Clan hall located in the Town of Gludio','Gludio','0','2','0');
-INSERT IGNORE INTO `clanhall` VALUES ('26','Crystal Hall','0','100000','Clan hall located in Gludin Village','Gludin','0','2','0');
-INSERT IGNORE INTO `clanhall` VALUES ('27','Onyx Hall','0','100000','Clan hall located in Gludin Village','Gludin','0','2','0');
-INSERT IGNORE INTO `clanhall` VALUES ('28','Sapphire Hall','0','100000','Clan hall located in Gludin Village','Gludin','0','2','0');
-INSERT IGNORE INTO `clanhall` VALUES ('29','Moonstone Hall','0','100000','Clan hall located in Gludin Village','Gludin','0','2','0');
-INSERT IGNORE INTO `clanhall` VALUES ('30','Emerald Hall','0','100000','Clan hall located in Gludin Village','Gludin','0','2','0');
-INSERT IGNORE INTO `clanhall` VALUES ('31','The Atramental Barracks','0','100000','Clan hall located in the Town of Dion','Dion','0','1','0');
-INSERT IGNORE INTO `clanhall` VALUES ('32','The Scarlet Barracks','0','100000','Clan hall located in the Town of Dion','Dion','0','1','0');
-INSERT IGNORE INTO `clanhall` VALUES ('33','The Viridian Barracks','0','100000','Clan hall located in the Town of Dion','Dion','0','1','0');
-INSERT IGNORE INTO `clanhall` VALUES ('34','Devastated Castle','0','100000','Contestable Clan Hall','Aden','0','0','0');
-INSERT IGNORE INTO `clanhall` VALUES ('35','Bandit Stronghold','0','100000','Contestable Clan Hall','Oren','0','0','0');
-INSERT IGNORE INTO `clanhall` VALUES ('36','The Golden Chamber','0','100000','Clan hall located in the Town of Aden','Aden','0','3','0');
-INSERT IGNORE INTO `clanhall` VALUES ('37','The Silver Chamber','0','100000','Clan hall located in the Town of Aden','Aden','0','3','0');
-INSERT IGNORE INTO `clanhall` VALUES ('38','The Mithril Chamber','0','100000','Clan hall located in the Town of Aden','Aden','0','3','0');
-INSERT IGNORE INTO `clanhall` VALUES ('39','Silver Manor','0','100000','Clan hall located in the Town of Aden','Aden','0','3','0');
-INSERT IGNORE INTO `clanhall` VALUES ('40','Gold Manor','0','100000','Clan hall located in the Town of Aden','Aden','0','3','0');
-INSERT IGNORE INTO `clanhall` VALUES ('41','The Bronze Chamber','0','100000','Clan hall located in the Town of Aden','Aden','0','3','0');
-INSERT IGNORE INTO `clanhall` VALUES ('42','The Golden Chamber','0','100000','Clan hall located in the Town of Giran','Giran','0','3','0');
-INSERT IGNORE INTO `clanhall` VALUES ('43','The Silver Chamber','0','100000','Clan hall located in the Town of Giran','Giran','0','3','0');
-INSERT IGNORE INTO `clanhall` VALUES ('44','The Mithril Chamber','0','100000','Clan hall located in the Town of Giran','Giran','0','3','0');
-INSERT IGNORE INTO `clanhall` VALUES ('45','The Bronze Chamber','0','100000','Clan hall located in the Town of Giran','Giran','0','3','0');
-INSERT IGNORE INTO `clanhall` VALUES ('46','Silver Manor','0','100000','Clan hall located in the Town of Giran','Giran','0','3','0');
-INSERT IGNORE INTO `clanhall` VALUES ('47','Moonstone Hall','0','100000','Clan hall located in the Town of Goddard','Goddard','0','3','0');
-INSERT IGNORE INTO `clanhall` VALUES ('48','Onyx Hall','0','100000','Clan hall located in the Town of Goddard','Goddard','0','3','0');
-INSERT IGNORE INTO `clanhall` VALUES ('49','Emerald Hall','0','100000','Clan hall located in the Town of Goddard','Goddard','0','3','0');
-INSERT IGNORE INTO `clanhall` VALUES ('50','Sapphire Hall','0','100000','Clan hall located in the Town of Goddard','Goddard','0','3','0');
-INSERT IGNORE INTO `clanhall` VALUES ('51','Mont Chamber','0','100000','An upscale Clan hall located in the Rune Township','Rune','0','3','0');
-INSERT IGNORE INTO `clanhall` VALUES ('52','Astaire Chamber','0','100000','An upscale Clan hall located in the Rune Township','Rune','0','3','0');
-INSERT IGNORE INTO `clanhall` VALUES ('53','Aria Chamber','0','100000','An upscale Clan hall located in the Rune Township','Rune','0','3','0');
-INSERT IGNORE INTO `clanhall` VALUES ('54','Yiana Chamber','0','100000','An upscale Clan hall located in the Rune Township','Rune','0','3','0');
-INSERT IGNORE INTO `clanhall` VALUES ('55','Roien Chamber','0','100000','An upscale Clan hall located in the Rune Township','Rune','0','3','0');
-INSERT IGNORE INTO `clanhall` VALUES ('56','Luna Chamber','0','100000','An upscale Clan hall located in the Rune Township','Rune','0','3','0');
-INSERT IGNORE INTO `clanhall` VALUES ('57','Traban Chamber','0','100000','An upscale Clan hall located in the Rune Township','Rune','0','3','0');
-INSERT IGNORE INTO `clanhall` VALUES ('58','Eisen Hall','0','100000','Clan hall located in the Town of Schuttgart','Schuttgart','0','2','0');
-INSERT IGNORE INTO `clanhall` VALUES ('59','Heavy Metal Hall','0','100000','Clan hall located in the Town of Schuttgart','Schuttgart','0','2','0');
-INSERT IGNORE INTO `clanhall` VALUES ('60','Molten Ore Hall','0','100000','Clan hall located in the Town of Schuttgart','Schuttgart','0','2','0');
-INSERT IGNORE INTO `clanhall` VALUES ('61','Titan Hall','0','100000','Clan hall located in the Town of Schuttgart','Schuttgart','0','2','0');
-INSERT IGNORE INTO `clanhall` VALUES ('62','Rainbow Springs','0','100000','','Goddard','0','0','0');
-INSERT IGNORE INTO `clanhall` VALUES ('63','Beast Farm','0','100000','','Rune','0','0','0');
-INSERT IGNORE INTO `clanhall` VALUES ('64','Fortress of the Dead','0','100000','','Rune','0','0','0');
+INSERT IGNORE INTO `clanhall` VALUES ('21','Fortress of Resistance','0','0','Ol Mahum Fortress of Resistance','Dion','0','0','0');
+INSERT IGNORE INTO `clanhall` VALUES ('22','Moonstone Hall','0','500000','Clan hall located in the Town of Gludio','Gludio','0','2','0');
+INSERT IGNORE INTO `clanhall` VALUES ('23','Onyx Hall','0','500000','Clan hall located in the Town of Gludio','Gludio','0','2','0');
+INSERT IGNORE INTO `clanhall` VALUES ('24','Topaz Hall','0','500000','Clan hall located in the Town of Gludio','Gludio','0','2','0');
+INSERT IGNORE INTO `clanhall` VALUES ('25','Ruby Hall','0','500000','Clan hall located in the Town of Gludio','Gludio','0','2','0');
+INSERT IGNORE INTO `clanhall` VALUES ('26','Crystal Hall','0','500000','Clan hall located in Gludin Village','Gludin','0','2','0');
+INSERT IGNORE INTO `clanhall` VALUES ('27','Onyx Hall','0','500000','Clan hall located in Gludin Village','Gludin','0','2','0');
+INSERT IGNORE INTO `clanhall` VALUES ('28','Sapphire Hall','0','500000','Clan hall located in Gludin Village','Gludin','0','2','0');
+INSERT IGNORE INTO `clanhall` VALUES ('29','Moonstone Hall','0','500000','Clan hall located in Gludin Village','Gludin','0','2','0');
+INSERT IGNORE INTO `clanhall` VALUES ('30','Emerald Hall','0','500000','Clan hall located in Gludin Village','Gludin','0','2','0');
+INSERT IGNORE INTO `clanhall` VALUES ('31','The Atramental Barracks','0','200000','Clan hall located in the Town of Dion','Dion','0','1','0');
+INSERT IGNORE INTO `clanhall` VALUES ('32','The Scarlet Barracks','0','200000','Clan hall located in the Town of Dion','Dion','0','1','0');
+INSERT IGNORE INTO `clanhall` VALUES ('33','The Viridian Barracks','0','200000','Clan hall located in the Town of Dion','Dion','0','1','0');
+INSERT IGNORE INTO `clanhall` VALUES ('34','Devastated Castle','0','0','Contestable Clan Hall','Aden','0','0','0');
+INSERT IGNORE INTO `clanhall` VALUES ('35','Bandit Stronghold','0','0','Contestable Clan Hall','Oren','0','0','0');
+INSERT IGNORE INTO `clanhall` VALUES ('36','The Golden Chamber','0','1000000','Clan hall located in the Town of Aden','Aden','0','3','0');
+INSERT IGNORE INTO `clanhall` VALUES ('37','The Silver Chamber','0','1000000','Clan hall located in the Town of Aden','Aden','0','3','0');
+INSERT IGNORE INTO `clanhall` VALUES ('38','The Mithril Chamber','0','1000000','Clan hall located in the Town of Aden','Aden','0','3','0');
+INSERT IGNORE INTO `clanhall` VALUES ('39','Silver Manor','0','1000000','Clan hall located in the Town of Aden','Aden','0','3','0');
+INSERT IGNORE INTO `clanhall` VALUES ('40','Gold Manor','0','1000000','Clan hall located in the Town of Aden','Aden','0','3','0');
+INSERT IGNORE INTO `clanhall` VALUES ('41','The Bronze Chamber','0','1000000','Clan hall located in the Town of Aden','Aden','0','3','0');
+INSERT IGNORE INTO `clanhall` VALUES ('42','The Golden Chamber','0','1000000','Clan hall located in the Town of Giran','Giran','0','3','0');
+INSERT IGNORE INTO `clanhall` VALUES ('43','The Silver Chamber','0','1000000','Clan hall located in the Town of Giran','Giran','0','3','0');
+INSERT IGNORE INTO `clanhall` VALUES ('44','The Mithril Chamber','0','1000000','Clan hall located in the Town of Giran','Giran','0','3','0');
+INSERT IGNORE INTO `clanhall` VALUES ('45','The Bronze Chamber','0','1000000','Clan hall located in the Town of Giran','Giran','0','3','0');
+INSERT IGNORE INTO `clanhall` VALUES ('46','Silver Manor','0','1000000','Clan hall located in the Town of Giran','Giran','0','3','0');
+INSERT IGNORE INTO `clanhall` VALUES ('47','Moonstone Hall','0','1000000','Clan hall located in the Town of Goddard','Goddard','0','3','0');
+INSERT IGNORE INTO `clanhall` VALUES ('48','Onyx Hall','0','1000000','Clan hall located in the Town of Goddard','Goddard','0','3','0');
+INSERT IGNORE INTO `clanhall` VALUES ('49','Emerald Hall','0','1000000','Clan hall located in the Town of Goddard','Goddard','0','3','0');
+INSERT IGNORE INTO `clanhall` VALUES ('50','Sapphire Hall','0','1000000','Clan hall located in the Town of Goddard','Goddard','0','3','0');
+INSERT IGNORE INTO `clanhall` VALUES ('51','Mont Chamber','0','1000000','An upscale Clan hall located in the Rune Township','Rune','0','3','0');
+INSERT IGNORE INTO `clanhall` VALUES ('52','Astaire Chamber','0','1000000','An upscale Clan hall located in the Rune Township','Rune','0','3','0');
+INSERT IGNORE INTO `clanhall` VALUES ('53','Aria Chamber','0','1000000','An upscale Clan hall located in the Rune Township','Rune','0','3','0');
+INSERT IGNORE INTO `clanhall` VALUES ('54','Yiana Chamber','0','1000000','An upscale Clan hall located in the Rune Township','Rune','0','3','0');
+INSERT IGNORE INTO `clanhall` VALUES ('55','Roien Chamber','0','1000000','An upscale Clan hall located in the Rune Township','Rune','0','3','0');
+INSERT IGNORE INTO `clanhall` VALUES ('56','Luna Chamber','0','1000000','An upscale Clan hall located in the Rune Township','Rune','0','3','0');
+INSERT IGNORE INTO `clanhall` VALUES ('57','Traban Chamber','0','1000000','An upscale Clan hall located in the Rune Township','Rune','0','3','0');
+INSERT IGNORE INTO `clanhall` VALUES ('58','Eisen Hall','0','500000','Clan hall located in the Town of Schuttgart','Schuttgart','0','2','0');
+INSERT IGNORE INTO `clanhall` VALUES ('59','Heavy Metal Hall','0','500000','Clan hall located in the Town of Schuttgart','Schuttgart','0','2','0');
+INSERT IGNORE INTO `clanhall` VALUES ('60','Molten Ore Hall','0','500000','Clan hall located in the Town of Schuttgart','Schuttgart','0','2','0');
+INSERT IGNORE INTO `clanhall` VALUES ('61','Titan Hall','0','500000','Clan hall located in the Town of Schuttgart','Schuttgart','0','2','0');
+INSERT IGNORE INTO `clanhall` VALUES ('62','Rainbow Springs','0','0','','Goddard','0','0','0');
+INSERT IGNORE INTO `clanhall` VALUES ('63','Beast Farm','0','0','','Rune','0','0','0');
+INSERT IGNORE INTO `clanhall` VALUES ('64','Fortress of the Dead','0','0','','Rune','0','0','0');

+ 18 - 17
datapack_development/sql/teleport.sql

@@ -404,18 +404,18 @@ INSERT INTO teleport VALUES
 
 INSERT INTO teleport VALUES
 ('Clan Hall -> Execution Grounds',502,51055,141959,-2869,500,0),
--- ('Clan Hall -> Fortress of Resistance',503,51055,141959,-2869,500,0),-- dunno coords !
+('Clan Hall -> Fortress of Resistance',503,47382,111278,-104,500,0),
 ('Clan Hall -> Cruma Marshlands',504,5106,126916,-3664,500,0),
 ('Clan Hall -> Cruma Tower Entrance',505,17192,114178,-3439,500,0),
  -- ('Clan Hall -> Mandragora Farm',506,17192,114178,-3439,500,0),-- dunno coords !
 ('Clan Hall -> Town of Dion',507,15670,142983,-2705,500,0),
-('Clan Hall -> Floran Village',508,17838,170274,-3508,500,0),
+('Clan Hall -> Floran Village',508,17430,170103,-3496,500,0),
  -- 509
-('Clan Hall -> Tanor Canyon',510,58316,163851,-2816,500,0),
+('Clan Hall -> Tanor Canyon',510,60374,164301,-2856,500,0),
 ('Clan Hall -> Bee Hive',511,20505,189036,-3344,500,0),
  -- ('Clan Hall -> Dion Hills',512,20505,189036,-3344,500,0),-- dunno coords !
 ('Clan Hall -> Floran Agricultural Area',513,26810,172787,-3376,500,0),-- needs confirming
-('Clan Hall -> Plains of Dion',514,9980,173167,-3734,500,0),-- needs confirming
+('Clan Hall -> Plains of Dion',514,630,179184,-3720,500,0),-- needs confirming
  -- 515
  -- 516
 ('Clan Hall -> Hardin\'s Academy',517,105918,109759,-3207,500,0),
@@ -449,12 +449,12 @@ INSERT INTO teleport VALUES
  -- ('Clan Hall -> Undine Waterfall',595,85995,-2433,-3528,500,0),-- dunno coords !
  -- ('Clan Hall -> The Gods\' Falls',596,85995,-2433,-3528,500,0), -- dunno coords !
  -- 597
-('Clan Hall -> Tower of Insolence',598,121685,15749,-3852,500,0),
+('Clan Hall -> Tower of Insolence',598,114649,11115,-5120,500,0),
 ('Clan Hall -> The Blazing Swamp',599,146828,-12859,-4455,500,0),
  -- 600
 ('Clan Hall -> The Forbidden Gateway',601,185395,20359,-3270,500,0),
 ('Clan Hall -> The Giants Cave',602,174528,52683,-4369,500,0),
-('Clan Hall -> Northern Pathway of Enchanted Valley',603,104426,33746,-3800,500,0),-- need also southern?
+('Clan Hall -> Northern Pathway of Enchanted Valley',603,104426,33746,-3800,500,0),
 ('Clan Hall -> The Cemetery',604,172136,20325,-3326,500,0),
 ('Clan Hall -> The Forest of Mirrors',605,150477,85907,-2753,500,0),
 ('Clan Hall -> Anghel Waterfall',606,165584,85997,-2338,500,0),
@@ -464,12 +464,12 @@ INSERT INTO teleport VALUES
 ('Clan Hall -> Coliseum',610,150086,46733,-3412,500,0),
 -- ('Clan Hall -> Narsell Lake',611,150086,46733,-3412,500,0),-- dunno coords !
  -- 612 
-('Clan Hall -> Ancient Battleground',613,127739,-6998,-3869,500,0),
-('Clan Hall -> Forsaken Plains',614,167285,37109,-4008,500,0),
+('Clan Hall -> Ancient Battleground',613,106517,-2871,-3416,500,0),
+('Clan Hall -> Forsaken Plains',614,168217,37990,-4072,500,0),
 ('Clan Hall -> Silent Valley',615,177318,48447,-3835,500,0),
 ('Clan Hall -> Hunters Valley',616,114306,86573,-3112,500,0),-- needs confirming
 ('Clan Hall -> Plains of Glory',617,135756,19557,-3424,500,0),-- needs confirming
-('Clan Hall -> Fields of Massacre',618,179718,-7843,-3517,500,0),-- needs confirming
+('Clan Hall -> Fields of Massacre',618,181726,-7524,-3464,500,0),
 ('Clan Hall -> War-Torn Plains',619,156898,11217,-4032,500,0),-- needs confirming
 ('Clan Hall -> Border Outpost(Unknown Side)',620,114172,-18034,-1875,500,0),
 ('Clan Hall -> Rune Castle Town - Shopping Area',621,43835,-47749,-796,0,0),
@@ -518,7 +518,8 @@ INSERT INTO teleport VALUES
 ('Clan Hall -> Ant Cave South Entrance',664,-16019,193365,-4488,500,0),
 ('Clan Hall -> Ant Cave East Entrance',665,-10875,175962,-4152,500,0),
 ('Clan Hall -> Ant Cave West Entrance',666,-25899,172857,-4186,500,0),
-('Clan Hall -> Altar of Rites',667,-44311,78617,-3744,500,0);
+('Clan Hall -> Altar of Rites',667,-44311,78617,-3744,500,0),
+('Clan Hall -> Windmill Hill',668,-68628,162336,-3592,500,0);
 
 -- Noblesse Teleport
 INSERT INTO teleport VALUES
@@ -677,16 +678,16 @@ INSERT INTO teleport VALUES
 ('Clan Hall -> East Town of Aden',12002,142593,26344,-2425,0,0),
 ('Clan Hall -> South Town of Aden',12003,147503,32299,-2501,0,0),
 ('Clan Hall -> West Town of Aden',12004,147465,20737,-2130,0,0),
-('Clan Hall -> Southern Pathway of Enchanted Valley',12005,124904,61992,-3973,500,0),
-('Clan Hall -> East of Blazing Swamp',12006,159676,-13544,-2832,500,0),
+('Clan Hall -> Southern Pathway of Enchanted Valley',12005,124904,61992,-3920,500,0),
+('Clan Hall -> Blazing Swamp',12006,155310,-16339,-3320,500,0),
 ('Clan Hall -> Plains of Glory',12007,133164,14036,-3888,500,0),
 ('Clan Hall -> Plains of Fierce Battle',12008,153757,8905,-4024,500,0),
-('Clan Hall -> Path to Forest of Wirrors',12009,134310,71976,-3298,500,0),
-('Clan Hall -> The Front of Anghel Waterfall',12010,163341,91374,-3320,500,0),
-('Clan Hall -> Disciples Necropolis',12011,168779,-18790,-3184,500,0),
+('Clan Hall -> Path to Forest of Wirrors',12009,142065,81300,-3000,500,0),
+('Clan Hall -> Anghel Waterfall',12010,166182,91560,-3168,500,0),
+('Clan Hall -> West Area of Devastated Castle',12011,168779,-18790,-3184,500,0),
 ('Clan Hall -> North Path to The Cementery',12012,175191,4082,-2863,500,0),
-('Clan Hall ->South Path to The Cementery',12013,175432,30299,-3773,500,0),
-('Clan Hall -> West Path to The Cementery',12014,166502,20284,-3328,500,0),
+('Clan Hall -> South Path to The Cementery',12013,175432,30299,-3773,500,0),
+('Clan Hall -> Seal of Shilen',12014,184742,19745,-3168,500,0),
 ('Clan Hall -> Center of Giran Castle Town',12015,81749,149171,-3464,0,0),
 ('Clan Hall -> North of Giran Castle Town',12016,81525,143821,-3528,0,0),
 ('Clan Hall -> East of Giran Castle Town',12017,88342,147329,-3400,0,0),