Quests rework.
This commit is contained in:
@@ -56,39 +56,49 @@ public class Q00137_TempleChampionPart1 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 getNoQuestMsg(player);
|
||||
}
|
||||
switch (event)
|
||||
{
|
||||
case "30070-02.htm":
|
||||
st.startQuest();
|
||||
{
|
||||
qs.startQuest();
|
||||
break;
|
||||
}
|
||||
case "30070-05.html":
|
||||
st.set("talk", "1");
|
||||
{
|
||||
qs.set("talk", "1");
|
||||
break;
|
||||
}
|
||||
case "30070-06.html":
|
||||
st.set("talk", "2");
|
||||
{
|
||||
qs.set("talk", "2");
|
||||
break;
|
||||
}
|
||||
case "30070-08.html":
|
||||
st.unset("talk");
|
||||
st.setCond(2, true);
|
||||
{
|
||||
qs.unset("talk");
|
||||
qs.setCond(2, true);
|
||||
break;
|
||||
}
|
||||
case "30070-16.html":
|
||||
if (st.isCond(3) && (st.hasQuestItems(EXECUTOR) && st.hasQuestItems(MISSIONARY)))
|
||||
{
|
||||
if (qs.isCond(3) && (hasQuestItems(player, EXECUTOR) && hasQuestItems(player, MISSIONARY)))
|
||||
{
|
||||
st.takeItems(EXECUTOR, -1);
|
||||
st.takeItems(MISSIONARY, -1);
|
||||
st.giveAdena(69146, true);
|
||||
takeItems(player, EXECUTOR, -1);
|
||||
takeItems(player, MISSIONARY, -1);
|
||||
giveAdena(player, 69146, true);
|
||||
if (player.getLevel() < 41)
|
||||
{
|
||||
st.addExpAndSp(219975, 13047);
|
||||
addExpAndSp(player, 219975, 13047);
|
||||
}
|
||||
st.exitQuest(false, true);
|
||||
qs.exitQuest(false, true);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
return event;
|
||||
}
|
||||
@@ -96,17 +106,17 @@ public class Q00137_TempleChampionPart1 extends Quest
|
||||
@Override
|
||||
public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon)
|
||||
{
|
||||
final QuestState st = getQuestState(player, false);
|
||||
if ((st != null) && st.isStarted() && st.isCond(2) && (st.getQuestItemsCount(FRAGMENT) < 30))
|
||||
final QuestState qs = getQuestState(player, false);
|
||||
if ((qs != null) && qs.isStarted() && qs.isCond(2) && (getQuestItemsCount(player, FRAGMENT) < 30))
|
||||
{
|
||||
st.giveItems(FRAGMENT, 1);
|
||||
if (st.getQuestItemsCount(FRAGMENT) >= 30)
|
||||
giveItems(player, FRAGMENT, 1);
|
||||
if (getQuestItemsCount(player, FRAGMENT) >= 30)
|
||||
{
|
||||
st.setCond(3, true);
|
||||
qs.setCond(3, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
|
||||
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
|
||||
}
|
||||
}
|
||||
return super.onKill(npc, player, isSummon);
|
||||
@@ -116,49 +126,63 @@ public class Q00137_TempleChampionPart1 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;
|
||||
}
|
||||
if (st.isCompleted())
|
||||
if (qs.isCompleted())
|
||||
{
|
||||
return getAlreadyCompletedMsg(player);
|
||||
}
|
||||
switch (st.getCond())
|
||||
switch (qs.getCond())
|
||||
{
|
||||
case 1:
|
||||
switch (st.getInt("talk"))
|
||||
{
|
||||
switch (qs.getInt("talk"))
|
||||
{
|
||||
case 1:
|
||||
{
|
||||
htmltext = "30070-05.html";
|
||||
break;
|
||||
}
|
||||
case 2:
|
||||
{
|
||||
htmltext = "30070-06.html";
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
htmltext = "30070-03.html";
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 2:
|
||||
{
|
||||
htmltext = "30070-08.html";
|
||||
break;
|
||||
}
|
||||
case 3:
|
||||
if (st.getInt("talk") == 1)
|
||||
{
|
||||
if (qs.getInt("talk") == 1)
|
||||
{
|
||||
htmltext = "30070-10.html";
|
||||
}
|
||||
else if (st.getQuestItemsCount(FRAGMENT) >= 30)
|
||||
else if (getQuestItemsCount(player, FRAGMENT) >= 30)
|
||||
{
|
||||
st.set("talk", "1");
|
||||
qs.set("talk", "1");
|
||||
htmltext = "30070-09.html";
|
||||
st.takeItems(FRAGMENT, -1);
|
||||
takeItems(player, FRAGMENT, -1);
|
||||
}
|
||||
break;
|
||||
}
|
||||
default:
|
||||
htmltext = ((player.getLevel() >= 35) && st.hasQuestItems(EXECUTOR, MISSIONARY)) ? "30070-01.htm" : "30070-00.html";
|
||||
{
|
||||
htmltext = ((player.getLevel() >= 35) && hasQuestItems(player, EXECUTOR, MISSIONARY)) ? "30070-01.htm" : "30070-00.html";
|
||||
break;
|
||||
}
|
||||
}
|
||||
return htmltext;
|
||||
}
|
||||
|
Reference in New Issue
Block a user