From a90bee22b522db4d289a2df85b5a7e8aca8e60cd Mon Sep 17 00:00:00 2001
From: lion <lion@5288da4f-0efc-0310-bd40-8d490a2659fa>
Date: Wed, 25 Jan 2012 12:48:18 +0000
Subject: [PATCH] quests tweak
---
.../Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java | 4 ++--
.../Q10280_MutatedKaneusSchuttgart.java | 4 ++--
.../Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java
index 998c46c657..f3f4c7fb31 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java
@@ -76,7 +76,7 @@ public class Q10277_MutatedKaneusDion extends Quest
{
htmltext = getAlreadyCompletedMsg(player);
}
- else if ((st.getQuestItemsCount(TISSUE_CH) > 0) && (st.getQuestItemsCount(TISSUE_SF) > 0))
+ else if ((st.hasQuestItems(TISSUE_CH)) && (st.hasQuestItems(TISSUE_SF)))
{
htmltext = "30461-02.htm";
}
@@ -131,7 +131,7 @@ public class Q10277_MutatedKaneusDion extends Quest
for (L2PcInstance member : killer.getParty().getPartyMembers())
{
st = member.getQuestState(qn);
- if (((st != null) && st.isStarted() && (st.getInt("cond") == 1) && ((npc.getNpcId() == CRIMSON_HATU) && !st.hasQuestItems(TISSUE_CH))) || ((npc.getNpcId() == SEER_FLOUROS) && !st.hasQuestItems(TISSUE_SF)))
+ if (((st != null) && st.isStarted() && (st.getInt("cond") == 1) && ((npcId == CRIMSON_HATU) && !st.hasQuestItems(TISSUE_CH))) || ((npcId == SEER_FLOUROS) && !st.hasQuestItems(TISSUE_SF)))
{
PartyMembers.add(st);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java
index f4d604e95e..e2e35544a0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java
@@ -134,11 +134,11 @@ public class Q10280_MutatedKaneusSchuttgart extends Quest
st = member.getQuestState(qn);
if ((st != null) && st.isStarted() && (st.getInt("cond") == 1))
{
- if ((npc.getNpcId() == VENOMOUS_STORACE) && !st.hasQuestItems(TISSUE_VS))
+ if ((npcId == VENOMOUS_STORACE) && !st.hasQuestItems(TISSUE_VS))
{
PartyMembers.add(st);
}
- else if ((npc.getNpcId() == KEL_BILETTE) && !st.hasQuestItems(TISSUE_KB))
+ else if ((npcId == KEL_BILETTE) && !st.hasQuestItems(TISSUE_KB))
{
PartyMembers.add(st);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
index 758cc00590..5ca301e1b6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
@@ -61,7 +61,7 @@ public class Q10281_MutatedKaneusRune extends Quest
{
htmltext = (player.getLevel() >= 68) ? "31340-01.htm" : "31340-00.htm";
}
- else if (st.getQuestItemsCount(TISSUE_WA) > 0)
+ else if (st.hasQuestItems(TISSUE_WA))
{
htmltext = "31340-05.htm";
}
@@ -75,7 +75,7 @@ public class Q10281_MutatedKaneusRune extends Quest
{
htmltext = Quest.getAlreadyCompletedMsg(player);
}
- else if (st.getQuestItemsCount(TISSUE_WA) > 0)
+ else if (st.hasQuestItems(TISSUE_WA))
{
htmltext = "31335-02.htm";
}
@@ -134,7 +134,7 @@ public class Q10281_MutatedKaneusRune extends Quest
st = member.getQuestState(qn);
if ((st != null) && st.isStarted() && (st.getInt("cond") == 1))
{
- if ((npcId == WHITE_ALLOSCE) && (st.getQuestItemsCount(TISSUE_WA) == 0))
+ if ((npcId == WHITE_ALLOSCE) && (!st.hasQuestItems(TISSUE_WA)))
{
PartyMembers.add(st);
}
--
GitLab