Quests rework.
This commit is contained in:
@@ -86,8 +86,8 @@ public class Q00617_GatherTheFlames 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);
|
||||
}
|
||||
@@ -97,23 +97,31 @@ public class Q00617_GatherTheFlames extends Quest
|
||||
{
|
||||
case "31539-03.htm":
|
||||
case "31271-03.htm":
|
||||
st.startQuest();
|
||||
{
|
||||
qs.startQuest();
|
||||
break;
|
||||
}
|
||||
case "32049-02.html":
|
||||
case "31539-04.html":
|
||||
case "31539-06.html":
|
||||
{
|
||||
break;
|
||||
}
|
||||
case "31539-07.html":
|
||||
if ((st.getQuestItemsCount(TORCH) < 1000) || !st.isStarted())
|
||||
{
|
||||
if ((getQuestItemsCount(player, TORCH) < 1000) || !qs.isStarted())
|
||||
{
|
||||
return getNoQuestMsg(player);
|
||||
}
|
||||
st.giveItems(REWARD[getRandom(REWARD.length)], 1);
|
||||
st.takeItems(TORCH, 1000);
|
||||
giveItems(player, REWARD[getRandom(REWARD.length)], 1);
|
||||
takeItems(player, TORCH, 1000);
|
||||
break;
|
||||
}
|
||||
case "31539-08.html":
|
||||
st.exitQuest(true, true);
|
||||
{
|
||||
qs.exitQuest(true, true);
|
||||
break;
|
||||
}
|
||||
case "6883":
|
||||
case "6885":
|
||||
case "7580":
|
||||
@@ -122,27 +130,33 @@ public class Q00617_GatherTheFlames extends Quest
|
||||
case "6895":
|
||||
case "6897":
|
||||
case "6899":
|
||||
if ((st.getQuestItemsCount(TORCH) < 1200) || !st.isStarted())
|
||||
{
|
||||
if ((getQuestItemsCount(player, TORCH) < 1200) || !qs.isStarted())
|
||||
{
|
||||
return getNoQuestMsg(player);
|
||||
}
|
||||
st.giveItems(Integer.valueOf(event), 1);
|
||||
st.takeItems(TORCH, 1200);
|
||||
giveItems(player, Integer.valueOf(event), 1);
|
||||
takeItems(player, TORCH, 1200);
|
||||
htmltext = "32049-04.html";
|
||||
break;
|
||||
}
|
||||
case "6887":
|
||||
case "6881":
|
||||
if ((st.getQuestItemsCount(TORCH) < 1200) || !st.isStarted())
|
||||
{
|
||||
if ((getQuestItemsCount(player, TORCH) < 1200) || !qs.isStarted())
|
||||
{
|
||||
return getNoQuestMsg(player);
|
||||
}
|
||||
st.giveItems(Integer.valueOf(event), 1);
|
||||
st.takeItems(TORCH, 1200);
|
||||
giveItems(player, Integer.valueOf(event), 1);
|
||||
takeItems(player, TORCH, 1200);
|
||||
htmltext = "32049-03.html";
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
htmltext = null;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return htmltext;
|
||||
}
|
||||
@@ -156,17 +170,16 @@ public class Q00617_GatherTheFlames extends Quest
|
||||
return super.onKill(npc, player, isSummon);
|
||||
}
|
||||
|
||||
final QuestState st = getQuestState(partyMember, false);
|
||||
|
||||
if (getRandom(1000) < MOBS.get(npc.getId()))
|
||||
{
|
||||
st.giveItems(TORCH, 2);
|
||||
giveItems(partyMember, TORCH, 2);
|
||||
}
|
||||
else
|
||||
{
|
||||
st.giveItems(TORCH, 1);
|
||||
giveItems(partyMember, TORCH, 1);
|
||||
}
|
||||
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
|
||||
playSound(partyMember, QuestSound.ITEMSOUND_QUEST_ITEMGET);
|
||||
|
||||
return super.onKill(npc, player, isSummon);
|
||||
}
|
||||
|
||||
@@ -174,8 +187,8 @@ public class Q00617_GatherTheFlames 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;
|
||||
}
|
||||
@@ -183,23 +196,28 @@ public class Q00617_GatherTheFlames extends Quest
|
||||
switch (npc.getId())
|
||||
{
|
||||
case ROONEY:
|
||||
if (st.isStarted())
|
||||
{
|
||||
if (qs.isStarted())
|
||||
{
|
||||
htmltext = (st.getQuestItemsCount(TORCH) >= 1200) ? "32049-02.html" : "32049-01.html";
|
||||
htmltext = (getQuestItemsCount(player, TORCH) >= 1200) ? "32049-02.html" : "32049-01.html";
|
||||
}
|
||||
break;
|
||||
}
|
||||
case VULCAN:
|
||||
if (st.isCreated())
|
||||
{
|
||||
if (qs.isCreated())
|
||||
{
|
||||
htmltext = (player.getLevel() >= 74) ? "31539-01.htm" : "31539-02.htm";
|
||||
}
|
||||
else
|
||||
{
|
||||
htmltext = (st.getQuestItemsCount(TORCH) >= 1000) ? "31539-04.html" : "31539-05.html";
|
||||
htmltext = (getQuestItemsCount(player, TORCH) >= 1000) ? "31539-04.html" : "31539-05.html";
|
||||
}
|
||||
break;
|
||||
}
|
||||
case HILDA:
|
||||
if (st.isCreated())
|
||||
{
|
||||
if (qs.isCreated())
|
||||
{
|
||||
htmltext = (player.getLevel() >= 74) ? "31271-01.htm" : "31271-02.htm";
|
||||
}
|
||||
@@ -208,6 +226,7 @@ public class Q00617_GatherTheFlames extends Quest
|
||||
htmltext = "31271-04.html";
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
return htmltext;
|
||||
}
|
||||
|
Reference in New Issue
Block a user