Browse Source

BETA: When you accept a quest, the game system examines your character's inventory and quest inventory to determine if your character has enough free inventory space for the quest item or items. Previously, if the combination of both inventories was 80% full, you could not accept the quest. This percentage has increased to 90%.

Rumen Nikiforov 12 years ago
parent
commit
f1c5ebc2d4

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2ClassMasterInstance.java

@@ -321,7 +321,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
 		int newJobLevel = currentClassId.level() + 1;
 		int newJobLevel = currentClassId.level() + 1;
 		
 		
 		// Weight/Inventory check
 		// Weight/Inventory check
-		if(!Config.CLASS_MASTER_SETTINGS.getRewardItems(newJobLevel).isEmpty() && !player.isInventoryUnder80(false))
+		if(!Config.CLASS_MASTER_SETTINGS.getRewardItems(newJobLevel).isEmpty() && !player.isInventoryUnder90(false))
 		{
 		{
 			player.sendPacket(SystemMessageId.INVENTORY_LESS_THAN_80_PERCENT);
 			player.sendPacket(SystemMessageId.INVENTORY_LESS_THAN_80_PERCENT);
 			return false;
 			return false;

+ 3 - 13
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -14955,23 +14955,13 @@ public final class L2PcInstance extends L2Playable
 	}
 	}
 	
 	
 	/**
 	/**
-	 * Test if player inventory is under 80% capaity
+	 * Test if player inventory is under 90% capaity
 	 * @param includeQuestInv check also quest inventory
 	 * @param includeQuestInv check also quest inventory
 	 * @return
 	 * @return
 	 */
 	 */
-	public boolean isInventoryUnder80(boolean includeQuestInv)
+	public boolean isInventoryUnder90(boolean includeQuestInv)
 	{
 	{
-		if (getInventory().getSize(false) <= (getInventoryLimit() * 0.8))
-		{
-			if (includeQuestInv)
-			{
-				if (getInventory().getSize(true) <= (getQuestInventoryLimit() * 0.8))
-					return true;
-			}
-			else
-				return true;
-		}
-		return false;
+		return (getInventory().getSize(includeQuestInv) <= (getInventoryLimit() * 0.9));
 	}
 	}
 	
 	
 	public boolean havePetInvItems()
 	public boolean havePetInvItems()

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterInstance.java

@@ -214,7 +214,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
 				return;
 				return;
 			}
 			}
 			// Subclasses may not be changed while you have exceeded your inventory limit.
 			// Subclasses may not be changed while you have exceeded your inventory limit.
-			if (!player.isInventoryUnder80(true))
+			if (!player.isInventoryUnder90(true))
 			{
 			{
 				player.sendPacket(SystemMessageId.NOT_SUBCLASS_WHILE_INVENTORY_FULL);
 				player.sendPacket(SystemMessageId.NOT_SUBCLASS_WHILE_INVENTORY_FULL);
 				return;
 				return;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/instance/L2ItemInstance.java

@@ -2167,7 +2167,7 @@ public final class L2ItemInstance extends L2Object
 			
 			
 			if (q != null)
 			if (q != null)
 			{
 			{
-				if ((q.getQuestIntId() >= 1 && q.getQuestIntId() < 20000) && (activeChar.getWeightPenalty() >= 3 || !activeChar.isInventoryUnder80(true)))
+				if ((q.getQuestIntId() >= 1 && q.getQuestIntId() < 20000) && (activeChar.getWeightPenalty() >= 3 || !activeChar.isInventoryUnder90(true)))
 				{
 				{
 					activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INVENTORY_LESS_THAN_80_PERCENT));
 					activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INVENTORY_LESS_THAN_80_PERCENT));
 					return;
 					return;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/olympiad/AbstractOlympiadGame.java

@@ -158,7 +158,7 @@ public abstract class AbstractOlympiadGame
 			player.sendPacket(sm);
 			player.sendPacket(sm);
 			return SystemMessage.getSystemMessage(SystemMessageId.THE_GAME_HAS_BEEN_CANCELLED_BECAUSE_THE_OTHER_PARTY_DOES_NOT_MEET_THE_REQUIREMENTS_FOR_JOINING_THE_GAME);
 			return SystemMessage.getSystemMessage(SystemMessageId.THE_GAME_HAS_BEEN_CANCELLED_BECAUSE_THE_OTHER_PARTY_DOES_NOT_MEET_THE_REQUIREMENTS_FOR_JOINING_THE_GAME);
 		}
 		}
-		if (!player.isInventoryUnder80(true))
+		if (!player.isInventoryUnder90(true))
 		{
 		{
 			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_CANNOT_PARTICIPATE_IN_OLYMPIAD_INVENTORY_SLOT_EXCEEDS_80_PERCENT);
 			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_CANNOT_PARTICIPATE_IN_OLYMPIAD_INVENTORY_SLOT_EXCEEDS_80_PERCENT);
 			sm.addPcName(player);
 			sm.addPcName(player);

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/olympiad/OlympiadManager.java

@@ -448,7 +448,7 @@ public class OlympiadManager
 			return false;
 			return false;
 		}
 		}
 
 
-		if (!noble.isInventoryUnder80(true))
+		if (!noble.isInventoryUnder90(true))
 		{
 		{
 			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_CANNOT_PARTICIPATE_IN_OLYMPIAD_INVENTORY_SLOT_EXCEEDS_80_PERCENT);
 			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_CANNOT_PARTICIPATE_IN_OLYMPIAD_INVENTORY_SLOT_EXCEEDS_80_PERCENT);
 			sm.addPcName(noble);
 			sm.addPcName(noble);

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java

@@ -59,7 +59,7 @@ public final class RequestWithDrawPremiumItem extends L2GameClientPacket
 			Util.handleIllegalPlayerAction(activeChar, "[RequestWithDrawPremiumItem] Player: " + activeChar.getName() + " try to get item with empty list!", Config.DEFAULT_PUNISH);
 			Util.handleIllegalPlayerAction(activeChar, "[RequestWithDrawPremiumItem] Player: " + activeChar.getName() + " try to get item with empty list!", Config.DEFAULT_PUNISH);
 			return;
 			return;
 		}
 		}
-		else if (activeChar.getWeightPenalty() >= 3 || !activeChar.isInventoryUnder80(false))
+		else if (activeChar.getWeightPenalty() >= 3 || !activeChar.isInventoryUnder90(false))
 		{
 		{
 			activeChar.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_VITAMIN_ITEM);
 			activeChar.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_VITAMIN_ITEM);
 			return;
 			return;