From 1d5a3df2c3da7cac2ae33b8d8264b4a04e33c93e Mon Sep 17 00:00:00 2001
From: Zealar <zealar@mail.bg>
Date: Thu, 10 Dec 2015 10:22:36 +0200
Subject: [PATCH] Update Separated Soul teleporter fix #259
---
dist/game/data/html/teleporter/32864.htm | 15 ----
dist/game/data/html/teleporter/32865.htm | 15 ----
dist/game/data/html/teleporter/32866.htm | 15 ----
dist/game/data/html/teleporter/32867.htm | 15 ----
dist/game/data/html/teleporter/32868.htm | 15 ----
dist/game/data/html/teleporter/32869.htm | 15 ----
dist/game/data/html/teleporter/32870.htm | 15 ----
dist/game/data/html/teleporter/32891.htm | 15 ----
.../data/html/teleporter/separatedsoul.htm | 4 -
.../ai/npc/Teleports/SeparatedSoul/32864.htm | 15 ++++
.../ai/npc/Teleports/SeparatedSoul/32865.htm | 15 ++++
.../ai/npc/Teleports/SeparatedSoul/32866.htm | 15 ++++
.../ai/npc/Teleports/SeparatedSoul/32867.htm | 15 ++++
.../ai/npc/Teleports/SeparatedSoul/32868.htm | 15 ++++
.../ai/npc/Teleports/SeparatedSoul/32869.htm | 15 ++++
.../ai/npc/Teleports/SeparatedSoul/32870.htm | 15 ++++
.../ai/npc/Teleports/SeparatedSoul/32891.htm | 15 ++++
.../SeparatedSoul/SeparatedSoul.java | 80 ++++++++++++-------
.../npc/Teleports/SeparatedSoul/no-items.htm | 2 +-
.../npc/Teleports/SeparatedSoul/no-level.htm | 2 +-
.../Teleports/SeparatedSoul/separatedsoul.htm | 4 +
21 files changed, 178 insertions(+), 154 deletions(-)
delete mode 100644 dist/game/data/html/teleporter/32864.htm
delete mode 100644 dist/game/data/html/teleporter/32865.htm
delete mode 100644 dist/game/data/html/teleporter/32866.htm
delete mode 100644 dist/game/data/html/teleporter/32867.htm
delete mode 100644 dist/game/data/html/teleporter/32868.htm
delete mode 100644 dist/game/data/html/teleporter/32869.htm
delete mode 100644 dist/game/data/html/teleporter/32870.htm
delete mode 100644 dist/game/data/html/teleporter/32891.htm
delete mode 100644 dist/game/data/html/teleporter/separatedsoul.htm
create mode 100644 dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32864.htm
create mode 100644 dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32865.htm
create mode 100644 dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32866.htm
create mode 100644 dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32867.htm
create mode 100644 dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32868.htm
create mode 100644 dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32869.htm
create mode 100644 dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32870.htm
create mode 100644 dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32891.htm
create mode 100644 dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/separatedsoul.htm
diff --git a/dist/game/data/html/teleporter/32864.htm b/dist/game/data/html/teleporter/32864.htm
deleted file mode 100644
index 7be689329b..0000000000
--- a/dist/game/data/html/teleporter/32864.htm
+++ /dev/null
@@ -1,15 +0,0 @@
-<html><body>Separated Soul:<br>
-The Claw of Antharas barely touched me, but even so, my soul was ripped from my body!<br>
-I can not gather the souls scattered in the area, but I can sense them. If you desire, I can send you to the location where the separated souls are located.<br>
-I can also release the <font color="LEVEL">Sealed Blood Crystal</font> using the <font color="LEVEL">Will of Antharas</font> you possess. What say you?<br>
-<a action="bypass -h Quest SeparatedSoul DragonValley">Entrance to Dragon Valley</a><br>
-<a action="bypass -h Quest SeparatedSoul DragonValleyCenter">The Center of Dragon Valley</a><br>
-<a action="bypass -h Quest SeparatedSoul DragonValleyNorth">Deep inside Dragon Valley (North)</a><br>
-<a action="bypass -h Quest SeparatedSoul DragonValleySouth">Deep inside Dragon Valley (South)</a><br>
-<a action="bypass -h Quest SeparatedSoul AntharasLair">Entrance of Antharas' Lair</a><br>
-<a action="bypass -h Quest SeparatedSoul AntharasLairMagicForceFieldBridge">Antharas' Lair - Magic Force Field Bridge</a><br>
-<a action="bypass -h Quest SeparatedSoul AntharasLairDeep">Deep inside Antharas' Lair</a><br>
-<a action="bypass -h npc_%objectId%_Link teleporter/separatedsoul.htm">Hear about Blood Crystal of Antharas.</a><br>
-<a action="bypass -h Quest SeparatedSoul Synthesis">Request item synthesis.</a><br>
-<a action="bypass -h npc_%objectId%_Quest">Quest</a>
-</body></html>
\ No newline at end of file
diff --git a/dist/game/data/html/teleporter/32865.htm b/dist/game/data/html/teleporter/32865.htm
deleted file mode 100644
index 3d79a2c335..0000000000
--- a/dist/game/data/html/teleporter/32865.htm
+++ /dev/null
@@ -1,15 +0,0 @@
-<html><body>Separated Soul:<br>
-The Claw of Antharas barely touched me, but even so, my soul was ripped from my body!<br>
-I can not gather the souls scattered in the area, but I can sense them. If you desire, I can send you to the location where the separated souls are located.<br>
-I can also release the <font color="LEVEL">Sealed Blood Crystal</font> using the <font color="LEVEL">Will of Antharas</font> you possess. What say you?<br>
-<a action="bypass -h Quest SeparatedSoul HuntersVillage">Hunter's Village</a><br>
-<a action="bypass -h Quest SeparatedSoul DragonValley">Entrance to Dragon Valley</a><br>
-<a action="bypass -h Quest SeparatedSoul DragonValleyNorth">Deep inside Dragon Valley (North)</a><br>
-<a action="bypass -h Quest SeparatedSoul DragonValleySouth">Deep inside Dragon Valley (South)</a><br>
-<a action="bypass -h Quest SeparatedSoul AntharasLair">Entrance of Antharas' Lair</a><br>
-<a action="bypass -h Quest SeparatedSoul AntharasLairMagicForceFieldBridge">Antharas' Lair - Magic Force Field Bridge</a><br>
-<a action="bypass -h Quest SeparatedSoul AntharasLairDeep">Deep inside Antharas' Lair</a><br>
-<a action="bypass -h npc_%objectId%_Link teleporter/separatedsoul.htm">Hear about Blood Crystal of Antharas.</a><br>
-<a action="bypass -h Quest SeparatedSoul Synthesis">Request item synthesis.</a><br>
-<a action="bypass -h npc_%objectId%_Quest">Quest</a>
-</body></html>
\ No newline at end of file
diff --git a/dist/game/data/html/teleporter/32866.htm b/dist/game/data/html/teleporter/32866.htm
deleted file mode 100644
index f096320f98..0000000000
--- a/dist/game/data/html/teleporter/32866.htm
+++ /dev/null
@@ -1,15 +0,0 @@
-<html><body>Separated Soul:<br>
-The Claw of Antharas barely touched me, but even so, my soul was ripped from my body!<br>
-I can not gather the souls scattered in the area, but I can sense them. If you desire, I can send you to the location where the separated souls are located.<br>
-I can also release the <font color="LEVEL">Sealed Blood Crystal</font> using the <font color="LEVEL">Will of Antharas</font> you possess. What say you?<br>
-<a action="bypass -h Quest SeparatedSoul HuntersVillage">Hunter's Village</a><br>
-<a action="bypass -h Quest SeparatedSoul DragonValley">Entrance of Dragon Valley</a><br>
-<a action="bypass -h Quest SeparatedSoul DragonValleyCenter">The Center of Dragon Valley</a><br>
-<a action="bypass -h Quest SeparatedSoul DragonValleySouth">Deep inside Dragon Valley (South)</a><br>
-<a action="bypass -h Quest SeparatedSoul AntharasLair">Entrance of Antharas' Lair</a><br>
-<a action="bypass -h Quest SeparatedSoul AntharasLairMagicForceFieldBridge">Antharas' Lair - Magic Force Field Bridge</a><br>
-<a action="bypass -h Quest SeparatedSoul AntharasLairDeep">Deep inside Antharas' Lair</a><br>
-<a action="bypass -h npc_%objectId%_Link teleporter/separatedsoul.htm">Hear about Blood Crystal of Antharas.</a><br>
-<a action="bypass -h Quest SeparatedSoul Synthesis">Request item synthesis.</a><br>
-<a action="bypass -h npc_%objectId%_Quest">Quest</a>
-</body></html>
\ No newline at end of file
diff --git a/dist/game/data/html/teleporter/32867.htm b/dist/game/data/html/teleporter/32867.htm
deleted file mode 100644
index de21dbc425..0000000000
--- a/dist/game/data/html/teleporter/32867.htm
+++ /dev/null
@@ -1,15 +0,0 @@
-<html><body>Separated Soul:<br>
-The Claw of Antharas barely touched me, but even so, my soul was ripped from my body!<br>
-I can not gather the souls scattered in the area, but I can sense them. If you desire, I can send you to the location where the separated souls are located.<br>
-I can also release the <font color="LEVEL">Sealed Blood Crystal</font> using the <font color="LEVEL">Will of Antharas</font> you possess. What say you?<br>
-<a action="bypass -h Quest SeparatedSoul HuntersVillage">Hunter's Village</a><br>
-<a action="bypass -h Quest SeparatedSoul DragonValley">Entrance of Dragon Valley</a><br>
-<a action="bypass -h Quest SeparatedSoul DragonValleyCenter">The Center of Dragon Valley</a><br>
-<a action="bypass -h Quest SeparatedSoul DragonValleyNorth">Deep inside Dragon Valley (North)</a><br>
-<a action="bypass -h Quest SeparatedSoul AntharasLair">Entrance of Antharas' Lair</a><br>
-<a action="bypass -h Quest SeparatedSoul AntharasLairMagicForceFieldBridge">Antharas' Lair - Magic Force Field Bridge</a><br>
-<a action="bypass -h Quest SeparatedSoul AntharasLairDeep">Deep inside Antharas' Lair</a><br>
-<a action="bypass -h npc_%objectId%_Link teleporter/separatedsoul.htm">Hear about Blood Crystal of Antharas.</a><br>
-<a action="bypass -h Quest SeparatedSoul Synthesis">Request item synthesis.</a><br>
-<a action="bypass -h npc_%objectId%_Quest">Quest</a>
-</body></html>
\ No newline at end of file
diff --git a/dist/game/data/html/teleporter/32868.htm b/dist/game/data/html/teleporter/32868.htm
deleted file mode 100644
index 077c5a1443..0000000000
--- a/dist/game/data/html/teleporter/32868.htm
+++ /dev/null
@@ -1,15 +0,0 @@
-<html><body>Separated Soul:<br>
-The Claw of Antharas barely touched me, but even so, my soul was ripped from my body!<br>
-I can not gather the souls scattered in the area, but I can sense them. If you desire, I can send you to the location where the separated souls are located.<br>
-I can also release the <font color="LEVEL">Sealed Blood Crystal</font> using the <font color="LEVEL">Will of Antharas</font> you possess. What say you?<br>
-<a action="bypass -h Quest SeparatedSoul HuntersVillage">Hunter's Village</a><br>
-<a action="bypass -h Quest SeparatedSoul DragonValley">Entrance to Dragon Valley</a><br>
-<a action="bypass -h Quest SeparatedSoul DragonValleyCenter">The Center of Dragon Valley</a><br>
-<a action="bypass -h Quest SeparatedSoul DragonValleyNorth">Deep inside Dragon Valley (North)</a><br>
-<a action="bypass -h Quest SeparatedSoul DragonValleySouth">Deep inside Dragon Valley (South)</a><br>
-<a action="bypass -h Quest SeparatedSoul AntharasLair">Entrance of Antharas' Lair</a><br>
-<a action="bypass -h Quest SeparatedSoul AntharasLairMagicForceFieldBridge">Antharas' Lair - Magic Force Field Bridge</a><br>
-<a action="bypass -h npc_%objectId%_Link teleporter/separatedsoul.htm">Hear about Blood Crystal of Antharas.</a><br>
-<a action="bypass -h Quest SeparatedSoul Synthesis">Request item synthesis.</a><br>
-<a action="bypass -h npc_%objectId%_Quest">Quest</a>
-</body></html>
\ No newline at end of file
diff --git a/dist/game/data/html/teleporter/32869.htm b/dist/game/data/html/teleporter/32869.htm
deleted file mode 100644
index da4b369a1f..0000000000
--- a/dist/game/data/html/teleporter/32869.htm
+++ /dev/null
@@ -1,15 +0,0 @@
-<html><body>Separated Soul:<br>
-The Claw of Antharas barely touched me, but even so, my soul was ripped from my body!<br>
-I can not gather the souls scattered in the area, but I can sense them. If you desire, I can send you to the location where the separated souls are located.<br>
-I can also release the <font color="LEVEL">Sealed Blood Crystal</font> using the <font color="LEVEL">Will of Antharas</font> you possess. What say you?<br>
-<a action="bypass -h Quest SeparatedSoul HuntersVillage">Hunter's Village</a><br>
-<a action="bypass -h Quest SeparatedSoul DragonValley">Entrance to Dragon Valley</a><br>
-<a action="bypass -h Quest SeparatedSoul DragonValleyCenter">The Center of Dragon Valley</a><br>
-<a action="bypass -h Quest SeparatedSoul DragonValleyNorth">Deep inside Dragon Valley (North)</a><br>
-<a action="bypass -h Quest SeparatedSoul DragonValleySouth">Deep inside Dragon Valley (South)</a><br>
-<a action="bypass -h Quest SeparatedSoul AntharasLair">Entrance of Antharas' Lair</a><br>
-<a action="bypass -h Quest SeparatedSoul AntharasLairDeep">Deep inside Antharas' Lair</a><br>
-<a action="bypass -h npc_%objectId%_Link teleporter/separatedsoul.htm">Hear about Blood Crystal of Antharas.</a><br>
-<a action="bypass -h Quest SeparatedSoul Synthesis">Request item synthesis.</a><br>
-<a action="bypass -h npc_%objectId%_Quest">Quest</a>
-</body></html>
\ No newline at end of file
diff --git a/dist/game/data/html/teleporter/32870.htm b/dist/game/data/html/teleporter/32870.htm
deleted file mode 100644
index d6d6efefb6..0000000000
--- a/dist/game/data/html/teleporter/32870.htm
+++ /dev/null
@@ -1,15 +0,0 @@
-<html><body>Separated Soul:<br>
-Antharas' claws covered my face for only a moment, but it ripped my soul to pieces.<br>
-The torn souls have been scattered all over, but I can feel all the pieces are connected. If you wish, I can send you to where each of my torn souls is.<br>
-I can also use your <font color="LEVEL">Will of Antharas</font> to unseal the <font color="LEVEL">Sealed Blood Crystal</font>. What do you think?<br>
-<a action="bypass -h Quest SeparatedSoul HuntersVillage">Hunters Village</a><br>
-<a action="bypass -h Quest SeparatedSoul DragonValleyCenter">The Center of Dragon Valley</a><br>
-<a action="bypass -h Quest SeparatedSoul DragonValleyNorth">Deep in the Dragon Valley (North)</a><br>
-<a action="bypass -h Quest SeparatedSoul DragonValleySouth">Deep in the Dragon Valley (South)</a><br>
-<a action="bypass -h Quest SeparatedSoul AntharasLair">Entrance to Antharas' Lair</a><br>
-<a action="bypass -h Quest SeparatedSoul AntharasLairMagicForceFieldBridge">Antharas' Lair - Barrier Bridge</a><br>
-<a action="bypass -h Quest SeparatedSoul AntharasLairDeep">Deep in Antharas' Lair</a><br>
-<a action="bypass -h npc_%objectId%_Link teleporter/separatedsoul.htm">Hear about the Antharas Blood Crystal.</a><br>
-<a action="bypass -h Quest SeparatedSoul Synthesis">Request item combination.</a><br>
-<a action="bypass -h npc_%objectId%_Quest">Quest</a>
-</body></html>
\ No newline at end of file
diff --git a/dist/game/data/html/teleporter/32891.htm b/dist/game/data/html/teleporter/32891.htm
deleted file mode 100644
index 4a0dbbfa73..0000000000
--- a/dist/game/data/html/teleporter/32891.htm
+++ /dev/null
@@ -1,15 +0,0 @@
-<html><body>Separated Soul:<br>
-The Claw of Antharas barely touched me, but even so, my soul was ripped from my body!<br>
-I can not gather the souls scattered in the area, but I can sense them. If you desire, I can send you to the location where the separated souls are located.<br>
-I can also release the <font color="LEVEL">Sealed Blood Crystal</font> using the <font color="LEVEL">Will of Antharas</font> you possess. What say you?<br>
-<a action="bypass -h Quest SeparatedSoul HuntersVillage">Hunter's Village</a><br>
-<a action="bypass -h Quest SeparatedSoul DragonValley">Entrance to Dragon Valley</a><br>
-<a action="bypass -h Quest SeparatedSoul DragonValleyCenter">The Center of Dragon Valley</a><br>
-<a action="bypass -h Quest SeparatedSoul DragonValleyNorth">Deep inside Dragon Valley (North)</a><br>
-<a action="bypass -h Quest SeparatedSoul DragonValleySouth">Deep inside Dragon Valley (South)</a><br>
-<a action="bypass -h Quest SeparatedSoul AntharasLairMagicForceFieldBridge">Antharas' Lair - Magic Force Field Bridge</a><br>
-<a action="bypass -h Quest SeparatedSoul AntharasLairDeep">Deep inside Antharas' Lair</a><br>
-<a action="bypass -h npc_%objectId%_Link teleporter/separatedsoul.htm">Hear about Blood Crystal of Antharas.</a><br>
-<a action="bypass -h Quest SeparatedSoul Synthesis">Request item synthesis.</a><br>
-<a action="bypass -h npc_%objectId%_Quest">Quest</a>
-</body></html>
\ No newline at end of file
diff --git a/dist/game/data/html/teleporter/separatedsoul.htm b/dist/game/data/html/teleporter/separatedsoul.htm
deleted file mode 100644
index c3641494de..0000000000
--- a/dist/game/data/html/teleporter/separatedsoul.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Separated Soul:<br>
-The <font color="LEVEL">Will of Antharas</font> is a command stone that Antharas embedded into his high commanding minions. With this stone Antharas has the ability to control these creatures to do his bidding. It is a required ingredient for creating an Antharas Blood Crystal.<br>
-A long time ago when Antharas' blood was split on the ground the poison in the blood corrupted the land. However, over time land acted as a filter separating the poison from the blood. The result was a pure form of Antharas blood that crystallized over time into small <font color="LEVEL">Sealed Blood Crystals</font>. The power in Antharas' blood has a high concentration of regenaration and restoration power. Enough that it even has the power to bring back the dead. It is a required ingredient for creating an Antharas Blood Crystal.
-</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32864.htm b/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32864.htm
new file mode 100644
index 0000000000..f12ebccf9a
--- /dev/null
+++ b/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32864.htm
@@ -0,0 +1,15 @@
+<html><body>Separated Soul:<br>
+The Claw of Antharas barely touched my face, but it gripped my soul, and ripped it from me!<br>
+I can sense the other souls around here. If you want, I can send you to where these souls are located.<br>
+Also, using the <font color="LEVEL">Will of Antharas</font> that you have, I can break the <font color="LEVEL">seal on the Blood Crystal</font>. How about it?<br>
+<a action="bypass -h Quest SeparatedSoul 7">Entrance of Dragon Valley</a><br>
+<a action="bypass -h Quest SeparatedSoul 2">The Center of Dragon Valley</a><br>
+<a action="bypass -h Quest SeparatedSoul 3">Deep inside Dragon Valley(North)</a><br>
+<a action="bypass -h Quest SeparatedSoul 4">Deep inside Dragon Valley(South)</a><br>
+<a action="bypass -h Quest SeparatedSoul 8">Entrance of Antharas' Lair</a><br>
+<a action="bypass -h Quest SeparatedSoul 5">Antharas' Lair - Magic Force Field Bridge</a><br>
+<a action="bypass -h Quest SeparatedSoul 6">Deep inside Antharas' Lair</a><br>
+<a action="bypass -h Quest SeparatedSoul 23242">Hear about Blood Crystal of Antharas</a><br>
+<a action="bypass -h Quest SeparatedSoul 23241">Request item synthesis</a><br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32865.htm b/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32865.htm
new file mode 100644
index 0000000000..0e96dc94f7
--- /dev/null
+++ b/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32865.htm
@@ -0,0 +1,15 @@
+<html><body>Separated Soul:<br>
+The Claw of Antharas barely touched my face, but it gripped my soul, and ripped it from me!<br>
+I can sense the other souls around here. If you want, I can send you to where these souls are located.<br>
+Also, using the <font color="LEVEL">Will of Antharas</font> that you have, I can break the <font color="LEVEL">seal on the Blood Crystal</font>. How about it?<br>
+<a action="bypass -h Quest SeparatedSoul 1">Hunter's Village</a><br>
+<a action="bypass -h Quest SeparatedSoul 7">Entrance to Dragon Valley</a><br>
+<a action="bypass -h Quest SeparatedSoul 3">Deep inside Dragon Valley(North)</a><br>
+<a action="bypass -h Quest SeparatedSoul 4">Deep inside Dragon Valley(South)</a><br>
+<a action="bypass -h Quest SeparatedSoul 8">Entrance of Antharas' Lair</a><br>
+<a action="bypass -h Quest SeparatedSoul 5">Antharas' Lair - Magic Force Field Bridge</a><br>
+<a action="bypass -h Quest SeparatedSoul 6">Deep inside Antharas' Lair</a><br>
+<a action="bypass -h Quest SeparatedSoul 23242">Hear about Blood Crystal of Antharas</a><br>
+<a action="bypass -h Quest SeparatedSoul 23241">Request item synthesis</a><br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32866.htm b/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32866.htm
new file mode 100644
index 0000000000..ce1c3aa81d
--- /dev/null
+++ b/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32866.htm
@@ -0,0 +1,15 @@
+<html><body>Separated Soul:<br>
+The Claw of Antharas barely touched my face, but it gripped my soul, and ripped it from me!<br>
+I can sense the other souls around here. If you want, I can send you to where these souls are located.<br>
+Also, using the <font color="LEVEL">Will of Antharas</font> that you have, I can break the <font color="LEVEL">seal on the Blood Crystal</font>. How about it?<br>
+<a action="bypass -h Quest SeparatedSoul 1">Hunter's Village</a><br>
+<a action="bypass -h Quest SeparatedSoul 7">Entrance of Dragon Valley</a><br>
+<a action="bypass -h Quest SeparatedSoul 2">The Center of Dragon Valley</a><br>
+<a action="bypass -h Quest SeparatedSoul 4">Deep inside Dragon Valley(South)</a><br>
+<a action="bypass -h Quest SeparatedSoul 8">Entrance of Antharas' Lair</a><br>
+<a action="bypass -h Quest SeparatedSoul 5">Antharas' Lair - Magic Force Field Bridge</a><br>
+<a action="bypass -h Quest SeparatedSoul 6">Deep inside Antharas' Lair</a><br>
+<a action="bypass -h Quest SeparatedSoul 23242">Hear about Blood Crystal of Antharas</a><br>
+<a action="bypass -h Quest SeparatedSoul 23241">Request item synthesis</a><br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32867.htm b/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32867.htm
new file mode 100644
index 0000000000..513dd2369f
--- /dev/null
+++ b/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32867.htm
@@ -0,0 +1,15 @@
+<html><body>Separated Soul:<br>
+The Claw of Antharas barely touched my face, but it gripped my soul, and ripped it from me!<br>
+I can sense the other souls around here. If you want, I can send you to where these souls are located.<br>
+Also, using the <font color="LEVEL">Will of Antharas</font> that you have, I can break the <font color="LEVEL">seal on the Blood Crystal</font>. How about it?<br>
+<a action="bypass -h Quest SeparatedSoul 1">Hunter's Village</a><br>
+<a action="bypass -h Quest SeparatedSoul 7">Entrance of Dragon Valley</a><br>
+<a action="bypass -h Quest SeparatedSoul 2">The Center of Dragon Valley</a><br>
+<a action="bypass -h Quest SeparatedSoul 3">Deep inside Dragon Valley(North)</a><br>
+<a action="bypass -h Quest SeparatedSoul 8">Entrance of Antharas' Lair</a><br>
+<a action="bypass -h Quest SeparatedSoul 5">Antharas' Lair - Magic Force Field Bridge</a><br>
+<a action="bypass -h Quest SeparatedSoul 6">Deep inside Antharas' Lair</a><br>
+<a action="bypass -h Quest SeparatedSoul 23242">Hear about Blood Crystal of Antharas</a><br>
+<a action="bypass -h Quest SeparatedSoul 23241">Request item synthesis</a><br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32868.htm b/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32868.htm
new file mode 100644
index 0000000000..ebb7022278
--- /dev/null
+++ b/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32868.htm
@@ -0,0 +1,15 @@
+<html><body>Separated Soul:<br>
+The Claw of Antharas barely touched my face, but it gripped my soul, and ripped it from me!<br>
+I can sense the other souls around here. If you want, I can send you to where these souls are located.<br>
+Also, using the <font color="LEVEL">Will of Antharas</font> that you have, I can break the <font color="LEVEL">seal on the Blood Crystal</font>. How about it?<br>
+<a action="bypass -h Quest SeparatedSoul 1">Hunter's Village</a><br>
+<a action="bypass -h Quest SeparatedSoul 7">Entrance to Dragon Valley</a><br>
+<a action="bypass -h Quest SeparatedSoul 2">The Center of Dragon Valley</a><br>
+<a action="bypass -h Quest SeparatedSoul 3">Deep inside Dragon Valley(North)</a><br>
+<a action="bypass -h Quest SeparatedSoul 4">Deep inside Dragon Valley(South)</a><br>
+<a action="bypass -h Quest SeparatedSoul 8">Entrance of Antharas' Lair</a><br>
+<a action="bypass -h Quest SeparatedSoul 5">Antharas' Lair - Magic Force Field Bridge</a><br>
+<a action="bypass -h Quest SeparatedSoul 23242">Hear about Blood Crystal of Antharas</a><br>
+<a action="bypass -h Quest SeparatedSoul 23241">Request item synthesis</a><br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32869.htm b/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32869.htm
new file mode 100644
index 0000000000..c4bb42399b
--- /dev/null
+++ b/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32869.htm
@@ -0,0 +1,15 @@
+<html><body>Separated Soul:<br>
+The Claw of Antharas barely touched my face, but it gripped my soul, and ripped it from me!<br>
+I can sense the other souls around here. If you want, I can send you to where these souls are located.<br>
+Also, using the <font color="LEVEL">Will of Antharas</font> that you have, I can break the <font color="LEVEL">seal on the Blood Crystal</font>. How about it?<br>
+<a action="bypass -h Quest SeparatedSoul 1">Hunter's Village</a><br>
+<a action="bypass -h Quest SeparatedSoul 7">Entrance to Dragon Valley</a><br>
+<a action="bypass -h Quest SeparatedSoul 2">The Center of Dragon Valley</a><br>
+<a action="bypass -h Quest SeparatedSoul 3">Deep inside Dragon Valley(North)</a><br>
+<a action="bypass -h Quest SeparatedSoul 4">Deep inside Dragon Valley(South)</a><br>
+<a action="bypass -h Quest SeparatedSoul 8">Entrance of Antharas' Lair</a><br>
+<a action="bypass -h Quest SeparatedSoul 6">Deep inside Antharas' Lair</a><br>
+<a action="bypass -h Quest SeparatedSoul 23242">Hear about Blood Crystal of Antharas</a><br>
+<a action="bypass -h Quest SeparatedSoul 23241">Request item synthesis</a><br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32870.htm b/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32870.htm
new file mode 100644
index 0000000000..87c1700b56
--- /dev/null
+++ b/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32870.htm
@@ -0,0 +1,15 @@
+<html><body>Separated Soul:<br>
+The Claw of Antharas barely touched my face, but my soul was still ripped apart!<br>
+Now I can't gather the scattered souls in the area, but I can sense them. If you want, I can send you to where my souls are located.<br>
+Also, using the <font color="LEVEL">Will of Antharas</font> that you have, I can break the <font color="LEVEL">the Sealed Blood Crystal</font>. How about it?<br>
+<a action="bypass -h Quest SeparatedSoul 1">Hunter's Village</a><br>
+<a action="bypass -h Quest SeparatedSoul 2">The Center of Dragon Valley</a><br>
+<a action="bypass -h Quest SeparatedSoul 3">Deep inside Dragon Valley(North)</a><br>
+<a action="bypass -h Quest SeparatedSoul 4">Deep inside Dragon Valley(South)</a><br>
+<a action="bypass -h Quest SeparatedSoul 8">Entrance of Antharas' Lair</a><br>
+<a action="bypass -h Quest SeparatedSoul 5">Antharas' Lair - Magic Force Field Bridge</a><br>
+<a action="bypass -h Quest SeparatedSoul 6">Deep inside Antharas' Lair</a><br>
+<a action="bypass -h Quest SeparatedSoul 23242">Hear about Blood Crystal of Antharas</a><br>
+<a action="bypass -h Quest SeparatedSoul 23241">Request item synthesis</a><br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32891.htm b/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32891.htm
new file mode 100644
index 0000000000..70bb7fff8f
--- /dev/null
+++ b/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/32891.htm
@@ -0,0 +1,15 @@
+<html><body>Separated Soul:<br>
+The Claw of Antharas barely touched my face, but it gripped my soul, and ripped it from me!<br>
+I can sense the other souls around here. If you want, I can send you to where these souls are located.<br>
+Also, using the <font color="LEVEL">Will of Antharas</font> that you have, I can break the <font color="LEVEL">seal on the Blood Crystal</font>. How about it?<br>
+<a action="bypass -h Quest SeparatedSoul 1">Hunter's Village</a><br>
+<a action="bypass -h Quest SeparatedSoul 7">Entrance to Dragon Valley</a><br>
+<a action="bypass -h Quest SeparatedSoul 2">The Center of Dragon Valley</a><br>
+<a action="bypass -h Quest SeparatedSoul 3">Deep inside Dragon Valley(North)</a><br>
+<a action="bypass -h Quest SeparatedSoul 4">Deep inside Dragon Valley(South)</a><br>
+<a action="bypass -h Quest SeparatedSoul 5">Antharas' Lair - Magic Force Field Bridge</a><br>
+<a action="bypass -h Quest SeparatedSoul 6">Deep inside Antharas' Lair</a><br>
+<a action="bypass -h Quest SeparatedSoul 23242">Hear about Blood Crystal of Antharas</a><br>
+<a action="bypass -h Quest SeparatedSoul 23241">Request item synthesis</a><br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/SeparatedSoul.java b/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/SeparatedSoul.java
index af696bcac0..7039803079 100644
--- a/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/SeparatedSoul.java
+++ b/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/SeparatedSoul.java
@@ -21,15 +21,15 @@ package ai.npc.Teleports.SeparatedSoul;
import java.util.HashMap;
import java.util.Map;
-import ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import ai.npc.AbstractNpcAI;
+
/**
* Separated Soul teleport AI.
- * @author UnAfraid, improved by Adry_85
+ * @author UnAfraid, improved by Adry_85, Zealar
*/
public final class SeparatedSoul extends AbstractNpcAI
{
@@ -53,17 +53,18 @@ public final class SeparatedSoul extends AbstractNpcAI
// Misc
private static final int MIN_LEVEL = 80;
// Locations
- private static final Map<String, Location> LOCATIONS = new HashMap<>();
+ private static final Map<Integer, Location> LOCATIONS = new HashMap<>();
+
static
{
- LOCATIONS.put("HuntersVillage", new Location(117031, 76769, -2696));
- LOCATIONS.put("AntharasLair", new Location(131116, 114333, -3704));
- LOCATIONS.put("AntharasLairDeep", new Location(148447, 110582, -3944));
- LOCATIONS.put("AntharasLairMagicForceFieldBridge", new Location(146129, 111232, -3568));
- LOCATIONS.put("DragonValley", new Location(73122, 118351, -3714));
- LOCATIONS.put("DragonValleyCenter", new Location(99218, 110283, -3696));
- LOCATIONS.put("DragonValleyNorth", new Location(116992, 113716, -3056));
- LOCATIONS.put("DragonValleySouth", new Location(113203, 121063, -3712));
+ LOCATIONS.put(1, new Location(117046, 76798, -2696)); // Hunter's Village
+ LOCATIONS.put(2, new Location(99218, 110283, -3696)); // The Center of Dragon Valley
+ LOCATIONS.put(3, new Location(116992, 113716, -3056)); // Deep inside Dragon Valley(North)
+ LOCATIONS.put(4, new Location(113203, 121063, -3712)); // Deep inside Dragon Valley (South)
+ LOCATIONS.put(5, new Location(146129, 111232, -3568)); // Antharas' Lair - Magic Force Field Bridge
+ LOCATIONS.put(6, new Location(148447, 110582, -3944)); // Deep inside Antharas' Lair
+ LOCATIONS.put(7, new Location(73122, 118351, -3714)); // Entrance to Dragon Valley
+ LOCATIONS.put(8, new Location(131116, 114333, -3704)); // Entrance of Antharas' Lair
}
private SeparatedSoul()
@@ -71,33 +72,56 @@ public final class SeparatedSoul extends AbstractNpcAI
super(SeparatedSoul.class.getSimpleName(), "ai/npc/Teleports");
addStartNpc(SEPARATED_SOULS);
addTalkId(SEPARATED_SOULS);
+ addFirstTalkId(SEPARATED_SOULS);
+ }
+
+ @Override
+ public String onFirstTalk(L2Npc npc, L2PcInstance player)
+ {
+ return npc.getId() + ".htm";
}
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
- if (LOCATIONS.containsKey(event))
+ final int ask = Integer.parseInt(event);
+ switch (ask)
{
- if (player.getLevel() >= MIN_LEVEL)
- {
- player.teleToLocation(LOCATIONS.get(event), true);
- }
- else
+ case 1:
+ case 2:
+ case 3:
+ case 4:
+ case 5:
+ case 6:
+ case 7:
+ case 8:
{
- return "no-level.htm";
+ if (player.getLevel() >= MIN_LEVEL)
+ {
+ player.teleToLocation(LOCATIONS.get(ask), false);
+ }
+ else
+ {
+ return "no-level.htm";
+ }
+ break;
}
- }
- else if ("Synthesis".equals(event)) // Request Item Synthesis
- {
- if (hasQuestItems(player, WILL_OF_ANTHARAS, SEALED_BLOOD_CRYSTAL))
+ case 23241:
{
- takeItems(player, WILL_OF_ANTHARAS, 1);
- takeItems(player, SEALED_BLOOD_CRYSTAL, 1);
- giveItems(player, ANTHARAS_BLOOD_CRYSTAL, 1);
+ if (hasQuestItems(player, WILL_OF_ANTHARAS, SEALED_BLOOD_CRYSTAL))
+ {
+ takeItems(player, WILL_OF_ANTHARAS, 1);
+ takeItems(player, SEALED_BLOOD_CRYSTAL, 1);
+ giveItems(player, ANTHARAS_BLOOD_CRYSTAL, 1);
+ }
+ else
+ {
+ return "no-items.htm";
+ }
}
- else
+ case 23242:
{
- return "no-items.htm";
+ return "separatedsoul.htm";
}
}
return super.onAdvEvent(event, npc, player);
diff --git a/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/no-items.htm b/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/no-items.htm
index 2b0a9c970c..279e1a9e68 100644
--- a/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/no-items.htm
+++ b/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/no-items.htm
@@ -1,3 +1,3 @@
<html><body>Separated Soul:<br>
-In order for me to create a <font color="LEVEL">Blood Crystal of Antharas</font> you will need to bring me the <font color="LEVEL">Will of Antharas</font> and a <font color="LEVEL">Sealed Blood Crystal</font>. You can acquire these items from his commanders in either Antharas' Lair or Dragon Valley.<br>
+In order for me to create a <font color="LEVEL">Blood Crystal of Antharas</font> you will need to bring me the <font color="LEVEL">Will of Antharas</font> and a <font color="LEVEL">Sealed Blood Crystal</font>. You can acquire these items from his commanders in either Antharas's Lair or Dragon Valley.
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/no-level.htm b/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/no-level.htm
index a5b33702bb..1994a93475 100644
--- a/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/no-level.htm
+++ b/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/no-level.htm
@@ -1,5 +1,5 @@
<html><body>Separated Soul:<br>
-The claw of Antharas barely touched my face,but my soul was still ripped apart!<br>
+The Claw of Antharas barely touched my face, but my soul was still ripped apart like this.<br>
I can't gather the scattered souls in the area, but I can sense them. I could send you to the location of the souls, but you don't look capable yet of combining my ripped soul.<br>
(Moving to the location of the other separated souls requires the character to be at <font color="LEVEL">level 80 or above</font>.)
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/separatedsoul.htm b/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/separatedsoul.htm
new file mode 100644
index 0000000000..6dbd319919
--- /dev/null
+++ b/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/separatedsoul.htm
@@ -0,0 +1,4 @@
+<html><body>Separaed Soul:<br>
+The <font color="LEVEL">Will of Antharas</font> is a command stone that Antharas embedded into his high commanding minions. With this stone Antharas has the ability to control these creatures to do his bidding. It is a required ingredient for creating an Antharas Blood Crystal.<br>
+A long time ago when Antharas's blood was spilt on the ground the poison in the blood corrupted the land. However, over time land acted as a filter separating the poison from the blood. The result was a pure form of Antharas blood that crystallized over time into small <font color="LEVEL">Sealed Blood Crystals</font>. The power in Antharas's blood has a high concentration of regeneration and restoration power. Enough that it even has the power to bring back the dead. It is a required ingredient for creating an Antharas Blood Crystal.
+</body></html>
\ No newline at end of file
--
GitLab