Renamed "mpConsume" to "mpConsume2" and "mpInitialConsume" to

"mpConsume1" inside skills.

src/main/java/com/l2jserver/gameserver/ai/L2AttackableAI.java

@@ -1880,7 +1880,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 			return false;
 		}
 		// Not enough MP.
-		if (skill.getMpConsume() >= caster.getCurrentMp())
+		if (skill.getMpConsume2() >= caster.getCurrentMp())
 		{
 			return false;
 		}

src/main/java/com/l2jserver/gameserver/ai/L2ControllableMobAI.java

@@ -156,7 +156,7 @@ public final class L2ControllableMobAI extends L2AttackableAI
 			
 			for (Skill sk : _actor.getAllSkills())
 			{
-				if (Util.checkIfInRange(sk.getCastRange(), _actor, getAttackTarget(), true) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() > _actor.getStat().getMpConsume(sk)))
+				if (Util.checkIfInRange(sk.getCastRange(), _actor, getAttackTarget(), true) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() > _actor.getStat().getMpConsume2(sk)))
 				{
 					_actor.doCast(sk);
 					return;
@@ -206,7 +206,7 @@ public final class L2ControllableMobAI extends L2AttackableAI
 			{
 				int castRange = sk.getCastRange();
 				
-				if (((castRange * castRange) >= dist2) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() > _actor.getStat().getMpConsume(sk)))
+				if (((castRange * castRange) >= dist2) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() > _actor.getStat().getMpConsume2(sk)))
 				{
 					_actor.doCast(sk);
 					return;
@@ -246,7 +246,7 @@ public final class L2ControllableMobAI extends L2AttackableAI
 			{
 				int castRange = sk.getCastRange();
 				
-				if (((castRange * castRange) >= dist2) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() > _actor.getStat().getMpConsume(sk)))
+				if (((castRange * castRange) >= dist2) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() > _actor.getStat().getMpConsume2(sk)))
 				{
 					_actor.doCast(sk);
 					return;
@@ -319,7 +319,7 @@ public final class L2ControllableMobAI extends L2AttackableAI
 				{
 					int castRange = sk.getCastRange();
 					
-					if (((castRange * castRange) >= dist2) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() > _actor.getStat().getMpConsume(sk)))
+					if (((castRange * castRange) >= dist2) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() > _actor.getStat().getMpConsume2(sk)))
 					{
 						_actor.doCast(sk);
 						return;
@@ -361,7 +361,7 @@ public final class L2ControllableMobAI extends L2AttackableAI
 				{
 					int castRange = sk.getCastRange();
 					
-					if (((castRange * castRange) >= dist2) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() < _actor.getStat().getMpConsume(sk)))
+					if (((castRange * castRange) >= dist2) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() < _actor.getStat().getMpConsume2(sk)))
 					{
 						_actor.doCast(sk);
 						return;

src/main/java/com/l2jserver/gameserver/ai/L2FortSiegeGuardAI.java

@@ -436,7 +436,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable
 					{
 						for (Skill sk : _selfAnalysis.healSkills)
 						{
-							if (_actor.getCurrentMp() < sk.getMpConsume())
+							if (_actor.getCurrentMp() < sk.getMpConsume2())
 							{
 								continue;
 							}
@@ -495,7 +495,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable
 				{
 					for (Skill sk : _selfAnalysis.healSkills)
 					{
-						if (_actor.getCurrentMp() < sk.getMpConsume())
+						if (_actor.getCurrentMp() < sk.getMpConsume2())
 						{
 							continue;
 						}
@@ -594,7 +594,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable
 			{
 				int castRange = sk.getCastRange();
 				
-				if ((dist_2 <= (castRange * castRange)) && (castRange > 70) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !sk.isPassive())
+				if ((dist_2 <= (castRange * castRange)) && (castRange > 70) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume2(sk)) && !sk.isPassive())
 				{
 					
 					L2Object OldTarget = _actor.getTarget();
@@ -740,7 +740,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable
 				{
 					int castRange = sk.getCastRange();
 					
-					if (((castRange * castRange) >= dist_2) && !sk.isPassive() && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !_actor.isSkillDisabled(sk))
+					if (((castRange * castRange) >= dist_2) && !sk.isPassive() && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume2(sk)) && !_actor.isSkillDisabled(sk))
 					{
 						L2Object OldTarget = _actor.getTarget();
 						if ((sk.isContinuous() && !sk.isDebuff()) || (sk.hasEffectType(L2EffectType.HEAL)))

src/main/java/com/l2jserver/gameserver/ai/L2SiegeGuardAI.java

@@ -416,7 +416,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable
 					{
 						for (Skill sk : _selfAnalysis.healSkills)
 						{
-							if (_actor.getCurrentMp() < sk.getMpConsume())
+							if (_actor.getCurrentMp() < sk.getMpConsume2())
 							{
 								continue;
 							}
@@ -475,7 +475,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable
 				{
 					for (Skill sk : _selfAnalysis.healSkills)
 					{
-						if (_actor.getCurrentMp() < sk.getMpConsume())
+						if (_actor.getCurrentMp() < sk.getMpConsume2())
 						{
 							continue;
 						}
@@ -568,7 +568,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable
 			{
 				int castRange = sk.getCastRange();
 				
-				if ((dist_2 <= (castRange * castRange)) && (castRange > 70) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !sk.isPassive())
+				if ((dist_2 <= (castRange * castRange)) && (castRange > 70) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume2(sk)) && !sk.isPassive())
 				{
 					
 					L2Object OldTarget = _actor.getTarget();
@@ -710,7 +710,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable
 				{
 					int castRange = sk.getCastRange();
 					
-					if (((castRange * castRange) >= dist_2) && !sk.isPassive() && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !_actor.isSkillDisabled(sk))
+					if (((castRange * castRange) >= dist_2) && !sk.isPassive() && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume2(sk)) && !_actor.isSkillDisabled(sk))
 					{
 						L2Object OldTarget = _actor.getTarget();
 						if ((sk.isContinuous() && !sk.isDebuff()) || (sk.hasEffectType(L2EffectType.HEAL)))

src/main/java/com/l2jserver/gameserver/model/actor/L2Attackable.java

@@ -198,7 +198,7 @@ public class L2Attackable extends L2Npc
 			return;
 		}
 		
-		if ((getCurrentMp() < (getStat().getMpConsume(skill) + getStat().getMpInitialConsume(skill))) || (getCurrentHp() <= skill.getHpConsume()))
+		if ((getCurrentMp() < (getStat().getMpConsume1(skill) + getStat().getMpConsume2(skill))) || (getCurrentHp() <= skill.getHpConsume()))
 		{
 			return;
 		}

src/main/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -1824,7 +1824,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 		}
 		
 		// Check if this skill consume mp on start casting
-		int initmpcons = getStat().getMpInitialConsume(skill);
+		int initmpcons = getStat().getMpConsume1(skill);
 		if (initmpcons > 0)
 		{
 			getStatus().reduceMp(initmpcons);
@@ -1993,7 +1993,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 		}
 		
 		// Check if the caster has enough MP
-		if (getCurrentMp() < (getStat().getMpConsume(skill) + getStat().getMpInitialConsume(skill)))
+		if (getCurrentMp() < (getStat().getMpConsume1(skill) + getStat().getMpConsume2(skill)))
 		{
 			// Send a System Message to the caster
 			sendPacket(SystemMessageId.NOT_ENOUGH_MP);
@@ -5536,18 +5536,18 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			boolean isSendStatus = false;
 			
 			// Consume MP of the L2Character and Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform
-			double mpConsume = getStat().getMpConsume(skill);
+			double mpConsume2 = getStat().getMpConsume2(skill);
 			
-			if (mpConsume > 0)
+			if (mpConsume2 > 0)
 			{
-				if (mpConsume > getCurrentMp())
+				if (mpConsume2 > getCurrentMp())
 				{
 					sendPacket(SystemMessageId.NOT_ENOUGH_MP);
 					abortCast();
 					return;
 				}
 				
-				getStatus().reduceMp(mpConsume);
+				getStatus().reduceMp(mpConsume2);
 				su.addAttribute(StatusUpdate.CUR_MP, (int) getCurrentMp());
 				isSendStatus = true;
 			}

src/main/java/com/l2jserver/gameserver/model/actor/L2Summon.java

@@ -659,7 +659,7 @@ public abstract class L2Summon extends L2Playable
 		}
 		
 		// Check if the summon has enough MP
-		if (getCurrentMp() < (getStat().getMpConsume(skill) + getStat().getMpInitialConsume(skill)))
+		if (getCurrentMp() < (getStat().getMpConsume1(skill) + getStat().getMpConsume2(skill)))
 		{
 			// Send a System Message to the caster
 			sendPacket(SystemMessageId.NOT_ENOUGH_MP);

src/main/java/com/l2jserver/gameserver/model/actor/instance/L2BabyPetInstance.java

@@ -289,7 +289,7 @@ public final class L2BabyPetInstance extends L2PetInstance
 					skill = _majorHeal.getSkill();
 					if (!_baby.isSkillDisabled(skill) && (Rnd.get(100) <= 75))
 					{
-						if (_baby.getCurrentMp() >= skill.getMpConsume())
+						if (_baby.getCurrentMp() >= skill.getMpConsume2())
 						{
 							castSkill(skill);
 							return;
@@ -302,7 +302,7 @@ public final class L2BabyPetInstance extends L2PetInstance
 					skill = _minorHeal.getSkill();
 					if (!_baby.isSkillDisabled(skill) && (Rnd.get(100) <= 25))
 					{
-						if (_baby.getCurrentMp() >= skill.getMpConsume())
+						if (_baby.getCurrentMp() >= skill.getMpConsume2())
 						{
 							castSkill(skill);
 							return;
@@ -325,7 +325,7 @@ public final class L2BabyPetInstance extends L2PetInstance
 							continue;
 						}
 						
-						if (_baby.getCurrentMp() < skill.getMpConsume())
+						if (_baby.getCurrentMp() < skill.getMpConsume2())
 						{
 							continue;
 						}
@@ -359,7 +359,7 @@ public final class L2BabyPetInstance extends L2PetInstance
 			if ((_recharge != null) && owner.isInCombat() && ((owner.getCurrentMp() / owner.getMaxMp()) < 0.6) && (Rnd.get(100) <= 60))
 			{
 				skill = _recharge.getSkill();
-				if (!_baby.isSkillDisabled(skill) && (_baby.getCurrentMp() >= skill.getMpConsume()))
+				if (!_baby.isSkillDisabled(skill) && (_baby.getCurrentMp() >= skill.getMpConsume2()))
 				{
 					castSkill(skill);
 				}

src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ClanHallManagerInstance.java

@@ -638,7 +638,8 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 						String mp_grade3 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 5\">5%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 15\">15%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 30\">30%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 40\">40%</a>]";
 						if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP) != null)
 						{
-							html.replace("%hp_recovery%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLease()) + "</font>Adena /" + String.valueOf(Config.CH_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
+							html.replace("%hp_recovery%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLease()) + "</font>Adena /"
+								+ String.valueOf(Config.CH_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
 							html.replace("%hp_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getEndTime()));
 							int grade = getClanHall().getGrade();
 							switch (grade)
@@ -680,7 +681,8 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 						}
 						if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP) != null)
 						{
-							html.replace("%exp_recovery%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLease()) + "</font>Adena /" + String.valueOf(Config.CH_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
+							html.replace("%exp_recovery%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLease()) + "</font>Adena /"
+								+ String.valueOf(Config.CH_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
 							html.replace("%exp_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getEndTime()));
 							int grade = getClanHall().getGrade();
 							switch (grade)
@@ -722,7 +724,8 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 						}
 						if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP) != null)
 						{
-							html.replace("%mp_recovery%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLease()) + "</font>Adena /" + String.valueOf(Config.CH_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
+							html.replace("%mp_recovery%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLease()) + "</font>Adena /"
+								+ String.valueOf(Config.CH_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
 							html.replace("%mp_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getEndTime()));
 							int grade = getClanHall().getGrade();
 							switch (grade)
@@ -1072,7 +1075,8 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 						String item = "[<a action=\"bypass -h npc_%objectId%_manage other edit_item 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_item 2\">Level 2</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_item 3\">Level 3</a>]";
 						if (getClanHall().getFunction(ClanHall.FUNC_TELEPORT) != null)
 						{
-							html.replace("%tele%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLease()) + "</font>Adena /" + String.valueOf(Config.CH_TELE_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
+							html.replace("%tele%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLease()) + "</font>Adena /"
+								+ String.valueOf(Config.CH_TELE_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
 							html.replace("%tele_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getEndTime()));
 							html.replace("%change_tele%", "[<a action=\"bypass -h npc_%objectId%_manage other tele_cancel\">Deactivate</a>]" + tele);
 						}
@@ -1084,7 +1088,8 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 						}
 						if (getClanHall().getFunction(ClanHall.FUNC_SUPPORT) != null)
 						{
-							html.replace("%support%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLease()) + "</font>Adena /" + String.valueOf(Config.CH_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
+							html.replace("%support%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLease()) + "</font>Adena /"
+								+ String.valueOf(Config.CH_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
 							html.replace("%support_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getEndTime()));
 							int grade = getClanHall().getGrade();
 							switch (grade)
@@ -1126,7 +1131,8 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 						}
 						if (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE) != null)
 						{
-							html.replace("%item%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLease()) + "</font>Adena /" + String.valueOf(Config.CH_ITEM_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
+							html.replace("%item%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLease()) + "</font>Adena /"
+								+ String.valueOf(Config.CH_ITEM_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
 							html.replace("%item_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getEndTime()));
 							html.replace("%change_item%", "[<a action=\"bypass -h npc_%objectId%_manage other item_cancel\">Deactivate</a>]" + item);
 						}
@@ -1315,7 +1321,8 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 						String fixtures = "[<a action=\"bypass -h npc_%objectId%_manage deco edit_fixtures 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage deco edit_fixtures 2\">Level 2</a>]";
 						if (getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS) != null)
 						{
-							html.replace("%curtain%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLease()) + "</font>Adena /" + String.valueOf(Config.CH_CURTAIN_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
+							html.replace("%curtain%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLease()) + "</font>Adena /"
+								+ String.valueOf(Config.CH_CURTAIN_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
 							html.replace("%curtain_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getEndTime()));
 							html.replace("%change_curtain%", "[<a action=\"bypass -h npc_%objectId%_manage deco curtains_cancel\">Deactivate</a>]" + curtains);
 						}
@@ -1327,7 +1334,8 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 						}
 						if (getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM) != null)
 						{
-							html.replace("%fixture%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLease()) + "</font>Adena /" + String.valueOf(Config.CH_FRONT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
+							html.replace("%fixture%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLease()) + "</font>Adena /"
+								+ String.valueOf(Config.CH_FRONT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
 							html.replace("%fixture_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getEndTime()));
 							html.replace("%change_fixture%", "[<a action=\"bypass -h npc_%objectId%_manage deco fixtures_cancel\">Deactivate</a>]" + fixtures);
 						}
@@ -1390,7 +1398,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 						}
 						else
 						{
-							final int mpCost = skill.getMpConsume() + skill.getMpInitialConsume();
+							final int mpCost = skill.getMpConsume1() + skill.getMpConsume2();
 							// If Clan Hall Buff are free or current MP is greater than MP cost, the skill should be casted.
 							if ((getCurrentMp() >= mpCost) || Config.CH_BUFF_FREE)
 							{

src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FortManagerInstance.java

@@ -615,7 +615,8 @@ public class L2FortManagerInstance extends L2MerchantInstance
 						String mp = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 40\">40%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 50\">50%</a>]";
 						if (getFort().getFunction(Fort.FUNC_RESTORE_HP) != null)
 						{
-							html.replace("%hp_recovery%", String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_HP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_HP).getLease()) + "</font>Adena /" + String.valueOf(Config.FS_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
+							html.replace("%hp_recovery%", String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_HP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_HP).getLease()) + "</font>Adena /"
+								+ String.valueOf(Config.FS_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
 							html.replace("%hp_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_RESTORE_HP).getEndTime()));
 							html.replace("%change_hp%", "[<a action=\"bypass -h npc_%objectId%_manage recovery hp_cancel\">Deactivate</a>]" + hp);
 						}
@@ -627,7 +628,8 @@ public class L2FortManagerInstance extends L2MerchantInstance
 						}
 						if (getFort().getFunction(Fort.FUNC_RESTORE_EXP) != null)
 						{
-							html.replace("%exp_recovery%", String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLease()) + "</font>Adena /" + String.valueOf(Config.FS_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
+							html.replace("%exp_recovery%", String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLease()) + "</font>Adena /"
+								+ String.valueOf(Config.FS_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
 							html.replace("%exp_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_RESTORE_EXP).getEndTime()));
 							html.replace("%change_exp%", "[<a action=\"bypass -h npc_%objectId%_manage recovery exp_cancel\">Deactivate</a>]" + exp);
 						}
@@ -639,7 +641,8 @@ public class L2FortManagerInstance extends L2MerchantInstance
 						}
 						if (getFort().getFunction(Fort.FUNC_RESTORE_MP) != null)
 						{
-							html.replace("%mp_recovery%", String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_MP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_MP).getLease()) + "</font>Adena /" + String.valueOf(Config.FS_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
+							html.replace("%mp_recovery%", String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_MP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_MP).getLease()) + "</font>Adena /"
+								+ String.valueOf(Config.FS_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
 							html.replace("%mp_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_RESTORE_MP).getEndTime()));
 							html.replace("%change_mp%", "[<a action=\"bypass -h npc_%objectId%_manage recovery mp_cancel\">Deactivate</a>]" + mp);
 						}
@@ -823,7 +826,8 @@ public class L2FortManagerInstance extends L2MerchantInstance
 						String support = "[<a action=\"bypass -h npc_%objectId%_manage other edit_support 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 2\">Level 2</a>]";
 						if (getFort().getFunction(Fort.FUNC_TELEPORT) != null)
 						{
-							html.replace("%tele%", "Stage " + String.valueOf(getFort().getFunction(Fort.FUNC_TELEPORT).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getFort().getFunction(Fort.FUNC_TELEPORT).getLease()) + "</font>Adena /" + String.valueOf(Config.FS_TELE_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
+							html.replace("%tele%", "Stage " + String.valueOf(getFort().getFunction(Fort.FUNC_TELEPORT).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getFort().getFunction(Fort.FUNC_TELEPORT).getLease()) + "</font>Adena /"
+								+ String.valueOf(Config.FS_TELE_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
 							html.replace("%tele_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_TELEPORT).getEndTime()));
 							html.replace("%change_tele%", "[<a action=\"bypass -h npc_%objectId%_manage other tele_cancel\">Deactivate</a>]" + tele);
 						}
@@ -835,7 +839,8 @@ public class L2FortManagerInstance extends L2MerchantInstance
 						}
 						if (getFort().getFunction(Fort.FUNC_SUPPORT) != null)
 						{
-							html.replace("%support%", "Stage " + String.valueOf(getFort().getFunction(Fort.FUNC_SUPPORT).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getFort().getFunction(Fort.FUNC_SUPPORT).getLease()) + "</font>Adena /" + String.valueOf(Config.FS_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
+							html.replace("%support%", "Stage " + String.valueOf(getFort().getFunction(Fort.FUNC_SUPPORT).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getFort().getFunction(Fort.FUNC_SUPPORT).getLease()) + "</font>Adena /"
+								+ String.valueOf(Config.FS_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
 							html.replace("%support_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_SUPPORT).getEndTime()));
 							html.replace("%change_support%", "[<a action=\"bypass -h npc_%objectId%_manage other support_cancel\">Deactivate</a>]" + support);
 						}
@@ -901,7 +906,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 						}
 						else
 						{
-							if (!((skill.getMpConsume() + skill.getMpInitialConsume()) > getCurrentMp()))
+							if (!((skill.getMpConsume1() + skill.getMpConsume2()) > getCurrentMp()))
 							{
 								this.doCast(skill);
 							}

src/main/java/com/l2jserver/gameserver/model/actor/stat/CharStat.java

@@ -582,50 +582,50 @@ public class CharStat
 	 * @param skill
 	 * @return the mpConsume.
 	 */
-	public final int getMpConsume(Skill skill)
+	public final int getMpConsume2(Skill skill)
 	{
 		if (skill == null)
 		{
 			return 1;
 		}
-		double mpConsume = skill.getMpConsume();
-		double nextDanceMpCost = Math.ceil(skill.getMpConsume() / 2.);
+		double mpConsume2 = skill.getMpConsume2();
+		double nextDanceMpCost = Math.ceil(skill.getMpConsume2() / 2.);
 		if (skill.isDance())
 		{
 			if (Config.DANCE_CONSUME_ADDITIONAL_MP && (_activeChar != null) && (_activeChar.getDanceCount() > 0))
 			{
-				mpConsume += _activeChar.getDanceCount() * nextDanceMpCost;
+				mpConsume2 += _activeChar.getDanceCount() * nextDanceMpCost;
 			}
 		}
 		
-		mpConsume = calcStat(Stats.MP_CONSUME, mpConsume, null, skill);
+		mpConsume2 = calcStat(Stats.MP_CONSUME, mpConsume2, null, skill);
 		
 		if (skill.isDance())
 		{
-			return (int) calcStat(Stats.DANCE_MP_CONSUME_RATE, mpConsume);
+			return (int) calcStat(Stats.DANCE_MP_CONSUME_RATE, mpConsume2);
 		}
 		else if (skill.isMagic())
 		{
-			return (int) calcStat(Stats.MAGICAL_MP_CONSUME_RATE, mpConsume);
+			return (int) calcStat(Stats.MAGICAL_MP_CONSUME_RATE, mpConsume2);
 		}
 		else
 		{
-			return (int) calcStat(Stats.PHYSICAL_MP_CONSUME_RATE, mpConsume);
+			return (int) calcStat(Stats.PHYSICAL_MP_CONSUME_RATE, mpConsume2);
 		}
 	}
 	
 	/**
 	 * @param skill
-	 * @return the mpInitialConsume.
+	 * @return the mpConsume1.
 	 */
-	public final int getMpInitialConsume(Skill skill)
+	public final int getMpConsume1(Skill skill)
 	{
 		if (skill == null)
 		{
 			return 1;
 		}
 		
-		return (int) calcStat(Stats.MP_CONSUME, skill.getMpInitialConsume(), null, skill);
+		return (int) calcStat(Stats.MP_CONSUME, skill.getMpConsume1(), null, skill);
 	}
 	
 	public byte getAttackElement()

src/main/java/com/l2jserver/gameserver/model/skills/Skill.java

@@ -91,10 +91,10 @@ public class Skill implements IIdentifiable
 	private final int _magic;
 	private final TraitType _traitType;
 	private final boolean _staticReuse;
-	/** MP consumption. */
-	private final int _mpConsume;
 	/** Initial MP consumption. */
-	private final int _mpInitialConsume;
+	private final int _mpConsume1;
+	/** MP consumption. */
+	private final int _mpConsume2;
 	/** MP consumption per channeling. */
 	private final int _mpPerChanneling;
 	/** HP consumption. */
@@ -223,9 +223,9 @@ public class Skill implements IIdentifiable
 		_magic = set.getInt("isMagic", 0);
 		_traitType = set.getEnum("trait", TraitType.class, TraitType.NONE);
 		_staticReuse = set.getBoolean("staticReuse", false);
-		_mpConsume = set.getInt("mpConsume", 0);
-		_mpInitialConsume = set.getInt("mpInitialConsume", 0);
-		_mpPerChanneling = set.getInt("mpPerChanneling", _mpConsume);
+		_mpConsume1 = set.getInt("mpConsume1", 0);
+		_mpConsume2 = set.getInt("mpConsume2", 0);
+		_mpPerChanneling = set.getInt("mpPerChanneling", _mpConsume2);
 		_hpConsume = set.getInt("hpConsume", 0);
 		_itemConsumeCount = set.getInt("itemConsumeCount", 0);
 		_itemConsumeId = set.getInt("itemConsumeId", 0);
@@ -762,19 +762,19 @@ public class Skill implements IIdentifiable
 	}
 	
 	/**
-	 * @return Returns the mpConsume.
+	 * @return Returns the mpConsume1.
 	 */
-	public int getMpConsume()
+	public int getMpConsume1()
 	{
-		return _mpConsume;
+		return _mpConsume1;
 	}
 	
 	/**
-	 * @return Returns the mpInitialConsume.
+	 * @return Returns the mpConsume2.
 	 */
-	public int getMpInitialConsume()
+	public int getMpConsume2()
 	{
-		return _mpInitialConsume;
+		return _mpConsume2;
 	}
 	
 	/**