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

@@ -66,8 +66,8 @@ public class Q00141_ShadowFoxPart3 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;
}
@@ -85,27 +85,38 @@ public class Q00141_ShadowFoxPart3 extends Quest
case "30894-17.html":
case "30894-19.html":
case "30894-20.html":
{
break;
}
case "30894-03.htm":
st.startQuest();
{
qs.startQuest();
break;
}
case "30894-06.html":
st.setCond(2, true);
{
qs.setCond(2, true);
break;
}
case "30894-15.html":
st.set("talk", "2");
{
qs.set("talk", "2");
break;
}
case "30894-18.html":
st.setCond(4, true);
st.unset("talk");
{
qs.setCond(4, true);
qs.unset("talk");
break;
}
case "30894-21.html":
st.giveAdena(88888, true);
{
giveAdena(player, 88888, true);
if (player.getLevel() <= MAX_REWARD_LEVEL)
{
st.addExpAndSp(278005, 17058);
addExpAndSp(player, 278005, 17058);
}
st.exitQuest(false, true);
qs.exitQuest(false, true);
final Quest q = QuestManager.getInstance().getQuest(Q00998_FallenAngelSelect.class.getSimpleName());
if (q != null)
@@ -113,9 +124,12 @@ public class Q00141_ShadowFoxPart3 extends Quest
q.newQuestState(player).setState(State.STARTED);
}
break;
}
default:
{
htmltext = null;
break;
}
}
return htmltext;
}
@@ -128,17 +142,17 @@ public class Q00141_ShadowFoxPart3 extends Quest
{
return super.onKill(npc, player, isSummon);
}
final QuestState st = getQuestState(member, false);
final QuestState qs = getQuestState(member, false);
if ((getRandom(100) < MOBS.get(npc.getId())))
{
st.giveItems(PREDECESSORS_REPORT, 1);
if (st.getQuestItemsCount(PREDECESSORS_REPORT) >= REPORT_COUNT)
giveItems(member, PREDECESSORS_REPORT, 1);
if (getQuestItemsCount(member, PREDECESSORS_REPORT) >= REPORT_COUNT)
{
st.setCond(3, true);
qs.setCond(3, true);
}
else
{
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
playSound(member, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
}
return super.onKill(npc, player, isSummon);
@@ -148,51 +162,65 @@ public class Q00141_ShadowFoxPart3 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(Q00140_ShadowFoxPart2.class.getSimpleName());
htmltext = (player.getLevel() >= MIN_LEVEL) ? ((qs != null) && qs.isCompleted()) ? "30894-01.htm" : "30894-00.html" : "30894-02.htm";
{
final QuestState qst = player.getQuestState(Q00140_ShadowFoxPart2.class.getSimpleName());
htmltext = (player.getLevel() >= MIN_LEVEL) ? ((qst != null) && qst.isCompleted()) ? "30894-01.htm" : "30894-00.html" : "30894-02.htm";
break;
}
case State.STARTED:
switch (st.getCond())
{
switch (qs.getCond())
{
case 1:
{
htmltext = "30894-04.html";
break;
}
case 2:
{
htmltext = "30894-07.html";
break;
}
case 3:
if (st.getInt("talk") == 1)
{
if (qs.getInt("talk") == 1)
{
htmltext = "30894-09.html";
}
else if (st.getInt("talk") == 2)
else if (qs.getInt("talk") == 2)
{
htmltext = "30894-16.html";
}
else
{
htmltext = "30894-08.html";
st.takeItems(PREDECESSORS_REPORT, -1);
st.set("talk", "1");
takeItems(player, PREDECESSORS_REPORT, -1);
qs.set("talk", "1");
}
break;
}
case 4:
{
htmltext = "30894-19.html";
break;
}
}
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
return htmltext;
}