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

@@ -61,8 +61,8 @@ public class Q00238_SuccessFailureOfBusiness 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;
}
@@ -71,19 +71,25 @@ public class Q00238_SuccessFailureOfBusiness extends Quest
switch (event)
{
case "32461-02.htm":
{
htmltext = event;
break;
}
case "32461-03.html":
st.startQuest();
{
qs.startQuest();
htmltext = event;
break;
}
case "32461-06.html":
if (st.isCond(2))
{
if (qs.isCond(2))
{
st.setCond(3, true);
qs.setCond(3, true);
htmltext = event;
}
break;
}
}
return htmltext;
}
@@ -96,18 +102,18 @@ public class Q00238_SuccessFailureOfBusiness extends Quest
final L2PcInstance partyMember = getRandomPartyMember(killer, 1);
if (partyMember != null)
{
final QuestState st = getQuestState(partyMember, false);
if (st.getQuestItemsCount(BROKEN_PIECE_OF_MAGIC_FORCE) < BROKEN_PIECE_OF_MAGIC_FORCE_NEEDED)
final QuestState qs = getQuestState(partyMember, false);
if (getQuestItemsCount(killer, BROKEN_PIECE_OF_MAGIC_FORCE) < BROKEN_PIECE_OF_MAGIC_FORCE_NEEDED)
{
st.giveItems(BROKEN_PIECE_OF_MAGIC_FORCE, 1);
giveItems(killer, BROKEN_PIECE_OF_MAGIC_FORCE, 1);
}
if (st.getQuestItemsCount(BROKEN_PIECE_OF_MAGIC_FORCE) == BROKEN_PIECE_OF_MAGIC_FORCE_NEEDED)
if (getQuestItemsCount(killer, BROKEN_PIECE_OF_MAGIC_FORCE) == BROKEN_PIECE_OF_MAGIC_FORCE_NEEDED)
{
st.setCond(2, true);
qs.setCond(2, true);
}
else
{
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
}
}
@@ -116,18 +122,18 @@ public class Q00238_SuccessFailureOfBusiness extends Quest
final L2PcInstance partyMember = getRandomPartyMember(killer, 3);
if ((partyMember != null) && (getRandom(100) < CHANCE_FOR_FRAGMENT))
{
final QuestState st = getQuestState(partyMember, false);
if (st.getQuestItemsCount(GUARDIAN_SPIRIT_FRAGMENT) < GUARDIAN_SPIRIT_FRAGMENT_NEEDED)
final QuestState qs = getQuestState(partyMember, false);
if (getQuestItemsCount(killer, GUARDIAN_SPIRIT_FRAGMENT) < GUARDIAN_SPIRIT_FRAGMENT_NEEDED)
{
st.giveItems(GUARDIAN_SPIRIT_FRAGMENT, 1);
giveItems(killer, GUARDIAN_SPIRIT_FRAGMENT, 1);
}
if (st.getQuestItemsCount(GUARDIAN_SPIRIT_FRAGMENT) == GUARDIAN_SPIRIT_FRAGMENT_NEEDED)
if (getQuestItemsCount(killer, GUARDIAN_SPIRIT_FRAGMENT) == GUARDIAN_SPIRIT_FRAGMENT_NEEDED)
{
st.setCond(4, true);
qs.setCond(4, true);
}
else
{
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
}
}
@@ -135,28 +141,31 @@ public class Q00238_SuccessFailureOfBusiness extends Quest
}
@Override
public String onTalk(L2Npc npc, L2PcInstance talker)
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(talker);
final QuestState st = getQuestState(talker, true);
if (st == null)
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (st.getState())
switch (qs.getState())
{
case State.COMPLETED:
{
htmltext = "32461-09.html";
break;
}
case State.CREATED:
final QuestState q237 = st.getPlayer().getQuestState(Q00237_WindsOfChange.class.getSimpleName());
final QuestState q239 = st.getPlayer().getQuestState(Q00239_WontYouJoinUs.class.getSimpleName());
{
final QuestState q237 = qs.getPlayer().getQuestState(Q00237_WindsOfChange.class.getSimpleName());
final QuestState q239 = qs.getPlayer().getQuestState(Q00239_WontYouJoinUs.class.getSimpleName());
if ((q239 != null) && q239.isCompleted())
{
htmltext = "32461-10.html";
}
else if ((q237 != null) && q237.isCompleted() && (talker.getLevel() >= MIN_LEVEL) && st.hasQuestItems(VICINITY_OF_FOS))
else if ((q237 != null) && q237.isCompleted() && (player.getLevel() >= MIN_LEVEL) && hasQuestItems(player, VICINITY_OF_FOS))
{
htmltext = "32461-01.htm";
}
@@ -165,34 +174,45 @@ public class Q00238_SuccessFailureOfBusiness extends Quest
htmltext = "32461-00.html";
}
break;
}
case State.STARTED:
switch (st.getCond())
{
switch (qs.getCond())
{
case 1:
{
htmltext = "32461-04.html";
break;
}
case 2:
if (st.getQuestItemsCount(BROKEN_PIECE_OF_MAGIC_FORCE) == BROKEN_PIECE_OF_MAGIC_FORCE_NEEDED)
{
if (getQuestItemsCount(player, BROKEN_PIECE_OF_MAGIC_FORCE) == BROKEN_PIECE_OF_MAGIC_FORCE_NEEDED)
{
htmltext = "32461-05.html";
st.takeItems(BROKEN_PIECE_OF_MAGIC_FORCE, -1);
takeItems(player, BROKEN_PIECE_OF_MAGIC_FORCE, -1);
}
break;
}
case 3:
{
htmltext = "32461-07.html";
break;
}
case 4:
if (st.getQuestItemsCount(GUARDIAN_SPIRIT_FRAGMENT) == GUARDIAN_SPIRIT_FRAGMENT_NEEDED)
{
if (getQuestItemsCount(player, GUARDIAN_SPIRIT_FRAGMENT) == GUARDIAN_SPIRIT_FRAGMENT_NEEDED)
{
htmltext = "32461-08.html";
st.giveAdena(283346, true);
st.takeItems(VICINITY_OF_FOS, 1);
st.addExpAndSp(1319736, 103553);
st.exitQuest(false, true);
giveAdena(player, 283346, true);
takeItems(player, VICINITY_OF_FOS, 1);
addExpAndSp(player, 1319736, 103553);
qs.exitQuest(false, true);
}
break;
}
}
break;
}
}
return htmltext;
}