Skip to content
Snippets Groups Projects
Commit b54059cb authored by Adry85's avatar Adry85 Committed by Zoey76
Browse files

Reworked quest Seven Signs, Girl of Doubt (10292). 

- Fixed wrong bypass on html
Reported by: hellEVIL-13
parent 6de0ed85
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 47 additions and 48 deletions
dist/game/data/scripts/instances/ElcadiasTent/ElcadiasTent.java
+ 1
− 1
View file @ b54059cb
......@@ -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)) //
......
dist/game/data/scripts/instances/HideoutOfTheDawn/32617-01.html 0 → 100644
+ 5
− 0
View file @ b54059cb
<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
dist/game/data/scripts/instances/HideoutOfTheDawn/32617-01.htm → dist/game/data/scripts/instances/HideoutOfTheDawn/32617-02.html
+ 1
− 1
View file @ b54059cb
<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
dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32617-02.html → dist/game/data/scripts/instances/HideoutOfTheDawn/32617-02a.html
+ 1
− 1
View file @ b54059cb
<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
dist/game/data/scripts/instances/HideoutOfTheDawn/32617.html 0 → 100644
+ 4
− 0
View file @ b54059cb
<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
dist/game/data/scripts/instances/HideoutOfTheDawn/HideoutOfTheDawn.java
+ 19
− 13
View file @ b54059cb
......@@ -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
......
dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32593-02.html
+ 1
− 1
View file @ b54059cb
<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
dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32593-04.html
+ 1
− 1
View file @ b54059cb
<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
dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32617-01.html deleted 100644 → 0
+ 0
− 5
View file @ 6de0ed85
<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
dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
+ 0
− 8
View file @ b54059cb
......@@ -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)
{
......
dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/30832-04.html deleted 100644 → 0
+ 0
− 3
View file @ 6de0ed85
<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
dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-01.htm
+ 1
− 1
View file @ b54059cb
<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
dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-02.htm
+ 3
− 2
View file @ b54059cb
<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
dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-03.htm
+ 2
− 2
View file @ b54059cb
<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
dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-04.htm
+ 1
− 3
View file @ b54059cb
<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
dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-05.htm deleted 100644 → 0
+ 0
− 4
View file @ 6de0ed85
<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
dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-05.html 0 → 100644
+ 4
− 0
View file @ b54059cb
<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
dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-06.htm
+ 2
− 1
View file @ b54059cb
<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
dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-07.html
+ 1
− 1
View file @ b54059cb
<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
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment