Config for dropping items when slot limit is exceeded.
This commit is contained in:
parent
1de5ae72bf
commit
3ae533f32d
@ -648,6 +648,11 @@ AutoLoot = False
|
|||||||
# Default: False
|
# Default: False
|
||||||
AutoLootRaids = 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
|
# Delay for raid drop items loot privilege
|
||||||
# Require Command Channel , check next option
|
# Require Command Channel , check next option
|
||||||
# Value is in seconds
|
# Value is in seconds
|
||||||
|
@ -258,6 +258,7 @@ public final class Config
|
|||||||
public static long MAX_ADENA;
|
public static long MAX_ADENA;
|
||||||
public static boolean AUTO_LOOT;
|
public static boolean AUTO_LOOT;
|
||||||
public static boolean AUTO_LOOT_RAIDS;
|
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_INTERVAL;
|
||||||
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
|
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
|
||||||
public static List<Integer> AUTO_LOOT_ITEM_IDS;
|
public static List<Integer> AUTO_LOOT_ITEM_IDS;
|
||||||
@ -1601,6 +1602,7 @@ public final class Config
|
|||||||
}
|
}
|
||||||
AUTO_LOOT = Character.getBoolean("AutoLoot", false);
|
AUTO_LOOT = Character.getBoolean("AutoLoot", false);
|
||||||
AUTO_LOOT_RAIDS = Character.getBoolean("AutoLootRaids", 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_INTERVAL = Character.getInt("RaidLootRightsInterval", 900) * 1000;
|
||||||
LOOT_RAIDS_PRIVILEGE_CC_SIZE = Character.getInt("RaidLootRightsCCSize", 45);
|
LOOT_RAIDS_PRIVILEGE_CC_SIZE = Character.getInt("RaidLootRightsCCSize", 45);
|
||||||
final String[] autoLootItemIds = Character.getString("AutoLootItemIds", "0").split(",");
|
final String[] autoLootItemIds = Character.getString("AutoLootItemIds", "0").split(",");
|
||||||
|
@ -840,7 +840,7 @@ public class PcInventory extends Inventory
|
|||||||
|
|
||||||
public boolean validateCapacity(long slots, boolean questItem)
|
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
|
@Override
|
||||||
|
@ -648,6 +648,11 @@ AutoLoot = False
|
|||||||
# Default: False
|
# Default: False
|
||||||
AutoLootRaids = 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
|
# Delay for raid drop items loot privilege
|
||||||
# Require Command Channel , check next option
|
# Require Command Channel , check next option
|
||||||
# Value is in seconds
|
# Value is in seconds
|
||||||
|
@ -264,6 +264,7 @@ public final class Config
|
|||||||
public static long MAX_ADENA;
|
public static long MAX_ADENA;
|
||||||
public static boolean AUTO_LOOT;
|
public static boolean AUTO_LOOT;
|
||||||
public static boolean AUTO_LOOT_RAIDS;
|
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_INTERVAL;
|
||||||
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
|
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
|
||||||
public static List<Integer> AUTO_LOOT_ITEM_IDS;
|
public static List<Integer> AUTO_LOOT_ITEM_IDS;
|
||||||
@ -1616,6 +1617,7 @@ public final class Config
|
|||||||
}
|
}
|
||||||
AUTO_LOOT = Character.getBoolean("AutoLoot", false);
|
AUTO_LOOT = Character.getBoolean("AutoLoot", false);
|
||||||
AUTO_LOOT_RAIDS = Character.getBoolean("AutoLootRaids", 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_INTERVAL = Character.getInt("RaidLootRightsInterval", 900) * 1000;
|
||||||
LOOT_RAIDS_PRIVILEGE_CC_SIZE = Character.getInt("RaidLootRightsCCSize", 45);
|
LOOT_RAIDS_PRIVILEGE_CC_SIZE = Character.getInt("RaidLootRightsCCSize", 45);
|
||||||
final String[] autoLootItemIds = Character.getString("AutoLootItemIds", "0").split(",");
|
final String[] autoLootItemIds = Character.getString("AutoLootItemIds", "0").split(",");
|
||||||
|
@ -840,7 +840,7 @@ public class PcInventory extends Inventory
|
|||||||
|
|
||||||
public boolean validateCapacity(long slots, boolean questItem)
|
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
|
@Override
|
||||||
|
@ -648,6 +648,11 @@ AutoLoot = False
|
|||||||
# Default: False
|
# Default: False
|
||||||
AutoLootRaids = 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
|
# Delay for raid drop items loot privilege
|
||||||
# Require Command Channel , check next option
|
# Require Command Channel , check next option
|
||||||
# Value is in seconds
|
# Value is in seconds
|
||||||
|
@ -264,6 +264,7 @@ public final class Config
|
|||||||
public static long MAX_ADENA;
|
public static long MAX_ADENA;
|
||||||
public static boolean AUTO_LOOT;
|
public static boolean AUTO_LOOT;
|
||||||
public static boolean AUTO_LOOT_RAIDS;
|
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_INTERVAL;
|
||||||
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
|
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
|
||||||
public static List<Integer> AUTO_LOOT_ITEM_IDS;
|
public static List<Integer> AUTO_LOOT_ITEM_IDS;
|
||||||
@ -1624,6 +1625,7 @@ public final class Config
|
|||||||
}
|
}
|
||||||
AUTO_LOOT = Character.getBoolean("AutoLoot", false);
|
AUTO_LOOT = Character.getBoolean("AutoLoot", false);
|
||||||
AUTO_LOOT_RAIDS = Character.getBoolean("AutoLootRaids", 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_INTERVAL = Character.getInt("RaidLootRightsInterval", 900) * 1000;
|
||||||
LOOT_RAIDS_PRIVILEGE_CC_SIZE = Character.getInt("RaidLootRightsCCSize", 45);
|
LOOT_RAIDS_PRIVILEGE_CC_SIZE = Character.getInt("RaidLootRightsCCSize", 45);
|
||||||
final String[] autoLootItemIds = Character.getString("AutoLootItemIds", "0").split(",");
|
final String[] autoLootItemIds = Character.getString("AutoLootItemIds", "0").split(",");
|
||||||
|
@ -840,7 +840,7 @@ public class PcInventory extends Inventory
|
|||||||
|
|
||||||
public boolean validateCapacity(long slots, boolean questItem)
|
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
|
@Override
|
||||||
|
@ -624,6 +624,11 @@ AutoLoot = False
|
|||||||
# Default: False
|
# Default: False
|
||||||
AutoLootRaids = 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
|
# Delay for raid drop items loot privilege
|
||||||
# Require Command Channel , check next option
|
# Require Command Channel , check next option
|
||||||
# Value is in seconds
|
# Value is in seconds
|
||||||
|
@ -258,6 +258,7 @@ public final class Config
|
|||||||
public static long MAX_ADENA;
|
public static long MAX_ADENA;
|
||||||
public static boolean AUTO_LOOT;
|
public static boolean AUTO_LOOT;
|
||||||
public static boolean AUTO_LOOT_RAIDS;
|
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_INTERVAL;
|
||||||
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
|
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
|
||||||
public static List<Integer> AUTO_LOOT_ITEM_IDS;
|
public static List<Integer> AUTO_LOOT_ITEM_IDS;
|
||||||
@ -1611,6 +1612,7 @@ public final class Config
|
|||||||
}
|
}
|
||||||
AUTO_LOOT = Character.getBoolean("AutoLoot", false);
|
AUTO_LOOT = Character.getBoolean("AutoLoot", false);
|
||||||
AUTO_LOOT_RAIDS = Character.getBoolean("AutoLootRaids", 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_INTERVAL = Character.getInt("RaidLootRightsInterval", 900) * 1000;
|
||||||
LOOT_RAIDS_PRIVILEGE_CC_SIZE = Character.getInt("RaidLootRightsCCSize", 45);
|
LOOT_RAIDS_PRIVILEGE_CC_SIZE = Character.getInt("RaidLootRightsCCSize", 45);
|
||||||
final String[] autoLootItemIds = Character.getString("AutoLootItemIds", "0").split(",");
|
final String[] autoLootItemIds = Character.getString("AutoLootItemIds", "0").split(",");
|
||||||
|
@ -840,7 +840,7 @@ public class PcInventory extends Inventory
|
|||||||
|
|
||||||
public boolean validateCapacity(long slots, boolean questItem)
|
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
|
@Override
|
||||||
|
@ -731,6 +731,11 @@ AutoLoot = False
|
|||||||
# Default: False
|
# Default: False
|
||||||
AutoLootRaids = 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
|
# Delay for raid drop items loot privilege
|
||||||
# Require Command Channel , check next option
|
# Require Command Channel , check next option
|
||||||
# Value is in seconds
|
# Value is in seconds
|
||||||
|
@ -263,6 +263,7 @@ public final class Config
|
|||||||
public static long MAX_ADENA;
|
public static long MAX_ADENA;
|
||||||
public static boolean AUTO_LOOT;
|
public static boolean AUTO_LOOT;
|
||||||
public static boolean AUTO_LOOT_RAIDS;
|
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_INTERVAL;
|
||||||
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
|
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
|
||||||
public static List<Integer> AUTO_LOOT_ITEM_IDS;
|
public static List<Integer> AUTO_LOOT_ITEM_IDS;
|
||||||
@ -1902,6 +1903,7 @@ public final class Config
|
|||||||
}
|
}
|
||||||
AUTO_LOOT = Character.getBoolean("AutoLoot", false);
|
AUTO_LOOT = Character.getBoolean("AutoLoot", false);
|
||||||
AUTO_LOOT_RAIDS = Character.getBoolean("AutoLootRaids", 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_INTERVAL = Character.getInt("RaidLootRightsInterval", 900) * 1000;
|
||||||
LOOT_RAIDS_PRIVILEGE_CC_SIZE = Character.getInt("RaidLootRightsCCSize", 45);
|
LOOT_RAIDS_PRIVILEGE_CC_SIZE = Character.getInt("RaidLootRightsCCSize", 45);
|
||||||
final String[] autoLootItemIds = Character.getString("AutoLootItemIds", "0").split(",");
|
final String[] autoLootItemIds = Character.getString("AutoLootItemIds", "0").split(",");
|
||||||
|
@ -852,7 +852,7 @@ public class PcInventory extends Inventory
|
|||||||
|
|
||||||
public boolean validateCapacity(long slots, boolean questItem)
|
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
|
@Override
|
||||||
|
@ -599,6 +599,11 @@ AutoLoot = False
|
|||||||
# Default: False
|
# Default: False
|
||||||
AutoLootRaids = 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
|
# Delay for raid drop items loot privilege
|
||||||
# Require Command Channel , check next option
|
# Require Command Channel , check next option
|
||||||
# Value is in seconds
|
# Value is in seconds
|
||||||
|
@ -263,6 +263,7 @@ public final class Config
|
|||||||
public static long MAX_ADENA;
|
public static long MAX_ADENA;
|
||||||
public static boolean AUTO_LOOT;
|
public static boolean AUTO_LOOT;
|
||||||
public static boolean AUTO_LOOT_RAIDS;
|
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_INTERVAL;
|
||||||
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
|
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
|
||||||
public static List<Integer> AUTO_LOOT_ITEM_IDS;
|
public static List<Integer> AUTO_LOOT_ITEM_IDS;
|
||||||
@ -1552,6 +1553,7 @@ public final class Config
|
|||||||
}
|
}
|
||||||
AUTO_LOOT = Character.getBoolean("AutoLoot", false);
|
AUTO_LOOT = Character.getBoolean("AutoLoot", false);
|
||||||
AUTO_LOOT_RAIDS = Character.getBoolean("AutoLootRaids", 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_INTERVAL = Character.getInt("RaidLootRightsInterval", 900) * 1000;
|
||||||
LOOT_RAIDS_PRIVILEGE_CC_SIZE = Character.getInt("RaidLootRightsCCSize", 45);
|
LOOT_RAIDS_PRIVILEGE_CC_SIZE = Character.getInt("RaidLootRightsCCSize", 45);
|
||||||
final String[] autoLootItemIds = Character.getString("AutoLootItemIds", "0").split(",");
|
final String[] autoLootItemIds = Character.getString("AutoLootItemIds", "0").split(",");
|
||||||
|
@ -840,7 +840,7 @@ public class PcInventory extends Inventory
|
|||||||
|
|
||||||
public boolean validateCapacity(long slots, boolean questItem)
|
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
|
@Override
|
||||||
|
@ -599,6 +599,11 @@ AutoLoot = False
|
|||||||
# Default: False
|
# Default: False
|
||||||
AutoLootRaids = 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
|
# Delay for raid drop items loot privilege
|
||||||
# Require Command Channel , check next option
|
# Require Command Channel , check next option
|
||||||
# Value is in seconds
|
# Value is in seconds
|
||||||
|
@ -263,6 +263,7 @@ public final class Config
|
|||||||
public static long MAX_ADENA;
|
public static long MAX_ADENA;
|
||||||
public static boolean AUTO_LOOT;
|
public static boolean AUTO_LOOT;
|
||||||
public static boolean AUTO_LOOT_RAIDS;
|
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_INTERVAL;
|
||||||
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
|
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
|
||||||
public static List<Integer> AUTO_LOOT_ITEM_IDS;
|
public static List<Integer> AUTO_LOOT_ITEM_IDS;
|
||||||
@ -1556,6 +1557,7 @@ public final class Config
|
|||||||
}
|
}
|
||||||
AUTO_LOOT = Character.getBoolean("AutoLoot", false);
|
AUTO_LOOT = Character.getBoolean("AutoLoot", false);
|
||||||
AUTO_LOOT_RAIDS = Character.getBoolean("AutoLootRaids", 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_INTERVAL = Character.getInt("RaidLootRightsInterval", 900) * 1000;
|
||||||
LOOT_RAIDS_PRIVILEGE_CC_SIZE = Character.getInt("RaidLootRightsCCSize", 45);
|
LOOT_RAIDS_PRIVILEGE_CC_SIZE = Character.getInt("RaidLootRightsCCSize", 45);
|
||||||
final String[] autoLootItemIds = Character.getString("AutoLootItemIds", "0").split(",");
|
final String[] autoLootItemIds = Character.getString("AutoLootItemIds", "0").split(",");
|
||||||
|
@ -840,7 +840,7 @@ public class PcInventory extends Inventory
|
|||||||
|
|
||||||
public boolean validateCapacity(long slots, boolean questItem)
|
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
|
@Override
|
||||||
|
@ -599,6 +599,11 @@ AutoLoot = False
|
|||||||
# Default: False
|
# Default: False
|
||||||
AutoLootRaids = 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
|
# Delay for raid drop items loot privilege
|
||||||
# Require Command Channel , check next option
|
# Require Command Channel , check next option
|
||||||
# Value is in seconds
|
# Value is in seconds
|
||||||
|
@ -263,6 +263,7 @@ public final class Config
|
|||||||
public static long MAX_ADENA;
|
public static long MAX_ADENA;
|
||||||
public static boolean AUTO_LOOT;
|
public static boolean AUTO_LOOT;
|
||||||
public static boolean AUTO_LOOT_RAIDS;
|
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_INTERVAL;
|
||||||
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
|
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
|
||||||
public static List<Integer> AUTO_LOOT_ITEM_IDS;
|
public static List<Integer> AUTO_LOOT_ITEM_IDS;
|
||||||
@ -1556,6 +1557,7 @@ public final class Config
|
|||||||
}
|
}
|
||||||
AUTO_LOOT = Character.getBoolean("AutoLoot", false);
|
AUTO_LOOT = Character.getBoolean("AutoLoot", false);
|
||||||
AUTO_LOOT_RAIDS = Character.getBoolean("AutoLootRaids", 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_INTERVAL = Character.getInt("RaidLootRightsInterval", 900) * 1000;
|
||||||
LOOT_RAIDS_PRIVILEGE_CC_SIZE = Character.getInt("RaidLootRightsCCSize", 45);
|
LOOT_RAIDS_PRIVILEGE_CC_SIZE = Character.getInt("RaidLootRightsCCSize", 45);
|
||||||
final String[] autoLootItemIds = Character.getString("AutoLootItemIds", "0").split(",");
|
final String[] autoLootItemIds = Character.getString("AutoLootItemIds", "0").split(",");
|
||||||
|
@ -840,7 +840,7 @@ public class PcInventory extends Inventory
|
|||||||
|
|
||||||
public boolean validateCapacity(long slots, boolean questItem)
|
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
|
@Override
|
||||||
|
Loading…
Reference in New Issue
Block a user