Fixed quest Odd Happenings At Dragon Valley (10531).

Contributed by Darkloud.
This commit is contained in:
MobiusDevelopment
2020-01-15 10:11:09 +00:00
parent 6a1f4c21ac
commit 438c637134
5 changed files with 100 additions and 85 deletions

View File

@@ -54,8 +54,9 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
23439, // IRON CAVE SERVANT 23439, // IRON CAVE SERVANT
20146, // HEADLESS KNIGHT 20146, // HEADLESS KNIGHT
}; };
// Rewards // Rewards
private static final int XP = 54308087; private static final int XP = 651696104;
private static final int SP = 23435; private static final int SP = 23435;
// Misc // Misc
private static final int MIN_LEVEL = 81; private static final int MIN_LEVEL = 81;
@@ -93,7 +94,12 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
htmltext = event; htmltext = event;
break; break;
} }
case "33973-06.html": case "33973-05.htm":
{
htmltext = event;
break;
}
case "33973-06.htm":
{ {
if (qs.isCond(2)) if (qs.isCond(2))
{ {
@@ -118,7 +124,8 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
public String onTalk(Npc npc, PlayerInstance player) public String onTalk(Npc npc, PlayerInstance player)
{ {
String htmltext = getNoQuestMsg(player); String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true); final QuestState qs = getQuestState(player, false);
switch (qs.getState()) switch (qs.getState())
{ {
case State.CREATED: case State.CREATED:
@@ -128,9 +135,9 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
} }
case State.STARTED: case State.STARTED:
{ {
if (qs.isCond(1)) if (qs.isCond(2))
{ {
htmltext = "33973-05.html"; htmltext = "33973-05.htm";
} }
break; break;
} }
@@ -147,22 +154,19 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon) public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{ {
final QuestState qs = getQuestState(killer, false); final QuestState qs = getQuestState(killer, false);
if ((qs != null) && qs.isStarted() && qs.isCond(1)) if ((qs != null) && qs.isStarted() && qs.isCond(1))
{ {
int killCount = qs.getInt("KILLED_COUNT"); int killCount = qs.getInt("KILLED_COUNT");
killCount++;
if (killCount < 100) qs.set("KILLED_COUNT", killCount);
{ if (killCount >= 200)
killCount++;
qs.set("KILLED_COUNT", killCount);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
if (killCount == 200)
{ {
qs.setCond(2, true); qs.setCond(2, true);
} }
else
{
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
} }
return super.onKill(npc, killer, isSummon); return super.onKill(npc, killer, isSummon);
} }
@@ -179,5 +183,4 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
} }
return super.getNpcLogList(player); return super.getNpcLogList(player);
} }
}
}

View File

@@ -54,8 +54,9 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
23439, // IRON CAVE SERVANT 23439, // IRON CAVE SERVANT
20146, // HEADLESS KNIGHT 20146, // HEADLESS KNIGHT
}; };
// Rewards // Rewards
private static final int XP = 54308087; private static final int XP = 651696104;
private static final int SP = 23435; private static final int SP = 23435;
// Misc // Misc
private static final int MIN_LEVEL = 81; private static final int MIN_LEVEL = 81;
@@ -93,7 +94,12 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
htmltext = event; htmltext = event;
break; break;
} }
case "33973-06.html": case "33973-05.htm":
{
htmltext = event;
break;
}
case "33973-06.htm":
{ {
if (qs.isCond(2)) if (qs.isCond(2))
{ {
@@ -118,7 +124,8 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
public String onTalk(Npc npc, PlayerInstance player) public String onTalk(Npc npc, PlayerInstance player)
{ {
String htmltext = getNoQuestMsg(player); String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true); final QuestState qs = getQuestState(player, false);
switch (qs.getState()) switch (qs.getState())
{ {
case State.CREATED: case State.CREATED:
@@ -128,9 +135,9 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
} }
case State.STARTED: case State.STARTED:
{ {
if (qs.isCond(1)) if (qs.isCond(2))
{ {
htmltext = "33973-05.html"; htmltext = "33973-05.htm";
} }
break; break;
} }
@@ -147,22 +154,19 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon) public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{ {
final QuestState qs = getQuestState(killer, false); final QuestState qs = getQuestState(killer, false);
if ((qs != null) && qs.isStarted() && qs.isCond(1)) if ((qs != null) && qs.isStarted() && qs.isCond(1))
{ {
int killCount = qs.getInt("KILLED_COUNT"); int killCount = qs.getInt("KILLED_COUNT");
killCount++;
if (killCount < 100) qs.set("KILLED_COUNT", killCount);
{ if (killCount >= 200)
killCount++;
qs.set("KILLED_COUNT", killCount);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
if (killCount == 200)
{ {
qs.setCond(2, true); qs.setCond(2, true);
} }
else
{
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
} }
return super.onKill(npc, killer, isSummon); return super.onKill(npc, killer, isSummon);
} }
@@ -179,5 +183,4 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
} }
return super.getNpcLogList(player); return super.getNpcLogList(player);
} }
}
}

