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

6
trunk/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java vendored
View File

@ -621,11 +621,11 @@ abstract class Chamber extends AbstractInstance
public String onTalk(L2Npc npc, L2PcInstance player)
{
final int npcId = npc.getId();
QuestState st = getQuestState(player, false);
QuestState qs = getQuestState(player, false);
if (st == null)
if (qs == null)
{
st = newQuestState(player);
qs = newQuestState(player);
}
if (npcId == ENTRANCE_GATEKEEPER)

6
trunk/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java vendored
View File

@ -1771,10 +1771,10 @@ public final class CrystalCaverns extends AbstractInstance
public String onTalk(L2Npc npc, L2PcInstance player)
{
final int npcId = npc.getId();
QuestState st = getQuestState(player, false);
if (st == null)
QuestState qs = getQuestState(player, false);
if (qs == null)
{
st = newQuestState(player);
qs = newQuestState(player);
}
if (npcId == ORACLE_GUIDE_1)
{

24
trunk/dist/game/data/scripts/instances/MonasteryOfSilence2/MonasteryOfSilence2.java vendored
View File

@ -295,12 +295,12 @@ public class MonasteryOfSilence2 extends AbstractNpcAI
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
final String htmltext = getNoQuestMsg(player);
QuestState st = player.getQuestState(MonasteryOfSilence2.class.getSimpleName());
final QuestState qs = player.getQuestState(Q10294_SevenSignsToTheMonasteryOfSilence.class.getSimpleName());
final QuestState qs1 = player.getQuestState(Q10295_SevenSignsSolinasTomb.class.getSimpleName());
if (st == null)
QuestState qs = player.getQuestState(MonasteryOfSilence2.class.getSimpleName());
final QuestState qs1 = player.getQuestState(Q10294_SevenSignsToTheMonasteryOfSilence.class.getSimpleName());
final QuestState qs2 = player.getQuestState(Q10295_SevenSignsSolinasTomb.class.getSimpleName());
if (qs == null)
{
st = newQuestState(player);
qs = newQuestState(player);
}
if ("check_follow".equals(event))
{
@ -308,7 +308,7 @@ public class MonasteryOfSilence2 extends AbstractNpcAI
npc.getAI().stopFollow();
npc.setIsRunning(true);
npc.getAI().startFollow(player);
if ((qs != null) && (qs.getCond() == 2))
if ((qs1 != null) && (qs1.getCond() == 2))
{
if (getRandom(10) < 1)
{
@ -319,14 +319,14 @@ public class MonasteryOfSilence2 extends AbstractNpcAI
npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.REMEMBER_THE_CONTENT_OF_THE_BOOKS_THAT_YOU_FOUND_YOU_CAN_T_TAKE_THEM_OUT_WITH_YOU));
}
}
if ((qs != null) && (qs.getCond() == 3))
if ((qs1 != null) && (qs1.getCond() == 3))
{
if (getRandom(8) < 1)
{
npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.YOUR_WORK_HERE_IS_DONE_SO_RETURN_TO_THE_CENTRAL_GUARDIAN));
}
}
if ((qs1 != null) && (qs1.getCond() == 1))
if ((qs2 != null) && (qs2.getCond() == 1))
{
if (getRandom(5) < 1)
{
@ -366,9 +366,9 @@ public class MonasteryOfSilence2 extends AbstractNpcAI
{
if ("Enter1".equals(event))
{
if (qs1.getInt("seal_removed") != 1)
if (qs2.getInt("seal_removed") != 1)
{
qs1.startQuestTimer("StartMovie", 1000);
qs2.startQuestTimer("StartMovie", 1000);
teleportPlayer(npc, player, TELEPORTS[ENTER1], player.getInstanceId());
}
else
@ -379,9 +379,9 @@ public class MonasteryOfSilence2 extends AbstractNpcAI
}
if ("Enter3".equals(event))
{
if ((qs.getInt("book_" + 32821) + qs.getInt("book_" + 32828) + qs.getInt("book_" + 32831) + qs.getInt("book_" + 32834)) != 4)
if ((qs1.getInt("book_" + 32821) + qs1.getInt("book_" + 32828) + qs1.getInt("book_" + 32831) + qs1.getInt("book_" + 32834)) != 4)
{
qs.startQuestTimer("OpenMovie", 4000);
qs1.startQuestTimer("OpenMovie", 4000);
}
teleportPlayer(npc, player, TELEPORTS[HOLYGRAL], player.getInstanceId());
return null;

26
trunk/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java vendored
View File

@ -389,9 +389,9 @@ public final class NornilsGarden extends AbstractInstance
}
}
private void openDoor(QuestState st, L2PcInstance player, int doorId)
private void openDoor(QuestState qs, L2PcInstance player, int doorId)
{
st.unset("correct");
qs.unset("correct");
final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(player.getInstanceId());
if (tmpworld instanceof NornilsWorld)
{
@ -492,8 +492,8 @@ public final class NornilsGarden extends AbstractInstance
public final String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
String htmltext = event;
final QuestState st = getQuestState(player, false);
if (st == null)
final QuestState qs = getQuestState(player, false);
if (qs == null)
{
return getNoQuestMsg(player);
}
@ -522,29 +522,29 @@ public final class NornilsGarden extends AbstractInstance
{
if (event.equalsIgnoreCase("32260-02.html") || event.equalsIgnoreCase("32261-02.html") || event.equalsIgnoreCase("32262-02.html"))
{
st.unset("correct");
qs.unset("correct");
}
else if (Util.isDigit(event))
{
int correct = st.getInt("correct");
int correct = qs.getInt("correct");
correct++;
st.set("correct", String.valueOf(correct));
qs.set("correct", String.valueOf(correct));
htmltext = npc.getId() + "-0" + String.valueOf(correct + 2) + ".html";
}
else if (event.equalsIgnoreCase("check"))
{
final int correct = st.getInt("correct");
final int correct = qs.getInt("correct");
if ((npc.getId() == 32260) && (correct == 3))
{
openDoor(st, player, 16200014);
openDoor(qs, player, 16200014);
}
else if ((npc.getId() == 32261) && (correct == 3))
{
openDoor(st, player, 16200015);
openDoor(qs, player, 16200015);
}
else if ((npc.getId() == 32262) && (correct == 4))
{
openDoor(st, player, 16200016);
openDoor(qs, player, 16200016);
}
else
{
@ -592,8 +592,8 @@ public final class NornilsGarden extends AbstractInstance
@Override
public final String onKill(L2Npc npc, L2PcInstance player, boolean isSummon)
{
final QuestState st = getQuestState(player, false);
if (st == null)
final QuestState qs = getQuestState(player, false);
if (qs == null)
{
return null;
}