lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Config for dropping items when slot limit is exceeded.

Browse Source
This commit is contained in:
MobiusDev 2018-09-10 17:11:00 +00:00
parent 1de5ae72bf
commit 3ae533f32d
24 changed files with 64 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
L2J_Mobius_1.0_Ertheia/dist/game/config/Character.ini vendored
View File

@ -648,6 +648,11 @@ AutoLoot = False
# Default: False
AutoLootRaids = False
# Prevent auto loot when inventory slot limit is reached.
# The items will be dropped to the ground instead.
# Default: False
AutoLootSlotLimit = False
# Delay for raid drop items loot privilege
# Require Command Channel , check next option
# Value is in seconds

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java
View File

@ -258,6 +258,7 @@ public final class Config
public static long MAX_ADENA;
public static boolean AUTO_LOOT;
public static boolean AUTO_LOOT_RAIDS;
public static boolean AUTO_LOOT_SLOT_LIMIT;
public static int LOOT_RAIDS_PRIVILEGE_INTERVAL;
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
public static List<Integer> AUTO_LOOT_ITEM_IDS;
@ -1601,6 +1602,7 @@ public final class Config
}
AUTO_LOOT = Character.getBoolean("AutoLoot", false);
AUTO_LOOT_RAIDS = Character.getBoolean("AutoLootRaids", false);
AUTO_LOOT_SLOT_LIMIT = Character.getBoolean("AutoLootSlotLimit", false);
LOOT_RAIDS_PRIVILEGE_INTERVAL = Character.getInt("RaidLootRightsInterval", 900) * 1000;
LOOT_RAIDS_PRIVILEGE_CC_SIZE = Character.getInt("RaidLootRightsCCSize", 45);
final String[] autoLootItemIds = Character.getString("AutoLootItemIds", "0").split(",");

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java
View File

@ -840,7 +840,7 @@ public class PcInventory extends Inventory
public boolean validateCapacity(long slots, boolean questItem)
{
return (slots == 0) || questItem ? (getSize(item -> item.isQuestItem()) + slots) <= _owner.getQuestInventoryLimit() : (getSize(item -> !item.isQuestItem()) + slots) <= _owner.getInventoryLimit();
return ((slots == 0) && !Config.AUTO_LOOT_SLOT_LIMIT) || questItem ? (getSize(item -> item.isQuestItem()) + slots) <= _owner.getQuestInventoryLimit() : (getSize(item -> !item.isQuestItem()) + slots) <= _owner.getInventoryLimit();
}
@Override

5
L2J_Mobius_2.5_Underground/dist/game/config/Character.ini vendored
View File

@ -648,6 +648,11 @@ AutoLoot = False
# Default: False
AutoLootRaids = False
# Prevent auto loot when inventory slot limit is reached.
# The items will be dropped to the ground instead.
# Default: False
AutoLootSlotLimit = False
# Delay for raid drop items loot privilege
# Require Command Channel , check next option
# Value is in seconds

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java
View File

@ -264,6 +264,7 @@ public final class Config
public static long MAX_ADENA;
public static boolean AUTO_LOOT;
public static boolean AUTO_LOOT_RAIDS;
public static boolean AUTO_LOOT_SLOT_LIMIT;
public static int LOOT_RAIDS_PRIVILEGE_INTERVAL;
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
public static List<Integer> AUTO_LOOT_ITEM_IDS;
@ -1616,6 +1617,7 @@ public final class Config
}
AUTO_LOOT = Character.getBoolean("AutoLoot", false);
AUTO_LOOT_RAIDS = Character.getBoolean("AutoLootRaids", false);
AUTO_LOOT_SLOT_LIMIT = Character.getBoolean("AutoLootSlotLimit", false);
LOOT_RAIDS_PRIVILEGE_INTERVAL = Character.getInt("RaidLootRightsInterval", 900) * 1000;
LOOT_RAIDS_PRIVILEGE_CC_SIZE = Character.getInt("RaidLootRightsCCSize", 45);
final String[] autoLootItemIds = Character.getString("AutoLootItemIds", "0").split(",");

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java
View File

@ -840,7 +840,7 @@ public class PcInventory extends Inventory
public boolean validateCapacity(long slots, boolean questItem)
{
return (slots == 0) || questItem ? (getSize(item -> item.isQuestItem()) + slots) <= _owner.getQuestInventoryLimit() : (getSize(item -> !item.isQuestItem()) + slots) <= _owner.getInventoryLimit();
return ((slots == 0) && !Config.AUTO_LOOT_SLOT_LIMIT) || questItem ? (getSize(item -> item.isQuestItem()) + slots) <= _owner.getQuestInventoryLimit() : (getSize(item -> !item.isQuestItem()) + slots) <= _owner.getInventoryLimit();
}
@Override

