Explorar el Código

DP Side for [5011]

BiggBoss hace 13 años
padre
commit
3d17bd3487
Se han modificado 19 ficheros con 1844 adiciones y 1550 borrados
  1. 1 1
      L2J_DataPack_BETA/dist/game/data/door.csv
  2. 15 0
      L2J_DataPack_BETA/dist/game/data/html/chamberlain/chamberlain-35438.htm
  3. 15 0
      L2J_DataPack_BETA/dist/game/data/html/chamberlain/chamberlain-35628.htm
  4. 28 14
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/BanditStronghold/BanditStronghold.java
  5. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/BanditStronghold/teleporter_notyet.htm
  6. 247 78
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
  7. 26 12
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/WildBeastReserve/WildBeastReserve.java
  8. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/WildBeastReserve/teleporter_notyet.htm
  9. 17 14
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceAction.java
  10. 22 19
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceActionShift.java
  11. 17 4
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java
  12. 286 286
      L2J_DataPack_BETA/dist/game/data/zones/castle_zones.xml
  13. 287 275
      L2J_DataPack_BETA/dist/game/data/zones/clan_hall_zones.xml
  14. 103 75
      L2J_DataPack_BETA/dist/game/data/zones/clanhall_teleport_zones.xml
  15. 12 12
      L2J_DataPack_BETA/dist/game/data/zones/cleft_zone.xml
  16. 451 451
      L2J_DataPack_BETA/dist/game/data/zones/fortress_zones.xml
  17. 286 286
      L2J_DataPack_BETA/dist/game/data/zones/territory_war_zones.xml
  18. 12 10
      L2J_DataPack_BETA/dist/sql/game/clanhall_siege_guards.sql
  19. 13 13
      L2J_DataPack_BETA/dist/sql/game/npc.sql

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/door.csv

@@ -4,7 +4,7 @@
 #To make a door unlockable through the unlock skill, add true to the end of the string
 #Doors sorted by map regions
 #Table Description:
-#name;static_object_id;posx;posy;posz;pos_minx;pos_miny;pos_minz;pos_maxx;pos_maxy;pos_maxz;hp;physical_defence;magic_defence;emitter;unlockable;start_opened;targetable
+#name;static_object_id;posx;posy;posz;pos_minx;pos_miny;pos_minz;pos_maxx;pos_maxy;pos_maxz;hp;physical_defence;magic_defence;emitter;unlockable;start_opened;targetable;clan_hall_id
 #####################################################################################################################################################
 
 Entrance_of_Destruction;12240001;-239264;219986;-10161;0;0;0;0;0;0;158250;644;518;0;False;False

+ 15 - 0
L2J_DataPack_BETA/dist/game/data/html/chamberlain/chamberlain-35438.htm

@@ -0,0 +1,15 @@
+<html><body>
+You again? I've seen you around here a lot lately! What do you want this time?<br><br>
+<center>
+<a action="bypass -h npc_%objectId%_receive_report">Receive report.</a><br>
+<a action="bypass -h npc_%objectId%_tax_set">Adjust tax rate and confirm</a><br>
+<a action="bypass -h npc_%objectId%_manage_vault">Manage castle vault.</a><br>
+<a action="bypass -h npc_%objectId%_manage_functions">Manage castle functions.</a><br>
+<a action="bypass -h npc_%objectId%_functions">Use castle functions.</a><br>
+<a action="bypass -h npc_%objectId%_list_siege_clans">View Castle siege information.</a><br>
+<a action="bypass -h npc_%objectId%_list_territory_clans">View Territory War information.</a><br>
+<a action="bypass -h npc_%objectId%_Link chamberlain/manor/manor.htm">Manage Manor.</a><br>
+<a action="bypass -h npc_%objectId%_products">Items</a><br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</center>
+</body></html>

+ 15 - 0
L2J_DataPack_BETA/dist/game/data/html/chamberlain/chamberlain-35628.htm

@@ -0,0 +1,15 @@
+<html><body>
+I trust your beasts are growing properly? Remember, beasts from our farm are very picky eaters. They'll only eat food that's grown here. <br> What can I do for you today?<br><br>
+<center>
+<a action="bypass -h npc_%objectId%_receive_report">Receive report.</a><br>
+<a action="bypass -h npc_%objectId%_tax_set">Adjust tax rate and confirm</a><br>
+<a action="bypass -h npc_%objectId%_manage_vault">Manage castle vault.</a><br>
+<a action="bypass -h npc_%objectId%_manage_functions">Manage castle functions.</a><br>
+<a action="bypass -h npc_%objectId%_functions">Use castle functions.</a><br>
+<a action="bypass -h npc_%objectId%_list_siege_clans">View Castle siege information.</a><br>
+<a action="bypass -h npc_%objectId%_list_territory_clans">View Territory War information.</a><br>
+<a action="bypass -h npc_%objectId%_Link chamberlain/manor/manor.htm">Manage Manor.</a><br>
+<a action="bypass -h npc_%objectId%_products">Items</a><br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</center>
+</body></html>

+ 28 - 14
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/BanditStronghold/BanditStronghold.java

