Added some missing arrow hacks.

This commit is contained in:
MobiusDev
2016-12-15 13:07:56 +00:00
parent efd5347159
commit 3afe0d648b
12 changed files with 184 additions and 136 deletions

View File

@@ -74,6 +74,8 @@ public final class Q10320_LetsGoToTheCentralSquare extends Quest
case "32972-03.html": case "32972-03.html":
{ {
qs.startQuest(); qs.startQuest();
qs.setCond(2); // arrow hack
qs.setCond(1);
player.sendPacket(new TutorialShowHtml(npc.getObjectId(), "..\\L2Text\\QT_001_Radar_01.htm", TutorialShowHtml.LARGE_WINDOW)); player.sendPacket(new TutorialShowHtml(npc.getObjectId(), "..\\L2Text\\QT_001_Radar_01.htm", TutorialShowHtml.LARGE_WINDOW));
htmltext = event; htmltext = event;
break; break;

View File

@@ -63,6 +63,8 @@ public final class Q10321_QualificationsOfTheSeeker extends Quest
case "32975-03.html": case "32975-03.html":
{ {
qs.startQuest(); qs.startQuest();
qs.setCond(2); // arrow hack
qs.setCond(1);
player.sendPacket(new TutorialShowHtml(npc.getObjectId(), "..\\L2Text\\QT_027_Quest_01.htm", TutorialShowHtml.LARGE_WINDOW)); player.sendPacket(new TutorialShowHtml(npc.getObjectId(), "..\\L2Text\\QT_027_Quest_01.htm", TutorialShowHtml.LARGE_WINDOW));
htmltext = event; htmltext = event;
break; break;

View File

@@ -67,8 +67,8 @@ public final class Q10333_DisappearedSakum extends Quest
@Override @Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{ {
final QuestState st = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (st == null) if (qs == null)
{ {
return null; return null;
} }
@@ -87,26 +87,28 @@ public final class Q10333_DisappearedSakum extends Quest
} }
case "30332-05.html": case "30332-05.html":
{ {
st.startQuest(); qs.startQuest();
qs.setCond(2); // arrow hack
qs.setCond(1);
htmltext = event; htmltext = event;
break; break;
} }
case "33176-03.html": case "33176-03.html":
{ {
if (st.isCond(1)) if (qs.isCond(1))
{ {
htmltext = event; htmltext = event;
st.setCond(2, true); qs.setCond(2, true);
} }
break; break;
} }
case "33508-03.html": case "33508-03.html":
{ {
if (st.isCond(3)) if (qs.isCond(3))
{ {
giveAdena(player, 800, true); giveAdena(player, 800, true);
addExpAndSp(player, 180000, 43); addExpAndSp(player, 180000, 43);
st.exitQuest(false, true); qs.exitQuest(false, true);
htmltext = event; htmltext = event;
} }
break; break;
@@ -119,9 +121,9 @@ public final class Q10333_DisappearedSakum extends Quest
public String onTalk(L2Npc npc, L2PcInstance player) public String onTalk(L2Npc npc, L2PcInstance player)
{ {
String htmltext = getNoQuestMsg(player); String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true); final QuestState qs = getQuestState(player, true);
switch (st.getState()) switch (qs.getState())
{ {
case State.CREATED: case State.CREATED:
{ {
@@ -137,20 +139,20 @@ public final class Q10333_DisappearedSakum extends Quest
{ {
case BATHIS: case BATHIS:
{ {
htmltext = st.isCond(0) ? "30332-06.html" : "30332-07.html"; htmltext = qs.isCond(0) ? "30332-06.html" : "30332-07.html";
break; break;
} }
case VENT: case VENT:
{ {
if (st.isCond(1)) if (qs.isCond(1))
{ {
htmltext = "33176-01.html"; htmltext = "33176-01.html";
} }
else if (st.isCond(2)) else if (qs.isCond(2))
{ {
htmltext = "33176-04.html"; htmltext = "33176-04.html";
} }
else if (st.isCond(3)) else if (qs.isCond(3))
{ {
htmltext = "33176-05.html"; htmltext = "33176-05.html";
} }
@@ -158,7 +160,7 @@ public final class Q10333_DisappearedSakum extends Quest
} }
case SCHUNAIN: case SCHUNAIN:
{ {
if (st.isCond(3)) if (qs.isCond(3))
{ {
htmltext = "33508-01.html"; htmltext = "33508-01.html";
} }
@@ -196,12 +198,12 @@ public final class Q10333_DisappearedSakum extends Quest
@Override @Override
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{ {
final QuestState st = getQuestState(killer, false); final QuestState qs = getQuestState(killer, false);
if ((st != null) && st.isStarted() && st.isCond(2)) if ((qs != null) && qs.isStarted() && qs.isCond(2))
{ {
int killedLizardmen = st.getInt("killed_" + LIZARDMEN); int killedLizardmen = qs.getInt("killed_" + LIZARDMEN);
int killedVakuOrc = st.getInt("killed_" + VAKU_ORC); int killedVakuOrc = qs.getInt("killed_" + VAKU_ORC);
switch (npc.getId()) switch (npc.getId())
{ {
@@ -210,7 +212,7 @@ public final class Q10333_DisappearedSakum extends Quest
if (killedLizardmen < 7) if (killedLizardmen < 7)
{ {
killedLizardmen++; killedLizardmen++;
st.set("killed_" + LIZARDMEN, killedLizardmen); qs.set("killed_" + LIZARDMEN, killedLizardmen);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
} }
break; break;
@@ -220,7 +222,7 @@ public final class Q10333_DisappearedSakum extends Quest
if (killedVakuOrc < 5) if (killedVakuOrc < 5)
{ {
killedVakuOrc++; killedVakuOrc++;
st.set("killed_" + VAKU_ORC, killedVakuOrc); qs.set("killed_" + VAKU_ORC, killedVakuOrc);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
} }
break; break;
@@ -238,7 +240,7 @@ public final class Q10333_DisappearedSakum extends Quest
if ((getQuestItemsCount(killer, BADGE) == 5) && (killedLizardmen == 7) && (killedVakuOrc == 5)) if ((getQuestItemsCount(killer, BADGE) == 5) && (killedLizardmen == 7) && (killedVakuOrc == 5))
{ {
st.setCond(3, true); qs.setCond(3, true);
} }
sendNpcLogList(killer); sendNpcLogList(killer);
} }
@@ -248,12 +250,12 @@ public final class Q10333_DisappearedSakum extends Quest
@Override @Override
public Set<NpcLogListHolder> getNpcLogList(L2PcInstance activeChar) public Set<NpcLogListHolder> getNpcLogList(L2PcInstance activeChar)
{ {
final QuestState st = getQuestState(activeChar, false); final QuestState qs = getQuestState(activeChar, false);
if ((st != null) && st.isStarted() && st.isCond(2)) if ((qs != null) && qs.isStarted() && qs.isCond(2))
{ {
final Set<NpcLogListHolder> npcLogList = new HashSet<>(2); final Set<NpcLogListHolder> npcLogList = new HashSet<>(2);
npcLogList.add(new NpcLogListHolder(LIZARDMEN, false, st.getInt("killed_" + LIZARDMEN))); npcLogList.add(new NpcLogListHolder(LIZARDMEN, false, qs.getInt("killed_" + LIZARDMEN)));
npcLogList.add(new NpcLogListHolder(VAKU_ORC, false, st.getInt("killed_" + VAKU_ORC))); npcLogList.add(new NpcLogListHolder(VAKU_ORC, false, qs.getInt("killed_" + VAKU_ORC)));
return npcLogList; return npcLogList;
} }
return super.getNpcLogList(activeChar); return super.getNpcLogList(activeChar);

View File

@@ -51,8 +51,8 @@ public final class Q10334_ReportingTheStatusOfTheWindmillHill extends Quest
@Override @Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{ {
final QuestState st = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (st == null) if (qs == null)
{ {
return null; return null;
} }
@@ -68,17 +68,19 @@ public final class Q10334_ReportingTheStatusOfTheWindmillHill extends Quest
} }
case "33508-03.html": case "33508-03.html":
{ {
st.startQuest(); qs.startQuest();
qs.setCond(2); // arrow hack
qs.setCond(1);
htmltext = event; htmltext = event;
break; break;
} }
case "30332-03.html": case "30332-03.html":
{ {
if (st.isCond(1)) if (qs.isCond(1))
{ {
giveAdena(player, 850, true); giveAdena(player, 850, true);
addExpAndSp(player, 200000, 48); addExpAndSp(player, 200000, 48);
st.exitQuest(false, true); qs.exitQuest(false, true);
htmltext = event; htmltext = event;
} }
break; break;
@@ -91,9 +93,9 @@ public final class Q10334_ReportingTheStatusOfTheWindmillHill extends Quest
public String onTalk(L2Npc npc, L2PcInstance player) public String onTalk(L2Npc npc, L2PcInstance player)
{ {
String htmltext = getNoQuestMsg(player); String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true); final QuestState qs = getQuestState(player, true);
switch (st.getState()) switch (qs.getState())
{ {
case State.CREATED: case State.CREATED:
{ {

View File

@@ -59,8 +59,8 @@ public final class Q10337_SakumsImpact extends Quest
@Override @Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{ {
final QuestState st = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (st == null) if (qs == null)
{ {
return null; return null;
} }
@@ -76,26 +76,28 @@ public final class Q10337_SakumsImpact extends Quest
} }
case "31795-03.html": case "31795-03.html":
{ {
st.startQuest(); qs.startQuest();
qs.setCond(2); // arrow hack
qs.setCond(1);
htmltext = event; htmltext = event;
break; break;
} }
case "33178-03.html": case "33178-03.html":
{ {
if (st.isCond(1)) if (qs.isCond(1))
{ {
st.setCond(2); qs.setCond(2);
htmltext = event; htmltext = event;
} }
break; break;
} }
case "33510-04.html": case "33510-04.html":
{ {
if (st.isCond(3)) if (qs.isCond(3))
{ {
giveAdena(player, 1030, true); giveAdena(player, 1030, true);
addExpAndSp(player, 650000, 156); addExpAndSp(player, 650000, 156);
st.exitQuest(false, true); qs.exitQuest(false, true);
htmltext = event; htmltext = event;
} }
break; break;
@@ -108,9 +110,9 @@ public final class Q10337_SakumsImpact extends Quest
public String onTalk(L2Npc npc, L2PcInstance player) public String onTalk(L2Npc npc, L2PcInstance player)
{ {
String htmltext = getNoQuestMsg(player); String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true); final QuestState qs = getQuestState(player, true);
switch (st.getState()) switch (qs.getState())
{ {
case State.CREATED: case State.CREATED:
{ {
@@ -122,22 +124,28 @@ public final class Q10337_SakumsImpact extends Quest
} }
case State.STARTED: case State.STARTED:
{ {
switch (st.getCond()) switch (qs.getCond())
{ {
case 1: case 1:
{ {
switch (npc.getId()) switch (npc.getId())
{ {
case ADVENTURE_GUILDSMAN: case ADVENTURE_GUILDSMAN:
{
htmltext = "31795-04.html"; htmltext = "31795-04.html";
break; break;
}
case SILVAN: case SILVAN:
{
htmltext = "33178-01.html"; htmltext = "33178-01.html";
break; break;
}
case LEF: case LEF:
{
htmltext = "33510-01.html"; htmltext = "33510-01.html";
break; break;
} }
}
break; break;
} }
case 2: case 2:
@@ -145,15 +153,21 @@ public final class Q10337_SakumsImpact extends Quest
switch (npc.getId()) switch (npc.getId())
{ {
case ADVENTURE_GUILDSMAN: case ADVENTURE_GUILDSMAN:
{
htmltext = "31795-04.html"; htmltext = "31795-04.html";
break; break;
}
case SILVAN: case SILVAN:
{
htmltext = "33178-04.html"; htmltext = "33178-04.html";
break; break;
}
case LEF: case LEF:
{
htmltext = "33510-02.html"; htmltext = "33510-02.html";
break; break;
} }
}
break; break;
} }
case 3: case 3:
@@ -161,15 +175,21 @@ public final class Q10337_SakumsImpact extends Quest
switch (npc.getId()) switch (npc.getId())
{ {
case ADVENTURE_GUILDSMAN: case ADVENTURE_GUILDSMAN:
{
htmltext = "31795-04.html"; htmltext = "31795-04.html";
break; break;
}
case SILVAN: case SILVAN:
{
htmltext = "33178-05.html"; htmltext = "33178-05.html";
break; break;
}
case LEF: case LEF:
{
htmltext = "33510-03.html"; htmltext = "33510-03.html";
break; break;
} }
}
break; break;
} }
} }
@@ -180,15 +200,21 @@ public final class Q10337_SakumsImpact extends Quest
switch (npc.getId()) switch (npc.getId())
{ {
case ADVENTURE_GUILDSMAN: case ADVENTURE_GUILDSMAN:
{
htmltext = "31795-05.html"; htmltext = "31795-05.html";
break; break;
}
case SILVAN: case SILVAN:
{
htmltext = "33178-06.html"; htmltext = "33178-06.html";
break; break;
}
case LEF: case LEF:
{
htmltext = "33510-05.html"; htmltext = "33510-05.html";
break; break;
} }
}
break; break;
} }
} }
@@ -198,13 +224,13 @@ public final class Q10337_SakumsImpact extends Quest
@Override @Override
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{ {
final QuestState st = getQuestState(killer, false); final QuestState qs = getQuestState(killer, false);
if ((st != null) && st.isStarted() && st.isCond(2)) if ((qs != null) && qs.isStarted() && qs.isCond(2))
{ {
int killedWarriors = st.getInt("killed_" + SKELETON_WARRIOR); int killedWarriors = qs.getInt("killed_" + SKELETON_WARRIOR);
int killedImps = st.getInt("killed_" + RUIN_IMP); int killedImps = qs.getInt("killed_" + RUIN_IMP);
int killedBats = st.getInt("killed_" + BAT); int killedBats = qs.getInt("killed_" + BAT);
switch (npc.getId()) switch (npc.getId())
{ {
@@ -213,7 +239,7 @@ public final class Q10337_SakumsImpact extends Quest
if (killedWarriors < 15) if (killedWarriors < 15)
{ {
killedWarriors++; killedWarriors++;
st.set("killed_" + SKELETON_WARRIOR, killedWarriors); qs.set("killed_" + SKELETON_WARRIOR, killedWarriors);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
} }
break; break;
@@ -223,7 +249,7 @@ public final class Q10337_SakumsImpact extends Quest
if (killedImps < 20) if (killedImps < 20)
{ {
killedImps++; killedImps++;
st.set("killed_" + RUIN_IMP, killedImps); qs.set("killed_" + RUIN_IMP, killedImps);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
} }
break; break;
@@ -234,7 +260,7 @@ public final class Q10337_SakumsImpact extends Quest
if (killedBats < 25) if (killedBats < 25)
{ {
killedBats++; killedBats++;
st.set("killed_" + BAT, killedBats); qs.set("killed_" + BAT, killedBats);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
} }
break; break;
@@ -243,7 +269,7 @@ public final class Q10337_SakumsImpact extends Quest
if ((killedWarriors == 15) && (killedImps == 20) && (killedBats == 25)) if ((killedWarriors == 15) && (killedImps == 20) && (killedBats == 25))
{ {
st.setCond(3, true); qs.setCond(3, true);
} }
sendNpcLogList(killer); sendNpcLogList(killer);
} }
@@ -253,13 +279,13 @@ public final class Q10337_SakumsImpact extends Quest
@Override @Override
public Set<NpcLogListHolder> getNpcLogList(L2PcInstance activeChar) public Set<NpcLogListHolder> getNpcLogList(L2PcInstance activeChar)
{ {
final QuestState st = getQuestState(activeChar, false); final QuestState qs = getQuestState(activeChar, false);
if ((st != null) && st.isStarted() && st.isCond(2)) if ((qs != null) && qs.isStarted() && qs.isCond(2))
{ {
final Set<NpcLogListHolder> npcLogList = new HashSet<>(3); final Set<NpcLogListHolder> npcLogList = new HashSet<>(3);
npcLogList.add(new NpcLogListHolder(SKELETON_WARRIOR, false, st.getInt("killed_" + SKELETON_WARRIOR))); npcLogList.add(new NpcLogListHolder(SKELETON_WARRIOR, false, qs.getInt("killed_" + SKELETON_WARRIOR)));
npcLogList.add(new NpcLogListHolder(RUIN_IMP, false, st.getInt("killed_" + RUIN_IMP))); npcLogList.add(new NpcLogListHolder(RUIN_IMP, false, qs.getInt("killed_" + RUIN_IMP)));
npcLogList.add(new NpcLogListHolder(27458, false, st.getInt("killed_" + BAT))); // NOTE: Somehow quest log react on bad ID, maybe client bug npcLogList.add(new NpcLogListHolder(27458, false, qs.getInt("killed_" + BAT))); // NOTE: Somehow quest log react on bad ID, maybe client bug
return npcLogList; return npcLogList;
} }
return super.getNpcLogList(activeChar); return super.getNpcLogList(activeChar);

View File

@@ -50,8 +50,8 @@ public final class Q10341_DayOfDestinyHumansFate extends ThirdClassTransferQuest
@Override @Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{ {
final QuestState st = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (st == null) if (qs == null)
{ {
return null; return null;
} }
@@ -69,8 +69,10 @@ public final class Q10341_DayOfDestinyHumansFate extends ThirdClassTransferQuest
} }
case "30857-05.htm": case "30857-05.htm":
{ {
st.startQuest(); qs.startQuest();
st.set("STARTED_CLASS", player.getClassId().getId()); qs.setCond(2); // arrow hack
qs.setCond(1);
qs.set("STARTED_CLASS", player.getClassId().getId());
htmltext = event; htmltext = event;
break; break;
} }
@@ -86,21 +88,21 @@ public final class Q10341_DayOfDestinyHumansFate extends ThirdClassTransferQuest
public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated) public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
{ {
String htmltext = getNoQuestMsg(player); String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true); final QuestState qs = getQuestState(player, true);
if (npc.getId() == ORVEN) if (npc.getId() == ORVEN)
{ {
if (st.getState() == State.CREATED) if (qs.getState() == State.CREATED)
{ {
htmltext = "30857-01.htm"; htmltext = "30857-01.htm";
} }
else if (st.getState() == State.STARTED) else if (qs.getState() == State.STARTED)
{ {
if (st.isCond(1)) if (qs.isCond(1))
{ {
htmltext = "30857-06.html"; htmltext = "30857-06.html";
} }
else if (st.isCond(13)) else if (qs.isCond(13))
{ {
htmltext = "30857-07.html"; htmltext = "30857-07.html";
} }

View File

@@ -50,8 +50,8 @@ public final class Q10342_DayOfDestinyElvenFate extends ThirdClassTransferQuest
@Override @Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{ {
final QuestState st = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (st == null) if (qs == null)
{ {
return null; return null;
} }
@@ -69,8 +69,10 @@ public final class Q10342_DayOfDestinyElvenFate extends ThirdClassTransferQuest
} }
case "30856-05.htm": case "30856-05.htm":
{ {
st.startQuest(); qs.startQuest();
st.set("STARTED_CLASS", player.getClassId().getId()); qs.setCond(2); // arrow hack
qs.setCond(1);
qs.set("STARTED_CLASS", player.getClassId().getId());
htmltext = event; htmltext = event;
break; break;
} }
@@ -86,21 +88,21 @@ public final class Q10342_DayOfDestinyElvenFate extends ThirdClassTransferQuest
public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated) public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
{ {
String htmltext = getNoQuestMsg(player); String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true); final QuestState qs = getQuestState(player, true);
if (npc.getId() == WINONIN) if (npc.getId() == WINONIN)
{ {
if (st.getState() == State.CREATED) if (qs.getState() == State.CREATED)
{ {
htmltext = "30856-01.htm"; htmltext = "30856-01.htm";
} }
else if (st.getState() == State.STARTED) else if (qs.getState() == State.STARTED)
{ {
if (st.isCond(1)) if (qs.isCond(1))
{ {
htmltext = "30856-06.html"; htmltext = "30856-06.html";
} }
else if (st.isCond(13)) else if (qs.isCond(13))
{ {
htmltext = "30856-07.html"; htmltext = "30856-07.html";
} }

View File

@@ -50,8 +50,8 @@ public final class Q10343_DayOfDestinyDarkElfsFate extends ThirdClassTransferQue
@Override @Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{ {
final QuestState st = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (st == null) if (qs == null)
{ {
return null; return null;
} }
@@ -69,8 +69,10 @@ public final class Q10343_DayOfDestinyDarkElfsFate extends ThirdClassTransferQue
} }
case "30862-05.htm": case "30862-05.htm":
{ {
st.startQuest(); qs.startQuest();
st.set("STARTED_CLASS", player.getClassId().getId()); qs.setCond(2); // arrow hack
qs.setCond(1);
qs.set("STARTED_CLASS", player.getClassId().getId());
htmltext = event; htmltext = event;
break; break;
} }
@@ -86,21 +88,21 @@ public final class Q10343_DayOfDestinyDarkElfsFate extends ThirdClassTransferQue
public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated) public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
{ {
String htmltext = getNoQuestMsg(player); String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true); final QuestState qs = getQuestState(player, true);
if (npc.getId() == OLTRAN) if (npc.getId() == OLTRAN)
{ {
if (st.getState() == State.CREATED) if (qs.getState() == State.CREATED)
{ {
htmltext = "30862-01.htm"; htmltext = "30862-01.htm";
} }
else if (st.getState() == State.STARTED) else if (qs.getState() == State.STARTED)
{ {
if (st.isCond(1)) if (qs.isCond(1))
{ {
htmltext = "30862-06.html"; htmltext = "30862-06.html";
} }
else if (st.isCond(13)) else if (qs.isCond(13))
{ {
htmltext = "30862-07.html"; htmltext = "30862-07.html";
} }

View File

@@ -50,8 +50,8 @@ public final class Q10344_DayOfDestinyOrcsFate extends ThirdClassTransferQuest
@Override @Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{ {
final QuestState st = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (st == null) if (qs == null)
{ {
return null; return null;
} }
@@ -69,8 +69,10 @@ public final class Q10344_DayOfDestinyOrcsFate extends ThirdClassTransferQuest
} }
case "30865-05.htm": case "30865-05.htm":
{ {
st.startQuest(); qs.startQuest();
st.set("STARTED_CLASS", player.getClassId().getId()); qs.setCond(2); // arrow hack
qs.setCond(1);
qs.set("STARTED_CLASS", player.getClassId().getId());
htmltext = event; htmltext = event;
break; break;
} }
@@ -86,21 +88,21 @@ public final class Q10344_DayOfDestinyOrcsFate extends ThirdClassTransferQuest
public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated) public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
{ {
String htmltext = getNoQuestMsg(player); String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true); final QuestState qs = getQuestState(player, true);
if (npc.getId() == LADANZA) if (npc.getId() == LADANZA)
{ {
if (st.getState() == State.CREATED) if (qs.getState() == State.CREATED)
{ {
htmltext = "30865-01.htm"; htmltext = "30865-01.htm";
} }
else if (st.getState() == State.STARTED) else if (qs.getState() == State.STARTED)
{ {
if (st.isCond(1)) if (qs.isCond(1))
{ {
htmltext = "30865-06.html"; htmltext = "30865-06.html";
} }
else if (st.isCond(13)) else if (qs.isCond(13))
{ {
htmltext = "30865-07.html"; htmltext = "30865-07.html";
} }

View File

@@ -50,8 +50,8 @@ public final class Q10345_DayOfDestinyDwarfsFate extends ThirdClassTransferQuest
@Override @Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{ {
final QuestState st = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (st == null) if (qs == null)
{ {
return null; return null;
} }
@@ -69,8 +69,10 @@ public final class Q10345_DayOfDestinyDwarfsFate extends ThirdClassTransferQuest
} }
case "30847-05.htm": case "30847-05.htm":
{ {
st.startQuest(); qs.startQuest();
st.set("STARTED_CLASS", player.getClassId().getId()); qs.setCond(2); // arrow hack
qs.setCond(1);
qs.set("STARTED_CLASS", player.getClassId().getId());
htmltext = event; htmltext = event;
break; break;
} }
@@ -86,21 +88,21 @@ public final class Q10345_DayOfDestinyDwarfsFate extends ThirdClassTransferQuest
public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated) public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
{ {
String htmltext = getNoQuestMsg(player); String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true); final QuestState qs = getQuestState(player, true);
if (npc.getId() == FERRIS) if (npc.getId() == FERRIS)
{ {
if (st.getState() == State.CREATED) if (qs.getState() == State.CREATED)
{ {
htmltext = "30847-01.htm"; htmltext = "30847-01.htm";
} }
else if (st.getState() == State.STARTED) else if (qs.getState() == State.STARTED)
{ {
if (st.isCond(1)) if (qs.isCond(1))
{ {
htmltext = "30847-06.html"; htmltext = "30847-06.html";
} }
else if (st.isCond(13)) else if (qs.isCond(13))
{ {
htmltext = "30847-07.html"; htmltext = "30847-07.html";
} }

View File

@@ -50,8 +50,8 @@ public final class Q10346_DayOfDestinyKamaelsFate extends ThirdClassTransferQues
@Override @Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{ {
final QuestState st = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (st == null) if (qs == null)
{ {
return null; return null;
} }
@@ -69,8 +69,10 @@ public final class Q10346_DayOfDestinyKamaelsFate extends ThirdClassTransferQues
} }
case "32221-05.htm": case "32221-05.htm":
{ {
st.startQuest(); qs.startQuest();
st.set("STARTED_CLASS", player.getClassId().getId()); qs.setCond(2); // arrow hack
qs.setCond(1);
qs.set("STARTED_CLASS", player.getClassId().getId());
htmltext = event; htmltext = event;
break; break;
} }
@@ -86,21 +88,21 @@ public final class Q10346_DayOfDestinyKamaelsFate extends ThirdClassTransferQues
public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated) public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
{ {
String htmltext = getNoQuestMsg(player); String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true); final QuestState qs = getQuestState(player, true);
if (npc.getId() == BROME) if (npc.getId() == BROME)
{ {
if (st.getState() == State.CREATED) if (qs.getState() == State.CREATED)
{ {
htmltext = "32221-01.htm"; htmltext = "32221-01.htm";
} }
else if (st.getState() == State.STARTED) else if (qs.getState() == State.STARTED)
{ {
if (st.isCond(1)) if (qs.isCond(1))
{ {
htmltext = "32221-06.html"; htmltext = "32221-06.html";
} }
else if (st.isCond(13)) else if (qs.isCond(13))
{ {
htmltext = "32221-07.html"; htmltext = "32221-07.html";
} }

View File

@@ -55,8 +55,8 @@ public final class Q10368_RebellionOfMonsters extends Quest
@Override @Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{ {
final QuestState st = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (st == null) if (qs == null)
{ {
return null; return null;
} }
@@ -71,17 +71,19 @@ public final class Q10368_RebellionOfMonsters extends Quest
} }
case "33179-03.htm": case "33179-03.htm":
{ {
st.startQuest(); qs.startQuest();
qs.setCond(2); // arrow hack
qs.setCond(1);
htmltext = event; htmltext = event;
break; break;
} }
case "33179-06.html": case "33179-06.html":
{ {
if (st.isCond(2)) if (qs.isCond(2))
{ {
giveAdena(player, 990, true); giveAdena(player, 990, true);
addExpAndSp(player, 750000, 180); addExpAndSp(player, 750000, 180);
st.exitQuest(false, true); qs.exitQuest(false, true);
} }
break; break;
} }
@@ -93,9 +95,9 @@ public final class Q10368_RebellionOfMonsters extends Quest
public String onTalk(L2Npc npc, L2PcInstance player) public String onTalk(L2Npc npc, L2PcInstance player)
{ {
String htmltext = getNoQuestMsg(player); String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true); final QuestState qs = getQuestState(player, true);
switch (st.getState()) switch (qs.getState())
{ {
case State.CREATED: case State.CREATED:
{ {
@@ -104,11 +106,11 @@ public final class Q10368_RebellionOfMonsters extends Quest
} }
case State.STARTED: case State.STARTED:
{ {
if (st.isCond(1)) if (qs.isCond(1))
{ {
htmltext = "33179-04.html"; htmltext = "33179-04.html";
} }
else if (st.isCond(2)) else if (qs.isCond(2))
{ {
htmltext = "33179-05.html"; htmltext = "33179-05.html";
} }
@@ -126,14 +128,14 @@ public final class Q10368_RebellionOfMonsters extends Quest
@Override @Override
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{ {
final QuestState st = getQuestState(killer, false); final QuestState qs = getQuestState(killer, false);
if ((st != null) && st.isStarted() && st.isCond(1)) if ((qs != null) && qs.isStarted() && qs.isCond(1))
{ {
int killedJaguar = st.getInt("killed_" + WEARY_JAGUAR); int killedJaguar = qs.getInt("killed_" + WEARY_JAGUAR);
int killedJaguarScout = st.getInt("killed_" + WEARY_JAGUAR_SCOUT); int killedJaguarScout = qs.getInt("killed_" + WEARY_JAGUAR_SCOUT);
int killedSoldier = st.getInt("killed_" + ANT_SOLDIER); int killedSoldier = qs.getInt("killed_" + ANT_SOLDIER);
int killedCaptain = st.getInt("killed_" + ANT_WARRIOR_CAPTAIN); int killedCaptain = qs.getInt("killed_" + ANT_WARRIOR_CAPTAIN);
switch (npc.getId()) switch (npc.getId())
{ {
@@ -142,7 +144,7 @@ public final class Q10368_RebellionOfMonsters extends Quest
if (killedJaguar < 10) if (killedJaguar < 10)
{ {
killedJaguar++; killedJaguar++;
st.set("killed_" + WEARY_JAGUAR, killedJaguar); qs.set("killed_" + WEARY_JAGUAR, killedJaguar);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
} }
break; break;
@@ -152,7 +154,7 @@ public final class Q10368_RebellionOfMonsters extends Quest
if (killedJaguarScout < 15) if (killedJaguarScout < 15)
{ {
killedJaguarScout++; killedJaguarScout++;
st.set("killed_" + WEARY_JAGUAR_SCOUT, killedJaguarScout); qs.set("killed_" + WEARY_JAGUAR_SCOUT, killedJaguarScout);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
} }
break; break;
@@ -162,7 +164,7 @@ public final class Q10368_RebellionOfMonsters extends Quest
if (killedSoldier < 15) if (killedSoldier < 15)
{ {
killedSoldier++; killedSoldier++;
st.set("killed_" + ANT_SOLDIER, killedSoldier); qs.set("killed_" + ANT_SOLDIER, killedSoldier);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
} }
break; break;
@@ -172,7 +174,7 @@ public final class Q10368_RebellionOfMonsters extends Quest
if (killedCaptain < 20) if (killedCaptain < 20)
{ {
killedCaptain++; killedCaptain++;
st.set("killed_" + ANT_WARRIOR_CAPTAIN, killedCaptain); qs.set("killed_" + ANT_WARRIOR_CAPTAIN, killedCaptain);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
} }
break; break;
@@ -181,7 +183,7 @@ public final class Q10368_RebellionOfMonsters extends Quest
if ((killedJaguar == 10) && (killedJaguarScout == 15) && (killedSoldier == 15) && (killedCaptain == 20)) if ((killedJaguar == 10) && (killedJaguarScout == 15) && (killedSoldier == 15) && (killedCaptain == 20))
{ {
st.setCond(2, true); qs.setCond(2, true);
} }
sendNpcLogList(killer); sendNpcLogList(killer);
} }
@@ -191,14 +193,14 @@ public final class Q10368_RebellionOfMonsters extends Quest
@Override @Override
public Set<NpcLogListHolder> getNpcLogList(L2PcInstance activeChar) public Set<NpcLogListHolder> getNpcLogList(L2PcInstance activeChar)
{ {
final QuestState st = getQuestState(activeChar, false); final QuestState qs = getQuestState(activeChar, false);
if ((st != null) && st.isStarted() && st.isCond(1)) if ((qs != null) && qs.isStarted() && qs.isCond(1))
{ {
final Set<NpcLogListHolder> npcLogList = new HashSet<>(4); final Set<NpcLogListHolder> npcLogList = new HashSet<>(4);
npcLogList.add(new NpcLogListHolder(WEARY_JAGUAR, false, st.getInt("killed_" + WEARY_JAGUAR))); npcLogList.add(new NpcLogListHolder(WEARY_JAGUAR, false, qs.getInt("killed_" + WEARY_JAGUAR)));
npcLogList.add(new NpcLogListHolder(WEARY_JAGUAR_SCOUT, false, st.getInt("killed_" + WEARY_JAGUAR_SCOUT))); npcLogList.add(new NpcLogListHolder(WEARY_JAGUAR_SCOUT, false, qs.getInt("killed_" + WEARY_JAGUAR_SCOUT)));
npcLogList.add(new NpcLogListHolder(ANT_SOLDIER, false, st.getInt("killed_" + ANT_SOLDIER))); npcLogList.add(new NpcLogListHolder(ANT_SOLDIER, false, qs.getInt("killed_" + ANT_SOLDIER)));
npcLogList.add(new NpcLogListHolder(ANT_WARRIOR_CAPTAIN, false, st.getInt("killed_" + ANT_WARRIOR_CAPTAIN))); npcLogList.add(new NpcLogListHolder(ANT_WARRIOR_CAPTAIN, false, qs.getInt("killed_" + ANT_WARRIOR_CAPTAIN)));
return npcLogList; return npcLogList;
} }
return super.getNpcLogList(activeChar); return super.getNpcLogList(activeChar);