View File

@@ -54,8 +54,9 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
23439, // IRON CAVE SERVANT 23439, // IRON CAVE SERVANT
20146, // HEADLESS KNIGHT 20146, // HEADLESS KNIGHT
}; };
// Rewards // Rewards
private static final int XP = 54308087; private static final int XP = 651696104;
private static final int SP = 23435; private static final int SP = 23435;
// Misc // Misc
private static final int MIN_LEVEL = 81; private static final int MIN_LEVEL = 81;
@@ -93,7 +94,12 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
htmltext = event; htmltext = event;
break; break;
} }
case "33973-06.html": case "33973-05.htm":
{
htmltext = event;
break;
}
case "33973-06.htm":
{ {
if (qs.isCond(2)) if (qs.isCond(2))
{ {
@@ -118,7 +124,8 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
public String onTalk(Npc npc, PlayerInstance player) public String onTalk(Npc npc, PlayerInstance player)
{ {
String htmltext = getNoQuestMsg(player); String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true); final QuestState qs = getQuestState(player, false);
switch (qs.getState()) switch (qs.getState())
{ {
case State.CREATED: case State.CREATED:
@@ -128,9 +135,9 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
} }
case State.STARTED: case State.STARTED:
{ {
if (qs.isCond(1)) if (qs.isCond(2))
{ {
htmltext = "33973-05.html"; htmltext = "33973-05.htm";
} }
break; break;
} }
@@ -147,22 +154,19 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon) public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{ {
final QuestState qs = getQuestState(killer, false); final QuestState qs = getQuestState(killer, false);
if ((qs != null) && qs.isStarted() && qs.isCond(1)) if ((qs != null) && qs.isStarted() && qs.isCond(1))
{ {
int killCount = qs.getInt("KILLED_COUNT"); int killCount = qs.getInt("KILLED_COUNT");
killCount++;
if (killCount < 100) qs.set("KILLED_COUNT", killCount);
{ if (killCount >= 200)
killCount++;
qs.set("KILLED_COUNT", killCount);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
if (killCount == 200)
{ {
qs.setCond(2, true); qs.setCond(2, true);
} }
else
{
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
} }
return super.onKill(npc, killer, isSummon); return super.onKill(npc, killer, isSummon);
} }
@@ -179,5 +183,4 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
} }
return super.getNpcLogList(player); return super.getNpcLogList(player);
} }
}
}

View File

