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

@@ -39,7 +39,6 @@ public class Q10273_GoodDayToFly extends Quest
22614, // Vulture Rider
22615, // Vulture Rider
};
// Item
private static final int MARK = 13856;
// Skills
@@ -58,8 +57,8 @@ public class Q10273_GoodDayToFly 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);
}
@@ -67,27 +66,39 @@ public class Q10273_GoodDayToFly extends Quest
switch (event)
{
case "32557-06.htm":
st.startQuest();
{
qs.startQuest();
break;
}
case "32557-09.html":
st.set("transform", "1");
{
qs.set("transform", "1");
AURA_BIRD_FALCON.getSkill().applyEffects(player, player);
break;
}
case "32557-10.html":
st.set("transform", "2");
{
qs.set("transform", "2");
AURA_BIRD_OWL.getSkill().applyEffects(player, player);
break;
}
case "32557-13.html":
switch (st.getInt("transform"))
{
switch (qs.getInt("transform"))
{
case 1:
{
AURA_BIRD_FALCON.getSkill().applyEffects(player, player);
break;
}
case 2:
{
AURA_BIRD_OWL.getSkill().applyEffects(player, player);
break;
}
}
break;
}
}
return event;
}
@@ -95,23 +106,23 @@ public class Q10273_GoodDayToFly extends Quest
@Override
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
final QuestState st = getQuestState(killer, false);
if ((st == null) || !st.isStarted())
final QuestState qs = getQuestState(killer, false);
if ((qs == null) || !qs.isStarted())
{
return null;
}
final long count = st.getQuestItemsCount(MARK);
if (st.isCond(1) && (count < 5))
final long count = getQuestItemsCount(killer, MARK);
if (qs.isCond(1) && (count < 5))
{
st.giveItems(MARK, 1);
giveItems(killer, MARK, 1);
if (count == 4)
{
st.setCond(2, true);
qs.setCond(2, true);
}
else
{
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
}
return null;
@@ -121,36 +132,41 @@ public class Q10273_GoodDayToFly 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;
}
final int transform = st.getInt("transform");
switch (st.getState())
final int transform = qs.getInt("transform");
switch (qs.getState())
{
case State.COMPLETED:
{
htmltext = "32557-0a.html";
break;
}
case State.CREATED:
{
htmltext = (player.getLevel() < 75) ? "32557-00.html" : "32557-01.htm";
break;
}
default:
if (st.getQuestItemsCount(MARK) >= 5)
{
if (getQuestItemsCount(player, MARK) >= 5)
{
htmltext = "32557-14.html";
if (transform == 1)
{
st.giveItems(13553, 1);
giveItems(player, 13553, 1);
}
else if (transform == 2)
{
st.giveItems(13554, 1);
giveItems(player, 13554, 1);
}
st.giveItems(13857, 1);
st.addExpAndSp(25160, 2525);
st.exitQuest(false, true);
giveItems(player, 13857, 1);
addExpAndSp(player, 25160, 2525);
qs.exitQuest(false, true);
}
else if (transform == 0)
{
@@ -161,6 +177,7 @@ public class Q10273_GoodDayToFly extends Quest
htmltext = "32557-11.html";
}
break;
}
}
return htmltext;
}