BETA: Unhardcoding Adena Id, use this constant PcInventory.ADENA_ID.

	* Unhardcoded Seal Stones Ids.
	* Removed duplicated constant for Ancient Adena.

L2J_Server_BETA/java/com/l2jserver/Config.java

@@ -45,6 +45,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.util.FloodProtectorConfig;
 import com.l2jserver.util.L2Properties;
 import com.l2jserver.util.StringUtil;
@@ -2331,9 +2332,9 @@ public final class Config
 							}
 						}
 					}
-					if (RATE_DROP_ITEMS_ID.get(57) == 0f)
+					if (RATE_DROP_ITEMS_ID.get(PcInventory.ADENA_ID) == 0f)
 					{
-						RATE_DROP_ITEMS_ID.put(57, RATE_DROP_ITEMS); //for Adena rate if not defined
+						RATE_DROP_ITEMS_ID.put(PcInventory.ADENA_ID, RATE_DROP_ITEMS); //for Adena rate if not defined
 					}
 				}
 				catch (Exception e)
@@ -3120,7 +3121,7 @@ public final class Config
 		else if (pName.equalsIgnoreCase("RateConsumableCost")) RATE_CONSUMABLE_COST = Float.parseFloat(pValue);
 		else if (pName.equalsIgnoreCase("RateExtractFish")) RATE_EXTR_FISH = Float.parseFloat(pValue);
 		else if (pName.equalsIgnoreCase("RateDropItems")) RATE_DROP_ITEMS = Float.parseFloat(pValue);
-		else if (pName.equalsIgnoreCase("RateDropAdena")) RATE_DROP_ITEMS_ID.put(57, Float.parseFloat(pValue));
+		else if (pName.equalsIgnoreCase("RateDropAdena")) RATE_DROP_ITEMS_ID.put(PcInventory.ADENA_ID, Float.parseFloat(pValue));
 		else if (pName.equalsIgnoreCase("RateRaidDropItems")) RATE_DROP_ITEMS_BY_RAID = Float.parseFloat(pValue);
 		else if (pName.equalsIgnoreCase("RateDropSpoil")) RATE_DROP_SPOIL = Float.parseFloat(pValue);
 		else if (pName.equalsIgnoreCase("RateDropManor")) RATE_DROP_MANOR = Integer.parseInt(pValue);

L2J_Server_BETA/java/com/l2jserver/gameserver/FortUpdater.java

