Просмотр исходного кода

BETA: Unhardcoding Wyvern Manager:
* Unified AI for castle, forts and halls.
* Merged bypass handler and core AI in a single AI script in Datapack.

Reviewed by: jurchiks, UnAfraid, Zoey76

Zoey76 12 лет назад
Родитель
Сommit
bc15e82957
17 измененных файлов с 379 добавлено и 169 удалено
  1. 0 4
      L2J_DataPack_BETA/dist/game/data/html/wyvernmanager/wyvernmanager-no.htm
  2. 0 5
      L2J_DataPack_BETA/dist/game/data/html/wyvernmanager/wyvernmanager.htm
  3. 1 0
      L2J_DataPack_BETA/dist/game/data/scripts.cfg
  4. 308 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java
  5. 7 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-01.html
  6. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-02.html
  7. 5 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-03.html
  8. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-03b.html
  9. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-04.html
  10. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-05.html
  11. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-06.html
  12. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-07.html
  13. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-dusk.html
  14. 0 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java
  15. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
  16. 0 125
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/RideWyvern.java
  17. 32 32
      L2J_DataPack_BETA/dist/sql/game/npc.sql

+ 0 - 4
L2J_DataPack_BETA/dist/game/data/html/wyvernmanager/wyvernmanager-no.htm

@@ -1,4 +0,0 @@
-<html><body><td align=left>Pet elite trainer:<br>
-How dare you talk to me! I am not interested in anything you have to say.<br1>
-I only answer to the Lord of this castle!
-</body></html>

+ 0 - 5
L2J_DataPack_BETA/dist/game/data/html/wyvernmanager/wyvernmanager.htm

@@ -1,5 +0,0 @@
-<html><body><td align=left>Pet elite trainer:<br>
-All my life I have trained hatchlings and striders...<br1>
-I hope... that I could do of your tiny dragoon an unstoppable beast in the battle...<br>
-<a action="bypass -h npc_%objectId%_RideWyvern">Mount in a Wyvern (25 Crystals: B Grade)</a>
-</body></html>

+ 1 - 0
L2J_DataPack_BETA/dist/game/data/scripts.cfg

@@ -61,6 +61,7 @@ ai/npc/TownPets/TownPets.java
 ai/npc/Tunatun/Tunatun.java
 ai/npc/VarkaSilenosSupport/VarkaSilenosSupport.java
 ai/npc/WeaverOlf/WeaverOlf.java
+ai/npc/WyvernManager/WyvernManager.java
 ai/npc/ZealotOfShilen/ZealotOfShilen.java
 
 # Fantasy Isle

+ 308 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java

@@ -0,0 +1,308 @@
+/*
+ * Copyright (C) 2004-2013 L2J DataPack
+ * 
+ * This file is part of L2J DataPack.
+ * 
+ * L2J DataPack is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J DataPack is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ai.npc.WyvernManager;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import ai.npc.AbstractNpcAI;
+
+import com.l2jserver.Config;
+import com.l2jserver.gameserver.SevenSigns;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Wyvern Manager
+ * @author xban1x
+ */
+public final class WyvernManager extends AbstractNpcAI
+{
+	private enum ManagerType
+	{
+		CASTLE,
+		CLAN_HALL,
+		FORT,
+	}
+	
+	// Misc
+	private static final int CRYSTAL_B_GRADE = 1460;
+	private static final int WYVERN = 12621;
+	private static final int WYVERN_FEE = 25;
+	private static final int STRIDER_LVL = 55;
+	private static final int[] STRIDERS =
+	{
+		12526,
+		12527,
+		12528,
+		16038,
+		16039,
+		16040,
+		16068,
+		13197
+	};
+	// NPCS
+	private static final Map<Integer, ManagerType> MANAGERS = new HashMap<>();
+	static
+	{
+		MANAGERS.put(35101, ManagerType.CASTLE);
+		MANAGERS.put(35143, ManagerType.CASTLE);
+		MANAGERS.put(35185, ManagerType.CASTLE);
+		MANAGERS.put(35227, ManagerType.CASTLE);
+		MANAGERS.put(35275, ManagerType.CASTLE);
+		MANAGERS.put(35317, ManagerType.CASTLE);
+		MANAGERS.put(35364, ManagerType.CASTLE);
+		MANAGERS.put(35510, ManagerType.CASTLE);
+		MANAGERS.put(35536, ManagerType.CASTLE);
+		MANAGERS.put(35419, ManagerType.CLAN_HALL);
+		MANAGERS.put(35638, ManagerType.CLAN_HALL);
+		MANAGERS.put(36457, ManagerType.FORT);
+		MANAGERS.put(36458, ManagerType.FORT);
+		MANAGERS.put(36459, ManagerType.FORT);
+		MANAGERS.put(36460, ManagerType.FORT);
+		MANAGERS.put(36461, ManagerType.FORT);
+		MANAGERS.put(36462, ManagerType.FORT);
+		MANAGERS.put(36463, ManagerType.FORT);
+		MANAGERS.put(36464, ManagerType.FORT);
+		MANAGERS.put(36465, ManagerType.FORT);
+		MANAGERS.put(36466, ManagerType.FORT);
+		MANAGERS.put(36467, ManagerType.FORT);
+		MANAGERS.put(36468, ManagerType.FORT);
+		MANAGERS.put(36469, ManagerType.FORT);
+		MANAGERS.put(36470, ManagerType.FORT);
+		MANAGERS.put(36471, ManagerType.FORT);
+		MANAGERS.put(36472, ManagerType.FORT);
+		MANAGERS.put(36473, ManagerType.FORT);
+		MANAGERS.put(36474, ManagerType.FORT);
+		MANAGERS.put(36475, ManagerType.FORT);
+		MANAGERS.put(36476, ManagerType.FORT);
+		MANAGERS.put(36477, ManagerType.FORT);
+	}
+	
+	private WyvernManager(String name, String descr)
+	{
+		super(name, descr);
+		addStartNpc(MANAGERS.keySet());
+		addTalkId(MANAGERS.keySet());
+		addFirstTalkId(MANAGERS.keySet());
+	}
+	
+	private String mountWyvern(L2Npc npc, L2PcInstance player)
+	{
+		if (player.isMounted() && (player.getMountLevel() >= STRIDER_LVL) && Util.contains(STRIDERS, player.getMountNpcId()))
+		{
+			if (isOwnerClan(npc, player) && (getQuestItemsCount(player, CRYSTAL_B_GRADE) >= WYVERN_FEE))
+			{
+				takeItems(player, CRYSTAL_B_GRADE, WYVERN_FEE);
+				player.dismount();
+				player.mount(WYVERN, 0, true);
+				return "wyvernmanager-04.html";
+			}
+			return replacePart(player.getHtmlPrefix(), "wyvernmanager-06.html");
+		}
+		return replacePart(player.getHtmlPrefix(), "wyvernmanager-05.html");
+	}
+	
+	private boolean isOwnerClan(L2Npc npc, L2PcInstance player)
+	{
+		switch (MANAGERS.get(npc.getNpcId()))
+		{
+			case CASTLE:
+			{
+				if ((player.getClan() != null) && (npc.getCastle() != null))
+				{
+					return (player.isClanLeader() && (player.getClanId() == npc.getCastle().getOwnerId()));
+				}
+				return false;
+			}
+			case CLAN_HALL:
+			{
+				if ((player.getClan() != null) && (npc.getConquerableHall() != null))
+				{
+					return (player.isClanLeader() && (player.getClanId() == npc.getConquerableHall().getOwnerId()));
+				}
+				return false;
+			}
+			case FORT:
+			{
+				if ((player.getClan() != null) && (npc.getFort() != null))
+				{
+					return (player.isClanLeader() && (player.getClanId() == npc.getFort().getOwnerClan().getClanId()));
+				}
+				return false;
+			}
+			default:
+			{
+				return false;
+			}
+		}
+	}
+	
+	private boolean isInSiege(L2Npc npc)
+	{
+		switch (MANAGERS.get(npc.getNpcId()))
+		{
+			case CASTLE:
+			{
+				return npc.getCastle().getZone().isActive();
+			}
+			case CLAN_HALL:
+			{
+				SiegableHall hall = npc.getConquerableHall();
+				return (hall != null) ? hall.isInSiege() : npc.getCastle().getSiege().getIsInProgress();
+			}
+			case FORT:
+			{
+				return npc.getFort().getZone().isActive();
+			}
+			default:
+			{
+				return false;
+			}
+		}
+	}
+	
+	private String getResidenceName(L2Npc npc)
+	{
+		switch (MANAGERS.get(npc.getNpcId()))
+		{
+			case CASTLE:
+			{
+				return npc.getCastle().getName();
+			}
+			case CLAN_HALL:
+			{
+				return npc.getConquerableHall().getName();
+			}
+			case FORT:
+			{
+				return npc.getFort().getName();
+			}
+			default:
+			{
+				return null;
+			}
+		}
+	}
+	
+	private String replaceAll(L2Npc npc, String htmlPrefix)
+	{
+		return replacePart(htmlPrefix, "wyvernmanager-01.html").replace("%residence_name%", getResidenceName(npc));
+	}
+	
+	private String replacePart(String htmlPrefix, String htmlFile)
+	{
+		return getHtm(htmlPrefix, htmlFile).replace("%wyvern_fee%", String.valueOf(WYVERN_FEE)).replace("%strider_level%", String.valueOf(STRIDER_LVL));
+	}
+	
+	@Override
+	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+	{
+		String htmltext = null;
+		switch (event)
+		{
+			case "Return":
+			{
+				if (!isOwnerClan(npc, player))
+				{
+					htmltext = "wyvernmanager-02.html";
+				}
+				else if (Config.ALLOW_WYVERN_ALWAYS)
+				{
+					htmltext = replaceAll(npc, player.getHtmlPrefix());
+				}
+				else if ((MANAGERS.get(npc.getNpcId()) == ManagerType.CASTLE) && SevenSigns.getInstance().isSealValidationPeriod() && (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK))
+				{
+					htmltext = "wyvernmanager-dusk.html";
+				}
+				else
+				{
+					htmltext = replaceAll(npc, player.getHtmlPrefix());
+				}
+				break;
+			}
+			case "Help":
+			{
+				htmltext = MANAGERS.get(npc.getNpcId()) == ManagerType.CASTLE ? replacePart(player.getHtmlPrefix(), "wyvernmanager-03.html") : replacePart(player.getHtmlPrefix(), "wyvernmanager-03b.html");
+				break;
+			}
+			case "RideWyvern":
+			{
+				if (!Config.ALLOW_WYVERN_ALWAYS)
+				{
+					if (!Config.ALLOW_WYVERN_DURING_SIEGE && (isInSiege(npc) || player.isInSiege()))
+					{
+						player.sendMessage("You cannot summon wyvern while in siege.");
+						return null;
+					}
+					if ((MANAGERS.get(npc.getNpcId()) == ManagerType.CASTLE) && SevenSigns.getInstance().isSealValidationPeriod() && ((SevenSigns.getInstance()).getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK))
+					{
+						htmltext = "wyvernmanager-dusk.html";
+					}
+					else
+					{
+						htmltext = mountWyvern(npc, player);
+					}
+				}
+				else
+				{
+					htmltext = mountWyvern(npc, player);
+				}
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onFirstTalk(L2Npc npc, L2PcInstance player)
+	{
+		String htmltext = null;
+		if (!isOwnerClan(npc, player))
+		{
+			htmltext = "wyvernmanager-02.html";
+		}
+		else
+		{
+			if (Config.ALLOW_WYVERN_ALWAYS)
+			{
+				htmltext = replaceAll(npc, player.getHtmlPrefix());
+			}
+			else
+			{
+				if ((MANAGERS.get(npc.getNpcId()) == ManagerType.CASTLE) && SevenSigns.getInstance().isSealValidationPeriod() && (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK))
+				{
+					htmltext = "wyvernmanager-dusk.html";
+				}
+				else
+				{
+					htmltext = replaceAll(npc, player.getHtmlPrefix());
+				}
+			}
+		}
+		return htmltext;
+	}
+	
+	public static void main(String[] args)
+	{
+		new WyvernManager(WyvernManager.class.getSimpleName(), "ai/npc");
+	}
+}

+ 7 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-01.html

@@ -0,0 +1,7 @@
+<html><body>
+Greetings, my lord %residence_name%!<br>
+Your Wyvern awaits!<br>
+First, however, you must ride a <font color="LEVEL">Strider of at least level %strider_level%</font> and have <font color="LEVEL">%wyvern_fee% B-Grade Crystals</font>.<br>
+<button action="bypass -h Quest WyvernManager Help" value="Wyvern Help" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br>
+<button action="bypass -h Quest WyvernManager RideWyvern" value="Ride Wyvern" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
+</body></html>

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-02.html

@@ -0,0 +1,4 @@
+<html><body>
+Only you, my lord, are worthy to ride a Wyvern.<br>
+<button action="bypass -h Quest WyvernManager Help" value="Explain" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
+</body></html>

+ 5 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-03.html

@@ -0,0 +1,5 @@
+<html><body>
+A Wyvern can be created from a Strider above level <font color="LEVEL">%strider_level%</font> by using <font color="LEVEL">%wyvern_fee%</font> B-Grade Crystals. At this time, only lords may ride a Wyvern.<br>
+However, if the Revolutionaries of Dusk possess the Seal of Strife, even lords will lose this privilege.<br>
+<button action="bypass -h Quest WyvernManager Return" value="Return" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
+</body></html>

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-03b.html

@@ -0,0 +1,4 @@
+<html><body>
+A Wyvern can be transformed from a <font color="LEVEL">Strider of at least level %strider_level%</font> by using <font color="LEVEL">%wyvern_fee% B-Grade Crystals</font>.<br>
+<button action="bypass -h Quest WyvernManager Return" value="Initial Screen" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
+<body></html>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-04.html

@@ -0,0 +1,3 @@
+<html><body>
+Your wyvern is ready to go!Please remember to keep it well fed.
+</body></html>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-05.html

@@ -0,0 +1,3 @@
+<html><body>
+To transform a Strider into a Wyvern, ride a <font color="LEVEL">Strider of at least level %strider_level%</font> and have <font color="LEVEL">%wyvern_fee% Crystals: B-Grade</font>.
+</body></html>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-06.html

@@ -0,0 +1,3 @@
+<html><body>
+To transform a strider into a wyvern, you must have <font color="LEVEL">%wyvern_fee% Crystals: B-Grade</font>.
+</body></html>

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-07.html

@@ -0,0 +1,4 @@
+<html><body>
+A Wyvern <font color="LEVEL">%strider_level%</font> can transform a Strider of a certain level <font color="LEVEL">%wyvern_fee%</font> by using B-grade Crystals. Only a lord can ride a Wyvern.<br>
+<button action="bypass -h Quest WyvernManager Return" value="Initial screen" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
+</body></html>

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-dusk.html

@@ -0,0 +1,4 @@
+<html><body>
+The Revolutionaries of Dusk currently possess the <font color="LEVEL">Seal of Strife</font>, so you are not able to ride a Wyvern at this time.<br>
+<button action="bypass -h Quest WyvernManager Help" value="Explain" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
+</body></html>

+ 0 - 2
L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java

@@ -151,7 +151,6 @@ import handlers.bypasshandlers.ReceivePremium;
 import handlers.bypasshandlers.ReleaseAttribute;
 import handlers.bypasshandlers.RemoveDeathPenalty;
 import handlers.bypasshandlers.RentPet;
-import handlers.bypasshandlers.RideWyvern;
 import handlers.bypasshandlers.Rift;
 import handlers.bypasshandlers.SkillList;
 import handlers.bypasshandlers.SupportBlessing;
@@ -453,7 +452,6 @@ public class MasterHandler
 			ReleaseAttribute.class,
 			RemoveDeathPenalty.class,
 			RentPet.class,
-			RideWyvern.class,
 			Rift.class,
 			SkillList.class,
 			SupportBlessing.class,

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java

@@ -269,7 +269,7 @@ public class AdminBuffs implements IAdminCommandHandler
 			if (e != null)
 			{
 				skill = e.getSkill();
-				StringUtil.append(html, "<tr><td>", skill.getName(), "(", e.getClass().getSimpleName(), ")", "</td><td>", skill.isToggle() ? "toggle" : (e.getAbnormalTime() - e.getTime()) + "s", "</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ", Integer.toString(target.getObjectId()), " ", String.valueOf(skill.getId()), "\" width=30 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td>" + e.isInUse() + "</td></tr>");
+				StringUtil.append(html, "<tr><td>", skill.getName(), "(", e.getClass().getSimpleName(), ")", "</td><td>", skill.isToggle() ? "toggle" : skill.isPassive() ? "passive" : (e.getAbnormalTime() - e.getTime()) + "s", "</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ", Integer.toString(target.getObjectId()), " ", String.valueOf(skill.getId()), "\" width=30 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td>" + e.isInUse() + "</td></tr>");
 			}
 		}
 		

+ 0 - 125
L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/RideWyvern.java

@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2004-2013 L2J DataPack
- * 
- * This file is part of L2J DataPack.
- * 
- * L2J DataPack is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * L2J DataPack is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.bypasshandlers;
-
-import com.l2jserver.Config;
-import com.l2jserver.gameserver.SevenSigns;
-import com.l2jserver.gameserver.datatables.SkillTable;
-import com.l2jserver.gameserver.handler.IBypassHandler;
-import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2WyvernManagerInstance;
-import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.util.Util;
-
-public class RideWyvern implements IBypassHandler
-{
-	private static final String[] COMMANDS =
-	{
-		"RideWyvern"
-	};
-	
-	private static final int[] STRIDERS =
-	{
-		12526,
-		12527,
-		12528,
-		16038,
-		16039,
-		16040,
-		16068,
-		13197
-	};
-	
-	@Override
-	public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
-	{
-		if (!(target instanceof L2WyvernManagerInstance))
-		{
-			return false;
-		}
-		
-		L2WyvernManagerInstance npc = (L2WyvernManagerInstance) target;
-		if (!npc.isOwnerClan(activeChar))
-		{
-			return false;
-		}
-		
-		if (!Config.ALLOW_WYVERN_DURING_SIEGE && (npc.isInSiege() || activeChar.isInSiege()))
-		{
-			activeChar.sendMessage("You cannot ride wyvern during siege.");
-			return false;
-		}
-		
-		if ((SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK) && SevenSigns.getInstance().isSealValidationPeriod())
-		{
-			activeChar.sendMessage("You cannot ride wyvern while Seal of Strife controlled by Dusk.");
-			return false;
-		}
-		
-		if (!activeChar.hasSummon())
-		{
-			if (activeChar.isMounted())
-			{
-				activeChar.sendPacket(SystemMessageId.YOU_ALREADY_HAVE_A_PET);
-			}
-			else
-			{
-				activeChar.sendMessage("Summon your Strider first.");
-			}
-		}
-		else if (Util.contains(STRIDERS, activeChar.getSummon().getNpcId()))
-		{
-			if ((activeChar.getInventory().getItemByItemId(1460) != null) && (activeChar.getInventory().getItemByItemId(1460).getCount() >= 25))
-			{
-				if (activeChar.getSummon().getLevel() < 55)
-				{
-					activeChar.sendMessage("Your Strider Has not reached the required level.");
-				}
-				else
-				{
-					activeChar.getSummon().unSummon(activeChar);
-					if (activeChar.mount(12621, 0, true))
-					{
-						activeChar.getInventory().destroyItemByItemId("Wyvern", 1460, 25, activeChar, npc);
-						activeChar.addSkill(SkillTable.FrequentSkill.WYVERN_BREATH.getSkill());
-						activeChar.sendMessage("The Wyvern has been summoned successfully!");
-					}
-					return true;
-				}
-			}
-			else
-			{
-				activeChar.sendMessage("You need 25 Crystals: B Grade.");
-			}
-		}
-		else
-		{
-			activeChar.sendMessage("Unsummon your pet.");
-		}
-		
-		return false;
-	}
-	
-	@Override
-	public String[] getBypassList()
-	{
-		return COMMANDS;
-	}
-}

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

@@ -9014,7 +9014,7 @@ INSERT INTO `npc` VALUES
 (35098, 35098, "Blacksmith", 0, "Gludio", 0, "LineageNPC.a_smith_MDwarf", 7, 16.5, 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, 333, 89, 0, 0, 50, 120, 0, 1),
 (35099, 35099, "Warehouse Keeper", 0, "Gludio", 0, "LineageNPC.a_warehouse_keeper_MDwarf", 8, 17, 75, "male", "L2Warehouse", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35100, 35100, "Sayres", 0, "Chamberlain", 0, "LineageNPC.a_chamberlain_MHuman", 9.5, 22.5, 75, "male", "L2Merchant", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(35101, 35101, "Grad", 0, "Wyvern Manager", 0, "LineageNPC.a_traderB_MHuman", 8, 25, 75, "male", "L2CastleWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(35101, 35101, "Grad", 0, "Wyvern Manager", 0, "LineageNPC.a_traderB_MHuman", 8, 25, 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35102, 35102, "Greenspan", 0, "Mercenary Manager", 0, "LineageNPC.a_common_peopleA_MHuman", 8, 21.5, 75, "male", "L2MercManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35103, 35103, "Manor Manager", 0, "Gludio", 0, "LineageNPC.a_chamberlain_MHuman", 9.5, 22.5, 75, "male", "L2ManorManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35104, 35104, "Tyron", 0, "Sir", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2SiegeNpc", 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, 333, 74, 0, 0, 50, 160, 0, 1),
@@ -9056,7 +9056,7 @@ INSERT INTO `npc` VALUES
 (35140, 35140, "Blacksmith", 0, "Dion", 0, "LineageNPC.a_smith_MDwarf", 7, 16.5, 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, 333, 89, 0, 0, 50, 120, 0, 1),
 (35141, 35141, "Warehouse Keeper", 0, "Dion", 0, "LineageNPC.a_warehouse_keeper_MDwarf", 8, 17, 75, "male", "L2Warehouse", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35142, 35142, "Crosby", 0, "Chamberlain", 0, "LineageNPC.a_chamberlain_MHuman", 9.5, 22.5, 75, "male", "L2Merchant", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(35143, 35143, "Hodler", 0, "Wyvern Manager", 0, "LineageNPC.a_traderB_MHuman", 8, 25, 75, "male", "L2CastleWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(35143, 35143, "Hodler", 0, "Wyvern Manager", 0, "LineageNPC.a_traderB_MHuman", 8, 25, 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35144, 35144, "Mercenary Manager Sanford", 0, "Mercenary Manager", 0, "LineageNPC.a_common_peopleA_MHuman", 8, 21.5, 75, "male", "L2MercManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35145, 35145, "Manor Manager", 0, "Dion", 0, "LineageNPC.a_chamberlain_MHuman", 9.5, 22.5, 75, "male", "L2ManorManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35146, 35146, "Gibbson", 0, "Herald", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2SiegeNpc", 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, 333, 74, 0, 0, 50, 160, 0, 1),
@@ -9098,7 +9098,7 @@ INSERT INTO `npc` VALUES
 (35182, 35182, "Blacksmith", 0, "Giran", 0, "LineageNPC.a_smith_MDwarf", 7, 16.5, 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, 333, 89, 0, 0, 50, 120, 0, 1),
 (35183, 35183, "Warehouse Keeper", 0, "Giran", 0, "LineageNPC.a_warehouse_keeper_MDwarf", 8, 17, 75, "male", "L2Warehouse", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35184, 35184, "Saul", 0, "Chamberlain", 0, "LineageNPC.a_chamberlain_MHuman", 9.5, 22.5, 75, "male", "L2Merchant", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(35185, 35185, "Bryce", 0, "Wyvern Manager", 0, "LineageNPC.a_traderB_MHuman", 8, 25, 75, "male", "L2CastleWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(35185, 35185, "Bryce", 0, "Wyvern Manager", 0, "LineageNPC.a_traderB_MHuman", 8, 25, 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35186, 35186, "Arvid", 0, "Mercenary Manager", 0, "LineageNPC.a_common_peopleA_MHuman", 8, 21.5, 75, "male", "L2MercManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35187, 35187, "Manor Manager", 0, "Giran", 0, "LineageNPC.a_chamberlain_MHuman", 9.5, 22.5, 75, "male", "L2ManorManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35188, 35188, "Holmes", 0, "Sir", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2SiegeNpc", 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, 333, 74, 0, 0, 50, 160, 0, 1),
@@ -9140,7 +9140,7 @@ INSERT INTO `npc` VALUES
 (35224, 35224, "Blacksmith", 0, "Oren", 0, "LineageNPC.a_smith_MDwarf", 7, 16.5, 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, 333, 89, 0, 0, 50, 120, 0, 1),
 (35225, 35225, "Warehouse Keeper", 0, "Oren", 0, "LineageNPC.a_warehouse_keeper_MDwarf", 8, 17, 75, "male", "L2Warehouse", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35226, 35226, "Brasseur", 0, "Chamberlain", 0, "LineageNPC.a_chamberlain_MHuman", 9.5, 22.5, 75, "male", "L2Merchant", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(35227, 35227, "Finrod", 0, "Wyvern Manager", 0, "LineageNPC.a_trader_MElf", 6, 24.5, 75, "male", "L2CastleWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(35227, 35227, "Finrod", 0, "Wyvern Manager", 0, "LineageNPC.a_trader_MElf", 6, 24.5, 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35228, 35228, "Morrison", 0, "Mercenary Manager", 0, "LineageNPC.a_common_peopleA_MHuman", 8, 21.5, 75, "male", "L2MercManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35229, 35229, "Manor Manager", 0, "Oren", 0, "LineageNPC.a_chamberlain_MHuman", 9.5, 22.5, 75, "male", "L2ManorManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35230, 35230, "Manor Manager", 0, "Oren", 0, "LineageNPC.a_trader_MElf", 6, 24.5, 75, "male", "L2ManorManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
@@ -9188,7 +9188,7 @@ INSERT INTO `npc` VALUES
 (35272, 35272, "Blacksmith", 0, "Aden", 0, "LineageNPC.a_smith_MDwarf", 7, 16.5, 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, 333, 89, 0, 0, 50, 120, 0, 1),
 (35273, 35273, "Warehouse Keeper", 0, "Aden", 0, "LineageNPC.a_warehouse_keeper_MDwarf", 8, 17, 75, "male", "L2Warehouse", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35274, 35274, "Logan", 0, "Chamberlain", 0, "LineageNPC.a_chamberlain_MHuman", 9.5, 22.5, 75, "male", "L2Merchant", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(35275, 35275, "Kruger", 0, "Wyvern Manager", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 75, "male", "L2CastleWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(35275, 35275, "Kruger", 0, "Wyvern Manager", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35276, 35276, "Eldon", 0, "Mercenary Manager", 0, "LineageNPC.a_common_peopleA_MHuman", 8, 21.5, 75, "male", "L2MercManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35277, 35277, "Manor Manager", 0, "Aden", 0, "LineageNPC.a_chamberlain_MHuman", 9.5, 22.5, 75, "male", "L2ManorManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35278, 35278, "Messenger Ruford", 0, "Messenger", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2SiegeNpc", 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, 333, 135, 0, 0, 50, 160, 0, 1),
@@ -9230,7 +9230,7 @@ INSERT INTO `npc` VALUES
 (35314, 35314, "Blacksmith", 0, "Innadril", 0, "LineageNPC.a_smith_MDwarf", 7, 16.5, 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, 333, 89, 0, 0, 50, 120, 0, 1),
 (35315, 35315, "Warehouse Keeper", 0, "Innadril", 0, "LineageNPC.a_warehouse_keeper_MDwarf", 8, 17, 75, "male", "L2Warehouse", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35316, 35316, "Neurath", 0, "Chamberlain", 0, "LineageNPC.a_chamberlain_MHuman", 9.5, 22.5, 75, "male", "L2Merchant", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(35317, 35317, "Tate", 0, "Wyvern Manager", 0, "LineageNPC.a_traderB_MHuman", 8, 25, 75, "male", "L2CastleWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(35317, 35317, "Tate", 0, "Wyvern Manager", 0, "LineageNPC.a_traderB_MHuman", 8, 25, 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35318, 35318, "Solinus", 0, "Mercenary Manager", 0, "LineageNPC.a_common_peopleA_MHuman", 8, 21.5, 75, "male", "L2MercManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35319, 35319, "Manor Manager", 0, "Innadril", 0, "LineageNPC.a_chamberlain_MHuman", 9.5, 22.5, 75, "male", "L2ManorManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35320, 35320, "Raybell", 0, "Sir", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2SiegeNpc", 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, 333, 74, 0, 0, 50, 160, 0, 1),
@@ -9276,7 +9276,7 @@ INSERT INTO `npc` VALUES
 (35361, 35361, "Blacksmith", 0, "Goddard", 0, "LineageNPC.a_smith_MDwarf", 7, 16.5, 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, 333, 89, 0, 0, 50, 120, 0, 1),
 (35362, 35362, "Warehouse Keeper", 0, "Goddard", 0, "LineageNPC.a_warehouse_keeper_MDwarf", 8, 17, 75, "male", "L2Warehouse", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35363, 35363, "Alfred", 0, "Chamberlain", 0, "LineageNPC.a_chamberlain_MHuman", 9.5, 22.5, 75, "male", "L2Merchant", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(35364, 35364, "Hadley", 0, "Wyvern Manager", 0, "LineageNPC.a_common_peopleC_Mhuman", 10, 24, 75, "male", "L2CastleWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(35364, 35364, "Hadley", 0, "Wyvern Manager", 0, "LineageNPC.a_common_peopleC_Mhuman", 10, 24, 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35365, 35365, "Rowell", 0, "Manager of Mercenary", 0, "LineageNPC.a_common_peopleC_Mhuman", 10, 24, 75, "male", "L2MercManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35366, 35366, "Manor Manager", 0, "Goddard", 0, "LineageNPC.a_chamberlain_MHuman", 9.5, 22.5, 75, "male", "L2ManorManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35367, 35367, "Daven", 0, "Messenger", 0, "LineageNPC.e_elmore_guard_Mhuman", 8, 23.5, 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, 333, 74, 0, 0, 50, 160, 0, 1),
@@ -9331,7 +9331,7 @@ INSERT INTO `npc` VALUES
 (35416, 35416, "Doom Knight", 0, "", 0, "LineageMonster.death_blader", 15, 45, 78, "male", "L2Defender", 40, 2974.356864, 1607.4, 8.5, 3, 40, 43, 30, 21, 20, 20, 608, 0, 890.50086, 332.70061, 608.09666, 243.45587, 253, 4, 333, 1472, 0, 0, 100, 170, 0, 1),
 (35417, 35417, "Doorman of Hell", 0, "", 0, "LineageMonster.dwarf_ghost", 9, 16.5, 75, "male", "L2CastleDoormen", 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, 333, 0, 0, 0, 80, 120, 0, 1),
 (35418, 35418, "Doorman of Hell", 0, "", 0, "LineageMonster.dwarf_ghost", 9, 16.5, 75, "male", "L2CastleDoormen", 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, 333, 0, 0, 0, 80, 120, 0, 1),
-(35419, 35419, "Hephaeston", 0, "Wyvern Manager", 0, "LineageMonster.human_ghost", 8, 22, 75, "male", "L2WyvernManager", 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, 333, 0, 0, 0, 80, 120, 0, 1),
+(35419, 35419, "Hephaeston", 0, "Wyvern Manager", 0, "LineageMonster.human_ghost", 8, 22, 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, 333, 0, 0, 0, 80, 120, 0, 1),
 (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, 333, 74, 0, 0, 80, 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, 333, 0, 0, 0, 80, 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, 333, 0, 0, 0, 50, 120, 0, 1),
@@ -9422,7 +9422,7 @@ INSERT INTO `npc` VALUES
 (35507, 35507, "Blacksmith", 0, "Rune", 0, "LineageNPC.a_smith_MDwarf", 7, 16.5, 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, 333, 89, 0, 0, 50, 120, 0, 1),
 (35508, 35508, "Warehouse Keeper", 0, "Rune", 0, "LineageNPC.a_warehouse_keeper_MDwarf", 8, 17, 75, "male", "L2Warehouse", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35509, 35509, "Frederick", 0, "Chamberlain", 0, "LineageNPC.a_chamberlain_MHuman", 9.5, 22.5, 75, "male", "L2Merchant", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(35510, 35510, "Titus", 0, "Wyvern Manager", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 75, "male", "L2CastleWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(35510, 35510, "Titus", 0, "Wyvern Manager", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35511, 35511, "Gompus", 0, "Mercenary Manager", 0, "LineageNPC.a_common_peopleC_Mhuman", 10, 24, 75, "male", "L2MercManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35512, 35512, "Manor Manager", 0, "Rune", 0, "LineageNPC.a_chamberlain_MHuman", 9.5, 22.5, 75, "male", "L2ManorManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35513, 35513, "Sherman", 0, "Messenger", 0, "LineageNPC.e_elmore_guard_Mhuman", 8, 23.5, 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, 333, 135, 0, 0, 50, 160, 0, 1),
@@ -9468,7 +9468,7 @@ INSERT INTO `npc` VALUES
 (35553, 35553, "Blacksmith", 0, "Schuttgart", 0, "LineageNPC.a_smith_MDwarf", 7, 16.5, 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, 333, 89, 0, 0, 50, 120, 0, 1),
 (35554, 35554, "Warehouse Keeper", 0, "Schuttgart", 0, "LineageNPC.a_warehouse_keeper_MDwarf", 8, 17, 75, "male", "L2Warehouse", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35555, 35555, "August", 0, "Chamberlain", 0, "LineageNPC.a_chamberlain_MHuman", 9.5, 22.5, 75, "male", "L2Merchant", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(35556, 35556, "Gallic", 0, "Wyvern Manager", 0, "LineageNPC.a_common_peopleC_Mhuman", 10, 24, 75, "male", "L2CastleWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(35556, 35556, "Gallic", 0, "Wyvern Manager", 0, "LineageNPC.a_common_peopleC_Mhuman", 10, 24, 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35557, 35557, "Kendrew", 0, "Mercenary Manager", 0, "LineageNPC.a_common_peopleC_Mhuman", 10, 24, 75, "male", "L2MercManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35558, 35558, "Manor Manager", 0, "Schuttgart", 0, "LineageNPC.a_chamberlain_MHuman", 9.5, 22.5, 75, "male", "L2ManorManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (35559, 35559, "Daguerre", 0, "Messenger", 0, "LineageNPC.e_elmore_guard_Mhuman", 8, 23.5, 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, 333, 74, 0, 0, 50, 160, 0, 1),
@@ -9550,7 +9550,7 @@ INSERT INTO `npc` VALUES
 (35635, 35635, "Vampire Magister", 0, "", 0, "LineageMonster2.vampire_wizard", 5.5, 28, 76, "female", "L2Defender", 40, 8274.1777, 1540.8, 8.5, 3, 40, 43, 30, 21, 20, 20, 0, 0, 1922.69132, 323.78455, 562.9734, 236.93149, 253, 4, 333, 99, 0, 0, 46, 155, 0, 1),
 (35636, 35636, "Vampire Warlord", 0, "", 0, "LineageMonster2.vampire_warrior", 9, 31.5, 77, "male", "L2Defender", 80, 8570.306177, 1574, 8.5, 3, 40, 43, 30, 21, 20, 20, 0, 0, 1712.88112, 328.27073, 584.83789, 240.21427, 253, 4, 333, 6723, 0, 0, 43, 160, 0, 1),
 (35637, 35637, "Vampire Leader", 0, "", 0, "LineageMonster2.vampire_lord", 7.5, 25.8, 78, "male", "L2Defender", 40, 8923.070592, 1607.4, 8.5, 3, 40, 43, 30, 21, 20, 20, 0, 0, 1556.42254, 332.70061, 608.09666, 243.45587, 253, 4, 333, 0, 0, 0, 15, 170, 0, 1),
-(35638, 35638, "Valens", 0, "Wyvern Manager", 0, "LineageMonster2.vampire_soldier", 8, 23.5, 75, "male", "L2WyvernManager", 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, 333, 0, 0, 0, 60, 120, 0, 1),
+(35638, 35638, "Valens", 0, "Wyvern Manager", 0, "LineageMonster2.vampire_soldier", 8, 23.5, 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, 333, 0, 0, 0, 60, 120, 0, 1),
 (35639, 35639, "Jacquard", 0, "Messenger", 0, "LineageMonster2.vampire_soldier", 8, 23.5, 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, 333, 0, 0, 0, 60, 120, 0, 1),
 (35640, 35640, "Bandello", 0, "Steward", 0, "LineageMonster2.vampire_soldier", 8, 23.5, 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, 333, 0, 0, 0, 60, 120, 0, 1),
 (35641, 35641, "Fortress Guard", 0, "", 0, "LineageMonster2.vampire_soldier", 8, 23.5, 75, "male", "L2CastleDoormen", 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, 333, 0, 0, 0, 60, 1, 0, 1),
@@ -10371,27 +10371,27 @@ INSERT INTO `npc` VALUES
 (36454, 36454, "Special Envoy", 0, "Rune", 0, "LineageNPC.a_maidB_FHuman", 8, 22, 75, "female", "L2FortEnvoy", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (36455, 36455, "Special Envoy", 0, "Schuttgart", 0, "LineageNPC.e_traderA_FDwarf", 7, 18.5, 75, "female", "L2FortEnvoy", 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (36456, 36456, "Manor Manager", 0, "Aden", 0, "LineageNPC2.K_M1_normal", 13, 25, 75, "male", "L2ManorManager", 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, 333, 0, 0, 0, 28, 120, 0, 1),
-(36457, 36457, "Wyvern Manager", 0, "Shanty Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 75, "male", "L2FortWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(36458, 36458, "Wyvern Manager", 0, "Southern Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 75, "male", "L2FortWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(36459, 36459, "Wyvern Manager", 0, "Hive Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 75, "male", "L2FortWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(36460, 36460, "Wyvern Manager", 0, "Valley Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 75, "male", "L2FortWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(36461, 36461, "Wyvern Manager", 0, "Ivory Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 75, "male", "L2FortWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(36462, 36462, "Wyvern Manager", 0, "Narsell Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 75, "male", "L2FortWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(36463, 36463, "Wyvern Manager", 0, "Bayou Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 75, "male", "L2FortWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(36464, 36464, "Wyvern Manager", 0, "White Sands Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 75, "male", "L2FortWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(36465, 36465, "Wyvern Manager", 0, "Borderland Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 75, "male", "L2FortWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(36466, 36466, "Wyvern Manager", 0, "Swamp Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 75, "male", "L2FortWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(36467, 36467, "Wyvern Manager", 0, "Archaic Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 75, "male", "L2FortWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(36468, 36468, "Wyvern Manager", 0, "Floran Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 75, "male", "L2FortWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(36469, 36469, "Wyvern Manager", 0, "Cloud Mountain", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 75, "male", "L2FortWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(36470, 36470, "Wyvern Manager", 0, "Tanor Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 75, "male", "L2FortWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(36471, 36471, "Wyvern Manager", 0, "Dragonspine Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 75, "male", "L2FortWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(36472, 36472, "Wyvern Manager", 0, "Antharas' Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 75, "male", "L2FortWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(36473, 36473, "Wyvern Manager", 0, "Western Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 75, "male", "L2FortWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(36474, 36474, "Wyvern Manager", 0, "Hunter's Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 75, "male", "L2FortWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(36475, 36475, "Wyvern Manager", 0, "Aaru Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 75, "male", "L2FortWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(36476, 36476, "Wyvern Manager", 0, "Demon Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 75, "male", "L2FortWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
-(36477, 36477, "Wyvern Manager", 0, "Monastic Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 75, "male", "L2FortWyvernManager", 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(36457, 36457, "Wyvern Manager", 0, "Shanty Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(36458, 36458, "Wyvern Manager", 0, "Southern Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(36459, 36459, "Wyvern Manager", 0, "Hive Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(36460, 36460, "Wyvern Manager", 0, "Valley Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(36461, 36461, "Wyvern Manager", 0, "Ivory Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(36462, 36462, "Wyvern Manager", 0, "Narsell Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(36463, 36463, "Wyvern Manager", 0, "Bayou Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(36464, 36464, "Wyvern Manager", 0, "White Sands Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(36465, 36465, "Wyvern Manager", 0, "Borderland Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(36466, 36466, "Wyvern Manager", 0, "Swamp Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(36467, 36467, "Wyvern Manager", 0, "Archaic Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(36468, 36468, "Wyvern Manager", 0, "Floran Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(36469, 36469, "Wyvern Manager", 0, "Cloud Mountain", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(36470, 36470, "Wyvern Manager", 0, "Tanor Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(36471, 36471, "Wyvern Manager", 0, "Dragonspine Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(36472, 36472, "Wyvern Manager", 0, "Antharas' Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(36473, 36473, "Wyvern Manager", 0, "Western Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(36474, 36474, "Wyvern Manager", 0, "Hunter's Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(36475, 36475, "Wyvern Manager", 0, "Aaru Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(36476, 36476, "Wyvern Manager", 0, "Demon Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 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, 333, 0, 0, 0, 50, 120, 0, 1),
+(36477, 36477, "Wyvern Manager", 0, "Monastic Fortress", 0, "LineageNPC.a_fighterguild_teacher_MHuman", 8, 23, 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, 333, 0, 0, 0, 50, 120, 0, 1),
 (36478, 36478, "Mickey", 0, "Pet Trader", 0, "LineageNPC.e_collector_teacher_FDwarf", 8, 17.5, 70, "female", "L2PetManager", 40, 2444.46819, 1345.8, 7.5, 2.7, 40, 43, 30, 21, 20, 20, 0, 0, 688.86373, 295.91597, 470.40463, 216.53847, 253, 4, 333, 0, 0, 0, 50, 120, 0, 1),
 (36479, 36479, "Rapidus", 0, "Reputation Manager", 0, "LineageNPC.a_fighterguild_master_Mhuman", 8, 23.5, 70, "male", "L2Npc", 40, 2444.46819, 1345.8, 7.5, 2.7, 40, 43, 30, 21, 20, 20, 0, 0, 688.86373, 295.91597, 470.40463, 216.53847, 253, 4, 333, 0, 0, 0, 50, 120, 0, 1),
 (36480, 36480, "Scipio", 0, "Reputation Manager", 0, "LineageNPC.a_fighterguild_master_Mhuman", 8, 23.5, 70, "male", "L2Npc", 40, 2444.46819, 1345.8, 7.5, 2.7, 40, 43, 30, 21, 20, 20, 0, 0, 688.86373, 295.91597, 470.40463, 216.53847, 253, 4, 333, 0, 0, 0, 50, 120, 0, 1),