From 57e3fa541fcd6edd54810069b86917ebb4649301 Mon Sep 17 00:00:00 2001
From: St3eT <St3eT@users.noreply.github.com>
Date: Thu, 20 Feb 2014 22:16:22 +0000
Subject: [PATCH] BETA: Reworking '''!SupportUnitCaptain''' from core to DP,
also minor fix for '''!CastleCourtMagician''' AI and '''!CastleChamberlain'''
AI. * Reviewed by: Nos, !UnAfraid, Adry_85, malyelfik
---
.../data/html/fortress/supportunit-noepau.htm | 4 -
L2J_DataPack_BETA/dist/game/data/scripts.cfg | 1 +
.../CastleChamberlain/CastleChamberlain.java | 2 +-
.../CastleCourtMagician.java | 39 +--
.../SupportUnitCaptain.java | 286 ++++++++++++++++++
.../SupportUnitCaptain/unitcaptain-01.html} | 6 +-
.../SupportUnitCaptain/unitcaptain-02.html} | 2 +-
.../SupportUnitCaptain/unitcaptain-03.html} | 2 +-
.../SupportUnitCaptain/unitcaptain-04.html} | 2 +-
.../SupportUnitCaptain/unitcaptain-05.html | 4 +
.../npc/SupportUnitCaptain/unitcaptain.html} | 10 +-
.../dist/game/data/stats/npcs/35600-35700.xml | 4 +-
.../dist/game/data/stats/npcs/35700-35800.xml | 4 +-
.../dist/game/data/stats/npcs/35800-35900.xml | 6 +-
.../dist/game/data/stats/npcs/35900-36000.xml | 6 +-
.../dist/game/data/stats/npcs/36000-36100.xml | 6 +-
.../dist/game/data/stats/npcs/36100-36200.xml | 6 +-
.../dist/game/data/stats/npcs/36200-36300.xml | 6 +-
.../dist/game/data/stats/npcs/36300-36400.xml | 4 +-
19 files changed, 329 insertions(+), 71 deletions(-)
delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/fortress/supportunit-noepau.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/SupportUnitCaptain/SupportUnitCaptain.java
rename L2J_DataPack_BETA/dist/game/data/{html/fortress/supportunit-1.htm => scripts/ai/npc/SupportUnitCaptain/unitcaptain-01.html} (57%)
rename L2J_DataPack_BETA/dist/game/data/{html/fortress/supportunit-talisman.htm => scripts/ai/npc/SupportUnitCaptain/unitcaptain-02.html} (68%)
rename L2J_DataPack_BETA/dist/game/data/{html/fortress/supportunit-nosquad.htm => scripts/ai/npc/SupportUnitCaptain/unitcaptain-03.html} (83%)
rename L2J_DataPack_BETA/dist/game/data/{html/fortress/supportunit-noclan.htm => scripts/ai/npc/SupportUnitCaptain/unitcaptain-04.html} (61%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain-05.html
rename L2J_DataPack_BETA/dist/game/data/{html/fortress/supportunit.htm => scripts/ai/npc/SupportUnitCaptain/unitcaptain.html} (66%)
diff --git a/L2J_DataPack_BETA/dist/game/data/html/fortress/supportunit-noepau.htm b/L2J_DataPack_BETA/dist/game/data/html/fortress/supportunit-noepau.htm
deleted file mode 100644
index 255400327a..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/html/fortress/supportunit-noepau.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>
-You do not have enough Knight's Epaulettes.<br><br>
-<a action="bypass -h npc_%objectId%_Chat 0">Back.</a>
-</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 df27993943..03f5560a71 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts.cfg
+++ b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
@@ -46,6 +46,7 @@ ai/npc/Rafforty/Rafforty.java
ai/npc/Seyo/Seyo.java
ai/npc/SubclassCertification/SubclassCertification.java
ai/npc/Summons/MerchantGolem/GolemTrader.java
+ai/npc/SupportUnitCaptain/SupportUnitCaptain.java
ai/npc/SymbolMaker/SymbolMaker.java
ai/npc/Teleports/CrumaTower/CrumaTower.java
ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java
index 7bddc88bb3..d9fdae335a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java
@@ -385,7 +385,7 @@ public final class CastleChamberlain extends AbstractNpcAI
private final boolean isOwner(final L2PcInstance player, final L2Npc npc)
{
- return player.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS) || (player.getClanId() == npc.getCastle().getOwnerId());
+ return player.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS) || ((player.getClan() != null) && (player.getClanId() == npc.getCastle().getOwnerId()));
}
@Override
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 16314212b2..c1f13de84c 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
@@ -18,20 +18,13 @@
*/
package ai.npc.CastleCourtMagician;
-import java.util.List;
-
import ai.npc.AbstractNpcAI;
-import com.l2jserver.gameserver.datatables.SkillTable;
-import com.l2jserver.gameserver.datatables.SkillTreesData;
import com.l2jserver.gameserver.model.ClanPrivilege;
-import com.l2jserver.gameserver.model.L2SkillLearn;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.base.AcquireSkillType;
import com.l2jserver.gameserver.model.holders.SkillHolder;
-import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.AcquireSkillList;
+import com.l2jserver.gameserver.network.clientpackets.RequestAcquireSkill;
import handlers.effecthandlers.CallPc;
@@ -135,7 +128,7 @@ public final class CastleCourtMagician extends AbstractNpcAI
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
- if (player.getClanId() != npc.getCastle().getOwnerId())
+ if ((player.getClan() == null) && (player.getClanId() != npc.getCastle().getOwnerId()))
{
return "courtmagician-01.html";
}
@@ -242,9 +235,9 @@ public final class CastleCourtMagician extends AbstractNpcAI
else
{
final int chance = getRandom(46);
- if (chance <= 43)
+ if (chance <= 42)
{
- itemId = COMMON_TALISMANS[getRandom(chance)];
+ itemId = COMMON_TALISMANS[chance];
}
else
{
@@ -260,27 +253,7 @@ public final class CastleCourtMagician extends AbstractNpcAI
{
if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_TROOPS_FAME))
{
- final List<L2SkillLearn> skills = SkillTreesData.getInstance().getAvailableSubPledgeSkills(player.getClan());
- final AcquireSkillList asl = new AcquireSkillList(AcquireSkillType.SUBPLEDGE);
- int count = 0;
-
- for (L2SkillLearn s : skills)
- {
- if (SkillTable.getInstance().getInfo(s.getSkillId(), s.getSkillLevel()) != null)
- {
- asl.addSkill(s.getSkillId(), s.getSkillLevel(), s.getSkillLevel(), s.getLevelUpSp(), 0);
- ++count;
- }
- }
-
- if (count == 0)
- {
- player.sendPacket(SystemMessageId.NO_MORE_SKILLS_TO_LEARN);
- }
- else
- {
- player.sendPacket(asl);
- }
+ RequestAcquireSkill.showSUbUnitSkillList(player);
}
else
{
@@ -317,7 +290,7 @@ public final class CastleCourtMagician extends AbstractNpcAI
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
- return (player.getClanId() == npc.getCastle().getOwnerId()) ? "courtmagician.html" : "courtmagician-01.html";
+ return ((player.getClan() != null) && (player.getClanId() == npc.getCastle().getOwnerId())) ? "courtmagician.html" : "courtmagician-01.html";
}
public static void main(String[] args)
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
new file mode 100644
index 0000000000..1f6388a495
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/SupportUnitCaptain/SupportUnitCaptain.java
@@ -0,0 +1,286 @@
+/*
+ * 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.SupportUnitCaptain;
+
+import ai.npc.AbstractNpcAI;
+
+import com.l2jserver.gameserver.model.ClanPrivilege;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.clientpackets.RequestAcquireSkill;
+
+/**
+ * Support Unit Captain AI.
+ * @author St3eT
+ */
+public final class SupportUnitCaptain extends AbstractNpcAI
+{
+ // NPCs
+ private static final int[] UNIT_CAPTAIN =
+ {
+ 35662, // Shanty Fortress
+ 35694, // Southern Fortress
+ 35731, // Hive Fortress
+ 35763, // Valley Fortress
+ 35800, // Ivory Fortress
+ 35831, // Narsell Fortress
+ 35863, // Bayou Fortress
+ 35900, // White Sands Fortress
+ 35932, // Borderland Fortress
+ 35970, // Swamp Fortress
+ 36007, // Archaic Fortress
+ 36039, // Floran Fortress
+ 36077, // Cloud Mountain
+ 36114, // Tanor Fortress
+ 36145, // Dragonspine Fortress
+ 36177, // Antharas's Fortress
+ 36215, // Western Fortress
+ 36253, // Hunter's Fortress
+ 36290, // Aaru Fortress
+ 36322, // Demon Fortress
+ 36360, // Monastic Fortress
+ };
+ // Items
+ private static final int EPAULETTE = 9912; // Knight's Epaulette
+ private static final int RED_MEDITATION = 9931; // Red Talisman of Meditation
+ private static final int BLUE_DIV_PROTECTION = 9932; // Blue Talisman - Divine Protection
+ private static final int BLUE_EXPLOSION = 10416; // Blue Talisman - Explosion
+ private static final int BLUE_M_EXPLOSION = 10417; // Blue Talisman - Magic Explosion
+ private static final int RED_MIN_CLARITY = 9917; // Red Talisman of Minimum Clarity
+ private static final int RED_MAX_CLARITY = 9918; // Red Talisman of Maximum Clarity
+ private static final int RED_MENTAL_REG = 9928; // Red Talisman of Mental Regeneration
+ private static final int BLUE_PROTECTION = 9929; // Blue Talisman of Protection
+ private static final int BLUE_INVIS = 9920; // Blue Talisman of Invisibility
+ private static final int BLUE_DEFENSE = 9916; // Blue Talisman of Defense
+ private static final int BLACK_ESCAPE = 9923; // Black Talisman - Escape
+ private static final int BLUE_HEALING = 9924; // Blue Talisman of Healing
+ private static final int RED_RECOVERY = 9925; // Red Talisman of Recovery
+ private static final int BLUE_DEFENSE2 = 9926; // Blue Talisman of Defense
+ private static final int BLUE_M_DEFENSE = 9927; // Blue Talisman of Magic Defense
+ private static final int RED_LIFE_FORCE = 10518; // Red Talisman - Life Force
+ private static final int BLUE_GREAT_HEALING = 10424; // Blue Talisman - Greater Healing
+ private static final int WHITE_FIRE = 10421; // White Talisman - Fire
+ private static final int[] COMMON_TALISMANS =
+ {
+ 9914, // Blue Talisman of Power
+ 9915, // Blue Talisman of Wild Magic
+ 9920, // Blue Talisman of Invisibility
+ 9921, // Blue Talisman - Shield Protection
+ 9922, // Black Talisman - Mending
+ 9933, // Yellow Talisman of Power
+ 9934, // Yellow Talisman of Violent Haste
+ 9935, // Yellow Talisman of Arcane Defense
+ 9936, // Yellow Talisman of Arcane Power
+ 9937, // Yellow Talisman of Arcane Haste
+ 9938, // Yellow Talisman of Accuracy
+ 9939, // Yellow Talisman of Defense
+ 9940, // Yellow Talisman of Alacrity
+ 9941, // Yellow Talisman of Speed
+ 9942, // Yellow Talisman of Critical Reduction
+ 9943, // Yellow Talisman of Critical Damage
+ 9944, // Yellow Talisman of Critical Dodging
+ 9945, // Yellow Talisman of Evasion
+ 9946, // Yellow Talisman of Healing
+ 9947, // Yellow Talisman of CP Regeneration
+ 9948, // Yellow Talisman of Physical Regeneration
+ 9949, // Yellow Talisman of Mental Regeneration
+ 9950, // Grey Talisman of Weight Training
+ 9952, // Orange Talisman - Hot Springs CP Potion
+ 9953, // Orange Talisman - Elixir of Life
+ 9954, // Orange Talisman - Elixir of Mental Strength
+ 9955, // Black Talisman - Vocalization
+ 9956, // Black Talisman - Arcane Freedom
+ 9957, // Black Talisman - Physical Freedom
+ 9958, // Black Talisman - Rescue
+ 9959, // Black Talisman - Free Speech
+ 9960, // White Talisman of Bravery
+ 9961, // White Talisman of Motion
+ 9962, // White Talisman of Grounding
+ 9963, // White Talisman of Attention
+ 9964, // White Talisman of Bandages
+ 9965, // White Talisman of Protection
+ 10418, // White Talisman - Storm
+ 10420, // White Talisman - Water
+ 10519, // White Talisman - Earth
+ 10422, // White Talisman - Light
+ 10423, // Blue Talisman - Self-Destruction
+ };
+
+ private SupportUnitCaptain()
+ {
+ super(SupportUnitCaptain.class.getSimpleName(), "ai/npc");
+ addStartNpc(UNIT_CAPTAIN);
+ addTalkId(UNIT_CAPTAIN);
+ addFirstTalkId(UNIT_CAPTAIN);
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+
+ final int fortOwner = npc.getFort().getOwnerClan() == null ? 0 : npc.getFort().getOwnerClan().getId();
+ if ((player.getClan() == null) || (player.getClanId() != fortOwner))
+ {
+ return "unitcaptain-04.html";
+ }
+
+ String htmltext = null;
+ int itemId = 0;
+ switch (event)
+ {
+ case "unitcaptain.html":
+ case "unitcaptain-01.html":
+ {
+ htmltext = event;
+ break;
+ }
+ case "giveTalisman":
+ {
+ if (getQuestItemsCount(player, EPAULETTE) < 10)
+ {
+ htmltext = "unitcaptain-05.html";
+ break;
+ }
+
+ final int categoryChance = getRandom(100);
+ if (categoryChance <= 5)
+ {
+ final int chance = getRandom(100);
+ if (chance <= 25)
+ {
+ itemId = RED_MEDITATION;
+ }
+ else if (chance <= 50)
+ {
+ itemId = BLUE_DIV_PROTECTION;
+ }
+ else if (chance <= 75)
+ {
+ itemId = BLUE_EXPLOSION;
+ }
+ else
+ {
+ itemId = BLUE_M_EXPLOSION;
+ }
+ }
+ else if (categoryChance <= 15)
+ {
+ final int chance = getRandom(100);
+ if (chance <= 20)
+ {
+ itemId = RED_MIN_CLARITY;
+ }
+ else if (chance <= 40)
+ {
+ itemId = RED_MAX_CLARITY;
+ }
+ else if (chance <= 60)
+ {
+ itemId = RED_MENTAL_REG;
+ }
+ else if (chance <= 80)
+ {
+ itemId = BLUE_PROTECTION;
+ }
+ else
+ {
+ itemId = BLUE_INVIS;
+ }
+ }
+ else if (categoryChance <= 30)
+ {
+ final int chance = getRandom(100);
+ if (chance <= 12)
+ {
+ itemId = BLUE_DEFENSE;
+ }
+ else if (chance <= 25)
+ {
+ itemId = BLACK_ESCAPE;
+ }
+ else if (chance <= 37)
+ {
+ itemId = BLUE_HEALING;
+ }
+ else if (chance <= 50)
+ {
+ itemId = RED_RECOVERY;
+ }
+ else if (chance <= 62)
+ {
+ itemId = BLUE_DEFENSE2;
+ }
+ else if (chance <= 75)
+ {
+ itemId = BLUE_M_DEFENSE;
+ }
+ else if (chance <= 87)
+ {
+ itemId = RED_LIFE_FORCE;
+ }
+ else
+ {
+ itemId = BLUE_GREAT_HEALING;
+ }
+ }
+ else
+ {
+ final int chance = getRandom(46);
+ if (chance <= 41)
+ {
+ itemId = COMMON_TALISMANS[chance];
+ }
+ else
+ {
+ itemId = WHITE_FIRE;
+ }
+ }
+ takeItems(player, EPAULETTE, 10);
+ giveItems(player, itemId, 1);
+ htmltext = "unitcaptain-02.html";
+ break;
+ }
+ case "squadSkill":
+ {
+ if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_TROOPS_FAME))
+ {
+ RequestAcquireSkill.showSUbUnitSkillList(player);
+ }
+ else
+ {
+ htmltext = "unitcaptain-03.html";
+ }
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onFirstTalk(L2Npc npc, L2PcInstance player)
+ {
+ final int fortOwner = npc.getFort().getOwnerClan() == null ? 0 : npc.getFort().getOwnerClan().getId();
+ return ((player.getClan() != null) && (player.getClanId() == fortOwner)) ? "unitcaptain.html" : "unitcaptain-04.html";
+ }
+
+ public static void main(String[] args)
+ {
+ new SupportUnitCaptain();
+ }
+}
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/fortress/supportunit-1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain-01.html
similarity index 57%
rename from L2J_DataPack_BETA/dist/game/data/html/fortress/supportunit-1.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain-01.html
index c4821ffae0..da6c800463 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/fortress/supportunit-1.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain-01.html
@@ -1,6 +1,6 @@
<html><body>
-The Talisman is both magical and mysterious. Once applied to your bracelet, you will be able to see its surprising effect for yourself. Before I can give it to you, however, you must prove to me that you are capable of responsibly wielding such power. Give me <font color="LEVEL">10 Knight's Epaulettes</font> and I will provide you the Talisman.<br><br><br>
+The Talisman is both magical and mysterious. Once applied to your bracelet, you will be able to see its surprising effect for yourself. Before I can give it to you, however, you must prove to me that you are capable of responsibly wielding such power. Give me <font color = "LEVEL">10 Knight's Epaulettes</font> and I will provide you the Talisman.<br><br><br>
<center>
-<a action="bypass -h npc_%objectId%_ExchangeKE">Give Knight's Epaulettes.</a>
+<a action="bypass -h Quest SupportUnitCaptain giveTalisman">Give Knight's Epaulettes.</a>
</center>
-</body></html>
\ No newline at end of file
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/fortress/supportunit-talisman.htm b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain-02.html
similarity index 68%
rename from L2J_DataPack_BETA/dist/game/data/html/fortress/supportunit-talisman.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain-02.html
index 959b8e3cbb..a94976a0f0 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/fortress/supportunit-talisman.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain-02.html
@@ -1,3 +1,3 @@
<html><body>
Very well. Here you go!
-</body></html>
\ No newline at end of file
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/fortress/supportunit-nosquad.htm b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain-03.html
similarity index 83%
rename from L2J_DataPack_BETA/dist/game/data/html/fortress/supportunit-nosquad.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain-03.html
index 9639b7b5ca..e5c1e59e18 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/fortress/supportunit-nosquad.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain-03.html
@@ -1,3 +1,3 @@
<html><body>
If you cannot prove your worthiness, I cannot give it to you. Please leave!
-</body></html>
\ No newline at end of file
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/fortress/supportunit-noclan.htm b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain-04.html
similarity index 61%
rename from L2J_DataPack_BETA/dist/game/data/html/fortress/supportunit-noclan.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain-04.html
index 3317ee097f..68a68fb6da 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/fortress/supportunit-noclan.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain-04.html
@@ -1,3 +1,3 @@
<html><body>
-Can't you see that I am busy? Continue to bother me and you'll finish your days as a toad in the castle pond!
+Can't you see that I am busy? Continue to bother me and you'll finish your days as a toad in the castle pond!<br><br>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain-05.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain-05.html
new file mode 100644
index 0000000000..004c07b1f9
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain-05.html
@@ -0,0 +1,4 @@
+<html><body>
+You do not have enough Knight's Epaulettes.<br><br>
+<a action="bypass -h Quest SupportUnitCaptain unitcaptain.html">Back.</a><br><br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/fortress/supportunit.htm b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain.html
similarity index 66%
rename from L2J_DataPack_BETA/dist/game/data/html/fortress/supportunit.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain.html
index 98344c2586..fc13dd781c 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/fortress/supportunit.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain.html
@@ -1,13 +1,11 @@
<html><body>
-Magic is intertwined with the very fabric of our world, affecting not only large-scale events like wars but also the mundane tasks of daily life.<br>
-<br>
-<br>
+Magic is intertwined with the very fabric of our world, affecting not only large-scale events like wars but also the mundane tasks of daily life.<br><br><br>
<center>
<a action="bypass -h npc_%objectId%_multisell 90001001">Purchase necessary items.</a><br>
<a action="bypass -h npc_%objectId%_multisell 90001002">Purchase bracelet.</a><br>
<a action="bypass -h npc_%objectId%_multisell 90001003">Purchase shirt.</a><br>
<a action="bypass -h npc_%objectId%_exc_multisell 90001004">Trade with enchanted shirt.</a><br>
-<a action="bypass -h npc_%objectId%_Chat 1">Obtain Talisman.</a><br>
-<a action="bypass -h npc_%objectId%_subskills">Learn special skills for low-ranking soldiers.</a>
+<a action="bypass -h Quest SupportUnitCaptain unitcaptain-01.html">Obtain Talisman.</a><br>
+<a action="bypass -h Quest SupportUnitCaptain squadSkill">Learn special skills for low-ranking soldiers.</a>
</center>
-</body></html>
\ No newline at end of file
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/npcs/35600-35700.xml b/L2J_DataPack_BETA/dist/game/data/stats/npcs/35600-35700.xml
index 0b7348d038..4f1320c4e1 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/npcs/35600-35700.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/npcs/35600-35700.xml
@@ -2768,7 +2768,7 @@
<height normal="23.5" />
</collision>
</npc>
- <npc id="35662" level="75" type="L2FortSupportCaptain" name="Support Unit Captain" title="Shanty Fortress">
+ <npc id="35662" level="75" type="L2Npc" name="Support Unit Captain" title="Shanty Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -4543,7 +4543,7 @@
<height normal="30" />
</collision>
</npc>
- <npc id="35694" level="75" type="L2FortSupportCaptain" name="Support Unit Captain" title="Southern Fortress">
+ <npc id="35694" level="75" type="L2Npc" name="Support Unit Captain" title="Southern Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/npcs/35700-35800.xml b/L2J_DataPack_BETA/dist/game/data/stats/npcs/35700-35800.xml
index 6ba5d06706..2c10c60c2a 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/npcs/35700-35800.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/npcs/35700-35800.xml
@@ -1795,7 +1795,7 @@
<height normal="23.5" />
</collision>
</npc>
- <npc id="35731" level="75" type="L2FortSupportCaptain" name="Support Unit Captain" title="Hive Fortress">
+ <npc id="35731" level="75" type="L2Npc" name="Support Unit Captain" title="Hive Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -3570,7 +3570,7 @@
<height normal="30" />
</collision>
</npc>
- <npc id="35763" level="75" type="L2FortSupportCaptain" name="Support Unit Captain" title="Valley Fortress">
+ <npc id="35763" level="75" type="L2Npc" name="Support Unit Captain" title="Valley Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/npcs/35800-35900.xml b/L2J_DataPack_BETA/dist/game/data/stats/npcs/35800-35900.xml
index 6773fbb2c5..8b24f9d80d 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/npcs/35800-35900.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/npcs/35800-35900.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
- <npc id="35800" level="75" type="L2FortSupportCaptain" name="Support Unit Captain" title="Ivory Fortress">
+ <npc id="35800" level="75" type="L2Npc" name="Support Unit Captain" title="Ivory Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -1734,7 +1734,7 @@
<height normal="23.5" />
</collision>
</npc>
- <npc id="35831" level="75" type="L2FortSupportCaptain" name="Support Unit Captain" title="Narsell Fortress">
+ <npc id="35831" level="75" type="L2Npc" name="Support Unit Captain" title="Narsell Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -3509,7 +3509,7 @@
<height normal="30" />
</collision>
</npc>
- <npc id="35863" level="75" type="L2FortSupportCaptain" name="Support Unit Captain" title="Bayou Fortress">
+ <npc id="35863" level="75" type="L2Npc" name="Support Unit Captain" title="Bayou Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/npcs/35900-36000.xml b/L2J_DataPack_BETA/dist/game/data/stats/npcs/35900-36000.xml
index 6a24490bfc..b8ba02f9aa 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/npcs/35900-36000.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/npcs/35900-36000.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
- <npc id="35900" level="75" type="L2FortSupportCaptain" name="Support Unit Captain" title="White Sands Fortress">
+ <npc id="35900" level="75" type="L2Npc" name="Support Unit Captain" title="White Sands Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -1764,7 +1764,7 @@
<height normal="30" />
</collision>
</npc>
- <npc id="35932" level="75" type="L2FortSupportCaptain" name="Support Unit Captain" title="Borderland Fortress">
+ <npc id="35932" level="75" type="L2Npc" name="Support Unit Captain" title="Borderland Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -3868,7 +3868,7 @@
<height normal="30" />
</collision>
</npc>
- <npc id="35970" level="75" type="L2FortSupportCaptain" name="Support Unit Captain" title="Swamp Fortress">
+ <npc id="35970" level="75" type="L2Npc" name="Support Unit Captain" title="Swamp Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/npcs/36000-36100.xml b/L2J_DataPack_BETA/dist/game/data/stats/npcs/36000-36100.xml
index 674b328066..06b047aa31 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/npcs/36000-36100.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/npcs/36000-36100.xml
@@ -348,7 +348,7 @@
<height normal="23.5" />
</collision>
</npc>
- <npc id="36007" level="75" type="L2FortSupportCaptain" name="Support Unit Captain" title="Archaic Fortress">
+ <npc id="36007" level="75" type="L2Npc" name="Support Unit Captain" title="Archaic Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -2112,7 +2112,7 @@
<height normal="30" />
</collision>
</npc>
- <npc id="36039" level="75" type="L2FortSupportCaptain" name="Support Unit Captain" title="Floran Fortress">
+ <npc id="36039" level="75" type="L2Npc" name="Support Unit Captain" title="Floran Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -4213,7 +4213,7 @@
<height normal="30" />
</collision>
</npc>
- <npc id="36077" level="75" type="L2FortSupportCaptain" name="Support Unit Captain" title="Cloud Mountain">
+ <npc id="36077" level="75" type="L2Npc" name="Support Unit Captain" title="Cloud Mountain">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/npcs/36100-36200.xml b/L2J_DataPack_BETA/dist/game/data/stats/npcs/36100-36200.xml
index 4c8c13459c..4f6a436f64 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/npcs/36100-36200.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/npcs/36100-36200.xml
@@ -794,7 +794,7 @@
<height normal="23.5" />
</collision>
</npc>
- <npc id="36114" level="75" type="L2FortSupportCaptain" name="Support Unit Captain" title="Tanor Fortress">
+ <npc id="36114" level="75" type="L2Npc" name="Support Unit Captain" title="Tanor Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -2514,7 +2514,7 @@
<height normal="23.5" />
</collision>
</npc>
- <npc id="36145" level="75" type="L2FortSupportCaptain" name="Support Unit Captain" title="Dragonspine Fortress">
+ <npc id="36145" level="75" type="L2Npc" name="Support Unit Captain" title="Dragonspine Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -4275,7 +4275,7 @@
<height normal="30" />
</collision>
</npc>
- <npc id="36177" level="75" type="L2FortSupportCaptain" name="Support Unit Captain" title="Antharas's Fortress">
+ <npc id="36177" level="75" type="L2Npc" name="Support Unit Captain" title="Antharas's Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/npcs/36200-36300.xml b/L2J_DataPack_BETA/dist/game/data/stats/npcs/36200-36300.xml
index d72f721aaa..70b848ed04 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/npcs/36200-36300.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/npcs/36200-36300.xml
@@ -836,7 +836,7 @@
<height normal="30" />
</collision>
</npc>
- <npc id="36215" level="75" type="L2FortSupportCaptain" name="Support Unit Captain" title="Western Fortress">
+ <npc id="36215" level="75" type="L2Npc" name="Support Unit Captain" title="Western Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -2937,7 +2937,7 @@
<height normal="30" />
</collision>
</npc>
- <npc id="36253" level="75" type="L2FortSupportCaptain" name="Support Unit Captain" title="Hunter's Fortress">
+ <npc id="36253" level="75" type="L2Npc" name="Support Unit Captain" title="Hunter's Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -4997,7 +4997,7 @@
<height normal="23.5" />
</collision>
</npc>
- <npc id="36290" level="75" type="L2FortSupportCaptain" name="Support Unit Captain" title="Aaru Fortress">
+ <npc id="36290" level="75" type="L2Npc" name="Support Unit Captain" title="Aaru Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
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 2aa76aa079..b71818ac52 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
@@ -1266,7 +1266,7 @@
<height normal="30" />
</collision>
</npc>
- <npc id="36322" level="75" type="L2FortSupportCaptain" name="Support Unit Captain" title="Demon Fortress">
+ <npc id="36322" level="75" type="L2Npc" name="Support Unit Captain" title="Demon Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -3367,7 +3367,7 @@
<height normal="30" />
</collision>
</npc>
- <npc id="36360" level="75" type="L2FortSupportCaptain" name="Support Unit Captain" title="Monastic Fortress">
+ <npc id="36360" level="75" type="L2Npc" name="Support Unit Captain" title="Monastic Fortress">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
--
GitLab