diff --git a/datapack_development/data/html/admin/game_menu.htm b/datapack_development/data/html/admin/game_menu.htm
index 47684f2951e6b561a94bd925de39ba90c6fb53d6..b4f5765522866bb1e87315a73721a0ab4fe4823c 100644
--- a/datapack_development/data/html/admin/game_menu.htm
+++ b/datapack_development/data/html/admin/game_menu.htm
@@ -36,6 +36,9 @@ War Related:
<td><button value="Fortress" action="bypass -h admin_fortsiege" width=82 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
<td><button value="Territory" action="bypass -h admin_territory" width=82 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
</tr>
+<tr>
+<td><button value="TerritoryWar" action="bypass -h admin_territory_war" width=82 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr>
</table>
<br>
Cursed Weapons:
diff --git a/datapack_development/data/html/admin/territorywar.htm b/datapack_development/data/html/admin/territorywar.htm
new file mode 100644
index 0000000000000000000000000000000000000000..c4bfeae480f5bd32070e19c82c0184c631c74e16
--- /dev/null
+++ b/datapack_development/data/html/admin/territorywar.htm
@@ -0,0 +1,21 @@
+<html><body>
+<table width=270><tr>
+<td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=180><center>Territory War Menu</center></td>
+<td width=45><button value="Back" action="bypass -h admin_admin2" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr></table>
+<center>
+<br><br><font color="LEVEL">Territory War Settings:</font><br>
+<table width=270>
+<tr>
+<td width=140 align="center"><button value="Set Start Time" action="bypass -h admin_territory_war_time" width=135 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr>
+</table>
+<table width=270>
+<tr>
+<td width=90 align="center"><button value="Start TW" action="bypass -h admin_territory_war_start" width=135 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=90 align="center"><button value="End TW" action="bypass -h admin_territory_war_end" width=135 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr>
+</table>
+</center>
+</body></html>
diff --git a/datapack_development/data/html/admin/territorywartime.htm b/datapack_development/data/html/admin/territorywartime.htm
new file mode 100644
index 0000000000000000000000000000000000000000..5597904124f4083b89fa07118c4e503c3bd0205d
--- /dev/null
+++ b/datapack_development/data/html/admin/territorywartime.htm
@@ -0,0 +1,64 @@
+<html><body>
+<table width=270><tr>
+<td width=45><button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=180><center>Territory War Time Set Menu</center></td>
+<td width=45><button value="Back" action="bypass -h admin_territory_war" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr></table>
+<center>
+<font color="LEVEL"><br>Territory War</font><br>start time: %time%<br>Day of start:<br>
+<table width=270>
+<tr>
+<td width=60 align="center"><button value="Monday" action="bypass -h admin_territory_war_time day 2" width=60 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=60 align="center"><button value="Tuesday" action="bypass -h admin_territory_war_time day 3" width=60 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=60 align="center"><button value="Wednesday" action="bypass -h admin_territory_war_time day 4" width=60 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=60 align="center"><button value="Thursday" action="bypass -h admin_territory_war_time day 5" width=60 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr>
+<tr>
+<td width=80 align="center"><button value="Friday" action="bypass -h admin_territory_war_time day 6" width=60 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=80 align="center"><button value="Saturday" action="bypass -h admin_territory_war_time day 7" width=60 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=80 align="center"><button value="Sunday" action="bypass -h admin_territory_war_time day 1" width=60 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr>
+</table>
+<br>Hour of start:<br>
+<table width=264>
+<tr>
+<td width=30><button value="0" action="bypass -h admin_territory_war_time hour 0" width=30 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=30><button value="1" action="bypass -h admin_territory_war_time hour 1" width=30 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=30><button value="2" action="bypass -h admin_territory_war_time hour 2" width=30 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=30><button value="3" action="bypass -h admin_territory_war_time hour 3" width=30 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=30><button value="4" action="bypass -h admin_territory_war_time hour 4" width=30 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=30><button value="5" action="bypass -h admin_territory_war_time hour 5" width=30 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=30><button value="6" action="bypass -h admin_territory_war_time hour 6" width=30 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=30><button value="7" action="bypass -h admin_territory_war_time hour 7" width=30 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr><tr>
+<td width=30><button value="8" action="bypass -h admin_territory_war_time hour 8" width=30 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=30><button value="9" action="bypass -h admin_territory_war_time hour 9" width=30 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=30><button value="10" action="bypass -h admin_territory_war_time hour 10" width=30 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=30><button value="11" action="bypass -h admin_territory_war_time hour 11" width=30 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=30><button value="12" action="bypass -h admin_territory_war_time hour 12" width=30 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=30><button value="13" action="bypass -h admin_territory_war_time hour 13" width=30 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=30><button value="14" action="bypass -h admin_territory_war_time hour 14" width=30 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=30><button value="15" action="bypass -h admin_territory_war_time hour 15" width=30 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr><tr>
+<td width=30><button value="16" action="bypass -h admin_territory_war_time hour 16" width=30 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=30><button value="17" action="bypass -h admin_territory_war_time hour 17" width=30 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=30><button value="18" action="bypass -h admin_territory_war_time hour 18" width=30 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=30><button value="19" action="bypass -h admin_territory_war_time hour 19" width=30 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=30><button value="20" action="bypass -h admin_territory_war_time hour 20" width=30 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=30><button value="21" action="bypass -h admin_territory_war_time hour 21" width=30 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=30><button value="22" action="bypass -h admin_territory_war_time hour 22" width=30 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=30><button value="23" action="bypass -h admin_territory_war_time hour 23" width=30 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr></table>
+<br>Minutes of start:<br>
+<table width=270>
+<tr>
+<td width=45><button value="0" action="bypass -h admin_territory_war_time min 0" width=40 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=45><button value="10" action="bypass -h admin_territory_war_time min 10" width=40 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=45><button value="20" action="bypass -h admin_territory_war_time min 20" width=40 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=45><button value="30" action="bypass -h admin_territory_war_time min 30" width=40 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=45><button value="40" action="bypass -h admin_territory_war_time min 40" width=40 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+<td width=45><button value="50" action="bypass -h admin_territory_war_time min 50" width=40 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df"></td>
+</tr>
+</table>
+</center>
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36481-10.htm b/datapack_development/data/html/mercmanager/36481-10.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e5083c1d95a28a1ead3c76ea968fe80a106cea6c
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36481-10.htm
@@ -0,0 +1,2 @@
+<html><body>Do you know what goes on during a battle?<br>
+If weren't already engaged, I'd jump at the chance to make some money...er, I mean fight the enemy! Heh...</body></html>
diff --git a/datapack_development/data/html/mercmanager/36481-2.htm b/datapack_development/data/html/mercmanager/36481-2.htm
new file mode 100644
index 0000000000000000000000000000000000000000..6350f00ac3a552553ba3578b6e9feb89ed0d9d33
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36481-2.htm
@@ -0,0 +1 @@
+<html><body>If you want to be a mercenary, come back after you have complered the 2nd class transfer and have reached at least level 40.</body></html>
diff --git a/datapack_development/data/html/mercmanager/MercenaryManager-4.htm b/datapack_development/data/html/mercmanager/36481-4.htm
similarity index 96%
rename from datapack_development/data/html/mercmanager/MercenaryManager-4.htm
rename to datapack_development/data/html/mercmanager/36481-4.htm
index bd682f017daad9488e892027adf0a77c59c537be..cc75ae2734f55013ce019874873a292b702033a2 100644
--- a/datapack_development/data/html/mercmanager/MercenaryManager-4.htm
+++ b/datapack_development/data/html/mercmanager/36481-4.htm
@@ -5,4 +5,4 @@ So hiring mercenaries like us to fight their battles for them became an easy opt
And, I gotta admit, it's a good way for a soldier to make money.
Win on the battlefield and you'll earn fame and fortune at the same time.<br>
But remember one thing... You must always fight as well as you can, no matter who has hired you.
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/MercenaryManager-5.htm b/datapack_development/data/html/mercmanager/36481-5.htm
similarity index 54%
rename from datapack_development/data/html/mercmanager/MercenaryManager-5.htm
rename to datapack_development/data/html/mercmanager/36481-5.htm
index d7ba44a1c3a9117b769fdc9899065582ce1f48f1..c24e7786fac6a67a64b7bb5d06eeac41a7ebff77 100644
--- a/datapack_development/data/html/mercmanager/MercenaryManager-5.htm
+++ b/datapack_development/data/html/mercmanager/36481-5.htm
@@ -1 +1 @@
-<html><body>Where is the certificate you promised to show me? Are you trying to pull a fast one on me?</body></html>
\ No newline at end of file
+<html><body>Where is the certificate you promised to show me? Are you trying to pull a fast one on me?</body></html>
diff --git a/datapack_development/data/html/mercmanager/MercenaryManager-6.htm b/datapack_development/data/html/mercmanager/36481-6.htm
similarity index 50%
rename from datapack_development/data/html/mercmanager/MercenaryManager-6.htm
rename to datapack_development/data/html/mercmanager/36481-6.htm
index 1e96510aeb60943020f3db499bda38afed14734b..67f5903881410bf206c93331381d7a3c50454287 100644
--- a/datapack_development/data/html/mercmanager/MercenaryManager-6.htm
+++ b/datapack_development/data/html/mercmanager/36481-6.htm
@@ -1 +1 @@
-<html><body>You do not have enough badges yet to be recognized for your activities on behalf of the territory.</body></html>
\ No newline at end of file
+<html><body>You do not have enough badges yet to be recognized for your activities on behalf of the territory.</body></html>
diff --git a/datapack_development/data/html/mercmanager/36481-7.htm b/datapack_development/data/html/mercmanager/36481-7.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f6bb2bf68de74e67ed2194c8db0b479b3709d6e8
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36481-7.htm
@@ -0,0 +1 @@
+<html><body>I will expect big things from you. Congratulations!</body></html>
diff --git a/datapack_development/data/html/mercmanager/MercenaryManager.htm b/datapack_development/data/html/mercmanager/36481.htm
similarity index 66%
rename from datapack_development/data/html/mercmanager/MercenaryManager.htm
rename to datapack_development/data/html/mercmanager/36481.htm
index c67c18e5eace13efcd3cbc0b0edcedd8570c0b5f..ad772a6764a993181a93c0903904a9d7c430caca 100644
--- a/datapack_development/data/html/mercmanager/MercenaryManager.htm
+++ b/datapack_development/data/html/mercmanager/36481.htm
@@ -1,11 +1,11 @@
<html><head><body>Mercenary Captain:<br>Are you interested in signing on as a mercenary for this Territory War?
I'll be honest with you -- the lord here is doing pretty well for himself.
Serve him well and you can acquire whatever you want.<br>
-<a action="bypass -h npc_%objectId%_Territory">Territorial battle information</a><br>
-<a action="bypass -h npc_%objectId%_Chat 0">Buy items. </a><br>
+<a action="bypass -h npc_%objectId%_Territory 1">Territorial battle information</a><br>
+<a action="bypass -h npc_%objectId%_multisell 364810001">Buy items. </a><br>
<a action="bypass -h npc_%objectId%_Chat 5">Show Elite Mercenary Certificate and buy items. </a><br>
<a action="bypass -h npc_%objectId%_Chat 5">Show Top Elite Mercenary Certificate and buy items. </a><br>
-<a action="bypass -h npc_%objectId%_Chat 3">Ask about mountables.</a><br>
+<a action="bypass -h npc_%objectId%_TW_Buy_List striderslist.htm">Ask about mountables.</a><br>
<a action="bypass -h npc_%objectId%_Chat 4">Ask about mercenaries.</a><br>
<a action="bypass -h npc_%objectId%_Quest">Quest</a>
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36482-10.htm b/datapack_development/data/html/mercmanager/36482-10.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e5083c1d95a28a1ead3c76ea968fe80a106cea6c
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36482-10.htm
@@ -0,0 +1,2 @@
+<html><body>Do you know what goes on during a battle?<br>
+If weren't already engaged, I'd jump at the chance to make some money...er, I mean fight the enemy! Heh...</body></html>
diff --git a/datapack_development/data/html/mercmanager/36482-2.htm b/datapack_development/data/html/mercmanager/36482-2.htm
new file mode 100644
index 0000000000000000000000000000000000000000..6350f00ac3a552553ba3578b6e9feb89ed0d9d33
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36482-2.htm
@@ -0,0 +1 @@
+<html><body>If you want to be a mercenary, come back after you have complered the 2nd class transfer and have reached at least level 40.</body></html>
diff --git a/datapack_development/data/html/mercmanager/36482-4.htm b/datapack_development/data/html/mercmanager/36482-4.htm
new file mode 100644
index 0000000000000000000000000000000000000000..cc75ae2734f55013ce019874873a292b702033a2
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36482-4.htm
@@ -0,0 +1,8 @@
+<html><head><body>Mercenary Captain:<br>
+As the war dragged on, those in power sought for a way to wage the conflict without risking their own positions.
+Politics, eh? No rich lord wants to weaken the strength of his loyal troops if he doesn't have to.<br>
+So hiring mercenaries like us to fight their battles for them became an easy option.<br>
+And, I gotta admit, it's a good way for a soldier to make money.
+Win on the battlefield and you'll earn fame and fortune at the same time.<br>
+But remember one thing... You must always fight as well as you can, no matter who has hired you.
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36482-5.htm b/datapack_development/data/html/mercmanager/36482-5.htm
new file mode 100644
index 0000000000000000000000000000000000000000..c24e7786fac6a67a64b7bb5d06eeac41a7ebff77
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36482-5.htm
@@ -0,0 +1 @@
+<html><body>Where is the certificate you promised to show me? Are you trying to pull a fast one on me?</body></html>
diff --git a/datapack_development/data/html/mercmanager/36482-6.htm b/datapack_development/data/html/mercmanager/36482-6.htm
new file mode 100644
index 0000000000000000000000000000000000000000..67f5903881410bf206c93331381d7a3c50454287
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36482-6.htm
@@ -0,0 +1 @@
+<html><body>You do not have enough badges yet to be recognized for your activities on behalf of the territory.</body></html>
diff --git a/datapack_development/data/html/mercmanager/36482-7.htm b/datapack_development/data/html/mercmanager/36482-7.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f6bb2bf68de74e67ed2194c8db0b479b3709d6e8
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36482-7.htm
@@ -0,0 +1 @@
+<html><body>I will expect big things from you. Congratulations!</body></html>
diff --git a/datapack_development/data/html/mercmanager/36482.htm b/datapack_development/data/html/mercmanager/36482.htm
new file mode 100644
index 0000000000000000000000000000000000000000..8108fded0d93e40f9b4a88af49807ad9a19be1c2
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36482.htm
@@ -0,0 +1,11 @@
+<html><head><body>Mercenary Captain:<br>Are you interested in signing on as a mercenary for this Territory War?
+I'll be honest with you -- the lord here is doing pretty well for himself.
+Serve him well and you can acquire whatever you want.<br>
+<a action="bypass -h npc_%objectId%_Territory 2">Territorial battle information</a><br>
+<a action="bypass -h npc_%objectId%_multisell 364820001">Buy items. </a><br>
+<a action="bypass -h npc_%objectId%_Chat 5">Show Elite Mercenary Certificate and buy items. </a><br>
+<a action="bypass -h npc_%objectId%_Chat 5">Show Top Elite Mercenary Certificate and buy items. </a><br>
+<a action="bypass -h npc_%objectId%_TW_Buy_List striderslist.htm">Ask about mountables.</a><br>
+<a action="bypass -h npc_%objectId%_Chat 4">Ask about mercenaries.</a><br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36483-10.htm b/datapack_development/data/html/mercmanager/36483-10.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e5083c1d95a28a1ead3c76ea968fe80a106cea6c
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36483-10.htm
@@ -0,0 +1,2 @@
+<html><body>Do you know what goes on during a battle?<br>
+If weren't already engaged, I'd jump at the chance to make some money...er, I mean fight the enemy! Heh...</body></html>
diff --git a/datapack_development/data/html/mercmanager/36483-2.htm b/datapack_development/data/html/mercmanager/36483-2.htm
new file mode 100644
index 0000000000000000000000000000000000000000..6350f00ac3a552553ba3578b6e9feb89ed0d9d33
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36483-2.htm
@@ -0,0 +1 @@
+<html><body>If you want to be a mercenary, come back after you have complered the 2nd class transfer and have reached at least level 40.</body></html>
diff --git a/datapack_development/data/html/mercmanager/36483-4.htm b/datapack_development/data/html/mercmanager/36483-4.htm
new file mode 100644
index 0000000000000000000000000000000000000000..cc75ae2734f55013ce019874873a292b702033a2
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36483-4.htm
@@ -0,0 +1,8 @@
+<html><head><body>Mercenary Captain:<br>
+As the war dragged on, those in power sought for a way to wage the conflict without risking their own positions.
+Politics, eh? No rich lord wants to weaken the strength of his loyal troops if he doesn't have to.<br>
+So hiring mercenaries like us to fight their battles for them became an easy option.<br>
+And, I gotta admit, it's a good way for a soldier to make money.
+Win on the battlefield and you'll earn fame and fortune at the same time.<br>
+But remember one thing... You must always fight as well as you can, no matter who has hired you.
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36483-5.htm b/datapack_development/data/html/mercmanager/36483-5.htm
new file mode 100644
index 0000000000000000000000000000000000000000..c24e7786fac6a67a64b7bb5d06eeac41a7ebff77
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36483-5.htm
@@ -0,0 +1 @@
+<html><body>Where is the certificate you promised to show me? Are you trying to pull a fast one on me?</body></html>
diff --git a/datapack_development/data/html/mercmanager/36483-6.htm b/datapack_development/data/html/mercmanager/36483-6.htm
new file mode 100644
index 0000000000000000000000000000000000000000..67f5903881410bf206c93331381d7a3c50454287
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36483-6.htm
@@ -0,0 +1 @@
+<html><body>You do not have enough badges yet to be recognized for your activities on behalf of the territory.</body></html>
diff --git a/datapack_development/data/html/mercmanager/36483-7.htm b/datapack_development/data/html/mercmanager/36483-7.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f6bb2bf68de74e67ed2194c8db0b479b3709d6e8
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36483-7.htm
@@ -0,0 +1 @@
+<html><body>I will expect big things from you. Congratulations!</body></html>
diff --git a/datapack_development/data/html/mercmanager/36483.htm b/datapack_development/data/html/mercmanager/36483.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f2201f15ff0247c42f9fbff8aaae8bd811c64eaa
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36483.htm
@@ -0,0 +1,11 @@
+<html><head><body>Mercenary Captain:<br>Are you interested in signing on as a mercenary for this Territory War?
+I'll be honest with you -- the lord here is doing pretty well for himself.
+Serve him well and you can acquire whatever you want.<br>
+<a action="bypass -h npc_%objectId%_Territory 3">Territorial battle information</a><br>
+<a action="bypass -h npc_%objectId%_multisell 364830001">Buy items. </a><br>
+<a action="bypass -h npc_%objectId%_Chat 5">Show Elite Mercenary Certificate and buy items. </a><br>
+<a action="bypass -h npc_%objectId%_Chat 5">Show Top Elite Mercenary Certificate and buy items. </a><br>
+<a action="bypass -h npc_%objectId%_TW_Buy_List striderslist.htm">Ask about mountables.</a><br>
+<a action="bypass -h npc_%objectId%_Chat 4">Ask about mercenaries.</a><br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36484-10.htm b/datapack_development/data/html/mercmanager/36484-10.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e5083c1d95a28a1ead3c76ea968fe80a106cea6c
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36484-10.htm
@@ -0,0 +1,2 @@
+<html><body>Do you know what goes on during a battle?<br>
+If weren't already engaged, I'd jump at the chance to make some money...er, I mean fight the enemy! Heh...</body></html>
diff --git a/datapack_development/data/html/mercmanager/36484-2.htm b/datapack_development/data/html/mercmanager/36484-2.htm
new file mode 100644
index 0000000000000000000000000000000000000000..6350f00ac3a552553ba3578b6e9feb89ed0d9d33
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36484-2.htm
@@ -0,0 +1 @@
+<html><body>If you want to be a mercenary, come back after you have complered the 2nd class transfer and have reached at least level 40.</body></html>
diff --git a/datapack_development/data/html/mercmanager/36484-4.htm b/datapack_development/data/html/mercmanager/36484-4.htm
new file mode 100644
index 0000000000000000000000000000000000000000..cc75ae2734f55013ce019874873a292b702033a2
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36484-4.htm
@@ -0,0 +1,8 @@
+<html><head><body>Mercenary Captain:<br>
+As the war dragged on, those in power sought for a way to wage the conflict without risking their own positions.
+Politics, eh? No rich lord wants to weaken the strength of his loyal troops if he doesn't have to.<br>
+So hiring mercenaries like us to fight their battles for them became an easy option.<br>
+And, I gotta admit, it's a good way for a soldier to make money.
+Win on the battlefield and you'll earn fame and fortune at the same time.<br>
+But remember one thing... You must always fight as well as you can, no matter who has hired you.
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36484-5.htm b/datapack_development/data/html/mercmanager/36484-5.htm
new file mode 100644
index 0000000000000000000000000000000000000000..c24e7786fac6a67a64b7bb5d06eeac41a7ebff77
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36484-5.htm
@@ -0,0 +1 @@
+<html><body>Where is the certificate you promised to show me? Are you trying to pull a fast one on me?</body></html>
diff --git a/datapack_development/data/html/mercmanager/36484-6.htm b/datapack_development/data/html/mercmanager/36484-6.htm
new file mode 100644
index 0000000000000000000000000000000000000000..67f5903881410bf206c93331381d7a3c50454287
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36484-6.htm
@@ -0,0 +1 @@
+<html><body>You do not have enough badges yet to be recognized for your activities on behalf of the territory.</body></html>
diff --git a/datapack_development/data/html/mercmanager/36484-7.htm b/datapack_development/data/html/mercmanager/36484-7.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f6bb2bf68de74e67ed2194c8db0b479b3709d6e8
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36484-7.htm
@@ -0,0 +1 @@
+<html><body>I will expect big things from you. Congratulations!</body></html>
diff --git a/datapack_development/data/html/mercmanager/36484.htm b/datapack_development/data/html/mercmanager/36484.htm
new file mode 100644
index 0000000000000000000000000000000000000000..03ff3d61987d06b0871d2edbf2fe03dd4e9a2733
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36484.htm
@@ -0,0 +1,11 @@
+<html><head><body>Mercenary Captain:<br>Are you interested in signing on as a mercenary for this Territory War?
+I'll be honest with you -- the lord here is doing pretty well for himself.
+Serve him well and you can acquire whatever you want.<br>
+<a action="bypass -h npc_%objectId%_Territory 4">Territorial battle information</a><br>
+<a action="bypass -h npc_%objectId%_multisell 364840001">Buy items. </a><br>
+<a action="bypass -h npc_%objectId%_Chat 5">Show Elite Mercenary Certificate and buy items. </a><br>
+<a action="bypass -h npc_%objectId%_Chat 5">Show Top Elite Mercenary Certificate and buy items. </a><br>
+<a action="bypass -h npc_%objectId%_TW_Buy_List striderslist.htm">Ask about mountables.</a><br>
+<a action="bypass -h npc_%objectId%_Chat 4">Ask about mercenaries.</a><br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36485-10.htm b/datapack_development/data/html/mercmanager/36485-10.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e5083c1d95a28a1ead3c76ea968fe80a106cea6c
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36485-10.htm
@@ -0,0 +1,2 @@
+<html><body>Do you know what goes on during a battle?<br>
+If weren't already engaged, I'd jump at the chance to make some money...er, I mean fight the enemy! Heh...</body></html>
diff --git a/datapack_development/data/html/mercmanager/36485-2.htm b/datapack_development/data/html/mercmanager/36485-2.htm
new file mode 100644
index 0000000000000000000000000000000000000000..6350f00ac3a552553ba3578b6e9feb89ed0d9d33
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36485-2.htm
@@ -0,0 +1 @@
+<html><body>If you want to be a mercenary, come back after you have complered the 2nd class transfer and have reached at least level 40.</body></html>
diff --git a/datapack_development/data/html/mercmanager/36485-4.htm b/datapack_development/data/html/mercmanager/36485-4.htm
new file mode 100644
index 0000000000000000000000000000000000000000..cc75ae2734f55013ce019874873a292b702033a2
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36485-4.htm
@@ -0,0 +1,8 @@
+<html><head><body>Mercenary Captain:<br>
+As the war dragged on, those in power sought for a way to wage the conflict without risking their own positions.
+Politics, eh? No rich lord wants to weaken the strength of his loyal troops if he doesn't have to.<br>
+So hiring mercenaries like us to fight their battles for them became an easy option.<br>
+And, I gotta admit, it's a good way for a soldier to make money.
+Win on the battlefield and you'll earn fame and fortune at the same time.<br>
+But remember one thing... You must always fight as well as you can, no matter who has hired you.
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36485-5.htm b/datapack_development/data/html/mercmanager/36485-5.htm
new file mode 100644
index 0000000000000000000000000000000000000000..c24e7786fac6a67a64b7bb5d06eeac41a7ebff77
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36485-5.htm
@@ -0,0 +1 @@
+<html><body>Where is the certificate you promised to show me? Are you trying to pull a fast one on me?</body></html>
diff --git a/datapack_development/data/html/mercmanager/36485-6.htm b/datapack_development/data/html/mercmanager/36485-6.htm
new file mode 100644
index 0000000000000000000000000000000000000000..67f5903881410bf206c93331381d7a3c50454287
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36485-6.htm
@@ -0,0 +1 @@
+<html><body>You do not have enough badges yet to be recognized for your activities on behalf of the territory.</body></html>
diff --git a/datapack_development/data/html/mercmanager/36485-7.htm b/datapack_development/data/html/mercmanager/36485-7.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f6bb2bf68de74e67ed2194c8db0b479b3709d6e8
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36485-7.htm
@@ -0,0 +1 @@
+<html><body>I will expect big things from you. Congratulations!</body></html>
diff --git a/datapack_development/data/html/mercmanager/36485.htm b/datapack_development/data/html/mercmanager/36485.htm
new file mode 100644
index 0000000000000000000000000000000000000000..bd7c256a562038f3dead722eb3e2fbf88c40624e
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36485.htm
@@ -0,0 +1,11 @@
+<html><head><body>Mercenary Captain:<br>Are you interested in signing on as a mercenary for this Territory War?
+I'll be honest with you -- the lord here is doing pretty well for himself.
+Serve him well and you can acquire whatever you want.<br>
+<a action="bypass -h npc_%objectId%_Territory 5">Territorial battle information</a><br>
+<a action="bypass -h npc_%objectId%_multisell 364850001">Buy items. </a><br>
+<a action="bypass -h npc_%objectId%_Chat 5">Show Elite Mercenary Certificate and buy items. </a><br>
+<a action="bypass -h npc_%objectId%_Chat 5">Show Top Elite Mercenary Certificate and buy items. </a><br>
+<a action="bypass -h npc_%objectId%_TW_Buy_List striderslist.htm">Ask about mountables.</a><br>
+<a action="bypass -h npc_%objectId%_Chat 4">Ask about mercenaries.</a><br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36486-10.htm b/datapack_development/data/html/mercmanager/36486-10.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e5083c1d95a28a1ead3c76ea968fe80a106cea6c
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36486-10.htm
@@ -0,0 +1,2 @@
+<html><body>Do you know what goes on during a battle?<br>
+If weren't already engaged, I'd jump at the chance to make some money...er, I mean fight the enemy! Heh...</body></html>
diff --git a/datapack_development/data/html/mercmanager/36486-2.htm b/datapack_development/data/html/mercmanager/36486-2.htm
new file mode 100644
index 0000000000000000000000000000000000000000..6350f00ac3a552553ba3578b6e9feb89ed0d9d33
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36486-2.htm
@@ -0,0 +1 @@
+<html><body>If you want to be a mercenary, come back after you have complered the 2nd class transfer and have reached at least level 40.</body></html>
diff --git a/datapack_development/data/html/mercmanager/36486-4.htm b/datapack_development/data/html/mercmanager/36486-4.htm
new file mode 100644
index 0000000000000000000000000000000000000000..cc75ae2734f55013ce019874873a292b702033a2
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36486-4.htm
@@ -0,0 +1,8 @@
+<html><head><body>Mercenary Captain:<br>
+As the war dragged on, those in power sought for a way to wage the conflict without risking their own positions.
+Politics, eh? No rich lord wants to weaken the strength of his loyal troops if he doesn't have to.<br>
+So hiring mercenaries like us to fight their battles for them became an easy option.<br>
+And, I gotta admit, it's a good way for a soldier to make money.
+Win on the battlefield and you'll earn fame and fortune at the same time.<br>
+But remember one thing... You must always fight as well as you can, no matter who has hired you.
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36486-5.htm b/datapack_development/data/html/mercmanager/36486-5.htm
new file mode 100644
index 0000000000000000000000000000000000000000..c24e7786fac6a67a64b7bb5d06eeac41a7ebff77
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36486-5.htm
@@ -0,0 +1 @@
+<html><body>Where is the certificate you promised to show me? Are you trying to pull a fast one on me?</body></html>
diff --git a/datapack_development/data/html/mercmanager/36486-6.htm b/datapack_development/data/html/mercmanager/36486-6.htm
new file mode 100644
index 0000000000000000000000000000000000000000..67f5903881410bf206c93331381d7a3c50454287
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36486-6.htm
@@ -0,0 +1 @@
+<html><body>You do not have enough badges yet to be recognized for your activities on behalf of the territory.</body></html>
diff --git a/datapack_development/data/html/mercmanager/36486-7.htm b/datapack_development/data/html/mercmanager/36486-7.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f6bb2bf68de74e67ed2194c8db0b479b3709d6e8
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36486-7.htm
@@ -0,0 +1 @@
+<html><body>I will expect big things from you. Congratulations!</body></html>
diff --git a/datapack_development/data/html/mercmanager/36486.htm b/datapack_development/data/html/mercmanager/36486.htm
new file mode 100644
index 0000000000000000000000000000000000000000..6404067b57e1313a06c69839184cabd071adb5d5
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36486.htm
@@ -0,0 +1,11 @@
+<html><head><body>Mercenary Captain:<br>Are you interested in signing on as a mercenary for this Territory War?
+I'll be honest with you -- the lord here is doing pretty well for himself.
+Serve him well and you can acquire whatever you want.<br>
+<a action="bypass -h npc_%objectId%_Territory 6">Territorial battle information</a><br>
+<a action="bypass -h npc_%objectId%_multisell 364860001">Buy items. </a><br>
+<a action="bypass -h npc_%objectId%_Chat 5">Show Elite Mercenary Certificate and buy items. </a><br>
+<a action="bypass -h npc_%objectId%_Chat 5">Show Top Elite Mercenary Certificate and buy items. </a><br>
+<a action="bypass -h npc_%objectId%_TW_Buy_List striderslist.htm">Ask about mountables.</a><br>
+<a action="bypass -h npc_%objectId%_Chat 4">Ask about mercenaries.</a><br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36487-10.htm b/datapack_development/data/html/mercmanager/36487-10.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e5083c1d95a28a1ead3c76ea968fe80a106cea6c
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36487-10.htm
@@ -0,0 +1,2 @@
+<html><body>Do you know what goes on during a battle?<br>
+If weren't already engaged, I'd jump at the chance to make some money...er, I mean fight the enemy! Heh...</body></html>
diff --git a/datapack_development/data/html/mercmanager/36487-2.htm b/datapack_development/data/html/mercmanager/36487-2.htm
new file mode 100644
index 0000000000000000000000000000000000000000..6350f00ac3a552553ba3578b6e9feb89ed0d9d33
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36487-2.htm
@@ -0,0 +1 @@
+<html><body>If you want to be a mercenary, come back after you have complered the 2nd class transfer and have reached at least level 40.</body></html>
diff --git a/datapack_development/data/html/mercmanager/36487-4.htm b/datapack_development/data/html/mercmanager/36487-4.htm
new file mode 100644
index 0000000000000000000000000000000000000000..cc75ae2734f55013ce019874873a292b702033a2
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36487-4.htm
@@ -0,0 +1,8 @@
+<html><head><body>Mercenary Captain:<br>
+As the war dragged on, those in power sought for a way to wage the conflict without risking their own positions.
+Politics, eh? No rich lord wants to weaken the strength of his loyal troops if he doesn't have to.<br>
+So hiring mercenaries like us to fight their battles for them became an easy option.<br>
+And, I gotta admit, it's a good way for a soldier to make money.
+Win on the battlefield and you'll earn fame and fortune at the same time.<br>
+But remember one thing... You must always fight as well as you can, no matter who has hired you.
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36487-5.htm b/datapack_development/data/html/mercmanager/36487-5.htm
new file mode 100644
index 0000000000000000000000000000000000000000..c24e7786fac6a67a64b7bb5d06eeac41a7ebff77
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36487-5.htm
@@ -0,0 +1 @@
+<html><body>Where is the certificate you promised to show me? Are you trying to pull a fast one on me?</body></html>
diff --git a/datapack_development/data/html/mercmanager/36487-6.htm b/datapack_development/data/html/mercmanager/36487-6.htm
new file mode 100644
index 0000000000000000000000000000000000000000..67f5903881410bf206c93331381d7a3c50454287
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36487-6.htm
@@ -0,0 +1 @@
+<html><body>You do not have enough badges yet to be recognized for your activities on behalf of the territory.</body></html>
diff --git a/datapack_development/data/html/mercmanager/36487-7.htm b/datapack_development/data/html/mercmanager/36487-7.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f6bb2bf68de74e67ed2194c8db0b479b3709d6e8
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36487-7.htm
@@ -0,0 +1 @@
+<html><body>I will expect big things from you. Congratulations!</body></html>
diff --git a/datapack_development/data/html/mercmanager/36487.htm b/datapack_development/data/html/mercmanager/36487.htm
new file mode 100644
index 0000000000000000000000000000000000000000..2a9a2e06ed559f696e483ad60267b686734f7b6d
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36487.htm
@@ -0,0 +1,11 @@
+<html><head><body>Mercenary Captain:<br>Are you interested in signing on as a mercenary for this Territory War?
+I'll be honest with you -- the lord here is doing pretty well for himself.
+Serve him well and you can acquire whatever you want.<br>
+<a action="bypass -h npc_%objectId%_Territory 7">Territorial battle information</a><br>
+<a action="bypass -h npc_%objectId%_multisell 364870001">Buy items. </a><br>
+<a action="bypass -h npc_%objectId%_Chat 5">Show Elite Mercenary Certificate and buy items. </a><br>
+<a action="bypass -h npc_%objectId%_Chat 5">Show Top Elite Mercenary Certificate and buy items. </a><br>
+<a action="bypass -h npc_%objectId%_TW_Buy_List striderslist.htm">Ask about mountables.</a><br>
+<a action="bypass -h npc_%objectId%_Chat 4">Ask about mercenaries.</a><br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36488-10.htm b/datapack_development/data/html/mercmanager/36488-10.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e5083c1d95a28a1ead3c76ea968fe80a106cea6c
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36488-10.htm
@@ -0,0 +1,2 @@
+<html><body>Do you know what goes on during a battle?<br>
+If weren't already engaged, I'd jump at the chance to make some money...er, I mean fight the enemy! Heh...</body></html>
diff --git a/datapack_development/data/html/mercmanager/36488-2.htm b/datapack_development/data/html/mercmanager/36488-2.htm
new file mode 100644
index 0000000000000000000000000000000000000000..6350f00ac3a552553ba3578b6e9feb89ed0d9d33
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36488-2.htm
@@ -0,0 +1 @@
+<html><body>If you want to be a mercenary, come back after you have complered the 2nd class transfer and have reached at least level 40.</body></html>
diff --git a/datapack_development/data/html/mercmanager/36488-4.htm b/datapack_development/data/html/mercmanager/36488-4.htm
new file mode 100644
index 0000000000000000000000000000000000000000..cc75ae2734f55013ce019874873a292b702033a2
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36488-4.htm
@@ -0,0 +1,8 @@
+<html><head><body>Mercenary Captain:<br>
+As the war dragged on, those in power sought for a way to wage the conflict without risking their own positions.
+Politics, eh? No rich lord wants to weaken the strength of his loyal troops if he doesn't have to.<br>
+So hiring mercenaries like us to fight their battles for them became an easy option.<br>
+And, I gotta admit, it's a good way for a soldier to make money.
+Win on the battlefield and you'll earn fame and fortune at the same time.<br>
+But remember one thing... You must always fight as well as you can, no matter who has hired you.
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36488-5.htm b/datapack_development/data/html/mercmanager/36488-5.htm
new file mode 100644
index 0000000000000000000000000000000000000000..c24e7786fac6a67a64b7bb5d06eeac41a7ebff77
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36488-5.htm
@@ -0,0 +1 @@
+<html><body>Where is the certificate you promised to show me? Are you trying to pull a fast one on me?</body></html>
diff --git a/datapack_development/data/html/mercmanager/36488-6.htm b/datapack_development/data/html/mercmanager/36488-6.htm
new file mode 100644
index 0000000000000000000000000000000000000000..67f5903881410bf206c93331381d7a3c50454287
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36488-6.htm
@@ -0,0 +1 @@
+<html><body>You do not have enough badges yet to be recognized for your activities on behalf of the territory.</body></html>
diff --git a/datapack_development/data/html/mercmanager/36488-7.htm b/datapack_development/data/html/mercmanager/36488-7.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f6bb2bf68de74e67ed2194c8db0b479b3709d6e8
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36488-7.htm
@@ -0,0 +1 @@
+<html><body>I will expect big things from you. Congratulations!</body></html>
diff --git a/datapack_development/data/html/mercmanager/36488.htm b/datapack_development/data/html/mercmanager/36488.htm
new file mode 100644
index 0000000000000000000000000000000000000000..1391336438c82ebd90b85258fc53fe95898624ee
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36488.htm
@@ -0,0 +1,11 @@
+<html><head><body>Mercenary Captain:<br>Are you interested in signing on as a mercenary for this Territory War?
+I'll be honest with you -- the lord here is doing pretty well for himself.
+Serve him well and you can acquire whatever you want.<br>
+<a action="bypass -h npc_%objectId%_Territory 8">Territorial battle information</a><br>
+<a action="bypass -h npc_%objectId%_multisell 364880001">Buy items. </a><br>
+<a action="bypass -h npc_%objectId%_Chat 5">Show Elite Mercenary Certificate and buy items. </a><br>
+<a action="bypass -h npc_%objectId%_Chat 5">Show Top Elite Mercenary Certificate and buy items. </a><br>
+<a action="bypass -h npc_%objectId%_TW_Buy_List striderslist.htm">Ask about mountables.</a><br>
+<a action="bypass -h npc_%objectId%_Chat 4">Ask about mercenaries.</a><br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36489-10.htm b/datapack_development/data/html/mercmanager/36489-10.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e5083c1d95a28a1ead3c76ea968fe80a106cea6c
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36489-10.htm
@@ -0,0 +1,2 @@
+<html><body>Do you know what goes on during a battle?<br>
+If weren't already engaged, I'd jump at the chance to make some money...er, I mean fight the enemy! Heh...</body></html>
diff --git a/datapack_development/data/html/mercmanager/36489-2.htm b/datapack_development/data/html/mercmanager/36489-2.htm
new file mode 100644
index 0000000000000000000000000000000000000000..6350f00ac3a552553ba3578b6e9feb89ed0d9d33
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36489-2.htm
@@ -0,0 +1 @@
+<html><body>If you want to be a mercenary, come back after you have complered the 2nd class transfer and have reached at least level 40.</body></html>
diff --git a/datapack_development/data/html/mercmanager/36489-4.htm b/datapack_development/data/html/mercmanager/36489-4.htm
new file mode 100644
index 0000000000000000000000000000000000000000..cc75ae2734f55013ce019874873a292b702033a2
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36489-4.htm
@@ -0,0 +1,8 @@
+<html><head><body>Mercenary Captain:<br>
+As the war dragged on, those in power sought for a way to wage the conflict without risking their own positions.
+Politics, eh? No rich lord wants to weaken the strength of his loyal troops if he doesn't have to.<br>
+So hiring mercenaries like us to fight their battles for them became an easy option.<br>
+And, I gotta admit, it's a good way for a soldier to make money.
+Win on the battlefield and you'll earn fame and fortune at the same time.<br>
+But remember one thing... You must always fight as well as you can, no matter who has hired you.
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36489-5.htm b/datapack_development/data/html/mercmanager/36489-5.htm
new file mode 100644
index 0000000000000000000000000000000000000000..c24e7786fac6a67a64b7bb5d06eeac41a7ebff77
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36489-5.htm
@@ -0,0 +1 @@
+<html><body>Where is the certificate you promised to show me? Are you trying to pull a fast one on me?</body></html>
diff --git a/datapack_development/data/html/mercmanager/36489-6.htm b/datapack_development/data/html/mercmanager/36489-6.htm
new file mode 100644
index 0000000000000000000000000000000000000000..67f5903881410bf206c93331381d7a3c50454287
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36489-6.htm
@@ -0,0 +1 @@
+<html><body>You do not have enough badges yet to be recognized for your activities on behalf of the territory.</body></html>
diff --git a/datapack_development/data/html/mercmanager/36489-7.htm b/datapack_development/data/html/mercmanager/36489-7.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f6bb2bf68de74e67ed2194c8db0b479b3709d6e8
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36489-7.htm
@@ -0,0 +1 @@
+<html><body>I will expect big things from you. Congratulations!</body></html>
diff --git a/datapack_development/data/html/mercmanager/36489.htm b/datapack_development/data/html/mercmanager/36489.htm
new file mode 100644
index 0000000000000000000000000000000000000000..dbe431f9749661de80974d5e3c22183ccec6f5ca
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36489.htm
@@ -0,0 +1,11 @@
+<html><head><body>Mercenary Captain:<br>Are you interested in signing on as a mercenary for this Territory War?
+I'll be honest with you -- the lord here is doing pretty well for himself.
+Serve him well and you can acquire whatever you want.<br>
+<a action="bypass -h npc_%objectId%_Territory 9">Territorial battle information</a><br>
+<a action="bypass -h npc_%objectId%_multisell 364890001">Buy items. </a><br>
+<a action="bypass -h npc_%objectId%_Chat 5">Show Elite Mercenary Certificate and buy items. </a><br>
+<a action="bypass -h npc_%objectId%_Chat 5">Show Top Elite Mercenary Certificate and buy items. </a><br>
+<a action="bypass -h npc_%objectId%_TW_Buy_List striderslist.htm">Ask about mountables.</a><br>
+<a action="bypass -h npc_%objectId%_Chat 4">Ask about mercenaries.</a><br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36490-1.htm b/datapack_development/data/html/mercmanager/36490-1.htm
new file mode 100644
index 0000000000000000000000000000000000000000..76ad9a7f50889bd5e54a958b302929f28a6dac3b
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36490-1.htm
@@ -0,0 +1,3 @@
+<html><body>
+You can obtain the badge by carrying out various missions assigned by the lord during a Territory War. You may access his orders through the Territory Managers or by participating in the Territory War.
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36490-10.htm b/datapack_development/data/html/mercmanager/36490-10.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e5083c1d95a28a1ead3c76ea968fe80a106cea6c
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36490-10.htm
@@ -0,0 +1,2 @@
+<html><body>Do you know what goes on during a battle?<br>
+If weren't already engaged, I'd jump at the chance to make some money...er, I mean fight the enemy! Heh...</body></html>
diff --git a/datapack_development/data/html/mercmanager/36490-2.htm b/datapack_development/data/html/mercmanager/36490-2.htm
new file mode 100644
index 0000000000000000000000000000000000000000..44c1fe58f861fc386738e4d1a6e4dca23b907338
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36490-2.htm
@@ -0,0 +1,2 @@
+<html><body>You require more training.<br>
+(You must have completed your 2nd class change and be at least level 40.)</body></html>
diff --git a/datapack_development/data/html/mercmanager/36490-4.htm b/datapack_development/data/html/mercmanager/36490-4.htm
new file mode 100644
index 0000000000000000000000000000000000000000..90412a571030677173f06563052d310b1bf58fd3
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36490-4.htm
@@ -0,0 +1,2 @@
+<html><body>Territory Manager:<br>
+If you go to another territory, all of your accomplishments here will vanish. Please do not forget. I hope to see you in our service again. Farewell!</body></html>
diff --git a/datapack_development/data/html/mercmanager/36490-6.htm b/datapack_development/data/html/mercmanager/36490-6.htm
new file mode 100644
index 0000000000000000000000000000000000000000..67f5903881410bf206c93331381d7a3c50454287
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36490-6.htm
@@ -0,0 +1 @@
+<html><body>You do not have enough badges yet to be recognized for your activities on behalf of the territory.</body></html>
diff --git a/datapack_development/data/html/mercmanager/36490-7.htm b/datapack_development/data/html/mercmanager/36490-7.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f6bb2bf68de74e67ed2194c8db0b479b3709d6e8
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36490-7.htm
@@ -0,0 +1 @@
+<html><body>I will expect big things from you. Congratulations!</body></html>
diff --git a/datapack_development/data/html/mercmanager/36490.htm b/datapack_development/data/html/mercmanager/36490.htm
new file mode 100644
index 0000000000000000000000000000000000000000..84f9a10adbaf99a5c3987a3b4a0b5cbbca7a0455
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36490.htm
@@ -0,0 +1,8 @@
+<html><body>
+I'm a merchant dispatched by the lord in order to announce his intentions and distribute special products to his subjects. I'm also in charge of assigning tasks for certain positions.<br>
+<a action="bypass -h npc_%objectId%_TW_Multisell 13757 364900001">Buy special products.</a><br>
+<a action="bypass -h npc_%objectId%_TW_Buy_List nobless.htm">Ask about the tasks.</a><br>
+<a action="bypass -h npc_%objectId%_Chat 1">Ask about the badge.</a><br>
+<a action="bypass -h npc_%objectId%_TerritoryStatus">Ask about the territory's current status.</a><br>
+<a action="bypass -h npc_%objectId%_CalcRewards 81">Quest</a>
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36491-1.htm b/datapack_development/data/html/mercmanager/36491-1.htm
new file mode 100644
index 0000000000000000000000000000000000000000..76ad9a7f50889bd5e54a958b302929f28a6dac3b
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36491-1.htm
@@ -0,0 +1,3 @@
+<html><body>
+You can obtain the badge by carrying out various missions assigned by the lord during a Territory War. You may access his orders through the Territory Managers or by participating in the Territory War.
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36491-10.htm b/datapack_development/data/html/mercmanager/36491-10.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e5083c1d95a28a1ead3c76ea968fe80a106cea6c
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36491-10.htm
@@ -0,0 +1,2 @@
+<html><body>Do you know what goes on during a battle?<br>
+If weren't already engaged, I'd jump at the chance to make some money...er, I mean fight the enemy! Heh...</body></html>
diff --git a/datapack_development/data/html/mercmanager/36491-2.htm b/datapack_development/data/html/mercmanager/36491-2.htm
new file mode 100644
index 0000000000000000000000000000000000000000..44c1fe58f861fc386738e4d1a6e4dca23b907338
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36491-2.htm
@@ -0,0 +1,2 @@
+<html><body>You require more training.<br>
+(You must have completed your 2nd class change and be at least level 40.)</body></html>
diff --git a/datapack_development/data/html/mercmanager/36491-4.htm b/datapack_development/data/html/mercmanager/36491-4.htm
new file mode 100644
index 0000000000000000000000000000000000000000..90412a571030677173f06563052d310b1bf58fd3
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36491-4.htm
@@ -0,0 +1,2 @@
+<html><body>Territory Manager:<br>
+If you go to another territory, all of your accomplishments here will vanish. Please do not forget. I hope to see you in our service again. Farewell!</body></html>
diff --git a/datapack_development/data/html/mercmanager/36491-6.htm b/datapack_development/data/html/mercmanager/36491-6.htm
new file mode 100644
index 0000000000000000000000000000000000000000..67f5903881410bf206c93331381d7a3c50454287
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36491-6.htm
@@ -0,0 +1 @@
+<html><body>You do not have enough badges yet to be recognized for your activities on behalf of the territory.</body></html>
diff --git a/datapack_development/data/html/mercmanager/36491-7.htm b/datapack_development/data/html/mercmanager/36491-7.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f6bb2bf68de74e67ed2194c8db0b479b3709d6e8
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36491-7.htm
@@ -0,0 +1 @@
+<html><body>I will expect big things from you. Congratulations!</body></html>
diff --git a/datapack_development/data/html/mercmanager/36491.htm b/datapack_development/data/html/mercmanager/36491.htm
new file mode 100644
index 0000000000000000000000000000000000000000..6a3546a6aa6f8caf3896da3a21d0578b3c53d286
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36491.htm
@@ -0,0 +1,8 @@
+<html><body>
+I'm a merchant dispatched by the lord in order to announce his intentions and distribute special products to his subjects. I'm also in charge of assigning tasks for certain positions.<br>
+<a action="bypass -h npc_%objectId%_TW_Multisell 13758 364910001">Buy special products.</a><br>
+<a action="bypass -h npc_%objectId%_TW_Buy_List nobless.htm">Ask about the tasks.</a><br>
+<a action="bypass -h npc_%objectId%_Chat 1">Ask about the badge.</a><br>
+<a action="bypass -h npc_%objectId%_TerritoryStatus">Ask about the territory's current status.</a><br>
+<a action="bypass -h npc_%objectId%_CalcRewards 82">Quest</a>
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36492-1.htm b/datapack_development/data/html/mercmanager/36492-1.htm
new file mode 100644
index 0000000000000000000000000000000000000000..76ad9a7f50889bd5e54a958b302929f28a6dac3b
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36492-1.htm
@@ -0,0 +1,3 @@
+<html><body>
+You can obtain the badge by carrying out various missions assigned by the lord during a Territory War. You may access his orders through the Territory Managers or by participating in the Territory War.
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36492-10.htm b/datapack_development/data/html/mercmanager/36492-10.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e5083c1d95a28a1ead3c76ea968fe80a106cea6c
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36492-10.htm
@@ -0,0 +1,2 @@
+<html><body>Do you know what goes on during a battle?<br>
+If weren't already engaged, I'd jump at the chance to make some money...er, I mean fight the enemy! Heh...</body></html>
diff --git a/datapack_development/data/html/mercmanager/36492-2.htm b/datapack_development/data/html/mercmanager/36492-2.htm
new file mode 100644
index 0000000000000000000000000000000000000000..44c1fe58f861fc386738e4d1a6e4dca23b907338
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36492-2.htm
@@ -0,0 +1,2 @@
+<html><body>You require more training.<br>
+(You must have completed your 2nd class change and be at least level 40.)</body></html>
diff --git a/datapack_development/data/html/mercmanager/36492-4.htm b/datapack_development/data/html/mercmanager/36492-4.htm
new file mode 100644
index 0000000000000000000000000000000000000000..90412a571030677173f06563052d310b1bf58fd3
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36492-4.htm
@@ -0,0 +1,2 @@
+<html><body>Territory Manager:<br>
+If you go to another territory, all of your accomplishments here will vanish. Please do not forget. I hope to see you in our service again. Farewell!</body></html>
diff --git a/datapack_development/data/html/mercmanager/36492-6.htm b/datapack_development/data/html/mercmanager/36492-6.htm
new file mode 100644
index 0000000000000000000000000000000000000000..67f5903881410bf206c93331381d7a3c50454287
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36492-6.htm
@@ -0,0 +1 @@
+<html><body>You do not have enough badges yet to be recognized for your activities on behalf of the territory.</body></html>
diff --git a/datapack_development/data/html/mercmanager/36492-7.htm b/datapack_development/data/html/mercmanager/36492-7.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f6bb2bf68de74e67ed2194c8db0b479b3709d6e8
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36492-7.htm
@@ -0,0 +1 @@
+<html><body>I will expect big things from you. Congratulations!</body></html>
diff --git a/datapack_development/data/html/mercmanager/36492.htm b/datapack_development/data/html/mercmanager/36492.htm
new file mode 100644
index 0000000000000000000000000000000000000000..285249d3d2ea2a58af1b0762f023b931e1e0ac92
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36492.htm
@@ -0,0 +1,8 @@
+<html><body>
+I'm a merchant dispatched by the lord in order to announce his intentions and distribute special products to his subjects. I'm also in charge of assigning tasks for certain positions.<br>
+<a action="bypass -h npc_%objectId%_TW_Multisell 13759 364920001">Buy special products.</a><br>
+<a action="bypass -h npc_%objectId%_TW_Buy_List nobless.htm">Ask about the tasks.</a><br>
+<a action="bypass -h npc_%objectId%_Chat 1">Ask about the badge.</a><br>
+<a action="bypass -h npc_%objectId%_TerritoryStatus">Ask about the territory's current status.</a><br>
+<a action="bypass -h npc_%objectId%_CalcRewards 83">Quest</a>
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36493-1.htm b/datapack_development/data/html/mercmanager/36493-1.htm
new file mode 100644
index 0000000000000000000000000000000000000000..76ad9a7f50889bd5e54a958b302929f28a6dac3b
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36493-1.htm
@@ -0,0 +1,3 @@
+<html><body>
+You can obtain the badge by carrying out various missions assigned by the lord during a Territory War. You may access his orders through the Territory Managers or by participating in the Territory War.
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36493-10.htm b/datapack_development/data/html/mercmanager/36493-10.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e5083c1d95a28a1ead3c76ea968fe80a106cea6c
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36493-10.htm
@@ -0,0 +1,2 @@
+<html><body>Do you know what goes on during a battle?<br>
+If weren't already engaged, I'd jump at the chance to make some money...er, I mean fight the enemy! Heh...</body></html>
diff --git a/datapack_development/data/html/mercmanager/36493-2.htm b/datapack_development/data/html/mercmanager/36493-2.htm
new file mode 100644
index 0000000000000000000000000000000000000000..44c1fe58f861fc386738e4d1a6e4dca23b907338
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36493-2.htm
@@ -0,0 +1,2 @@
+<html><body>You require more training.<br>
+(You must have completed your 2nd class change and be at least level 40.)</body></html>
diff --git a/datapack_development/data/html/mercmanager/36493-4.htm b/datapack_development/data/html/mercmanager/36493-4.htm
new file mode 100644
index 0000000000000000000000000000000000000000..90412a571030677173f06563052d310b1bf58fd3
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36493-4.htm
@@ -0,0 +1,2 @@
+<html><body>Territory Manager:<br>
+If you go to another territory, all of your accomplishments here will vanish. Please do not forget. I hope to see you in our service again. Farewell!</body></html>
diff --git a/datapack_development/data/html/mercmanager/36493-6.htm b/datapack_development/data/html/mercmanager/36493-6.htm
new file mode 100644
index 0000000000000000000000000000000000000000..67f5903881410bf206c93331381d7a3c50454287
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36493-6.htm
@@ -0,0 +1 @@
+<html><body>You do not have enough badges yet to be recognized for your activities on behalf of the territory.</body></html>
diff --git a/datapack_development/data/html/mercmanager/36493-7.htm b/datapack_development/data/html/mercmanager/36493-7.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f6bb2bf68de74e67ed2194c8db0b479b3709d6e8
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36493-7.htm
@@ -0,0 +1 @@
+<html><body>I will expect big things from you. Congratulations!</body></html>
diff --git a/datapack_development/data/html/mercmanager/36493.htm b/datapack_development/data/html/mercmanager/36493.htm
new file mode 100644
index 0000000000000000000000000000000000000000..1a3fdb5182512426afc4e5db36e9df9bfe821d9a
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36493.htm
@@ -0,0 +1,8 @@
+<html><body>
+I'm a merchant dispatched by the lord in order to announce his intentions and distribute special products to his subjects. I'm also in charge of assigning tasks for certain positions.<br>
+<a action="bypass -h npc_%objectId%_TW_Multisell 13760 364930001">Buy special products.</a><br>
+<a action="bypass -h npc_%objectId%_TW_Buy_List nobless.htm">Ask about the tasks.</a><br>
+<a action="bypass -h npc_%objectId%_Chat 1">Ask about the badge.</a><br>
+<a action="bypass -h npc_%objectId%_TerritoryStatus">Ask about the territory's current status.</a><br>
+<a action="bypass -h npc_%objectId%_CalcRewards 84">Quest</a>
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36494-1.htm b/datapack_development/data/html/mercmanager/36494-1.htm
new file mode 100644
index 0000000000000000000000000000000000000000..76ad9a7f50889bd5e54a958b302929f28a6dac3b
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36494-1.htm
@@ -0,0 +1,3 @@
+<html><body>
+You can obtain the badge by carrying out various missions assigned by the lord during a Territory War. You may access his orders through the Territory Managers or by participating in the Territory War.
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36494-10.htm b/datapack_development/data/html/mercmanager/36494-10.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e5083c1d95a28a1ead3c76ea968fe80a106cea6c
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36494-10.htm
@@ -0,0 +1,2 @@
+<html><body>Do you know what goes on during a battle?<br>
+If weren't already engaged, I'd jump at the chance to make some money...er, I mean fight the enemy! Heh...</body></html>
diff --git a/datapack_development/data/html/mercmanager/36494-2.htm b/datapack_development/data/html/mercmanager/36494-2.htm
new file mode 100644
index 0000000000000000000000000000000000000000..44c1fe58f861fc386738e4d1a6e4dca23b907338
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36494-2.htm
@@ -0,0 +1,2 @@
+<html><body>You require more training.<br>
+(You must have completed your 2nd class change and be at least level 40.)</body></html>
diff --git a/datapack_development/data/html/mercmanager/36494-4.htm b/datapack_development/data/html/mercmanager/36494-4.htm
new file mode 100644
index 0000000000000000000000000000000000000000..90412a571030677173f06563052d310b1bf58fd3
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36494-4.htm
@@ -0,0 +1,2 @@
+<html><body>Territory Manager:<br>
+If you go to another territory, all of your accomplishments here will vanish. Please do not forget. I hope to see you in our service again. Farewell!</body></html>
diff --git a/datapack_development/data/html/mercmanager/36494-6.htm b/datapack_development/data/html/mercmanager/36494-6.htm
new file mode 100644
index 0000000000000000000000000000000000000000..67f5903881410bf206c93331381d7a3c50454287
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36494-6.htm
@@ -0,0 +1 @@
+<html><body>You do not have enough badges yet to be recognized for your activities on behalf of the territory.</body></html>
diff --git a/datapack_development/data/html/mercmanager/36494-7.htm b/datapack_development/data/html/mercmanager/36494-7.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f6bb2bf68de74e67ed2194c8db0b479b3709d6e8
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36494-7.htm
@@ -0,0 +1 @@
+<html><body>I will expect big things from you. Congratulations!</body></html>
diff --git a/datapack_development/data/html/mercmanager/36494.htm b/datapack_development/data/html/mercmanager/36494.htm
new file mode 100644
index 0000000000000000000000000000000000000000..96b0139b646e0469b98ca8b4419a731f346884b1
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36494.htm
@@ -0,0 +1,8 @@
+<html><body>
+I'm a merchant dispatched by the lord in order to announce his intentions and distribute special products to his subjects. I'm also in charge of assigning tasks for certain positions.<br>
+<a action="bypass -h npc_%objectId%_TW_Multisell 13761 364940001">Buy special products.</a><br>
+<a action="bypass -h npc_%objectId%_TW_Buy_List nobless.htm">Ask about the tasks.</a><br>
+<a action="bypass -h npc_%objectId%_Chat 1">Ask about the badge.</a><br>
+<a action="bypass -h npc_%objectId%_TerritoryStatus">Ask about the territory's current status.</a><br>
+<a action="bypass -h npc_%objectId%_CalcRewards 85">Quest</a>
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36495-1.htm b/datapack_development/data/html/mercmanager/36495-1.htm
new file mode 100644
index 0000000000000000000000000000000000000000..76ad9a7f50889bd5e54a958b302929f28a6dac3b
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36495-1.htm
@@ -0,0 +1,3 @@
+<html><body>
+You can obtain the badge by carrying out various missions assigned by the lord during a Territory War. You may access his orders through the Territory Managers or by participating in the Territory War.
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36495-10.htm b/datapack_development/data/html/mercmanager/36495-10.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e5083c1d95a28a1ead3c76ea968fe80a106cea6c
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36495-10.htm
@@ -0,0 +1,2 @@
+<html><body>Do you know what goes on during a battle?<br>
+If weren't already engaged, I'd jump at the chance to make some money...er, I mean fight the enemy! Heh...</body></html>
diff --git a/datapack_development/data/html/mercmanager/36495-2.htm b/datapack_development/data/html/mercmanager/36495-2.htm
new file mode 100644
index 0000000000000000000000000000000000000000..44c1fe58f861fc386738e4d1a6e4dca23b907338
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36495-2.htm
@@ -0,0 +1,2 @@
+<html><body>You require more training.<br>
+(You must have completed your 2nd class change and be at least level 40.)</body></html>
diff --git a/datapack_development/data/html/mercmanager/36495-4.htm b/datapack_development/data/html/mercmanager/36495-4.htm
new file mode 100644
index 0000000000000000000000000000000000000000..90412a571030677173f06563052d310b1bf58fd3
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36495-4.htm
@@ -0,0 +1,2 @@
+<html><body>Territory Manager:<br>
+If you go to another territory, all of your accomplishments here will vanish. Please do not forget. I hope to see you in our service again. Farewell!</body></html>
diff --git a/datapack_development/data/html/mercmanager/36495-6.htm b/datapack_development/data/html/mercmanager/36495-6.htm
new file mode 100644
index 0000000000000000000000000000000000000000..67f5903881410bf206c93331381d7a3c50454287
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36495-6.htm
@@ -0,0 +1 @@
+<html><body>You do not have enough badges yet to be recognized for your activities on behalf of the territory.</body></html>
diff --git a/datapack_development/data/html/mercmanager/36495-7.htm b/datapack_development/data/html/mercmanager/36495-7.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f6bb2bf68de74e67ed2194c8db0b479b3709d6e8
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36495-7.htm
@@ -0,0 +1 @@
+<html><body>I will expect big things from you. Congratulations!</body></html>
diff --git a/datapack_development/data/html/mercmanager/36495.htm b/datapack_development/data/html/mercmanager/36495.htm
new file mode 100644
index 0000000000000000000000000000000000000000..7da09a9a55ca2ea89877fb1a88dbf6ee63e4818f
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36495.htm
@@ -0,0 +1,8 @@
+<html><body>
+I'm a merchant dispatched by the lord in order to announce his intentions and distribute special products to his subjects. I'm also in charge of assigning tasks for certain positions.<br>
+<a action="bypass -h npc_%objectId%_TW_Multisell 13762 364950001">Buy special products.</a><br>
+<a action="bypass -h npc_%objectId%_TW_Buy_List nobless.htm">Ask about the tasks.</a><br>
+<a action="bypass -h npc_%objectId%_Chat 1">Ask about the badge.</a><br>
+<a action="bypass -h npc_%objectId%_TerritoryStatus">Ask about the territory's current status.</a><br>
+<a action="bypass -h npc_%objectId%_CalcRewards 86">Quest</a>
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36496-1.htm b/datapack_development/data/html/mercmanager/36496-1.htm
new file mode 100644
index 0000000000000000000000000000000000000000..76ad9a7f50889bd5e54a958b302929f28a6dac3b
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36496-1.htm
@@ -0,0 +1,3 @@
+<html><body>
+You can obtain the badge by carrying out various missions assigned by the lord during a Territory War. You may access his orders through the Territory Managers or by participating in the Territory War.
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36496-10.htm b/datapack_development/data/html/mercmanager/36496-10.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e5083c1d95a28a1ead3c76ea968fe80a106cea6c
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36496-10.htm
@@ -0,0 +1,2 @@
+<html><body>Do you know what goes on during a battle?<br>
+If weren't already engaged, I'd jump at the chance to make some money...er, I mean fight the enemy! Heh...</body></html>
diff --git a/datapack_development/data/html/mercmanager/36496-2.htm b/datapack_development/data/html/mercmanager/36496-2.htm
new file mode 100644
index 0000000000000000000000000000000000000000..44c1fe58f861fc386738e4d1a6e4dca23b907338
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36496-2.htm
@@ -0,0 +1,2 @@
+<html><body>You require more training.<br>
+(You must have completed your 2nd class change and be at least level 40.)</body></html>
diff --git a/datapack_development/data/html/mercmanager/36496-4.htm b/datapack_development/data/html/mercmanager/36496-4.htm
new file mode 100644
index 0000000000000000000000000000000000000000..90412a571030677173f06563052d310b1bf58fd3
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36496-4.htm
@@ -0,0 +1,2 @@
+<html><body>Territory Manager:<br>
+If you go to another territory, all of your accomplishments here will vanish. Please do not forget. I hope to see you in our service again. Farewell!</body></html>
diff --git a/datapack_development/data/html/mercmanager/36496-6.htm b/datapack_development/data/html/mercmanager/36496-6.htm
new file mode 100644
index 0000000000000000000000000000000000000000..67f5903881410bf206c93331381d7a3c50454287
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36496-6.htm
@@ -0,0 +1 @@
+<html><body>You do not have enough badges yet to be recognized for your activities on behalf of the territory.</body></html>
diff --git a/datapack_development/data/html/mercmanager/36496-7.htm b/datapack_development/data/html/mercmanager/36496-7.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f6bb2bf68de74e67ed2194c8db0b479b3709d6e8
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36496-7.htm
@@ -0,0 +1 @@
+<html><body>I will expect big things from you. Congratulations!</body></html>
diff --git a/datapack_development/data/html/mercmanager/36496.htm b/datapack_development/data/html/mercmanager/36496.htm
new file mode 100644
index 0000000000000000000000000000000000000000..b5abc827bc5237103c0680f1d173887f037c776e
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36496.htm
@@ -0,0 +1,8 @@
+<html><body>
+I'm a merchant dispatched by the lord in order to announce his intentions and distribute special products to his subjects. I'm also in charge of assigning tasks for certain positions.<br>
+<a action="bypass -h npc_%objectId%_TW_Multisell 13763 364960001">Buy special products.</a><br>
+<a action="bypass -h npc_%objectId%_TW_Buy_List nobless.htm">Ask about the tasks.</a><br>
+<a action="bypass -h npc_%objectId%_Chat 1">Ask about the badge.</a><br>
+<a action="bypass -h npc_%objectId%_TerritoryStatus">Ask about the territory's current status.</a><br>
+<a action="bypass -h npc_%objectId%_CalcRewards 87">Quest</a>
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36497-1.htm b/datapack_development/data/html/mercmanager/36497-1.htm
new file mode 100644
index 0000000000000000000000000000000000000000..76ad9a7f50889bd5e54a958b302929f28a6dac3b
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36497-1.htm
@@ -0,0 +1,3 @@
+<html><body>
+You can obtain the badge by carrying out various missions assigned by the lord during a Territory War. You may access his orders through the Territory Managers or by participating in the Territory War.
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36497-10.htm b/datapack_development/data/html/mercmanager/36497-10.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e5083c1d95a28a1ead3c76ea968fe80a106cea6c
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36497-10.htm
@@ -0,0 +1,2 @@
+<html><body>Do you know what goes on during a battle?<br>
+If weren't already engaged, I'd jump at the chance to make some money...er, I mean fight the enemy! Heh...</body></html>
diff --git a/datapack_development/data/html/mercmanager/36497-2.htm b/datapack_development/data/html/mercmanager/36497-2.htm
new file mode 100644
index 0000000000000000000000000000000000000000..44c1fe58f861fc386738e4d1a6e4dca23b907338
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36497-2.htm
@@ -0,0 +1,2 @@
+<html><body>You require more training.<br>
+(You must have completed your 2nd class change and be at least level 40.)</body></html>
diff --git a/datapack_development/data/html/mercmanager/36497-4.htm b/datapack_development/data/html/mercmanager/36497-4.htm
new file mode 100644
index 0000000000000000000000000000000000000000..90412a571030677173f06563052d310b1bf58fd3
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36497-4.htm
@@ -0,0 +1,2 @@
+<html><body>Territory Manager:<br>
+If you go to another territory, all of your accomplishments here will vanish. Please do not forget. I hope to see you in our service again. Farewell!</body></html>
diff --git a/datapack_development/data/html/mercmanager/36497-6.htm b/datapack_development/data/html/mercmanager/36497-6.htm
new file mode 100644
index 0000000000000000000000000000000000000000..67f5903881410bf206c93331381d7a3c50454287
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36497-6.htm
@@ -0,0 +1 @@
+<html><body>You do not have enough badges yet to be recognized for your activities on behalf of the territory.</body></html>
diff --git a/datapack_development/data/html/mercmanager/36497-7.htm b/datapack_development/data/html/mercmanager/36497-7.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f6bb2bf68de74e67ed2194c8db0b479b3709d6e8
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36497-7.htm
@@ -0,0 +1 @@
+<html><body>I will expect big things from you. Congratulations!</body></html>
diff --git a/datapack_development/data/html/mercmanager/36497.htm b/datapack_development/data/html/mercmanager/36497.htm
new file mode 100644
index 0000000000000000000000000000000000000000..78fa94dc4e62053b34c911a5022b221d79c0eede
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36497.htm
@@ -0,0 +1,8 @@
+<html><body>
+I'm a merchant dispatched by the lord in order to announce his intentions and distribute special products to his subjects. I'm also in charge of assigning tasks for certain positions.<br>
+<a action="bypass -h npc_%objectId%_TW_Multisell 13764 364970001">Buy special products.</a><br>
+<a action="bypass -h npc_%objectId%_TW_Buy_List nobless.htm">Ask about the tasks.</a><br>
+<a action="bypass -h npc_%objectId%_Chat 1">Ask about the badge.</a><br>
+<a action="bypass -h npc_%objectId%_TerritoryStatus">Ask about the territory's current status.</a><br>
+<a action="bypass -h npc_%objectId%_CalcRewards 88">Quest</a>
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36498-1.htm b/datapack_development/data/html/mercmanager/36498-1.htm
new file mode 100644
index 0000000000000000000000000000000000000000..76ad9a7f50889bd5e54a958b302929f28a6dac3b
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36498-1.htm
@@ -0,0 +1,3 @@
+<html><body>
+You can obtain the badge by carrying out various missions assigned by the lord during a Territory War. You may access his orders through the Territory Managers or by participating in the Territory War.
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/36498-10.htm b/datapack_development/data/html/mercmanager/36498-10.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e5083c1d95a28a1ead3c76ea968fe80a106cea6c
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36498-10.htm
@@ -0,0 +1,2 @@
+<html><body>Do you know what goes on during a battle?<br>
+If weren't already engaged, I'd jump at the chance to make some money...er, I mean fight the enemy! Heh...</body></html>
diff --git a/datapack_development/data/html/mercmanager/36498-2.htm b/datapack_development/data/html/mercmanager/36498-2.htm
new file mode 100644
index 0000000000000000000000000000000000000000..44c1fe58f861fc386738e4d1a6e4dca23b907338
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36498-2.htm
@@ -0,0 +1,2 @@
+<html><body>You require more training.<br>
+(You must have completed your 2nd class change and be at least level 40.)</body></html>
diff --git a/datapack_development/data/html/mercmanager/36498-4.htm b/datapack_development/data/html/mercmanager/36498-4.htm
new file mode 100644
index 0000000000000000000000000000000000000000..90412a571030677173f06563052d310b1bf58fd3
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36498-4.htm
@@ -0,0 +1,2 @@
+<html><body>Territory Manager:<br>
+If you go to another territory, all of your accomplishments here will vanish. Please do not forget. I hope to see you in our service again. Farewell!</body></html>
diff --git a/datapack_development/data/html/mercmanager/36498-6.htm b/datapack_development/data/html/mercmanager/36498-6.htm
new file mode 100644
index 0000000000000000000000000000000000000000..67f5903881410bf206c93331381d7a3c50454287
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36498-6.htm
@@ -0,0 +1 @@
+<html><body>You do not have enough badges yet to be recognized for your activities on behalf of the territory.</body></html>
diff --git a/datapack_development/data/html/mercmanager/36498-7.htm b/datapack_development/data/html/mercmanager/36498-7.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f6bb2bf68de74e67ed2194c8db0b479b3709d6e8
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36498-7.htm
@@ -0,0 +1 @@
+<html><body>I will expect big things from you. Congratulations!</body></html>
diff --git a/datapack_development/data/html/mercmanager/36498.htm b/datapack_development/data/html/mercmanager/36498.htm
new file mode 100644
index 0000000000000000000000000000000000000000..ca50262e1ad4609a7b0a150271e1ee7c5164546c
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/36498.htm
@@ -0,0 +1,8 @@
+<html><body>
+I'm a merchant dispatched by the lord in order to announce his intentions and distribute special products to his subjects. I'm also in charge of assigning tasks for certain positions.<br>
+<a action="bypass -h npc_%objectId%_TW_Multisell 13765 364980001">Buy special products.</a><br>
+<a action="bypass -h npc_%objectId%_TW_Buy_List nobless.htm">Ask about the tasks.</a><br>
+<a action="bypass -h npc_%objectId%_Chat 1">Ask about the badge.</a><br>
+<a action="bypass -h npc_%objectId%_TerritoryStatus">Ask about the territory's current status.</a><br>
+<a action="bypass -h npc_%objectId%_CalcRewards 89">Quest</a>
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/MercenaryManager-3.htm b/datapack_development/data/html/mercmanager/MercenaryManager-3.htm
deleted file mode 100644
index cf20be7e68abaff97c4054d87d39dbf224387618..0000000000000000000000000000000000000000
--- a/datapack_development/data/html/mercmanager/MercenaryManager-3.htm
+++ /dev/null
@@ -1,10 +0,0 @@
-<html><head><body>Mercenary Captain:<br>Mobility is a basic skill of all mercenaries.
-What's really needed in a large-scale battle is striders, of course.<br>
-A mercenary company receives striders when it signs a contract with a lord.
-Then we assigne them to individual mercenaries.
-If you need one, bring enough badges to prove your skill.<br>
-I think <font color="LEVEL">60</font> should be enough.<br><br>
-<a action="bypass -h npc_%objectId%_Chat 6">"Here it is. I want the Strider of Wind."</a><br>
-<a action="bypass -h npc_%objectId%_Chat 6">"Here it is. I want the Strider of Star."</a><br>
-<a action="bypass -h npc_%objectId%_Chat 6">"Here it is. I want the Strider of Twilight."</a>
-</body></html>
\ No newline at end of file
diff --git a/datapack_development/data/html/mercmanager/nobless.htm b/datapack_development/data/html/mercmanager/nobless.htm
new file mode 100644
index 0000000000000000000000000000000000000000..5f4b2a8061d08e989168ed671581bc682fa03065
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/nobless.htm
@@ -0,0 +1,4 @@
+<html><body>If you're qualified, I can personally appoint you as Noblesse on the lord's behalf.<br>
+Do you feel confident? Would you like to be Noblesse? If so, please prove your worth. Bring me %noblessBadge% territory badges.<br>
+<a action="bypass -h npc_%objectId%_TW_Buy 13765 %noblessBadge% 0">"I have proven my qualification. Make me a Noblesse."</a>
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/reward-0a.htm b/datapack_development/data/html/mercmanager/reward-0a.htm
new file mode 100644
index 0000000000000000000000000000000000000000..658da1932e2731c7765db6e24a447387d371af26
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/reward-0a.htm
@@ -0,0 +1,3 @@
+<html><body>Territory Manager:<br>
+There is nothing I can do for you. Given your level of achievement, I have nothing else to offer you. I look forward to witnessing your accomplishments in the next territory battle.
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/reward-0b.htm b/datapack_development/data/html/mercmanager/reward-0b.htm
new file mode 100644
index 0000000000000000000000000000000000000000..ffc463c0792af8c0a7960babd030378fcedf1d0f
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/reward-0b.htm
@@ -0,0 +1,4 @@
+<html><body>Territory Manager:<br>
+How does someone who used to work for %castle% dare show their face here? Go find the %castle% Territory Manager.<br>
+(All previous rewards will disappear if you begin a Territory Battle while your territory changes status.)
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/reward-1.htm b/datapack_development/data/html/mercmanager/reward-1.htm
new file mode 100644
index 0000000000000000000000000000000000000000..b35c3e44d021cecf22b94953294000e0a87e377e
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/reward-1.htm
@@ -0,0 +1,6 @@
+<html><body>Territory Manager:<br>
+Thank you for your service to %castle% Territory during the recent war. For your efforts, I can reward you with %badge% numbers of Territory Badge and %adena% Adena.<br>
+If you continue your efforts on our behalf, I'll make sure you recive more in the future. What would you like to do?<br>
+<a action="bypass -h npc_%objectId%_Chat 4">Receive the reward later.</a><br>
+<a action="bypass -h npc_%objectId%_ReceiveRewards %territoryId%">Receive the reward now.</a>
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/reward-2.htm b/datapack_development/data/html/mercmanager/reward-2.htm
new file mode 100644
index 0000000000000000000000000000000000000000..4d8d344b99b694f189d3ae7f306b5f24efc75a93
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/reward-2.htm
@@ -0,0 +1,3 @@
+<html><body>Territory Manager:<br>
+Here it is. I hope to see your accomplishments in the next territory battle!
+</body></html>
diff --git a/datapack_development/data/html/mercmanager/striderslist.htm b/datapack_development/data/html/mercmanager/striderslist.htm
new file mode 100644
index 0000000000000000000000000000000000000000..0db8c548098c35d1120bb912de0729cc2bddba77
--- /dev/null
+++ b/datapack_development/data/html/mercmanager/striderslist.htm
@@ -0,0 +1,10 @@
+<html><head><body>Mercenary Captain:<br>Mobility is a basic skill of all mercenaries.
+What's really needed in a large-scale battle is striders, of course.<br>
+A mercenary company receives striders when it signs a contract with a lord.
+Then we assigne them to individual mercenaries.
+If you need one, bring enough badges to prove your skill.<br>
+I think <font color="LEVEL">%striderBadge%</font> should be enough.<br><br>
+<a action="bypass -h npc_%objectId%_TW_Buy 13757 %striderBadge% 1">"Here it is. I want the Strider of Wind."</a><br>
+<a action="bypass -h npc_%objectId%_TW_Buy 13757 %striderBadge% 2">"Here it is. I want the Strider of Star."</a><br>
+<a action="bypass -h npc_%objectId%_TW_Buy 13757 %striderBadge% 3">"Here it is. I want the Strider of Twilight."</a>
+</body></html>
diff --git a/datapack_development/data/scripts.cfg b/datapack_development/data/scripts.cfg
index 3cf75b9b0433fcee3fefdd5593bbde7ab309d7d0..ec3e24166747d9f6258ac7ea1fef4e6a7811c52f 100644
--- a/datapack_development/data/scripts.cfg
+++ b/datapack_development/data/scripts.cfg
@@ -204,6 +204,7 @@ hellbound/Budenka/Budenka.java
# Quests Section
quests/SagasScripts/SagasSuperClass.java
+quests/TerritoryWarScripts/TerritoryWarSuperClass.java
quests/1_LettersOfLove1/__init__.py
quests/2_WhatWomenWant1/__init__.py
quests/3_ReleaseDarkelfElder1/__init__.py
diff --git a/datapack_development/data/scripts/handlers/MasterHandler.java b/datapack_development/data/scripts/handlers/MasterHandler.java
index 13344416e10badd0dc335459d968b3e73c7ab5e9..fad068e8e34c687623defba81b5fae63a60a0da4 100644
--- a/datapack_development/data/scripts/handlers/MasterHandler.java
+++ b/datapack_development/data/scripts/handlers/MasterHandler.java
@@ -129,6 +129,7 @@ public class MasterHandler
AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminSummon());
AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminTarget());
AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminTeleport());
+ AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminTerritoryWar());
AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminTest());
AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminTvTEvent());
AdminCommandHandler.getInstance().registerAdminCommandHandler(new AdminUnblockIp());
@@ -164,6 +165,7 @@ public class MasterHandler
BypassHandler.getInstance().registerBypassHandler(new SupportBlessing());
BypassHandler.getInstance().registerBypassHandler(new SupportMagic());
BypassHandler.getInstance().registerBypassHandler(new TerritoryStatus());
+ BypassHandler.getInstance().registerBypassHandler(new TerritoryWar());
BypassHandler.getInstance().registerBypassHandler(new Transform());
BypassHandler.getInstance().registerBypassHandler(new Wear());
_log.config("Loaded " + BypassHandler.getInstance().size() + " BypassHandlers");
@@ -173,6 +175,7 @@ public class MasterHandler
{
ChatHandler.getInstance().registerChatHandler(new ChatAll());
ChatHandler.getInstance().registerChatHandler(new ChatAlliance());
+ ChatHandler.getInstance().registerChatHandler(new ChatBattlefield());
ChatHandler.getInstance().registerChatHandler(new ChatClan());
ChatHandler.getInstance().registerChatHandler(new ChatHeroVoice());
ChatHandler.getInstance().registerChatHandler(new ChatParty());
@@ -215,6 +218,7 @@ public class MasterHandler
ItemHandler.getInstance().registerItemHandler(new BeastSpice());
ItemHandler.getInstance().registerItemHandler(new TeleportBookmark());
ItemHandler.getInstance().registerItemHandler(new Elixir());
+ ItemHandler.getInstance().registerItemHandler(new Disguise());
_log.config("Loaded " + ItemHandler.getInstance().size() + " ItemHandlers");
}
diff --git a/datapack_development/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java b/datapack_development/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java
new file mode 100644
index 0000000000000000000000000000000000000000..7b09d8b5a255d643e9de13ff1835861fb301873c
--- /dev/null
+++ b/datapack_development/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java
@@ -0,0 +1,118 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.admincommandhandlers;
+
+import java.util.Calendar;
+import java.util.StringTokenizer;
+
+import com.l2jserver.gameserver.handler.IAdminCommandHandler;
+import com.l2jserver.gameserver.instancemanager.QuestManager;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+
+/**
+ * Admin comand handler for Territory War System
+ * This class handles following admin commands:
+ *
+ * @author Gigiikun
+ */
+public class AdminTerritoryWar implements IAdminCommandHandler
+{
+ private static final String[] _adminCommands =
+ {
+ "admin_territory_war",
+ "admin_territory_war_time",
+ "admin_territory_war_start",
+ "admin_territory_war_end"
+ };
+
+ public boolean useAdminCommand(String command, L2PcInstance activeChar)
+ {
+ StringTokenizer st = new StringTokenizer(command);
+ command = st.nextToken();
+
+ if (command.equals("admin_territory_war"))
+ {
+ showMainPage(activeChar);
+ }
+ else if (command.equalsIgnoreCase("admin_territory_war_time"))
+ {
+ String val = "";
+ if (st.hasMoreTokens())
+ {
+ val = st.nextToken();
+ Calendar newAdminTWDate = Calendar.getInstance();
+ newAdminTWDate.setTimeInMillis(TerritoryWarManager.getInstance().getTWStartTimeInMillis());
+ if (val.equalsIgnoreCase("day"))
+ newAdminTWDate.set(Calendar.DAY_OF_WEEK, Integer.parseInt(st.nextToken()));
+ else if (val.equalsIgnoreCase("hour"))
+ newAdminTWDate.set(Calendar.HOUR_OF_DAY, Integer.parseInt(st.nextToken()));
+ else if (val.equalsIgnoreCase("min"))
+ newAdminTWDate.set(Calendar.MINUTE, Integer.parseInt(st.nextToken()));
+
+ if (newAdminTWDate.getTimeInMillis() < Calendar.getInstance().getTimeInMillis())
+ {
+ activeChar.sendMessage("Unable to change TW Date!");
+ }
+ else if (newAdminTWDate.getTimeInMillis() != TerritoryWarManager.getInstance().getTWStartTimeInMillis())
+ {
+ Quest twQuest = QuestManager.getInstance().getQuest(TerritoryWarManager.qn);
+ if (twQuest != null)
+ twQuest.onAdvEvent("setTWDate " + newAdminTWDate.getTimeInMillis(), null, null);
+ else
+ activeChar.sendMessage("Missing Territory War Quest!");
+ }
+ }
+ showSiegeTimePage(activeChar);
+ }
+ else if (command.equalsIgnoreCase("admin_territory_war_start"))
+ {
+ Quest twQuest = QuestManager.getInstance().getQuest(TerritoryWarManager.qn);
+ if (twQuest != null)
+ twQuest.onAdvEvent("setTWDate " + Calendar.getInstance().getTimeInMillis(), null, null);
+ else
+ activeChar.sendMessage("Missing Territory War Quest!");
+ }
+ else if (command.equalsIgnoreCase("admin_territory_war_end"))
+ {
+ Quest twQuest = QuestManager.getInstance().getQuest(TerritoryWarManager.qn);
+ if (twQuest != null)
+ twQuest.onAdvEvent("setTWDate " + (Calendar.getInstance().getTimeInMillis() - TerritoryWarManager.WARLENGTH), null, null);
+ else
+ activeChar.sendMessage("Missing Territory War Quest!");
+ }
+ return true;
+ }
+
+ public String[] getAdminCommandList()
+ {
+ return _adminCommands;
+ }
+
+ private void showSiegeTimePage(L2PcInstance activeChar)
+ {
+ NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/territorywartime.htm");
+ adminReply.replace("%time%", TerritoryWarManager.getInstance().getTWStart().getTime().toString());
+ activeChar.sendPacket(adminReply);
+ }
+
+ private void showMainPage(L2PcInstance activeChar)
+ {
+ AdminHelpPage.showHelpPage(activeChar, "territorywar.htm");
+ }
+}
diff --git a/datapack_development/data/scripts/handlers/bypasshandlers/TerritoryWar.java b/datapack_development/data/scripts/handlers/bypasshandlers/TerritoryWar.java
new file mode 100644
index 0000000000000000000000000000000000000000..56e58ee760e98423aaa6a6f56a2828eb962c024b
--- /dev/null
+++ b/datapack_development/data/scripts/handlers/bypasshandlers/TerritoryWar.java
@@ -0,0 +1,208 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.bypasshandlers;
+
+import java.util.StringTokenizer;
+
+import com.l2jserver.gameserver.handler.IBypassHandler;
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.model.L2Multisell;
+import com.l2jserver.gameserver.model.L2Object.InstanceType;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2MercenaryManagerInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
+import com.l2jserver.gameserver.network.serverpackets.ExShowDominionRegistry;
+import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jserver.gameserver.network.serverpackets.UserInfo;
+
+public class TerritoryWar implements IBypassHandler
+{
+ private static final String[] COMMANDS =
+ {
+ "Territory",
+ "TW_Multisell",
+ "TW_Buy_List",
+ "TW_Buy",
+ "CalcRewards",
+ "ReceiveRewards"
+ };
+
+ public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
+ {
+ if (!target.isInstanceType(InstanceType.L2Npc))
+ return false;
+
+ try
+ {
+ StringTokenizer st = new StringTokenizer(command, " ");
+ String actualCommand = st.nextToken(); // Get actual command
+
+ if (actualCommand.equalsIgnoreCase("Territory"))
+ {
+ if (st.countTokens() < 1)
+ return false;
+
+ int castleId = Integer.parseInt(st.nextToken());
+ activeChar.sendPacket(new ExShowDominionRegistry(castleId, activeChar));
+ }
+ else if (!target.isInstanceType(InstanceType.L2MercenaryManagerInstance))
+ return false;
+
+ L2MercenaryManagerInstance mercman = ((L2MercenaryManagerInstance)target);
+ if (actualCommand.equalsIgnoreCase("TW_Multisell"))
+ {
+ if (st.countTokens() < 1)
+ return false;
+ int territoryItemId = Integer.parseInt(st.nextToken());
+ if (activeChar.getInventory().getItemByItemId(territoryItemId) == null)
+ {
+ mercman.showChatWindow(activeChar, 1);
+ return true;
+ }
+
+ int val = Integer.parseInt(st.nextToken());
+ L2Multisell.getInstance().separateAndSend(val, activeChar, mercman.getNpcId(), false, mercman.getCastle().getTaxRate());
+ }
+ else if (actualCommand.equalsIgnoreCase("TW_Buy_List"))
+ {
+ if (st.countTokens() < 1)
+ return false;
+
+ NpcHtmlMessage html = new NpcHtmlMessage(mercman.getObjectId());
+ html.setFile(activeChar.getHtmlPrefix(), "data/html/mercmanager/" + st.nextToken());
+ html.replace("%noblessBadge%", String.valueOf(TerritoryWarManager.MINTWBADGEFORNOBLESS));
+ html.replace("%striderBadge%", String.valueOf(TerritoryWarManager.MINTWBADGEFORSTRIDERS));
+ html.replace("%gstriderBadge%", String.valueOf(TerritoryWarManager.MINTWBADGEFORBIGSTRIDER));
+ html.replace("%objectId%", String.valueOf(mercman.getObjectId()));
+ activeChar.sendPacket(html);
+ activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+ }
+ else if (actualCommand.equalsIgnoreCase("TW_Buy"))
+ {
+ int itemId = Integer.parseInt(st.nextToken());
+ int count = Integer.parseInt(st.nextToken());
+ int type = Integer.parseInt(st.nextToken());
+ if (activeChar.getInventory().getItemByItemId(itemId) != null)
+ {
+ long playerItemCount = activeChar.getInventory().getItemByItemId(itemId).getCount();
+ if (count <= playerItemCount)
+ {
+ int boughtId = 0;
+ switch(type)
+ {
+ case 0:
+ if (activeChar.isNoble())
+ return false;
+ boughtId = 7694;
+ activeChar.setNoble(true);
+ activeChar.sendPacket(new UserInfo(activeChar));
+ activeChar.sendPacket(new ExBrExtraUserInfo(activeChar));
+ break;
+ case 1:
+ boughtId = 4422;
+ break;
+ case 2:
+ boughtId = 4423;
+ break;
+ case 3:
+ boughtId = 4424;
+ break;
+ case 4:
+ boughtId = 14819;
+ break;
+ default:
+ _log.warning("TerritoryWar buy: not handled type: " + type);
+ return false;
+ }
+ activeChar.destroyItemByItemId("QUEST", itemId, (long) count, mercman, true);
+ activeChar.addItem("QUEST", boughtId, 1, mercman, false);
+ mercman.showChatWindow(activeChar, 7);
+ return true;
+ }
+ }
+ mercman.showChatWindow(activeChar, 6);
+ }
+ else if (actualCommand.equalsIgnoreCase("CalcRewards"))
+ {
+ int territoryId = Integer.parseInt(st.nextToken());
+ int[] reward = TerritoryWarManager.getInstance().calcReward(activeChar);
+ NpcHtmlMessage html = new NpcHtmlMessage(mercman.getObjectId());
+ if (TerritoryWarManager.getInstance().isTWInProgress() || reward[0] == 0)
+ html.setFile(activeChar.getHtmlPrefix(), "data/html/mercmanager/reward-0a.htm");
+ else if (reward[0] != territoryId)
+ {
+ html.setFile(activeChar.getHtmlPrefix(), "data/html/mercmanager/reward-0b.htm");
+ html.replace("%castle%", CastleManager.getInstance().getCastleById(reward[0] - 80).getName());
+ }
+ else if (reward[1] == 0)
+ html.setFile(activeChar.getHtmlPrefix(), "data/html/mercmanager/reward-0a.htm");
+ else
+ {
+ html.setFile(activeChar.getHtmlPrefix(), "data/html/mercmanager/reward-1.htm");
+ html.replace("%castle%", CastleManager.getInstance().getCastleById(reward[0] - 80).getName());
+ html.replace("%badge%", String.valueOf(reward[1]));
+ html.replace("%adena%", String.valueOf(reward[1] * 5000));
+ }
+ html.replace("%territoryId%", String.valueOf(territoryId));
+ html.replace("%objectId%", String.valueOf(mercman.getObjectId()));
+ activeChar.sendPacket(html);
+ activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+ }
+ else if (actualCommand.equalsIgnoreCase("ReceiveRewards"))
+ {
+ int territoryId = Integer.parseInt(st.nextToken());
+ int badgeId = 57;
+ if (TerritoryWarManager.getInstance().TERRITORY_ITEM_IDS.containsKey(territoryId))
+ badgeId = TerritoryWarManager.getInstance().TERRITORY_ITEM_IDS.get(territoryId);
+ int[] reward = TerritoryWarManager.getInstance().calcReward(activeChar);
+ NpcHtmlMessage html = new NpcHtmlMessage(mercman.getObjectId());
+ if (TerritoryWarManager.getInstance().isTWInProgress() || reward[0] == 0)
+ html.setFile(activeChar.getHtmlPrefix(), "data/html/mercmanager/reward-0a.htm");
+ else if (reward[0] != territoryId)
+ {
+ html.setFile(activeChar.getHtmlPrefix(), "data/html/mercmanager/reward-0b.htm");
+ html.replace("%castle%", CastleManager.getInstance().getCastleById(reward[0] - 80).getName());
+ }
+ else if (reward[1] == 0)
+ html.setFile(activeChar.getHtmlPrefix(), "data/html/mercmanager/reward-0a.htm");
+ else
+ {
+ html.setFile(activeChar.getHtmlPrefix(), "data/html/mercmanager/reward-2.htm");
+ activeChar.addItem("QUEST", badgeId, reward[1], mercman, true);
+ activeChar.addAdena("QUEST", reward[1] * 5000, mercman, true);
+ TerritoryWarManager.getInstance().resetReward(activeChar);
+ }
+
+ html.replace("%objectId%", String.valueOf(mercman.getObjectId()));
+ activeChar.sendPacket(html);
+ activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+ }
+ return true;
+ }
+ catch (Exception e)
+ {
+ _log.info("Exception in " + getClass().getSimpleName());
+ }
+ return false;
+ }
+
+ public String[] getBypassList()
+ {
+ return COMMANDS;
+ }
+}
diff --git a/datapack_development/data/scripts/handlers/chathandlers/ChatBattlefield.java b/datapack_development/data/scripts/handlers/chathandlers/ChatBattlefield.java
new file mode 100644
index 0000000000000000000000000000000000000000..378eb860a49cdc9da0d7d18b076350b9198b88b3
--- /dev/null
+++ b/datapack_development/data/scripts/handlers/chathandlers/ChatBattlefield.java
@@ -0,0 +1,61 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.chathandlers;
+
+import java.util.Collection;
+
+import com.l2jserver.gameserver.handler.IChatHandler;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
+
+/**
+ * A chat handler
+ *
+ * @author Gigiikun
+ */
+public class ChatBattlefield implements IChatHandler
+{
+ private static final int[] COMMAND_IDS =
+ {
+ 20
+ };
+
+ /**
+ * Handle chat type 'battlefield'
+ * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
+ */
+ public void handleChat(int type, L2PcInstance activeChar, String target, String text)
+ {
+ if (TerritoryWarManager.getInstance().isTWChannelOpen() && activeChar.getSiegeSide() > 0)
+ {
+ CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text);
+ Collection<L2PcInstance> pls = L2World.getInstance().getAllPlayers().values();
+ for (L2PcInstance player : pls)
+ if (player.getSiegeSide() == activeChar.getSiegeSide())
+ player.sendPacket(cs);
+ }
+ }
+
+ /**
+ * Returns the chat types registered to this handler
+ * @see com.l2jserver.gameserver.handler.IChatHandler#getChatTypeList()
+ */
+ public int[] getChatTypeList()
+ {
+ return COMMAND_IDS;
+ }
+}
diff --git a/datapack_development/data/scripts/handlers/itemhandlers/Disguise.java b/datapack_development/data/scripts/handlers/itemhandlers/Disguise.java
new file mode 100644
index 0000000000000000000000000000000000000000..40887f783fb5d84a88cc10f6d1b3c66a35c9ab59
--- /dev/null
+++ b/datapack_development/data/scripts/handlers/itemhandlers/Disguise.java
@@ -0,0 +1,67 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.itemhandlers;
+
+import com.l2jserver.gameserver.handler.IItemHandler;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.model.L2ItemInstance;
+import com.l2jserver.gameserver.model.actor.L2Playable;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * This class provides handling for items that should display a map
+ * when double clicked.
+ *
+ * @version $Revision: 1.1.4.3 $ $Date: 2005/03/27 15:30:07 $
+ */
+
+public class Disguise implements IItemHandler
+{
+ /**
+ *
+ * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance)
+ */
+ public void useItem(L2Playable playable, L2ItemInstance item)
+ {
+ if (!(playable instanceof L2PcInstance))
+ return;
+
+ L2PcInstance activeChar = (L2PcInstance) playable;
+
+ int regId = TerritoryWarManager.getInstance().getRegisteredTerritoryId(activeChar);
+ if (regId > 0 && regId == (item.getItemId() - 13596))
+ {
+ if (activeChar.getClan() != null && activeChar.getClan().getHasCastle() > 0)
+ {
+ activeChar.sendPacket(SystemMessageId.TERRITORY_OWNING_CLAN_CANNOT_USE_DISGUISE_SCROLL);
+ return;
+ }
+ TerritoryWarManager.getInstance().addDisguisedPlayer(activeChar.getObjectId());
+ activeChar.broadcastUserInfo();
+ playable.destroyItem("Consume", item.getObjectId(), 1, null, false);
+ }
+ else if (regId > 0)
+ {
+ activeChar.sendPacket(SystemMessageId.THE_DISGUISE_SCROLL_MEANT_FOR_DIFFERENT_TERRITORY);
+ return;
+ }
+ else
+ {
+ activeChar.sendPacket(SystemMessageId.TERRITORY_WAR_SCROLL_CAN_NOT_USED_NOW);
+ return;
+ }
+ }
+}
diff --git a/datapack_development/data/scripts/handlers/usercommandhandlers/Escape.java b/datapack_development/data/scripts/handlers/usercommandhandlers/Escape.java
index 385feee8f29e9de23366f6353dc0db11de703749..1bd2ced9e7eb3f4c51404b9db41ec4e732527d4a 100644
--- a/datapack_development/data/scripts/handlers/usercommandhandlers/Escape.java
+++ b/datapack_development/data/scripts/handlers/usercommandhandlers/Escape.java
@@ -81,7 +81,7 @@ public class Escape implements IUserCommandHandler
}
if (activeChar.isCastingNow() || activeChar.isMovementDisabled() || activeChar.isMuted()
- || activeChar.isAlikeDead() || activeChar.isInOlympiadMode() || activeChar.inObserverMode())
+ || activeChar.isAlikeDead() || activeChar.isInOlympiadMode() || activeChar.inObserverMode() || activeChar.isCombatFlagEquipped())
return false;
activeChar.forceIsCasting(GameTimeController.getGameTicks() + unstuckTimer / GameTimeController.MILLIS_IN_TICK);
diff --git a/datapack_development/data/scripts/handlers/voicedcommandhandlers/Wedding.java b/datapack_development/data/scripts/handlers/voicedcommandhandlers/Wedding.java
index ce0382b7bfb5dc0d1f2b353b91273e3a6351bae0..2211daf75e5663927406658cee807d7bef1d9b50 100644
--- a/datapack_development/data/scripts/handlers/voicedcommandhandlers/Wedding.java
+++ b/datapack_development/data/scripts/handlers/voicedcommandhandlers/Wedding.java
@@ -266,6 +266,11 @@ public class Wedding implements IVoicedCommandHandler
activeChar.sendMessage("You are inside a Boss Zone.");
return false;
}
+ if (activeChar.isCombatFlagEquipped())
+ {
+ activeChar.sendMessage("While you are holding a Combat Flag or Territory Ward you can't go to your love!");
+ return false;
+ }
L2PcInstance partner;
partner = (L2PcInstance) L2World.getInstance().findObject(activeChar.getPartnerId());
diff --git a/datapack_development/data/scripts/quests/TerritoryWarScripts/KillTheKeyTargets.java b/datapack_development/data/scripts/quests/TerritoryWarScripts/KillTheKeyTargets.java
new file mode 100644
index 0000000000000000000000000000000000000000..751c24fc16ae1ef0eaf311afeb7eaf30c19950fc
--- /dev/null
+++ b/datapack_development/data/scripts/quests/TerritoryWarScripts/KillTheKeyTargets.java
@@ -0,0 +1,38 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.TerritoryWarScripts;
+
+
+/**
+*
+* @author Gigiikun
+*/
+
+public class KillTheKeyTargets extends TerritoryWarSuperClass
+{
+ public static String qn1 = "738_DestroyKeyTargets";
+ public static int qnu = 738;
+ public static String qna = "Destroy Key Targets";
+
+ public KillTheKeyTargets()
+ {
+ super(qnu,qn1,qna);
+ CLASS_IDS = new int[]{13, 21, 34, 51, 57, 95, 100, 107, 115, 118, 135, 136};
+ qn = qn1;
+ RANDOM_MIN = 3;
+ RANDOM_MAX = 8;
+ Text = new String[]{"Out of MAX Production and Curse you have defeated KILL.","You weakened the enemy's attack!"};
+ }
+}
diff --git a/datapack_development/data/scripts/quests/TerritoryWarScripts/KillTheKnights.java b/datapack_development/data/scripts/quests/TerritoryWarScripts/KillTheKnights.java
new file mode 100644
index 0000000000000000000000000000000000000000..027c2b5d38312cddd5767369abbb23a21bfd2eb1
--- /dev/null
+++ b/datapack_development/data/scripts/quests/TerritoryWarScripts/KillTheKnights.java
@@ -0,0 +1,38 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.TerritoryWarScripts;
+
+
+/**
+*
+* @author Gigiikun
+*/
+
+public class KillTheKnights extends TerritoryWarSuperClass
+{
+ public static String qn1 = "734_Piercethroughashield";
+ public static int qnu = 734;
+ public static String qna = "Pierce through a shield";
+
+ public KillTheKnights()
+ {
+ super(qnu,qn1,qna);
+ CLASS_IDS = new int[]{5, 6, 20, 33, 90, 91, 99, 106};
+ qn = qn1;
+ RANDOM_MIN = 10;
+ RANDOM_MAX = 15;
+ Text = new String[]{"Out of MAX Knights you have defeated KILL.","You weakened the enemy's attack!"};
+ }
+}
diff --git a/datapack_development/data/scripts/quests/TerritoryWarScripts/KillThePriests.java b/datapack_development/data/scripts/quests/TerritoryWarScripts/KillThePriests.java
new file mode 100644
index 0000000000000000000000000000000000000000..d4791c2bf3bf8251842e76fd6d9a147d32289775
--- /dev/null
+++ b/datapack_development/data/scripts/quests/TerritoryWarScripts/KillThePriests.java
@@ -0,0 +1,38 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.TerritoryWarScripts;
+
+
+/**
+*
+* @author Gigiikun
+*/
+
+public class KillThePriests extends TerritoryWarSuperClass
+{
+ public static String qn1 = "737_DenyBlessings";
+ public static int qnu = 737;
+ public static String qna = "Deny Blessings";
+
+ public KillThePriests()
+ {
+ super(qnu,qn1,qna);
+ CLASS_IDS = new int[]{16, 17, 30, 43, 52, 97, 98, 105, 112, 116};
+ qn = qn1;
+ RANDOM_MIN = 3;
+ RANDOM_MAX = 8;
+ Text = new String[]{"Out of MAX Priests you have defeated KILL.","You weakened the enemy's attack!"};
+ }
+}
diff --git a/datapack_development/data/scripts/quests/TerritoryWarScripts/KillTheWarriors.java b/datapack_development/data/scripts/quests/TerritoryWarScripts/KillTheWarriors.java
new file mode 100644
index 0000000000000000000000000000000000000000..919a88afedd78441a194b7773223c37ba71ec058
--- /dev/null
+++ b/datapack_development/data/scripts/quests/TerritoryWarScripts/KillTheWarriors.java
@@ -0,0 +1,38 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.TerritoryWarScripts;
+
+
+/**
+*
+* @author Gigiikun
+*/
+
+public class KillTheWarriors extends TerritoryWarSuperClass
+{
+ public static String qn1 = "735_Makespearsdull";
+ public static int qnu = 735;
+ public static String qna = "Make spears dull";
+
+ public KillTheWarriors()
+ {
+ super(qnu,qn1,qna);
+ CLASS_IDS = new int[]{2, 3, 8, 9, 23, 24, 36, 37, 46, 48, 55, 88, 89, 92, 93, 101, 102, 108, 109, 113, 114, 117, 127, 128, 129, 130, 131, 132, 133, 134};
+ qn = qn1;
+ RANDOM_MIN = 15;
+ RANDOM_MAX = 20;
+ Text = new String[]{"Out of MAX Warriors and Rogues you have defeated KILL.","You weakened the enemy's attack!"};
+ }
+}
diff --git a/datapack_development/data/scripts/quests/TerritoryWarScripts/KillTheWizards.java b/datapack_development/data/scripts/quests/TerritoryWarScripts/KillTheWizards.java
new file mode 100644
index 0000000000000000000000000000000000000000..a8ed2c6e4f1d39c321f9765a0136e117367f16d8
--- /dev/null
+++ b/datapack_development/data/scripts/quests/TerritoryWarScripts/KillTheWizards.java
@@ -0,0 +1,38 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.TerritoryWarScripts;
+
+
+/**
+*
+* @author Gigiikun
+*/
+
+public class KillTheWizards extends TerritoryWarSuperClass
+{
+ public static String qn1 = "736_Weakenmagic";
+ public static int qnu = 736;
+ public static String qna = "Weaken magic";
+
+ public KillTheWizards()
+ {
+ super(qnu,qn1,qna);
+ CLASS_IDS = new int[]{12, 14, 27, 28, 40, 41, 94, 96, 103, 104, 110, 111};
+ qn = qn1;
+ RANDOM_MIN = 10;
+ RANDOM_MAX = 15;
+ Text = new String[]{"Out of MAX Wizards and Summoners you have defeated KILL.","You weakened the enemy's attack!"};
+ }
+}
diff --git a/datapack_development/data/scripts/quests/TerritoryWarScripts/ProtectTheCatapult.java b/datapack_development/data/scripts/quests/TerritoryWarScripts/ProtectTheCatapult.java
new file mode 100644
index 0000000000000000000000000000000000000000..28c262464e662e5fbacdbdc6fe128475d0fad53e
--- /dev/null
+++ b/datapack_development/data/scripts/quests/TerritoryWarScripts/ProtectTheCatapult.java
@@ -0,0 +1,42 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.TerritoryWarScripts;
+
+
+/**
+*
+* @author Gigiikun
+*/
+
+public class ProtectTheCatapult extends TerritoryWarSuperClass
+{
+ public static String qn1 = "729_Protecttheterritorycatapult";
+ public static int qnu = 729;
+ public static String qna = "Protect the territory catapult";
+
+ public ProtectTheCatapult()
+ {
+ super(qnu,qn1,qna);
+ NPC_IDS = new int[]{36499,36500,36501,36502,36503,36504,36505,36506,36507};
+ qn = qn1;
+ registerAttackIds();
+ }
+
+ @Override
+ public int getTerritoryIdForThisNPCId(int npcid)
+ {
+ return npcid - 36418;
+ }
+}
diff --git a/datapack_development/data/scripts/quests/TerritoryWarScripts/ProtectTheEconomic.java b/datapack_development/data/scripts/quests/TerritoryWarScripts/ProtectTheEconomic.java
new file mode 100644
index 0000000000000000000000000000000000000000..ef541058330384b9e82b1ec5c4839fba7ea2096b
--- /dev/null
+++ b/datapack_development/data/scripts/quests/TerritoryWarScripts/ProtectTheEconomic.java
@@ -0,0 +1,42 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.TerritoryWarScripts;
+
+
+/**
+*
+* @author Gigiikun
+*/
+
+public class ProtectTheEconomic extends TerritoryWarSuperClass
+{
+ public static String qn1 = "733_ProtecttheEconomicAssociationLeader";
+ public static int qnu = 733;
+ public static String qna = "Protect the Economic Association Leader";
+
+ public ProtectTheEconomic()
+ {
+ super(qnu,qn1,qna);
+ NPC_IDS = new int[]{36513,36519,36525,36531,36537,36543,36549,36555,36561};
+ qn = qn1;
+ registerAttackIds();
+ }
+
+ @Override
+ public int getTerritoryIdForThisNPCId(int npcid)
+ {
+ return 81 + (npcid - 36513) / 6;
+ }
+}
diff --git a/datapack_development/data/scripts/quests/TerritoryWarScripts/ProtectTheMilitary.java b/datapack_development/data/scripts/quests/TerritoryWarScripts/ProtectTheMilitary.java
new file mode 100644
index 0000000000000000000000000000000000000000..5f025ae2fcb8cb11a640f115d7f1ef94928e37b4
--- /dev/null
+++ b/datapack_development/data/scripts/quests/TerritoryWarScripts/ProtectTheMilitary.java
@@ -0,0 +1,42 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.TerritoryWarScripts;
+
+
+/**
+*
+* @author Gigiikun
+*/
+
+public class ProtectTheMilitary extends TerritoryWarSuperClass
+{
+ public static String qn1 = "731_ProtecttheMilitaryAssociationLeader";
+ public static int qnu = 731;
+ public static String qna = "Protect the Military Association Leader";
+
+ public ProtectTheMilitary()
+ {
+ super(qnu,qn1,qna);
+ NPC_IDS = new int[]{36508,36514,36520,36526,36532,36538,36544,36550,36556};
+ qn = qn1;
+ registerAttackIds();
+ }
+
+ @Override
+ public int getTerritoryIdForThisNPCId(int npcid)
+ {
+ return 81 + (npcid - 36508) / 6;
+ }
+}
diff --git a/datapack_development/data/scripts/quests/TerritoryWarScripts/ProtectTheReligious.java b/datapack_development/data/scripts/quests/TerritoryWarScripts/ProtectTheReligious.java
new file mode 100644
index 0000000000000000000000000000000000000000..9e72143d2182530c65af7792c1ab583e3f9b5b0c
--- /dev/null
+++ b/datapack_development/data/scripts/quests/TerritoryWarScripts/ProtectTheReligious.java
@@ -0,0 +1,42 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.TerritoryWarScripts;
+
+
+/**
+*
+* @author Gigiikun
+*/
+
+public class ProtectTheReligious extends TerritoryWarSuperClass
+{
+ public static String qn1 = "732_ProtecttheReligiousAssociationLeader";
+ public static int qnu = 732;
+ public static String qna = "Protect the Religious Association Leader";
+
+ public ProtectTheReligious()
+ {
+ super(qnu,qn1,qna);
+ NPC_IDS = new int[]{36510,36516,36522,36528,36534,36540,36546,36552,36558};
+ qn = qn1;
+ registerAttackIds();
+ }
+
+ @Override
+ public int getTerritoryIdForThisNPCId(int npcid)
+ {
+ return 81 + (npcid - 36510) / 6;
+ }
+}
diff --git a/datapack_development/data/scripts/quests/TerritoryWarScripts/ProtectTheSupplies.java b/datapack_development/data/scripts/quests/TerritoryWarScripts/ProtectTheSupplies.java
new file mode 100644
index 0000000000000000000000000000000000000000..bcb3aedae32154e677171c866981efbe2b0b3721
--- /dev/null
+++ b/datapack_development/data/scripts/quests/TerritoryWarScripts/ProtectTheSupplies.java
@@ -0,0 +1,42 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.TerritoryWarScripts;
+
+
+/**
+*
+* @author Gigiikun
+*/
+
+public class ProtectTheSupplies extends TerritoryWarSuperClass
+{
+ public static String qn1 = "730_ProtecttheSuppliesSafe.";
+ public static int qnu = 730;
+ public static String qna = "Protect the Supplies Safe";
+
+ public ProtectTheSupplies()
+ {
+ super(qnu,qn1,qna);
+ NPC_IDS = new int[]{36591,36592,36593,36594,36595,36596,36597,36598,36599};
+ qn = qn1;
+ registerAttackIds();
+ }
+
+ @Override
+ public int getTerritoryIdForThisNPCId(int npcid)
+ {
+ return npcid - 36510;
+ }
+}
diff --git a/datapack_development/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java b/datapack_development/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java
new file mode 100644
index 0000000000000000000000000000000000000000..7d8d32a13db214c9be68f43a2eed14ff05688150
--- /dev/null
+++ b/datapack_development/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java
@@ -0,0 +1,477 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.TerritoryWarScripts;
+
+import java.util.Calendar;
+import java.util.StringTokenizer;
+
+import com.l2jserver.gameserver.SevenSigns;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager.TerritoryNPCSpawn;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2Skill;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.TerritoryWard;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.quest.State;
+import com.l2jserver.gameserver.network.serverpackets.ExShowScreenMessage;
+import com.l2jserver.gameserver.util.Util;
+import com.l2jserver.util.L2FastMap;
+import com.l2jserver.util.Rnd;
+
+public class TerritoryWarSuperClass extends Quest
+{
+ private static L2FastMap<Integer, TerritoryWarSuperClass> _forTheSakeScripts = new L2FastMap<Integer, TerritoryWarSuperClass>();
+ private static L2FastMap<Integer, TerritoryWarSuperClass> _protectTheScripts = new L2FastMap<Integer, TerritoryWarSuperClass>();
+ private static L2FastMap<Integer, TerritoryWarSuperClass> _killTheScripts = new L2FastMap<Integer, TerritoryWarSuperClass>();
+
+ public static String qn = "TerritoryWarSuperClass";
+
+ // "For the Sake of the Territory ..." quests variables
+ public int CATAPULT_ID;
+ public int TERRITORY_ID;
+ public int[] LEADER_IDS;
+ public int[] GUARD_IDS;
+ public String[] Text = {};
+ // "Protect the ..." quests variables
+ public int[] NPC_IDS;
+ // "Kill The ..."
+ public int[] CLASS_IDS;
+ public int RANDOM_MIN;
+ public int RANDOM_MAX;
+
+ public static boolean contains(int[] array, int obj)
+ {
+ for (int i = 0; i < array.length; i++)
+ {
+ if (array[i] == obj)
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ // Used to register NPCs "For the Sake of the Territory ..." quests
+ public void registerKillIds()
+ {
+ addKillId(CATAPULT_ID);
+ for (int mobid : LEADER_IDS)
+ addKillId(mobid);
+ for (int mobid : GUARD_IDS)
+ addKillId(mobid);
+ }
+
+ // Used to register NPCs "Protect the ..." quests
+ public void registerAttackIds()
+ {
+ for (int mobid : NPC_IDS)
+ addAttackId(mobid);
+ }
+
+ public String onSkillSee(L2Npc npc, L2PcInstance caster, L2Skill skill, L2Object[] targets, boolean isPet)
+ {
+ if (targets[0] == npc)
+ {
+ if (skill.getId() == 845)
+ {
+ if (TerritoryWarManager.getInstance().getHQForClan(caster.getClan()) != npc)
+ {
+ return super.onSkillSee(npc, caster, skill, targets, isPet);
+ }
+ npc.deleteMe();
+ TerritoryWarManager.getInstance().setHQForClan(caster.getClan(), null);
+ }
+ else if (skill.getId() == 847)
+ {
+ if (TerritoryWarManager.getInstance().getHQForTerritory(caster.getSiegeSide()) != npc)
+ {
+ return super.onSkillSee(npc, caster, skill, targets, isPet);
+ }
+ TerritoryWard ward = TerritoryWarManager.getInstance().getTerritoryWard(caster);
+ if (ward == null)
+ return super.onSkillSee(npc, caster, skill, targets, isPet);
+ if ((caster.getSiegeSide() - 80) == ward.getOwnerCastleId())
+ {
+ for(TerritoryNPCSpawn wardSpawn : TerritoryWarManager.getInstance().getTerritory(ward.getOwnerCastleId()).getOwnedWard())
+ if (wardSpawn.getNpcId() == ward.getTerritoryId())
+ {
+ wardSpawn.setNPC(wardSpawn.getNpc().getSpawn().doSpawn());
+ ward.unSpawnMe();
+ ward.setNpc(wardSpawn.getNpc());
+ }
+ }
+ else
+ {
+ ward.unSpawnMe();
+ ward.setNpc(TerritoryWarManager.getInstance().addTerritoryWard(ward.getTerritoryId(), caster.getSiegeSide() - 80, ward.getOwnerCastleId()));
+ ward.setOwnerCastleId(caster.getSiegeSide() - 80);
+ TerritoryWarManager.getInstance().getTerritory(caster.getSiegeSide() - 80).getQuestDone()[1]++;
+ }
+ }
+ }
+ return super.onSkillSee(npc, caster, skill, targets, isPet);
+ }
+
+ public int getTerritoryIdForThisNPCId(int npcid)
+ {
+ return 0;
+ }
+
+ @Override
+ public String onAttack(L2Npc npc,L2PcInstance player, int damage, boolean isPet)
+ {
+ if (npc.getCurrentHp() == npc.getMaxHp() && contains(NPC_IDS, npc.getNpcId()))
+ {
+ int territoryId = getTerritoryIdForThisNPCId(npc.getNpcId());
+ if (territoryId >= 81 && territoryId <= 89)
+ for(L2PcInstance pl : L2World.getInstance().getAllPlayers().values())
+ if (pl.getSiegeSide() == territoryId)
+ {
+ QuestState st = pl.getQuestState(getName());
+ if (st == null)
+ st = newQuestState(pl);
+ if (st.getState() != State.STARTED)
+ {
+ st.set("cond","1");
+ st.setStateAndNotSave(State.STARTED);
+ }
+ }
+ }
+ return super.onAttack(npc, player, damage, isPet);
+ }
+
+ @Override
+ public String onKill (L2Npc npc, L2PcInstance killer, boolean isPet)
+ {
+ if (npc.getNpcId() == CATAPULT_ID)
+ {
+ TerritoryWarManager.getInstance().territoryCatapultDestroyed(TERRITORY_ID - 80);
+ TerritoryWarManager.getInstance().giveTWPoint(killer, TERRITORY_ID, 4);
+ TerritoryWarManager.getInstance().announceToParticipants(new ExShowScreenMessage(Text[0],10000), 135000, 13500);
+ }
+ else if (contains(LEADER_IDS, npc.getNpcId()))
+ TerritoryWarManager.getInstance().giveTWPoint(killer, TERRITORY_ID, 3);
+
+ if (killer.getSiegeSide() != TERRITORY_ID
+ && TerritoryWarManager.getInstance().getTerritory(killer.getSiegeSide() - 80) != null)
+ TerritoryWarManager.getInstance().getTerritory(killer.getSiegeSide() - 80).getQuestDone()[0]++;
+ return super.onKill(npc,killer,isPet);
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ if (npc != null || player != null)
+ return null;
+ StringTokenizer st = new StringTokenizer(event, " ");
+ event = st.nextToken(); // Get actual command
+ if (event.equalsIgnoreCase("setNextTWDate"))
+ {
+ Calendar startTWDate = Calendar.getInstance();
+ startTWDate.set(Calendar.DAY_OF_WEEK, Calendar.SATURDAY);
+ startTWDate.set(Calendar.HOUR_OF_DAY, 20);
+ startTWDate.set(Calendar.MINUTE, 0);
+ startTWDate.set(Calendar.SECOND, 0);
+ if (startTWDate.getTimeInMillis() < System.currentTimeMillis())
+ startTWDate.add(Calendar.DAY_OF_MONTH, 7);
+ if (!SevenSigns.getInstance().isDateInSealValidPeriod(startTWDate))
+ startTWDate.add(Calendar.DAY_OF_MONTH, 7);
+ saveGlobalQuestVar("nextTWStartDate", String.valueOf(startTWDate.getTimeInMillis()));
+ TerritoryWarManager.getInstance().setTWStartTimeInMillis(startTWDate.getTimeInMillis());
+ _log.info("Next TerritoryWarTime: " + startTWDate.getTime());
+ }
+ else if (event.equalsIgnoreCase("setTWDate") && st.hasMoreTokens())
+ {
+ Calendar startTWDate = Calendar.getInstance();
+ startTWDate.setTimeInMillis(Long.parseLong(st.nextToken()));
+ saveGlobalQuestVar("nextTWStartDate", String.valueOf(startTWDate.getTimeInMillis()));
+ TerritoryWarManager.getInstance().setTWStartTimeInMillis(startTWDate.getTimeInMillis());
+ }
+ return null;
+ }
+
+ private void handleKillTheQuest(L2PcInstance player)
+ {
+ QuestState st = player.getQuestState(getName());
+ int kill = 1;
+ int max = 10;
+ if (st == null)
+ st = newQuestState(player);
+ if (st.getState() != State.COMPLETED)
+ {
+ if (st.getState() != State.STARTED)
+ {
+ st.setState(State.STARTED);
+ st.set("cond","1");
+ st.set("kill", "1");
+ max = Rnd.get(RANDOM_MIN, RANDOM_MAX);
+ st.set("max", String.valueOf(max));
+ }
+ else
+ {
+ kill = st.getInt("kill") + 1;
+ max = st.getInt("max");
+ }
+ if (kill >= max)
+ {
+ TerritoryWarManager.getInstance().giveTWQuestPoint(player);
+ st.addExpAndSp(534000, 51000);
+ st.set("doneDate", String.valueOf(Calendar.getInstance().get(Calendar.DAY_OF_YEAR)));
+ st.setState(State.COMPLETED);
+ st.exitQuest(true);
+ player.sendPacket(new ExShowScreenMessage(Text[1],10000));
+ }
+ else
+ {
+ st.set("kill", String.valueOf(kill));
+ player.sendPacket(new ExShowScreenMessage(Text[0].replace("MAX", String.valueOf(max)).replace("KILL", String.valueOf(kill)),10000));
+ }
+ }
+ else if (st.getInt("doneDate") != Calendar.getInstance().get(Calendar.DAY_OF_YEAR))
+ {
+ st.setState(State.STARTED);
+ st.set("cond","1");
+ st.set("kill", "1");
+ max = Rnd.get(RANDOM_MIN, RANDOM_MAX);
+ st.set("max", String.valueOf(max));
+ player.sendPacket(new ExShowScreenMessage(Text[0].replace("MAX", String.valueOf(max)).replace("KILL", String.valueOf(kill)),10000));
+ }
+ else if (player.isGM())
+ {
+ // just for test
+ player.sendMessage("Cleaning " + getName() + " Territory War quest by force!");
+ st.setState(State.STARTED);
+ st.set("cond","1");
+ st.set("kill", "1");
+ max = Rnd.get(RANDOM_MIN, RANDOM_MAX);
+ st.set("max", String.valueOf(max));
+ player.sendPacket(new ExShowScreenMessage(Text[0].replace("MAX", String.valueOf(max)).replace("KILL", String.valueOf(kill)),10000));
+ }
+ }
+
+ @Override
+ public String onDeath(L2Character killer, L2Character victim, QuestState qs)
+ {
+ if (killer == victim || !(victim instanceof L2PcInstance) || victim.getLevel() < 61)
+ return "";
+ L2PcInstance actingPlayer = killer.getActingPlayer();
+ if (actingPlayer != null && qs.getPlayer() != null)
+ {
+ if (actingPlayer.getParty() != null)
+ for(L2PcInstance pl : actingPlayer.getParty().getPartyMembers())
+ {
+ if (pl.getSiegeSide() == qs.getPlayer().getSiegeSide() || pl.getSiegeSide() == 0 || !Util.checkIfInRange(2000, killer, pl, false))
+ continue;
+ handleKillTheQuest(pl);
+ }
+ else if (actingPlayer.getSiegeSide() != qs.getPlayer().getSiegeSide() && actingPlayer.getSiegeSide() > 0)
+ handleKillTheQuest(actingPlayer);
+ TerritoryWarManager.getInstance().giveTWPoint(actingPlayer, qs.getPlayer().getSiegeSide(), 1);
+ }
+ return "";
+ }
+
+ @Override
+ public String onEnterWorld(L2PcInstance player)
+ {
+ int territoryId = TerritoryWarManager.getInstance().getRegisteredTerritoryId(player);
+ if (territoryId > 0)
+ {
+ // register Territory Quest
+ TerritoryWarSuperClass territoryQuest = _forTheSakeScripts.get(territoryId);
+ QuestState st = player.getQuestState(territoryQuest.getName());
+ if (st == null)
+ st = territoryQuest.newQuestState(player);
+ st.set("cond","1");
+ st.setStateAndNotSave(State.STARTED);
+
+ // register player on Death
+ if (player.getLevel() >= 61)
+ {
+ TerritoryWarSuperClass killthe = _killTheScripts.get(player.getClassId().getId());
+ if (killthe != null)
+ {
+ st = player.getQuestState(killthe.getName());
+ if (st == null)
+ st = killthe.newQuestState(player);
+ player.addNotifyQuestOfDeath(st);
+ }
+ else
+ _log.warning("TerritoryWar: Missing Kill the quest for player " + player.getName() + " whose class id: " + player.getClassId().getId());
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public void setOnEnterWorld(boolean val)
+ {
+ super.setOnEnterWorld(val);
+
+ for(L2PcInstance player: L2World.getInstance().getAllPlayers().values())
+ if (player.getSiegeSide() > 0)
+ {
+ TerritoryWarSuperClass territoryQuest = _forTheSakeScripts.get(player.getSiegeSide());
+ if (territoryQuest == null)
+ continue;
+ QuestState st = player.getQuestState(territoryQuest.getName());
+ if (st == null)
+ st = territoryQuest.newQuestState(player);
+ if (val)
+ {
+ st.set("cond","1");
+ st.setStateAndNotSave(State.STARTED);
+ // register player on Death
+ if (player.getLevel() >= 61)
+ {
+ TerritoryWarSuperClass killthe = _killTheScripts.get(player.getClassId().getId());
+ if (killthe != null)
+ {
+ st = player.getQuestState(killthe.getName());
+ if (st == null)
+ st = killthe.newQuestState(player);
+ player.addNotifyQuestOfDeath(st);
+ }
+ else
+ _log.warning("TerritoryWar: Missing Kill the quest for player " + player.getName() + " whose class id: " + player.getClassId().getId());
+ }
+ }
+ else
+ {
+ st.setStateAndNotSave(State.COMPLETED);
+ st.exitQuest(false);
+ for(Quest q : _protectTheScripts.values())
+ if (player.getQuestState(q.getName()) != null)
+ {
+ player.getQuestState(q.getName()).setStateAndNotSave(State.COMPLETED);
+ player.getQuestState(q.getName()).exitQuest(false);
+ }
+ // unregister player on Death
+ TerritoryWarSuperClass killthe = _killTheScripts.get(player.getClassIndex());
+ if (killthe != null)
+ {
+ st = player.getQuestState(killthe.getName());
+ if (st != null)
+ player.removeNotifyQuestOfDeath(st);
+ }
+ }
+ }
+ }
+
+ public TerritoryWarSuperClass(int questId, String name, String descr)
+ {
+ super(questId, name, descr);
+
+ if (questId < 0)
+ {
+ // Outpost and Ward handled by the Super Class script
+ addSkillSeeId(36590);
+
+ // Calculate next TW date
+ Calendar startTWDate = Calendar.getInstance();
+ if (loadGlobalQuestVar("nextTWStartDate").equalsIgnoreCase(""))
+ {
+ startTWDate.set(Calendar.DAY_OF_WEEK, Calendar.SATURDAY);
+ startTWDate.set(Calendar.HOUR_OF_DAY, 20);
+ startTWDate.set(Calendar.MINUTE, 0);
+ startTWDate.set(Calendar.SECOND, 0);
+ if (startTWDate.getTimeInMillis() < System.currentTimeMillis())
+ startTWDate.add(Calendar.DAY_OF_MONTH, 7);
+ if (!SevenSigns.getInstance().isDateInSealValidPeriod(startTWDate))
+ startTWDate.add(Calendar.DAY_OF_MONTH, 7);
+ saveGlobalQuestVar("nextTWStartDate", String.valueOf(startTWDate.getTimeInMillis()));
+ }
+ else
+ {
+ startTWDate.setTimeInMillis(Long.parseLong(loadGlobalQuestVar("nextTWStartDate")));
+ if (startTWDate.getTimeInMillis() < System.currentTimeMillis()
+ && SevenSigns.getInstance().isSealValidationPeriod()
+ && SevenSigns.getInstance().getMilliToPeriodChange() > 172800000)
+ {
+ startTWDate.set(Calendar.DAY_OF_WEEK, Calendar.SATURDAY);
+ startTWDate.set(Calendar.HOUR_OF_DAY, 20);
+ startTWDate.set(Calendar.MINUTE, 0);
+ startTWDate.set(Calendar.SECOND, 0);
+ if (startTWDate.getTimeInMillis() < System.currentTimeMillis())
+ startTWDate.add(Calendar.DAY_OF_MONTH, 7);
+ if (!SevenSigns.getInstance().isDateInSealValidPeriod(startTWDate))
+ startTWDate.add(Calendar.DAY_OF_MONTH, 7);
+ saveGlobalQuestVar("nextTWStartDate", String.valueOf(startTWDate.getTimeInMillis()));
+ }
+ }
+ TerritoryWarManager.getInstance().setTWStartTimeInMillis(startTWDate.getTimeInMillis());
+ _log.info("Next TerritoryWarTime: " + startTWDate.getTime());
+ }
+ }
+
+ public static void main(String[] args)
+ {
+ // initialize superclass
+ new TerritoryWarSuperClass(-1,qn,"Territory_War");
+
+ // initialize subclasses
+ // "For The Sake" quests
+ TerritoryWarSuperClass gludio = new TheTerritoryGludio();
+ _forTheSakeScripts.put(gludio.TERRITORY_ID, gludio);
+ TerritoryWarSuperClass dion = new TheTerritoryDion();
+ _forTheSakeScripts.put(dion.TERRITORY_ID, dion);
+ TerritoryWarSuperClass giran = new TheTerritoryGiran();
+ _forTheSakeScripts.put(giran.TERRITORY_ID, giran);
+ TerritoryWarSuperClass oren = new TheTerritoryOren();
+ _forTheSakeScripts.put(oren.TERRITORY_ID, oren);
+ TerritoryWarSuperClass aden = new TheTerritoryAden();
+ _forTheSakeScripts.put(aden.TERRITORY_ID, aden);
+ TerritoryWarSuperClass innadril = new TheTerritoryInnadril();
+ _forTheSakeScripts.put(innadril.TERRITORY_ID, innadril);
+ TerritoryWarSuperClass goddard = new TheTerritoryGoddard();
+ _forTheSakeScripts.put(goddard.TERRITORY_ID, goddard);
+ TerritoryWarSuperClass rune = new TheTerritoryRune();
+ _forTheSakeScripts.put(rune.TERRITORY_ID, rune);
+ TerritoryWarSuperClass schuttgart = new TheTerritorySchuttgart();
+ _forTheSakeScripts.put(schuttgart.TERRITORY_ID, schuttgart);
+ // "Protect the" quests
+ TerritoryWarSuperClass catapult = new ProtectTheCatapult();
+ _protectTheScripts.put(catapult.getQuestIntId(), catapult);
+ TerritoryWarSuperClass military = new ProtectTheMilitary();
+ _protectTheScripts.put(military.getQuestIntId(), military);
+ TerritoryWarSuperClass religious = new ProtectTheReligious();
+ _protectTheScripts.put(religious.getQuestIntId(), religious);
+ TerritoryWarSuperClass supplies = new ProtectTheSupplies();
+ _protectTheScripts.put(supplies.getQuestIntId(), supplies);
+ TerritoryWarSuperClass economic = new ProtectTheEconomic();
+ _protectTheScripts.put(economic.getQuestIntId(), economic);
+ // "Kill the" quests
+ TerritoryWarSuperClass knights = new KillTheKnights();
+ for (int i : knights.CLASS_IDS)
+ _killTheScripts.put(i, knights);
+ TerritoryWarSuperClass warriors = new KillTheWarriors();
+ for (int i : warriors.CLASS_IDS)
+ _killTheScripts.put(i, warriors);
+ TerritoryWarSuperClass wizards = new KillTheWizards();
+ for (int i : wizards.CLASS_IDS)
+ _killTheScripts.put(i, wizards);
+ TerritoryWarSuperClass priests = new KillThePriests();
+ for (int i : priests.CLASS_IDS)
+ _killTheScripts.put(i, priests);
+ TerritoryWarSuperClass keys = new KillTheKeyTargets();
+ for (int i : keys.CLASS_IDS)
+ _killTheScripts.put(i, keys);
+ }
+}
diff --git a/datapack_development/data/scripts/quests/TerritoryWarScripts/TheTerritoryAden.java b/datapack_development/data/scripts/quests/TerritoryWarScripts/TheTerritoryAden.java
new file mode 100644
index 0000000000000000000000000000000000000000..3ae37bad2a45094206145938978bbbd2caf6e966
--- /dev/null
+++ b/datapack_development/data/scripts/quests/TerritoryWarScripts/TheTerritoryAden.java
@@ -0,0 +1,40 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.TerritoryWarScripts;
+
+
+/**
+*
+* @author Gigiikun
+*/
+
+public class TheTerritoryAden extends TerritoryWarSuperClass
+{
+ public static String qn1 = "721_FortheSakeoftheTerritoryAden";
+ public static int qnu = 721;
+ public static String qna = "For the Sake of the Territory - Aden";
+
+ public TheTerritoryAden()
+ {
+ super(qnu,qn1,qna);
+ CATAPULT_ID = 36503;
+ TERRITORY_ID = 85;
+ LEADER_IDS = new int[]{36532, 36534, 36537, 36595};
+ GUARD_IDS = new int[]{36533, 36535, 36536};
+ qn = qn1;
+ Text = new String[]{"The catapult of Aden has been destroyed!"};
+ registerKillIds();
+ }
+}
diff --git a/datapack_development/data/scripts/quests/TerritoryWarScripts/TheTerritoryDion.java b/datapack_development/data/scripts/quests/TerritoryWarScripts/TheTerritoryDion.java
new file mode 100644
index 0000000000000000000000000000000000000000..4638a210e2f714e9cf68b5a849214d46a20996d5
--- /dev/null
+++ b/datapack_development/data/scripts/quests/TerritoryWarScripts/TheTerritoryDion.java
@@ -0,0 +1,40 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.TerritoryWarScripts;
+
+
+/**
+*
+* @author Gigiikun
+*/
+
+public class TheTerritoryDion extends TerritoryWarSuperClass
+{
+ public static String qn1 = "718_FortheSakeoftheTerritoryDion";
+ public static int qnu = 718;
+ public static String qna = "For the Sake of the Territory - Dion";
+
+ public TheTerritoryDion()
+ {
+ super(qnu,qn1,qna);
+ CATAPULT_ID = 36500;
+ TERRITORY_ID = 82;
+ LEADER_IDS = new int[]{36514, 36516, 36519, 36592};
+ GUARD_IDS = new int[]{36515, 36517, 36518};
+ qn = qn1;
+ Text = new String[]{"The catapult of Dion has been destroyed!"};
+ registerKillIds();
+ }
+}
diff --git a/datapack_development/data/scripts/quests/TerritoryWarScripts/TheTerritoryGiran.java b/datapack_development/data/scripts/quests/TerritoryWarScripts/TheTerritoryGiran.java
new file mode 100644
index 0000000000000000000000000000000000000000..1b8742a9bce153bc78baa28d5a28c48c781776b3
--- /dev/null
+++ b/datapack_development/data/scripts/quests/TerritoryWarScripts/TheTerritoryGiran.java
@@ -0,0 +1,40 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.TerritoryWarScripts;
+
+
+/**
+*
+* @author Gigiikun
+*/
+
+public class TheTerritoryGiran extends TerritoryWarSuperClass
+{
+ public static String qn1 = "719_FortheSakeoftheTerritoryGiran";
+ public static int qnu = 719;
+ public static String qna = "For the Sake of the Territory - Giran";
+
+ public TheTerritoryGiran()
+ {
+ super(qnu,qn1,qna);
+ CATAPULT_ID = 36501;
+ TERRITORY_ID = 83;
+ LEADER_IDS = new int[]{36520, 36522, 36525, 36593};
+ GUARD_IDS = new int[]{36521, 36523, 36524};
+ qn = qn1;
+ Text = new String[]{"The catapult of Giran has been destroyed!"};
+ registerKillIds();
+ }
+}
diff --git a/datapack_development/data/scripts/quests/TerritoryWarScripts/TheTerritoryGludio.java b/datapack_development/data/scripts/quests/TerritoryWarScripts/TheTerritoryGludio.java
new file mode 100644
index 0000000000000000000000000000000000000000..5d9921a720da797bd1ffb38c29c85607f4587a4c
--- /dev/null
+++ b/datapack_development/data/scripts/quests/TerritoryWarScripts/TheTerritoryGludio.java
@@ -0,0 +1,40 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.TerritoryWarScripts;
+
+
+/**
+*
+* @author Gigiikun
+*/
+
+public class TheTerritoryGludio extends TerritoryWarSuperClass
+{
+ public static String qn1 = "717_FortheSakeoftheTerritoryGludio";
+ public static int qnu = 717;
+ public static String qna = "For the Sake of the Territory - Gludio";
+
+ public TheTerritoryGludio()
+ {
+ super(qnu,qn1,qna);
+ CATAPULT_ID = 36499;
+ TERRITORY_ID = 81;
+ LEADER_IDS = new int[]{36508, 36510, 36513, 36591};
+ GUARD_IDS = new int[]{36509, 36511, 36512};
+ qn = qn1;
+ Text = new String[]{"The catapult of Gludio has been destroyed!"};
+ registerKillIds();
+ }
+}
diff --git a/datapack_development/data/scripts/quests/TerritoryWarScripts/TheTerritoryGoddard.java b/datapack_development/data/scripts/quests/TerritoryWarScripts/TheTerritoryGoddard.java
new file mode 100644
index 0000000000000000000000000000000000000000..febe61555936a805f0da1dccf678476e3024eff4
--- /dev/null
+++ b/datapack_development/data/scripts/quests/TerritoryWarScripts/TheTerritoryGoddard.java
@@ -0,0 +1,40 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.TerritoryWarScripts;
+
+
+/**
+*
+* @author Gigiikun
+*/
+
+public class TheTerritoryGoddard extends TerritoryWarSuperClass
+{
+ public static String qn1 = "723_FortheSakeoftheTerritoryGoddard";
+ public static int qnu = 723;
+ public static String qna = "For the Sake of the Territory - Goddard";
+
+ public TheTerritoryGoddard()
+ {
+ super(qnu,qn1,qna);
+ CATAPULT_ID = 36505;
+ TERRITORY_ID = 87;
+ LEADER_IDS = new int[]{36544, 36546, 36549, 36597};
+ GUARD_IDS = new int[]{36545, 36547, 36548};
+ qn = qn1;
+ Text = new String[]{"The catapult of Goddard has been destroyed!"};
+ registerKillIds();
+ }
+}
diff --git a/datapack_development/data/scripts/quests/TerritoryWarScripts/TheTerritoryInnadril.java b/datapack_development/data/scripts/quests/TerritoryWarScripts/TheTerritoryInnadril.java
new file mode 100644
index 0000000000000000000000000000000000000000..b2135a72ed8662ab9e7c76ed3a8839acdb0b3cf9
--- /dev/null
+++ b/datapack_development/data/scripts/quests/TerritoryWarScripts/TheTerritoryInnadril.java
@@ -0,0 +1,40 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.TerritoryWarScripts;
+
+
+/**
+*
+* @author Gigiikun
+*/
+
+public class TheTerritoryInnadril extends TerritoryWarSuperClass
+{
+ public static String qn1 = "722_FortheSakeoftheTerritoryInnadril";
+ public static int qnu = 722;
+ public static String qna = "For the Sake of the Territory - Innadril";
+
+ public TheTerritoryInnadril()
+ {
+ super(qnu,qn1,qna);
+ CATAPULT_ID = 36504;
+ TERRITORY_ID = 86;
+ LEADER_IDS = new int[]{36538, 36540, 36543, 36596};
+ GUARD_IDS = new int[]{36539, 36541, 36542};
+ qn = qn1;
+ Text = new String[]{"The catapult of Innadril has been destroyed!"};
+ registerKillIds();
+ }
+}
diff --git a/datapack_development/data/scripts/quests/TerritoryWarScripts/TheTerritoryOren.java b/datapack_development/data/scripts/quests/TerritoryWarScripts/TheTerritoryOren.java
new file mode 100644
index 0000000000000000000000000000000000000000..256651206c4513460cbbdcc268a4d0eaa6973e79
--- /dev/null
+++ b/datapack_development/data/scripts/quests/TerritoryWarScripts/TheTerritoryOren.java
@@ -0,0 +1,40 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.TerritoryWarScripts;
+
+
+/**
+*
+* @author Gigiikun
+*/
+
+public class TheTerritoryOren extends TerritoryWarSuperClass
+{
+ public static String qn1 = "720_FortheSakeoftheTerritoryOren";
+ public static int qnu = 720;
+ public static String qna = "For the Sake of the Territory - Oren";
+
+ public TheTerritoryOren()
+ {
+ super(qnu,qn1,qna);
+ CATAPULT_ID = 36502;
+ TERRITORY_ID = 84;
+ LEADER_IDS = new int[]{36526, 36528, 36531, 36594};
+ GUARD_IDS = new int[]{36527, 36529, 36530};
+ qn = qn1;
+ Text = new String[]{"The catapult of Oren has been destroyed!"};
+ registerKillIds();
+ }
+}
diff --git a/datapack_development/data/scripts/quests/TerritoryWarScripts/TheTerritoryRune.java b/datapack_development/data/scripts/quests/TerritoryWarScripts/TheTerritoryRune.java
new file mode 100644
index 0000000000000000000000000000000000000000..fc73d8acd19c688d0c99742d5f5fe405fc304678
--- /dev/null
+++ b/datapack_development/data/scripts/quests/TerritoryWarScripts/TheTerritoryRune.java
@@ -0,0 +1,40 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.TerritoryWarScripts;
+
+
+/**
+*
+* @author Gigiikun
+*/
+
+public class TheTerritoryRune extends TerritoryWarSuperClass
+{
+ public static String qn1 = "724_FortheSakeoftheTerritoryRune";
+ public static int qnu = 724;
+ public static String qna = "For the Sake of the Territory - Rune";
+
+ public TheTerritoryRune()
+ {
+ super(qnu,qn1,qna);
+ CATAPULT_ID = 36506;
+ TERRITORY_ID = 88;
+ LEADER_IDS = new int[]{36550, 36552, 36555, 36598};
+ GUARD_IDS = new int[]{36551, 36553, 36554};
+ qn = qn1;
+ Text = new String[]{"The catapult of Rune has been destroyed!"};
+ registerKillIds();
+ }
+}
diff --git a/datapack_development/data/scripts/quests/TerritoryWarScripts/TheTerritorySchuttgart.java b/datapack_development/data/scripts/quests/TerritoryWarScripts/TheTerritorySchuttgart.java
new file mode 100644
index 0000000000000000000000000000000000000000..38c6c74db2902e3d77ea1f0340b22ea39ef2c0be
--- /dev/null
+++ b/datapack_development/data/scripts/quests/TerritoryWarScripts/TheTerritorySchuttgart.java
@@ -0,0 +1,40 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.TerritoryWarScripts;
+
+
+/**
+*
+* @author Gigiikun
+*/
+
+public class TheTerritorySchuttgart extends TerritoryWarSuperClass
+{
+ public static String qn1 = "725_FortheSakeoftheTerritorySchuttgart";
+ public static int qnu = 725;
+ public static String qna = "For the Sake of the Territory - Schuttgart";
+
+ public TheTerritorySchuttgart()
+ {
+ super(qnu,qn1,qna);
+ CATAPULT_ID = 36507;
+ TERRITORY_ID = 89;
+ LEADER_IDS = new int[]{36556, 36558, 36561, 36599};
+ GUARD_IDS = new int[]{36557, 36559, 36560};
+ qn = qn1;
+ Text = new String[]{"The catapult of Schuttgart has been destroyed!"};
+ registerKillIds();
+ }
+}
diff --git a/datapack_development/data/stats/skills/0800-0899.xml b/datapack_development/data/stats/skills/0800-0899.xml
index 6fe493385a373e2b18f0bd2217c87cd68ca2c457..eb671cde23490c38b6d67de83122278106a6abab 100644
--- a/datapack_development/data/stats/skills/0800-0899.xml
+++ b/datapack_development/data/stats/skills/0800-0899.xml
@@ -682,27 +682,55 @@
<set name="hitTime" val="1500" />
</skill>
<skill id="844" levels="1" name="Outpost Construction">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="mpInitialConsume" val="30" />
+ <set name="itemConsumeId" val="2132" />
+ <set name="itemConsumeCount" val="120" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="reuseDelay" val="4000" />
<set name="hitTime" val="4000" />
+ <set name="staticReuse" val="true" />
+ <set name="staticHitTime" val="true" />
+ <set name="skillType" val="SIEGEFLAG" />
+ <set name="isOutpost" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
</skill>
<skill id="845" levels="1" name="Outpost Demolition">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_ONE" />
+ <set name="skillType" val="DUMMY" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="4000" />
+ <set name="staticHitTime" val="true" />
+ <set name="reuseDelay" val="10000" />
+ <set name="staticReuse" val="true" />
+ <set name="castRange" val="100" />
+ <set name="effectRange" val="600" />
+ <cond msgId="109">
+ <target npcId="36590" />
+ </cond>
</skill>
<skill id="846" levels="1" name="Possess Ward">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
<set name="operateType" val="OP_PASSIVE" />
+ <for>
+ <mul order="0x30" stat="pAtkSpd" val="0.1" />
+ <mul order="0x30" stat="mAtkSpd" val="0.1" />
+ <mul order="0x30" stat="runSpd" val="0.5" />
+ </for>
</skill>
<skill id="847" levels="1" name="Ward Transport">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_ONE" />
+ <set name="skillType" val="DUMMY" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="180000" />
+ <set name="staticHitTime" val="true" />
+ <set name="reuseDelay" val="10000" />
+ <set name="staticReuse" val="true" />
+ <set name="castRange" val="100" />
+ <set name="effectRange" val="600" />
+ <cond msgId="109">
+ <target npcId="36590" />
+ </cond>
</skill>
<skill id="848" levels="1" name="Gludio Territory Benefaction">
<set name="target" val="TARGET_SELF" />
diff --git a/datapack_development/data/stats/skills/2600-2699.xml b/datapack_development/data/stats/skills/2600-2699.xml
index 54d61fab62c50c635fa5b3ab96fdf8254cef1819..f54b657ecebec0586fc7e56faf849ffa832349b7 100644
--- a/datapack_development/data/stats/skills/2600-2699.xml
+++ b/datapack_development/data/stats/skills/2600-2699.xml
@@ -650,171 +650,535 @@
<set name="operateType" val="OP_PASSIVE" />
</skill>
<skill id="2672" levels="1" name="Gludio Human Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="10" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="81" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2673" levels="1" name="Gludio Elf Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="11" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="81" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2674" levels="1" name="Gludio Dark Elf Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="12" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="81" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2675" levels="1" name="Gludio Orc Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="13" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="81" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2676" levels="1" name="Gludio Dwarf Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="14" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="81" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2677" levels="1" name="Gludio Kamael Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="15" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="81" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2678" levels="1" name="Gludio Royal Guard Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="16" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="81" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2679" levels="1" name="Gludio Archer Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="17" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="81" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2680" levels="1" name="Gludio Magic Leader">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="18" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="81" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2681" levels="1" name="Gludio Kamael Guard Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="19" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="81" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2682" levels="1" name="Gludio Knight of Dawn">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="20" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="81" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2683" levels="1" name="Gludio Fortress Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="21" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="81" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2684" levels="1" name="Dion Human Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="10" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="82" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2685" levels="1" name="Dion Elf Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="11" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="82" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2686" levels="1" name="Dion Dark Elf Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="12" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="82" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2687" levels="1" name="Dion Orc Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="13" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="82" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2688" levels="1" name="Dion Dwarf Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="14" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="82" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2689" levels="1" name="Dion Kamael Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="15" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="82" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2690" levels="1" name="Dion Royal Guard Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="16" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="82" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2691" levels="1" name="Dion Archer Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="17" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="82" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2692" levels="1" name="Dion Magic Leader">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="18" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="82" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2693" levels="1" name="Dion Kamael Guard Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="19" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="82" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2694" levels="1" name="Dion Knight of Dawn">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="20" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="82" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2695" levels="1" name="Dion Fortress Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="21" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="82" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2696" levels="1" name="Giran Human Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="10" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="83" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2697" levels="1" name="Giran Elf Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="11" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="83" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2698" levels="1" name="Giran Dark Elf Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="12" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="83" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2699" levels="1" name="Giran Orc Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="13" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="83" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
</list>
\ No newline at end of file
diff --git a/datapack_development/data/stats/skills/2700-2799.xml b/datapack_development/data/stats/skills/2700-2799.xml
index b011a2119298dcf5c29eb83522b9e699088c1200..dff9901fc91ea321f48c588a9710c6d083e13638 100644
--- a/datapack_development/data/stats/skills/2700-2799.xml
+++ b/datapack_development/data/stats/skills/2700-2799.xml
@@ -1,484 +1,1524 @@
<?xml version="1.0" encoding="UTF-8"?>
<list>
<skill id="2700" levels="1" name="Giran Dwarf Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="14" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="83" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2701" levels="1" name="Giran Kamael Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="15" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="83" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2702" levels="1" name="Giran Royal Guard Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="16" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="83" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2703" levels="1" name="Giran Archer Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="17" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="83" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2704" levels="1" name="Giran Magic Leader">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="18" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="83" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2705" levels="1" name="Giran Kamael Guard Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="19" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="83" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2706" levels="1" name="Giran Knight of Dawn">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="20" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="83" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2707" levels="1" name="Giran Fortress Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="21" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="83" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2708" levels="1" name="Oren Human Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="10" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="84" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2709" levels="1" name="Oren Elf Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="11" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="84" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2710" levels="1" name="Oren Dark Elf Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="12" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="84" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2711" levels="1" name="Oren Orc Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="13" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="84" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2712" levels="1" name="Oren Dwarf Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="14" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="84" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2713" levels="1" name="Oren Kamael Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="15" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="84" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2714" levels="1" name="Oren Royal Guard Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="16" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="84" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2715" levels="1" name="Oren Archer Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="17" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="84" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2716" levels="1" name="Oren Magic Leader">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="18" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="84" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2717" levels="1" name="Oren Kamael Guard Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="19" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="84" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2718" levels="1" name="Oren Knight of Dawn">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="20" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="84" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2719" levels="1" name="Oren Fortress Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="21" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="84" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2720" levels="1" name="Aden Human Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="10" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="85" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2721" levels="1" name="Aden Elf Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="11" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="85" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2722" levels="1" name="Aden Dark Elf Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="12" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="85" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2723" levels="1" name="Aden Orc Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="13" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="85" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2724" levels="1" name="Aden Dwarf Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="14" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="85" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2725" levels="1" name="Aden Kamael Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="15" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="85" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2726" levels="1" name="Aden Royal Guard Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="16" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="85" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2727" levels="1" name="Aden Archer Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="17" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="85" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2728" levels="1" name="Aden Magic Leader">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="18" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="85" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2729" levels="1" name="Aden Kamael Guard Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="19" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="85" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2730" levels="1" name="Aden Knight of Dawn">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="20" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="85" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2731" levels="1" name="Aden Fortress Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="21" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="85" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2732" levels="1" name="Innadril Human Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="10" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="86" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2733" levels="1" name="Innadril Elf Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="11" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="86" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2734" levels="1" name="Innadril Dark Elf Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="12" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="86" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2735" levels="1" name="Innadril Orc Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="13" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="86" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2736" levels="1" name="Innadril Dwarf Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="14" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="86" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2737" levels="1" name="Innadril Kamael Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="15" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="86" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2738" levels="1" name="Innadril Royal Guard Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="16" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="86" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2739" levels="1" name="Innadril Archer Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="17" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="86" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2740" levels="1" name="Innadril Magic Leader">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="18" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="86" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2741" levels="1" name="Innadril Kamael Guard Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="19" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="86" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2742" levels="1" name="Innadril Knight of Dawn">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="20" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="86" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2743" levels="1" name="Innadril Fortress Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="21" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="86" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2744" levels="1" name="Goddard Human Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="10" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="87" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2745" levels="1" name="Goddard Elf Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="11" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="87" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2746" levels="1" name="Goddard Dark Elf Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="12" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="87" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2747" levels="1" name="Goddard Orc Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="13" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="87" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2748" levels="1" name="Goddard Dwarf Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="14" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="87" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2749" levels="1" name="Goddard Kamael Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="15" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="87" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2750" levels="1" name="Goddard Royal Guard Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="16" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="87" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2751" levels="1" name="Goddard Archer Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="17" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="87" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2752" levels="1" name="Goddard Magic Leader">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="18" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="87" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2753" levels="1" name="Goddard Kamael Guard Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="19" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="87" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2754" levels="1" name="Goddard Knight of Dawn">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="20" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="87" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2755" levels="1" name="Goddard Fortress Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="21" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="87" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2756" levels="1" name="Rune Human Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="10" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="88" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2757" levels="1" name="Rune Elf Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="11" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="88" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2758" levels="1" name="Rune Dark Elf Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="12" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="88" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2759" levels="1" name="Rune Orc Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="13" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="88" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2760" levels="1" name="Rune Dwarf Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="14" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="88" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2761" levels="1" name="Rune Kamael Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="15" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="88" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2762" levels="1" name="Rune Royal Guard Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="16" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="88" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2763" levels="1" name="Rune Archer Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="17" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="88" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2764" levels="1" name="Rune Magic Leader">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="18" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="88" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2765" levels="1" name="Rune Kamael Guard Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="19" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="88" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2766" levels="1" name="Rune Knight of Dawn">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="20" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="88" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2767" levels="1" name="Rune Fortress Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="21" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="88" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2768" levels="1" name="Schuttgart Human Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="10" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="89" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2769" levels="1" name="Schuttgart Elf Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="11" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="89" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2770" levels="1" name="Schuttgart Dark Elf Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="12" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="89" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2771" levels="1" name="Schuttgart Orc Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="13" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="89" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2772" levels="1" name="Schuttgart Dwarf Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="14" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="89" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2773" levels="1" name="Schuttgart Kamael Mercenary">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="15" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="89" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2774" levels="1" name="Schuttgart Royal Guard Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="16" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="89" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2775" levels="1" name="Schuttgart Archer Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="17" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="89" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2776" levels="1" name="Schuttgart Magic Leader">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="18" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="89" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2777" levels="1" name="Schuttgart Kamael Guard Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="19" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="89" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2778" levels="1" name="Schuttgart Knight of Dawn">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="20" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="89" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2779" levels="1" name="Schuttgart Fortress Captain">
- <set name="target" val="TARGET_NONE" />
- <set name="skillType" val="NOTDONE" />
- <set name="operateType" val="OP_PASSIVE" />
+ <set name="target" val="TARGET_SELF" />
+ <set name="skillType" val="BUFF" />
+ <set name="isMagic" val="true" />
+ <set name="operateType" val="OP_ACTIVE" />
<set name="hitTime" val="2500" />
+ <set name="staticHitTime" val="true" />
+ <set name="transformId" val="21" />
+ <set name="itemConsumeCount" val="1" />
+ <cond msgId="2955">
+ <and>
+ <player siegeZone="147" />
+ <player siegeSide="89" />
+ </and>
+ </cond>
+ <for>
+ <effect name="Transformation" time="1800" val="0" /> <!-- Transformation lasts 30 minutes -->
+ </for>
</skill>
<skill id="2780" levels="1" name="Magician's Will">
<set name="itemConsumeCount" val="1" />
diff --git a/datapack_development/sql/armor.sql b/datapack_development/sql/armor.sql
index 89d1c13595d2f27adbacd57c41783efa8430ed83..8d0c6d91a3651d589eb293826a8c13d4d8387f63 100644
--- a/datapack_development/sql/armor.sql
+++ b/datapack_development/sql/armor.sql
@@ -2496,10 +2496,10 @@ INSERT INTO `armor` VALUES
(14959,'Regular Magic Ornament Mithril Belt','PVP Defense','belt','false','none',440,'wood','s',0,-1,-1,14,0,0,0,0,'true','true','true','true','true','0-0','8347-2;'),
(14960,'High-grade Magic Ornament Mithril Belt','PVP Defense','belt','false','none',440,'wood','s',0,-1,-1,14,0,0,0,0,'true','true','true','true','true','0-0','8347-3;'),
(14961,'Top-grade Magic Ornament Mithril Belt','PVP Defense','belt','false','none',440,'wood','s',0,-1,-1,14,0,0,0,0,'true','true','true','true','true','0-0','8347-4;'),
-(14962,'Gold Skeleton Circlet','','hairall','false','none',10,'wood','none',0,-1,-1,0,0,0,0,0,'false','false','true','false','false','0-0','0-0;'),
-(14963,'Silver Skeleton Circlet','','hairall','false','none',10,'wood','none',0,-1,-1,0,0,0,0,0,'false','false','true','false','false','0-0','0-0;'),
-(14964,'Red Skeleton Circlet','','hairall','false','none',10,'wood','none',0,-1,-1,0,0,0,0,0,'false','false','true','false','false','0-0','0-0;'),
-(14965,'Black Skeleton Circlet','','hairall','false','none',10,'wood','none',0,-1,-1,0,0,0,0,0,'false','false','true','false','false','0-0','0-0;'),
+(14962,'Gold Skeleton Circlet','','hairall','false','none',10,'wood','none',0,-1,-1,0,0,0,0,0,'true','true','true','true','true','0-0','0-0;'),
+(14963,'Silver Skeleton Circlet','','hairall','false','none',10,'wood','none',0,-1,-1,0,0,0,0,0,'true','true','true','true','true','0-0','0-0;'),
+(14964,'Red Skeleton Circlet','','hairall','false','none',10,'wood','none',0,-1,-1,0,0,0,0,0,'true','true','true','true','true','0-0','0-0;'),
+(14965,'Black Skeleton Circlet','','hairall','false','none',10,'wood','none',0,-1,-1,0,0,0,0,0,'true','true','true','true','true','0-0','0-0;'),
(14966,'Majestic Earring of Friendship','30 day limited period','none','false','none',150,'wood','none',0,-1,43200,0,63,25,0,0,'false','false','false','false','false','0-0','0-0;'),
(14967,'Majestic Necklace of Friendship','30 day limited period','none','false','none',150,'wood','none',0,-1,43200,0,85,33,0,0,'false','false','false','false','false','0-0','0-0;'),
(14968,'Majestic Ring of Friendship','30 day limited period','none','false','none',150,'wood','none',0,-1,43200,0,42,17,0,0,'false','false','false','false','false','0-0','0-0;'),
diff --git a/datapack_development/sql/etcitem.sql b/datapack_development/sql/etcitem.sql
index 74800788af4a41417f677340714b72b7eec0b441..e934669d47c9ee335b043292ecbedcb671af7f9b 100644
--- a/datapack_development/sql/etcitem.sql
+++ b/datapack_development/sql/etcitem.sql
@@ -8411,123 +8411,123 @@ INSERT INTO `etcitem` VALUES
(13554,'Spellbook - Aurabird Owl','','false','none',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2791-1;'),
(13555,'Combined Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
(13559,'Airship Summon License','','false','none',20,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13569,'Gludio Human Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13570,'Gludio Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13571,'Gludio Dark Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13572,'Gludio Orc Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13573,'Gludio Dwarf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13574,'Gludio Kamael Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13575,'Gludio Knight Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13576,'Gludio Archer Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13577,'Gludio Wizard Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13578,'Gludio White Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13579,'Gludio Knight Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13580,'Gludio Commander Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13581,'Dion Human Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13582,'Dion Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13583,'Dion Dark Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13584,'Dion Orc Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13585,'Dion Dwarf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13586,'Dion Kamael Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13587,'Dion Knight Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13588,'Dion Archer Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13589,'Dion Wizard Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13590,'Dion White Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13591,'Dion Knight Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13592,'Dion Commander Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13593,'Giran Human Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13594,'Giran Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13595,'Giran Dark Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13596,'Giran Orc Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13597,'Giran Dwarf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13598,'Giran Kamael Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13599,'Giran Knight Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13600,'Giran Archer Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13601,'Giran Wizard Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13602,'Giran White Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13603,'Giran Knight Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13604,'Giran Commander Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13605,'Oren Human Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13606,'Oren Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13607,'Oren Dark Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13608,'Oren Orc Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13609,'Oren Dwarf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13610,'Oren Kamael Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13611,'Oren Knight Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13612,'Oren Archer Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13613,'Oren Wizard Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13614,'Oren White Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13615,'Oren Knight Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13616,'Oren Commander Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13617,'Aden Human Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13618,'Aden Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13619,'Aden Dark Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13620,'Aden Orc Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13621,'Aden Dwarf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13622,'Aden Kamael Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13623,'Aden Knight Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13624,'Aden Archer Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13625,'Aden Wizard Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13626,'Aden White Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13627,'Aden Knight Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13628,'Aden Commander Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13629,'Innadril Human Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13630,'Innadril Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13631,'Innadril Dark Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13632,'Innadril Orc Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13633,'Innadril Dwarf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13634,'Innadril Kamael Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13635,'Innadril Knight Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13636,'Innadril Archer Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13637,'Innadril Wizard Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13638,'Innadril White Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13639,'Innadril Knight Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13640,'Innadril Commander Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13641,'Goddard Human Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13642,'Goddard Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13643,'Goddard Dark Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13644,'Goddard Orc Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13645,'Goddard Dwarf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13646,'Goddard Kamael Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13647,'Goddard Knight Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13648,'Goddard Archer Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13649,'Goddard Wizard Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13650,'Goddard White Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13651,'Goddard Knight Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13652,'Goddard Commander Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13653,'Rune Human Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13654,'Rune Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13655,'Rune Dark Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13656,'Rune Orc Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13657,'Rune Dwarf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13658,'Rune Kamael Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13659,'Rune Knight Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13660,'Rune Archer Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13661,'Rune Wizard Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13662,'Rune White Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13663,'Rune Knight Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13664,'Rune Commander Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13665,'Schuttgart Human Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13666,'Schuttgart Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13667,'Schuttgart Dark Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13668,'Schuttgart Orc Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13669,'Schuttgart Dwarf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13670,'Schuttgart Kamael Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13671,'Schuttgart Knight Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13672,'Schuttgart Archer Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13673,'Schuttgart Wizard Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13674,'Schuttgart White Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13675,'Schuttgart Knight Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13676,'Schuttgart Commander Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13677,'Gludio Disguise Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13678,'Dion Disguise Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13679,'Giran Disguise Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13680,'Oren Disguise Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13681,'Aden Disguise Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13682,'Innadril Disguise Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13683,'Goddard Disguise Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13684,'Rune Disguise Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
-(13685,'Schuttgart Disguise Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
+(13569,'Gludio Human Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2672-1;'),
+(13570,'Gludio Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2673-1;'),
+(13571,'Gludio Dark Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2674-1;'),
+(13572,'Gludio Orc Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2675-1;'),
+(13573,'Gludio Dwarf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2676-1;'),
+(13574,'Gludio Kamael Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2677-1;'),
+(13575,'Gludio Knight Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2678-1;'),
+(13576,'Gludio Archer Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2679-1;'),
+(13577,'Gludio Wizard Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2680-1;'),
+(13578,'Gludio White Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2681-1;'),
+(13579,'Gludio Knight Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2682-1;'),
+(13580,'Gludio Commander Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2683-1;'),
+(13581,'Dion Human Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2684-1;'),
+(13582,'Dion Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2685-1;'),
+(13583,'Dion Dark Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2686-1;'),
+(13584,'Dion Orc Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2687-1;'),
+(13585,'Dion Dwarf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2688-1;'),
+(13586,'Dion Kamael Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2689-1;'),
+(13587,'Dion Knight Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2690-1;'),
+(13588,'Dion Archer Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2691-1;'),
+(13589,'Dion Wizard Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2692-1;'),
+(13590,'Dion White Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2693-1;'),
+(13591,'Dion Knight Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2694-1;'),
+(13592,'Dion Commander Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2695-1;'),
+(13593,'Giran Human Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2696-1;'),
+(13594,'Giran Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2697-1;'),
+(13595,'Giran Dark Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2698-1;'),
+(13596,'Giran Orc Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2699-1;'),
+(13597,'Giran Dwarf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2700-1;'),
+(13598,'Giran Kamael Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2701-1;'),
+(13599,'Giran Knight Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2702-1;'),
+(13600,'Giran Archer Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2703-1;'),
+(13601,'Giran Wizard Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2704-1;'),
+(13602,'Giran White Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2705-1;'),
+(13603,'Giran Knight Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2706-1;'),
+(13604,'Giran Commander Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2707-1;'),
+(13605,'Oren Human Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2708-1;'),
+(13606,'Oren Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2709-1;'),
+(13607,'Oren Dark Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2710-1;'),
+(13608,'Oren Orc Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2711-1;'),
+(13609,'Oren Dwarf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2712-1;'),
+(13610,'Oren Kamael Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2713-1;'),
+(13611,'Oren Knight Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2714-1;'),
+(13612,'Oren Archer Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2715-1;'),
+(13613,'Oren Wizard Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2716-1;'),
+(13614,'Oren White Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2717-1;'),
+(13615,'Oren Knight Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2718-1;'),
+(13616,'Oren Commander Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2719-1;'),
+(13617,'Aden Human Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2720-1;'),
+(13618,'Aden Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2721-1;'),
+(13619,'Aden Dark Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2722-1;'),
+(13620,'Aden Orc Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2723-1;'),
+(13621,'Aden Dwarf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2724-1;'),
+(13622,'Aden Kamael Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2725-1;'),
+(13623,'Aden Knight Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2726-1;'),
+(13624,'Aden Archer Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2727-1;'),
+(13625,'Aden Wizard Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2728-1;'),
+(13626,'Aden White Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2729-1;'),
+(13627,'Aden Knight Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2730-1;'),
+(13628,'Aden Commander Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2731-1;'),
+(13629,'Innadril Human Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2732-1;'),
+(13630,'Innadril Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2733-1;'),
+(13631,'Innadril Dark Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2734-1;'),
+(13632,'Innadril Orc Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2735-1;'),
+(13633,'Innadril Dwarf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2736-1;'),
+(13634,'Innadril Kamael Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2737-1;'),
+(13635,'Innadril Knight Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2738-1;'),
+(13636,'Innadril Archer Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2739-1;'),
+(13637,'Innadril Wizard Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2740-1;'),
+(13638,'Innadril White Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2741-1;'),
+(13639,'Innadril Knight Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2742-1;'),
+(13640,'Innadril Commander Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2743-1;'),
+(13641,'Goddard Human Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2744-1;'),
+(13642,'Goddard Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2745-1;'),
+(13643,'Goddard Dark Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2746-1;'),
+(13644,'Goddard Orc Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2747-1;'),
+(13645,'Goddard Dwarf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2748-1;'),
+(13646,'Goddard Kamael Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2749-1;'),
+(13647,'Goddard Knight Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2750-1;'),
+(13648,'Goddard Archer Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2751-1;'),
+(13649,'Goddard Wizard Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2752-1;'),
+(13650,'Goddard White Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2753-1;'),
+(13651,'Goddard Knight Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2754-1;'),
+(13652,'Goddard Commander Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2755-1;'),
+(13653,'Rune Human Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2756-1;'),
+(13654,'Rune Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2757-1;'),
+(13655,'Rune Dark Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2758-1;'),
+(13656,'Rune Orc Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2759-1;'),
+(13657,'Rune Dwarf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2760-1;'),
+(13658,'Rune Kamael Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2761-1;'),
+(13659,'Rune Knight Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2762-1;'),
+(13660,'Rune Archer Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2763-1;'),
+(13661,'Rune Wizard Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2764-1;'),
+(13662,'Rune White Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2765-1;'),
+(13663,'Rune Knight Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2766-1;'),
+(13664,'Rune Commander Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2767-1;'),
+(13665,'Schuttgart Human Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2768-1;'),
+(13666,'Schuttgart Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2769-1;'),
+(13667,'Schuttgart Dark Elf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2770-1;'),
+(13668,'Schuttgart Orc Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2771-1;'),
+(13669,'Schuttgart Dwarf Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2772-1;'),
+(13670,'Schuttgart Kamael Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2773-1;'),
+(13671,'Schuttgart Knight Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2774-1;'),
+(13672,'Schuttgart Archer Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2775-1;'),
+(13673,'Schuttgart Wizard Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2776-1;'),
+(13674,'Schuttgart White Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2777-1;'),
+(13675,'Schuttgart Knight Captain Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2778-1;'),
+(13676,'Schuttgart Commander Mercenary Transformation Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','ItemSkills','2779-1;'),
+(13677,'Gludio Disguise Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','Disguise','0-0;'),
+(13678,'Dion Disguise Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','Disguise','0-0;'),
+(13679,'Giran Disguise Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','Disguise','0-0;'),
+(13680,'Oren Disguise Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','Disguise','0-0;'),
+(13681,'Aden Disguise Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','Disguise','0-0;'),
+(13682,'Innadril Disguise Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','Disguise','0-0;'),
+(13683,'Goddard Disguise Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','Disguise','0-0;'),
+(13684,'Rune Disguise Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','Disguise','0-0;'),
+(13685,'Schuttgart Disguise Scroll','','false','scroll',120,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','Disguise','0-0;'),
(13686,'Sealed Knight\'s Cloak','','false','none',220,'normal','paper','none',-1,-1,28671000,0,'true','true','true','true','true','none','0-0;'),
(13691,'Mark of Keucereus - Stage 1','','false','none',10,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
(13692,'Mark of Keucereus - Stage 2','','false','none',10,'stackable','paper','none',-1,-1,0,0,'true','true','true','true','true','none','0-0;'),
diff --git a/datapack_development/sql/npc.sql b/datapack_development/sql/npc.sql
index 0c78e7ce6e2e4aea48bf00b19a480cc46629e556..a4febf9e41ff1e46264dc724ed432c33ad4acba2 100644
--- a/datapack_development/sql/npc.sql
+++ b/datapack_development/sql/npc.sql
@@ -9743,15 +9743,15 @@ INSERT INTO `npc` VALUES
(36487,36487,'Mercenary Captain',0,'Goddard',0,'LineageMonster3.Kight_of_Dawn',12.00,24.50,70,'male','L2MercenaryManager',40,2444,2444,0.00,0.00,10,10,10,10,10,10,0,0,500,500,500,500,278,0,333,2500,6377,NULL,0,50,120,0,0,'LAST_HIT','false'),
(36488,36488,'Mercenary Captain',0,'Rune',0,'LineageMonster3.Kight_of_Dawn',12.00,24.50,70,'male','L2MercenaryManager',40,2444,2444,0.00,0.00,10,10,10,10,10,10,0,0,500,500,500,500,278,0,333,2500,6377,NULL,0,50,120,0,0,'LAST_HIT','false'),
(36489,36489,'Mercenary Captain',0,'Schuttgart',0,'LineageMonster3.Kight_of_Dawn',12.00,24.50,70,'male','L2MercenaryManager',40,2444,2444,0.00,0.00,10,10,10,10,10,10,0,0,500,500,500,500,278,0,333,2500,6377,NULL,0,50,120,0,0,'LAST_HIT','false'),
-(36490,36490,'Territory Manager',0,'Gludio',0,'LineageNPC2.feudal_custodian',10.00,22.50,70,'male','L2Npc',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,NULL,0,50,120,0,0,'LAST_HIT','false'),
-(36491,36491,'Territory Manager',0,'Dion',0,'LineageNPC2.feudal_custodian',10.00,22.50,70,'male','L2Npc',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,NULL,0,50,120,0,0,'LAST_HIT','false'),
-(36492,36492,'Territory Manager',0,'Giran',0,'LineageNPC2.feudal_custodian',10.00,22.50,70,'male','L2Npc',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,NULL,0,50,120,0,0,'LAST_HIT','false'),
-(36493,36493,'Territory Manager',0,'Oren',0,'LineageNPC2.feudal_custodian',10.00,22.50,70,'male','L2Npc',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,NULL,0,50,120,0,0,'LAST_HIT','false'),
-(36494,36494,'Territory Manager',0,'Aden',0,'LineageNPC2.feudal_custodian',10.00,22.50,70,'male','L2Npc',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,NULL,0,50,120,0,0,'LAST_HIT','false'),
-(36495,36495,'Territory Manager',0,'Innadril',0,'LineageNPC2.feudal_custodian',10.00,22.50,70,'male','L2Npc',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,NULL,0,50,120,0,0,'LAST_HIT','false'),
-(36496,36496,'Territory Manager',0,'Goddard',0,'LineageNPC2.feudal_custodian',10.00,22.50,70,'male','L2Npc',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,NULL,0,50,120,0,0,'LAST_HIT','false'),
-(36497,36497,'Territory Manager',0,'Rune',0,'LineageNPC2.feudal_custodian',10.00,22.50,70,'male','L2Npc',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,NULL,0,50,120,0,0,'LAST_HIT','false'),
-(36498,36498,'Territory Manager',0,'Schuttgart',0,'LineageNPC2.feudal_custodian',10.00,22.50,70,'male','L2Npc',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,NULL,0,50,120,0,0,'LAST_HIT','false'),
+(36490,36490,'Territory Manager',0,'Gludio',0,'LineageNPC2.feudal_custodian',10.00,22.50,70,'male','L2MercenaryManager',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,NULL,0,50,120,0,0,'LAST_HIT','false'),
+(36491,36491,'Territory Manager',0,'Dion',0,'LineageNPC2.feudal_custodian',10.00,22.50,70,'male','L2MercenaryManager',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,NULL,0,50,120,0,0,'LAST_HIT','false'),
+(36492,36492,'Territory Manager',0,'Giran',0,'LineageNPC2.feudal_custodian',10.00,22.50,70,'male','L2MercenaryManager',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,NULL,0,50,120,0,0,'LAST_HIT','false'),
+(36493,36493,'Territory Manager',0,'Oren',0,'LineageNPC2.feudal_custodian',10.00,22.50,70,'male','L2MercenaryManager',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,NULL,0,50,120,0,0,'LAST_HIT','false'),
+(36494,36494,'Territory Manager',0,'Aden',0,'LineageNPC2.feudal_custodian',10.00,22.50,70,'male','L2MercenaryManager',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,NULL,0,50,120,0,0,'LAST_HIT','false'),
+(36495,36495,'Territory Manager',0,'Innadril',0,'LineageNPC2.feudal_custodian',10.00,22.50,70,'male','L2MercenaryManager',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,NULL,0,50,120,0,0,'LAST_HIT','false'),
+(36496,36496,'Territory Manager',0,'Goddard',0,'LineageNPC2.feudal_custodian',10.00,22.50,70,'male','L2MercenaryManager',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,NULL,0,50,120,0,0,'LAST_HIT','false'),
+(36497,36497,'Territory Manager',0,'Rune',0,'LineageNPC2.feudal_custodian',10.00,22.50,70,'male','L2MercenaryManager',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,NULL,0,50,120,0,0,'LAST_HIT','false'),
+(36498,36498,'Territory Manager',0,'Schuttgart',0,'LineageNPC2.feudal_custodian',10.00,22.50,70,'male','L2MercenaryManager',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,NULL,0,50,120,0,0,'LAST_HIT','false'),
(36499,36499,'Territory Catapult',0,'Gludio',0,'LineageNpcEV.ballista',112.00,59.00,80,'male','L2Monster',40,5198,1859,0.00,0.00,40,43,30,21,20,20,0,0,1952,577,905,469,253,0,333,0,0,0,0,0,0,0,0,'LAST_HIT','false'),
(36500,36500,'Territory Catapult',0,'Dion',0,'LineageNpcEV.ballista',112.00,59.00,80,'male','L2Monster',40,5198,1859,0.00,0.00,40,43,30,21,20,20,0,0,1952,577,905,469,253,0,333,0,0,0,0,0,0,0,0,'LAST_HIT','false'),
(36501,36501,'Territory Catapult',0,'Giran',0,'LineageNpcEV.ballista',112.00,59.00,80,'male','L2Monster',40,5198,1859,0.00,0.00,40,43,30,21,20,20,0,0,1952,577,905,469,253,0,333,0,0,0,0,0,0,0,0,'LAST_HIT','false'),
@@ -9825,15 +9825,15 @@ INSERT INTO `npc` VALUES
(36569,36569,'Seduced Warrior',0,'Investigator',0,'LineageNPC2.officer_of_insurgents_orc',14.50,30.00,70,'male','L2Npc',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,NULL,0,50,120,0,0,'LAST_HIT','false'),
(36570,36570,'Emery Compressor',0,'Aerial Cleft',0,'LineageNpcEV.source_facility',62.00,140.00,70,'male','L2Teleporter',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,NULL,0,1,120,0,0,'LAST_HIT','false'),
(36571,36571,'Vortex',0,'Aerial Cleft',0,'LineageNpcEV.war_gate',300.00,130.00,70,'male','L2Npc',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,NULL,0,50,120,0,0,'LAST_HIT','false'),
-(36572,36572,'Gludio Ward',0,'',0,'LineageNpcEV.native_thing_of_territory',10.00,35.00,70,'male','L2Npc',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,0,0,0,0,0,0,'LAST_HIT','false'),
-(36573,36573,'Dion Ward',0,'',0,'LineageNpcEV.native_thing_of_territory',10.00,35.00,70,'male','L2Npc',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,0,0,0,0,0,0,'LAST_HIT','false'),
-(36574,36574,'Giran Ward',0,'',0,'LineageNpcEV.native_thing_of_territory',10.00,35.00,70,'male','L2Npc',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,0,0,0,0,0,0,'LAST_HIT','false'),
-(36575,36575,'Oren Ward',0,'',0,'LineageNpcEV.native_thing_of_territory',10.00,35.00,70,'male','L2Npc',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,0,0,0,0,0,0,'LAST_HIT','false'),
-(36576,36576,'Aden Ward',0,'',0,'LineageNpcEV.native_thing_of_territory',10.00,35.00,70,'male','L2Npc',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,0,0,0,0,0,0,'LAST_HIT','false'),
-(36577,36577,'Innadril Ward',0,'',0,'LineageNpcEV.native_thing_of_territory',10.00,35.00,70,'male','L2Npc',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,0,0,0,0,0,0,'LAST_HIT','false'),
-(36578,36578,'Goddard Ward',0,'',0,'LineageNpcEV.native_thing_of_territory',10.00,35.00,70,'male','L2Npc',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,0,0,0,0,0,0,'LAST_HIT','false'),
-(36579,36579,'Rune Ward',0,'',0,'LineageNpcEV.native_thing_of_territory',10.00,35.00,70,'male','L2Npc',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,0,0,0,0,0,0,'LAST_HIT','false'),
-(36580,36580,'Schuttgart Ward',0,'',0,'LineageNpcEV.native_thing_of_territory',10.00,35.00,70,'male','L2Npc',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,0,0,0,0,0,0,'LAST_HIT','false'),
+(36572,36572,'Gludio Ward',0,'',0,'LineageNpcEV.native_thing_of_territory',10.00,35.00,70,'male','L2TerritoryWard',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,0,0,0,0,0,0,'LAST_HIT','false'),
+(36573,36573,'Dion Ward',0,'',0,'LineageNpcEV.native_thing_of_territory',10.00,35.00,70,'male','L2TerritoryWard',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,0,0,0,0,0,0,'LAST_HIT','false'),
+(36574,36574,'Giran Ward',0,'',0,'LineageNpcEV.native_thing_of_territory',10.00,35.00,70,'male','L2TerritoryWard',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,0,0,0,0,0,0,'LAST_HIT','false'),
+(36575,36575,'Oren Ward',0,'',0,'LineageNpcEV.native_thing_of_territory',10.00,35.00,70,'male','L2TerritoryWard',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,0,0,0,0,0,0,'LAST_HIT','false'),
+(36576,36576,'Aden Ward',0,'',0,'LineageNpcEV.native_thing_of_territory',10.00,35.00,70,'male','L2TerritoryWard',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,0,0,0,0,0,0,'LAST_HIT','false'),
+(36577,36577,'Innadril Ward',0,'',0,'LineageNpcEV.native_thing_of_territory',10.00,35.00,70,'male','L2TerritoryWard',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,0,0,0,0,0,0,'LAST_HIT','false'),
+(36578,36578,'Goddard Ward',0,'',0,'LineageNpcEV.native_thing_of_territory',10.00,35.00,70,'male','L2TerritoryWard',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,0,0,0,0,0,0,'LAST_HIT','false'),
+(36579,36579,'Rune Ward',0,'',0,'LineageNpcEV.native_thing_of_territory',10.00,35.00,70,'male','L2TerritoryWard',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,0,0,0,0,0,0,'LAST_HIT','false'),
+(36580,36580,'Schuttgart Ward',0,'',0,'LineageNpcEV.native_thing_of_territory',10.00,35.00,70,'male','L2TerritoryWard',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,0,0,0,0,0,0,'LAST_HIT','false'),
(36581,36581,'Territory Catapult',0,'Gludio',0,'LineageNpcEV.damaged_ballista',125.00,43.00,70,'male','L2Npc',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,0,0,0,0,0,0,'LAST_HIT','false'),
(36582,36582,'Territory Catapult',0,'Dion',0,'LineageNpcEV.damaged_ballista',125.00,43.00,70,'male','L2Npc',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,0,0,0,0,0,0,'LAST_HIT','false'),
(36583,36583,'Territory Catapult',0,'Giran',0,'LineageNpcEV.damaged_ballista',125.00,43.00,70,'male','L2Npc',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,0,0,0,0,0,0,'LAST_HIT','false'),
@@ -9843,7 +9843,7 @@ INSERT INTO `npc` VALUES
(36587,36587,'Territory Catapult',0,'Goddard',0,'LineageNpcEV.damaged_ballista',125.00,43.00,70,'male','L2Npc',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,0,0,0,0,0,0,'LAST_HIT','false'),
(36588,36588,'Territory Catapult',0,'Rune',0,'LineageNpcEV.damaged_ballista',125.00,43.00,70,'male','L2Npc',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,0,0,0,0,0,0,'LAST_HIT','false'),
(36589,36589,'Territory Catapult',0,'Schuttgart',0,'LineageNpcEV.damaged_ballista',125.00,43.00,70,'male','L2Npc',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,0,0,0,0,0,0,'LAST_HIT','false'),
-(36590,36590,'Outpost',0,'',0,'LineageNpcEV.Advance_quarters',110.00,70.00,70,'male','L2Npc',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,0,0,0,0,0,0,'LAST_HIT','false'),
+(36590,36590,'Outpost',0,'',0,'LineageNpcEV.Advance_quarters',110.00,70.00,70,'male','L2Npc',40,3862,1494,0.00,0.00,40,43,30,21,20,20,0,0,1303,471,607,382,253,0,333,0,0,0,0,80,1,0,0,'LAST_HIT','false'),
(36591,36591,'Supplies Safe',0,'',0,'LineageMonster.mimic',8.50,8.50,80,'male','L2Monster',40,5198,1859,0.00,0.00,40,43,30,21,20,20,0,0,1952,577,905,469,253,0,333,0,0,0,0,80,1,0,0,'LAST_HIT','false'),
(36592,36592,'Supplies Safe',0,'',0,'LineageMonster.mimic',8.50,8.50,80,'male','L2Monster',40,5198,1859,0.00,0.00,40,43,30,21,20,20,0,0,1952,577,905,469,253,0,333,0,0,0,0,80,1,0,0,'LAST_HIT','false'),
(36593,36593,'Supplies Safe',0,'',0,'LineageMonster.mimic',8.50,8.50,80,'male','L2Monster',40,5198,1859,0.00,0.00,40,43,30,21,20,20,0,0,1952,577,905,469,253,0,333,0,0,0,0,80,1,0,0,'LAST_HIT','false'),
diff --git a/datapack_development/sql/skill_residential.sql b/datapack_development/sql/skill_residential.sql
index f5daf3503a103816ce0d7de2fd7fe6824c6f0643..ca072ff9a8c99ecfb72ebc92dccb26d43decf486 100644
--- a/datapack_development/sql/skill_residential.sql
+++ b/datapack_development/sql/skill_residential.sql
@@ -32,6 +32,16 @@ INSERT INTO `skill_residential` VALUES
(9,592,1),
(9,600,1),
(9,610,1),
+-- Territory Ward skills
+(81,848,1),
+(82,849,1),
+(83,850,1),
+(84,851,1),
+(85,852,1),
+(86,853,1),
+(87,854,1),
+(88,855,1),
+(89,856,1),
(101,590,1),
(101,603,1),
(102,602,1),
diff --git a/datapack_development/sql/territories.sql b/datapack_development/sql/territories.sql
new file mode 100644
index 0000000000000000000000000000000000000000..dd09910a4d702ae4fcaf99eff1261f1c9f55a7c7
--- /dev/null
+++ b/datapack_development/sql/territories.sql
@@ -0,0 +1,18 @@
+CREATE TABLE IF NOT EXISTS `territories` (
+ `territoryId` INT NOT NULL default 0,
+ `castleId` INT NOT NULL default 0,
+ `fortId` INT NOT NULL default 0,
+ `ownedWardIds` varchar(30) NOT NULL DEFAULT '',
+ PRIMARY KEY (`territoryId`)
+);
+
+INSERT IGNORE INTO `territories` VALUES
+(81,1,101,'81;'),
+(82,2,103,'82;'),
+(83,3,104,'83;'),
+(84,4,105,'84;'),
+(85,5,106,'85;'),
+(86,6,108,'86;'),
+(87,7,109,'87;'),
+(88,8,110,'88;'),
+(89,9,111,'89;');
diff --git a/datapack_development/sql/territory_registrations.sql b/datapack_development/sql/territory_registrations.sql
new file mode 100644
index 0000000000000000000000000000000000000000..15002236fab6f08e8aedafe4e714a5db5c277a71
--- /dev/null
+++ b/datapack_development/sql/territory_registrations.sql
@@ -0,0 +1,5 @@
+CREATE TABLE IF NOT EXISTS `territory_registrations` (
+ `castleId` int(1) NOT NULL default '0',
+ `registeredId` int(11) NOT NULL default '0',
+ PRIMARY KEY (`castleId`,`registeredId`)
+);
diff --git a/datapack_development/sql/territory_spawnlist.sql b/datapack_development/sql/territory_spawnlist.sql
new file mode 100644
index 0000000000000000000000000000000000000000..a89ea82a2ce0b84029c117ce9d2d01097d4f5224
--- /dev/null
+++ b/datapack_development/sql/territory_spawnlist.sql
@@ -0,0 +1,254 @@
+DROP TABLE IF EXISTS `territory_spawnlist`;
+CREATE TABLE `territory_spawnlist` (
+ `castleId` 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,
+ `spawnType` INT NOT NULL default 0, -- 0-spawned when castle have owner, 1-fortress spawns in TW time, 2-Castle spawns in TW time, 3-Ward spawn places
+ PRIMARY KEY (`id`),
+ KEY `id` (`castleId`)
+);
+INSERT INTO `territory_spawnlist` VALUES
+(1,null,36481,-15094,124113,-3119,50948,0),
+(1,null,36490,-15162,124230,-3119,36991,0),
+(1,null,36499,-51598,156183,-2057,0,1),
+(1,null,36510,-51461,156032,-2057,53667,1),
+(1,null,36512,-51724,156038,-2057,18636,1),
+(1,null,36512,-51498,156317,-2057,20943,1),
+(1,null,36512,-51455,156203,-2057,20777,1),
+(1,null,36512,-51582,156032,-2057,19828,1),
+(1,null,36513,-51499,156231,-2057,25955,1),
+(1,null,36572,-17780,109260,-2499,0,3),
+(1,null,36573,-17860,109260,-2499,0,3),
+(1,null,36574,-17940,109260,-2499,0,3),
+(1,null,36575,-18020,109260,-2499,0,3),
+(1,null,36576,-18100,109260,-2499,0,3),
+(1,null,36577,-18180,109260,-2499,0,3),
+(1,null,36578,-18260,109260,-2499,0,3),
+(1,null,36579,-18340,109260,-2499,0,3),
+(1,null,36580,-18420,109260,-2499,0,3),
+(2,null,36491,17746,144214,-3040,54112,0),
+(2,null,36491,19342,145065,-3104,30304,0),
+(2,null,36482,19326,144888,-3096,32768,0),
+(2,null,36500,15962,187144,-2927,0,1),
+(2,null,36516,16099,186993,-2927,53667,1),
+(2,null,36518,15836,186999,-2927,18636,1),
+(2,null,36518,16062,187278,-2927,20943,1),
+(2,null,36518,16105,187164,-2927,20777,1),
+(2,null,36518,15978,186993,-2927,19828,1),
+(2,null,36519,16061,187192,-2927,25955,1),
+(2,null,36572,21740,160500,-2693,0,3),
+(2,null,36573,21820,160500,-2693,0,3),
+(2,null,36574,21900,160500,-2693,0,3),
+(2,null,36575,21980,160500,-2693,0,3),
+(2,null,36576,22060,160500,-2693,0,3),
+(2,null,36577,22140,160500,-2693,0,3),
+(2,null,36578,22220,160500,-2693,0,3),
+(2,null,36579,22300,160500,-2693,0,3),
+(2,null,36580,22380,160500,-2693,0,3),
+(3,null,36492,81896,149584,-3464,36864,0),
+(3,null,36492,80544,152328,-3528,24576,0),
+(3,null,36483,82176,149616,-3464,53247,0),
+(3,null,36501,126042,124693,-2589,0,1),
+(3,null,36522,126179,124542,-2589,53667,1),
+(3,null,36524,125916,124548,-2589,18636,1),
+(3,null,36524,126142,124827,-2589,20943,1),
+(3,null,36524,126185,124713,-2589,20777,1),
+(3,null,36524,126058,124542,-2589,19828,1),
+(3,null,36525,126141,124741,-2589,25955,1),
+(3,null,36572,116675,144760,-2566,0,3),
+(3,null,36573,116675,144840,-2566,0,3),
+(3,null,36574,116675,144920,-2566,0,3),
+(3,null,36575,116675,145000,-2566,0,3),
+(3,null,36576,116675,145080,-2566,0,3),
+(3,null,36577,116675,145160,-2566,0,3),
+(3,null,36578,116675,145240,-2566,0,3),
+(3,null,36579,116675,145320,-2566,0,3),
+(3,null,36580,116675,145400,-2566,0,3),
+(4,null,36493,82684,55342,-1527,30709,0),
+(4,null,36484,83100,55304,-1527,13028,0),
+(4,null,36502,72006,5374,-3048,0,1),
+(4,null,36528,72143,5223,-3048,53667,1),
+(4,null,36530,71880,5229,-3048,18636,1),
+(4,null,36530,72106,5508,-3048,20943,1),
+(4,null,36530,72149,5394,-3048,20777,1),
+(4,null,36530,72022,5223,-3048,19828,1),
+(4,null,36531,72105,5422,-3048,25955,1),
+(4,null,36572,82750,36840,-2293,0,3),
+(4,null,36573,82750,36920,-2293,0,3),
+(4,null,36574,82750,37000,-2293,0,3),
+(4,null,36575,82750,37080,-2293,0,3),
+(4,null,36576,82750,37160,-2293,0,3),
+(4,null,36577,82750,37240,-2293,0,3),
+(4,null,36578,82750,37320,-2293,0,3),
+(4,null,36579,82750,37400,-2293,0,3),
+(4,null,36580,82750,37480,-2293,0,3),
+(5,null,36494,146531,28538,-2271,56398,0),
+(5,null,36485,146432,28346,-2271,60062,0),
+(5,null,36503,153877,56094,-3258,0,1),
+(5,null,36534,154014,55943,-3258,53667,1),
+(5,null,36536,153751,55949,-3258,18636,1),
+(5,null,36536,153977,56228,-3258,20943,1),
+(5,null,36536,154020,56114,-3258,20777,1),
+(5,null,36536,153893,55943,-3258,19828,1),
+(5,null,36537,153976,56142,-3258,25955,1),
+(5,null,36572,147130,4330,-343,0,3),
+(5,null,36573,147210,4330,-343,0,3),
+(5,null,36574,147290,4330,-343,0,3),
+(5,null,36575,147370,4330,-343,0,3),
+(5,null,36576,147450,4330,-343,0,3),
+(5,null,36577,147530,4330,-343,0,3),
+(5,null,36578,147610,4330,-343,0,3),
+(5,null,36579,147690,4330,-343,0,3),
+(5,null,36580,147770,4330,-343,0,3),
+(6,null,36486,115363,218730,-3664,27931,0),
+(6,null,36495,115474,218843,-3664,18585,0),
+(6,null,36504,119510,205517,-3337,0,1),
+(6,null,36540,119647,205366,-3337,53667,1),
+(6,null,36542,119384,205372,-3337,18636,1),
+(6,null,36542,119610,205651,-3337,20943,1),
+(6,null,36542,119653,205537,-3337,20777,1),
+(6,null,36542,119526,205366,-3337,19828,1),
+(6,null,36543,119609,205565,-3337,25955,1),
+(6,null,36572,115730,249280,-789,0,3),
+(6,null,36573,115810,249280,-789,0,3),
+(6,null,36574,115890,249280,-789,0,3),
+(6,null,36575,115970,249280,-789,0,3),
+(6,null,36576,116050,249280,-789,0,3),
+(6,null,36577,116130,249280,-789,0,3),
+(6,null,36578,116210,249280,-789,0,3),
+(6,null,36579,116290,249280,-789,0,3),
+(6,null,36580,116370,249280,-789,0,3),
+(7,null,36496,145704,-57162,-2983,31777,0),
+(7,null,36487,145773,-57269,-2983,38241,0),
+(7,null,36505,160489,-71139,-2864,0,1),
+(7,null,36546,160626,-71290,-2864,53667,1),
+(7,null,36548,160363,-71284,-2864,18636,1),
+(7,null,36548,160589,-71005,-2864,20943,1),
+(7,null,36548,160633,-71119,-2864,20777,1),
+(7,null,36548,160505,-71290,-2864,19828,1),
+(7,null,36549,160588,-71091,-2864,25955,1),
+(7,null,36572,147210,-48500,-2279,0,3),
+(7,null,36573,147290,-48500,-2279,0,3),
+(7,null,36574,147370,-48500,-2279,0,3),
+(7,null,36575,147450,-48500,-2279,0,3),
+(7,null,36576,147530,-48500,-2279,0,3),
+(7,null,36577,147610,-48500,-2279,0,3),
+(7,null,36578,147690,-48500,-2279,0,3),
+(7,null,36579,147770,-48500,-2279,0,3),
+(7,null,36580,147850,-48500,-2279,0,3),
+(8,null,36497,38267,-47995,894,400,0),
+(8,null,36488,38207,-47929,894,990,0),
+(8,null,36506,70409,-60006,-2784,0,1),
+(8,null,36552,70546,-60157,-2784,53667,1),
+(8,null,36554,70283,-60151,-2784,18636,1),
+(8,null,36554,70509,-59872,-2784,20943,1),
+(8,null,36554,70553,-59986,-2784,20777,1),
+(8,null,36554,70425,-60157,-2784,19828,1),
+(8,null,36555,70508,-59958,-2784,25955,1),
+(8,null,36554,18585,-49402,-568,0,2),
+(8,null,36554,18586,-49365,-568,0,2),
+(8,null,36554,18531,-49443,-568,0,2),
+(8,null,36554,18532,-49372,-568,0,2),
+(8,null,36554,18483,-49444,-568,0,2),
+(8,null,36554,18586,-49443,-568,0,2),
+(8,null,36554,18585,-48935,-568,0,2),
+(8,null,36554,18584,-48894,-568,0,2),
+(8,null,36554,18529,-48863,-568,0,2),
+(8,null,36554,18480,-48864,-568,0,2),
+(8,null,36554,18585,-48857,-568,0,2),
+(8,null,36550,18535,-48922,-568,0,2),
+(8,null,36554,18287,-50008,-704,0,2),
+(8,null,36554,18302,-49963,-704,0,2),
+(8,null,36554,18315,-49911,-704,0,2),
+(8,null,36554,18323,-49867,-704,0,2),
+(8,null,36554,18330,-49819,-704,0,2),
+(8,null,36554,18337,-49773,-704,0,2),
+(8,null,36554,18272,-48261,-704,0,2),
+(8,null,36554,18296,-48307,-704,0,2),
+(8,null,36554,18323,-48416,-704,0,2),
+(8,null,36554,18311,-48360,-704,0,2),
+(8,null,36554,18339,-48519,-704,0,2),
+(8,null,36554,18330,-48466,-704,0,2),
+(8,null,36554,17205,-46601,-576,7312,2),
+(8,null,36554,17375,-46759,-576,7312,2),
+(8,null,36554,17241,-46635,-576,7312,2),
+(8,null,36554,17274,-46667,-576,7312,2),
+(8,null,36554,17308,-46696,-576,7312,2),
+(8,null,36554,17341,-46728,-576,7312,2),
+(8,null,36554,17668,-46786,-576,7800,2),
+(8,null,36554,17412,-46791,-576,7312,2),
+(8,null,36554,17602,-46807,-576,7800,2),
+(8,null,36554,17657,-46869,-576,7800,2),
+(8,null,36554,17568,-46823,-576,7312,2),
+(8,null,36554,17637,-46794,-576,7312,2),
+(8,null,36554,17640,-46900,-576,7312,2),
+(8,null,36554,17674,-46835,-576,7312,2),
+(8,null,36554,17685,-46806,-560,7312,2),
+(8,null,36554,15591,-49581,-992,16432,2),
+(8,null,36553,15542,-49633,-960,16080,2),
+(8,null,36554,15456,-49569,-976,16432,2),
+(8,null,36554,15500,-49572,-984,16432,2),
+(8,null,36553,15589,-49487,-1032,16576,2),
+(8,null,36554,15467,-49527,-1000,16432,2),
+(8,null,36554,15547,-49576,-984,16432,2),
+(8,null,36554,15511,-49530,-1000,16432,2),
+(8,null,36554,15558,-49535,-1008,16432,2),
+(8,null,36554,15602,-49539,-1008,16432,2),
+(8,null,36553,15636,-49489,-1024,16576,2),
+(8,null,36553,15457,-49477,-1024,16576,2),
+(8,null,36553,15499,-49479,-1024,16576,2),
+(8,null,36553,15546,-49482,-1024,16576,2),
+(8,null,36553,15478,-49430,-1048,16456,2),
+(8,null,36553,15522,-49432,-1048,16456,2),
+(8,null,36553,15570,-49437,-1048,16456,2),
+(8,null,36553,15613,-49441,-1048,16456,2),
+(8,null,36598,15919,-49314,-1056,0,2),
+(8,null,36553,15485,-48680,-960,52584,2),
+(8,null,36553,15624,-48809,-1024,51080,2),
+(8,null,36554,15547,-48718,-984,50960,2),
+(8,null,36554,15591,-48714,-984,50960,2),
+(8,null,36554,15500,-48722,-984,50960,2),
+(8,null,36554,15456,-48725,-976,50960,2),
+(8,null,36554,15588,-48757,-1008,50960,2),
+(8,null,36554,15544,-48761,-1000,50960,2),
+(8,null,36554,15497,-48765,-992,50960,2),
+(8,null,36554,15453,-48768,-992,50960,2),
+(8,null,36553,15443,-48826,-1024,51080,2),
+(8,null,36553,15583,-48814,-1024,51080,2),
+(8,null,36553,15536,-48818,-1024,51080,2),
+(8,null,36553,15611,-48859,-1048,50960,2),
+(8,null,36553,15492,-48822,-1024,51080,2),
+(8,null,36553,15567,-48864,-1040,50960,2),
+(8,null,36553,15519,-48867,-1048,50960,2),
+(8,null,36553,15476,-48870,-1048,50960,2),
+(8,null,36572,11300,-49470,-536,0,3),
+(8,null,36573,11300,-49390,-536,0,3),
+(8,null,36574,11300,-49310,-536,0,3),
+(8,null,36575,11300,-49230,-536,0,3),
+(8,null,36579,11300,-49150,-536,0,3),
+(8,null,36578,11300,-49070,-536,0,3),
+(8,null,36577,11300,-48990,-536,0,3),
+(8,null,36576,11300,-48910,-536,0,3),
+(8,null,36580,11300,-48830,-536,0,3),
+(9,null,36498,89373,-141535,-1543,10250,0),
+(9,null,36489,89271,-141421,-1543,7643,0),
+(9,null,36507,108263,-140769,-2961,0,1),
+(9,null,36558,108400,-140920,-2961,53667,1),
+(9,null,36560,108137,-140914,-2961,18636,1),
+(9,null,36560,108363,-140635,-2961,20943,1),
+(9,null,36560,108406,-140749,-2961,20777,1),
+(9,null,36560,108279,-140920,-2961,19828,1),
+(9,null,36561,108362,-140721,-2961,25955,1),
+(9,null,36572,77310,-152560,-547,0,3),
+(9,null,36573,77390,-152560,-547,0,3),
+(9,null,36574,77470,-152560,-547,0,3),
+(9,null,36575,77550,-152560,-547,0,3),
+(9,null,36576,77630,-152560,-547,0,3),
+(9,null,36577,77710,-152560,-547,0,3),
+(9,null,36578,77790,-152560,-547,0,3),
+(9,null,36579,77870,-152560,-547,0,3),
+(9,null,36580,77950,-152560,-547,0,3);
diff --git a/datapack_development/sql/weapon.sql b/datapack_development/sql/weapon.sql
index e611964b272de1ca5c545073188aecbf5c0616ec..2e851d989051574c20f3ec9723f6a588fdb81dcf 100644
--- a/datapack_development/sql/weapon.sql
+++ b/datapack_development/sql/weapon.sql
@@ -3012,15 +3012,15 @@ INSERT INTO `weapon` VALUES
(13556,'Airship Helm','','rhand','false',0,0,0,'fine_steel','none',1,10,'sword',8,0.00000,0,0,0,379,0,1,-1,-1,0,0,'true','true','true','true','true',0,0,0,0,0,0,0,0,0,'0-0;'),
(13557,'Airship Cannon','','rhand','false',0,0,0,'fine_steel','none',1,10,'sword',8,0.00000,0,0,0,379,0,1,-1,-1,0,0,'true','true','true','true','true',0,0,0,0,0,0,0,0,0,'0-0;'),
(13558,'Airship Cannon Briquet','','rhand','false',0,0,0,'fine_steel','none',1,10,'sword',8,0.00000,0,0,0,379,0,1,-1,-1,0,0,'true','true','true','true','true',0,0,0,0,0,0,0,0,0,'0-0;'),
-(13560,'Gludio Ward','','rhand','false',500,1,1,'fine_steel','none',0,0,'sword',0,0.00000,0,0,0,325,0,0,-1,-1,0,0,'true','true','true','true','true',0,0,0,0,0,0,0,0,0,'0-0;'),
-(13561,'Dion Ward','','rhand','false',500,1,1,'fine_steel','none',0,0,'sword',0,0.00000,0,0,0,325,0,0,-1,-1,0,0,'true','true','true','true','true',0,0,0,0,0,0,0,0,0,'0-0;'),
-(13562,'Giran Ward','','rhand','false',500,1,1,'fine_steel','none',0,0,'sword',0,0.00000,0,0,0,325,0,0,-1,-1,0,0,'true','true','true','true','true',0,0,0,0,0,0,0,0,0,'0-0;'),
-(13563,'Oren Ward','','rhand','false',500,1,1,'fine_steel','none',0,0,'sword',0,0.00000,0,0,0,325,0,0,-1,-1,0,0,'true','true','true','true','true',0,0,0,0,0,0,0,0,0,'0-0;'),
-(13564,'Aden Ward','','rhand','false',500,1,1,'fine_steel','none',0,0,'sword',0,0.00000,0,0,0,325,0,0,-1,-1,0,0,'true','true','true','true','true',0,0,0,0,0,0,0,0,0,'0-0;'),
-(13565,'Innadril Ward','','rhand','false',500,1,1,'fine_steel','none',0,0,'sword',0,0.00000,0,0,0,325,0,0,-1,-1,0,0,'true','true','true','true','true',0,0,0,0,0,0,0,0,0,'0-0;'),
-(13566,'Goddard Ward','','rhand','false',500,1,1,'fine_steel','none',0,0,'sword',0,0.00000,0,0,0,325,0,0,-1,-1,0,0,'true','true','true','true','true',0,0,0,0,0,0,0,0,0,'0-0;'),
-(13567,'Rune Ward','','rhand','false',500,1,1,'fine_steel','none',0,0,'sword',0,0.00000,0,0,0,325,0,0,-1,-1,0,0,'true','true','true','true','true',0,0,0,0,0,0,0,0,0,'0-0;'),
-(13568,'Schuttgart Ward','','rhand','false',500,1,1,'fine_steel','none',0,0,'sword',0,0.00000,0,0,0,325,0,0,-1,-1,0,0,'true','true','true','true','true',0,0,0,0,0,0,0,0,0,'0-0;'),
+(13560,'Gludio Ward','','lrhand','false',500,1,1,'wood','none',0,0,'none',0,0.00000,0,0,0,325,0,0,-1,-1,0,0,'false','false','false','false','false',0,0,0,0,0,0,0,0,0,'846-1;847-1;'),
+(13561,'Dion Ward','','lrhand','false',500,1,1,'wood','none',0,0,'none',0,0.00000,0,0,0,325,0,0,-1,-1,0,0,'false','false','false','false','false',0,0,0,0,0,0,0,0,0,'846-1;847-1;'),
+(13562,'Giran Ward','','lrhand','false',500,1,1,'wood','none',0,0,'none',0,0.00000,0,0,0,325,0,0,-1,-1,0,0,'false','false','false','false','false',0,0,0,0,0,0,0,0,0,'846-1;847-1;'),
+(13563,'Oren Ward','','lrhand','false',500,1,1,'wood','none',0,0,'none',0,0.00000,0,0,0,325,0,0,-1,-1,0,0,'false','false','false','false','false',0,0,0,0,0,0,0,0,0,'846-1;847-1;'),
+(13564,'Aden Ward','','lrhand','false',500,1,1,'wood','none',0,0,'none',0,0.00000,0,0,0,325,0,0,-1,-1,0,0,'false','false','false','false','false',0,0,0,0,0,0,0,0,0,'846-1;847-1;'),
+(13565,'Innadril Ward','','lrhand','false',500,1,1,'wood','none',0,0,'none',0,0.00000,0,0,0,325,0,0,-1,-1,0,0,'false','false','false','false','false',0,0,0,0,0,0,0,0,0,'846-1;847-1;'),
+(13566,'Goddard Ward','','lrhand','false',500,1,1,'wood','none',0,0,'none',0,0.00000,0,0,0,325,0,0,-1,-1,0,0,'false','false','false','false','false',0,0,0,0,0,0,0,0,0,'846-1;847-1;'),
+(13567,'Rune Ward','','lrhand','false',500,1,1,'wood','none',0,0,'none',0,0.00000,0,0,0,325,0,0,-1,-1,0,0,'false','false','false','false','false',0,0,0,0,0,0,0,0,0,'846-1;847-1;'),
+(13568,'Schuttgart Ward','','lrhand','false',500,1,1,'wood','none',0,0,'none',0,0.00000,0,0,0,325,0,0,-1,-1,0,0,'false','false','false','false','false',0,0,0,0,0,0,0,0,0,'846-1;847-1;'),
(13755,'Olympiad Warrior\'s Weapon (undetermined)','','rhand','false',1500,2,2,'fine_steel','none',24,10,'sword',8,0.00000,0,0,0,379,0,17,-1,-1,0,0,'true','true','true','true','true',0,0,0,0,0,0,0,0,0,'0-0;'),
(13770,'Shadow Item - Shield of Yehan Miakesh','','lhand','false',1300,0,0,'fine_steel','none',0,0,'none',0,0.00000,-8,101,20,0,0,0,60,-1,0,0,'false','false','true','false','true',0,0,0,0,0,0,0,0,0,'0-0;'),
(13789,'Red Boing Hammer','','rhand','true',1710,2,2,'fine_steel','c',107,20,'blunt',4,4.00000,0,0,0,379,0,61,-1,-1,0,705,'true','true','true','true','true',0,0,0,0,0,0,0,0,0,'0-0;'),
diff --git a/datapack_development/tools/database_installer.bat b/datapack_development/tools/database_installer.bat
index b512faac1533ce02b688e25dd5b8befa75a81e3a..19346dc5dad797e2f4ccf1eaeb84b8e29d72bd48 100644
--- a/datapack_development/tools/database_installer.bat
+++ b/datapack_development/tools/database_installer.bat
@@ -801,7 +801,10 @@ spawnlist.sql
special_skill_trees.sql
teleport.sql
topic.sql
-transform_skill_trees.sql;
+territories.sql
+territory_registrations.sql
+territory_spawnlist.sql
+transform_skill_trees.sql
walker_routes.sql
weapon.sql
zone_vertices.sql
diff --git a/datapack_development/tools/database_installer.sh b/datapack_development/tools/database_installer.sh
index d78d2d173c0696ed72ee4cdbb9a595ba40e7efce..83b46cc87b32eafd8b817e1d48a0502af73fc8f4 100644
--- a/datapack_development/tools/database_installer.sh
+++ b/datapack_development/tools/database_installer.sh
@@ -456,6 +456,9 @@ $MYG < ../sql/spawnlist.sql &> /dev/null
$MYG < ../sql/special_skill_trees.sql &> /dev/null
$MYG < ../sql/teleport.sql &> /dev/null
$MYG < ../sql/topic.sql &> /dev/null
+$MYG < ../sql/territories.sql &> /dev/null
+$MYG < ../sql/territory_registrations.sql &> /dev/null
+$MYG < ../sql/territory_spawnlist.sql &> /dev/null
$MYG < ../sql/transform_skill_trees.sql &> /dev/null
$MYG < ../sql/walker_routes.sql &> /dev/null
$MYG < ../sql/weapon.sql &> /dev/null