Jelajahi Sumber

DP support for [L1923]. Thanks Ahmed
(I hope I didn't forget any files)

Fulminus 17 tahun lalu
induk
melakukan
3c298f2eb3

+ 0 - 10
datapack_development/data/door.csv

@@ -417,16 +417,6 @@ Gate_of_fort_086;18200010;-52265;92992;-2823;0;0;0;0;0;0;158250;644;518;False
 Gate_of_fort_087;18200011;-53299;91817;-2821;0;0;0;0;0;0;158250;644;518;False
 Gate_of_fort_088;18200012;-53157;91815;-2821;0;0;0;0;0;0;158250;644;518;False
 
-#Gate_of_Fort_Cruma_Tower
-Gate_of_fort_089;20200001;12496;93487;-3429;0;0;0;0;0;0;158250;644;518;False
-Gate_of_fort_090;20200002;11467;94385;-3426;0;0;0;0;0;0;158250;644;518;False
-Gate_of_fort_091;20200003;11605;94374;-3426;0;0;0;0;0;0;158250;644;518;False
-Gate_of_fort_092;20200004;10126;94940;-3399;0;0;0;0;0;0;158250;644;518;False
-Gate_of_fort_093;20200005;10124;95088;-3399;0;0;0;0;0;0;158250;644;518;False
-Gate_of_fort_094;20200006;11466;95581;-3426;0;0;0;0;0;0;158250;644;518;False
-Gate_of_fort_095;20200007;11610;95585;-3426;0;0;0;0;0;0;158250;644;518;False
-Gate_of_fort_096;20200008;10476;96573;-3429;0;0;0;0;0;0;158250;644;518;False
-
 #Gate_of_Fort_Lizardmen
 Gate_of_fort_097;22200001;78083;89319;-2887;0;0;0;0;0;0;158250;644;518;False
 Gate_of_fort_098;22200002;80525;89335;-2852;0;0;0;0;0;0;158250;644;518;False

+ 129 - 0
datapack_development/data/html/admin/fort.htm

@@ -0,0 +1,129 @@
+<html><body>
+<table width=260><tr>
+<td width=40><button value="Main" action="bypass -h admin_admin" width=40 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=180><center>Siege Menu</center></td>
+<td width=40><button value="Back" action="bypass -h admin_siege" width=40 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr></table>
+<center>
+<br><br><br>Fort: %fortName%<br><br>
+<table width=270>
+<tr>
+<td><button value="Add Attacker" action="bypass -h admin_add_fortattacker %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="Add Defender" action="bypass -h admin_add_fortdefender %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr><tr>
+<td><button value="List Clans" action="bypass -h admin_list_fortsiege_clans %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="Clear List" action="bypass -h admin_clear_fortsiege_list %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr>
+</table>
+<br>
+<table width=270>
+<tr>
+<td><button value="Move Defenders" action="bypass -h admin_move_fortdefenders %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="Spawn Doors" action="bypass -h admin_spawn_fortdoors %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr>
+</table>
+<br>
+<table width=270>
+<tr>
+<td><button value="Start Siege" action="bypass -h admin_startfortsiege %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="End Siege" action="bypass -h admin_endfortsiege %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr>
+</table>
+<br>
+<table width=270>
+<tr><td><button value="Give Fort" action="bypass -h admin_setfort %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="Remove Fort" action="bypass -h admin_removefort %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td></tr>
+</tr>
+</table>
+<br>
+<table width=270>
+<tr><td width=60>NpcId:</td><td><edit var="value" width=40></td><td><button value="Add Guard" action="bypass -h admin_add_guard %fortName% $value" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr></table>
+</center>
+</body></html>
+<html><body>
+<table width=260><tr>
+<td width=40><button value="Main" action="bypass -h admin_admin" width=40 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=180><center>Siege Menu</center></td>
+<td width=40><button value="Back" action="bypass -h admin_siege" width=40 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr></table>
+<center>
+<br><br><br>Fort: %fortName%<br><br>
+<table width=270>
+<tr>
+<td><button value="Add Attacker" action="bypass -h admin_add_fortattacker %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="Add Defender" action="bypass -h admin_add_fortdefender %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr><tr>
+<td><button value="List Clans" action="bypass -h admin_list_fortsiege_clans %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="Clear List" action="bypass -h admin_clear_fortsiege_list %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr>
+</table>
+<br>
+<table width=270>
+<tr>
+<td><button value="Move Defenders" action="bypass -h admin_move_fortdefenders %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="Spawn Doors" action="bypass -h admin_spawn_fortdoors %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr>
+</table>
+<br>
+<table width=270>
+<tr>
+<td><button value="Start Siege" action="bypass -h admin_startfortsiege %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="End Siege" action="bypass -h admin_endfortsiege %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr>
+</table>
+<br>
+<table width=270>
+<tr><td><button value="Give Fort" action="bypass -h admin_setfort %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="Remove Fort" action="bypass -h admin_removefort %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td></tr>
+</tr>
+</table>
+<br>
+<table width=270>
+<tr><td width=60>NpcId:</td><td><edit var="value" width=40></td><td><button value="Add Guard" action="bypass -h admin_add_guard %fortName% $value" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr></table>
+</center>
+</body></html>
+<html><body>
+<table width=260><tr>
+<td width=40><button value="Main" action="bypass -h admin_admin" width=40 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=180><center>Siege Menu</center></td>
+<td width=40><button value="Back" action="bypass -h admin_siege" width=40 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr></table>
+<center>
+<br><br><br>Fort: %fortName%<br><br>
+<table width=270>
+<tr>
+<td><button value="Add Attacker" action="bypass -h admin_add_fortattacker %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="Add Defender" action="bypass -h admin_add_fortdefender %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr><tr>
+<td><button value="List Clans" action="bypass -h admin_list_fortsiege_clans %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="Clear List" action="bypass -h admin_clear_fortsiege_list %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr>
+</table>
+<br>
+<table width=270>
+<tr>
+<td><button value="Move Defenders" action="bypass -h admin_move_fortdefenders %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="Spawn Doors" action="bypass -h admin_spawn_fortdoors %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr>
+</table>
+<br>
+<table width=270>
+<tr>
+<td><button value="Start Siege" action="bypass -h admin_startfortsiege %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="End Siege" action="bypass -h admin_endfortsiege %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr>
+</table>
+<br>
+<table width=270>
+<tr><td><button value="Give Fort" action="bypass -h admin_setfort %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="Remove Fort" action="bypass -h admin_removefort %fortName%" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td></tr>
+</tr>
+</table>
+<br>
+<table width=270>
+<tr><td width=60>NpcId:</td><td><edit var="value" width=40></td><td><button value="Add Guard" action="bypass -h admin_add_guard %fortName% $value" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr></table>
+</center>
+</body></html>

+ 39 - 0
datapack_development/data/html/admin/forts.htm

@@ -0,0 +1,39 @@
+<html><body>
+<table width=260><tr>
+<td width=40><button value="Main" action="bypass -h admin_admin" width=40 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=180><center>Fortress Menu</center></td>
+<td width=40><button value="Back" action="bypass -h admin_admin2" width=40 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr></table>
+<center>
+<br>Fortress:<br>
+<table width=270><tr>
+%forts%
+</tr></table>
+</center>
+</body></html>
+<html><body>
+<table width=260><tr>
+<td width=40><button value="Main" action="bypass -h admin_admin" width=40 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=180><center>Fortress Menu</center></td>
+<td width=40><button value="Back" action="bypass -h admin_admin2" width=40 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr></table>
+<center>
+<br>Fortress:<br>
+<table width=270><tr>
+%forts%
+</tr></table>
+</center>
+</body></html>
+<html><body>
+<table width=260><tr>
+<td width=40><button value="Main" action="bypass -h admin_admin" width=40 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=180><center>Fortress Menu</center></td>
+<td width=40><button value="Back" action="bypass -h admin_admin2" width=40 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr></table>
+<center>
+<br>Fortress:<br>
+<table width=270><tr>
+%forts%
+</tr></table>
+</center>
+</body></html>

+ 53 - 52
datapack_development/data/html/admin/game_menu.htm

@@ -1,52 +1,53 @@
-<html><title>L2J Game Panel</title><body><br>
-<center>
-<table width=260>
-<tr>
-<td><button value="Main" action="bypass -h admin_admin" width=50 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-<td><button value="Game" action="bypass -h admin_admin2" width=50 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-<td><button value="Effects" action="bypass -h admin_admin3" width=50 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-<td><button value="Server" action="bypass -h admin_admin4" width=50 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-<td><button value="Mods" action="bypass -h admin_admin5" width=50 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-</tr>
-</table><br>
-<table width=240><tr>
-<td>QuickBox:</td>
-<td><edit var="qbox" width=120 height=15></td>
-<td><button value="Help" action="bypass -h admin_help help/game_menu.htm" width=45 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-</tr></table><br>Character related:
-<table width=240><tr>
-<td><button value="Manage" action="bypass -h admin_char_manage" width=55 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-<td><button value="List" action="bypass -h admin_show_characters 0" width=55 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-<td><button value="SetName" action="bypass -h admin_setname $qbox" width=55 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-<td><button value="SetTitle" action="bypass -h admin_settitle $qbox" width=55 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-</tr></table><br>
-Clan related:
-<table width=240><tr>
-<td><button value="Create" action="bypass -h admin_pledge create $qbox" width=55 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-<td><button value="Delete" action="bypass -h admin_pledge dismiss $qbox" width=55 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-<td><button value="SetLevel" action="bypass -h admin_pledge setlevel $qbox" width=55 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-<td><button value="Reputatn" action="bypass -h admin_pledge rep $qbox" width=55 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-</tr><tr>
-<td><button value="Cstle/CH" action="bypass -h admin_siege" width=55 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-<td><button value="Info" action="bypass -h admin_pledge info" width=55 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td></tr></table><br>
-Cursed Weapons:
-<table width=240><tr>
-<td><button value="Info" action="bypass -h admin_cw_info_menu $qbox" width=73 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-<td><button value="Add" action="bypass -h admin_cw_add $qbox" width=73 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-<td><button value="Remove" action="bypass -h admin_cw_remove $qbox" width=73 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-<td></td>
-</tr></table><br>
-Seven Signs:
-<table width=240><tr>
-<td><button value="Blacksmith" action="bypass -h admin_mammon_find 1" width=73 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-<td><button value="Merchant" action="bypass -h admin_mammon_find 2" width=73 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-<td><button value="Respawn" action="bypass -h admin_mammon_respawn" width=73 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-<td></td>
-</tr></table><br>
-Olympiad:
-<table width=240><tr>
-<td><button value="SaveOlympd" action="bypass -h admin_saveolymp" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-<td><button value="ManualHero" action="bypass -h admin_manualhero" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
-</tr></table><br></center>
-Server Software: running L2J created by L2Chef and the L2J team. l2jserver.com for details
-</body></html>
+<html><title>L2J Game Panel</title><body><br>
+<center>
+<table width=260>
+<tr>
+<td><button value="Main" action="bypass -h admin_admin" width=50 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="Game" action="bypass -h admin_admin2" width=50 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="Effects" action="bypass -h admin_admin3" width=50 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="Server" action="bypass -h admin_admin4" width=50 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="Mods" action="bypass -h admin_admin5" width=50 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr>
+</table><br>
+<table width=240><tr>
+<td>QuickBox:</td>
+<td><edit var="qbox" width=120 height=15></td>
+<td><button value="Help" action="bypass -h admin_help help/game_menu.htm" width=45 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr></table><br>Character related:
+<table width=240><tr>
+<td><button value="Manage" action="bypass -h admin_char_manage" width=55 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="List" action="bypass -h admin_show_characters 0" width=55 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="SetName" action="bypass -h admin_setname $qbox" width=55 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="SetTitle" action="bypass -h admin_settitle $qbox" width=55 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr></table><br>
+Clan related:
+<table width=240><tr>
+<td><button value="Create" action="bypass -h admin_pledge create $qbox" width=55 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="Delete" action="bypass -h admin_pledge dismiss $qbox" width=55 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="SetLevel" action="bypass -h admin_pledge setlevel $qbox" width=55 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="Reputatn" action="bypass -h admin_pledge rep $qbox" width=55 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr><tr>
+<td><button value="Cstle/CH" action="bypass -h admin_siege" width=55 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="Fortress" action="bypass -h admin_fortsiege" width=55 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="Info" action="bypass -h admin_pledge info" width=55 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td></tr></table><br>
+Cursed Weapons:
+<table width=240><tr>
+<td><button value="Info" action="bypass -h admin_cw_info_menu $qbox" width=73 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="Add" action="bypass -h admin_cw_add $qbox" width=73 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="Remove" action="bypass -h admin_cw_remove $qbox" width=73 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td></td>
+</tr></table><br>
+Seven Signs:
+<table width=240><tr>
+<td><button value="Blacksmith" action="bypass -h admin_mammon_find 1" width=73 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="Merchant" action="bypass -h admin_mammon_find 2" width=73 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="Respawn" action="bypass -h admin_mammon_respawn" width=73 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td></td>
+</tr></table><br>
+Olympiad:
+<table width=240><tr>
+<td><button value="SaveOlympd" action="bypass -h admin_saveolymp" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td><button value="ManualHero" action="bypass -h admin_manualhero" width=80 height=15 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr></table><br></center>
+Server Software: running L2J created by L2Chef and the L2J team. l2jserver.com for details
+</body></html>

+ 126 - 0
datapack_development/data/multisell/36142001.xml

@@ -0,0 +1,126 @@
+<?xml version='1.0' encoding='utf-8'?>
+<list>
+
+<!-- dragonspine fortress buylist -->
+
+<!-- Oblivion Codex -->
+<item id="1">
+<ingredient id="9912" count="1000"/>
+<production id="9625" count="1"/>
+</item>
+
+<!-- Giant's Secret Codex of Discipline -->
+<item id="2">
+<ingredient id="9912" count="1500"/>
+<production id="9626" count="1"/>
+</item>
+
+<!-- Giant's Secret Codes of Mastery -->
+<item id="3">
+<ingredient id="9912" count="3000"/>
+<production id="9627" count="1"/>
+</item>
+
+<!-- Battleground Spell - Shield Mastery -->
+<item id="4">
+<ingredient id="57" count="3000"/>
+<production id="10143" count="1"/>
+</item>
+
+<!-- Battleground Spell - Wizard -->
+<item id="5">
+<ingredient id="57" count="3600"/>
+<production id="10144" count="1"/>
+</item>
+
+<!-- Battleground Spell - Healer -->
+<item id="6">
+<ingredient id="57" count="3500"/>
+<production id="10145" count="1"/>
+</item>
+
+<!-- Battleground Spell - Dagger Mastery -->
+<item id="7">
+<ingredient id="57" count="3200"/>
+<production id="10146" count="1"/>
+</item>
+
+<!-- Battleground Spell - Bow Mastery -->
+<item id="8">
+<ingredient id="57" count="2900"/>
+<production id="10147" count="1"/>
+</item>
+
+<!-- Battleground Berserker Spell -->
+<item id="9">
+<ingredient id="57" count="2200"/>
+<production id="10148" count="1"/>
+</item>
+
+<!-- Battleground Blessed Scroll of Escape -->
+<item id="10">
+<ingredient id="57" count="27000"/>
+<production id="10149" count="1"/>
+</item>
+
+<!-- Battleground Blessed Scroll of Resurrection -->
+<item id="11">
+<ingredient id="57" count="55000"/>
+<production id="10150" count="1"/>
+</item>
+
+<!-- Battleground Transform Spell -->
+<item id="12">
+<ingredient id="57" count="8000"/>
+<production id="10151" count="1"/>
+</item>
+
+<!-- Battle Health Recovery Potion -->
+<item id="13">
+<ingredient id="57" count="1400"/>
+<production id="10152" count="1"/>
+</item>
+
+<!-- Battle Mana Recovery Potion -->
+<item id="14">
+<ingredient id="57" count="9200"/>
+<production id="10153" count="1"/>
+</item>
+
+<!-- Battle CP Recovery Potion -->
+<item id="15">
+<ingredient id="57" count="4000"/>
+<production id="10154" count="1"/>
+</item>
+
+<!-- Mental Strengthening Potion -->
+<item id="16">
+<ingredient id="57" count="7200"/>
+<production id="10155" count="1"/>
+</item>
+
+<!-- Medusa's Potion -->
+<item id="17">
+<ingredient id="57" count="8000"/>
+<production id="10156" count="1"/>
+</item>
+
+<!-- Instant Haste Potion -->
+<item id="18">
+<ingredient id="57" count="3000"/>
+<production id="10157" count="1"/>
+</item>
+
+<!-- Balliste Bomb -->
+<item id="18">
+<ingredient id="57" count="4000"/>
+<production id="9688" count="1"/>
+</item>
+
+<!-- Capture Rope -->
+<item id="19">
+<ingredient id="57" count="4000"/>
+<production id="10159" count="1"/>
+</item>
+
+</list>

+ 2 - 1
datapack_development/data/staticobjects.csv

@@ -26,4 +26,5 @@ floran_arena_002;20230002;12979;183365;-3538;2;none;0;0
 giran_arena_001;22220001;73766;142489;-3748;2;none;0;0
 giran_arena_002;22220002;72200;143102;-3748;2;none;0;0
 gludin_arena_001;17220015;-88697;142316;-3621;2;none;0;0
-gludin_arena_002;17220016;-87136;142491;-3623;2;none;0;0
+gludin_arena_002;17220016;-87136;142491;-3623;2;none;0;0
+Dragonspine_flagpole;20200500;11546;95030;-2498;3;none;0;0

+ 21 - 21
datapack_development/data/stats/skills/3300-3399.xml

@@ -180,16 +180,15 @@
   <for> 
   </for> 
 </skill> 
-<skill id="3318" levels="1" name="Flag Display"> 
-  <set name="power" val="0.0"/> 
-  <set name="target" val="TARGET_NONE"/> 
-  <set name="skillType" val="NOTDONE"/> 
-  <set name="operateType" val="OP_PASSIVE"/> 
-  <set name="castRange" val="-1"/> 
-  <set name="effectRange" val="-1"/> 
-  <for> 
-  </for> 
-</skill> 
+<skill id="3318" levels="1" name="Flag Display">
+  <set name="mpInitialConsume" val="50"/> 
+  <set name="mpConsume" val="0"/> 
+  <set name="power" val="0.0"/> 
+  <set name="target" val="TARGET_FLAGPOLE"/> 
+  <set name="hitTime" val="180000"/> 
+  <set name="skillType" val="TAKEFORT"/>
+  <set name="operateType" val="OP_ACTIVE"/> 
+</skill>
 <skill id="3319" levels="1" name="Divine Protection of Ring"> 
   <set name="power" val="0.0"/> 
   <set name="target" val="TARGET_NONE"/> 
@@ -622,16 +621,17 @@
        <add val="321" order="0x10" stat="maxMp"/>
   </for>
 </skill> 
-<skill id="3358" levels="1" name="Flag Equip"> 
-  <set name="power" val="0.0"/> 
-  <set name="target" val="TARGET_NONE"/> 
-  <set name="skillType" val="NOTDONE"/> 
-  <set name="operateType" val="OP_PASSIVE"/> 
-  <set name="castRange" val="-1"/> 
-  <set name="effectRange" val="-1"/> 
-  <for> 
-  </for> 
-</skill> 
+<skill id="3358" levels="1" name="Flag Equip">
+  <set name="power" val="0.0"/>  
+  <set name="target" val="TARGET_SELF"/>  
+  <set name="skillType" val="BUFF"/>  
+  <set name="operateType" val="OP_PASSIVE"/>  
+  <set name="castRange" val="-1"/>  
+  <set name="effectRange" val="-1"/>  
+  <for>  
+       <mul order="0x30" stat="runSpd" val="0.5"/> 
+  </for>  
+</skill>
 <skill id="3359" levels="1" name="Transform Native"> 
   <set name="power" val="0.0"/> 
   <set name="target" val="TARGET_NONE"/> 
@@ -1043,4 +1043,4 @@
   <for> 
   </for> 
 </skill> 
-</list>
+</list>

+ 170 - 1
datapack_development/data/zones/zone.xml

@@ -609,6 +609,175 @@
 		<stat name='spawnZ' val='-545'/>
 	</zone>
 
+<!-- Fortress zones -->
+	<zone id='11501' type='FortZone' shape='Cuboid' minZ='-3800' maxZ='3200'>
+		<!-- Shanty Fortress -->
+		<stat name='fortId' val='101'/>
+		<stat name='spawnX' val='-52695'/>
+		<stat name='spawnY' val='156457'/>
+		<stat name='spawnZ' val='-2053'/>
+	</zone>
+
+	<zone id='11502' type='FortZone' shape='Cuboid' minZ='-3800' maxZ='3200'>
+		<!-- Southern Fortress -->
+		<stat name='fortId' val='102'/>
+		<stat name='spawnX' val='-22759'/>
+		<stat name='spawnY' val='219818'/>
+		<stat name='spawnZ' val='-3236'/>
+	</zone>
+
+	<zone id='11503' type='FortZone' shape='Cuboid' minZ='-3800' maxZ='3200'>
+		<!-- Hive Fortress -->
+		<stat name='fortId' val='103'/>
+		<stat name='spawnX' val='16625'/>
+		<stat name='spawnY' val='188108'/>
+		<stat name='spawnZ' val='-2924'/>
+	</zone>
+
+	<zone id='11504' type='FortZone' shape='Cuboid' minZ='-3800' maxZ='3200'>
+		<!-- Valley Fortress -->
+		<stat name='fortId' val='104'/>
+		<stat name='spawnX' val='126058'/>
+		<stat name='spawnY' val='123425'/>
+		<stat name='spawnZ' val='-2585'/>
+	</zone>
+
+	<zone id='11505' type='FortZone' shape='Cuboid' minZ='-3800' maxZ='3200'>
+		<!-- Ivory Fortress -->
+		<stat name='fortId' val='105'/>
+		<stat name='spawnX' val='72808'/>
+		<stat name='spawnY' val='4307'/>
+		<stat name='spawnZ' val='-3045'/>
+	</zone>
+	
+	<zone id='11506' type='FortZone' shape='Cuboid' minZ='-3800' maxZ='3200'>
+		<!-- Narsell Fortress -->
+		<stat name='fortId' val='106'/>
+		<stat name='spawnX' val='154966'/>
+		<stat name='spawnY' val='55276'/>
+		<stat name='spawnZ' val='-3254'/>
+	</zone>
+
+	<zone id='11507' type='FortZone' shape='Cuboid' minZ='-3800' maxZ='3200'>
+		<!-- Bayou Fortress -->
+		<stat name='fortId' val='107'/>
+		<stat name='spawnX' val='189910'/>
+		<stat name='spawnY' val='39770'/>
+		<stat name='spawnZ' val='-3410'/>
+	</zone>
+
+	<zone id='11508' type='FortZone' shape='Cuboid' minZ='-3800' maxZ='3200'>
+		<!-- White Sands Fortress -->
+		<stat name='fortId' val='108'/>
+		<stat name='spawnX' val='118361'/>
+		<stat name='spawnY' val='204924'/>
+		<stat name='spawnZ' val='-3333'/>
+	</zone>
+	
+	<zone id='11509' type='FortZone' shape='Cuboid' minZ='-3800' maxZ='3200'>
+		<!-- Borderland Fortress -->
+		<stat name='fortId' val='109'/>
+		<stat name='spawnX' val='159009'/>
+		<stat name='spawnY' val='-70167'/>
+		<stat name='spawnZ' val='-2864'/>
+	</zone>
+
+	<zone id='11510' type='FortZone' shape='Cuboid' minZ='-3800' maxZ='3200'>
+		<!-- Marshland Fortress -->
+		<stat name='fortId' val='110'/>
+		<stat name='spawnX' val='69791'/>
+		<stat name='spawnY' val='-61482'/>
+		<stat name='spawnZ' val='-2786'/>
+	</zone>
+	
+	<zone id='11511' type='FortZone' shape='Cuboid' minZ='-3800' maxZ='3200'>
+		<!-- Archaic Fortress -->
+		<stat name='fortId' val='111'/>
+		<stat name='spawnX' val='109568'/>
+		<stat name='spawnY' val='-141277'/>
+		<stat name='spawnZ' val='-2957'/>
+	</zone>
+
+	<zone id='11512' type='FortZone' shape='Cuboid' minZ='-3800' maxZ='3200'>
+		<!-- Floran Fortress - Border -->
+		<stat name='fortId' val='112'/>
+		<stat name='spawnX' val='5688'/>
+		<stat name='spawnY' val='149726'/>
+		<stat name='spawnZ' val='-2889'/>
+	</zone>
+
+	<zone id='11513' type='FortZone' shape='Cuboid' minZ='-3800' maxZ='3200'>
+		<!-- Cloud Mountain Fortress - Border -->
+		<stat name='fortId' val='113'/>
+		<stat name='spawnX' val='-53204'/>
+		<stat name='spawnY' val='91210'/>
+		<stat name='spawnZ' val='-2821'/>
+	</zone>
+	
+	<zone id='11514' type='FortZone' shape='Cuboid' minZ='-3800' maxZ='3200'>
+		<!-- Tanor Fortress - Border -->
+		<stat name='fortId' val='114'/>
+		<stat name='spawnX' val='60258'/>
+		<stat name='spawnY' val='139425'/>
+		<stat name='spawnZ' val='-1754'/>
+	</zone>
+	
+	<zone id='11515' type='FortZone' shape='Cuboid' minZ='-3800' maxZ='3200'>
+		<!-- Dragonspine Fortress - Border -->
+		<stat name='fortId' val='115'/>
+		<stat name='spawnX' val='11542'/>
+		<stat name='spawnY' val='95060'/>
+		<stat name='spawnZ' val='-3426'/>
+	</zone>
+
+	<zone id='11516' type='FortZone' shape='Cuboid' minZ='-3800' maxZ='3200'>
+		<!-- Antharas Fortress - Border -->
+		<stat name='fortId' val='116'/>
+		<stat name='spawnX' val='75904'/>
+		<stat name='spawnY' val='86336'/>
+		<stat name='spawnZ' val='-3472'/>
+	</zone>
+
+	<zone id='11517' type='FortZone' shape='Cuboid' minZ='-3800' maxZ='3200'>
+		<!-- Western Fortress - Border -->
+		<stat name='fortId' val='117'/>
+		<stat name='spawnX' val='111376'/>
+		<stat name='spawnY' val='-15203'/>
+		<stat name='spawnZ' val='-995'/>
+	</zone>
+	
+	<zone id='11518' type='FortZone' shape='Cuboid' minZ='-3800' maxZ='3200'>
+		<!-- Hunters Fortress - Border -->
+		<stat name='fortId' val='118'/>
+		<stat name='spawnX' val='125308'/>
+		<stat name='spawnY' val='95066'/>
+		<stat name='spawnZ' val='-2140'/>
+	</zone>
+	
+	<zone id='11519' type='FortZone' shape='Cuboid' minZ='-3800' maxZ='3200'>
+		<!-- Aaru Fortress - Border -->
+		<stat name='fortId' val='119'/>
+		<stat name='spawnX' val='73066'/>
+		<stat name='spawnY' val='185954'/>
+		<stat name='spawnZ' val='-2581'/>
+	</zone>
+	
+	<zone id='11520' type='FortZone' shape='Cuboid' minZ='-3800' maxZ='3200'>
+		<!-- Demon Fortress - Border -->
+		<stat name='fortId' val='120'/>
+		<stat name='spawnX' val='100698'/>
+		<stat name='spawnY' val='-55334'/>
+		<stat name='spawnZ' val='-645'/>
+	</zone>
+	
+	<zone id='11521' type='FortZone' shape='Cuboid' minZ='-3800' maxZ='3200'>
+		<!-- Monastic Fortress - Border -->
+		<stat name='fortId' val='121'/>
+		<stat name='spawnX' val='72146'/>
+		<stat name='spawnY' val='-94782'/>
+		<stat name='spawnZ' val='-1428'/>
+	</zone>
+
 <!-- Boss Zones -->
      <zone id='12006' type='BossZone' shape='Cuboid' minZ='-8320' maxZ='-4870'>
 	    <stat name='name' val='Lair of Antharas'/>
@@ -1212,4 +1381,4 @@
 <!-- [22_17_2] water zone-->
 	<zone id='15188' type='WaterZone' shape='NPoly' minZ='-4810' maxZ='-3810'>
 	</zone>
-</list>
+</list>

+ 37 - 0
datapack_development/sql/fort.sql

@@ -0,0 +1,37 @@
+-- ----------------------------
+-- Table structure for fort
+-- ----------------------------
+CREATE TABLE `fort` (
+  `id` int(11) NOT NULL default '0',
+  `name` varchar(25) NOT NULL,
+  `siegeDate` decimal(20,0) NOT NULL default '0',
+  `siegeDayOfWeek` int(11) NOT NULL default '7',
+  `siegeHourOfDay` int(11) NOT NULL default '20',
+  `owner` int(11) NOT NULL default '0',
+  PRIMARY KEY  (`id`)
+) ;
+
+-- ----------------------------
+-- Records 
+-- ----------------------------
+INSERT INTO `fort` VALUES ('101', 'Shanty', '0', '0', '0', '0');
+INSERT INTO `fort` VALUES ('102', 'Southern', '0', '0', '20', '0');
+INSERT INTO `fort` VALUES ('103', 'Hive', '0', '0', '20', '0');
+INSERT INTO `fort` VALUES ('104', 'Valley', '0', '0', '20', '0');
+INSERT INTO `fort` VALUES ('105', 'Ivory', '0', '0', '20', '0');
+INSERT INTO `fort` VALUES ('106', 'Narsell', '0', '0', '20', '0');
+INSERT INTO `fort` VALUES ('107', 'Basin', '0', '0', '20', '0');
+INSERT INTO `fort` VALUES ('108', 'White Sands', '0', '0', '20', '0');
+INSERT INTO `fort` VALUES ('109', 'Borderland', '0', '0', '20', '0');
+INSERT INTO `fort` VALUES ('110', 'Marshland', '0', '0', '20', '0');
+INSERT INTO `fort` VALUES ('111', 'Archaic', '0', '0', '20', '0');
+INSERT INTO `fort` VALUES ('112', 'Floran', '0', '0', '20', '0');
+INSERT INTO `fort` VALUES ('113', 'Cloud Mountain', '0', '0', '20', '0');
+INSERT INTO `fort` VALUES ('114', 'Tanor', '0', '0', '20', '0');
+INSERT INTO `fort` VALUES ('115', 'Dragonspine', '0', '0', '20', '0');
+INSERT INTO `fort` VALUES ('116', 'Land Dragon', '0', '0', '20', '0');
+INSERT INTO `fort` VALUES ('117', 'Western Guard', '0', '0', '20', '0');
+INSERT INTO `fort` VALUES ('118', 'Hunters', '0', '0', '20', '0');
+INSERT INTO `fort` VALUES ('119', 'Aaru', '0', '0', '20', '0');
+INSERT INTO `fort` VALUES ('120', 'Demon', '0', '0', '20', '0');
+INSERT INTO `fort` VALUES ('121', 'Monastic', '0', '0', '20', '0');

+ 34 - 0
datapack_development/sql/fort_door.sql

@@ -0,0 +1,34 @@
+-- ---------------------------
+-- Table structure for fort_door
+-- ---------------------------
+DROP TABLE IF EXISTS fort_door;
+CREATE TABLE fort_door (
+  fortId INT NOT NULL default 0,
+  id INT NOT NULL default 0,
+  name varchar(30) NOT NULL,
+  x INT NOT NULL default 0,
+  y INT NOT NULL default 0,
+  z INT NOT NULL default 0,
+  range_xmin INT NOT NULL default 0,
+  range_ymin INT NOT NULL default 0,
+  range_zmin INT NOT NULL default 0,
+  range_xmax INT NOT NULL default 0,
+  range_ymax INT NOT NULL default 0,
+  range_zmax INT NOT NULL default 0,
+  hp INT NOT NULL default 0,
+  pDef INT NOT NULL default 0,
+  mDef INT NOT NULL default 0,
+  PRIMARY KEY(id),
+  KEY id (fortId)
+);
+
+-- Dragonspine doors
+INSERT INTO `fort_door` VALUES 
+(115,20200001,'Gate_of_fort',12496,93487,-3429,0,0,0,0,0,0,158250,644,518),
+(115,20200002,'Gate_of_fort',11467,94385,-3426,0,0,0,0,0,0,158250,644,518),
+(115,20200003,'Gate_of_fort',11605,94374,-3426,0,0,0,0,0,0,158250,644,518),
+(115,20200004,'Gate_of_fort',10126,94940,-3399,0,0,0,0,0,0,158250,644,518),
+(115,20200005,'Gate_of_fort',10124,95088,-3399,0,0,0,0,0,0,158250,644,518),
+(115,20200006,'Gate_of_fort',11466,95581,-3426,0,0,0,0,0,0,158250,644,518),
+(115,20200007,'Gate_of_fort',11610,95585,-3426,0,0,0,0,0,0,158250,644,518),
+(115,20200008,'Gate_of_fort',10476,96573,-3429,0,0,0,0,0,0,158250,644,518);

+ 12 - 0
datapack_development/sql/fort_doorupgrade.sql

@@ -0,0 +1,12 @@
+-- ----------------------------
+-- Table structure for fort_doorupgrade
+-- ----------------------------
+CREATE TABLE `fort_doorupgrade` (
+  `doorId` int(11) NOT NULL default '0',
+  `fortId` int(11) NOT NULL,
+  `hp` int(11) NOT NULL default '0',
+  `pDef` int(11) NOT NULL default '0',
+  `mDef` int(11) NOT NULL default '0',
+  PRIMARY KEY  (`doorId`)
+);
+

+ 189 - 0
datapack_development/sql/fort_siege_guards.sql

@@ -0,0 +1,189 @@
+-- ---------------------------
+-- Table structure for fort_siege_guards
+-- ---------------------------
+DROP TABLE IF EXISTS `fort_siege_guards`;
+CREATE TABLE IF NOT EXISTS fort_siege_guards (
+  fortId INT NOT NULL default 0,
+  id int(11) NOT NULL auto_increment,
+  npcId INT NOT NULL default 0,
+  x INT NOT NULL default 0,
+  y INT NOT NULL default 0,
+  z INT NOT NULL default 0,
+  heading INT NOT NULL default 0,
+  respawnDelay INT NOT NULL default 0,
+  isHired INT NOT NULL default 1,
+  PRIMARY KEY  (id),
+  KEY id (fortId)
+);
+
+-- Dragonspine Guards
+-- RETAIL !!
+INSERT INTO `fort_siege_guards` VALUES ('115', '1', '36145', '12829', '96214', '-3392', '49152', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '2', '36154', '11488', '95088', '-2496', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '3', '36154', '11489', '94886', '-2496', '49151', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '4', '36154', '11584', '95088', '-2480', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '5', '36154', '11521', '94886', '-2496', '49151', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '6', '36154', '11553', '94886', '-2496', '49151', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '7', '36154', '11585', '94886', '-2496', '49151', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '8', '36154', '11552', '95088', '-2496', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '9', '36154', '11520', '95088', '-2496', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '10', '36155', '11567', '95280', '-2528', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '11', '36155', '11759', '95280', '-2528', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '12', '36155', '11903', '94560', '-2712', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '13', '36155', '10960', '95376', '-3056', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '14', '36155', '11903', '94624', '-2712', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '15', '36155', '11014', '94644', '-2904', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '16', '36155', '11695', '95280', '-2528', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '17', '36155', '11791', '95280', '-2528', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '18', '36155', '10960', '95344', '-3056', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '19', '36155', '11903', '94592', '-2712', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '20', '36155', '11078', '94644', '-2904', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '21', '36155', '11046', '94644', '-2904', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '22', '36155', '10960', '95408', '-3056', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '23', '36155', '11727', '95280', '-2528', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '24', '36155', '11663', '95280', '-2528', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '25', '36155', '11631', '95280', '-2528', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '26', '36155', '11599', '95280', '-2528', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '27', '36156', '12512', '93488', '-3424', '39347', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '28', '36156', '12544', '93488', '-3424', '49152', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '29', '36156', '11487', '94361', '-3424', '49151', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '30', '36156', '11519', '95609', '-3424', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '31', '36156', '11583', '94361', '-3424', '49151', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '32', '36156', '12448', '93488', '-3424', '49152', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '33', '36156', '12480', '93488', '-3424', '49152', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '34', '36156', '11519', '94361', '-3424', '49151', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '35', '36156', '11551', '94361', '-3424', '49151', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '36', '36156', '10436', '96588', '-3424', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '37', '36156', '10530', '96589', '-3424', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '38', '36156', '11583', '95609', '-3424', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '39', '36156', '11487', '95609', '-3424', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '40', '36156', '10468', '96588', '-3424', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '41', '36156', '11551', '95609', '-3424', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '42', '36156', '10499', '96589', '-3424', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '43', '36157', '12206', '93591', '-3248', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '44', '36157', '13170', '93936', '-3072', '49151', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '45', '36157', '12841', '93590', '-3248', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '46', '36157', '12174', '93591', '-3248', '57674', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '47', '36157', '8896', '94448', '-3048', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '48', '36157', '13296', '93472', '-3048', '49152', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '49', '36157', '13264', '93472', '-3048', '49152', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '50', '36157', '11568', '93472', '-3048', '49152', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '51', '36157', '10720', '93472', '-3048', '49152', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '52', '36157', '9024', '93984', '-3048', '40960', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '53', '36157', '8896', '95424', '-3048', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '54', '36157', '8896', '95456', '-3048', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '55', '36157', '9056', '93968', '-3048', '40960', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '56', '36157', '14080', '95600', '-3048', '0', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '57', '36157', '14080', '94624', '-3048', '0', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '58', '36157', '14080', '94656', '-3048', '0', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '59', '36157', '13952', '94000', '-3048', '57344', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '60', '36157', '13920', '93968', '-3048', '57344', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '61', '36157', '12304', '94096', '-3424', '54044', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '62', '36157', '12267', '94077', '-3424', '54044', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '63', '36157', '10622', '95920', '-3424', '20480', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '64', '36157', '10730', '95971', '-3424', '20480', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '65', '36157', '12112', '93744', '-2976', '0', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '66', '36157', '12112', '93680', '-2976', '0', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '67', '36157', '12898', '93676', '-2976', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '68', '36157', '12898', '93742', '-2976', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '69', '36157', '12930', '93708', '-2976', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '70', '36157', '11843', '93930', '-3072', '49151', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '71', '36157', '12809', '93590', '-3248', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '72', '36157', '12343', '94061', '-3424', '54044', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '73', '36157', '11536', '93472', '-3048', '49152', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '74', '36157', '9872', '93472', '-3048', '49152', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '75', '36157', '12373', '94132', '-3424', '54044', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '76', '36157', '12112', '93712', '-2976', '0', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '77', '36157', '10752', '93472', '-3048', '49152', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '78', '36157', '9920', '93472', '-3048', '49152', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '79', '36157', '12898', '93708', '-2976', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '80', '36157', '12080', '93712', '-2976', '0', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '81', '36157', '13202', '93936', '-3072', '49151', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '82', '36157', '12340', '94114', '-3424', '54044', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '83', '36157', '11811', '93930', '-3072', '49151', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '84', '36157', '9680', '96608', '-3048', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '85', '36157', '11584', '96608', '-3048', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '86', '36157', '10912', '96368', '-2976', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '87', '36157', '10912', '96336', '-2976', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '88', '36157', '10912', '96400', '-2976', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '89', '36157', '10944', '96368', '-2976', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '90', '36157', '10112', '96400', '-2976', '0', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '91', '36157', '10112', '96334', '-2976', '0', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '92', '36157', '10805', '96480', '-3248', '49151', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '93', '36157', '11616', '96608', '-3048', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '94', '36157', '10200', '96480', '-3248', '49151', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '95', '36157', '10168', '96480', '-3248', '49151', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '96', '36157', '9712', '96608', '-3048', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '97', '36157', '12448', '96608', '-3024', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '98', '36157', '10837', '96480', '-3248', '49151', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '99', '36157', '10112', '96368', '-2960', '0', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '100', '36157', '10656', '95936', '-3424', '20480', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '101', '36157', '10693', '95951', '-3424', '20480', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '102', '36157', '10080', '96368', '-2976', '0', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '103', '36157', '11165', '96144', '-3072', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '104', '36157', '9806', '96139', '-3072', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '105', '36157', '9838', '96139', '-3072', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '106', '36157', '11197', '96144', '-3072', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '107', '36157', '10640', '95987', '-3424', '20480', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '108', '36157', '14080', '95632', '-3048', '0', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '109', '36157', '12400', '96608', '-3048', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '110', '36161', '9529', '94927', '-3392', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '111', '36161', '9529', '95023', '-3392', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '112', '36161', '9529', '94991', '-3392', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '113', '36161', '9529', '95055', '-3392', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '114', '36161', '9529', '94959', '-3392', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '115', '36162', '9561', '95055', '-3392', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '116', '36162', '9561', '95023', '-3392', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '117', '36162', '9561', '94991', '-3392', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '118', '36162', '9561', '94959', '-3392', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '119', '36162', '9561', '94927', '-3392', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '120', '36163', '12829', '96214', '-3392', '49152', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '121', '36164', '12258', '93598', '-3424', '0', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '122', '36164', '12414', '93598', '-3424', '59404', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '123', '36164', '12750', '93598', '-3424', '32767', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '124', '36164', '12594', '93598', '-3424', '38902', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '125', '36164', '9838', '96107', '-3072', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '126', '36164', '11811', '93962', '-3072', '49151', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '127', '36164', '12809', '93558', '-3248', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '128', '36164', '13120', '96085', '-3392', '27864', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '129', '36164', '12174', '93559', '-3248', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '130', '36164', '12827', '95980', '-3392', '16232', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '131', '36164', '13202', '93968', '-3072', '49151', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '132', '36164', '11197', '96112', '-3072', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '133', '36164', '12704', '95984', '-3392', '10308', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '134', '36164', '12992', '96260', '-3392', '35780', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '135', '36164', '10200', '96512', '-3248', '59067', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '136', '36164', '10242', '96482', '-3424', '0', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '137', '36164', '10398', '96482', '-3424', '6132', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '138', '36164', '10446', '96514', '-3424', '17151', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '139', '36164', '10837', '96512', '-3248', '35725', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '140', '36164', '10492', '96609', '-3424', '10835', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '141', '36164', '10578', '96482', '-3424', '27931', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '142', '36164', '10514', '96514', '-3424', '19632', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '143', '36165', '12592', '96096', '-3392', '6296', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '144', '36165', '12206', '93559', '-3248', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '145', '36165', '11843', '93962', '-3072', '49151', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '146', '36165', '12841', '93558', '-3248', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '147', '36165', '11165', '96112', '-3072', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '148', '36165', '13170', '93968', '-3072', '49151', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '149', '36165', '10805', '96512', '-3248', '49151', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '150', '36165', '12928', '95968', '-3392', '19600', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '151', '36165', '10168', '96512', '-3248', '49151', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '152', '36165', '9806', '96107', '-3072', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '153', '36167', '13119', '94688', '-3240', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '154', '36167', '13447', '94764', '-3344', '0', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '155', '36167', '13447', '95116', '-3344', '0', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '156', '36167', '13216', '95200', '-3240', '49152', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '157', '36167', '12927', '94758', '-3344', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '158', '36167', '13248', '95200', '-3240', '49152', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '159', '36167', '13151', '94688', '-3240', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '160', '36167', '12928', '95112', '-3344', '32768', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '161', '36167', '12986', '95168', '-3344', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '162', '36167', '13380', '95167', '-3344', '16384', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '163', '36167', '12988', '94714', '-3344', '49151', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '164', '36167', '13184', '94944', '-3344', '0', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '165', '36167', '13388', '94712', '-3344', '49151', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '166', '36168', '13894', '95136', '-3424', '0', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '167', '36168', '9086', '94588', '-3424', '0', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '168', '36168', '12330', '94991', '-3424', '0', '10800', '0');
+INSERT INTO `fort_siege_guards` VALUES ('115', '169', '36168', '10675', '95036', '-3424', '0', '10800', '0');

+ 10 - 0
datapack_development/sql/fortsiege_clans.sql

@@ -0,0 +1,10 @@
+-- ----------------------------
+-- Table structure for fortsiege_clans
+-- ----------------------------
+CREATE TABLE `fortsiege_clans` (
+  `fort_id` int(1) NOT NULL default '0',
+  `clan_id` int(11) NOT NULL default '0',
+  `type` int(1) default NULL,
+  `fort_owner` int(1) default NULL,
+  PRIMARY KEY  (`clan_id`,`fort_id`)
+) ;

+ 33 - 33
datapack_development/sql/npc.sql

@@ -7338,7 +7338,7 @@ INSERT INTO `npc` VALUES
 (35656, 35656, "Court Magician", 0, "Schuttgart", 0, "Monster3.Elite_Mage", 6.5, 21.96, 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, 132, "NULL", 0, 0, 0, "LAST_HIT", 0, 0, 0, "mage"),
 (35657, 35657, "Flagpole", 0, "", 0, "LineageNpcEV.rune_holything", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35658, 35658, "Foreman", 0, "Shanty Fortress", 0, "LineageNPC.a_royal_guardA_MHuman", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(35659, 35659, "Suspicious Merchant", 0, "Shanty Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(35659, 35659, "Suspicious Merchant", 0, "Shanty Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2FortMerchant", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35660, 35660, "Guard Captain", 0, "Shanty Fortress", 0, "LineageNPC2.garrison_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35661, 35661, "Archer Captain", 0, "Shanty Fortress", 0, "LineageNPC2.archer_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "archer"),
 (35662, 35662, "Support Unit Captain", 0, "Shanty Fortress", 0, "LineageNPC2.mage_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "mage"),
@@ -7369,7 +7369,7 @@ INSERT INTO `npc` VALUES
 (35687, 35687, "Mercenary Private", 0, "", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35688, 35688, "Flagpole", 0, "", 0, "LineageNpcEV.rune_holything", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35689, 35689, "Foreman", 0, "Southern Gludio Fortress", 0, "LineageNPC.a_royal_guardA_MHuman", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(35690, 35690, "Suspicious Merchant", 0, "Southern Gludio Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(35690, 35690, "Suspicious Merchant", 0, "Southern Gludio Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2FortMerchant", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35691, 35691, "Guard Captain", 0, "Southern Gludio Fortress", 0, "LineageNPC2.garrison_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35692, 35692, "Archer Captain", 0, "Southern Gludio Fortress", 0, "LineageNPC2.archer_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "archer"),
 (35693, 35693, "General", 0, "Southern Gludio Fortress", 0, "LineageNPC2.officer_of_insurgents_orc", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
@@ -7407,7 +7407,7 @@ INSERT INTO `npc` VALUES
 (35725, 35725, "Mercenary Private", 0, "", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35726, 35726, "Flagpole", 0, "", 0, "LineageNpcEV.rune_holything", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35727, 35727, "Foreman", 0, "Hive Fortress", 0, "LineageNPC.a_royal_guardA_MHuman", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(35728, 35728, "Suspicious Merchant", 0, "Hive Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(35728, 35728, "Suspicious Merchant", 0, "Hive Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2FortMerchant", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35729, 35729, "Guard Captain", 0, "Hive Fortress", 0, "LineageNPC2.garrison_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35730, 35730, "Archer Captain", 0, "Hive Fortress", 0, "LineageNPC2.archer_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "archer"),
 (35731, 35731, "Support Unit Captain", 0, "Hive Fortress", 0, "LineageNPC2.mage_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "mage"),
@@ -7438,7 +7438,7 @@ INSERT INTO `npc` VALUES
 (35756, 35756, "Mercenary Private", 0, "", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35757, 35757, "Flagpole", 0, "", 0, "LineageNpcEV.rune_holything", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35758, 35758, "Foreman", 0, "Valley Fortress", 0, "LineageNPC.a_royal_guardA_MHuman", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(35759, 35759, "Suspicious Merchant", 0, "Valley Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(35759, 35759, "Suspicious Merchant", 0, "Valley Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2FortMerchant", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35760, 35760, "Guard Captain", 0, "Valley Fortress", 0, "LineageNPC2.garrison_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35761, 35761, "Archer Captain", 0, "Valley Fortress", 0, "LineageNPC2.archer_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "archer"),
 (35762, 35762, "General", 0, "Valley Fortress", 0, "LineageNPC2.officer_of_insurgents_orc", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
@@ -7476,7 +7476,7 @@ INSERT INTO `npc` VALUES
 (35794, 35794, "Mercenary Private", 0, "", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35795, 35795, "Flagpole", 0, "", 0, "LineageNpcEV.rune_holything", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35796, 35796, "Foreman", 0, "Ivory Tower Fortress", 0, "LineageNPC.a_royal_guardA_MHuman", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(35797, 35797, "Suspicious Merchant", 0, "Ivory Tower Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(35797, 35797, "Suspicious Merchant", 0, "Ivory Tower Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2FortMerchant", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35798, 35798, "Guard Captain", 0, "Ivory Tower Fortress", 0, "LineageNPC2.garrison_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35799, 35799, "Archer Captain", 0, "Ivory Tower Fortress", 0, "LineageNPC2.archer_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "archer"),
 (35800, 35800, "Support Unit Captain", 0, "Ivory Tower Fortress", 0, "LineageNPC2.mage_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "mage"),
@@ -7507,7 +7507,7 @@ INSERT INTO `npc` VALUES
 (35825, 35825, "Mercenary Private", 0, "", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35826, 35826, "Flagpole", 0, "", 0, "LineageNpcEV.rune_holything", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35827, 35827, "Foreman", 0, "Lake Fortress", 0, "LineageNPC.a_royal_guardA_MHuman", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(35828, 35828, "Suspicious Merchant", 0, "Lake Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(35828, 35828, "Suspicious Merchant", 0, "Lake Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2FortMerchant", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35829, 35829, "Guard Captain", 0, "Lake Fortress", 0, "LineageNPC2.garrison_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35830, 35830, "Archer Captain", 0, "Lake Fortress", 0, "LineageNPC2.archer_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "archer"),
 (35831, 35831, "Support Unit Captain", 0, "Lake Fortress", 0, "LineageNPC2.mage_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "mage"),
@@ -7538,7 +7538,7 @@ INSERT INTO `npc` VALUES
 (35856, 35856, "Mercenary Private", 0, "", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35857, 35857, "Flagpole", 0, "", 0, "LineageNpcEV.rune_holything", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35858, 35858, "Foreman", 0, "Basin Fortress", 0, "LineageNPC.a_royal_guardA_MHuman", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(35859, 35859, "Suspicious Merchant", 0, "Basin Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(35859, 35859, "Suspicious Merchant", 0, "Basin Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2FortMerchant", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35860, 35860, "Guard Captain", 0, "Basin Fortress", 0, "LineageNPC2.garrison_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35861, 35861, "Archer Captain", 0, "Basin Fortress", 0, "LineageNPC2.archer_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "archer"),
 (35862, 35862, "General", 0, "Basin Fortress", 0, "LineageNPC2.officer_of_insurgents_orc", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
@@ -7576,7 +7576,7 @@ INSERT INTO `npc` VALUES
 (35894, 35894, "Mercenary Private", 0, "", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35895, 35895, "Flagpole", 0, "", 0, "LineageNpcEV.rune_holything", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35896, 35896, "Foreman", 0, "White Sand Fortress", 0, "LineageNPC.a_royal_guardA_MHuman", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(35897, 35897, "Suspicious Merchant", 0, "White Sand Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(35897, 35897, "Suspicious Merchant", 0, "White Sand Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2FortMerchant", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35898, 35898, "Guard Captain", 0, "White Sand Fortress", 0, "LineageNPC2.garrison_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35899, 35899, "Archer Captain", 0, "White Sand Fortress", 0, "LineageNPC2.archer_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "archer"),
 (35900, 35900, "Support Unit Captain", 0, "White Sand Fortress", 0, "LineageNPC2.mage_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "mage"),
@@ -7607,7 +7607,7 @@ INSERT INTO `npc` VALUES
 (35925, 35925, "Mercenary Private", 0, "", 0, "LineageNPC.e_guard_MOrc", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35926, 35926, "Flagpole", 0, "", 0, "LineageNpcEV.rune_holything", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35927, 35927, "Foreman", 0, "Border Fortress", 0, "LineageNPC.a_royal_guardA_MHuman", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(35928, 35928, "Suspicious Merchant", 0, "Border Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(35928, 35928, "Suspicious Merchant", 0, "Border Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2FortMerchant", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35929, 35929, "Guard Captain", 0, "Border Fortress", 0, "LineageNPC2.garrison_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35930, 35930, "Archer Captain", 0, "Border Fortress", 0, "LineageNPC2.archer_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "archer"),
 (35931, 35931, "General", 0, "Border Fortress", 0, "LineageNPC2.officer_of_insurgents_orc", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
@@ -7645,7 +7645,7 @@ INSERT INTO `npc` VALUES
 (35963, 35963, "Mercenary Private", 0, "", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35964, 35964, "Flagpole", 0, "", 0, "LineageNpcEV.rune_holything", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35965, 35965, "Foreman", 0, "Swampland Fortress", 0, "LineageNPC.a_royal_guardA_MHuman", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(35966, 35966, "Suspicious Merchant", 0, "Swampland Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(35966, 35966, "Suspicious Merchant", 0, "Swampland Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2FortMerchant", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35967, 35967, "Guard Captain", 0, "Swampland Fortress", 0, "LineageNPC2.garrison_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (35968, 35968, "Archer Captain", 0, "Swampland Fortress", 0, "LineageNPC2.archer_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "archer"),
 (35969, 35969, "General", 0, "Swampland Fortress", 0, "LineageNPC2.officer_of_insurgents_orc", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
@@ -7685,7 +7685,7 @@ INSERT INTO `npc` VALUES
 (36001, 36001, "Mercenary Private", 0, "", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36002, 36002, "Flagpole", 0, "", 0, "LineageNpcEV.rune_holything", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36003, 36003, "Foreman", 0, "Archaic Fortress", 0, "LineageNPC.a_royal_guardA_MHuman", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(36004, 36004, "Suspicious Merchant", 0, "Archaic Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(36004, 36004, "Suspicious Merchant", 0, "Archaic Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2FortMerchant", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36005, 36005, "Guard Captain", 0, "Archaic Fortress", 0, "LineageNPC2.garrison_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36006, 36006, "Archer Captain", 0, "Archaic Fortress", 0, "LineageNPC2.archer_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "archer"),
 (36007, 36007, "Support Unit Captain", 0, "Archaic Fortress", 0, "LineageNPC2.mage_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "mage"),
@@ -7716,7 +7716,7 @@ INSERT INTO `npc` VALUES
 (36032, 36032, "Mercenary Private", 0, "", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36033, 36033, "Flagpole", 0, "", 0, "LineageNpcEV.rune_holything", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36034, 36034, "Foreman", 0, "Floran Fortress", 0, "LineageNPC.a_royal_guardA_MHuman", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(36035, 36035, "Suspicious Merchant", 0, "Floran Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(36035, 36035, "Suspicious Merchant", 0, "Floran Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2FortMerchant", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36036, 36036, "Guard Captain", 0, "Floran Fortress", 0, "LineageNPC2.garrison_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36037, 36037, "Archer Captain", 0, "Floran Fortress", 0, "LineageNPC2.archer_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "archer"),
 (36038, 36038, "General", 0, "Floran Fortress", 0, "LineageNPC2.officer_of_insurgents_orc", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
@@ -7754,7 +7754,7 @@ INSERT INTO `npc` VALUES
 (36070, 36070, "Mercenary Private", 0, "", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36071, 36071, "Flagpole", 0, "", 0, "LineageNpcEV.rune_holything", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36072, 36072, "Foreman", 0, "Cloud Mountain", 0, "LineageNPC.a_royal_guardA_MHuman", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(36073, 36073, "Suspicious Merchant", 0, "Cloud Mountain", 0, "LineageNPC.e_guard_MOrc", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(36073, 36073, "Suspicious Merchant", 0, "Cloud Mountain", 0, "LineageNPC.e_guard_MOrc", 8, 22, 1, "male", "L2FortMerchant", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36074, 36074, "Guard Captain", 0, "Cloud Mountain", 0, "LineageNPC2.garrison_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36075, 36075, "Archer Captain", 0, "Cloud Mountain", 0, "LineageNPC2.archer_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "archer"),
 (36076, 36076, "General", 0, "Cloud Mountain", 0, "LineageNPC2.officer_of_insurgents_orc", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
@@ -7792,7 +7792,7 @@ INSERT INTO `npc` VALUES
 (36108, 36108, "Mercenary Private", 0, "", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36109, 36109, "Flagpole", 0, "", 0, "LineageNpcEV.rune_holything", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36110, 36110, "Foreman", 0, "Tanor Fortress", 0, "LineageNPC.a_royal_guardA_MHuman", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(36111, 36111, "Suspicious Merchant", 0, "Tanor Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(36111, 36111, "Suspicious Merchant", 0, "Tanor Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2FortMerchant", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36112, 36112, "Guard Captain", 0, "Tanor Fortress", 0, "LineageNPC2.garrison_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36113, 36113, "Archer Captain", 0, "Tanor Fortress", 0, "LineageNPC2.archer_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "archer"),
 (36114, 36114, "Support Unit Captain", 0, "Tanor Fortress", 0, "LineageNPC2.mage_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "mage"),
@@ -7823,7 +7823,7 @@ INSERT INTO `npc` VALUES
 (36139, 36139, "Mercenary Private", 0, "", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36140, 36140, "Flagpole", 0, "", 0, "LineageNpcEV.rune_holything", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36141, 36141, "Foreman", 0, "Dragonspine Fortress", 0, "LineageNPC.a_royal_guardA_MHuman", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(36142, 36142, "Suspicious Merchant", 0, "Dragonspine Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(36142, 36142, "Suspicious Merchant", 0, "Dragonspine Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2FortMerchant", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36143, 36143, "Guard Captain", 0, "Dragonspine Fortress", 0, "LineageNPC2.garrison_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36144, 36144, "Archer Captain", 0, "Dragonspine Fortress", 0, "LineageNPC2.archer_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "archer"),
 (36145, 36145, "Support Unit Captain", 0, "Dragonspine Fortress", 0, "LineageNPC2.mage_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "mage"),
@@ -7834,27 +7834,27 @@ INSERT INTO `npc` VALUES
 (36150, 36150, "Doorman", 0, "", 0, "LineageNPC.a_guard_MHuman", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36151, 36151, "Doorman", 0, "", 0, "LineageNPC.a_guard_MHuman", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36152, 36152, "Doorman", 0, "", 0, "LineageNPC.a_guard_MHuman", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(36153, 36153, "Rebel Commander", 0, "Dragonspine Fortress", 0, "LineageNPC2.chief_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(36154, 36154, "Decorated Rebel Soldier", 0, "Dragonspine Fortress", 0, "LineageMonster.shadow_50_bi", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(36155, 36155, "Rebel Private", 0, "Dragonspine Fortress", 0, "LineageNPC.e_elmore_guard_Mhuman", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(36156, 36156, "Court Guard", 0, "Dragonspine Fortress", 0, "LineageNPC.a_royal_guardB_MHuman", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(36157, 36157, "Guard", 0, "Dragonspine Fortress", 0, "LineageNPC.a_guard_MElf", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(36153, 36153, "Rebel Commander", 0, "Dragonspine Fortress", 0, "LineageNPC2.chief_of_insurgents", 10, 26.99, 70, "male", 'L2Commander', 1100, 1331548, 2444, 10, 2, 40, 43, 30, 21, 20, 10, 0, 0, 2039, 562, 1258, 456, 278, 0, 333, 2500, 6377, NULL, 29, 120, "dragonspine_siege_clan", 600, 1, 0, "LAST_HIT", 0, 0, 0, "fighter"),
+(36154, 36154, "Decorated Rebel Soldier", 0, "Dragonspine Fortress", 0, "LineageMonster.shadow_50_bi", 15, 45, 68, "male", "L2SiegeGuard", 80, 4526, 2444, 10, 2, 40, 43, 30, 21, 20, 10, 0, 0, 1721, 368, 1248, 456, 278, 0, 333, 0, 0, NULL, 80, 120, "dragonspine_siege_clan", 600, 1, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(36155, 36155, "Rebel Private", 0, "Dragonspine Fortress", 0, "LineageNPC.e_elmore_guard_Mhuman", 8, "23.5", 68, "male", "L2SiegeGuard", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 278, 0, 333, 97, 0, NULL, 50, 120, "dragonspine_siege_clan", 600, 1, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(36156, 36156, "Court Guard", 0, "Dragonspine Fortress", 0, "LineageNPC.a_royal_guardB_MHuman", 7, 24, 68, "male", "L2SiegeGuard", 80, 3265, 2444, 10, 2, 40, 43, 30, 21, 20, 10, 0, 0, 1721, 368, 478, 299, 278, 0, 333, 98, 0, NULL, 50, 120, "dragonspine_siege_clan", 600, 1, 0, "LAST_HIT", 0, 0, 0, "fighter"),
+(36157, 36157, "Guard", 0, "Dragonspine Fortress", 0, "LineageNPC.a_guard_MElf", 8, "23.5", 68, "male", "L2SiegeGuard", 1100, 2958, 2444, 10, 2, 40, 43, 30, 21, 20, 10, 0, 0, 1739, 331, 382, 269, 247, 0, 333, 287, 0, NULL, 50, 120, "dragonspine_siege_clan", 1200, 1, 0, "LAST_HIT", 0, 0, 0, "fighter"),
 (36158, 36158, "Power Control Unit", 0, "Control Room", 0, "LineageNpcEV.machine_construction_a", 16, 15.5, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36159, 36159, "Dwarven Gunnery Sergeant", 0, "", 0, "LineageNPC2.battery_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36160, 36160, "Guard Captain", 0, "Guard", 0, "LineageNPC2.garrison_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(36161, 36161, "Guard", 0, "Guard", 0, "LineageNPC.a_royal_guardB_MHuman", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(36162, 36162, "Guard", 0, "Guard", 0, "LineageNPC.a_royal_guardB_MHuman", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(36163, 36163, "Support Unit Captain", 0, "Support Unit", 0, "LineageNPC2.mage_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "mage"),
-(36164, 36164, "Wizard", 0, "Support Unit", 0, "LineageNPC.a_patriarch_MElf", 8, 22.5, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(36165, 36165, "Healer", 0, "Support Unit", 0, "LineageNPC.a_mageguild_master_FHuman", 8, 23, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "mage"),
+(36161, 36161, "Guard", 0, "Guard", 0, "LineageNPC.a_royal_guardB_MHuman", 7, 24, 68, "male", "L2SiegeGuard", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 278, 0, 333, 75, 0, NULL, 50, 120, "dragonspine_siege_clan", 600, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(36162, 36162, "Guard", 0, "Guard", 0, "LineageNPC.a_royal_guardB_MHuman", 7, 24, 68, "male", "L2SiegeGuard", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 278, 0, 333, 75, 0, NULL, 50, 120, "dragonspine_siege_clan", 600, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(36163, 36163, "Support Unit Captain", 0, "Support Unit", 0, "LineageNPC2.mage_of_insurgents", 9, "23.5", 68, "male", "L2SiegeGuard", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 278, 0, 333, 0, 0, NULL, 60, 120, "dragonspine_siege_clan", 600, 0, 0, "LAST_HIT", 0, 0, 0, "mage"),
+(36164, 36164, "Wizard", 0, "Support Unit", 0, "LineageNPC.a_patriarch_MElf", 8, "22.5", 68, "male", "L2SiegeGuard", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 278, 0, 333, 325, 0, NULL, 50, 120, "dragonspine_siege_clan", 1200, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(36165, 36165, "Healer", 0, "Support Unit", 0, "LineageNPC.a_mageguild_master_FHuman", 8, 23, 68, "male", "L2SiegeGuard", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 278, 0, 333, 92, 0, NULL, 50, 120, "dragonspine_siege_clan", 600, 0, 0, "LAST_HIT", 0, 0, 0, "mage"),
 (36166, 36166, "Archer Captain", 0, "Archer", 0, "LineageNPC2.archer_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "archer"),
-(36167, 36167, "Archer", 0, "Archer", 0, "LineageNPC.a_guard_MElf", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(36168, 36168, "Ballista", 0, "Dragonspine Fortress", 0, "LineageNpcEV.ballista", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(36167, 36167, "Archer", 0, "Archer", 0, "LineageNPC.a_guard_MElf", 8, "23.5", 68, "male", "L2SiegeGuard", 1100, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 247, 0, 333, 287, 0, NULL, 50, 120, "dragonspine_siege_clan", 1200, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(36168, 36168, "Ballista", 0, "Dragonspine Fortress", 0, "LineageNpcEV.ballista", 112, 59, 68, "male", "L2SiegeGuard", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 278, 0, 333, 0, 0, NULL, 1, 1, "dragonspine_siege_clan", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36169, 36169, "Mercenary Captain", 0, "", 0, "LineageMonster3.Kight_of_Dawn", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36170, 36170, "Mercenary Private", 0, "", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36171, 36171, "Flagpole", 0, "", 0, "LineageNpcEV.rune_holything", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36172, 36172, "Foreman", 0, "Land Dragon Fortress", 0, "LineageNPC.a_royal_guardA_MHuman", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(36173, 36173, "Suspicious Merchant", 0, "Land Dragon Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(36173, 36173, "Suspicious Merchant", 0, "Land Dragon Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2FortMerchant", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36174, 36174, "Guard Captain", 0, "Land Dragon Fortress", 0, "LineageNPC2.garrison_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36175, 36175, "Archer Captain", 0, "Land Dragon Fortress", 0, "LineageNPC2.archer_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "archer"),
 (36176, 36176, "General", 0, "Land Dragon Fortress", 0, "LineageNPC2.officer_of_insurgents_orc", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
@@ -7892,7 +7892,7 @@ INSERT INTO `npc` VALUES
 (36208, 36208, "Mercenary Private", 0, "", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36209, 36209, "Flagpole", 0, "", 0, "LineageNpcEV.rune_holything", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36210, 36210, "Foreman", 0, "Western Guard Fortress", 0, "LineageNPC.a_royal_guardA_MHuman", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(36211, 36211, "Suspicious Merchant", 0, "Western Guard Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(36211, 36211, "Suspicious Merchant", 0, "Western Guard Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2FortMerchant", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36212, 36212, "Guard Captain", 0, "Western Guard Fortress", 0, "LineageNPC2.garrison_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36213, 36213, "Archer Captain", 0, "Western Guard Fortress", 0, "LineageNPC2.archer_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "archer"),
 (36214, 36214, "General", 0, "Western Guard Fortress", 0, "LineageNPC2.officer_of_insurgents_orc", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
@@ -7930,7 +7930,7 @@ INSERT INTO `npc` VALUES
 (36246, 36246, "Mercenary Private", 0, "", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36247, 36247, "Flagpole", 0, "", 0, "LineageNpcEV.rune_holything", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36248, 36248, "Foreman", 0, "Hunter's Fortress", 0, "LineageNPC.a_royal_guardA_MHuman", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(36249, 36249, "Suspicious Merchant", 0, "Hunter's Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(36249, 36249, "Suspicious Merchant", 0, "Hunter's Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2FortMerchant", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36250, 36250, "Guard Captain", 0, "Hunter's Fortress", 0, "LineageNPC2.garrison_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36251, 36251, "Archer Captain", 0, "Hunter's Fortress", 0, "LineageNPC2.archer_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "archer"),
 (36252, 36252, "General", 0, "Hunter's Fortress", 0, "LineageNPC2.officer_of_insurgents_orc", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
@@ -7968,7 +7968,7 @@ INSERT INTO `npc` VALUES
 (36284, 36284, "Mercenary Private", 0, "", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36285, 36285, "Flagpole", 0, "", 0, "LineageNpcEV.rune_holything", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36286, 36286, "Foreman", 0, "Aaru Fortress", 0, "LineageNPC.a_royal_guardA_MHuman", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(36287, 36287, "Suspicious Merchant", 0, "Aaru Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(36287, 36287, "Suspicious Merchant", 0, "Aaru Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2FortMerchant", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36288, 36288, "Guard Captain", 0, "Aaru Fortress", 0, "LineageNPC2.garrison_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36289, 36289, "Archer Captain", 0, "Aaru Fortress", 0, "LineageNPC2.archer_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "archer"),
 (36290, 36290, "Support Unit Captain", 0, "Aaru Fortress", 0, "LineageNPC2.mage_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "mage"),
@@ -7999,7 +7999,7 @@ INSERT INTO `npc` VALUES
 (36315, 36315, "Mercenary Private", 0, "", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36316, 36316, "Flagpole", 0, "", 0, "LineageNpcEV.rune_holything", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36317, 36317, "Foreman", 0, "Demon Fortress", 0, "LineageNPC.a_royal_guardA_MHuman", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(36318, 36318, "Suspicious Merchant", 0, "Demon Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(36318, 36318, "Suspicious Merchant", 0, "Demon Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2FortMerchant", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36319, 36319, "Guard Captain", 0, "Demon Fortress", 0, "LineageNPC2.garrison_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36320, 36320, "Archer Captain", 0, "Demon Fortress", 0, "LineageNPC2.archer_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "archer"),
 (36321, 36321, "General", 0, "Demon Fortress", 0, "LineageNPC2.officer_of_insurgents_orc", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
@@ -8037,7 +8037,7 @@ INSERT INTO `npc` VALUES
 (36353, 36353, "Mercenary Private", 0, "", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36354, 36354, "Flagpole", 0, "", 0, "LineageNpcEV.rune_holything", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36355, 36355, "Foreman", 0, "Monastic Fortress", 0, "LineageNPC.a_royal_guardA_MHuman", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(36356, 36356, "Suspicious Merchant", 0, "Monastic Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(36356, 36356, "Suspicious Merchant", 0, "Monastic Fortress", 0, "LineageNPC.e_guard_MOrc", 8, 27, 1, "male", "L2FortMerchant", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36357, 36357, "Guard Captain", 0, "Monastic Fortress", 0, "LineageNPC2.garrison_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (36358, 36358, "Archer Captain", 0, "Monastic Fortress", 0, "LineageNPC2.archer_of_insurgents", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "archer"),
 (36359, 36359, "General", 0, "Monastic Fortress", 0, "LineageNPC2.officer_of_insurgents_orc", 8, 22, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),

+ 3 - 0
datapack_development/sql/npcskills.sql

@@ -22195,3 +22195,6 @@ INSERT INTO `npcskills` VALUES
 ('35520','1230','24'),
 ('35532','1230','24'),
 ('35533','1230','24');
+-- Fortress
+('36153','4178','12'),
+('36153','4195','12');

+ 4 - 0
datapack_development/sql/spawnlist.sql

@@ -40463,3 +40463,7 @@ INSERT INTO spawnlist VALUES
 (54953,'Miss_Queen',1,31765,-84336,242156,-3730,0,0,24500,60,0,'0'),
 (54954,'Miss_Queen',1,31766,-82032,150160,-3127,0,0,16500,60,0,'0'),
 (54955,'Priest Kanis',1,32264,143478,191013,-3720,0,0,8087,60,0,0);
+
+-- Fortress Suspicious Merchants
+INSERT INTO spawnlist VALUES
+(124659,'Dragon_Spine_Fortress',1,36142,12196,93188,-3421,0,0,50504,60,0,'0');

+ 1 - 1
datapack_development/sql/weapon.sql

@@ -1573,7 +1573,7 @@ INSERT INTO `weapon` VALUES
 (9661,'Enchanted Fenril Fang','rhand','true',100,0,0,'wood','none',537,0,'dualfist',8,0.00000,0,0,0,277,0,5,-1,0,0,'true','true','true','true',0,0,0,0,0,0,0,0,0,0,0),
 (9720,'Warrior''s Sword','rhand','true',1300,1,1,'wood','none',12,0,'sword',10,-1.00000,0,0,0,406,0,10,-1,0,0,'true','true','true','true',0,0,0,0,0,0,0,0,0,0,0),
 (9813,'Orc Officer','lrhand','true',2150,1,1,'wood','none',213,0,'dual',8,0.00000,0,0,0,325,0,91,-1,0,0,'true','true','true','true',0,0,0,0,0,0,0,0,0,0,0),
-(9819,'Combat flag','lhand','true',500,1,1,'wood','none',0,0,'none',0,0.00000,0,0,0,325,0,0,-1,0,0,'true','true','true','true',0,0,0,0,0,0,0,0,0,0,0),
+(9819,'Combat flag','lrhand','true',500,1,1,'wood','none',0,0,'none',0,0.00000,0,0,0,325,0,0,-1,0,0,'false','false','false','false',0,0,0,0,0,0,0,0,0,0,0),
 (9840,'Shadow Item: Chevalier Rapier','rhand','false',473,2,2,'wood','d',111,0,'rapier',10,-1.00000,0,0,0,406,0,68,300,0,0,'false','false','true','false',0,0,0,0,0,0,0,0,0,0,0),
 (9841,'Shadow Item: Riter Schlager','lrhand','false',667,2,2,'wood','c',132,0,'ancient',6,2.00000,0,0,0,350,0,68,300,0,0,'false','false','true','false',0,0,0,0,0,0,0,0,0,0,0),
 (9842,'Shadow Item: Ballista','lrhand','false',590,2,2,'wood','d',155,0,'crossbow',10,-1.00000,0,0,0,303,9,68,300,0,0,'false','false','true','false',0,0,0,0,0,0,0,0,0,0,0),

+ 42 - 0
datapack_development/sql/zone_vertices.sql

@@ -295,6 +295,48 @@ INSERT INTO `zone_vertices` (`id`,`order`,`x`,`y`) VALUES
 (11207,1,27250,-41716),
 (11208,0,73000,-156600),
 (11208,1,82560,-144750),
+(11501, 0, -56256, 153728),
+(11501, 1, -49536, 159424),
+(11502, 0, -26304, 216576),
+(11502, 1, -19584, 222912),
+(11503, 0, 12544, 185856),
+(11503, 1, 19456, 190272),
+(11504, 0, 122432, 120192),
+(11504, 1, 129600, 126656),
+(11505, 0, 70080, 1984),
+(11505, 1, 74944, 6656),
+(11506, 0, 151936, 52736),
+(11506, 1, 157760, 58304),
+(11507, 0, 186368, 36288),
+(11507, 1, 192640, 42240),
+(11508, 0, 114432, 201664),
+(11508, 1, 122176, 208704),
+(11509, 0, 155776, -72896),
+(11509, 1, 162368, -67776),
+(11510, 0, 66304, -63872),
+(11510, 1, 72832, -58688),
+(11511, 0, 106176, -143616),
+(11511, 1, 112704, -138752),
+(11512, 0, 1472, 145216),
+(11512, 1, 9728, 155136),
+(11513, 0, -57408, 88704),
+(11513, 1, -49408, 93824),
+(11514, 0, 56256, 136768),
+(11514, 1, 64256, 142016),
+(11515, 0, 8000, 92928),
+(11515, 1, 14976, 97408),
+(11516, 0, 75904, 86336),
+(11516, 1, 80448, 95488),
+(11517, 0, 107264, -17664),
+(11517, 1, 115392, -12544),
+(11518, 0, 121472, 92992),
+(11518, 1, 129088, 97792),
+(11519, 0, 69120, 182400),
+(11519, 1, 76672, 190784),
+(11520, 0, 98432, -56465),
+(11520, 1, 102912, -52288),
+(11521, 0, 68480, -97536),
+(11521, 1, 75520, -92224),
 (22001,0,82722,148839),
 (22001,1,83019,149274),
 (22004,0,82414,148486),

+ 5 - 0
datapack_development/tools/database_installer.bat

@@ -558,6 +558,11 @@ enchant_skill_trees.sql
 etcitem.sql
 fish.sql
 fishing_skill_trees.sql
+fort_door.sql
+fort_doorupgrade.sql
+fort_siege_guard.sql
+fort.sql
+fortsiege_clans.sql
 forums.sql
 games.sql
 global_tasks.sql

+ 441 - 436
datapack_development/tools/database_installer.sh

@@ -1,437 +1,442 @@
-#!/bin/bash
-############################################
-## WARNING!  WARNING!  WARNING!  WARNING! ##
-##                                        ##
-## DON'T USE NOTEPAD TO CHANGE THIS FILE  ##
-## INSTEAD USE SOME DECENT TEXT EDITOR.   ##
-## NEWLINE CHARACTERS DIFFER BETWEEN DOS/ ##
-## WINDOWS AND UNIX.                      ##
-##                                        ##
-## USING NOTEPAD TO SAVE THIS FILE WILL   ##
-## LEAVE IT IN A BROKEN STATE!!!          ##
-############################################
-## Writen by DrLecter                     ##
-## License: GNU GPL                       ##
-## Based on Tiago Tagliaferri's script    ##
-## E-mail: tiago_tagliaferri@msn.com      ##
-## From "L2J-DataPack"                    ##
-## Bug reports: http://l2jdp.com/trac     ##
-############################################
-trap finish 2
-
-configure() {
-echo "#############################################"
-echo "# You entered script configuration area     #"
-echo "# No change will be performed in your DB    #"
-echo "# I will just ask you some questions about  #"
-echo "# your hosts and DB.                        #"
-echo "#############################################"
-MYSQLDUMPPATH=`which -a mysqldump 2>/dev/null`
-MYSQLPATH=`which -a mysql 2>/dev/null`
-if [ $? -ne 0 ]; then
-echo "We were unable to find MySQL binaries on your path"
-while :
- do
-  echo -ne "\nPlease enter MySQL binaries directory (no trailing slash): "
-  read MYSQLBINPATH
-    if [ -e "$MYSQLBINPATH" ] && [ -d "$MYSQLBINPATH" ] && \
-       [ -e "$MYSQLBINPATH/mysqldump" ] && [ -e "$MYSQLBINPATH/mysql" ]; then
-       MYSQLDUMPPATH="$MYSQLBINPATH/mysqldump"
-       MYSQLPATH="$MYSQLBINPATH/mysql"
-       break
-    else
-       echo "The data you entered is invalid. Please verify and try again."
-       exit 1
-    fi
- done
-fi
-#LS
-echo -ne "\nPlease enter MySQL Login Server hostname (default localhost): "
-read LSDBHOST
-if [ -z "$LSDBHOST" ]; then
-  LSDBHOST="localhost"
-fi
-echo -ne "\nPlease enter MySQL Login Server database name (default l2jdb): "
-read LSDB
-if [ -z "$LSDB" ]; then
-  LSDB="l2jdb"
-fi
-echo -ne "\nPlease enter MySQL Login Server user (default root): "
-read LSUSER
-if [ -z "$LSUSER" ]; then
-  LSUSER="root"
-fi
-echo -ne "\nPlease enter MySQL Login Server $LSUSER's password (won't be displayed) :"
-stty -echo
-read LSPASS
-stty echo
-echo ""
-if [ -z "$LSPASS" ]; then
-  echo "Hum.. I'll let it be but don't be stupid and avoid empty passwords"
-elif [ "$LSUSER" == "$LSPASS" ]; then
-  echo "You're not too brilliant choosing passwords huh?"
-fi
-#GS
-echo -ne "\nPlease enter MySQL Game Server hostname (default $LSDBHOST): "
-read GSDBHOST
-if [ -z "$GSDBHOST" ]; then
-  GSDBHOST="$LSDBHOST"
-fi
-echo -ne "\nPlease enter MySQL Game Server database name (default $LSDB): "
-read GSDB
-if [ -z "$GSDB" ]; then
-  GSDB="$LSDB"
-fi
-echo -ne "\nPlease enter MySQL Game Server user (default $LSUSER): "
-read GSUSER
-if [ -z "$GSUSER" ]; then
-  GSUSER="$LSUSER"
-fi
-echo -ne "\nPlease enter MySQL Game Server $GSUSER's password (won't be displayed): "
-stty -echo
-read GSPASS
-stty echo
-echo ""
-if [ -z "$GSPASS" ]; then
-  echo "Hum.. I'll let it be but don't be stupid and avoid empty passwords"
-elif [ "$GSUSER" == "$GSPASS" ]; then
-  echo "You're not too brilliant choosing passwords huh?"
-fi
-save_config $1
-}
-
-save_config() {
-if [ -n "$1" ]; then
-CONF="$1"
-else 
-CONF="database_installer.rc"
-fi
-echo ""
-echo "With these data I can generate a configuration file which can be read"
-echo "on future updates. WARNING: this file will contain clear text passwords!"
-echo -ne "Shall I generate config file $CONF? (Y/n):"
-read SAVE
-if [ "$SAVE" == "y" -o "$SAVE" == "Y" -o "$SAVE" == "" ];then 
-cat <<EOF>$CONF
-#Configuration settings for L2J-Datapack database installer script
-MYSQLDUMPPATH=$MYSQLDUMPPATH
-MYSQLPATH=$MYSQLPATH
-LSDBHOST=$LSDBHOST
-LSDB=$LSDB
-LSUSER=$LSUSER
-LSPASS=$LSPASS
-GSDBHOST=$GSDBHOST
-GSDB=$GSDB
-GSUSER=$GSUSER
-GSPASS=$GSPASS
-EOF
-chmod 600 $CONF
-echo "Configuration saved as $CONF"
-echo "Permissions changed to 600 (rw- --- ---)"
-elif [ "$SAVE" != "n" -a "$SAVE" != "N" ]; then
-  save_config
-fi
-}
-
-load_config() {
-if [ -n "$1" ]; then
-CONF="$1"
-else 
-CONF="database_installer.rc"
-fi
-if [ -e "$CONF" ] && [ -f "$CONF" ]; then
-. $CONF
-else
-echo "Settings file not found: $CONF"
-echo "You can specify an alternate settings filename:"
-echo $0 config_filename
-echo ""
-echo "If file doesn't exist it can be created"
-echo "If nothing is specified script will try to work with ./database_installer.rc"
-echo ""
-configure $CONF
-fi
-}
-
-asklogin(){
-echo "#############################################"
-echo "# WARNING: This section of the script CAN   #"
-echo "# destroy your characters and accounts      #"
-echo "# information. Read questions carefully     #"
-echo "# before you reply.                         #"
-echo "#############################################"
-echo ""
-echo "Choose full (f) if you don't have and 'accounts' table or would"
-echo "prefer to erase the existing accounts information."
-echo "Choose skip (s) to skip loginserver DB installation and go to"
-echo "gameserver DB installation/upgrade."
-echo -ne "LOGINSERVER DB install type: (f) full, (s) skip or (q) quit? "
-read LOGINPROMPT
-case "$LOGINPROMPT" in
-	"f"|"F") logininstall; loginupgrade; gsbackup; asktype;;
-	"s"|"S") gsbackup; asktype;;
-	"q"|"Q") finish;;
-	*) asklogin;;
-esac
-}
-
-logininstall(){
-echo "Deleting loginserver tables for new content."
-$MYL < login_install.sql &> /dev/null
-}
-
-loginupgrade(){
-echo "Installling new loginserver content."
-$MYL < ../sql/accounts.sql &> /dev/null
-$MYL < ../sql/gameservers.sql &> /dev/null
-}
-
-gsbackup(){
-while :
-  do
-   echo ""
-   echo -ne "Do you want to make a backup copy of your GSDB? (y/n): "
-   read LSB
-   if [ "$LSB" == "Y" -o "$LSB" == "y" ]; then
-     echo "Making a backup of the original gameserver database."
-     $MYSQLDUMPPATH --add-drop-table -h $GSDBHOST -u $GSUSER --password=$GSPASS $GSDB > gameserver_backup.sql
-     if [ $? -ne 0 ];then
-     echo ""
-     echo "There was a problem accesing your GS database, either it wasnt created or authentication data is incorrect."
-     exit 1
-     fi
-     break
-   elif [ "$LSB" == "n" -o "$LSB" == "N" ]; then 
-     break
-   fi
-  done 
-}
-
-lsbackup(){
-while :
-  do
-   echo ""
-   echo -ne "Do you want to make a backup copy of your LSDB? (y/n): "
-   read LSB
-   if [ "$LSB" == "Y" -o "$LSB" == "y" ]; then
-     echo "Making a backup of the original loginserver database."
-     $MYSQLDUMPPATH --add-drop-table -h $LSDBHOST -u $LSUSER --password=$LSPASS $LSDB > loginserver_backup.sql
-     if [ $? -ne 0 ];then
-        echo ""
-        echo "There was a problem accesing your LS database, either it wasnt created or authentication data is incorrect."
-        exit 1
-     fi
-     break
-   elif [ "$LSB" == "n" -o "$LSB" == "N" ]; then 
-     break
-   fi
-  done 
-}
-
-asktype(){
-echo ""
-echo ""
-echo "WARNING: A full install (f) will destroy all existing character data."
-echo -ne "GAMESERVER DB install type: (f) full install, (u) upgrade, (s) skip or (q) quit? "
-read INSTALLTYPE
-case "$INSTALLTYPE" in
-	"f"|"F") fullinstall; upgradeinstall I; custom;;
-	"u"|"U") upgradeinstall U; custom;;
-	"s"|"S") custom;;
-	"q"|"Q") finish;;
-	*) asktype;;
-esac
-}
-
-fullinstall(){
-echo "Deleting all gameserver tables for new content."
-$MYG < full_install.sql &> /dev/null
-}
-
-upgradeinstall(){
-if [ "$1" == "I" ]; then 
-echo "Installling new gameserver content."
-else
-echo "Upgrading gameserver content"
-fi
-$MYG < ../sql/account_data.sql &> /dev/null
-$MYG < ../sql/armor.sql &> /dev/null
-$MYG < ../sql/armorsets.sql &> /dev/null
-$MYG < ../sql/auction.sql &> /dev/null
-$MYG < ../sql/auction_bid.sql &> /dev/null
-$MYG < ../sql/auction_watch.sql &> /dev/null
-$MYG < ../sql/augmentations.sql &> /dev/null
-$MYG < ../sql/auto_chat.sql &> /dev/null
-$MYG < ../sql/auto_chat_text.sql &> /dev/null
-$MYG < ../sql/boxaccess.sql &> /dev/null
-$MYG < ../sql/boxes.sql &> /dev/null
-$MYG < ../sql/castle.sql &> /dev/null
-$MYG < ../sql/castle_door.sql &> /dev/null
-$MYG < ../sql/castle_doorupgrade.sql &> /dev/null
-$MYG < ../sql/castle_manor_procure.sql &> /dev/null
-$MYG < ../sql/castle_manor_production.sql &> /dev/null
-$MYG < ../sql/castle_siege_guards.sql &> /dev/null
-$MYG < ../sql/char_templates.sql &> /dev/null
-$MYG < ../sql/character_friends.sql &> /dev/null
-$MYG < ../sql/character_hennas.sql &> /dev/null
-$MYG < ../sql/character_macroses.sql &> /dev/null
-$MYG < ../sql/character_quests.sql &> /dev/null
-$MYG < ../sql/character_recipebook.sql &> /dev/null
-$MYG < ../sql/character_recommends.sql &> /dev/null
-$MYG < ../sql/character_shortcuts.sql &> /dev/null
-$MYG < ../sql/character_skills.sql &> /dev/null
-$MYG < ../sql/character_skills_save.sql &> /dev/null
-$MYG < ../sql/character_subclasses.sql &> /dev/null
-$MYG < ../sql/characters.sql &> /dev/null
-$MYG < ../sql/clan_data.sql &> /dev/null
-$MYG < ../sql/clan_privs.sql &> /dev/null
-$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/cursed_weapons.sql &> /dev/null
-$MYG < ../sql/dimensional_rift.sql &> /dev/null
-$MYG < ../sql/droplist.sql &> /dev/null
-$MYG < ../sql/enchant_skill_trees.sql &> /dev/null
-$MYG < ../sql/etcitem.sql &> /dev/null
-$MYG < ../sql/fish.sql &> /dev/null
-$MYG < ../sql/fishing_skill_trees.sql &> /dev/null
-$MYG < ../sql/forums.sql &> /dev/null
-$MYG < ../sql/games.sql &> /dev/null
-$MYG < ../sql/global_tasks.sql &> /dev/null
-$MYG < ../sql/grandboss_data.sql &> /dev/null
-$MYG < ../sql/grandboss_list.sql &> /dev/null
-$MYG < ../sql/helper_buff_list.sql &> /dev/null
-$MYG < ../sql/henna.sql &> /dev/null
-$MYG < ../sql/henna_trees.sql &> /dev/null
-$MYG < ../sql/heroes.sql &> /dev/null
-$MYG < ../sql/items.sql &> /dev/null
-$MYG < ../sql/itemsonground.sql &> /dev/null
-$MYG < ../sql/locations.sql &> /dev/null
-$MYG < ../sql/lvlupgain.sql &> /dev/null
-$MYG < ../sql/mapregion.sql &> /dev/null
-$MYG < ../sql/merchant_areas_list.sql &> /dev/null
-$MYG < ../sql/merchant_buylists.sql &> /dev/null
-$MYG < ../sql/merchant_lease.sql &> /dev/null
-$MYG < ../sql/merchant_shopids.sql &> /dev/null
-$MYG < ../sql/merchants.sql &> /dev/null
-$MYG < ../sql/minions.sql &> /dev/null
-$MYG < ../sql/npc.sql &> /dev/null
-$MYG < ../sql/olympiad_nobles.sql&> /dev/null
-$MYG < ../sql/pets.sql &> /dev/null
-$MYG < ../sql/pets_stats.sql &> /dev/null
-$MYG < ../sql/pledge_skill_trees.sql &> /dev/null
-$MYG < ../sql/posts.sql &> /dev/null
-$MYG < ../sql/quest_global_data.sql &> /dev/null
-$MYG < ../sql/npcskills.sql &> /dev/null
-$MYG < ../sql/raidboss_spawnlist.sql &> /dev/null
-$MYG < ../sql/random_spawn.sql &> /dev/null
-$MYG < ../sql/random_spawn_loc.sql &> /dev/null
-$MYG < ../sql/seven_signs.sql &> /dev/null
-$MYG < ../sql/seven_signs_festival.sql &> /dev/null
-$MYG < ../sql/seven_signs_status.sql &> /dev/null
-$MYG < ../sql/siege_clans.sql &> /dev/null
-$MYG < ../sql/skill_learn.sql &> /dev/null
-$MYG < ../sql/skill_spellbooks.sql &> /dev/null
-$MYG < ../sql/skill_trees.sql &> /dev/null
-$MYG < ../sql/spawnlist.sql &> /dev/null
-$MYG < ../sql/teleport.sql &> /dev/null
-$MYG < ../sql/topic.sql &> /dev/null
-$MYG < ../sql/walker_routes.sql &> /dev/null
-$MYG < ../sql/weapon.sql &> /dev/null
-$MYG < ../sql/zone_vertices.sql &> /dev/null
-newbie_helper
-}
-
-custom(){
-echo ""
-echo ""
-echo -ne "Install custom gameserver DB tables: (y) yes or (n) no or (q) quit?"
-read ASKCS
-case "$ASKCS" in
-	"y"|"Y") cstinstall;;
-	"n"|"N") finish;;
-	"q"|"Q") finish;;
-	*) custom;;
-esac
-finish
-}
-
-cstinstall(){
-while :
-  do
-   echo ""
-   echo -ne "Do you want to make another backup of GSDB before applying custom contents? (y/N): "
-   read LSB
-   if [ "$LSB" == "Y" -o "$LSB" == "y" ]; then
-     echo "Making a backup of the default gameserver tables."
-     $MYSQLDUMPPATH --add-drop-table -h $GSDBHOST -u $GSUSER --password=$GSPASS $GSDB > custom_backup.sql 2> /dev/null
-     if [ $? -ne 0 ];then
-     echo ""
-     echo "There was a problem accesing your GS database, server down?."
-     exit 1
-     fi
-     break
-   elif [ "$LSB" == "n" -o "$LSB" == "N" -o "$LSB" == "" ]; then 
-     break
-   fi
-  done 
-echo "Installing custom content."
-for custom in $(ls ../sql/custom/*.sql);do 
-$MYG < $custom &> /dev/null
-done
-# L2J mods that needed extra tables to work properly, should be 
-# listed here. To do so copy & paste the following 6 lines and
-# change them properly:
-# MOD: Wedding.
-  echo -ne "Install "Wedding Mod" tables? (y/N): "
-  read modprompt
-  if [ "$modprompt" == "Y" -o "$LSB" == "y" ]; then
-		$MYG < ../sql/mods/mods_wedding.sql &> /dev/null
-	fi
-
-finish
-}
-
-finish(){
-echo ""
-echo "Script execution finished."
-exit 0
-}
-
-newbie_helper(){
-while :
-  do
-   echo ""
-   echo -ne "If you're not that skilled applying changes within 'updates' folder, i can try to do it for you (y). If you wish to do it on your own, choose (n). Should i parse updates files? (Y/n)"
-   read NOB
-   if [ "$NOB" == "Y" -o "$NOB" == "y" -o "$NOB" == "" ]; then
-     echo ""
-     echo "There we go, it may take some time..."
-     echo "updates parser results. Last run: "`date` >database_installer.log
-     for file in $(ls ../sql/updates/*sql);do
-        echo $file|cut -d/ -f4 >> database_installer.log
-        $MYG < $file 2>> database_installer.log
-	if [ $? -eq 0 ];then
-	    echo "no errors">> database_installer.log
-	fi    
-	done
-     echo ""
-     echo "Log available at $(pwd)/database_installer.log"
-     echo ""
-     break
-   elif [ "$NOB" == "n" -o "$NOB" == "N" ]; then 
-     break
-   fi
-  done 
-}
-
-
-clear
-load_config $1
-MYL="$MYSQLPATH -h $LSDBHOST -u $LSUSER --password=$LSPASS -D $LSDB"
-MYG="$MYSQLPATH -h $GSDBHOST -u $GSUSER --password=$GSPASS -D $GSDB"
-lsbackup
+#!/bin/bash
+############################################
+## WARNING!  WARNING!  WARNING!  WARNING! ##
+##                                        ##
+## DON'T USE NOTEPAD TO CHANGE THIS FILE  ##
+## INSTEAD USE SOME DECENT TEXT EDITOR.   ##
+## NEWLINE CHARACTERS DIFFER BETWEEN DOS/ ##
+## WINDOWS AND UNIX.                      ##
+##                                        ##
+## USING NOTEPAD TO SAVE THIS FILE WILL   ##
+## LEAVE IT IN A BROKEN STATE!!!          ##
+############################################
+## Writen by DrLecter                     ##
+## License: GNU GPL                       ##
+## Based on Tiago Tagliaferri's script    ##
+## E-mail: tiago_tagliaferri@msn.com      ##
+## From "L2J-DataPack"                    ##
+## Bug reports: http://l2jdp.com/trac     ##
+############################################
+trap finish 2
+
+configure() {
+echo "#############################################"
+echo "# You entered script configuration area     #"
+echo "# No change will be performed in your DB    #"
+echo "# I will just ask you some questions about  #"
+echo "# your hosts and DB.                        #"
+echo "#############################################"
+MYSQLDUMPPATH=`which -a mysqldump 2>/dev/null`
+MYSQLPATH=`which -a mysql 2>/dev/null`
+if [ $? -ne 0 ]; then
+echo "We were unable to find MySQL binaries on your path"
+while :
+ do
+  echo -ne "\nPlease enter MySQL binaries directory (no trailing slash): "
+  read MYSQLBINPATH
+    if [ -e "$MYSQLBINPATH" ] && [ -d "$MYSQLBINPATH" ] && \
+       [ -e "$MYSQLBINPATH/mysqldump" ] && [ -e "$MYSQLBINPATH/mysql" ]; then
+       MYSQLDUMPPATH="$MYSQLBINPATH/mysqldump"
+       MYSQLPATH="$MYSQLBINPATH/mysql"
+       break
+    else
+       echo "The data you entered is invalid. Please verify and try again."
+       exit 1
+    fi
+ done
+fi
+#LS
+echo -ne "\nPlease enter MySQL Login Server hostname (default localhost): "
+read LSDBHOST
+if [ -z "$LSDBHOST" ]; then
+  LSDBHOST="localhost"
+fi
+echo -ne "\nPlease enter MySQL Login Server database name (default l2jdb): "
+read LSDB
+if [ -z "$LSDB" ]; then
+  LSDB="l2jdb"
+fi
+echo -ne "\nPlease enter MySQL Login Server user (default root): "
+read LSUSER
+if [ -z "$LSUSER" ]; then
+  LSUSER="root"
+fi
+echo -ne "\nPlease enter MySQL Login Server $LSUSER's password (won't be displayed) :"
+stty -echo
+read LSPASS
+stty echo
+echo ""
+if [ -z "$LSPASS" ]; then
+  echo "Hum.. I'll let it be but don't be stupid and avoid empty passwords"
+elif [ "$LSUSER" == "$LSPASS" ]; then
+  echo "You're not too brilliant choosing passwords huh?"
+fi
+#GS
+echo -ne "\nPlease enter MySQL Game Server hostname (default $LSDBHOST): "
+read GSDBHOST
+if [ -z "$GSDBHOST" ]; then
+  GSDBHOST="$LSDBHOST"
+fi
+echo -ne "\nPlease enter MySQL Game Server database name (default $LSDB): "
+read GSDB
+if [ -z "$GSDB" ]; then
+  GSDB="$LSDB"
+fi
+echo -ne "\nPlease enter MySQL Game Server user (default $LSUSER): "
+read GSUSER
+if [ -z "$GSUSER" ]; then
+  GSUSER="$LSUSER"
+fi
+echo -ne "\nPlease enter MySQL Game Server $GSUSER's password (won't be displayed): "
+stty -echo
+read GSPASS
+stty echo
+echo ""
+if [ -z "$GSPASS" ]; then
+  echo "Hum.. I'll let it be but don't be stupid and avoid empty passwords"
+elif [ "$GSUSER" == "$GSPASS" ]; then
+  echo "You're not too brilliant choosing passwords huh?"
+fi
+save_config $1
+}
+
+save_config() {
+if [ -n "$1" ]; then
+CONF="$1"
+else 
+CONF="database_installer.rc"
+fi
+echo ""
+echo "With these data I can generate a configuration file which can be read"
+echo "on future updates. WARNING: this file will contain clear text passwords!"
+echo -ne "Shall I generate config file $CONF? (Y/n):"
+read SAVE
+if [ "$SAVE" == "y" -o "$SAVE" == "Y" -o "$SAVE" == "" ];then 
+cat <<EOF>$CONF
+#Configuration settings for L2J-Datapack database installer script
+MYSQLDUMPPATH=$MYSQLDUMPPATH
+MYSQLPATH=$MYSQLPATH
+LSDBHOST=$LSDBHOST
+LSDB=$LSDB
+LSUSER=$LSUSER
+LSPASS=$LSPASS
+GSDBHOST=$GSDBHOST
+GSDB=$GSDB
+GSUSER=$GSUSER
+GSPASS=$GSPASS
+EOF
+chmod 600 $CONF
+echo "Configuration saved as $CONF"
+echo "Permissions changed to 600 (rw- --- ---)"
+elif [ "$SAVE" != "n" -a "$SAVE" != "N" ]; then
+  save_config
+fi
+}
+
+load_config() {
+if [ -n "$1" ]; then
+CONF="$1"
+else 
+CONF="database_installer.rc"
+fi
+if [ -e "$CONF" ] && [ -f "$CONF" ]; then
+. $CONF
+else
+echo "Settings file not found: $CONF"
+echo "You can specify an alternate settings filename:"
+echo $0 config_filename
+echo ""
+echo "If file doesn't exist it can be created"
+echo "If nothing is specified script will try to work with ./database_installer.rc"
+echo ""
+configure $CONF
+fi
+}
+
+asklogin(){
+echo "#############################################"
+echo "# WARNING: This section of the script CAN   #"
+echo "# destroy your characters and accounts      #"
+echo "# information. Read questions carefully     #"
+echo "# before you reply.                         #"
+echo "#############################################"
+echo ""
+echo "Choose full (f) if you don't have and 'accounts' table or would"
+echo "prefer to erase the existing accounts information."
+echo "Choose skip (s) to skip loginserver DB installation and go to"
+echo "gameserver DB installation/upgrade."
+echo -ne "LOGINSERVER DB install type: (f) full, (s) skip or (q) quit? "
+read LOGINPROMPT
+case "$LOGINPROMPT" in
+	"f"|"F") logininstall; loginupgrade; gsbackup; asktype;;
+	"s"|"S") gsbackup; asktype;;
+	"q"|"Q") finish;;
+	*) asklogin;;
+esac
+}
+
+logininstall(){
+echo "Deleting loginserver tables for new content."
+$MYL < login_install.sql &> /dev/null
+}
+
+loginupgrade(){
+echo "Installling new loginserver content."
+$MYL < ../sql/accounts.sql &> /dev/null
+$MYL < ../sql/gameservers.sql &> /dev/null
+}
+
+gsbackup(){
+while :
+  do
+   echo ""
+   echo -ne "Do you want to make a backup copy of your GSDB? (y/n): "
+   read LSB
+   if [ "$LSB" == "Y" -o "$LSB" == "y" ]; then
+     echo "Making a backup of the original gameserver database."
+     $MYSQLDUMPPATH --add-drop-table -h $GSDBHOST -u $GSUSER --password=$GSPASS $GSDB > gameserver_backup.sql
+     if [ $? -ne 0 ];then
+     echo ""
+     echo "There was a problem accesing your GS database, either it wasnt created or authentication data is incorrect."
+     exit 1
+     fi
+     break
+   elif [ "$LSB" == "n" -o "$LSB" == "N" ]; then 
+     break
+   fi
+  done 
+}
+
+lsbackup(){
+while :
+  do
+   echo ""
+   echo -ne "Do you want to make a backup copy of your LSDB? (y/n): "
+   read LSB
+   if [ "$LSB" == "Y" -o "$LSB" == "y" ]; then
+     echo "Making a backup of the original loginserver database."
+     $MYSQLDUMPPATH --add-drop-table -h $LSDBHOST -u $LSUSER --password=$LSPASS $LSDB > loginserver_backup.sql
+     if [ $? -ne 0 ];then
+        echo ""
+        echo "There was a problem accesing your LS database, either it wasnt created or authentication data is incorrect."
+        exit 1
+     fi
+     break
+   elif [ "$LSB" == "n" -o "$LSB" == "N" ]; then 
+     break
+   fi
+  done 
+}
+
+asktype(){
+echo ""
+echo ""
+echo "WARNING: A full install (f) will destroy all existing character data."
+echo -ne "GAMESERVER DB install type: (f) full install, (u) upgrade, (s) skip or (q) quit? "
+read INSTALLTYPE
+case "$INSTALLTYPE" in
+	"f"|"F") fullinstall; upgradeinstall I; custom;;
+	"u"|"U") upgradeinstall U; custom;;
+	"s"|"S") custom;;
+	"q"|"Q") finish;;
+	*) asktype;;
+esac
+}
+
+fullinstall(){
+echo "Deleting all gameserver tables for new content."
+$MYG < full_install.sql &> /dev/null
+}
+
+upgradeinstall(){
+if [ "$1" == "I" ]; then 
+echo "Installling new gameserver content."
+else
+echo "Upgrading gameserver content"
+fi
+$MYG < ../sql/account_data.sql &> /dev/null
+$MYG < ../sql/armor.sql &> /dev/null
+$MYG < ../sql/armorsets.sql &> /dev/null
+$MYG < ../sql/auction.sql &> /dev/null
+$MYG < ../sql/auction_bid.sql &> /dev/null
+$MYG < ../sql/auction_watch.sql &> /dev/null
+$MYG < ../sql/augmentations.sql &> /dev/null
+$MYG < ../sql/auto_chat.sql &> /dev/null
+$MYG < ../sql/auto_chat_text.sql &> /dev/null
+$MYG < ../sql/boxaccess.sql &> /dev/null
+$MYG < ../sql/boxes.sql &> /dev/null
+$MYG < ../sql/castle.sql &> /dev/null
+$MYG < ../sql/castle_door.sql &> /dev/null
+$MYG < ../sql/castle_doorupgrade.sql &> /dev/null
+$MYG < ../sql/castle_manor_procure.sql &> /dev/null
+$MYG < ../sql/castle_manor_production.sql &> /dev/null
+$MYG < ../sql/castle_siege_guards.sql &> /dev/null
+$MYG < ../sql/char_templates.sql &> /dev/null
+$MYG < ../sql/character_friends.sql &> /dev/null
+$MYG < ../sql/character_hennas.sql &> /dev/null
+$MYG < ../sql/character_macroses.sql &> /dev/null
+$MYG < ../sql/character_quests.sql &> /dev/null
+$MYG < ../sql/character_recipebook.sql &> /dev/null
+$MYG < ../sql/character_recommends.sql &> /dev/null
+$MYG < ../sql/character_shortcuts.sql &> /dev/null
+$MYG < ../sql/character_skills.sql &> /dev/null
+$MYG < ../sql/character_skills_save.sql &> /dev/null
+$MYG < ../sql/character_subclasses.sql &> /dev/null
+$MYG < ../sql/characters.sql &> /dev/null
+$MYG < ../sql/clan_data.sql &> /dev/null
+$MYG < ../sql/clan_privs.sql &> /dev/null
+$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/cursed_weapons.sql &> /dev/null
+$MYG < ../sql/dimensional_rift.sql &> /dev/null
+$MYG < ../sql/droplist.sql &> /dev/null
+$MYG < ../sql/enchant_skill_trees.sql &> /dev/null
+$MYG < ../sql/etcitem.sql &> /dev/null
+$MYG < ../sql/fish.sql &> /dev/null
+$MYG < ../sql/fishing_skill_trees.sql &> /dev/null
+$MYG < ../sql/fort_door.sql &> /dev/null
+$MYG < ../sql/fort_doorupgrade.sql &> /dev/null
+$MYG < ../sql/fort_siege_guards.sql &> /dev/null
+$MYG < ../sql/fort.sql &> /dev/null
+$MYG < ../sql/fortsiege_clans.sql &> /dev/null
+$MYG < ../sql/forums.sql &> /dev/null
+$MYG < ../sql/games.sql &> /dev/null
+$MYG < ../sql/global_tasks.sql &> /dev/null
+$MYG < ../sql/grandboss_data.sql &> /dev/null
+$MYG < ../sql/grandboss_list.sql &> /dev/null
+$MYG < ../sql/helper_buff_list.sql &> /dev/null
+$MYG < ../sql/henna.sql &> /dev/null
+$MYG < ../sql/henna_trees.sql &> /dev/null
+$MYG < ../sql/heroes.sql &> /dev/null
+$MYG < ../sql/items.sql &> /dev/null
+$MYG < ../sql/itemsonground.sql &> /dev/null
+$MYG < ../sql/locations.sql &> /dev/null
+$MYG < ../sql/lvlupgain.sql &> /dev/null
+$MYG < ../sql/mapregion.sql &> /dev/null
+$MYG < ../sql/merchant_areas_list.sql &> /dev/null
+$MYG < ../sql/merchant_buylists.sql &> /dev/null
+$MYG < ../sql/merchant_lease.sql &> /dev/null
+$MYG < ../sql/merchant_shopids.sql &> /dev/null
+$MYG < ../sql/merchants.sql &> /dev/null
+$MYG < ../sql/minions.sql &> /dev/null
+$MYG < ../sql/npc.sql &> /dev/null
+$MYG < ../sql/olympiad_nobles.sql&> /dev/null
+$MYG < ../sql/pets.sql &> /dev/null
+$MYG < ../sql/pets_stats.sql &> /dev/null
+$MYG < ../sql/pledge_skill_trees.sql &> /dev/null
+$MYG < ../sql/posts.sql &> /dev/null
+$MYG < ../sql/quest_global_data.sql &> /dev/null
+$MYG < ../sql/npcskills.sql &> /dev/null
+$MYG < ../sql/raidboss_spawnlist.sql &> /dev/null
+$MYG < ../sql/random_spawn.sql &> /dev/null
+$MYG < ../sql/random_spawn_loc.sql &> /dev/null
+$MYG < ../sql/seven_signs.sql &> /dev/null
+$MYG < ../sql/seven_signs_festival.sql &> /dev/null
+$MYG < ../sql/seven_signs_status.sql &> /dev/null
+$MYG < ../sql/siege_clans.sql &> /dev/null
+$MYG < ../sql/skill_learn.sql &> /dev/null
+$MYG < ../sql/skill_spellbooks.sql &> /dev/null
+$MYG < ../sql/skill_trees.sql &> /dev/null
+$MYG < ../sql/spawnlist.sql &> /dev/null
+$MYG < ../sql/teleport.sql &> /dev/null
+$MYG < ../sql/topic.sql &> /dev/null
+$MYG < ../sql/walker_routes.sql &> /dev/null
+$MYG < ../sql/weapon.sql &> /dev/null
+$MYG < ../sql/zone_vertices.sql &> /dev/null
+newbie_helper
+}
+
+custom(){
+echo ""
+echo ""
+echo -ne "Install custom gameserver DB tables: (y) yes or (n) no or (q) quit?"
+read ASKCS
+case "$ASKCS" in
+	"y"|"Y") cstinstall;;
+	"n"|"N") finish;;
+	"q"|"Q") finish;;
+	*) custom;;
+esac
+finish
+}
+
+cstinstall(){
+while :
+  do
+   echo ""
+   echo -ne "Do you want to make another backup of GSDB before applying custom contents? (y/N): "
+   read LSB
+   if [ "$LSB" == "Y" -o "$LSB" == "y" ]; then
+     echo "Making a backup of the default gameserver tables."
+     $MYSQLDUMPPATH --add-drop-table -h $GSDBHOST -u $GSUSER --password=$GSPASS $GSDB > custom_backup.sql 2> /dev/null
+     if [ $? -ne 0 ];then
+     echo ""
+     echo "There was a problem accesing your GS database, server down?."
+     exit 1
+     fi
+     break
+   elif [ "$LSB" == "n" -o "$LSB" == "N" -o "$LSB" == "" ]; then 
+     break
+   fi
+  done 
+echo "Installing custom content."
+for custom in $(ls ../sql/custom/*.sql);do 
+$MYG < $custom &> /dev/null
+done
+# L2J mods that needed extra tables to work properly, should be 
+# listed here. To do so copy & paste the following 6 lines and
+# change them properly:
+# MOD: Wedding.
+  echo -ne "Install "Wedding Mod" tables? (y/N): "
+  read modprompt
+  if [ "$modprompt" == "Y" -o "$LSB" == "y" ]; then
+		$MYG < ../sql/mods/mods_wedding.sql &> /dev/null
+	fi
+
+finish
+}
+
+finish(){
+echo ""
+echo "Script execution finished."
+exit 0
+}
+
+newbie_helper(){
+while :
+  do
+   echo ""
+   echo -ne "If you're not that skilled applying changes within 'updates' folder, i can try to do it for you (y). If you wish to do it on your own, choose (n). Should i parse updates files? (Y/n)"
+   read NOB
+   if [ "$NOB" == "Y" -o "$NOB" == "y" -o "$NOB" == "" ]; then
+     echo ""
+     echo "There we go, it may take some time..."
+     echo "updates parser results. Last run: "`date` >database_installer.log
+     for file in $(ls ../sql/updates/*sql);do
+        echo $file|cut -d/ -f4 >> database_installer.log
+        $MYG < $file 2>> database_installer.log
+	if [ $? -eq 0 ];then
+	    echo "no errors">> database_installer.log
+	fi    
+	done
+     echo ""
+     echo "Log available at $(pwd)/database_installer.log"
+     echo ""
+     break
+   elif [ "$NOB" == "n" -o "$NOB" == "N" ]; then 
+     break
+   fi
+  done 
+}
+
+
+clear
+load_config $1
+MYL="$MYSQLPATH -h $LSDBHOST -u $LSUSER --password=$LSPASS -D $LSDB"
+MYG="$MYSQLPATH -h $GSDBHOST -u $GSUSER --password=$GSPASS -D $GSDB"
+lsbackup
 asklogin

+ 5 - 0
datapack_development/tools/full_install.sql

@@ -42,6 +42,11 @@ DROP TABLE IF EXISTS enchant_skill_trees;
 DROP TABLE IF EXISTS etcitem;
 DROP TABLE IF EXISTS fish;
 DROP TABLE IF EXISTS fishing_skill_trees;
+DROP TABLE IF EXISTS fort_door;
+DROP TABLE IF EXISTS fort_doorupgrade;
+DROP TABLE IF EXISTS fort_siege_guards;
+DROP TABLE IF EXISTS fort;
+DROP TABLE IF EXISTS fortsiege_clans;
 DROP TABLE IF EXISTS forums;
 DROP TABLE IF EXISTS global_tasks;
 DROP TABLE IF EXISTS grandboss_data;