@@ -54,8 +54,9 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
23439, // IRON CAVE SERVANT 23439, // IRON CAVE SERVANT
20146, // HEADLESS KNIGHT 20146, // HEADLESS KNIGHT
}; };
// Rewards // Rewards
private static final int XP = 54308087; private static final int XP = 651696104;
private static final int SP = 23435; private static final int SP = 23435;
// Misc // Misc
private static final int MIN_LEVEL = 81; private static final int MIN_LEVEL = 81;
@@ -93,7 +94,12 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
htmltext = event; htmltext = event;
break; break;
} }
case "33973-06.html": case "33973-05.htm":
{
htmltext = event;
break;
}
case "33973-06.htm":
{ {
if (qs.isCond(2)) if (qs.isCond(2))
{ {
@@ -118,7 +124,8 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
public String onTalk(Npc npc, PlayerInstance player) public String onTalk(Npc npc, PlayerInstance player)
{ {
String htmltext = getNoQuestMsg(player); String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true); final QuestState qs = getQuestState(player, false);
switch (qs.getState()) switch (qs.getState())
{ {
case State.CREATED: case State.CREATED:
@@ -128,9 +135,9 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
} }
case State.STARTED: case State.STARTED:
{ {
if (qs.isCond(1)) if (qs.isCond(2))
{ {
htmltext = "33973-05.html"; htmltext = "33973-05.htm";
} }
break; break;
} }
@@ -147,22 +154,19 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon) public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{ {
final QuestState qs = getQuestState(killer, false); final QuestState qs = getQuestState(killer, false);
if ((qs != null) && qs.isStarted() && qs.isCond(1)) if ((qs != null) && qs.isStarted() && qs.isCond(1))
{ {
int killCount = qs.getInt("KILLED_COUNT"); int killCount = qs.getInt("KILLED_COUNT");
killCount++;
if (killCount < 100) qs.set("KILLED_COUNT", killCount);
{ if (killCount >= 200)
killCount++;
qs.set("KILLED_COUNT", killCount);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
if (killCount == 200)
{ {
qs.setCond(2, true); qs.setCond(2, true);
} }
else
{
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
} }
return super.onKill(npc, killer, isSummon); return super.onKill(npc, killer, isSummon);
} }
@@ -179,5 +183,4 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
} }
return super.getNpcLogList(player); return super.getNpcLogList(player);
} }
}
}

View File

@@ -54,8 +54,9 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
23439, // IRON CAVE SERVANT 23439, // IRON CAVE SERVANT
20146, // HEADLESS KNIGHT 20146, // HEADLESS KNIGHT
}; };
// Rewards // Rewards
private static final int XP = 54308087; private static final int XP = 651696104;
private static final int SP = 23435; private static final int SP = 23435;
// Misc // Misc
private static final int MIN_LEVEL = 81; private static final int MIN_LEVEL = 81;
@@ -93,7 +94,12 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
htmltext = event; htmltext = event;
break; break;
} }
case "33973-06.html": case "33973-05.htm":
{
htmltext = event;
break;
}
case "33973-06.htm":
{ {
if (qs.isCond(2)) if (qs.isCond(2))
{ {
@@ -118,7 +124,8 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
public String onTalk(Npc npc, PlayerInstance player) public String onTalk(Npc npc, PlayerInstance player)
{ {
String htmltext = getNoQuestMsg(player); String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true); final QuestState qs = getQuestState(player, false);
switch (qs.getState()) switch (qs.getState())
{ {
case State.CREATED: case State.CREATED:
@@ -128,9 +135,9 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
} }
case State.STARTED: case State.STARTED:
{ {
if (qs.isCond(1)) if (qs.isCond(2))
{ {
htmltext = "33973-05.html"; htmltext = "33973-05.htm";
} }
break; break;
} }
@@ -147,22 +154,19 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon) public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{ {
final QuestState qs = getQuestState(killer, false); final QuestState qs = getQuestState(killer, false);
if ((qs != null) && qs.isStarted() && qs.isCond(1)) if ((qs != null) && qs.isStarted() && qs.isCond(1))
{ {
int killCount = qs.getInt("KILLED_COUNT"); int killCount = qs.getInt("KILLED_COUNT");
killCount++;
if (killCount < 100) qs.set("KILLED_COUNT", killCount);
{ if (killCount >= 200)
killCount++;
qs.set("KILLED_COUNT", killCount);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
if (killCount == 200)
{ {
qs.setCond(2, true); qs.setCond(2, true);
} }
else
{
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
} }
return super.onKill(npc, killer, isSummon); return super.onKill(npc, killer, isSummon);
} }
@@ -179,5 +183,4 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
} }
return super.getNpcLogList(player); return super.getNpcLogList(player);
} }
}
}