Browse Source

quests tweak

lion 13 years ago
parent
commit
a90bee22b5

+ 2 - 2
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);
 				}

+ 2 - 2
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);
 					}

+ 3 - 3
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);
 					}