@@ -21,6 +21,7 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.instancemanager.CastleManager;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.entity.Fort;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 
 /**
  * Class managing periodical events with castle
@@ -65,7 +66,7 @@ public class FortUpdater implements Runnable
 					{
 						if (_clan.getWarehouse().getAdena() >= Config.FS_FEE_FOR_CASTLE)
 						{
-							_clan.getWarehouse().destroyItemByItemId("FS_fee_for_Castle", 57, Config.FS_FEE_FOR_CASTLE, null, null);
+							_clan.getWarehouse().destroyItemByItemId("FS_fee_for_Castle", PcInventory.ADENA_ID, Config.FS_FEE_FOR_CASTLE, null, null);
 							CastleManager.getInstance().getCastleById(_fort.getCastleId()).addToTreasuryNoTax(Config.FS_FEE_FOR_CASTLE);
 							_fort.raiseSupplyLvL();
 						}

L2J_Server_BETA/java/com/l2jserver/gameserver/SevenSigns.java

@@ -83,7 +83,6 @@ public class SevenSigns
 	public static final int PERIOD_MINOR_LENGTH = 900000;
 	public static final int PERIOD_MAJOR_LENGTH = 604800000 - PERIOD_MINOR_LENGTH;
 	
-	public static final int ANCIENT_ADENA_ID = 5575;
 	public static final int RECORD_SEVEN_SIGNS_ID = 5707;
 	public static final int CERTIFICATE_OF_APPROVAL_ID = 6388;
 	public static final int RECORD_SEVEN_SIGNS_COST = 500;
@@ -99,11 +98,13 @@ public class SevenSigns
 	public static final int ANAKIM_NPC_ID = 25286;
 	public static final int CREST_OF_DAWN_ID = 31170;
 	public static final int CREST_OF_DUSK_ID = 31171;
-	// Seal Stone Related Constants \\
+	// Seal Stone Related Constants
 	public static final int SEAL_STONE_BLUE_ID = 6360;
 	public static final int SEAL_STONE_GREEN_ID = 6361;
 	public static final int SEAL_STONE_RED_ID = 6362;
 	
+	public static final int[] SEAL_STONE_IDS = { SEAL_STONE_BLUE_ID, SEAL_STONE_GREEN_ID, SEAL_STONE_RED_ID };
+	
 	public static final int SEAL_STONE_BLUE_VALUE = 3;
 	public static final int SEAL_STONE_GREEN_VALUE = 5;
 	public static final int SEAL_STONE_RED_VALUE = 10;

L2J_Server_BETA/java/com/l2jserver/gameserver/communitybbs/Manager/RegionBBSManager.java

@@ -30,6 +30,7 @@ import com.l2jserver.gameserver.datatables.ExperienceTable;
 import com.l2jserver.gameserver.model.BlockList;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
 import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
@@ -354,7 +355,7 @@ public class RegionBBSManager extends BaseBBSManager
 					+ "SP Rate: x", String.valueOf(Config.RATE_SP), tdClose + colSpacer + tdOpen + "Party SP Rate: x", String.valueOf(Config.RATE_SP
 							* Config.RATE_PARTY_SP), tdClose + colSpacer + tdOpen + "SP Exponent: ", String.valueOf(Config.ALT_GAME_EXPONENT_SP), tdClose
 							+ trClose + trOpen + tdOpen + "Drop Rate: ", String.valueOf(Config.RATE_DROP_ITEMS), tdClose + colSpacer + tdOpen
-							+ "Spoil Rate: ", String.valueOf(Config.RATE_DROP_SPOIL), tdClose + colSpacer + tdOpen + "Adena Rate: ", String.valueOf(Config.RATE_DROP_ITEMS_ID.get(57)), tdClose
+							+ "Spoil Rate: ", String.valueOf(Config.RATE_DROP_SPOIL), tdClose + colSpacer + tdOpen + "Adena Rate: ", String.valueOf(Config.RATE_DROP_ITEMS_ID.get(PcInventory.ADENA_ID)), tdClose
 							+ trClose
 							+ "</table>"
 							+ "<table>"
@@ -445,7 +446,7 @@ public class RegionBBSManager extends BaseBBSManager
 					+ trClose + trOpen + tdOpen + "SP Rate: ", String.valueOf(Config.RATE_SP), tdClose + colSpacer + tdOpen
 					+ "Party SP Rate: ", String.valueOf(Config.RATE_PARTY_SP), tdClose + colSpacer + tdOpen + "SP Exponent: ", String.valueOf(Config.ALT_GAME_EXPONENT_SP), tdClose
 					+ trClose + trOpen + tdOpen + "Drop Rate: ", String.valueOf(Config.RATE_DROP_ITEMS), tdClose + colSpacer + tdOpen
-					+ "Spoil Rate: ", String.valueOf(Config.RATE_DROP_SPOIL), tdClose + colSpacer + tdOpen + "Adena Rate: ", String.valueOf(Config.RATE_DROP_ITEMS_ID.get(57)), tdClose
+					+ "Spoil Rate: ", String.valueOf(Config.RATE_DROP_SPOIL), tdClose + colSpacer + tdOpen + "Adena Rate: ", String.valueOf(Config.RATE_DROP_ITEMS_ID.get(PcInventory.ADENA_ID)), tdClose
 					+ trClose
 					+ "</table>"
 					+ "<table>"

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2DropCategory.java

@@ -17,6 +17,9 @@ package com.l2jserver.gameserver.model;
 import javolution.util.FastList;
 
 import com.l2jserver.Config;
+import com.l2jserver.gameserver.SevenSigns;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
+import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
 /**
@@ -136,7 +139,7 @@ public class L2DropCategory
 		int subCatChance = 0;
 		for (L2DropData drop : getAllDrops())
 		{
-			if ((drop.getItemId() == 57) || (drop.getItemId() == 6360)|| (drop.getItemId() == 6361)|| (drop.getItemId() == 6362))
+			if ((drop.getItemId() == PcInventory.ADENA_ID) || Util.contains(SevenSigns.SEAL_STONE_IDS, drop.getItemId()))
 			{
 				drops.add(drop);
 				subCatChance += drop.getChance();

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

@@ -37,6 +37,7 @@ import com.l2jserver.gameserver.instancemanager.MercTicketManager;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.knownlist.NullKnownList;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.DropItem;
@@ -257,7 +258,7 @@ public final class L2ItemInstance extends L2Object
 			ItemsOnGroundManager.getInstance().removeObject(this);
 		}
 		
-		if (!Config.DISABLE_TUTORIAL && (itemId == 57 || itemId == 6353))
+		if (!Config.DISABLE_TUTORIAL && (itemId == PcInventory.ADENA_ID || itemId == 6353))
 		{
 			//Note from UnAfraid:
 			//Unhardcode this?
@@ -774,7 +775,7 @@ public final class L2ItemInstance extends L2Object
 				&& (getItem().getType2() != L2Item.TYPE2_MONEY || getItem().getType1() != L2Item.TYPE1_SHIELD_ARMOR) // not money, not shield
 				&& (player.getPet() == null || getObjectId() != player.getPet().getControlObjectId()) // Not Control item of currently summoned pet
 				&& (player.getActiveEnchantItem() != this) // Not momentarily used enchant scroll
-				&& (allowAdena || getItemId() != 57) // Not adena
+				&& (allowAdena || getItemId() != PcInventory.ADENA_ID) // Not Adena
 				&& (player.getCurrentSkill() == null || player.getCurrentSkill().getSkill().getItemConsumeId() != getItemId())
 				&& (!player.isCastingSimultaneouslyNow() || player.getLastSimultaneousSkillCast() == null || player.getLastSimultaneousSkillCast().getItemConsumeId() != getItemId())
 				&& (allowNonTradeable || isTradeable()

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Party.java

@@ -37,6 +37,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance;
 import com.l2jserver.gameserver.model.entity.DimensionalRift;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
 import com.l2jserver.gameserver.network.serverpackets.ExAskModifyPartyLooting;
@@ -627,7 +628,7 @@ public class L2Party
 	 */
 	public void distributeItem(L2PcInstance player, L2ItemInstance item)
 	{
-		if (item.getItemId() == 57)
+		if (item.getItemId() == PcInventory.ADENA_ID)
 		{
 			distributeAdena(player, item.getCount(), player);
 			ItemTable.getInstance().destroyItem("Party", item, player, null);
@@ -666,7 +667,7 @@ public class L2Party
 	{
 		if (item == null) return;
 		
-		if (item.getItemId() == 57)
+		if (item.getItemId() == PcInventory.ADENA_ID)
 		{
 			distributeAdena(player, item.getCount(), target);
 			return;

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

@@ -22,6 +22,7 @@ import javolution.util.FastMap;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.ItemsAutoDestroy;
+import com.l2jserver.gameserver.SevenSigns;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlEvent;
 import com.l2jserver.gameserver.ai.CtrlIntention;
@@ -51,6 +52,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance;
 import com.l2jserver.gameserver.model.actor.knownlist.AttackableKnownList;
 import com.l2jserver.gameserver.model.actor.status.AttackableStatus;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
@@ -1198,7 +1200,7 @@ public class L2Attackable extends L2Npc
 				// We should multiply by the server's drop rate, so we always get a low chance of drop for deep blue mobs.
 				// NOTE: This is valid only for adena drops! Others drops will still obey server's rate
 				deepBlueDrop = 3;
-				if (drop.getItemId() == 57)
+				if (drop.getItemId() == PcInventory.ADENA_ID)
 					deepBlueDrop *= isRaid() && !isRaidMinion() ? (int) Config.RATE_DROP_ITEMS_BY_RAID : (int) Config.RATE_DROP_ITEMS;
 			}
 		}
@@ -1260,10 +1262,11 @@ public class L2Attackable extends L2Npc
 			// Prepare for next iteration if dropChance > L2DropData.MAX_CHANCE
 			dropChance -= L2DropData.MAX_CHANCE;
 		}
-		if (Config.L2JMOD_CHAMPION_ENABLE)
-			// TODO (April 11, 2009): Find a way not to hardcode these values.
-			if ((drop.getItemId() == 57 || (drop.getItemId() >= 6360 && drop.getItemId() <= 6362)) && isChampion())
-				itemCount *= Config.L2JMOD_CHAMPION_ADENAS_REWARDS;
+		
+		if (Config.L2JMOD_CHAMPION_ENABLE && isChampion() && ((drop.getItemId() == PcInventory.ADENA_ID) || Util.contains(SevenSigns.SEAL_STONE_IDS, drop.getItemId())))
+		{
+			itemCount *= Config.L2JMOD_CHAMPION_ADENAS_REWARDS;
+		}
 		
 		if (itemCount > 0)
 			return new RewardItem(drop.getItemId(), itemCount);
@@ -1393,10 +1396,11 @@ public class L2Attackable extends L2Npc
 				// Prepare for next iteration if dropChance > L2DropData.MAX_CHANCE
 				dropChance -= L2DropData.MAX_CHANCE;
 			}