@@ -1,5 +1,16 @@
-/**
+/*
+ * 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 conquerablehalls.flagwar.BanditStronghold;
 
@@ -18,6 +29,7 @@ public final class BanditStronghold extends FlagWar
 	{
 		qn = "BanditStronghold";
 		
+		ROYAL_FLAG			= 35422;
 		FLAG_RED			= 35423;
 		FLAG_YELLOW			= 35424;
 		FLAG_GREEN			= 35425;
@@ -30,22 +42,24 @@ public final class BanditStronghold extends FlagWar
 		ALLY_4				= 35431;
 		ALLY_5				= 35432;
 		
-		TELEPORT_1			= 35561;
+		TELEPORT_1			= 35560;
 				
 		MESSENGER 			= 35437;
-
-		FLAG_COORDS[0] = new int[]{83607,-17541,-1829};
-		FLAG_COORDS[1] = new int[]{84965,-16140,-1829};
-		FLAG_COORDS[2] = new int[]{83280,-15171,-1832};
-		FLAG_COORDS[3] = new int[]{81629,-15004,-1831};
-		FLAG_COORDS[4] = new int[]{81596,-16562,-1848};
-		
-		ALLY_COORDS[0] = new int[] {83409,-17362,-1829};
-		ALLY_COORDS[1] = new int[] {85074,-16408,-1829};
-		ALLY_COORDS[2] = new int[] {83366,-15371,-1835};
-		ALLY_COORDS[3] = new int[] {81889,-14986,-1833};
-		ALLY_COORDS[4] = new int[] {81431,-16272,-1856};
 		
+		OUTTER_DOORS_TO_OPEN[0] = 22170001;
+		OUTTER_DOORS_TO_OPEN[1] = 22170002;
+
+		INNER_DOORS_TO_OPEN[0] = 22170003;
+		INNER_DOORS_TO_OPEN[1] = 22170004;
+
+		FLAG_COORDS[0] = new int[]{83699,-17468,-1774,19048};
+		FLAG_COORDS[1] = new int[]{82053,-17060,-1784,5432};
+		FLAG_COORDS[2] = new int[]{82142,-15528,-1799,58792};
+		FLAG_COORDS[3] = new int[]{83544,-15266,-1770,44976};
+		FLAG_COORDS[4] = new int[]{84609,-16041,-1769,35816};
+		FLAG_COORDS[5] = new int[]{81981,-15708,-1858,60392};
+		FLAG_COORDS[6] = new int[]{84375,-17060,-1860,27712};
+
 		java.util.Collection<L2ResidenceHallTeleportZone> zoneList 
 		= ZoneManager.getInstance().getAllZones(L2ResidenceHallTeleportZone.class);
 		

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/BanditStronghold/teleporter_notyet.htm

@@ -0,0 +1,3 @@
+<html><body>
+You cannot get teleported to the battlefield yet!
+</body></html>

+ 247 - 78
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java

@@ -1,5 +1,16 @@
-/**
+/*
+ * 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 conquerablehalls.flagwar;
 
@@ -12,6 +23,7 @@ import java.util.ArrayList;
 
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.Announcements;
+import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.ai.L2SpecialSiegeGuardAI;
 import com.l2jserver.gameserver.cache.HtmCache;
@@ -20,6 +32,7 @@ import com.l2jserver.gameserver.datatables.NpcTable;
 import com.l2jserver.gameserver.instancemanager.MapRegionManager.TeleportWhereType;
 import com.l2jserver.gameserver.model.L2CharPosition;
 import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2ClanMember;
 import com.l2jserver.gameserver.model.L2SiegeClan;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.L2World;
@@ -28,6 +41,7 @@ import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.clanhall.ClanHallSiegeEngine;
+import com.l2jserver.gameserver.model.entity.clanhall.SiegeStatus;
 import com.l2jserver.gameserver.model.zone.type.L2ResidenceHallTeleportZone;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -49,6 +63,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 	private static final String SQL_CLEAR_CLAN 				= "DELETE FROM siegable_hall_flagwar_attackers WHERE hall_id = ?";
 	private static final String SQL_CLEAR_CLAN_ATTACKERS 	= "DELETE FROM siegable_hall_flagwar_attackers_members WHERE hall_id = ?";
 
+	protected static int ROYAL_FLAG;
 	protected static int FLAG_RED;
 	protected static int FLAG_YELLOW;
 	protected static int FLAG_GREEN;
@@ -65,17 +80,19 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 	
 	protected static int MESSENGER;
 	
-	protected static int[][] FLAG_COORDS = new int[5][3];
-	protected static int[][] ALLY_COORDS = new int[5][3];
+	protected static int[] OUTTER_DOORS_TO_OPEN = new int[2];
+	protected static int[] INNER_DOORS_TO_OPEN = new int[2];
+	protected static int[][] FLAG_COORDS = new int[7][4];
 	
-	protected static L2ResidenceHallTeleportZone[] TELE_ZONES = new L2ResidenceHallTeleportZone[5];
+	protected static L2ResidenceHallTeleportZone[] TELE_ZONES = new L2ResidenceHallTeleportZone[6];
 	
 	protected static int QUEST_REWARD;
 	
 	protected static L2CharPosition CENTER;
 	
-	protected TIntObjectHashMap<ClanData> _data =  new TIntObjectHashMap<ClanData>();
+	protected TIntObjectHashMap<ClanData> _data =  new TIntObjectHashMap<ClanData>(6);
 	protected L2Clan _winner;
+	private boolean _firstPhase;
 	
 	public FlagWar(int questId, String name, String descr, int hallId)
 	{
@@ -85,14 +102,14 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		addFirstTalkId(MESSENGER);
 		addTalkId(MESSENGER);
 		
-		for(int i = 0; i < 5; i++)
+		for(int i = 0; i < 6; i++)
 			addFirstTalkId(TELEPORT_1 + i);
 		
-		addKillId(FLAG_RED);
-		addKillId(FLAG_YELLOW);
-		addKillId(FLAG_GREEN);
-		addKillId(FLAG_BLUE);
-		addKillId(FLAG_PURPLE);
+		addKillId(ALLY_1);
+		addKillId(ALLY_2);
+		addKillId(ALLY_3);
+		addKillId(ALLY_4);
+		addKillId(ALLY_5);
 		
 		addSpawnId(ALLY_1);
 		addSpawnId(ALLY_2);
@@ -128,8 +145,13 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		else
 		{
 			int index = npc.getNpcId() - TELEPORT_1;
-			TELE_ZONES[index].checkTeleporTask();
-			html = "teleporter.htm";
+			if(index == 0 && _firstPhase)
+				html = "teleporter_notyet.htm";
+			else
+			{
+				TELE_ZONES[index].checkTeleporTask();
+				html = "teleporter.htm";
+			}
 		}
 		return html;
 	}
@@ -154,8 +176,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 			}
 			else if(clan == null || !player.isClanLeader())
 				html = "messenger_notclannotleader.htm";
-			else if((_hall.getOwnerId() > 0 && getAttackers().size() >= 4)
-					|| getAttackers().size() >= 5)
+			else if(getAttackers().size() >= 5)
 				html = "messenger_attackersqueuefull.htm";
 			else if(checkIsAttacker(clan))
 				html = "messenger_clanalreadyregistered.htm";
@@ -262,17 +283,22 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 			else
 			{
 				html = HtmCache.getInstance().getHtm(null, "data/scripts/conquerablehalls/flagwar/"+qn+"/messenger_registeredclans.htm");
-				final ClanData[] clanData = _data.values(new ClanData[0]);
 				for(int i = 0; i < _data.size(); i++)
 				{
 					L2Clan attacker = ClanTable.getInstance().getClan(_data.keys()[i]);
 					if(attacker == null)
 						continue;
 					html.replaceAll("%clan"+i+"%", clan.getName());
-					html.replaceAll("%clanMem"+i+"%", String.valueOf((clanData[i]).players.size()));
+					html.replaceAll("%clanMem"+i+"%", String.valueOf(((ClanData)_data.values()[i]).players.size()));
+				}
+				if(_data.size() < 5)
+				{
+					for(int i = _data.size(); i < 5; i++)
+					{
+						html.replaceAll("%clan"+i+"%", "Empty pos. ");
+						html.replaceAll("%clanMem"+i+"%", "Empty pos. ");
+					}
 				}
-				html.replaceAll("%clan", "Empty pos. ");
-				html.replaceAll("%clanMem", "Empty pos. ");
 			}
 		}
 		
@@ -286,18 +312,56 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		{
 			final int npcId = npc.getNpcId();
 			for(int keys : _data.keys())
-				if(_data.get(keys).flag == npcId)
+				if(_data.get(keys).npc == npcId)
 					removeParticipant(keys, true);
+			_data.trimToSize();
 			
 			synchronized(this)
 			{
-				// Siege ends if just 1 flag is alive
-				if(_data.size() == 1)
+				if(_firstPhase)
+				{
+					// Siege ends if just 1 flag is alive
+					if((_data.size() == 1 && _hall.getOwnerId() <= 0)	// Hall was free before battle
+						|| _data.values()[0].npc == 0) 					// or owner didnt set the ally npc
+					{
+						_missionAccomplished = true;
+						_winner = ClanTable.getInstance().getClan(_data.keys()[0]);
+						removeParticipant(_data.keys()[0], false);
+						cancelSiegeTask();
+						endSiege();
+					}
+					else if(_data.size() == 2 && _hall.getOwnerId() > 0) // Hall has defender (owner)
+					{
+						cancelSiegeTask();	// No time limit now
+						_firstPhase = false;
+						_hall.getSiegeZone().setIsActive(false);
+						for(int doorId : INNER_DOORS_TO_OPEN)
+							_hall.openCloseDoor(doorId, true);
+						
+						for(ClanData data : _data.values())
+							doUnSpawns(data);
+						
+						ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
+						{
+							@Override
+							public void run()
+							{
+								for(int doorId : INNER_DOORS_TO_OPEN)
+									_hall.openCloseDoor(doorId, false);
+								
+								for(int i = 0; i< _data.size(); i++)
+									doSpawns(_data.keys()[i], _data.values()[i]);
+								
+								_hall.getSiegeZone().setIsActive(true);
+							}
+						}, 300000);
+					}
+				}
+				else
 				{
 					_missionAccomplished = true;
 					_winner = ClanTable.getInstance().getClan(_data.keys()[0]);
 					removeParticipant(_data.keys()[0], false);
-					cancelSiegeTask();
 					endSiege();
 				}
 			}
@@ -318,6 +382,21 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		return _winner;
 	}
 	
+	@Override
+	public void prepareOwner()
+	{
+		if(_hall.getOwnerId() > 0)
+			registerClan(ClanTable.getInstance().getClan(_hall.getOwnerId()));
+		
+		_hall.banishForeigners();
+		SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.REGISTRATION_TERM_FOR_S1_ENDED);
+		msg.addString(getName());
+		Announcements.getInstance().announceToAll(msg);
+		_hall.updateSiegeStatus(SiegeStatus.WAITING_BATTLE);
+		
+		_siegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new SiegeStarts(), 3600000);
+	}
+	
 	@Override
 	public void startSiege()
 	{
@@ -332,60 +411,53 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 			return;
 		}
 		
-		super.startSiege();
+		// Open doors for challengers
+		for(int door : OUTTER_DOORS_TO_OPEN)
+			_hall.openCloseDoor(door, true);
+		
+		// Teleport owner inside
+		if(_hall.getOwnerId() > 0)
+		{
+			L2Clan owner = ClanTable.getInstance().getClan(_hall.getOwnerId());
+			final Location loc = _hall.getZone().getSpawns().get(0); // Owner restart point
+			for(L2ClanMember pc : owner.getMembers())
+			{
+				if(pc != null)
+				{
+					final L2PcInstance player = pc.getPlayerInstance();
+					if(player != null && player.isOnline())
+						player.teleToLocation(loc, false);
+				}
+			}
+		}
+		
+		// Schedule open doors closement and siege start in 2 minutes
+		ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				for(int door : OUTTER_DOORS_TO_OPEN)
+					_hall.openCloseDoor(door, false);
+				
+				_hall.getZone().banishNonSiegeParticipants();
+				
+				FlagWar.super.startSiege();
+			}
+		}, 300000);
 	}
 	
 	@Override
 	public void onSiegeStarts()
 	{
-		for(ClanData data : _data.values(new ClanData[0]))
+		for(int i = 1; i < _data.size(); i++)
 		{
+			// Spawns challengers flags and npcs
 			try
 			{
-				L2NpcTemplate flagTemplate = NpcTable.getInstance().getTemplate(data.flag);
-				L2NpcTemplate mahumTemplate = NpcTable.getInstance().getTemplate(data.npc);
-				
-				if(flagTemplate == null)
-				{
-					_log.warning(qn+": Flag L2NpcTemplate["+data.flag+"] does not exist!");
-					continue;
-				}
-				if(mahumTemplate == null)
-				{
-					_log.warning(qn+": Ally L2NpcTemplate["+data.npc+"] does not exist!");
-					continue;
-				}
-						
-				data.flagInstance = new L2Spawn(flagTemplate);
-				int index = data.flag - FLAG_RED;
-				int[] flagCoords = FLAG_COORDS[index];		
-				data.flagInstance.setLocx(flagCoords[0]);
-				data.flagInstance.setLocy(flagCoords[1]);
-				data.flagInstance.setLocz(flagCoords[2]);
-				data.flagInstance.setRespawnDelay(10000);
-				data.flagInstance.setAmount(1);
-				data.flagInstance.init();
-				
-				for(int objId : data.players)
-				{
-					L2PcInstance plr = L2World.getInstance().getPlayer(objId);
-					if(plr != null)
-					{
-						data.playersInstance.add(plr);
-						plr.teleToLocation(flagCoords[0] + 50, flagCoords[1] + 50, flagCoords[2]);
-					}
-				}
-				
-				data.warrior = new L2Spawn(mahumTemplate);
-				int indexx = data.npc - ALLY_1;
-				data.warrior.setLocx(ALLY_COORDS[indexx][0]);
-				data.warrior.setLocy(ALLY_COORDS[indexx][1]);
-				data.warrior.setLocz(ALLY_COORDS[indexx][2]);
-				data.warrior.setRespawnDelay(10000);
-				data.warrior.setAmount(1);
-				data.warrior.init();
-				
-				((L2SpecialSiegeGuardAI)data.warrior.getLastSpawn().getAI()).getAlly().addAll(data.players);	
+				ClanData data = _data.values()[i];				
+				doSpawns(_data.keys()[i], data);
+				fillPlayerList(data);
 			}
 			catch(Exception e)
 			{
@@ -396,6 +468,18 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		}	
 	}
 	
+	@Override
+	public void endSiege()
+	{
+		if(_hall.getOwnerId() > 0)
+		{
+			L2Clan clan = ClanTable.getInstance().getClan(_hall.getOwnerId());
+			clan.setHasHideout(0);
+			_hall.free();
+		}
+		super.endSiege();
+	}
+	
 	@Override
 	public void onSiegeEnds()
 	{
@@ -416,15 +500,19 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 	public final Location getInnerSpawnLoc(final L2PcInstance player)
 	{
 		Location loc = null;
-		ClanData cd = _data.get(player.getClanId());
-		if(cd != null)
+		if(player.getClanId() == _hall.getOwnerId())
+			loc = _hall.getZone().getSpawns().get(0);
+		else
 		{
-			// 0 is owner inner spawn point during no siege
-			int index = cd.npc - ALLY_1 + 1;
-			if(index >= 1 && index <= 5)
-				loc = _hall.getZone().getSpawns().get(index);
-			else 
-				throw new ArrayIndexOutOfBoundsException();
+			ClanData cd = _data.get(player.getClanId());
+			if(cd != null)
+			{
+				int index = cd.flag - FLAG_RED;
+				if(index >= 0 && index <= 4)
+					loc = _hall.getZone().getChallengerSpawns().get(index);
+				else 
+					throw new ArrayIndexOutOfBoundsException();
+			}
 		}
 		return loc;
 	}
@@ -435,6 +523,73 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		return false;
 	}
 	
+	@Override
+	public final boolean doorIsAutoAttackable()
+	{
+		return false;
+	}
+	
+	private void doSpawns(int clanId, ClanData data)
+	{
+		try
+		{
+			L2NpcTemplate mahumTemplate = NpcTable.getInstance().getTemplate(data.npc);
+			L2NpcTemplate flagTemplate = NpcTable.getInstance().getTemplate(data.flag);
+			
+			if(flagTemplate == null)
+			{
+				_log.warning(qn+": Flag L2NpcTemplate["+data.flag+"] does not exist!");
+				throw new NullPointerException();
+			}
+			else if(mahumTemplate == null)
+			{
+				_log.warning(qn+": Ally L2NpcTemplate["+data.npc+"] does not exist!");
+				throw new NullPointerException();
+			}
+	
+			int index = 0;
+			if(_firstPhase)
+				index = data.flag - FLAG_RED;
+			else
+				index = clanId == _hall.getOwnerId()? 5 : 6;
+			int[] coords = FLAG_COORDS[index];		
+			
+			data.flagInstance = new L2Spawn(flagTemplate);			
+			data.flagInstance.setLocx(coords[0]);
+			data.flagInstance.setLocy(coords[1]);
+			data.flagInstance.setLocz(coords[2]);
+			data.flagInstance.setRespawnDelay(10000);
+			data.flagInstance.setAmount(1);
+			data.flagInstance.init();
+			
+			data.warrior = new L2Spawn(mahumTemplate);
+			data.warrior.setLocx(coords[0] + 25);
+			data.warrior.setLocy(coords[1] + 25);
+			data.warrior.setLocz(coords[2]);
+			data.warrior.setRespawnDelay(10000);
+			data.warrior.setAmount(1);
+			data.warrior.init();
+			((L2SpecialSiegeGuardAI)data.warrior.getLastSpawn().getAI()).getAlly().addAll(data.players);
+		}
+		catch(Exception e)
+		{
+			_log.warning(qn+": Couldnt make clan spawns: "+e.getMessage());
+			e.printStackTrace();
+		}
+	}
+	
+	private void fillPlayerList(ClanData data)
+	{
+		for(int objId : data.players)
+		{
+			L2PcInstance plr = L2World.getInstance().getPlayer(objId);
+			if(plr != null)
+			{
+				data.playersInstance.add(plr);
+			}
+		}			
+	}
+	
 	private void registerClan(L2Clan clan)
 	{
 		final int clanId = clan.getClanId();
@@ -443,7 +598,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		getAttackers().put(clanId, sc);
 		
 		ClanData data = new ClanData();
-		data.flag = FLAG_RED + _data.size();
+		data.flag = ROYAL_FLAG + _data.size();
 		data.players.add(clan.getLeaderId());
 		_data.put(clanId, data);
 		
@@ -451,6 +606,20 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		saveMember(clanId, clan.getLeaderId());
 	}
 	
+	private final void doUnSpawns(ClanData data)
+	{
+		if(data.flagInstance != null)
+		{
+			data.flagInstance.stopRespawn();
+			data.flagInstance.getLastSpawn().deleteMe();
+		}
+		if(data.warrior != null)
+		{
+			data.warrior.stopRespawn();
+			data.warrior.getLastSpawn().deleteMe();
+		}
+	}
+	
 	private final void removeParticipant(int clanId, boolean teleport)
 	{
 		ClanData dat = _data.remove(clanId);

+ 26 - 12
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/WildBeastReserve/WildBeastReserve.java

@@ -1,5 +1,16 @@
-/**
+/*
+ * 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 conquerablehalls.flagwar.WildBeastReserve;
 
@@ -18,6 +29,7 @@ public final class WildBeastReserve extends FlagWar
 	{
 		qn = "WildBeastReserve";
 		
+		ROYAL_FLAG					= 35606;
 		FLAG_RED					= 35607;	// White flag
 		FLAG_YELLOW					= 35608;	// Red flag
 		FLAG_GREEN					= 35609;	// Blue flag
@@ -30,22 +42,24 @@ public final class WildBeastReserve extends FlagWar
 		ALLY_4						= 35621;
 		ALLY_5						= 35622;
 		
-		TELEPORT_1 					= 35613;
+		TELEPORT_1 					= 35612;
 		
 		MESSENGER 					= 35627;
 		
-		FLAG_COORDS[0] = new int[]{59489,-91704,-1359};
-		FLAG_COORDS[1] = new int[]{57448,-90896,-1359};
-		FLAG_COORDS[2] = new int[]{56013,-92601,-1358};
-		FLAG_COORDS[3] = new int[]{57270,-94211,-1360};
-		FLAG_COORDS[4] = new int[]{59478,-94270,-1355};
+		FLAG_COORDS[0] = new int[]{56963,-92211,-1303,60611};
+		FLAG_COORDS[1] = new int[]{58090,-91641,-1303,47274};
+		FLAG_COORDS[2] = new int[]{58908,-92556,-1303,34450};
+		FLAG_COORDS[3] = new int[]{58336,-93600,-1303,21100};
+		FLAG_COORDS[4] = new int[]{57152,-93360,-1303,8400};
+		FLAG_COORDS[5] = new int[]{59116,-93251,-1302,31000};
+		FLAG_COORDS[6] = new int[]{56432,-92864,-1303,64000};
 		
-		ALLY_COORDS[0] = new int[]{59342,-91632,-1360};
-		ALLY_COORDS[1] = new int[]{57325,-91094,-1354};
-		ALLY_COORDS[2] = new int[]{56184,-92742,-1358};
-		ALLY_COORDS[3] = new int[]{57511,-94009,-1368};
-		ALLY_COORDS[4] = new int[]{57537,-93921,-1360};
+		OUTTER_DOORS_TO_OPEN[0] = 21150003;
+		OUTTER_DOORS_TO_OPEN[1] = 21150004;
 		
+		INNER_DOORS_TO_OPEN[0] = 21150001;
+		INNER_DOORS_TO_OPEN[1] = 21150002;
+		 
 		java.util.Collection<L2ResidenceHallTeleportZone> zoneList 
 		= ZoneManager.getInstance().getAllZones(L2ResidenceHallTeleportZone.class);
 		

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/WildBeastReserve/teleporter_notyet.htm

@@ -0,0 +1,3 @@
+<html><body>
+You cannot get teleported to the battlefield yet!
+</body></html>

+ 17 - 14
L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceAction.java

@@ -22,6 +22,7 @@ import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
 import com.l2jserver.gameserver.network.serverpackets.ConfirmDlg;
 import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
 import com.l2jserver.gameserver.network.serverpackets.StaticObject;
@@ -41,24 +42,25 @@ public class L2DoorInstanceAction implements IActionHandler
 			activeChar.sendPacket(new MyTargetSelected(target.getObjectId(), 0));
 			
 			StaticObject su;
+			L2DoorInstance door = (L2DoorInstance)target;
 			// send HP amount if doors are inside castle/fortress zone
 			// TODO: needed to be added here doors from conquerable clanhalls
-			if ((((L2DoorInstance)target).getCastle() != null
-					&& ((L2DoorInstance)target).getCastle().getCastleId() > 0)
-					|| (((L2DoorInstance)target).getFort() != null
-							&& ((L2DoorInstance)target).getFort().getFortId() > 0
-							&& !((L2DoorInstance)target).getIsCommanderDoor()))
-				su = new StaticObject((L2DoorInstance)target, true);
+			if ((door.getCastle() != null && door.getCastle().getCastleId() > 0)
+				|| (door.getFort() != null && door.getFort().getFortId() > 0)
+				|| (door.getClanHall() != null && door.getClanHall().isSiegableHall())
+				&& !door.getIsCommanderDoor())
+				su = new StaticObject(door, true);
 			else
-				su = new StaticObject((L2DoorInstance)target, false);
+				su = new StaticObject(door, false);
 			
 			activeChar.sendPacket(su);
 			
 			// Send a Server->Client packet ValidateLocation to correct the L2NpcInstance position and heading on the client
-			activeChar.sendPacket(new ValidateLocation((L2Character)target));
+			activeChar.sendPacket(new ValidateLocation(door));
 		}
 		else if (interact)
 		{
+			L2DoorInstance door = (L2DoorInstance)target;
 			//            MyTargetSelected my = new MyTargetSelected(getObjectId(), activeChar.getLevel());
 			//            activeChar.sendPacket(my);
 			if (target.isAutoAttackable(activeChar))
@@ -67,17 +69,18 @@ public class L2DoorInstanceAction implements IActionHandler
 					activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
 			}
 			else if (activeChar.getClan() != null
-					&& ((L2DoorInstance)target).getClanHall() != null
-					&& activeChar.getClanId() == ((L2DoorInstance)target).getClanHall().getOwnerId())
+					&& door.getClanHall() != null
+					&& activeChar.getClanId() == door.getClanHall().getOwnerId())
 			{
-				if (!((L2Character)target).isInsideRadius(activeChar, L2Npc.INTERACTION_DISTANCE, false, false))
+				if (!door.isInsideRadius(activeChar, L2Npc.INTERACTION_DISTANCE, false, false))
 				{
 					activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_INTERACT, target);
 				}
-				else
+				else if(!door.getClanHall().isSiegableHall() ||
+					!((SiegableHall)door.getClanHall()).isInSiege())
 				{
-					activeChar.gatesRequest((L2DoorInstance)target);
-					if (!((L2DoorInstance)target).getOpen())
+					activeChar.gatesRequest(door);
+					if (!door.getOpen())
 						activeChar.sendPacket(new ConfirmDlg(1140));
 					else
 						activeChar.sendPacket(new ConfirmDlg(1141));

+ 22 - 19
L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceActionShift.java

@@ -17,7 +17,6 @@ package handlers.actionhandlers;
 import com.l2jserver.gameserver.handler.IActionHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Object.InstanceType;
-import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
@@ -34,35 +33,39 @@ public class L2DoorInstanceActionShift implements IActionHandler
 			activeChar.sendPacket(new MyTargetSelected(target.getObjectId(), activeChar.getLevel()));
 			
 			StaticObject su;
+			L2DoorInstance door = (L2DoorInstance)target;
 			// send HP amount if doors are inside castle/fortress zone
-			// TODO: needed to be added here doors from conquerable clanhalls
-			if ((((L2DoorInstance)target).getCastle() != null
-					&& ((L2DoorInstance)target).getCastle().getCastleId() > 0)
-					|| (((L2DoorInstance)target).getFort() != null
-							&& ((L2DoorInstance)target).getFort().getFortId() > 0
-							&& !((L2DoorInstance)target).getIsCommanderDoor()))
-				su = new StaticObject((L2DoorInstance)target, true);
+
+			if ((door.getCastle() != null && door.getCastle().getCastleId() > 0)
+				|| (door.getFort() != null && door.getFort().getFortId() > 0
+				|| (door.getClanHall() != null && door.getClanHall().isSiegableHall())
+				&& !door.getIsCommanderDoor()))
+			{
+				su = new StaticObject(door, true);
+			}
 			else
-				su  = new StaticObject((L2DoorInstance)target, false);
+			{
+				su  = new StaticObject(door, false);
+			}
 			
 			activeChar.sendPacket(su);
 			
 			NpcHtmlMessage html = new NpcHtmlMessage(0);
 			html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/doorinfo.htm");
 			html.replace("%class%", target.getClass().getSimpleName());
-			html.replace("%hp%",    String.valueOf((int)((L2Character)target).getCurrentHp()));
-			html.replace("%hpmax%", String.valueOf(((L2Character)target).getMaxHp()));
+			html.replace("%hp%",    String.valueOf((int)door.getCurrentHp()));
+			html.replace("%hpmax%", String.valueOf(door.getMaxHp()));
 			html.replace("%objid%", String.valueOf(target.getObjectId()));
-			html.replace("%doorid%",  String.valueOf(((L2DoorInstance)target).getDoorId()));
+			html.replace("%doorid%",  String.valueOf(door.getDoorId()));
 			
-			html.replace("%minx%", String.valueOf(((L2DoorInstance)target).getXMin()));
-			html.replace("%miny%", String.valueOf(((L2DoorInstance)target).getYMin()));
-			html.replace("%minz%", String.valueOf(((L2DoorInstance)target).getZMin()));
+			html.replace("%minx%", String.valueOf(door.getXMin()));
+			html.replace("%miny%", String.valueOf(door.getYMin()));
+			html.replace("%minz%", String.valueOf(door.getZMin()));
 			
-			html.replace("%maxx%", String.valueOf(((L2DoorInstance)target).getXMax()));
-			html.replace("%maxy%", String.valueOf(((L2DoorInstance)target).getYMax()));
-			html.replace("%maxz%", String.valueOf(((L2DoorInstance)target).getZMax()));
-			html.replace("%unlock%", ((L2DoorInstance)target).isUnlockable() ? "<font color=00FF00>YES<font>" : "<font color=FF0000>NO</font>");
+			html.replace("%maxx%", String.valueOf(door.getXMax()));
+			html.replace("%maxy%", String.valueOf(door.getYMax()));
+			html.replace("%maxz%", String.valueOf(door.getZMax()));
+			html.replace("%unlock%", door.isUnlockable() ? "<font color=00FF00>YES<font>" : "<font color=FF0000>NO</font>");
 			
 			activeChar.sendPacket(html);
 		}

+ 17 - 4
L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java

@@ -47,14 +47,27 @@ public final class AdminCHSiege implements IAdminCommandHandler
 		final String[] split = command.split(" ");
 		SiegableHall hall = null;
 		if(Config.ALT_DEV_NO_QUESTS)
+		{
 			activeChar.sendMessage("AltDevNoQuests = true; Clan Hall Sieges are disabled!");
-		else if(split.length < 2)
+			return false;
+		}
+		if(split.length < 2)
+		{
 			activeChar.sendMessage("You have to specify the hall id at least");
-		else if((hall = getHall(split[1], activeChar)) == null)
+			return false;
+		}
+		if((hall = getHall(split[1], activeChar)) == null)
+		{
 			activeChar.sendMessage("Couldnt find he desired siegable hall ("+split[1]+")");
-		else if(hall.getSiege() == null)
+			return false;
+		}
+		if(hall.getSiege() == null)
+		{
 			activeChar.sendMessage("The given hall dont have any attached siege!");
-		else if(split[0].equals(COMMANDS[1]))
+			return false;
+		}
+
+		if(split[0].equals(COMMANDS[1]))
 		{
 			if(hall.isInSiege())
 				activeChar.sendMessage("The requested clan hall is alredy in siege!");

+ 286 - 286
L2J_DataPack_BETA/dist/game/data/zones/castle_zones.xml

@@ -14,41 +14,41 @@
 		<spawn X="-16659" Y="109261" Z="-1799" />
 		<spawn X="-16618" Y="109485" Z="-1799" />
 		<!-- other_restart_village_list -->
-		<spawn X="-81447" Y="152760" Z="-3170" isOther="true" />
-		<spawn X="-81447" Y="152880" Z="-3170" isOther="true" />
-		<spawn X="-81447" Y="152640" Z="-3170" isOther="true" />
-		<spawn X="-82186" Y="152760" Z="-3170" isOther="true" />
-		<spawn X="-82186" Y="152880" Z="-3170" isOther="true" />
-		<spawn X="-82186" Y="152640" Z="-3170" isOther="true" />
-		<spawn X="-81780" Y="152760" Z="-3170" isOther="true" />
-		<spawn X="-81780" Y="152880" Z="-3170" isOther="true" />
-		<spawn X="-81780" Y="152640" Z="-3170" isOther="true" />
+		<spawn X="-81447" Y="152760" Z="-3170" type="other" />
+		<spawn X="-81447" Y="152880" Z="-3170" type="other" />
+		<spawn X="-81447" Y="152640" Z="-3170" type="other" />
+		<spawn X="-82186" Y="152760" Z="-3170" type="other" />
+		<spawn X="-82186" Y="152880" Z="-3170" type="other" />
+		<spawn X="-82186" Y="152640" Z="-3170" type="other" />
+		<spawn X="-81780" Y="152760" Z="-3170" type="other" />
+		<spawn X="-81780" Y="152880" Z="-3170" type="other" />
+		<spawn X="-81780" Y="152640" Z="-3170" type="other" />
 		<!-- chao_restart_point_list -->
-		<spawn X="-81616" Y="157104" Z="-3150" isChaotic="true" />
-		<spawn X="-80688" Y="157216" Z="-3150" isChaotic="true" />
-		<spawn X="-79568" Y="156960" Z="-3150" isChaotic="true" />
-		<spawn X="-78800" Y="157744" Z="-3150" isChaotic="true" />
-		<spawn X="-80448" Y="157968" Z="-3130" isChaotic="true" />
-		<spawn X="-81712" Y="159536" Z="-3230" isChaotic="true" />
-		<spawn X="-79744" Y="160592" Z="-3330" isChaotic="true" />
-		<spawn X="-79584" Y="159408" Z="-3180" isChaotic="true" />
-		<spawn X="-74016" Y="150656" Z="-2800" isChaotic="true" />
-		<spawn X="-72720" Y="149632" Z="-2780" isChaotic="true" />
-		<spawn X="-75904" Y="162000" Z="-3300" isChaotic="true" />
-		<spawn X="-75488" Y="161472" Z="-3250" isChaotic="true" />
-		<spawn X="-74688" Y="160736" Z="-3200" isChaotic="true" />
-		<spawn X="-74352" Y="161488" Z="-3250" isChaotic="true" />
-		<spawn X="-76656" Y="160768" Z="-3280" isChaotic="true" />
-		<spawn X="-77472" Y="160960" Z="-3470" isChaotic="true" />
-		<spawn X="-77776" Y="158752" Z="-3270" isChaotic="true" />
-		<spawn X="-80448" Y="161488" Z="-3420" isChaotic="true" />
-		<spawn X="-75440" Y="162672" Z="-3350" isChaotic="true" />
-		<spawn X="-81760" Y="161248" Z="-3200" isChaotic="true" />
+		<spawn X="-81616" Y="157104" Z="-3150" type="chaotic" />
+		<spawn X="-80688" Y="157216" Z="-3150" type="chaotic" />
+		<spawn X="-79568" Y="156960" Z="-3150" type="chaotic" />
+		<spawn X="-78800" Y="157744" Z="-3150" type="chaotic" />
+		<spawn X="-80448" Y="157968" Z="-3130" type="chaotic" />
+		<spawn X="-81712" Y="159536" Z="-3230" type="chaotic" />
+		<spawn X="-79744" Y="160592" Z="-3330" type="chaotic" />
+		<spawn X="-79584" Y="159408" Z="-3180" type="chaotic" />
+		<spawn X="-74016" Y="150656" Z="-2800" type="chaotic" />
+		<spawn X="-72720" Y="149632" Z="-2780" type="chaotic" />
+		<spawn X="-75904" Y="162000" Z="-3300" type="chaotic" />
+		<spawn X="-75488" Y="161472" Z="-3250" type="chaotic" />
+		<spawn X="-74688" Y="160736" Z="-3200" type="chaotic" />
+		<spawn X="-74352" Y="161488" Z="-3250" type="chaotic" />
+		<spawn X="-76656" Y="160768" Z="-3280" type="chaotic" />
+		<spawn X="-77472" Y="160960" Z="-3470" type="chaotic" />
+		<spawn X="-77776" Y="158752" Z="-3270" type="chaotic" />
+		<spawn X="-80448" Y="161488" Z="-3420" type="chaotic" />
+		<spawn X="-75440" Y="162672" Z="-3350" type="chaotic" />
+		<spawn X="-81760" Y="161248" Z="-3200" type="chaotic" />
 		<!-- banish_point_list -->
-		<spawn X="-15881" Y="110651" Z="-2770" isBanish="true" />
-		<spawn X="-15679" Y="110168" Z="-2770" isBanish="true" />
-		<spawn X="-15553" Y="110780" Z="-2770" isBanish="true" />
-		<spawn X="-15281" Y="110142" Z="-2770" isBanish="true" />
+		<spawn X="-15881" Y="110651" Z="-2770" type="banish" />
+		<spawn X="-15679" Y="110168" Z="-2770" type="banish" />
+		<spawn X="-15553" Y="110780" Z="-2770" type="banish" />
+		<spawn X="-15281" Y="110142" Z="-2770" type="banish" />
 	</zone>
 	<zone name="dion_castle" type="CastleZone" shape="NPoly" minZ="-4646" maxZ="4000">
 		<stat name="castleId" val="2" />
@@ -63,41 +63,41 @@
 		<spawn X="20619" Y="160489" Z="-1993" />
 		<spawn X="20578" Y="160265" Z="-1993" />
 		<!-- other_restart_village_list -->
-		<spawn X="-81447" Y="152760" Z="-3170" isOther="true" />
-		<spawn X="-81447" Y="152880" Z="-3170" isOther="true" />
-		<spawn X="-81447" Y="152640" Z="-3170" isOther="true" />
-		<spawn X="-82186" Y="152760" Z="-3170" isOther="true" />
-		<spawn X="-82186" Y="152880" Z="-3170" isOther="true" />
-		<spawn X="-82186" Y="152640" Z="-3170" isOther="true" />
-		<spawn X="-81780" Y="152760" Z="-3170" isOther="true" />
-		<spawn X="-81780" Y="152880" Z="-3170" isOther="true" />
-		<spawn X="-81780" Y="152640" Z="-3170" isOther="true" />
+		<spawn X="-81447" Y="152760" Z="-3170" type="other" />
+		<spawn X="-81447" Y="152880" Z="-3170" type="other" />
+		<spawn X="-81447" Y="152640" Z="-3170" type="other" />
+		<spawn X="-82186" Y="152760" Z="-3170" type="other" />
+		<spawn X="-82186" Y="152880" Z="-3170" type="other" />
+		<spawn X="-82186" Y="152640" Z="-3170" type="other" />
+		<spawn X="-81780" Y="152760" Z="-3170" type="other" />
+		<spawn X="-81780" Y="152880" Z="-3170" type="other" />
+		<spawn X="-81780" Y="152640" Z="-3170" type="other" />
 		<!-- chao_restart_point_list -->
-		<spawn X="-81616" Y="157104" Z="-3150" isChaotic="true" />
-		<spawn X="-80688" Y="157216" Z="-3150" isChaotic="true" />
-		<spawn X="-79568" Y="156960" Z="-3150" isChaotic="true" />
-		<spawn X="-78800" Y="157744" Z="-3150" isChaotic="true" />
-		<spawn X="-80448" Y="157968" Z="-3130" isChaotic="true" />
-		<spawn X="-81712" Y="159536" Z="-3230" isChaotic="true" />
-		<spawn X="-79744" Y="160592" Z="-3330" isChaotic="true" />
-		<spawn X="-79584" Y="159408" Z="-3180" isChaotic="true" />
-		<spawn X="-74016" Y="150656" Z="-2800" isChaotic="true" />
-		<spawn X="-72720" Y="149632" Z="-2780" isChaotic="true" />
-		<spawn X="-75904" Y="162000" Z="-3300" isChaotic="true" />
-		<spawn X="-75488" Y="161472" Z="-3250" isChaotic="true" />
-		<spawn X="-74688" Y="160736" Z="-3200" isChaotic="true" />
-		<spawn X="-74352" Y="161488" Z="-3250" isChaotic="true" />
-		<spawn X="-76656" Y="160768" Z="-3280" isChaotic="true" />
-		<spawn X="-77472" Y="160960" Z="-3470" isChaotic="true" />
-		<spawn X="-77776" Y="158752" Z="-3270" isChaotic="true" />
-		<spawn X="-80448" Y="161488" Z="-3420" isChaotic="true" />
-		<spawn X="-75440" Y="162672" Z="-3350" isChaotic="true" />
-		<spawn X="-81760" Y="161248" Z="-3200" isChaotic="true" />
+		<spawn X="-81616" Y="157104" Z="-3150" type="chaotic" />
+		<spawn X="-80688" Y="157216" Z="-3150" type="chaotic" />
+		<spawn X="-79568" Y="156960" Z="-3150" type="chaotic" />
+		<spawn X="-78800" Y="157744" Z="-3150" type="chaotic" />
+		<spawn X="-80448" Y="157968" Z="-3130" type="chaotic" />
+		<spawn X="-81712" Y="159536" Z="-3230" type="chaotic" />
+		<spawn X="-79744" Y="160592" Z="-3330" type="chaotic" />
+		<spawn X="-79584" Y="159408" Z="-3180" type="chaotic" />
+		<spawn X="-74016" Y="150656" Z="-2800" type="chaotic" />
+		<spawn X="-72720" Y="149632" Z="-2780" type="chaotic" />
+		<spawn X="-75904" Y="162000" Z="-3300" type="chaotic" />
+		<spawn X="-75488" Y="161472" Z="-3250" type="chaotic" />
+		<spawn X="-74688" Y="160736" Z="-3200" type="chaotic" />
+		<spawn X="-74352" Y="161488" Z="-3250" type="chaotic" />
+		<spawn X="-76656" Y="160768" Z="-3280" type="chaotic" />
+		<spawn X="-77472" Y="160960" Z="-3470" type="chaotic" />
+		<spawn X="-77776" Y="158752" Z="-3270" type="chaotic" />
+		<spawn X="-80448" Y="161488" Z="-3420" type="chaotic" />
+		<spawn X="-75440" Y="162672" Z="-3350" type="chaotic" />
+		<spawn X="-81760" Y="161248" Z="-3200" type="chaotic" />
 		<!-- banish_point_list -->
-		<spawn X="19852" Y="159170" Z="-2770" isBanish="true" />
-		<spawn X="19650" Y="159653" Z="-2770" isBanish="true" />
-		<spawn X="19524" Y="159041" Z="-2770" isBanish="true" />
-		<spawn X="19252" Y="159679" Z="-2770" isBanish="true" />
+		<spawn X="19852" Y="159170" Z="-2770" type="banish" />
+		<spawn X="19650" Y="159653" Z="-2770" type="banish" />
+		<spawn X="19524" Y="159041" Z="-2770" type="banish" />
+		<spawn X="19252" Y="159679" Z="-2770" type="banish" />
 	</zone>
 	<zone name="giran_castle" type="CastleZone" shape="NPoly" minZ="-4519" maxZ="19931">
 		<stat name="castleId" val="3" />
@@ -112,37 +112,37 @@
 		<spawn X="116661" Y="146550" Z="-1866" />
 		<spawn X="116437" Y="146591" Z="-1866" />
 		<!-- other_restart_village_list -->
-		<spawn X="116127" Y="76015" Z="-2729" isOther="true" />
-		<spawn X="115683" Y="77610" Z="-2650" isOther="true" />
-		<spawn X="117304" Y="76318" Z="-2670" isOther="true" />
-		<spawn X="119862" Y="76603" Z="-2220" isOther="true" />
-		<spawn X="117671" Y="78998" Z="-2210" isOther="true" />
-		<spawn X="117189" Y="78952" Z="-2210" isOther="true" />
-		<spawn X="115861" Y="75200" Z="-2550" isOther="true" />
-		<spawn X="118275" Y="74859" Z="-2557" isOther="true" />
-		<spawn X="118229" Y="74677" Z="-2450" isOther="true" />
-		<spawn X="115685" Y="75072" Z="-2550" isOther="true" />
-		<spawn X="116704" Y="75695" Z="-2680" isOther="true" />
-		<spawn X="116737" Y="76738" Z="-2650" isOther="true" />
-		<spawn X="115193" Y="77594" Z="-2670" isOther="true" />
-		<spawn X="116158" Y="77443" Z="-2660" isOther="true" />
+		<spawn X="116127" Y="76015" Z="-2729" type="other" />
+		<spawn X="115683" Y="77610" Z="-2650" type="other" />
+		<spawn X="117304" Y="76318" Z="-2670" type="other" />
+		<spawn X="119862" Y="76603" Z="-2220" type="other" />
+		<spawn X="117671" Y="78998" Z="-2210" type="other" />
+		<spawn X="117189" Y="78952" Z="-2210" type="other" />
+		<spawn X="115861" Y="75200" Z="-2550" type="other" />
+		<spawn X="118275" Y="74859" Z="-2557" type="other" />
+		<spawn X="118229" Y="74677" Z="-2450" type="other" />
+		<spawn X="115685" Y="75072" Z="-2550" type="other" />
+		<spawn X="116704" Y="75695" Z="-2680" type="other" />
+		<spawn X="116737" Y="76738" Z="-2650" type="other" />
+		<spawn X="115193" Y="77594" Z="-2670" type="other" />
+		<spawn X="116158" Y="77443" Z="-2660" type="other" />
 		<!-- chao_restart_point_list -->
-		<spawn X="122098" Y="70373" Z="-2864" isChaotic="true" />
-		<spawn X="118674" Y="71218" Z="-2743" isChaotic="true" />
-		<spawn X="118040" Y="67175" Z="-2905" isChaotic="true" />
-		<spawn X="119300" Y="70660" Z="-2850" isChaotic="true" />
-		<spawn X="118851" Y="70566" Z="-2800" isChaotic="true" />
-		<spawn X="112655" Y="70976" Z="-3122" isChaotic="true" />
-		<spawn X="119712" Y="66376" Z="-2960" isChaotic="true" />
-		<spawn X="107511" Y="82890" Z="-2515" isChaotic="true" />
-		<spawn X="105702" Y="82773" Z="-2803" isChaotic="true" />
-		<spawn X="104257" Y="82194" Z="-2581" isChaotic="true" />
-		<spawn X="104474" Y="81109" Z="-2651" isChaotic="true" />
+		<spawn X="122098" Y="70373" Z="-2864" type="chaotic" />
+		<spawn X="118674" Y="71218" Z="-2743" type="chaotic" />
+		<spawn X="118040" Y="67175" Z="-2905" type="chaotic" />
+		<spawn X="119300" Y="70660" Z="-2850" type="chaotic" />
+		<spawn X="118851" Y="70566" Z="-2800" type="chaotic" />
+		<spawn X="112655" Y="70976" Z="-3122" type="chaotic" />
+		<spawn X="119712" Y="66376" Z="-2960" type="chaotic" />
+		<spawn X="107511" Y="82890" Z="-2515" type="chaotic" />
+		<spawn X="105702" Y="82773" Z="-2803" type="chaotic" />
+		<spawn X="104257" Y="82194" Z="-2581" type="chaotic" />
+		<spawn X="104474" Y="81109" Z="-2651" type="chaotic" />
 		<!-- banish_point_list -->
-		<spawn X="115275" Y="147273" Z="-2770" isBanish="true" />
-		<spawn X="115758" Y="147475" Z="-2770" isBanish="true" />
-		<spawn X="115146" Y="147601" Z="-2770" isBanish="true" />
-		<spawn X="115784" Y="147873" Z="-2770" isBanish="true" />
+		<spawn X="115275" Y="147273" Z="-2770" type="banish" />
+		<spawn X="115758" Y="147475" Z="-2770" type="banish" />
+		<spawn X="115146" Y="147601" Z="-2770" type="banish" />
+		<spawn X="115784" Y="147873" Z="-2770" type="banish" />
 	</zone>
 	<zone name="oren_castle" type="CastleZone" shape="NPoly" minZ="-4246" maxZ="19931">
 		<stat name="castleId" val="4" />
@@ -157,37 +157,37 @@
 		<spawn X="82737" Y="38645" Z="-1593" />
 		<spawn X="82513" Y="38686" Z="-1593" />
 		<!-- other_restart_village_list -->
-		<spawn X="116127" Y="76015" Z="-2729" isOther="true" />
-		<spawn X="115683" Y="77610" Z="-2650" isOther="true" />
-		<spawn X="117304" Y="76318" Z="-2670" isOther="true" />
-		<spawn X="119862" Y="76603" Z="-2220" isOther="true" />
-		<spawn X="117671" Y="78998" Z="-2210" isOther="true" />
-		<spawn X="117189" Y="78952" Z="-2210" isOther="true" />
-		<spawn X="115861" Y="75200" Z="-2550" isOther="true" />
-		<spawn X="118275" Y="74859" Z="-2557" isOther="true" />
-		<spawn X="118229" Y="74677" Z="-2450" isOther="true" />
-		<spawn X="115685" Y="75072" Z="-2550" isOther="true" />
-		<spawn X="116704" Y="75695" Z="-2680" isOther="true" />
-		<spawn X="116737" Y="76738" Z="-2650" isOther="true" />
-		<spawn X="115193" Y="77594" Z="-2670" isOther="true" />
-		<spawn X="116158" Y="77443" Z="-2660" isOther="true" />
+		<spawn X="116127" Y="76015" Z="-2729" type="other" />
+		<spawn X="115683" Y="77610" Z="-2650" type="other" />
+		<spawn X="117304" Y="76318" Z="-2670" type="other" />
+		<spawn X="119862" Y="76603" Z="-2220" type="other" />
+		<spawn X="117671" Y="78998" Z="-2210" type="other" />
+		<spawn X="117189" Y="78952" Z="-2210" type="other" />
+		<spawn X="115861" Y="75200" Z="-2550" type="other" />
+		<spawn X="118275" Y="74859" Z="-2557" type="other" />
+		<spawn X="118229" Y="74677" Z="-2450" type="other" />
+		<spawn X="115685" Y="75072" Z="-2550" type="other" />
+		<spawn X="116704" Y="75695" Z="-2680" type="other" />
+		<spawn X="116737" Y="76738" Z="-2650" type="other" />
+		<spawn X="115193" Y="77594" Z="-2670" type="other" />
+		<spawn X="116158" Y="77443" Z="-2660" type="other" />
 		<!-- chao_restart_point_list -->
-		<spawn X="122098" Y="70373" Z="-2864" isChaotic="true" />
-		<spawn X="118674" Y="71218" Z="-2743" isChaotic="true" />
-		<spawn X="118040" Y="67175" Z="-2905" isChaotic="true" />
-		<spawn X="119300" Y="70660" Z="-2850" isChaotic="true" />
-		<spawn X="118851" Y="70566" Z="-2800" isChaotic="true" />
-		<spawn X="112655" Y="70976" Z="-3122" isChaotic="true" />
-		<spawn X="119712" Y="66376" Z="-2960" isChaotic="true" />
-		<spawn X="107511" Y="82890" Z="-2515" isChaotic="true" />
-		<spawn X="105702" Y="82773" Z="-2803" isChaotic="true" />
-		<spawn X="104257" Y="82194" Z="-2581" isChaotic="true" />
-		<spawn X="104474" Y="81109" Z="-2651" isChaotic="true" />
+		<spawn X="122098" Y="70373" Z="-2864" type="chaotic" />
+		<spawn X="118674" Y="71218" Z="-2743" type="chaotic" />
+		<spawn X="118040" Y="67175" Z="-2905" type="chaotic" />
+		<spawn X="119300" Y="70660" Z="-2850" type="chaotic" />
+		<spawn X="118851" Y="70566" Z="-2800" type="chaotic" />
+		<spawn X="112655" Y="70976" Z="-3122" type="chaotic" />
+		<spawn X="119712" Y="66376" Z="-2960" type="chaotic" />
+		<spawn X="107511" Y="82890" Z="-2515" type="chaotic" />
+		<spawn X="105702" Y="82773" Z="-2803" type="chaotic" />
+		<spawn X="104257" Y="82194" Z="-2581" type="chaotic" />
+		<spawn X="104474" Y="81109" Z="-2651" type="chaotic" />
 		<!-- banish_point_list -->
-		<spawn X="81353" Y="39421" Z="-2770" isBanish="true" />
-		<spawn X="81836" Y="39623" Z="-2770" isBanish="true" />
-		<spawn X="81224" Y="39749" Z="-2770" isBanish="true" />
-		<spawn X="81862" Y="40021" Z="-2770" isBanish="true" />
+		<spawn X="81353" Y="39421" Z="-2770" type="banish" />
+		<spawn X="81836" Y="39623" Z="-2770" type="banish" />
+		<spawn X="81224" Y="39749" Z="-2770" type="banish" />
+		<spawn X="81862" Y="40021" Z="-2770" type="banish" />
 	</zone>
 	<zone name="aden_castle" type="CastleZone" shape="NPoly" minZ="-4000" maxZ="8800">
 		<stat name="castleId" val="5" />
@@ -203,37 +203,37 @@
 		<spawn X="147200" Y="4350" Z="-2784" />
 		<spawn X="147705" Y="4350" Z="-2784" />
 		<!-- other_restart_village_list -->
-		<spawn X="116127" Y="76015" Z="-2729" isOther="true" />
-		<spawn X="115683" Y="77610" Z="-2650" isOther="true" />
-		<spawn X="117304" Y="76318" Z="-2670" isOther="true" />
-		<spawn X="119862" Y="76603" Z="-2220" isOther="true" />
-		<spawn X="117671" Y="78998" Z="-2210" isOther="true" />
-		<spawn X="117189" Y="78952" Z="-2210" isOther="true" />
-		<spawn X="115861" Y="75200" Z="-2550" isOther="true" />
-		<spawn X="118275" Y="74859" Z="-2557" isOther="true" />
-		<spawn X="118229" Y="74677" Z="-2450" isOther="true" />
-		<spawn X="115685" Y="75072" Z="-2550" isOther="true" />
-		<spawn X="116704" Y="75695" Z="-2680" isOther="true" />
-		<spawn X="116737" Y="76738" Z="-2650" isOther="true" />
-		<spawn X="115193" Y="77594" Z="-2670" isOther="true" />
-		<spawn X="116158" Y="77443" Z="-2660" isOther="true" />
+		<spawn X="116127" Y="76015" Z="-2729" type="other" />
+		<spawn X="115683" Y="77610" Z="-2650" type="other" />
+		<spawn X="117304" Y="76318" Z="-2670" type="other" />
+		<spawn X="119862" Y="76603" Z="-2220" type="other" />
+		<spawn X="117671" Y="78998" Z="-2210" type="other" />
+		<spawn X="117189" Y="78952" Z="-2210" type="other" />
+		<spawn X="115861" Y="75200" Z="-2550" type="other" />
+		<spawn X="118275" Y="74859" Z="-2557" type="other" />
+		<spawn X="118229" Y="74677" Z="-2450" type="other" />
+		<spawn X="115685" Y="75072" Z="-2550" type="other" />
+		<spawn X="116704" Y="75695" Z="-2680" type="other" />
+		<spawn X="116737" Y="76738" Z="-2650" type="other" />
+		<spawn X="115193" Y="77594" Z="-2670" type="other" />
+		<spawn X="116158" Y="77443" Z="-2660" type="other" />
 		<!-- chao_restart_point_list -->
-		<spawn X="122098" Y="70373" Z="-2864" isChaotic="true" />
-		<spawn X="118674" Y="71218" Z="-2743" isChaotic="true" />
-		<spawn X="118040" Y="67175" Z="-2905" isChaotic="true" />
-		<spawn X="119300" Y="70660" Z="-2850" isChaotic="true" />
-		<spawn X="118851" Y="70566" Z="-2800" isChaotic="true" />
-		<spawn X="112655" Y="70976" Z="-3122" isChaotic="true" />
-		<spawn X="119712" Y="66376" Z="-2960" isChaotic="true" />
-		<spawn X="107511" Y="82890" Z="-2515" isChaotic="true" />
-		<spawn X="105702" Y="82773" Z="-2803" isChaotic="true" />
-		<spawn X="104257" Y="82194" Z="-2581" isChaotic="true" />
-		<spawn X="104474" Y="81109" Z="-2651" isChaotic="true" />
+		<spawn X="122098" Y="70373" Z="-2864" type="chaotic" />
+		<spawn X="118674" Y="71218" Z="-2743" type="chaotic" />
+		<spawn X="118040" Y="67175" Z="-2905" type="chaotic" />
+		<spawn X="119300" Y="70660" Z="-2850" type="chaotic" />
+		<spawn X="118851" Y="70566" Z="-2800" type="chaotic" />
+		<spawn X="112655" Y="70976" Z="-3122" type="chaotic" />
+		<spawn X="119712" Y="66376" Z="-2960" type="chaotic" />
+		<spawn X="107511" Y="82890" Z="-2515" type="chaotic" />
+		<spawn X="105702" Y="82773" Z="-2803" type="chaotic" />
+		<spawn X="104257" Y="82194" Z="-2581" type="chaotic" />
+		<spawn X="104474" Y="81109" Z="-2651" type="chaotic" />
 		<!-- banish_point_list -->
-		<spawn X="151765" Y="4175" Z="-592" isBanish="true" />
-		<spawn X="151555" Y="2660" Z="-592" isBanish="true" />
-		<spawn X="151065" Y="1813" Z="-592" isBanish="true" />
-		<spawn X="150952" Y="2615" Z="-592" isBanish="true" />
+		<spawn X="151765" Y="4175" Z="-592" type="banish" />
+		<spawn X="151555" Y="2660" Z="-592" type="banish" />
+		<spawn X="151065" Y="1813" Z="-592" type="banish" />
+		<spawn X="150952" Y="2615" Z="-592" type="banish" />
 	</zone>
 	<zone name="innadrile_castle" type="CastleZone" shape="NPoly" minZ="-2742" maxZ="4000">
 		<stat name="castleId" val="6" />
@@ -248,37 +248,37 @@
 		<spawn X="114570" Y="249268" Z="-89" />
 		<spawn X="114529" Y="249044" Z="-89" />
 		<!-- other_restart_village_list -->
-		<spawn X="116127" Y="76015" Z="-2729" isOther="true" />
-		<spawn X="115683" Y="77610" Z="-2650" isOther="true" />
-		<spawn X="117304" Y="76318" Z="-2670" isOther="true" />
-		<spawn X="119862" Y="76603" Z="-2220" isOther="true" />
-		<spawn X="117671" Y="78998" Z="-2210" isOther="true" />
-		<spawn X="117189" Y="78952" Z="-2210" isOther="true" />
-		<spawn X="115861" Y="75200" Z="-2550" isOther="true" />
-		<spawn X="118275" Y="74859" Z="-2557" isOther="true" />
-		<spawn X="118229" Y="74677" Z="-2450" isOther="true" />
-		<spawn X="115685" Y="75072" Z="-2550" isOther="true" />
-		<spawn X="116704" Y="75695" Z="-2680" isOther="true" />
-		<spawn X="116737" Y="76738" Z="-2650" isOther="true" />
-		<spawn X="115193" Y="77594" Z="-2670" isOther="true" />
-		<spawn X="116158" Y="77443" Z="-2660" isOther="true" />
+		<spawn X="116127" Y="76015" Z="-2729" type="other" />
+		<spawn X="115683" Y="77610" Z="-2650" type="other" />
+		<spawn X="117304" Y="76318" Z="-2670" type="other" />
+		<spawn X="119862" Y="76603" Z="-2220" type="other" />
+		<spawn X="117671" Y="78998" Z="-2210" type="other" />
+		<spawn X="117189" Y="78952" Z="-2210" type="other" />
+		<spawn X="115861" Y="75200" Z="-2550" type="other" />
+		<spawn X="118275" Y="74859" Z="-2557" type="other" />
+		<spawn X="118229" Y="74677" Z="-2450" type="other" />
+		<spawn X="115685" Y="75072" Z="-2550" type="other" />
+		<spawn X="116704" Y="75695" Z="-2680" type="other" />
+		<spawn X="116737" Y="76738" Z="-2650" type="other" />
+		<spawn X="115193" Y="77594" Z="-2670" type="other" />
+		<spawn X="116158" Y="77443" Z="-2660" type="other" />
 		<!-- chao_restart_point_list -->
-		<spawn X="122098" Y="70373" Z="-2864" isChaotic="true" />
-		<spawn X="118674" Y="71218" Z="-2743" isChaotic="true" />
-		<spawn X="118040" Y="67175" Z="-2905" isChaotic="true" />
-		<spawn X="119300" Y="70660" Z="-2850" isChaotic="true" />
-		<spawn X="118851" Y="70566" Z="-2800" isChaotic="true" />
-		<spawn X="112655" Y="70976" Z="-3122" isChaotic="true" />
-		<spawn X="119712" Y="66376" Z="-2960" isChaotic="true" />
-		<spawn X="107511" Y="82890" Z="-2515" isChaotic="true" />
-		<spawn X="105702" Y="82773" Z="-2803" isChaotic="true" />
-		<spawn X="104257" Y="82194" Z="-2581" isChaotic="true" />
-		<spawn X="104474" Y="81109" Z="-2651" isChaotic="true" />
+		<spawn X="122098" Y="70373" Z="-2864" type="chaotic" />
+		<spawn X="118674" Y="71218" Z="-2743" type="chaotic" />
+		<spawn X="118040" Y="67175" Z="-2905" type="chaotic" />
+		<spawn X="119300" Y="70660" Z="-2850" type="chaotic" />
+		<spawn X="118851" Y="70566" Z="-2800" type="chaotic" />
+		<spawn X="112655" Y="70976" Z="-3122" type="chaotic" />
+		<spawn X="119712" Y="66376" Z="-2960" type="chaotic" />
+		<spawn X="107511" Y="82890" Z="-2515" type="chaotic" />
+		<spawn X="105702" Y="82773" Z="-2803" type="chaotic" />
+		<spawn X="104257" Y="82194" Z="-2581" type="chaotic" />
+		<spawn X="104474" Y="81109" Z="-2651" type="chaotic" />
 		<!-- banish_point_list -->
-		<spawn X="118730" Y="243416" Z="-1060" isBanish="true" />
-		<spawn X="118932" Y="242933" Z="-1060" isBanish="true" />
-		<spawn X="119058" Y="243545" Z="-1060" isBanish="true" />
-		<spawn X="119330" Y="242907" Z="-1060" isBanish="true" />
+		<spawn X="118730" Y="243416" Z="-1060" type="banish" />
+		<spawn X="118932" Y="242933" Z="-1060" type="banish" />
+		<spawn X="119058" Y="243545" Z="-1060" type="banish" />
+		<spawn X="119330" Y="242907" Z="-1060" type="banish" />
 	</zone>
 	<zone name="godad_castle" type="CastleZone" shape="NPoly" minZ="-3670" maxZ="4830">
 		<stat name="castleId" val="7" />
@@ -300,40 +300,40 @@
 		<spawn X="147408" Y="-46896" Z="-963" />
 		<spawn X="147536" Y="-46896" Z="-963" />
 		<!-- other_restart_village_list -->
-		<spawn X="38096" Y="-46976" Z="899" isOther="true" />
-		<spawn X="38608" Y="-47168" Z="899" isOther="true" />
-		<spawn X="38752" Y="-47792" Z="899" isOther="true" />
-		<spawn X="38848" Y="-48640" Z="899" isOther="true" />
-		<spawn X="38272" Y="-49008" Z="899" isOther="true" />
-		<spawn X="38112" Y="-49792" Z="899" isOther="true" />
-		<spawn X="43408" Y="-51120" Z="-800" isOther="true" />
-		<spawn X="43536" Y="-50416" Z="-800" isOther="true" />
-		<spawn X="44368" Y="-50592" Z="-800" isOther="true" />
-		<spawn X="44000" Y="-49952" Z="-800" isOther="true" />
-		<spawn X="45072" Y="-49936" Z="-800" isOther="true" />
-		<spawn X="45824" Y="-49056" Z="-800" isOther="true" />
-		<spawn X="45632" Y="-47968" Z="-800" isOther="true" />
-		<spawn X="44864" Y="-47824" Z="-800" isOther="true" />
-		<spawn X="43744" Y="-47920" Z="-800" isOther="true" />
-		<spawn X="43792" Y="-48928" Z="-800" isOther="true" />
+		<spawn X="38096" Y="-46976" Z="899" type="other" />
+		<spawn X="38608" Y="-47168" Z="899" type="other" />
+		<spawn X="38752" Y="-47792" Z="899" type="other" />
+		<spawn X="38848" Y="-48640" Z="899" type="other" />
+		<spawn X="38272" Y="-49008" Z="899" type="other" />
+		<spawn X="38112" Y="-49792" Z="899" type="other" />
+		<spawn X="43408" Y="-51120" Z="-800" type="other" />
+		<spawn X="43536" Y="-50416" Z="-800" type="other" />
+		<spawn X="44368" Y="-50592" Z="-800" type="other" />
+		<spawn X="44000" Y="-49952" Z="-800" type="other" />
+		<spawn X="45072" Y="-49936" Z="-800" type="other" />
+		<spawn X="45824" Y="-49056" Z="-800" type="other" />
+		<spawn X="45632" Y="-47968" Z="-800" type="other" />
+		<spawn X="44864" Y="-47824" Z="-800" type="other" />
+		<spawn X="43744" Y="-47920" Z="-800" type="other" />
+		<spawn X="43792" Y="-48928" Z="-800" type="other" />
 		<!-- chao_restart_point_list -->
-		<spawn X="42640" Y="-54496" Z="-2310" isChaotic="true" />
-		<spawn X="38304" Y="-55440" Z="-1136" isChaotic="true" />
-		<spawn X="40192" Y="-57600" Z="-2343" isChaotic="true" />
-		<spawn X="38400" Y="-56832" Z="-992" isChaotic="true" />
-		<spawn X="35632" Y="-54800" Z="-1744" isChaotic="true" />
-		<spawn X="36407" Y="-54245" Z="-1224" isChaotic="true" />
-		<spawn X="43936" Y="-56480" Z="-3627" isChaotic="true" />
-		<spawn X="39440" Y="-60080" Z="-2870" isChaotic="true" />
-		<spawn X="41376" Y="-55376" Z="-1488" isChaotic="true" />
-		<spawn X="41920" Y="-57760" Z="-2392" isChaotic="true" />
-		<spawn X="41409" Y="-58699" Z="-2848" isChaotic="true" />
-		<spawn X="40784" Y="-59888" Z="-2600" isChaotic="true" />
+		<spawn X="42640" Y="-54496" Z="-2310" type="chaotic" />
+		<spawn X="38304" Y="-55440" Z="-1136" type="chaotic" />
+		<spawn X="40192" Y="-57600" Z="-2343" type="chaotic" />
+		<spawn X="38400" Y="-56832" Z="-992" type="chaotic" />
+		<spawn X="35632" Y="-54800" Z="-1744" type="chaotic" />
+		<spawn X="36407" Y="-54245" Z="-1224" type="chaotic" />
+		<spawn X="43936" Y="-56480" Z="-3627" type="chaotic" />
+		<spawn X="39440" Y="-60080" Z="-2870" type="chaotic" />
+		<spawn X="41376" Y="-55376" Z="-1488" type="chaotic" />
+		<spawn X="41920" Y="-57760" Z="-2392" type="chaotic" />
+		<spawn X="41409" Y="-58699" Z="-2848" type="chaotic" />
+		<spawn X="40784" Y="-59888" Z="-2600" type="chaotic" />
 		<!-- banish_point_list -->
-		<spawn X="154848" Y="-52608" Z="-2962" isBanish="true" />
-		<spawn X="156400" Y="-53808" Z="-2873" isBanish="true" />
-		<spawn X="138439" Y="-45153" Z="-2064" isBanish="true" />
-		<spawn X="140871" Y="-55380" Z="-3224" isBanish="true" />
+		<spawn X="154848" Y="-52608" Z="-2962" type="banish" />
+		<spawn X="156400" Y="-53808" Z="-2873" type="banish" />
+		<spawn X="138439" Y="-45153" Z="-2064" type="banish" />
+		<spawn X="140871" Y="-55380" Z="-3224" type="banish" />
 	</zone>
 	<zone name="rune_castle" type="CastleZone" shape="NPoly" minZ="-3200" maxZ="10020">
 		<stat name="castleId" val="8" />
@@ -356,48 +356,48 @@
 		<spawn X="10974" Y="-49244" Z="3890" />
 		<spawn X="10658" Y="-49211" Z="3890" />
 		<!-- other_restart_village_list -->
-		<spawn X="148560" Y="-55904" Z="-2779" isOther="true" />
-		<spawn X="150704" Y="-55744" Z="-2979" isOther="true" />
-		<spawn X="150400" Y="-56752" Z="-2979" isOther="true" />
-		<spawn X="149872" Y="-57424" Z="-2979" isOther="true" />
-		<spawn X="149088" Y="-56256" Z="-2779" isOther="true" />
-		<spawn X="147664" Y="-56464" Z="-2779" isOther="true" />
-		<spawn X="147680" Y="-56928" Z="-2779" isOther="true" />
-		<spawn X="146832" Y="-55904" Z="-2779" isOther="true" />
-		<spawn X="146368" Y="-56256" Z="-2779" isOther="true" />
-		<spawn X="149120" Y="-58064" Z="-2979" isOther="true" />
-		<spawn X="148288" Y="-58304" Z="-2979" isOther="true" />
-		<spawn X="147680" Y="-58208" Z="-2979" isOther="true" />
-		<spawn X="147232" Y="-58480" Z="-2979" isOther="true" />
-		<spawn X="146272" Y="-58176" Z="-2979" isOther="true" />
-		<spawn X="145696" Y="-57696" Z="-2979" isOther="true" />
-		<spawn X="145264" Y="-57680" Z="-2979" isOther="true" />
-		<spawn X="145392" Y="-56960" Z="-2979" isOther="true" />
-		<spawn X="144752" Y="-56752" Z="-2979" isOther="true" />
-		<spawn X="144960" Y="-56224" Z="-2979" isOther="true" />
-		<spawn X="144944" Y="-55392" Z="-2979" isOther="true" />
-		<spawn X="144496" Y="-55088" Z="-2979" isOther="true" />
+		<spawn X="148560" Y="-55904" Z="-2779" type="other" />
+		<spawn X="150704" Y="-55744" Z="-2979" type="other" />
+		<spawn X="150400" Y="-56752" Z="-2979" type="other" />
+		<spawn X="149872" Y="-57424" Z="-2979" type="other" />
+		<spawn X="149088" Y="-56256" Z="-2779" type="other" />
+		<spawn X="147664" Y="-56464" Z="-2779" type="other" />
+		<spawn X="147680" Y="-56928" Z="-2779" type="other" />
+		<spawn X="146832" Y="-55904" Z="-2779" type="other" />
+		<spawn X="146368" Y="-56256" Z="-2779" type="other" />
+		<spawn X="149120" Y="-58064" Z="-2979" type="other" />
+		<spawn X="148288" Y="-58304" Z="-2979" type="other" />
+		<spawn X="147680" Y="-58208" Z="-2979" type="other" />
+		<spawn X="147232" Y="-58480" Z="-2979" type="other" />
+		<spawn X="146272" Y="-58176" Z="-2979" type="other" />
+		<spawn X="145696" Y="-57696" Z="-2979" type="other" />
+		<spawn X="145264" Y="-57680" Z="-2979" type="other" />
+		<spawn X="145392" Y="-56960" Z="-2979" type="other" />
+		<spawn X="144752" Y="-56752" Z="-2979" type="other" />
+		<spawn X="144960" Y="-56224" Z="-2979" type="other" />
+		<spawn X="144944" Y="-55392" Z="-2979" type="other" />
+		<spawn X="144496" Y="-55088" Z="-2979" type="other" />
 		<!-- chao_restart_point_list -->
-		<spawn X="142656" Y="-55008" Z="-3024" isChaotic="true" />
-		<spawn X="142832" Y="-55680" Z="-3462" isChaotic="true" />
-		<spawn X="143152" Y="-56368" Z="-3456" isChaotic="true" />
-		<spawn X="145344" Y="-59472" Z="-3344" isChaotic="true" />
-		<spawn X="145872" Y="-59744" Z="-3328" isChaotic="true" />
-		<spawn X="150304" Y="-59800" Z="-3504" isChaotic="true" />
-		<spawn X="145248" Y="-60064" Z="-3440" isChaotic="true" />
-		<spawn X="144368" Y="-59616" Z="-3512" isChaotic="true" />
-		<spawn X="149680" Y="-59600" Z="-3440" isChaotic="true" />
-		<spawn X="149360" Y="-60576" Z="-3520" isChaotic="true" />
-		<spawn X="152114" Y="-57296" Z="-3451" isChaotic="true" />
-		<spawn X="150492" Y="-59719" Z="-3611" isChaotic="true" />
-		<spawn X="148791" Y="-60361" Z="-3537" isChaotic="true" />
-		<spawn X="146499" Y="-60242" Z="-3455" isChaotic="true" />
-		<spawn X="143052" Y="-56418" Z="-3490" isChaotic="true" />
+		<spawn X="142656" Y="-55008" Z="-3024" type="chaotic" />
+		<spawn X="142832" Y="-55680" Z="-3462" type="chaotic" />
+		<spawn X="143152" Y="-56368" Z="-3456" type="chaotic" />
+		<spawn X="145344" Y="-59472" Z="-3344" type="chaotic" />
+		<spawn X="145872" Y="-59744" Z="-3328" type="chaotic" />
+		<spawn X="150304" Y="-59800" Z="-3504" type="chaotic" />
+		<spawn X="145248" Y="-60064" Z="-3440" type="chaotic" />
+		<spawn X="144368" Y="-59616" Z="-3512" type="chaotic" />
+		<spawn X="149680" Y="-59600" Z="-3440" type="chaotic" />
+		<spawn X="149360" Y="-60576" Z="-3520" type="chaotic" />
+		<spawn X="152114" Y="-57296" Z="-3451" type="chaotic" />
+		<spawn X="150492" Y="-59719" Z="-3611" type="chaotic" />
+		<spawn X="148791" Y="-60361" Z="-3537" type="chaotic" />
+		<spawn X="146499" Y="-60242" Z="-3455" type="chaotic" />
+		<spawn X="143052" Y="-56418" Z="-3490" type="chaotic" />
 		<!-- banish_point_list -->
-		<spawn X="27384" Y="-50899" Z="-1344" isBanish="true" />
-		<spawn X="28024" Y="-52804" Z="-1840" isBanish="true" />
-		<spawn X="28331" Y="-48740" Z="-1344" isBanish="true" />
-		<spawn X="29203" Y="-50908" Z="-2056" isBanish="true" />
+		<spawn X="27384" Y="-50899" Z="-1344" type="banish" />
+		<spawn X="28024" Y="-52804" Z="-1840" type="banish" />
+		<spawn X="28331" Y="-48740" Z="-1344" type="banish" />
+		<spawn X="29203" Y="-50908" Z="-2056" type="banish" />
 	</zone>
 	<zone name="schuttgart_castle" type="CastleZone" shape="NPoly" minZ="-3670" maxZ="8830">
 		<stat name="castleId" val="9" />
@@ -417,39 +417,39 @@
 		<spawn X="77575" Y="-150992" Z="770" />
 		<spawn X="77646" Y="-150441" Z="770" />
 		<!-- other_restart_village_list -->
-		<spawn X="38096" Y="-46976" Z="899" isOther="true" />
-		<spawn X="38608" Y="-47168" Z="899" isOther="true" />
-		<spawn X="38752" Y="-47792" Z="899" isOther="true" />
-		<spawn X="38848" Y="-48640" Z="899" isOther="true" />
-		<spawn X="38272" Y="-49008" Z="899" isOther="true" />
-		<spawn X="38112" Y="-49792" Z="899" isOther="true" />
-		<spawn X="43408" Y="-51120" Z="-800" isOther="true" />
-		<spawn X="43536" Y="-50416" Z="-800" isOther="true" />
-		<spawn X="44368" Y="-50592" Z="-800" isOther="true" />
-		<spawn X="44000" Y="-49952" Z="-800" isOther="true" />
-		<spawn X="45072" Y="-49936" Z="-800" isOther="true" />
-		<spawn X="45824" Y="-49056" Z="-800" isOther="true" />
-		<spawn X="45632" Y="-47968" Z="-800" isOther="true" />
-		<spawn X="44864" Y="-47824" Z="-800" isOther="true" />
-		<spawn X="43744" Y="-47920" Z="-800" isOther="true" />
-		<spawn X="43792" Y="-48928" Z="-800" isOther="true" />
+		<spawn X="38096" Y="-46976" Z="899" type="other" />
+		<spawn X="38608" Y="-47168" Z="899" type="other" />
+		<spawn X="38752" Y="-47792" Z="899" type="other" />
+		<spawn X="38848" Y="-48640" Z="899" type="other" />
+		<spawn X="38272" Y="-49008" Z="899" type="other" />
+		<spawn X="38112" Y="-49792" Z="899" type="other" />
+		<spawn X="43408" Y="-51120" Z="-800" type="other" />
+		<spawn X="43536" Y="-50416" Z="-800" type="other" />
+		<spawn X="44368" Y="-50592" Z="-800" type="other" />
+		<spawn X="44000" Y="-49952" Z="-800" type="other" />
+		<spawn X="45072" Y="-49936" Z="-800" type="other" />
+		<spawn X="45824" Y="-49056" Z="-800" type="other" />
+		<spawn X="45632" Y="-47968" Z="-800" type="other" />
+		<spawn X="44864" Y="-47824" Z="-800" type="other" />
+		<spawn X="43744" Y="-47920" Z="-800" type="other" />
+		<spawn X="43792" Y="-48928" Z="-800" type="other" />
 		<!-- chao_restart_point_list -->
-		<spawn X="42640" Y="-54496" Z="-2310" isChaotic="true" />
-		<spawn X="38304" Y="-55440" Z="-1136" isChaotic="true" />
-		<spawn X="40192" Y="-57600" Z="-2343" isChaotic="true" />
-		<spawn X="38400" Y="-56832" Z="-992" isChaotic="true" />
-		<spawn X="35632" Y="-54800" Z="-1744" isChaotic="true" />
-		<spawn X="36407" Y="-54245" Z="-1224" isChaotic="true" />
-		<spawn X="43936" Y="-56480" Z="-3627" isChaotic="true" />
-		<spawn X="39440" Y="-60080" Z="-2870" isChaotic="true" />
-		<spawn X="41376" Y="-55376" Z="-1488" isChaotic="true" />
-		<spawn X="41920" Y="-57760" Z="-2392" isChaotic="true" />
-		<spawn X="41409" Y="-58699" Z="-2848" isChaotic="true" />
-		<spawn X="40784" Y="-59888" Z="-2600" isChaotic="true" />
+		<spawn X="42640" Y="-54496" Z="-2310" type="chaotic" />
+		<spawn X="38304" Y="-55440" Z="-1136" type="chaotic" />
+		<spawn X="40192" Y="-57600" Z="-2343" type="chaotic" />
+		<spawn X="38400" Y="-56832" Z="-992" type="chaotic" />
+		<spawn X="35632" Y="-54800" Z="-1744" type="chaotic" />
+		<spawn X="36407" Y="-54245" Z="-1224" type="chaotic" />
+		<spawn X="43936" Y="-56480" Z="-3627" type="chaotic" />
+		<spawn X="39440" Y="-60080" Z="-2870" type="chaotic" />
+		<spawn X="41376" Y="-55376" Z="-1488" type="chaotic" />
+		<spawn X="41920" Y="-57760" Z="-2392" type="chaotic" />
+		<spawn X="41409" Y="-58699" Z="-2848" type="chaotic" />
+		<spawn X="40784" Y="-59888" Z="-2600" type="chaotic" />
 		<!-- banish_point_list -->
-		<spawn X="81614" Y="-150548" Z="-768" isBanish="true" />
-		<spawn X="76698" Y="-146662" Z="-920" isBanish="true" />
-		<spawn X="73717" Y="-151339" Z="-624" isBanish="true" />
-		<spawn X="75951" Y="-145789" Z="-1168" isBanish="true" />
+		<spawn X="81614" Y="-150548" Z="-768" type="banish" />
+		<spawn X="76698" Y="-146662" Z="-920" type="banish" />
+		<spawn X="73717" Y="-151339" Z="-624" type="banish" />
+		<spawn X="75951" Y="-145789" Z="-1168" type="banish" />
 	</zone>
 </list>

+ 287 - 275
L2J_DataPack_BETA/dist/game/data/zones/clan_hall_zones.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list enabled="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="zones.xsd">
 	<!-- Clan Hall Zones -->
-	<zone name="partisan_agit001" type="ClanHallZone" shape="NPoly" minZ="-2104" maxZ="-1104">
+	<zone name="partisan_agit001" type="SiegableHallZone" shape="NPoly" minZ="-2104" maxZ="-1104">
 		<stat name="clanHallId" val="21" />
 		<!-- residence_territory -->
 		<node X="43048" Y="108832" />
@@ -12,9 +12,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="43370" Y="108839" Z="-1980" />
 		<!-- other_restart_village_list -->
-		<spawn X="51952" Y="111060" Z="-1970" isOther="true" />
+		<spawn X="51952" Y="111060" Z="-1970" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="51952" Y="111060" Z="-1970" isBanish="true" />
+		<spawn X="51952" Y="111060" Z="-1970" type="banish" />
 	</zone>
 	<zone name="gludio_castle_agit_001" type="ClanHallZone" shape="NPoly" minZ="-3598" maxZ="-2098">
 		<stat name="clanHallId" val="22" />
@@ -26,9 +26,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="-16029" Y="123642" Z="-3101" />
 		<!-- other_restart_village_list -->
-		<spawn X="-15872" Y="123824" Z="-3116" isOther="true" />
+		<spawn X="-15872" Y="123824" Z="-3116" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="-15872" Y="123824" Z="-3116" isBanish="true" />
+		<spawn X="-15872" Y="123824" Z="-3116" type="banish" />
 	</zone>
 	<zone name="gludio_castle_agit_002" type="ClanHallZone" shape="NPoly" minZ="-3777" maxZ="-2277">
 		<stat name="clanHallId" val="23" />
@@ -40,9 +40,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="-14848" Y="125552" Z="-3128" />
 		<!-- other_restart_village_list -->
-		<spawn X="-14684" Y="125655" Z="-3142" isOther="true" />
+		<spawn X="-14684" Y="125655" Z="-3142" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="-14684" Y="125655" Z="-3142" isBanish="true" />
+		<spawn X="-14684" Y="125655" Z="-3142" type="banish" />
 	</zone>
 	<zone name="gludio_castle_agit_003" type="ClanHallZone" shape="NPoly" minZ="-3745" maxZ="-2245">
 		<stat name="clanHallId" val="24" />
@@ -56,9 +56,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="-13879" Y="125413" Z="-3128" />
 		<!-- other_restart_village_list -->
-		<spawn X="-14192" Y="125584" Z="-3139" isOther="true" />
+		<spawn X="-14192" Y="125584" Z="-3139" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="-14192" Y="125584" Z="-3139" isBanish="true" />
+		<spawn X="-14192" Y="125584" Z="-3139" type="banish" />
 	</zone>
 	<zone name="gludio_castle_agit_004" type="ClanHallZone" shape="NPoly" minZ="-3809" maxZ="-2309">
 		<stat name="clanHallId" val="25" />
@@ -70,9 +70,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="-12710" Y="124029" Z="-3096" />
 		<!-- other_restart_village_list -->
-		<spawn X="-12688" Y="123760" Z="-3115" isOther="true" />
+		<spawn X="-12688" Y="123760" Z="-3115" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="-12688" Y="123760" Z="-3115" isBanish="true" />
+		<spawn X="-12688" Y="123760" Z="-3115" type="banish" />
 	</zone>
 	<zone name="gludin_agit_001" type="ClanHallZone" shape="NPoly" minZ="-4076" maxZ="-2576">
 		<stat name="clanHallId" val="26" />
@@ -84,9 +84,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="-84416" Y="152192" Z="-3123" />
 		<!-- other_restart_village_list -->
-		<spawn X="-84080" Y="151744" Z="-3127" isOther="true" />
+		<spawn X="-84080" Y="151744" Z="-3127" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="-84080" Y="151744" Z="-3127" isBanish="true" />
+		<spawn X="-84080" Y="151744" Z="-3127" type="banish" />
 	</zone>
 	<zone name="gludin_agit_001" type="ClanHallZone" shape="NPoly" minZ="-4076" maxZ="-2576">
 		<stat name="clanHallId" val="26" />
@@ -100,9 +100,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="-84416" Y="152192" Z="-3123" />
 		<!-- other_restart_village_list -->
-		<spawn X="-84080" Y="151744" Z="-3127" isOther="true" />
+		<spawn X="-84080" Y="151744" Z="-3127" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="-84080" Y="151744" Z="-3127" isBanish="true" />
+		<spawn X="-84080" Y="151744" Z="-3127" type="banish" />
 	</zone>
 	<zone name="gludin_agit_002" type="ClanHallZone" shape="NPoly" minZ="-4012" maxZ="-2512">
 		<stat name="clanHallId" val="27" />
@@ -114,9 +114,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="-84171" Y="153385" Z="-3159" />
 		<!-- other_restart_village_list -->
-		<spawn X="-83860" Y="153744" Z="-3176" isOther="true" />
+		<spawn X="-83860" Y="153744" Z="-3176" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="-83860" Y="153744" Z="-3176" isBanish="true" />
+		<spawn X="-83860" Y="153744" Z="-3176" type="banish" />
 	</zone>
 	<zone name="gludin_agit_002" type="ClanHallZone" shape="NPoly" minZ="-4012" maxZ="-2512">
 		<stat name="clanHallId" val="27" />
@@ -128,9 +128,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="-84171" Y="153385" Z="-3159" />
 		<!-- other_restart_village_list -->
-		<spawn X="-83860" Y="153744" Z="-3176" isOther="true" />
+		<spawn X="-83860" Y="153744" Z="-3176" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="-83860" Y="153744" Z="-3176" isBanish="true" />
+		<spawn X="-83860" Y="153744" Z="-3176" type="banish" />
 	</zone>
 	<zone name="gludin_agit_003" type="ClanHallZone" shape="NPoly" minZ="-4044" maxZ="-2544">
 		<stat name="clanHallId" val="28" />
@@ -142,9 +142,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="-84236" Y="155520" Z="-3160" />
 		<!-- other_restart_village_list -->
-		<spawn X="-83824" Y="155216" Z="-3176" isOther="true" />
+		<spawn X="-83824" Y="155216" Z="-3176" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="-83824" Y="155216" Z="-3176" isBanish="true" />
+		<spawn X="-83824" Y="155216" Z="-3176" type="banish" />
 	</zone>
 	<zone name="gludin_agit_003" type="ClanHallZone" shape="NPoly" minZ="-4044" maxZ="-2544">
 		<stat name="clanHallId" val="28" />
@@ -156,9 +156,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="-84236" Y="155520" Z="-3160" />
 		<!-- other_restart_village_list -->
-		<spawn X="-83824" Y="155216" Z="-3176" isOther="true" />
+		<spawn X="-83824" Y="155216" Z="-3176" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="-83824" Y="155216" Z="-3176" isBanish="true" />
+		<spawn X="-83824" Y="155216" Z="-3176" type="banish" />
 	</zone>
 	<zone name="gludin_agit_004" type="ClanHallZone" shape="NPoly" minZ="-3948" maxZ="-2448">
 		<stat name="clanHallId" val="29" />
@@ -170,9 +170,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="-79544" Y="150181" Z="-3038" />
 		<!-- other_restart_village_list -->
-		<spawn X="-79856" Y="150144" Z="-3042" isOther="true" />
+		<spawn X="-79856" Y="150144" Z="-3042" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="-79856" Y="150144" Z="-3042" isBanish="true" />
+		<spawn X="-79856" Y="150144" Z="-3042" type="banish" />
 	</zone>
 	<zone name="gludin_agit_004" type="ClanHallZone" shape="NPoly" minZ="-3948" maxZ="-2448">
 		<stat name="clanHallId" val="29" />
@@ -184,9 +184,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="-79544" Y="150181" Z="-3038" />
 		<!-- other_restart_village_list -->
-		<spawn X="-79856" Y="150144" Z="-3042" isOther="true" />
+		<spawn X="-79856" Y="150144" Z="-3042" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="-79856" Y="150144" Z="-3042" isBanish="true" />
+		<spawn X="-79856" Y="150144" Z="-3042" type="banish" />
 	</zone>
 	<zone name="gludin_agit_005" type="ClanHallZone" shape="NPoly" minZ="-3980" maxZ="-2480">
 		<stat name="clanHallId" val="30" />
@@ -198,9 +198,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="-79513" Y="151506" Z="-3041" />
 		<!-- other_restart_village_list -->
-		<spawn X="-79854" Y="151602" Z="-3042" isOther="true" />
+		<spawn X="-79854" Y="151602" Z="-3042" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="-79854" Y="151602" Z="-3042" isBanish="true" />
+		<spawn X="-79854" Y="151602" Z="-3042" type="banish" />
 	</zone>
 	<zone name="gludin_agit_005" type="ClanHallZone" shape="NPoly" minZ="-3980" maxZ="-2480">
 		<stat name="clanHallId" val="30" />
@@ -212,9 +212,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="-79513" Y="151506" Z="-3041" />
 		<!-- other_restart_village_list -->
-		<spawn X="-79854" Y="151602" Z="-3042" isOther="true" />
+		<spawn X="-79854" Y="151602" Z="-3042" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="-79854" Y="151602" Z="-3042" isBanish="true" />
+		<spawn X="-79854" Y="151602" Z="-3042" type="banish" />
 	</zone>
 	<zone name="dion_castle_agit_001" type="ClanHallZone" shape="NPoly" minZ="-3365" maxZ="-1865">
 		<stat name="clanHallId" val="31" />
@@ -226,9 +226,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="17760" Y="145200" Z="-3036" />
 		<!-- other_restart_village_list -->
-		<spawn X="17552" Y="145248" Z="-3050" isOther="true" />
+		<spawn X="17552" Y="145248" Z="-3050" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="17552" Y="145248" Z="-3050" isBanish="true" />
+		<spawn X="17552" Y="145248" Z="-3050" type="banish" />
 	</zone>
 	<zone name="dion_castle_agit_002" type="ClanHallZone" shape="NPoly" minZ="-3333" maxZ="-1833">
 		<stat name="clanHallId" val="32" />
@@ -240,9 +240,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="18800" Y="143248" Z="-3010" />
 		<!-- other_restart_village_list -->
-		<spawn X="18976" Y="143360" Z="-3033" isOther="true" />
+		<spawn X="18976" Y="143360" Z="-3033" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="18976" Y="143360" Z="-3033" isBanish="true" />
+		<spawn X="18976" Y="143360" Z="-3033" type="banish" />
 	</zone>
 	<zone name="dion_castle_agit_003" type="ClanHallZone" shape="NPoly" minZ="-3397" maxZ="-1897">
 		<stat name="clanHallId" val="33" />
@@ -254,11 +254,11 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="20096" Y="146064" Z="-3111" />
 		<!-- other_restart_village_list -->
-		<spawn X="20192" Y="145920" Z="-3125" isOther="true" />
+		<spawn X="20192" Y="145920" Z="-3125" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="20192" Y="145920" Z="-3125" isBanish="true" />
+		<spawn X="20192" Y="145920" Z="-3125" type="banish" />
 	</zone>
-	<zone name="devastated_castle" type="ClanHallZone" shape="NPoly" minZ="-2514" maxZ="486">
+	<zone name="devastated_castle" type="SiegableHallZone" shape="NPoly" minZ="-2514" maxZ="486">
 		<stat name="clanHallId" val="34" />
 		<!-- residence_territory -->
 		<node X="176793" Y="-19176" />
@@ -270,35 +270,35 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="177930" Y="-18629" Z="-2240" />
 		<!-- other_restart_village_list -->
-		<spawn X="146494" Y="30584" Z="-2420" isOther="true" />
-		<spawn X="146038" Y="30519" Z="-2420" isOther="true" />
-		<spawn X="148112" Y="30439" Z="-2420" isOther="true" />
-		<spawn X="148565" Y="30463" Z="-2420" isOther="true" />
-		<spawn X="150227" Y="29104" Z="-2420" isOther="true" />
-		<spawn X="144626" Y="29145" Z="-2420" isOther="true" />
-		<spawn X="144635" Y="26664" Z="-2220" isOther="true" />
-		<spawn X="144526" Y="24661" Z="-2100" isOther="true" />
-		<spawn X="144559" Y="22835" Z="-2100" isOther="true" />
-		<spawn X="145686" Y="21114" Z="-2100" isOther="true" />
-		<spawn X="148946" Y="21121" Z="-2070" isOther="true" />
-		<spawn X="148010" Y="27996" Z="-2256" isOther="true" />
-		<spawn X="147970" Y="27040" Z="-2191" isOther="true" />
+		<spawn X="146494" Y="30584" Z="-2420" type="other" />
+		<spawn X="146038" Y="30519" Z="-2420" type="other" />
+		<spawn X="148112" Y="30439" Z="-2420" type="other" />
+		<spawn X="148565" Y="30463" Z="-2420" type="other" />
+		<spawn X="150227" Y="29104" Z="-2420" type="other" />
+		<spawn X="144626" Y="29145" Z="-2420" type="other" />
+		<spawn X="144635" Y="26664" Z="-2220" type="other" />
+		<spawn X="144526" Y="24661" Z="-2100" type="other" />
+		<spawn X="144559" Y="22835" Z="-2100" type="other" />
+		<spawn X="145686" Y="21114" Z="-2100" type="other" />
+		<spawn X="148946" Y="21121" Z="-2070" type="other" />
+		<spawn X="148010" Y="27996" Z="-2256" type="other" />
+		<spawn X="147970" Y="27040" Z="-2191" type="other" />
 		<!-- chao_restart_point_list -->
-		<spawn X="136398" Y="28901" Z="-3582" isChaotic="true" />
-		<spawn X="137292" Y="28485" Z="-3290" isChaotic="true" />
-		<spawn X="155925" Y="28554" Z="-3164" isChaotic="true" />
-		<spawn X="157608" Y="23866" Z="-3760" isChaotic="true" />
-		<spawn X="157463" Y="28770" Z="-3371" isChaotic="true" />
-		<spawn X="159348" Y="28561" Z="-3400" isChaotic="true" />
-		<spawn X="160236" Y="14119" Z="-3892" isChaotic="true" />
-		<spawn X="156764" Y="13774" Z="-3960" isChaotic="true" />
-		<spawn X="161426" Y="23055" Z="-3670" isChaotic="true" />
-		<spawn X="136380" Y="21899" Z="-3647" isChaotic="true" />
-		<spawn X="137708" Y="15640" Z="-3800" isChaotic="true" />
-		<!-- banish_point_list -->
-		<spawn X="178497" Y="-13129" Z="-2200" isBanish="true" />
-	</zone>
-	<zone name="bandits'_stronghold" type="ClanHallZone" shape="NPoly" minZ="-2920" maxZ="80">
+		<spawn X="136398" Y="28901" Z="-3582" type="chaotic" />
+		<spawn X="137292" Y="28485" Z="-3290" type="chaotic" />
+		<spawn X="155925" Y="28554" Z="-3164" type="chaotic" />
+		<spawn X="157608" Y="23866" Z="-3760" type="chaotic" />
+		<spawn X="157463" Y="28770" Z="-3371" type="chaotic" />
+		<spawn X="159348" Y="28561" Z="-3400" type="chaotic" />
+		<spawn X="160236" Y="14119" Z="-3892" type="chaotic" />
+		<spawn X="156764" Y="13774" Z="-3960" type="chaotic" />
+		<spawn X="161426" Y="23055" Z="-3670" type="chaotic" />
+		<spawn X="136380" Y="21899" Z="-3647" type="chaotic" />
+		<spawn X="137708" Y="15640" Z="-3800" type="chaotic" />
+		<!-- banish_point_list -->
+		<spawn X="178497" Y="-13129" Z="-2200" type="banish" />
+	</zone>
+	<zone name="bandits'_stronghold" type="SiegableHallZone" shape="NPoly" minZ="-2920" maxZ="80">
 		<stat name="clanHallId" val="35" />
 		<!-- residence_territory -->
 		<node X="79028" Y="-17588" />
@@ -308,54 +308,55 @@
 		<node X="79196" Y="-13584" />
 		<!-- owner_restart_point_list -->
 		<spawn X="80339" Y="-15442" Z="-1804" />
-		<spawn X="83367" Y="-18136" Z="-1247" /> <!-- Temporary battle spawn 1 -->
-		<spawn X="85268" Y="-15443" Z="-1247" /> <!-- Temporary battle spawn 2 -->
-		<spawn X="83681" Y="-14487" Z="-1249" /> <!-- Temporary battle spawn 3 -->
-		<spawn X="81831" Y="-14200" Z="-1249" /> <!-- Temporary battle spawn 4 -->
-		<spawn X="81225" Y="-17481" Z="-1249" /> <!-- Temporary battle spawn 5 -->
-		<!-- other_restart_village_list -->
-		<spawn X="80304" Y="56241" Z="-1500" isOther="true" />
-		<spawn X="80594" Y="55837" Z="-1500" isOther="true" />
-		<spawn X="79933" Y="55752" Z="-1500" isOther="true" />
-		<spawn X="80267" Y="55497" Z="-1500" isOther="true" />
-		<spawn X="80334" Y="54400" Z="-1500" isOther="true" />
-		<spawn X="82445" Y="56012" Z="-1480" isOther="true" />
-		<spawn X="82323" Y="55466" Z="-1480" isOther="true" />
-		<spawn X="82880" Y="55390" Z="-1480" isOther="true" />
-		<spawn X="82638" Y="53885" Z="-1440" isOther="true" />
-		<spawn X="82552" Y="53447" Z="-1440" isOther="true" />
-		<spawn X="82213" Y="53964" Z="-1440" isOther="true" />
-		<spawn X="80054" Y="53209" Z="-1500" isOther="true" />
-		<spawn X="79706" Y="52986" Z="-1500" isOther="true" />
-		<spawn X="82123" Y="53535" Z="-1440" isOther="true" />
+		<!-- other_restart_village_list -->
+		<spawn X="80304" Y="56241" Z="-1500" type="other" />
+		<spawn X="80594" Y="55837" Z="-1500" type="other" />
+		<spawn X="79933" Y="55752" Z="-1500" type="other" />
+		<spawn X="80267" Y="55497" Z="-1500" type="other" />
+		<spawn X="80334" Y="54400" Z="-1500" type="other" />
+		<spawn X="82445" Y="56012" Z="-1480" type="other" />
+		<spawn X="82323" Y="55466" Z="-1480" type="other" />
+		<spawn X="82880" Y="55390" Z="-1480" type="other" />
+		<spawn X="82638" Y="53885" Z="-1440" type="other" />
+		<spawn X="82552" Y="53447" Z="-1440" type="other" />
+		<spawn X="82213" Y="53964" Z="-1440" type="other" />
+		<spawn X="80054" Y="53209" Z="-1500" type="other" />
+		<spawn X="79706" Y="52986" Z="-1500" type="other" />
+		<spawn X="82123" Y="53535" Z="-1440" type="other" />
 		<!-- chao_restart_point_list -->
-		<spawn X="76576" Y="50151" Z="-3200" isChaotic="true" />
-		<spawn X="77310" Y="50317" Z="-3160" isChaotic="true" />
-		<spawn X="77250" Y="51285" Z="-3160" isChaotic="true" />
-		<spawn X="78811" Y="51106" Z="-3160" isChaotic="true" />
-		<spawn X="75755" Y="51372" Z="-3250" isChaotic="true" />
-		<spawn X="75613" Y="52504" Z="-3200" isChaotic="true" />
-		<spawn X="74459" Y="52441" Z="-3260" isChaotic="true" />
-		<spawn X="74467" Y="53354" Z="-3200" isChaotic="true" />
-		<spawn X="73600" Y="53918" Z="-3170" isChaotic="true" />
-		<spawn X="71102" Y="57875" Z="-3330" isChaotic="true" />
-		<spawn X="70052" Y="59300" Z="-3580" isChaotic="true" />
-		<spawn X="70420" Y="57480" Z="-3480" isChaotic="true" />
-		<spawn X="75474" Y="60125" Z="-2730" isChaotic="true" />
-		<spawn X="74880" Y="60818" Z="-2820" isChaotic="true" />
-		<spawn X="88011" Y="56589" Z="-3560" isChaotic="true" />
-		<spawn X="91239" Y="53120" Z="-3430" isChaotic="true" />
-		<spawn X="81785" Y="46306" Z="-3160" isChaotic="true" />
-		<spawn X="80708" Y="44609" Z="-3120" isChaotic="true" />
-		<spawn X="70139" Y="55885" Z="-3550" isChaotic="true" />
-		<spawn X="80236" Y="45675" Z="-3150" isChaotic="true" />
-		<!-- banish_point_list -->
-		<spawn X="91826" Y="-12575" Z="-2408" isBanish="true" />
-		<spawn X="92188" Y="-12927" Z="-2404" isBanish="true" />
-		<spawn X="91737" Y="-12075" Z="-2450" isBanish="true" />
-		<spawn X="91288" Y="-12467" Z="-2409" isBanish="true" />
-		<spawn X="91456" Y="-13048" Z="-2378" isBanish="true" />
-		<spawn X="91359" Y="-12094" Z="-2436" isBanish="true" />
+		<spawn X="76576" Y="50151" Z="-3200" type="chaotic" />
+		<spawn X="77310" Y="50317" Z="-3160" type="chaotic" />
+		<spawn X="77250" Y="51285" Z="-3160" type="chaotic" />
+		<spawn X="78811" Y="51106" Z="-3160" type="chaotic" />
+		<spawn X="75755" Y="51372" Z="-3250" type="chaotic" />
+		<spawn X="75613" Y="52504" Z="-3200" type="chaotic" />
+		<spawn X="74459" Y="52441" Z="-3260" type="chaotic" />
+		<spawn X="74467" Y="53354" Z="-3200" type="chaotic" />
+		<spawn X="73600" Y="53918" Z="-3170" type="chaotic" />
+		<spawn X="71102" Y="57875" Z="-3330" type="chaotic" />
+		<spawn X="70052" Y="59300" Z="-3580" type="chaotic" />
+		<spawn X="70420" Y="57480" Z="-3480" type="chaotic" />
+		<spawn X="75474" Y="60125" Z="-2730" type="chaotic" />
+		<spawn X="74880" Y="60818" Z="-2820" type="chaotic" />
+		<spawn X="88011" Y="56589" Z="-3560" type="chaotic" />
+		<spawn X="91239" Y="53120" Z="-3430" type="chaotic" />
+		<spawn X="81785" Y="46306" Z="-3160" type="chaotic" />
+		<spawn X="80708" Y="44609" Z="-3120" type="chaotic" />
+		<spawn X="70139" Y="55885" Z="-3550" type="chaotic" />
+		<spawn X="80236" Y="45675" Z="-3150" type="chaotic" />
+		<!-- banish_point_list -->
+		<spawn X="91826" Y="-12575" Z="-2408" type="banish" />
+		<spawn X="92188" Y="-12927" Z="-2404" type="banish" />
+		<spawn X="91737" Y="-12075" Z="-2450" type="banish" />
+		<spawn X="91288" Y="-12467" Z="-2409" type="banish" />
+		<spawn X="91456" Y="-13048" Z="-2378" type="banish" />
+		<spawn X="91359" Y="-12094" Z="-2436" type="banish" />
+		<!-- challenger_restart_point_list -->
+		<spawn X="83425" Y="-18137" Z="-1240" type="challenger" />
+		<spawn X="83591" Y="-14636" Z="-1240" type="challenger" />
+		<spawn X="81743" Y="-14383" Z="-1240" type="challenger" />
+		<spawn X="81357" Y="-17307" Z="-1240" type="challenger" />
+		<spawn X="85140" Y="-15541" Z="-1240" type="challenger" />
 	</zone>
 	<zone name="aden_castle_agit_001" type="ClanHallZone" shape="NPoly" minZ="-2160" maxZ="-1960">
 		<stat name="clanHallId" val="36" />
@@ -367,9 +368,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="149134" Y="23140" Z="-2160" />
 		<!-- other_restart_village_list -->
-		<spawn X="149568" Y="23024" Z="-2128" isOther="true" />
+		<spawn X="149568" Y="23024" Z="-2128" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="149568" Y="23024" Z="-2128" isBanish="true" />
+		<spawn X="149568" Y="23024" Z="-2128" type="banish" />
 	</zone>
 	<zone name="aden_castle_agit_002" type="ClanHallZone" shape="NPoly" minZ="-2150" maxZ="-1950">
 		<stat name="clanHallId" val="37" />
@@ -385,9 +386,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="150644" Y="23653" Z="-2150" />
 		<!-- other_restart_village_list -->
-		<spawn X="150192" Y="23808" Z="-2128" isOther="true" />
+		<spawn X="150192" Y="23808" Z="-2128" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="150192" Y="23808" Z="-2128" isBanish="true" />
+		<spawn X="150192" Y="23808" Z="-2128" type="banish" />
 	</zone>
 	<zone name="aden_castle_agit_003" type="ClanHallZone" shape="NPoly" minZ="-2150" maxZ="-1950">
 		<stat name="clanHallId" val="38" />
@@ -399,9 +400,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="145667" Y="25356" Z="-2150" />
 		<!-- other_restart_village_list -->
-		<spawn X="150320" Y="26368" Z="-2256" isOther="true" />
+		<spawn X="150320" Y="26368" Z="-2256" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="150320" Y="26368" Z="-2256" isBanish="true" />
+		<spawn X="150320" Y="26368" Z="-2256" type="banish" />
 	</zone>
 	<zone name="aden_castle_agit_004" type="ClanHallZone" shape="NPoly" minZ="-2280" maxZ="-2080">
 		<stat name="clanHallId" val="39" />
@@ -417,9 +418,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="150748" Y="26540" Z="-2280" />
 		<!-- other_restart_village_list -->
-		<spawn X="145280" Y="25184" Z="-2128" isOther="true" />
+		<spawn X="145280" Y="25184" Z="-2128" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="145280" Y="25184" Z="-2128" isBanish="true" />
+		<spawn X="145280" Y="25184" Z="-2128" type="banish" />
 	</zone>
 	<zone name="aden_castle_agit_005" type="ClanHallZone" shape="NPoly" minZ="-2290" maxZ="-2090">
 		<stat name="clanHallId" val="40" />
@@ -431,9 +432,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="143992" Y="27092" Z="-2290" />
 		<!-- other_restart_village_list -->
-		<spawn X="144432" Y="26896" Z="-2256" isOther="true" />
+		<spawn X="144432" Y="26896" Z="-2256" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="144432" Y="26896" Z="-2256" isBanish="true" />
+		<spawn X="144432" Y="26896" Z="-2256" type="banish" />
 	</zone>
 	<zone name="aden_castle_agit_006" type="ClanHallZone" shape="NPoly" minZ="-2280" maxZ="-2080">
 		<stat name="clanHallId" val="41" />
@@ -449,9 +450,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="144014" Y="28202" Z="-2280" />
 		<!-- other_restart_village_list -->
-		<spawn X="144448" Y="28384" Z="-2256" isOther="true" />
+		<spawn X="144448" Y="28384" Z="-2256" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="144448" Y="28384" Z="-2256" isBanish="true" />
+		<spawn X="144448" Y="28384" Z="-2256" type="banish" />
 	</zone>
 	<zone name="giran_castle_agit_001" type="ClanHallZone" shape="NPoly" minZ="-3647" maxZ="-3297">
 		<stat name="clanHallId" val="42" />
@@ -467,9 +468,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="78592" Y="148080" Z="-3581" />
 		<!-- other_restart_village_list -->
-		<spawn X="83409" Y="148578" Z="-3300" isOther="true" />
+		<spawn X="83409" Y="148578" Z="-3300" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="83409" Y="148578" Z="-3300" isBanish="true" />
+		<spawn X="83409" Y="148578" Z="-3300" type="banish" />
 	</zone>
 	<zone name="giran_castle_agit_002" type="ClanHallZone" shape="NPoly" minZ="-3647" maxZ="-3297">
 		<stat name="clanHallId" val="43" />
@@ -485,9 +486,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="82032" Y="145328" Z="-3520" />
 		<!-- other_restart_village_list -->
-		<spawn X="83409" Y="148578" Z="-3300" isOther="true" />
+		<spawn X="83409" Y="148578" Z="-3300" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="83409" Y="148578" Z="-3300" isBanish="true" />
+		<spawn X="83409" Y="148578" Z="-3300" type="banish" />
 	</zone>
 	<zone name="giran_castle_agit_003 " type="ClanHallZone" shape="NPoly" minZ="-3540" maxZ="-3190">
 		<stat name="clanHallId" val="44" />
@@ -503,9 +504,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="83392" Y="145328" Z="-3389" />
 		<!-- other_restart_village_list -->
-		<spawn X="83409" Y="148578" Z="-3300" isOther="true" />
+		<spawn X="83409" Y="148578" Z="-3300" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="83409" Y="148578" Z="-3300" isBanish="true" />
+		<spawn X="83409" Y="148578" Z="-3300" type="banish" />
 	</zone>
 	<zone name="giran_castle_agit_004" type="ClanHallZone" shape="NPoly" minZ="-3647" maxZ="-3297">
 		<stat name="clanHallId" val="45" />
@@ -521,9 +522,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="80960" Y="151600" Z="-3517" />
 		<!-- other_restart_village_list -->
-		<spawn X="83409" Y="148578" Z="-3300" isOther="true" />
+		<spawn X="83409" Y="148578" Z="-3300" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="83409" Y="148578" Z="-3300" isBanish="true" />
+		<spawn X="83409" Y="148578" Z="-3300" type="banish" />
 	</zone>
 	<zone name="giran_castle_agit_005" type="ClanHallZone" shape="NPoly" minZ="-3647" maxZ="-3297">
 		<stat name="clanHallId" val="46" />
@@ -539,9 +540,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="82064" Y="151904" Z="-3520" />
 		<!-- other_restart_village_list -->
-		<spawn X="83409" Y="148578" Z="-3300" isOther="true" />
+		<spawn X="83409" Y="148578" Z="-3300" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="83409" Y="148578" Z="-3300" isBanish="true" />
+		<spawn X="83409" Y="148578" Z="-3300" type="banish" />
 	</zone>
 	<zone name="godad_castle_agit_001" type="ClanHallZone" shape="NPoly" minZ="-2828" maxZ="-2528">
 		<stat name="clanHallId" val="47" />
@@ -553,9 +554,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="146022" Y="-55560" Z="-2765" />
 		<!-- other_restart_village_list -->
-		<spawn X="147712" Y="-58432" Z="-2979" isOther="true" />
+		<spawn X="147712" Y="-58432" Z="-2979" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="147712" Y="-58432" Z="-2979" isBanish="true" />
+		<spawn X="147712" Y="-58432" Z="-2979" type="banish" />
 	</zone>
 	<zone name="godad_castle_agit_002 " type="ClanHallZone" shape="NPoly" minZ="-2828" maxZ="-2528">
 		<stat name="clanHallId" val="48" />
@@ -567,9 +568,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="146960" Y="-56768" Z="-2765" />
 		<!-- other_restart_village_list -->
-		<spawn X="147712" Y="-58432" Z="-2979" isOther="true" />
+		<spawn X="147712" Y="-58432" Z="-2979" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="147712" Y="-58432" Z="-2979" isBanish="true" />
+		<spawn X="147712" Y="-58432" Z="-2979" type="banish" />
 	</zone>
 	<zone name="godad_castle_agit_003" type="ClanHallZone" shape="NPoly" minZ="-2828" maxZ="-2528">
 		<stat name="clanHallId" val="49" />
@@ -581,9 +582,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="148480" Y="-56848" Z="-2765" />
 		<!-- other_restart_village_list -->
-		<spawn X="147712" Y="-58432" Z="-2979" isOther="true" />
+		<spawn X="147712" Y="-58432" Z="-2979" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="147712" Y="-58432" Z="-2979" isBanish="true" />
+		<spawn X="147712" Y="-58432" Z="-2979" type="banish" />
 	</zone>
 	<zone name="godad_castle_agit_004 " type="ClanHallZone" shape="NPoly" minZ="-2828" maxZ="-2528">
 		<stat name="clanHallId" val="50" />
@@ -595,9 +596,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="149376" Y="-55568" Z="-2765" />
 		<!-- other_restart_village_list -->
-		<spawn X="147712" Y="-58432" Z="-2979" isOther="true" />
+		<spawn X="147712" Y="-58432" Z="-2979" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="147712" Y="-58432" Z="-2979" isBanish="true" />
+		<spawn X="147712" Y="-58432" Z="-2979" type="banish" />
 	</zone>
 	<zone name="rune_castle_agit_001" type="ClanHallZone" shape="NPoly" minZ="850" maxZ="1150">
 		<stat name="clanHallId" val="51" />
@@ -613,9 +614,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="37736" Y="-50777" Z="910" />
 		<!-- other_restart_village_list -->
-		<spawn X="43858" Y="-48126" Z="-792" isOther="true" />
+		<spawn X="43858" Y="-48126" Z="-792" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="43858" Y="-48126" Z="-792" isBanish="true" />
+		<spawn X="43858" Y="-48126" Z="-792" type="banish" />
 	</zone>
 	<zone name="rune_castle_agit_002" type="ClanHallZone" shape="NPoly" minZ="850" maxZ="1150">
 		<stat name="clanHallId" val="52" />
@@ -631,9 +632,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="38737" Y="-50491" Z="910" />
 		<!-- other_restart_village_list -->
-		<spawn X="43858" Y="-48126" Z="-792" isOther="true" />
+		<spawn X="43858" Y="-48126" Z="-792" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="43858" Y="-48126" Z="-792" isBanish="true" />
+		<spawn X="43858" Y="-48126" Z="-792" type="banish" />
 	</zone>
 	<zone name="rune_castle_agit_003" type="ClanHallZone" shape="NPoly" minZ="850" maxZ="1150">
 		<stat name="clanHallId" val="53" />
@@ -649,9 +650,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="39403" Y="-49668" Z="910" />
 		<!-- other_restart_village_list -->
-		<spawn X="43858" Y="-48126" Z="-792" isOther="true" />
+		<spawn X="43858" Y="-48126" Z="-792" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="43858" Y="-48126" Z="-792" isBanish="true" />
+		<spawn X="43858" Y="-48126" Z="-792" type="banish" />
 	</zone>
 	<zone name="rune_castle_agit_004" type="ClanHallZone" shape="NPoly" minZ="850" maxZ="1150">
 		<stat name="clanHallId" val="54" />
@@ -667,9 +668,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="39599" Y="-48264" Z="910" />
 		<!-- other_restart_village_list -->
-		<spawn X="43858" Y="-48126" Z="-792" isOther="true" />
+		<spawn X="43858" Y="-48126" Z="-792" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="43858" Y="-48126" Z="-792" isBanish="true" />
+		<spawn X="43858" Y="-48126" Z="-792" type="banish" />
 	</zone>
 	<zone name="rune_castle_agit_005" type="ClanHallZone" shape="NPoly" minZ="850" maxZ="1150">
 		<stat name="clanHallId" val="55" />
@@ -685,9 +686,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="39440" Y="-46806" Z="910" />
 		<!-- other_restart_village_list -->
-		<spawn X="43858" Y="-48126" Z="-792" isOther="true" />
+		<spawn X="43858" Y="-48126" Z="-792" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="43858" Y="-48126" Z="-792" isBanish="true" />
+		<spawn X="43858" Y="-48126" Z="-792" type="banish" />
 	</zone>
 	<zone name="rune_castle_agit_006" type="ClanHallZone" shape="NPoly" minZ="850" maxZ="1150">
 		<stat name="clanHallId" val="56" />
@@ -703,9 +704,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="38712" Y="-46042" Z="910" />
 		<!-- other_restart_village_list -->
-		<spawn X="43858" Y="-48126" Z="-792" isOther="true" />
+		<spawn X="43858" Y="-48126" Z="-792" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="43858" Y="-48126" Z="-792" isBanish="true" />
+		<spawn X="43858" Y="-48126" Z="-792" type="banish" />
 	</zone>
 	<zone name="rune_castle_agit_007" type="ClanHallZone" shape="NPoly" minZ="850" maxZ="1150">
 		<stat name="clanHallId" val="57" />
@@ -721,9 +722,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="37711" Y="-45723" Z="910" />
 		<!-- other_restart_village_list -->
-		<spawn X="43858" Y="-48126" Z="-792" isOther="true" />
+		<spawn X="43858" Y="-48126" Z="-792" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="43858" Y="-48126" Z="-792" isBanish="true" />
+		<spawn X="43858" Y="-48126" Z="-792" type="banish" />
 	</zone>
 	<zone name="schuttgart_castle_agit_001 " type="ClanHallZone" shape="NPoly" minZ="-1380" maxZ="-1130">
 		<stat name="clanHallId" val="58" />
@@ -735,9 +736,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="85812" Y="-143183" Z="-1230" />
 		<!-- other_restart_village_list -->
-		<spawn X="87412" Y="-139881" Z="-1536" isOther="true" />
+		<spawn X="87412" Y="-139881" Z="-1536" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="87412" Y="-139881" Z="-1536" isBanish="true" />
+		<spawn X="87412" Y="-139881" Z="-1536" type="banish" />
 	</zone>
 	<zone name="schuttgart_castle_agit_002" type="ClanHallZone" shape="NPoly" minZ="-1380" maxZ="-1130">
 		<stat name="clanHallId" val="59" />
@@ -749,9 +750,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="86609" Y="-141949" Z="-1230" />
 		<!-- other_restart_village_list -->
-		<spawn X="87412" Y="-139881" Z="-1536" isOther="true" />
+		<spawn X="87412" Y="-139881" Z="-1536" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="87412" Y="-139881" Z="-1536" isBanish="true" />
+		<spawn X="87412" Y="-139881" Z="-1536" type="banish" />
 	</zone>
 	<zone name="schuttgart_castle_agit_003" type="ClanHallZone" shape="NPoly" minZ="-1380" maxZ="-1130">
 		<stat name="clanHallId" val="60" />
@@ -763,9 +764,9 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="88093" Y="-141931" Z="-1230" />
 		<!-- other_restart_village_list -->
-		<spawn X="87412" Y="-139881" Z="-1536" isOther="true" />
+		<spawn X="87412" Y="-139881" Z="-1536" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="87412" Y="-139881" Z="-1536" isBanish="true" />
+		<spawn X="87412" Y="-139881" Z="-1536" type="banish" />
 	</zone>
 	<zone name="schuttgart_castle_agit_004" type="ClanHallZone" shape="NPoly" minZ="-1380" maxZ="-1130">
 		<stat name="clanHallId" val="61" />
@@ -777,11 +778,11 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="88901" Y="-143200" Z="-1230" />
 		<!-- other_restart_village_list -->
-		<spawn X="87412" Y="-139881" Z="-1536" isOther="true" />
+		<spawn X="87412" Y="-139881" Z="-1536" type="other" />
 		<!-- banish_point_list -->
-		<spawn X="87412" Y="-139881" Z="-1536" isBanish="true" />
+		<spawn X="87412" Y="-139881" Z="-1536" type="banish" />
 	</zone>
-	<zone name="rainbow_spring" type="ClanHallZone" shape="NPoly" minZ="-1930" maxZ="-1680">
+	<zone name="rainbow_spring" type="SiegableHallZone" shape="NPoly" minZ="-1930" maxZ="-1680">
 		<stat name="clanHallId" val="62" />
 		<!-- residence_territory -->
 		<node X="141073" Y="-125043" />
@@ -791,42 +792,52 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="140949" Y="-124658" Z="-1800" />
 		<!-- other_restart_village_list -->
-		<spawn X="148560" Y="-55904" Z="-2779" isOther="true" />
-		<spawn X="150704" Y="-55744" Z="-2979" isOther="true" />
-		<spawn X="150400" Y="-56752" Z="-2979" isOther="true" />
-		<spawn X="149872" Y="-57424" Z="-2979" isOther="true" />
-		<spawn X="149088" Y="-56256" Z="-2779" isOther="true" />
-		<spawn X="147664" Y="-56464" Z="-2779" isOther="true" />
-		<spawn X="147680" Y="-56928" Z="-2779" isOther="true" />
-		<spawn X="146832" Y="-55904" Z="-2779" isOther="true" />
-		<spawn X="146368" Y="-56256" Z="-2779" isOther="true" />
-		<spawn X="149120" Y="-58064" Z="-2979" isOther="true" />
-		<spawn X="148288" Y="-58304" Z="-2979" isOther="true" />
-		<spawn X="147680" Y="-58208" Z="-2979" isOther="true" />
-		<spawn X="147232" Y="-58480" Z="-2979" isOther="true" />
-		<spawn X="146272" Y="-58176" Z="-2979" isOther="true" />
-		<spawn X="145696" Y="-57696" Z="-2979" isOther="true" />
-		<spawn X="145264" Y="-57680" Z="-2979" isOther="true" />
+		<spawn X="148560" Y="-55904" Z="-2779" type="other" />
+		<spawn X="150704" Y="-55744" Z="-2979" type="other" />
+		<spawn X="150400" Y="-56752" Z="-2979" type="other" />
+		<spawn X="149872" Y="-57424" Z="-2979" type="other" />
+		<spawn X="149088" Y="-56256" Z="-2779" type="other" />
+		<spawn X="147664" Y="-56464" Z="-2779" type="other" />
+		<spawn X="147680" Y="-56928" Z="-2779" type="other" />
+		<spawn X="146832" Y="-55904" Z="-2779" type="other" />
+		<spawn X="146368" Y="-56256" Z="-2779" type="other" />
+		<spawn X="149120" Y="-58064" Z="-2979" type="other" />
+		<spawn X="148288" Y="-58304" Z="-2979" type="other" />
+		<spawn X="147680" Y="-58208" Z="-2979" type="other" />
+		<spawn X="147232" Y="-58480" Z="-2979" type="other" />
+		<spawn X="146272" Y="-58176" Z="-2979" type="other" />
+		<spawn X="145696" Y="-57696" Z="-2979" type="other" />
+		<spawn X="145264" Y="-57680" Z="-2979" type="other" />
 		<!-- chao_restart_point_list -->
-		<spawn X="142656" Y="-55008" Z="-3024" isChaotic="true" />
-		<spawn X="142832" Y="-55680" Z="-3462" isChaotic="true" />
-		<spawn X="143152" Y="-56368" Z="-3456" isChaotic="true" />
-		<spawn X="145344" Y="-59472" Z="-3344" isChaotic="true" />
-		<spawn X="145872" Y="-59744" Z="-3328" isChaotic="true" />
-		<spawn X="150304" Y="-59800" Z="-3504" isChaotic="true" />
-		<spawn X="145248" Y="-60064" Z="-3440" isChaotic="true" />
-		<spawn X="144368" Y="-59616" Z="-3512" isChaotic="true" />
-		<spawn X="149680" Y="-59600" Z="-3440" isChaotic="true" />
-		<spawn X="149360" Y="-60576" Z="-3520" isChaotic="true" />
-		<spawn X="152114" Y="-57296" Z="-3451" isChaotic="true" />
-		<spawn X="150492" Y="-59719" Z="-3611" isChaotic="true" />
-		<spawn X="148791" Y="-60361" Z="-3537" isChaotic="true" />
-		<spawn X="146499" Y="-60242" Z="-3455" isChaotic="true" />
-		<spawn X="143052" Y="-56418" Z="-3490" isChaotic="true" />
-		<!-- banish_point_list -->
-		<spawn X="141103" Y="-120315" Z="-2000" isBanish="true" />
-	</zone>
-	<zone name="beast_farm_guildhall" type="ClanHallZone" shape="NPoly" minZ="-1407" maxZ="-907">
+		<spawn X="142656" Y="-55008" Z="-3024" type="chaotic" />
+		<spawn X="142832" Y="-55680" Z="-3462" type="chaotic" />
+		<spawn X="143152" Y="-56368" Z="-3456" type="chaotic" />
+		<spawn X="145344" Y="-59472" Z="-3344" type="chaotic" />
+		<spawn X="145872" Y="-59744" Z="-3328" type="chaotic" />
+		<spawn X="150304" Y="-59800" Z="-3504" type="chaotic" />
+		<spawn X="145248" Y="-60064" Z="-3440" type="chaotic" />
+		<spawn X="144368" Y="-59616" Z="-3512" type="chaotic" />
+		<spawn X="149680" Y="-59600" Z="-3440" type="chaotic" />
+		<spawn X="149360" Y="-60576" Z="-3520" type="chaotic" />
+		<spawn X="152114" Y="-57296" Z="-3451" type="chaotic" />
+		<spawn X="150492" Y="-59719" Z="-3611" type="chaotic" />
+		<spawn X="148791" Y="-60361" Z="-3537" type="chaotic" />
+		<spawn X="146499" Y="-60242" Z="-3455" type="chaotic" />
+		<spawn X="143052" Y="-56418" Z="-3490" type="chaotic" />
+		<!-- banish_point_list -->
+		<spawn X="141103" Y="-120315" Z="-2000" type="banish" />
+		<!-- challenger_restart_point_list -->
+		<spawn X="153300" Y="-125491" Z="-2216" type="challenger" />
+		<spawn X="155378" Y="-126018" Z="-2216" type="challenger" />
+		<spawn X="153637" Y="-127283" Z="-2216" type="challenger" />
+		<spawn X="151742" Y="-126869" Z="-2216" type="challenger" />
+		<!-- agit_entrance_point -->
+		<spawn X="153300" Y="-125491" Z="-2216" type="entrance" />
+		<spawn X="155378" Y="-126018" Z="-2216" type="entrance" />
+		<spawn X="153637" Y="-127283" Z="-2216" type="entrance" />
+		<spawn X="151742" Y="-126869" Z="-2216" type="entrance" />
+	</zone>
+	<zone name="beast_farm_guildhall" type="SiegableHallZone" shape="NPoly" minZ="-1407" maxZ="-907">
 		<stat name="clanHallId" val="63" />
 		<!-- residence_territory -->
 		<node X="59997" Y="-96111" />
@@ -838,51 +849,52 @@
 		<node X="56049" Y="-94619" />
 		<!-- owner_restart_point_list -->
 		<spawn X="60608" Y="-94016" Z="-1349" />
-		<spawn X="60219" Y="-92396" Z="-1360" /> <!-- Temporary battle spawn 1 -->
-		<spawn X="58298" Y="-90302" Z="-1360" /> <!-- Temporary battle spawn 2 -->
-		<spawn X="55759" Y="-91603" Z="-1360" /> <!-- Temporary battle spawn 3 -->
-		<spawn X="56250" Y="-94332" Z="-1360" /> <!-- Temporary battle spawn 4 -->
-		<spawn X="58972" Y="-94795" Z="-1360" /> <!-- Temporary battle spawn 5 -->
-		<!-- other_restart_village_list -->
-		<spawn X="38096" Y="-46976" Z="899" isOther="true" />
-		<spawn X="38608" Y="-47168" Z="899" isOther="true" />
-		<spawn X="38752" Y="-47792" Z="899" isOther="true" />
-		<spawn X="38848" Y="-48640" Z="899" isOther="true" />
-		<spawn X="38272" Y="-49008" Z="899" isOther="true" />
-		<spawn X="38112" Y="-49792" Z="899" isOther="true" />
-		<spawn X="43408" Y="-51120" Z="-800" isOther="true" />
-		<spawn X="43536" Y="-50416" Z="-800" isOther="true" />
-		<spawn X="44368" Y="-50592" Z="-800" isOther="true" />
-		<spawn X="44000" Y="-49952" Z="-800" isOther="true" />
-		<spawn X="45072" Y="-49936" Z="-800" isOther="true" />
-		<spawn X="45824" Y="-49056" Z="-800" isOther="true" />
-		<spawn X="45632" Y="-47968" Z="-800" isOther="true" />
-		<spawn X="44864" Y="-47824" Z="-800" isOther="true" />
-		<spawn X="43744" Y="-47920" Z="-800" isOther="true" />
-		<spawn X="43792" Y="-48928" Z="-800" isOther="true" />
+		<!-- other_restart_village_list -->
+		<spawn X="38096" Y="-46976" Z="899" type="other" />
+		<spawn X="38608" Y="-47168" Z="899" type="other" />
+		<spawn X="38752" Y="-47792" Z="899" type="other" />
+		<spawn X="38848" Y="-48640" Z="899" type="other" />
+		<spawn X="38272" Y="-49008" Z="899" type="other" />
+		<spawn X="38112" Y="-49792" Z="899" type="other" />
+		<spawn X="43408" Y="-51120" Z="-800" type="other" />
+		<spawn X="43536" Y="-50416" Z="-800" type="other" />
+		<spawn X="44368" Y="-50592" Z="-800" type="other" />
+		<spawn X="44000" Y="-49952" Z="-800" type="other" />
+		<spawn X="45072" Y="-49936" Z="-800" type="other" />
+		<spawn X="45824" Y="-49056" Z="-800" type="other" />
+		<spawn X="45632" Y="-47968" Z="-800" type="other" />
+		<spawn X="44864" Y="-47824" Z="-800" type="other" />
+		<spawn X="43744" Y="-47920" Z="-800" type="other" />
+		<spawn X="43792" Y="-48928" Z="-800" type="other" />
 		<!-- chao_restart_point_list -->
-		<spawn X="42640" Y="-54496" Z="-2310" isChaotic="true" />
-		<spawn X="38304" Y="-55440" Z="-1136" isChaotic="true" />
-		<spawn X="40192" Y="-57600" Z="-2343" isChaotic="true" />
-		<spawn X="38400" Y="-56832" Z="-992" isChaotic="true" />
-		<spawn X="35632" Y="-54800" Z="-1744" isChaotic="true" />
-		<spawn X="37152" Y="-56272" Z="-272" isChaotic="true" />
-		<spawn X="43936" Y="-56480" Z="-3627" isChaotic="true" />
-		<spawn X="39440" Y="-60080" Z="-2870" isChaotic="true" />
-		<spawn X="41376" Y="-55376" Z="-1488" isChaotic="true" />
-		<spawn X="41920" Y="-57760" Z="-2392" isChaotic="true" />
-		<spawn X="42496" Y="-58192" Z="-3264" isChaotic="true" />
-		<spawn X="40784" Y="-59888" Z="-2600" isChaotic="true" />
-		<!-- banish_point_list -->
-		<spawn X="47552" Y="-93280" Z="-2419" isBanish="true" />
-		<spawn X="46656" Y="-93456" Z="-2469" isBanish="true" />
-		<spawn X="46999" Y="-92986" Z="-2499" isBanish="true" />
-		<spawn X="47216" Y="-93152" Z="-2464" isBanish="true" />
-		<spawn X="46836" Y="-93252" Z="-2497" isBanish="true" />
-		<spawn X="46691" Y="-92882" Z="-2528" isBanish="true" />
-		<spawn X="48128" Y="-93344" Z="-2320" isBanish="true" />
-	</zone>
-	<zone name="fortress_of_restless" type="ClanHallZone" shape="NPoly" minZ="305" maxZ="1685">
+		<spawn X="42640" Y="-54496" Z="-2310" type="chaotic" />
+		<spawn X="38304" Y="-55440" Z="-1136" type="chaotic" />
+		<spawn X="40192" Y="-57600" Z="-2343" type="chaotic" />
+		<spawn X="38400" Y="-56832" Z="-992" type="chaotic" />
+		<spawn X="35632" Y="-54800" Z="-1744" type="chaotic" />
+		<spawn X="37152" Y="-56272" Z="-272" type="chaotic" />
+		<spawn X="43936" Y="-56480" Z="-3627" type="chaotic" />
+		<spawn X="39440" Y="-60080" Z="-2870" type="chaotic" />
+		<spawn X="41376" Y="-55376" Z="-1488" type="chaotic" />
+		<spawn X="41920" Y="-57760" Z="-2392" type="chaotic" />
+		<spawn X="42496" Y="-58192" Z="-3264" type="chaotic" />
+		<spawn X="40784" Y="-59888" Z="-2600" type="chaotic" />
+		<!-- banish_point_list -->
+		<spawn X="47552" Y="-93280" Z="-2419" type="banish" />
+		<spawn X="46656" Y="-93456" Z="-2469" type="banish" />
+		<spawn X="46999" Y="-92986" Z="-2499" type="banish" />
+		<spawn X="47216" Y="-93152" Z="-2464" type="banish" />
+		<spawn X="46836" Y="-93252" Z="-2497" type="banish" />
+		<spawn X="46691" Y="-92882" Z="-2528" type="banish" />
+		<spawn X="48128" Y="-93344" Z="-2320" type="banish" />
+		<!-- challenger_restart_point_list -->
+		<spawn X="56019" Y="-91918" Z="-1360" type="challenger" />
+		<spawn X="58971" Y="-94265" Z="-1360" type="challenger" />
+		<spawn X="59860" Y="-92133" Z="-1360" type="challenger" />
+		<spawn X="57965" Y="-90683" Z="-1360" type="challenger" />
+		<spawn X="56788" Y="-94219" Z="-1360" type="challenger" />
+	</zone>
+	<zone name="fortress_of_restless" type="SiegableHallZone" shape="NPoly" minZ="305" maxZ="1685">
 		<stat name="clanHallId" val="64" />
 		<!-- residence_territory -->
 		<node X="58672" Y="-30158" />
@@ -894,36 +906,36 @@
 		<!-- owner_restart_point_list -->
 		<spawn X="57932" Y="-26064" Z="595" />
 		<!-- other_restart_village_list -->
-		<spawn X="38096" Y="-46976" Z="899" isOther="true" />
-		<spawn X="38608" Y="-47168" Z="899" isOther="true" />
-		<spawn X="38752" Y="-47792" Z="899" isOther="true" />
-		<spawn X="38848" Y="-48640" Z="899" isOther="true" />
-		<spawn X="38272" Y="-49008" Z="899" isOther="true" />
-		<spawn X="38112" Y="-49792" Z="899" isOther="true" />
-		<spawn X="43408" Y="-51120" Z="-800" isOther="true" />
-		<spawn X="43536" Y="-50416" Z="-800" isOther="true" />
-		<spawn X="44368" Y="-50592" Z="-800" isOther="true" />
-		<spawn X="44000" Y="-49952" Z="-800" isOther="true" />
-		<spawn X="45072" Y="-49936" Z="-800" isOther="true" />
-		<spawn X="45824" Y="-49056" Z="-800" isOther="true" />
-		<spawn X="45632" Y="-47968" Z="-800" isOther="true" />
-		<spawn X="44864" Y="-47824" Z="-800" isOther="true" />
-		<spawn X="43744" Y="-47920" Z="-800" isOther="true" />
-		<spawn X="43792" Y="-48928" Z="-800" isOther="true" />
+		<spawn X="38096" Y="-46976" Z="899" type="other" />
+		<spawn X="38608" Y="-47168" Z="899" type="other" />
+		<spawn X="38752" Y="-47792" Z="899" type="other" />
+		<spawn X="38848" Y="-48640" Z="899" type="other" />
+		<spawn X="38272" Y="-49008" Z="899" type="other" />
+		<spawn X="38112" Y="-49792" Z="899" type="other" />
+		<spawn X="43408" Y="-51120" Z="-800" type="other" />
+		<spawn X="43536" Y="-50416" Z="-800" type="other" />
+		<spawn X="44368" Y="-50592" Z="-800" type="other" />
+		<spawn X="44000" Y="-49952" Z="-800" type="other" />
+		<spawn X="45072" Y="-49936" Z="-800" type="other" />
+		<spawn X="45824" Y="-49056" Z="-800" type="other" />
+		<spawn X="45632" Y="-47968" Z="-800" type="other" />
+		<spawn X="44864" Y="-47824" Z="-800" type="other" />
+		<spawn X="43744" Y="-47920" Z="-800" type="other" />
+		<spawn X="43792" Y="-48928" Z="-800" type="other" />
 		<!-- chao_restart_point_list -->
-		<spawn X="42640" Y="-54496" Z="-2310" isChaotic="true" />
-		<spawn X="38304" Y="-55440" Z="-1136" isChaotic="true" />
-		<spawn X="40192" Y="-57600" Z="-2343" isChaotic="true" />
-		<spawn X="38400" Y="-56832" Z="-992" isChaotic="true" />
-		<spawn X="35632" Y="-54800" Z="-1744" isChaotic="true" />
-		<spawn X="37152" Y="-56272" Z="-272" isChaotic="true" />
-		<spawn X="43936" Y="-56480" Z="-3627" isChaotic="true" />
-		<spawn X="39440" Y="-60080" Z="-2870" isChaotic="true" />
-		<spawn X="41376" Y="-55376" Z="-1488" isChaotic="true" />
-		<spawn X="41920" Y="-57760" Z="-2392" isChaotic="true" />
-		<spawn X="42496" Y="-58192" Z="-3264" isChaotic="true" />
-		<spawn X="40784" Y="-59888" Z="-2600" isChaotic="true" />
-		<!-- banish_point_list -->
-		<spawn X="58048" Y="-32160" Z="298" isBanish="true" />
+		<spawn X="42640" Y="-54496" Z="-2310" type="chaotic" />
+		<spawn X="38304" Y="-55440" Z="-1136" type="chaotic" />
+		<spawn X="40192" Y="-57600" Z="-2343" type="chaotic" />
+		<spawn X="38400" Y="-56832" Z="-992" type="chaotic" />
+		<spawn X="35632" Y="-54800" Z="-1744" type="chaotic" />
+		<spawn X="37152" Y="-56272" Z="-272" type="chaotic" />
+		<spawn X="43936" Y="-56480" Z="-3627" type="chaotic" />
+		<spawn X="39440" Y="-60080" Z="-2870" type="chaotic" />
+		<spawn X="41376" Y="-55376" Z="-1488" type="chaotic" />
+		<spawn X="41920" Y="-57760" Z="-2392" type="chaotic" />
+		<spawn X="42496" Y="-58192" Z="-3264" type="chaotic" />
+		<spawn X="40784" Y="-59888" Z="-2600" type="chaotic" />
+		<!-- banish_point_list -->
+		<spawn X="58048" Y="-32160" Z="298" type="banish" />
 	</zone>
 </list>

+ 103 - 75
L2J_DataPack_BETA/dist/game/data/zones/clanhall_teleport_zones.xml

@@ -1,37 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list enabled="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="zones.xsd">
 	<!-- Clan Hall Teleport Zones -->
-	<zone name="bandit_stronghold_restart_territory_1" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1840" maxZ="-1540">
+		<zone name="bandit_stronghold_restart_territory_1" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1814" maxZ="-1814">
 		<stat name="residenceId" val="35" />
 		<stat name="residenceZoneId" val="0" />  <!-- Identifier inside hall's teleport zones -->
+		<node X="80773" Y="-15854" />
+		<node X="80658" Y="-15971" />
+		<node X="79700" Y="-15968" />
+		<node X="79574" Y="-15836" />
+		<node X="79574" Y="-15120" />
+		<node X="79701" Y="-14996" />
+		<node X="80658" Y="-14996" />
+		<node X="80776" Y="-15131" />
+		<spawn X="81321" Y="-15448" Z="-1824" /> <!-- Battlefield spawn zone -->
+		<spawn X="81415" Y="-15084" Z="-1824" />
+	</zone>
+	<zone name="bandit_stronghold_restart_territory_2" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1245" maxZ="-1250">
+		<stat name="residenceId" val="35" />
+		<stat name="residenceZoneId" val="1" /> 
 		<node X="83536" Y="-18012" />
 		<node X="83499" Y="-18378" />
 		<node X="83326" Y="-18455" />
 		<node X="83185" Y="-18317" />
 		<node X="83220" Y="-17986" />
-		<spawn X="83909" Y="-17481" Z="-1830" /> <!-- Battlefield spawn zone -->
+		<spawn X="83526" Y="-17596" Z="-1824" />
+		<spawn X="83754" Y="-17722" Z="-1824" />
 	</zone>
-	<zone name="bandit_stronghold_restart_territory_2" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1840" maxZ="-1540">
-		<stat name="residenceId" val="35" />
-		<stat name="residenceZoneId" val="1" />
-		<node X="84997" Y="-15613" />
-		<node X="85158" Y="-15305" />
-		<node X="85364" Y="-15270" />
-		<node X="85434" Y="-15466" />
-		<node X="85270" Y="-15764" />
-		<spawn X="84877" Y="-16048" Z="-1829" />
-	</zone>
-	<zone name="bandit_stronghold_restart_territory_3" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1840" maxZ="-1540">
+	<zone name="bandit_stronghold_restart_territory_3" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1245" maxZ="-1250">
 		<stat name="residenceId" val="35" />
 		<stat name="residenceZoneId" val="2" />
-		<node X="83463" Y="-14772" />
-		<node X="83528" Y="-14441" />
-		<node X="83713" Y="-14349" />
-		<node X="83852" Y="-14515" />
-		<node X="83778" Y="-14832" />
-		<spawn X="83025" Y="-15259" Z="-1846" />
-	</zone>
-	<zone name="bandit_stronghold_restart_territory_4" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1840" maxZ="-1540">
+		<node X="81492" Y="-17235" />
+		<node X="81361" Y="-17550" />
+		<node X="81168" Y="-17602" />
+		<node X="81071" Y="-17412" />
+		<node X="81206" Y="-17110" />
+		<spawn X="81807" Y="-17161" Z="-1816" />
+		<spawn X="82142" Y="-17288" Z="-1824" />
+	</zone>		
+	<zone name="bandit_stronghold_restart_territory_4" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1245" maxZ="-1250">
 		<stat name="residenceId" val="35" />
 		<stat name="residenceZoneId" val="3" />
 		<node X="81638" Y="-14510" />
@@ -39,56 +45,44 @@
 		<node X="81845" Y="-14058" />
 		<node X="81995" Y="-14200" />
 		<node X="81957" Y="-14541" />
-		<spawn X="81522" Y="-15206" Z="-1829" />
+		<spawn X="81944" Y="-15280" Z="-1840" />
+		<spawn X="82355" Y="-15265" Z="-1848" />
 	</zone>
-	<zone name="bandit_stronghold_restart_territory_5" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1840" maxZ="-1540">
+	<zone name="bandit_stronghold_restart_territory_5" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1245" maxZ="-1250">
 		<stat name="residenceId" val="35" />
 		<stat name="residenceZoneId" val="4" />
-		<node X="81492" Y="-17235" />
-		<node X="81361" Y="-17550" />
-		<node X="81168" Y="-17602" />
-		<node X="81071" Y="-17412" />
-		<node X="81206" Y="-17110" />
-		<spawn X="81702" Y="-16641" Z="-1846" />
+		<node X="83463" Y="-14772" />
+		<node X="83528" Y="-14441" />
+		<node X="83713" Y="-14349" />
+		<node X="83852" Y="-14515" />
+		<node X="83778" Y="-14832" />
+		<spawn X="83425" Y="-15055" Z="-1824" />
+		<spawn X="83712" Y="-15106" Z="-1816" />
+	</zone>
+	<zone name="bandit_stronghold_restart_territory_6" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1245" maxZ="-1250">
+		<stat name="residenceId" val="35" />
+		<stat name="residenceZoneId" val="5" />
+		<node X="84997" Y="-15613" />
+		<node X="85158" Y="-15305" />
+		<node X="85364" Y="-15270" />
+		<node X="85434" Y="-15466" />
+		<node X="85270" Y="-15764" />
+		<spawn X="84568" Y="-15789" Z="-1824" />
+		<spawn X="84812" Y="-15839" Z="-1816" />
 	</zone>
 	
 	<zone name="wild_beast_reserve_restart_territory_1" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1840" maxZ="-1540">
 		<stat name="residenceId" val="63" />
 		<stat name="residenceZoneId" val="0" />
-		<node X="60335" Y="-92873" />
-		<node X="59641" Y="-92960" />
-		<node X="59587" Y="-92680" />
-		<node X="59336" Y="-92708" />
-		<node X="59286" Y="-92330" />
-		<node X="59547" Y="-92304" />
-		<node X="59500" Y="-91980" />
-		<node X="60202" Y="-91869" />
-		<node X="60220" Y="-91986" />
-		<node X="60356" Y="-91987" />
-		<node X="60462" Y="-92711" />
-		<node X="60318" Y="-92759" />
-		<spawn X="59315" Y="-91798" Z="-1356" />
+		<node X="60433" Y="-93298" />
+		<node X="61245" Y="-93736" />
+		<node X="60698" Y="-94776" />
+		<node X="59883" Y="-94346" />
+		<spawn X="59020" Y="-92374" Z="-1352" />
 	</zone>
-	<zone name="wild_beast_reserve_restart_territory_2" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1360" maxZ="-1281">
+	<zone name="wild_beast_reserve_restart_territory_2" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1840" maxZ="-1540">
 		<stat name="residenceId" val="63" />
 		<stat name="residenceZoneId" val="1" />
-		<node X="58821" Y="-90419" />
-		<node X="58684" Y="-91068" />
-		<node X="58417" Y="-91047" />
-		<node X="58363" Y="-91289" />
-		<node X="57975" Y="-91224" />
-		<node X="58020" Y="-90983" />
-		<node X="57712" Y="-90910" />
-		<node X="57824" Y="-90219" />
-		<node X="57936" Y="-90243" />
-		<node X="57994" Y="-90103" />
-		<node X="58702" Y="-90225" />
-		<node X="58699" Y="-90363" />
-		<spawn X="57325" Y="-91094" Z="-1354" />
-	</zone>
-	<zone name="wild_beast_reserve_restart_territory_3" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1840" maxZ="-1540">
-		<stat name="residenceId" val="63" />
-		<stat name="residenceZoneId" val="2" />
 		<node X="55979" Y="-91116" />
 		<node X="55914" Y="-91224" />
 		<node X="56597" Y="-91452" />
@@ -101,24 +95,41 @@
 		<node X="55581" Y="-91939" />
 		<node X="55462" Y="-91837" />
 		<node X="55785" Y="-91191" />
-		<spawn X="56268" Y="-92538" Z="-1362" />
+		<spawn X="56954" Y="-92338" Z="-1360" />
+	</zone>
+		<zone name="wild_beast_reserve_restart_territory_3" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1360" maxZ="-1281">
+		<stat name="residenceId" val="63" />
+		<stat name="residenceZoneId" val="2" />
+		<node X="58821" Y="-90419" />
+		<node X="58684" Y="-91068" />
+		<node X="58417" Y="-91047" />
+		<node X="58363" Y="-91289" />
+		<node X="57975" Y="-91224" />
+		<node X="58020" Y="-90983" />
+		<node X="57712" Y="-90910" />
+		<node X="57824" Y="-90219" />
+		<node X="57936" Y="-90243" />
+		<node X="57994" Y="-90103" />
+		<node X="58702" Y="-90225" />
+		<node X="58699" Y="-90363" />
+		<spawn X="57693" Y="-91641" Z="-1360" />
 	</zone>
 	<zone name="wild_beast_reserve_restart_territory_4" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1840" maxZ="-1540">
 		<stat name="residenceId" val="63" />
 		<stat name="residenceZoneId" val="3" />
-		<node X="55844" Y="-93986" />
-		<node X="56339" Y="-93521" />
-		<node X="56530" Y="-93688" />
-		<node X="56714" Y="-93521" />
-		<node X="56994" Y="-93798" />
-		<node X="56812" Y="-93977" />
-		<node X="57035" Y="-94204" />
-		<node X="56543" Y="-94704" />
-		<node X="56472" Y="-94630" />
-		<node X="56347" Y="-94704" />
-		<node X="55834" Y="-94198" />
-		<node X="55915" Y="-94067" />
-		<spawn X="57267" Y="-93871" Z="-1371" />
+		<node X="60335" Y="-92873" />
+		<node X="59641" Y="-92960" />
+		<node X="59587" Y="-92680" />
+		<node X="59336" Y="-92708" />
+		<node X="59286" Y="-92330" />
+		<node X="59547" Y="-92304" />
+		<node X="59500" Y="-91980" />
+		<node X="60202" Y="-91869" />
+		<node X="60220" Y="-91986" />
+		<node X="60356" Y="-91987" />
+		<node X="60462" Y="-92711" />
+		<node X="60318" Y="-92759" />
+		<spawn X="58835" Y="-92432" Z="-1360" />
 	</zone>
 	<zone name="wild_beast_reserve_restart_territory_5" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1840" maxZ="-1540">
 		<stat name="residenceId" val="63" />
@@ -135,6 +146,23 @@
 		<node X="59330" Y="-94776" />
 		<node X="58674" Y="-95107" />
 		<node X="58590" Y="-94988" />
-		<spawn X="59227" Y="-93925" Z="-1360" />
+		<spawn X="58423" Y="-93505" Z="-1360" />
+	</zone>
+	<zone name="wild_beast_reserve_restart_territory_6" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1840" maxZ="-1540">
+		<stat name="residenceId" val="63" />
+		<stat name="residenceZoneId" val="5" />
+		<node X="55844" Y="-93986" />
+		<node X="56339" Y="-93521" />
+		<node X="56530" Y="-93688" />
+		<node X="56714" Y="-93521" />
+		<node X="56994" Y="-93798" />
+		<node X="56812" Y="-93977" />
+		<node X="57035" Y="-94204" />
+		<node X="56543" Y="-94704" />
+		<node X="56472" Y="-94630" />
+		<node X="56347" Y="-94704" />
+		<node X="55834" Y="-94198" />
+		<node X="55915" Y="-94067" />
+		<spawn X="57267" Y="-93405" Z="-1360" />
 	</zone>
 </list>

+ 12 - 12
L2J_DataPack_BETA/dist/game/data/zones/cleft_zone.xml

@@ -11,20 +11,20 @@
 		<node X="-223234" Y="248801" />
 		<node X="-223226" Y="241093" />
 		<!-- red_start_point -->
-		<spawn X="-222704" Y="247803" Z="1744" isRedStartPoint="true" />
-		<spawn X="-222649" Y="247945" Z="1728" isRedStartPoint="true" />
-		<spawn X="-222652" Y="247666" Z="1728" isRedStartPoint="true" />
+		<spawn X="-222704" Y="247803" Z="1744" type="redStartPoint" />
+		<spawn X="-222649" Y="247945" Z="1728" type="redStartPoint" />
+		<spawn X="-222652" Y="247666" Z="1728" type="redStartPoint" />
 		<!-- blue_start_point -->
-		<spawn X="-205312" Y="242144" Z="1744" isBlueStartPoint="true" />
-		<spawn X="-205376" Y="241997" Z="1744" isBlueStartPoint="true" />
-		<spawn X="-205376" Y="242276" Z="1744" isBlueStartPoint="true" />
+		<spawn X="-205312" Y="242144" Z="1744" type="blueStartPoint" />
+		<spawn X="-205376" Y="241997" Z="1744" type="blueStartPoint" />
+		<spawn X="-205376" Y="242276" Z="1744" type="blueStartPoint" />
 		<!-- red_banish_point -->
-		<spawn X="-223701" Y="247795" Z="1744" isRedBanishPoint="true" />
-		<spawn X="-223780" Y="247661" Z="1744" isRedBanishPoint="true" />
-		<spawn X="-223776" Y="247914" Z="1744" isRedBanishPoint="true" />
+		<spawn X="-223701" Y="247795" Z="1744" type="redBasnihPoint" />
+		<spawn X="-223780" Y="247661" Z="1744" type="redBasnihPoint" />
+		<spawn X="-223776" Y="247914" Z="1744" type="redBasnihPoint" />
 		<!-- blue_banish_point -->
-		<spawn X="-204350" Y="242148" Z="1744" isBlueBanishPoint="true" />
-		<spawn X="-204284" Y="242288" Z="1744" isBlueBanishPoint="true" />
-		<spawn X="-204288" Y="242026" Z="1728" isBlueBanishPoint="true" />
+		<spawn X="-204350" Y="242148" Z="1744" type="blueBanishPoint" />
+		<spawn X="-204284" Y="242288" Z="1744" type="blueBanishPoint" />
+		<spawn X="-204288" Y="242026" Z="1728" type="blueBanishPoint" />
 	</zone>
 </list>

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 451 - 451
L2J_DataPack_BETA/dist/game/data/zones/fortress_zones.xml


+ 286 - 286
L2J_DataPack_BETA/dist/game/data/zones/territory_war_zones.xml

@@ -14,41 +14,41 @@
 		<spawn X="-16659" Y="109261" Z="-1799" />
 		<spawn X="-16618" Y="109485" Z="-1799" />
 		<!-- other_restart_village_list -->
-		<spawn X="-81447" Y="152760" Z="-3170" isOther="true" />
-		<spawn X="-81447" Y="152880" Z="-3170" isOther="true" />
-		<spawn X="-81447" Y="152640" Z="-3170" isOther="true" />
-		<spawn X="-82186" Y="152760" Z="-3170" isOther="true" />
-		<spawn X="-82186" Y="152880" Z="-3170" isOther="true" />
-		<spawn X="-82186" Y="152640" Z="-3170" isOther="true" />
-		<spawn X="-81780" Y="152760" Z="-3170" isOther="true" />
-		<spawn X="-81780" Y="152880" Z="-3170" isOther="true" />
-		<spawn X="-81780" Y="152640" Z="-3170" isOther="true" />
+		<spawn X="-81447" Y="152760" Z="-3170" type="other" />
+		<spawn X="-81447" Y="152880" Z="-3170" type="other" />
+		<spawn X="-81447" Y="152640" Z="-3170" type="other" />
+		<spawn X="-82186" Y="152760" Z="-3170" type="other" />
+		<spawn X="-82186" Y="152880" Z="-3170" type="other" />
+		<spawn X="-82186" Y="152640" Z="-3170" type="other" />
+		<spawn X="-81780" Y="152760" Z="-3170" type="other" />
+		<spawn X="-81780" Y="152880" Z="-3170" type="other" />
+		<spawn X="-81780" Y="152640" Z="-3170" type="other" />
 		<!-- chao_restart_point_list -->
-		<spawn X="-81616" Y="157104" Z="-3150" isChaotic="true" />
-		<spawn X="-80688" Y="157216" Z="-3150" isChaotic="true" />
-		<spawn X="-79568" Y="156960" Z="-3150" isChaotic="true" />
-		<spawn X="-78800" Y="157744" Z="-3150" isChaotic="true" />
-		<spawn X="-80448" Y="157968" Z="-3130" isChaotic="true" />
-		<spawn X="-81712" Y="159536" Z="-3230" isChaotic="true" />
-		<spawn X="-79744" Y="160592" Z="-3330" isChaotic="true" />
-		<spawn X="-79584" Y="159408" Z="-3180" isChaotic="true" />
-		<spawn X="-74016" Y="150656" Z="-2800" isChaotic="true" />
-		<spawn X="-72720" Y="149632" Z="-2780" isChaotic="true" />
-		<spawn X="-75904" Y="162000" Z="-3300" isChaotic="true" />
-		<spawn X="-75488" Y="161472" Z="-3250" isChaotic="true" />
-		<spawn X="-74688" Y="160736" Z="-3200" isChaotic="true" />
-		<spawn X="-74352" Y="161488" Z="-3250" isChaotic="true" />
-		<spawn X="-76656" Y="160768" Z="-3280" isChaotic="true" />
-		<spawn X="-77472" Y="160960" Z="-3470" isChaotic="true" />
-		<spawn X="-77776" Y="158752" Z="-3270" isChaotic="true" />
-		<spawn X="-80448" Y="161488" Z="-3420" isChaotic="true" />
-		<spawn X="-75440" Y="162672" Z="-3350" isChaotic="true" />
-		<spawn X="-81760" Y="161248" Z="-3200" isChaotic="true" />
+		<spawn X="-81616" Y="157104" Z="-3150" type="chaotic" />
+		<spawn X="-80688" Y="157216" Z="-3150" type="chaotic" />
+		<spawn X="-79568" Y="156960" Z="-3150" type="chaotic" />
+		<spawn X="-78800" Y="157744" Z="-3150" type="chaotic" />
+		<spawn X="-80448" Y="157968" Z="-3130" type="chaotic" />
+		<spawn X="-81712" Y="159536" Z="-3230" type="chaotic" />
+		<spawn X="-79744" Y="160592" Z="-3330" type="chaotic" />
+		<spawn X="-79584" Y="159408" Z="-3180" type="chaotic" />
+		<spawn X="-74016" Y="150656" Z="-2800" type="chaotic" />
+		<spawn X="-72720" Y="149632" Z="-2780" type="chaotic" />
+		<spawn X="-75904" Y="162000" Z="-3300" type="chaotic" />
+		<spawn X="-75488" Y="161472" Z="-3250" type="chaotic" />
+		<spawn X="-74688" Y="160736" Z="-3200" type="chaotic" />
+		<spawn X="-74352" Y="161488" Z="-3250" type="chaotic" />
+		<spawn X="-76656" Y="160768" Z="-3280" type="chaotic" />
+		<spawn X="-77472" Y="160960" Z="-3470" type="chaotic" />
+		<spawn X="-77776" Y="158752" Z="-3270" type="chaotic" />
+		<spawn X="-80448" Y="161488" Z="-3420" type="chaotic" />
+		<spawn X="-75440" Y="162672" Z="-3350" type="chaotic" />
+		<spawn X="-81760" Y="161248" Z="-3200" type="chaotic" />
 		<!-- banish_point_list -->
-		<spawn X="-15881" Y="110651" Z="-2770" isBanish="true" />
-		<spawn X="-15679" Y="110168" Z="-2770" isBanish="true" />
-		<spawn X="-15553" Y="110780" Z="-2770" isBanish="true" />
-		<spawn X="-15281" Y="110142" Z="-2770" isBanish="true" />
+		<spawn X="-15881" Y="110651" Z="-2770" type="banish" />
+		<spawn X="-15679" Y="110168" Z="-2770" type="banish" />
+		<spawn X="-15553" Y="110780" Z="-2770" type="banish" />
+		<spawn X="-15281" Y="110142" Z="-2770" type="banish" />
 	</zone>
 	<zone name="dion_dominion" type="TerritoryWarZone" shape="NPoly" minZ="-4646" maxZ="4000">
 		<stat name="territoryId" val="82" />
@@ -63,41 +63,41 @@
 		<spawn X="20619" Y="160489" Z="-1993" />
 		<spawn X="20578" Y="160265" Z="-1993" />
 		<!-- other_restart_village_list -->
-		<spawn X="-81447" Y="152760" Z="-3170" isOther="true" />
-		<spawn X="-81447" Y="152880" Z="-3170" isOther="true" />
-		<spawn X="-81447" Y="152640" Z="-3170" isOther="true" />
-		<spawn X="-82186" Y="152760" Z="-3170" isOther="true" />
-		<spawn X="-82186" Y="152880" Z="-3170" isOther="true" />
-		<spawn X="-82186" Y="152640" Z="-3170" isOther="true" />
-		<spawn X="-81780" Y="152760" Z="-3170" isOther="true" />
-		<spawn X="-81780" Y="152880" Z="-3170" isOther="true" />
-		<spawn X="-81780" Y="152640" Z="-3170" isOther="true" />
+		<spawn X="-81447" Y="152760" Z="-3170" type="other" />
+		<spawn X="-81447" Y="152880" Z="-3170" type="other" />
+		<spawn X="-81447" Y="152640" Z="-3170" type="other" />
+		<spawn X="-82186" Y="152760" Z="-3170" type="other" />
+		<spawn X="-82186" Y="152880" Z="-3170" type="other" />
+		<spawn X="-82186" Y="152640" Z="-3170" type="other" />
+		<spawn X="-81780" Y="152760" Z="-3170" type="other" />
+		<spawn X="-81780" Y="152880" Z="-3170" type="other" />
+		<spawn X="-81780" Y="152640" Z="-3170" type="other" />
 		<!-- chao_restart_point_list -->
-		<spawn X="-81616" Y="157104" Z="-3150" isChaotic="true" />
-		<spawn X="-80688" Y="157216" Z="-3150" isChaotic="true" />
-		<spawn X="-79568" Y="156960" Z="-3150" isChaotic="true" />
-		<spawn X="-78800" Y="157744" Z="-3150" isChaotic="true" />
-		<spawn X="-80448" Y="157968" Z="-3130" isChaotic="true" />
-		<spawn X="-81712" Y="159536" Z="-3230" isChaotic="true" />
-		<spawn X="-79744" Y="160592" Z="-3330" isChaotic="true" />
-		<spawn X="-79584" Y="159408" Z="-3180" isChaotic="true" />
-		<spawn X="-74016" Y="150656" Z="-2800" isChaotic="true" />
-		<spawn X="-72720" Y="149632" Z="-2780" isChaotic="true" />
-		<spawn X="-75904" Y="162000" Z="-3300" isChaotic="true" />
-		<spawn X="-75488" Y="161472" Z="-3250" isChaotic="true" />
-		<spawn X="-74688" Y="160736" Z="-3200" isChaotic="true" />
-		<spawn X="-74352" Y="161488" Z="-3250" isChaotic="true" />
-		<spawn X="-76656" Y="160768" Z="-3280" isChaotic="true" />
-		<spawn X="-77472" Y="160960" Z="-3470" isChaotic="true" />
-		<spawn X="-77776" Y="158752" Z="-3270" isChaotic="true" />
-		<spawn X="-80448" Y="161488" Z="-3420" isChaotic="true" />
-		<spawn X="-75440" Y="162672" Z="-3350" isChaotic="true" />
-		<spawn X="-81760" Y="161248" Z="-3200" isChaotic="true" />
+		<spawn X="-81616" Y="157104" Z="-3150" type="chaotic" />
+		<spawn X="-80688" Y="157216" Z="-3150" type="chaotic" />
+		<spawn X="-79568" Y="156960" Z="-3150" type="chaotic" />
+		<spawn X="-78800" Y="157744" Z="-3150" type="chaotic" />
+		<spawn X="-80448" Y="157968" Z="-3130" type="chaotic" />
+		<spawn X="-81712" Y="159536" Z="-3230" type="chaotic" />
+		<spawn X="-79744" Y="160592" Z="-3330" type="chaotic" />
+		<spawn X="-79584" Y="159408" Z="-3180" type="chaotic" />
+		<spawn X="-74016" Y="150656" Z="-2800" type="chaotic" />
+		<spawn X="-72720" Y="149632" Z="-2780" type="chaotic" />
+		<spawn X="-75904" Y="162000" Z="-3300" type="chaotic" />
+		<spawn X="-75488" Y="161472" Z="-3250" type="chaotic" />
+		<spawn X="-74688" Y="160736" Z="-3200" type="chaotic" />
+		<spawn X="-74352" Y="161488" Z="-3250" type="chaotic" />
+		<spawn X="-76656" Y="160768" Z="-3280" type="chaotic" />
+		<spawn X="-77472" Y="160960" Z="-3470" type="chaotic" />
+		<spawn X="-77776" Y="158752" Z="-3270" type="chaotic" />
+		<spawn X="-80448" Y="161488" Z="-3420" type="chaotic" />
+		<spawn X="-75440" Y="162672" Z="-3350" type="chaotic" />
+		<spawn X="-81760" Y="161248" Z="-3200" type="chaotic" />
 		<!-- banish_point_list -->
-		<spawn X="19852" Y="159170" Z="-2770" isBanish="true" />
-		<spawn X="19650" Y="159653" Z="-2770" isBanish="true" />
-		<spawn X="19524" Y="159041" Z="-2770" isBanish="true" />
-		<spawn X="19252" Y="159679" Z="-2770" isBanish="true" />
+		<spawn X="19852" Y="159170" Z="-2770" type="banish" />
+		<spawn X="19650" Y="159653" Z="-2770" type="banish" />
+		<spawn X="19524" Y="159041" Z="-2770" type="banish" />
+		<spawn X="19252" Y="159679" Z="-2770" type="banish" />
 	</zone>
 	<zone name="giran_dominion" type="TerritoryWarZone" shape="NPoly" minZ="-4519" maxZ="19931">
 		<stat name="territoryId" val="83" />
@@ -112,37 +112,37 @@
 		<spawn X="116661" Y="146550" Z="-1866" />
 		<spawn X="116437" Y="146591" Z="-1866" />
 		<!-- other_restart_village_list -->
-		<spawn X="116127" Y="76015" Z="-2729" isOther="true" />
-		<spawn X="115683" Y="77610" Z="-2650" isOther="true" />
-		<spawn X="117304" Y="76318" Z="-2670" isOther="true" />
-		<spawn X="119862" Y="76603" Z="-2220" isOther="true" />
-		<spawn X="117671" Y="78998" Z="-2210" isOther="true" />
-		<spawn X="117189" Y="78952" Z="-2210" isOther="true" />
-		<spawn X="115861" Y="75200" Z="-2550" isOther="true" />
-		<spawn X="118275" Y="74859" Z="-2557" isOther="true" />
-		<spawn X="118229" Y="74677" Z="-2450" isOther="true" />
-		<spawn X="115685" Y="75072" Z="-2550" isOther="true" />
-		<spawn X="116704" Y="75695" Z="-2680" isOther="true" />
-		<spawn X="116737" Y="76738" Z="-2650" isOther="true" />
-		<spawn X="115193" Y="77594" Z="-2670" isOther="true" />
-		<spawn X="116158" Y="77443" Z="-2660" isOther="true" />
+		<spawn X="116127" Y="76015" Z="-2729" type="other" />
+		<spawn X="115683" Y="77610" Z="-2650" type="other" />
+		<spawn X="117304" Y="76318" Z="-2670" type="other" />
+		<spawn X="119862" Y="76603" Z="-2220" type="other" />
+		<spawn X="117671" Y="78998" Z="-2210" type="other" />
+		<spawn X="117189" Y="78952" Z="-2210" type="other" />
+		<spawn X="115861" Y="75200" Z="-2550" type="other" />
+		<spawn X="118275" Y="74859" Z="-2557" type="other" />
+		<spawn X="118229" Y="74677" Z="-2450" type="other" />
+		<spawn X="115685" Y="75072" Z="-2550" type="other" />
+		<spawn X="116704" Y="75695" Z="-2680" type="other" />
+		<spawn X="116737" Y="76738" Z="-2650" type="other" />
+		<spawn X="115193" Y="77594" Z="-2670" type="other" />
+		<spawn X="116158" Y="77443" Z="-2660" type="other" />
 		<!-- chao_restart_point_list -->
-		<spawn X="122098" Y="70373" Z="-2864" isChaotic="true" />
-		<spawn X="118674" Y="71218" Z="-2743" isChaotic="true" />
-		<spawn X="118040" Y="67175" Z="-2905" isChaotic="true" />
-		<spawn X="119300" Y="70660" Z="-2850" isChaotic="true" />
-		<spawn X="118851" Y="70566" Z="-2800" isChaotic="true" />
-		<spawn X="112655" Y="70976" Z="-3122" isChaotic="true" />
-		<spawn X="119712" Y="66376" Z="-2960" isChaotic="true" />
-		<spawn X="107511" Y="82890" Z="-2515" isChaotic="true" />
-		<spawn X="105702" Y="82773" Z="-2803" isChaotic="true" />
-		<spawn X="104257" Y="82194" Z="-2581" isChaotic="true" />
-		<spawn X="104474" Y="81109" Z="-2651" isChaotic="true" />
+		<spawn X="122098" Y="70373" Z="-2864" type="chaotic" />
+		<spawn X="118674" Y="71218" Z="-2743" type="chaotic" />
+		<spawn X="118040" Y="67175" Z="-2905" type="chaotic" />
+		<spawn X="119300" Y="70660" Z="-2850" type="chaotic" />
+		<spawn X="118851" Y="70566" Z="-2800" type="chaotic" />
+		<spawn X="112655" Y="70976" Z="-3122" type="chaotic" />
+		<spawn X="119712" Y="66376" Z="-2960" type="chaotic" />
+		<spawn X="107511" Y="82890" Z="-2515" type="chaotic" />
+		<spawn X="105702" Y="82773" Z="-2803" type="chaotic" />
+		<spawn X="104257" Y="82194" Z="-2581" type="chaotic" />
+		<spawn X="104474" Y="81109" Z="-2651" type="chaotic" />
 		<!-- banish_point_list -->
-		<spawn X="115275" Y="147273" Z="-2770" isBanish="true" />
-		<spawn X="115758" Y="147475" Z="-2770" isBanish="true" />
-		<spawn X="115146" Y="147601" Z="-2770" isBanish="true" />
-		<spawn X="115784" Y="147873" Z="-2770" isBanish="true" />
+		<spawn X="115275" Y="147273" Z="-2770" type="banish" />
+		<spawn X="115758" Y="147475" Z="-2770" type="banish" />
+		<spawn X="115146" Y="147601" Z="-2770" type="banish" />
+		<spawn X="115784" Y="147873" Z="-2770" type="banish" />
 	</zone>
 	<zone name="oren_dominion" type="TerritoryWarZone" shape="NPoly" minZ="-4246" maxZ="19931">
 		<stat name="territoryId" val="84" />
@@ -157,37 +157,37 @@
 		<spawn X="82737" Y="38645" Z="-1593" />
 		<spawn X="82513" Y="38686" Z="-1593" />
 		<!-- other_restart_village_list -->
-		<spawn X="116127" Y="76015" Z="-2729" isOther="true" />
-		<spawn X="115683" Y="77610" Z="-2650" isOther="true" />
-		<spawn X="117304" Y="76318" Z="-2670" isOther="true" />
-		<spawn X="119862" Y="76603" Z="-2220" isOther="true" />
-		<spawn X="117671" Y="78998" Z="-2210" isOther="true" />
-		<spawn X="117189" Y="78952" Z="-2210" isOther="true" />
-		<spawn X="115861" Y="75200" Z="-2550" isOther="true" />
-		<spawn X="118275" Y="74859" Z="-2557" isOther="true" />
-		<spawn X="118229" Y="74677" Z="-2450" isOther="true" />
-		<spawn X="115685" Y="75072" Z="-2550" isOther="true" />
-		<spawn X="116704" Y="75695" Z="-2680" isOther="true" />
-		<spawn X="116737" Y="76738" Z="-2650" isOther="true" />
-		<spawn X="115193" Y="77594" Z="-2670" isOther="true" />
-		<spawn X="116158" Y="77443" Z="-2660" isOther="true" />
+		<spawn X="116127" Y="76015" Z="-2729" type="other" />
+		<spawn X="115683" Y="77610" Z="-2650" type="other" />
+		<spawn X="117304" Y="76318" Z="-2670" type="other" />
+		<spawn X="119862" Y="76603" Z="-2220" type="other" />
+		<spawn X="117671" Y="78998" Z="-2210" type="other" />
+		<spawn X="117189" Y="78952" Z="-2210" type="other" />
+		<spawn X="115861" Y="75200" Z="-2550" type="other" />
+		<spawn X="118275" Y="74859" Z="-2557" type="other" />
+		<spawn X="118229" Y="74677" Z="-2450" type="other" />
+		<spawn X="115685" Y="75072" Z="-2550" type="other" />
+		<spawn X="116704" Y="75695" Z="-2680" type="other" />
+		<spawn X="116737" Y="76738" Z="-2650" type="other" />
+		<spawn X="115193" Y="77594" Z="-2670" type="other" />
+		<spawn X="116158" Y="77443" Z="-2660" type="other" />
 		<!-- chao_restart_point_list -->
-		<spawn X="122098" Y="70373" Z="-2864" isChaotic="true" />
-		<spawn X="118674" Y="71218" Z="-2743" isChaotic="true" />
-		<spawn X="118040" Y="67175" Z="-2905" isChaotic="true" />
-		<spawn X="119300" Y="70660" Z="-2850" isChaotic="true" />
-		<spawn X="118851" Y="70566" Z="-2800" isChaotic="true" />
-		<spawn X="112655" Y="70976" Z="-3122" isChaotic="true" />
-		<spawn X="119712" Y="66376" Z="-2960" isChaotic="true" />
-		<spawn X="107511" Y="82890" Z="-2515" isChaotic="true" />
-		<spawn X="105702" Y="82773" Z="-2803" isChaotic="true" />
-		<spawn X="104257" Y="82194" Z="-2581" isChaotic="true" />
-		<spawn X="104474" Y="81109" Z="-2651" isChaotic="true" />
+		<spawn X="122098" Y="70373" Z="-2864" type="chaotic" />
+		<spawn X="118674" Y="71218" Z="-2743" type="chaotic" />
+		<spawn X="118040" Y="67175" Z="-2905" type="chaotic" />
+		<spawn X="119300" Y="70660" Z="-2850" type="chaotic" />
+		<spawn X="118851" Y="70566" Z="-2800" type="chaotic" />
+		<spawn X="112655" Y="70976" Z="-3122" type="chaotic" />
+		<spawn X="119712" Y="66376" Z="-2960" type="chaotic" />
+		<spawn X="107511" Y="82890" Z="-2515" type="chaotic" />
+		<spawn X="105702" Y="82773" Z="-2803" type="chaotic" />
+		<spawn X="104257" Y="82194" Z="-2581" type="chaotic" />
+		<spawn X="104474" Y="81109" Z="-2651" type="chaotic" />
 		<!-- banish_point_list -->
-		<spawn X="81353" Y="39421" Z="-2770" isBanish="true" />
-		<spawn X="81836" Y="39623" Z="-2770" isBanish="true" />
-		<spawn X="81224" Y="39749" Z="-2770" isBanish="true" />
-		<spawn X="81862" Y="40021" Z="-2770" isBanish="true" />
+		<spawn X="81353" Y="39421" Z="-2770" type="banish" />
+		<spawn X="81836" Y="39623" Z="-2770" type="banish" />
+		<spawn X="81224" Y="39749" Z="-2770" type="banish" />
+		<spawn X="81862" Y="40021" Z="-2770" type="banish" />
 	</zone>
 	<zone name="aden_dominion" type="TerritoryWarZone" shape="NPoly" minZ="-4000" maxZ="8800">
 		<stat name="territoryId" val="85" />
@@ -203,37 +203,37 @@
 		<spawn X="147200" Y="4350" Z="-2784" />
 		<spawn X="147705" Y="4350" Z="-2784" />
 		<!-- other_restart_village_list -->
-		<spawn X="116127" Y="76015" Z="-2729" isOther="true" />
-		<spawn X="115683" Y="77610" Z="-2650" isOther="true" />
-		<spawn X="117304" Y="76318" Z="-2670" isOther="true" />
-		<spawn X="119862" Y="76603" Z="-2220" isOther="true" />
-		<spawn X="117671" Y="78998" Z="-2210" isOther="true" />
-		<spawn X="117189" Y="78952" Z="-2210" isOther="true" />
-		<spawn X="115861" Y="75200" Z="-2550" isOther="true" />
-		<spawn X="118275" Y="74859" Z="-2557" isOther="true" />
-		<spawn X="118229" Y="74677" Z="-2450" isOther="true" />
-		<spawn X="115685" Y="75072" Z="-2550" isOther="true" />
-		<spawn X="116704" Y="75695" Z="-2680" isOther="true" />
-		<spawn X="116737" Y="76738" Z="-2650" isOther="true" />
-		<spawn X="115193" Y="77594" Z="-2670" isOther="true" />
-		<spawn X="116158" Y="77443" Z="-2660" isOther="true" />
+		<spawn X="116127" Y="76015" Z="-2729" type="other" />
+		<spawn X="115683" Y="77610" Z="-2650" type="other" />
+		<spawn X="117304" Y="76318" Z="-2670" type="other" />
+		<spawn X="119862" Y="76603" Z="-2220" type="other" />
+		<spawn X="117671" Y="78998" Z="-2210" type="other" />
+		<spawn X="117189" Y="78952" Z="-2210" type="other" />
+		<spawn X="115861" Y="75200" Z="-2550" type="other" />
+		<spawn X="118275" Y="74859" Z="-2557" type="other" />
+		<spawn X="118229" Y="74677" Z="-2450" type="other" />
+		<spawn X="115685" Y="75072" Z="-2550" type="other" />
+		<spawn X="116704" Y="75695" Z="-2680" type="other" />
+		<spawn X="116737" Y="76738" Z="-2650" type="other" />
+		<spawn X="115193" Y="77594" Z="-2670" type="other" />
+		<spawn X="116158" Y="77443" Z="-2660" type="other" />
 		<!-- chao_restart_point_list -->
-		<spawn X="122098" Y="70373" Z="-2864" isChaotic="true" />
-		<spawn X="118674" Y="71218" Z="-2743" isChaotic="true" />
-		<spawn X="118040" Y="67175" Z="-2905" isChaotic="true" />
-		<spawn X="119300" Y="70660" Z="-2850" isChaotic="true" />
-		<spawn X="118851" Y="70566" Z="-2800" isChaotic="true" />
-		<spawn X="112655" Y="70976" Z="-3122" isChaotic="true" />
-		<spawn X="119712" Y="66376" Z="-2960" isChaotic="true" />
-		<spawn X="107511" Y="82890" Z="-2515" isChaotic="true" />
-		<spawn X="105702" Y="82773" Z="-2803" isChaotic="true" />
-		<spawn X="104257" Y="82194" Z="-2581" isChaotic="true" />
-		<spawn X="104474" Y="81109" Z="-2651" isChaotic="true" />
+		<spawn X="122098" Y="70373" Z="-2864" type="chaotic" />
+		<spawn X="118674" Y="71218" Z="-2743" type="chaotic" />
+		<spawn X="118040" Y="67175" Z="-2905" type="chaotic" />
+		<spawn X="119300" Y="70660" Z="-2850" type="chaotic" />
+		<spawn X="118851" Y="70566" Z="-2800" type="chaotic" />
+		<spawn X="112655" Y="70976" Z="-3122" type="chaotic" />
+		<spawn X="119712" Y="66376" Z="-2960" type="chaotic" />
+		<spawn X="107511" Y="82890" Z="-2515" type="chaotic" />
+		<spawn X="105702" Y="82773" Z="-2803" type="chaotic" />
+		<spawn X="104257" Y="82194" Z="-2581" type="chaotic" />
+		<spawn X="104474" Y="81109" Z="-2651" type="chaotic" />
 		<!-- banish_point_list -->
-		<spawn X="151765" Y="4175" Z="-592" isBanish="true" />
-		<spawn X="151555" Y="2660" Z="-592" isBanish="true" />
-		<spawn X="151065" Y="1813" Z="-592" isBanish="true" />
-		<spawn X="150952" Y="2615" Z="-592" isBanish="true" />
+		<spawn X="151765" Y="4175" Z="-592" type="banish" />
+		<spawn X="151555" Y="2660" Z="-592" type="banish" />
+		<spawn X="151065" Y="1813" Z="-592" type="banish" />
+		<spawn X="150952" Y="2615" Z="-592" type="banish" />
 	</zone>
 	<zone name="innadrile_dominion" type="TerritoryWarZone" shape="NPoly" minZ="-2742" maxZ="4000">
 		<stat name="territoryId" val="86" />
@@ -248,37 +248,37 @@
 		<spawn X="114570" Y="249268" Z="-89" />
 		<spawn X="114529" Y="249044" Z="-89" />
 		<!-- other_restart_village_list -->
-		<spawn X="116127" Y="76015" Z="-2729" isOther="true" />
-		<spawn X="115683" Y="77610" Z="-2650" isOther="true" />
-		<spawn X="117304" Y="76318" Z="-2670" isOther="true" />
-		<spawn X="119862" Y="76603" Z="-2220" isOther="true" />
-		<spawn X="117671" Y="78998" Z="-2210" isOther="true" />
-		<spawn X="117189" Y="78952" Z="-2210" isOther="true" />
-		<spawn X="115861" Y="75200" Z="-2550" isOther="true" />
-		<spawn X="118275" Y="74859" Z="-2557" isOther="true" />
-		<spawn X="118229" Y="74677" Z="-2450" isOther="true" />
-		<spawn X="115685" Y="75072" Z="-2550" isOther="true" />
-		<spawn X="116704" Y="75695" Z="-2680" isOther="true" />
-		<spawn X="116737" Y="76738" Z="-2650" isOther="true" />
-		<spawn X="115193" Y="77594" Z="-2670" isOther="true" />
-		<spawn X="116158" Y="77443" Z="-2660" isOther="true" />
+		<spawn X="116127" Y="76015" Z="-2729" type="other" />
+		<spawn X="115683" Y="77610" Z="-2650" type="other" />
+		<spawn X="117304" Y="76318" Z="-2670" type="other" />
+		<spawn X="119862" Y="76603" Z="-2220" type="other" />
+		<spawn X="117671" Y="78998" Z="-2210" type="other" />
+		<spawn X="117189" Y="78952" Z="-2210" type="other" />
+		<spawn X="115861" Y="75200" Z="-2550" type="other" />
+		<spawn X="118275" Y="74859" Z="-2557" type="other" />
+		<spawn X="118229" Y="74677" Z="-2450" type="other" />
+		<spawn X="115685" Y="75072" Z="-2550" type="other" />
+		<spawn X="116704" Y="75695" Z="-2680" type="other" />
+		<spawn X="116737" Y="76738" Z="-2650" type="other" />
+		<spawn X="115193" Y="77594" Z="-2670" type="other" />
+		<spawn X="116158" Y="77443" Z="-2660" type="other" />
 		<!-- chao_restart_point_list -->
-		<spawn X="122098" Y="70373" Z="-2864" isChaotic="true" />
-		<spawn X="118674" Y="71218" Z="-2743" isChaotic="true" />
-		<spawn X="118040" Y="67175" Z="-2905" isChaotic="true" />
-		<spawn X="119300" Y="70660" Z="-2850" isChaotic="true" />
-		<spawn X="118851" Y="70566" Z="-2800" isChaotic="true" />
-		<spawn X="112655" Y="70976" Z="-3122" isChaotic="true" />
-		<spawn X="119712" Y="66376" Z="-2960" isChaotic="true" />
-		<spawn X="107511" Y="82890" Z="-2515" isChaotic="true" />
-		<spawn X="105702" Y="82773" Z="-2803" isChaotic="true" />
-		<spawn X="104257" Y="82194" Z="-2581" isChaotic="true" />
-		<spawn X="104474" Y="81109" Z="-2651" isChaotic="true" />
+		<spawn X="122098" Y="70373" Z="-2864" type="chaotic" />
+		<spawn X="118674" Y="71218" Z="-2743" type="chaotic" />
+		<spawn X="118040" Y="67175" Z="-2905" type="chaotic" />
+		<spawn X="119300" Y="70660" Z="-2850" type="chaotic" />
+		<spawn X="118851" Y="70566" Z="-2800" type="chaotic" />
+		<spawn X="112655" Y="70976" Z="-3122" type="chaotic" />
+		<spawn X="119712" Y="66376" Z="-2960" type="chaotic" />
+		<spawn X="107511" Y="82890" Z="-2515" type="chaotic" />
+		<spawn X="105702" Y="82773" Z="-2803" type="chaotic" />
+		<spawn X="104257" Y="82194" Z="-2581" type="chaotic" />
+		<spawn X="104474" Y="81109" Z="-2651" type="chaotic" />
 		<!-- banish_point_list -->
-		<spawn X="118730" Y="243416" Z="-1060" isBanish="true" />
-		<spawn X="118932" Y="242933" Z="-1060" isBanish="true" />
-		<spawn X="119058" Y="243545" Z="-1060" isBanish="true" />
-		<spawn X="119330" Y="242907" Z="-1060" isBanish="true" />
+		<spawn X="118730" Y="243416" Z="-1060" type="banish" />
+		<spawn X="118932" Y="242933" Z="-1060" type="banish" />
+		<spawn X="119058" Y="243545" Z="-1060" type="banish" />
+		<spawn X="119330" Y="242907" Z="-1060" type="banish" />
 	</zone>
 	<zone name="godad_dominion" type="TerritoryWarZone" shape="NPoly" minZ="-3670" maxZ="4830">
 		<stat name="territoryId" val="87" />
@@ -309,40 +309,40 @@
 		<spawn X="147408" Y="-46896" Z="-963" />
 		<spawn X="147536" Y="-46896" Z="-963" />
 		<!-- other_restart_village_list -->
-		<spawn X="38096" Y="-46976" Z="899" isOther="true" />
-		<spawn X="38608" Y="-47168" Z="899" isOther="true" />
-		<spawn X="38752" Y="-47792" Z="899" isOther="true" />
-		<spawn X="38848" Y="-48640" Z="899" isOther="true" />
-		<spawn X="38272" Y="-49008" Z="899" isOther="true" />
-		<spawn X="38112" Y="-49792" Z="899" isOther="true" />
-		<spawn X="43408" Y="-51120" Z="-800" isOther="true" />
-		<spawn X="43536" Y="-50416" Z="-800" isOther="true" />
-		<spawn X="44368" Y="-50592" Z="-800" isOther="true" />
-		<spawn X="44000" Y="-49952" Z="-800" isOther="true" />
-		<spawn X="45072" Y="-49936" Z="-800" isOther="true" />
-		<spawn X="45824" Y="-49056" Z="-800" isOther="true" />
-		<spawn X="45632" Y="-47968" Z="-800" isOther="true" />
-		<spawn X="44864" Y="-47824" Z="-800" isOther="true" />
-		<spawn X="43744" Y="-47920" Z="-800" isOther="true" />
-		<spawn X="43792" Y="-48928" Z="-800" isOther="true" />
+		<spawn X="38096" Y="-46976" Z="899" type="other" />
+		<spawn X="38608" Y="-47168" Z="899" type="other" />
+		<spawn X="38752" Y="-47792" Z="899" type="other" />
+		<spawn X="38848" Y="-48640" Z="899" type="other" />
+		<spawn X="38272" Y="-49008" Z="899" type="other" />
+		<spawn X="38112" Y="-49792" Z="899" type="other" />
+		<spawn X="43408" Y="-51120" Z="-800" type="other" />
+		<spawn X="43536" Y="-50416" Z="-800" type="other" />
+		<spawn X="44368" Y="-50592" Z="-800" type="other" />
+		<spawn X="44000" Y="-49952" Z="-800" type="other" />
+		<spawn X="45072" Y="-49936" Z="-800" type="other" />
+		<spawn X="45824" Y="-49056" Z="-800" type="other" />
+		<spawn X="45632" Y="-47968" Z="-800" type="other" />
+		<spawn X="44864" Y="-47824" Z="-800" type="other" />
+		<spawn X="43744" Y="-47920" Z="-800" type="other" />
+		<spawn X="43792" Y="-48928" Z="-800" type="other" />
 		<!-- chao_restart_point_list -->
-		<spawn X="42640" Y="-54496" Z="-2310" isChaotic="true" />
-		<spawn X="38304" Y="-55440" Z="-1136" isChaotic="true" />
-		<spawn X="40192" Y="-57600" Z="-2343" isChaotic="true" />
-		<spawn X="38400" Y="-56832" Z="-992" isChaotic="true" />
-		<spawn X="35632" Y="-54800" Z="-1744" isChaotic="true" />
-		<spawn X="36407" Y="-54245" Z="-1224" isChaotic="true" />
-		<spawn X="43936" Y="-56480" Z="-3627" isChaotic="true" />
-		<spawn X="39440" Y="-60080" Z="-2870" isChaotic="true" />
-		<spawn X="41376" Y="-55376" Z="-1488" isChaotic="true" />
-		<spawn X="41920" Y="-57760" Z="-2392" isChaotic="true" />
-		<spawn X="41409" Y="-58699" Z="-2848" isChaotic="true" />
-		<spawn X="40784" Y="-59888" Z="-2600" isChaotic="true" />
+		<spawn X="42640" Y="-54496" Z="-2310" type="chaotic" />
+		<spawn X="38304" Y="-55440" Z="-1136" type="chaotic" />
+		<spawn X="40192" Y="-57600" Z="-2343" type="chaotic" />
+		<spawn X="38400" Y="-56832" Z="-992" type="chaotic" />
+		<spawn X="35632" Y="-54800" Z="-1744" type="chaotic" />
+		<spawn X="36407" Y="-54245" Z="-1224" type="chaotic" />
+		<spawn X="43936" Y="-56480" Z="-3627" type="chaotic" />
+		<spawn X="39440" Y="-60080" Z="-2870" type="chaotic" />
+		<spawn X="41376" Y="-55376" Z="-1488" type="chaotic" />
+		<spawn X="41920" Y="-57760" Z="-2392" type="chaotic" />
+		<spawn X="41409" Y="-58699" Z="-2848" type="chaotic" />
+		<spawn X="40784" Y="-59888" Z="-2600" type="chaotic" />
 		<!-- banish_point_list -->
-		<spawn X="154848" Y="-52608" Z="-2962" isBanish="true" />
-		<spawn X="156400" Y="-53808" Z="-2873" isBanish="true" />
-		<spawn X="138439" Y="-45153" Z="-2064" isBanish="true" />
-		<spawn X="140871" Y="-55380" Z="-3224" isBanish="true" />
+		<spawn X="154848" Y="-52608" Z="-2962" type="banish" />
+		<spawn X="156400" Y="-53808" Z="-2873" type="banish" />
+		<spawn X="138439" Y="-45153" Z="-2064" type="banish" />
+		<spawn X="140871" Y="-55380" Z="-3224" type="banish" />
 	</zone>
 	<zone name="rune_dominion" type="TerritoryWarZone" shape="NPoly" minZ="-3200" maxZ="10020">
 		<stat name="territoryId" val="88" />
@@ -365,48 +365,48 @@
 		<spawn X="10974" Y="-49244" Z="3890" />
 		<spawn X="10658" Y="-49211" Z="3890" />
 		<!-- other_restart_village_list -->
-		<spawn X="148560" Y="-55904" Z="-2779" isOther="true" />
-		<spawn X="150704" Y="-55744" Z="-2979" isOther="true" />
-		<spawn X="150400" Y="-56752" Z="-2979" isOther="true" />
-		<spawn X="149872" Y="-57424" Z="-2979" isOther="true" />
-		<spawn X="149088" Y="-56256" Z="-2779" isOther="true" />
-		<spawn X="147664" Y="-56464" Z="-2779" isOther="true" />
-		<spawn X="147680" Y="-56928" Z="-2779" isOther="true" />
-		<spawn X="146832" Y="-55904" Z="-2779" isOther="true" />
-		<spawn X="146368" Y="-56256" Z="-2779" isOther="true" />
-		<spawn X="149120" Y="-58064" Z="-2979" isOther="true" />
-		<spawn X="148288" Y="-58304" Z="-2979" isOther="true" />
-		<spawn X="147680" Y="-58208" Z="-2979" isOther="true" />
-		<spawn X="147232" Y="-58480" Z="-2979" isOther="true" />
-		<spawn X="146272" Y="-58176" Z="-2979" isOther="true" />
-		<spawn X="145696" Y="-57696" Z="-2979" isOther="true" />
-		<spawn X="145264" Y="-57680" Z="-2979" isOther="true" />
-		<spawn X="145392" Y="-56960" Z="-2979" isOther="true" />
-		<spawn X="144752" Y="-56752" Z="-2979" isOther="true" />
-		<spawn X="144960" Y="-56224" Z="-2979" isOther="true" />
-		<spawn X="144944" Y="-55392" Z="-2979" isOther="true" />
-		<spawn X="144496" Y="-55088" Z="-2979" isOther="true" />
+		<spawn X="148560" Y="-55904" Z="-2779" type="other" />
+		<spawn X="150704" Y="-55744" Z="-2979" type="other" />
+		<spawn X="150400" Y="-56752" Z="-2979" type="other" />
+		<spawn X="149872" Y="-57424" Z="-2979" type="other" />
+		<spawn X="149088" Y="-56256" Z="-2779" type="other" />
+		<spawn X="147664" Y="-56464" Z="-2779" type="other" />
+		<spawn X="147680" Y="-56928" Z="-2779" type="other" />
+		<spawn X="146832" Y="-55904" Z="-2779" type="other" />
+		<spawn X="146368" Y="-56256" Z="-2779" type="other" />
+		<spawn X="149120" Y="-58064" Z="-2979" type="other" />
+		<spawn X="148288" Y="-58304" Z="-2979" type="other" />
+		<spawn X="147680" Y="-58208" Z="-2979" type="other" />
+		<spawn X="147232" Y="-58480" Z="-2979" type="other" />
+		<spawn X="146272" Y="-58176" Z="-2979" type="other" />
+		<spawn X="145696" Y="-57696" Z="-2979" type="other" />
+		<spawn X="145264" Y="-57680" Z="-2979" type="other" />
+		<spawn X="145392" Y="-56960" Z="-2979" type="other" />
+		<spawn X="144752" Y="-56752" Z="-2979" type="other" />
+		<spawn X="144960" Y="-56224" Z="-2979" type="other" />
+		<spawn X="144944" Y="-55392" Z="-2979" type="other" />
+		<spawn X="144496" Y="-55088" Z="-2979" type="other" />
 		<!-- chao_restart_point_list -->
-		<spawn X="142656" Y="-55008" Z="-3024" isChaotic="true" />
-		<spawn X="142832" Y="-55680" Z="-3462" isChaotic="true" />
-		<spawn X="143152" Y="-56368" Z="-3456" isChaotic="true" />
-		<spawn X="145344" Y="-59472" Z="-3344" isChaotic="true" />
-		<spawn X="145872" Y="-59744" Z="-3328" isChaotic="true" />
-		<spawn X="150304" Y="-59800" Z="-3504" isChaotic="true" />
-		<spawn X="145248" Y="-60064" Z="-3440" isChaotic="true" />
-		<spawn X="144368" Y="-59616" Z="-3512" isChaotic="true" />
-		<spawn X="149680" Y="-59600" Z="-3440" isChaotic="true" />
-		<spawn X="149360" Y="-60576" Z="-3520" isChaotic="true" />
-		<spawn X="152114" Y="-57296" Z="-3451" isChaotic="true" />
-		<spawn X="150492" Y="-59719" Z="-3611" isChaotic="true" />
-		<spawn X="148791" Y="-60361" Z="-3537" isChaotic="true" />
-		<spawn X="146499" Y="-60242" Z="-3455" isChaotic="true" />
-		<spawn X="143052" Y="-56418" Z="-3490" isChaotic="true" />
+		<spawn X="142656" Y="-55008" Z="-3024" type="chaotic" />
+		<spawn X="142832" Y="-55680" Z="-3462" type="chaotic" />
+		<spawn X="143152" Y="-56368" Z="-3456" type="chaotic" />
+		<spawn X="145344" Y="-59472" Z="-3344" type="chaotic" />
+		<spawn X="145872" Y="-59744" Z="-3328" type="chaotic" />
+		<spawn X="150304" Y="-59800" Z="-3504" type="chaotic" />
+		<spawn X="145248" Y="-60064" Z="-3440" type="chaotic" />
+		<spawn X="144368" Y="-59616" Z="-3512" type="chaotic" />
+		<spawn X="149680" Y="-59600" Z="-3440" type="chaotic" />
+		<spawn X="149360" Y="-60576" Z="-3520" type="chaotic" />
+		<spawn X="152114" Y="-57296" Z="-3451" type="chaotic" />
+		<spawn X="150492" Y="-59719" Z="-3611" type="chaotic" />
+		<spawn X="148791" Y="-60361" Z="-3537" type="chaotic" />
+		<spawn X="146499" Y="-60242" Z="-3455" type="chaotic" />
+		<spawn X="143052" Y="-56418" Z="-3490" type="chaotic" />
 		<!-- banish_point_list -->
-		<spawn X="27384" Y="-50899" Z="-1344" isBanish="true" />
-		<spawn X="28024" Y="-52804" Z="-1840" isBanish="true" />
-		<spawn X="28331" Y="-48740" Z="-1344" isBanish="true" />
-		<spawn X="29203" Y="-50908" Z="-2056" isBanish="true" />
+		<spawn X="27384" Y="-50899" Z="-1344" type="banish" />
+		<spawn X="28024" Y="-52804" Z="-1840" type="banish" />
+		<spawn X="28331" Y="-48740" Z="-1344" type="banish" />
+		<spawn X="29203" Y="-50908" Z="-2056" type="banish" />
 	</zone>
 	<zone name="schuttgart_dominion" type="TerritoryWarZone" shape="NPoly" minZ="-3670" maxZ="8830">
 		<stat name="territoryId" val="89" />
@@ -433,39 +433,39 @@
 		<spawn X="77575" Y="-150992" Z="770" />
 		<spawn X="77646" Y="-150441" Z="770" />
 		<!-- other_restart_village_list -->
-		<spawn X="38096" Y="-46976" Z="899" isOther="true" />
-		<spawn X="38608" Y="-47168" Z="899" isOther="true" />
-		<spawn X="38752" Y="-47792" Z="899" isOther="true" />
-		<spawn X="38848" Y="-48640" Z="899" isOther="true" />
-		<spawn X="38272" Y="-49008" Z="899" isOther="true" />
-		<spawn X="38112" Y="-49792" Z="899" isOther="true" />
-		<spawn X="43408" Y="-51120" Z="-800" isOther="true" />
-		<spawn X="43536" Y="-50416" Z="-800" isOther="true" />
-		<spawn X="44368" Y="-50592" Z="-800" isOther="true" />
-		<spawn X="44000" Y="-49952" Z="-800" isOther="true" />
-		<spawn X="45072" Y="-49936" Z="-800" isOther="true" />
-		<spawn X="45824" Y="-49056" Z="-800" isOther="true" />
-		<spawn X="45632" Y="-47968" Z="-800" isOther="true" />
-		<spawn X="44864" Y="-47824" Z="-800" isOther="true" />
-		<spawn X="43744" Y="-47920" Z="-800" isOther="true" />
-		<spawn X="43792" Y="-48928" Z="-800" isOther="true" />
+		<spawn X="38096" Y="-46976" Z="899" type="other" />
+		<spawn X="38608" Y="-47168" Z="899" type="other" />
+		<spawn X="38752" Y="-47792" Z="899" type="other" />
+		<spawn X="38848" Y="-48640" Z="899" type="other" />
+		<spawn X="38272" Y="-49008" Z="899" type="other" />
+		<spawn X="38112" Y="-49792" Z="899" type="other" />
+		<spawn X="43408" Y="-51120" Z="-800" type="other" />
+		<spawn X="43536" Y="-50416" Z="-800" type="other" />
+		<spawn X="44368" Y="-50592" Z="-800" type="other" />
+		<spawn X="44000" Y="-49952" Z="-800" type="other" />
+		<spawn X="45072" Y="-49936" Z="-800" type="other" />
+		<spawn X="45824" Y="-49056" Z="-800" type="other" />
+		<spawn X="45632" Y="-47968" Z="-800" type="other" />
+		<spawn X="44864" Y="-47824" Z="-800" type="other" />
+		<spawn X="43744" Y="-47920" Z="-800" type="other" />
+		<spawn X="43792" Y="-48928" Z="-800" type="other" />
 		<!-- chao_restart_point_list -->
-		<spawn X="42640" Y="-54496" Z="-2310" isChaotic="true" />
-		<spawn X="38304" Y="-55440" Z="-1136" isChaotic="true" />
-		<spawn X="40192" Y="-57600" Z="-2343" isChaotic="true" />
-		<spawn X="38400" Y="-56832" Z="-992" isChaotic="true" />
-		<spawn X="35632" Y="-54800" Z="-1744" isChaotic="true" />
-		<spawn X="36407" Y="-54245" Z="-1224" isChaotic="true" />
-		<spawn X="43936" Y="-56480" Z="-3627" isChaotic="true" />
-		<spawn X="39440" Y="-60080" Z="-2870" isChaotic="true" />
-		<spawn X="41376" Y="-55376" Z="-1488" isChaotic="true" />
-		<spawn X="41920" Y="-57760" Z="-2392" isChaotic="true" />
-		<spawn X="41409" Y="-58699" Z="-2848" isChaotic="true" />
-		<spawn X="40784" Y="-59888" Z="-2600" isChaotic="true" />
+		<spawn X="42640" Y="-54496" Z="-2310" type="chaotic" />
+		<spawn X="38304" Y="-55440" Z="-1136" type="chaotic" />
+		<spawn X="40192" Y="-57600" Z="-2343" type="chaotic" />
+		<spawn X="38400" Y="-56832" Z="-992" type="chaotic" />
+		<spawn X="35632" Y="-54800" Z="-1744" type="chaotic" />
+		<spawn X="36407" Y="-54245" Z="-1224" type="chaotic" />
+		<spawn X="43936" Y="-56480" Z="-3627" type="chaotic" />
+		<spawn X="39440" Y="-60080" Z="-2870" type="chaotic" />
+		<spawn X="41376" Y="-55376" Z="-1488" type="chaotic" />
+		<spawn X="41920" Y="-57760" Z="-2392" type="chaotic" />
+		<spawn X="41409" Y="-58699" Z="-2848" type="chaotic" />
+		<spawn X="40784" Y="-59888" Z="-2600" type="chaotic" />
 		<!-- banish_point_list -->
-		<spawn X="81614" Y="-150548" Z="-768" isBanish="true" />
-		<spawn X="76698" Y="-146662" Z="-920" isBanish="true" />
-		<spawn X="73717" Y="-151339" Z="-624" isBanish="true" />
-		<spawn X="75951" Y="-145789" Z="-1168" isBanish="true" />
+		<spawn X="81614" Y="-150548" Z="-768" type="banish" />
+		<spawn X="76698" Y="-146662" Z="-920" type="banish" />
+		<spawn X="73717" Y="-151339" Z="-624" type="banish" />
+		<spawn X="75951" Y="-145789" Z="-1168" type="banish" />
 	</zone>
 </list>

+ 12 - 10
L2J_DataPack_BETA/dist/sql/game/clanhall_siege_guards.sql

@@ -399,19 +399,21 @@ INSERT INTO `clanhall_siege_guards` VALUES
 
 INSERT INTO `clanhall_siege_guards` VALUES
 -- Bandit Stronghold
-(35,35561,83341,-18309,-1247,16102,1200,'false'),
-(35,35562,85190,-15583,-1247,11451,1200,'false'),
-(35,35563,83654,-14663,-1247,12309,1200,'false'),
-(35,35564,81809,-14375,-1247,14954,1200,'false'),
-(35,35565,81299,-17283,-1247,46120,1200,'false');
+(35,35560,79745,-15472,-1792,0,1200,'false'),
+(35,35561,83348,-18267,-1248,14536,1200,'false'),
+(35,35562,81258,-17387,-1248,11144,1200,'false'),
+(35,35563,81832,-14223,-1248,-17664,1200,'false'),
+(35,35564,83687,-14532,-1248,-19008,1200,'false'),
+(35,35565,85263,-15447,-1248,-21328,1200,'false');
 
 INSERT INTO `clanhall_siege_guards` VALUES
 -- Beast Farm
-(63,35613,59785,-92481,-1360,1093,1200,'false'),
-(63,35614,58270,-90756,-1360,14325,1200,'false'),
-(63,35615,56203,-91740,-1360,25072,1200,'false'),
-(63,35616,56450,-94020,-1360,39350,1200,'false'),
-(63,35617,58706,-94427,-1360,53417,1200,'false');
+(63,35612,60606,-93984,-1344,0,1200,'false'),
+(63,35613,56098,-91770,-1360,0,1200,'false'),
+(63,35614,58276,-90672,-1360,0,1200,'false'),
+(63,35615,59970,-92422,-1360,0,1200,'false'),
+(63,35616,58783,-94540,-1360,0,1200,'false'),
+(63,35617,56415,-94126,-1360,0,1200,'false');
 
 INSERT INTO `clanhall_siege_guards` VALUES
 -- Fortress of the Dead

+ 13 - 13
L2J_DataPack_BETA/dist/sql/game/npc.sql

@@ -9334,11 +9334,11 @@ INSERT INTO `npc` VALUES
 (35420,35420,'Loken',0,'Messenger',0,'LineageMonster.human_ghost','8','22',75,'male','L2SiegeNpc',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,0,0,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,74,0,0,80,1,1,1,0,1),
 (35421,35421,'Biggerstaff',0,'Steward',0,'LineageMonster.elf_ghost','7','21',75,'male','L2ClanHallManager',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,0,0,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,80,1,1,1,0,1),
 (35422,35422,'Flag of Winner',0,'',0,'LineageDeco.azit_a','100','72',75,'etc','L2Npc',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,563,10,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,50,120,1,1,0,1),
-(35423,35423,'Red Flag',0,'',0,'LineageDeco.azit_b','75','55',75,'etc','L2Monster',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,563,10,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,50,120,1,1,0,1),
-(35424,35424,'Yellow Flag',0,'',0,'LineageDeco.azit_b','75','55',75,'etc','L2Monster',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,563,10,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,50,120,1,1,0,1),
-(35425,35425,'Green Flag',0,'',0,'LineageDeco.azit_b','75','55',75,'etc','L2Monster',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,563,10,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,50,120,1,1,0,1),
-(35426,35426,'Blue Flag',0,'',0,'LineageDeco.azit_b','75','55',75,'etc','L2Monster',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,563,10,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,50,120,1,1,0,1),
-(35427,35427,'Purple Flag',0,'',0,'LineageDeco.azit_b','75','55',75,'etc','L2Monster',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,563,10,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,50,120,1,1,0,1),
+(35423,35423,'Red Flag',0,'',0,'LineageDeco.azit_b','75','55',75,'etc','L2Npc',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,563,10,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,50,120,1,1,0,1),
+(35424,35424,'Yellow Flag',0,'',0,'LineageDeco.azit_b','75','55',75,'etc','L2Npc',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,563,10,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,50,120,1,1,0,1),
+(35425,35425,'Green Flag',0,'',0,'LineageDeco.azit_b','75','55',75,'etc','L2Npc',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,563,10,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,50,120,1,1,0,1),
+(35426,35426,'Blue Flag',0,'',0,'LineageDeco.azit_b','75','55',75,'etc','L2Npc',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,563,10,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,50,120,1,1,0,1),
+(35427,35427,'Purple Flag',0,'',0,'LineageDeco.azit_b','75','55',75,'etc','L2Npc',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,563,10,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,50,120,1,1,0,1),
 (35428,35428,'Oel Mahum Berserker',0,'',0,'LineageMonster.oel_mahum_warrior','20','38',73,'male','L2Defender',40,'70386.6449027313','2143.56666666667','8.5','3',40,43,30,21,20,20,6395,247,'293.998763258434','1240.61871367051','625.529276102317','226.8662',253,4,0,333,0,0,0,70,140,1,1,0,1),
 (35429,35429,'Oel Mahum Scout',0,'',0,'LineageMonster.oel_mahum_warrior','20','38',73,'male','L2Defender',40,'31673.9902062291','2143.56666666667','8.5','3',40,43,30,21,20,20,6395,247,'293.998763258434','1240.61871367051','625.529276102317','226.8662',253,4,0,333,0,0,0,70,140,1,1,0,1),
 (35430,35430,'Oel Mahum Leader',0,'',0,'LineageMonster.oel_mahum_witch_doctor','15','34',73,'male','L2Defender',40,'35193.3224513656','2143.56666666667','8.5','3',40,43,30,21,20,20,6395,247,'293.998763258434','1240.61871367051','625.529276102317','226.8662',253,4,0,333,0,0,0,70,140,1,1,0,1),
@@ -9521,19 +9521,19 @@ INSERT INTO `npc` VALUES
 (35607,35607,'Red Flag',0,'',0,'LineageNpcEV.azit_contest_pile_a','51.8','108.25',75,'etc','L2Npc',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,0,0,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,50,120,1,1,0,1),
 (35608,35608,'Yellow Flag',0,'',0,'LineageNpcEV.azit_contest_pile_b','51.8','108.25',75,'etc','L2Npc',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,0,0,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,50,120,1,1,0,1),
 (35609,35609,'Green Flag',0,'',0,'LineageNpcEV.azit_contest_pile_c','51.8','108.25',75,'etc','L2Npc',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,0,0,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,50,120,1,1,0,1),
-(35610,35610,'Blue Flag',0,'',0,'LineageNpcEV.azit_contest_pile_d','51.8','108.25',75,'etc','L2Defender',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,0,0,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,50,120,1,1,0,1),
-(35611,35611,'Purple Flag',0,'',0,'LineageNpcEV.azit_contest_pile_e','51.8','108.25',75,'etc','L2Defender',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,0,0,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,50,120,1,1,0,1),
-(35612,35612,'Group Gatekeeper',0,'',0,'LineageMonster.kel_mahum','13','26',75,'male','L2Defender',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,0,0,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,50,120,1,1,0,1),
+(35610,35610,'Blue Flag',0,'',0,'LineageNpcEV.azit_contest_pile_d','51.8','108.25',75,'etc','L2Npc',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,0,0,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,50,120,1,1,0,1),
+(35611,35611,'Purple Flag',0,'',0,'LineageNpcEV.azit_contest_pile_e','51.8','108.25',75,'etc','L2Npc',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,0,0,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,50,120,1,1,0,1),
+(35612,35612,'Group Gatekeeper',0,'',0,'LineageMonster.kel_mahum','13','26',75,'male','L2Npc',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,0,0,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,50,120,1,1,0,1),
 (35613,35613,'Group Gatekeeper',0,'',0,'LineageMonster.kel_mahum','13','26',75,'male','L2Npc',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,0,0,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,50,120,1,1,0,1),
 (35614,35614,'Group Gatekeeper',0,'',0,'LineageMonster.kel_mahum','13','26',75,'male','L2Npc',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,0,0,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,50,120,1,1,0,1),
 (35615,35615,'Group Gatekeeper',0,'',0,'LineageMonster.kel_mahum','13','26',75,'male','L2Npc',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,0,0,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,50,120,1,1,0,1),
 (35616,35616,'Group Gatekeeper',0,'',0,'LineageMonster.kel_mahum','13','26',75,'male','L2Npc',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,0,0,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,50,120,1,1,0,1),
 (35617,35617,'Group Gatekeeper',0,'',0,'LineageMonster.kel_mahum','13','26',75,'male','L2Npc',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,0,0,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,50,120,1,1,0,1),
-(35618,35618,'Frenzied Cougar',0,'',0,'LineageMonster.saber_toothed_tiger','34','28',73,'male','L2Npc',40,'70386.6449027313','2143.56666666667','8.5','3',40,43,30,21,20,20,0,0,'293.998763258434','1240.61871367051','625.529276102317','226.8662',253,4,0,333,0,0,0,60,140,1,1,0,1),
-(35619,35619,'Frenzied Buffalo',0,'',0,'LineageMonster2.buffalo','22','31',73,'male','L2Npc',40,'31673.9902062291','2143.56666666667','8.5','3',40,43,30,21,20,20,0,0,'293.998763258434','1240.61871367051','625.529276102317','226.8662',253,4,0,333,0,0,0,80,140,1,1,0,1),
-(35620,35620,'Frenzied Kookaburra',0,'',0,'LineageMonster2.rough_ostrich','10','33',73,'male','L2Npc',40,'35193.3224513656','2143.56666666667','8.5','3',40,43,30,21,20,20,0,0,'293.998763258434','2481.23742734103','625.529276102317','226.8662',253,4,0,333,0,0,0,23,140,1,1,0,1),
-(35621,35621,'Frenzied Buffalo Baby',0,'',0,'LineageMonster2.baby_buffalo','8','15',73,'male','L2Npc',40,'35193.3224513656','2143.56666666667','8.5','3',40,43,30,21,20,20,0,0,'293.998763258434','620.309356835257','625.529276102317','226.8662',253,4,0,333,0,0,0,30,140,1,1,0,1),
-(35622,35622,'Frenzied Baby Cougar',0,'',0,'LineageMonster2.baby_tiger','8','15.7',73,'male','L2Npc',40,'28154.6579610925','2143.56666666667','8.5','3',40,43,30,21,20,20,0,0,'235.199010606747','992.494970936412','625.529276102317','226.8662',253,4,0,333,0,0,0,28,140,1,1,0,1),
+(35618,35618,'Frenzied Cougar',0,'',0,'LineageMonster.saber_toothed_tiger','34','28',73,'male','L2Defender',40,'70386.6449027313','2143.56666666667','8.5','3',40,43,30,21,20,20,0,0,'293.998763258434','1240.61871367051','625.529276102317','226.8662',253,4,0,333,0,0,0,60,140,1,1,0,1),
+(35619,35619,'Frenzied Buffalo',0,'',0,'LineageMonster2.buffalo','22','31',73,'male','L2Defender',40,'31673.9902062291','2143.56666666667','8.5','3',40,43,30,21,20,20,0,0,'293.998763258434','1240.61871367051','625.529276102317','226.8662',253,4,0,333,0,0,0,80,140,1,1,0,1),
+(35620,35620,'Frenzied Kookaburra',0,'',0,'LineageMonster2.rough_ostrich','10','33',73,'male','L2Defender',40,'35193.3224513656','2143.56666666667','8.5','3',40,43,30,21,20,20,0,0,'293.998763258434','2481.23742734103','625.529276102317','226.8662',253,4,0,333,0,0,0,23,140,1,1,0,1),
+(35621,35621,'Frenzied Buffalo Baby',0,'',0,'LineageMonster2.baby_buffalo','8','15',73,'male','L2Defender',40,'35193.3224513656','2143.56666666667','8.5','3',40,43,30,21,20,20,0,0,'293.998763258434','620.309356835257','625.529276102317','226.8662',253,4,0,333,0,0,0,30,140,1,1,0,1),
+(35622,35622,'Frenzied Baby Cougar',0,'',0,'LineageMonster2.baby_tiger','8','15.7',73,'male','L2Defender',40,'28154.6579610925','2143.56666666667','8.5','3',40,43,30,21,20,20,0,0,'235.199010606747','992.494970936412','625.529276102317','226.8662',253,4,0,333,0,0,0,28,140,1,1,0,1),
 (35623,35623,'Inner Doorman',0,'',0,'LineageMonster.kel_mahum_champion','13','32',75,'male','L2Npc',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,0,0,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,50,120,1,1,0,1),
 (35624,35624,'Inner Doorman',0,'',0,'LineageMonster.kel_mahum_champion','13','32',75,'male','L2Npc',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,0,0,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,50,120,1,1,0,1),
 (35625,35625,'Outer Doorman',0,'',0,'LineageMonster.kel_mahum_champion','13','32',75,'male','L2Npc',40,'2676.65854','1507.8','8.5','3',40,43,30,21,20,20,0,0,'794.70901','319.24623','542.68324','233.61053',253,4,0,333,0,0,0,50,120,1,1,0,1),

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio