Some quest fixes from l2jserver.

This commit is contained in:
MobiusDev
2017-08-26 00:35:24 +00:00
parent 9f1002e57d
commit e31b86dd67
46 changed files with 323 additions and 313 deletions

View File

@@ -66,7 +66,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)) //

View File

@@ -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>

View File

@@ -1,3 +1,3 @@
<html><body>Priestess Jeina:<br>
<html><body>Priestess Jaina:<br>
May Einhasad's blessing go with you....
</body></html>

View File

@@ -0,0 +1,3 @@
<html><body>Priestess Jaina:<br>
Please speak with Priest Franz for more details.
</body></html>

View File

@@ -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>

View File

@@ -16,7 +16,6 @@
*/
package instances.HideoutOfTheDawn;
import com.l2jmobius.gameserver.instancemanager.InstanceManager;
import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -30,42 +29,54 @@ import instances.AbstractInstance;
*/
public final class HideoutOfTheDawn extends AbstractInstance
{
protected class HotDWorld extends InstanceWorld
{
}
// NPCs
private static final int WOOD = 32593;
private static final int JAINA = 32617;
// Location
private static final Location WOOD_LOC = new Location(-23758, -8959, -5384, 0, 0);
private static final Location JAINA_LOC = new Location(147072, 23743, -1984, 0);
private static final Location WOOD_LOC = new Location(-23758, -8959, -5384);
private static final Location JAINA_LOC = new Location(147072, 23743, -1984);
// Misc
private static final int TEMPLATE_ID = 113;
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, "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