瀏覽代碼

BETA: DP-part for [L5904]
* Added some cond checks to quest Dwarven Kinship (167)
* Reported by: xban1x

Reviewed by: !UnAfraid

malyelfik 12 年之前
父節點
當前提交
f3cb28170c
共有 49 個文件被更改,包括 623 次插入225 次删除
  1. 0 7
      L2J_DataPack_BETA/dist/game/data/html/castleblacksmith/castleblacksmith-1.htm
  2. 0 3
      L2J_DataPack_BETA/dist/game/data/html/castleblacksmith/castleblacksmith-busy.htm
  3. 0 9
      L2J_DataPack_BETA/dist/game/data/html/castlewarehouse/castlewarehouse-2.htm
  4. 0 6
      L2J_DataPack_BETA/dist/game/data/html/castlewarehouse/castlewarehouse-4.htm
  5. 0 3
      L2J_DataPack_BETA/dist/game/data/html/castlewarehouse/castlewarehouse-busy.htm
  6. 0 4
      L2J_DataPack_BETA/dist/game/data/html/castlewarehouse/castlewarehouse-no.htm
  7. 0 8
      L2J_DataPack_BETA/dist/game/data/html/castlewarehouse/castlewarehouse.htm
  8. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts.cfg
  9. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/NonLethalableNpcs.java
  10. 1 2
      L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/RandomSpawn.java
  11. 8 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35098-01.html
  12. 6 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35098-02.html
  13. 3 5
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35140-01.html
  14. 6 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35140-02.html
  15. 6 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35182-01.html
  16. 7 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35182-02.html
  17. 8 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35224-01.html
  18. 6 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35224-02.html
  19. 8 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35272-01.html
  20. 7 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35272-02.html
  21. 8 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35314-01.html
  22. 6 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35314-02.html
  23. 9 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35361-01.html
  24. 6 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35361-02.html
  25. 9 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35507-01.html
  26. 7 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35507-02.html
  27. 9 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35553-01.html
  28. 7 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35553-02.html
  29. 77 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/CastleBlacksmith.java
  30. 0 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/no.html
  31. 105 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleTeleporter/CastleTeleporter.java
  32. 3 1
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleTeleporter/teleporter-01.html
  33. 3 1
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleTeleporter/teleporter-02.html
  34. 0 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleTeleporter/teleporter-03.html
  35. 119 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleWarehouse/CastleWarehouse.java
  36. 8 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-01.html
  37. 3 5
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-02.html
  38. 7 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-03.html
  39. 6 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-04.html
  40. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-05.html
  41. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-06.html
  42. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-07.html
  43. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-08.html
  44. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-no.html
  45. 96 0
      L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/TownPets/TownPets.java
  46. 0 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java
  47. 0 113
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/BloodAlliance.java
  48. 20 11
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
  49. 39 39
      L2J_DataPack_BETA/dist/sql/game/npc.sql

+ 0 - 7
L2J_DataPack_BETA/dist/game/data/html/castleblacksmith/castleblacksmith-1.htm

@@ -1,7 +0,0 @@
-<html><body>Sure, just bring the ingredients I need and I'll make it for 
-you right away. <br> What would you like? <br>
-<br>
-<center> 
-<a action="bypass -h npc_%objectId%_multisell 35098000%castleid%">Choose Item</a>
-</center> 
-</body></html>

+ 0 - 3
L2J_DataPack_BETA/dist/game/data/html/castleblacksmith/castleblacksmith-busy.htm

@@ -1,3 +0,0 @@
-<html><body>
-Oh! Our castle is being attacked and I can't do anything for you right now.
-</body></html>

+ 0 - 9
L2J_DataPack_BETA/dist/game/data/html/castlewarehouse/castlewarehouse-2.htm

@@ -1,9 +0,0 @@
-<html><body>
-Warehouse Keeper:<br>
-<center>
-<a action="bypass -h npc_%objectId%_DepositC">Deposit an item. (Clan Warehouse)</a><br>
-<a action="bypass -h npc_%objectId%_WithdrawC">Withdraw an item. (Clan Warehouse)</a><br>
-<br>
-<a action="bypass -h npc_%objectId%_Chat 0">Back</a>
-</center>
-</body></html>

+ 0 - 6
L2J_DataPack_BETA/dist/game/data/html/castlewarehouse/castlewarehouse-4.htm

@@ -1,6 +0,0 @@
-<html><body>Warehouse Keeper:<br>
-You can earn a total of <font color="LEVEL">%blood%</font> "Blood Alliances" through a successful siege. <br><br>
-<a action="bypass -h npc_%objectId%_Receive">Receive "Blood Alliance."</a><br>
-<a action="bypass -h npc_%objectId%_Exchange">Exchange a "Blood Alliance" for 30 "Blood Oaths."</a><br>
-<a action="bypass -h npc_%objectId%_Chat 0">Back.</a>
-</body></html>

+ 0 - 3
L2J_DataPack_BETA/dist/game/data/html/castlewarehouse/castlewarehouse-busy.htm

@@ -1,3 +0,0 @@
-<html><body>
-Oh! Our castle is being attacked and I can't do anything for you right now.
-</body></html>

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

@@ -1,4 +0,0 @@
-<html><body>
-Warehouse Keeper:<br>
-Sorry, I can't help you now.
-</body></html>

+ 0 - 8
L2J_DataPack_BETA/dist/game/data/html/castlewarehouse/castlewarehouse.htm

@@ -1,8 +0,0 @@
-<html><body>Warehouse Keeper:<br>
-Welcome! What can I do for you today? It costs only 30 adena to store items. If you are a manager, please let me know in advance and I will give you an item that will help the clan's development.<br>
-<center>
-<a action="bypass -h npc_%objectId%_Chat 1">Private Warehouse.</a><br>
-<a action="bypass -h npc_%objectId%_Chat 2">Clan Warehouse.</a><br>
-<a action="bypass -h npc_%objectId%_HonoraryItem">Check honorary item.</a><br>
-</center>
-</body></html>

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

@@ -12,6 +12,9 @@ handlers/MasterHandler.java
 
 # Npc
 ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
+ai/npc/CastleBlacksmith/CastleBlacksmith.java
+ai/npc/CastleTeleporter/CastleTeleporter.java
+ai/npc/CastleWarehouse/CastleWarehouse.java
 ai/npc/Dorian/Dorian.java
 ai/npc/DragonVortex/DragonVortex.java
 ai/npc/ForgeOfTheGods/ForgeOfTheGods.java
@@ -49,6 +52,7 @@ ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java
 ai/npc/Teleports/ToIVortex/ToIVortex.java
 ai/npc/Teleports/Warpgate/Warpgate.java
 ai/npc/TerritoryManagers/TerritoryManagers.java
+ai/npc/TownPets/TownPets.java
 ai/npc/Tunatun/Tunatun.java
 ai/npc/VarkaSilenosSupport/VarkaSilenosSupport.java
 ai/npc/WeaverOlf/WeaverOlf.java

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/NonLethalableNpcs.java

