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

@@ -59,8 +59,8 @@ public final class Q10285_MeetingSirra 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;
}
@@ -75,24 +75,24 @@ public final class Q10285_MeetingSirra extends Quest
}
case "32020-03.htm":
{
st.startQuest();
st.setMemoState(1);
qs.startQuest();
qs.setMemoState(1);
htmltext = event;
break;
}
case "32760-02.html":
{
if (st.isMemoState(1) && (st.getInt("ex") == 0))
if (qs.isMemoState(1) && (qs.getInt("ex") == 0))
{
st.set("ex", 1);
st.setCond(3, true);
qs.set("ex", 1);
qs.setCond(3, true);
htmltext = event;
}
break;
}
case "32760-05.html":
{
if (st.isMemoState(1) && (st.getInt("ex") == 2))
if (qs.isMemoState(1) && (qs.getInt("ex") == 2))
{
htmltext = event;
}
@@ -100,12 +100,12 @@ public final class Q10285_MeetingSirra extends Quest
}
case "32760-06.html":
{
if (st.isMemoState(1) && (st.getInt("ex") == 2))
if (qs.isMemoState(1) && (qs.getInt("ex") == 2))
{
final L2Npc sirra = addSpawn(SIRRA, -23905, -8790, -5384, 56238, false, 0, false, npc.getInstanceId());
sirra.broadcastPacket(new NpcSay(sirra.getObjectId(), ChatType.NPC_GENERAL, sirra.getId(), NpcStringId.THERE_S_NOTHING_YOU_CAN_T_SAY_I_CAN_T_LISTEN_TO_YOU_ANYMORE));
st.set("ex", 3);
st.setCond(5, true);
qs.set("ex", 3);
qs.setCond(5, true);
htmltext = event;
}
break;
@@ -114,7 +114,7 @@ public final class Q10285_MeetingSirra extends Quest
case "32760-10.html":
case "32760-11.html":
{
if (st.isMemoState(1) && (st.getInt("ex") == 4))
if (qs.isMemoState(1) && (qs.getInt("ex") == 4))
{
htmltext = event;
}
@@ -122,20 +122,20 @@ public final class Q10285_MeetingSirra extends Quest
}
case "32760-12.html":
{
if (st.isMemoState(1) && (st.getInt("ex") == 4))
if (qs.isMemoState(1) && (qs.getInt("ex") == 4))
{
st.set("ex", 5);
st.setCond(7, true);
qs.set("ex", 5);
qs.setCond(7, true);
htmltext = event;
}
break;
}
case "32760-13.html":
{
if (st.isMemoState(1) && (st.getInt("ex") == 5))
if (qs.isMemoState(1) && (qs.getInt("ex") == 5))
{
st.unset("ex");
st.setMemoState(2);
qs.unset("ex");
qs.setMemoState(2);
final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player);
world.removeAllowed(player.getObjectId());
player.setInstanceId(0);
@@ -145,7 +145,7 @@ public final class Q10285_MeetingSirra extends Quest
}
case "32760-14.html":
{
if (st.isMemoState(2))
if (qs.isMemoState(2))
{
player.teleToLocation(EXIT_LOC, 0);
htmltext = event;
@@ -154,10 +154,10 @@ public final class Q10285_MeetingSirra extends Quest
}
case "32761-02.html":
{
if (st.isMemoState(1) && (st.getInt("ex") == 1))
if (qs.isMemoState(1) && (qs.getInt("ex") == 1))
{
st.set("ex", 2);
st.setCond(4, true);
qs.set("ex", 2);
qs.setCond(4, true);
htmltext = event;
}
break;
@@ -169,7 +169,7 @@ public final class Q10285_MeetingSirra extends Quest
case "32762-06.html":
case "32762-07.html":
{
if (st.isMemoState(1) && (st.getInt("ex") == 3))
if (qs.isMemoState(1) && (qs.getInt("ex") == 3))
{
htmltext = event;
}
@@ -177,10 +177,10 @@ public final class Q10285_MeetingSirra extends Quest
}
case "32762-08.html":
{
if (st.isMemoState(1) && (st.getInt("ex") == 3))
if (qs.isMemoState(1) && (qs.getInt("ex") == 3))
{
st.set("ex", 4);
st.setCond(6, true);
qs.set("ex", 4);
qs.setCond(6, true);
htmltext = event;
npc.deleteMe();
}
@@ -189,7 +189,7 @@ public final class Q10285_MeetingSirra extends Quest
case "32781-02.html":
case "32781-03.html":
{
if (st.isMemoState(2))
if (qs.isMemoState(2))
{
htmltext = event;
}
@@ -210,9 +210,9 @@ public final class Q10285_MeetingSirra extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
QuestState st = getQuestState(player, true);
QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
switch (st.getState())
switch (qs.getState())
{
case State.COMPLETED:
{
@@ -226,8 +226,8 @@ public final class Q10285_MeetingSirra extends Quest
{
if (npc.getId() == RAFFORTY)
{
st = player.getQuestState(Q10284_AcquisitionOfDivineSword.class.getSimpleName());
htmltext = ((player.getLevel() >= MIN_LEVEL) && (st != null) && (st.isCompleted())) ? "32020-01.htm" : "32020-04.htm";
qs = player.getQuestState(Q10284_AcquisitionOfDivineSword.class.getSimpleName());
htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && (qs.isCompleted())) ? "32020-01.htm" : "32020-04.htm";
}
break;
}
@@ -237,7 +237,7 @@ public final class Q10285_MeetingSirra extends Quest
{
case RAFFORTY:
{
switch (st.getMemoState())
switch (qs.getMemoState())
{
case 1:
{
@@ -251,9 +251,9 @@ public final class Q10285_MeetingSirra extends Quest
}
case 3:
{
st.giveAdena(283425, true);
st.addExpAndSp(939075, 83855);
st.exitQuest(false, true);
giveAdena(player, 283425, true);
addExpAndSp(player, 939075, 83855);
qs.exitQuest(false, true);
htmltext = "32020-08.html";
break;
}
@@ -262,9 +262,9 @@ public final class Q10285_MeetingSirra extends Quest
}
case JINIA:
{
if (st.isMemoState(1))
if (qs.isMemoState(1))
{
final int state = st.getInt("ex");
final int state = qs.getInt("ex");
switch (state)
{
case 0:
@@ -303,9 +303,9 @@ public final class Q10285_MeetingSirra extends Quest
}
case KEGOR:
{
if (st.isMemoState(1))
if (qs.isMemoState(1))
{
final int state = st.getInt("ex");
final int state = qs.getInt("ex");
switch (state)
{
case 1:
@@ -329,9 +329,9 @@ public final class Q10285_MeetingSirra extends Quest
}
case SIRRA:
{
if (st.isMemoState(1))
if (qs.isMemoState(1))
{
final int state = st.getInt("ex");
final int state = qs.getInt("ex");
if (state == 3)
{
htmltext = "32762-01.html";
@@ -345,11 +345,11 @@ public final class Q10285_MeetingSirra extends Quest
}
case JINIA2:
{
if (st.isMemoState(2))
if (qs.isMemoState(2))
{
htmltext = "32781-01.html";
}
else if (st.isMemoState(3))
else if (qs.isMemoState(3))
{
htmltext = "32781-04.html";
}
@@ -357,10 +357,10 @@ public final class Q10285_MeetingSirra extends Quest
}
case FREYAS_STEWARD:
{
if (st.isMemoState(2))
if (qs.isMemoState(2))
{
htmltext = "32029-01.html";
st.setCond(8, true);
qs.setCond(8, true);
}
break;
}