From 2bb69835600edc8f89fe865f9a142cdb213fca1d Mon Sep 17 00:00:00 2001 From: St3eT <St3eT@users.noreply.github.com> Date: Sun, 23 Feb 2014 22:26:59 +0000 Subject: [PATCH] BETA: Reworking '''!CastleAmbassador''' from core to DP. * Reviewed by: !UnAfraid, Adry_85, malyelfik also fixed minor typo from [10193]. * Reported by: Adry_85 --- .../html/fortress/ambassador-not-owned.htm | 3 - L2J_DataPack_BETA/dist/game/data/scripts.cfg | 1 + .../CastleAmbassador/CastleAmbassador.java | 178 ++++++++++++++++++ .../npc/CastleAmbassador/ambassador-01.html} | 2 +- .../npc/CastleAmbassador/ambassador-02.html} | 0 .../npc/CastleAmbassador/ambassador-03.html} | 0 .../npc/CastleAmbassador/ambassador-04.html} | 0 .../npc/CastleAmbassador/ambassador-05.html} | 0 .../ai/npc/CastleAmbassador/ambassador.html} | 4 +- .../CastleCourtMagician.java | 2 +- .../SupportUnitCaptain.java | 2 +- .../dist/game/data/stats/npcs/36300-36400.xml | 28 +-- .../dist/game/data/stats/npcs/36400-36500.xml | 100 +++------- 13 files changed, 216 insertions(+), 104 deletions(-) delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/fortress/ambassador-not-owned.htm create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java rename L2J_DataPack_BETA/dist/game/data/{html/fortress/ambassador-border.htm => scripts/ai/npc/CastleAmbassador/ambassador-01.html} (79%) rename L2J_DataPack_BETA/dist/game/data/{html/fortress/ambassador-independent.htm => scripts/ai/npc/CastleAmbassador/ambassador-02.html} (100%) rename L2J_DataPack_BETA/dist/game/data/{html/fortress/ambassador-not-leader.htm => scripts/ai/npc/CastleAmbassador/ambassador-03.html} (100%) rename L2J_DataPack_BETA/dist/game/data/{html/fortress/ambassador-rejected.htm => scripts/ai/npc/CastleAmbassador/ambassador-04.html} (100%) rename L2J_DataPack_BETA/dist/game/data/{html/fortress/ambassador-signed.htm => scripts/ai/npc/CastleAmbassador/ambassador-05.html} (100%) rename L2J_DataPack_BETA/dist/game/data/{html/fortress/ambassador.htm => scripts/ai/npc/CastleAmbassador/ambassador.html} (66%) diff --git a/L2J_DataPack_BETA/dist/game/data/html/fortress/ambassador-not-owned.htm b/L2J_DataPack_BETA/dist/game/data/html/fortress/ambassador-not-owned.htm deleted file mode 100644 index 5657c302fd..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/fortress/ambassador-not-owned.htm +++ /dev/null @@ -1,3 +0,0 @@ -<html><body> -Contact is currently not possible, %castleName% Castle isn't currently owned by clan. -</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/scripts.cfg b/L2J_DataPack_BETA/dist/game/data/scripts.cfg index efbaed5d1e..45714f0349 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts.cfg +++ b/L2J_DataPack_BETA/dist/game/data/scripts.cfg @@ -17,6 +17,7 @@ ai/npc/ArenaManager/ArenaManager.java ai/npc/AvantGarde/AvantGarde.java ai/npc/BlackJudge/BlackJudge.java ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java +ai/npc/CastleAmbassador/CastleAmbassador.java ai/npc/CastleBlacksmith/CastleBlacksmith.java ai/npc/CastleCourtMagician/CastleCourtMagician.java ai/npc/CastleChamberlain/CastleChamberlain.java diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java new file mode 100644 index 0000000000..c79d853a14 --- /dev/null +++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java @@ -0,0 +1,178 @@ +/* + * Copyright (C) 2004-2014 L2J DataPack + * + * This file is part of L2J DataPack. + * + * L2J DataPack is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * L2J DataPack is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +package ai.npc.CastleAmbassador; + +import ai.npc.AbstractNpcAI; + +import com.l2jserver.gameserver.model.L2Object; +import com.l2jserver.gameserver.model.actor.L2Npc; +import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; +import com.l2jserver.gameserver.model.entity.Castle; +import com.l2jserver.gameserver.model.entity.Fort; +import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; + +/** + * Castle Ambassador AI. + * @author St3eT + */ +public final class CastleAmbassador extends AbstractNpcAI +{ + // NPCs + // @formatter:off + private static final int[] CASTLE_AMBASSADOR = + { + 36393, 36394, 36437, 36435, // Gludio + 36395, 36436, 36439, 36441, // Dion + 36396, 36440, 36444, 36449, 36451, // Giran + 36397, 36438, 36442, 36443, 36446, // Oren + 36398, 36399, 36445, 36448, // Aden + 36400, 36450, // Innadril + 36401, 36447, 36453, // Goddard + 36433, 36452, 36454, // Rune + 36434, 36455, // Schuttgart + }; + // @formatter:on + + private CastleAmbassador() + { + super(CastleAmbassador.class.getSimpleName(), "ai/npc"); + addStartNpc(CASTLE_AMBASSADOR); + addTalkId(CASTLE_AMBASSADOR); + addFirstTalkId(CASTLE_AMBASSADOR); + addEventReceivedId(CASTLE_AMBASSADOR); + addSpawnId(CASTLE_AMBASSADOR); + } + + @Override + public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) + { + if (npc != null) + { + final Fort fortresss = npc.getFort(); + String htmltext = null; + + switch (event) + { + case "signed": + { + if (fortresss.getFortState() == 0) + { + fortresss.setFortState(2, fortresss.getCastleIdByAmbassador(npc.getId())); + cancelQuestTimer("DESPAWN", npc, null); + startQuestTimer("DESPAWN", 3000, npc, null); + htmltext = "ambassador-05.html"; + } + else if (fortresss.getFortState() == 1) + { + htmltext = "ambassador-04.html"; + } + break; + } + case "rejected": + { + if (fortresss.getFortState() == 0) + { + fortresss.setFortState(1, fortresss.getCastleIdByAmbassador(npc.getId())); + cancelQuestTimer("DESPAWN", npc, null); + startQuestTimer("DESPAWN", 3000, npc, null); + htmltext = "ambassador-02.html"; + } + else if (fortresss.getFortState() == 2) + { + htmltext = "ambassador-02.html"; + } + break; + } + case "DESPAWN": + { + if (fortresss.getFortState() == 0) + { + fortresss.setFortState(1, fortresss.getCastleIdByAmbassador(npc.getId())); + } + cancelQuestTimer("DESPAWN", npc, null); + npc.broadcastEvent("DESPAWN", 1000, null); + npc.deleteMe(); + break; + } + } + + if (htmltext != null) + { + final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId()); + packet.setHtml(getHtm(player.getHtmlPrefix(), htmltext)); + packet.replace("%castleName%", String.valueOf(fortresss.getCastleByAmbassador(npc.getId()).getName())); + player.sendPacket(packet); + } + } + return super.onAdvEvent(event, npc, player); + } + + @Override + public String onEventReceived(String eventName, L2Npc sender, L2Npc receiver, L2Object reference) + { + if (receiver != null) + { + receiver.deleteMe(); + } + return super.onEventReceived(eventName, sender, receiver, reference); + } + + @Override + public String onFirstTalk(L2Npc npc, L2PcInstance player) + { + final Fort fortresss = npc.getFort(); + final int fortOwner = fortresss.getOwnerClan() == null ? 0 : fortresss.getOwnerClan().getId(); + String htmltext = null; + + if (player.isClanLeader() && (player.getClan() != null) && (player.getClanId() == fortOwner)) + { + htmltext = (fortresss.isBorderFortress()) ? "ambassador-01.html" : "ambassador.html"; + } + else + { + htmltext = "ambassador-03.html"; + } + + final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId()); + packet.setHtml(getHtm(player.getHtmlPrefix(), htmltext)); + packet.replace("%castleName%", String.valueOf(fortresss.getCastleByAmbassador(npc.getId()).getName())); + player.sendPacket(packet); + return null; + } + + @Override + public String onSpawn(L2Npc npc) + { + final Castle castle = npc.getFort().getCastleByAmbassador(npc.getId()); + if (castle.getOwnerId() == 0) + { + npc.deleteMe(); + } + else + { + startQuestTimer("DESPAWN", 3600000, npc, null); + } + return super.onSpawn(npc); + } + + public static void main(String[] args) + { + new CastleAmbassador(); + } +} \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/fortress/ambassador-border.htm b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleAmbassador/ambassador-01.html similarity index 79% rename from L2J_DataPack_BETA/dist/game/data/html/fortress/ambassador-border.htm rename to L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleAmbassador/ambassador-01.html index 7a74f52c0a..61c3e2de30 100644 --- a/L2J_DataPack_BETA/dist/game/data/html/fortress/ambassador-border.htm +++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleAmbassador/ambassador-01.html @@ -3,6 +3,6 @@ My master is the great ruler of %castleName% Castle. The message I am commanded If you do not have the strength to protect this place, my master inquires whether you would care to use our clan's strength to develop your skills.<br> <br> <center> -<a action="bypass -h npc_%objectId%_select 1">"We decline. We will walk our own path."</a> +<a action="bypass -h Quest CastleAmbassador rejected">"We decline. We will walk our own path."</a> </center> </body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/fortress/ambassador-independent.htm b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleAmbassador/ambassador-02.html similarity index 100% rename from L2J_DataPack_BETA/dist/game/data/html/fortress/ambassador-independent.htm rename to L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleAmbassador/ambassador-02.html diff --git a/L2J_DataPack_BETA/dist/game/data/html/fortress/ambassador-not-leader.htm b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleAmbassador/ambassador-03.html similarity index 100% rename from L2J_DataPack_BETA/dist/game/data/html/fortress/ambassador-not-leader.htm rename to L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleAmbassador/ambassador-03.html diff --git a/L2J_DataPack_BETA/dist/game/data/html/fortress/ambassador-rejected.htm b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleAmbassador/ambassador-04.html similarity index 100% rename from L2J_DataPack_BETA/dist/game/data/html/fortress/ambassador-rejected.htm rename to L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleAmbassador/ambassador-04.html diff --git a/L2J_DataPack_BETA/dist/game/data/html/fortress/ambassador-signed.htm b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleAmbassador/ambassador-05.html similarity index 100% rename from L2J_DataPack_BETA/dist/game/data/html/fortress/ambassador-signed.htm rename to L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleAmbassador/ambassador-05.html diff --git a/L2J_DataPack_BETA/dist/game/data/html/fortress/ambassador.htm b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleAmbassador/ambassador.html similarity index 66% rename from L2J_DataPack_BETA/dist/game/data/html/fortress/ambassador.htm rename to L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleAmbassador/ambassador.html index 37399f78ff..723e13e2b5 100644 --- a/L2J_DataPack_BETA/dist/game/data/html/fortress/ambassador.htm +++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleAmbassador/ambassador.html @@ -3,7 +3,7 @@ My master is the ruler of %castleName% Castle, renowned throughout the world for Unless you do so, my lord will know that your loyalty is suspect. Make your decision!<br> <br> <center> -<a action="bypass -h npc_%objectId%_select 2">"Very well, I will sign the contract."</a><br> -<a action="bypass -h npc_%objectId%_select 1">"I need no help from people like you!"</a> +<a action="bypass -h Quest CastleAmbassador signed">"Very well, I will sign the contract."</a><br> +<a action="bypass -h Quest CastleAmbassador rejected">"I need no help from people like you!"</a> </center> </body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleCourtMagician/CastleCourtMagician.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleCourtMagician/CastleCourtMagician.java index c1f13de84c..36978e1a9e 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleCourtMagician/CastleCourtMagician.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleCourtMagician/CastleCourtMagician.java @@ -253,7 +253,7 @@ public final class CastleCourtMagician extends AbstractNpcAI { if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_TROOPS_FAME)) { - RequestAcquireSkill.showSUbUnitSkillList(player); + RequestAcquireSkill.showSubUnitSkillList(player); } else { diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/SupportUnitCaptain/SupportUnitCaptain.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/SupportUnitCaptain/SupportUnitCaptain.java index 1f6388a495..6e32ab0590 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/SupportUnitCaptain/SupportUnitCaptain.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/SupportUnitCaptain/SupportUnitCaptain.java @@ -260,7 +260,7 @@ public final class SupportUnitCaptain extends AbstractNpcAI { if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_TROOPS_FAME)) { - RequestAcquireSkill.showSUbUnitSkillList(player); + RequestAcquireSkill.showSubUnitSkillList(player); } else { diff --git a/L2J_DataPack_BETA/dist/game/data/stats/npcs/36300-36400.xml b/L2J_DataPack_BETA/dist/game/data/stats/npcs/36300-36400.xml index b71818ac52..9eccb31f23 100644 --- a/L2J_DataPack_BETA/dist/game/data/stats/npcs/36300-36400.xml +++ b/L2J_DataPack_BETA/dist/game/data/stats/npcs/36300-36400.xml @@ -5253,13 +5253,11 @@ <height normal="21" /> </collision> </npc> - <npc id="36393" level="75" type="L2FortEnvoy" name="Special Envoy" title="Gludio"> + <npc id="36393" level="75" type="L2Npc" name="Special Envoy" title="Gludio"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="90" /> - <param name="fortress_id" value="101" /> - <param name="castle_id" value="1" /> </parameters> <race>HUMAN</race> <sex>FEMALE</sex> @@ -5295,13 +5293,11 @@ <height normal="25" /> </collision> </npc> - <npc id="36394" level="75" type="L2FortEnvoy" name="Special Envoy" title="Gludio"> + <npc id="36394" level="75" type="L2Npc" name="Special Envoy" title="Gludio"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="90" /> - <param name="fortress_id" value="102" /> - <param name="castle_id" value="1" /> </parameters> <race>HUMAN</race> <sex>FEMALE</sex> @@ -5337,13 +5333,11 @@ <height normal="25" /> </collision> </npc> - <npc id="36395" level="75" type="L2FortEnvoy" name="Special Envoy" title="Dion"> + <npc id="36395" level="75" type="L2Npc" name="Special Envoy" title="Dion"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="90" /> - <param name="fortress_id" value="103" /> - <param name="castle_id" value="2" /> </parameters> <race>HUMAN</race> <sex>FEMALE</sex> @@ -5379,13 +5373,11 @@ <height normal="22" /> </collision> </npc> - <npc id="36396" level="75" type="L2FortEnvoy" name="Special Envoy" title="Giran"> + <npc id="36396" level="75" type="L2Npc" name="Special Envoy" title="Giran"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="120" /> - <param name="fortress_id" value="104" /> - <param name="castle_id" value="3" /> </parameters> <race>HUMAN</race> <sex>FEMALE</sex> @@ -5421,13 +5413,11 @@ <height normal="22.5" /> </collision> </npc> - <npc id="36397" level="75" type="L2FortEnvoy" name="Special Envoy" title="Oren"> + <npc id="36397" level="75" type="L2Npc" name="Special Envoy" title="Oren"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="106" /> - <param name="fortress_id" value="105" /> - <param name="castle_id" value="4" /> </parameters> <race>DARKELF</race> <sex>FEMALE</sex> @@ -5463,13 +5453,11 @@ <height normal="25" /> </collision> </npc> - <npc id="36398" level="75" type="L2FortEnvoy" name="Special Envoy" title="Aden"> + <npc id="36398" level="75" type="L2Npc" name="Special Envoy" title="Aden"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="90" /> - <param name="fortress_id" value="106" /> - <param name="castle_id" value="5" /> </parameters> <race>HUMAN</race> <sex>FEMALE</sex> @@ -5505,13 +5493,11 @@ <height normal="22" /> </collision> </npc> - <npc id="36399" level="75" type="L2FortEnvoy" name="Special Envoy" title="Aden"> + <npc id="36399" level="75" type="L2Npc" name="Special Envoy" title="Aden"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="90" /> - <param name="fortress_id" value="107" /> - <param name="castle_id" value="5" /> </parameters> <race>HUMAN</race> <sex>FEMALE</sex> diff --git a/L2J_DataPack_BETA/dist/game/data/stats/npcs/36400-36500.xml b/L2J_DataPack_BETA/dist/game/data/stats/npcs/36400-36500.xml index a42a592595..cc5f8ac9d4 100644 --- a/L2J_DataPack_BETA/dist/game/data/stats/npcs/36400-36500.xml +++ b/L2J_DataPack_BETA/dist/game/data/stats/npcs/36400-36500.xml @@ -1,12 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd"> - <npc id="36400" level="75" type="L2FortEnvoy" name="Special Envoy" title="Innadril"> + <npc id="36400" level="75" type="L2Npc" name="Special Envoy" title="Innadril"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="130" /> - <param name="fortress_id" value="108" /> - <param name="castle_id" value="6" /> </parameters> <race>ELF</race> <sex>FEMALE</sex> @@ -42,13 +40,11 @@ <height normal="23.5" /> </collision> </npc> - <npc id="36401" level="75" type="L2FortEnvoy" name="Special Envoy" title="Goddard"> + <npc id="36401" level="75" type="L2Npc" name="Special Envoy" title="Goddard"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="134" /> - <param name="fortress_id" value="109" /> - <param name="castle_id" value="7" /> </parameters> <race>HUMAN</race> <sex>FEMALE</sex> @@ -1493,13 +1489,11 @@ <height normal="35" /> </collision> </npc> - <npc id="36433" level="75" type="L2FortEnvoy" name="Special Envoy" title="Rune"> + <npc id="36433" level="75" type="L2Npc" name="Special Envoy" title="Rune"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="90" /> - <param name="fortress_id" value="110" /> - <param name="castle_id" value="8" /> </parameters> <race>HUMAN</race> <sex>FEMALE</sex> @@ -1535,13 +1529,11 @@ <height normal="22" /> </collision> </npc> - <npc id="36434" level="75" type="L2FortEnvoy" name="Special Envoy" title="Schuttgart"> + <npc id="36434" level="75" type="L2Npc" name="Special Envoy" title="Schuttgart"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="87" /> - <param name="fortress_id" value="111" /> - <param name="castle_id" value="9" /> </parameters> <race>DWARF</race> <sex>FEMALE</sex> @@ -1577,13 +1569,11 @@ <height normal="18.5" /> </collision> </npc> - <npc id="36435" level="75" type="L2FortEnvoy" name="Special Envoy" title="Gludio"> + <npc id="36435" level="75" type="L2Npc" name="Special Envoy" title="Gludio"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="90" /> - <param name="fortress_id" value="112" /> - <param name="castle_id" value="1" /> </parameters> <race>HUMAN</race> <sex>FEMALE</sex> @@ -1619,13 +1609,11 @@ <height normal="25" /> </collision> </npc> - <npc id="36436" level="75" type="L2FortEnvoy" name="Special Envoy" title="Dion"> + <npc id="36436" level="75" type="L2Npc" name="Special Envoy" title="Dion"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="90" /> - <param name="fortress_id" value="112" /> - <param name="castle_id" value="2" /> </parameters> <race>HUMAN</race> <sex>FEMALE</sex> @@ -1661,13 +1649,11 @@ <height normal="22" /> </collision> </npc> - <npc id="36437" level="75" type="L2FortEnvoy" name="Special Envoy" title="Gludio"> + <npc id="36437" level="75" type="L2Npc" name="Special Envoy" title="Gludio"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="90" /> - <param name="fortress_id" value="113" /> - <param name="castle_id" value="1" /> </parameters> <race>HUMAN</race> <sex>FEMALE</sex> @@ -1703,13 +1689,11 @@ <height normal="25" /> </collision> </npc> - <npc id="36438" level="75" type="L2FortEnvoy" name="Special Envoy" title="Oren"> + <npc id="36438" level="75" type="L2Npc" name="Special Envoy" title="Oren"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="106" /> - <param name="fortress_id" value="113" /> - <param name="castle_id" value="4" /> </parameters> <race>DARKELF</race> <sex>FEMALE</sex> @@ -1745,13 +1729,11 @@ <height normal="25" /> </collision> </npc> - <npc id="36439" level="75" type="L2FortEnvoy" name="Special Envoy" title="Dion"> + <npc id="36439" level="75" type="L2Npc" name="Special Envoy" title="Dion"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="90" /> - <param name="fortress_id" value="114" /> - <param name="castle_id" value="2" /> </parameters> <race>HUMAN</race> <sex>FEMALE</sex> @@ -1787,13 +1769,11 @@ <height normal="22" /> </collision> </npc> - <npc id="36440" level="75" type="L2FortEnvoy" name="Special Envoy" title="Giran"> + <npc id="36440" level="75" type="L2Npc" name="Special Envoy" title="Giran"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="120" /> - <param name="fortress_id" value="114" /> - <param name="castle_id" value="3" /> </parameters> <race>HUMAN</race> <sex>FEMALE</sex> @@ -1829,13 +1809,11 @@ <height normal="22.5" /> </collision> </npc> - <npc id="36441" level="75" type="L2FortEnvoy" name="Special Envoy" title="Dion"> + <npc id="36441" level="75" type="L2Npc" name="Special Envoy" title="Dion"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="90" /> - <param name="fortress_id" value="115" /> - <param name="castle_id" value="2" /> </parameters> <race>HUMAN</race> <sex>FEMALE</sex> @@ -1871,13 +1849,11 @@ <height normal="22" /> </collision> </npc> - <npc id="36442" level="75" type="L2FortEnvoy" name="Special Envoy" title="Oren"> + <npc id="36442" level="75" type="L2Npc" name="Special Envoy" title="Oren"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="106" /> - <param name="fortress_id" value="115" /> - <param name="castle_id" value="4" /> </parameters> <race>DARKELF</race> <sex>FEMALE</sex> @@ -1913,13 +1889,11 @@ <height normal="25" /> </collision> </npc> - <npc id="36443" level="75" type="L2FortEnvoy" name="Special Envoy" title="Oren"> + <npc id="36443" level="75" type="L2Npc" name="Special Envoy" title="Oren"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="106" /> - <param name="fortress_id" value="116" /> - <param name="castle_id" value="4" /> </parameters> <race>DARKELF</race> <sex>FEMALE</sex> @@ -1955,13 +1929,11 @@ <height normal="25" /> </collision> </npc> - <npc id="36444" level="75" type="L2FortEnvoy" name="Special Envoy" title="Giran"> + <npc id="36444" level="75" type="L2Npc" name="Special Envoy" title="Giran"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="120" /> - <param name="fortress_id" value="116" /> - <param name="castle_id" value="3" /> </parameters> <race>HUMAN</race> <sex>FEMALE</sex> @@ -1997,13 +1969,11 @@ <height normal="22.5" /> </collision> </npc> - <npc id="36445" level="75" type="L2FortEnvoy" name="Special Envoy" title="Aden"> + <npc id="36445" level="75" type="L2Npc" name="Special Envoy" title="Aden"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="90" /> - <param name="fortress_id" value="117" /> - <param name="castle_id" value="5" /> </parameters> <race>HUMAN</race> <sex>FEMALE</sex> @@ -2039,13 +2009,11 @@ <height normal="22" /> </collision> </npc> - <npc id="36446" level="75" type="L2FortEnvoy" name="Special Envoy" title="Oren"> + <npc id="36446" level="75" type="L2Npc" name="Special Envoy" title="Oren"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="106" /> - <param name="fortress_id" value="117" /> - <param name="castle_id" value="4" /> </parameters> <race>DARKELF</race> <sex>FEMALE</sex> @@ -2081,13 +2049,11 @@ <height normal="25" /> </collision> </npc> - <npc id="36447" level="75" type="L2FortEnvoy" name="Special Envoy" title="Goddard"> + <npc id="36447" level="75" type="L2Npc" name="Special Envoy" title="Goddard"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="134" /> - <param name="fortress_id" value="117" /> - <param name="castle_id" value="7" /> </parameters> <race>HUMAN</race> <sex>FEMALE</sex> @@ -2123,13 +2089,11 @@ <height normal="25" /> </collision> </npc> - <npc id="36448" level="75" type="L2FortEnvoy" name="Special Envoy" title="Aden"> + <npc id="36448" level="75" type="L2Npc" name="Special Envoy" title="Aden"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="90" /> - <param name="fortress_id" value="118" /> - <param name="castle_id" value="5" /> </parameters> <race>HUMAN</race> <sex>FEMALE</sex> @@ -2165,13 +2129,11 @@ <height normal="22" /> </collision> </npc> - <npc id="36449" level="75" type="L2FortEnvoy" name="Special Envoy" title="Giran"> + <npc id="36449" level="75" type="L2Npc" name="Special Envoy" title="Giran"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="120" /> - <param name="fortress_id" value="118" /> - <param name="castle_id" value="3" /> </parameters> <race>HUMAN</race> <sex>FEMALE</sex> @@ -2207,13 +2169,11 @@ <height normal="22.5" /> </collision> </npc> - <npc id="36450" level="75" type="L2FortEnvoy" name="Special Envoy" title="Innadril"> + <npc id="36450" level="75" type="L2Npc" name="Special Envoy" title="Innadril"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="130" /> - <param name="fortress_id" value="119" /> - <param name="castle_id" value="6" /> </parameters> <race>ELF</race> <sex>FEMALE</sex> @@ -2249,13 +2209,11 @@ <height normal="23.5" /> </collision> </npc> - <npc id="36451" level="75" type="L2FortEnvoy" name="Special Envoy" title="Giran"> + <npc id="36451" level="75" type="L2Npc" name="Special Envoy" title="Giran"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="120" /> - <param name="fortress_id" value="119" /> - <param name="castle_id" value="3" /> </parameters> <race>HUMAN</race> <sex>FEMALE</sex> @@ -2291,13 +2249,11 @@ <height normal="22.5" /> </collision> </npc> - <npc id="36452" level="75" type="L2FortEnvoy" name="Special Envoy" title="Rune"> + <npc id="36452" level="75" type="L2Npc" name="Special Envoy" title="Rune"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="90" /> - <param name="fortress_id" value="120" /> - <param name="castle_id" value="8" /> </parameters> <race>HUMAN</race> <sex>FEMALE</sex> @@ -2333,13 +2289,11 @@ <height normal="22" /> </collision> </npc> - <npc id="36453" level="75" type="L2FortEnvoy" name="Special Envoy" title="Goddard"> + <npc id="36453" level="75" type="L2Npc" name="Special Envoy" title="Goddard"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="134" /> - <param name="fortress_id" value="120" /> - <param name="castle_id" value="7" /> </parameters> <race>HUMAN</race> <sex>FEMALE</sex> @@ -2375,13 +2329,11 @@ <height normal="25" /> </collision> </npc> - <npc id="36454" level="75" type="L2FortEnvoy" name="Special Envoy" title="Rune"> + <npc id="36454" level="75" type="L2Npc" name="Special Envoy" title="Rune"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="90" /> - <param name="fortress_id" value="121" /> - <param name="castle_id" value="8" /> </parameters> <race>HUMAN</race> <sex>FEMALE</sex> @@ -2417,13 +2369,11 @@ <height normal="22" /> </collision> </npc> - <npc id="36455" level="75" type="L2FortEnvoy" name="Special Envoy" title="Schuttgart"> + <npc id="36455" level="75" type="L2Npc" name="Special Envoy" title="Schuttgart"> <!-- Confirmed CT2.5 --> <parameters> <param name="MoveAroundSocial" value="0" /> <param name="MoveAroundSocial1" value="87" /> - <param name="fortress_id" value="121" /> - <param name="castle_id" value="9" /> </parameters> <race>DWARF</race> <sex>FEMALE</sex> -- GitLab