BETA: Core-part of [DP10411]

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -1949,7 +1949,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 		{
 			if (skill.getItemConsumeId() > 0)
 			{
-				if (!destroyItemByItemId("Consume", skill.getItemConsumeId(), skill.getItemConsume(), null, true))
+				if (!destroyItemByItemId("Consume", skill.getItemConsumeId(), skill.getItemConsumeCount(), null, true))
 				{
 					getActingPlayer().sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS);
 					abortCast();
@@ -2194,14 +2194,14 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			L2ItemInstance requiredItems = getInventory().getItemByItemId(skill.getItemConsumeId());
 			
 			// Check if the caster owns enough consumed Item to cast
-			if ((requiredItems == null) || (requiredItems.getCount() < skill.getItemConsume()))
+			if ((requiredItems == null) || (requiredItems.getCount() < skill.getItemConsumeCount()))
 			{
 				// Checked: when a summon skill failed, server show required consume item count
 				if (skill.hasEffectType(L2EffectType.SUMMON))
 				{
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SUMMONING_SERVITOR_COSTS_S2_S1);
 					sm.addItemName(skill.getItemConsumeId());
-					sm.addInt(skill.getItemConsume());
+					sm.addInt(skill.getItemConsumeCount());
 					sendPacket(sm);
 				}
 				else

L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/L2Item.java

@@ -669,6 +669,11 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable
 		return (getItemType() == EtcItemType.ELIXIR);
 	}
 	
+	public boolean isScroll()
+	{
+		return (getItemType() == EtcItemType.SCROLL);
+	}
+	
 	/**
 	 * Get the functions used by this item.
 	 * @param item : L2ItemInstance pointing out the item

L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/instance/L2ItemInstance.java

@@ -826,6 +826,11 @@ public final class L2ItemInstance extends L2Object
 		return _item.isElixir();
 	}
 	
+	public boolean isScroll()
+	{
+		return _item.isScroll();
+	}
+	
 	public boolean isHeroItem()
 	{
 		return _item.isHeroItem();

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/Skill.java

@@ -719,15 +719,15 @@ public final class Skill implements IChanceSkillTrigger, IIdentifiable
 	}
 	
 	/**
-	 * @return Returns the itemConsume.
+	 * @return Returns the how much items will be consumed.
 	 */
-	public int getItemConsume()
+	public int getItemConsumeCount()
 	{
 		return _itemConsumeCount;
 	}
 	
 	/**
-	 * @return Returns the itemConsumeId.
+	 * @return Returns the ID of item for consume.
 	 */
 	public int getItemConsumeId()
 	{