Quests should not have GM checks.
Thanks to nasseka.
This commit is contained in:
@@ -149,13 +149,7 @@ public class Q10967_CulturedAdventurer extends Quest
|
|||||||
if ((qs != null) && qs.isCond(1))
|
if ((qs != null) && qs.isCond(1))
|
||||||
{
|
{
|
||||||
final int killCount = qs.getInt(KILL_COUNT_VAR) + 1;
|
final int killCount = qs.getInt(KILL_COUNT_VAR) + 1;
|
||||||
if (killer.isGM())
|
if (killCount < 300)
|
||||||
{
|
|
||||||
qs.setCond(2, true);
|
|
||||||
qs.unset(KILL_COUNT_VAR);
|
|
||||||
killer.sendPacket(new ExShowScreenMessage(NpcStringId.MONSTERS_OF_THE_ABANDONED_CAMP_ARE_KILLED_NUSE_THE_TELEPORT_TO_GET_TO_BATHIS_IN_GLUDIO, 2, 5000));
|
|
||||||
}
|
|
||||||
else if (killCount < 300)
|
|
||||||
{
|
{
|
||||||
qs.set(KILL_COUNT_VAR, killCount);
|
qs.set(KILL_COUNT_VAR, killCount);
|
||||||
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
|
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
|
||||||
|
@@ -141,13 +141,7 @@ public class Q10967_CulturedAdventurer extends Quest
|
|||||||
if ((qs != null) && qs.isCond(1))
|
if ((qs != null) && qs.isCond(1))
|
||||||
{
|
{
|
||||||
final int killCount = qs.getInt(KILL_COUNT_VAR) + 1;
|
final int killCount = qs.getInt(KILL_COUNT_VAR) + 1;
|
||||||
if (killer.isGM())
|
if (killCount < 150)
|
||||||
{
|
|
||||||
qs.setCond(2, true);
|
|
||||||
qs.unset(KILL_COUNT_VAR);
|
|
||||||
killer.sendPacket(new ExShowScreenMessage(NpcStringId.MONSTERS_OF_THE_ABANDONED_CAMP_ARE_KILLED_NUSE_THE_TELEPORT_TO_GET_TO_BATHIS_IN_GLUDIO, 2, 5000));
|
|
||||||
}
|
|
||||||
else if (killCount < 150)
|
|
||||||
{
|
{
|
||||||
qs.set(KILL_COUNT_VAR, killCount);
|
qs.set(KILL_COUNT_VAR, killCount);
|
||||||
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
|
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
|
||||||
|
@@ -142,13 +142,7 @@ public class Q10291_MoreExperience extends Quest
|
|||||||
if ((qs != null) && qs.isCond(1))
|
if ((qs != null) && qs.isCond(1))
|
||||||
{
|
{
|
||||||
final int killCount = qs.getInt(KILL_COUNT_VAR) + 1;
|
final int killCount = qs.getInt(KILL_COUNT_VAR) + 1;
|
||||||
if (killer.isGM())
|
if (killCount < 50)
|
||||||
{
|
|
||||||
qs.setCond(2, true);
|
|
||||||
qs.unset(KILL_COUNT_VAR);
|
|
||||||
killer.sendPacket(new ExShowScreenMessage(NpcStringId.MONSTERS_OF_THE_ABANDONED_CAMP_ARE_KILLED_NUSE_THE_TELEPORT_TO_GET_TO_BATHIS_IN_GLUDIO, 2, 5000));
|
|
||||||
}
|
|
||||||
else if (killCount < 50)
|
|
||||||
{
|
{
|
||||||
qs.set(KILL_COUNT_VAR, killCount);
|
qs.set(KILL_COUNT_VAR, killCount);
|
||||||
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
|
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
|
||||||
|
@@ -142,13 +142,7 @@ public class Q10291_MoreExperience extends Quest
|
|||||||
if ((qs != null) && qs.isCond(1))
|
if ((qs != null) && qs.isCond(1))
|
||||||
{
|
{
|
||||||
final int killCount = qs.getInt(KILL_COUNT_VAR) + 1;
|
final int killCount = qs.getInt(KILL_COUNT_VAR) + 1;
|
||||||
if (killer.isGM())
|
if (killCount < 50)
|
||||||
{
|
|
||||||
qs.setCond(2, true);
|
|
||||||
qs.unset(KILL_COUNT_VAR);
|
|
||||||
killer.sendPacket(new ExShowScreenMessage(NpcStringId.MONSTERS_OF_THE_ABANDONED_CAMP_ARE_KILLED_USE_THE_TELEPORT_TO_GET_TO_BATHIS_IN_GLUDIO, 2, 5000));
|
|
||||||
}
|
|
||||||
else if (killCount < 50)
|
|
||||||
{
|
{
|
||||||
qs.set(KILL_COUNT_VAR, killCount);
|
qs.set(KILL_COUNT_VAR, killCount);
|
||||||
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
|
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
|
||||||
|
@@ -142,13 +142,7 @@ public class Q10291_MoreExperience extends Quest
|
|||||||
if ((qs != null) && qs.isCond(1))
|
if ((qs != null) && qs.isCond(1))
|
||||||
{
|
{
|
||||||
final int killCount = qs.getInt(KILL_COUNT_VAR) + 1;
|
final int killCount = qs.getInt(KILL_COUNT_VAR) + 1;
|
||||||
if (killer.isGM())
|
if (killCount < 50)
|
||||||
{
|
|
||||||
qs.setCond(2, true);
|
|
||||||
qs.unset(KILL_COUNT_VAR);
|
|
||||||
killer.sendPacket(new ExShowScreenMessage(NpcStringId.MONSTERS_OF_THE_ABANDONED_CAMP_ARE_KILLED_USE_THE_TELEPORT_TO_GET_TO_BATHIS_IN_GLUDIO, 2, 5000));
|
|
||||||
}
|
|
||||||
else if (killCount < 50)
|
|
||||||
{
|
{
|
||||||
qs.set(KILL_COUNT_VAR, killCount);
|
qs.set(KILL_COUNT_VAR, killCount);
|
||||||
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
|
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
|
||||||
|
Reference in New Issue
Block a user