Minor improvements for custom quests.

This commit is contained in:
MobiusDevelopment
2019-04-04 13:10:20 +00:00
parent 2dd884a837
commit f2b390857c
5 changed files with 20 additions and 16 deletions

View File

@@ -171,7 +171,7 @@ public class Q00529_RegularBarrierMaintenance extends Quest
{ {
if (giveItemRandomly(killer, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true)) if (giveItemRandomly(killer, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true))
{ {
qs.setCond(FINISH_COND); qs.setCond(FINISH_COND, true);
} }
sendNpcLogList(killer); sendNpcLogList(killer);
} }

View File

@@ -169,7 +169,7 @@ public class Q00560_HowToOvercomeFear extends Quest
{ {
if (giveItemRandomly(killer, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true)) if (giveItemRandomly(killer, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true))
{ {
qs.setCond(FINISH_COND); qs.setCond(FINISH_COND, true);
} }
sendNpcLogList(killer); sendNpcLogList(killer);
} }

View File

@@ -35,6 +35,9 @@ public class Q10516_UnveiledFafurionTemple extends Quest
private static final int TALK_NPC_2 = 34489; private static final int TALK_NPC_2 = 34489;
private static final int FINISH_NPC = 34490; private static final int FINISH_NPC = 34490;
// Misc // Misc
private static final int TALK_NPC_1_COND = 1;
private static final int TALK_NPC_2_COND = 2;
private static final int FINISH_NPC_COND = 3;
private static final int MIN_LEVEL = 110; private static final int MIN_LEVEL = 110;
public Q10516_UnveiledFafurionTemple() public Q10516_UnveiledFafurionTemple()
@@ -61,28 +64,29 @@ public class Q10516_UnveiledFafurionTemple extends Quest
if (qs.isCreated()) if (qs.isCreated())
{ {
qs.startQuest(); qs.startQuest();
qs.setCond(TALK_NPC_1_COND);
} }
break; break;
} }
case "talk_1_2.html": case "talk_1_2.html":
{ {
if ((npc.getId() == TALK_NPC_1) && qs.isCond(1)) if ((npc.getId() == TALK_NPC_1) && qs.isCond(TALK_NPC_1_COND))
{ {
qs.setCond(2, true); qs.setCond(TALK_NPC_2_COND, true);
} }
break; break;
} }
case "talk_2_2.html": case "talk_2_2.html":
{ {
if ((npc.getId() == TALK_NPC_2) && qs.isCond(2)) if ((npc.getId() == TALK_NPC_2) && qs.isCond(TALK_NPC_2_COND))
{ {
qs.setCond(3, true); qs.setCond(FINISH_NPC_COND, true);
} }
break; break;
} }
case "reward.html": case "reward.html":
{ {
if ((npc.getId() == FINISH_NPC) && qs.isCond(3)) if ((npc.getId() == FINISH_NPC) && qs.isCond(FINISH_NPC_COND))
{ {
// Reward. // Reward.
addExpAndSp(player, 5556186900L, 5556186); addExpAndSp(player, 5556186900L, 5556186);
@@ -126,11 +130,11 @@ public class Q10516_UnveiledFafurionTemple extends Quest
} }
case TALK_NPC_1: case TALK_NPC_1:
{ {
if (qs.isCond(1)) if (qs.isCond(TALK_NPC_1_COND))
{ {
htmltext = "talk_1_1.html"; htmltext = "talk_1_1.html";
} }
else if (qs.getCond() > 1) else if (qs.getCond() > TALK_NPC_1_COND)
{ {
htmltext = "talk_1_2.html"; htmltext = "talk_1_2.html";
} }
@@ -138,11 +142,11 @@ public class Q10516_UnveiledFafurionTemple extends Quest
} }
case TALK_NPC_2: case TALK_NPC_2:
{ {
if (qs.isCond(2)) if (qs.isCond(TALK_NPC_2_COND))
{ {
htmltext = "talk_2_1.html"; htmltext = "talk_2_1.html";
} }
else if (qs.getCond() > 2) else if (qs.getCond() > TALK_NPC_2_COND)
{ {
htmltext = "talk_2_2.html"; htmltext = "talk_2_2.html";
} }
@@ -150,7 +154,7 @@ public class Q10516_UnveiledFafurionTemple extends Quest
} }
case FINISH_NPC: case FINISH_NPC:
{ {
if (qs.isCond(3)) if (qs.isCond(FINISH_NPC_COND))
{ {
htmltext = "finish.html"; htmltext = "finish.html";
} }

View File

@@ -182,7 +182,7 @@ public class Q10517_FafurionsMinions extends Quest
if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(killer, MONSTER_DROP) >= REQUIRED_DROP_COUNT)) if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(killer, MONSTER_DROP) >= REQUIRED_DROP_COUNT))
{ {
qs.setCond(FINISH_COND); qs.setCond(FINISH_COND, true);
} }
sendNpcLogList(killer); sendNpcLogList(killer);

View File

@@ -102,7 +102,7 @@ public class Q10529_IvoryTowersResearchFloatingSeaJournal extends Quest
if (qs.isCreated()) if (qs.isCreated())
{ {
qs.startQuest(); qs.startQuest();
qs.setCond(KILLING_COND_1, true); qs.setCond(KILLING_COND_1);
} }
break; break;
} }
@@ -198,7 +198,7 @@ public class Q10529_IvoryTowersResearchFloatingSeaJournal extends Quest
{ {
if (giveItemRandomly(killer, npc, MONSTER_DROP_1, 1, REQUIRED_DROP_COUNT_1, 1, true)) if (giveItemRandomly(killer, npc, MONSTER_DROP_1, 1, REQUIRED_DROP_COUNT_1, 1, true))
{ {
qs.setCond(FINISH_COND_1); qs.setCond(FINISH_COND_1, true);
} }
sendNpcLogList(killer); sendNpcLogList(killer);
} }
@@ -206,7 +206,7 @@ public class Q10529_IvoryTowersResearchFloatingSeaJournal extends Quest
{ {
if (giveItemRandomly(killer, npc, MONSTER_DROP_2, 1, REQUIRED_DROP_COUNT_2, 1, true)) if (giveItemRandomly(killer, npc, MONSTER_DROP_2, 1, REQUIRED_DROP_COUNT_2, 1, true))
{ {
qs.setCond(FINISH_COND_2); qs.setCond(FINISH_COND_2, true);
} }
} }
} }