DP side of l385 - *** WARNING - update20061230.sql will DROP and CREATE auction & clanhall tables due to structure changes [thx Enforcer, l2jfree and Sami]

datapack_development/data/html/auction/AgitAuctionInfo.htm

@@ -9,37 +9,37 @@
 <tr><td width=90>
 <font color="a2a0a2">Name of clan hall</font>
 </td><td width=180>
-<font color="b09979"><?AGIT_NAME?></font>
+<font color="b09979">%AGIT_NAME%</font>
 </td></tr>
 
 <tr><td>
 <font color="a2a0a2">Clan that owns</font>
 </td><td>
-<font color="b09979"><?OWNER_PLEDGE_NAME?></font>
+<font color="b09979">%OWNER_PLEDGE_NAME%</font>
 </td></tr>
 
 <tr><td>
 <font color="a2a0a2">Leader of clan that owns</font>
 </td><td>
-<font color="b09979"><?OWNER_PLEDGE_MASTER?></font>
+<font color="b09979">%OWNER_PLEDGE_MASTER%</font>
 </td></tr>
 
 <tr><td>
 <font color="a2a0a2">Size of clan hall</font>
 </td><td>
-<font color="b09979"><?AGIT_SIZE?>rating</font> (grade)
+<font color="b09979">%AGIT_SIZE%rating</font> (grade)
 </td></tr>
 
 <tr><td>
 <font color="a2a0a2">Rental fee for clan hall</font>
 </td><td>
-<font color="b09979"><?AGIT_LEASE?></font>adena<font color="LEVEL">/week</font>
+<font color="b09979">%AGIT_LEASE%</font>adena<font color="LEVEL">/week</font>
 </td></tr>
 
 <tr><td>
 <font color="a2a0a2">Clan hall location</font>
 </td><td>
-<?AGIT_LOCATION?>
+%AGIT_LOCATION%
 </td></tr>
 </table>
 <img src="L2UI.SquareGray" width=270 height=1> <img src="L2UI.SquareBlank" width=1 height=3>
@@ -49,38 +49,38 @@
 <tr><td width=90>
 <font color="a2a0a2">Time and date that auction ends</font>
 </td><td width=180>
-<font color="b09979"><?AGIT_AUCTION_END_YY?> year <?AGIT_AUCTION_END_MM?> month <?AGIT_AUCTION_END_DD?> day <?AGIT_AUCTION_END_HH?> hour </font>
+<font color="b09979">%AGIT_AUCTION_END_YY%/%AGIT_AUCTION_END_MM%/%AGIT_AUCTION_END_DD% %AGIT_AUCTION_END_HH% hour </font>
 </td></tr>
 <tr><td>
 <font color="a2a0a2">Time remaining</font>
 </td><td>
-<font color="b09979"><?AGIT_AUCTION_REMAIN?></font>
+<font color="b09979">%AGIT_AUCTION_REMAIN%</font>
 </td></tr>
 <tr><td>
 <font color="a2a0a2">Minimum bid price</font>
 </td><td>
-<font color="b09979"><?AGIT_AUCTION_MINBID?></font> adena
+<font color="b09979">%AGIT_AUCTION_MINBID%</font> adena
 </td></tr>
 <tr><td>
 <font color="a2a0a2">Number of bidding clans</font>
 </td><td>
-<font color="b09979"><?AGIT_AUCTION_COUNT?></font>
+<font color="b09979">%AGIT_AUCTION_COUNT%</font>
 </td></tr>
 
 </table>
 
 <table width=270 border=0 bgcolor=333333>
 <tr><td width=270>
-<?AGIT_AUCTION_DESC?>
+%AGIT_AUCTION_DESC%
 </td></tr>
 </table>
 <img src="L2UI.SquareBlank" width=270 height=10> <img src="L2UI.SquareWhite" width=270 height=1> <img src="L2UI.SquareBlank" width=270 height=5>
 <table width=270 border=0>
 <tr>
 <td width=60></td>
-<td width=70 align=center><button action="<?AGIT_LINK_BACK?>" value="????" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
-<td width=70 align=center><button action="<?AGIT_LINK_BIDLIST?>" value="??? ??" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
-<td width=70 align=center><button action="<?AGIT_LINK_BID?>" value="??" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
+<td width=70 align=center><button action="bypass -h npc_%objectId%_list" value="Back" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
+<td width=70 align=center><button action="%AGIT_LINK_BIDLIST%" value="Bidders List" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
+<td width=70 align=center><button action="%AGIT_LINK_RE%" value="Bid" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
 </tr>
 </table>
 </body></html>

datapack_development/data/html/auction/AgitAuctionList.htm

@@ -6,23 +6,35 @@
 <center>Items for Sale in All Regions</center>
 <img src="L2UI.SquareWhite" width=270 height=1>
 
-<table width=270 border=0 bgcolor="000000">
+<table width=270 border=0 bgcolor="#000000">
 <tr>
-<td width=50 align=center>&amp;$550;</td>
-<td width=100 align=center>&amp;$551;</td>
-<td width=50 align=center>&amp;$552;</td>
-<td width=70 align=center>&amp;$555;</td>
+<td width=50 align=center>Action</td>
+<td width=100 align=center>Action
+  </td>
+<td width=50 align=center>EndDate</td>
+<td width=70 align=center>Min Bid</td>
 </tr>
 </table>
-
-<?AGIT_LIST?>
+<table width=270 border=0>
+<tr>
+<td width=50 align=center></td>
+<td width=100 align=center></td>
+<td width=50 align=center></td>
+<td width=70 align=center></td>
+</tr>
+%itemsField%
+</table>
 
 <img src="L2UI.SquareWhite" width=270 height=1> <img src="L2UI.SquareBlank" width=270 height=5>
 <table width=270 border=0>
 <tr>
 <td width=210></td>
-<td width=70 align=center><button action="<?AGIT_LINK_BACK?>" value="??" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
+<td width=70 align=center><button action="bypass -h npc_%objectId%_start" value="Back" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
 </tr>
 </table>
+
+<a action="bypass -h npc_%objectId%_bidding">All items for sale.</a><br>
+
+
 </body>
 </html>

datapack_development/data/html/auction/AgitBid1.htm

@@ -1,13 +1,13 @@
 ?<html>
 <body>
-<font color="LEVEL">Bidding is only permitted in one clan hall.</font> When a bid is submitted, the amount of adena bid is <font color="LEVEL">deposited</font> from the clan warehouse into the auction. <font color="LEVEL">10% of the bid amount is a transaction tax</font> and cannot be returned even if the bidding is canceled.<br> <font color="LEVEL">The bid price</font> must be higher than the minimum bid price (or previous bid price when rebidding) and the clan that has written the highest price at the end of the auction wins the auction.<br> There are currently <font color="aaccff"><?PLEDGE_ADENA?></font> adena in the clan warehouse. The minimum amount that can be bid is <font color="aaccff"><?AGIT_AUCTION_MINBID?></font> adena.<br> How much do you want to bid?
+<font color="LEVEL">Bidding is only permitted in one clan hall.</font> When a bid is submitted, the amount of adena bid is <font color="LEVEL">deposited</font> from the clan warehouse into the auction. <font color="LEVEL">10% of the bid amount is a transaction tax</font> and cannot be returned even if the bidding is canceled.<br> <font color="LEVEL">The bid price</font> must be higher than the minimum bid price (or previous bid price when rebidding) and the clan that has written the highest price at the end of the auction wins the auction.<br> There are currently <font color="aaccff">%PLEDGE_ADENA%</font> adena in the clan warehouse. The minimum amount that can be bid is <font color="aaccff">%AGIT_AUCTION_MINBID%</font> adena.<br> How much do you want to bid?
 <table width=270 border=0><tr><td width=220 align=right><edit var=bidprice width=230 align=right type=number></td><td width=40 align=right>adena</td></tr></table>
 <img src="L2UI.SquareBlank" width=270 height=10> <img src="L2UI.SquareWhite" width=270 height=1> <img src="L2UI.SquareBlank" width=270 height=5>
 <table width=270 border=0>
 <tr>
 <td width=130></td>
-<td width=70 align=center><button action="<?AGIT_LINK_BACK?>" value="????" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
-<td width=70 align=center><button action="<?AGIT_LINK_NEXT?>" value="????" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
+<td width=70 align=center><button action="%AGIT_LINK_BACK%" value="Back" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
+<td width=70 align=center><button action="bypass -h npc_%objectId%_bid $bidprice" value="Confirm" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
 </tr>
 </table>
 <br>

datapack_development/data/html/auction/AgitBid2.htm

@@ -4,22 +4,22 @@
 <tr><td width=90>
 Minimum bid price
 </td><td width=180>
-<font color="aaccff"><?AGIT_AUCTION_MINBID?></font> adena</td></tr>
+<font color="aaccff">%AGIT_AUCTION_MINBID%</font> adena</td></tr>
 <tr><td>
 Bid price
 </td><td>
-<font color="aaccff"><?AGIT_AUCTION_BID?></font> adena</td></tr>
+<font color="aaccff">%AGIT_AUCTION_BID%</font> adena</td></tr>
 <tr><td>
 Auction closing date
-</td><td><?AGIT_AUCTION_END_YY?> year <?AGIT_AUCTION_END_MM?> month <?AGIT_AUCTION_END_DD?> day <?AGIT_AUCTION_END_HH?> hour
+</td><td>%AGIT_AUCTION_END_YY% year %AGIT_AUCTION_END_MM% month %AGIT_AUCTION_END_DD% day %AGIT_AUCTION_END_HH% hour
 </td></tr>
 </table>
 <br> Rebidding is only possible after a bid has been made or when raising a bid price. When canceling a bid, the transaction tax (<font color="LEVEL">10% of the bid price</font>) cannot be returned. <br> Rebidding and bid cancelation can be done through "My Sale Items" in the top menu.<br>  Do you want to bid?<br> <img src="L2UI.SquareBlank" width=270 height=10> <img src="L2UI.SquareWhite" width=270 height=1> <img src="L2UI.SquareBlank" width=270 height=5>
 <table width=270 border=0>
 <tr>
 <td width=130></td>
-<td width=70 align=center><button action="<?AGIT_LINK_BACK?>" value="????" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
-<td width=70 align=center><button action="<?AGIT_LINK_DOBID?>" value="????" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
+<td width=70 align=center><button action="bypass -h npc_%objectId%_electedItems" value="Back" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
+<td width=70 align=center><button action="bypass -h npc_%objectId%_bid1" value="Confirm" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
 </tr>
 </table>
 <br>

datapack_development/data/html/auction/AgitBidCancel.htm

@@ -2,14 +2,14 @@
 
 
 <body>
-When an auction bid is canceled, the transaction tax (<font color="LEVEL">10% of the bid amount</font>) cannot be returned.<br> The bid price for this clan hall is <font color="aaccff"><?AGIT_BID?></font> adena. After deducting the transaction tax, you can receive back the remaining <font color="aaccff"><?AGIT_BID_REMAIN?></font> adena. Do you want to cancel your bid?
+When an auction bid is canceled, the transaction tax (<font color="LEVEL">10% of the bid amount</font>) cannot be returned.<br> The bid price for this clan hall is <font color="aaccff">%AGIT_BID%</font> adena. After deducting the transaction tax, you can receive back the remaining <font color="aaccff">%AGIT_BID_REMAIN%</font> adena. Do you want to cancel your bid?
 
 <img src="L2UI.SquareBlank" width=270 height=10> <img src="L2UI.SquareWhite" width=270 height=1> <img src="L2UI.SquareBlank" width=270 height=5>
 <table width=270 border=0>
 <tr>
 <td width=130></td>
-<td width=70 align=center><button action="<?AGIT_LINK_BACK?>" value="????" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
-<td width=70 align=center><button action="<?AGIT_LINK_CANCEL?>" value="?? ??" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
+<td width=70 align=center><button action="bypass -h npc_%objectId%_selectedItems" value="Back" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
+<td width=70 align=center><button action="bypass -h npc_%objectId%_doCancelBid" value="Cancel Bidding" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
 </tr>
 </table>
 &nbsp;<br>

datapack_development/data/html/auction/AgitBidInfo.htm

@@ -9,37 +9,37 @@
 <tr><td width=90>
 <font color="a2a0a2">Name of clan hall</font>
 </td><td width=180>
-<font color="b09979"><?AGIT_NAME?></font>
+<font color="b09979">%AGIT_NAME%</font>
 </td></tr>
 
 <tr><td>
 <font color="a2a0a2">Clan that owns</font>
 </td><td>
-<font color="b09979"><?OWNER_PLEDGE_NAME?></font>
+<font color="b09979">%OWNER_PLEDGE_NAME%</font>
 </td></tr>
 
 <tr><td>
 <font color="a2a0a2">Leader of clan that owns</font>
 </td><td>
-<font color="b09979"><?OWNER_PLEDGE_MASTER?></font>
+<font color="b09979">%OWNER_PLEDGE_MASTER%</font>
 </td></tr>
 
 <tr><td>
 <font color="a2a0a2">Size of clan hall</font>
 </td><td>
-<font color="b09979"><?AGIT_SIZE?>rating</font> (grade)
+<font color="b09979">%AGIT_SIZE% rating</font> (grade)
 </td></tr>
 
 <tr><td>
 <font color="a2a0a2">Rental fee for clan hall</font>
 </td><td>
-<font color="b09979"><?AGIT_LEASE?></font>adena<font color="LEVEL">/week</font>
+<font color="b09979">%AGIT_LEASE%</font> adena<font color="LEVEL">/week</font>
 </td></tr>
 
 <tr><td>
 <font color="a2a0a2">Clan hall location</font>
 </td><td>
-<?AGIT_LOCATION?>
+%AGIT_LOCATION%
 </td></tr>
 </table>
 <img src="L2UI.SquareGray" width=270 height=1> <img src="L2UI.SquareBlank" width=1 height=3>
@@ -49,41 +49,41 @@
 <tr><td width=90>
 <font color="a2a0a2">Time and date that auction ends</font>
 </td><td width=180>
-<font color="b09979"><?AGIT_AUCTION_END_YY?> year <?AGIT_AUCTION_END_MM?> month <?AGIT_AUCTION_END_DD?> day <?AGIT_AUCTION_END_HH?> hour </font>
+<font color="b09979">%AGIT_AUCTION_END_YY%/%AGIT_AUCTION_END_MM%/%AGIT_AUCTION_END_DD% %AGIT_AUCTION_END_HH% hour </font>
 </td></tr>
 <tr><td>
 <font color="a2a0a2">Time remaining</font>
 </td><td>
-<font color="b09979"><?AGIT_AUCTION_REMAIN?></font>
+<font color="b09979">%AGIT_AUCTION_REMAIN%</font>
 </td></tr>
 <tr><td>
 <font color="a2a0a2">Minimum bid price</font>
 </td><td>
-<font color="b09979"><?AGIT_AUCTION_MINBID?></font> adena
+<font color="b09979">%AGIT_AUCTION_MINBID%</font> adena
 </td></tr>
 <tr><td>
 <font color="ccc0cc">Bid price</font>
 </td><td>
-<font color="aaccff"><?AGIT_AUCTION_MYBID?></font> adena
+<font color="aaccff">%AGIT_AUCTION_MYBID%</font> adena
 </td></tr>
 
 </table>
 
 <table width=270 border=0 bgcolor=333333>
 <tr><td width=270>
-<?AGIT_AUCTION_DESC?>
+%AGIT_AUCTION_DESC%
 </td></tr>
 </table>
 <img src="L2UI.SquareBlank" width=270 height=10> <img src="L2UI.SquareWhite" width=270 height=1> <img src="L2UI.SquareBlank" width=270 height=5>
 <table width=270 border=0>
 <tr>
 <td width=130></td>
-<td width=70 align=center><button action="<?AGIT_LINK_CANCEL?>" value="????" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
-<td width=70 align=center><button action="<?AGIT_LINK_BIDLIST?>" value="?????" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
+<td width=70 align=center><button action="bypass -h npc_%objectId%_cancelBid" value="Cancel" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
+<td width=70 align=center><button action="bypass -h npc_%objectId%_bidlist" value="Bidders List" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
 </tr><tr>
 <td width=130></td>
-<td width=70 align=center><button action="<?AGIT_LINK_BACK?>" value="????" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
-<td width=70 align=center><button action="<?AGIT_LINK_RE?>" value="???" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
+<td width=70 align=center><button action="bypass -h npc_%objectId%_start" value="Back" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
+<td width=70 align=center><button action="bypass -h npc_%objectId%_rebid" value="Rebid" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
 </tr>
 </table>
 </body></html>

datapack_development/data/html/auction/AgitBidderList.htm

@@ -9,21 +9,30 @@
 <table width=270 border=0 bgcolor="000000">
 <tr>
 <td width=50 align=center>Clan Name</td>
-<td width=100 align=center>Name of bidding clan</td>
+<td width=100 align=center>Leader of bidding clan</td>
 <td width=50 align=center>Time bid was placed</td>
 <td width=70 align=center>Bid price</td>
 </tr>
 </table>
+<table width=270 border=0>
+<tr>
+<td width=50 align=center></td>
+<td width=100 align=center></td>
+<td width=50 align=center></td>
+<td width=70 align=center></td>
+</tr>
+%AGIT_LIST%
+</table>
+
 
 
-<?AGIT_LIST?>
 
 
 <img src="L2UI.SquareWhite" width=270 height=1> <img src="L2UI.SquareBlank" width=270 height=5>
 <table width=270 border=0>
 <tr>
 <td width=210></td>
-<td width=70 align=center><button action="<?AGIT_LINK_BACK?>" value="????" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
+<td width=70 align=center><button action="bypass -h npc_%objectId%_bidding %x%" value="Back" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
 </tr>
 </table>
 </body>

datapack_development/data/html/auction/AgitInfo.htm

@@ -9,37 +9,37 @@
 <tr><td width=90>
 <font color="a2a0a2">Name of clan hall</font>
 </td><td width=180>
-<font color="b09979"><?AGIT_NAME?></font>
+<font color="b09979">%AGIT_NAME%</font>
 </td></tr>
 
 <tr><td>
 <font color="a2a0a2">Clan that owns</font>
 </td><td>
-<font color="b09979"><?AGIT_OWNER_PLEDGE_NAME?></font>
+<font color="b09979">%AGIT_OWNER_PLEDGE_NAME%</font>
 </td></tr>
 
 <tr><td>
 <font color="a2a0a2">Leader of clan that owns</font>
 </td><td>
-<font color="b09979"><?OWNER_PLEDGE_MASTER?></font>
+<font color="b09979">%OWNER_PLEDGE_MASTER%</font>
 </td></tr>
 
 <tr><td>
 <font color="a2a0a2">Size of clan hall</font>
 </td><td>
-<font color="b09979"><?AGIT_SIZE?>rating</font> (grade)
+<font color="b09979">%AGIT_SIZE%rating</font> (grade)
 </td></tr>
 
 <tr><td>
 <font color="a2a0a2">Rental fee for clan hall</font>
 </td><td>
-<font color="b09979"><?AGIT_LEASE?></font>adena<font color="LEVEL">/week</font>
+<font color="b09979">%AGIT_LEASE%</font>adena<font color="LEVEL">/week</font>
 </td></tr>
 
 <tr><td>
 <font color="a2a0a2">Clan hall location</font>
 </td><td>
-<?AGIT_LOCATION?>
+%AGIT_LOCATION%
 </td></tr>
 
 
@@ -48,8 +48,8 @@
 <table width=270 border=0>
 <tr>
 <td width=130></td>
-<td width=70 align=center><button action="<?AGIT_LINK_BACK?>" value="????" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
-<td width=70 align=center><button action="<?AGIT_LINK_SALE1?>" value="??????" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
+<td width=70 align=center><button action="bypass -h npc_%objectId%_start" value="Back" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
+<td width=70 align=center><button action="bypass -h npc_%objectId%_sale" value="Sell" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
 </tr>
 </table>
 </body></html>

datapack_development/data/html/auction/AgitSale1.htm

@@ -1,13 +1,13 @@
 ?<html>
 <body>
-In order to put a clan hall up for auction, a <font color="LEVEL">deposit</font> must be paid for the respective clan hall in the clan warehouse. The <font color="LEVEL">deposit</font> is taken out of the clan warehouse at the moment the clan hall is put up for auction and is returned if the auction is completed normally.<br> If an auction is canceled, you cannot register an auction again for seven days and the <font color="LEVEL">deposit</font> is not returned. The deposit also cannot be returned if the auction ends without any bids.<br>  The <font color="LEVEL">deposit</font> for this clan house is <font color="aaccff"><?AGIT_DEPOSIT?></font> adena and there are currently <font color="aaccff"><?AGIT_PLEDGE_ADENA?></font> adena in the clan warehouse.
+In order to put a clan hall up for auction, a <font color="LEVEL">deposit</font> must be paid for the respective clan hall in the clan warehouse. The <font color="LEVEL">deposit</font> is taken out of the clan warehouse at the moment the clan hall is put up for auction and is returned if the auction is completed normally.<br> If an auction is canceled, you cannot register an auction again for seven days and the <font color="LEVEL">deposit</font> is not returned. The deposit also cannot be returned if the auction ends without any bids.<br>  The <font color="LEVEL">deposit</font> for this clan house is <font color="aaccff">%AGIT_DEPOSIT%</font> adena and there are currently <font color="aaccff">%AGIT_PLEDGE_ADENA%</font> adena in the clan warehouse.
 
 <img src="L2UI.SquareBlank" width=270 height=10> <img src="L2UI.SquareWhite" width=270 height=1> <img src="L2UI.SquareBlank" width=270 height=5>
 <table width=270 border=0>
 <tr>
 <td width=130></td>
-<td width=70 align=center><button action="<?AGIT_LINK_BACK?>" value="????" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
-<td width=70 align=center><button action="<?AGIT_LINK_SALE2?>" value="??" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
+<td width=70 align=center><button action="bypass -h npc_%objectId%_back" value="????" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
+<td width=70 align=center><button action="bypass -h npc_%objectId%_sale2" value="Sell" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
 </tr>
 </table>
 <br>

datapack_development/data/html/auction/AgitSale2.htm

@@ -1,17 +1,17 @@
 ?<html>
 <body>
-The standard system price for this clan hall is <font color="aaccff"><?AGIT_LAST_PRICE?></font> adena and the last trading price was <font color="aaccff"><?AGIT_LAST_PRICE?></font> adena.<br> The amount received at the end of the auction is the amount remaining after deducting the <font color="LEVEL">transaction tax (10%) </font> from the successful bid price. How much would you like to set the standard auction price at (minimum bid price)?
+The standard system price for this clan hall is <font color="aaccff">%AGIT_LAST_PRICE%</font> adena and the last trading price was <font color="aaccff">%AGIT_LAST_PRICE%</font> adena.<br> The amount received at the end of the auction is the amount remaining after deducting the <font color="LEVEL">transaction tax (10%) </font> from the successful bid price. How much would you like to set the standard auction price at (minimum bid price)?
 <table width=270 border=0><tr><td width=220 align=right><edit var=minbid width=230 align=right type=number></td><td width=40 align=right>adena</td></tr></table>
 
 For how many days do you want the auction to run?
-<table width=270 border=0><tr><td width=270 align=right><combobox width=50 var=day list="7?;3?;1?"></td></tr></table>
+<table width=270 border=0><tr><td width=270 align=right><combobox width=50 var=day list="7;3;1"></td></tr></table>
 
 Write an explanation of the clan hall. <multiedit var="comment" width=270><img src="L2UI.SquareBlank" width=270 height=10> <img src="L2UI.SquareWhite" width=270 height=1> <img src="L2UI.SquareBlank" width=270 height=5>
 <table width=270 border=0>
 <tr>
 <td width=130></td>
-<td width=70 align=center><button action="<?AGIT_LINK_BACK?>" value="????" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
-<td width=70 align=center><button action="<?AGIT_LINK_SALE3?>" value="??" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
+<td width=70 align=center><button action="bypass -h npc_%objectId%_back" value="Back" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
+<td width=70 align=center><button action="bypass -h npc_%objectId%_auction $day $minbid" value="Sell" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td> 
 </tr>
 </table>
 <br>

datapack_development/data/html/auction/AgitSale3.htm

@@ -4,32 +4,32 @@
 <tr><td width=90>
 Standard Auction Price
 </td><td width=180>
-<font color="aaccff"><?AGIT_AUCTION_MIN?></font> adena</td></tr>
+<font color="aaccff">%AGIT_AUCTION_MIN%</font> adena</td></tr>
 <tr><td width=90>
 Minimum bid price
 </td><td width=180>
-<font color="aaccff"><?AGIT_AUCTION_MINBID?></font> adena</td></tr>
+<font color="aaccff">%AGIT_AUCTION_MINBID%</font> adena</td></tr>
 <tr><td width=90>
 Auction period
 </td><td width=180>
-days
+%x% days
 </td></tr>
 <tr><td width=90>
 Auction closing date
-</td><td width=180><?AGIT_AUCTION_END_YY?> year <?AGIT_AUCTION_END_MM?> month <?AGIT_AUCTION_END_DD?> day <?AGIT_AUCTION_END_HH?> hour
+</td><td width=180>%AGIT_AUCTION_END_YY% year %AGIT_AUCTION_END_MM% month %AGIT_AUCTION_END_DD% day %AGIT_AUCTION_END_HH% hour
 </td></tr>
 </table>
 <table width=270 border=0 bgcolor=333333>
 <tr><td width=270>
-<?AGIT_AUCTION_DESC?>
+%AGIT_AUCTION_DESC%
 </td></tr>
 </table>
 You can re-enter information by clicking the "Back" button<br> Do you want to register the clan hall for auction? <img src="L2UI.SquareBlank" width=270 height=10> <img src="L2UI.SquareWhite" width=270 height=1> <img src="L2UI.SquareBlank" width=270 height=5>
 <table width=270 border=0>
 <tr>
 <td width=130></td>
-<td width=70 align=center><button action="<?AGIT_LINK_BACK?>" value="??" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
-<td width=70 align=center><button action="<?AGIT_LINK_ACT?>" value="??" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
+<td width=70 align=center><button action="bypass -h npc_%objectId%_sale2" value="Back" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td> 
+<td width=70 align=center><button action="bypass -h npc_%objectId%_confirmAuction" value="Confirm" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td> 
 </tr>
 </table>
 <br>

datapack_development/data/html/auction/AgitSaleCancel.htm

@@ -2,12 +2,12 @@
 
 
 <body>
