Improvements for quest Seven Signs Girl of Doubt (10292).

This commit is contained in:
MobiusDevelopment
2020-01-14 20:48:49 +00:00
parent b1a5ff9dba
commit 411782efce
8 changed files with 14 additions and 17 deletions

View File

@@ -37,7 +37,6 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest
private static final int HARDIN = 30832; private static final int HARDIN = 30832;
private static final int WOOD = 32593; private static final int WOOD = 32593;
private static final int FRANZ = 32597; private static final int FRANZ = 32597;
private static final int JAINA = 32617;
private static final int ELCADIA = 32784; private static final int ELCADIA = 32784;
// Item // Item
private static final ItemHolder ELCADIAS_MARK = new ItemHolder(17226, 10); private static final ItemHolder ELCADIAS_MARK = new ItemHolder(17226, 10);
@@ -61,7 +60,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest
{ {
super(10292); super(10292);
addStartNpc(WOOD); addStartNpc(WOOD);
addTalkId(WOOD, FRANZ, JAINA, ELCADIA, HARDIN); addTalkId(WOOD, FRANZ, ELCADIA, HARDIN);
addKillId(MOBS); addKillId(MOBS);
addKillId(CREATURE_OF_THE_DUSK1, CREATURE_OF_THE_DUSK2); addKillId(CREATURE_OF_THE_DUSK1, CREATURE_OF_THE_DUSK2);
addCondMinLevel(MIN_LEVEL, "32593-03.htm"); addCondMinLevel(MIN_LEVEL, "32593-03.htm");

View File

@@ -37,7 +37,6 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest
private static final int HARDIN = 30832; private static final int HARDIN = 30832;
private static final int WOOD = 32593; private static final int WOOD = 32593;
private static final int FRANZ = 32597; private static final int FRANZ = 32597;
private static final int JAINA = 32617;
private static final int ELCADIA = 32784; private static final int ELCADIA = 32784;
// Item // Item
private static final ItemHolder ELCADIAS_MARK = new ItemHolder(17226, 10); private static final ItemHolder ELCADIAS_MARK = new ItemHolder(17226, 10);
@@ -61,7 +60,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest
{ {
super(10292); super(10292);
addStartNpc(WOOD); addStartNpc(WOOD);
addTalkId(WOOD, FRANZ, JAINA, ELCADIA, HARDIN); addTalkId(WOOD, FRANZ, ELCADIA, HARDIN);
addKillId(MOBS); addKillId(MOBS);
addKillId(CREATURE_OF_THE_DUSK1, CREATURE_OF_THE_DUSK2); addKillId(CREATURE_OF_THE_DUSK1, CREATURE_OF_THE_DUSK2);
addCondMinLevel(MIN_LEVEL, "32593-03.htm"); addCondMinLevel(MIN_LEVEL, "32593-03.htm");

View File

@@ -37,7 +37,6 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest
private static final int HARDIN = 30832; private static final int HARDIN = 30832;
private static final int WOOD = 32593; private static final int WOOD = 32593;
private static final int FRANZ = 32597; private static final int FRANZ = 32597;
private static final int JAINA = 32617;
private static final int ELCADIA = 32784; private static final int ELCADIA = 32784;
// Item // Item
private static final ItemHolder ELCADIAS_MARK = new ItemHolder(17226, 10); private static final ItemHolder ELCADIAS_MARK = new ItemHolder(17226, 10);
@@ -57,7 +56,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest
{ {
super(10292); super(10292);
addStartNpc(WOOD); addStartNpc(WOOD);
addTalkId(WOOD, FRANZ, JAINA, ELCADIA, HARDIN); addTalkId(WOOD, FRANZ, ELCADIA, HARDIN);
addKillId(MOBS); addKillId(MOBS);
addKillId(CREATURE_OF_THE_DUSK1, CREATURE_OF_THE_DUSK2); addKillId(CREATURE_OF_THE_DUSK1, CREATURE_OF_THE_DUSK2);
addCondMinLevel(MIN_LEVEL, "32593-03.htm"); addCondMinLevel(MIN_LEVEL, "32593-03.htm");

View File

@@ -37,7 +37,6 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest
private static final int HARDIN = 30832; private static final int HARDIN = 30832;
private static final int WOOD = 32593; private static final int WOOD = 32593;
private static final int FRANZ = 32597; private static final int FRANZ = 32597;
private static final int JAINA = 32617;
private static final int ELCADIA = 32784; private static final int ELCADIA = 32784;
// Item // Item
private static final ItemHolder ELCADIAS_MARK = new ItemHolder(17226, 10); private static final ItemHolder ELCADIAS_MARK = new ItemHolder(17226, 10);
@@ -57,7 +56,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest
{ {
super(10292); super(10292);
addStartNpc(WOOD); addStartNpc(WOOD);
addTalkId(WOOD, FRANZ, JAINA, ELCADIA, HARDIN); addTalkId(WOOD, FRANZ, ELCADIA, HARDIN);
addKillId(MOBS); addKillId(MOBS);
addKillId(CREATURE_OF_THE_DUSK1, CREATURE_OF_THE_DUSK2); addKillId(CREATURE_OF_THE_DUSK1, CREATURE_OF_THE_DUSK2);
addCondMinLevel(MIN_LEVEL, "32593-03.htm"); addCondMinLevel(MIN_LEVEL, "32593-03.htm");

View File

@@ -37,7 +37,6 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest
private static final int HARDIN = 30832; private static final int HARDIN = 30832;
private static final int WOOD = 32593; private static final int WOOD = 32593;
private static final int FRANZ = 32597; private static final int FRANZ = 32597;
private static final int JAINA = 32617;
private static final int ELCADIA = 32784; private static final int ELCADIA = 32784;
// Item // Item
private static final ItemHolder ELCADIAS_MARK = new ItemHolder(17226, 10); private static final ItemHolder ELCADIAS_MARK = new ItemHolder(17226, 10);
@@ -57,7 +56,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest
{ {
super(10292); super(10292);
addStartNpc(WOOD); addStartNpc(WOOD);
addTalkId(WOOD, FRANZ, JAINA, ELCADIA, HARDIN); addTalkId(WOOD, FRANZ, ELCADIA, HARDIN);
addKillId(MOBS); addKillId(MOBS);
addKillId(CREATURE_OF_THE_DUSK1, CREATURE_OF_THE_DUSK2); addKillId(CREATURE_OF_THE_DUSK1, CREATURE_OF_THE_DUSK2);
addCondMinLevel(MIN_LEVEL, "32593-03.htm"); addCondMinLevel(MIN_LEVEL, "32593-03.htm");

View File

@@ -37,7 +37,6 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest
private static final int HARDIN = 30832; private static final int HARDIN = 30832;
private static final int WOOD = 32593; private static final int WOOD = 32593;
private static final int FRANZ = 32597; private static final int FRANZ = 32597;
private static final int JAINA = 32617;
private static final int ELCADIA = 32784; private static final int ELCADIA = 32784;
// Item // Item
private static final ItemHolder ELCADIAS_MARK = new ItemHolder(17226, 10); private static final ItemHolder ELCADIAS_MARK = new ItemHolder(17226, 10);
@@ -57,7 +56,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest
{ {
super(10292); super(10292);
addStartNpc(WOOD); addStartNpc(WOOD);
addTalkId(WOOD, FRANZ, JAINA, ELCADIA, HARDIN); addTalkId(WOOD, FRANZ, ELCADIA, HARDIN);
addKillId(MOBS); addKillId(MOBS);
addKillId(CREATURE_OF_THE_DUSK1, CREATURE_OF_THE_DUSK2); addKillId(CREATURE_OF_THE_DUSK1, CREATURE_OF_THE_DUSK2);
addCondMinLevel(MIN_LEVEL, "32593-03.htm"); addCondMinLevel(MIN_LEVEL, "32593-03.htm");

View File

@@ -37,7 +37,6 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest
private static final int HARDIN = 30832; private static final int HARDIN = 30832;
private static final int WOOD = 32593; private static final int WOOD = 32593;
private static final int FRANZ = 32597; private static final int FRANZ = 32597;
private static final int JAINA = 32617;
private static final int ELCADIA = 32784; private static final int ELCADIA = 32784;
// Item // Item
private static final ItemHolder ELCADIAS_MARK = new ItemHolder(17226, 10); private static final ItemHolder ELCADIAS_MARK = new ItemHolder(17226, 10);
@@ -57,7 +56,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest
{ {
super(10292); super(10292);
addStartNpc(WOOD); addStartNpc(WOOD);
addTalkId(WOOD, FRANZ, JAINA, ELCADIA, HARDIN); addTalkId(WOOD, FRANZ, ELCADIA, HARDIN);
addKillId(MOBS); addKillId(MOBS);
addKillId(CREATURE_OF_THE_DUSK1, CREATURE_OF_THE_DUSK2); addKillId(CREATURE_OF_THE_DUSK1, CREATURE_OF_THE_DUSK2);
addCondMinLevel(MIN_LEVEL, "32593-03.htm"); addCondMinLevel(MIN_LEVEL, "32593-03.htm");

View File

@@ -42,8 +42,8 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest
// Misc // Misc
private static final int MIN_LEVEL = 81; private static final int MIN_LEVEL = 81;
// Variables // Variables
private static int killCount = 0;
private static final String I_QUEST1 = "I_QUEST1"; private static final String I_QUEST1 = "I_QUEST1";
private static final String KILLCOUNT_VAR = "killCount";
// Monster // Monster
private static final int CREATURE_OF_THE_DUSK1 = 27422; private static final int CREATURE_OF_THE_DUSK1 = 27422;
private static final int CREATURE_OF_THE_DUSK2 = 27424; private static final int CREATURE_OF_THE_DUSK2 = 27424;
@@ -208,12 +208,16 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest
} }
else else
{ {
killCount++; if (qs.getInt(KILLCOUNT_VAR) == 1)
if (killCount == 2)
{ {
qs.unset(KILLCOUNT_VAR);
qs.setMemoState(6); qs.setMemoState(6);
qs.setCond(6); qs.setCond(6);
} }
else
{
qs.set(KILLCOUNT_VAR, 1);
}
} }
} }
return super.onKill(npc, player, isSummon); return super.onKill(npc, player, isSummon);