lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed kill condition check for quest Facing Sadness (10812).

Browse Source 
Contributed by angelus_ira.
This commit is contained in:
MobiusDevelopment 2020-07-09 03:50:58 +00:00
parent c9648c50ad
commit dc4a84c2c3
7 changed files with 42 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java vendored
View File

@ -189,10 +189,13 @@ public class Q10812_FacingSadness extends Quest
public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
if ((qs != null) && qs.isCond(1) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
{
giveItems(player, PROOF_OF_DISPOSAL, CommonUtil.contains(MONSTERS_1, npc.getId()) ? 1 : 2);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
if (getQuestItemsCount(player, PROOF_OF_DISPOSAL) < 8000)
{
giveItems(player, PROOF_OF_DISPOSAL, CommonUtil.contains(MONSTERS_1, npc.getId()) ? 1 : 2);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
if (getQuestItemsCount(player, PROOF_OF_DISPOSAL) >= 8000)
{
qs.setCond(2, true);

9
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java vendored
View File

@ -189,10 +189,13 @@ public class Q10812_FacingSadness extends Quest
public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
if ((qs != null) && qs.isCond(1) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
{
giveItems(player, PROOF_OF_DISPOSAL, CommonUtil.contains(MONSTERS_1, npc.getId()) ? 1 : 2);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
if (getQuestItemsCount(player, PROOF_OF_DISPOSAL) < 8000)
{
giveItems(player, PROOF_OF_DISPOSAL, CommonUtil.contains(MONSTERS_1, npc.getId()) ? 1 : 2);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
if (getQuestItemsCount(player, PROOF_OF_DISPOSAL) >= 8000)
{
qs.setCond(2, true);

10
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java vendored
View File

@ -17,7 +17,6 @@
package quests.Q10812_FacingSadness;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.enums.QuestSound;
import org.l2jmobius.gameserver.instancemanager.QuestManager;
import org.l2jmobius.gameserver.model.actor.Npc;
@ -220,10 +219,13 @@ public class Q10812_FacingSadness extends Quest
public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE) && CommonUtil.contains(MONSTERS, npc.getId()))
if ((qs != null) && qs.isCond(1) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
{
giveItems(player, PROOF_OF_DISPOSAL, 1);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
if (getQuestItemsCount(player, PROOF_OF_DISPOSAL) < 8000)
{
giveItems(player, PROOF_OF_DISPOSAL, 1);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
if (getQuestItemsCount(player, PROOF_OF_DISPOSAL) >= 8000)
{
qs.setCond(2, true);

10
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java vendored
View File

@ -17,7 +17,6 @@
package quests.Q10812_FacingSadness;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.enums.QuestSound;
import org.l2jmobius.gameserver.instancemanager.QuestManager;
import org.l2jmobius.gameserver.model.actor.Npc;
@ -220,10 +219,13 @@ public class Q10812_FacingSadness extends Quest
public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE) && CommonUtil.contains(MONSTERS, npc.getId()))
if ((qs != null) && qs.isCond(1) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
{
giveItems(player, PROOF_OF_DISPOSAL, 1);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
if (getQuestItemsCount(player, PROOF_OF_DISPOSAL) < 8000)
{
giveItems(player, PROOF_OF_DISPOSAL, 1);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
if (getQuestItemsCount(player, PROOF_OF_DISPOSAL) >= 8000)
{
qs.setCond(2, true);

10
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java vendored
View File

@ -17,7 +17,6 @@
package quests.Q10812_FacingSadness;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.enums.QuestSound;
import org.l2jmobius.gameserver.instancemanager.QuestManager;
import org.l2jmobius.gameserver.model.actor.Npc;
@ -220,10 +219,13 @@ public class Q10812_FacingSadness extends Quest
public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE) && CommonUtil.contains(MONSTERS, npc.getId()))
if ((qs != null) && qs.isCond(1) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
{
giveItems(player, PROOF_OF_DISPOSAL, 1);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
if (getQuestItemsCount(player, PROOF_OF_DISPOSAL) < 8000)
{
giveItems(player, PROOF_OF_DISPOSAL, 1);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
if (getQuestItemsCount(player, PROOF_OF_DISPOSAL) >= 8000)
{
qs.setCond(2, true);

10
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java vendored
View File

@ -17,7 +17,6 @@
package quests.Q10812_FacingSadness;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.enums.QuestSound;
import org.l2jmobius.gameserver.instancemanager.QuestManager;
import org.l2jmobius.gameserver.model.actor.Npc;
@ -220,10 +219,13 @@ public class Q10812_FacingSadness extends Quest
public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE) && CommonUtil.contains(MONSTERS, npc.getId()))
if ((qs != null) && qs.isCond(1) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
{
giveItems(player, PROOF_OF_DISPOSAL, 1);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
if (getQuestItemsCount(player, PROOF_OF_DISPOSAL) < 8000)
{
giveItems(player, PROOF_OF_DISPOSAL, 1);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
if (getQuestItemsCount(player, PROOF_OF_DISPOSAL) >= 8000)
{
qs.setCond(2, true);

10
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java vendored
View File

@ -17,7 +17,6 @@
package quests.Q10812_FacingSadness;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.enums.QuestSound;
import org.l2jmobius.gameserver.instancemanager.QuestManager;
import org.l2jmobius.gameserver.model.actor.Npc;
@ -220,10 +219,13 @@ public class Q10812_FacingSadness extends Quest
public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE) && CommonUtil.contains(MONSTERS, npc.getId()))
if ((qs != null) && qs.isCond(1) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
{
giveItems(player, PROOF_OF_DISPOSAL, 1);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
if (getQuestItemsCount(player, PROOF_OF_DISPOSAL) < 8000)
{
giveItems(player, PROOF_OF_DISPOSAL, 1);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
if (getQuestItemsCount(player, PROOF_OF_DISPOSAL) >= 8000)
{
qs.setCond(2, true);