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

@@ -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;
}