Quests rework.

This commit is contained in:
MobiusDev
2016-02-11 21:39:33 +00:00
parent b2cafd8e2e
commit 09976b0ce6
173 changed files with 6416 additions and 4720 deletions

View File

@@ -47,8 +47,8 @@ public class Q00013_ParcelDelivery extends Quest
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
String htmltext = event;
final QuestState st = getQuestState(player, false);
if (st == null)
final QuestState qs = getQuestState(player, false);
if (qs == null)
{
return htmltext;
}
@@ -56,21 +56,25 @@ public class Q00013_ParcelDelivery extends Quest
switch (event)
{
case "31274-02.html":
st.startQuest();
st.giveItems(PACKAGE, 1);
{
qs.startQuest();
giveItems(player, PACKAGE, 1);
break;
}
case "31539-01.html":
if (st.isCond(1) && st.hasQuestItems(PACKAGE))
{
if (qs.isCond(1) && hasQuestItems(player, PACKAGE))
{
st.giveAdena(157834, true);
st.addExpAndSp(589092, 58794);
st.exitQuest(false, true);
giveAdena(player, 157834, true);
addExpAndSp(player, 589092, 58794);
qs.exitQuest(false, true);
}
else
{
htmltext = "31539-02.html";
}
break;
}
}
return htmltext;
}
@@ -79,38 +83,43 @@ public class Q00013_ParcelDelivery 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;
}
final int npcId = npc.getId();
switch (st.getState())
switch (qs.getState())
{
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
case State.CREATED:
{
if (npcId == FUNDIN)
{
htmltext = (player.getLevel() >= 74) ? "31274-00.htm" : "31274-01.html";
}
break;
}
case State.STARTED:
if (st.isCond(1))
{
if (qs.isCond(1))
{
switch (npcId)
if (npcId == FUNDIN)
{
case FUNDIN:
htmltext = "31274-02.html";
break;
case VULCAN:
htmltext = "31539-00.html";
break;
htmltext = "31274-02.html";
}
else if (npcId == VULCAN)
{
htmltext = "31539-00.html";
}
}
break;
}
}
return htmltext;
}