Minor quest improvements.

This commit is contained in:
MobiusDev
2016-12-16 20:42:57 +00:00
parent 7d489c485b
commit 8a9b048719
20 changed files with 125 additions and 86 deletions

View File

@@ -120,7 +120,8 @@ public class Q00337_AudienceWithTheLandDragon extends Quest
{ {
return getNoQuestMsg(player); return getNoQuestMsg(player);
} }
String htmltext = event;
String htmltext = null;
switch (event) switch (event)
{ {
case "30753-02.htm": case "30753-02.htm":
@@ -175,6 +176,7 @@ public class Q00337_AudienceWithTheLandDragon extends Quest
{ {
return htmltext; return htmltext;
} }
switch (npc.getId()) switch (npc.getId())
{ {
case GABRIELLE: case GABRIELLE:
@@ -636,6 +638,6 @@ public class Q00337_AudienceWithTheLandDragon extends Quest
break; break;
} }
} }
return null; return super.onKill(npc, player, isSummon);
} }
} }

View File

@@ -59,12 +59,13 @@ public final class Q10310_TwistedCreationTree extends Quest
@Override @Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{ {
String htmltext = null;
final QuestState qs = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (qs == null) if (qs == null)
{ {
return htmltext; return null;
} }
String htmltext = null;
switch (event) switch (event)
{ {
case "33032-02.htm": case "33032-02.htm":
@@ -90,7 +91,7 @@ public final class Q10310_TwistedCreationTree extends Quest
} }
default: default:
{ {
if (event.startsWith("giveReward_")) if (qs.isCond(3) && event.startsWith("giveReward_"))
{ {
final int itemId = Integer.parseInt(event.replace("giveReward_", "")); final int itemId = Integer.parseInt(event.replace("giveReward_", ""));
qs.exitQuest(false, true); qs.exitQuest(false, true);
@@ -99,6 +100,7 @@ public final class Q10310_TwistedCreationTree extends Quest
addExpAndSp(player, 50178765, 12042); addExpAndSp(player, 50178765, 12042);
htmltext = "33031-07.html"; htmltext = "33031-07.html";
} }
break;
} }
} }
return htmltext; return htmltext;
@@ -108,7 +110,7 @@ public final class Q10310_TwistedCreationTree extends Quest
public String onTalk(L2Npc npc, L2PcInstance player) public String onTalk(L2Npc npc, L2PcInstance player)
{ {
final QuestState qs = getQuestState(player, true); final QuestState qs = getQuestState(player, true);
String htmltext = null; String htmltext = getNoQuestMsg(player);
switch (qs.getState()) switch (qs.getState())
{ {
@@ -243,7 +245,6 @@ public final class Q10310_TwistedCreationTree extends Quest
qs.getPlayer().sendPacket(log); qs.getPlayer().sendPacket(log);
if ((qs.getInt(Integer.toString(GARDEN_SENTRY)) >= 10) && (qs.getInt(Integer.toString(GARDEN_SCOUT)) >= 10) && (qs.getInt(Integer.toString(GARDEN_COMMANDER)) >= 10) && (qs.getInt(Integer.toString(GARDEN_DESTROYER)) >= 10) && (qs.getInt(Integer.toString(GARDEN_DESTROYER)) >= 10)) if ((qs.getInt(Integer.toString(GARDEN_SENTRY)) >= 10) && (qs.getInt(Integer.toString(GARDEN_SCOUT)) >= 10) && (qs.getInt(Integer.toString(GARDEN_COMMANDER)) >= 10) && (qs.getInt(Integer.toString(GARDEN_DESTROYER)) >= 10) && (qs.getInt(Integer.toString(GARDEN_DESTROYER)) >= 10))
{ {
qs.setCond(1);
qs.setCond(3, true); qs.setCond(3, true);
} }
} }

View File

@@ -70,13 +70,13 @@ public final class Q10318_DecayingDarkness extends Quest
@Override @Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{ {
String htmltext = null;
final QuestState qs = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (qs == null) if (qs == null)
{ {
return htmltext; return null;
} }
String htmltext = null;
switch (event) switch (event)
{ {
case "32892-02.htm": case "32892-02.htm":
@@ -94,10 +94,13 @@ public final class Q10318_DecayingDarkness extends Quest
} }
case "32892-07.html": case "32892-07.html":
{ {
giveAdena(player, 5427900, false); if (qs.isCond(2))
addExpAndSp(player, 79260650, 19022); {
qs.exitQuest(false, true); giveAdena(player, 5427900, false);
htmltext = event; addExpAndSp(player, 79260650, 19022);
qs.exitQuest(false, true);
htmltext = event;
}
break; break;
} }
} }
@@ -113,6 +116,7 @@ public final class Q10318_DecayingDarkness extends Quest
{ {
return htmltext; return htmltext;
} }
final int npcId = npc.getId(); final int npcId = npc.getId();
switch (qs.getState()) switch (qs.getState())
{ {

View File

@@ -53,13 +53,13 @@ public final class Q10351_OwnerOfHall extends Quest
@Override @Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{ {
String htmltext = null;
final QuestState qs = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (qs == null) if (qs == null)
{ {
return htmltext; return null;
} }
String htmltext = null;
switch (event) switch (event)
{ {
case "32892-02.htm": case "32892-02.htm":
@@ -77,11 +77,14 @@ public final class Q10351_OwnerOfHall extends Quest
} }
case "32892-08.html": case "32892-08.html":
{ {
giveAdena(player, 23655000, false); if (qs.isCond(2))
addExpAndSp(player, 897850000, 215484); {
giveItems(player, OCTAVIS_BRACELET, 1); giveAdena(player, 23655000, false);
qs.exitQuest(false, true); addExpAndSp(player, 897850000, 215484);
htmltext = getHtm(player.getHtmlPrefix(), "32892-08.html").replace("%name%", player.getName()); giveItems(player, OCTAVIS_BRACELET, 1);
qs.exitQuest(false, true);
htmltext = getHtm(player.getHtmlPrefix(), "32892-08.html").replace("%name%", player.getName());
}
break; break;
} }
} }
@@ -97,6 +100,7 @@ public final class Q10351_OwnerOfHall extends Quest
{ {
return htmltext; return htmltext;
} }
final int npcId = npc.getId(); final int npcId = npc.getId();
switch (qs.getState()) switch (qs.getState())
{ {

View File

@@ -53,13 +53,13 @@ public final class Q10354_ResurrectedOwnerOfHall extends Quest
@Override @Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{ {
String htmltext = null;
final QuestState qs = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (qs == null) if (qs == null)
{ {
return htmltext; return null;
} }
String htmltext = null;
switch (event) switch (event)
{ {
case "32892-02.htm": case "32892-02.htm":
@@ -76,11 +76,14 @@ public final class Q10354_ResurrectedOwnerOfHall extends Quest
} }
case "32892-07.html": case "32892-07.html":
{ {
giveAdena(player, 23655000, false); if (qs.isCond(2))
addExpAndSp(player, 897850000, 215484); {
giveItems(player, OCTAVIS_SOUL_BOTTLE, 1); giveAdena(player, 23655000, false);
qs.exitQuest(false, true); addExpAndSp(player, 897850000, 215484);
htmltext = getHtm(player.getHtmlPrefix(), "32892-07.html").replace("%name%", player.getName()); giveItems(player, OCTAVIS_SOUL_BOTTLE, 1);
qs.exitQuest(false, true);
htmltext = getHtm(player.getHtmlPrefix(), "32892-07.html").replace("%name%", player.getName());
}
break; break;
} }
} }

View File

@@ -95,7 +95,6 @@ public final class Q10377_TheInvadedExecutionGrounds extends Quest
} }
case "warden_roderik_q10377_03.html": case "warden_roderik_q10377_03.html":
{ {
qs.setCond(0);
qs.setCond(3, true); qs.setCond(3, true);
takeItems(player, HARLANS_ORDERS, -1); takeItems(player, HARLANS_ORDERS, -1);
giveItems(player, ENDRIGOS_REPORT, 1); giveItems(player, ENDRIGOS_REPORT, 1);
@@ -164,6 +163,7 @@ public final class Q10377_TheInvadedExecutionGrounds extends Quest
{ {
return htmltext; return htmltext;
} }
switch (qs.getState()) switch (qs.getState())
{ {
case State.CREATED: case State.CREATED:

View File

@@ -70,13 +70,13 @@ public final class Q10379_AnUninvitedGuest extends Quest
@Override @Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{ {
String htmltext = event;
final QuestState qs = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (qs == null) if (qs == null)
{ {
return getNoQuestMsg(player); return null;
} }
String htmltext = null;
switch (event) switch (event)
{ {
case "warden_endrigo_q10379_04.htm": case "warden_endrigo_q10379_04.htm":
@@ -179,7 +179,6 @@ public final class Q10379_AnUninvitedGuest extends Quest
final ExQuestNpcLogList log = new ExQuestNpcLogList(getId()); final ExQuestNpcLogList log = new ExQuestNpcLogList(getId());
log.addNpc(SCALDISECT_THE_FURIOUS, qs.getInt("SCALDISECT_THE_FURIOUS")); log.addNpc(SCALDISECT_THE_FURIOUS, qs.getInt("SCALDISECT_THE_FURIOUS"));
player.sendPacket(log); player.sendPacket(log);
} }
if (qs.getInt(Integer.toString(SCALDISECT_THE_FURIOUS)) == 1) if (qs.getInt(Integer.toString(SCALDISECT_THE_FURIOUS)) == 1)
{ {

View File

@@ -63,6 +63,7 @@ public class Q10432_ChasingVarangka extends Quest
{ {
return null; return null;
} }
String htmltext = null; String htmltext = null;
switch (event) switch (event)
{ {
@@ -94,8 +95,8 @@ public class Q10432_ChasingVarangka extends Quest
giveStoryQuestReward(player, 30); giveStoryQuestReward(player, 30);
addExpAndSp(player, 14120400, 3388); addExpAndSp(player, 14120400, 3388);
qs.exitQuest(false, true); qs.exitQuest(false, true);
htmltext = "33868-03.html";
} }
htmltext = "33868-03.html";
break; break;
} }
} }
@@ -111,6 +112,7 @@ public class Q10432_ChasingVarangka extends Quest
{ {
return htmltext; return htmltext;
} }
switch (qs.getState()) switch (qs.getState())
{ {
case State.CREATED: case State.CREATED:

View File

@@ -92,8 +92,8 @@ public class Q10435_ChasingKeltron extends Quest
giveStoryQuestReward(player, 30); giveStoryQuestReward(player, 30);
addExpAndSp(player, 14120400, 3388); addExpAndSp(player, 14120400, 3388);
qs.exitQuest(false, true); qs.exitQuest(false, true);
htmltext = "33841-07.html";
} }
htmltext = "33841-07.html";
break; break;
} }
} }
@@ -109,6 +109,7 @@ public class Q10435_ChasingKeltron extends Quest
{ {
return htmltext; return htmltext;
} }
switch (qs.getState()) switch (qs.getState())
{ {

View File

@@ -93,8 +93,8 @@ public class Q10438_ChasingLoygen extends Quest
giveStoryQuestReward(player, 30); giveStoryQuestReward(player, 30);
addExpAndSp(player, 14120400, 3388); addExpAndSp(player, 14120400, 3388);
qs.exitQuest(false, true); qs.exitQuest(false, true);
htmltext = "32742-08.html";
} }
htmltext = "32742-08.html";
break; break;
} }
} }
@@ -110,6 +110,7 @@ public class Q10438_ChasingLoygen extends Quest
{ {
return htmltext; return htmltext;
} }
switch (qs.getState()) switch (qs.getState())
{ {
case State.CREATED: case State.CREATED:

View File

@@ -116,7 +116,6 @@ public class Q10441_ChasingMeccadan extends Quest
addExpAndSp(player, 14120400, 3388); addExpAndSp(player, 14120400, 3388);
qs.exitQuest(false, true); qs.exitQuest(false, true);
htmltext = "32641-08.html"; htmltext = "32641-08.html";
break;
} }
else if (npc.getId() == ATHENIA) else if (npc.getId() == ATHENIA)
{ {
@@ -127,9 +126,9 @@ public class Q10441_ChasingMeccadan extends Quest
addExpAndSp(player, 14120400, 3388); addExpAndSp(player, 14120400, 3388);
qs.exitQuest(false, true); qs.exitQuest(false, true);
htmltext = "32643-08.html"; htmltext = "32643-08.html";
break;
} }
} }
break;
} }
} }
return htmltext; return htmltext;
@@ -144,6 +143,7 @@ public class Q10441_ChasingMeccadan extends Quest
{ {
return htmltext; return htmltext;
} }
switch (npc.getId()) switch (npc.getId())
{ {
case HELVETICA: case HELVETICA:

View File

@@ -52,12 +52,13 @@ public class Q10455_ElikiasLetter extends Quest
@Override @Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{ {
String htmltext = null;
final QuestState qs = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (qs == null) if (qs == null)
{ {
return null; return null;
} }
String htmltext = null;
switch (event) switch (event)
{ {
case "31620-02.htm": case "31620-02.htm":
@@ -83,11 +84,14 @@ public class Q10455_ElikiasLetter extends Quest
} }
case "31595-03.html": case "31595-03.html":
{ {
giveAdena(player, 32962, true); if (qs.isCond(2))
addExpAndSp(player, 3859143, 14816); {
npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, LEONA_BLACKBIRD_FIRE_DRAGON_BRIDE, NpcStringId.HAVE_YOU_MADE_PREPARATIONS_FOR_THE_MISSION_THERE_ISN_T_MUCH_TIME)); giveAdena(player, 32962, true);
qs.exitQuest(false, true); addExpAndSp(player, 3859143, 14816);
htmltext = event; npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, LEONA_BLACKBIRD_FIRE_DRAGON_BRIDE, NpcStringId.HAVE_YOU_MADE_PREPARATIONS_FOR_THE_MISSION_THERE_ISN_T_MUCH_TIME));
qs.exitQuest(false, true);
htmltext = event;
}
break; break;
} }
} }
@@ -103,6 +107,7 @@ public class Q10455_ElikiasLetter extends Quest
{ {
return htmltext; return htmltext;
} }
switch (npc.getId()) switch (npc.getId())
{ {
case ELRIKIA_VERDURE_ELDER: case ELRIKIA_VERDURE_ELDER:

View File

@@ -55,12 +55,13 @@ public class Q10459_ASickAmbition extends Quest
@Override @Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{ {
String htmltext = null;
final QuestState qs = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (qs == null) if (qs == null)
{ {
return null; return null;
} }
String htmltext = null;
switch (event) switch (event)
{ {
case "31595-02.htm": case "31595-02.htm":
@@ -77,10 +78,13 @@ public class Q10459_ASickAmbition extends Quest
} }
case "33899-02.html": case "33899-02.html":
{ {
giveItems(player, SP_RUNE_PACK, 1); if (qs.isCond(2))
addExpAndSp(player, 555716700, 2133952); {
qs.exitQuest(false, true); giveItems(player, SP_RUNE_PACK, 1);
htmltext = event; addExpAndSp(player, 555716700, 2133952);
qs.exitQuest(false, true);
htmltext = event;
}
break; break;
} }
} }
@@ -96,6 +100,7 @@ public class Q10459_ASickAmbition extends Quest
{ {
return htmltext; return htmltext;
} }
switch (qs.getState()) switch (qs.getState())
{ {
case State.CREATED: case State.CREATED:

View File

@@ -143,8 +143,8 @@ public final class Q10753_WindsOfFateChoices extends Quest
{ {
return null; return null;
} }
String htmltext = event;
String htmltext = null;
switch (event) switch (event)
{ {
case "33943-02.htm": case "33943-02.htm":

View File

@@ -70,6 +70,7 @@ public class Q10766_ANewCraft extends Quest
{ {
return null; return null;
} }
String htmltext = null; String htmltext = null;
switch (event) switch (event)
{ {
@@ -111,13 +112,16 @@ public class Q10766_ANewCraft extends Quest
} }
case "33978-07.html": case "33978-07.html":
{ {
takeItems(player, AIR_STONE, 1); if (qs.isCond(4))
takeItems(player, WINDY_HEALING_POTION_1, 1); {
giveItems(player, WINDY_HEALING_POTION); takeItems(player, AIR_STONE, 1);
giveItems(player, WINDY_QUICK_HEALING_POTION); takeItems(player, WINDY_HEALING_POTION_1, 1);
addExpAndSp(player, EXP_REWARD, SP_REWARD); giveItems(player, WINDY_HEALING_POTION);
qs.exitQuest(false, true); giveItems(player, WINDY_QUICK_HEALING_POTION);
htmltext = event; addExpAndSp(player, EXP_REWARD, SP_REWARD);
qs.exitQuest(false, true);
htmltext = event;
}
break; break;
} }
} }
@@ -174,22 +178,33 @@ public class Q10766_ANewCraft extends Quest
} }
case ZEPHYRA: case ZEPHYRA:
{ {
if (qs.isCond(1)) switch (qs.getCond())
{ {
htmltext = "33978-01.html"; case 1:
} {
if (qs.isCond(2)) htmltext = "33978-01.html";
{ break;
htmltext = "33978-04.html"; }
} case 2:
if (qs.isCond(3) && ((getQuestItemsCount(player, AIR_STONE) == 0) || (getQuestItemsCount(player, WINDY_HEALING_POTION_1) == 1))) {
{ htmltext = "33978-04.html";
htmltext = "33978-08.html"; break;
} }
if (qs.isCond(4)) case 3:
{ {
htmltext = "33978-06.html"; if ((getQuestItemsCount(player, AIR_STONE) == 0) || (getQuestItemsCount(player, WINDY_HEALING_POTION_1) == 1))
{
htmltext = "33978-08.html";
}
break;
}
case 4:
{
htmltext = "33978-06.html";
break;
}
} }
break;
} }
} }
return htmltext; return htmltext;