-If an auction is canceled, you cannot register an auction again for seven days and the <font color="LEVEL">deposit</font> is not returned.<br> The <font color="LEVEL">deposit</font> for this clan hall is  <font color="aaccff"><?AGIT_DEPOSIT?></font> adena.<br> Do you want to cancel the auction? <img src="L2UI.SquareBlank" width=270 height=10> <img src="L2UI.SquareWhite" width=270 height=1> <img src="L2UI.SquareBlank" width=270 height=5>
+If an auction is canceled, you cannot register an auction again for seven days and the <font color="LEVEL">deposit</font> is not returned.<br> The <font color="LEVEL">deposit</font> for this clan hall is  <font color="aaccff">%AGIT_DEPOSIT%</font> adena.<br> Do you want to cancel the auction? <img src="L2UI.SquareBlank" width=270 height=10> <img src="L2UI.SquareWhite" width=270 height=1> <img src="L2UI.SquareBlank" width=270 height=5>
 <table width=270 border=0>
 <tr>
 <td width=130></td>
-<td width=70 align=center><button action="<?AGIT_LINK_BACK?>" value="??" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
-<td width=70 align=center><button action="<?AGIT_LINK_DOCANCEL?>" value="?? ??" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
+<td width=70 align=center><button action="bypass -h npc_%objectId%_selectedItems" value="Back" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
+<td width=70 align=center><button action="bypass -h npc_%objectId%_doCancelAuction" value="Cancel Sale" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
 </tr>
 </table>
 &nbsp;<br>

datapack_development/data/html/auction/AgitSaleInfo.htm

@@ -9,37 +9,37 @@
 <tr><td width=90>
 <font color="a2a0a2">Name of clan hall</font>
 </td><td width=180>
-<font color="b09979"><?AGIT_NAME?></font>
+<font color="b09979">%AGIT_NAME%</font>
 </td></tr>
 
 <tr><td>
 <font color="a2a0a2">Clan that owns</font>
 </td><td>
-<font color="b09979"><?AGIT_OWNER_PLEDGE_NAME?></font>
+<font color="b09979">%AGIT_OWNER_PLEDGE_NAME%</font>
 </td></tr>
 
 <tr><td>
 <font color="a2a0a2">Leader of clan that owns</font>
 </td><td>
-<font color="b09979"><?OWNER_PLEDGE_MASTER?></font>
+<font color="b09979">%OWNER_PLEDGE_MASTER%</font>
 </td></tr>
 
 <tr><td>
 <font color="a2a0a2">Size of clan hall</font>
 </td><td>
-<font color="b09979"><?AGIT_SIZE?>rating</font> (grade)
+<font color="b09979">%AGIT_SIZE%rating</font> (grade)
 </td></tr>
 
 <tr><td>
 <font color="a2a0a2">Rental fee for clan hall</font>
 </td><td>
-<font color="b09979"><?AGIT_LEASE?></font>adena<font color="LEVEL">/week</font>
+<font color="b09979">%AGIT_LEASE%</font>adena<font color="LEVEL">/week</font>
 </td></tr>
 
 <tr><td>
 <font color="a2a0a2">Clan hall location</font>
 </td><td>
-<?AGIT_LOCATION?>
+%AGIT_LOCATION%
 </td></tr>
 </table>
 <img src="L2UI.SquareGray" width=270 height=1> <img src="L2UI.SquareBlank" width=1 height=3>
@@ -49,38 +49,38 @@
 <tr><td width=90>
 <font color="a2a0a2">Time and date that auction ends</font>
 </td><td width=180>
-<font color="b09979"><?AGIT_AUCTION_END_YY?> year <?AGIT_AUCTION_END_MM?> month <?AGIT_AUCTION_END_DD?> day <?AGIT_AUCTION_END_HH?> hour </font>
+<font color="b09979">%AGIT_AUCTION_END_YY% year %AGIT_AUCTION_END_MM% month %AGIT_AUCTION_END_DD% day %AGIT_AUCTION_END_HH% hour </font>
 </td></tr>
 <tr><td>
 <font color="a2a0a2">Time remaining</font>
 </td><td>
-<font color="b09979"><?AGIT_AUCTION_REMAIN?></font>
+<font color="b09979">%AGIT_AUCTION_REMAIN%</font>
 </td></tr>
 <tr><td>
 <font color="a2a0a2">Minimum bid price</font>
 </td><td>
-<font color="b09979"><?AGIT_AUCTION_MINBID?></font> adena
+<font color="b09979">%AGIT_AUCTION_MINBID%</font> adena
 </td></tr>
 <tr><td>
 <font color="a2a0a2">Number of bidding clans</font>
 </td><td>
-<font color="b09979"><?AGIT_AUCTION_BIDCOUNT?></font>
+<font color="b09979">%AGIT_AUCTION_BIDCOUNT%</font>
 </td></tr>
 
 </table>
 
 <table width=270 border=0 bgcolor=333333>
 <tr><td width=270>
-<?AGIT_AUCTION_DESC?>
+%AGIT_AUCTION_DESC%
 </td></tr>
 </table>
 <img src="L2UI.SquareBlank" width=270 height=10> <img src="L2UI.SquareWhite" width=270 height=1> <img src="L2UI.SquareBlank" width=270 height=5>
 <table width=270 border=0>
 <tr>
 <td width=60></td>
-<td width=70 align=center><button action="<?AGIT_LINK_BACK?>" value="??" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
-<td width=70 align=center><button action="<?AGIT_LINK_BIDLIST?>" value="?????" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
-<td width=70 align=center><button action="<?AGIT_LINK_CANCELAUCTION?>" value="????" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
+<td width=70 align=center><button action="bypass -h npc_%objectId%_start" value="Back" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
+<td width=70 align=center><button action="bypass -h npc_%objectId%_bidlist %id%" value="Bidders List" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
+<td width=70 align=center><button action="bypass -h npc_%objectId%_cancelAuction" value="Cancel" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
 </tr>
 </table>
 &nbsp;<br>

datapack_development/data/html/auction/auction.htm

@@ -0,0 +1,11 @@
+<HTML><body>Ah, so you've come to see the clan hall! <BR><br><br>
+Good idea! A clan hall is something that every clan should have, don't you agree?<BR>
+There are many wonderful things here, so take your time!
+<CENTER>
+<a action="bypass -h npc_%objectId%_list">All items for sale.</a><br>
+<a action="bypass -h npc_%objectId%_selectedItems">My selected items.</a><br><br>
+<a action="bypass -h npc_%objectId%_location">Location of the clan hall.</a><br><br>
+<br>
+
+</CENTER>
+</body></HTML>

datapack_development/data/html/auction/location.htm

@@ -0,0 +1,4 @@
+<html><head><body>
+<center><font color="LEVEL">[%location%]</font><br>
+<img src="L2font-e.MAP_AGIT_%LOCATION%" width=270 height=270></center><br>
+<a action="bypass -h npc_%objectId%_start">Back</a></body></html>

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

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

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

@@ -0,0 +1,7 @@
+<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>
+</body>
+</html>

datapack_development/data/html/clanHallManager/chamberlain.htm

@@ -0,0 +1,16 @@
+<html>
+<body>
+%npcname%:
+<br>
+Greetings, my Lord.<br>
+Awaiting your order!
+<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%_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>
+</CENTER>
+</body>
+</html>

datapack_development/data/html/clanHallManager/door.htm

@@ -0,0 +1,7 @@
+<html>
+<body>
+%npcname%:
+<br>
+<a action="bypass -h npc_%objectId%_door open">Open doors</a><br></body>
+<a action="bypass -h npc_%objectId%_door close">Close doors</a><br>
+</html>

datapack_development/data/html/clanHallManager/edit_deco.htm

@@ -0,0 +1,13 @@
+<html>
+<body>
+%npcname%:
+  <br>
+[Clan Hall Facilities Managment]<br><br>
+
+This is not working yet. Sorry.<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>

datapack_development/data/html/clanHallManager/edit_other.htm

