Quests rework.
This commit is contained in:
@@ -68,8 +68,8 @@ public class Q00701_ProofOfExistence extends Quest
|
||||
@Override
|
||||
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
|
||||
{
|
||||
final QuestState st = getQuestState(player, false);
|
||||
if (st == null)
|
||||
final QuestState qs = getQuestState(player, false);
|
||||
if (qs == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
@@ -78,16 +78,24 @@ public class Q00701_ProofOfExistence extends Quest
|
||||
{
|
||||
case "32559-03.htm":
|
||||
case "32559-08.html":
|
||||
{
|
||||
break;
|
||||
}
|
||||
case "32559-04.htm":
|
||||
st.startQuest();
|
||||
{
|
||||
qs.startQuest();
|
||||
break;
|
||||
}
|
||||
case "32559-09.html":
|
||||
st.exitQuest(true, true);
|
||||
{
|
||||
qs.exitQuest(true, true);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
htmltext = null;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return htmltext;
|
||||
}
|
||||
@@ -100,7 +108,7 @@ public class Q00701_ProofOfExistence extends Quest
|
||||
{
|
||||
return super.onKill(npc, player, isSummon);
|
||||
}
|
||||
final QuestState st = getQuestState(member, false);
|
||||
|
||||
if (npc.getId() == ENIRA)
|
||||
{
|
||||
final int chance = getRandom(1000);
|
||||
@@ -125,13 +133,13 @@ public class Q00701_ProofOfExistence extends Quest
|
||||
{
|
||||
count = getRandom(5) + 14;
|
||||
}
|
||||
st.giveItems(BANSHEE_QUEENS_EYE, count);
|
||||
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
|
||||
giveItems(player, BANSHEE_QUEENS_EYE, count);
|
||||
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
|
||||
}
|
||||
else if (getRandom(1000) < MOBS.get(npc.getId()))
|
||||
{
|
||||
st.giveItems(DEADMANS_REMAINS, 1);
|
||||
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
|
||||
giveItems(player, DEADMANS_REMAINS, 1);
|
||||
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
|
||||
}
|
||||
return super.onKill(npc, player, isSummon);
|
||||
}
|
||||
@@ -140,30 +148,33 @@ public class Q00701_ProofOfExistence extends Quest
|
||||
public String onTalk(L2Npc npc, L2PcInstance player)
|
||||
{
|
||||
String htmltext = getNoQuestMsg(player);
|
||||
final QuestState st = getQuestState(player, true);
|
||||
if (st == null)
|
||||
final QuestState qs = getQuestState(player, true);
|
||||
if (qs == null)
|
||||
{
|
||||
return htmltext;
|
||||
}
|
||||
|
||||
switch (st.getState())
|
||||
switch (qs.getState())
|
||||
{
|
||||
case State.CREATED:
|
||||
final QuestState qs = player.getQuestState(Q10273_GoodDayToFly.class.getSimpleName());
|
||||
htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "32559-01.htm" : "32559-02.htm";
|
||||
{
|
||||
final QuestState qst = player.getQuestState(Q10273_GoodDayToFly.class.getSimpleName());
|
||||
htmltext = ((player.getLevel() >= MIN_LEVEL) && (qst != null) && qst.isCompleted()) ? "32559-01.htm" : "32559-02.htm";
|
||||
break;
|
||||
}
|
||||
case State.STARTED:
|
||||
if (st.hasQuestItems(BANSHEE_QUEENS_EYE))
|
||||
{
|
||||
if (hasQuestItems(player, BANSHEE_QUEENS_EYE))
|
||||
{
|
||||
st.giveAdena((st.getQuestItemsCount(DEADMANS_REMAINS) * 2500) + (st.getQuestItemsCount(BANSHEE_QUEENS_EYE) * 50000) + 23835, true);
|
||||
st.takeItems(BANSHEE_QUEENS_EYE, -1);
|
||||
st.takeItems(DEADMANS_REMAINS, -1);
|
||||
giveAdena(player, (getQuestItemsCount(player, DEADMANS_REMAINS) * 2500) + (getQuestItemsCount(player, BANSHEE_QUEENS_EYE) * 50000) + 23835, true);
|
||||
takeItems(player, BANSHEE_QUEENS_EYE, -1);
|
||||
takeItems(player, DEADMANS_REMAINS, -1);
|
||||
htmltext = "32559-07.html";
|
||||
}
|
||||
else if (st.hasQuestItems(DEADMANS_REMAINS))
|
||||
else if (hasQuestItems(player, DEADMANS_REMAINS))
|
||||
{
|
||||
st.giveAdena(st.getQuestItemsCount(DEADMANS_REMAINS) * 2500, true);
|
||||
st.takeItems(DEADMANS_REMAINS, -1);
|
||||
giveAdena(player, getQuestItemsCount(player, DEADMANS_REMAINS) * 2500, true);
|
||||
takeItems(player, DEADMANS_REMAINS, -1);
|
||||
htmltext = "32559-06.html";
|
||||
}
|
||||
else
|
||||
@@ -171,6 +182,7 @@ public class Q00701_ProofOfExistence extends Quest
|
||||
htmltext = "32559-05.html";
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
return htmltext;
|
||||
}
|
||||
|
Reference in New Issue
Block a user