lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Quests rework.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

36
trunk/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java vendored
View File

@@ -71,21 +71,21 @@ public final class Q00326_VanquishRemnants extends Quest
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
final QuestState st = getQuestState(player, false);
final QuestState qs = getQuestState(player, false);
String htmltext = null;
if (st != null)
if (qs != null)
{
switch (event)
{
case "30435-03.htm":
{
st.startQuest();
qs.startQuest();
htmltext = event;
break;
}
case "30435-07.html":
{
st.exitQuest(true, true);
qs.exitQuest(true, true);
htmltext = event;
break;
}
@@ -102,11 +102,11 @@ public final class Q00326_VanquishRemnants extends Quest
@Override
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
final QuestState st = getQuestState(killer, false);
if ((st != null) && st.isStarted() && (getRandom(100) < MONSTERS.get(npc.getId())[0]))
final QuestState qs = getQuestState(killer, false);
if ((qs != null) && qs.isStarted() && (getRandom(100) < MONSTERS.get(npc.getId())[0]))
{
st.giveItems(MONSTERS.get(npc.getId())[1], 1);
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
giveItems(killer, MONSTERS.get(npc.getId())[1], 1);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
return super.onKill(npc, killer, isSummon);
}
@@ -114,11 +114,11 @@ public final class Q00326_VanquishRemnants extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
final QuestState st = getQuestState(player, true);
final QuestState qs = getQuestState(player, true);
String htmltext = null;
if (st != null)
if (qs != null)
{
switch (st.getState())
switch (qs.getState())
{
case State.CREATED:
{
@@ -127,19 +127,19 @@ public final class Q00326_VanquishRemnants extends Quest
}
case State.STARTED:
{
final long red_badges = st.getQuestItemsCount(RED_CROSS_BADGE);
final long blue_badges = st.getQuestItemsCount(BLUE_CROSS_BADGE);
final long black_badges = st.getQuestItemsCount(BLACK_CROSS_BADGE);
final long red_badges = getQuestItemsCount(player, RED_CROSS_BADGE);
final long blue_badges = getQuestItemsCount(player, BLUE_CROSS_BADGE);
final long black_badges = getQuestItemsCount(player, BLACK_CROSS_BADGE);
final long sum = red_badges + blue_badges + black_badges;
if (sum > 0)
{
if ((sum >= 100) && !st.hasQuestItems(BLACK_LION_MARK))
if ((sum >= 100) && !hasQuestItems(player, BLACK_LION_MARK))
{
st.giveItems(BLACK_LION_MARK, 1);
giveItems(player, BLACK_LION_MARK, 1);
}
st.giveAdena(((red_badges * 46) + (blue_badges * 52) + (black_badges * 58) + ((sum >= 10) ? 4320 : 0)), true);
giveAdena(player, ((red_badges * 46) + (blue_badges * 52) + (black_badges * 58) + ((sum >= 10) ? 4320 : 0)), true);
takeItems(player, -1, RED_CROSS_BADGE, BLUE_CROSS_BADGE, BLACK_CROSS_BADGE);
htmltext = (sum >= 100) ? (st.hasQuestItems(BLACK_LION_MARK)) ? "30435-09.html" : "30435-06.html" : "30435-05.html";
htmltext = (sum >= 100) ? (hasQuestItems(player, BLACK_LION_MARK)) ? "30435-09.html" : "30435-06.html" : "30435-05.html";
}
else
{