-			if (Config.L2JMOD_CHAMPION_ENABLE)
-				// TODO (April 11, 2009): Find a way not to hardcode these values.
-				if ((drop.getItemId() == 57 || (drop.getItemId() >= 6360 && drop.getItemId() <= 6362)) && isChampion())
-					itemCount *= Config.L2JMOD_CHAMPION_ADENAS_REWARDS;
+			
+			if (Config.L2JMOD_CHAMPION_ENABLE && isChampion() && ((drop.getItemId() == PcInventory.ADENA_ID) || Util.contains(SevenSigns.SEAL_STONE_IDS, drop.getItemId())))
+			{
+				itemCount *= Config.L2JMOD_CHAMPION_ADENAS_REWARDS;
+			}
 			
 			if (!Config.MULTIPLE_ITEM_DROP && !ItemTable.getInstance().getTemplate(drop.getItemId()).isStackable() && itemCount > 1)
 				itemCount = 1;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -3832,7 +3832,7 @@ public final class L2PcInstance extends L2Playable
 	@Override
 	public boolean destroyItemByItemId(String process, int itemId, long count, L2Object reference, boolean sendMessage)
 	{
-		if (itemId == 57)
+		if (itemId == PcInventory.ADENA_ID)
 			return reduceAdena(process, count, reference, sendMessage);
 		
 		L2ItemInstance item = _inventory.getItemByItemId(itemId);
@@ -4713,8 +4713,10 @@ public final class L2PcInstance extends L2Playable
 	{
 		if (isInParty()&&ItemTable.getInstance().getTemplate(item.getItemId()).getItemType() != L2EtcItemType.HERB)
 			getParty().distributeItem(this, item, false, target);
-		else if (item.getItemId() == 57) addAdena("Loot", item.getCount(), target, true);
-		else addItem("Loot", item.getItemId(), item.getCount(), target, true);
+		else if (item.getItemId() == PcInventory.ADENA_ID)
+			addAdena("Loot", item.getCount(), target, true);
+		else
+			addItem("Loot", item.getItemId(), item.getCount(), target, true);
 	}
 	
 	
@@ -4798,7 +4800,7 @@ public final class L2PcInstance extends L2Playable
 			
 			if (target.getOwnerId() != 0 && target.getOwnerId() != getObjectId() && !isInLooterParty(target.getOwnerId()))
 			{
-				if (target.getItemId() == 57)
+				if (target.getItemId() == PcInventory.ADENA_ID)
 				{
 					smsg = SystemMessage.getSystemMessage(SystemMessageId.FAILED_TO_PICKUP_S1_ADENA);
 					smsg.addItemNumber(target.getCount());
@@ -4880,7 +4882,7 @@ public final class L2PcInstance extends L2Playable
 			// Check if a Party is in progress
 			if (isInParty()) getParty().distributeItem(this, target);
 			// Target is adena
-			else if (target.getItemId() == 57 && getInventory().getAdenaInstance() != null)
+			else if (target.getItemId() == PcInventory.ADENA_ID && getInventory().getAdenaInstance() != null)
 			{
 				addAdena("Pickup", target.getCount(), null, true);
 				ItemTable.getInstance().destroyItem("Pickup", target, this, null);
@@ -5663,7 +5665,7 @@ public final class L2PcInstance extends L2Playable
 							itemDrop.isShadowItem() || // Dont drop Shadow Items
 							itemDrop.isTimeLimitedItem() || // Dont drop Time Limited Items
 							!itemDrop.isDropable() ||
-							itemDrop.getItemId() == 57 || // Adena
+							itemDrop.getItemId() == PcInventory.ADENA_ID || // Adena
 							itemDrop.getItem().getType2() == L2Item.TYPE2_QUEST ||                  // Quest Items
 							getPet() != null && getPet().getControlObjectId() == itemDrop.getItemId() || // Control Item of active pet
 							Arrays.binarySearch(Config.KARMA_LIST_NONDROPPABLE_ITEMS, itemDrop.getItemId()) >= 0 || // Item listed in the non droppable item list

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java

@@ -50,6 +50,7 @@ import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.stat.PetStat;
 import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.model.itemcontainer.PetInventory;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
@@ -528,7 +529,7 @@ public class L2PetInstance extends L2Summon
 			{
 				getOwner().sendPacket(ActionFailed.STATIC_PACKET);
 				
-				if (target.getItemId() == 57)
+				if (target.getItemId() == PcInventory.ADENA_ID)
 				{
 					SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.FAILED_TO_PICKUP_S1_ADENA);
 					smsg.addItemNumber(target.getCount());
@@ -575,7 +576,7 @@ public class L2PetInstance extends L2Summon
 		}
 		else
 		{
-			if (target.getItemId() == 57)
+			if (target.getItemId() == PcInventory.ADENA_ID)
 			{
 				SystemMessage sm2 = SystemMessage.getSystemMessage(SystemMessageId.PET_PICKED_S1_ADENA);
 				sm2.addItemNumber(target.getCount());

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2RaceManagerInstance.java

@@ -24,6 +24,7 @@ import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.model.L2ItemInstance;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.knownlist.RaceManagerKnownList;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.DeleteObject;
@@ -425,7 +426,7 @@ public class L2RaceManagerInstance extends L2Npc
 			player.getInventory().addItem("Race", item, player, this);
 			InventoryUpdate iu = new InventoryUpdate();
 			iu.addItem(item);
-			L2ItemInstance adenaupdate = player.getInventory().getItemByItemId(57);
+			L2ItemInstance adenaupdate = player.getInventory().getItemByItemId(PcInventory.ADENA_ID);
 			iu.addModifiedItem(adenaupdate);
 			player.sendPacket(iu);
 			return;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SignsPriestInstance.java

@@ -24,6 +24,7 @@ import com.l2jserver.gameserver.SevenSigns;
 import com.l2jserver.gameserver.cache.HtmCache;
 import com.l2jserver.gameserver.model.L2ItemInstance;
 import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
@@ -62,8 +63,7 @@ public class L2SignsPriestInstance extends L2Npc
 			int cabal = SevenSigns.CABAL_NULL;
 			int stoneType = 0;
 			
-			L2ItemInstance ancientAdena = player.getInventory().getItemByItemId(SevenSigns.ANCIENT_ADENA_ID);
-			long ancientAdenaAmount = ancientAdena == null ? 0 : ancientAdena.getCount();
+			final long ancientAdenaAmount = player.getAncientAdena();
 			
 			int val = Integer.parseInt(command.substring(11, 12).trim());
 			
@@ -167,7 +167,7 @@ public class L2SignsPriestInstance extends L2Npc
 						showChatWindow(player, val, "dusk", false);
 					break;
 				case 34: // Pay the participation fee request
-					L2ItemInstance adena = player.getInventory().getItemByItemId(57); //adena
+					L2ItemInstance adena = player.getInventory().getItemByItemId(PcInventory.ADENA_ID); //adena
 					L2ItemInstance certif = player.getInventory().getItemByItemId(6388); //Lord of the Manor's Certificate of Approval
 					boolean fee = true;
 					

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Castle.java

@@ -208,7 +208,7 @@ public class Castle
 						dbSave();
 						if (_cwh)
 						{
-							ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().destroyItemByItemId("CS_function_fee", 57, fee, null, null);
+							ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().destroyItemByItemId("CS_function_fee", PcInventory.ADENA_ID, fee, null, null);
 							if (Config.DEBUG)
 								_log.warning("deducted " + fee + " adena from " + getName() + " owner's cwh for function id : " + getType());
 						}
@@ -828,7 +828,7 @@ public class Castle
 		if (Config.DEBUG)
 			_log.warning("Called Castle.updateFunctions(int type, int lvl, int lease, long rate, boolean addNew) Owner : " + getOwnerId());
 		if (lease > 0)
-			if (!player.destroyItemByItemId("Consume", 57, lease, null, true))
+			if (!player.destroyItemByItemId("Consume", PcInventory.ADENA_ID, lease, null, true))
 				return false;
 		if (addNew)
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/ClanHall.java

@@ -32,6 +32,7 @@ import com.l2jserver.gameserver.datatables.ClanTable;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.model.zone.type.L2ClanHallZone;
 import com.l2jserver.gameserver.network.serverpackets.PledgeShowInfoUpdate;
 import com.l2jserver.gameserver.templates.StatsSet;
@@ -158,7 +159,7 @@ public abstract class ClanHall
 						dbSave();
 						if (_cwh)
 						{
-							ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().destroyItemByItemId("CH_function_fee", 57, fee, null, null);
+							ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().destroyItemByItemId("CH_function_fee", PcInventory.ADENA_ID, fee, null, null);
 							if (Config.DEBUG)
 								_log.warning("deducted " + fee + " adena from " + getName() + " owner's cwh for function id : " + getType());
 						}
@@ -477,7 +478,7 @@ public abstract class ClanHall
 			_log.warning("Called ClanHall.updateFunctions(int type, int lvl, int lease, long rate, boolean addNew) Owner : " + getOwnerId());
 		if (lease > 0)
 		{
-			if (!player.destroyItemByItemId("Consume", 57, lease, null, true))
+			if (!player.destroyItemByItemId("Consume", PcInventory.ADENA_ID, lease, null, true))
 				return false;
 		}
 		if (addNew)

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Fort.java

@@ -53,6 +53,7 @@ import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.model.zone.type.L2FortZone;
 import com.l2jserver.gameserver.model.zone.type.L2SiegeZone;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -200,7 +201,7 @@ public class Fort
 						dbSave();
 						if (_cwh)
 						{
-							getOwnerClan().getWarehouse().destroyItemByItemId("CS_function_fee", 57, fee, null, null);
+							getOwnerClan().getWarehouse().destroyItemByItemId("CS_function_fee", PcInventory.ADENA_ID, fee, null, null);
 							if (Config.DEBUG)
 								_log.warning("Deducted " + fee + " adena from " + getName() + " owner's cwh for function id : " + getType());
 						}
@@ -756,7 +757,7 @@ public class Fort
 		if (Config.DEBUG)
 			_log.warning("Called Fort.updateFunctions(int type, int lvl, int lease, long rate, boolean addNew) Owner : " + getOwnerClan());
 		if (lease > 0)
-			if (!player.destroyItemByItemId("Consume", 57, lease, null, true))
+			if (!player.destroyItemByItemId("Consume", PcInventory.ADENA_ID, lease, null, true))
 				return false;
 		if (addNew)
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/clanhall/AuctionableHall.java

@@ -26,6 +26,7 @@ import com.l2jserver.gameserver.instancemanager.AuctionManager;
 import com.l2jserver.gameserver.instancemanager.ClanHallManager;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.entity.ClanHall;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.templates.StatsSet;
@@ -149,7 +150,7 @@ public final class AuctionableHall extends ClanHall
 					}
 					else
 						_paidUntil = _time + _chRate;
-					ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().destroyItemByItemId("CH_rental_fee", 57, getLease(), null, null);
+					ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().destroyItemByItemId("CH_rental_fee", PcInventory.ADENA_ID, getLease(), null, null);
 					if (Config.DEBUG)
 						_log.warning("deducted " + getLease() + " adena from " + getName() + " owner's cwh for ClanHall _paidUntil: " + _paidUntil);
 					ThreadPoolManager.getInstance().scheduleGeneral(new FeeTask(), _paidUntil - _time);

L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/ItemContainer.java

@@ -212,7 +212,7 @@ public abstract class ItemContainer
 			item = olditem;
 			
 			// Updates database
-			if (item.getItemId() == 57 && count < 10000 * Config.RATE_DROP_ITEMS_ID.get(57))
+			if (item.getItemId() == PcInventory.ADENA_ID && count < 10000 * Config.RATE_DROP_ITEMS_ID.get(PcInventory.ADENA_ID))
 			{
 				// Small adena changes won't be saved to database all the time
 				if (GameTimeController.getGameTicks() % 5 == 0)
@@ -258,7 +258,7 @@ public abstract class ItemContainer
 			item.changeCount(process, count, actor, reference);
 			item.setLastChange(L2ItemInstance.MODIFIED);
 			// Updates database
-			if (itemId == 57 && count < 10000 * Config.RATE_DROP_ITEMS_ID.get(57))
+			if (itemId == PcInventory.ADENA_ID && count < 10000 * Config.RATE_DROP_ITEMS_ID.get(PcInventory.ADENA_ID))
 			{
 				// Small adena changes won't be saved to database all the time
 				if (GameTimeController.getGameTicks() % 5 == 0)
@@ -490,22 +490,19 @@ public abstract class ItemContainer
 	}
 	
 	/**
-	 * Get warehouse adena
-	 * @return 
+	 * @return warehouse Adena.
 	 */
 	public long getAdena()
 	{
 		long count = 0;
-		
 		for (L2ItemInstance item : _items)
 		{
-			if (item != null && item.getItemId() == 57)
+			if (item != null && item.getItemId() == PcInventory.ADENA_ID)
 			{
 				count = item.getCount();
 				return count;
 			}
 		}
-		
 		return count;
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/PcInventory.java

@@ -123,9 +123,9 @@ public class PcInventory extends Inventory
 		FastList<L2ItemInstance> list = FastList.newInstance();
 		for (L2ItemInstance item : _items)
 		{
-			if ((!allowAdena && item.getItemId() == 57))
+			if ((!allowAdena && item.getItemId() == ADENA_ID))
 				continue;
-			if ((!allowAncientAdena && item.getItemId() == 5575))
+			if ((!allowAncientAdena && item.getItemId() == ANCIENT_ADENA_ID))
 				continue;
 			
 			boolean isDuplicate = false;
@@ -168,9 +168,9 @@ public class PcInventory extends Inventory
 		{
 			if (item == null)
 				continue;
-			if ((!allowAdena && item.getItemId() == 57))
+			if ((!allowAdena && item.getItemId() == ADENA_ID))
 				continue;
-			if ((!allowAncientAdena && item.getItemId() == 5575))
+			if ((!allowAncientAdena && item.getItemId() == ANCIENT_ADENA_ID))
 				continue;
 			
 			boolean isDuplicate = false;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/quest/QuestState.java

@@ -35,6 +35,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.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExShowQuestMark;
 import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
@@ -578,7 +579,7 @@ public final class QuestState
 	 */
 	public void giveAdena(long count, boolean applyRates)
 	{
-		giveItems(57, count, applyRates ? 0 : 1);
+		giveItems(PcInventory.ADENA_ID, count, applyRates ? 0 : 1);
 	}
 	
 	/**
@@ -596,7 +597,7 @@ public final class QuestState
 		if (_tmpItem == null)
 			return;
 		
-		if (itemId == 57)
+		if (itemId == PcInventory.ADENA_ID)
 		{
 			count = (long) (count * Config.RATE_QUEST_REWARD_ADENA);
 		}
@@ -637,7 +638,7 @@ public final class QuestState
 			return;
 		
 		// If item for reward is gold, send message of gold reward to client
-		if (itemId == 57)
+		if (itemId == PcInventory.ADENA_ID)
 		{
 			SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S1_ADENA);
 			smsg.addItemNumber(count);
@@ -682,7 +683,7 @@ public final class QuestState
 			return;
 		
 		// If item for reward is adena (ID=57), modify count with rate for quest reward if rates available
-		if (itemId == 57 && !(enchantlevel > 0))
+		if (itemId == PcInventory.ADENA_ID && !(enchantlevel > 0))
 			count = (long) (count * Config.RATE_QUEST_REWARD_ADENA);
 		
 		// Add items to player's inventory
@@ -692,11 +693,11 @@ public final class QuestState
 			return;
 		
 		// set enchant level for item if that item is not adena
-		if (enchantlevel > 0 && itemId != 57)
+		if (enchantlevel > 0 && itemId != PcInventory.ADENA_ID)
 			item.setEnchantLevel(enchantlevel);
 		
 		// If item for reward is gold, send message of gold reward to client
-		if (itemId == 57)
+		if (itemId == PcInventory.ADENA_ID)
 		{
 			SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S1_ADENA);
 			smsg.addItemNumber(count);
@@ -749,7 +750,7 @@ public final class QuestState
 		}
 		
 		// If item for reward is gold, send message of gold reward to client
-		if (itemId == 57)
+		if (itemId == PcInventory.ADENA_ID)
 		{
 			SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S1_ADENA);
 			smsg.addItemNumber(count);

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/form/ZoneCuboid.java

@@ -15,6 +15,7 @@
 package com.l2jserver.gameserver.model.zone.form;
 
 import com.l2jserver.gameserver.GeoEngine;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.model.zone.L2ZoneForm;
 import com.l2jserver.util.Rnd;
 
@@ -151,14 +152,14 @@ public class ZoneCuboid extends L2ZoneForm
 		//x1->x2
 		for (int x = _x1; x < _x2; x = x + STEP)
 		{
-			dropDebugItem(57, 1, x, _y1, z);
-			dropDebugItem(57, 1, x, _y2, z);
+			dropDebugItem(PcInventory.ADENA_ID, 1, x, _y1, z);
+			dropDebugItem(PcInventory.ADENA_ID, 1, x, _y2, z);
 		}
 		//y1->y2
 		for (int y = _y1; y < _y2; y = y + STEP)
 		{
-			dropDebugItem(57, 1, _x1, y, z);
-			dropDebugItem(57, 1, _x2, y, z);
+			dropDebugItem(PcInventory.ADENA_ID, 1, _x1, y, z);
+			dropDebugItem(PcInventory.ADENA_ID, 1, _x2, y, z);
 		}
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/form/ZoneCylinder.java

@@ -15,6 +15,7 @@
 package com.l2jserver.gameserver.model.zone.form;
 
 import com.l2jserver.gameserver.GeoEngine;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.model.zone.L2ZoneForm;
 import com.l2jserver.util.Rnd;
 
@@ -113,7 +114,7 @@ public class ZoneCylinder extends L2ZoneForm
 		{
 			int x = (int) (Math.cos(angle * i) * _rad);
 			int y = (int) (Math.sin(angle * i) * _rad);
-			dropDebugItem(57, 1, _x + x, _y + y, z);
+			dropDebugItem(PcInventory.ADENA_ID, 1, _x + x, _y + y, z);
 		}
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/form/ZoneNPoly.java

@@ -16,6 +16,7 @@ package com.l2jserver.gameserver.model.zone.form;
 
 import com.l2jserver.gameserver.GeoEngine;
 import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.model.zone.L2ZoneForm;
 import com.l2jserver.util.Rnd;
 
@@ -167,7 +168,7 @@ public class ZoneNPoly extends L2ZoneForm
 			for (int o = 1; o <= lenght; o++)
 			{
 				float k = o/lenght;
-				dropDebugItem(57, 1, (int) (_x[i] + k*vx), (int) (_y[i] + k*vy), z);
+				dropDebugItem(PcInventory.ADENA_ID, 1, (int) (_x[i] + k*vx), (int) (_y[i] + k*vy), z);
 			}
 		}
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestDropItem.java

@@ -21,6 +21,7 @@ import com.l2jserver.gameserver.GmListTable;
 import com.l2jserver.gameserver.model.L2ItemInstance;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
 import com.l2jserver.gameserver.network.serverpackets.ItemList;
@@ -213,7 +214,7 @@ public final class RequestDropItem extends L2GameClientPacket
 					+ " x: " + activeChar.getX() + " y: " + activeChar.getY() + " z: " + activeChar.getZ() + ")");
 		}
 		
-		if (dropedItem != null && dropedItem.getItemId() == 57 && dropedItem.getCount() >= 1000000)
+		if (dropedItem != null && dropedItem.getItemId() == PcInventory.ADENA_ID && dropedItem.getCount() >= 1000000)
 		{
 			String msg = "Character (" + activeChar.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")";
 			_log.warning(msg);

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkill.java

@@ -26,6 +26,7 @@ import com.l2jserver.gameserver.model.L2EnchantSkillLearn;
 import com.l2jserver.gameserver.model.L2ItemInstance;
 import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
 import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillInfo;
@@ -133,7 +134,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket
 				check &= player.destroyItem("Consume", spb.getObjectId(), 1, player, true);
 			}
 			
-			check &= player.destroyItemByItemId("Consume", 57, requiredAdena, player, true);
+			check &= player.destroyItemByItemId("Consume", PcInventory.ADENA_ID, requiredAdena, player, true);
 			if (!check)
 			{
 				player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_DONT_HAVE_ALL_OF_THE_ITEMS_NEEDED_TO_ENCHANT_THAT_SKILL));

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java

@@ -26,6 +26,7 @@ import com.l2jserver.gameserver.model.L2EnchantSkillLearn;
 import com.l2jserver.gameserver.model.L2ItemInstance;
 import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
 import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillInfo;
@@ -141,7 +142,7 @@ public final class RequestExEnchantSkillRouteChange extends L2GameClientPacket
 				check &= player.destroyItem("Consume", spb.getObjectId(), 1, player, true);
 			}
 			
-			check &= player.destroyItemByItemId("Consume", 57, requireditems, player, true);
+			check &= player.destroyItemByItemId("Consume", PcInventory.ADENA_ID, requireditems, player, true);
 			
 			if (!check)
 			{

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java

@@ -26,6 +26,7 @@ import com.l2jserver.gameserver.model.L2EnchantSkillLearn;
 import com.l2jserver.gameserver.model.L2ItemInstance;
 import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
 import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillInfo;
@@ -127,7 +128,7 @@ public final class RequestExEnchantSkillSafe extends L2GameClientPacket
 			boolean check = player.getStat().removeExpAndSp(0, requiredSp, false);
 			check &= player.destroyItem("Consume", spb.getObjectId(), 1, player, true);
 			
-			check &= player.destroyItemByItemId("Consume", 57, requireditems, player, true);
+			check &= player.destroyItemByItemId("Consume", PcInventory.ADENA_ID, requireditems, player, true);
 			
 			if (!check)
 			{

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java

@@ -26,6 +26,7 @@ import com.l2jserver.gameserver.model.L2EnchantSkillLearn;
 import com.l2jserver.gameserver.model.L2ItemInstance;
 import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
 import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillInfo;
@@ -132,7 +133,7 @@ public final class RequestExEnchantSkillUntrain extends L2GameClientPacket
 			check &= player.destroyItem("Consume", spb.getObjectId(), 1, player, true);
 		}
 		
-		check &= player.destroyItemByItemId("Consume", 57, requireditems, player, true);
+		check &= player.destroyItemByItemId("Consume", PcInventory.ADENA_ID, requireditems, player, true);
 		
 		
 		if (!check)

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestPackageSend.java

@@ -24,6 +24,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.itemcontainer.ItemContainer;
 import com.l2jserver.gameserver.model.itemcontainer.PcFreight;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
 import com.l2jserver.gameserver.network.serverpackets.ItemList;
@@ -118,7 +119,7 @@ public class RequestPackageSend extends L2GameClientPacket
 				return;
 			
 			// Calculate needed adena and slots
-			if (item.getItemId() == 57)
+			if (item.getItemId() == PcInventory.ADENA_ID)
 				currentAdena -= i.getCount();
 			else if (!item.isStackable())
 				slots += i.getCount();

L2J_Server_BETA/java/com/l2jserver/gameserver/pathfinding/cellnodes/CellPathFinding.java

@@ -27,6 +27,7 @@ import com.l2jserver.gameserver.GeoData;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.model.L2ItemInstance;
 import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.pathfinding.AbstractNode;
 import com.l2jserver.gameserver.pathfinding.AbstractNodeLoc;
 import com.l2jserver.gameserver.pathfinding.PathFinding;
@@ -145,7 +146,7 @@ public class CellPathFinding extends PathFinding
 						dropDebugItem(1831, (int) (-n.getCost() * 10), n.getLoc());
 					else
 						// known nodes
-						dropDebugItem(57, (int) (n.getCost() * 10), n.getLoc());
+						dropDebugItem(PcInventory.ADENA_ID, (int) (n.getCost() * 10), n.getLoc());
 				}
 			}