@@ -0,0 +1,23 @@
+<html>
+<body>
+%npcname%:
+  <br>
+[Clan Hall Facilities Managment]<br><br>
+
+Function Teleport<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<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 <br>
+Period	 Withdraw the fee for the next time at %itemDate%<br>
+Change	 [<a action="bypass -h npc_%objectId%_manage rither item 0">Deactivate</a>][<a action="bypass -h npc_%objectId%_manage other item">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>

datapack_development/data/html/clanHallManager/edit_recovery.htm

@@ -0,0 +1,23 @@
+<html>
+<body>
+%npcname%:
+  <br>
+<font color="LEVEL">[Clan Hall Facilities Managment]</font><br><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><br>
+
+Function MP Recovery <font color="55FFFF">%mp%</font> (<font color="LEVEL">%mpPrice%</font>Adena / 2 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><br>
+
+Function Exp Recovery <font color="55FFFF">%exp%</font> <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><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>

datapack_development/data/html/clanHallManager/functions.htm

@@ -0,0 +1,26 @@
+<html>
+<body>
+%npcname%:
+<br>
+The clan hall's special functions are being used. <br>
+<br>
+In order to use the following functions each function must be activated for the <a action="bypass -h npc_%objectId%_manage">"clan hall Managment menu"</a>.<br><br>
+
+<CENTER>
+
+<font color="LEVEL">Hp recovery:</font> <font color="55FFFF">%hp_regen%</font> is currently applied.<br><br>
+
+<font color="LEVEL">Mp recovery:</font> <font color="55FFFF">%mp_regen%</font> is currently applied.<br><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" 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>
+</CENTER>
+</body>
+</html>

datapack_development/data/html/clanHallManager/manage.htm

@@ -0,0 +1,17 @@
+<html>
+<body>
+%npcname%:
+<br>
+[Manage clan hall facilities]<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">
+</CENTER>
+</body>
+</html>

datapack_development/data/html/clanHallManager/support1.htm

@@ -0,0 +1,11 @@
+<html>
+<body>
+The clan hall manager currently has %mp% MP remaining.
+<br>
+<CENTER>
+<a action="bypass -h npc_%objectId%_support 1204 2">Wind Walk Lvl.2</a><br>
+<a action="bypass -h npc_%objectId%_support 1257 3">Decrease Weight Lvl.3</a><br>
+<a action="bypass -h npc_%objectId%_support 1040 3">Shield Lvl.3</a><br>
+</CENTER>
+</body>
+</html>

datapack_development/data/html/clanHallManager/support2.htm

@@ -0,0 +1,16 @@
+<html>
+<body>
+The clan hall manager currently has %mp% MP remaining
+<br>
+<CENTER>
+<a action="bypass -h npc_%objectId%_support 1204 2">Wind Walk Lvl.2</a><br>
+<a action="bypass -h npc_%objectId%_support 1257 3">Decrease Weight Lvl.3</a><br>
+<a action="bypass -h npc_%objectId%_support 1040 3">Shield Lvl.3</a><br>
+<a action="bypass -h npc_%objectId%_support 1035 4">Mental Shield Lv. 4</a><br>
+<a action="bypass -h npc_%objectId%_support 1068 3">Might Lvl.3</a><br>
+<a action="bypass -h npc_%objectId%_support 1045 2">Bless The Body Lvl.2</a><br>
+<a action="bypass -h npc_%objectId%_support 1036 1">Magic Barrier Lvl.1</a><br>
+<a action="bypass -h npc_%objectId%_support 1259 1">Resist Shock Lvl.1</a><br>
+</CENTER>
+</body>
+</html>

datapack_development/data/html/clanHallManager/support3.htm

@@ -0,0 +1,19 @@
+<html>
+<body>
+The clan hall manager currently has %mp% MP remaining.
+<br>
+<CENTER>
+<a action="bypass -h npc_%objectId%_support 1204 2">Wind Walk Lvl.2</a><br>
+<a action="bypass -h npc_%objectId%_support 1257 3">Decrease Weight Lv.3</a><br>
+<a action="bypass -h npc_%objectId%_support 1040 3">Shield Lvl.3</a><br>
+<a action="bypass -h npc_%objectId%_support 1035 4">Mental Shield Lv. 4</a><br>
+<a action="bypass -h npc_%objectId%_support 1068 3">Might Lvl.3</a><br>
+<a action="bypass -h npc_%objectId%_support 1045 2">Bless The Body Lvl.2</a><br>
+<a action="bypass -h npc_%objectId%_support 1036 1">Magic Barrier Lvl.1</a><br>
+<a action="bypass -h npc_%objectId%_support 1259 1">Resist Shock Lvl.1</a><br>
+<a action="bypass -h npc_%objectId%_support 1048 2">Bless the Soul Lvl.2</a><br>
+<a action="bypass -h npc_%objectId%_support 1078 4">Greater Concentration Lvl.2</a><br>
+<a action="bypass -h npc_%objectId%_support 1062 1">Berserk Spirit Lvl.1</a><br>
+</CENTER>
+</body>
+</html>

datapack_development/data/html/clanHallManager/support4.htm

@@ -0,0 +1,20 @@
+<html>
+<body>
+The clan hall ,anager currently has %mp% MP remaining.
+<br>
+<CENTER>
+<a action="bypass -h npc_%objectId%_support 1204 2">Wind Walk Lvl.2</a><br>
+<a action="bypass -h npc_%objectId%_support 1257 3">Decrease Weight Lvl.3</a><br>
+<a action="bypass -h npc_%objectId%_support 1040 3">Shield Lvl.3</a><br>
+<a action="bypass -h npc_%objectId%_support 1035 4">Mental Shield Lvl. 4</a><br>
+<a action="bypass -h npc_%objectId%_support 1068 3">Might Lvl.3</a><br>
+<a action="bypass -h npc_%objectId%_support 1045 2">Bless The Body Lvl.2</a><br>
+<a action="bypass -h npc_%objectId%_support 1036 1">Magic Barrier Lvl.1</a><br>
+<a action="bypass -h npc_%objectId%_support 1259 1">Resist Shock Lvl.1</a><br>
+<a action="bypass -h npc_%objectId%_support 1048 2">Bless the Soul Lvl.2</a><br>
+<a action="bypass -h npc_%objectId%_support 1078 4">Greater Concentration Lv.2</a><br>
+<a action="bypass -h npc_%objectId%_support 1062 1">Berserk Spirit Lvl.1</a><br>
+</CENTER>
+</body>
+</html>
+

datapack_development/data/html/clanHallManager/support5.htm

@@ -0,0 +1,21 @@
+<html>
+<body>
+The clan hall manager currently has %mp% MP remaining.
+<br>
+<CENTER>
+<a action="bypass -h npc_%objectId%_support 1204 2">Wind Walk Lvl.2</a><br>
+<a action="bypass -h npc_%objectId%_support 1257 3">Decrease Weight Lvl.3</a><br>
+<a action="bypass -h npc_%objectId%_support 1040 3">Shield Lvl.3</a><br>
+<a action="bypass -h npc_%objectId%_support 1035 4">Mental Shield Lvl.4</a><br>
+<a action="bypass -h npc_%objectId%_support 1068 3">Might Lvl.3</a><br>
+<a action="bypass -h npc_%objectId%_support 1045 2">Bless The Body Lvl.2</a><br>
+<a action="bypass -h npc_%objectId%_support 1036 1">Magic Barrier Lvl.1</a><br>
+<a action="bypass -h npc_%objectId%_support 1259 1">Resist Shock Lvl.1</a><br>
+<a action="bypass -h npc_%objectId%_support 1048 2">Bless the Soul Lvl.2</a><br>
+<a action="bypass -h npc_%objectId%_support 1078 4">Greater Concentration Lvl.2</a><br>
+<a action="bypass -h npc_%objectId%_support 1062 1">Berserk Spirit Lvl.1</a><br>
+altough this should be lvl5 its like lvl3 and lvl4 :P
+</CENTER>
+</body>
+</html>
+

datapack_development/data/html/clanHallManager/teleAden1.htm

@@ -0,0 +1,18 @@
+<html>
+<body>
+%npcname%:
+<br>
+<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 599" msg="811;Blazing Swamp">Blazing Swamp-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 601" msg="811;The Forbidden Gateway">The Forbidden Gateway-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>
+<a action="bypass -h npc_%objectId%_goto 603" msg="811;The Enchanted Valley">The Enchanted Valley-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 604" msg="811;The Cemetery">The Cemetery-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 605" msg="811;The Forest of Mirrors">The Forest of Mirrors-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 606" msg="811;Anghel Waterfall">Anghel Waterfall-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 607" msg="811;Town of Aden">Town of Aden-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 608" msg="811;Hunters Village">Hunters Village-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 609" msg="811;Eastern Border Outpost">Eastern Border Outpost-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 610" msg="811;Coliseum">Coliseum-500 Adena</a><br1>
+</body>
+</html>

datapack_development/data/html/clanHallManager/teleAden2.htm

@@ -0,0 +1,28 @@
+<html>
+<body>
+%npcname%:
+<br>
+<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 599" msg="811;Blazing Swamp">Blazing Swamp-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 601" msg="811;The Forbidden Gateway">The Forbidden Gateway-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>
+<a action="bypass -h npc_%objectId%_goto 603" msg="811;The Enchanted Valley">The Enchanted Valley-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 604" msg="811;The Cemetery">The Cemetery-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 605" msg="811;The Forest of Mirrors">The Forest of Mirrors-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 606" msg="811;Anghel Waterfall">Anghel Waterfall-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 607" msg="811;Town of Aden">Town of Aden-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 608" msg="811;Hunters Village">Hunters Village-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 609" msg="811;Eastern Border Outpost">Eastern Border Outpost-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 610" msg="811;Coliseum">Coliseum-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 611" msg="811;Narsell Lake">Narsell Lake-500 Adena</a><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 614" msg="811;Forsaken Plains ">Forsaken Plains -500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 615" msg="811;Silent Valley">Silent Valley-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 616" msg="811;Hunters Valley">Hunters Valley-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 617" msg="811;Plains of Glory">Plains of Glory-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 619" msg="811;War-Torn Plains">War-Torn Plains-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 620" msg="811;Western Border Outpost">Western Border Outpost-500 Adena</a><br1>
+
+</body>
+</html>

datapack_development/data/html/clanHallManager/teleAden3.htm

@@ -0,0 +1,43 @@
+<html>
+<body>
+%npcname%:
+<br>
+<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 599" msg="811;Blazing Swamp">Blazing Swamp-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 601" msg="811;The Forbidden Gateway">The Forbidden Gateway-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>
+<a action="bypass -h npc_%objectId%_goto 603" msg="811;The Enchanted Valley">The Enchanted Valley-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 604" msg="811;The Cemetery">The Cemetery-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 605" msg="811;The Forest of Mirrors">The Forest of Mirrors-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 606" msg="811;Anghel Waterfall">Anghel Waterfall-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 607" msg="811;Town of Aden">Town of Aden-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 608" msg="811;Hunters Village">Hunters Village-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 609" msg="811;Eastern Border Outpost">Eastern Border Outpost-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 610" msg="811;Coliseum">Coliseum-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 611" msg="811;Narsell Lake">Narsell Lake-500 Adena</a><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 614" msg="811;Forsaken Plains ">Forsaken Plains -500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 615" msg="811;Silent Valley">Silent Valley-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 616" msg="811;Hunters Valley">Hunters Valley-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 617" msg="811;Plains of Glory">Plains of Glory-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 619" msg="811;War-Torn Plains">War-Torn Plains-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 620" msg="811;Western Border Outpost">Western Border Outpost-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 581" msg="811;Ivory Tower">Ivory Tower-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 582" msg="811;Town of Oren">Town of Oren-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 584" msg="811;Plains of the Lizardmen">Plains of the Lizardmen-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 585" msg="811;Skyshadow Meadow">Skyshadow Meadow-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 586" msg="811;Shilen's Garden">Shilen's Garden-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 587" msg="811;Black Rock Hill">Black Rock Hill-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 588" msg="811;Spider Nest">Spider Nest-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 589" msg="811;Timak Outpost ">Timak Outpost -500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 590" msg="811;Ivory Tower Crater">Ivory Tower Crater-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 591" msg="811;Forest of Evil">Forest of Evil-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 592" msg="811;Outlaw Forest">Outlaw Forest-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 593" msg="811;Misty Mountains">Misty Mountains-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 594" msg="811;Starlight Waterfall">Starlight Waterfall-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 595" msg="811;Undine Waterfall">Undine Waterfall-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 596" msg="811;The Gods' Falls">The Gods' Falls-500 Adena</a><br1>
+
+</body>
+</html>

datapack_development/data/html/clanHallManager/teleDion1.htm

@@ -0,0 +1,7 @@
+<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 Lord of this castle!<br>
+</body>
+</html>

datapack_development/data/html/clanHallManager/teleDion2.htm

@@ -0,0 +1,7 @@
+<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 Lord of this castle!<br>
+</body>
+</html>

datapack_development/data/html/clanHallManager/teleDion3.htm

@@ -0,0 +1,7 @@
+<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 Lord of this castle!<br>
+</body>
+</html>

datapack_development/data/html/clanHallManager/teleGiran1.htm

@@ -0,0 +1,16 @@
+<html>
+<body>
+%npcname%:
+<br>
+<a action="bypass -h npc_%objectId%_goto 517" msg="811;Hardin's Academy">Hardin's Academy-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 518" msg="811;Dragon Valley">Dragon Valley-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 521" msg="811;Death Pass">Death Pass-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 524" msg="811;Giran Harbor">Giran Harbor-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 525" msg="811;Giran Castle Town">Giran Castle Town-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 526" msg="811;Arena">Arena-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 528" msg="811;Breka's Stronghold">Breka's Stronghold-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 529" msg="811;Gorgon Flower Garden">Gorgon Flower Garden-500 Adena</a><br1>
+
+</body>
+</html>

datapack_development/data/html/clanHallManager/teleGiran2.htm

@@ -0,0 +1,22 @@
+<html>
+<body>
+%npcname%:
+<br>
+<a action="bypass -h npc_%objectId%_goto 517" msg="811;Hardin's Academy">Hardin's Academy-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 518" msg="811;Dragon Valley">Dragon Valley-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 521" msg="811;Death Pass">Death Pass-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 524" msg="811;Giran Harbor">Giran Harbor-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 525" msg="811;Giran Castle Town">Giran Castle Town-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 526" msg="811;Arena">Arena-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 528" msg="811;Breka's Stronghold">Breka's Stronghold-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 529" msg="811;Gorgon Flower Garden">Gorgon Flower Garden-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 502" msg="811;Execution Grounds">Execution Grounds-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 503" msg="811;Fortress of Resistance">Fortress of Resistance-500 Adena</a><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 505" msg="811;Cruma Tower">Cruma Tower-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 506" msg="811;Mandragora Farm">Mandragora Farm-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 507" msg="811;Town of Dion">Town of Dion-500 Adena</a><br1>
+
+</body>
+</html>

datapack_development/data/html/clanHallManager/teleGiran3.htm

@@ -0,0 +1,27 @@
+<html>
+<body>
+%npcname%:
+<br>
+<a action="bypass -h npc_%objectId%_goto 517" msg="811;Hardin's Academy">Hardin's Academy-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 518" msg="811;Dragon Valley">Dragon Valley-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 521" msg="811;Death Pass">Death Pass-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 524" msg="811;Giran Harbor">Giran Harbor-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 525" msg="811;Giran Castle Town">Giran Castle Town-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 526" msg="811;Arena">Arena-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 528" msg="811;Breka's Stronghold">Breka's Stronghold-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 529" msg="811;Gorgon Flower Garden">Gorgon Flower Garden-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 502" msg="811;Execution Grounds">Execution Grounds-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 503" msg="811;Fortress of Resistance">Fortress of Resistance-500 Adena</a><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 505" msg="811;Cruma Tower">Cruma Tower-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 506" msg="811;Mandragora Farm">Mandragora Farm-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 507" msg="811;Town of Dion">Town of Dion-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 508" msg="811;Floran Village">Floran Village-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 510" msg="811;Tanor Canyon">Tanor Canyon-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 511" msg="811;Bee Hive">Bee Hive-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 512" msg="811;Dion Hills">Dion Hills-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 513" msg="811;Floran Agricultural Area">Floran Agricultural Area-500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 514" msg="811;Plains of Dion">Plains of Dion-500 Adena</a><br1>
+</body>
+</html>

datapack_development/data/html/clanHallManager/teleGludin1.htm

@@ -0,0 +1,7 @@
+<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 Lord of this castle!<br>
+</body>
+</html>

datapack_development/data/html/clanHallManager/teleGludin2.htm

@@ -0,0 +1,7 @@
+<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 Lord of this castle!<br>
+</body>
+</html>

datapack_development/data/html/clanHallManager/teleGludin3.htm

@@ -0,0 +1,7 @@
+<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 Lord of this castle!<br>
+</body>
+</html>

datapack_development/data/html/clanHallManager/teleGludio1.htm

@@ -0,0 +1,7 @@
+<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 Lord of this castle!<br>
+</body>
+</html>

datapack_development/data/html/clanHallManager/teleGludio2.htm

@@ -0,0 +1,7 @@
+<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 Lord of this castle!<br>
+</body>
+</html>

datapack_development/data/html/clanHallManager/teleGludio3.htm

@@ -0,0 +1,7 @@
+<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 Lord of this castle!<br>
+</body>
+</html>

datapack_development/data/html/clanHallManager/teleRune1.htm

@@ -0,0 +1,7 @@
+<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 Lord of this castle!<br>
+</body>
+</html>

datapack_development/data/html/clanHallManager/teleRune2.htm

@@ -0,0 +1,7 @@
+<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 Lord of this castle!<br>
+</body>
+</html>

datapack_development/data/html/clanHallManager/teleRune3.htm

@@ -0,0 +1,7 @@
+<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 Lord of this castle!<br>
+</body>
+</html>

datapack_development/data/html/clanHallManager/teleSchuttgart1.htm

@@ -0,0 +1,7 @@
+<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 Lord of this castle!<br>
+</body>
+</html>

datapack_development/data/html/clanHallManager/teleSchuttgart2.htm

@@ -0,0 +1,7 @@
+<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 Lord of this castle!<br>
+</body>
+</html>

datapack_development/data/html/clanHallManager/teleSchuttgart3.htm

@@ -0,0 +1,7 @@
+<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 Lord of this castle!<br>
+</body>
+</html>

datapack_development/data/html/clanHallManager/vault.htm

@@ -0,0 +1,15 @@
+<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>
+</CENTER>
+</body>
+</html>

datapack_development/sql/auction.sql

@@ -1,18 +1,64 @@
 -- ---------------------------
 -- Table structure for auction
 -- ---------------------------
-CREATE TABLE IF NOT EXISTS auction (
-  id INT NOT NULL default 0,
-  sellerId INT NOT NULL default 0,
+DROP TABLE IF EXISTS `auction`;
+CREATE TABLE `auction` (
+  id int(11) NOT NULL default '0',
+  sellerId int(11) NOT NULL default '0',
   sellerName varchar(50) NOT NULL default 'NPC',
-  itemType varchar(25) NOT NULL,
-  itemId INT NOT NULL default 0,
-  itemObjectId INT NOT NULL default 0,
-  itemName varchar(40) NOT NULL,
-  itemQuantity INT NOT NULL default 0,
-  startingBid int(11) NOT NULL default 0,
-  currentBid int(11) NOT NULL default 0,
-  endDate DECIMAL(20,0) NOT NULL default 0,
-  PRIMARY KEY  (itemType, itemId, itemObjectId),
-  KEY id (id)
-);
+  sellerClanName varchar(50) NOT NULL default '',
+  itemType varchar(25) NOT NULL default '',
+  itemId int(11) NOT NULL default '0',
+  itemObjectId int(11) NOT NULL default '0',
+  itemName varchar(40) NOT NULL default '',
+  itemQuantity int(11) NOT NULL default '0',
+  startingBid int(11) NOT NULL default '0',
+  currentBid int(11) NOT NULL default '0',
+  endDate decimal(20,0) NOT NULL default '0',
+  PRIMARY KEY  (`itemType`,`itemId`,`itemObjectId`),
+  KEY `id` (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+-- 
+-- Dumping data for table `auction`
+-- 
+
+INSERT INTO `auction` VALUES 
+(22, 0, 'NPC', 'NPC Clan', 'ClanHall', 22, 0, 'Moonstone Hall', 1, 20000000, 0, 1164841200000),
+(23, 0, 'NPC', 'NPC Clan', 'ClanHall', 23, 0, 'Onyx Hall', 1, 20000000, 0, 1164841200000),
+(24, 0, 'NPC', 'NPC Clan', 'ClanHall', 24, 0, 'Topaz Hall', 1, 20000000, 0, 1164841200000),
+(25, 0, 'NPC', 'NPC Clan', 'ClanHall', 25, 0, 'Ruby Hall', 1, 20000000, 0, 1164841200000),
+(26, 0, 'NPC', 'NPC Clan', 'ClanHall', 26, 0, 'Crystal Hall', 1, 20000000, 0, 1164841200000),
+(27, 0, 'NPC', 'NPC Clan', 'ClanHall', 27, 0, 'Onyx Hall', 1, 20000000, 0, 1164841200000),
+(28, 0, 'NPC', 'NPC Clan', 'ClanHall', 28, 0, 'Sapphire Hall', 1, 20000000, 0, 1164841200000),
+(29, 0, 'NPC', 'NPC Clan', 'ClanHall', 29, 0, 'Moonstone Hall', 1, 20000000, 0, 1164841200000),
+(30, 0, 'NPC', 'NPC Clan', 'ClanHall', 30, 0, 'Emerald Hall', 1, 20000000, 0, 1164841200000),
+(31, 0, 'NPC', 'NPC Clan', 'ClanHall', 31, 0, 'The Atramental Barracks', 1, 8000000, 0, 1164841200000),
+(32, 0, 'NPC', 'NPC Clan', 'ClanHall', 32, 0, 'The Scarlet Barracks', 1, 8000000, 0, 1164841200000),
+(33, 0, 'NPC', 'NPC Clan', 'ClanHall', 33, 0, 'The Viridian Barracks', 1, 8000000, 0, 1164841200000),
+(36, 0, 'NPC', 'NPC Clan', 'ClanHall', 36, 0, 'The Golden Chamber', 1, 50000000, 0, 1164841200000),
+(37, 0, 'NPC', 'NPC Clan', 'ClanHall', 37, 0, 'The Silver Chamber', 1, 50000000, 0, 1164841200000),
+(38, 0, 'NPC', 'NPC Clan', 'ClanHall', 38, 0, 'The Mithril Chamber', 1, 50000000, 0, 1164841200000),
+(39, 0, 'NPC', 'NPC Clan', 'ClanHall', 39, 0, 'Silver Manor', 1, 50000000, 0, 1164841200000),
+(40, 0, 'NPC', 'NPC Clan', 'ClanHall', 40, 0, 'Gold Manor', 1, 50000000, 0, 1164841200000),
+(41, 0, 'NPC', 'NPC Clan', 'ClanHall', 41, 0, 'The Bronze Chamber', 1, 50000000, 0, 1164841200000),
+(42, 0, 'NPC', 'NPC Clan', 'ClanHall', 42, 0, 'The Golden Chamber', 1, 50000000, 0, 1164841200000),
+(43, 0, 'NPC', 'NPC Clan', 'ClanHall', 43, 0, 'The Silver Chamber', 1, 50000000, 0, 1164841200000),
+(44, 0, 'NPC', 'NPC Clan', 'ClanHall', 44, 0, 'The Mithril Chamber', 1, 50000000, 0, 1164841200000),
+(45, 0, 'NPC', 'NPC Clan', 'ClanHall', 45, 0, 'The Bronze Chamber', 1, 50000000, 0, 1164841200000),
+(46, 0, 'NPC', 'NPC Clan', 'ClanHall', 46, 0, 'Silver Manor', 1, 50000000, 0, 1164841200000),
+(47, 0, 'NPC', 'NPC Clan', 'ClanHall', 47, 0, 'Moonstone Hall', 1, 50000000, 0, 1164841200000),
+(48, 0, 'NPC', 'NPC Clan', 'ClanHall', 48, 0, 'Onyx Hall', 1, 50000000, 0, 1164841200000),
+(49, 0, 'NPC', 'NPC Clan', 'ClanHall', 49, 0, 'Emerald Hall', 1, 50000000, 0, 1164841200000),
+(50, 0, 'NPC', 'NPC Clan', 'ClanHall', 50, 0, 'Sapphire Hall', 1, 50000000, 0, 1164841200000),
+(51, 0, 'NPC', 'NPC Clan', 'ClanHall', 51, 0, 'Mont Chamber', 1, 50000000, 0, 1164841200000),
+(52, 0, 'NPC', 'NPC Clan', 'ClanHall', 52, 0, 'Astaire Chamber', 1, 50000000, 0, 1164841200000),
+(53, 0, 'NPC', 'NPC Clan', 'ClanHall', 53, 0, 'Aria Chamber', 1, 50000000, 0, 1164841200000),
+(54, 0, 'NPC', 'NPC Clan', 'ClanHall', 54, 0, 'Yiana Chamber', 1, 50000000, 0, 1164841200000),
+(55, 0, 'NPC', 'NPC Clan', 'ClanHall', 55, 0, 'Roien Chamber', 1, 50000000, 0, 1164841200000),
+(56, 0, 'NPC', 'NPC Clan', 'ClanHall', 56, 0, 'Luna Chamber', 1, 50000000, 0, 1164841200000),
+(57, 0, 'NPC', 'NPC Clan', 'ClanHall', 57, 0, 'Traban Chamber', 1, 50000000, 0, 1164841200000),
+(58, 0, 'NPC', 'NPC Clan', 'ClanHall', 58, 0, 'Eisen Hall', 1, 50000000, 0, 1164841200000),
+(59, 0, 'NPC', 'NPC Clan', 'ClanHall', 59, 0, 'Heavy Metal Hall', 1, 50000000, 0, 1164841200000),
+(60, 0, 'NPC', 'NPC Clan', 'ClanHall', 60, 0, 'Molten Ore Hall', 1, 50000000, 0, 1164841200000),
+(61, 0, 'NPC', 'NPC Clan', 'ClanHall', 61, 0, 'Titan Hall', 1, 50000000, 0, 1164841200000);

datapack_development/sql/auction_bid.sql

@@ -6,7 +6,9 @@ CREATE TABLE IF NOT EXISTS auction_bid (
   auctionId INT NOT NULL default 0,
   bidderId INT NOT NULL default 0,
   bidderName varchar(50) NOT NULL,
+  clan_name varchar(50) NOT NULL,
   maxBid int(11) NOT NULL default 0,
+  time_bid decimal(20,0) NOT NULL default '0',
   PRIMARY KEY  (auctionId, bidderId),
   KEY id (id)
 );

datapack_development/sql/clan_data.sql

@@ -14,6 +14,7 @@ CREATE TABLE IF NOT EXISTS clan_data (
   crest_id INT,
   crest_large_id INT,
   ally_crest_id INT,
+  auction_bid_at INT NOT NULL default '0',
   PRIMARY KEY  (clan_id),
   KEY `leader_id` (`leader_id`),
   KEY `ally_id` (`ally_id`)

datapack_development/sql/clanhall.sql

@@ -1,41 +1,64 @@
 -- ---------------------------
 -- Table structure for clanhall
 -- ---------------------------
-CREATE TABLE IF NOT EXISTS clanhall (
-  id INT NOT NULL default 0,
-  name varchar(40) NOT NULL,
-  ownerId INT NOT NULL default 0,
-  PRIMARY KEY  (name),
-  KEY id (id)
+DROP TABLE IF EXISTS `clanhall`;
+CREATE TABLE `clanhall` (
+  `id` int(11) NOT NULL default '0',
+  `name` varchar(40) NOT NULL default '',
+  `ownerId` int(11) NOT NULL default '0',
+  `lease` int(10) NOT NULL default '0',
+  `desc` text NOT NULL,
+  `location` varchar(15) NOT NULL default '',
+  `paidUntil` decimal(20,0) NOT NULL default '0',
+  `Grade` decimal(1,0) NOT NULL default '0',
+  PRIMARY KEY  (`id`,`name`),
+  KEY `id` (`id`)
 );
 
-INSERT IGNORE INTO `clanhall` VALUES (1, 'Gludio 1', 0),
-(2, 'Gludio 2', 0),
-(3, 'Gludio 3', 0),
-(4, 'Gludio 4', 0),
-(5, 'Gludin 1', 0),
-(6, 'Gludin 2', 0),
-(7, 'Gludin 3', 0),
-(8, 'Gludin 4', 0),
-(9, 'Gludin 5', 0),
-(10, 'Dion 1', 0),
-(11, 'Dion 2', 0),
-(12, 'Dion 3', 0),
-(13, 'Giran 1', 0),
-(14, 'Giran 2', 0),
-(15, 'Giran 3', 0),
-(16, 'Giran 4', 0),
-(17, 'Giran 5', 0),
-(18, 'Aden 1', 0),
-(19, 'Aden 2', 0),
-(20, 'Aden 3', 0),
-(21, 'Aden 4', 0),
-(22, 'Aden 5', 0),
-(23, 'Aden 6', 0),
-(24, 'Goddard 1', 0),
-(25, 'Goddard 2', 0),
-(26, 'Goddard 3', 0),
-(27, 'Goddard 4', 0),
-(28, 'Bandits Stronghold', 0),
-(29, 'Partisan Hideaway', 0),
-(30, 'Hot Springs Guild House', 0);
+-- ----------------------------
+-- Records 
+-- ----------------------------
+INSERT INTO `clanhall` VALUES ('21', 'Fortress of Resistance', '0', '500000', 'Ol Mahum Fortress of Resistance', 'Dion', '0', '0');
+INSERT INTO `clanhall` VALUES ('22', 'Moonstone Hall', '0', '500000', 'Clan hall located in the Town of Gludio', 'Gludio', '0', '2');
+INSERT INTO `clanhall` VALUES ('23', 'Onyx Hall', '0', '500000', 'Clan hall located in the Town of Gludio', 'Gludio', '0', '2');
+INSERT INTO `clanhall` VALUES ('24', 'Topaz Hall', '0', '500000', 'Clan hall located in the Town of Gludio', 'Gludio', '0', '2');
+INSERT INTO `clanhall` VALUES ('25', 'Ruby Hall', '0', '500000', 'Clan hall located in the Town of Gludio', 'Gludio', '0', '2');
+INSERT INTO `clanhall` VALUES ('26', 'Crystal Hall', '0', '500000', 'Clan hall located in Gludin Village', 'Gludin', '0', '2');
+INSERT INTO `clanhall` VALUES ('27', 'Onyx Hall', '0', '500000', 'Clan hall located in Gludin Village', 'Gludin', '0', '2');
+INSERT INTO `clanhall` VALUES ('28', 'Sapphire Hall', '0', '500000', 'Clan hall located in Gludin Village', 'Gludin', '0', '2');
+INSERT INTO `clanhall` VALUES ('29', 'Moonstone Hall', '0', '500000', 'Clan hall located in Gludin Village', 'Gludin', '0', '2');
+INSERT INTO `clanhall` VALUES ('30', 'Emerald Hall', '0', '500000', 'Clan hall located in Gludin Village', 'Gludin', '0', '2');
+INSERT INTO `clanhall` VALUES ('31', 'The Atramental Barracks', '0', '500000', 'Clan hall located in the Town of Dion', 'Dion', '0', '1');
+INSERT INTO `clanhall` VALUES ('32', 'The Scarlet Barracks', '0', '500000', 'Clan hall located in the Town of Dion', 'Dion', '0', '1');
+INSERT INTO `clanhall` VALUES ('33', 'The Viridian Barracks', '0', '500000', 'Clan hall located in the Town of Dion', 'Dion', '0', '1');
+INSERT INTO `clanhall` VALUES ('34', 'Devastated Castle', '0', '500000', 'Contestable Clan Hall', 'Aden', '0', '0');
+INSERT INTO `clanhall` VALUES ('35', 'Bandit Stronghold', '0', '500000', 'Contestable Clan Hall', 'Oren', '0', '0');
+INSERT INTO `clanhall` VALUES ('36', 'The Golden Chamber', '0', '500000', 'Clan hall located in the Town of Aden', 'Aden', '0', '3');
+INSERT INTO `clanhall` VALUES ('37', 'The Silver Chamber', '0', '500000', 'Clan hall located in the Town of Aden', 'Aden', '0', '3');
+INSERT INTO `clanhall` VALUES ('38', 'The Mithril Chamber', '0', '500000', 'Clan hall located in the Town of Aden', 'Aden', '0', '3');
+INSERT INTO `clanhall` VALUES ('39', 'Silver Manor', '0', '500000', 'Clan hall located in the Town of Aden', 'Aden', '0', '3');
+INSERT INTO `clanhall` VALUES ('40', 'Gold Manor', '0', '500000', 'Clan hall located in the Town of Aden', 'Aden', '0', '3');
+INSERT INTO `clanhall` VALUES ('41', 'The Bronze Chamber', '0', '500000', 'Clan hall located in the Town of Aden', 'Aden', '0', '3');
+INSERT INTO `clanhall` VALUES ('42', 'The Golden Chamber', '0', '500000', 'Clan hall located in the Town of Giran', 'Giran', '0', '3');
+INSERT INTO `clanhall` VALUES ('43', 'The Silver Chamber', '0', '500000', 'Clan hall located in the Town of Giran', 'Giran', '0', '3');
+INSERT INTO `clanhall` VALUES ('44', 'The Mithril Chamber', '0', '500000', 'Clan hall located in the Town of Giran', 'Giran', '0', '3');
+INSERT INTO `clanhall` VALUES ('45', 'The Bronze Chamber', '0', '500000', 'Clan hall located in the Town of Giran', 'Giran', '0', '3');
+INSERT INTO `clanhall` VALUES ('46', 'Silver Manor', '0', '500000', 'Clan hall located in the Town of Giran', 'Giran', '0', '3');
+INSERT INTO `clanhall` VALUES ('47', 'Moonstone Hall', '0', '500000', 'Clan hall located in the Town of Goddard', 'Goddard', '0', '3');
+INSERT INTO `clanhall` VALUES ('48', 'Onyx Hall', '0', '500000', 'Clan hall located in the Town of Goddard', 'Goddard', '0', '3');
+INSERT INTO `clanhall` VALUES ('49', 'Emerald Hall', '0', '500000', 'Clan hall located in the Town of Goddard', 'Goddard', '0', '3');
+INSERT INTO `clanhall` VALUES ('50', 'Sapphire Hall', '0', '500000', 'Clan hall located in the Town of Goddard', 'Goddard', '0', '3');
+INSERT INTO `clanhall` VALUES ('51', 'Mont Chamber', '0', '500000', 'An upscale Clan hall located in the Rune Township', 'Rune', '0', '3');
+INSERT INTO `clanhall` VALUES ('52', 'Astaire Chamber', '0', '500000', 'An upscale Clan hall located in the Rune Township', 'Rune', '0', '3');
+INSERT INTO `clanhall` VALUES ('53', 'Aria Chamber', '0', '500000', 'An upscale Clan hall located in the Rune Township', 'Rune', '0', '3');
+INSERT INTO `clanhall` VALUES ('54', 'Yiana Chamber', '0', '500000', 'An upscale Clan hall located in the Rune Township', 'Rune', '0', '3');
+INSERT INTO `clanhall` VALUES ('55', 'Roien Chamber', '0', '500000', 'An upscale Clan hall located in the Rune Township', 'Rune', '0', '3');
+INSERT INTO `clanhall` VALUES ('56', 'Luna Chamber', '0', '500000', 'An upscale Clan hall located in the Rune Township', 'Rune', '0', '3');
+INSERT INTO `clanhall` VALUES ('57', 'Traban Chamber', '0', '500000', 'An upscale Clan hall located in the Rune Township', 'Rune', '0', '3');
+INSERT INTO `clanhall` VALUES ('58', 'Eisen Hall', '0', '500000', 'Clan hall located in the Town of Schuttgart', 'Schuttgart', '0', '2');
+INSERT INTO `clanhall` VALUES ('59', 'Heavy Metal Hall', '0', '500000', 'Clan hall located in the Town of Schuttgart', 'Schuttgart', '0', '2');
+INSERT INTO `clanhall` VALUES ('60', 'Molten Ore Hall', '0', '500000', 'Clan hall located in the Town of Schuttgart', 'Schuttgart', '0', '2');
+INSERT INTO `clanhall` VALUES ('61', 'Titan Hall', '0', '500000', 'Clan hall located in the Town of Schuttgart', 'Schuttgart', '0', '2');
+INSERT INTO `clanhall` VALUES ('62', 'Rainbow Springs', '0', '500000', '', 'Goddard', '0', '0');
+INSERT INTO `clanhall` VALUES ('63', 'Beast Farm', '0', '500000', '', 'Rune', '0', '0');
+INSERT INTO `clanhall` VALUES ('64', 'Fortress of the Dead', '0', '500000', '', 'Rune', '0', '0');

datapack_development/sql/clanhall_functions.sql

@@ -0,0 +1,14 @@
+-- ---------------------------
+-- Table structure for `clanhall_functions`
+-- ---------------------------
+DROP TABLE IF EXISTS `clanhall_functions`;
+CREATE TABLE `clanhall_functions` (
+  `hall_id` int(2) NOT NULL default '0',
+  `type` int(1) NOT NULL default '0',
+  `lvl` int(3) NOT NULL default '0',
+  `lease` int(10) NOT NULL default '0',
+  `rate` decimal(20,0) NOT NULL default '0',
+  `endTime` decimal(20,0) NOT NULL default '0',
+  `inDebt` int(1) NOT NULL default '0',
+  PRIMARY KEY  (`hall_id`,`type`)
+);

datapack_development/sql/npc.sql

@@ -2751,11 +2751,11 @@ INSERT INTO `npc` (`id`,`idTemplate`,`name`,`serverSideName`,`title`,`serverSide
 	(30764,30764,'Balthazar',0,'',0,'NPC.e_common_people_MDwarf',8.00,17.00,70,'male','L2Npc',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,132,NULL,0,1,0),
 	(30765,30765,'Imperial Coffer',0,'',0,'NPC.coffer_d',12.00,9.50,70,'etc','L2Npc',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,132,NULL,0,1,0),
 	(30766,30766,'Cleo',0,'Witch',0,'NPC.a_hardins_pupil_FHuman',8.00,23.00,70,'female','L2Npc',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,132,NULL,0,1,0),
-	(30767,30767,'Auctioneer',0,'',0,'NPC.a_maidB_FHuman',8.00,22.00,70,'female','L2Npc',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,132,NULL,0,1,0),
-	(30768,30768,'Auctioneer',0,'',0,'NPC.a_trader_FElf',8.00,24.00,70,'female','L2Npc',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,132,NULL,0,1,0),
-	(30769,30769,'Auctioneer',0,'',0,'NPC.a_common_people_FDarkElf',8.00,21.50,70,'female','L2Npc',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,132,NULL,0,1,0),
-	(30770,30770,'Auctioneer',0,'',0,'NPC.e_traderA_FDwarf',7.00,18.50,70,'female','L2Npc',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,132,NULL,0,1,0),
-	(30771,30771,'Auctioneer',0,'',0,'NPC.e_trader_FOrc',8.00,24.00,70,'female','L2Npc',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,132,NULL,0,1,0),
+	(30767,30767,'Auctioneer',0,'',0,'NPC.a_maidB_FHuman',8.00,22.00,70,'female','L2Auctioneer',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,132,NULL,0,1,0),
+	(30768,30768,'Auctioneer',0,'',0,'NPC.a_trader_FElf',8.00,24.00,70,'female','L2Auctioneer',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,132,NULL,0,1,0),
+	(30769,30769,'Auctioneer',0,'',0,'NPC.a_common_people_FDarkElf',8.00,21.50,70,'female','L2Auctioneer',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,132,NULL,0,1,0),
+	(30770,30770,'Auctioneer',0,'',0,'NPC.e_traderA_FDwarf',7.00,18.50,70,'female','L2Auctioneer',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,132,NULL,0,1,0),
+	(30771,30771,'Auctioneer',0,'',0,'NPC.e_trader_FOrc',8.00,24.00,70,'female','L2Auctioneer',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,132,NULL,0,1,0),
 	(30772,30772,'Wilson',0,'Clan Hall Gatekeeper',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2Doormen',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,132,NULL,0,1,0),
 	(30773,30773,'Todd',0,'Clan Hall Gatekeeper',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2Doormen',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,132,NULL,0,1,0),
 	(30774,30774,'Ruben',0,'',0,'Monster.mechanic_golem',8.00,23.00,70,'male','L2Npc',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,132,NULL,0,1,0),
@@ -4688,7 +4688,7 @@ INSERT INTO `npc` (`id`,`idTemplate`,`name`,`serverSideName`,`title`,`serverSide
 	(35379,35379,'Partisan Soldier',0,'',0,'Monster.ol_mahum',8.50,8.50,22,'male','L2Monster',40,631,242,7.11,1.84,40,43,30,21,20,10,948,45,71,106,28,83,278,0,333,0,0,0,55,121,NULL,0,0,0),
 	(35380,35380,'Partisan Sorcerer',0,'',0,'Monster.batur_orc_shaman',8.50,8.50,25,'male','L2Monster',40,751,287,7.11,1.84,40,43,30,21,20,10,1143,57,91,119,37,94,278,0,333,0,0,0,55,132,NULL,0,0,0),
 	(35381,35381,'Partisan Archer',0,'',0,'Monster.ol_mahum_archer',8.50,8.50,27,'male','L2Monster',40,840,318,7.11,1.84,40,43,30,21,20,10,1283,66,107,129,45,102,278,0,333,0,0,0,55,121,NULL,0,0,0),
-	(35385,35385,'Renny',0,'Clan Hall Gatekeeper',0,'NPC.a_casino_MHuman',8.50,8.50,33,'male','L2Monster',40,1145,414,7.11,1.84,40,43,30,21,20,10,1829,105,171,162,75,128,278,0,333,0,0,0,88,171,NULL,0,0,0),
+	(35385,35385,'Renny',0,'Clan Hall Manager',0,'NPC.a_casino_MHuman',8.50,8.50,33,'male','L2ClanHallManager',40,1145,414,7.11,1.84,40,43,30,21,20,10,1829,105,171,162,75,128,278,0,333,0,0,0,88,171,NULL,0,0,0),
 	(35387,35387,'Baback',0,'Clan Hall Gatekeeper',0,'NPC.a_casino_MHuman',8.50,8.50,39,'male','L2Monster',40,1510,514,7.11,1.84,40,43,30,21,20,10,2555,162,263,201,121,158,278,0,333,0,0,0,88,171,NULL,0,0,0),
 	(35389,35389,'Loring',0,'Clan Hall Gatekeeper',0,'NPC.a_casino_MHuman',8.50,8.50,43,'male','L2Monster',40,1784,618,8.69,2.14,40,43,30,21,20,10,3106,210,343,230,163,181,278,0,333,0,0,0,88,171,NULL,0,0,0),
 	(35391,35391,'Latif',0,'Clan Hall Gatekeeper',0,'NPC.a_casino_MHuman',8.50,8.50,47,'male','L2Monster',40,2081,738,8.69,2.14,40,43,30,21,20,10,3711,266,440,262,216,206,278,0,333,0,0,0,88,171,NULL,0,0,0),
@@ -4848,7 +4848,7 @@ INSERT INTO `npc` (`id`,`idTemplate`,`name`,`serverSideName`,`title`,`serverSide
 	(35435,35435,'Outer Doorman',0,'',0,'Monster.oel_mahum',20.00,37.00,70,'male','L2Npc',40,5149,1493,11.85,2.78,40,43,30,21,20,10,490,10,1314,941,780,382,282,0,333,0,0,0,77,132,NULL,0,0,0),
 	(35436,35436,'Outer Doorman',0,'',0,'Monster.oel_mahum',20.00,37.00,70,'male','L2Npc',40,5149,1493,11.85,2.78,40,43,30,21,20,10,490,10,1314,941,780,382,282,0,333,0,0,0,77,132,NULL,0,0,0),
 	(35437,35437,'Messenger',0,'',0,'Monster.oel_mahum',20.00,37.00,56,'male','L2Npc',40,2725,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,331,382,268,282,0,333,0,0,0,77,132,'dion_siege_clan',600,0,0),
-	(35438,35438,'Chamberlain',0,'',0,'Monster.oel_mahum',20.00,37.00,56,'male','L2Npc',40,2725,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,331,382,268,282,0,333,0,0,0,77,132,'dion_siege_clan',600,0,0),
+	(35438,35438,'Chamberlain',0,'Clan Hall Manager',0,'Monster.oel_mahum',20.00,37.00,56,'male','L2ClanHallManager',40,2725,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,331,382,268,282,0,333,0,0,0,77,132,'dion_siege_clan',600,0,0),
 	(35563,35563,'Mass Gatekeeper',0,'',0,'Monster.oel_mahum',8.00,25.00,56,'female','L2Teleporter',40,2725,1019,10.27,2.45,40,43,30,21,20,10,313,10,706,331,382,268,282,0,333,0,0,0,55,132,'dion_siege_clan',600,1,0),
 	(12564,12564,'Sin Eater',0,'',0,'Monster.imp',10.00,24.00,15,'male','L2Monster',40,195,164,1.15,1.21,40,1,30,21,20,25,0,0,9,19,3,17,282,0,333,0,0,0,66,137,NULL,0,0,0),
 	(35411,35411,'Doom Servant',0,'',0,'Monster.hungry_spirit',30.00,40.00,65,'male','L2Monster',40,9571,1150,11.85,2.78,40,43,30,21,20,10,422,0,2151,417,617,338,278,150,333,0,0,0,16,132,'gustav_clan',1000,1,0),
@@ -5106,38 +5106,38 @@ INSERT INTO `npc` (`id`,`idTemplate`,`name`,`serverSideName`,`title`,`serverSide
 	(35390,35390,'Dillon',0,'Clan Hall Manager',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,8.69,2.14,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,88,171,NULL,0,1,0),
 	(35386,35386,'Boyer',0,'Clan Hall Manager',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,7.11,1.84,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,88,171,NULL,0,1,0),
 	(35388,35388,'Tim',0,'Clan Hall Manager',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,8.69,2.14,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,88,171,NULL,0,1,0),
-	(35855,35855,'Lowell',0,'',0,'NPC.a_trader_MElf',6.00,24.50,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
-	(35856,35856,'Paranos',0,'',0,'NPC.a_trader_MElf',6.00,24.50,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
-	(35857,35857,'Klingel',0,'',0,'NPC.a_trader_MElf',6.00,24.50,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
-	(35858,35858,'Keffer',0,'',0,'NPC.a_trader_MElf',6.00,24.50,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
-	(35859,35859,'Sand',0,'',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
-	(35860,35860,'Teters',0,'',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35855,35855,'Lowell',0,'Clan Hall Manager',0,'NPC.a_trader_MElf',6.00,24.50,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35856,35856,'Paranos',0,'Clan Hall Manager',0,'NPC.a_trader_MElf',6.00,24.50,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35857,35857,'Klingel',0,'Clan Hall Manager',0,'NPC.a_trader_MElf',6.00,24.50,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35858,35858,'Keffer',0,'Clan Hall Manager',0,'NPC.a_trader_MElf',6.00,24.50,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35859,35859,'Sand',0,'Clan Hall Manager',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35860,35860,'Teters',0,'Clan Hall Manager',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
 	(35407,35407,'Seth',0,'Clan Hall Manager',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,8.69,2.14,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,88,171,NULL,0,1,0),
 	(35403,35403,'Ron',0,'Clan Hall Manager',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,7.11,1.84,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,88,171,NULL,0,1,0),
 	(35405,35405,'Flynn',0,'Clan Hall Manager',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,8.69,2.14,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,88,171,NULL,0,1,0),
-	(35864,35864,'Watkins',0,'',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
-	(35865,35865,'Cohen',0,'',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
-	(35866,35866,'Bint',0,'',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
-	(35867,35867,'Bourdon',0,'',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
-	(35868,35868,'Pery',0,'',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
-	(35869,35869,'Gampert',0,'',0,'NPC.a_warehouse_keeper_MDwarf',8.00,17.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
-	(35870,35870,'Gonti',0,'',0,'NPC.a_warehouse_keeper_MDwarf',8.00,17.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
-	(35871,35871,'Baraha',0,'',0,'NPC.e_trader_MOrc',8.00,23.50,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
-	(35872,35872,'Vanhal',0,'',0,'NPC.e_trader_MOrc',8.00,23.50,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
-	(35873,35873,'Dan',0,'',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
-	(35874,35874,'Briggs',0,'',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
-	(35875,35875,'Stegmann',0,'',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
-	(35876,35876,'Randolph',0,'',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
-	(35877,35877,'Trotter',0,'',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
-	(35878,35878,'Veder',0,'',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
-	(35879,35879,'Danas',0,'',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
-	(35880,35880,'Corey',0,'',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
-	(35881,35881,'Barney',0,'',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
-	(35882,35882,'Klett',0,'',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
-	(35883,35883,'Tairee',0,'',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
-	(35884,35884,'Tanner',0,'',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
-	(35885,35885,'Cresson',0,'',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
-	(35886,35886,'Crothers',0,'',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35864,35864,'Watkins',0,'Clan Hall Manager',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35865,35865,'Cohen',0,'Clan Hall Manager',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35866,35866,'Bint',0,'Clan Hall Manager',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35867,35867,'Bourdon',0,'Clan Hall Manager',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35868,35868,'Pery',0,'Clan Hall Manager',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35869,35869,'Gampert',0,'Clan Hall Manager',0,'NPC.a_warehouse_keeper_MDwarf',8.00,17.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35870,35870,'Gonti',0,'Clan Hall Manager',0,'NPC.a_warehouse_keeper_MDwarf',8.00,17.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35871,35871,'Baraha',0,'Clan Hall Manager',0,'NPC.e_trader_MOrc',8.00,23.50,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35872,35872,'Vanhal',0,'Clan Hall Manager',0,'NPC.e_trader_MOrc',8.00,23.50,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35873,35873,'Dan',0,'Clan Hall Manager',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35874,35874,'Briggs',0,'Clan Hall Manager',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35875,35875,'Stegmann',0,'Clan Hall Manager',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35876,35876,'Randolph',0,'Clan Hall Manager',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35877,35877,'Trotter',0,'Clan Hall Manager',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35878,35878,'Veder',0,'Clan Hall Manager',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35879,35879,'Danas',0,'Clan Hall Manager',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35880,35880,'Corey',0,'Clan Hall Manager',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35881,35881,'Barney',0,'Clan Hall Manager',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35882,35882,'Klett',0,'Clan Hall Manager',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35883,35883,'Tairee',0,'Clan Hall Manager',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35884,35884,'Tanner',0,'Clan Hall Manager',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35885,35885,'Cresson',0,'Clan Hall Manager',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
+	(35886,35886,'Crothers',0,'Clan Hall Manager',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),
 	(35421,35421,'Biggerstaff',0,'Steward',0,'Monster.elf_ghost',7.00,21.00,70,'male','L2Npc',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,88,0,NULL,0,1,0),
 	(35420,35420,'Loken',0,'Messenger',0,'Monster.human_ghost',8.00,22.00,70,'male','L2Npc',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,74,0,0,88,0,NULL,0,1,0),
 	(35439,35439,'Carey',0,'Clan Hall Manager',0,'NPC.a_maidB_FHuman',8.00,22.00,70,'female','L2ClanHallManager',40,3862,1493,11.85,2.78,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,333,0,0,0,55,0,NULL,0,1,0),

datapack_development/sql/spawnlist.sql

@@ -29080,35 +29080,17 @@ INSERT INTO `spawnlist` VALUES
 (70064,'unset',1,'31205',81076,145813,-3528,0,0,50491,5,0,0),
 (70063,'unset',1,'30990',15693,142886,-2696,0,0,16000,5,0,0),
 (70062,'unset',1,'31204',19323,142878,-3032,0,0,60055,5,0,0),
-(70061,'unset',1,'30802',18634,143342,-3010,0,0,64500,5,0,0),
-(70060,'unset',1,'30800',17621,144920,-3037,0,0,12288,5,0,0),
 (70059,'unset',1,'30990',-12676,122821,-3112,0,0,48000,5,0,0),
 (70058,'unset',1,'31203',-13909,123306,-3112,0,0,3355,5,0,0),
-(70057,'unset',1,'30790',-13745,125573,-3129,0,0,32768,5,0,0),
-(70056,'unset',1,'30788',-14852,125413,-3130,0,0,16384,5,0,0),
-(70055,'unset',1,'30786',-12866,124166,-3096,0,0,57344,5,0,0),
-(70054,'unset',1,'30784',-16159,123728,-3102,0,0,53248,5,0,0),
-(70053,'unset',1,'30774',-79357,150232,-3037,0,0,40000,5,0,0),
-(70052,'unset',1,'30776',-79587,151436,-3041,0,0,8192,5,0,0),
-(70051,'unset',1,'30778',-84596,152253,-3125,0,0,53248,5,0,0),
-(70050,'unset',1,'30780',-84276,153321,-3161,0,0,0,5,0,0),
-(70049,'unset',1,'30782',-84282,155597,-3160,0,0,48512,5,0,0),
 (70048,'unset',1,'31202',-84608,150809,-3120,0,0,50307,5,0,0),
 (70047,'unset',1,'31266',43477,-49561,-792,0,0,58198,60,0,0),
 (70046,'unset',1,'31758',148952,-58402,-2976,0,0,7937,60,0,0),
-(70045,'unset',1,'31150',149358,23189,-2120,0,0,33500,5,0,0),
-(70044,'unset',1,'31152',150416,23605,-2112,0,0,0,5,0,0),
-(70043,'unset',1,'31156',150532,26500,-2248,0,0,0,5,0,0),
 (70042,'unset',1,'30990',146738,25756,-2008,0,0,0,5,0,0),
-(70041,'unset',1,'31154',145473,25295,-2112,0,0,0,5,0,0),
 (70040,'unset',1,'31208',145188,30448,-2456,0,0,7246,5,0,0),
-(70039,'unset',1,'31160',144243,28252,-2240,0,0,33000,5,0,0),
-(70038,'unset',1,'31158',144237,27172,-2248,0,0,33000,5,0,0),
 (70037,'unset',1,'31206',81947,54040,-1488,0,0,4092,5,0,0),
 (70036,'unset',1,'30990',83001,53224,-1488,0,0,31000,5,0,0),
 (70035,'unset',1,'30990',117148,76865,-2688,0,0,34000,5,0,0),
 (70034,'unset',1,'30990',-80785,149735,-3040,0,0,23000,5,0,0),
-(70033,'unset',1,'30798',19996,146216,-3111,0,0,57344,5,0,0),
 (70032,'unset',1,'31031',109787,219432,-3479,0,0,64055,15,0,0),
 (70031,'unset',1,'31209',110572,219501,-3664,0,0,33967,5,0,0),
 (70030,'unset',1,'30990',111417,219422,-3544,0,0,48000,5,0,0),

datapack_development/sql/teleport.sql

@@ -379,4 +379,75 @@ INSERT INTO teleport VALUES
 ('Schuttgart -> Wasteland of plunder',1117,109024,-159223,-1778,1600,0),
 ('Schuttgart -> Labyrinth of winter',1118,122162,-118893,-2603,3500,0),
 ('Schuttgart -> Graveyard of disgrace',1119,56095,-118952,-3290,1900,0),
-('Schuttgart -> Farbel Ruins',1120,88288,-125692,-3816,2100,0);
+('Schuttgart -> Farbel Ruins',1120,88288,-125692,-3816,2100,0);
+
+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 -> 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),
+ -- 509
+('Clan Hall -> Tanor Canyon',510,51147,165543,-2829,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,20505,189036,-3344,500,0), -- dunno coords !
+ -- ('Clan Hall -> Plains of Dion',514,20505,189036,-3344,500,0), -- dunno coords !
+ -- 515
+ -- 516
+('Clan Hall -> Hardin\'s Academy',517,105918,109759,-3207,500,0),
+('Clan Hall -> Dragon Valley',518,122824,110836,-3720,500,0),
+ -- 519
+ -- 520
+('Clan Hall -> Death Pass',521,70000,126636,-3804,500,0),
+('Clan Hall -> Pirate Tunnel',522,41298,200350,-4583,500,0),
+ -- 523
+('Clan Hall -> Giran Harbor',524,47942,186764,-3485,500,0),
+('Clan Hall -> Giran Castle Town',525,83400,147943,-3404,500,0),
+('Clan Hall -> Giran Arena',526,73890,142656,-3778,500,0),
+ -- 527
+('Clan Hall -> Breka\'s Stronghold',528,79798,130624,-3677,500,0),
+ -- ('Clan Hall -> Gorgon Flower Garden',529,79798,130624,-3677,500,0),  -- dunno coords !
+ -- -----------------
+('Clan Hall -> Ivory Tower',581,85348,16142,-3699,500,0),
+('Clan Hall -> Town of Oren',582,85348,16142,-3699,500,0),
+ -- 583
+('Clan Hall -> Plains of Lizardmen',584,87252,85514,-3056,500,0),
+('Clan Hall -> Skyshadow Meadow',585,82764,61145,-3502,500,0),
+ -- ('Clan Hall -> Shilen\'s Garden',586,82764,61145,-3502,500,0),  -- dunno coords !
+ -- ('Clan Hall -> Black Rock Hill',587,82764,61145,-3502,500,0),  -- dunno coords !
+('Clan Hall -> Spider Nest',588,-56532,78321,-2960,500,0),
+ -- ('Clan Hall -> Timak Outpost',589,-56532,78321,-2960,500,0), -- dunno coords !
+ -- ('Clan Hall -> Ivory Tower Crater',590,-56532,78321,-2960,500,0), -- dunno coords !
+ -- ('Clan Hall -> Forest of Evil',591,-56532,78321,-2960,500,0), -- dunno coords !
+('Clan Hall -> Outlaw Forest',592,85995,-2433,-3528,500,0),
+ -- ('Clan Hall -> Misty Mountains',593,85995,-2433,-3528,500,0), -- dunno coords !
+ -- ('Clan Hall -> Starlight Waterfall',594,85995,-2433,-3528,500,0), -- dunno coords !
+ -- ('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 -> 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 -> 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),
+('Clan Hall -> Aden Castle Town',607,146331,25762,-2018,500,0),
+('Clan Hall -> Hunters Village',608,117110,76883,-2695,500,0),
+('Clan Hall -> Border Outpost(Aden Side)',609,109699,-7908,-2902,500,0),
+('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 -> Silent Valley',615,177318,48447,-3835,500,0),
+-- ('Clan Hall -> Hunters Valley',616,177318,48447,-3835,500,0), -- dunno coords !
+-- ('Clan Hall -> Plains of Glory',617,177318,48447,-3835,500,0), -- dunno coords !
+('Clan Hall -> Fields of Massacre',618,179718,48447,-7843,500,0),
+-- ('Clan Hall -> War-Torn Plains',619,179718,48447,-7843,500,0), --- dunno coords !
+('Clan Hall -> Border Outpost(Unknown Side)',620,114172,-18034,-1875,500,0);

datapack_development/sql/updates/update20061230.sql

@@ -0,0 +1,305 @@
+-- *** DANGER *** - This update must DROP & CREATE the `clanhall` & `auction` tables due to structure changes
+
+ALTER TABLE clan_data ADD `auction_bid_at` INT NOT NULL default '0';
+ALTER TABLE auction_bid ADD `time_bid` decimal(20,0) NOT NULL default '0';
+ALTER TABLE auction_bid ADD `clan_name` varchar(50) NOT NULL after `bidderName`;
+
+-- removing duplicates spawns with bad IDs
+DELETE FROM spawnlist where npc_templateid in (30800,30798,30802,31158,31160,31156,31152,31150,31154,30784,30788,30790,30786,30778,30780,30782,30774,30776,30798);
+
+-- updating auctionners
+UPDATE npc SET type = 'L2Auctioneer' where id in (30767,30768,30769,30770,30771);
+
+-- updating doormens
+update npc set type = 'L2Doormen' where id in
+(30492,30493,30772,30773,30775,30777,30778,30779,30781,30783,30785,30787,30789,30791,30799,30801,30803,31151,31153,31155,31157,31159,31161,31352,31353,31354,31355,31447,31448,31449,31450,31451,35138,35139,35180,35181,35222,35223,35267,35268,35269,35270,35337,35433,35434,35312,35313,35096,35097,35581,35583,35585,35587);
+
+-- updating clan hall managers
+update npc set type='L2ClanHallManager', title='Clan Hall Manager' where id in
+(35385,35438,35453,35455,35451,35457,35459,35398,35400,35392,35394,35396,35384,35390,35386,35388,35855,35856,35857,35858,35859,35860,35407,35403,35405,35864,35865,35866,35867,35868,35869,35870,35871,35872,35873,35874,35875,35876,35877,35878,35879,35880,35881,35882,35883,35884,35885,35886,35439,35441,35443,35445,35447,35449,35467,35465,35463,35461);
+
+-- setting zones
+DELETE FROM zone WHERE type = 'Clan Hall';
+ALTER TABLE zone ADD `z2` int(11) NOT NULL default '0' AFTER `z`;
+INSERT INTO  zone VALUES
+ (22, 'Clan Hall', 'Gludio 1', -16400, 123275, -15551, 123850, -3117,0, 1),
+ (23, 'Clan Hall', 'Gludio 2', -15100, 125350, -14800, 125800, -3143,0, 1),
+ (24, 'Clan Hall', 'Gludio 3', -14050, 125050, -13700, 125700, -3143,0, 1),
+ (25, 'Clan Hall', 'Gludio 4', -12950, 123900, -12300, 124250, -3117,0, 1),
+ (26, 'Clan Hall', 'Gludin 1', -84700, 151550, -84250, 152350, -3130,0, 1),
+ (26, 'Clan Hall', 'Gludin 1', -84350, 151950, -83800, 152350, -3130,0, 1),
+ (27, 'Clan Hall', 'Gludin 2', -84400, 153050, -83950, 154050, -3166,0, 1),
+ (27, 'Clan Hall', 'Gludin 2', -84200, 153050, -83550, 153600, -3166,0, 1),
+ (28, 'Clan Hall', 'Gludin 3', -84500, 154900, -83950, 155700, -3158,0, 1),
+ (28, 'Clan Hall', 'Gludin 3', -84100, 155300, -83500, 155700, -3158,0, 1),
+ (29, 'Clan Hall', 'Gludin 4', -79700, 149400, -79250, 150300, -3061,0, 1),
+ (29, 'Clan Hall', 'Gludin 4', -80100, 149400, -79500, 149850, -3061,0, 1),
+ (30, 'Clan Hall', 'Gludin 5', -79700, 151350, -79300, 152250, -3036,0, 1),
+ (30, 'Clan Hall', 'Gludin 5', -80100, 151800, -79500, 152250, -3036,0, 1),
+ (31, 'Clan Hall', 'Dion 1', 17400, 144800, 18000, 145350, -3043,0, 1),
+ (32, 'Clan Hall', 'Dion 2', 18850, 143600, 18600, 143100, -3017,0, 1),
+ (33, 'Clan Hall', 'Dion 3', 19950, 146000, 20400, 146300, -3118,0, 1),
+ (42, 'Clan Hall', 'Giran 1', 80780, 151063, 81156, 152111, -3518,0, 1),
+ (43, 'Clan Hall', 'Giran 2', 82288, 152437, 81912, 151393, -3543,0, 1),
+ (44, 'Clan Hall', 'Giran 3', 78077, 148285, 79119, 147911, -3608,0, 1),
+ (45, 'Clan Hall', 'Giran 4', 83205, 144788, 83577, 145837, -3396,0, 1),
+ (46, 'Clan Hall', 'Giran 5', 82244, 145860, 81870, 144814, -3517,0, 1),
+ (36, 'Clan Hall', 'Aden 1', 143712, 27490, 144222, 26713, -2255,0, 1),
+ (37, 'Clan Hall', 'Aden 2', 143720, 28607, 144262, 27789, -2247,0, 1),
+ (38, 'Clan Hall', 'Aden 3', 151025, 26140, 150512, 26916, -2249,0, 1),
+ (39, 'Clan Hall', 'Aden 4', 150396, 24062, 150940, 23243, -2120,0, 1),
+ (40, 'Clan Hall', 'Aden 5', 149362, 22756, 148855, 23536, -2132,0, 1),
+ (41, 'Clan Hall', 'Aden 6', 145999, 24932, 145455, 25753, -2121,0, 1),
+ (47, 'Clan Hall', 'Goddard 1', 149717, -55824, 149063, -55350, -2783,0, 1),
+ (48, 'Clan Hall', 'Goddard 2', 148479, -56473, 148479, -57275, -2773,0, 1),
+ (49, 'Clan Hall', 'Goddard 3', 147238, -56636, 146564, -57078, -2783,0, 1),
+ (50, 'Clan Hall', 'Goddard 4', 146399, -55682, 145652, -55386, -2773,0, 1),
+ (35, 'Clan Hall', 'Bandits Stronghold', 80738, -15914, 79627, -15054, -1810,0, 1),
+ (21, 'Clan Hall', 'Partisan Hideaway', 43151, 108377, 43648, 109399, -1981,0, 1),
+ (62, 'Clan Hall', 'Hot Springs Guild House', 141414, -124508, 140590, -124706, -1896,0, 1);
+
+-- -------------------------------
+-- C5 Clan Halls (these are not correct, but just to avoid NPEs)
+-- -------------------------------
+
+INSERT INTO zone (id, type, name, x1, y1, x2, y2, z, taxById) VALUES
+  (62, "Clan Hall", "Hot Springs Guild House", 141414, -124508, 140590, -124706, -1896, 1),
+  (34, "Clan Hall", "Devastated Castle", 0, 0, 0, 0, 0, 0),
+  (51, "Clan Hall", "Mont Chamber", 37437, -45872, 38024, -45460, 900, 8),
+  (52, "Clan Hall", "Astaire Chamber", 38433, -46322, 39062, -45731, 900, 8),
+  (53, "Clan Hall", "Aria Chamber", 39437, -47141, 39760, -46668, 900, 8),
+  (54, "Clan Hall", "Yiana Chamber", 39426, -48619, 39820, -47871, 899, 8),
+  (55, "Clan Hall", "Roien Chamber", 39173, -50020, 39774, -49340, 900, 8),
+  (56, "Clan Hall", "Luna Chamber", 38401, -50516, 39054, -50404, 900, 8),
+  (57, "Clan Hall", "Traban Chamber", 37461, -50973, 38006, -50589, 900, 8),
+  (58, "Clan Hall", "Eisen Hall", 85426, -143448, 86069, -142769, -1342, 8),
+  (59, "Clan Hall", "Heavy Metal Hall", 86162, -142094, 87003, -141727, -1340, 8),
+  (60, "Clan Hall", "Molten Ore Hall", 88600, -142111, 87724, -141750, -1341, 8),
+  (61, "Clan Hall", "Titan Hall", 88500, -143500, 89500, -142880, -1340, 8),
+  (63, "Clan Hall", "Beast Farm", 0, 0, 0, 0, 0, 0),
+  (64, "Clan Hall", "Fortress of the Dead", 0, 0, 0, 0, 0, 0);
+
+-- -----------------------------------------
+-- C5 town and castle spawns
+-- -----------------------------------------
+INSERT INTO zone (id, type, name, x1, y1, x2, y2, z, taxById) VALUES
+  (17, "Town", "Schuttgart", 83881, -146500, 90908, -139486, 0, 9),
+  (17, "Town Spawn", "Schuttgart", 87331, -142842, 0, 0, -1317, 0),
+  (9, "Castle Area", "Schuttgart", 73000, -156600, 80740, -147592, 0, 8),
+  (9, "Castle HQ", "Schuttgart", 77200, -153000, 77900, -478700, -545, 8),
+  (9, "Castle Defender Spawn", "Schuttgart", 77524, -152709, 0, 0, -545, 0),
+  (8, "Castle Defender Spawn", "Rune", 11388, -49160, 0, 0, -537, 0),
+  (8, "Castle HQ", "Rune", 7000, -52500, 18493, -45900, -547, 0),
+  (8, "Castle Area", "Rune", 7000, -55500, 27000, -41716, 0, 0),
+  (8, "Siege Battlefield", "Rune", 7000, -55500, 27000, -41716, 0, 0),
+  (9, "Siege Battlefield", "Schuttgart", 73000, -156600, 80740, -147592, 0, 0);
+
+-- adding teleporting locations
+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 -> 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),
+ -- 509
+('Clan Hall -> Tanor Canyon',510,51147,165543,-2829,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,20505,189036,-3344,500,0), -- dunno coords !
+ -- ('Clan Hall -> Plains of Dion',514,20505,189036,-3344,500,0), -- dunno coords !
+ -- 515
+ -- 516
+('Clan Hall -> Hardin\'s Academy',517,105918,109759,-3207,500,0),
+('Clan Hall -> Dragon Valley',518,122824,110836,-3720,500,0),
+ -- 519
+ -- 520
+('Clan Hall -> Death Pass',521,70000,126636,-3804,500,0),
+('Clan Hall -> Pirate Tunnel',522,41298,200350,-4583,500,0),
+ -- 523
+('Clan Hall -> Giran Harbor',524,47942,186764,-3485,500,0),
+('Clan Hall -> Giran Castle Town',525,83400,147943,-3404,500,0),
+('Clan Hall -> Giran Arena',526,73890,142656,-3778,500,0),
+ -- 527
+('Clan Hall -> Breka\'s Stronghold',528,79798,130624,-3677,500,0),
+ -- ('Clan Hall -> Gorgon Flower Garden',529,79798,130624,-3677,500,0),  -- dunno coords !
+ -- -----------------
+('Clan Hall -> Ivory Tower',581,85348,16142,-3699,500,0),
+('Clan Hall -> Town of Oren',582,85348,16142,-3699,500,0),
+ -- 583
+('Clan Hall -> Plains of Lizardmen',584,87252,85514,-3056,500,0),
+('Clan Hall -> Skyshadow Meadow',585,82764,61145,-3502,500,0),
+ -- ('Clan Hall -> Shilen\'s Garden',586,82764,61145,-3502,500,0),  -- dunno coords !
+ -- ('Clan Hall -> Black Rock Hill',587,82764,61145,-3502,500,0),  -- dunno coords !
+('Clan Hall -> Spider Nest',588,-56532,78321,-2960,500,0),
+ -- ('Clan Hall -> Timak Outpost',589,-56532,78321,-2960,500,0), -- dunno coords !
+ -- ('Clan Hall -> Ivory Tower Crater',590,-56532,78321,-2960,500,0), -- dunno coords !
+ -- ('Clan Hall -> Forest of Evil',591,-56532,78321,-2960,500,0), -- dunno coords !
+('Clan Hall -> Outlaw Forest',592,85995,-2433,-3528,500,0),
+ -- ('Clan Hall -> Misty Mountains',593,85995,-2433,-3528,500,0), -- dunno coords !
+ -- ('Clan Hall -> Starlight Waterfall',594,85995,-2433,-3528,500,0), -- dunno coords !
+ -- ('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 -> 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 -> 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),
+('Clan Hall -> Aden Castle Town',607,146331,25762,-2018,500,0),
+('Clan Hall -> Hunters Village',608,117110,76883,-2695,500,0),
+('Clan Hall -> Border Outpost(Aden Side)',609,109699,-7908,-2902,500,0),
+('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 -> Silent Valley',615,177318,48447,-3835,500,0),
+-- ('Clan Hall -> Hunters Valley',616,177318,48447,-3835,500,0), -- dunno coords !
+-- ('Clan Hall -> Plains of Glory',617,177318,48447,-3835,500,0), -- dunno coords !
+('Clan Hall -> Fields of Massacre',618,179718,48447,-7843,500,0),
+-- ('Clan Hall -> War-Torn Plains',619,179718,48447,-7843,500,0), --- dunno coords !
+('Clan Hall -> Border Outpost(Unknown Side)',620,114172,-18034,-1875,500,0);
+
+-- creating new tables and replacing old ones
+DROP TABLE IF EXISTS `clanhall_functions`;
+CREATE TABLE `clanhall_functions` (
+  `hall_id` int(2) NOT NULL default '0',
+  `type` int(1) NOT NULL default '0',
+  `lvl` int(3) NOT NULL default '0',
+  `lease` int(10) NOT NULL default '0',
+  `rate` decimal(20,0) NOT NULL default '0',
+  `endTime` decimal(20,0) NOT NULL default '0',
+  `inDebt` int(1) NOT NULL default '0',
+  PRIMARY KEY  (`hall_id`,`type`)
+);
+
+DROP TABLE IF EXISTS `clanhall`;
+CREATE TABLE `clanhall` (
+  `id` int(11) NOT NULL default '0',
+  `name` varchar(40) NOT NULL default '',
+  `ownerId` int(11) NOT NULL default '0',
+  `lease` int(10) NOT NULL default '0',
+  `desc` text NOT NULL,
+  `location` varchar(15) NOT NULL default '',
+  `paidUntil` decimal(20,0) NOT NULL default '0',
+  `Grade` decimal(1,0) NOT NULL default '0',
+  PRIMARY KEY  (`id`,`name`),
+  KEY `id` (`id`)
+);
+
+-- ----------------------------
+-- Records 
+-- ----------------------------
+INSERT INTO `clanhall` VALUES ('21', 'Fortress of Resistance', '0', '500000', 'Ol Mahum Fortress of Resistance', 'Dion', '0', '0');
+INSERT INTO `clanhall` VALUES ('22', 'Moonstone Hall', '0', '500000', 'Clan hall located in the Town of Gludio', 'Gludio', '0', '2');
+INSERT INTO `clanhall` VALUES ('23', 'Onyx Hall', '0', '500000', 'Clan hall located in the Town of Gludio', 'Gludio', '0', '2');
+INSERT INTO `clanhall` VALUES ('24', 'Topaz Hall', '0', '500000', 'Clan hall located in the Town of Gludio', 'Gludio', '0', '2');
+INSERT INTO `clanhall` VALUES ('25', 'Ruby Hall', '0', '500000', 'Clan hall located in the Town of Gludio', 'Gludio', '0', '2');
+INSERT INTO `clanhall` VALUES ('26', 'Crystal Hall', '0', '500000', 'Clan hall located in Gludin Village', 'Gludin', '0', '2');
+INSERT INTO `clanhall` VALUES ('27', 'Onyx Hall', '0', '500000', 'Clan hall located in Gludin Village', 'Gludin', '0', '2');
+INSERT INTO `clanhall` VALUES ('28', 'Sapphire Hall', '0', '500000', 'Clan hall located in Gludin Village', 'Gludin', '0', '2');
+INSERT INTO `clanhall` VALUES ('29', 'Moonstone Hall', '0', '500000', 'Clan hall located in Gludin Village', 'Gludin', '0', '2');
+INSERT INTO `clanhall` VALUES ('30', 'Emerald Hall', '0', '500000', 'Clan hall located in Gludin Village', 'Gludin', '0', '2');
+INSERT INTO `clanhall` VALUES ('31', 'The Atramental Barracks', '0', '500000', 'Clan hall located in the Town of Dion', 'Dion', '0', '1');
+INSERT INTO `clanhall` VALUES ('32', 'The Scarlet Barracks', '0', '500000', 'Clan hall located in the Town of Dion', 'Dion', '0', '1');
+INSERT INTO `clanhall` VALUES ('33', 'The Viridian Barracks', '0', '500000', 'Clan hall located in the Town of Dion', 'Dion', '0', '1');
+INSERT INTO `clanhall` VALUES ('34', 'Devastated Castle', '0', '500000', 'Contestable Clan Hall', 'Aden', '0', '0');
+INSERT INTO `clanhall` VALUES ('35', 'Bandit Stronghold', '0', '500000', 'Contestable Clan Hall', 'Oren', '0', '0');
+INSERT INTO `clanhall` VALUES ('36', 'The Golden Chamber', '0', '500000', 'Clan hall located in the Town of Aden', 'Aden', '0', '3');
+INSERT INTO `clanhall` VALUES ('37', 'The Silver Chamber', '0', '500000', 'Clan hall located in the Town of Aden', 'Aden', '0', '3');
+INSERT INTO `clanhall` VALUES ('38', 'The Mithril Chamber', '0', '500000', 'Clan hall located in the Town of Aden', 'Aden', '0', '3');
+INSERT INTO `clanhall` VALUES ('39', 'Silver Manor', '0', '500000', 'Clan hall located in the Town of Aden', 'Aden', '0', '3');
+INSERT INTO `clanhall` VALUES ('40', 'Gold Manor', '0', '500000', 'Clan hall located in the Town of Aden', 'Aden', '0', '3');
+INSERT INTO `clanhall` VALUES ('41', 'The Bronze Chamber', '0', '500000', 'Clan hall located in the Town of Aden', 'Aden', '0', '3');
+INSERT INTO `clanhall` VALUES ('42', 'The Golden Chamber', '0', '500000', 'Clan hall located in the Town of Giran', 'Giran', '0', '3');
+INSERT INTO `clanhall` VALUES ('43', 'The Silver Chamber', '0', '500000', 'Clan hall located in the Town of Giran', 'Giran', '0', '3');
+INSERT INTO `clanhall` VALUES ('44', 'The Mithril Chamber', '0', '500000', 'Clan hall located in the Town of Giran', 'Giran', '0', '3');
+INSERT INTO `clanhall` VALUES ('45', 'The Bronze Chamber', '0', '500000', 'Clan hall located in the Town of Giran', 'Giran', '0', '3');
+INSERT INTO `clanhall` VALUES ('46', 'Silver Manor', '0', '500000', 'Clan hall located in the Town of Giran', 'Giran', '0', '3');
+INSERT INTO `clanhall` VALUES ('47', 'Moonstone Hall', '0', '500000', 'Clan hall located in the Town of Goddard', 'Goddard', '0', '3');
+INSERT INTO `clanhall` VALUES ('48', 'Onyx Hall', '0', '500000', 'Clan hall located in the Town of Goddard', 'Goddard', '0', '3');
+INSERT INTO `clanhall` VALUES ('49', 'Emerald Hall', '0', '500000', 'Clan hall located in the Town of Goddard', 'Goddard', '0', '3');
+INSERT INTO `clanhall` VALUES ('50', 'Sapphire Hall', '0', '500000', 'Clan hall located in the Town of Goddard', 'Goddard', '0', '3');
+INSERT INTO `clanhall` VALUES ('51', 'Mont Chamber', '0', '500000', 'An upscale Clan hall located in the Rune Township', 'Rune', '0', '3');
+INSERT INTO `clanhall` VALUES ('52', 'Astaire Chamber', '0', '500000', 'An upscale Clan hall located in the Rune Township', 'Rune', '0', '3');
+INSERT INTO `clanhall` VALUES ('53', 'Aria Chamber', '0', '500000', 'An upscale Clan hall located in the Rune Township', 'Rune', '0', '3');
+INSERT INTO `clanhall` VALUES ('54', 'Yiana Chamber', '0', '500000', 'An upscale Clan hall located in the Rune Township', 'Rune', '0', '3');
+INSERT INTO `clanhall` VALUES ('55', 'Roien Chamber', '0', '500000', 'An upscale Clan hall located in the Rune Township', 'Rune', '0', '3');
+INSERT INTO `clanhall` VALUES ('56', 'Luna Chamber', '0', '500000', 'An upscale Clan hall located in the Rune Township', 'Rune', '0', '3');
+INSERT INTO `clanhall` VALUES ('57', 'Traban Chamber', '0', '500000', 'An upscale Clan hall located in the Rune Township', 'Rune', '0', '3');
+INSERT INTO `clanhall` VALUES ('58', 'Eisen Hall', '0', '500000', 'Clan hall located in the Town of Schuttgart', 'Schuttgart', '0', '2');
+INSERT INTO `clanhall` VALUES ('59', 'Heavy Metal Hall', '0', '500000', 'Clan hall located in the Town of Schuttgart', 'Schuttgart', '0', '2');
+INSERT INTO `clanhall` VALUES ('60', 'Molten Ore Hall', '0', '500000', 'Clan hall located in the Town of Schuttgart', 'Schuttgart', '0', '2');
+INSERT INTO `clanhall` VALUES ('61', 'Titan Hall', '0', '500000', 'Clan hall located in the Town of Schuttgart', 'Schuttgart', '0', '2');
+INSERT INTO `clanhall` VALUES ('62', 'Rainbow Springs', '0', '500000', '', 'Goddard', '0', '0');
+INSERT INTO `clanhall` VALUES ('63', 'Beast Farm', '0', '500000', '', 'Rune', '0', '0');
+INSERT INTO `clanhall` VALUES ('64', 'Fortress of the Dead', '0', '500000', '', 'Rune', '0', '0');
+
+
+DROP TABLE IF EXISTS `auction`;
+CREATE TABLE `auction` (
+  id int(11) NOT NULL default '0',
+  sellerId int(11) NOT NULL default '0',
+  sellerName varchar(50) NOT NULL default 'NPC',
+  sellerClanName varchar(50) NOT NULL default '',
+  itemType varchar(25) NOT NULL default '',
+  itemId int(11) NOT NULL default '0',
+  itemObjectId int(11) NOT NULL default '0',
+  itemName varchar(40) NOT NULL default '',
+  itemQuantity int(11) NOT NULL default '0',
+  startingBid int(11) NOT NULL default '0',
+  currentBid int(11) NOT NULL default '0',
+  endDate decimal(20,0) NOT NULL default '0',
+  PRIMARY KEY  (`itemType`,`itemId`,`itemObjectId`),
+  KEY `id` (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+-- 
+-- Dumping data for table `auction`
+-- 
+
+INSERT INTO `auction` VALUES 
+(22, 0, 'NPC', 'NPC Clan', 'ClanHall', 22, 0, 'Moonstone Hall', 1, 20000000, 0, 1164841200000),
+(23, 0, 'NPC', 'NPC Clan', 'ClanHall', 23, 0, 'Onyx Hall', 1, 20000000, 0, 1164841200000),
+(24, 0, 'NPC', 'NPC Clan', 'ClanHall', 24, 0, 'Topaz Hall', 1, 20000000, 0, 1164841200000),
+(25, 0, 'NPC', 'NPC Clan', 'ClanHall', 25, 0, 'Ruby Hall', 1, 20000000, 0, 1164841200000),
+(26, 0, 'NPC', 'NPC Clan', 'ClanHall', 26, 0, 'Crystal Hall', 1, 20000000, 0, 1164841200000),
+(27, 0, 'NPC', 'NPC Clan', 'ClanHall', 27, 0, 'Onyx Hall', 1, 20000000, 0, 1164841200000),
+(28, 0, 'NPC', 'NPC Clan', 'ClanHall', 28, 0, 'Sapphire Hall', 1, 20000000, 0, 1164841200000),
+(29, 0, 'NPC', 'NPC Clan', 'ClanHall', 29, 0, 'Moonstone Hall', 1, 20000000, 0, 1164841200000),
+(30, 0, 'NPC', 'NPC Clan', 'ClanHall', 30, 0, 'Emerald Hall', 1, 20000000, 0, 1164841200000),
+(31, 0, 'NPC', 'NPC Clan', 'ClanHall', 31, 0, 'The Atramental Barracks', 1, 8000000, 0, 1164841200000),
+(32, 0, 'NPC', 'NPC Clan', 'ClanHall', 32, 0, 'The Scarlet Barracks', 1, 8000000, 0, 1164841200000),
+(33, 0, 'NPC', 'NPC Clan', 'ClanHall', 33, 0, 'The Viridian Barracks', 1, 8000000, 0, 1164841200000),
+(36, 0, 'NPC', 'NPC Clan', 'ClanHall', 36, 0, 'The Golden Chamber', 1, 50000000, 0, 1164841200000),
+(37, 0, 'NPC', 'NPC Clan', 'ClanHall', 37, 0, 'The Silver Chamber', 1, 50000000, 0, 1164841200000),
+(38, 0, 'NPC', 'NPC Clan', 'ClanHall', 38, 0, 'The Mithril Chamber', 1, 50000000, 0, 1164841200000),
+(39, 0, 'NPC', 'NPC Clan', 'ClanHall', 39, 0, 'Silver Manor', 1, 50000000, 0, 1164841200000),
+(40, 0, 'NPC', 'NPC Clan', 'ClanHall', 40, 0, 'Gold Manor', 1, 50000000, 0, 1164841200000),
+(41, 0, 'NPC', 'NPC Clan', 'ClanHall', 41, 0, 'The Bronze Chamber', 1, 50000000, 0, 1164841200000),
+(42, 0, 'NPC', 'NPC Clan', 'ClanHall', 42, 0, 'The Golden Chamber', 1, 50000000, 0, 1164841200000),
+(43, 0, 'NPC', 'NPC Clan', 'ClanHall', 43, 0, 'The Silver Chamber', 1, 50000000, 0, 1164841200000),
+(44, 0, 'NPC', 'NPC Clan', 'ClanHall', 44, 0, 'The Mithril Chamber', 1, 50000000, 0, 1164841200000),
+(45, 0, 'NPC', 'NPC Clan', 'ClanHall', 45, 0, 'The Bronze Chamber', 1, 50000000, 0, 1164841200000),
+(46, 0, 'NPC', 'NPC Clan', 'ClanHall', 46, 0, 'Silver Manor', 1, 50000000, 0, 1164841200000),
+(47, 0, 'NPC', 'NPC Clan', 'ClanHall', 47, 0, 'Moonstone Hall', 1, 50000000, 0, 1164841200000),
+(48, 0, 'NPC', 'NPC Clan', 'ClanHall', 48, 0, 'Onyx Hall', 1, 50000000, 0, 1164841200000),
+(49, 0, 'NPC', 'NPC Clan', 'ClanHall', 49, 0, 'Emerald Hall', 1, 50000000, 0, 1164841200000),
+(50, 0, 'NPC', 'NPC Clan', 'ClanHall', 50, 0, 'Sapphire Hall', 1, 50000000, 0, 1164841200000),
+(51, 0, 'NPC', 'NPC Clan', 'ClanHall', 51, 0, 'Mont Chamber', 1, 50000000, 0, 1164841200000),
+(52, 0, 'NPC', 'NPC Clan', 'ClanHall', 52, 0, 'Astaire Chamber', 1, 50000000, 0, 1164841200000),
+(53, 0, 'NPC', 'NPC Clan', 'ClanHall', 53, 0, 'Aria Chamber', 1, 50000000, 0, 1164841200000),
+(54, 0, 'NPC', 'NPC Clan', 'ClanHall', 54, 0, 'Yiana Chamber', 1, 50000000, 0, 1164841200000),
+(55, 0, 'NPC', 'NPC Clan', 'ClanHall', 55, 0, 'Roien Chamber', 1, 50000000, 0, 1164841200000),
+(56, 0, 'NPC', 'NPC Clan', 'ClanHall', 56, 0, 'Luna Chamber', 1, 50000000, 0, 1164841200000),
+(57, 0, 'NPC', 'NPC Clan', 'ClanHall', 57, 0, 'Traban Chamber', 1, 50000000, 0, 1164841200000),
+(58, 0, 'NPC', 'NPC Clan', 'ClanHall', 58, 0, 'Eisen Hall', 1, 50000000, 0, 1164841200000),
+(59, 0, 'NPC', 'NPC Clan', 'ClanHall', 59, 0, 'Heavy Metal Hall', 1, 50000000, 0, 1164841200000),
+(60, 0, 'NPC', 'NPC Clan', 'ClanHall', 60, 0, 'Molten Ore Hall', 1, 50000000, 0, 1164841200000),
+(61, 0, 'NPC', 'NPC Clan', 'ClanHall', 61, 0, 'Titan Hall', 1, 50000000, 0, 1164841200000);

datapack_development/sql/zone.sql

@@ -11,361 +11,399 @@ CREATE TABLE zone (
   x2 INT NOT NULL default 0,
   y2 INT NOT NULL default 0,
   z INT NOT NULL default 0,
+  z2 INT NOT NULL default 0,
   taxById INT NOT NULL default 0
 );
 
-insert into zone values (1, 'Arena', 'Giran Arena', 72498, 142271, 73495, 143255, -3774, 0);
-insert into zone values (2, 'Arena', 'Gludin Arena', -88410, 142728, -87421, 141730, -3633, 0);
-insert into zone values (3, 'Arena', 'Collusieum', 148014, 45304, 150976, 48020, -3410, 0);
-insert into zone values (4, 'Arena', 'Monster Track', 11955, 183017, 12937, 184008, -3565, 0);
+insert into zone values (1, 'Arena', 'Giran Arena', 72498, 142271, 73495, 143255, -3774, 0, 0);
+insert into zone values (2, 'Arena', 'Gludin Arena', -88410, 142728, -87421, 141730, -3633, 0, 0);
+insert into zone values (3, 'Arena', 'Collusieum', 148014, 45304, 150976, 48020, -3410, 0, 0);
+insert into zone values (4, 'Arena', 'Monster Track', 11955, 183017, 12937, 184008, -3565, 0, 0);
 
-insert into zone values (1, 'Arena Spawn', 'Giran Arena', 73890, 142656, 0, 0, -3778, 0);
-insert into zone values (2, 'Arena Spawn', 'Gludin Arena', -86979, 142402, 0, 0, -3643, 0);
-insert into zone values (3, 'Arena Spawn', 'Collusieum', 147451, 46728, 0, 0, -3410, 0);
-insert into zone values (4, 'Arena Spawn', 'Monster Track', 12312, 182752, 0, 0, -3558, 0);
+insert into zone values (1, 'Arena Spawn', 'Giran Arena', 73890, 142656, 0, 0, -3778, 0, 0);
+insert into zone values (2, 'Arena Spawn', 'Gludin Arena', -86979, 142402, 0, 0, -3643, 0, 0);
+insert into zone values (3, 'Arena Spawn', 'Collusieum', 147451, 46728, 0, 0, -3410, 0, 0);
+insert into zone values (4, 'Arena Spawn', 'Monster Track', 12312, 182752, 0, 0, -3558, 0, 0);
 
-insert into zone values (1, 'Castle Area', 'Gludio', -22900, 104000, -14567, 116513, 0, 5);
-insert into zone values (2, 'Castle Area', 'Dion', 18438, 152343, 25757, 164097, 0, 5);
-insert into zone values (3, 'Castle Area', 'Giran', 105737, 140128, 121331, 149842, 0, 5);
-insert into zone values (4, 'Castle Area', 'Oren', 72876, 32336, 87556, 40457, 0, 5);
-insert into zone values (5, 'Castle Area', 'Aden', 134790, -2552, 154760, 20850, 0, 0);
-insert into zone values (6, 'Castle Area', 'Innadril', 111975, 241396, 120720, 253425, 0, 5);
-insert into zone values (7, 'Castle Area', 'Goddard', 144715, -43884, 150037, -43064, 0, 5);
+insert into zone values (1, 'Castle Area', 'Gludio', -22900, 104000, -14567, 116513, 0, 0 ,5);
+insert into zone values (2, 'Castle Area', 'Dion', 18438, 152343, 25757, 164097, 0, 0 ,5);
+insert into zone values (3, 'Castle Area', 'Giran', 105737, 140128, 121331, 149842, 0, 0 ,5);
+insert into zone values (4, 'Castle Area', 'Oren', 72876, 32336, 87556, 40457, 0, 0 ,5);
+insert into zone values (5, 'Castle Area', 'Aden', 134790, -2552, 154760, 20850, 0, 0, 0);
+insert into zone values (6, 'Castle Area', 'Innadril', 111975, 241396, 120720, 253425, 0, 0 ,5);
+insert into zone values (7, 'Castle Area', 'Goddard', 144715, -43884, 150037, -43064, 0, 0 ,5);
 
-insert into zone values (1, 'Castle HQ', 'Gludio', -20400, 106800, -15700, 113750, 0, 5);
-insert into zone values (2, 'Castle HQ', 'Dion', 19650, 163000, 24350, 155950, 0, 5);
-insert into zone values (3, 'Castle HQ', 'Giran', 119200, 142750, 112200, 147450, 0, 5);
-insert into zone values (4, 'Castle HQ', 'Oren', 85300, 34900, 78100, 39600, 0, 5);
-insert into zone values (5, 'Castle HQ', 'Aden', 144600, 550, 150300, 8550, 0, 0);
-insert into zone values (6, 'Castle HQ', 'Innadril', 111975, 241396, 120720, 253425, 0, 5);
-insert into zone values (7, 'Castle HQ', 'Goddard', 144715, -43884, 150037, -43064, 0, 5);
+insert into zone values (1, 'Castle HQ', 'Gludio', -20400, 106800, -15700, 113750, 0, 0 ,5);
+insert into zone values (2, 'Castle HQ', 'Dion', 19650, 163000, 24350, 155950, 0, 0 ,5);
+insert into zone values (3, 'Castle HQ', 'Giran', 119200, 142750, 112200, 147450, 0, 0 ,5);
+insert into zone values (4, 'Castle HQ', 'Oren', 85300, 34900, 78100, 39600, 0, 0 ,5);
+insert into zone values (5, 'Castle HQ', 'Aden', 144600, 550, 150300, 8550, 0, 0, 0);
+insert into zone values (6, 'Castle HQ', 'Innadril', 111975, 241396, 120720, 253425, 0, 0 ,5);
+insert into zone values (7, 'Castle HQ', 'Goddard', 144715, -43884, 150037, -43064, 0, 0 ,5);
 
-insert into zone values (1, 'Castle Defender Spawn', 'Gludio', -18105, 110303, 0, 0, -2146, 0);
-insert into zone values (2, 'Castle Defender Spawn', 'Dion', 22080, 159450, 0, 0, -2441, 0);
-insert into zone values (3, 'Castle Defender Spawn', 'Giran', 115621, 145097, 0, 0, -2214, 0);
-insert into zone values (4, 'Castle Defender Spawn', 'Oren', 81707, 37208, 0, 0, -1941, 0);
-insert into zone values (5, 'Castle Defender Spawn', 'Aden', 147456, 6048, 0, 0, 253, 0);
-insert into zone values (6, 'Castle Defender Spawn', 'Innadril', 116025, 248229, 0, 0, -536, 0);
-insert into zone values (7, 'Castle Defender Spawn', 'Goddard', 147408, -46448, 0, 0, -963, 0);
+insert into zone values (1, 'Castle Defender Spawn', 'Gludio', -18105, 110303, 0, 0, -2146, 0, 0);
+insert into zone values (2, 'Castle Defender Spawn', 'Dion', 22080, 159450, 0, 0, -2441, 0, 0);
+insert into zone values (3, 'Castle Defender Spawn', 'Giran', 115621, 145097, 0, 0, -2214, 0, 0);
+insert into zone values (4, 'Castle Defender Spawn', 'Oren', 81707, 37208, 0, 0, -1941, 0, 0);
+insert into zone values (5, 'Castle Defender Spawn', 'Aden', 147456, 6048, 0, 0, 253, 0, 0);
+insert into zone values (6, 'Castle Defender Spawn', 'Innadril', 116025, 248229, 0, 0, -536, 0, 0);
+insert into zone values (7, 'Castle Defender Spawn', 'Goddard', 147408, -46448, 0, 0, -963, 0, 0);
 
-insert into zone values (1, 'Clan Hall', 'Gludio 1', -16400, 123275, -15551, 123850, -3117, 1);
-insert into zone values (2, 'Clan Hall', 'Gludio 2', -15100, 125350, -14800, 125800, -3143, 1);
-insert into zone values (3, 'Clan Hall', 'Gludio 3', -14050, 125050, -13700, 125700, -3143, 1);
-insert into zone values (4, 'Clan Hall', 'Gludio 4', -12950, 123900, -12300, 124250, -3117, 1);
-insert into zone values (5, 'Clan Hall', 'Gludin 1', -84700, 151550, -84250, 152350, -3130, 1);
-insert into zone values (5, 'Clan Hall', 'Gludin 1', -84350, 151950, -83800, 152350, -3130, 1);
-insert into zone values (6, 'Clan Hall', 'Gludin 2', -84400, 153050, -83950, 154050, -3166, 1);
-insert into zone values (6, 'Clan Hall', 'Gludin 2', -84200, 153050, -83550, 153600, -3166, 1);
-insert into zone values (7, 'Clan Hall', 'Gludin 3', -84500, 154900, -83950, 155700, -3158, 1);
-insert into zone values (7, 'Clan Hall', 'Gludin 3', -84100, 155300, -83500, 155700, -3158, 1);
-insert into zone values (8, 'Clan Hall', 'Gludin 4', -79700, 149400, -79250, 150300, -3061, 1);
-insert into zone values (8, 'Clan Hall', 'Gludin 4', -80100, 149400, -79500, 149850, -3061, 1);
-insert into zone values (9, 'Clan Hall', 'Gludin 5', -79700, 151350, -79300, 152250, -3036, 1);
-insert into zone values (9, 'Clan Hall', 'Gludin 5', -80100, 151800, -79500, 152250, -3036, 1);
-insert into zone values (10, 'Clan Hall', 'Dion 1', 17400, 144800, 18000, 145350, -3043, 1);
-insert into zone values (11, 'Clan Hall', 'Dion 2', 18850, 143600, 18600, 143100, -3017, 1);
-insert into zone values (12, 'Clan Hall', 'Dion 3', 19950, 146000, 20400, 146300, -3118, 1);
-insert into zone values (13, 'Clan Hall', 'Giran 1', 80780, 151063, 81156, 152111, -3518, 1);
-insert into zone values (14, 'Clan Hall', 'Giran 2', 82288, 152437, 81912, 151393, -3543, 1);
-insert into zone values (15, 'Clan Hall', 'Giran 3', 78077, 148285, 79119, 147911, -3608, 1);
-insert into zone values (16, 'Clan Hall', 'Giran 4', 83205, 144788, 83577, 145837, -3396, 1);
-insert into zone values (17, 'Clan Hall', 'Giran 5', 82244, 145860, 81870, 144814, -3517, 1);
-insert into zone values (18, 'Clan Hall', 'Aden 1', 143712, 27490, 144222, 26713, -2255, 1);
-insert into zone values (19, 'Clan Hall', 'Aden 2', 143720, 28607, 144262, 27789, -2247, 1);
-insert into zone values (20, 'Clan Hall', 'Aden 3', 151025, 26140, 150512, 26916, -2249, 1);
-insert into zone values (21, 'Clan Hall', 'Aden 4', 150396, 24062, 150940, 23243, -2120, 1);
-insert into zone values (22, 'Clan Hall', 'Aden 5', 149362, 22756, 148855, 23536, -2132, 1);
-insert into zone values (23, 'Clan Hall', 'Aden 6', 145999, 24932, 145455, 25753, -2121, 1);
-insert into zone values (24, 'Clan Hall', 'Goddard 1', 149717, -55824, 149063, -55350, -2783, 1);
-insert into zone values (25, 'Clan Hall', 'Goddard 2', 148479, -56473, 148479, -57275, -2773, 1);
-insert into zone values (26, 'Clan Hall', 'Goddard 3', 147238, -56636, 146564, -57078, -2783, 1);
-insert into zone values (27, 'Clan Hall', 'Goddard 4', 146399, -55682, 145652, -55386, -2773, 1);
-insert into zone values (28, 'Clan Hall', 'Bandits Stronghold', 80738, -15914, 79627, -15054, -1810, 1);
-insert into zone values (29, 'Clan Hall', 'Partisan Hideaway', 43151, 108377, 43648, 109399, -1981, 1);
-insert into zone values (30, 'Clan Hall', 'Hot Springs Guild House', 141414, -124508, 140590, -124706, -1896, 1);
+INSERT INTO  zone VALUES
+ (21, 'Clan Hall', 'Partisan Hideaway', 43151, 108377, 43648, 109399, -1981,0, 1),
+ (22, 'Clan Hall', 'Gludio 1', -16400, 123275, -15551, 123850, -3117, 0, 1),
+ (23, 'Clan Hall', 'Gludio 2', -15100, 125350, -14800, 125800, -3143, 0, 1),
+ (24, 'Clan Hall', 'Gludio 3', -14050, 125050, -13700, 125700, -3143, 0, 1),
+ (25, 'Clan Hall', 'Gludio 4', -12950, 123900, -12300, 124250, -3117, 0, 1),
+ (26, 'Clan Hall', 'Gludin 1', -84350, 151950, -83800, 152350, -3130, 0, 1),
+ (26, 'Clan Hall', 'Gludin 1', -84700, 151550, -84250, 152350, -3130, 0, 1),
+ (27, 'Clan Hall', 'Gludin 2', -84200, 153050, -83550, 153600, -3166, 0, 1),
+ (27, 'Clan Hall', 'Gludin 2', -84400, 153050, -83950, 154050, -3166, 0, 1),
+ (28, 'Clan Hall', 'Gludin 3', -84100, 155300, -83500, 155700, -3158, 0, 1),
+ (28, 'Clan Hall', 'Gludin 3', -84500, 154900, -83950, 155700, -3158, 0, 1),
+ (29, 'Clan Hall', 'Gludin 4', -79700, 149400, -79250, 150300, -3061, 0, 1),
+ (29, 'Clan Hall', 'Gludin 4', -80100, 149400, -79500, 149850, -3061, 0, 1),
+ (30, 'Clan Hall', 'Gludin 5', -79700, 151350, -79300, 152250, -3036, 0, 1),
+ (30, 'Clan Hall', 'Gludin 5', -80100, 151800, -79500, 152250, -3036, 0, 1),
+ (31, 'Clan Hall', 'Dion 1', 17400, 144800, 18000, 145350, -3043, 0, 1),
+ (32, 'Clan Hall', 'Dion 2', 18850, 143600, 18600, 143100, -3017, 0, 1),
+ (33, 'Clan Hall', 'Dion 3', 19950, 146000, 20400, 146300, -3118, 0, 1),
+ (35, 'Clan Hall', 'Bandits Stronghold', 80738, -15914, 79627, -15054, -1810, 0, 1),
+ (36, 'Clan Hall', 'Aden 1', 143712, 27490, 144222, 26713, -2255, 0, 1),
+ (37, 'Clan Hall', 'Aden 2', 143720, 28607, 144262, 27789, -2247, 0, 1),
+ (38, 'Clan Hall', 'Aden 3', 151025, 26140, 150512, 26916, -2249, 0, 1),
+ (39, 'Clan Hall', 'Aden 4', 150396, 24062, 150940, 23243, -2120, 0, 1),
+ (40, 'Clan Hall', 'Aden 5', 149362, 22756, 148855, 23536, -2132, 0, 1),
+ (41, 'Clan Hall', 'Aden 6', 145999, 24932, 145455, 25753, -2121, 0, 1),
+ (42, 'Clan Hall', 'Giran 1', 80780, 151063, 81156, 152111, -3518, 0, 1),
+ (43, 'Clan Hall', 'Giran 2', 82288, 152437, 81912, 151393, -3543, 0, 1),
+ (44, 'Clan Hall', 'Giran 3', 78077, 148285, 79119, 147911, -3608, 0, 1),
+ (45, 'Clan Hall', 'Giran 4', 83205, 144788, 83577, 145837, -3396, 0, 1),
+ (46, 'Clan Hall', 'Giran 5', 82244, 145860, 81870, 144814, -3517, 0, 1),
+ (47, 'Clan Hall', 'Goddard 1', 149717, -55824, 149063, -55350, -2783, 0, 1),
+ (48, 'Clan Hall', 'Goddard 2', 148479, -56473, 148479, -57275, -2773, 0, 1),
+ (49, 'Clan Hall', 'Goddard 3', 147238, -56636, 146564, -57078, -2783, 0, 1),
+ (50, 'Clan Hall', 'Goddard 4', 146399, -55682, 145652, -55386, -2773, 0, 1);
 
-insert into zone values (1, 'Peace', 'Giran Arena', 72249, 142018, 72498, 143510, -3774, 0);
-insert into zone values (1, 'Peace', 'Giran Arena', 73495, 142018, 73738, 143510, -3774, 0);
-insert into zone values (1, 'Peace', 'Giran Arena', 72498, 142018, 73495, 142271, -3774, 0);
-insert into zone values (1, 'Peace', 'Giran Arena', 72498, 143255, 73495, 143510, -3774, 0);
-insert into zone values (2, 'Peace', 'Gudin Arena', -88654, 141479, -88410, 142960, -3648, 0);
-insert into zone values (2, 'Peace', 'Gudin Arena', -87421, 141479, -87172, 142960, -3648, 0);
-insert into zone values (2, 'Peace', 'Gudin Arena', -88410, 141479, -87421, 141728, -3648, 0);
-insert into zone values (2, 'Peace', 'Gudin Arena', -88410, 142715, -87421, 142960, -3648, 0);
-insert into zone values (3, 'Peace', 'Collusieum', 147117, 46230, 148014, 47217, -3410, 0);
-insert into zone values (3, 'Peace', 'Collusieum', 147771, 45304, 148014, 46230, -3410, 0);
-insert into zone values (3, 'Peace', 'Collusieum', 147771, 47217, 148014, 48020, -3410, 0);
-insert into zone values (3, 'Peace', 'Collusieum', 150976, 46228, 151885, 47217, -3410, 0);
-insert into zone values (3, 'Peace', 'Collusieum', 150976, 45304, 151218, 46228, -3410, 0);
-insert into zone values (3, 'Peace', 'Collusieum', 150976, 47217, 151218, 48020, -3410, 0);
-insert into zone values (4, 'Peace', 'Monster Track', 11703, 181289, 14574, 183017, -3564, 0);
-insert into zone values (4, 'Peace', 'Monster Track', 11703, 183017, 11955, 184260, -3564, 0);
-insert into zone values (4, 'Peace', 'Monster Track', 11955, 184008, 12937, 184260, -3564, 0);
-insert into zone values (4, 'Peace', 'Monster Track', 12937, 183017, 13192, 184260, -3564, 0);
+-- -------------------------------
+-- C5 Clan Halls (these are not correct, but just to avoid NPEs)
+-- -------------------------------
 
-insert into zone values (1, 'Siege Battlefield', 'Gludio', -22900, 104000, -14567, 116513, 0, 0);
-insert into zone values (2, 'Siege Battlefield', 'Dion', 18438, 152343, 25757, 164097, 0, 0);
-insert into zone values (3, 'Siege Battlefield', 'Giran', 105737, 140128, 121331, 149842, 0, 0);
-insert into zone values (4, 'Siege Battlefield', 'Oren', 72876, 32336, 87556, 40457, 0, 0);
-insert into zone values (5, 'Siege Battlefield', 'Aden', 134790, -2552, 154760, 20850, 0, 0);
-insert into zone values (6, 'Siege Battlefield', 'Innadril', 111975, 241396, 120720, 253425, 0, 0);
-insert into zone values (7, 'Siege Battlefield', 'Goddard', 144715, -43884, 150037, -43064, 0, 0);
+INSERT INTO zone (id, type, name, x1, y1, x2, y2, z, taxById) VALUES
+  (34, "Clan Hall", "Devastated Castle", 0, 0, 0, 0, 0, 0),
+  (51, "Clan Hall", "Mont Chamber", 37437, -45872, 38024, -45460, 900, 8),
+  (52, "Clan Hall", "Astaire Chamber", 38433, -46322, 39062, -45731, 900, 8),
+  (53, "Clan Hall", "Aria Chamber", 39437, -47141, 39760, -46668, 900, 8),
+  (54, "Clan Hall", "Yiana Chamber", 39426, -48619, 39820, -47871, 899, 8),
+  (55, "Clan Hall", "Roien Chamber", 39173, -50020, 39774, -49340, 900, 8),
+  (56, "Clan Hall", "Luna Chamber", 38401, -50516, 39054, -50404, 900, 8),
+  (57, "Clan Hall", "Traban Chamber", 37461, -50973, 38006, -50589, 900, 8),
+  (58, "Clan Hall", "Eisen Hall", 85426, -143448, 86069, -142769, -1342, 8),
+  (59, "Clan Hall", "Heavy Metal Hall", 86162, -142094, 87003, -141727, -1340, 8),
+  (60, "Clan Hall", "Molten Ore Hall", 88600, -142111, 87724, -141750, -1341, 8),
+  (61, "Clan Hall", "Titan Hall", 88500, -143500, 89500, -142880, -1340, 8),
+  (62, "Clan Hall", "Hot Springs Guild House", 141414, -124508, 140590, -124706, -1896, 1),
+  (63, "Clan Hall", "Beast Farm", 0, 0, 0, 0, 0, 0),
+  (64, "Clan Hall", "Fortress of the Dead", 0, 0, 0, 0, 0, 0);
 
-insert into zone values (1, 'Town', 'DE Village', 6063, 19664, 17248, 14019, 0, 4);
-insert into zone values (2, 'Town', 'Talking Island', -87312, 240096, -81129, 246345, 0, 1);
-insert into zone values (3, 'Town', 'Elven Village', 48294, 52995, 42402, 46155, 0, 4);
-insert into zone values (4, 'Town', 'Orc Village', -42078, -109785, -47648, -117366, 0, 0);
-insert into zone values (5, 'Town', 'Gludin Village', -84892, 149075, -76820, 156125, 0, 1);
-insert into zone values (6, 'Town', 'Dwarven Village', 117395, -176766, 114650, -184347, 0, 0);
-insert into zone values (7, 'Town', 'Gludio Castle Town', -11853, 126610, -16652, 121003, 0, 1);
-insert into zone values (8, 'Town', 'Dion Castle Town', 15300, 141609, 21570, 147635, 0, 2);
-insert into zone values (9, 'Town', 'Giran Castle Town', 76995, 141424, 90565, 153614, 0, 3);
-insert into zone values (10, 'Town', 'Town of Oren', 76696, 57199, 84511, 50120, 0, 4);
-insert into zone values (11, 'Town', 'Hunter Village', 121308, 73941, 114667, 80383, 0, 5);
-insert into zone values (12, 'Town', 'Town of Aden', 142312, 32317, 152163, 19708, 0, 5);
-insert into zone values (13, 'Town', 'Goddard', 152846, -54289, 143721, -59446, 0, 5);
-insert into zone values (14, 'Town', 'Rune Castle Town', 47150, -44815, 32531, -52045, 0, 6);
-insert into zone values (15, 'Town', 'Heine', 103598, 216010, 118991, 225905, 0, 6);
-insert into zone values (16, 'Town', 'Floran Village', 0, 0, 0, 0, 0, 2);
-insert into zone values (17, 'Town', 'Ivory Tower', 0, 0, 0, 0, 0, 4);
+-- -----------------------------------------
+-- C5 town and castle spawns
+-- -----------------------------------------
+INSERT INTO zone (id, type, name, x1, y1, x2, y2, z, taxById) VALUES
+  (17, "Town", "Schuttgart", 83881, -146500, 90908, -139486, 0, 9),
+  (17, "Town Spawn", "Schuttgart", 87331, -142842, 0, 0, -1317, 0),
+  (9, "Castle Area", "Schuttgart", 73000, -156600, 80740, -147592, 0, 8),
+  (9, "Castle HQ", "Schuttgart", 77200, -153000, 77900, -478700, -545, 8),
+  (9, "Castle Defender Spawn", "Schuttgart", 77524, -152709, 0, 0, -545, 0),
+  (8, "Castle Defender Spawn", "Rune", 11388, -49160, 0, 0, -537, 0),
+  (8, "Castle HQ", "Rune", 7000, -52500, 18493, -45900, -547, 0),
+  (8, "Castle Area", "Rune", 7000, -55500, 27000, -41716, 0, 0),
+  (8, "Siege Battlefield", "Rune", 7000, -55500, 27000, -41716, 0, 0),
+  (9, "Siege Battlefield", "Schuttgart", 73000, -156600, 80740, -147592, 0, 0);
 
-insert into zone values (1, 'Town Spawn', 'DE Village', 12181, 16675, 0, 0, -4580, 0);
-insert into zone values (2, 'Town Spawn', 'Talking Island', -84176, 243382, 0, 0, -3126, 0);
-insert into zone values (3, 'Town Spawn', 'Elven Village', 45525, 48376, 0, 0, -3059, 0);
-insert into zone values (4, 'Town Spawn', 'Orc Village', -45232, -113603, 0, 0, -224, 0);
-insert into zone values (5, 'Town Spawn', 'Gludin Village', -82856, 150901, 0, 0, -3128, 0);
-insert into zone values (6, 'Town Spawn', 'Dwarven Village', 115074, -178115, 0, 0, -880, 0);
-insert into zone values (7, 'Town Spawn', 'Gludio Castle Town', -14138, 122042, 0, 0, -2988, 0);
-insert into zone values (8, 'Town Spawn', 'Dion Castle Town', 18823, 145048, 0, 0, -3126, 0);
-insert into zone values (9, 'Town Spawn', 'Giran Castle Town', 83235, 148497, 0, 0, -3404, 0);
-insert into zone values (10, 'Town Spawn', 'Town of Oren', 80853, 54653, 0, 0, -1524, 0);
-insert into zone values (11, 'Town Spawn', 'Hunter Village', 117163, 76511, 0, 0, -2712, 0);
-insert into zone values (12, 'Town Spawn', 'Town of Aden', 147391, 25967, 0, 0, -2012, 0);
-insert into zone values (13, 'Town Spawn', 'Goddard', 147955, -55339, 0, 0, -2734, 0);
-insert into zone values (14, 'Town Spawn', 'Rune Castle Town', 43813, -47790, 0, 0, -797, 0);
-insert into zone values (15, 'Town Spawn', 'Heine', 111381, 219064, 0, 0, -3543, 0);
-insert into zone values (16, 'Town Spawn', 'Floran Village', 17817, 170079, 0, 0, -3530, 0);
-insert into zone values (17, 'Town Spawn', 'Ivory Tower', 0, 0, 0, 0, 0, 0);
 
-insert into zone values (1, 'Underground', 'Ascetics Necropolis', 0, 0, 0, 0, -4844, 0);
-insert into zone values (2, 'Underground', 'Elven Ruins', 43100, 246500, 49400, 249200, -6614, 0);
-insert into zone values (3, 'Underground', 'School of Dark Arts', -49800, 56879, -35311, 43790, -6000, 0);
-insert into zone values (4, 'Underground', 'School of Dark Arts', -47150, 41782, -54659, 53065, -6000, 0);
-insert into zone values (5, 'Underground', 'School of Dark Arts', -38741, 55152, -55186, 62474, -6000, 0);
-insert into zone values (6, 'Underground', 'Ants Nest', 917, 165166, -45452, 201937, -6000, 0);
-insert into zone values (7, 'Underground', 'Elven Fortress', 6068, 88790, 36734, 69188, -6000, 0);
-insert into zone values (8, 'Underground', 'Ivory Tower', 76563, 27040, 98577, 7238, -6000, 0);
-insert into zone values (9, 'Underground', 'Hunter Village', 1234573, 68112, 98542, 92245, -6000, 0);
-insert into zone values (10, 'Underground', 'DE Village', 34061, 8905, -7877, 26384, -6000, 0);
-insert into zone values (11, 'Underground', 'Ruins of Despair', -1231, 131977, -31364, 160147, -5000, 0);
-insert into zone values (12, 'Underground', 'Gludin North Road', -77276, 134858, -69590, 120547, -5000, 0);
-insert into zone values (13, 'Underground', '', 38116, 147264, -69590, 120547, -5000, 0);
+insert into zone values (1, 'Peace', 'Giran Arena', 72249, 142018, 72498, 143510, -3774, 0, 0);
+insert into zone values (1, 'Peace', 'Giran Arena', 73495, 142018, 73738, 143510, -3774, 0, 0);
+insert into zone values (1, 'Peace', 'Giran Arena', 72498, 142018, 73495, 142271, -3774, 0, 0);
+insert into zone values (1, 'Peace', 'Giran Arena', 72498, 143255, 73495, 143510, -3774, 0, 0);
+insert into zone values (2, 'Peace', 'Gudin Arena', -88654, 141479, -88410, 142960, -3648, 0, 0);
+insert into zone values (2, 'Peace', 'Gudin Arena', -87421, 141479, -87172, 142960, -3648, 0, 0);
+insert into zone values (2, 'Peace', 'Gudin Arena', -88410, 141479, -87421, 141728, -3648, 0, 0);
+insert into zone values (2, 'Peace', 'Gudin Arena', -88410, 142715, -87421, 142960, -3648, 0, 0);
+insert into zone values (3, 'Peace', 'Collusieum', 147117, 46230, 148014, 47217, -3410, 0, 0);
+insert into zone values (3, 'Peace', 'Collusieum', 147771, 45304, 148014, 46230, -3410, 0, 0);
+insert into zone values (3, 'Peace', 'Collusieum', 147771, 47217, 148014, 48020, -3410, 0, 0);
+insert into zone values (3, 'Peace', 'Collusieum', 150976, 46228, 151885, 47217, -3410, 0, 0);
+insert into zone values (3, 'Peace', 'Collusieum', 150976, 45304, 151218, 46228, -3410, 0, 0);
+insert into zone values (3, 'Peace', 'Collusieum', 150976, 47217, 151218, 48020, -3410, 0, 0);
+insert into zone values (4, 'Peace', 'Monster Track', 11703, 181289, 14574, 183017, -3564, 0, 0);
+insert into zone values (4, 'Peace', 'Monster Track', 11703, 183017, 11955, 184260, -3564, 0, 0);
+insert into zone values (4, 'Peace', 'Monster Track', 11955, 184008, 12937, 184260, -3564, 0, 0);
+insert into zone values (4, 'Peace', 'Monster Track', 12937, 183017, 13192, 184260, -3564, 0, 0);
 
-insert into zone values (1, 'Water', 'Ascetics Necropolis', -56190, 78595, -55175, 79600, -3061, 0);
-insert into zone values (169, 'Fishing', 'Giran North Entrance1', 82480, 143048, 83321, 141782, 0, 0);
-insert into zone values (170, 'Fishing', 'Giran North Entrance2', 82109, 142550, 82211, 142149, 0, 0);
-insert into zone values (171, 'Fishing', 'Giran North Entrance3', 82235, 141780, 82700, 142718, 0, 0);
-insert into zone values (1, 'No Landing', 'ToI', 109448, 10233, 118547, 21446, 0, 0);
+insert into zone values (1, 'Siege Battlefield', 'Gludio', -22900, 104000, -14567, 116513, 0, 0, 0);
+insert into zone values (2, 'Siege Battlefield', 'Dion', 18438, 152343, 25757, 164097, 0, 0, 0);
+insert into zone values (3, 'Siege Battlefield', 'Giran', 105737, 140128, 121331, 149842, 0, 0, 0);
+insert into zone values (4, 'Siege Battlefield', 'Oren', 72876, 32336, 87556, 40457, 0, 0, 0);
+insert into zone values (5, 'Siege Battlefield', 'Aden', 134790, -2552, 154760, 20850, 0, 0, 0);
+insert into zone values (6, 'Siege Battlefield', 'Innadril', 111975, 241396, 120720, 253425, 0, 0, 0);
+insert into zone values (7, 'Siege Battlefield', 'Goddard', 144715, -43884, 150037, -43064, 0, 0, 0);
 
-insert into zone values (1, 'Jail', 'GM Jail', -115600, -250700, -113500, -248200, 0, 0);
-insert into zone values (1, 'Monster Derby Track', 'Monster Derby Track', 11600, 181200, 14600, 184500, -3565, 0);
+insert into zone values (1, 'Town', 'DE Village', 6063, 19664, 17248, 14019, 0, 0, 4);
+insert into zone values (2, 'Town', 'Talking Island', -87312, 240096, -81129, 246345, 0, 0, 1);
+insert into zone values (3, 'Town', 'Elven Village', 48294, 52995, 42402, 46155, 0, 0, 4);
+insert into zone values (4, 'Town', 'Orc Village', -42078, -109785, -47648, -117366, 0, 0, 0);
+insert into zone values (5, 'Town', 'Gludin Village', -84892, 149075, -76820, 156125, 0, 0, 1);
+insert into zone values (6, 'Town', 'Dwarven Village', 117395, -176766, 114650, -184347, 0, 0, 0);
+insert into zone values (7, 'Town', 'Gludio Castle Town', -11853, 126610, -16652, 121003, 0, 0, 1);
+insert into zone values (8, 'Town', 'Dion Castle Town', 15300, 141609, 21570, 147635, 0, 0, 2);
+insert into zone values (9, 'Town', 'Giran Castle Town', 76995, 141424, 90565, 153614, 0, 0, 3);
+insert into zone values (10, 'Town', 'Town of Oren', 76696, 57199, 84511, 50120, 0, 0, 4);
+insert into zone values (11, 'Town', 'Hunter Village', 121308, 73941, 114667, 80383, 0, 0, 5);
+insert into zone values (12, 'Town', 'Town of Aden', 142312, 32317, 152163, 19708, 0, 0, 5);
+insert into zone values (13, 'Town', 'Goddard', 152846, -54289, 143721, -59446, 0, 0, 5);
+insert into zone values (14, 'Town', 'Rune Castle Town', 47150, -44815, 32531, -52045, 0, 0, 6);
+insert into zone values (15, 'Town', 'Heine', 103598, 216010, 118991, 225905, 0, 0, 6);
+insert into zone values (16, 'Town', 'Floran Village', 0, 0, 0, 0, 0, 0, 2);
+insert into zone values (17, 'Town', 'Ivory Tower', 0, 0, 0, 0, 0, 0, 4);
+
+insert into zone values (1, 'Town Spawn', 'DE Village', 12181, 16675, 0, 0, -4580, 0, 0);
+insert into zone values (2, 'Town Spawn', 'Talking Island', -84176, 243382, 0, 0, -3126, 0, 0);
+insert into zone values (3, 'Town Spawn', 'Elven Village', 45525, 48376, 0, 0, -3059, 0, 0);
+insert into zone values (4, 'Town Spawn', 'Orc Village', -45232, -113603, 0, 0, -224, 0, 0);
+insert into zone values (5, 'Town Spawn', 'Gludin Village', -82856, 150901, 0, 0, -3128, 0, 0);
+insert into zone values (6, 'Town Spawn', 'Dwarven Village', 115074, -178115, 0, 0, -880, 0, 0);
+insert into zone values (7, 'Town Spawn', 'Gludio Castle Town', -14138, 122042, 0, 0, -2988, 0, 0);
+insert into zone values (8, 'Town Spawn', 'Dion Castle Town', 18823, 145048, 0, 0, -3126, 0, 0);
+insert into zone values (9, 'Town Spawn', 'Giran Castle Town', 83235, 148497, 0, 0, -3404, 0, 0);
+insert into zone values (10, 'Town Spawn', 'Town of Oren', 80853, 54653, 0, 0, -1524, 0, 0);
+insert into zone values (11, 'Town Spawn', 'Hunter Village', 117163, 76511, 0, 0, -2712, 0, 0);
+insert into zone values (12, 'Town Spawn', 'Town of Aden', 147391, 25967, 0, 0, -2012, 0, 0);
+insert into zone values (13, 'Town Spawn', 'Goddard', 147955, -55339, 0, 0, -2734, 0, 0);
+insert into zone values (14, 'Town Spawn', 'Rune Castle Town', 43813, -47790, 0, 0, -797, 0, 0);
+insert into zone values (15, 'Town Spawn', 'Heine', 111381, 219064, 0, 0, -3543, 0, 0);
+insert into zone values (16, 'Town Spawn', 'Floran Village', 17817, 170079, 0, 0, -3530, 0, 0);
+insert into zone values (17, 'Town Spawn', 'Ivory Tower', 0, 0, 0, 0, 0, 0, 0);
+
+insert into zone values (1, 'Underground', 'Ascetics Necropolis', 0, 0, 0, 0, -4844, 0, 0);
+insert into zone values (2, 'Underground', 'Elven Ruins', 43100, 246500, 49400, 249200, -6614, 0, 0);
+insert into zone values (3, 'Underground', 'School of Dark Arts', -49800, 56879, -35311, 43790, -6000, 0, 0);
+insert into zone values (4, 'Underground', 'School of Dark Arts', -47150, 41782, -54659, 53065, -6000, 0, 0);
+insert into zone values (5, 'Underground', 'School of Dark Arts', -38741, 55152, -55186, 62474, -6000, 0, 0);
+insert into zone values (6, 'Underground', 'Ants Nest', 917, 165166, -45452, 201937, -6000, 0, 0);
+insert into zone values (7, 'Underground', 'Elven Fortress', 6068, 88790, 36734, 69188, -6000, 0, 0);
+insert into zone values (8, 'Underground', 'Ivory Tower', 76563, 27040, 98577, 7238, -6000, 0, 0);
+insert into zone values (9, 'Underground', 'Hunter Village', 1234573, 68112, 98542, 92245, -6000, 0, 0);
+insert into zone values (10, 'Underground', 'DE Village', 34061, 8905, -7877, 26384, -6000, 0, 0);
+insert into zone values (11, 'Underground', 'Ruins of Despair', -1231, 131977, -31364, 160147, -5000, 0, 0);
+insert into zone values (12, 'Underground', 'Gludin North Road', -77276, 134858, -69590, 120547, -5000, 0, 0);
+insert into zone values (13, 'Underground', '', 38116, 147264, -69590, 120547, -5000, 0, 0);
+
+insert into zone values (1, 'Water', 'Ascetics Necropolis', -56190, 78595, -55175, 79600, -3061, 0, 0);
+insert into zone values (169, 'Fishing', 'Giran North Entrance1', 82480, 143048, 83321, 141782, 0, 0, 0);
+insert into zone values (170, 'Fishing', 'Giran North Entrance2', 82109, 142550, 82211, 142149, 0, 0, 0);
+insert into zone values (171, 'Fishing', 'Giran North Entrance3', 82235, 141780, 82700, 142718, 0, 0, 0);
+insert into zone values (1, 'No Landing', 'ToI', 109448, 10233, 118547, 21446, 0, 0, 0);
+
+insert into zone values (1, 'Jail', 'GM Jail', -115600, -250700, -113500, -248200, 0, 0, 0);
+insert into zone values (1, 'Monster Derby Track', 'Monster Derby Track', 11600, 181200, 14600, 184500, -3565, 0, 0);
 
 insert into zone values
-(1, "Olympiad Stadia", "Stadia 1",-19627, -19712, -22024, -22322, -3026, 0),
-(2, "Olympiad Stadia", "Stadia 2",-119100, -223705, -121484, -226316, -3331, 0),
-(3, "Olympiad Stadia", "Stadia 3",-103690, -210300, -101325, -207724, -3331, 0),
-(4, "Olympiad Stadia", "Stadia 4",-119079, -206078, -121438, -208668, -3331, 0),
-(5, "Olympiad Stadia", "Stadia 5",-88700, -226280, -86351, -223722, -3331, 0),
-(6, "Olympiad Stadia", "Stadia 6",-80586, -211911, -82939, -214487, -3331, 0),
-(7, "Olympiad Stadia", "Stadia 7",-88659, -208652, -86297, -206075, -3331, 0),
-(8, "Olympiad Stadia", "Stadia 8",-95000, -219531, -92632, -216950, -3331, 0),
-(9, "Olympiad Stadia", "Stadia 9",-75936, -217408, -78306, -220017, -3331, 0),
-(10, "Olympiad Stadia", "Stadia 10",-68560, -207718, -70933, -210312, -3331, 0),
-(11, "Olympiad Stadia", "Stadia 11",-78008, -202528, -75663, -199943, -3331, 0),
-(12, "Olympiad Stadia", "Stadia 12",-108690, -217403, -111072, -220023, -3331, 0),
-(13, "Olympiad Stadia", "Stadia 13",-127766, -219555, -125394, -216946, -3331, 0),
-(14, "Olympiad Stadia", "Stadia 14",-108428, -199935, -110796, -202541, -3331, 0),
-(15, "Olympiad Stadia", "Stadia 15",-88677, -241444, -86294, -238836, -3331, 0),
-(16, "Olympiad Stadia", "Stadia 16",-82938, -247261, -80580, -244668, -3331, 0),
-(17, "Olympiad Stadia", "Stadia 17",-75930, -250175, -78298, -252779, -3331, 0),
-(18, "Olympiad Stadia", "Stadia 18",-70920, -243079, -68547, -240473, -3331, 0),
-(19, "Olympiad Stadia", "Stadia 19",-75670, -232712, -78027, -235326, -3331, 0),
-(20, "Olympiad Stadia", "Stadia 20",-92632, -249706, -94999, -252316, -3331, 0),
-(21, "Olympiad Stadia", "Stadia 21",-87816, -254280, -86332, -256466, -3331, 0),
-(22, "Olympiad Stadia", "Stadia 22",-113332, -211881, -115713, -214513, -3331, 0);
+(1, "Olympiad Stadia", "Stadia 1",-19627, -19712, -22024, -22322, -3026, 0, 0),
+(2, "Olympiad Stadia", "Stadia 2",-119100, -223705, -121484, -226316, -3331, 0, 0),
+(3, "Olympiad Stadia", "Stadia 3",-103690, -210300, -101325, -207724, -3331, 0, 0),
+(4, "Olympiad Stadia", "Stadia 4",-119079, -206078, -121438, -208668, -3331, 0, 0),
+(5, "Olympiad Stadia", "Stadia 5",-88700, -226280, -86351, -223722, -3331, 0, 0),
+(6, "Olympiad Stadia", "Stadia 6",-80586, -211911, -82939, -214487, -3331, 0, 0),
+(7, "Olympiad Stadia", "Stadia 7",-88659, -208652, -86297, -206075, -3331, 0, 0),
+(8, "Olympiad Stadia", "Stadia 8",-95000, -219531, -92632, -216950, -3331, 0, 0),
+(9, "Olympiad Stadia", "Stadia 9",-75936, -217408, -78306, -220017, -3331, 0, 0),
+(10, "Olympiad Stadia", "Stadia 10",-68560, -207718, -70933, -210312, -3331, 0, 0),
+(11, "Olympiad Stadia", "Stadia 11",-78008, -202528, -75663, -199943, -3331, 0, 0),
+(12, "Olympiad Stadia", "Stadia 12",-108690, -217403, -111072, -220023, -3331, 0, 0),
+(13, "Olympiad Stadia", "Stadia 13",-127766, -219555, -125394, -216946, -3331, 0, 0),
+(14, "Olympiad Stadia", "Stadia 14",-108428, -199935, -110796, -202541, -3331, 0, 0),
+(15, "Olympiad Stadia", "Stadia 15",-88677, -241444, -86294, -238836, -3331, 0, 0),
+(16, "Olympiad Stadia", "Stadia 16",-82938, -247261, -80580, -244668, -3331, 0, 0),
+(17, "Olympiad Stadia", "Stadia 17",-75930, -250175, -78298, -252779, -3331, 0, 0),
+(18, "Olympiad Stadia", "Stadia 18",-70920, -243079, -68547, -240473, -3331, 0, 0),
+(19, "Olympiad Stadia", "Stadia 19",-75670, -232712, -78027, -235326, -3331, 0, 0),
+(20, "Olympiad Stadia", "Stadia 20",-92632, -249706, -94999, -252316, -3331, 0, 0),
+(21, "Olympiad Stadia", "Stadia 21",-87816, -254280, -86332, -256466, -3331, 0, 0),
+(22, "Olympiad Stadia", "Stadia 22",-113332, -211881, -115713, -214513, -3331, 0, 0);
 
 insert into zone values
-(1, 'MotherTree', 'Shadow of the Mother Tree', 47600, 38290, 44483, 41745, -3491, 0),
-(2, 'MotherTree', 'Elven Village', 46249, 50036, 44431, 49176, -3060, 0),
-(3, 'MotherTree', 'East Elven Village', 20580, 51713, 21667, 50393, -3690, 0),
-(4, 'MotherTree', 'Elven Fortress', 24993, 80655, 25454, 82314, -3165, 0),
-(5, 'MotherTree', 'Iris Lake', 57052, 85445, 57937, 87057, -3658, 0);
+(1, 'MotherTree', 'Shadow of the Mother Tree', 47600, 38290, 44483, 41745, -3491, 0, 0),
+(2, 'MotherTree', 'Elven Village', 46249, 50036, 44431, 49176, -3060, 0, 0),
+(3, 'MotherTree', 'East Elven Village', 20580, 51713, 21667, 50393, -3690, 0, 0),
+(4, 'MotherTree', 'Elven Fortress', 24993, 80655, 25454, 82314, -3165, 0, 0),
+(5, 'MotherTree', 'Iris Lake', 57052, 85445, 57937, 87057, -3658, 0, 0);
 
-INSERT INTO `zone` VALUES ('1', 'Fishing', 'Water1', '-131072', '98304', '-98304', '131072', '-3780', '0');
-INSERT INTO `zone` VALUES ('2', 'Fishing', 'Water2', '-131072', '131072', '-98304', '163840', '-3780', '0');
-INSERT INTO `zone` VALUES ('3', 'Fishing', 'Water3', '-131072', '163840', '-98304', '196608', '-3780', '0');
-INSERT INTO `zone` VALUES ('4', 'Fishing', 'Water4', '-131072', '196608', '-98304', '229376', '-3780', '0');
-INSERT INTO `zone` VALUES ('5', 'Fishing', 'Water5', '-131072', '237205', '-98304', '262144', '-3780', '0');
-INSERT INTO `zone` VALUES ('6', 'Fishing', 'Water6', '-98304', '65536', '-85504', '98304', '-3780', '0');
-INSERT INTO `zone` VALUES ('7', 'Fishing', 'Water7', '-85504', '65536', '-65536', '80384', '-3780', '0');
-INSERT INTO `zone` VALUES ('8', 'Fishing', 'Water8', '-85056', '86208', '-84416', '86848', '-3504', '0');
-INSERT INTO `zone` VALUES ('9', 'Fishing', 'Water9', '-84416', '86208', '-82944', '86848', '-5248', '0');
-INSERT INTO `zone` VALUES ('10', 'Fishing', 'Water10', '-98304', '121072', '-88304', '131072', '-3780', '0');
-INSERT INTO `zone` VALUES ('11', 'Fishing', 'Water11', '-98304', '98304', '-96804', '99804', '-3780', '0');
-INSERT INTO `zone` VALUES ('12', 'Fishing', 'Water12', '-68536', '128072', '-65536', '131072', '-3179', '0');
-INSERT INTO `zone` VALUES ('13', 'Fishing', 'Water13', '-84032', '111040', '-83392', '111680', '-3248', '0');
-INSERT INTO `zone` VALUES ('14', 'Fishing', 'Water14', '-83392', '111040', '-81920', '111680', '-4992', '0');
-INSERT INTO `zone` VALUES ('15', 'Fishing', 'Water15', '-98304', '131072', '-78304', '163840', '-3780', '0');
-INSERT INTO `zone` VALUES ('16', 'Fishing', 'Water16', '-69836', '131072', '-65536', '140072', '-3179', '0');
-INSERT INTO `zone` VALUES ('17', 'Fishing', 'Water17', '-98304', '163840', '-65536', '196608', '-3780', '0');
-INSERT INTO `zone` VALUES ('18', 'Fishing', 'Water18', '-98304', '196608', '-65536', '229376', '-3780', '0');
-INSERT INTO `zone` VALUES ('19', 'Fishing', 'Water19', '-98304', '229376', '-65536', '262144', '-3780', '0');
-INSERT INTO `zone` VALUES ('20', 'Fishing', 'Water20', '-65536', '-103304', '-32768', '-98304', '-3780', '0');
-INSERT INTO `zone` VALUES ('21', 'Fishing', 'Water21', '-65536', '32768', '-52036', '65536', '-3780', '0');
-INSERT INTO `zone` VALUES ('22', 'Fishing', 'Water22', '-52036', '32768', '-32768', '40768', '-3780', '0');
-INSERT INTO `zone` VALUES ('23', 'Fishing', 'Water23', '-65536', '65536', '-55536', '75536', '-3780', '0');
-INSERT INTO `zone` VALUES ('24', 'Fishing', 'Water24', '-55360', '78784', '-53888', '79424', '-4832', '0');
-INSERT INTO `zone` VALUES ('25', 'Fishing', 'Water25', '-56000', '78784', '-55360', '79424', '-3088', '0');
-INSERT INTO `zone` VALUES ('26', 'Fishing', 'Water26', '-65536', '122368', '-52480', '131072', '-3179', '0');
-INSERT INTO `zone` VALUES ('27', 'Fishing', 'Water27', '-65536', '113088', '-57664', '121856', '-3659', '0');
-INSERT INTO `zone` VALUES ('28', 'Fishing', 'Water28', '-65536', '131072', '-62464', '141056', '-3179', '0');
-INSERT INTO `zone` VALUES ('29', 'Fishing', 'Water29', '-61764', '131072', '-55748', '132608', '-3179', '0');
-INSERT INTO `zone` VALUES ('30', 'Fishing', 'Water30', '-65536', '191350', '-53536', '196608', '-3780', '0');
-INSERT INTO `zone` VALUES ('31', 'Fishing', 'Water31', '-65535', '179446', '-62962', '191446', '-3780', '0');
-INSERT INTO `zone` VALUES ('32', 'Fishing', 'Water32', '-54681', '180234', '-53049', '183018', '-4702', '0');
-INSERT INTO `zone` VALUES ('33', 'Fishing', 'Water33', '-53616', '183018', '-52368', '184394', '-4702', '0');
-INSERT INTO `zone` VALUES ('34', 'Fishing', 'Water34', '-41888', '206688', '-41248', '208160', '-5177', '0');
-INSERT INTO `zone` VALUES ('35', 'Fishing', 'Water35', '-65536', '196608', '-53536', '229376', '-3780', '0');
-INSERT INTO `zone` VALUES ('36', 'Fishing', 'Water36', '-53536', '220976', '-32768', '229376', '-3780', '0');
-INSERT INTO `zone` VALUES ('37', 'Fishing', 'Water37', '-41024', '212576', '-32768', '220976', '-3780', '0');
-INSERT INTO `zone` VALUES ('38', 'Fishing', 'Water38', '-53536', '212576', '-45280', '220976', '-3780', '0');
-INSERT INTO `zone` VALUES ('39', 'Fishing', 'Water39', '-53536', '202208', '-47584', '209584', '-3780', '0');
-INSERT INTO `zone` VALUES ('40', 'Fishing', 'Water40', '-45280', '212576', '-41024', '220976', '-3780', '0');
-INSERT INTO `zone` VALUES ('41', 'Fishing', 'Water41', '-41888', '206048', '-41248', '206688', '-3434', '0');
-INSERT INTO `zone` VALUES ('42', 'Fishing', 'Water42', '-65536', '229376', '-32768', '262144', '-3780', '0');
-INSERT INTO `zone` VALUES ('43', 'Fishing', 'Water43', '-32768', '-101304', '-29768', '-98304', '-3780', '0');
-INSERT INTO `zone` VALUES ('44', 'Fishing', 'Water44', '-23168', '13184', '-22528', '13824', '-3248', '0');
-INSERT INTO `zone` VALUES ('45', 'Fishing', 'Water45', '-22528', '13184', '-21056', '13824', '-4991', '0');
-INSERT INTO `zone` VALUES ('46', 'Fishing', 'Water46', '-12972', '57536', '-5972', '65536', '-3784', '0');
-INSERT INTO `zone` VALUES ('47', 'Fishing', 'Water47', '-5840', '60646', '-3840', '62646', '-3788', '0');
-INSERT INTO `zone` VALUES ('48', 'Fishing', 'Water48', '-25472', '77056', '-24832', '77696', '-3520', '0');
-INSERT INTO `zone` VALUES ('49', 'Fishing', 'Water49', '-24832', '77056', '-23360', '77696', '-5263', '0');
-INSERT INTO `zone` VALUES ('50', 'Fishing', 'Water50', '-32768', '209376', '-10000', '229376', '-3780', '0');
-INSERT INTO `zone` VALUES ('51', 'Fishing', 'Water51', '4608', '65480', '32768', '70344', '-3794', '0');
-INSERT INTO `zone` VALUES ('52', 'Fishing', 'Water52', '32768', '32768', '60672', '65536', '-3780', '0');
-INSERT INTO `zone` VALUES ('53', 'Fishing', 'Water53', '32768', '65536', '63568', '90536', '-3780', '0');
-INSERT INTO `zone` VALUES ('54', 'Fishing', 'Water54', '63236', '73140', '65536', '75440', '-3780', '0');
-INSERT INTO `zone` VALUES ('55', 'Fishing', 'Water55', '43517', '116837', '52517', '126093', '-3780', '0');
-INSERT INTO `zone` VALUES ('56', 'Fishing', 'Water56', '48773', '115910', '50237', '116709', '-2227', '0');
-INSERT INTO `zone` VALUES ('57', 'Fishing', 'Water57', '46597', '111629', '49597', '115129', '-2259', '0');
-INSERT INTO `zone` VALUES ('58', 'Fishing', 'Water58', '49172', '115129', '50136', '116869', '-2259', '0');
-INSERT INTO `zone` VALUES ('59', 'Fishing', 'Water59', '48000', '115129', '49172', '116357', '-2259', '0');
-INSERT INTO `zone` VALUES ('60', 'Fishing', 'Water60', '44928', '126976', '45568', '127616', '-3776', '0');
-INSERT INTO `zone` VALUES ('61', 'Fishing', 'Water61', '44928', '125504', '45568', '126976', '-5504', '0');
-INSERT INTO `zone` VALUES ('62', 'Fishing', 'Water62', '41917', '139480', '51917', '152770', '-3749', '0');
-INSERT INTO `zone` VALUES ('63', 'Fishing', 'Water63', '39296', '143616', '39936', '144256', '-3728', '0');
-INSERT INTO `zone` VALUES ('64', 'Fishing', 'Water64', '39936', '143616', '41408', '144256', '-5471', '0');
-INSERT INTO `zone` VALUES ('65', 'Fishing', 'Water65', '32768', '181240', '65536', '196608', '-3780', '0');
-INSERT INTO `zone` VALUES ('66', 'Fishing', 'Water66', '32768', '175600', '44032', '181240', '-3780', '0');
-INSERT INTO `zone` VALUES ('67', 'Fishing', 'Water67', '57472', '175600', '65536', '181240', '-3780', '0');
-INSERT INTO `zone` VALUES ('68', 'Fishing', 'Water68', '42496', '169984', '43136', '170624', '-3328', '0');
-INSERT INTO `zone` VALUES ('69', 'Fishing', 'Water69', '43136', '169984', '44608', '170624', '-5071', '0');
-INSERT INTO `zone` VALUES ('70', 'Fishing', 'Water70', '32768', '196608', '65536', '229376', '-3780', '0');
-INSERT INTO `zone` VALUES ('71', 'Fishing', 'Water71', '65536', '4768', '75536', '32768', '-3780', '0');
-INSERT INTO `zone` VALUES ('72', 'Fishing', 'Water72', '75536', '27768', '98304', '32768', '-3780', '0');
-INSERT INTO `zone` VALUES ('73', 'Fishing', 'Water73', '84727', '32768', '91727', '53768', '-3780', '0');
-INSERT INTO `zone` VALUES ('74', 'Fishing', 'Water74', '65536', '91304', '98304', '98304', '-3772', '0');
-INSERT INTO `zone` VALUES ('75', 'Fishing', 'Water75', '65536', '71304', '70536', '91304', '-3772', '0');
-INSERT INTO `zone` VALUES ('76', 'Fishing', 'Water76', '73984', '78080', '74624', '78720', '-3472', '0');
-INSERT INTO `zone` VALUES ('77', 'Fishing', 'Water77', '74624', '78080', '76096', '78720', '-5215', '0');
-INSERT INTO `zone` VALUES ('78', 'Fishing', 'Water78', '78304', '139840', '98304', '163840', '-3780', '0');
-INSERT INTO `zone` VALUES ('79', 'Fishing', 'Water79', '65536', '163840', '74752', '196608', '-3780', '0');
-INSERT INTO `zone` VALUES ('80', 'Fishing', 'Water80', '74752', '163840', '85215', '173976', '-3780', '0');
-INSERT INTO `zone` VALUES ('81', 'Fishing', 'Water81', '74752', '173976', '83244', '178267', '-3780', '0');
-INSERT INTO `zone` VALUES ('82', 'Fishing', 'Water82', '74752', '178267', '78031', '180291', '-3780', '0');
-INSERT INTO `zone` VALUES ('83', 'Fishing', 'Water83', '91149', '163840', '98304', '166737', '-3780', '0');
-INSERT INTO `zone` VALUES ('84', 'Fishing', 'Water84', '95485', '166737', '98304', '193105', '-3780', '0');
-INSERT INTO `zone` VALUES ('85', 'Fishing', 'Water85', '92290', '173976', '95485', '185103', '-3780', '0');
-INSERT INTO `zone` VALUES ('86', 'Fishing', 'Water86', '92290', '193105', '98304', '196608', '-3780', '0');
-INSERT INTO `zone` VALUES ('87', 'Fishing', 'Water87', '93696', '224128', '98304', '229376', '-3780', '0');
-INSERT INTO `zone` VALUES ('88', 'Fishing', 'Water88', '93056', '196608', '98304', '201216', '-3780', '0');
-INSERT INTO `zone` VALUES ('89', 'Fishing', 'Water89', '65536', '196608', '76032', '200320', '-3780', '0');
-INSERT INTO `zone` VALUES ('90', 'Fishing', 'Water90', '70024', '222217', '77862', '229376', '-3780', '0');
-INSERT INTO `zone` VALUES ('91', 'Fishing', 'Water91', '65536', '200320', '70024', '229376', '-3780', '0');
-INSERT INTO `zone` VALUES ('92', 'Fishing', 'Water92', '70024', '200320', '79174', '222217', '-3780', '0');
-INSERT INTO `zone` VALUES ('93', 'Fishing', 'Water93', '77862', '224128', '93696', '229376', '-3780', '0');
-INSERT INTO `zone` VALUES ('94', 'Fishing', 'Water94', '80192', '201216', '98304', '224128', '-3780', '0');
-INSERT INTO `zone` VALUES ('95', 'Fishing', 'Water95', '81856', '196608', '93056', '201216', '-3780', '0');
-INSERT INTO `zone` VALUES ('96', 'Fishing', 'Water96', '79360', '208897', '80000', '209537', '-3786', '0');
-INSERT INTO `zone` VALUES ('97', 'Fishing', 'Water97', '80000', '208897', '81472', '209537', '-5529', '0');
-INSERT INTO `zone` VALUES ('98', 'Fishing', 'Water98', '79174', '209727', '80192', '224128', '-3780', '0');
-INSERT INTO `zone` VALUES ('99', 'Fishing', 'Water99', '79174', '201216', '80192', '208704', '-3780', '0');
-INSERT INTO `zone` VALUES ('100', 'Fishing', 'Water100', '79010', '246661', '86498', '254711', '-10886', '0');
-INSERT INTO `zone` VALUES ('101', 'Fishing', 'Water101', '84195', '239660', '86179', '242732', '-4203', '0');
-INSERT INTO `zone` VALUES ('102', 'Fishing', 'Water102', '82979', '241472', '84195', '241920', '-6763', '0');
-INSERT INTO `zone` VALUES ('103', 'Fishing', 'Water103', '80356', '245013', '84644', '245845', '-8898', '0');
-INSERT INTO `zone` VALUES ('104', 'Fishing', 'Water104', '80303', '258157', '84591', '258989', '-8898', '0');
-INSERT INTO `zone` VALUES ('105', 'Fishing', 'Water105', '65536', '229376', '98304', '262144', '-3780', '0');
-INSERT INTO `zone` VALUES ('106', 'Fishing', 'Water106', '78624', '254711', '82336', '255593', '-10886', '0');
-INSERT INTO `zone` VALUES ('107', 'Fishing', 'Water107', '82785', '254711', '86497', '255593', '-10886', '0');
-INSERT INTO `zone` VALUES ('108', 'Fishing', 'Water108', '82336', '255351', '82785', '255593', '-10886', '0');
-INSERT INTO `zone` VALUES ('109', 'Fishing', 'Water109', '98304', '-229376', '131072', '-196608', '-3780', '0');
-INSERT INTO `zone` VALUES ('110', 'Fishing', 'Water110', '119040', '-196608', '131072', '-178624', '-3780', '0');
-INSERT INTO `zone` VALUES ('111', 'Fishing', 'Water111', '98305', '27768', '120321', '32768', '-3780', '0');
-INSERT INTO `zone` VALUES ('112', 'Fishing', 'Water112', '103091', '37760', '128091', '62760', '-4656', '0');
-INSERT INTO `zone` VALUES ('113', 'Fishing', 'Water113', '110208', '84224', '110848', '84864', '-4864', '0');
-INSERT INTO `zone` VALUES ('114', 'Fishing', 'Water114', '110848', '84224', '112320', '84864', '-6631', '0');
-INSERT INTO `zone` VALUES ('115', 'Fishing', 'Water115', '98304', '138240', '131072', '163840', '-3780', '0');
-INSERT INTO `zone` VALUES ('116', 'Fishing', 'Water116', '112096', '142624', '119232', '147604', '-2892', '0');
-INSERT INTO `zone` VALUES ('117', 'Fishing', 'Water117', '117509', '136740', '122009', '138240', '-3780', '0');
-INSERT INTO `zone` VALUES ('118', 'Fishing', 'Water118', '117509', '136740', '122009', '138240', '-3780', '0');
-INSERT INTO `zone` VALUES ('119', 'Fishing', 'Water119', '117509', '136740', '122009', '138240', '-3780', '0');
-INSERT INTO `zone` VALUES ('120', 'Fishing', 'Water120', '114560', '132480', '115200', '133120', '-3184', '0');
-INSERT INTO `zone` VALUES ('121', 'Fishing', 'Water121', '115200', '132480', '116672', '133120', '-4928', '0');
-INSERT INTO `zone` VALUES ('122', 'Fishing', 'Water122', '98304', '163840', '131072', '167840', '-3780', '0');
-INSERT INTO `zone` VALUES ('123', 'Fishing', 'Water123', '98304', '167840', '102304', '196608', '-3780', '0');
-INSERT INTO `zone` VALUES ('124', 'Fishing', 'Water124', '124072', '167840', '131072', '196608', '-3780', '0');
-INSERT INTO `zone` VALUES ('125', 'Fishing', 'Water125', '102304', '191608', '124072', '196608', '-3780', '0');
-INSERT INTO `zone` VALUES ('126', 'Fishing', 'Water126', '121672', '186199', '124072', '189151', '-3780', '0');
-INSERT INTO `zone` VALUES ('127', 'Fishing', 'Water127', '102304', '184170', '105652', '187250', '-3780', '0');
-INSERT INTO `zone` VALUES ('128', 'Fishing', 'Water128', '102304', '168567', '106804', '173567', '-3780', '0');
-INSERT INTO `zone` VALUES ('129', 'Fishing', 'Water129', '107520', '173696', '108160', '174336', '-3776', '0');
-INSERT INTO `zone` VALUES ('130', 'Fishing', 'Water130', '108160', '173696', '109632', '174336', '-5529', '0');
-INSERT INTO `zone` VALUES ('131', 'Fishing', 'Water131', '98304', '196608', '131072', '229376', '-3780', '0');
-INSERT INTO `zone` VALUES ('132', 'Fishing', 'Water132', '98304', '229376', '131072', '262144', '-3780', '0');
-INSERT INTO `zone` VALUES ('133', 'Fishing', 'Water133', '131072', '-229376', '163840', '-196608', '-3780', '0');
-INSERT INTO `zone` VALUES ('134', 'Fishing', 'Water134', '131072', '-196608', '163840', '-178608', '-3780', '0');
-INSERT INTO `zone` VALUES ('135', 'Fishing', 'Water135', '145081', '25139', '149881', '29939', '-2528', '0');
-INSERT INTO `zone` VALUES ('136', 'Fishing', 'Water136', '131059', '32768', '163827', '65536', '-3776', '0');
-INSERT INTO `zone` VALUES ('137', 'Fishing', 'Water137', '136648', '79304', '137400', '80056', '-3736', '0');
-INSERT INTO `zone` VALUES ('138', 'Fishing', 'Water138', '137400', '79360', '138816', '80000', '-5519', '0');
-INSERT INTO `zone` VALUES ('139', 'Fishing', 'Water139', '137472', '65536', '163840', '98304', '-3780', '0');
-INSERT INTO `zone` VALUES ('140', 'Fishing', 'Water140', '131072', '126072', '136072', '131072', '-3780', '0');
-INSERT INTO `zone` VALUES ('141', 'Fishing', 'Water141', '163840', '-229376', '196608', '-196608', '-3780', '0');
-INSERT INTO `zone` VALUES ('142', 'Fishing', 'Water142', '163840', '-196608', '168840', '-186608', '-3780', '0');
-INSERT INTO `zone` VALUES ('143', 'Fishing', 'Water143', '173411', '-187756', '186042', '-182534', '-4465', '0');
-INSERT INTO `zone` VALUES ('144', 'Fishing', 'Water144', '174206', '-182687', '176749', '-179167', '-2066', '0');
-INSERT INTO `zone` VALUES ('145', 'Fishing', 'Water145', '170908', '-116846', '173748', '-113953', '-4033', '0');
-INSERT INTO `zone` VALUES ('146', 'Fishing', 'Water146', '170926', '-113936', '173766', '-111043', '-5256', '0');
-INSERT INTO `zone` VALUES ('147', 'Fishing', 'Water147', '163840', '65760', '173840', '95072', '-3780', '0');
-INSERT INTO `zone` VALUES ('148', 'Fishing', 'Water148', '168576', '-17920', '169216', '-17280', '-3248', '0');
-INSERT INTO `zone` VALUES ('149', 'Fishing', 'Water149', '169216', '-17920', '170688', '-17280', '-4991', '0');
-INSERT INTO `zone` VALUES ('150', 'Fishing', 'Water150', '32768', '-98304', '65536', '-65536', '-3780', '0');
-INSERT INTO `zone` VALUES ('151', 'Fishing', 'Water151', '32768', '-65536', '65536', '-32768', '-3784', '0');
-INSERT INTO `zone` VALUES ('152', 'Fishing', 'Water152', '65536', '-40960', '98304', '-32768', '-3780', '0');
-INSERT INTO `zone` VALUES ('153', 'Fishing', 'Water153', '91829', '-55930', '95637', '-50266', '-2633', '0');
-INSERT INTO `zone` VALUES ('154', 'Fishing', 'Water154', '87765', '-54554', '91829', '-50266', '-2633', '0');
-INSERT INTO `zone` VALUES ('155', 'Fishing', 'Water155', '84947', '-50234', '90133', '-46202', '-3152', '0');
-INSERT INTO `zone` VALUES ('156', 'Fishing', 'Water156', '76003', '-46368', '84947', '-39968', '-3248', '0');
-INSERT INTO `zone` VALUES ('157', 'Fishing', 'Water157', '68852', '-62008', '74036', '-56192', '-3161', '0');
-INSERT INTO `zone` VALUES ('158', 'Fishing', 'Water158', '69480', '-56192', '77032', '-53203', '-3161', '0');
-INSERT INTO `zone` VALUES ('159', 'Fishing', 'Water159', '71311', '-53203', '76175', '-50292', '-3161', '0');
-INSERT INTO `zone` VALUES ('160', 'Fishing', 'Water160', '75059', '-63591', '78355', '-57517', '-2352', '0');
-INSERT INTO `zone` VALUES ('161', 'Fishing', 'Water161', '78355', '-65184', '83859', '-51872', '-2352', '0');
-INSERT INTO `zone` VALUES ('162', 'Fishing', 'Water162', '83859', '-64826', '87187', '-55418', '-2352', '0');
-INSERT INTO `zone` VALUES ('163', 'Fishing', 'Water163', '87187', '-62909', '90963', '-58301', '-2352', '0');
-INSERT INTO `zone` VALUES ('164', 'Fishing', 'Water164', '77283', '-51872', '83747', '-49440', '-2352', '0');
-INSERT INTO `zone` VALUES ('165', 'Fishing', 'Water165', '83859', '-55418', '86227', '-52602', '-2352', '0');
-INSERT INTO `zone` VALUES ('166', 'Fishing', 'Water166', '69635', '-47328', '76003', '-39776', '-3248', '0');
-INSERT INTO `zone` VALUES ('167', 'Fishing', 'Water167', '87187', '-58301', '89235', '-56541', '-2352', '0');
-INSERT INTO `zone` VALUES ('168', 'Fishing', 'Water168', '76800', '-32768', '98304', '-18432', '-3780', '0');
+INSERT INTO `zone` VALUES ('1', 'Fishing', 'Water1', '-131072', '98304', '-98304', '131072', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('2', 'Fishing', 'Water2', '-131072', '131072', '-98304', '163840', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('3', 'Fishing', 'Water3', '-131072', '163840', '-98304', '196608', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('4', 'Fishing', 'Water4', '-131072', '196608', '-98304', '229376', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('5', 'Fishing', 'Water5', '-131072', '237205', '-98304', '262144', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('6', 'Fishing', 'Water6', '-98304', '65536', '-85504', '98304', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('7', 'Fishing', 'Water7', '-85504', '65536', '-65536', '80384', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('8', 'Fishing', 'Water8', '-85056', '86208', '-84416', '86848', '-3504', '0', '0');
+INSERT INTO `zone` VALUES ('9', 'Fishing', 'Water9', '-84416', '86208', '-82944', '86848', '-5248', '0', '0');
+INSERT INTO `zone` VALUES ('10', 'Fishing', 'Water10', '-98304', '121072', '-88304', '131072', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('11', 'Fishing', 'Water11', '-98304', '98304', '-96804', '99804', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('12', 'Fishing', 'Water12', '-68536', '128072', '-65536', '131072', '-3179', '0', '0');
+INSERT INTO `zone` VALUES ('13', 'Fishing', 'Water13', '-84032', '111040', '-83392', '111680', '-3248', '0', '0');
+INSERT INTO `zone` VALUES ('14', 'Fishing', 'Water14', '-83392', '111040', '-81920', '111680', '-4992', '0', '0');
+INSERT INTO `zone` VALUES ('15', 'Fishing', 'Water15', '-98304', '131072', '-78304', '163840', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('16', 'Fishing', 'Water16', '-69836', '131072', '-65536', '140072', '-3179', '0', '0');
+INSERT INTO `zone` VALUES ('17', 'Fishing', 'Water17', '-98304', '163840', '-65536', '196608', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('18', 'Fishing', 'Water18', '-98304', '196608', '-65536', '229376', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('19', 'Fishing', 'Water19', '-98304', '229376', '-65536', '262144', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('20', 'Fishing', 'Water20', '-65536', '-103304', '-32768', '-98304', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('21', 'Fishing', 'Water21', '-65536', '32768', '-52036', '65536', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('22', 'Fishing', 'Water22', '-52036', '32768', '-32768', '40768', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('23', 'Fishing', 'Water23', '-65536', '65536', '-55536', '75536', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('24', 'Fishing', 'Water24', '-55360', '78784', '-53888', '79424', '-4832', '0', '0');
+INSERT INTO `zone` VALUES ('25', 'Fishing', 'Water25', '-56000', '78784', '-55360', '79424', '-3088', '0', '0');
+INSERT INTO `zone` VALUES ('26', 'Fishing', 'Water26', '-65536', '122368', '-52480', '131072', '-3179', '0', '0');
+INSERT INTO `zone` VALUES ('27', 'Fishing', 'Water27', '-65536', '113088', '-57664', '121856', '-3659', '0', '0');
+INSERT INTO `zone` VALUES ('28', 'Fishing', 'Water28', '-65536', '131072', '-62464', '141056', '-3179', '0', '0');
+INSERT INTO `zone` VALUES ('29', 'Fishing', 'Water29', '-61764', '131072', '-55748', '132608', '-3179', '0', '0');
+INSERT INTO `zone` VALUES ('30', 'Fishing', 'Water30', '-65536', '191350', '-53536', '196608', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('31', 'Fishing', 'Water31', '-65535', '179446', '-62962', '191446', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('32', 'Fishing', 'Water32', '-54681', '180234', '-53049', '183018', '-4702', '0', '0');
+INSERT INTO `zone` VALUES ('33', 'Fishing', 'Water33', '-53616', '183018', '-52368', '184394', '-4702', '0', '0');
+INSERT INTO `zone` VALUES ('34', 'Fishing', 'Water34', '-41888', '206688', '-41248', '208160', '-5177', '0', '0');
+INSERT INTO `zone` VALUES ('35', 'Fishing', 'Water35', '-65536', '196608', '-53536', '229376', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('36', 'Fishing', 'Water36', '-53536', '220976', '-32768', '229376', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('37', 'Fishing', 'Water37', '-41024', '212576', '-32768', '220976', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('38', 'Fishing', 'Water38', '-53536', '212576', '-45280', '220976', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('39', 'Fishing', 'Water39', '-53536', '202208', '-47584', '209584', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('40', 'Fishing', 'Water40', '-45280', '212576', '-41024', '220976', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('41', 'Fishing', 'Water41', '-41888', '206048', '-41248', '206688', '-3434', '0', '0');
+INSERT INTO `zone` VALUES ('42', 'Fishing', 'Water42', '-65536', '229376', '-32768', '262144', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('43', 'Fishing', 'Water43', '-32768', '-101304', '-29768', '-98304', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('44', 'Fishing', 'Water44', '-23168', '13184', '-22528', '13824', '-3248', '0', '0');
+INSERT INTO `zone` VALUES ('45', 'Fishing', 'Water45', '-22528', '13184', '-21056', '13824', '-4991', '0', '0');
+INSERT INTO `zone` VALUES ('46', 'Fishing', 'Water46', '-12972', '57536', '-5972', '65536', '-3784', '0', '0');
+INSERT INTO `zone` VALUES ('47', 'Fishing', 'Water47', '-5840', '60646', '-3840', '62646', '-3788', '0', '0');
+INSERT INTO `zone` VALUES ('48', 'Fishing', 'Water48', '-25472', '77056', '-24832', '77696', '-3520', '0', '0');
+INSERT INTO `zone` VALUES ('49', 'Fishing', 'Water49', '-24832', '77056', '-23360', '77696', '-5263', '0', '0');
+INSERT INTO `zone` VALUES ('50', 'Fishing', 'Water50', '-32768', '209376', '-10000', '229376', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('51', 'Fishing', 'Water51', '4608', '65480', '32768', '70344', '-3794', '0', '0');
+INSERT INTO `zone` VALUES ('52', 'Fishing', 'Water52', '32768', '32768', '60672', '65536', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('53', 'Fishing', 'Water53', '32768', '65536', '63568', '90536', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('54', 'Fishing', 'Water54', '63236', '73140', '65536', '75440', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('55', 'Fishing', 'Water55', '43517', '116837', '52517', '126093', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('56', 'Fishing', 'Water56', '48773', '115910', '50237', '116709', '-2227', '0', '0');
+INSERT INTO `zone` VALUES ('57', 'Fishing', 'Water57', '46597', '111629', '49597', '115129', '-2259', '0', '0');
+INSERT INTO `zone` VALUES ('58', 'Fishing', 'Water58', '49172', '115129', '50136', '116869', '-2259', '0', '0');
+INSERT INTO `zone` VALUES ('59', 'Fishing', 'Water59', '48000', '115129', '49172', '116357', '-2259', '0', '0');
+INSERT INTO `zone` VALUES ('60', 'Fishing', 'Water60', '44928', '126976', '45568', '127616', '-3776', '0', '0');
+INSERT INTO `zone` VALUES ('61', 'Fishing', 'Water61', '44928', '125504', '45568', '126976', '-5504', '0', '0');
+INSERT INTO `zone` VALUES ('62', 'Fishing', 'Water62', '41917', '139480', '51917', '152770', '-3749', '0', '0');
+INSERT INTO `zone` VALUES ('63', 'Fishing', 'Water63', '39296', '143616', '39936', '144256', '-3728', '0', '0');
+INSERT INTO `zone` VALUES ('64', 'Fishing', 'Water64', '39936', '143616', '41408', '144256', '-5471', '0', '0');
+INSERT INTO `zone` VALUES ('65', 'Fishing', 'Water65', '32768', '181240', '65536', '196608', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('66', 'Fishing', 'Water66', '32768', '175600', '44032', '181240', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('67', 'Fishing', 'Water67', '57472', '175600', '65536', '181240', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('68', 'Fishing', 'Water68', '42496', '169984', '43136', '170624', '-3328', '0', '0');
+INSERT INTO `zone` VALUES ('69', 'Fishing', 'Water69', '43136', '169984', '44608', '170624', '-5071', '0', '0');
+INSERT INTO `zone` VALUES ('70', 'Fishing', 'Water70', '32768', '196608', '65536', '229376', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('71', 'Fishing', 'Water71', '65536', '4768', '75536', '32768', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('72', 'Fishing', 'Water72', '75536', '27768', '98304', '32768', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('73', 'Fishing', 'Water73', '84727', '32768', '91727', '53768', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('74', 'Fishing', 'Water74', '65536', '91304', '98304', '98304', '-3772', '0', '0');
+INSERT INTO `zone` VALUES ('75', 'Fishing', 'Water75', '65536', '71304', '70536', '91304', '-3772', '0', '0');
+INSERT INTO `zone` VALUES ('76', 'Fishing', 'Water76', '73984', '78080', '74624', '78720', '-3472', '0', '0');
+INSERT INTO `zone` VALUES ('77', 'Fishing', 'Water77', '74624', '78080', '76096', '78720', '-5215', '0', '0');
+INSERT INTO `zone` VALUES ('78', 'Fishing', 'Water78', '78304', '139840', '98304', '163840', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('79', 'Fishing', 'Water79', '65536', '163840', '74752', '196608', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('80', 'Fishing', 'Water80', '74752', '163840', '85215', '173976', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('81', 'Fishing', 'Water81', '74752', '173976', '83244', '178267', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('82', 'Fishing', 'Water82', '74752', '178267', '78031', '180291', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('83', 'Fishing', 'Water83', '91149', '163840', '98304', '166737', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('84', 'Fishing', 'Water84', '95485', '166737', '98304', '193105', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('85', 'Fishing', 'Water85', '92290', '173976', '95485', '185103', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('86', 'Fishing', 'Water86', '92290', '193105', '98304', '196608', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('87', 'Fishing', 'Water87', '93696', '224128', '98304', '229376', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('88', 'Fishing', 'Water88', '93056', '196608', '98304', '201216', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('89', 'Fishing', 'Water89', '65536', '196608', '76032', '200320', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('90', 'Fishing', 'Water90', '70024', '222217', '77862', '229376', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('91', 'Fishing', 'Water91', '65536', '200320', '70024', '229376', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('92', 'Fishing', 'Water92', '70024', '200320', '79174', '222217', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('93', 'Fishing', 'Water93', '77862', '224128', '93696', '229376', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('94', 'Fishing', 'Water94', '80192', '201216', '98304', '224128', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('95', 'Fishing', 'Water95', '81856', '196608', '93056', '201216', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('96', 'Fishing', 'Water96', '79360', '208897', '80000', '209537', '-3786', '0', '0');
+INSERT INTO `zone` VALUES ('97', 'Fishing', 'Water97', '80000', '208897', '81472', '209537', '-5529', '0', '0');
+INSERT INTO `zone` VALUES ('98', 'Fishing', 'Water98', '79174', '209727', '80192', '224128', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('99', 'Fishing', 'Water99', '79174', '201216', '80192', '208704', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('100', 'Fishing', 'Water100', '79010', '246661', '86498', '254711', '-10886', '0', '0');
+INSERT INTO `zone` VALUES ('101', 'Fishing', 'Water101', '84195', '239660', '86179', '242732', '-4203', '0', '0');
+INSERT INTO `zone` VALUES ('102', 'Fishing', 'Water102', '82979', '241472', '84195', '241920', '-6763', '0', '0');
+INSERT INTO `zone` VALUES ('103', 'Fishing', 'Water103', '80356', '245013', '84644', '245845', '-8898', '0', '0');
+INSERT INTO `zone` VALUES ('104', 'Fishing', 'Water104', '80303', '258157', '84591', '258989', '-8898', '0', '0');
+INSERT INTO `zone` VALUES ('105', 'Fishing', 'Water105', '65536', '229376', '98304', '262144', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('106', 'Fishing', 'Water106', '78624', '254711', '82336', '255593', '-10886', '0', '0');
+INSERT INTO `zone` VALUES ('107', 'Fishing', 'Water107', '82785', '254711', '86497', '255593', '-10886', '0', '0');
+INSERT INTO `zone` VALUES ('108', 'Fishing', 'Water108', '82336', '255351', '82785', '255593', '-10886', '0', '0');
+INSERT INTO `zone` VALUES ('109', 'Fishing', 'Water109', '98304', '-229376', '131072', '-196608', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('110', 'Fishing', 'Water110', '119040', '-196608', '131072', '-178624', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('111', 'Fishing', 'Water111', '98305', '27768', '120321', '32768', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('112', 'Fishing', 'Water112', '103091', '37760', '128091', '62760', '-4656', '0', '0');
+INSERT INTO `zone` VALUES ('113', 'Fishing', 'Water113', '110208', '84224', '110848', '84864', '-4864', '0', '0');
+INSERT INTO `zone` VALUES ('114', 'Fishing', 'Water114', '110848', '84224', '112320', '84864', '-6631', '0', '0');
+INSERT INTO `zone` VALUES ('115', 'Fishing', 'Water115', '98304', '138240', '131072', '163840', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('116', 'Fishing', 'Water116', '112096', '142624', '119232', '147604', '-2892', '0', '0');
+INSERT INTO `zone` VALUES ('117', 'Fishing', 'Water117', '117509', '136740', '122009', '138240', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('118', 'Fishing', 'Water118', '117509', '136740', '122009', '138240', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('119', 'Fishing', 'Water119', '117509', '136740', '122009', '138240', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('120', 'Fishing', 'Water120', '114560', '132480', '115200', '133120', '-3184', '0', '0');
+INSERT INTO `zone` VALUES ('121', 'Fishing', 'Water121', '115200', '132480', '116672', '133120', '-4928', '0', '0');
+INSERT INTO `zone` VALUES ('122', 'Fishing', 'Water122', '98304', '163840', '131072', '167840', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('123', 'Fishing', 'Water123', '98304', '167840', '102304', '196608', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('124', 'Fishing', 'Water124', '124072', '167840', '131072', '196608', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('125', 'Fishing', 'Water125', '102304', '191608', '124072', '196608', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('126', 'Fishing', 'Water126', '121672', '186199', '124072', '189151', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('127', 'Fishing', 'Water127', '102304', '184170', '105652', '187250', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('128', 'Fishing', 'Water128', '102304', '168567', '106804', '173567', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('129', 'Fishing', 'Water129', '107520', '173696', '108160', '174336', '-3776', '0', '0');
+INSERT INTO `zone` VALUES ('130', 'Fishing', 'Water130', '108160', '173696', '109632', '174336', '-5529', '0', '0');
+INSERT INTO `zone` VALUES ('131', 'Fishing', 'Water131', '98304', '196608', '131072', '229376', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('132', 'Fishing', 'Water132', '98304', '229376', '131072', '262144', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('133', 'Fishing', 'Water133', '131072', '-229376', '163840', '-196608', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('134', 'Fishing', 'Water134', '131072', '-196608', '163840', '-178608', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('135', 'Fishing', 'Water135', '145081', '25139', '149881', '29939', '-2528', '0', '0');
+INSERT INTO `zone` VALUES ('136', 'Fishing', 'Water136', '131059', '32768', '163827', '65536', '-3776', '0', '0');
+INSERT INTO `zone` VALUES ('137', 'Fishing', 'Water137', '136648', '79304', '137400', '80056', '-3736', '0', '0');
+INSERT INTO `zone` VALUES ('138', 'Fishing', 'Water138', '137400', '79360', '138816', '80000', '-5519', '0', '0');
+INSERT INTO `zone` VALUES ('139', 'Fishing', 'Water139', '137472', '65536', '163840', '98304', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('140', 'Fishing', 'Water140', '131072', '126072', '136072', '131072', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('141', 'Fishing', 'Water141', '163840', '-229376', '196608', '-196608', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('142', 'Fishing', 'Water142', '163840', '-196608', '168840', '-186608', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('143', 'Fishing', 'Water143', '173411', '-187756', '186042', '-182534', '-4465', '0', '0');
+INSERT INTO `zone` VALUES ('144', 'Fishing', 'Water144', '174206', '-182687', '176749', '-179167', '-2066', '0', '0');
+INSERT INTO `zone` VALUES ('145', 'Fishing', 'Water145', '170908', '-116846', '173748', '-113953', '-4033', '0', '0');
+INSERT INTO `zone` VALUES ('146', 'Fishing', 'Water146', '170926', '-113936', '173766', '-111043', '-5256', '0', '0');
+INSERT INTO `zone` VALUES ('147', 'Fishing', 'Water147', '163840', '65760', '173840', '95072', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('148', 'Fishing', 'Water148', '168576', '-17920', '169216', '-17280', '-3248', '0', '0');
+INSERT INTO `zone` VALUES ('149', 'Fishing', 'Water149', '169216', '-17920', '170688', '-17280', '-4991', '0', '0');
+INSERT INTO `zone` VALUES ('150', 'Fishing', 'Water150', '32768', '-98304', '65536', '-65536', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('151', 'Fishing', 'Water151', '32768', '-65536', '65536', '-32768', '-3784', '0', '0');
+INSERT INTO `zone` VALUES ('152', 'Fishing', 'Water152', '65536', '-40960', '98304', '-32768', '-3780', '0', '0');
+INSERT INTO `zone` VALUES ('153', 'Fishing', 'Water153', '91829', '-55930', '95637', '-50266', '-2633', '0', '0');
+INSERT INTO `zone` VALUES ('154', 'Fishing', 'Water154', '87765', '-54554', '91829', '-50266', '-2633', '0', '0');
+INSERT INTO `zone` VALUES ('155', 'Fishing', 'Water155', '84947', '-50234', '90133', '-46202', '-3152', '0', '0');
+INSERT INTO `zone` VALUES ('156', 'Fishing', 'Water156', '76003', '-46368', '84947', '-39968', '-3248', '0', '0');
+INSERT INTO `zone` VALUES ('157', 'Fishing', 'Water157', '68852', '-62008', '74036', '-56192', '-3161', '0', '0');
+INSERT INTO `zone` VALUES ('158', 'Fishing', 'Water158', '69480', '-56192', '77032', '-53203', '-3161', '0', '0');
+INSERT INTO `zone` VALUES ('159', 'Fishing', 'Water159', '71311', '-53203', '76175', '-50292', '-3161', '0', '0');
+INSERT INTO `zone` VALUES ('160', 'Fishing', 'Water160', '75059', '-63591', '78355', '-57517', '-2352', '0', '0');
+INSERT INTO `zone` VALUES ('161', 'Fishing', 'Water161', '78355', '-65184', '83859', '-51872', '-2352', '0', '0');
+INSERT INTO `zone` VALUES ('162', 'Fishing', 'Water162', '83859', '-64826', '87187', '-55418', '-2352', '0', '0');
+INSERT INTO `zone` VALUES ('163', 'Fishing', 'Water163', '87187', '-62909', '90963', '-58301', '-2352', '0', '0');
+INSERT INTO `zone` VALUES ('164', 'Fishing', 'Water164', '77283', '-51872', '83747', '-49440', '-2352', '0', '0');
+INSERT INTO `zone` VALUES ('165', 'Fishing', 'Water165', '83859', '-55418', '86227', '-52602', '-2352', '0', '0');
+INSERT INTO `zone` VALUES ('166', 'Fishing', 'Water166', '69635', '-47328', '76003', '-39776', '-3248', '0', '0');
+INSERT INTO `zone` VALUES ('167', 'Fishing', 'Water167', '87187', '-58301', '89235', '-56541', '-2352', '0', '0');
+INSERT INTO `zone` VALUES ('168', 'Fishing', 'Water168', '76800', '-32768', '98304', '-18432', '-3780', '0', '0');

datapack_development/tools/database_installer.bat

@@ -141,6 +141,7 @@ echo Installling new gameserver content.
 %mysqlPath% -h %gshost% -u %gsuser% --password=%gspass% -D %gsdb% < ../sql/clan_skills.sql
 %mysqlPath% -h %gshost% -u %gsuser% --password=%gspass% -D %gsdb% < ../sql/clan_wars.sql
 %mysqlPath% -h %gshost% -u %gsuser% --password=%gspass% -D %gsdb% < ../sql/clanhall.sql
+%mysqlPath% -h %gshost% -u %gsuser% --password=%gspass% -D %gsdb% < ../sql/clanhall_functions.sql
 %mysqlPath% -h %gshost% -u %gsuser% --password=%gspass% -D %gsdb% < ../sql/class_list.sql
 %mysqlPath% -h %gshost% -u %gsuser% --password=%gspass% -D %gsdb% < ../sql/cursedWeapons.sql
 %mysqlPath% -h %gshost% -u %gsuser% --password=%gspass% -D %gsdb% < ../sql/droplist.sql

datapack_development/tools/database_installer.sh

@@ -273,6 +273,7 @@ $MYG < ../sql/clan_skills.sql &> /dev/null
 $MYG < ../sql/clan_subpledges.sql &> /dev/null
 $MYG < ../sql/clan_wars.sql &> /dev/null
 $MYG < ../sql/clanhall.sql &> /dev/null
+$MYG < ../sql/clanhall_functions.sql &> /dev/null
 $MYG < ../sql/class_list.sql &> /dev/null
 $MYG < ../sql/cursedWeapons.sql &> /dev/null
 $MYG < ../sql/droplist.sql &> /dev/null

datapack_development/tools/full_install.sql

@@ -28,6 +28,7 @@ DROP TABLE IF EXISTS clan_skills;
 DROP TABLE IF EXISTS clan_subpledges;
 DROP TABLE IF EXISTS clan_wars;
 DROP TABLE IF EXISTS clanhall;
+DROP TABLE IF EXISTS clanhall_functions;
 DROP TABLE IF EXISTS class_list;
 DROP TABLE IF EXISTS cursedWeapons;
 DROP TABLE IF EXISTS droplist;