SQL/HTML support by Steuf for [L898]; Requires [L898]

datapack_development/data/html/auction/AgitAuctionInfo.htm

@@ -19,7 +19,7 @@
 <img src="L2UI.SquareGray" width=270 height=1> <img src="L2UI.SquareBlank" width=1 height=3>
 <table width=280 border=0>
 <tr><td width=140><font color="a2a0a2">Time and date auction ends</font></td>
-<td width=140><font color="b09979">%AGIT_AUCTION_END_YY%/%AGIT_AUCTION_END_MM%/%AGIT_AUCTION_END_DD% %AGIT_AUCTION_END_HH% hour </font></td></tr>
+<td width=140><font color="b09979">%AGIT_AUCTION_END%</font></td></tr>
 <tr><td><font color="a2a0a2">Time remaining</font></td>
 <td><font color="b09979">%AGIT_AUCTION_REMAIN%</font></td></tr>
 <tr><td><font color="a2a0a2">Minimum bid price</font></td>
@@ -34,7 +34,7 @@
 <table width=280 border=0>
 <tr>
 <td width=60></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_BACK%" 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>

datapack_development/data/html/auction/AgitAuctionList.htm

@@ -10,20 +10,12 @@
 <td width=70 align=center>Min Bid</td>
 </tr>
 </table>
-<table width=280 border=0>
-<tr>
-<td width=70 align=center></td>
-<td width=110 align=center></td>
-<td width=80 align=center></td>
-<td width=70 align=center></td>
-</tr>
 %itemsField%
-</table>
 <img src="L2UI.SquareWhite" width=280 height=1> <img src="L2UI.SquareBlank" width=280 height=5>
 <table width=280 border=0>
 <tr>
 <td width=210></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="%AGIT_LINK_BACK%" value="Back" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
 </tr>
 </table>
 </body>

datapack_development/data/html/auction/AgitBid2.htm

@@ -6,13 +6,13 @@
 <tr><td>Bid price</td>
 <td><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></tr>
+<td>%AGIT_AUCTION_END%</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="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="%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%_bid1" value="Confirm" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
 </tr>
 </table>

datapack_development/data/html/auction/AgitBidCancel.htm