5
L2J_Mobius_3.0_Helios/dist/game/config/Character.ini vendored
View File

@ -648,6 +648,11 @@ AutoLoot = False
# Default: False
AutoLootRaids = False
# Prevent auto loot when inventory slot limit is reached.
# The items will be dropped to the ground instead.
# Default: False
AutoLootSlotLimit = False
# Delay for raid drop items loot privilege
# Require Command Channel , check next option
# Value is in seconds

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java
View File

@ -264,6 +264,7 @@ public final class Config
public static long MAX_ADENA;
public static boolean AUTO_LOOT;
public static boolean AUTO_LOOT_RAIDS;
public static boolean AUTO_LOOT_SLOT_LIMIT;
public static int LOOT_RAIDS_PRIVILEGE_INTERVAL;
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
public static List<Integer> AUTO_LOOT_ITEM_IDS;
@ -1624,6 +1625,7 @@ public final class Config
}
AUTO_LOOT = Character.getBoolean("AutoLoot", false);
AUTO_LOOT_RAIDS = Character.getBoolean("AutoLootRaids", false);
AUTO_LOOT_SLOT_LIMIT = Character.getBoolean("AutoLootSlotLimit", false);
LOOT_RAIDS_PRIVILEGE_INTERVAL = Character.getInt("RaidLootRightsInterval", 900) * 1000;
LOOT_RAIDS_PRIVILEGE_CC_SIZE = Character.getInt("RaidLootRightsCCSize", 45);
final String[] autoLootItemIds = Character.getString("AutoLootItemIds", "0").split(",");

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java
View File

@ -840,7 +840,7 @@ public class PcInventory extends Inventory
public boolean validateCapacity(long slots, boolean questItem)
{
return (slots == 0) || questItem ? (getSize(item -> item.isQuestItem()) + slots) <= _owner.getQuestInventoryLimit() : (getSize(item -> !item.isQuestItem()) + slots) <= _owner.getInventoryLimit();
return ((slots == 0) && !Config.AUTO_LOOT_SLOT_LIMIT) || questItem ? (getSize(item -> item.isQuestItem()) + slots) <= _owner.getQuestInventoryLimit() : (getSize(item -> !item.isQuestItem()) + slots) <= _owner.getInventoryLimit();
}
@Override

5
L2J_Mobius_4.0_GrandCrusade/dist/game/config/Character.ini vendored
View File

@ -624,6 +624,11 @@ AutoLoot = False
# Default: False
AutoLootRaids = False
# Prevent auto loot when inventory slot limit is reached.
# The items will be dropped to the ground instead.
# Default: False
AutoLootSlotLimit = False
# Delay for raid drop items loot privilege
# Require Command Channel , check next option
# Value is in seconds

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java
View File

@ -258,6 +258,7 @@ public final class Config
public static long MAX_ADENA;
public static boolean AUTO_LOOT;
public static boolean AUTO_LOOT_RAIDS;
public static boolean AUTO_LOOT_SLOT_LIMIT;
public static int LOOT_RAIDS_PRIVILEGE_INTERVAL;
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
public static List<Integer> AUTO_LOOT_ITEM_IDS;
@ -1611,6 +1612,7 @@ public final class Config
}
AUTO_LOOT = Character.getBoolean("AutoLoot", false);
AUTO_LOOT_RAIDS = Character.getBoolean("AutoLootRaids", false);
AUTO_LOOT_SLOT_LIMIT = Character.getBoolean("AutoLootSlotLimit", false);
LOOT_RAIDS_PRIVILEGE_INTERVAL = Character.getInt("RaidLootRightsInterval", 900) * 1000;
LOOT_RAIDS_PRIVILEGE_CC_SIZE = Character.getInt("RaidLootRightsCCSize", 45);
final String[] autoLootItemIds = Character.getString("AutoLootItemIds", "0").split(",");

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java
View File

@ -840,7 +840,7 @@ public class PcInventory extends Inventory
public boolean validateCapacity(long slots, boolean questItem)
{
return (slots == 0) || questItem ? (getSize(item -> item.isQuestItem()) + slots) <= _owner.getQuestInventoryLimit() : (getSize(item -> !item.isQuestItem()) + slots) <= _owner.getInventoryLimit();
return ((slots == 0) && !Config.AUTO_LOOT_SLOT_LIMIT) || questItem ? (getSize(item -> item.isQuestItem()) + slots) <= _owner.getQuestInventoryLimit() : (getSize(item -> !item.isQuestItem()) + slots) <= _owner.getInventoryLimit();
}
@Override