@@ -29,7 +29,7 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
  */
 public class NonLethalableNpcs extends AbstractNpcAI
 {
-	private static final int[] NPCS = new int[]
+	private static final int[] NPCS =
 	{
 		35062, // Headquarters
 	};

+ 1 - 2
L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/RandomSpawn.java

@@ -96,8 +96,7 @@ public class RandomSpawn extends AbstractNpcAI
 		if (!npc.isTeleporting())
 		{
 			final Location[] spawnlist = SPAWN_POINTS.get(npc.getNpcId());
-			int num = getRandom(spawnlist.length);
-			final Location loc = spawnlist[num];
+			final Location loc = spawnlist[getRandom(spawnlist.length)];
 			if (!npc.isInsideRadius(loc, 200, false, false))
 			{
 				npc.getSpawn().setLocation(loc);

+ 8 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35098-01.html

@@ -0,0 +1,8 @@
+<html><body>Blacksmith:<br>
+Hello!<br>
+We Dwarves of the Blacksmith Guild have refined our skills in order to create a greater variety of crops for our Lord.<br>
+What can I do for you?<br><br>
+<center>
+<a action="bypass -h Quest CastleBlacksmith 35098-02.html">Manufacture a crop.</a>
+</center>
+</body></html>

+ 6 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35098-02.html

@@ -0,0 +1,6 @@
+<html><body>
+Sure, no problem! Bring the ingredients needed and I'll create an item for you.<br>
+<center>
+<a action="bypass -h npc_%objectId%_multisell 350980001">Choose an item.</a>
+</center>
+</body></html>

+ 3 - 5
L2J_DataPack_BETA/dist/game/data/html/castleblacksmith/castleblacksmith.htm → L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35140-01.html

@@ -1,10 +1,8 @@
-<html><body>
-Blacksmith:<br>
+<html><body>Blacksmith:<br>
 My goodness! What brings you here?<br>
 We Dwarves of the Blacksmith Guild have refined our skills in order to create a greater variety of crops for our Lord.<br>
-What can I do for you?<br>
-<br>
+What can I do for you?<br><br>
 <center>
-<a action="bypass -h npc_%objectId%_Chat 1">Manufacture a crop.</a>
+<a action="bypass -h Quest CastleBlacksmith 35140-02.html">Manufacture a crop.</a>
 </center>
 </body></html>

+ 6 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35140-02.html

@@ -0,0 +1,6 @@
+<html><body>
+Sure, no problem! If you bring me the ingredients I need, I'll get right on it!<br>
+<center>
+<a action="bypass -h npc_%objectId%_multisell 350980002">Choose an item.</a>
+</center>
+</body></html>

+ 6 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35182-01.html

@@ -0,0 +1,6 @@
+<html><body>Blacksmith:<br>
+Greetings! Is there anything I can do for you today?<br>
+<center>
+<a action="bypass -h Quest CastleBlacksmith 35182-02.html">Manufacture a crop.</a>
+</center>
+</body></html>

+ 7 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35182-02.html

@@ -0,0 +1,7 @@
+<html><body>
+Certainly! If you bring me the ingredients I need I'll make it for you.<br>
+What would you like?<br>
+<center>
+<a action="bypass -h npc_%objectId%_multisell 350980003">View the list.</a>
+</center>
+</body></html>

+ 8 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35224-01.html

@@ -0,0 +1,8 @@
+<html><body>Blacksmith:<br>
+Greetings!<br>
+We Dwarves of the Blacksmith Guild have refined our skills in order to create a greater variety of crops for our Lord.<br>
+What can I do for you?<br><br>
+<center>
+<a action="bypass -h Quest CastleBlacksmith 35224-02.html">Manufacture a crop.</a>
+</center>
+</body></html>

+ 6 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35224-02.html

@@ -0,0 +1,6 @@
+<html><body>
+Certainly, I'd be glad to make an item for you! Bring me the ingredients I need and I'll make it immediately.<br>
+<center>
+<a action="bypass -h npc_%objectId%_multisell 350980004">View the list.</a>
+</center>
+</body></html>

+ 8 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35272-01.html

@@ -0,0 +1,8 @@
+<html><body>Blacksmith:<br>
+My goodness! What brings you here?<br>
+We Dwarves of the Blacksmith Guild have refined our skills in order to create a greater variety of crops for our Lord.<br>
+What can I do for you?<br><br>
+<center>
+<a action="bypass -h Quest CastleBlacksmith 35272-02.html">Manufacture a crop.</a>
+</center>
+</body></html>

+ 7 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35272-02.html

@@ -0,0 +1,7 @@
+<html><body>
+Sure, just bring the ingredients I need and I'll make it for you right away.<br>
+What would you like?<br>
+<center> 
+<a action="bypass -h npc_%objectId%_multisell 350980005">Choose Item</a>
+</center> 
+</body></html>

+ 8 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35314-01.html

@@ -0,0 +1,8 @@
+<html><body>Blacksmith:<br>
+My goodness! What brings you here?<br>
+We Dwarves of the Blacksmith Guild have refined our skills in order to create a greater variety of crops for our Lord.<br>
+What can I do for you?<br><br>
+<center>
+<a action="bypass -h Quest CastleBlacksmith 35314-02.html">Manufacture a crop.</a>
+</center>
+</body></html>

+ 6 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35314-02.html

@@ -0,0 +1,6 @@
+<html><body>
+Certainly, I'd be glad to make an item for you! Bring me the ingredients I need and I'll make it immediately.<br>
+<center>
+<a action="bypass -h npc_%objectId%_multisell 350980006">View the list.</a>
+</center>
+</body></html>

+ 9 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35361-01.html

@@ -0,0 +1,9 @@
+<html><body>Blacksmith:<br>
+What brings you here?<br>
+Our Blacksmiths Guild has learned a new technique, so we can use more diverse crops.<br>
+Our Dwarven dexterity is truly unequaled!<br>
+If you want something made, just give us the order!<br><br>
+<center>
+<a action="bypass -h Quest CastleBlacksmith 35361-02.html">Crop Processing</a>
+</center>
+</body></html>

+ 6 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35361-02.html

@@ -0,0 +1,6 @@
+<html><body>
+If you provide the materials, it won't take anytime! What do you want made?<br>
+<center>
+<a action="bypass -h npc_%objectId%_multisell 350980007">See the list</a>
+</center>
+</body></html>

+ 9 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35507-01.html

@@ -0,0 +1,9 @@
+<html><body>Blacksmith:<br>
+What brings you to this shabby place?<br>
+I've learned a new skill from our Blacksmith Guild. Now I can make what you want with various crops, my Lord!<br>
+Our Dwarves are truly gifted with their hands. Ha! Oops! Pardon me, my Lord!<br>
+If you want me to make something, just say the word!<br><br>
+<center>
+<a action="bypass -h Quest CastleBlacksmith 35507-02.html">Crop Manufacturing</a>
+</center>
+</body></html>

+ 7 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35507-02.html

@@ -0,0 +1,7 @@
+<html><body>
+Sure, just bring the ingredients I need and I'll make it for you right away.<br>
+What would you like?<br>
+<center> 
+<a action="bypass -h npc_%objectId%_multisell 350980008">Choose Item</a>
+</center> 
+</body></html>

+ 9 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35553-01.html

@@ -0,0 +1,9 @@
+<html><body>Blacksmith:<br>
+What brings you to this shabby place?<br>
+By the way, I've learned a new skill from our Blacksmith Guild! Now I use a wider variety of crops to make the items you need, my Lord.<br>
+Our Dwarves are truly gifted with their hands..  Ha! Oops! Pardon me, my Lord.<br>
+If you want me to make something for you, just ask.<br><br>
+<center>
+<a action="bypass -h Quest CastleBlacksmith 35553-02.html">Crop Manufacturing</a>
+</center>
+</body></html>

+ 7 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/35553-02.html

@@ -0,0 +1,7 @@
+<html><body>
+Sure, just bring the ingredients I need and I'll make it for you right away.<br>
+What would you like?<br>
+<center> 
+<a action="bypass -h npc_%objectId%_multisell 350980009">Choose Item</a>
+</center> 
+</body></html>

+ 77 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/CastleBlacksmith.java

@@ -0,0 +1,77 @@
+/*
+ * 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.CastleBlacksmith;
+
+import ai.npc.AbstractNpcAI;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.PcCondOverride;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Castle Blacksmith AI
+ * @author malyelfik
+ */
+public class CastleBlacksmith extends AbstractNpcAI
+{
+	// Blacksmith IDs
+	private static final int[] NPCS =
+	{
+		35098, // Blacksmith (Gludio)
+		35140, // Blacksmith (Dion)
+		35182, // Blacksmith (Giran)
+		35224, // Blacksmith (Oren)
+		35272, // Blacksmith (Aden)
+		35314, // Blacksmith (Innadril)
+		35361, // Blacksmith (Goddard)
+		35507, // Blacksmith (Rune)
+		35553, // Blacksmith (Schuttgart)
+	};
+	
+	private CastleBlacksmith(String name, String descr)
+	{
+		super(name, descr);
+		addStartNpc(NPCS);
+		addTalkId(NPCS);
+		addFirstTalkId(NPCS);
+	}
+	
+	private boolean hasRights(L2PcInstance player, L2Npc npc)
+	{
+		return player.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS) || npc.isMyLord(player) || ((player.getClanId() == npc.getCastle().getOwnerId()) && ((player.getClanPrivileges() & L2Clan.CP_CS_MANOR_ADMIN) == L2Clan.CP_CS_MANOR_ADMIN));
+	}
+	
+	@Override
+	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+	{
+		return (event.equalsIgnoreCase(npc.getNpcId() + "-02.html") && hasRights(player, npc)) ? event : null;
+	}
+	
+	@Override
+	public String onFirstTalk(L2Npc npc, L2PcInstance player)
+	{
+		return (hasRights(player, npc)) ? npc.getNpcId() + "-01.html" : "no.html";
+	}
+	
+	public static void main(String[] args)
+	{
+		new CastleBlacksmith(CastleBlacksmith.class.getSimpleName(), "ai/npc");
+	}
+}

+ 0 - 0
L2J_DataPack_BETA/dist/game/data/html/castleblacksmith/castleblacksmith-no.htm → L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleBlacksmith/no.html


+ 105 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleTeleporter/CastleTeleporter.java

@@ -0,0 +1,105 @@
+/*
+ * 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.CastleTeleporter;
+
+import ai.npc.AbstractNpcAI;
+
+import com.l2jserver.gameserver.instancemanager.MapRegionManager;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Siege;
+import com.l2jserver.gameserver.network.NpcStringId;
+import com.l2jserver.gameserver.network.clientpackets.Say2;
+import com.l2jserver.gameserver.network.serverpackets.NpcSay;
+
+/**
+ * Castle Teleporter AI
+ * @author malyelfik
+ */
+public class CastleTeleporter extends AbstractNpcAI
+{
+	// Teleporter IDs
+	private static final int[] NPCS =
+	{
+		35095, // Mass Gatekeeper (Gludio)
+		35137, // Mass Gatekeeper (Dion)
+		35179, // Mass Gatekeeper (Giran)
+		35221, // Mass Gatekeeper (Oren)
+		35266, // Mass Gatekeeper (Aden)
+		35311, // Mass Gatekeeper (Innadril)
+		35355, // Mass Gatekeeper (Goddard)
+		35502, // Mass Gatekeeper (Rune)
+		35547, // Mass Gatekeeper (Schuttgart)
+	};
+	
+	private CastleTeleporter(String name, String descr)
+	{
+		super(name, descr);
+		addStartNpc(NPCS);
+		addTalkId(NPCS);
+		addFirstTalkId(NPCS);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+	{
+		if (event.equalsIgnoreCase("teleporter-03.html"))
+		{
+			if (npc.isScriptValue(0))
+			{
+				final Siege siege = npc.getCastle().getSiege();
+				final int time = (siege.getIsInProgress() && (siege.getControlTowerCount() == 0)) ? 480000 : 30000;
+				startQuestTimer("teleport", time, npc, null);
+				npc.setScriptValue(1);
+			}
+			return event;
+		}
+		else if (event.equalsIgnoreCase("teleport"))
+		{
+			final int region = MapRegionManager.getInstance().getMapRegionLocId(npc.getX(), npc.getY());
+			final NpcSay msg = new NpcSay(npc, Say2.NPC_SHOUT, NpcStringId.THE_DEFENDERS_OF_S1_CASTLE_WILL_BE_TELEPORTED_TO_THE_INNER_CASTLE);
+			msg.addStringParameter(npc.getCastle().getName());
+			npc.getCastle().oustAllPlayers();
+			npc.setScriptValue(0);
+			
+			final L2PcInstance[] players = L2World.getInstance().getAllPlayersArray();
+			for (L2PcInstance pl : players)
+			{
+				if (region == MapRegionManager.getInstance().getMapRegionLocId(pl))
+				{
+					pl.sendPacket(msg);
+				}
+			}
+		}
+		return null;
+	}
+	
+	@Override
+	public String onFirstTalk(L2Npc npc, L2PcInstance player)
+	{
+		final Siege siege = npc.getCastle().getSiege();
+		return (npc.isScriptValue(0)) ? (siege.getIsInProgress() && (siege.getControlTowerCount() == 0)) ? "teleporter-02.html" : "teleporter-01.html" : "teleporter-03.html";
+	}
+	
+	public static void main(String[] args)
+	{
+		new CastleTeleporter(CastleTeleporter.class.getSimpleName(), "ai/npc");
+	}
+}

+ 3 - 1
L2J_DataPack_BETA/dist/game/data/html/castleteleporter/MassGK.htm → L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleTeleporter/teleporter-01.html

@@ -1,5 +1,7 @@
 <html><body>
 All those present will be teleported to a position near the castle hall in 30 seconds.<br>
 Prepare for transport!<br>
-<center><a action="bypass -h npc_%objectId%_tele">Teleport</a></center>
+<center>
+<a action="bypass -h Quest CastleTeleporter teleporter-03.html">Teleport</a>
+</center>
 </body></html>

+ 3 - 1
L2J_DataPack_BETA/dist/game/data/html/castleteleporter/MassGK-2.htm → L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleTeleporter/teleporter-02.html

@@ -2,5 +2,7 @@
 That is not possible as the Guardian Towers of Life have been destroyed.<br>
 Therefore, all of those in the room will be teleported to a position near the castle hall in 8 minutes.<br>
 Make yourself comfortable.<br>
-<CENTER><a action="bypass -h npc_%objectId%_tele">Teleport</a></CENTER>
+<center>
+<a action="bypass -h Quest CastleTeleporter teleporter-03.html">Teleport</a>
+</center>
 </body></html>

+ 0 - 0
L2J_DataPack_BETA/dist/game/data/html/castleteleporter/MassGK-1.htm → L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleTeleporter/teleporter-03.html


+ 119 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleWarehouse/CastleWarehouse.java

@@ -0,0 +1,119 @@
+/*
+ * 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.CastleWarehouse;
+
+import ai.npc.AbstractNpcAI;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Castle Warehouse Keeper AI
+ * @author malyelfik
+ */
+public class CastleWarehouse extends AbstractNpcAI
+{
+	// NPCs
+	private static final int[] NPCS =
+	{
+		35099, // Warehouse Keeper (Gludio)
+		35141, // Warehouse Keeper (Dion)
+		35183, // Warehouse Keeper (Giran)
+		35225, // Warehouse Keeper (Oren)
+		35273, // Warehouse Keeper (Aden)
+		35315, // Warehouse Keeper (Inadril)
+		35362, // Warehouse Keeper (Goddard)
+		35508, // Warehouse Keeper (Rune)
+		35554, // Warehouse Keeper (Schuttgart)
+	};
+	// Items
+	private static final int BLOOD_OATH = 9910;
+	private static final int BLOOD_ALLIANCE = 9911;
+	
+	private CastleWarehouse(String name, String descr)
+	{
+		super(name, descr);
+		addStartNpc(NPCS);
+		addTalkId(NPCS);
+		addFirstTalkId(NPCS);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+	{
+		String htmltext = event;
+		switch (event)
+		{
+			case "warehouse-01.html":
+			case "warehouse-02.html":
+			case "warehouse-03.html":
+				break;
+			case "warehouse-04.html":
+				htmltext = (!npc.isMyLord(player)) ? "warehouse-no.html" : getHtm(player.getHtmlPrefix(), "warehouse-04.html").replace("%blood%", Integer.toString(player.getClan().getBloodAllianceCount()));
+				break;
+			case "Receive":
+				if (!npc.isMyLord(player))
+				{
+					htmltext = "warehouse-no.html";
+				}
+				else if (player.getClan().getBloodAllianceCount() == 0)
+				{
+					htmltext = "warehouse-05.html";
+				}
+				else
+				{
+					giveItems(player, BLOOD_ALLIANCE, player.getClan().getBloodAllianceCount());
+					player.getClan().resetBloodAllianceCount();
+					htmltext = "warehouse-06.html";
+				}
+				break;
+			case "Exchange":
+				if (!npc.isMyLord(player))
+				{
+					htmltext = "warehouse-no.html";
+				}
+				else if (!hasQuestItems(player, BLOOD_ALLIANCE))
+				{
+					htmltext = "warehouse-08.html";
+				}
+				else
+				{
+					takeItems(player, BLOOD_ALLIANCE, 1);
+					giveItems(player, BLOOD_OATH, 30);
+					htmltext = "warehouse-07.html";
+				}
+				break;
+			default:
+				htmltext = null;
+				break;
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onFirstTalk(L2Npc npc, L2PcInstance player)
+	{
+		return "warehouse-01.html";
+	}
+	
+	public static void main(String[] args)
+	{
+		new CastleWarehouse(CastleWarehouse.class.getSimpleName(), "ai/npc");
+	}
+}

+ 8 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-01.html

@@ -0,0 +1,8 @@
+<html><body>Warehouse Keeper:<br>
+Welcome! What can I do for you today? It costs only 30 Adena to store items. If you are a manager, please let me know in advance and I will give you an item that will help the clan's development.<br><br>
+<center>
+<a action="bypass -h Quest CastleWarehouse warehouse-02.html">Private Warehouse.</a><br>
+<a action="bypass -h Quest CastleWarehouse warehouse-03.html">Clan Warehouse.</a><br>
+<a action="bypass -h Quest CastleWarehouse warehouse-04.html">Check honorary item.</a>
+</center>
+</body></html>

+ 3 - 5
L2J_DataPack_BETA/dist/game/data/html/castlewarehouse/castlewarehouse-1.htm → L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-02.html

@@ -1,9 +1,7 @@
-<html><body>
-Warehouse Keeper:<br>
+<html><body>Warehouse Keeper:<br>
 <center>
 <a action="bypass -h npc_%objectId%_DepositP">Deposit an item. (Private Warehouse)</a><br>
-<a action="bypass -h npc_%objectId%_WithdrawP">Withdraw an item. (Private Warehouse)</a><br>
-<br>
-<a action="bypass -h npc_%objectId%_Chat 0">Back</a>
+<a action="bypass -h npc_%objectId%_WithdrawP">Withdraw an item. (Private Warehouse)</a><br><br>
+<a action="bypass -h Quest CastleWarehouse warehouse-01.html">Back</a>
 </center>
 </body></html>

+ 7 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-03.html

@@ -0,0 +1,7 @@
+<html><body>Warehouse Keeper:<br>
+<center>
+<a action="bypass -h npc_%objectId%_DepositC" msg="1039">Deposit an item. (Clan Warehouse)</a><br>
+<a action="bypass -h npc_%objectId%_WithdrawC">Withdraw an item. (Clan Warehouse)</a><br><br>
+<a action="bypass -h Quest CastleWarehouse warehouse-01.html">Back</a>
+</center>
+</body></html>

+ 6 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-04.html

@@ -0,0 +1,6 @@
+<html><body>Warehouse Keeper:<br>
+You can earn a total of <font color="LEVEL">%blood%</font> "Blood Alliances" through a successful siege.<br><br>
+<a action="bypass -h Quest CastleWarehouse Receive">Receive "Blood Alliance."</a><br>
+<a action="bypass -h Quest CastleWarehouse Exchange">Exchange a "Blood Alliance" for 30 "Blood Oaths."</a><br>
+<a action="bypass -h Quest CastleWarehouse warehouse-01.html">Back.</a>
+</body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/html/castlewarehouse/castlewarehouse-5.htm → L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-05.html

@@ -1,3 +1,3 @@
 <html><body>Warehouse Keeper:<br>
 There are no items currently being stored here.
-</body></html>
+</body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/html/castlewarehouse/castlewarehouse-6.htm → L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-06.html

@@ -1,3 +1,3 @@
 <html><body>Warehouse Keeper:<br>
 You have made your payment.
-</body></html>
+</body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/html/castlewarehouse/castlewarehouse-7.htm → L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-07.html

@@ -1,3 +1,3 @@
 <html><body>Warehouse Keeper:<br>
 Exchanged.
-</body></html>
+</body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/html/castlewarehouse/castlewarehouse-8.htm → L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-08.html

@@ -1,3 +1,3 @@
 <html><body>Warehouse Keeper:<br>
 You do not have enough "Blood Alliances."
-</body></html>
+</body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/html/castlewarehouse/castlewarehouse-3.htm → L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-no.html

@@ -1,3 +1,3 @@
 <html><body>Warehouse Keeper:<br>
 You do not have the authority to access that account.
-</body></html>
+</body></html>

+ 96 - 0
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/TownPets/TownPets.java

@@ -0,0 +1,96 @@
+/*
+ * 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.TownPets;
+
+import ai.npc.AbstractNpcAI;
+
+import com.l2jserver.Config;
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.datatables.SpawnTable;
+import com.l2jserver.gameserver.model.L2CharPosition;
+import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Town Pets AI
+ * @author malyelfik
+ */
+public class TownPets extends AbstractNpcAI
+{
+	// Pet IDs
+	private static final int[] PETS =
+	{
+		31202, // Maximus
+		31203, // Moon Dancer
+		31204, // Georgio
+		31205, // Katz
+		31206, // Ten Ten
+		31207, // Sardinia
+		31208, // La Grange
+		31209, // Misty Rain
+		31266, // Kaiser
+		31593, // Dorothy
+		31758, // Rafi
+		31955, // Ruby
+	};
+	
+	private TownPets(String name, String descr)
+	{
+		super(name, descr);
+		addSpawnId(PETS);
+		
+		for (int npcId : PETS)
+		{
+			for (L2Spawn spawn : SpawnTable.getInstance().getSpawns(npcId))
+			{
+				onSpawn(spawn.getLastSpawn());
+			}
+		}
+	}
+	
+	@Override
+	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+	{
+		if (event.equalsIgnoreCase("move"))
+		{
+			final int locX = (npc.getSpawn().getLocx() - 50) + getRandom(100);
+			final int locY = (npc.getSpawn().getLocy() - 50) + getRandom(100);
+			npc.setRunning();
+			npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new L2CharPosition(locX, locY, npc.getZ(), 0));
+			startQuestTimer("move", 5000, npc, null);
+		}
+		return null;
+	}
+	
+	@Override
+	public String onSpawn(L2Npc npc)
+	{
+		if (Config.ALLOW_PET_WALKERS)
+		{
+			startQuestTimer("move", 3000, npc, null);
+		}
+		return super.onSpawn(npc);
+	}
+	
+	public static void main(String[] args)
+	{
+		new TownPets(TownPets.class.getSimpleName(), "ai/npc");
+	}
+}

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

@@ -126,7 +126,6 @@ import handlers.admincommandhandlers.AdminVitality;
 import handlers.admincommandhandlers.AdminZone;
 import handlers.bypasshandlers.ArenaBuff;
 import handlers.bypasshandlers.Augment;
-import handlers.bypasshandlers.BloodAlliance;
 import handlers.bypasshandlers.Buy;
 import handlers.bypasshandlers.BuyShadowItem;
 import handlers.bypasshandlers.ChatLink;
@@ -437,7 +436,6 @@ public class MasterHandler
 			// Bypass Handlers
 			Augment.class,
 			ArenaBuff.class,
-			BloodAlliance.class,
 			Buy.class,
 			BuyShadowItem.class,
 			ChatLink.class,

+ 0 - 113
L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/BloodAlliance.java

@@ -1,113 +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 java.util.StringTokenizer;
-import java.util.logging.Level;
-
-import com.l2jserver.gameserver.handler.IBypassHandler;
-import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.instance.L2CastleWarehouseInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-
-/**
- * Castle Warehouse - Blood Alliance.
- * @author malyelfik
- */
-public class BloodAlliance implements IBypassHandler
-{
-	private static final String[] COMMANDS =
-	{
-		"HonoraryItem",
-		"Receive",
-		"Exchange"
-	};
-	
-	@Override
-	public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
-	{
-		if (!(target instanceof L2CastleWarehouseInstance))
-		{
-			return false;
-		}
-		
-		final L2CastleWarehouseInstance npc = (L2CastleWarehouseInstance) target;
-		try
-		{
-			NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
-			StringTokenizer st = new StringTokenizer(command, " ");
-			String actualCommand = st.nextToken(); // Get actual command
-			
-			if (actualCommand.equalsIgnoreCase(COMMANDS[0])) // "HonoraryItem"
-			{
-				if (npc.isMyLord(activeChar))
-				{
-					html.setFile(activeChar.getHtmlPrefix(), "data/html/castlewarehouse/castlewarehouse-4.htm");
-					html.replace("%blood%", Integer.toString(activeChar.getClan().getBloodAllianceCount()));
-				}
-				else
-				{
-					html.setFile(activeChar.getHtmlPrefix(), "data/html/castlewarehouse/castlewarehouse-3.htm");
-				}
-			}
-			else if (actualCommand.equalsIgnoreCase(COMMANDS[1])) // "Receive"
-			{
-				if (!npc.isMyLord(activeChar))
-				{
-					html.setFile(activeChar.getHtmlPrefix(), "data/html/castlewarehouse/castlewarehouse-5.htm");
-				}
-				else
-				{
-					activeChar.addItem("BloodAlliance", 9911, activeChar.getClan().getBloodAllianceCount(), activeChar, true);
-					activeChar.getClan().resetBloodAllianceCount();
-					html.setFile(activeChar.getHtmlPrefix(), "data/html/castlewarehouse/castlewarehouse-6.htm");
-				}
-			}
-			else if (actualCommand.equalsIgnoreCase(COMMANDS[2])) // "Exchange"
-			{
-				if (activeChar.getInventory().getInventoryItemCount(9911, -1) > 0)
-				{
-					activeChar.destroyItemByItemId("BloodAllianceExchange", 9911, 1, activeChar, true);
-					activeChar.addItem("BloodAllianceExchange", 9910, 30, activeChar, true);
-					html.setFile(activeChar.getHtmlPrefix(), "data/html/castlewarehouse/castlewarehouse-7.htm");
-				}
-				else
-				{
-					html.setFile(activeChar.getHtmlPrefix(), "data/html/castlewarehouse/castlewarehouse-8.htm");
-				}
-				
-			}
-			html.replace("%objectId%", String.valueOf(npc.getObjectId()));
-			activeChar.sendPacket(html);
-			return true;
-		}
-		catch (Exception e)
-		{
-			_log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e);
-		}
-		return false;
-	}
-	
-	@Override
-	public String[] getBypassList()
-	{
-		return COMMANDS;
-	}
-}

+ 20 - 11
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java

@@ -59,9 +59,12 @@ public class Q00167_DwarvenKinship extends Quest
 			{
 				case "30210-02.html":
 				{
-					st.giveAdena(20000, true);
-					st.exitQuest(false, true);
-					htmltext = event;
+					if (st.isCond(2) && st.hasQuestItems(NORMANS_LETTER))
+					{
+						st.giveAdena(20000, true);
+						st.exitQuest(false, true);
+						htmltext = event;
+					}
 					break;
 				}
 				case "30255-02.html":
@@ -71,18 +74,24 @@ public class Q00167_DwarvenKinship extends Quest
 				}
 				case "30255-03.html":
 				{
-					st.takeItems(CARLONS_LETTER, -1);
-					st.giveItems(NORMANS_LETTER, 1);
-					st.giveAdena(2000, true);
-					st.setCond(2);
-					htmltext = event;
+					if (st.isCond(1) && st.hasQuestItems(CARLONS_LETTER))
+					{
+						st.takeItems(CARLONS_LETTER, -1);
+						st.giveItems(NORMANS_LETTER, 1);
+						st.giveAdena(2000, true);
+						st.setCond(2);
+						htmltext = event;
+					}
 					break;
 				}
 				case "30255-04.html":
 				{
-					st.giveAdena(15000, true);
-					st.exitQuest(false, true);
-					htmltext = event;
+					if (st.isCond(1) && st.hasQuestItems(CARLONS_LETTER))
+					{
+						st.giveAdena(15000, true);
+						st.exitQuest(false, true);
+						htmltext = event;
+					}
 					break;
 				}
 				case "30350-03.htm":

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

@@ -7271,14 +7271,14 @@ INSERT INTO `npc` VALUES
 (31199, 31199, "Orator of Revelations", 0, "", 0, "LineageMonster.liviona", 15, 28, 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, 80, 120, 0, 1),
 (31200, 31200, "Preacher of Doom", 0, "", 0, "LineageMonster.dark_horror", 20, 35, 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, 100, 120, 0, 1),
 (31201, 31201, "Orator of Revelations", 0, "", 0, "LineageMonster.liviona", 15, 28, 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, 80, 120, 0, 1),
-(31202, 31202, "Maximus", 0, "", 0, "LineageMonster.pet_wolf", 13, 11.5, 70, "male", "L2TownPet", 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, 24, 120, 0, 1),
-(31203, 31203, "Moon Dancer", 0, "", 0, "LineageMonster.pet_wolf", 13, 11.5, 70, "male", "L2TownPet", 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, 24, 120, 0, 1),
-(31204, 31204, "Georgio", 0, "", 0, "LineageMonster.pet_wolf", 13, 11.5, 70, "male", "L2TownPet", 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, 24, 120, 0, 1),
-(31205, 31205, "Katz", 0, "", 0, "LineageMonster.hatchling", 9, 10, 70, "male", "L2TownPet", 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, 80, 120, 0, 1),
-(31206, 31206, "Ten Ten", 0, "", 0, "LineageMonster.hatchling", 9, 10, 70, "male", "L2TownPet", 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, 80, 120, 0, 1),
-(31207, 31207, "Sardinia", 0, "", 0, "LineageMonster.hatchling", 9, 10, 70, "male", "L2TownPet", 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, 80, 120, 0, 1),
-(31208, 31208, "La Grange", 0, "", 0, "LineageMonster.hatchling", 9, 10, 70, "male", "L2TownPet", 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, 80, 120, 0, 1),
-(31209, 31209, "Misty Rain", 0, "", 0, "LineageMonster.pet_wolf", 13, 11.5, 70, "male", "L2TownPet", 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, 24, 120, 0, 1),
+(31202, 31202, "Maximus", 0, "", 0, "LineageMonster.pet_wolf", 13, 11.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, 24, 120, 0, 1),
+(31203, 31203, "Moon Dancer", 0, "", 0, "LineageMonster.pet_wolf", 13, 11.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, 24, 120, 0, 1),
+(31204, 31204, "Georgio", 0, "", 0, "LineageMonster.pet_wolf", 13, 11.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, 24, 120, 0, 1),
+(31205, 31205, "Katz", 0, "", 0, "LineageMonster.hatchling", 9, 10, 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, 80, 120, 0, 1),
+(31206, 31206, "Ten Ten", 0, "", 0, "LineageMonster.hatchling", 9, 10, 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, 80, 120, 0, 1),
+(31207, 31207, "Sardinia", 0, "", 0, "LineageMonster.hatchling", 9, 10, 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, 80, 120, 0, 1),
+(31208, 31208, "La Grange", 0, "", 0, "LineageMonster.hatchling", 9, 10, 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, 80, 120, 0, 1),
+(31209, 31209, "Misty Rain", 0, "", 0, "LineageMonster.pet_wolf", 13, 11.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, 24, 120, 0, 1),
 (31210, 31210, "Race Track Gatekeeper", 0, "", 0, "LineageNPC.e_teleporter_FDwarf", 8, 21.3, 70, "female", "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),
 (31211, 31211, "Race Track Guide", 0, "", 0, "LineageNPC.e_traderA_FDwarf", 7, 18.5, 70, "female", "L2Teleporter", 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),
 (31212, 31212, "Event Gatekeeper", 0, "", 0, "LineageMonster.cutie_cat", 8, 15, 70, "female", "L2Teleporter", 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, 48, 120, 0, 1),
@@ -7335,7 +7335,7 @@ INSERT INTO `npc` VALUES
 (31263, 31263, "Liesel", 0, "Grocer", 0, "LineageNPC.a_common_peopleC_Fhuman", 8, 22.5, 70, "female", "L2Merchant", 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),
 (31264, 31264, "Olsun", 0, "Symbol Maker", 0, "LineageNPC.a_traderC_Mhuman", 8, 23, 70, "male", "L2SymbolMaker", 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),
 (31265, 31265, "Annette", 0, "Pet Manager", 0, "LineageNPC.a_fighterguild_teacher_FHuman", 9.5, 22.4, 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),
-(31266, 31266, "Kaiser", 0, "", 0, "LineageMonster2.youth_tiger", 16, 17.2, 70, "male", "L2TownPet", 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, 60, 120, 0, 1),
+(31266, 31266, "Kaiser", 0, "", 0, "LineageMonster2.youth_tiger", 16, 17.2, 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, 60, 120, 0, 1),
 (31267, 31267, "Lietta", 0, "Warehouse Keeper", 0, "LineageNPC.e_warehouse_keeper_FDwarf", 7, 18, 70, "female", "L2Warehouse", 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),
 (31268, 31268, "Hakon", 0, "Warehouse Keeper", 0, "LineageNPC.e_warehouse_master_MDwarf", 8, 17.5, 70, "male", "L2Warehouse", 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),
 (31269, 31269, "Mona", 0, "Warehouse Chief", 0, "LineageNPC.e_traderB_FDwarf", 7, 18, 70, "female", "L2VillageMasterDwarf", 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),
@@ -7650,7 +7650,7 @@ INSERT INTO `npc` VALUES
 (31590, 31590, "Truth Scholar Devianne", 0, "", 0, "LineageNPC.a_teleporter_FHuman", 8, 25, 70, "female", "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, 192, 0, 0, 50, 120, 0, 1),
 (31591, 31591, "Sunset Guide Luna", 0, "", 0, "LineageNPC.a_sanctuary_teacher_FHuman", 8, 22.5, 70, "female", "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, 189, 633, 0, 50, 120, 0, 1),
 (31592, 31592, "Telson", 0, "Chief Golem Crafter", 0, "LineageNPC.e_mine_master_MDwarf", 8, 19.7, 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),
-(31593, 31593, "Dorothy", 0, "Golem of Telson", 0, "LineageMonster.mechanic_golem", 5, 19, 70, "male", "L2TownPet", 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, 30, 120, 0, 1),
+(31593, 31593, "Dorothy", 0, "Golem of Telson", 0, "LineageMonster.mechanic_golem", 5, 19, 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, 30, 120, 0, 1),
 (31594, 31594, "Mond", 0, "Chief Inspector", 0, "LineageNPC.e_celebrant_MDwarf", 8, 19.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),
 (31595, 31595, "Leona Blackbird", 0, "", 0, "LineageNPC.a_fighterguild_teacher_FHuman", 9.5, 22.4, 70, "female", "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, 79, 110, 0, 50, 120, 0, 1),
 (31596, 31596, "Tobald", 0, "Master", 0, "LineageNPC.e_guard_MDwarf", 8, 19, 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, 187, 0, 0, 50, 120, 0, 1),
@@ -7812,7 +7812,7 @@ INSERT INTO `npc` VALUES
 (31755, 31755, "Halaster", 0, "Grand Magister", 0, "LineageNPC.a_mageguild_master_MHuman", 8, 24, 70, "male", "L2VillageMasterMystic", 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),
 (31756, 31756, "Mr. Cat", 0, "Test Server Helper", 0, "LineageMonster.cat_the_cat", 9, 16, 70, "male", "L2ClassMaster", 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, 80, 120, 0, 1),
 (31757, 31757, "Miss Queen", 0, "Test Server Helper", 0, "LineageMonster2.queen_of_cat", 8, 15, 70, "female", "L2ClassMaster", 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, 26, 120, 0, 1),
-(31758, 31758, "Rafi", 0, "", 0, "LineageMonster.hatchling", 9, 10, 70, "male", "L2TownPet", 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, 80, 120, 0, 1),
+(31758, 31758, "Rafi", 0, "", 0, "LineageMonster.hatchling", 9, 10, 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, 80, 120, 0, 1),
 (31759, 31759, "Teleportation Cubic", 0, "", 0, "LineageNPC.teleport_npc", 40, 80, 70, "etc", "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),
 (31760, 31760, "Miss Queen", 0, "Adventurers' Guide", 0, "LineageMonster2.queen_of_cat", 8, 15, 70, "female", "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, 26, 120, 0, 1),
 (31761, 31761, "Miss Queen", 0, "Adventurers' Guide", 0, "LineageMonster2.queen_of_cat", 8, 15, 70, "female", "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, 26, 120, 0, 1),
@@ -8009,7 +8009,7 @@ INSERT INTO `npc` VALUES
 (31952, 31952, "Pele", 0, "Grocer", 0, "LineageNPC.a_common_peopleC_Fhuman", 8, 22.5, 70, "female", "L2Merchant", 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),
 (31953, 31953, "Rankar", 0, "Symbol Maker", 0, "LineageNPC.a_mageguild_teacher_MHuman", 8, 23, 70, "male", "L2SymbolMaker", 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),
 (31954, 31954, "Saroyan", 0, "Pet Manager", 0, "LineageNPC.a_traderD_Mhuman", 8, 21.5, 70, "male", "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),
-(31955, 31955, "Ruby", 0, "", 0, "LineageMonster2.baby_tiger", 11, 15.7, 70, "male", "L2TownPet", 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, 28, 120, 0, 1),
+(31955, 31955, "Ruby", 0, "", 0, "LineageMonster2.baby_tiger", 11, 15.7, 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, 28, 120, 0, 1),
 (31956, 31956, "Rydel", 0, "Warehouse Keeper", 0, "LineageNPC.e_warehouse_keeper_FDwarf", 7, 18, 70, "female", "L2Warehouse", 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),
 (31957, 31957, "Cherbal", 0, "Warehouse Keeper", 0, "LineageNPC.a_warehouse_keeper_MDwarf", 8, 17, 70, "male", "L2Warehouse", 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),
 (31958, 31958, "Yasheni", 0, "Warehouse Chief", 0, "LineageNPC.e_warehouse_keeper_FDwarf", 7, 18, 70, "female", "L2VillageMasterDwarf", 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),
@@ -9008,11 +9008,11 @@ INSERT INTO `npc` VALUES
 (35092, 35092, "Gatekeeper", 0, "Gludio", 0, "LineageNPC.a_guard_MHuman", 8, 24, 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, 50, 1, 0, 1),
 (35093, 35093, "Gatekeeper", 0, "Gludio", 0, "LineageNPC.a_guard_MHuman", 8, 24, 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, 50, 1, 0, 1),
 (35094, 35094, "Gatekeeper", 0, "Gludio", 0, "LineageNPC.a_guard_MHuman", 8, 24, 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, 50, 1, 0, 1),
-(35095, 35095, "Mass Gatekeeper", 0, "Gludio", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleTeleporter", 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, 1, 0, 1),
+(35095, 35095, "Mass Gatekeeper", 0, "Gludio", 0, "LineageNPC.a_guard_MHuman", 8, 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, 1, 0, 1),
 (35096, 35096, "Outer Doorman", 0, "Gludio", 0, "LineageNPC.a_guard_MHuman", 8, 24, 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, 50, 1, 0, 1),
 (35097, 35097, "Inner Doorman", 0, "Gludio", 0, "LineageNPC.a_guard_MHuman", 8, 24, 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, 50, 1, 0, 1),
-(35098, 35098, "Blacksmith", 0, "Gludio", 0, "LineageNPC.a_smith_MDwarf", 7, 16.5, 75, "male", "L2CastleBlacksmith", 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", "L2CastleWarehouse", 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),
+(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", "L2CastleChamberlain", 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),
 (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),
@@ -9050,11 +9050,11 @@ INSERT INTO `npc` VALUES
 (35134, 35134, "Gatekeeper", 0, "Dion", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleDoormen", 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),
 (35135, 35135, "Gatekeeper", 0, "Dion", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleDoormen", 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),
 (35136, 35136, "Gatekeeper", 0, "Dion", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleDoormen", 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),
-(35137, 35137, "Mass Gatekeeper", 0, "Dion", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleTeleporter", 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),
+(35137, 35137, "Mass Gatekeeper", 0, "Dion", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "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),
 (35138, 35138, "Outer Doorman", 0, "Dion", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleDoormen", 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),
 (35139, 35139, "Inner Doorman", 0, "Dion", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleDoormen", 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),
-(35140, 35140, "Blacksmith", 0, "Dion", 0, "LineageNPC.a_smith_MDwarf", 7, 16.5, 75, "male", "L2CastleBlacksmith", 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", "L2CastleWarehouse", 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),
+(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", "L2CastleChamberlain", 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),
 (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),
@@ -9092,11 +9092,11 @@ INSERT INTO `npc` VALUES
 (35176, 35176, "Gatekeeper", 0, "Giran", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleDoormen", 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),
 (35177, 35177, "Gatekeeper", 0, "Giran", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleDoormen", 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),
 (35178, 35178, "Gatekeeper", 0, "Giran", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleDoormen", 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),
-(35179, 35179, "Mass Gatekeeper", 0, "Giran", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleTeleporter", 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),
+(35179, 35179, "Mass Gatekeeper", 0, "Giran", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "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),
 (35180, 35180, "Outer Doorman", 0, "Giran", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleDoormen", 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),
 (35181, 35181, "Inner Doorman", 0, "Giran", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleDoormen", 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),
-(35182, 35182, "Blacksmith", 0, "Giran", 0, "LineageNPC.a_smith_MDwarf", 7, 16.5, 75, "male", "L2CastleBlacksmith", 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", "L2CastleWarehouse", 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),
+(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", "L2CastleChamberlain", 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),
 (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),
@@ -9134,11 +9134,11 @@ INSERT INTO `npc` VALUES
 (35218, 35218, "Gatekeeper", 0, "Oren", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleDoormen", 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),
 (35219, 35219, "Gatekeeper", 0, "Oren", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleDoormen", 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),
 (35220, 35220, "Gatekeeper", 0, "Oren", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleDoormen", 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),
-(35221, 35221, "Mass Gatekeeper", 0, "Oren", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleTeleporter", 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),
+(35221, 35221, "Mass Gatekeeper", 0, "Oren", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "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),
 (35222, 35222, "Outer Doorman", 0, "Oren", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleDoormen", 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),
 (35223, 35223, "Inner Doorman", 0, "Oren", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleDoormen", 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),
-(35224, 35224, "Blacksmith", 0, "Oren", 0, "LineageNPC.a_smith_MDwarf", 7, 16.5, 75, "male", "L2CastleBlacksmith", 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", "L2CastleWarehouse", 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),
+(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", "L2CastleChamberlain", 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),
 (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),
@@ -9179,14 +9179,14 @@ INSERT INTO `npc` VALUES
 (35263, 35263, "Gatekeeper", 0, "Aden", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleDoormen", 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),
 (35264, 35264, "Gatekeeper", 0, "Aden", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleDoormen", 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),
 (35265, 35265, "Gatekeeper", 0, "Aden", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleDoormen", 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),
-(35266, 35266, "Mass Gatekeeper", 0, "Aden", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleTeleporter", 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),
+(35266, 35266, "Mass Gatekeeper", 0, "Aden", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "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),
 (35267, 35267, "Outer Doorman", 0, "Aden", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleDoormen", 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),
 (35268, 35268, "Inner Doorman", 0, "Aden", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleDoormen", 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),
 (35269, 35269, "Hall Doorman", 0, "Aden", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleDoormen", 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),
 (35270, 35270, "Inner Doorman", 0, "Aden", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleDoormen", 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),
 (35271, 35271, "Gatekeeper", 0, "Aden", 0, "LineageNPC.a_guard_MHuman", 8, 24, 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, 50, 120, 0, 1),
-(35272, 35272, "Blacksmith", 0, "Aden", 0, "LineageNPC.a_smith_MDwarf", 7, 16.5, 75, "male", "L2CastleBlacksmith", 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", "L2CastleWarehouse", 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),
+(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", "L2CastleChamberlain", 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),
 (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),
@@ -9224,11 +9224,11 @@ INSERT INTO `npc` VALUES
 (35308, 35308, "Gatekeeper", 0, "Innadril", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleDoormen", 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),
 (35309, 35309, "Gatekeeper", 0, "Innadril", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleDoormen", 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),
 (35310, 35310, "Gatekeeper", 0, "Innadril", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleDoormen", 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),
-(35311, 35311, "Mass Gatekeeper", 0, "Innadril", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleTeleporter", 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),
+(35311, 35311, "Mass Gatekeeper", 0, "Innadril", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "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),
 (35312, 35312, "Outer Doorman", 0, "Innadril", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleDoormen", 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),
 (35313, 35313, "Inner Doorman", 0, "Innadril", 0, "LineageNPC.a_guard_MHuman", 8, 24, 75, "male", "L2CastleDoormen", 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),
-(35314, 35314, "Blacksmith", 0, "Innadril", 0, "LineageNPC.a_smith_MDwarf", 7, 16.5, 75, "male", "L2CastleBlacksmith", 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", "L2CastleWarehouse", 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),
+(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", "L2CastleChamberlain", 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),
 (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),
@@ -9267,14 +9267,14 @@ INSERT INTO `npc` VALUES
 (35352, 35352, "Gatekeeper", 0, "Goddard", 0, "LineageNPC.e_elmore_guard_Mhuman", 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, 50, 120, 0, 1),
 (35353, 35353, "Gatekeeper", 0, "Goddard", 0, "LineageNPC.e_elmore_guard_Mhuman", 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, 50, 120, 0, 1),
 (35354, 35354, "Gatekeeper", 0, "Goddard", 0, "LineageNPC.e_elmore_guard_Mhuman", 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, 50, 120, 0, 1),
-(35355, 35355, "Mass Gatekeeper", 0, "Goddard", 0, "LineageNPC.e_elmore_guard_Mhuman", 8, 23.5, 75, "male", "L2CastleTeleporter", 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),
+(35355, 35355, "Mass Gatekeeper", 0, "Goddard", 0, "LineageNPC.e_elmore_guard_Mhuman", 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, 50, 120, 0, 1),
 (35356, 35356, "Outer Doorman", 0, "Goddard", 0, "LineageNPC.e_elmore_guard_Mhuman", 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, 50, 120, 0, 1),
 (35357, 35357, "Inner Doorman", 0, "Goddard", 0, "LineageNPC.e_elmore_guard_Mhuman", 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, 50, 120, 0, 1),
 (35358, 35358, "Inner Doorman", 0, "Goddard", 0, "LineageNPC.e_elmore_guard_Mhuman", 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, 50, 120, 0, 1),
 (35359, 35359, "Gatekeeper", 0, "Goddard", 0, "LineageNPC.e_elmore_guard_Mhuman", 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, 50, 120, 0, 1),
 (35360, 35360, "Gatekeeper", 0, "Goddard", 0, "LineageNPC.e_elmore_guard_Mhuman", 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, 50, 120, 0, 1),
-(35361, 35361, "Blacksmith", 0, "Goddard", 0, "LineageNPC.a_smith_MDwarf", 7, 16.5, 75, "male", "L2CastleBlacksmith", 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", "L2CastleWarehouse", 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),
+(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", "L2CastleChamberlain", 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),
 (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),
@@ -9414,13 +9414,13 @@ INSERT INTO `npc` VALUES
 (35499, 35499, "Gatekeeper", 0, "Rune", 0, "LineageNPC.e_elmore_guard_Mhuman", 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, 50, 120, 0, 1),
 (35500, 35500, "Gatekeeper", 0, "Rune", 0, "LineageNPC.e_elmore_guard_Mhuman", 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, 50, 120, 0, 1),
 (35501, 35501, "Gatekeeper", 0, "Rune", 0, "LineageNPC.e_elmore_guard_Mhuman", 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, 50, 120, 0, 1),
-(35502, 35502, "Group Gatekeeper", 0, "Rune", 0, "LineageNPC.e_elmore_guard_Mhuman", 8, 23.5, 75, "male", "L2CastleTeleporter", 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),
+(35502, 35502, "Group Gatekeeper", 0, "Rune", 0, "LineageNPC.e_elmore_guard_Mhuman", 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, 50, 120, 0, 1),
 (35503, 35503, "Outer Doorman", 0, "Rune", 0, "LineageNPC.e_elmore_guard_Mhuman", 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, 50, 120, 0, 1),
 (35504, 35504, "Inner Doorman", 0, "Rune", 0, "LineageNPC.e_elmore_guard_Mhuman", 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, 50, 120, 0, 1),
 (35505, 35505, "Inner Doorman", 0, "Rune", 0, "LineageNPC.e_elmore_guard_Mhuman", 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, 50, 120, 0, 1),
 (35506, 35506, "Dungeon Gatekeeper", 0, "Rune", 0, "LineageNPC.e_elmore_guard_Mhuman", 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, 50, 120, 0, 1),
-(35507, 35507, "Blacksmith", 0, "Rune", 0, "LineageNPC.a_smith_MDwarf", 7, 16.5, 75, "male", "L2CastleBlacksmith", 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", "L2CastleWarehouse", 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),
+(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", "L2CastleChamberlain", 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),
 (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),
@@ -9459,14 +9459,14 @@ INSERT INTO `npc` VALUES
 (35544, 35544, "Gatekeeper", 0, "Schuttgart", 0, "LineageNPC.e_elmore_guard_Mhuman", 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, 50, 120, 0, 1),
 (35545, 35545, "Gatekeeper", 0, "Schuttgart", 0, "LineageNPC.e_elmore_guard_Mhuman", 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, 50, 120, 0, 1),
 (35546, 35546, "Gatekeeper", 0, "Schuttgart", 0, "LineageNPC.e_elmore_guard_Mhuman", 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, 50, 120, 0, 1),
-(35547, 35547, "Group Gatekeeper", 0, "Schuttgart", 0, "LineageNPC.e_elmore_guard_Mhuman", 8, 23.5, 75, "male", "L2CastleTeleporter", 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),
+(35547, 35547, "Group Gatekeeper", 0, "Schuttgart", 0, "LineageNPC.e_elmore_guard_Mhuman", 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, 50, 120, 0, 1),
 (35548, 35548, "Outer Doorman", 0, "Schuttgart", 0, "LineageNPC.e_elmore_guard_Mhuman", 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, 50, 120, 0, 1),
 (35549, 35549, "Inner Doorman", 0, "Schuttgart", 0, "LineageNPC.e_elmore_guard_Mhuman", 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, 50, 120, 0, 1),
 (35550, 35550, "Inner Doorman", 0, "Schuttgart", 0, "LineageNPC.e_elmore_guard_Mhuman", 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, 50, 120, 0, 1),
 (35551, 35551, "Doorman", 0, "Schuttgart", 0, "LineageNPC.e_elmore_guard_Mhuman", 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, 50, 120, 0, 1),
 (35552, 35552, "Doorman", 0, "Schuttgart", 0, "LineageNPC.e_elmore_guard_Mhuman", 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, 50, 120, 0, 1),
-(35553, 35553, "Blacksmith", 0, "Schuttgart", 0, "LineageNPC.a_smith_MDwarf", 7, 16.5, 75, "male", "L2CastleBlacksmith", 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", "L2CastleWarehouse", 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),
+(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", "L2CastleChamberlain", 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),
 (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),