diff --git a/L2J_DataPack_BETA/dist/game/data/scripts.cfg b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
index a022be5ff90088d96ef2bf621e1e3f55038410fb..2c8abf4eaec0f19985c1227e8018f2e84791931d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts.cfg
+++ b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
@@ -32,6 +32,7 @@ ai/npc/ForgeOfTheGods/ForgeOfTheGods.java
ai/npc/ForgeOfTheGods/Rooney.java
ai/npc/ForgeOfTheGods/TarBeetle.java
ai/npc/FortressArcherCaptain/FortressArcherCaptain.java
+ai/npc/FortressSiegeManager/FortressSiegeManager.java
ai/npc/FortuneTelling/FortuneTelling.java
ai/npc/FreyasSteward/FreyasSteward.java
ai/npc/Jinia/Jinia.java
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..2ef11df0cd2f7f475e303b14674155f7d2723c56
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-01.html
@@ -0,0 +1,5 @@
+<html><body>
+Are you curious why I'm here in front of this fortress owned by the <font color="LEVEL">%clanName%</font> clan selling my wares, instead of in a nice, safe village?<br><br>
+<a action="bypass -h npc_%objectId%_multisell 90001000">"No. Please show me items I can use on the battlefield."</a><br>
+<a action="bypass -h Quest FortressSiegeManager FortressSiegeManager-11.html">"Yes, I'm a little curious."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..756d66727552359547bd2b066f3cd5c0647e4051
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-02.html
@@ -0,0 +1,3 @@
+<html><body>
+Whoa -- no need to be suspicious of me, friend. It's a nice day and I'm just out taking a walk to get a breath of fresh air. Don't mind me!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..5b3f6a66ef9b6bc297d2bc6e589a9763064f3528
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-03.html
@@ -0,0 +1,3 @@
+<html><body>
+We are mercenary soldiers ready to fight if the money is right. We don't take charity cases, though.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-04.html
new file mode 100644
index 0000000000000000000000000000000000000000..1af0b01e52e446482c52c59918b8fd85d6f2caa4
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-04.html
@@ -0,0 +1,4 @@
+<html><body>
+Hmm... No offense, but my gut tells me that I shouldn't trust you. Sorry, friend.<br>
+(A clan must be clan level 4 or above to register for a Fortress Battle.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-05.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-05.html
new file mode 100644
index 0000000000000000000000000000000000000000..13f541e29555090f18e74bb308c2feb81bc5146d
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-05.html
@@ -0,0 +1,3 @@
+<html><body>
+All right, then! Let's show these villains who's boss by combining our power. Allow me to call my associates...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-06.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-06.html
new file mode 100644
index 0000000000000000000000000000000000000000..8ec0e2a1337c061429cd5a93018e6b3da27fd013
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-06.html
@@ -0,0 +1,4 @@
+<html><body>
+Your attempt to register for the fortress battle has failed.<br>
+(Unless a castle siege is in progress, only clans that are level 4 or higher and do not possess a castle may register. You may only register for one fortress battle at a time.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-07.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-07.html
new file mode 100644
index 0000000000000000000000000000000000000000..6aae0e08e9c9b43b719f7491c9df158fb2f587ed
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-07.html
@@ -0,0 +1,3 @@
+<html><body>
+This is not a good time. I will examine the area; come see me again later.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-08.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-08.html
new file mode 100644
index 0000000000000000000000000000000000000000..a21ef99d4c178c3f808fd78838fa54a7841455a3
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-08.html
@@ -0,0 +1,3 @@
+<html><body>
+I'm afraid that there's nothing we can do to help right now. Please come back after you've had a chance to freshen up.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-09.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-09.html
new file mode 100644
index 0000000000000000000000000000000000000000..d4a4fae37c0e1982e9fe2d6629360304e6e71089
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-09.html
@@ -0,0 +1,3 @@
+<html><body>
+Who are you? You seem to have listened to some very inaccurate rumors about me... Ha!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-10.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-10.html
new file mode 100644
index 0000000000000000000000000000000000000000..ae7914605549694999df8c4cd826cbb56351011b
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-10.html
@@ -0,0 +1,3 @@
+<html><body>
+This battle is not some streetgang fight; it is a serious business, with rules and traditions. I don't know your intentions, but I think you'd best bring your senior officer here immediately.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-11.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-11.html
new file mode 100644
index 0000000000000000000000000000000000000000..93c78b32339edb02bd887d605c4e5a331f1fd602
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-11.html
@@ -0,0 +1,8 @@
+<html><body>
+I'll tell you why. You may be surprised to learn that I am a member of the Tactics Corps. You see this fortress? Places just like it used to protect the people of this land from Monsters and foreign armies. And now? Greedy, grasping fools have occupied the fortress, using its might to extort money from the area residents... So I'm guarding this area, searching for someone worthy to defeat that band of bandits and occupy the fortress on behalf of the citizens here.<br>
+You seem a likely candidate... What do you say? You could hire our mercenaries, and with our help I'm sure you'd be able to capture the fortress. Do you want to try?<br><br>
+<a action="bypass -h Quest FortressSiegeManager register">Register fortress siege warfare.</a><br>
+<a action="bypass -h Quest FortressSiegeManager cancel">Cancel registration.</a><br>
+<a action="bypass -h Quest FortressSiegeManager warInfo">Ask about fortress siege warfare.</a><br>
+<a action="bypass -h Quest FortressSiegeManager FortressSiegeManager-13.html">"Tell me more about the fortress."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-12.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-12.html
new file mode 100644
index 0000000000000000000000000000000000000000..de538ac3cc4aedba2f0a9f57c83c4bf3c8f222dc
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-12.html
@@ -0,0 +1,3 @@
+<html><body>
+Well... Member of the clan <font color="LEVEL">%clanName%</font> of repute! What I just told you was simply mimicking the story I heard from a stranger that I met in the village armor store. Don't take it the wrong way!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-13.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-13.html
new file mode 100644
index 0000000000000000000000000000000000000000..7632751d8a24bc2a6af1884a3fc37e6281e8af94
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-13.html
@@ -0,0 +1,6 @@
+<html><body>
+Listen carefully. My lord does not trust the clan currently in possession of this fortress — you can see the effort and expense he has gone to to assemble this mercenary force as a counterweight. Were you to expel the current owners and capture the fortress, I am sure he would be most grateful. (Of course, that probably won't last long -- it's not called a "3-day reign" for nothing...)<br><br>
+Oh, forgive my muttering -- just talking to myself, you know. In any event, let me explain a little about the two types of fortresses.<br><br>
+Territorial fortresses are built within a territory to defend against monster attacks, while border fortresses are established along the boundary between two territories. If you have a map, take a look for yourself and you'll see what I mean. Blue flags indicate territorial fortresses, whereas red flags indicate border fortresses.<br><br>
+<a action="bypass -h Quest FortressSiegeManager FortressSiegeManager-14.html">Ask him how to conquer a fortress.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-14.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-14.html
new file mode 100644
index 0000000000000000000000000000000000000000..7a9609cdd12167c7948bbaf2fd2b6ab4d0bac521
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-14.html
@@ -0,0 +1,5 @@
+<html><body>
+Knowing a fortress' layout can help you turn the battle to your advantage. Each fortress is essentially a residential area consisting of a large central command post surrounded by several barracks.<br><br>
+There are 5 types of barracks: defense barracks, archer barracks, support barracks, officer's barracks and a control center. The number of barracks varies depending on the size of the fortress. Each barracks has a commander who must be defeated in order for you to conquer that barracks. Note that the control center must have a Warsmith or a Maestro in order to handle the machinery.<br><br>
+<a action="bypass -h Quest FortressSiegeManager FortressSiegeManager-15.html">"What happens if I conquer the barracks?"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-15.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-15.html
new file mode 100644
index 0000000000000000000000000000000000000000..920df80227138c40e82214b8cfadaf9ef539720d
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-15.html
@@ -0,0 +1,5 @@
+<html><body>
+If you conquer all of the barracks, weakening your opponents' defensive system, the command gate will open. Entering the command post, you will find a Flag of Combat on the first floor that symbolizes the authority of the fort. You can end the battle by hanging it from the flag pole on the very highest floor.<br><br>
+Be warned, though, that you must conquer the fortress within 10 minutes or all of the barracks' functions will return to normal.<br><br>
+<a action="bypass -h Quest FortressSiegeManager FortressSiegeManager-16.html">"As a mercenary, what do you..."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-16.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-16.html
new file mode 100644
index 0000000000000000000000000000000000000000..c8d70ed6ae81a031c79bed271f04be76f1207623
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-16.html
@@ -0,0 +1,5 @@
+<html><body>
+Uh-huh. I occasionally earn a few Adena as mercenary... A single mission earns me 250,000 Adena. Not a particularly expensive fee, considering that I put my life on the line!<br><br>
+But I get your point. If there is an enemy clan controlling the fortress, I'll escort our mercenary captain there. He can open the central command gate, so be sure to guard him carefully!<br><br>
+<a action="bypass -h Quest FortressSiegeManager FortressSiegeManager-11.html">Back</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-17.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-17.html
new file mode 100644
index 0000000000000000000000000000000000000000..1486793458a92c4c773c15a33557e39bb7314a8e
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-17.html
@@ -0,0 +1,3 @@
+<html><body>
+A clan that possesses a castle in a different region cannot register.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-18.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-18.html
new file mode 100644
index 0000000000000000000000000000000000000000..4c929f046fbec4acce888c8105f58001202830c8
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-18.html
@@ -0,0 +1,3 @@
+<html><body>
+You cannot register for a fortress war while the castle in your possession is allied with the fortress.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-19.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-19.html
new file mode 100644
index 0000000000000000000000000000000000000000..b035a61eaab58b0b51e433d9be3174481bcc6434
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-19.html
@@ -0,0 +1,4 @@
+<html><body>
+Hmm... I feel a strange energy near the fortress. Be on your guard! I believe that the rebels who once held this place will soon attempt to seize it again!<br><br>
+<a action="bypass -h Quest FortressSiegeManager FortressSiegeManager-11.html">Back.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-20.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-20.html
new file mode 100644
index 0000000000000000000000000000000000000000..249d8f585a017a47d06c706abc2a33b8339674d8
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-20.html
@@ -0,0 +1,4 @@
+<html><body>
+We don't have any clients at the moment, so we're searching for opportunities. If someone needs us, we can be ready in less than an hour. How about your clan? A mere 250,000 Adena secures our services!<br><br>
+<a action="bypass -h Quest FortressSiegeManager FortressSiegeManager-11.html">Back.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-21.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-21.html
new file mode 100644
index 0000000000000000000000000000000000000000..9d34dbe1030025d1c429d3e9fbf9a605fccab71e
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-21.html
@@ -0,0 +1,4 @@
+<html><body>
+Ah, we've already been hired by another clan. If you make a request now, we will register your clan to the battle, but don't give us a hard time. I'll return to our headquarters to prepare. Get ready! The battle will begin in 10 minutes.<br><br>
+<a action="bypass -h Quest FortressSiegeManager FortressSiegeManager-11.html">Back.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager.html
new file mode 100644
index 0000000000000000000000000000000000000000..427fdd6a6a117b55c772c4287e4ec299df73e6d7
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager.html
@@ -0,0 +1,5 @@
+<html><body>
+Are you curious why I am selling here, since it's not a village?<br><br>
+<a action="bypass -h npc_%objectId%_multisell 90001000">"No. Please show me items I can use on the battlefield."</a><br>
+<a action="bypass -h Quest FortressSiegeManager FortressSiegeManager-11.html">"Yes, I'm a little curious."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager.java
new file mode 100644
index 0000000000000000000000000000000000000000..a568bfed94c21f08c71e928118848d4845ee9324
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright (C) 2004-2014 L2J DataPack
+ *
+ * This file is part of L2J DataPack.
+ *
+ * L2J DataPack 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.
+ *
+ * L2J DataPack 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 ai.npc.FortressSiegeManager;
+
+import ai.npc.AbstractNpcAI;
+
+import com.l2jserver.gameserver.instancemanager.FortSiegeManager;
+import com.l2jserver.gameserver.model.ClanPrivilege;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.entity.Fort;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * Fortress Siege Manager AI.
+ * @author St3eT
+ */
+public final class FortressSiegeManager extends AbstractNpcAI
+{
+ // NPCs
+ private static final int[] MANAGERS =
+ {
+ 35659, // Shanty Fortress
+ 35690, // Southern Fortress
+ 35728, // Hive Fortress
+ 35759, // Valley Fortress
+ 35797, // Ivory Fortress
+ 35828, // Narsell Fortress
+ 35859, // Bayou Fortress
+ 35897, // White Sands Fortress
+ 35928, // Borderland Fortress
+ 35966, // Swamp Fortress
+ 36004, // Archaic Fortress
+ 36035, // Floran Fortress
+ 36073, // Cloud Mountain
+ 36111, // Tanor Fortress
+ 36142, // Dragonspine Fortress
+ 36173, // Antharas's Fortress
+ 36211, // Western Fortress
+ 36249, // Hunter's Fortress
+ 36287, // Aaru Fortress
+ 36318, // Demon Fortress
+ 36356, // Monastic Fortress
+ };
+
+ private FortressSiegeManager()
+ {
+ super(FortressSiegeManager.class.getSimpleName(), "ai/npc");
+ addStartNpc(MANAGERS);
+ addTalkId(MANAGERS);
+ addFirstTalkId(MANAGERS);
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ String htmltext = null;
+ switch (event)
+ {
+ case "FortressSiegeManager-11.html":
+ case "FortressSiegeManager-13.html":
+ case "FortressSiegeManager-14.html":
+ case "FortressSiegeManager-15.html":
+ case "FortressSiegeManager-16.html":
+ {
+ return htmltext = event;
+ }
+ case "register":
+ {
+ if (player.getClan() == null)
+ {
+ htmltext = "FortressSiegeManager-02.html";
+ }
+ else
+ {
+ final L2Clan clan = player.getClan();
+ final Fort fortress = npc.getFort();
+ final Castle castle = npc.getCastle();
+
+ if (clan.getFortId() == fortress.getResidenceId())
+ {
+ final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
+ html.setHtml(getHtm(player.getHtmlPrefix(), "FortressSiegeManager-12.html"));
+ html.replace("%clanName%", fortress.getOwnerClan().getName());
+ return html.getHtml();
+ }
+ else if (!player.isClanLeader() || !player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_SIEGE))
+ {
+ htmltext = "FortressSiegeManager-10.html";
+ }
+ else if ((clan.getLevel() < FortSiegeManager.getInstance().getSiegeClanMinLevel()))
+ {
+ htmltext = "FortressSiegeManager-04.html";
+ }
+ else if ((player.getClan().getCastleId() == castle.getResidenceId()) && (fortress.getFortState() == 2))
+ {
+ htmltext = "FortressSiegeManager-18.html";
+ }
+ else if ((clan.getCastleId() != 0) && (clan.getCastleId() != castle.getResidenceId()) && FortSiegeManager.getInstance().canRegisterJustTerritory())
+ {
+ htmltext = "FortressSiegeManager-17.html";
+ }
+ else if ((fortress.getTimeTillRebelArmy() > 0) && (fortress.getTimeTillRebelArmy() <= 7200))
+ {
+ htmltext = "FortressSiegeManager-19.html";
+ }
+ else
+ {
+ switch (npc.getFort().getSiege().addAttacker(player, true))
+ {
+ case 1:
+ {
+ htmltext = "FortressSiegeManager-03.html";
+ break;
+ }
+ case 2:
+ {
+ htmltext = "FortressSiegeManager-07.html";
+ break;
+ }
+ case 3:
+ {
+ htmltext = "FortressSiegeManager-06.html";
+ break;
+ }
+ case 4:
+ {
+ final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.REGISTERED_TO_S1_FORTRESS_BATTLE);
+ sm.addString(npc.getFort().getName());
+ player.sendPacket(sm);
+ htmltext = "FortressSiegeManager-05.html";
+ break;
+ }
+ }
+ }
+ }
+ break;
+ }
+ case "cancel":
+ {
+ if (player.getClan() == null)
+ {
+ htmltext = "FortressSiegeManager-02.html";
+ }
+ else
+ {
+ final L2Clan clan = player.getClan();
+ final Fort fortress = npc.getFort();
+
+ if (clan.getFortId() == fortress.getResidenceId())
+ {
+ final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
+ html.setHtml(getHtm(player.getHtmlPrefix(), "FortressSiegeManager-12.html"));
+ html.replace("%clanName%", fortress.getOwnerClan().getName());
+ return html.getHtml();
+ }
+ else if (!player.isClanLeader() || !player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_SIEGE))
+ {
+ htmltext = "FortressSiegeManager-10.html";
+ }
+ else if (!FortSiegeManager.getInstance().checkIsRegistered(clan, fortress.getResidenceId()))
+ {
+ htmltext = "FortressSiegeManager-09.html";
+ }
+ else
+ {
+ fortress.getSiege().removeAttacker(player.getClan());
+ htmltext = "FortressSiegeManager-08.html";
+ }
+ }
+ break;
+ }
+ case "warInfo":
+ {
+ htmltext = npc.getFort().getSiege().getAttackerClans().isEmpty() ? "FortressSiegeManager-20.html" : "FortressSiegeManager-21.html";
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onFirstTalk(L2Npc npc, L2PcInstance player)
+ {
+ final Fort fortress = npc.getFort();
+ final int fortOwner = fortress.getOwnerClan() == null ? 0 : fortress.getOwnerClan().getId();
+ if (fortOwner == 0)
+ {
+ return "FortressSiegeManager.html";
+ }
+ final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
+ html.setHtml(getHtm(player.getHtmlPrefix(), "FortressSiegeManager-01.html"));
+ html.replace("%clanName%", fortress.getOwnerClan().getName());
+ html.replace("%objectId%", npc.getObjectId());
+ return html.getHtml();
+ }
+
+ public static void main(String[] args)
+ {
+ new FortressSiegeManager();
+ }
+}
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java
index 7ea60a46184a20cadaaffbedc764d28ca2f71385..163ddfe949a3080a8d714c6bac4a044e27217db8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java
@@ -131,7 +131,6 @@ import handlers.bypasshandlers.ChatLink;
import handlers.bypasshandlers.ClanWarehouse;
import handlers.bypasshandlers.EventEngine;
import handlers.bypasshandlers.Festival;
-import handlers.bypasshandlers.FortSiege;
import handlers.bypasshandlers.Freight;
import handlers.bypasshandlers.ItemAuctionLink;
import handlers.bypasshandlers.Link;
@@ -400,7 +399,6 @@ public class MasterHandler
ClanWarehouse.class,
EventEngine.class,
Festival.class,
- FortSiege.class,
Freight.class,
ItemAuctionLink.class,
Link.class,
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
index c2f73d9f5d00039b6a902dc21ae79fa4977d40e6..260f9f448d5458a2d4dfefde58218a02633854f0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
@@ -25,10 +25,12 @@ import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.instancemanager.FortManager;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.entity.Fort;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.util.StringUtil;
/**
@@ -88,9 +90,15 @@ public class AdminFortSiege implements IAdminCommandHandler
}
else
{
- if (fort.getSiege().checkIfCanRegister(player))
+ if (fort.getSiege().addAttacker(player, false) == 4)
{
- fort.getSiege().registerAttacker(player, true);
+ final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.REGISTERED_TO_S1_FORTRESS_BATTLE);
+ sm.addString(((L2Npc) target).getFort().getName());
+ player.sendPacket(sm);
+ }
+ else
+ {
+ player.sendMessage("During registering error occurred!");
}
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/FortSiege.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/FortSiege.java
deleted file mode 100644
index 6f6ef972ce649fcaffdacbfe8cf1e72032a55c53..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/FortSiege.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2004-2014 L2J DataPack
- *
- * This file is part of L2J DataPack.
- *
- * L2J DataPack 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.
- *
- * L2J DataPack 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 com.l2jserver.gameserver.handler.IBypassHandler;
-import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
-import com.l2jserver.gameserver.model.ClanPrivilege;
-import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.L2Npc;
-import com.l2jserver.gameserver.model.actor.instance.L2FortSiegeNpcInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-
-public class FortSiege implements IBypassHandler
-{
- private static final String[] COMMANDS =
- {
- "fort_register",
- "fort_unregister"
- };
-
- @Override
- public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
- {
- if (!(target instanceof L2FortSiegeNpcInstance))
- {
- return false;
- }
-
- if ((activeChar.getClanId() > 0) && activeChar.hasClanPrivilege(ClanPrivilege.CS_MANAGE_SIEGE))
- {
- if (command.toLowerCase().startsWith(COMMANDS[0])) // register
- {
- if ((System.currentTimeMillis() < TerritoryWarManager.getInstance().getTWStartTimeInMillis()) && TerritoryWarManager.getInstance().getIsRegistrationOver())
- {
- activeChar.sendPacket(SystemMessageId.NOT_SIEGE_REGISTRATION_TIME2);
- return false;
- }
- else if ((System.currentTimeMillis() > TerritoryWarManager.getInstance().getTWStartTimeInMillis()) && TerritoryWarManager.getInstance().isTWChannelOpen())
- {
- activeChar.sendPacket(SystemMessageId.NOT_SIEGE_REGISTRATION_TIME2);
- return false;
- }
- else if (((L2Npc) target).getFort().getSiege().registerAttacker(activeChar, false))
- {
- SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.REGISTERED_TO_S1_FORTRESS_BATTLE);
- sm.addString(((L2Npc) target).getFort().getName());
- activeChar.sendPacket(sm);
- ((L2Npc) target).showChatWindow(activeChar, 7);
- return true;
- }
- }
- else if (command.toLowerCase().startsWith(COMMANDS[1])) // unregister
- {
- ((L2Npc) target).getFort().getSiege().removeSiegeClan(activeChar.getClan());
- ((L2Npc) target).showChatWindow(activeChar, 8);
- return true;
- }
- return false;
- }
-
- ((L2Npc) target).showChatWindow(activeChar, 10);
-
- return true;
- }
-
- @Override
- public String[] getBypassList()
- {
- return COMMANDS;
- }
-}
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/npcs/35600-35700.xml b/L2J_DataPack_BETA/dist/game/data/stats/npcs/35600-35700.xml
index 4f1320c4e1cf0f4570ce715dbd363b1d9f5efcf1..1203909af9854e884404ca52da6a7b6790792e92 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/npcs/35600-35700.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/npcs/35600-35700.xml
@@ -2636,16 +2636,11 @@
<height normal="24" />
</collision>
</npc>
- <npc id="35659" level="75" type="L2FortSiegeNpc" name="Suspicious Merchant" title="Shanty Fortress">
+ <npc id="35659" level="75" type="L2Npc" name="Suspicious Merchant" title="Shanty Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
<param name="MoveAroundSocial1" value="140" />
- <param name="fortress_id" value="101" />
- <param name="commission" value="250000" />
- <param name="pledge_lv_req" value="4" />
- <param name="mobile_type" value="1" />
- <param name="castle_id1" value="1" />
</parameters>
<race>ORC</race>
<sex>MALE</sex>
@@ -4370,16 +4365,11 @@
<height normal="24" />
</collision>
</npc>
- <npc id="35690" level="75" type="L2FortSiegeNpc" name="Suspicious Merchant" title="Southern Fortress">
+ <npc id="35690" level="75" type="L2Npc" name="Suspicious Merchant" title="Southern Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
<param name="MoveAroundSocial1" value="140" />
- <param name="fortress_id" value="102" />
- <param name="commission" value="250000" />
- <param name="pledge_lv_req" value="4" />
- <param name="mobile_type" value="1" />
- <param name="castle_id1" value="1" />
</parameters>
<race>ORC</race>
<sex>MALE</sex>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/npcs/35700-35800.xml b/L2J_DataPack_BETA/dist/game/data/stats/npcs/35700-35800.xml
index 2c10c60c2ab8e7601d8f4f55a2ffaf6df97fa4b7..8100c913a504c0bb8a69cc1f13aa7c1a90a7e485 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/npcs/35700-35800.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/npcs/35700-35800.xml
@@ -1663,16 +1663,11 @@
<height normal="24" />
</collision>
</npc>
- <npc id="35728" level="75" type="L2FortSiegeNpc" name="Suspicious Merchant" title="Hive Fortress">
+ <npc id="35728" level="75" type="L2Npc" name="Suspicious Merchant" title="Hive Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
<param name="MoveAroundSocial1" value="140" />
- <param name="fortress_id" value="103" />
- <param name="commission" value="250000" />
- <param name="pledge_lv_req" value="4" />
- <param name="mobile_type" value="1" />
- <param name="castle_id1" value="2" />
</parameters>
<race>ORC</race>
<sex>MALE</sex>
@@ -3397,16 +3392,11 @@
<height normal="24" />
</collision>
</npc>
- <npc id="35759" level="75" type="L2FortSiegeNpc" name="Suspicious Merchant" title="Valley Fortress">
+ <npc id="35759" level="75" type="L2Npc" name="Suspicious Merchant" title="Valley Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
<param name="MoveAroundSocial1" value="140" />
- <param name="fortress_id" value="104" />
- <param name="commission" value="250000" />
- <param name="pledge_lv_req" value="4" />
- <param name="mobile_type" value="1" />
- <param name="castle_id1" value="3" />
</parameters>
<race>ORC</race>
<sex>MALE</sex>
@@ -5512,16 +5502,11 @@
<height normal="24" />
</collision>
</npc>
- <npc id="35797" level="75" type="L2FortSiegeNpc" name="Suspicious Merchant" title="Ivory Fortress">
+ <npc id="35797" level="75" type="L2Npc" name="Suspicious Merchant" title="Ivory Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
<param name="MoveAroundSocial1" value="140" />
- <param name="fortress_id" value="105" />
- <param name="commission" value="250000" />
- <param name="pledge_lv_req" value="4" />
- <param name="mobile_type" value="1" />
- <param name="castle_id1" value="4" />
</parameters>
<race>ORC</race>
<sex>MALE</sex>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/npcs/35800-35900.xml b/L2J_DataPack_BETA/dist/game/data/stats/npcs/35800-35900.xml
index 8b24f9d80da08e310ac7ce2487a37031d9fd704b..a1f35cfa456b29b1b12804f6be7c36f15348bfa6 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/npcs/35800-35900.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/npcs/35800-35900.xml
@@ -1602,16 +1602,11 @@
<height normal="24" />
</collision>
</npc>
- <npc id="35828" level="75" type="L2FortSiegeNpc" name="Suspicious Merchant" title="Narsell Fortress">
+ <npc id="35828" level="75" type="L2Npc" name="Suspicious Merchant" title="Narsell Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
<param name="MoveAroundSocial1" value="140" />
- <param name="fortress_id" value="106" />
- <param name="commission" value="250000" />
- <param name="pledge_lv_req" value="4" />
- <param name="mobile_type" value="1" />
- <param name="castle_id1" value="5" />
</parameters>
<race>ORC</race>
<sex>MALE</sex>
@@ -3336,16 +3331,11 @@
<height normal="24" />
</collision>
</npc>
- <npc id="35859" level="75" type="L2FortSiegeNpc" name="Suspicious Merchant" title="Bayou Fortress">
+ <npc id="35859" level="75" type="L2Npc" name="Suspicious Merchant" title="Bayou Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
<param name="MoveAroundSocial1" value="140" />
- <param name="fortress_id" value="107" />
- <param name="commission" value="250000" />
- <param name="pledge_lv_req" value="4" />
- <param name="mobile_type" value="1" />
- <param name="castle_id1" value="5" />
</parameters>
<race>ORC</race>
<sex>MALE</sex>
@@ -5440,16 +5430,11 @@
<height normal="24" />
</collision>
</npc>
- <npc id="35897" level="75" type="L2FortSiegeNpc" name="Suspicious Merchant" title="White Sands Fortress">
+ <npc id="35897" level="75" type="L2Npc" name="Suspicious Merchant" title="White Sands Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
<param name="MoveAroundSocial1" value="140" />
- <param name="fortress_id" value="108" />
- <param name="commission" value="250000" />
- <param name="pledge_lv_req" value="4" />
- <param name="mobile_type" value="1" />
- <param name="castle_id1" value="6" />
</parameters>
<race>ORC</race>
<sex>MALE</sex>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/npcs/35900-36000.xml b/L2J_DataPack_BETA/dist/game/data/stats/npcs/35900-36000.xml
index b8ba02f9aa741f823a4b76834e378a813ebcb00b..3a0971e798d18faffe4ca7a8ef900343e3c42f2e 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/npcs/35900-36000.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/npcs/35900-36000.xml
@@ -1591,16 +1591,11 @@
<height normal="24" />
</collision>
</npc>
- <npc id="35928" level="75" type="L2FortSiegeNpc" name="Suspicious Merchant" title="Borderland Fortress">
+ <npc id="35928" level="75" type="L2Npc" name="Suspicious Merchant" title="Borderland Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
<param name="MoveAroundSocial1" value="140" />
- <param name="fortress_id" value="109" />
- <param name="commission" value="250000" />
- <param name="pledge_lv_req" value="4" />
- <param name="mobile_type" value="1" />
- <param name="castle_id1" value="7" />
</parameters>
<race>ORC</race>
<sex>MALE</sex>
@@ -3695,16 +3690,11 @@
<height normal="24" />
</collision>
</npc>
- <npc id="35966" level="75" type="L2FortSiegeNpc" name="Suspicious Merchant" title="Swamp Fortress">
+ <npc id="35966" level="75" type="L2Npc" name="Suspicious Merchant" title="Swamp Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
<param name="MoveAroundSocial1" value="140" />
- <param name="fortress_id" value="110" />
- <param name="commission" value="250000" />
- <param name="pledge_lv_req" value="4" />
- <param name="mobile_type" value="1" />
- <param name="castle_id1" value="8" />
</parameters>
<race>ORC</race>
<sex>MALE</sex>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/npcs/36000-36100.xml b/L2J_DataPack_BETA/dist/game/data/stats/npcs/36000-36100.xml
index 06b047aa3171fae294d6906f6b9b994ba81e87c7..afe21d6f4d15f8518ae406bfa839df7bccfc409c 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/npcs/36000-36100.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/npcs/36000-36100.xml
@@ -216,16 +216,11 @@
<height normal="24" />
</collision>
</npc>
- <npc id="36004" level="75" type="L2FortSiegeNpc" name="Suspicious Merchant" title="Archaic Fortress">
+ <npc id="36004" level="75" type="L2Npc" name="Suspicious Merchant" title="Archaic Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
<param name="MoveAroundSocial1" value="140" />
- <param name="fortress_id" value="111" />
- <param name="commission" value="250000" />
- <param name="pledge_lv_req" value="4" />
- <param name="mobile_type" value="1" />
- <param name="castle_id1" value="9" />
</parameters>
<race>ORC</race>
<sex>MALE</sex>
@@ -1938,17 +1933,11 @@
<height normal="24" />
</collision>
</npc>
- <npc id="36035" level="75" type="L2FortSiegeNpc" name="Suspicious Merchant" title="Floran Fortress">
+ <npc id="36035" level="75" type="L2Npc" name="Suspicious Merchant" title="Floran Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
<param name="MoveAroundSocial1" value="140" />
- <param name="fortress_id" value="112" />
- <param name="commission" value="250000" />
- <param name="pledge_lv_req" value="4" />
- <param name="mobile_type" value="1" />
- <param name="castle_id1" value="1" />
- <param name="castle_id2" value="2" />
</parameters>
<race>ORC</race>
<sex>MALE</sex>
@@ -4039,17 +4028,11 @@
<height normal="24" />
</collision>
</npc>
- <npc id="36073" level="75" type="L2FortSiegeNpc" name="Suspicious Merchant" title="Cloud Mountain">
+ <npc id="36073" level="75" type="L2Npc" name="Suspicious Merchant" title="Cloud Mountain">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
<param name="MoveAroundSocial1" value="140" />
- <param name="fortress_id" value="113" />
- <param name="commission" value="250000" />
- <param name="pledge_lv_req" value="4" />
- <param name="mobile_type" value="1" />
- <param name="castle_id1" value="1" />
- <param name="castle_id2" value="4" />
</parameters>
<race>ORC</race>
<sex>MALE</sex>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/npcs/36100-36200.xml b/L2J_DataPack_BETA/dist/game/data/stats/npcs/36100-36200.xml
index 4f6a436f64ab932edc3d6513f879dbca83813046..6f1d99bb6b259776181243c56f3a5c91a095db2c 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/npcs/36100-36200.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/npcs/36100-36200.xml
@@ -661,17 +661,11 @@
<height normal="24" />
</collision>
</npc>
- <npc id="36111" level="75" type="L2FortSiegeNpc" name="Suspicious Merchant" title="Tanor Fortress">
+ <npc id="36111" level="75" type="L2Npc" name="Suspicious Merchant" title="Tanor Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
<param name="MoveAroundSocial1" value="140" />
- <param name="fortress_id" value="114" />
- <param name="commission" value="250000" />
- <param name="pledge_lv_req" value="4" />
- <param name="mobile_type" value="1" />
- <param name="castle_id1" value="2" />
- <param name="castle_id2" value="3" />
</parameters>
<race>ORC</race>
<sex>MALE</sex>
@@ -2381,17 +2375,11 @@
<height normal="24" />
</collision>
</npc>
- <npc id="36142" level="75" type="L2FortSiegeNpc" name="Suspicious Merchant" title="Dragonspine Fortress">
+ <npc id="36142" level="75" type="L2Npc" name="Suspicious Merchant" title="Dragonspine Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
<param name="MoveAroundSocial1" value="140" />
- <param name="fortress_id" value="115" />
- <param name="commission" value="250000" />
- <param name="pledge_lv_req" value="4" />
- <param name="mobile_type" value="1" />
- <param name="castle_id1" value="2" />
- <param name="castle_id2" value="4" />
</parameters>
<race>ORC</race>
<sex>MALE</sex>
@@ -4101,17 +4089,11 @@
<height normal="24" />
</collision>
</npc>
- <npc id="36173" level="75" type="L2FortSiegeNpc" name="Suspicious Merchant" title="Antharas's Fortress">
+ <npc id="36173" level="75" type="L2Npc" name="Suspicious Merchant" title="Antharas's Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
<param name="MoveAroundSocial1" value="140" />
- <param name="fortress_id" value="116" />
- <param name="commission" value="250000" />
- <param name="pledge_lv_req" value="4" />
- <param name="mobile_type" value="1" />
- <param name="castle_id1" value="4" />
- <param name="castle_id2" value="3" />
</parameters>
<race>ORC</race>
<sex>MALE</sex>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/npcs/36200-36300.xml b/L2J_DataPack_BETA/dist/game/data/stats/npcs/36200-36300.xml
index 70b848ed0497f1f8323afbbf38574090b49a0cae..ab378aa55198894d99cb9b6d21e11b237c93220f 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/npcs/36200-36300.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/npcs/36200-36300.xml
@@ -661,18 +661,11 @@
<height normal="24" />
</collision>
</npc>
- <npc id="36211" level="75" type="L2FortSiegeNpc" name="Suspicious Merchant" title="Western Fortress">
+ <npc id="36211" level="75" type="L2Npc" name="Suspicious Merchant" title="Western Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
<param name="MoveAroundSocial1" value="140" />
- <param name="fortress_id" value="117" />
- <param name="commission" value="250000" />
- <param name="pledge_lv_req" value="4" />
- <param name="mobile_type" value="1" />
- <param name="castle_id1" value="5" />
- <param name="castle_id2" value="4" />
- <param name="castle_id3" value="7" />
</parameters>
<race>ORC</race>
<sex>MALE</sex>
@@ -2763,17 +2756,11 @@
<height normal="24" />
</collision>
</npc>
- <npc id="36249" level="75" type="L2FortSiegeNpc" name="Suspicious Merchant" title="Hunter's Fortress">
+ <npc id="36249" level="75" type="L2Npc" name="Suspicious Merchant" title="Hunter's Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
<param name="MoveAroundSocial1" value="140" />
- <param name="fortress_id" value="118" />
- <param name="commission" value="250000" />
- <param name="pledge_lv_req" value="4" />
- <param name="mobile_type" value="1" />
- <param name="castle_id1" value="5" />
- <param name="castle_id2" value="3" />
</parameters>
<race>ORC</race>
<sex>MALE</sex>
@@ -4864,17 +4851,11 @@
<height normal="24" />
</collision>
</npc>
- <npc id="36287" level="75" type="L2FortSiegeNpc" name="Suspicious Merchant" title="Aaru Fortress">
+ <npc id="36287" level="75" type="L2Npc" name="Suspicious Merchant" title="Aaru Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
<param name="MoveAroundSocial1" value="140" />
- <param name="fortress_id" value="119" />
- <param name="commission" value="250000" />
- <param name="pledge_lv_req" value="4" />
- <param name="mobile_type" value="1" />
- <param name="castle_id1" value="6" />
- <param name="castle_id2" value="3" />
</parameters>
<race>ORC</race>
<sex>MALE</sex>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/npcs/36300-36400.xml b/L2J_DataPack_BETA/dist/game/data/stats/npcs/36300-36400.xml
index 9eccb31f23016351539ac3c508df8500cc61db68..291bdc1cf27864250e5189c4d5718051f64346eb 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/npcs/36300-36400.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/npcs/36300-36400.xml
@@ -1092,17 +1092,11 @@
<height normal="24" />
</collision>
</npc>
- <npc id="36318" level="75" type="L2FortSiegeNpc" name="Suspicious Merchant" title="Demon Fortress">
+ <npc id="36318" level="75" type="L2Npc" name="Suspicious Merchant" title="Demon Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
<param name="MoveAroundSocial1" value="140" />
- <param name="fortress_id" value="120" />
- <param name="commission" value="250000" />
- <param name="pledge_lv_req" value="4" />
- <param name="mobile_type" value="1" />
- <param name="castle_id1" value="8" />
- <param name="castle_id2" value="7" />
</parameters>
<race>ORC</race>
<sex>MALE</sex>
@@ -3193,17 +3187,11 @@
<height normal="24" />
</collision>
</npc>
- <npc id="36356" level="75" type="L2FortSiegeNpc" name="Suspicious Merchant" title="Monastic Fortress">
+ <npc id="36356" level="75" type="L2Npc" name="Suspicious Merchant" title="Monastic Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
<param name="MoveAroundSocial1" value="140" />
- <param name="fortress_id" value="121" />
- <param name="commission" value="250000" />
- <param name="pledge_lv_req" value="4" />
- <param name="mobile_type" value="1" />
- <param name="castle_id1" value="8" />
- <param name="castle_id2" value="9" />
</parameters>
<race>ORC</race>
<sex>MALE</sex>