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

@@ -60,8 +60,8 @@ public class Q00645_GhostsOfBatur 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;
}
@@ -73,7 +73,7 @@ public class Q00645_GhostsOfBatur extends Quest
{
case "32017-03.htm":
{
st.startQuest();
qs.startQuest();
htmltext = event;
break;
}
@@ -85,7 +85,7 @@ public class Q00645_GhostsOfBatur extends Quest
}
case "32017-09.html":
{
st.exitQuest(true, true);
qs.exitQuest(true, true);
htmltext = event;
break;
}
@@ -102,15 +102,15 @@ public class Q00645_GhostsOfBatur extends Quest
{
if (getRandom(1000) < CHANCES[npc.getId() - CONTAMINATED_MOREK_WARRIOR])
{
final QuestState st = getQuestState(player, false);
st.giveItems(CURSED_BURIAL_ITEMS, 1);
if (st.isCond(1) && (st.getQuestItemsCount(CURSED_BURIAL_ITEMS) >= 500))
final QuestState qs = getQuestState(player, false);
giveItems(killer, CURSED_BURIAL_ITEMS, 1);
if (qs.isCond(1) && (getQuestItemsCount(killer, CURSED_BURIAL_ITEMS) >= 500))
{
st.setCond(2, true);
qs.setCond(2, true);
}
else
{
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
}
}
@@ -120,14 +120,14 @@ public class Q00645_GhostsOfBatur extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
final QuestState st = getQuestState(player, true);
if (st == null)
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return getNoQuestMsg(player);
}
String htmltext = getNoQuestMsg(player);
switch (st.getState())
switch (qs.getState())
{
case State.CREATED:
{
@@ -137,17 +137,17 @@ public class Q00645_GhostsOfBatur extends Quest
case State.STARTED:
{
// Support for old quest reward.
final long count = st.getQuestItemsCount(CURSED_GRAVE_GOODS);
final long count = getQuestItemsCount(player, CURSED_GRAVE_GOODS);
if ((count > 0) && (count < 180))
{
st.giveAdena(56000 + (count * 64), false);
st.addExpAndSp(138000, 7997);
st.exitQuest(true, true);
giveAdena(player, 56000 + (count * 64), false);
addExpAndSp(player, 138000, 7997);
qs.exitQuest(true, true);
htmltext = "32017-07.html";
}
else
{
htmltext = st.hasQuestItems(CURSED_BURIAL_ITEMS) ? "32017-04.html" : "32017-05.html";
htmltext = hasQuestItems(player, CURSED_BURIAL_ITEMS) ? "32017-04.html" : "32017-05.html";
}
break;
}