View File

@@ -68,13 +68,13 @@ public class Q10791_TheManOfMystery extends Quest
@Override @Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{ {
String htmltext = event;
final QuestState qs = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (qs == null) if (qs == null)
{ {
return getNoQuestMsg(player); return null;
} }
String htmltext = null;
switch (event) switch (event)
{ {
case "33847-02.htm": case "33847-02.htm":
@@ -114,7 +114,6 @@ public class Q10791_TheManOfMystery extends Quest
{ {
final QuestState qs = getQuestState(player, true); final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player); String htmltext = getNoQuestMsg(player);
switch (qs.getState()) switch (qs.getState())
{ {
case State.CREATED: case State.CREATED:

View File

@@ -49,7 +49,8 @@ public class Q10795_LettersFromTheQueenWallOfAgros extends LetterQuest
{ {
return null; return null;
} }
String htmltext = event;
String htmltext = null;
switch (event) switch (event)
{ {
case "31279-02.html": case "31279-02.html":
@@ -78,8 +79,6 @@ public class Q10795_LettersFromTheQueenWallOfAgros extends LetterQuest
} }
break; break;
} }
default:
htmltext = null;
} }
return htmltext; return htmltext;
} }
@@ -88,7 +87,7 @@ public class Q10795_LettersFromTheQueenWallOfAgros extends LetterQuest
public String onTalk(L2Npc npc, L2PcInstance player) public String onTalk(L2Npc npc, L2PcInstance player)
{ {
final QuestState qs = getQuestState(player, true); final QuestState qs = getQuestState(player, true);
String htmltext = null; String htmltext = getNoQuestMsg(player);
if (qs == null) if (qs == null)
{ {
return htmltext; return htmltext;

View File

@@ -49,7 +49,6 @@ public class Q10798_LettersFromTheQueenDragonValley extends LetterQuest
{ {
super(10798); super(10798);
addTalkId(MAXIMILIAN, NAMO); addTalkId(MAXIMILIAN, NAMO);
setIsErtheiaQuest(true); setIsErtheiaQuest(true);
setLevel(MIN_LEVEL, MAX_LEVEL); setLevel(MIN_LEVEL, MAX_LEVEL);
setStartLocation(SOE_TOWN_OF_GIRAN, TELEPORT_LOC); setStartLocation(SOE_TOWN_OF_GIRAN, TELEPORT_LOC);
@@ -65,7 +64,8 @@ public class Q10798_LettersFromTheQueenDragonValley extends LetterQuest
{ {
return null; return null;
} }
String htmltext = event;
String htmltext = null;
switch (event) switch (event)
{ {
case "30120-02.html": case "30120-02.html":
@@ -94,8 +94,6 @@ public class Q10798_LettersFromTheQueenDragonValley extends LetterQuest
} }
break; break;
} }
default:
htmltext = null;
} }
return htmltext; return htmltext;
} }
@@ -104,7 +102,7 @@ public class Q10798_LettersFromTheQueenDragonValley extends LetterQuest
public String onTalk(L2Npc npc, L2PcInstance player) public String onTalk(L2Npc npc, L2PcInstance player)
{ {
final QuestState qs = getQuestState(player, true); final QuestState qs = getQuestState(player, true);
String htmltext = null; String htmltext = getNoQuestMsg(player);
if (qs == null) if (qs == null)
{ {
return htmltext; return htmltext;

View File

@@ -74,13 +74,13 @@ public class Q10799_StrangeThingsAfootInTheValley extends Quest
@Override @Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{ {
String htmltext = event;
final QuestState qs = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (qs == null) if (qs == null)
{ {
return getNoQuestMsg(player); return null;
} }
String htmltext = null;
switch (event) switch (event)
{ {
case "33973-02.htm": case "33973-02.htm":
@@ -96,7 +96,7 @@ public class Q10799_StrangeThingsAfootInTheValley extends Quest
} }
default: default:
{ {
if (event.startsWith("giveReward_") && qs.isCond(2) && (player.getLevel() >= MIN_LEVEL)) if (qs.isCond(2) && event.startsWith("giveReward_") && (player.getLevel() >= MIN_LEVEL))
{ {
final int itemId = Integer.parseInt(event.replace("giveReward_", "")); final int itemId = Integer.parseInt(event.replace("giveReward_", ""));
qs.exitQuest(false, true); qs.exitQuest(false, true);

View File

@@ -74,13 +74,13 @@ public class Q10800_ReconnaissanceAtDragonValley extends Quest
@Override @Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{ {
String htmltext = event;
final QuestState qs = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (qs == null) if (qs == null)
{ {
return getNoQuestMsg(player); return getNoQuestMsg(player);
} }
String htmltext = null;
switch (event) switch (event)
{ {
case "33973-02.htm": case "33973-02.htm":
@@ -96,7 +96,7 @@ public class Q10800_ReconnaissanceAtDragonValley extends Quest
} }
default: default:
{ {
if (event.startsWith("giveReward_") && qs.isCond(2) && (player.getLevel() >= MIN_LEVEL)) if (qs.isCond(2) && event.startsWith("giveReward_") && (player.getLevel() >= MIN_LEVEL))
{ {
final int itemId = Integer.parseInt(event.replace("giveReward_", "")); final int itemId = Integer.parseInt(event.replace("giveReward_", ""));
qs.exitQuest(false, true); qs.exitQuest(false, true);
@@ -106,6 +106,7 @@ public class Q10800_ReconnaissanceAtDragonValley extends Quest
addExpAndSp(player, 84722400, 20333); addExpAndSp(player, 84722400, 20333);
htmltext = "33973-08.html"; htmltext = "33973-08.html";
} }
break;
} }
} }
return htmltext; return htmltext;