diff --git a/dist/game/data/scripts/instances/ElcadiasTent/ElcadiasTent.java b/dist/game/data/scripts/instances/ElcadiasTent/ElcadiasTent.java
index 8912567893ea1a54a9fbf92a9ecfe4a58a771a47..93d913c866312598b9cbb045da7d3f2c3d66c10a 100644
--- a/dist/game/data/scripts/instances/ElcadiasTent/ElcadiasTent.java
+++ b/dist/game/data/scripts/instances/ElcadiasTent/ElcadiasTent.java
@@ -68,7 +68,7 @@ public final class ElcadiasTent extends AbstractInstance
final QuestState Q10293 = talker.getQuestState(Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.class.getSimpleName());
final QuestState Q10294 = talker.getQuestState(Q10294_SevenSignsToTheMonasteryOfSilence.class.getSimpleName());
final QuestState Q10296 = talker.getQuestState(Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.class.getSimpleName());
- if (((Q10292 != null) && Q10292.isStarted()) //
+ if (((Q10292 != null) && (Q10292.getMemoState() > 1) && (Q10292.getMemoState() < 9)) //
|| ((Q10292 != null) && Q10292.isCompleted() && (Q10293 == null)) //
|| ((Q10293 != null) && Q10293.isStarted()) //
|| ((Q10293 != null) && Q10293.isCompleted() && (Q10294 == null)) //
diff --git a/dist/game/data/scripts/instances/HideoutOfTheDawn/32593-01.htm b/dist/game/data/scripts/instances/HideoutOfTheDawn/32593-01.html
similarity index 100%
rename from dist/game/data/scripts/instances/HideoutOfTheDawn/32593-01.htm
rename to dist/game/data/scripts/instances/HideoutOfTheDawn/32593-01.html
diff --git a/dist/game/data/scripts/instances/HideoutOfTheDawn/32617-01.html b/dist/game/data/scripts/instances/HideoutOfTheDawn/32617-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..3afae31183637393087672f22d4c7b198b7d5408
--- /dev/null
+++ b/dist/game/data/scripts/instances/HideoutOfTheDawn/32617-01.html
@@ -0,0 +1,5 @@
+<html><body>Priestess Jaina:<br>
+Are you sure you wish to leave the safety of our hall?<br>
+<a action="bypass -h Quest HideoutOfTheDawn 32617-02.html">"Yes, I am sure."</a><br>
+<a action="bypass -h Quest HideoutOfTheDawn 32617-02a.html">"No, I want to stay in the clan hall."</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/instances/HideoutOfTheDawn/32617-01.htm b/dist/game/data/scripts/instances/HideoutOfTheDawn/32617-02.html
similarity index 60%
rename from dist/game/data/scripts/instances/HideoutOfTheDawn/32617-01.htm
rename to dist/game/data/scripts/instances/HideoutOfTheDawn/32617-02.html
index ca2b782f0ddb2de44ccb0701d8a0e441428016ea..ec3203f2cfdffc0cde7a58395da86a02df477435 100644
--- a/dist/game/data/scripts/instances/HideoutOfTheDawn/32617-01.htm
+++ b/dist/game/data/scripts/instances/HideoutOfTheDawn/32617-02.html
@@ -1,3 +1,3 @@
-<html><body>Priestess Jeina:<br>
+<html><body>Priestess Jaina:<br>
May Einhasad's blessing go with you....
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32617-02.html b/dist/game/data/scripts/instances/HideoutOfTheDawn/32617-02a.html
similarity index 64%
rename from dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32617-02.html
rename to dist/game/data/scripts/instances/HideoutOfTheDawn/32617-02a.html
index 5121eb917cd05de35f7faec61a3a2a0de89d4311..d135553637cdfa19f6c5639760fc50a0c2dab3b6 100644
--- a/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32617-02.html
+++ b/dist/game/data/scripts/instances/HideoutOfTheDawn/32617-02a.html
@@ -1,3 +1,3 @@
-<html><body>Priestess Jeina:<br>
+<html><body>Priestess Jaina:<br>
Please speak with Priest Franz for more details.
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/instances/HideoutOfTheDawn/32617.html b/dist/game/data/scripts/instances/HideoutOfTheDawn/32617.html
new file mode 100644
index 0000000000000000000000000000000000000000..9eb607e48b3db0b53d3fe22054b0706bf1f17c3c
--- /dev/null
+++ b/dist/game/data/scripts/instances/HideoutOfTheDawn/32617.html
@@ -0,0 +1,4 @@
+<html><body>Priestess Jaina:<br>
+Are you sure you wish to leave the safety of our hall?<br>
+<a action="bypass -h Quest HideoutOfTheDawn 32617-01.html">"I want to get out of the clan hall."</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/instances/HideoutOfTheDawn/HideoutOfTheDawn.java b/dist/game/data/scripts/instances/HideoutOfTheDawn/HideoutOfTheDawn.java
index cfba5fe604e53375e04d0075cd8b550db761ae91..0bc1d523fd67f4ecb871ed5667594a2dd0ecf70b 100644
--- a/dist/game/data/scripts/instances/HideoutOfTheDawn/HideoutOfTheDawn.java
+++ b/dist/game/data/scripts/instances/HideoutOfTheDawn/HideoutOfTheDawn.java
@@ -18,7 +18,6 @@
*/
package instances.HideoutOfTheDawn;
-import com.l2jserver.gameserver.instancemanager.InstanceManager;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -49,30 +48,37 @@ public final class HideoutOfTheDawn extends AbstractInstance
public HideoutOfTheDawn()
{
super(HideoutOfTheDawn.class.getSimpleName());
+ addFirstTalkId(JAINA);
addStartNpc(WOOD);
addTalkId(WOOD, JAINA);
}
@Override
- public String onTalk(L2Npc npc, L2PcInstance talker)
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
- switch (npc.getId())
+ String htmltext = null;
+ switch (event)
{
- case WOOD:
+ case "32617-01.html":
+ case "32617-02a.html":
{
- enterInstance(talker, new HotDWorld(), "HideoutOfTheDawn.xml", TEMPLATE_ID);
- return "32593-01.htm";
+ htmltext = event;
+ break;
}
- case JAINA:
+ case "32617-02.html":
{
- final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(talker);
- world.removeAllowed(talker.getObjectId());
- talker.setInstanceId(0);
- talker.teleToLocation(JAINA_LOC);
- return "32617-01.htm";
+ player.setInstanceId(0);
+ player.teleToLocation(JAINA_LOC, true);
+ htmltext = event;
+ break;
+ }
+ case "32593-01.html":
+ {
+ enterInstance(player, new HotDWorld(), "HideoutOfTheDawn.xml", TEMPLATE_ID);
+ htmltext = event;
}
}
- return super.onTalk(npc, talker);
+ return htmltext;
}
@Override
diff --git a/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32593-02.html b/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32593-02.html
index d45d8eff0a8cff9d15ddef9ab490ee1b9647bc42..a205df70f0c3642353254374a699f4cbb5e5b15f 100644
--- a/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32593-02.html
+++ b/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32593-02.html
@@ -1,4 +1,4 @@
<html><body>Priest Wood:<br>
You know Franz doesn't just meet anyone. In fact I believe you'll be the first new acquaintance of his for quite some time.<br>
-<a action="bypass -h npc_%objectId%_Quest HideoutOfTheDawn">"I feel privileged."</a>
+<a action="bypass -h Quest HideoutOfTheDawn 32593-01.html">"I feel privileged."</a>
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32593-04.html b/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32593-04.html
index 6fdbe58c2615e57bdc6bd7efc9c36f122576febe..2065915298eef0a20c466ad3e2bdaeeb3abaa54a 100644
--- a/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32593-04.html
+++ b/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32593-04.html
@@ -1,4 +1,4 @@
<html><body>Priest Wood:<br>
Good! Now... it's time for you to meet the great man yourself.<br>
-<a action="bypass -h npc_%objectId%_Quest HideoutOfTheDawn">"I'm ready."</a>
+<a action="bypass -h Quest HideoutOfTheDawn 32593-01.html">"I'm ready."</a>
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32617-01.html b/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32617-01.html
deleted file mode 100644
index f88e4e0e7032f9366d22b5dc5ad354aa9cd17d22..0000000000000000000000000000000000000000
--- a/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32617-01.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Priestess Jeina:<br>
-Are you sure you wish to leave the safety of our hall?<br>
-<a action="bypass -h npc_%objectId%_Quest HideoutOfTheDawn">Leave the clan hall.</a><br>
-<a action="bypass -h Quest Q00198_SevenSignsEmbryo 32617-02.html">Remain in the clan hall.</a>
-</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java b/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
index 64b4e20566c151748d9259ed8f962c2dbe01b011..4975bd9109a512815f141816e2d3856111e0aa27 100644
--- a/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
+++ b/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
@@ -43,7 +43,6 @@ public final class Q00198_SevenSignsEmbryo extends Quest
private static final int SHILENS_EVIL_THOUGHTS = 27346;
private static final int WOOD = 32593;
private static final int FRANZ = 32597;
- private static final int JAINA = 32617;
// Items
private static final int SCULPTURE_OF_DOUBT = 14355;
private static final int DAWNS_BRACELET = 15312;
@@ -56,7 +55,6 @@ public final class Q00198_SevenSignsEmbryo extends Quest
public Q00198_SevenSignsEmbryo()
{
super(198, Q00198_SevenSignsEmbryo.class.getSimpleName(), "Seven Signs, Embryo");
- addFirstTalkId(JAINA);
addStartNpc(WOOD);
addTalkId(WOOD, FRANZ);
addKillId(SHILENS_EVIL_THOUGHTS);
@@ -165,12 +163,6 @@ public final class Q00198_SevenSignsEmbryo extends Quest
return htmltext;
}
- @Override
- public String onFirstTalk(L2Npc npc, L2PcInstance player)
- {
- return "32617-01.html";
- }
-
@Override
public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon)
{
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/30832-04.html b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/30832-04.html
deleted file mode 100644
index 1b48036eb91990c23a99dc0aefb068cec4f0c441..0000000000000000000000000000000000000000
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/30832-04.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Hardin:<br>
-Library of Sages holds so many ancient books. I believe you might be able to find whatever you seek there, friend. Please tell Elcadia she should head there first.
-</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-01.htm b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-01.htm
index e8eab50fb2297f656d8634f8b3be1e65fb8c87a3..584725b84a53b40f7afd590f6cfd9b2e645bb55a 100644
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-01.htm
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-01.htm
@@ -1,4 +1,4 @@
<html><body>Priest Wood:<br>
You are a difficult person to find. Lord Franz wishes something of you. Can you go and speak with Lord Franz?<br>
-<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt 32593-04.htm">Accept request.</a>
+<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt 32593-02.htm">"Leave it to me."</a>
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-02.htm b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-02.htm
index 1f4c27e1c84a788286969a2712b348829209adba..21f3b14e34bd9aee22cfc6307f966f7448facf72 100644
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-02.htm
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-02.htm
@@ -1,4 +1,5 @@
<html><body>Priest Wood:<br>
-Thanks to you, we've moved another step forward.<br>
-(This is an already completed quest.)
+Lord Franz requests you, I'm afraid this is an urgent matter. Can you see Lord Franz right away?<br>
+<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt 32593-03.htm">"Yes, right now."</a><br>
+<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt 32593-04.htm">"Maybe later."</a>
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-03.htm b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-03.htm
index e56a7e8a6bcce4092ccdf02e0b5be9c7c7da93a5..590dc8a2bd2bc27d67a42bef06fe5acdceab612a 100644
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-03.htm
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-03.htm
@@ -1,4 +1,4 @@
<html><body>Priest Wood:<br>
-There is more you must do first. Return when you can help me.<br>
-(Only characters with level 81 or above can take on this quest.)
+Very well. If you must, go ahead and meet Lord Franz.<br>
+<a action="bypass -h Quest HideoutOfTheDawn 32593-01.html">"I can't wait to see him."</a>
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-04.htm b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-04.htm
index 85c725e92132fe77cb52c364de9fd1f4782071a6..bdd79a55a4280ca44210fc06aced61267e6fac12 100644
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-04.htm
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-04.htm
@@ -1,5 +1,3 @@
<html><body>Priest Wood:<br>
-Lord Franz requests you, I'm afraid this is an urgent matter. Can you see Lord Franz right away?<br>
-<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt 32593-05.htm">I will go right now.</a><br>
-<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt 32593-06.htm">I will go later.</a>
+Are you busy right now? Alright, but tell me as soon as you are ready.
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-05.htm b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-05.htm
deleted file mode 100644
index c7baa9d5f9e0353a094e9fbe14083c0e8c936bbb..0000000000000000000000000000000000000000
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-05.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Priest Wood:<br>
-Very well. If you must, go ahead and meet Lord Franz.<br>
-<a action="bypass -h npc_%objectId%_Quest HideoutOfTheDawn">Enter.</a>
-</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-05.html b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-05.html
new file mode 100644
index 0000000000000000000000000000000000000000..042da12a3ff1f731e92124cd42efcb10c0e65fe2
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-05.html
@@ -0,0 +1,4 @@
+<html><body>Priest Wood:<br>
+Thanks to you, we've moved another step forward.<br>
+(You have already completed this quest.)
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-06.htm b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-06.htm
index bdd79a55a4280ca44210fc06aced61267e6fac12..e56a7e8a6bcce4092ccdf02e0b5be9c7c7da93a5 100644
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-06.htm
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-06.htm
@@ -1,3 +1,4 @@
<html><body>Priest Wood:<br>
-Are you busy right now? Alright, but tell me as soon as you are ready.
+There is more you must do first. Return when you can help me.<br>
+(Only characters with level 81 or above can take on this quest.)
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-07.html b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-07.html
index be619fa959304c27d2ebda0ee666e5c1626e4388..dbba16353136873df97ccb78432b94ab21cbcee8 100644
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-07.html
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-07.html
@@ -1,4 +1,4 @@
<html><body>Priest Wood:<br>
Alright. Go ahead, you may meet Lord Franz.<br>
-<a action="bypass -h npc_%objectId%_Quest HideoutOfTheDawn">Enter.</a>
+<a action="bypass -h Quest HideoutOfTheDawn 32593-01.html">"I can't wait to see him."</a>
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-02.html b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-02.html
index a3a015780924e28cdefe7b51d4711e3a837131af..97f1427719f60a377d04c4fdb63c91a8d6e2f686 100644
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-02.html
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-02.html
@@ -1,5 +1,5 @@
<html><body>Priest Franz:<br>
I had a good deal of results ever since the research on the Seven Signs was completed. Also, I received information suggesting that the Revolutionaries of Dusk had uncovered more information too. We're going to send someone to uncover their findings, and I want you to accompany him and find out what they know.<br>
-<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt 32597-07.html">"Sure."</a><br>
-<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt 32597-06.html">"Not interested."</a>
+<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt 32597-03.html">"Sure."</a><br>
+<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt 32597-04.html">"Not interested."</a>
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-03.html b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-03.html
index 5a983df19d252ba80793e32830f957032af19ef0..e7031301811c559cdcd9c755726577b875605598 100644
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-03.html
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-03.html
@@ -1,3 +1,3 @@
<html><body>Priest Franz:<br>
-How did the job I requested go?
+It is said that he has been looking for a companion. According to our intelligence, he is staying at a place in the Beast Farm. I want you to go find out what's going on.
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-04.html b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-04.html
index 16e607cb7cc1853aab4a327df946a2968bc71487..3cdff52935ba47ed25e4c951691fefc093cdae68 100644
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-04.html
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-04.html
@@ -1,3 +1,3 @@
<html><body>Priest Franz:<br>
-Is the job I requested going well?
+Is that so? That's too bad. But, there is nobody other than you who is qualified, so I hope that you think about it again.
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-05.html b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-05.html
index 7149355c9a6aec058dde499a8369cc948d810c7a..5a983df19d252ba80793e32830f957032af19ef0 100644
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-05.html
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-05.html
@@ -1,4 +1,3 @@
<html><body>Priest Franz:<br>
-We don't have accurate information regarding the figure dispatched from the Dusk. But, the only thing is, that person is looking for an adventurer who has skills to accompany him. I thought that you would be qualified to work with him because you have skill, no? It was said that he's taken on the job very secretively, so approach him cautiously.<br>
-<a action="bypass -h menu_select?ask=10292&reply=2">"Okay."</a>
+How did the job I requested go?
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-06.html b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-06.html
index 3cdff52935ba47ed25e4c951691fefc093cdae68..16e607cb7cc1853aab4a327df946a2968bc71487 100644
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-06.html
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-06.html
@@ -1,3 +1,3 @@
<html><body>Priest Franz:<br>
-Is that so? That's too bad. But, there is nobody other than you who is qualified, so I hope that you think about it again.
+Is the job I requested going well?
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-07.html b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-07.html
deleted file mode 100644
index e7031301811c559cdcd9c755726577b875605598..0000000000000000000000000000000000000000
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-07.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Priest Franz:<br>
-It is said that he has been looking for a companion. According to our intelligence, he is staying at a place in the Beast Farm. I want you to go find out what's going on.
-</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-01.html b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-01.html
index cdfc46aaff513c3bdcf9ace37295798eead9cb6e..aede7f9a4a496d70cf1099afbcf00ff8c95dcd49 100644
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-01.html
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-01.html
@@ -1,4 +1,4 @@
<html><body>Abyssal Saintess Elcadia:<br>
Are you here to help me? Hm... you have an air of confidence about you, perhaps you will do. But you will have to earn my trust, and I cannot promise your safety. Are you sure you want to become involved?<br>
-<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt 32784-02.html">I will help you.</a>
+<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt 32784-02.html">"I will help you."</a>
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-02.html b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-02.html
index f4edd57f2a9467a94898b6aacb3ce7d7662eddcb..10e646bb820352fa8a7d917a5ad097466502784d 100644
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-02.html
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-02.html
@@ -1,4 +1,4 @@
<html><body>Abyssal Saintess Elcadia:<br>
Alright. If you think you have what it takes, I'll just require a small demonstration. But know this, those who have come before you quickly discovered it takes more than confidence to pass this test. We shall see soon enough if you have what it takes, do you accept?<br>
-<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt 32784-03.html">Accept the test.</a>
+<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt 32784-03.html">"Yes."</a>
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-03.html b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-03.html
index f97fce193b80a13471140fc0b757f08a2ab363c9..3fd80d55f237dea7710fe130480a6e7f67304b0c 100644
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-03.html
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-03.html
@@ -1,4 +1,4 @@
<html><body>Abyssal Saintess Elcadia:<br>
-Really? In a place called Pavel Ruins, northeast from here, are Golems. I've placed tokens on them using a bit of magic. Defeat them and collect the tokens. Your test is to earn 10 tokens.<br>
+Alright. Then how about proving yourself by slaying the monsters around here, without venturing too far? The <font color="LEVEL">Farm Bandits and Beast Devourers</font> lurking around the Beast Farm have been marked using my magic. Slay them, and they will give up these marks. Your test is to collect 10 of these marks.<br>
Don't look so glum. Maybe it's harder than you think, but either way I have to know who I'm dealing with.
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-04.html b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-04.html
index c59413233796abb68173c033887d8ce286ad58cb..196f1c2ca1de7e38f9b26a2ac15efb801820266c 100644
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-04.html
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-04.html
@@ -1,4 +1,4 @@
<html><body>Abyssal Saintess Elcadia:<br>
-You've heard of a place called Pavel Ruins, just northeast from here? There are Golems there, with magically placed tokens hung by yours truly. Your test is to defeat the Golems until you've collected 10 tokens.<br>
-You almost look disappointed. I'll take that as a good sign, if your abilities match your confidence.
+Hm.. You are better than I thought. But that was just a small test.<br>
+<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt 32784-05.html">"Did I pass the test?"</a>
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-05.html b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-05.html
index ae4fdb60d2bcc16b7fa8fc32d294e19b9c823611..084106282b78e515e57a5f0020856a1afc3a769f 100644
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-05.html
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-05.html
@@ -1,4 +1,4 @@
<html><body>Abyssal Saintess Elcadia:<br>
-Hm.. You are better than I thought. But that was just a small test.<br>
-<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt 32784-06.html">Did I pass the test?</a>
+Not yet... This is just a basic test. Let's call it research for a client. Can you demonstrate your abilities so I can see for myself?<br>
+<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt 32784-06.html">"No problem."</a>
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-06.html b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-06.html
index f753c970c4af21a3eeed4fd224b87c7eed7bb59c..cb8aadb56a102d45146eb6a660865a84b72ade85 100644
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-06.html
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-06.html
@@ -1,4 +1,4 @@
<html><body>Abyssal Saintess Elcadia:<br>
-Not yet... This is just a basic test. Let's call it research for a client. Can you demonstrate your abilities so I can see for myself?<br>
-<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt 32784-08.html">Continue with the testing.</a>
+Yes, you certainly sound confident in battle... But can you prove it, here and now? What do you think? Are you ready?<br>
+<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt SPAWN">"Absolutely!"</a>
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-07.html b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-07.html
index 26b349295c5f9a2ade6bdc45861e01a294dc5f17..673e945174028208be4dee099cb40b24de8950b6 100644
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-07.html
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-07.html
@@ -1,4 +1,3 @@
<html><body>Abyssal Saintess Elcadia:<br>
-I love your confidence, especially if you can back it up. Why not show me firsthand what you can do? Are you ready?<br>
-<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt SPAWN">Puh-leez, I'm always ready.</a>
+Hey, pay attention to detail. See all these monsters around here? I said defeat them.
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-08.html b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-08.html
index a5022487175ddf648116f76a2a289ecf10fef41d..f634f220d3bc320fec4e26e745dd5d60b3dba4f8 100644
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-08.html
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-08.html
@@ -1,4 +1,4 @@
<html><body>Abyssal Saintess Elcadia:<br>
-Yes, you certainly sound confident in battle... But can you prove it, here and now? What do you think? Are you ready?<br>
-<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt SPAWN">Am I ready? I was BORN ready! Prepare to be impressed.</a>
+I love your confidence, especially if you can back it up. Why not show me firsthand what you can do? Are you ready?<br>
+<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt SPAWN">"Always!"</a>
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-09.html b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-09.html
index 23257fa6877bd3a6a6bae9a21d82d9cc845cce93..10166d9385dc0ee66e96388b3f855a884536c322 100644
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-09.html
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-09.html
@@ -1,4 +1,4 @@
-<html><body>Abyssal Saintess Elcadia:<br>
-I'm suprised, and not in a good way. What happened to you? Are you better now? Ready to show me your true skills?<br>
-<a action="bypass -h menu_select?ask=10292&reply=5">I'm always ready. I had something in my eye last time.</a>
+<html><body>Abyssal Saintess Elcadia:<br>
+I'm surprised, and not in a good way. What happened to you? Are you better now? Ready to show me your true skills?<br>
+<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt SPAWN">"Absolutely!"</a>
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-10.html b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-10.html
index 012f42b93381ccc3a3d2c9f3127384adf67d2af7..04b0db1dc4339f71421bf6e78083ff6223d62e74 100644
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-10.html
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-10.html
@@ -1,3 +1,4 @@
-<html><body>Abyssal Saintess Elcadia:<br>
-Alright. Time to see what you are made of, adventurer. Defeat the monsters I have prepared for you, and I'll know there's more to you than just a pretty face.
+<html><body>Abyssal Saintess Elcadia:<br>
+You are very skilled, and I am not easily impressed... Alright. Consider this a formal request. I'm in need of someone who I can count on in a number of ways, especially someone who can keep a secret. What do you say, are you willing to help me?<br>
+<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt 32784-11.html">"Leave it to me."</a>
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-11.html b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-11.html
index 710e9d5093c52b9740e7d68851483931ff518c56..4faafc5298c77d984887bdc08010a714bd7a3bfa 100644
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-11.html
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-11.html
@@ -1,4 +1,4 @@
<html><body>Abyssal Saintess Elcadia:<br>
-You are very skilled, and I am not easily impressed... Alright. Consider this a formal request. I'm in need of someone who I can count on in a number of ways, especially someone who can keep a secret. What do you say, are you willing to help me?<br>
-<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt 32784-12.html">Accept the request.</a>
+My request is simple, just accompany me until I get the information I need. Right now I need information on a place called Embryo. I don't even know if its a place or a person, but whatever it is I need to know.<br>
+<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt 32784-12.html">"Hmm... What do you want me to do?"</a>
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-12.html b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-12.html
index aa6d4b8f09628e313311c8bc24c411da3ff3935f..ff9171fdb2c1d87692e757ea88081849974f0e11 100644
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-12.html
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-12.html
@@ -1,4 +1,4 @@
<html><body>Abyssal Saintess Elcadia:<br>
-My request is simple, just accompany me until I get the information I need. Right now I need information on a place called Embryo. I don't even know if its a place or a person, but whatever it is I need to know.<br>
-<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt 32784-13.html">Ask what I should do.</a>
+Have you heard of the great wizard Hardin? He used to reside in Ivory Tower, and now he is studying dark magic at Hardin's Academy. He knows more than most will forget in their lifetime, he will know the information we need. I want you to find Hardin.<br>
+<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt 32784-13.html">"Okay. I will go find him now."</a>
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-13.html b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-13.html
index bd1c26d60ff89a8d7e94061f245b475f8b36c1db..f30c1e1916b17767a7dc382e552abcb298c67868 100644
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-13.html
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-13.html
@@ -1,4 +1,3 @@
<html><body>Abyssal Saintess Elcadia:<br>
-Have you heard of the great wizard Hardin? He used to reside in Ivory Tower, and now he is studying dark magic at Hardin's Academy. He knows more than most will forget in their lifetime, he will know the information we need. I want you to find Hardin.<br>
-<a action="bypass -h Quest Q10292_SevenSignsGirlOfDoubt 32784-14.html">Come back after meeting with Hardin.</a>
+If you meet Hardin, remember to ask him about Embryo. If he asks who sent you, give him my name. He knows who I am.
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-14.html b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-14.html
index f30c1e1916b17767a7dc382e552abcb298c67868..37c2ccd80315b3a5057d93666b3082ff8d80790b 100644
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-14.html
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-14.html
@@ -1,3 +1,3 @@
<html><body>Abyssal Saintess Elcadia:<br>
-If you meet Hardin, remember to ask him about Embryo. If he asks who sent you, give him my name. He knows who I am.
+If you meet Hardin, ask him about the word Embryo. When he asks who sent you, give him my name. We're not close, but he knows who I am.
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-15.html b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-15.html
index 37c2ccd80315b3a5057d93666b3082ff8d80790b..105872b622accb751fc1a11e0f39c40349cd3f89 100644
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-15.html
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-15.html
@@ -1,3 +1,4 @@
<html><body>Abyssal Saintess Elcadia:<br>
-If you meet Hardin, ask him about the word Embryo. When he asks who sent you, give him my name. We're not close, but he knows who I am.
+Oh? You seem different than when I met you. If you changed your class or if you're in a different state than before, you would have to return to your original state. Said again, I have no intention of talking with you if you're in a subclass condition.<br>
+(You cannot complete the quest while in a subclass condition)
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-17.html b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-17.html
deleted file mode 100644
index 673e945174028208be4dee099cb40b24de8950b6..0000000000000000000000000000000000000000
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-17.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Abyssal Saintess Elcadia:<br>
-Hey, pay attention to detail. See all these monsters around here? I said defeat them.
-</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-18.html b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-18.html
deleted file mode 100644
index 0adfd980d2dbae7fbbc0a2028c71f518927e8614..0000000000000000000000000000000000000000
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-18.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Abyssal Saintess Elcadia:<br>
-Oh? You're different than when I first met you. If you changed your class or if you're in a different state, you would have to come back to your original state. (You cannot complete the quest when you're in a sub job condition.)
-</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
index 062e1df392e20f81e1b6a84dafe18d19213d74e4..fb5b2d17875bd1388afbb9495b87d0d33ae3fc65 100644
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2016 L2J DataPack
+ * Copyright (C) 2004-2017 L2J DataPack
*
* This file is part of L2J DataPack.
*
@@ -18,10 +18,6 @@
*/
package quests.Q10292_SevenSignsGirlOfDoubt;
-import quests.Q00198_SevenSignsEmbryo.Q00198_SevenSignsEmbryo;
-
-import com.l2jserver.gameserver.ThreadPoolManager;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.ItemHolder;
@@ -29,9 +25,12 @@ import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.util.Util;
+import quests.Q00198_SevenSignsEmbryo.Q00198_SevenSignsEmbryo;
+
/**
* Seven Signs, Girl of Doubt (10292)
* @author Adry_85
+ * @since 2.6.0.0
*/
public final class Q10292_SevenSignsGirlOfDoubt extends Quest
{
@@ -39,13 +38,14 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
private static final int HARDIN = 30832;
private static final int WOOD = 32593;
private static final int FRANZ = 32597;
- private static final int JAINA = 32617;
private static final int ELCADIA = 32784;
// Item
private static final ItemHolder ELCADIAS_MARK = new ItemHolder(17226, 10);
// Misc
private static final int MIN_LEVEL = 81;
- boolean isBusy = false;
+ // Variables
+ private static int killCount = 0;
+ private static final String I_QUEST1 = "I_QUEST1";
// Monster
private static final int CREATURE_OF_THE_DUSK1 = 27422;
private static final int CREATURE_OF_THE_DUSK2 = 27424;
@@ -63,7 +63,8 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
{
super(10292, Q10292_SevenSignsGirlOfDoubt.class.getSimpleName(), "Seven Signs, Girl of Doubt");
addStartNpc(WOOD);
- addTalkId(WOOD, FRANZ, JAINA, ELCADIA, HARDIN);
+ addSpawnId(ELCADIA);
+ addTalkId(WOOD, FRANZ, ELCADIA, HARDIN);
addKillId(MOBS);
addKillId(CREATURE_OF_THE_DUSK1, CREATURE_OF_THE_DUSK2);
registerQuestItems(ELCADIAS_MARK.getId());
@@ -81,33 +82,31 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
String htmltext = null;
switch (event)
{
+ case "32593-02.htm":
case "32593-04.htm":
- case "32593-06.htm":
+ case "32597-02.html":
+ case "32597-04.html":
{
htmltext = event;
break;
}
- case "32593-05.htm":
+ case "32593-03.htm":
{
st.startQuest();
+ st.setMemoState(1);
htmltext = event;
break;
}
- case "32597-02.html":
- case "32597-06.html":
- {
- htmltext = event;
- break;
- }
- case "32597-07.html":
+ case "32597-03.html":
{
+ st.setMemoState(2);
st.setCond(2, true);
htmltext = event;
break;
}
case "32784-02.html":
{
- if (st.isCond(2))
+ if (st.isMemoState(2))
{
htmltext = event;
}
@@ -115,73 +114,70 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
}
case "32784-03.html":
{
- if (st.isCond(2))
+ if (st.isMemoState(2))
{
+ st.setMemoState(3);
st.setCond(3, true);
htmltext = event;
}
break;
}
- case "32784-06.html":
+ case "32784-05.html":
{
- if (st.isCond(4) && hasItem(player, ELCADIAS_MARK))
+ if (st.isMemoState(4))
{
- playSound(player, Sound.ITEMSOUND_QUEST_MIDDLE);
htmltext = event;
}
break;
}
- case "32784-08.html":
+ case "32784-06.html":
{
- if (st.isCond(4) && hasItem(player, ELCADIAS_MARK))
+ if (st.isMemoState(4))
{
- takeItem(player, ELCADIAS_MARK);
+ st.setMemoState(5);
st.setCond(5, true);
htmltext = event;
}
break;
}
- case "32784-12.html":
- case "32784-13.html":
+ case "SPAWN":
{
- if (st.isCond(6))
+ if (!npc.getVariables().getBoolean(I_QUEST1, false))
{
- htmltext = event;
+ npc.getVariables().set(I_QUEST1, true);
+ addSpawn(CREATURE_OF_THE_DUSK1, 89440, -238016, -9632, getRandom(360), false, 0, false, player.getInstanceId());
+ addSpawn(CREATURE_OF_THE_DUSK2, 89524, -238131, -9632, getRandom(360), false, 0, false, player.getInstanceId());
+ }
+ else
+ {
+ htmltext = "32784-07.html";
}
break;
}
- case "32784-14.html":
+ case "32784-11.html":
+ case "32784-12.html":
{
- if (st.isCond(6))
+ if (st.isMemoState(6))
{
- st.setCond(7, true);
htmltext = event;
}
break;
}
- case "SPAWN":
+ case "32784-13.html":
{
- if (st.isCond(5))
+ if (st.isMemoState(6))
{
- isBusy = true;
- final L2Npc creature1 = addSpawn(CREATURE_OF_THE_DUSK1, 89440, -238016, -9632, 335, false, 0, false, player.getInstanceId());
- creature1.setIsNoRndWalk(true);
- final L2Npc creature2 = addSpawn(CREATURE_OF_THE_DUSK2, 89524, -238131, -9632, 56, false, 0, false, player.getInstanceId());
- creature2.setIsNoRndWalk(true);
- ThreadPoolManager.getInstance().scheduleGeneral(() ->
- {
- creature1.deleteMe();
- creature2.deleteMe();
- st.unset("ex");
- isBusy = false;
- }, 60000);
+ st.setMemoState(7);
+ st.setCond(7, true);
+ htmltext = event;
}
break;
}
case "30832-02.html":
{
- if (st.isCond(7))
+ if (st.isMemoState(7))
{
+ st.setMemoState(8);
st.setCond(8, true);
htmltext = event;
}
@@ -189,7 +185,7 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
}
case "30832-03.html":
{
- if (st.isCond(8))
+ if (st.isMemoState(8))
{
htmltext = event;
}
@@ -202,139 +198,155 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
@Override
public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon)
{
- if (Util.contains(MOBS, npc.getId()))
+ final QuestState st = getRandomPartyMemberState(player, -1, 3, npc);
+ if (st != null)
{
- final QuestState st = getRandomPartyMemberState(player, 3, 3, npc);
- if ((st != null) && giveItemRandomly(st.getPlayer(), npc, ELCADIAS_MARK.getId(), 1, ELCADIAS_MARK.getCount(), 1.0, true))
+ if (Util.contains(MOBS, npc.getId()))
{
- st.setCond(4, true);
+ if (giveItemRandomly(st.getPlayer(), npc, ELCADIAS_MARK.getId(), 1, ELCADIAS_MARK.getCount(), 0.7, true) && st.isMemoState(3))
+ {
+ st.setCond(4, true);
+ }
}
- }
- else
- {
- final QuestState st = getQuestState(player, false);
- if ((st != null) && st.isCond(5))
+ else
{
- final int value = st.getInt("ex") + 1;
- st.set("ex", value);
- if (value == 2)
+ killCount++;
+ if (killCount == 2)
{
- st.setCond(6, true);
+ st.setMemoState(6);
+ st.setCond(6);
}
}
}
return super.onKill(npc, player, isSummon);
}
+ @Override
+ public String onSpawn(L2Npc npc)
+ {
+ npc.getVariables().set(I_QUEST1, false);
+ return super.onSpawn(npc);
+ }
+
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- QuestState st = getQuestState(player, true);
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- switch (npc.getId())
+ if (st.isCompleted())
{
- case WOOD:
+ if (npc.getId() == WOOD)
{
- if (st.isCompleted())
- {
- htmltext = "32593-02.html";
- }
- else if (st.isCreated())
- {
- st = player.getQuestState(Q00198_SevenSignsEmbryo.class.getSimpleName());
- htmltext = ((player.getLevel() >= MIN_LEVEL) && (st != null) && (st.isCompleted())) ? "32593-01.htm" : "32593-03.htm";
- }
- else if (st.isStarted())
- {
- htmltext = "32593-07.html";
- }
- break;
+ htmltext = "32593-05.html";
}
- case FRANZ:
+ }
+ else if (st.isCreated())
+ {
+ final QuestState st1 = player.getQuestState(Q00198_SevenSignsEmbryo.class.getSimpleName());
+ htmltext = ((player.getLevel() >= MIN_LEVEL) && (st1 != null) && (st1.isCompleted())) ? "32593-01.htm" : "32593-06.htm";
+ }
+ else if (st.isStarted())
+ {
+ switch (npc.getId())
{
- if (st.isCond(1))
+ case WOOD:
{
- htmltext = "32597-01.html";
+ if ((st.getMemoState() > 0) && (st.getMemoState() < 9))
+ {
+ htmltext = "32593-07.html";
+ }
+ break;
}
- else if (st.isCond(2))
+ case FRANZ:
{
- htmltext = "32597-03.html";
- }
- break;
- }
- case ELCADIA:
- {
- switch (st.getCond())
- {
- case 2:
+ final int memoState = st.getMemoState();
+ if (memoState == 1)
{
- htmltext = "32784-01.html";
- break;
+ htmltext = "32597-01.html";
}
- case 3:
+ else if ((memoState >= 2) && (memoState < 7))
{
- htmltext = "32784-04.html";
- break;
+ htmltext = "32597-05.html";
}
- case 4:
+ else if (memoState == 7)
{
- if (hasItem(player, ELCADIAS_MARK))
- {
- playSound(player, Sound.ITEMSOUND_QUEST_MIDDLE);
- htmltext = "32784-05.html";
- }
- break;
+ htmltext = "32597-06.html";
}
- case 5:
+ break;
+ }
+ case ELCADIA:
+ {
+ switch (st.getMemoState())
{
- if (isBusy)
+ case 2:
{
- htmltext = "32784-17.html";
+ htmltext = "32784-01.html";
+ break;
}
- else
+ case 3:
{
- htmltext = "32784-07.html";
+ if (!hasItem(player, ELCADIAS_MARK))
+ {
+ htmltext = "32784-03.html";
+ }
+ else
+ {
+ takeItem(player, ELCADIAS_MARK);
+ st.setMemoState(4);
+ st.setCond(4, true);
+ htmltext = "32784-04.html";
+ }
+ break;
}
- break;
- }
- case 6:
- {
- htmltext = "32784-11.html";
- break;
- }
- case 7:
- {
- htmltext = "32784-15.html";
- break;
- }
- case 8:
- {
- if (player.isSubClassActive())
+ case 4:
+ {
+ htmltext = "32784-08.html";
+ break;
+ }
+ case 5:
{
- htmltext = "32784-18.html";
+ htmltext = "32784-09.html";
+ break;
}
- else
+ case 6:
{
- addExpAndSp(player, 10000000, 1000000);
- st.exitQuest(false, true);
- htmltext = "32784-16.html";
+ htmltext = "32784-10.html";
+ break;
+ }
+ case 7:
+ {
+ htmltext = "32784-14.html";
+ break;
+ }
+ case 8:
+ {
+ if (player.isSubClassActive())
+ {
+ htmltext = "32784-15.html";
+ }
+ else
+ {
+ addExpAndSp(player, 10000000, 1000000);
+ st.exitQuest(false, true);
+ htmltext = "32784-16.html";
+ }
+ break;
}
- break;
}
+ break;
}
- break;
- }
- case HARDIN:
- {
- if (st.isCond(7))
+ case HARDIN:
{
- htmltext = "30832-01.html";
- }
- else if (st.isCond(8))
- {
- htmltext = "30832-04.html";
+ if (st.isMemoState(7))
+ {
+ htmltext = "30832-01.html";
+ }
+ else if (st.isMemoState(8))
+ {
+ htmltext = "30832-03.html";
+ }
+ break;
}
- break;
}
}
return htmltext;
diff --git a/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/32593-03.html b/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/32593-03.html
index 027bf4e2572933023e907cfc7fab1a976d598424..a631156c8feecc76292c72ca0bbcc2c4a0b45259 100644
--- a/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/32593-03.html
+++ b/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/32593-03.html
@@ -1,4 +1,4 @@
<html><body>Priest Wood:<br>
OK, then go and greet Lord Franz. And remember your courtesies.<br>
-<a action="bypass -h Quest HideoutOfTheDawn">Enter.</a>
+<a action="bypass -h Quest HideoutOfTheDawn 32593-01.html">Enter.</a>
</body></html>
\ No newline at end of file