2
0
Эх сурвалжийг харах

BETA: Core part for [DP9407]

malyelfik 12 жил өмнө
parent
commit
7071d7e8e4

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2TransformManagerInstance.java

@@ -94,7 +94,7 @@ public final class L2TransformManagerInstance extends L2MerchantInstance
 		{
 			if (canTransform(player))
 			{
-				L2TransformManagerInstance.showTransformSkillList(player);
+				showTransformSkillList(player);
 			}
 			else
 			{
@@ -289,7 +289,7 @@ public final class L2TransformManagerInstance extends L2MerchantInstance
 		{
 			return true;
 		}
-		final QuestState st = player.getQuestState("136_MoreThanMeetsTheEye");
+		final QuestState st = player.getQuestState("Q00136_MoreThanMeetsTheEye");
 		if ((st != null) && st.isCompleted())
 		{
 			return true;

+ 15 - 0
L2J_Server_BETA/java/com/l2jserver/gameserver/model/quest/QuestState.java

@@ -34,6 +34,7 @@ import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
 import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.model.quest.Quest.QuestSound;
 import com.l2jserver.gameserver.network.serverpackets.ExShowQuestMark;
@@ -621,6 +622,15 @@ public final class QuestState
 		return getQuest().hasQuestItems(getPlayer(), itemId);
 	}
 	
+	/**
+	 * @param itemIds list of items that are required
+	 * @return true if all items exists in player's inventory, false - if not
+	 */
+	public boolean hasQuestItems(int... itemIds)
+	{
+		return getQuest().hasQuestItems(getPlayer(), itemIds);
+	}
+	
 	/**
 	 * Return the level of enchantment on the weapon of the player(Done specifically for weapon SA's)
 	 * @param itemId Id of the item to check enchantment
@@ -661,6 +671,11 @@ public final class QuestState
 		giveItems(itemId, count, 0);
 	}
 	
+	public void giveItems(ItemHolder holder)
+	{
+		giveItems(holder.getId(), holder.getCount(), 0);
+	}
+	
 	public void giveItems(int itemId, long count, int enchantlevel)
 	{
 		getQuest().giveItems(getPlayer(), itemId, count, enchantlevel);