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

@@ -54,8 +54,8 @@ public class Q00143_FallenAngelRequestOfDusk 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;
}
@@ -75,34 +75,49 @@ public class Q00143_FallenAngelRequestOfDusk extends Quest
case "32369-08.html":
case "32369-09.html":
case "32369-10.html":
{
break;
}
case "30894-01.html":
st.startQuest();
{
qs.startQuest();
break;
}
case "30894-03.html":
st.setCond(2, true);
st.giveItems(SEALED_PROPHECY_PATH_OF_THE_GOD, 1);
{
qs.setCond(2, true);
giveItems(player, SEALED_PROPHECY_PATH_OF_THE_GOD, 1);
break;
}
case "30297-03.html":
st.takeItems(SEALED_PROPHECY_PATH_OF_THE_GOD, -1);
st.set("talk", "1");
{
takeItems(player, SEALED_PROPHECY_PATH_OF_THE_GOD, -1);
qs.set("talk", "1");
break;
}
case "30297-05.html":
st.unset("talk");
st.setCond(3, true);
st.giveItems(PROPHECY_PATH_OF_THE_GOD, 1);
st.giveItems(EMPTY_SOUND_CRYSTAL, 1);
{
qs.unset("talk");
qs.setCond(3, true);
giveItems(player, PROPHECY_PATH_OF_THE_GOD, 1);
giveItems(player, EMPTY_SOUND_CRYSTAL, 1);
break;
}
case "30612-03.html":
st.takeItems(PROPHECY_PATH_OF_THE_GOD, -1);
st.set("talk", "1");
{
takeItems(player, PROPHECY_PATH_OF_THE_GOD, -1);
qs.set("talk", "1");
break;
}
case "30612-09.html":
st.unset("talk");
st.setCond(4, true);
st.giveItems(ANGEL_MEDICINE, 1);
{
qs.unset("talk");
qs.setCond(4, true);
giveItems(player, ANGEL_MEDICINE, 1);
break;
}
case "32368-04.html":
{
if (isAngelSpawned)
{
return "32368-03.html";
@@ -111,29 +126,40 @@ public class Q00143_FallenAngelRequestOfDusk extends Quest
startQuestTimer("despawn", 120000, null, player);
isAngelSpawned = true;
break;
}
case "32369-03.html":
st.takeItems(ANGEL_MEDICINE, -1);
st.set("talk", "1");
{
takeItems(player, ANGEL_MEDICINE, -1);
qs.set("talk", "1");
break;
}
case "32369-06.html":
st.set("talk", "2");
{
qs.set("talk", "2");
break;
}
case "32369-11.html":
st.unset("talk");
st.takeItems(EMPTY_SOUND_CRYSTAL, -1);
st.giveItems(ANGELS_MESSAGE, 1);
st.setCond(5, true);
{
qs.unset("talk");
takeItems(player, EMPTY_SOUND_CRYSTAL, -1);
giveItems(player, ANGELS_MESSAGE, 1);
qs.setCond(5, true);
npc.deleteMe();
isAngelSpawned = false;
break;
}
case "despawn":
{
if (isAngelSpawned)
{
isAngelSpawned = false;
}
}
default:
{
htmltext = null;
break;
}
}
return htmltext;
}
@@ -142,8 +168,8 @@ public class Q00143_FallenAngelRequestOfDusk 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;
}
@@ -151,104 +177,144 @@ public class Q00143_FallenAngelRequestOfDusk extends Quest
switch (npc.getId())
{
case NATOOLS:
switch (st.getState())
{
switch (qs.getState())
{
case State.STARTED:
switch (st.getCond())
{
switch (qs.getCond())
{
case 1:
{
htmltext = "30894-01.html";
break;
}
default:
{
htmltext = "30894-04.html";
break;
}
}
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
break;
}
case TOBIAS:
if (st.isStarted())
{
if (qs.isStarted())
{
switch (st.getCond())
switch (qs.getCond())
{
case 1:
{
htmltext = "30297-01.html";
break;
}
case 2:
htmltext = (st.isSet("talk")) ? "30297-04.html" : "30297-02.html";
{
htmltext = (qs.isSet("talk")) ? "30297-04.html" : "30297-02.html";
break;
}
case 3:
case 4:
{
htmltext = "30297-06.html";
break;
}
case 5:
st.giveAdena(89046, true);
{
giveAdena(player, 89046, true);
if (player.getLevel() <= MAX_REWARD_LEVEL)
{
st.addExpAndSp(223036, 13901);
addExpAndSp(player, 223036, 13901);
}
st.exitQuest(false, true);
qs.exitQuest(false, true);
htmltext = "30297-07.html";
break;
}
}
}
break;
}
case CASIAN:
if (st.isStarted())
{
if (qs.isStarted())
{
switch (st.getCond())
switch (qs.getCond())
{
case 1:
case 2:
{
htmltext = "30612-01.html";
break;
}
case 3:
htmltext = (st.isSet("talk")) ? "30612-04.html" : "30612-02.html";
{
htmltext = (qs.isSet("talk")) ? "30612-04.html" : "30612-02.html";
break;
}
default:
{
htmltext = "30612-10.html";
break;
}
}
}
break;
}
case ROCK:
if (st.isStarted())
{
if (qs.isStarted())
{
switch (st.getCond())
switch (qs.getCond())
{
case 1:
case 2:
case 3:
{
htmltext = "32368-01.html";
break;
}
case 4:
{
htmltext = "32368-02.html";
break;
}
case 5:
{
htmltext = "32368-05.html";
break;
}
}
}
break;
}
case ANGEL:
if (st.isStarted())
{
if (qs.isStarted())
{
switch (st.getCond())
switch (qs.getCond())
{
case 1:
case 2:
case 3:
{
htmltext = "32369-01.html";
break;
}
case 4:
if (st.getInt("talk") == 1)
{
if (qs.getInt("talk") == 1)
{
htmltext = "32369-04.html";
}
else if (st.getInt("talk") == 2)
else if (qs.getInt("talk") == 2)
{
htmltext = "32369-07.html";
}
@@ -257,9 +323,11 @@ public class Q00143_FallenAngelRequestOfDusk extends Quest
htmltext = "32369-02.html";
}
break;
}
}
}
break;
}
}
return htmltext;
}