5
L2J_Mobius_CT_2.6_HighFive/dist/game/config/Character.ini vendored
View File

@ -731,6 +731,11 @@ AutoLoot = False
# Default: False
AutoLootRaids = False
# Prevent auto loot when inventory slot limit is reached.
# The items will be dropped to the ground instead.
# Default: False
AutoLootSlotLimit = False
# Delay for raid drop items loot privilege
# Require Command Channel , check next option
# Value is in seconds

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java
View File

@ -263,6 +263,7 @@ public final class Config
public static long MAX_ADENA;
public static boolean AUTO_LOOT;
public static boolean AUTO_LOOT_RAIDS;
public static boolean AUTO_LOOT_SLOT_LIMIT;
public static int LOOT_RAIDS_PRIVILEGE_INTERVAL;
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
public static List<Integer> AUTO_LOOT_ITEM_IDS;
@ -1902,6 +1903,7 @@ public final class Config
}
AUTO_LOOT = Character.getBoolean("AutoLoot", false);
AUTO_LOOT_RAIDS = Character.getBoolean("AutoLootRaids", false);
AUTO_LOOT_SLOT_LIMIT = Character.getBoolean("AutoLootSlotLimit", false);
LOOT_RAIDS_PRIVILEGE_INTERVAL = Character.getInt("RaidLootRightsInterval", 900) * 1000;
LOOT_RAIDS_PRIVILEGE_CC_SIZE = Character.getInt("RaidLootRightsCCSize", 45);
final String[] autoLootItemIds = Character.getString("AutoLootItemIds", "0").split(",");

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java
View File

@ -852,7 +852,7 @@ public class PcInventory extends Inventory
public boolean validateCapacity(long slots, boolean questItem)
{
return !questItem ? ((_items.size() - _questSlots) + slots) <= _owner.getInventoryLimit() : (_questSlots + slots) <= _owner.getQuestInventoryLimit();
return ((slots == 0) && !Config.AUTO_LOOT_SLOT_LIMIT) || questItem ? (_questSlots + slots) <= _owner.getQuestInventoryLimit() : ((_items.size() - _questSlots) + slots) <= _owner.getInventoryLimit();
}
@Override

5
L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Character.ini vendored
View File

@ -599,6 +599,11 @@ AutoLoot = False
# Default: False
AutoLootRaids = False
# Prevent auto loot when inventory slot limit is reached.
# The items will be dropped to the ground instead.
# Default: False
AutoLootSlotLimit = False
# Delay for raid drop items loot privilege
# Require Command Channel , check next option
# Value is in seconds

2
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java
View File

@ -263,6 +263,7 @@ public final class Config
public static long MAX_ADENA;
public static boolean AUTO_LOOT;
public static boolean AUTO_LOOT_RAIDS;
public static boolean AUTO_LOOT_SLOT_LIMIT;
public static int LOOT_RAIDS_PRIVILEGE_INTERVAL;
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
public static List<Integer> AUTO_LOOT_ITEM_IDS;
@ -1552,6 +1553,7 @@ public final class Config
}
AUTO_LOOT = Character.getBoolean("AutoLoot", false);
AUTO_LOOT_RAIDS = Character.getBoolean("AutoLootRaids", false);
AUTO_LOOT_SLOT_LIMIT = Character.getBoolean("AutoLootSlotLimit", false);
LOOT_RAIDS_PRIVILEGE_INTERVAL = Character.getInt("RaidLootRightsInterval", 900) * 1000;
LOOT_RAIDS_PRIVILEGE_CC_SIZE = Character.getInt("RaidLootRightsCCSize", 45);
final String[] autoLootItemIds = Character.getString("AutoLootItemIds", "0").split(",");

2
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java
View File

@ -840,7 +840,7 @@ public class PcInventory extends Inventory
public boolean validateCapacity(long slots, boolean questItem)
{
return (slots == 0) || questItem ? (getSize(item -> item.isQuestItem()) + slots) <= _owner.getQuestInventoryLimit() : (getSize(item -> !item.isQuestItem()) + slots) <= _owner.getInventoryLimit();
return ((slots == 0) && !Config.AUTO_LOOT_SLOT_LIMIT) || questItem ? (getSize(item -> item.isQuestItem()) + slots) <= _owner.getQuestInventoryLimit() : (getSize(item -> !item.isQuestItem()) + slots) <= _owner.getInventoryLimit();
}
@Override

