From ef51c8a3f39fb16d508570ffc7aa94abc038329b Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 21 Feb 2020 11:52:29 +0000 Subject: [PATCH] Configuration for making items depositable. --- .../game/config/Custom/CustomDepositableItems.ini | 11 +++++++++++ .../java/org/l2jmobius/Config.java | 9 +++++++++ .../org/l2jmobius/gameserver/model/items/Item.java | 13 +++++++++++-- .../game/config/Custom/CustomDepositableItems.ini | 11 +++++++++++ .../java/org/l2jmobius/Config.java | 9 +++++++++ .../org/l2jmobius/gameserver/model/items/Item.java | 13 +++++++++++-- .../game/config/Custom/CustomDepositableItems.ini | 11 +++++++++++ .../java/org/l2jmobius/Config.java | 9 +++++++++ .../org/l2jmobius/gameserver/model/items/Item.java | 13 +++++++++++-- .../game/config/Custom/CustomDepositableItems.ini | 11 +++++++++++ .../java/org/l2jmobius/Config.java | 9 +++++++++ .../org/l2jmobius/gameserver/model/items/Item.java | 13 +++++++++++-- .../game/config/Custom/CustomDepositableItems.ini | 11 +++++++++++ .../java/org/l2jmobius/Config.java | 9 +++++++++ .../org/l2jmobius/gameserver/model/items/Item.java | 13 +++++++++++-- .../game/config/Custom/CustomDepositableItems.ini | 11 +++++++++++ .../java/org/l2jmobius/Config.java | 9 +++++++++ .../org/l2jmobius/gameserver/model/items/Item.java | 13 +++++++++++-- .../game/config/Custom/CustomDepositableItems.ini | 11 +++++++++++ .../java/org/l2jmobius/Config.java | 9 +++++++++ .../org/l2jmobius/gameserver/model/items/Item.java | 13 +++++++++++-- .../game/config/Custom/CustomDepositableItems.ini | 11 +++++++++++ .../java/org/l2jmobius/Config.java | 9 +++++++++ .../org/l2jmobius/gameserver/model/items/Item.java | 13 +++++++++++-- .../game/config/Custom/CustomDepositableItems.ini | 11 +++++++++++ .../java/org/l2jmobius/Config.java | 9 +++++++++ .../org/l2jmobius/gameserver/model/items/Item.java | 13 +++++++++++-- .../game/config/Custom/CustomDepositableItems.ini | 11 +++++++++++ .../java/org/l2jmobius/Config.java | 9 +++++++++ .../org/l2jmobius/gameserver/model/items/Item.java | 13 +++++++++++-- .../game/config/Custom/CustomDepositableItems.ini | 11 +++++++++++ .../java/org/l2jmobius/Config.java | 9 +++++++++ .../org/l2jmobius/gameserver/model/items/Item.java | 13 +++++++++++-- .../game/config/Custom/CustomDepositableItems.ini | 11 +++++++++++ .../java/org/l2jmobius/Config.java | 9 +++++++++ .../org/l2jmobius/gameserver/model/items/Item.java | 13 +++++++++++-- .../game/config/Custom/CustomDepositableItems.ini | 11 +++++++++++ .../java/org/l2jmobius/Config.java | 9 +++++++++ .../org/l2jmobius/gameserver/model/items/Item.java | 13 +++++++++++-- .../game/config/Custom/CustomDepositableItems.ini | 11 +++++++++++ .../java/org/l2jmobius/Config.java | 9 +++++++++ .../org/l2jmobius/gameserver/model/items/Item.java | 13 +++++++++++-- .../game/config/Custom/CustomDepositableItems.ini | 11 +++++++++++ .../java/org/l2jmobius/Config.java | 9 +++++++++ .../org/l2jmobius/gameserver/model/items/Item.java | 13 +++++++++++-- 45 files changed, 465 insertions(+), 30 deletions(-) create mode 100644 L2J_Mobius_1.0_Ertheia/dist/game/config/Custom/CustomDepositableItems.ini create mode 100644 L2J_Mobius_2.5_Underground/dist/game/config/Custom/CustomDepositableItems.ini create mode 100644 L2J_Mobius_3.0_Helios/dist/game/config/Custom/CustomDepositableItems.ini create mode 100644 L2J_Mobius_4.0_GrandCrusade/dist/game/config/Custom/CustomDepositableItems.ini create mode 100644 L2J_Mobius_5.0_Salvation/dist/game/config/Custom/CustomDepositableItems.ini create mode 100644 L2J_Mobius_5.5_EtinasFate/dist/game/config/Custom/CustomDepositableItems.ini create mode 100644 L2J_Mobius_6.0_Fafurion/dist/game/config/Custom/CustomDepositableItems.ini create mode 100644 L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Custom/CustomDepositableItems.ini create mode 100644 L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Custom/CustomDepositableItems.ini create mode 100644 L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Custom/CustomDepositableItems.ini create mode 100644 L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Custom/CustomDepositableItems.ini create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Custom/CustomDepositableItems.ini create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/config/Custom/CustomDepositableItems.ini create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Custom/CustomDepositableItems.ini create mode 100644 L2J_Mobius_Classic_Interlude/dist/game/config/Custom/CustomDepositableItems.ini diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/config/Custom/CustomDepositableItems.ini b/L2J_Mobius_1.0_Ertheia/dist/game/config/Custom/CustomDepositableItems.ini new file mode 100644 index 0000000000..88dfef9177 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/config/Custom/CustomDepositableItems.ini @@ -0,0 +1,11 @@ +# --------------------------------------------------------------------------- +# Custom Depositable Items +# --------------------------------------------------------------------------- + +# Make all items depositable for private warehouse. +# Default: False +CustomDepositableEnabled = True + +# Include quest items. +# Default: False +DepositableQuestItems = False diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/Config.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/Config.java index d77520cf3d..5de12e6e9f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/Config.java @@ -116,6 +116,7 @@ public class Config private static final String CUSTOM_CHAT_MODERATION_CONFIG_FILE = "./config/Custom/ChatModeration.ini"; private static final String CUSTOM_CLASS_BALANCE_CONFIG_FILE = "./config/Custom/ClassBalance.ini"; private static final String CUSTOM_COMMUNITY_BOARD_CONFIG_FILE = "./config/Custom/CommunityBoard.ini"; + private static final String CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE = "./config/Custom/CustomDepositableItems.ini"; private static final String CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE = "./config/Custom/CustomMailManager.ini"; private static final String CUSTOM_DELEVEL_MANAGER_CONFIG_FILE = "./config/Custom/DelevelManager.ini"; private static final String CUSTOM_DUALBOX_CHECK_CONFIG_FILE = "./config/Custom/DualboxCheck.ini"; @@ -1210,6 +1211,8 @@ public class Config public static int COMMUNITY_PREMIUM_PRICE_PER_DAY; public static List COMMUNITY_AVAILABLE_BUFFS; public static Map COMMUNITY_AVAILABLE_TELEPORTS; + public static boolean CUSTOM_DEPOSITABLE_ENABLED; + public static boolean CUSTOM_DEPOSITABLE_QUEST_ITEMS; public static boolean CUSTOM_MAIL_MANAGER_ENABLED; public static int CUSTOM_MAIL_MANAGER_DELAY; public static boolean DELEVEL_MANAGER_ENABLED; @@ -3133,6 +3136,12 @@ public class Config COMMUNITY_AVAILABLE_TELEPORTS.put(splitInfo[0], new Location(Integer.parseInt(splitInfo[1]), Integer.parseInt(splitInfo[2]), Integer.parseInt(splitInfo[3]))); } + // Load CustomDepositableItems config file (if exists) + final PropertiesParser CustomDepositableItems = new PropertiesParser(CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE); + + CUSTOM_DEPOSITABLE_ENABLED = CustomDepositableItems.getBoolean("CustomDepositableEnabled", false); + CUSTOM_DEPOSITABLE_QUEST_ITEMS = CustomDepositableItems.getBoolean("DepositableQuestItems", false); + // Load CustomMailManager config file (if exists) final PropertiesParser CustomMailManager = new PropertiesParser(CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Item.java index e919088ff1..0a0e8366cb 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Item.java @@ -205,10 +205,19 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _dropable = set.getBoolean("is_dropable", true); _destroyable = set.getBoolean("is_destroyable", true); _tradeable = set.getBoolean("is_tradable", true); - _depositable = set.getBoolean("is_depositable", true); + + _questItem = set.getBoolean("is_questitem", false); + if (Config.CUSTOM_DEPOSITABLE_ENABLED) + { + _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + } + else + { + _depositable = set.getBoolean("is_depositable", true); + } + _elementable = set.getBoolean("element_enabled", false); _enchantable = set.getInt("enchant_enabled", 0); - _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); _isOlyRestricted = set.getBoolean("is_oly_restricted", false); diff --git a/L2J_Mobius_2.5_Underground/dist/game/config/Custom/CustomDepositableItems.ini b/L2J_Mobius_2.5_Underground/dist/game/config/Custom/CustomDepositableItems.ini new file mode 100644 index 0000000000..88dfef9177 --- /dev/null +++ b/L2J_Mobius_2.5_Underground/dist/game/config/Custom/CustomDepositableItems.ini @@ -0,0 +1,11 @@ +# --------------------------------------------------------------------------- +# Custom Depositable Items +# --------------------------------------------------------------------------- + +# Make all items depositable for private warehouse. +# Default: False +CustomDepositableEnabled = True + +# Include quest items. +# Default: False +DepositableQuestItems = False diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/Config.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/Config.java index cbf895d729..4f60524559 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/Config.java @@ -117,6 +117,7 @@ public class Config private static final String CUSTOM_CHAT_MODERATION_CONFIG_FILE = "./config/Custom/ChatModeration.ini"; private static final String CUSTOM_CLASS_BALANCE_CONFIG_FILE = "./config/Custom/ClassBalance.ini"; private static final String CUSTOM_COMMUNITY_BOARD_CONFIG_FILE = "./config/Custom/CommunityBoard.ini"; + private static final String CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE = "./config/Custom/CustomDepositableItems.ini"; private static final String CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE = "./config/Custom/CustomMailManager.ini"; private static final String CUSTOM_DELEVEL_MANAGER_CONFIG_FILE = "./config/Custom/DelevelManager.ini"; private static final String CUSTOM_DUALBOX_CHECK_CONFIG_FILE = "./config/Custom/DualboxCheck.ini"; @@ -1218,6 +1219,8 @@ public class Config public static int COMMUNITY_PREMIUM_PRICE_PER_DAY; public static List COMMUNITY_AVAILABLE_BUFFS; public static Map COMMUNITY_AVAILABLE_TELEPORTS; + public static boolean CUSTOM_DEPOSITABLE_ENABLED; + public static boolean CUSTOM_DEPOSITABLE_QUEST_ITEMS; public static boolean CUSTOM_MAIL_MANAGER_ENABLED; public static int CUSTOM_MAIL_MANAGER_DELAY; public static boolean DELEVEL_MANAGER_ENABLED; @@ -3151,6 +3154,12 @@ public class Config COMMUNITY_AVAILABLE_TELEPORTS.put(splitInfo[0], new Location(Integer.parseInt(splitInfo[1]), Integer.parseInt(splitInfo[2]), Integer.parseInt(splitInfo[3]))); } + // Load CustomDepositableItems config file (if exists) + final PropertiesParser CustomDepositableItems = new PropertiesParser(CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE); + + CUSTOM_DEPOSITABLE_ENABLED = CustomDepositableItems.getBoolean("CustomDepositableEnabled", false); + CUSTOM_DEPOSITABLE_QUEST_ITEMS = CustomDepositableItems.getBoolean("DepositableQuestItems", false); + // Load CustomMailManager config file (if exists) final PropertiesParser CustomMailManager = new PropertiesParser(CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Item.java index e919088ff1..0a0e8366cb 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Item.java @@ -205,10 +205,19 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _dropable = set.getBoolean("is_dropable", true); _destroyable = set.getBoolean("is_destroyable", true); _tradeable = set.getBoolean("is_tradable", true); - _depositable = set.getBoolean("is_depositable", true); + + _questItem = set.getBoolean("is_questitem", false); + if (Config.CUSTOM_DEPOSITABLE_ENABLED) + { + _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + } + else + { + _depositable = set.getBoolean("is_depositable", true); + } + _elementable = set.getBoolean("element_enabled", false); _enchantable = set.getInt("enchant_enabled", 0); - _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); _isOlyRestricted = set.getBoolean("is_oly_restricted", false); diff --git a/L2J_Mobius_3.0_Helios/dist/game/config/Custom/CustomDepositableItems.ini b/L2J_Mobius_3.0_Helios/dist/game/config/Custom/CustomDepositableItems.ini new file mode 100644 index 0000000000..88dfef9177 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/config/Custom/CustomDepositableItems.ini @@ -0,0 +1,11 @@ +# --------------------------------------------------------------------------- +# Custom Depositable Items +# --------------------------------------------------------------------------- + +# Make all items depositable for private warehouse. +# Default: False +CustomDepositableEnabled = True + +# Include quest items. +# Default: False +DepositableQuestItems = False diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java index 5b115a7bc8..21e5ed9fd6 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java @@ -117,6 +117,7 @@ public class Config private static final String CUSTOM_CHAT_MODERATION_CONFIG_FILE = "./config/Custom/ChatModeration.ini"; private static final String CUSTOM_CLASS_BALANCE_CONFIG_FILE = "./config/Custom/ClassBalance.ini"; private static final String CUSTOM_COMMUNITY_BOARD_CONFIG_FILE = "./config/Custom/CommunityBoard.ini"; + private static final String CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE = "./config/Custom/CustomDepositableItems.ini"; private static final String CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE = "./config/Custom/CustomMailManager.ini"; private static final String CUSTOM_DELEVEL_MANAGER_CONFIG_FILE = "./config/Custom/DelevelManager.ini"; private static final String CUSTOM_DUALBOX_CHECK_CONFIG_FILE = "./config/Custom/DualboxCheck.ini"; @@ -1231,6 +1232,8 @@ public class Config public static int COMMUNITY_PREMIUM_PRICE_PER_DAY; public static List COMMUNITY_AVAILABLE_BUFFS; public static Map COMMUNITY_AVAILABLE_TELEPORTS; + public static boolean CUSTOM_DEPOSITABLE_ENABLED; + public static boolean CUSTOM_DEPOSITABLE_QUEST_ITEMS; public static boolean CUSTOM_MAIL_MANAGER_ENABLED; public static int CUSTOM_MAIL_MANAGER_DELAY; public static boolean DELEVEL_MANAGER_ENABLED; @@ -3175,6 +3178,12 @@ public class Config COMMUNITY_AVAILABLE_TELEPORTS.put(splitInfo[0], new Location(Integer.parseInt(splitInfo[1]), Integer.parseInt(splitInfo[2]), Integer.parseInt(splitInfo[3]))); } + // Load CustomDepositableItems config file (if exists) + final PropertiesParser CustomDepositableItems = new PropertiesParser(CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE); + + CUSTOM_DEPOSITABLE_ENABLED = CustomDepositableItems.getBoolean("CustomDepositableEnabled", false); + CUSTOM_DEPOSITABLE_QUEST_ITEMS = CustomDepositableItems.getBoolean("DepositableQuestItems", false); + // Load CustomMailManager config file (if exists) final PropertiesParser CustomMailManager = new PropertiesParser(CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Item.java index e919088ff1..0a0e8366cb 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Item.java @@ -205,10 +205,19 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _dropable = set.getBoolean("is_dropable", true); _destroyable = set.getBoolean("is_destroyable", true); _tradeable = set.getBoolean("is_tradable", true); - _depositable = set.getBoolean("is_depositable", true); + + _questItem = set.getBoolean("is_questitem", false); + if (Config.CUSTOM_DEPOSITABLE_ENABLED) + { + _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + } + else + { + _depositable = set.getBoolean("is_depositable", true); + } + _elementable = set.getBoolean("element_enabled", false); _enchantable = set.getInt("enchant_enabled", 0); - _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); _isOlyRestricted = set.getBoolean("is_oly_restricted", false); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Custom/CustomDepositableItems.ini b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Custom/CustomDepositableItems.ini new file mode 100644 index 0000000000..88dfef9177 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Custom/CustomDepositableItems.ini @@ -0,0 +1,11 @@ +# --------------------------------------------------------------------------- +# Custom Depositable Items +# --------------------------------------------------------------------------- + +# Make all items depositable for private warehouse. +# Default: False +CustomDepositableEnabled = True + +# Include quest items. +# Default: False +DepositableQuestItems = False diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/Config.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/Config.java index fe66b2d91f..8fd9ebc9a2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/Config.java @@ -117,6 +117,7 @@ public class Config private static final String CUSTOM_CHAT_MODERATION_CONFIG_FILE = "./config/Custom/ChatModeration.ini"; private static final String CUSTOM_CLASS_BALANCE_CONFIG_FILE = "./config/Custom/ClassBalance.ini"; private static final String CUSTOM_COMMUNITY_BOARD_CONFIG_FILE = "./config/Custom/CommunityBoard.ini"; + private static final String CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE = "./config/Custom/CustomDepositableItems.ini"; private static final String CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE = "./config/Custom/CustomMailManager.ini"; private static final String CUSTOM_DELEVEL_MANAGER_CONFIG_FILE = "./config/Custom/DelevelManager.ini"; private static final String CUSTOM_DUALBOX_CHECK_CONFIG_FILE = "./config/Custom/DualboxCheck.ini"; @@ -1218,6 +1219,8 @@ public class Config public static int COMMUNITY_PREMIUM_PRICE_PER_DAY; public static List COMMUNITY_AVAILABLE_BUFFS; public static Map COMMUNITY_AVAILABLE_TELEPORTS; + public static boolean CUSTOM_DEPOSITABLE_ENABLED; + public static boolean CUSTOM_DEPOSITABLE_QUEST_ITEMS; public static boolean CUSTOM_MAIL_MANAGER_ENABLED; public static int CUSTOM_MAIL_MANAGER_DELAY; public static boolean DELEVEL_MANAGER_ENABLED; @@ -3149,6 +3152,12 @@ public class Config COMMUNITY_AVAILABLE_TELEPORTS.put(splitInfo[0], new Location(Integer.parseInt(splitInfo[1]), Integer.parseInt(splitInfo[2]), Integer.parseInt(splitInfo[3]))); } + // Load CustomDepositableItems config file (if exists) + final PropertiesParser CustomDepositableItems = new PropertiesParser(CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE); + + CUSTOM_DEPOSITABLE_ENABLED = CustomDepositableItems.getBoolean("CustomDepositableEnabled", false); + CUSTOM_DEPOSITABLE_QUEST_ITEMS = CustomDepositableItems.getBoolean("DepositableQuestItems", false); + // Load CustomMailManager config file (if exists) final PropertiesParser CustomMailManager = new PropertiesParser(CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Item.java index 15946c4364..f1ed265f5f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Item.java @@ -205,10 +205,19 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _dropable = set.getBoolean("is_dropable", true); _destroyable = set.getBoolean("is_destroyable", true); _tradeable = set.getBoolean("is_tradable", true); - _depositable = set.getBoolean("is_depositable", true); + + _questItem = set.getBoolean("is_questitem", false); + if (Config.CUSTOM_DEPOSITABLE_ENABLED) + { + _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + } + else + { + _depositable = set.getBoolean("is_depositable", true); + } + _elementable = set.getBoolean("element_enabled", false); _enchantable = set.getInt("enchant_enabled", 0); - _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); _isOlyRestricted = set.getBoolean("is_oly_restricted", false); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/config/Custom/CustomDepositableItems.ini b/L2J_Mobius_5.0_Salvation/dist/game/config/Custom/CustomDepositableItems.ini new file mode 100644 index 0000000000..88dfef9177 --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/dist/game/config/Custom/CustomDepositableItems.ini @@ -0,0 +1,11 @@ +# --------------------------------------------------------------------------- +# Custom Depositable Items +# --------------------------------------------------------------------------- + +# Make all items depositable for private warehouse. +# Default: False +CustomDepositableEnabled = True + +# Include quest items. +# Default: False +DepositableQuestItems = False diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/Config.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/Config.java index c6e2fcea2f..7c8beff177 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/Config.java @@ -118,6 +118,7 @@ public class Config private static final String CUSTOM_CHAT_MODERATION_CONFIG_FILE = "./config/Custom/ChatModeration.ini"; private static final String CUSTOM_CLASS_BALANCE_CONFIG_FILE = "./config/Custom/ClassBalance.ini"; private static final String CUSTOM_COMMUNITY_BOARD_CONFIG_FILE = "./config/Custom/CommunityBoard.ini"; + private static final String CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE = "./config/Custom/CustomDepositableItems.ini"; private static final String CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE = "./config/Custom/CustomMailManager.ini"; private static final String CUSTOM_DELEVEL_MANAGER_CONFIG_FILE = "./config/Custom/DelevelManager.ini"; private static final String CUSTOM_DUALBOX_CHECK_CONFIG_FILE = "./config/Custom/DualboxCheck.ini"; @@ -1213,6 +1214,8 @@ public class Config public static int COMMUNITY_PREMIUM_PRICE_PER_DAY; public static List COMMUNITY_AVAILABLE_BUFFS; public static Map COMMUNITY_AVAILABLE_TELEPORTS; + public static boolean CUSTOM_DEPOSITABLE_ENABLED; + public static boolean CUSTOM_DEPOSITABLE_QUEST_ITEMS; public static boolean CUSTOM_MAIL_MANAGER_ENABLED; public static int CUSTOM_MAIL_MANAGER_DELAY; public static boolean DELEVEL_MANAGER_ENABLED; @@ -3151,6 +3154,12 @@ public class Config COMMUNITY_AVAILABLE_TELEPORTS.put(splitInfo[0], new Location(Integer.parseInt(splitInfo[1]), Integer.parseInt(splitInfo[2]), Integer.parseInt(splitInfo[3]))); } + // Load CustomDepositableItems config file (if exists) + final PropertiesParser CustomDepositableItems = new PropertiesParser(CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE); + + CUSTOM_DEPOSITABLE_ENABLED = CustomDepositableItems.getBoolean("CustomDepositableEnabled", false); + CUSTOM_DEPOSITABLE_QUEST_ITEMS = CustomDepositableItems.getBoolean("DepositableQuestItems", false); + // Load CustomMailManager config file (if exists) final PropertiesParser CustomMailManager = new PropertiesParser(CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/Item.java index 6235683261..7f3eb9bc09 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/Item.java @@ -206,10 +206,19 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _dropable = set.getBoolean("is_dropable", true); _destroyable = set.getBoolean("is_destroyable", true); _tradeable = set.getBoolean("is_tradable", true); - _depositable = set.getBoolean("is_depositable", true); + + _questItem = set.getBoolean("is_questitem", false); + if (Config.CUSTOM_DEPOSITABLE_ENABLED) + { + _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + } + else + { + _depositable = set.getBoolean("is_depositable", true); + } + _elementable = set.getBoolean("element_enabled", false); _enchantable = set.getInt("enchant_enabled", 0); - _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); _isOlyRestricted = set.getBoolean("is_oly_restricted", false); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/config/Custom/CustomDepositableItems.ini b/L2J_Mobius_5.5_EtinasFate/dist/game/config/Custom/CustomDepositableItems.ini new file mode 100644 index 0000000000..88dfef9177 --- /dev/null +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/config/Custom/CustomDepositableItems.ini @@ -0,0 +1,11 @@ +# --------------------------------------------------------------------------- +# Custom Depositable Items +# --------------------------------------------------------------------------- + +# Make all items depositable for private warehouse. +# Default: False +CustomDepositableEnabled = True + +# Include quest items. +# Default: False +DepositableQuestItems = False diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/Config.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/Config.java index c6e2fcea2f..7c8beff177 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/Config.java @@ -118,6 +118,7 @@ public class Config private static final String CUSTOM_CHAT_MODERATION_CONFIG_FILE = "./config/Custom/ChatModeration.ini"; private static final String CUSTOM_CLASS_BALANCE_CONFIG_FILE = "./config/Custom/ClassBalance.ini"; private static final String CUSTOM_COMMUNITY_BOARD_CONFIG_FILE = "./config/Custom/CommunityBoard.ini"; + private static final String CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE = "./config/Custom/CustomDepositableItems.ini"; private static final String CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE = "./config/Custom/CustomMailManager.ini"; private static final String CUSTOM_DELEVEL_MANAGER_CONFIG_FILE = "./config/Custom/DelevelManager.ini"; private static final String CUSTOM_DUALBOX_CHECK_CONFIG_FILE = "./config/Custom/DualboxCheck.ini"; @@ -1213,6 +1214,8 @@ public class Config public static int COMMUNITY_PREMIUM_PRICE_PER_DAY; public static List COMMUNITY_AVAILABLE_BUFFS; public static Map COMMUNITY_AVAILABLE_TELEPORTS; + public static boolean CUSTOM_DEPOSITABLE_ENABLED; + public static boolean CUSTOM_DEPOSITABLE_QUEST_ITEMS; public static boolean CUSTOM_MAIL_MANAGER_ENABLED; public static int CUSTOM_MAIL_MANAGER_DELAY; public static boolean DELEVEL_MANAGER_ENABLED; @@ -3151,6 +3154,12 @@ public class Config COMMUNITY_AVAILABLE_TELEPORTS.put(splitInfo[0], new Location(Integer.parseInt(splitInfo[1]), Integer.parseInt(splitInfo[2]), Integer.parseInt(splitInfo[3]))); } + // Load CustomDepositableItems config file (if exists) + final PropertiesParser CustomDepositableItems = new PropertiesParser(CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE); + + CUSTOM_DEPOSITABLE_ENABLED = CustomDepositableItems.getBoolean("CustomDepositableEnabled", false); + CUSTOM_DEPOSITABLE_QUEST_ITEMS = CustomDepositableItems.getBoolean("DepositableQuestItems", false); + // Load CustomMailManager config file (if exists) final PropertiesParser CustomMailManager = new PropertiesParser(CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Item.java index 3bca2449af..242d4527dd 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Item.java @@ -210,10 +210,19 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _dropable = set.getBoolean("is_dropable", true); _destroyable = set.getBoolean("is_destroyable", true); _tradeable = set.getBoolean("is_tradable", true); - _depositable = set.getBoolean("is_depositable", true); + + _questItem = set.getBoolean("is_questitem", false); + if (Config.CUSTOM_DEPOSITABLE_ENABLED) + { + _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + } + else + { + _depositable = set.getBoolean("is_depositable", true); + } + _elementable = set.getBoolean("element_enabled", false); _enchantable = set.getInt("enchant_enabled", 0); - _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); _isOlyRestricted = set.getBoolean("is_oly_restricted", false); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/config/Custom/CustomDepositableItems.ini b/L2J_Mobius_6.0_Fafurion/dist/game/config/Custom/CustomDepositableItems.ini new file mode 100644 index 0000000000..88dfef9177 --- /dev/null +++ b/L2J_Mobius_6.0_Fafurion/dist/game/config/Custom/CustomDepositableItems.ini @@ -0,0 +1,11 @@ +# --------------------------------------------------------------------------- +# Custom Depositable Items +# --------------------------------------------------------------------------- + +# Make all items depositable for private warehouse. +# Default: False +CustomDepositableEnabled = True + +# Include quest items. +# Default: False +DepositableQuestItems = False diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/Config.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/Config.java index 1fa2a48d9a..528a2204d0 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/Config.java @@ -118,6 +118,7 @@ public class Config private static final String CUSTOM_CHAT_MODERATION_CONFIG_FILE = "./config/Custom/ChatModeration.ini"; private static final String CUSTOM_CLASS_BALANCE_CONFIG_FILE = "./config/Custom/ClassBalance.ini"; private static final String CUSTOM_COMMUNITY_BOARD_CONFIG_FILE = "./config/Custom/CommunityBoard.ini"; + private static final String CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE = "./config/Custom/CustomDepositableItems.ini"; private static final String CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE = "./config/Custom/CustomMailManager.ini"; private static final String CUSTOM_DELEVEL_MANAGER_CONFIG_FILE = "./config/Custom/DelevelManager.ini"; private static final String CUSTOM_DUALBOX_CHECK_CONFIG_FILE = "./config/Custom/DualboxCheck.ini"; @@ -1235,6 +1236,8 @@ public class Config public static int COMMUNITY_PREMIUM_PRICE_PER_DAY; public static List COMMUNITY_AVAILABLE_BUFFS; public static Map COMMUNITY_AVAILABLE_TELEPORTS; + public static boolean CUSTOM_DEPOSITABLE_ENABLED; + public static boolean CUSTOM_DEPOSITABLE_QUEST_ITEMS; public static boolean CUSTOM_MAIL_MANAGER_ENABLED; public static int CUSTOM_MAIL_MANAGER_DELAY; public static boolean DELEVEL_MANAGER_ENABLED; @@ -3194,6 +3197,12 @@ public class Config COMMUNITY_AVAILABLE_TELEPORTS.put(splitInfo[0], new Location(Integer.parseInt(splitInfo[1]), Integer.parseInt(splitInfo[2]), Integer.parseInt(splitInfo[3]))); } + // Load CustomDepositableItems config file (if exists) + final PropertiesParser CustomDepositableItems = new PropertiesParser(CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE); + + CUSTOM_DEPOSITABLE_ENABLED = CustomDepositableItems.getBoolean("CustomDepositableEnabled", false); + CUSTOM_DEPOSITABLE_QUEST_ITEMS = CustomDepositableItems.getBoolean("DepositableQuestItems", false); + // Load CustomMailManager config file (if exists) final PropertiesParser CustomMailManager = new PropertiesParser(CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Item.java index 87b00b463a..44d0b0c4c9 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Item.java @@ -210,10 +210,19 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _dropable = set.getBoolean("is_dropable", true); _destroyable = set.getBoolean("is_destroyable", true); _tradeable = set.getBoolean("is_tradable", true); - _depositable = set.getBoolean("is_depositable", true); + + _questItem = set.getBoolean("is_questitem", false); + if (Config.CUSTOM_DEPOSITABLE_ENABLED) + { + _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + } + else + { + _depositable = set.getBoolean("is_depositable", true); + } + _elementable = set.getBoolean("element_enabled", false); _enchantable = set.getInt("enchant_enabled", 0); - _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); _isOlyRestricted = set.getBoolean("is_oly_restricted", false); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Custom/CustomDepositableItems.ini b/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Custom/CustomDepositableItems.ini new file mode 100644 index 0000000000..88dfef9177 --- /dev/null +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Custom/CustomDepositableItems.ini @@ -0,0 +1,11 @@ +# --------------------------------------------------------------------------- +# Custom Depositable Items +# --------------------------------------------------------------------------- + +# Make all items depositable for private warehouse. +# Default: False +CustomDepositableEnabled = True + +# Include quest items. +# Default: False +DepositableQuestItems = False diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/Config.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/Config.java index 3fc52f5100..31af15b411 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/Config.java @@ -119,6 +119,7 @@ public class Config private static final String CUSTOM_CHAT_MODERATION_CONFIG_FILE = "./config/Custom/ChatModeration.ini"; private static final String CUSTOM_CLASS_BALANCE_CONFIG_FILE = "./config/Custom/ClassBalance.ini"; private static final String CUSTOM_COMMUNITY_BOARD_CONFIG_FILE = "./config/Custom/CommunityBoard.ini"; + private static final String CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE = "./config/Custom/CustomDepositableItems.ini"; private static final String CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE = "./config/Custom/CustomMailManager.ini"; private static final String CUSTOM_DELEVEL_MANAGER_CONFIG_FILE = "./config/Custom/DelevelManager.ini"; private static final String CUSTOM_DUALBOX_CHECK_CONFIG_FILE = "./config/Custom/DualboxCheck.ini"; @@ -1241,6 +1242,8 @@ public class Config public static int COMMUNITY_PREMIUM_PRICE_PER_DAY; public static List COMMUNITY_AVAILABLE_BUFFS; public static Map COMMUNITY_AVAILABLE_TELEPORTS; + public static boolean CUSTOM_DEPOSITABLE_ENABLED; + public static boolean CUSTOM_DEPOSITABLE_QUEST_ITEMS; public static boolean CUSTOM_MAIL_MANAGER_ENABLED; public static int CUSTOM_MAIL_MANAGER_DELAY; public static boolean DELEVEL_MANAGER_ENABLED; @@ -3209,6 +3212,12 @@ public class Config COMMUNITY_AVAILABLE_TELEPORTS.put(splitInfo[0], new Location(Integer.parseInt(splitInfo[1]), Integer.parseInt(splitInfo[2]), Integer.parseInt(splitInfo[3]))); } + // Load CustomDepositableItems config file (if exists) + final PropertiesParser CustomDepositableItems = new PropertiesParser(CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE); + + CUSTOM_DEPOSITABLE_ENABLED = CustomDepositableItems.getBoolean("CustomDepositableEnabled", false); + CUSTOM_DEPOSITABLE_QUEST_ITEMS = CustomDepositableItems.getBoolean("DepositableQuestItems", false); + // Load CustomMailManager config file (if exists) final PropertiesParser CustomMailManager = new PropertiesParser(CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Item.java index 87b00b463a..44d0b0c4c9 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Item.java @@ -210,10 +210,19 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _dropable = set.getBoolean("is_dropable", true); _destroyable = set.getBoolean("is_destroyable", true); _tradeable = set.getBoolean("is_tradable", true); - _depositable = set.getBoolean("is_depositable", true); + + _questItem = set.getBoolean("is_questitem", false); + if (Config.CUSTOM_DEPOSITABLE_ENABLED) + { + _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + } + else + { + _depositable = set.getBoolean("is_depositable", true); + } + _elementable = set.getBoolean("element_enabled", false); _enchantable = set.getInt("enchant_enabled", 0); - _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); _isOlyRestricted = set.getBoolean("is_oly_restricted", false); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Custom/CustomDepositableItems.ini b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Custom/CustomDepositableItems.ini new file mode 100644 index 0000000000..88dfef9177 --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Custom/CustomDepositableItems.ini @@ -0,0 +1,11 @@ +# --------------------------------------------------------------------------- +# Custom Depositable Items +# --------------------------------------------------------------------------- + +# Make all items depositable for private warehouse. +# Default: False +CustomDepositableEnabled = True + +# Include quest items. +# Default: False +DepositableQuestItems = False diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java index ac3aef7132..350e502b8d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java @@ -117,6 +117,7 @@ public class Config private static final String CUSTOM_CHAT_MODERATION_CONFIG_FILE = "./config/Custom/ChatModeration.ini"; private static final String CUSTOM_CLASS_BALANCE_CONFIG_FILE = "./config/Custom/ClassBalance.ini"; private static final String CUSTOM_COMMUNITY_BOARD_CONFIG_FILE = "./config/Custom/CommunityBoard.ini"; + private static final String CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE = "./config/Custom/CustomDepositableItems.ini"; private static final String CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE = "./config/Custom/CustomMailManager.ini"; private static final String CUSTOM_DELEVEL_MANAGER_CONFIG_FILE = "./config/Custom/DelevelManager.ini"; private static final String CUSTOM_DUALBOX_CHECK_CONFIG_FILE = "./config/Custom/DualboxCheck.ini"; @@ -1154,6 +1155,8 @@ public class Config public static int COMMUNITY_PREMIUM_PRICE_PER_DAY; public static List COMMUNITY_AVAILABLE_BUFFS; public static Map COMMUNITY_AVAILABLE_TELEPORTS; + public static boolean CUSTOM_DEPOSITABLE_ENABLED; + public static boolean CUSTOM_DEPOSITABLE_QUEST_ITEMS; public static boolean CUSTOM_MAIL_MANAGER_ENABLED; public static int CUSTOM_MAIL_MANAGER_DELAY; public static boolean DELEVEL_MANAGER_ENABLED; @@ -3011,6 +3014,12 @@ public class Config COMMUNITY_AVAILABLE_TELEPORTS.put(splitInfo[0], new Location(Integer.parseInt(splitInfo[1]), Integer.parseInt(splitInfo[2]), Integer.parseInt(splitInfo[3]))); } + // Load CustomDepositableItems config file (if exists) + final PropertiesParser CustomDepositableItems = new PropertiesParser(CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE); + + CUSTOM_DEPOSITABLE_ENABLED = CustomDepositableItems.getBoolean("CustomDepositableEnabled", false); + CUSTOM_DEPOSITABLE_QUEST_ITEMS = CustomDepositableItems.getBoolean("DepositableQuestItems", false); + // Load CustomMailManager config file (if exists) final PropertiesParser CustomMailManager = new PropertiesParser(CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Item.java index 4ad2f7c61d..2544bdb6eb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Item.java @@ -205,10 +205,19 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _dropable = set.getBoolean("is_dropable", true); _destroyable = set.getBoolean("is_destroyable", true); _tradeable = set.getBoolean("is_tradable", true); - _depositable = set.getBoolean("is_depositable", true); + + _questItem = set.getBoolean("is_questitem", false); + if (Config.CUSTOM_DEPOSITABLE_ENABLED) + { + _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + } + else + { + _depositable = set.getBoolean("is_depositable", true); + } + _elementable = set.getBoolean("element_enabled", false); _enchantable = set.getInt("enchant_enabled", 0); - _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); _isOlyRestricted = set.getBoolean("is_oly_restricted", false); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Custom/CustomDepositableItems.ini b/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Custom/CustomDepositableItems.ini new file mode 100644 index 0000000000..88dfef9177 --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Custom/CustomDepositableItems.ini @@ -0,0 +1,11 @@ +# --------------------------------------------------------------------------- +# Custom Depositable Items +# --------------------------------------------------------------------------- + +# Make all items depositable for private warehouse. +# Default: False +CustomDepositableEnabled = True + +# Include quest items. +# Default: False +DepositableQuestItems = False diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/Config.java index f5f9a325a3..46d786983e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/Config.java @@ -117,6 +117,7 @@ public class Config private static final String CUSTOM_CHAT_MODERATION_CONFIG_FILE = "./config/Custom/ChatModeration.ini"; private static final String CUSTOM_CLASS_BALANCE_CONFIG_FILE = "./config/Custom/ClassBalance.ini"; private static final String CUSTOM_COMMUNITY_BOARD_CONFIG_FILE = "./config/Custom/CommunityBoard.ini"; + private static final String CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE = "./config/Custom/CustomDepositableItems.ini"; private static final String CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE = "./config/Custom/CustomMailManager.ini"; private static final String CUSTOM_DELEVEL_MANAGER_CONFIG_FILE = "./config/Custom/DelevelManager.ini"; private static final String CUSTOM_DUALBOX_CHECK_CONFIG_FILE = "./config/Custom/DualboxCheck.ini"; @@ -1158,6 +1159,8 @@ public class Config public static int COMMUNITY_PREMIUM_PRICE_PER_DAY; public static List COMMUNITY_AVAILABLE_BUFFS; public static Map COMMUNITY_AVAILABLE_TELEPORTS; + public static boolean CUSTOM_DEPOSITABLE_ENABLED; + public static boolean CUSTOM_DEPOSITABLE_QUEST_ITEMS; public static boolean CUSTOM_MAIL_MANAGER_ENABLED; public static int CUSTOM_MAIL_MANAGER_DELAY; public static boolean DELEVEL_MANAGER_ENABLED; @@ -3018,6 +3021,12 @@ public class Config COMMUNITY_AVAILABLE_TELEPORTS.put(splitInfo[0], new Location(Integer.parseInt(splitInfo[1]), Integer.parseInt(splitInfo[2]), Integer.parseInt(splitInfo[3]))); } + // Load CustomDepositableItems config file (if exists) + final PropertiesParser CustomDepositableItems = new PropertiesParser(CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE); + + CUSTOM_DEPOSITABLE_ENABLED = CustomDepositableItems.getBoolean("CustomDepositableEnabled", false); + CUSTOM_DEPOSITABLE_QUEST_ITEMS = CustomDepositableItems.getBoolean("DepositableQuestItems", false); + // Load CustomMailManager config file (if exists) final PropertiesParser CustomMailManager = new PropertiesParser(CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Item.java index 4ad2f7c61d..2544bdb6eb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Item.java @@ -205,10 +205,19 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _dropable = set.getBoolean("is_dropable", true); _destroyable = set.getBoolean("is_destroyable", true); _tradeable = set.getBoolean("is_tradable", true); - _depositable = set.getBoolean("is_depositable", true); + + _questItem = set.getBoolean("is_questitem", false); + if (Config.CUSTOM_DEPOSITABLE_ENABLED) + { + _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + } + else + { + _depositable = set.getBoolean("is_depositable", true); + } + _elementable = set.getBoolean("element_enabled", false); _enchantable = set.getInt("enchant_enabled", 0); - _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); _isOlyRestricted = set.getBoolean("is_oly_restricted", false); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Custom/CustomDepositableItems.ini b/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Custom/CustomDepositableItems.ini new file mode 100644 index 0000000000..88dfef9177 --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Custom/CustomDepositableItems.ini @@ -0,0 +1,11 @@ +# --------------------------------------------------------------------------- +# Custom Depositable Items +# --------------------------------------------------------------------------- + +# Make all items depositable for private warehouse. +# Default: False +CustomDepositableEnabled = True + +# Include quest items. +# Default: False +DepositableQuestItems = False diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/Config.java index f5f9a325a3..46d786983e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/Config.java @@ -117,6 +117,7 @@ public class Config private static final String CUSTOM_CHAT_MODERATION_CONFIG_FILE = "./config/Custom/ChatModeration.ini"; private static final String CUSTOM_CLASS_BALANCE_CONFIG_FILE = "./config/Custom/ClassBalance.ini"; private static final String CUSTOM_COMMUNITY_BOARD_CONFIG_FILE = "./config/Custom/CommunityBoard.ini"; + private static final String CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE = "./config/Custom/CustomDepositableItems.ini"; private static final String CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE = "./config/Custom/CustomMailManager.ini"; private static final String CUSTOM_DELEVEL_MANAGER_CONFIG_FILE = "./config/Custom/DelevelManager.ini"; private static final String CUSTOM_DUALBOX_CHECK_CONFIG_FILE = "./config/Custom/DualboxCheck.ini"; @@ -1158,6 +1159,8 @@ public class Config public static int COMMUNITY_PREMIUM_PRICE_PER_DAY; public static List COMMUNITY_AVAILABLE_BUFFS; public static Map COMMUNITY_AVAILABLE_TELEPORTS; + public static boolean CUSTOM_DEPOSITABLE_ENABLED; + public static boolean CUSTOM_DEPOSITABLE_QUEST_ITEMS; public static boolean CUSTOM_MAIL_MANAGER_ENABLED; public static int CUSTOM_MAIL_MANAGER_DELAY; public static boolean DELEVEL_MANAGER_ENABLED; @@ -3018,6 +3021,12 @@ public class Config COMMUNITY_AVAILABLE_TELEPORTS.put(splitInfo[0], new Location(Integer.parseInt(splitInfo[1]), Integer.parseInt(splitInfo[2]), Integer.parseInt(splitInfo[3]))); } + // Load CustomDepositableItems config file (if exists) + final PropertiesParser CustomDepositableItems = new PropertiesParser(CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE); + + CUSTOM_DEPOSITABLE_ENABLED = CustomDepositableItems.getBoolean("CustomDepositableEnabled", false); + CUSTOM_DEPOSITABLE_QUEST_ITEMS = CustomDepositableItems.getBoolean("DepositableQuestItems", false); + // Load CustomMailManager config file (if exists) final PropertiesParser CustomMailManager = new PropertiesParser(CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Item.java index 8d126b4d44..ccc400187b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Item.java @@ -206,10 +206,19 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _dropable = set.getBoolean("is_dropable", true); _destroyable = set.getBoolean("is_destroyable", true); _tradeable = set.getBoolean("is_tradable", true); - _depositable = set.getBoolean("is_depositable", true); + + _questItem = set.getBoolean("is_questitem", false); + if (Config.CUSTOM_DEPOSITABLE_ENABLED) + { + _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + } + else + { + _depositable = set.getBoolean("is_depositable", true); + } + _elementable = set.getBoolean("element_enabled", false); _enchantable = set.getInt("enchant_enabled", 0); - _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); _isOlyRestricted = set.getBoolean("is_oly_restricted", false); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Custom/CustomDepositableItems.ini b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Custom/CustomDepositableItems.ini new file mode 100644 index 0000000000..88dfef9177 --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Custom/CustomDepositableItems.ini @@ -0,0 +1,11 @@ +# --------------------------------------------------------------------------- +# Custom Depositable Items +# --------------------------------------------------------------------------- + +# Make all items depositable for private warehouse. +# Default: False +CustomDepositableEnabled = True + +# Include quest items. +# Default: False +DepositableQuestItems = False diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/Config.java index f5f9a325a3..46d786983e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/Config.java @@ -117,6 +117,7 @@ public class Config private static final String CUSTOM_CHAT_MODERATION_CONFIG_FILE = "./config/Custom/ChatModeration.ini"; private static final String CUSTOM_CLASS_BALANCE_CONFIG_FILE = "./config/Custom/ClassBalance.ini"; private static final String CUSTOM_COMMUNITY_BOARD_CONFIG_FILE = "./config/Custom/CommunityBoard.ini"; + private static final String CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE = "./config/Custom/CustomDepositableItems.ini"; private static final String CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE = "./config/Custom/CustomMailManager.ini"; private static final String CUSTOM_DELEVEL_MANAGER_CONFIG_FILE = "./config/Custom/DelevelManager.ini"; private static final String CUSTOM_DUALBOX_CHECK_CONFIG_FILE = "./config/Custom/DualboxCheck.ini"; @@ -1158,6 +1159,8 @@ public class Config public static int COMMUNITY_PREMIUM_PRICE_PER_DAY; public static List COMMUNITY_AVAILABLE_BUFFS; public static Map COMMUNITY_AVAILABLE_TELEPORTS; + public static boolean CUSTOM_DEPOSITABLE_ENABLED; + public static boolean CUSTOM_DEPOSITABLE_QUEST_ITEMS; public static boolean CUSTOM_MAIL_MANAGER_ENABLED; public static int CUSTOM_MAIL_MANAGER_DELAY; public static boolean DELEVEL_MANAGER_ENABLED; @@ -3018,6 +3021,12 @@ public class Config COMMUNITY_AVAILABLE_TELEPORTS.put(splitInfo[0], new Location(Integer.parseInt(splitInfo[1]), Integer.parseInt(splitInfo[2]), Integer.parseInt(splitInfo[3]))); } + // Load CustomDepositableItems config file (if exists) + final PropertiesParser CustomDepositableItems = new PropertiesParser(CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE); + + CUSTOM_DEPOSITABLE_ENABLED = CustomDepositableItems.getBoolean("CustomDepositableEnabled", false); + CUSTOM_DEPOSITABLE_QUEST_ITEMS = CustomDepositableItems.getBoolean("DepositableQuestItems", false); + // Load CustomMailManager config file (if exists) final PropertiesParser CustomMailManager = new PropertiesParser(CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Item.java index 2c8449f886..f3888717d1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Item.java @@ -208,10 +208,19 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _dropable = set.getBoolean("is_dropable", true); _destroyable = set.getBoolean("is_destroyable", true); _tradeable = set.getBoolean("is_tradable", true); - _depositable = set.getBoolean("is_depositable", true); + + _questItem = set.getBoolean("is_questitem", false); + if (Config.CUSTOM_DEPOSITABLE_ENABLED) + { + _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + } + else + { + _depositable = set.getBoolean("is_depositable", true); + } + _elementable = set.getBoolean("element_enabled", false); _enchantable = set.getInt("enchant_enabled", 0); - _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); _isOlyRestricted = set.getBoolean("is_oly_restricted", false); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/config/Custom/CustomDepositableItems.ini b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/config/Custom/CustomDepositableItems.ini new file mode 100644 index 0000000000..88dfef9177 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/config/Custom/CustomDepositableItems.ini @@ -0,0 +1,11 @@ +# --------------------------------------------------------------------------- +# Custom Depositable Items +# --------------------------------------------------------------------------- + +# Make all items depositable for private warehouse. +# Default: False +CustomDepositableEnabled = True + +# Include quest items. +# Default: False +DepositableQuestItems = False diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/Config.java index 73a6c33797..2316e06dad 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/Config.java @@ -117,6 +117,7 @@ public class Config private static final String CUSTOM_CHAT_MODERATION_CONFIG_FILE = "./config/Custom/ChatModeration.ini"; private static final String CUSTOM_CLASS_BALANCE_CONFIG_FILE = "./config/Custom/ClassBalance.ini"; private static final String CUSTOM_COMMUNITY_BOARD_CONFIG_FILE = "./config/Custom/CommunityBoard.ini"; + private static final String CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE = "./config/Custom/CustomDepositableItems.ini"; private static final String CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE = "./config/Custom/CustomMailManager.ini"; private static final String CUSTOM_DELEVEL_MANAGER_CONFIG_FILE = "./config/Custom/DelevelManager.ini"; private static final String CUSTOM_DUALBOX_CHECK_CONFIG_FILE = "./config/Custom/DualboxCheck.ini"; @@ -1163,6 +1164,8 @@ public class Config public static int COMMUNITY_PREMIUM_PRICE_PER_DAY; public static List COMMUNITY_AVAILABLE_BUFFS; public static Map COMMUNITY_AVAILABLE_TELEPORTS; + public static boolean CUSTOM_DEPOSITABLE_ENABLED; + public static boolean CUSTOM_DEPOSITABLE_QUEST_ITEMS; public static boolean CUSTOM_MAIL_MANAGER_ENABLED; public static int CUSTOM_MAIL_MANAGER_DELAY; public static boolean DELEVEL_MANAGER_ENABLED; @@ -3026,6 +3029,12 @@ public class Config COMMUNITY_AVAILABLE_TELEPORTS.put(splitInfo[0], new Location(Integer.parseInt(splitInfo[1]), Integer.parseInt(splitInfo[2]), Integer.parseInt(splitInfo[3]))); } + // Load CustomDepositableItems config file (if exists) + final PropertiesParser CustomDepositableItems = new PropertiesParser(CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE); + + CUSTOM_DEPOSITABLE_ENABLED = CustomDepositableItems.getBoolean("CustomDepositableEnabled", false); + CUSTOM_DEPOSITABLE_QUEST_ITEMS = CustomDepositableItems.getBoolean("DepositableQuestItems", false); + // Load CustomMailManager config file (if exists) final PropertiesParser CustomMailManager = new PropertiesParser(CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Item.java index 2c8449f886..f3888717d1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Item.java @@ -208,10 +208,19 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _dropable = set.getBoolean("is_dropable", true); _destroyable = set.getBoolean("is_destroyable", true); _tradeable = set.getBoolean("is_tradable", true); - _depositable = set.getBoolean("is_depositable", true); + + _questItem = set.getBoolean("is_questitem", false); + if (Config.CUSTOM_DEPOSITABLE_ENABLED) + { + _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + } + else + { + _depositable = set.getBoolean("is_depositable", true); + } + _elementable = set.getBoolean("element_enabled", false); _enchantable = set.getInt("enchant_enabled", 0); - _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); _isOlyRestricted = set.getBoolean("is_oly_restricted", false); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Custom/CustomDepositableItems.ini b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Custom/CustomDepositableItems.ini new file mode 100644 index 0000000000..88dfef9177 --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Custom/CustomDepositableItems.ini @@ -0,0 +1,11 @@ +# --------------------------------------------------------------------------- +# Custom Depositable Items +# --------------------------------------------------------------------------- + +# Make all items depositable for private warehouse. +# Default: False +CustomDepositableEnabled = True + +# Include quest items. +# Default: False +DepositableQuestItems = False diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java index f82eaaa23c..523981de7e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java @@ -118,6 +118,7 @@ public class Config private static final String CUSTOM_CHAT_MODERATION_CONFIG_FILE = "./config/Custom/ChatModeration.ini"; private static final String CUSTOM_CLASS_BALANCE_CONFIG_FILE = "./config/Custom/ClassBalance.ini"; private static final String CUSTOM_COMMUNITY_BOARD_CONFIG_FILE = "./config/Custom/CommunityBoard.ini"; + private static final String CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE = "./config/Custom/CustomDepositableItems.ini"; private static final String CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE = "./config/Custom/CustomMailManager.ini"; private static final String CUSTOM_DELEVEL_MANAGER_CONFIG_FILE = "./config/Custom/DelevelManager.ini"; private static final String CUSTOM_DUALBOX_CHECK_CONFIG_FILE = "./config/Custom/DualboxCheck.ini"; @@ -1167,6 +1168,8 @@ public class Config public static int COMMUNITY_PREMIUM_PRICE_PER_DAY; public static List COMMUNITY_AVAILABLE_BUFFS; public static Map COMMUNITY_AVAILABLE_TELEPORTS; + public static boolean CUSTOM_DEPOSITABLE_ENABLED; + public static boolean CUSTOM_DEPOSITABLE_QUEST_ITEMS; public static boolean CUSTOM_MAIL_MANAGER_ENABLED; public static int CUSTOM_MAIL_MANAGER_DELAY; public static boolean DELEVEL_MANAGER_ENABLED; @@ -3037,6 +3040,12 @@ public class Config COMMUNITY_AVAILABLE_TELEPORTS.put(splitInfo[0], new Location(Integer.parseInt(splitInfo[1]), Integer.parseInt(splitInfo[2]), Integer.parseInt(splitInfo[3]))); } + // Load CustomDepositableItems config file (if exists) + final PropertiesParser CustomDepositableItems = new PropertiesParser(CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE); + + CUSTOM_DEPOSITABLE_ENABLED = CustomDepositableItems.getBoolean("CustomDepositableEnabled", false); + CUSTOM_DEPOSITABLE_QUEST_ITEMS = CustomDepositableItems.getBoolean("DepositableQuestItems", false); + // Load CustomMailManager config file (if exists) final PropertiesParser CustomMailManager = new PropertiesParser(CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Item.java index 2c8449f886..f3888717d1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Item.java @@ -208,10 +208,19 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _dropable = set.getBoolean("is_dropable", true); _destroyable = set.getBoolean("is_destroyable", true); _tradeable = set.getBoolean("is_tradable", true); - _depositable = set.getBoolean("is_depositable", true); + + _questItem = set.getBoolean("is_questitem", false); + if (Config.CUSTOM_DEPOSITABLE_ENABLED) + { + _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + } + else + { + _depositable = set.getBoolean("is_depositable", true); + } + _elementable = set.getBoolean("element_enabled", false); _enchantable = set.getInt("enchant_enabled", 0); - _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); _isOlyRestricted = set.getBoolean("is_oly_restricted", false); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/config/Custom/CustomDepositableItems.ini b/L2J_Mobius_Classic_Interlude/dist/game/config/Custom/CustomDepositableItems.ini new file mode 100644 index 0000000000..88dfef9177 --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/dist/game/config/Custom/CustomDepositableItems.ini @@ -0,0 +1,11 @@ +# --------------------------------------------------------------------------- +# Custom Depositable Items +# --------------------------------------------------------------------------- + +# Make all items depositable for private warehouse. +# Default: False +CustomDepositableEnabled = True + +# Include quest items. +# Default: False +DepositableQuestItems = False diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java index 5af20353a2..78d25aa15d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java @@ -118,6 +118,7 @@ public class Config private static final String CUSTOM_CHAT_MODERATION_CONFIG_FILE = "./config/Custom/ChatModeration.ini"; private static final String CUSTOM_CLASS_BALANCE_CONFIG_FILE = "./config/Custom/ClassBalance.ini"; private static final String CUSTOM_COMMUNITY_BOARD_CONFIG_FILE = "./config/Custom/CommunityBoard.ini"; + private static final String CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE = "./config/Custom/CustomDepositableItems.ini"; private static final String CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE = "./config/Custom/CustomMailManager.ini"; private static final String CUSTOM_DELEVEL_MANAGER_CONFIG_FILE = "./config/Custom/DelevelManager.ini"; private static final String CUSTOM_DUALBOX_CHECK_CONFIG_FILE = "./config/Custom/DualboxCheck.ini"; @@ -1172,6 +1173,8 @@ public class Config public static int COMMUNITY_PREMIUM_PRICE_PER_DAY; public static List COMMUNITY_AVAILABLE_BUFFS; public static Map COMMUNITY_AVAILABLE_TELEPORTS; + public static boolean CUSTOM_DEPOSITABLE_ENABLED; + public static boolean CUSTOM_DEPOSITABLE_QUEST_ITEMS; public static boolean CUSTOM_MAIL_MANAGER_ENABLED; public static int CUSTOM_MAIL_MANAGER_DELAY; public static boolean DELEVEL_MANAGER_ENABLED; @@ -3044,6 +3047,12 @@ public class Config COMMUNITY_AVAILABLE_TELEPORTS.put(splitInfo[0], new Location(Integer.parseInt(splitInfo[1]), Integer.parseInt(splitInfo[2]), Integer.parseInt(splitInfo[3]))); } + // Load CustomDepositableItems config file (if exists) + final PropertiesParser CustomDepositableItems = new PropertiesParser(CUSTOM_CUSTOM_DEPOSITABLE_ITEMS_CONFIG_FILE); + + CUSTOM_DEPOSITABLE_ENABLED = CustomDepositableItems.getBoolean("CustomDepositableEnabled", false); + CUSTOM_DEPOSITABLE_QUEST_ITEMS = CustomDepositableItems.getBoolean("DepositableQuestItems", false); + // Load CustomMailManager config file (if exists) final PropertiesParser CustomMailManager = new PropertiesParser(CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java index e919088ff1..0a0e8366cb 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java @@ -205,10 +205,19 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _dropable = set.getBoolean("is_dropable", true); _destroyable = set.getBoolean("is_destroyable", true); _tradeable = set.getBoolean("is_tradable", true); - _depositable = set.getBoolean("is_depositable", true); + + _questItem = set.getBoolean("is_questitem", false); + if (Config.CUSTOM_DEPOSITABLE_ENABLED) + { + _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + } + else + { + _depositable = set.getBoolean("is_depositable", true); + } + _elementable = set.getBoolean("element_enabled", false); _enchantable = set.getInt("enchant_enabled", 0); - _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); _isOlyRestricted = set.getBoolean("is_oly_restricted", false);