diff --git a/L2J_DataPack_BETA/dist/game/data/html/admin/castlesiegetime.htm b/L2J_DataPack_BETA/dist/game/data/html/admin/castlesiegetime.htm
index 9aebef4c250a392719164590af4cad801632d9f1..2db230e5f0349d974176afd92f268975dfbdd94d 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/admin/castlesiegetime.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/admin/castlesiegetime.htm
@@ -1,55 +1,96 @@
<html><body>
<table width=270><tr>
-<td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="Main" action="bypass admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
<td width=180><center>Siege Time Set Menu</center></td>
-<td width=45><button value="Back" action="bypass -h admin_siege %castleName%" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="Back" action="bypass admin_siege %castleName%" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
</tr></table>
<center>
-<font color="LEVEL"><br>Castle: %castleName%</font><br>Siege time: %time%<br>Day of siege:<br>
+<font color="LEVEL"><br>Castle: %castleName%</font><br>Siege time: %time%
+<br>Month of Siege:<br>
<table width=270>
<tr>
-<td width=135 align="center"><button value="%saturday%" action="bypass -h admin_setsiegetime %castleName% day %saturdaylink%" width=80 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=135 align="center"><button value="%sunday%" action="bypass -h admin_setsiegetime %castleName% day %sundaylink%" width=80 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=135 align="center"><button value="-1" action="bypass admin_setsiegetime %castleName% month -1" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=135 align="center"><button value="1" action="bypass admin_setsiegetime %castleName% month 1" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr>
+</table>
+<br>Day of Siege:<br>
+<table width=264>
+<tr>
+<td width=30><button value="0" action="bypass admin_setsiegetime %castleName% day 0" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="1" action="bypass admin_setsiegetime %castleName% day 1" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="2" action="bypass admin_setsiegetime %castleName% day 2" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="3" action="bypass admin_setsiegetime %castleName% day 3" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="4" action="bypass admin_setsiegetime %castleName% day 4" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="5" action="bypass admin_setsiegetime %castleName% day 5" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="6" action="bypass admin_setsiegetime %castleName% day 6" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="7" action="bypass admin_setsiegetime %castleName% day 7" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr><tr>
+<td width=30><button value="8" action="bypass admin_setsiegetime %castleName% day 8" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="9" action="bypass admin_setsiegetime %castleName% day 9" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="10" action="bypass admin_setsiegetime %castleName% day 10" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="11" action="bypass admin_setsiegetime %castleName% day 11" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="12" action="bypass admin_setsiegetime %castleName% day 12" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="13" action="bypass admin_setsiegetime %castleName% day 13" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="14" action="bypass admin_setsiegetime %castleName% day 14" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="15" action="bypass admin_setsiegetime %castleName% day 15" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr><tr>
+<td width=30><button value="16" action="bypass admin_setsiegetime %castleName% day 16" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="17" action="bypass admin_setsiegetime %castleName% day 17" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="18" action="bypass admin_setsiegetime %castleName% day 18" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="19" action="bypass admin_setsiegetime %castleName% day 19" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="20" action="bypass admin_setsiegetime %castleName% day 20" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="21" action="bypass admin_setsiegetime %castleName% day 21" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="22" action="bypass admin_setsiegetime %castleName% day 22" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="23" action="bypass admin_setsiegetime %castleName% day 23" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr><tr>
+<td width=30><button value="24" action="bypass admin_setsiegetime %castleName% day 24" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="25" action="bypass admin_setsiegetime %castleName% day 25" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="26" action="bypass admin_setsiegetime %castleName% day 26" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="27" action="bypass admin_setsiegetime %castleName% day 27" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="28" action="bypass admin_setsiegetime %castleName% day 28" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="29" action="bypass admin_setsiegetime %castleName% day 29" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="30" action="bypass admin_setsiegetime %castleName% day 30" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="31" action="bypass admin_setsiegetime %castleName% day 31" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
</tr></table>
<br>Hour of Siege:<br>
<table width=264>
<tr>
-<td width=30><button value="0" action="bypass -h admin_setsiegetime %castleName% hour 0" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="1" action="bypass -h admin_setsiegetime %castleName% hour 1" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="2" action="bypass -h admin_setsiegetime %castleName% hour 2" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="3" action="bypass -h admin_setsiegetime %castleName% hour 3" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="4" action="bypass -h admin_setsiegetime %castleName% hour 4" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="5" action="bypass -h admin_setsiegetime %castleName% hour 5" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="6" action="bypass -h admin_setsiegetime %castleName% hour 6" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="7" action="bypass -h admin_setsiegetime %castleName% hour 7" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="0" action="bypass admin_setsiegetime %castleName% hour 0" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="1" action="bypass admin_setsiegetime %castleName% hour 1" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="2" action="bypass admin_setsiegetime %castleName% hour 2" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="3" action="bypass admin_setsiegetime %castleName% hour 3" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="4" action="bypass admin_setsiegetime %castleName% hour 4" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="5" action="bypass admin_setsiegetime %castleName% hour 5" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="6" action="bypass admin_setsiegetime %castleName% hour 6" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="7" action="bypass admin_setsiegetime %castleName% hour 7" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
</tr><tr>
-<td width=30><button value="8" action="bypass -h admin_setsiegetime %castleName% hour 8" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="9" action="bypass -h admin_setsiegetime %castleName% hour 9" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="10" action="bypass -h admin_setsiegetime %castleName% hour 10" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="11" action="bypass -h admin_setsiegetime %castleName% hour 11" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="12" action="bypass -h admin_setsiegetime %castleName% hour 12" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="13" action="bypass -h admin_setsiegetime %castleName% hour 13" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="14" action="bypass -h admin_setsiegetime %castleName% hour 14" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="15" action="bypass -h admin_setsiegetime %castleName% hour 15" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="8" action="bypass admin_setsiegetime %castleName% hour 8" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="9" action="bypass admin_setsiegetime %castleName% hour 9" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="10" action="bypass admin_setsiegetime %castleName% hour 10" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="11" action="bypass admin_setsiegetime %castleName% hour 11" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="12" action="bypass admin_setsiegetime %castleName% hour 12" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="13" action="bypass admin_setsiegetime %castleName% hour 13" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="14" action="bypass admin_setsiegetime %castleName% hour 14" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="15" action="bypass admin_setsiegetime %castleName% hour 15" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
</tr><tr>
-<td width=30><button value="16" action="bypass -h admin_setsiegetime %castleName% hour 16" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="17" action="bypass -h admin_setsiegetime %castleName% hour 17" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="18" action="bypass -h admin_setsiegetime %castleName% hour 18" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="19" action="bypass -h admin_setsiegetime %castleName% hour 19" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="20" action="bypass -h admin_setsiegetime %castleName% hour 20" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="21" action="bypass -h admin_setsiegetime %castleName% hour 21" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="22" action="bypass -h admin_setsiegetime %castleName% hour 22" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="23" action="bypass -h admin_setsiegetime %castleName% hour 23" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="16" action="bypass admin_setsiegetime %castleName% hour 16" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="17" action="bypass admin_setsiegetime %castleName% hour 17" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="18" action="bypass admin_setsiegetime %castleName% hour 18" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="19" action="bypass admin_setsiegetime %castleName% hour 19" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="20" action="bypass admin_setsiegetime %castleName% hour 20" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="21" action="bypass admin_setsiegetime %castleName% hour 21" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="22" action="bypass admin_setsiegetime %castleName% hour 22" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="23" action="bypass admin_setsiegetime %castleName% hour 23" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
</tr></table>
<br>Minutes of Siege:<br>
<table width=270>
<tr>
-<td width=45><button value="0" action="bypass -h admin_setsiegetime %castleName% min 0" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=45><button value="10" action="bypass -h admin_setsiegetime %castleName% min 10" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=45><button value="20" action="bypass -h admin_setsiegetime %castleName% min 20" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=45><button value="30" action="bypass -h admin_setsiegetime %castleName% min 30" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=45><button value="40" action="bypass -h admin_setsiegetime %castleName% min 40" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=45><button value="50" action="bypass -h admin_setsiegetime %castleName% min 50" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="0" action="bypass admin_setsiegetime %castleName% min 0" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="10" action="bypass admin_setsiegetime %castleName% min 10" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="20" action="bypass admin_setsiegetime %castleName% min 20" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="30" action="bypass admin_setsiegetime %castleName% min 30" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="40" action="bypass admin_setsiegetime %castleName% min 40" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="50" action="bypass admin_setsiegetime %castleName% min 50" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
</tr>
</table>
</center>
diff --git a/L2J_DataPack_BETA/dist/game/data/html/admin/territorywartime.htm b/L2J_DataPack_BETA/dist/game/data/html/admin/territorywartime.htm
index 4058f5a0ba86dde48e351fcb77f40f876a609e3d..73af98f2dee29040dbcb4dd3734d8bfbdff40bd5 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/admin/territorywartime.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/admin/territorywartime.htm
@@ -1,63 +1,96 @@
<html><body>
<table width=270><tr>
-<td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="Main" action="bypass admin_admin" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
<td width=180><center>Territory War Time Set Menu</center></td>
-<td width=45><button value="Back" action="bypass -h admin_territory_war" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="Back" action="bypass admin_territory_war" width=45 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
</tr></table>
<center>
-<font color="LEVEL"><br>Territory War</font><br>start time: %time%<br>Day of start:<br>
+<font color="LEVEL"><br>Territory War</font><br>Siege time: %time%
+<br>Month of Siege:<br>
<table width=270>
<tr>
-<td width=60 align="center"><button value="Monday" action="bypass -h admin_territory_war_time day 2" width=60 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=60 align="center"><button value="Tuesday" action="bypass -h admin_territory_war_time day 3" width=60 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=60 align="center"><button value="Wednesday" action="bypass -h admin_territory_war_time day 4" width=60 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=60 align="center"><button value="Thursday" action="bypass -h admin_territory_war_time day 5" width=60 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr>
-<tr>
-<td width=80 align="center"><button value="Friday" action="bypass -h admin_territory_war_time day 6" width=60 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=80 align="center"><button value="Saturday" action="bypass -h admin_territory_war_time day 7" width=60 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=80 align="center"><button value="Sunday" action="bypass -h admin_territory_war_time day 1" width=60 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=135 align="center"><button value="-1" action="bypass admin_territory_war_time month -1" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=135 align="center"><button value="1" action="bypass admin_territory_war_time month 1" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
</tr>
</table>
+<br>Day of Siege:<br>
+<table width=264>
+<tr>
+<td width=30><button value="0" action="bypass admin_territory_war_time day 0" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="1" action="bypass admin_territory_war_time day 1" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="2" action="bypass admin_territory_war_time day 2" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="3" action="bypass admin_territory_war_time day 3" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="4" action="bypass admin_territory_war_time day 4" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="5" action="bypass admin_territory_war_time day 5" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="6" action="bypass admin_territory_war_time day 6" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="7" action="bypass admin_territory_war_time day 7" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr><tr>
+<td width=30><button value="8" action="bypass admin_territory_war_time day 8" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="9" action="bypass admin_territory_war_time day 9" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="10" action="bypass admin_territory_war_time day 10" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="11" action="bypass admin_territory_war_time day 11" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="12" action="bypass admin_territory_war_time day 12" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="13" action="bypass admin_territory_war_time day 13" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="14" action="bypass admin_territory_war_time day 14" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="15" action="bypass admin_territory_war_time day 15" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr><tr>
+<td width=30><button value="16" action="bypass admin_territory_war_time day 16" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="17" action="bypass admin_territory_war_time day 17" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="18" action="bypass admin_territory_war_time day 18" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="19" action="bypass admin_territory_war_time day 19" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="20" action="bypass admin_territory_war_time day 20" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="21" action="bypass admin_territory_war_time day 21" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="22" action="bypass admin_territory_war_time day 22" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="23" action="bypass admin_territory_war_time day 23" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr><tr>
+<td width=30><button value="24" action="bypass admin_territory_war_time day 24" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="25" action="bypass admin_territory_war_time day 25" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="26" action="bypass admin_territory_war_time day 26" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="27" action="bypass admin_territory_war_time day 27" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="28" action="bypass admin_territory_war_time day 28" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="29" action="bypass admin_territory_war_time day 29" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="30" action="bypass admin_territory_war_time day 30" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="31" action="bypass admin_territory_war_time day 31" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr></table>
<br>Hour of start:<br>
<table width=264>
<tr>
-<td width=30><button value="0" action="bypass -h admin_territory_war_time hour 0" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="1" action="bypass -h admin_territory_war_time hour 1" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="2" action="bypass -h admin_territory_war_time hour 2" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="3" action="bypass -h admin_territory_war_time hour 3" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="4" action="bypass -h admin_territory_war_time hour 4" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="5" action="bypass -h admin_territory_war_time hour 5" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="6" action="bypass -h admin_territory_war_time hour 6" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="7" action="bypass -h admin_territory_war_time hour 7" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="0" action="bypass admin_territory_war_time hour 0" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="1" action="bypass admin_territory_war_time hour 1" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="2" action="bypass admin_territory_war_time hour 2" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="3" action="bypass admin_territory_war_time hour 3" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="4" action="bypass admin_territory_war_time hour 4" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="5" action="bypass admin_territory_war_time hour 5" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="6" action="bypass admin_territory_war_time hour 6" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="7" action="bypass admin_territory_war_time hour 7" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
</tr><tr>
-<td width=30><button value="8" action="bypass -h admin_territory_war_time hour 8" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="9" action="bypass -h admin_territory_war_time hour 9" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="10" action="bypass -h admin_territory_war_time hour 10" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="11" action="bypass -h admin_territory_war_time hour 11" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="12" action="bypass -h admin_territory_war_time hour 12" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="13" action="bypass -h admin_territory_war_time hour 13" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="14" action="bypass -h admin_territory_war_time hour 14" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="15" action="bypass -h admin_territory_war_time hour 15" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="8" action="bypass admin_territory_war_time hour 8" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="9" action="bypass admin_territory_war_time hour 9" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="10" action="bypass admin_territory_war_time hour 10" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="11" action="bypass admin_territory_war_time hour 11" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="12" action="bypass admin_territory_war_time hour 12" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="13" action="bypass admin_territory_war_time hour 13" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="14" action="bypass admin_territory_war_time hour 14" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="15" action="bypass admin_territory_war_time hour 15" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
</tr><tr>
-<td width=30><button value="16" action="bypass -h admin_territory_war_time hour 16" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="17" action="bypass -h admin_territory_war_time hour 17" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="18" action="bypass -h admin_territory_war_time hour 18" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="19" action="bypass -h admin_territory_war_time hour 19" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="20" action="bypass -h admin_territory_war_time hour 20" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="21" action="bypass -h admin_territory_war_time hour 21" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="22" action="bypass -h admin_territory_war_time hour 22" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=30><button value="23" action="bypass -h admin_territory_war_time hour 23" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="16" action="bypass admin_territory_war_time hour 16" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="17" action="bypass admin_territory_war_time hour 17" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="18" action="bypass admin_territory_war_time hour 18" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="19" action="bypass admin_territory_war_time hour 19" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="20" action="bypass admin_territory_war_time hour 20" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="21" action="bypass admin_territory_war_time hour 21" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="22" action="bypass admin_territory_war_time hour 22" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=30><button value="23" action="bypass admin_territory_war_time hour 23" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
</tr></table>
<br>Minutes of start:<br>
<table width=270>
<tr>
-<td width=45><button value="0" action="bypass -h admin_territory_war_time min 0" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=45><button value="10" action="bypass -h admin_territory_war_time min 10" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=45><button value="20" action="bypass -h admin_territory_war_time min 20" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=45><button value="30" action="bypass -h admin_territory_war_time min 30" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=45><button value="40" action="bypass -h admin_territory_war_time min 40" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td width=45><button value="50" action="bypass -h admin_territory_war_time min 50" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="0" action="bypass admin_territory_war_time min 0" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="10" action="bypass admin_territory_war_time min 10" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="20" action="bypass admin_territory_war_time min 20" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="30" action="bypass admin_territory_war_time min 30" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="40" action="bypass admin_territory_war_time min 40" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=45><button value="50" action="bypass admin_territory_war_time min 50" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
</tr>
</table>
</center>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java
index 6152c05f94e49e0e27266a03197f83077c64749a..cd90581cc78bb17823a60076e3eea3b39516f97b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java
@@ -259,29 +259,57 @@ public class AdminSiege implements IAdminCommandHandler
case "admin_setsiegetime":
if (st.hasMoreTokens())
{
- val = st.nextToken();
- final Calendar newAdminSiegeDate = Calendar.getInstance();
- newAdminSiegeDate.setTimeInMillis(castle.getSiegeDate().getTimeInMillis());
- if (val.equalsIgnoreCase("day"))
+ final Calendar cal = Calendar.getInstance();
+ cal.setTimeInMillis(castle.getSiegeDate().getTimeInMillis());
+
+ if ("month".equals(val))
+ {
+ int month = cal.get(Calendar.MONTH) + Integer.parseInt(st.nextToken());
+ if ((cal.getActualMinimum(Calendar.MONTH) > month) || (cal.getActualMaximum(Calendar.MONTH) < month))
+ {
+ activeChar.sendMessage("Unable to change Siege Date - Incorrect month value only " + cal.getActualMinimum(Calendar.MONTH) + "-" + cal.getActualMaximum(Calendar.MONTH) + " is accepted!");
+ return false;
+ }
+ cal.set(Calendar.MONTH, month);
+ }
+ else if ("day".equals(val))
{
- newAdminSiegeDate.set(Calendar.DAY_OF_YEAR, Integer.parseInt(st.nextToken()));
+ int day = Integer.parseInt(st.nextToken());
+ if ((cal.getActualMinimum(Calendar.DAY_OF_YEAR) > day) || (cal.getActualMaximum(Calendar.DAY_OF_YEAR) < day))
+ {
+ activeChar.sendMessage("Unable to change Siege Date - Incorrect day value only " + cal.getActualMinimum(Calendar.DAY_OF_YEAR) + "-" + cal.getActualMaximum(Calendar.DAY_OF_YEAR) + " is accepted!");
+ return false;
+ }
+ cal.set(Calendar.DAY_OF_YEAR, day);
}
- else if (val.equalsIgnoreCase("hour"))
+ else if ("hour".equals(val))
{
- newAdminSiegeDate.set(Calendar.HOUR_OF_DAY, Integer.parseInt(st.nextToken()));
+ int hour = Integer.parseInt(st.nextToken());
+ if ((cal.getActualMinimum(Calendar.HOUR_OF_DAY) > hour) || (cal.getActualMaximum(Calendar.HOUR_OF_DAY) < hour))
+ {
+ activeChar.sendMessage("Unable to change Siege Date - Incorrect hour value only " + cal.getActualMinimum(Calendar.HOUR_OF_DAY) + "-" + cal.getActualMaximum(Calendar.HOUR_OF_DAY) + " is accepted!");
+ return false;
+ }
+ cal.set(Calendar.HOUR_OF_DAY, hour);
}
- else if (val.equalsIgnoreCase("min"))
+ else if ("min".equals(val))
{
- newAdminSiegeDate.set(Calendar.MINUTE, Integer.parseInt(st.nextToken()));
+ int min = Integer.parseInt(st.nextToken());
+ if ((cal.getActualMinimum(Calendar.MINUTE) > min) || (cal.getActualMaximum(Calendar.MINUTE) < min))
+ {
+ activeChar.sendMessage("Unable to change Siege Date - Incorrect minute value only " + cal.getActualMinimum(Calendar.MINUTE) + "-" + cal.getActualMaximum(Calendar.MINUTE) + " is accepted!");
+ return false;
+ }
+ cal.set(Calendar.MINUTE, min);
}
- if (newAdminSiegeDate.getTimeInMillis() < Calendar.getInstance().getTimeInMillis())
+ if (cal.getTimeInMillis() < Calendar.getInstance().getTimeInMillis())
{
- activeChar.sendMessage("Unable to change siege date.");
+ activeChar.sendMessage("Unable to change Siege Date");
}
- else if (newAdminSiegeDate.getTimeInMillis() != castle.getSiegeDate().getTimeInMillis())
+ else if (cal.getTimeInMillis() != castle.getSiegeDate().getTimeInMillis())
{
- castle.getSiegeDate().setTimeInMillis(newAdminSiegeDate.getTimeInMillis());
+ castle.getSiegeDate().setTimeInMillis(cal.getTimeInMillis());
castle.getSiege().saveSiegeDate();
activeChar.sendMessage("Castle siege time for castle " + castle.getName() + " has been changed.");
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java
index 42de0f1ff5d94ed37cf9bb9bf867c6a855c08b81..4ec1d5e41281fd36870eaae1f83297859e88caa1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java
@@ -57,40 +57,60 @@ public class AdminTerritoryWar implements IAdminCommandHandler
}
else if (command.equalsIgnoreCase("admin_territory_war_time"))
{
- String val = "";
if (st.hasMoreTokens())
{
- val = st.nextToken();
- Calendar newAdminTWDate = Calendar.getInstance();
- newAdminTWDate.setTimeInMillis(TerritoryWarManager.getInstance().getTWStartTimeInMillis());
- if (val.equalsIgnoreCase("day"))
+ final Calendar cal = Calendar.getInstance();
+ cal.setTimeInMillis(TerritoryWarManager.getInstance().getTWStartTimeInMillis());
+
+ final String val = st.nextToken();
+ if ("month".equals(val))
{
- newAdminTWDate.set(Calendar.DAY_OF_WEEK, Integer.parseInt(st.nextToken()));
+ int month = cal.get(Calendar.MONTH) + Integer.parseInt(st.nextToken());
+ if ((cal.getActualMinimum(Calendar.MONTH) > month) || (cal.getActualMaximum(Calendar.MONTH) < month))
+ {
+ activeChar.sendMessage("Unable to change Siege Date - Incorrect month value only " + cal.getActualMinimum(Calendar.MONTH) + "-" + cal.getActualMaximum(Calendar.MONTH) + " is accepted!");
+ return false;
+ }
+ cal.set(Calendar.MONTH, month);
}
- else if (val.equalsIgnoreCase("hour"))
+ else if ("day".equals(val))
{
- newAdminTWDate.set(Calendar.HOUR_OF_DAY, Integer.parseInt(st.nextToken()));
+ int day = Integer.parseInt(st.nextToken());
+ if ((cal.getActualMinimum(Calendar.DAY_OF_YEAR) > day) || (cal.getActualMaximum(Calendar.DAY_OF_YEAR) < day))
+ {
+ activeChar.sendMessage("Unable to change Siege Date - Incorrect day value only " + cal.getActualMinimum(Calendar.DAY_OF_YEAR) + "-" + cal.getActualMaximum(Calendar.DAY_OF_YEAR) + " is accepted!");
+ return false;
+ }
+ cal.set(Calendar.DAY_OF_YEAR, day);
}
- else if (val.equalsIgnoreCase("min"))
+ else if ("hour".equals(val))
{
- newAdminTWDate.set(Calendar.MINUTE, Integer.parseInt(st.nextToken()));
+ int hour = Integer.parseInt(st.nextToken());
+ if ((cal.getActualMinimum(Calendar.HOUR_OF_DAY) > hour) || (cal.getActualMaximum(Calendar.HOUR_OF_DAY) < hour))
+ {
+ activeChar.sendMessage("Unable to change Siege Date - Incorrect hour value only " + cal.getActualMinimum(Calendar.HOUR_OF_DAY) + "-" + cal.getActualMaximum(Calendar.HOUR_OF_DAY) + " is accepted!");
+ return false;
+ }
+ cal.set(Calendar.HOUR_OF_DAY, hour);
+ }
+ else if ("min".equals(val))
+ {
+ int min = Integer.parseInt(st.nextToken());
+ if ((cal.getActualMinimum(Calendar.MINUTE) > min) || (cal.getActualMaximum(Calendar.MINUTE) < min))
+ {
+ activeChar.sendMessage("Unable to change Siege Date - Incorrect minute value only " + cal.getActualMinimum(Calendar.MINUTE) + "-" + cal.getActualMaximum(Calendar.MINUTE) + " is accepted!");
+ return false;
+ }
+ cal.set(Calendar.MINUTE, min);
}
- if (newAdminTWDate.getTimeInMillis() < Calendar.getInstance().getTimeInMillis())
+ if (cal.getTimeInMillis() < Calendar.getInstance().getTimeInMillis())
{
activeChar.sendMessage("Unable to change TW Date!");
}
- else if (newAdminTWDate.getTimeInMillis() != TerritoryWarManager.getInstance().getTWStartTimeInMillis())
+ else if (cal.getTimeInMillis() != TerritoryWarManager.getInstance().getTWStartTimeInMillis())
{
- Quest twQuest = QuestManager.getInstance().getQuest(TerritoryWarManager.qn);
- if (twQuest != null)
- {
- twQuest.onAdvEvent("setTWDate " + newAdminTWDate.getTimeInMillis(), null, null);
- }
- else
- {
- activeChar.sendMessage("Missing Territory War Quest!");
- }
+ TerritoryWarManager.getInstance().setTWStartTimeInMillis(cal.getTimeInMillis());
}
}
showSiegeTimePage(activeChar);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java
index 8bccecdbdb7891ff65f6199f583582850bfb929b..5532a5008a00f5cc2c989bd487d9a0c7696e6e3b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java
@@ -19,13 +19,13 @@
package quests.TerritoryWarScripts;
import java.util.Calendar;
-import java.util.StringTokenizer;
import quests.Q00147_PathtoBecominganEliteMercenary.Q00147_PathtoBecominganEliteMercenary;
import quests.Q00148_PathtoBecominganExaltedMercenary.Q00148_PathtoBecominganExaltedMercenary;
import quests.Q00176_StepsForHonor.Q00176_StepsForHonor;
-import com.l2jserver.gameserver.SevenSigns;
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.GlobalVariablesManager;
import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
import com.l2jserver.gameserver.instancemanager.TerritoryWarManager.TerritoryNPCSpawn;
import com.l2jserver.gameserver.model.L2Object;
@@ -76,45 +76,33 @@ public class TerritoryWarSuperClass extends Quest
addSkillSeeId(36590);
// Calculate next TW date
- Calendar startTWDate = Calendar.getInstance();
- if (loadGlobalQuestVar("nextTWStartDate").equalsIgnoreCase(""))
+ final Calendar cal = Calendar.getInstance();
+
+ final long nextSiegeDate = GlobalVariablesManager.getInstance().getLong("nextTWStartDate", 0);
+ if (nextSiegeDate > System.currentTimeMillis())
{
- startTWDate.set(Calendar.DAY_OF_WEEK, Calendar.SATURDAY);
- startTWDate.set(Calendar.HOUR_OF_DAY, 20);
- startTWDate.set(Calendar.MINUTE, 0);
- startTWDate.set(Calendar.SECOND, 0);
- if (startTWDate.getTimeInMillis() < System.currentTimeMillis())
- {
- startTWDate.add(Calendar.DAY_OF_MONTH, 7);
- }
- if (!SevenSigns.getInstance().isDateInSealValidPeriod(startTWDate))
- {
- startTWDate.add(Calendar.DAY_OF_MONTH, 7);
- }
- saveGlobalQuestVar("nextTWStartDate", String.valueOf(startTWDate.getTimeInMillis()));
+ cal.setTimeInMillis(nextSiegeDate);
}
else
{
- startTWDate.setTimeInMillis(Long.parseLong(loadGlobalQuestVar("nextTWStartDate")));
- if ((startTWDate.getTimeInMillis() < System.currentTimeMillis()) && SevenSigns.getInstance().isSealValidationPeriod() && (SevenSigns.getInstance().getMilliToPeriodChange() > 172800000))
+ // Let's check if territory war date was in the past
+ if (cal.before(Calendar.getInstance()))
{
- startTWDate.set(Calendar.DAY_OF_WEEK, Calendar.SATURDAY);
- startTWDate.set(Calendar.HOUR_OF_DAY, 20);
- startTWDate.set(Calendar.MINUTE, 0);
- startTWDate.set(Calendar.SECOND, 0);
- if (startTWDate.getTimeInMillis() < System.currentTimeMillis())
- {
- startTWDate.add(Calendar.DAY_OF_MONTH, 7);
- }
- if (!SevenSigns.getInstance().isDateInSealValidPeriod(startTWDate))
- {
- startTWDate.add(Calendar.DAY_OF_MONTH, 7);
- }
- saveGlobalQuestVar("nextTWStartDate", String.valueOf(startTWDate.getTimeInMillis()));
+ cal.setTimeInMillis(System.currentTimeMillis());
+ }
+
+ boolean hasOwnedCastle = CastleManager.getInstance().hasOwnedCastle();
+ cal.set(Calendar.DAY_OF_WEEK, hasOwnedCastle ? Calendar.SATURDAY : Calendar.SUNDAY);
+ cal.set(Calendar.HOUR_OF_DAY, hasOwnedCastle ? 20 : 22);
+ cal.set(Calendar.MINUTE, 0);
+ cal.set(Calendar.SECOND, 0);
+ if (cal.before(Calendar.getInstance()))
+ {
+ cal.add(Calendar.WEEK_OF_YEAR, 2);
}
}
- TerritoryWarManager.getInstance().setTWStartTimeInMillis(startTWDate.getTimeInMillis());
- _log.info("Next TerritoryWarTime: " + startTWDate.getTime());
+ TerritoryWarManager.getInstance().setTWStartTimeInMillis(cal.getTimeInMillis());
+ _log.info(getClass().getSimpleName() + ": Siege date: " + cal.getTime());
}
}
@@ -196,44 +184,6 @@ public class TerritoryWarSuperClass extends Quest
}
}
- @Override
- public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
- {
- if ((npc != null) || (player != null))
- {
- return null;
- }
- StringTokenizer st = new StringTokenizer(event, " ");
- event = st.nextToken(); // Get actual command
- if (event.equalsIgnoreCase("setNextTWDate"))
- {
- Calendar startTWDate = Calendar.getInstance();
- startTWDate.set(Calendar.DAY_OF_WEEK, Calendar.SATURDAY);
- startTWDate.set(Calendar.HOUR_OF_DAY, 20);
- startTWDate.set(Calendar.MINUTE, 0);
- startTWDate.set(Calendar.SECOND, 0);
- if (startTWDate.getTimeInMillis() < System.currentTimeMillis())
- {
- startTWDate.add(Calendar.DAY_OF_MONTH, 7);
- }
- if (!SevenSigns.getInstance().isDateInSealValidPeriod(startTWDate))
- {
- startTWDate.add(Calendar.DAY_OF_MONTH, 7);
- }
- saveGlobalQuestVar("nextTWStartDate", String.valueOf(startTWDate.getTimeInMillis()));
- TerritoryWarManager.getInstance().setTWStartTimeInMillis(startTWDate.getTimeInMillis());
- _log.info("Next TerritoryWarTime: " + startTWDate.getTime());
- }
- else if (event.equalsIgnoreCase("setTWDate") && st.hasMoreTokens())
- {
- Calendar startTWDate = Calendar.getInstance();
- startTWDate.setTimeInMillis(Long.parseLong(st.nextToken()));
- saveGlobalQuestVar("nextTWStartDate", String.valueOf(startTWDate.getTimeInMillis()));
- TerritoryWarManager.getInstance().setTWStartTimeInMillis(startTWDate.getTimeInMillis());
- }
- return null;
- }
-
@Override
public String onAttack(L2Npc npc, L2PcInstance player, int damage, boolean isSummon)
{
diff --git a/L2J_DataPack_BETA/dist/sql/game/updates/20140108update.sql b/L2J_DataPack_BETA/dist/sql/game/updates/20140108update.sql
index df85c68bf8edad93156ed15f5cb51f3a493b59cf..970d5fae78bf70deb4e76279518d52bd98915529 100644
--- a/L2J_DataPack_BETA/dist/sql/game/updates/20140108update.sql
+++ b/L2J_DataPack_BETA/dist/sql/game/updates/20140108update.sql
@@ -1 +1,2 @@
-UPDATE character_quests SET name='Q00235_MimirsElixir' WHERE name='235_MimirsElixir';
\ No newline at end of file
+UPDATE character_quests SET name='Q00235_MimirsElixir' WHERE name='235_MimirsElixir';
+INSERT IGNORE INTO global_variables (`var`, `value`) VALUES ('nextTWStartDate', (SELECT `value` FROM quest_global_data WHERE var = "nextTWStartDate"));
\ No newline at end of file