5
L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Character.ini vendored
View File

@ -599,6 +599,11 @@ AutoLoot = False
# Default: False
AutoLootRaids = False
# Prevent auto loot when inventory slot limit is reached.
# The items will be dropped to the ground instead.
# Default: False
AutoLootSlotLimit = False
# Delay for raid drop items loot privilege
# Require Command Channel , check next option
# Value is in seconds

2
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/Config.java
View File

@ -263,6 +263,7 @@ public final class Config
public static long MAX_ADENA;
public static boolean AUTO_LOOT;
public static boolean AUTO_LOOT_RAIDS;
public static boolean AUTO_LOOT_SLOT_LIMIT;
public static int LOOT_RAIDS_PRIVILEGE_INTERVAL;
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
public static List<Integer> AUTO_LOOT_ITEM_IDS;
@ -1556,6 +1557,7 @@ public final class Config
}
AUTO_LOOT = Character.getBoolean("AutoLoot", false);
AUTO_LOOT_RAIDS = Character.getBoolean("AutoLootRaids", false);
AUTO_LOOT_SLOT_LIMIT = Character.getBoolean("AutoLootSlotLimit", false);
LOOT_RAIDS_PRIVILEGE_INTERVAL = Character.getInt("RaidLootRightsInterval", 900) * 1000;
LOOT_RAIDS_PRIVILEGE_CC_SIZE = Character.getInt("RaidLootRightsCCSize", 45);
final String[] autoLootItemIds = Character.getString("AutoLootItemIds", "0").split(",");

2
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java
View File

@ -840,7 +840,7 @@ public class PcInventory extends Inventory
public boolean validateCapacity(long slots, boolean questItem)
{
return (slots == 0) || questItem ? (getSize(item -> item.isQuestItem()) + slots) <= _owner.getQuestInventoryLimit() : (getSize(item -> !item.isQuestItem()) + slots) <= _owner.getInventoryLimit();
return ((slots == 0) && !Config.AUTO_LOOT_SLOT_LIMIT) || questItem ? (getSize(item -> item.isQuestItem()) + slots) <= _owner.getQuestInventoryLimit() : (getSize(item -> !item.isQuestItem()) + slots) <= _owner.getInventoryLimit();
}
@Override

5
L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Character.ini vendored
View File

@ -599,6 +599,11 @@ AutoLoot = False
# Default: False
AutoLootRaids = False
# Prevent auto loot when inventory slot limit is reached.
# The items will be dropped to the ground instead.
# Default: False
AutoLootSlotLimit = False
# Delay for raid drop items loot privilege
# Require Command Channel , check next option
# Value is in seconds

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/Config.java
View File

@ -263,6 +263,7 @@ public final class Config
public static long MAX_ADENA;
public static boolean AUTO_LOOT;
public static boolean AUTO_LOOT_RAIDS;
public static boolean AUTO_LOOT_SLOT_LIMIT;
public static int LOOT_RAIDS_PRIVILEGE_INTERVAL;
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
public static List<Integer> AUTO_LOOT_ITEM_IDS;
@ -1556,6 +1557,7 @@ public final class Config
}
AUTO_LOOT = Character.getBoolean("AutoLoot", false);
AUTO_LOOT_RAIDS = Character.getBoolean("AutoLootRaids", false);
AUTO_LOOT_SLOT_LIMIT = Character.getBoolean("AutoLootSlotLimit", false);
LOOT_RAIDS_PRIVILEGE_INTERVAL = Character.getInt("RaidLootRightsInterval", 900) * 1000;
LOOT_RAIDS_PRIVILEGE_CC_SIZE = Character.getInt("RaidLootRightsCCSize", 45);
final String[] autoLootItemIds = Character.getString("AutoLootItemIds", "0").split(",");

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java
View File

@ -840,7 +840,7 @@ public class PcInventory extends Inventory
public boolean validateCapacity(long slots, boolean questItem)
{
return (slots == 0) || questItem ? (getSize(item -> item.isQuestItem()) + slots) <= _owner.getQuestInventoryLimit() : (getSize(item -> !item.isQuestItem()) + slots) <= _owner.getInventoryLimit();
return ((slots == 0) && !Config.AUTO_LOOT_SLOT_LIMIT) || questItem ? (getSize(item -> item.isQuestItem()) + slots) <= _owner.getQuestInventoryLimit() : (getSize(item -> !item.isQuestItem()) + slots) <= _owner.getInventoryLimit();
}
@Override