@@ -8,7 +8,7 @@ When an auction bid is canceled, the transaction tax (<font color="LEVEL">10% of
 <table width=270 border=0>
 <tr>
 <td width=130></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="%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%_doCancelBid" value="Cancel Bidding" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
 </tr>
 </table>

datapack_development/data/html/auction/AgitBidInfo.htm

@@ -19,7 +19,7 @@
 <img src="L2UI.SquareGray" width=270 height=1> <img src="L2UI.SquareBlank" width=1 height=3>
 <table width=280 border=0>
 <tr><td width=140><font color="a2a0a2">Auction ends at</font></td>
-<td width=140><font color="b09979">%AGIT_AUCTION_END_YY%/%AGIT_AUCTION_END_MM%/%AGIT_AUCTION_END_DD% %AGIT_AUCTION_END_HH% hour </font></td></tr>
+<td width=140><font color="b09979">%AGIT_AUCTION_END%</font></td></tr>
 <tr><td><font color="a2a0a2">Time remaining</font></td>
 <td><font color="b09979">%AGIT_AUCTION_REMAIN%</font></td></tr>
 <tr><td><font color="a2a0a2">Minimum bid price</font></td>
@@ -39,7 +39,7 @@
 </tr>
 <tr>
 <td width=130></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="%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%_rebid" value="Rebid" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
 </tr>
 </table>

datapack_development/data/html/auction/AgitBidderList.htm

@@ -23,7 +23,7 @@
 <table width=280 border=0>
 <tr>
 <td width=210></td>
-<td width=70 align=center><button action="bypass -h npc_%objectId%_bidding_AgitBidderList" value="Back" 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>
 </tr>
 </table>
 </body>

datapack_development/data/html/auction/AgitInfo.htm

@@ -19,7 +19,7 @@
 <table width=280 border=0>
 <tr>
 <td width=130></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="%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%_sale" value="Sell" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
 </tr>
 </table>

datapack_development/data/html/auction/AgitSale1.htm

@@ -5,7 +5,7 @@ In order to put a clan hall up for auction, a <font color="LEVEL">deposit</font>
 <table width=270 border=0>
 <tr>
 <td width=130></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="%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%_sale2" value="Sell" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
 </tr>
 </table>

datapack_development/data/html/auction/AgitSale2.htm

@@ -8,7 +8,7 @@ Write an explanation of the clan hall. <multiedit var="comment" width=270><img s
 <table width=270 border=0>
 <tr>
 <td width=130></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="%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%_auction $day $minbid" value="Sell" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td> 
 </tr>
 </table>

datapack_development/data/html/auction/AgitSale3.htm

@@ -8,7 +8,7 @@
 <tr><td width=140>Auction period</td>
 <td width=140>%x% days</td></tr>
 <tr><td width=140>Auction closing date</td>
-<td width=140>%AGIT_AUCTION_END_YY% year %AGIT_AUCTION_END_MM% month %AGIT_AUCTION_END_DD% day %AGIT_AUCTION_END_HH% hour</td></tr>
+<td width=140>%AGIT_AUCTION_END%</td></tr>
 </table>
 <table width=280 border=0 bgcolor=333333>
 <tr><td width=280>%AGIT_AUCTION_DESC%</td></tr>
@@ -17,7 +17,7 @@ You can re-enter information by clicking the "Back" button<br> Do you want to re
 <table width=280 border=0>
 <tr>
 <td width=130></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="%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%_confirmAuction" value="Confirm" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td> 
 </tr>
 </table>

datapack_development/data/html/auction/AgitSaleCancel.htm

@@ -4,7 +4,7 @@ If an auction is canceled, you cannot register an auction again for seven days a
 <table width=270 border=0>
 <tr>
 <td width=130></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="%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%_doCancelAuction" value="Cancel Sale" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td>
 </tr>
 </table>

datapack_development/data/html/auction/AgitSaleInfo.htm

@@ -19,7 +19,7 @@
 <img src="L2UI.SquareGray" width=280 height=1> <img src="L2UI.SquareBlank" width=1 height=3>
 <table width=280 border=0>
 <tr><td width=140><font color="a2a0a2">Time and date that auction ends</font></td>
-<td width=140><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>
+<td width=140><font color="b09979">%AGIT_AUCTION_END%</font></td></tr>
 <tr><td><font color="a2a0a2">Time remaining</font></td>
 <td><font color="b09979">%AGIT_AUCTION_REMAIN%</font></td></tr>
 <tr><td><font color="a2a0a2">Minimum bid price</font></td>
@@ -34,7 +34,7 @@
 <table width=280 border=0>
 <tr>
 <td width=60></td>
-<td width=70 align=center><button action="bypass -h npc_%objectId%_bidding_AgitBidderList" value="Back" 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%_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>

datapack_development/data/html/auction/location.htm

@@ -4,7 +4,7 @@
 <img src="L2font-e.MAP_AGIT_%LOCATION%" width=270 height=270></center><br>
 <table width=70 border=0>
 <tr><td width=280></td>
-<td width=280 align=center><button action="bypass -h npc_%objectId%_start" value="Back" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td></tr>
+<td width=280 align=center><button action="%AGIT_LINK_BACK%" value="Back" width=70 height=21 back="L2UI.DefaultButton_click" fore="L2UI.DefaultButton"></td></tr>
 </table>
 <br>
 </body>

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

@@ -0,0 +1,10 @@
+<html>
+<body>
+%npcname%:
+<br>
+That function has not been activated.<br> <a action="bypass -h npc_%objectId%_manage">Use the Clan Hall Management menu to activate functions.</a><br>
+<center>
+<button value="Initial Screen" action="bypass -h npc_%objectId%_functions back" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal"><br>
+</center>
+</body>
+</html>

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

@@ -0,0 +1,5 @@
+<html><body>
+%npcname%:
+<br>
+Can I at least offer you a cup of tea? 
+</body></html>

datapack_development/sql/clan_data.sql

@@ -7,7 +7,6 @@ CREATE TABLE IF NOT EXISTS clan_data (
   clan_level INT,
   reputation_score INT NOT NULL default 0,
   hasCastle INT,
-  hasHideout INT,
   ally_id INT,
   ally_name varchar(45),
   leader_id INT,

datapack_development/sql/clanhall_functions.sql

@@ -8,6 +8,5 @@ CREATE TABLE IF NOT EXISTS `clanhall_functions` (
   `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/updates/update25052007.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `clanhall_functions`
+DROP `inDebt`;
+ALTER TABLE `clan_data`
+DROP `hasHideout`;