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

8
trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/AwakeningMaster.java vendored
View File

@@ -78,8 +78,8 @@ public final class AwakeningMaster extends AbstractNpcAI
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
final QuestState st = getQuestState(player, true);
if (st == null)
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return null;
}
@@ -88,8 +88,8 @@ public final class AwakeningMaster extends AbstractNpcAI
{
case "awakening":
{
final QuestState st2 = player.getQuestState(Q10338_SeizeYourDestiny.class.getSimpleName());
if (st.hasQuestItems(SCROLL_OF_AFTERLIFE) && (player.getLevel() > 84) && (!player.isSubClassActive() || player.isDualClassActive()) && player.isInCategory(CategoryType.FOURTH_CLASS_GROUP) && (st2 != null) && st2.isCompleted())
final QuestState qs2 = player.getQuestState(Q10338_SeizeYourDestiny.class.getSimpleName());
if (hasQuestItems(player, SCROLL_OF_AFTERLIFE) && (player.getLevel() > 84) && (!player.isSubClassActive() || player.isDualClassActive()) && player.isInCategory(CategoryType.FOURTH_CLASS_GROUP) && (qs2 != null) && qs2.isCompleted())
{
switch (npc.getId())
{

12
trunk/dist/game/data/scripts/ai/npc/Jinia/Jinia.java vendored
View File

@@ -65,8 +65,8 @@ final class Jinia extends AbstractNpcAI
}
else
{
final QuestState st = player.getQuestState(Q10286_ReunionWithSirra.class.getSimpleName());
if ((st != null) && st.isCompleted())
final QuestState qs = player.getQuestState(Q10286_ReunionWithSirra.class.getSimpleName());
if ((qs != null) && qs.isCompleted())
{
giveItems(player, FROZEN_CORE, 1);
}
@@ -85,14 +85,14 @@ final class Jinia extends AbstractNpcAI
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
final QuestState st = player.getQuestState(Q10286_ReunionWithSirra.class.getSimpleName());
if ((st != null) && (player.getLevel() >= MIN_LEVEL))
final QuestState qs = player.getQuestState(Q10286_ReunionWithSirra.class.getSimpleName());
if ((qs != null) && (player.getLevel() >= MIN_LEVEL))
{
if (st.isCond(5) || st.isCond(6))
if (qs.isCond(5) || qs.isCond(6))
{
return "32781-09.html";
}
else if (st.isCond(7))
else if (qs.isCond(7))
{
return "32781-01.html";
}

4
trunk/dist/game/data/scripts/ai/npc/Pantheon/Pantheon.java vendored
View File

@@ -85,8 +85,8 @@ final class Pantheon extends AbstractNpcAI
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
final QuestState st = player.getQuestState(Q10320_LetsGoToTheCentralSquare.class.getSimpleName());
if (st == null)
final QuestState qs = player.getQuestState(Q10320_LetsGoToTheCentralSquare.class.getSimpleName());
if (qs == null)
{
showOnScreenMsg(player, NpcStringId.BEGIN_TUTORIAL_QUESTS, ExShowScreenMessage.TOP_CENTER, 4500);
}

10
trunk/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java vendored
View File

@@ -67,12 +67,12 @@ final class GrandBossTeleporters extends AbstractNpcAI
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
String htmltext = "";
final QuestState st = getQuestState(player, false);
final QuestState qs = getQuestState(player, false);
if (hasQuestItems(player, VACUALITE_FLOATING_STONE))
{
player.teleToLocation(ENTER_HALL_OF_FLAMES);
st.set("allowEnter", "1");
qs.set("allowEnter", "1");
}
else
{
@@ -85,7 +85,7 @@ final class GrandBossTeleporters extends AbstractNpcAI
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = "";
final QuestState st = getQuestState(player, true);
final QuestState qs = getQuestState(player, true);
switch (npc.getId())
{
@@ -101,9 +101,9 @@ final class GrandBossTeleporters extends AbstractNpcAI
{
htmltext = "31385-03.htm";
}
else if (st.getInt("allowEnter") == 1)
else if (qs.getInt("allowEnter") == 1)
{
st.unset("allowEnter");
qs.unset("allowEnter");
final L2BossZone zone = GrandBossManager.getInstance().getZone(212852, -114842, -1632);
if (zone != null)

6
trunk/dist/game/data/scripts/ai/npc/Tunatun/Tunatun.java vendored
View File

@@ -54,12 +54,12 @@ final class Tunatun extends AbstractNpcAI
return "31537-01.html";
}
final QuestState st = player.getQuestState(Q00020_BringUpWithLove.class.getSimpleName());
if ((st == null) && (player.getLevel() < MIN_LEVEL))
final QuestState qs = player.getQuestState(Q00020_BringUpWithLove.class.getSimpleName());
if ((qs == null) && (player.getLevel() < MIN_LEVEL))
{
return "31537-02.html";
}
else if ((st != null) || (player.getLevel() >= MIN_LEVEL))
else if ((qs != null) || (player.getLevel() >= MIN_LEVEL))
{
giveItems(player, BEAST_HANDLERS_WHIP, 1);
return "31537-03.html";