From 16b23947fd41dddef819a43035557304f5a7b700 Mon Sep 17 00:00:00 2001 From: sruon Date: Sat, 11 Apr 2026 01:09:12 -0600 Subject: [PATCH] Flag certain items to skip rare check and recycle bin --- sql/item_basic.sql | 84 ++++++++++++------------- src/map/packets/c2s/0x028_item_dump.cpp | 4 +- src/map/treasure_pool.cpp | 6 +- 3 files changed, 48 insertions(+), 46 deletions(-) diff --git a/sql/item_basic.sql b/sql/item_basic.sql index 3da98758ab5..34d9096b7b6 100644 --- a/sql/item_basic.sql +++ b/sql/item_basic.sql @@ -526,7 +526,7 @@ INSERT INTO `item_basic` VALUES (509,0,'orc_mask','orc_mask',@GENERAL_TYPE,1,@FL INSERT INTO `item_basic` VALUES (510,0,'goblin_armor','goblin_armor',@GENERAL_TYPE,12,@FLAG_MYSTERY_BOX | @FLAG_NOSALE,@BEAST_MADE,0); INSERT INTO `item_basic` VALUES (511,0,'goblin_mask','goblin_mask',@GENERAL_TYPE,12,@FLAG_MYSTERY_BOX | @FLAG_NOSALE,@BEAST_MADE,0); INSERT INTO `item_basic` VALUES (512,0,'new_linkshell','new_linkshell',@LINKSHELL_TYPE,1,@FLAG_NOAUCTION | @FLAG_LINKSHELL | @FLAG_NODELIVERY | @FLAG_EX,@NONE,2000); -INSERT INTO `item_basic` VALUES (513,0,'linkshell','linkshell',@LINKSHELL_TYPE,1,@FLAG_NOAUCTION | @FLAG_LINKSHELL | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX,@NONE,0); +INSERT INTO `item_basic` VALUES (513,0,'linkshell','linkshell',@LINKSHELL_TYPE,1,@FLAG_NOAUCTION | @FLAG_LINKSHELL | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_NO_RECYCLE,@NONE,0); INSERT INTO `item_basic` VALUES (514,0,'pearlsack','pearlsack',@LINKSHELL_TYPE,1,@FLAG_NOAUCTION | @FLAG_LINKSHELL | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX,@NONE,0); INSERT INTO `item_basic` VALUES (515,0,'linkpearl','linkpearl',@LINKSHELL_TYPE,1,@FLAG_NOAUCTION | @FLAG_LINKSHELL | @FLAG_NOSALE | @FLAG_NODELIVERY,@NONE,0); INSERT INTO `item_basic` VALUES (516,0,'ripped_pearlsack','ripped_pearlsack',@LINKSHELL_TYPE,1,@FLAG_NOAUCTION | @FLAG_LINKSHELL | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX,@NONE,0); @@ -1036,47 +1036,47 @@ INSERT INTO `item_basic` VALUES (1020,0,'sickle','sickle',@GENERAL_TYPE,99,@FLAG INSERT INTO `item_basic` VALUES (1021,0,'hatchet','hatchet',@GENERAL_TYPE,99,@FLAG_MYSTERY_BOX | @FLAG_CANTRADENPC,@MISC,125); INSERT INTO `item_basic` VALUES (1022,0,'set_of_thiefs_tools','thiefs_tools',@GENERAL_TYPE,12,@FLAG_MYSTERY_BOX | @FLAG_CANTRADENPC,@MISC,180); INSERT INTO `item_basic` VALUES (1023,0,'living_key','living_key',@GENERAL_TYPE,12,@FLAG_MYSTERY_BOX | @FLAG_CANTRADENPC,@MISC,291); -INSERT INTO `item_basic` VALUES (1024,0,'ghelsba_chest_key','gls._chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1025,0,'palborough_chest_key','plb._chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1026,0,'giddeus_chest_key','gds._chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1027,0,'ranperre_chest_key','rnp._chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1028,0,'dangruf_chest_key','dgr._chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1029,0,'horutoto_chest_key','hrt._chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1030,0,'ordelle_chest_key','ordelle_chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1031,0,'gusgen_chest_key','gusgen_chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1032,0,'shakhrami_chest_key','shk._chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1033,0,'davoi_chest_key','davoi_chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1034,0,'beadeaux_chest_key','bdx._chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1035,0,'oztroja_chest_key','oztroja_chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1036,0,'delkfutt_chest_key','dlk._chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1037,0,'feiyin_chest_key','feiyin_chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1038,0,'zvahl_chest_key','zvahl_chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1039,0,'eldieme_chest_key','eld._chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1040,0,'nest_chest_key','nest_chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1041,0,'garlaige_chest_key','grl._chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1042,0,'davoi_coffer_key','davoi_coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1043,0,'beadeaux_coffer_key','bdx._coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1044,0,'oztroja_coffer_key','ozt._coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1045,0,'nest_coffer_key','nest_coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1046,0,'eldieme_coffer_key','eld._coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1047,0,'garlaige_coffer_key','grl._coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1048,0,'zvahl_coffer_key','zvahl_coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1049,0,'uggalepih_coffer_key','ugl._coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1050,0,'rancor_den_coffer_key','den_coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1051,0,'kuftal_coffer_key','kuftal_coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1052,0,'boyahda_coffer_key','byd._coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1053,0,'cauldron_coffer_key','cld._coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1054,0,'quicksand_coffer_key','qsd._coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1055,0,'grotto_chest_key','grotto_chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1056,0,'onzozo_chest_key','onzozo_chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1057,0,'toraimarai_coffer_key','tor._coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1058,0,'ruaun_coffer_key','ruaun_coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1059,0,'grotto_coffer_key','grotto_coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1060,0,'velugannon_coffer_key','vlg._coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1061,0,'sacrarium_chest_key','scr._chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1062,0,'oldton_chest_key','oldton_chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1063,0,'newton_coffer_key','ntn._coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); -INSERT INTO `item_basic` VALUES (1064,0,'psoxja_chest_key','pso._chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); +INSERT INTO `item_basic` VALUES (1024,0,'ghelsba_chest_key','gls._chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1025,0,'palborough_chest_key','plb._chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1026,0,'giddeus_chest_key','gds._chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1027,0,'ranperre_chest_key','rnp._chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1028,0,'dangruf_chest_key','dgr._chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1029,0,'horutoto_chest_key','hrt._chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1030,0,'ordelle_chest_key','ordelle_chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1031,0,'gusgen_chest_key','gusgen_chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1032,0,'shakhrami_chest_key','shk._chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1033,0,'davoi_chest_key','davoi_chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1034,0,'beadeaux_chest_key','bdx._chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1035,0,'oztroja_chest_key','oztroja_chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1036,0,'delkfutt_chest_key','dlk._chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1037,0,'feiyin_chest_key','feiyin_chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1038,0,'zvahl_chest_key','zvahl_chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1039,0,'eldieme_chest_key','eld._chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1040,0,'nest_chest_key','nest_chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1041,0,'garlaige_chest_key','grl._chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1042,0,'davoi_coffer_key','davoi_coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1043,0,'beadeaux_coffer_key','bdx._coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1044,0,'oztroja_coffer_key','ozt._coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1045,0,'nest_coffer_key','nest_coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1046,0,'eldieme_coffer_key','eld._coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1047,0,'garlaige_coffer_key','grl._coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1048,0,'zvahl_coffer_key','zvahl_coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1049,0,'uggalepih_coffer_key','ugl._coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1050,0,'rancor_den_coffer_key','den_coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1051,0,'kuftal_coffer_key','kuftal_coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1052,0,'boyahda_coffer_key','byd._coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1053,0,'cauldron_coffer_key','cld._coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1054,0,'quicksand_coffer_key','qsd._coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1055,0,'grotto_chest_key','grotto_chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1056,0,'onzozo_chest_key','onzozo_chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1057,0,'toraimarai_coffer_key','tor._coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1058,0,'ruaun_coffer_key','ruaun_coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1059,0,'grotto_coffer_key','grotto_coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1060,0,'velugannon_coffer_key','vlg._coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1061,0,'sacrarium_chest_key','scr._chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1062,0,'oldton_chest_key','oldton_chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1063,0,'newton_coffer_key','ntn._coffer_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); +INSERT INTO `item_basic` VALUES (1064,0,'psoxja_chest_key','pso._chest_key',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_CAN_SEND_ACCT | @FLAG_NOAUCTION | @FLAG_CANTRADENPC | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE | @FLAG_NO_RARE_CHECK,@NONE,0); INSERT INTO `item_basic` VALUES (1088,0,'piece_of_ancient_papyrus','ancient_papyrus',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_NOAUCTION | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); INSERT INTO `item_basic` VALUES (1089,0,'clump_of_exoray_mold','exoray_mold',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_NOAUCTION | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); INSERT INTO `item_basic` VALUES (1090,0,'chunk_of_bomb_coal','bomb_coal',@GENERAL_TYPE,1,@FLAG_MYSTERY_BOX | @FLAG_NOAUCTION | @FLAG_NOSALE | @FLAG_NODELIVERY | @FLAG_EX | @FLAG_RARE,@NONE,0); diff --git a/src/map/packets/c2s/0x028_item_dump.cpp b/src/map/packets/c2s/0x028_item_dump.cpp index 94f45720666..52e0fbccdb4 100644 --- a/src/map/packets/c2s/0x028_item_dump.cpp +++ b/src/map/packets/c2s/0x028_item_dump.cpp @@ -116,9 +116,9 @@ void GP_CLI_COMMAND_ITEM_DUMP::process(MapSession* PSession, CCharEntity* PChar) } } - // Linkshells (other than Linkpearls and Pearlsacks) cannot be stored in the Recycle Bin. // Retail accurate: Any item dropped from a container other than inventory skips the recycle bin. - if (!settings::get("map.ENABLE_ITEM_RECYCLE_BIN") || PItem->getID() == ITEMID::LINKSHELL || Category != CONTAINER_ID::LOC_INVENTORY) + // Items with the NoRecycle flag bypass the recycle bin entirely (e.g. linkshells). + if (!settings::get("map.ENABLE_ITEM_RECYCLE_BIN") || Category != CONTAINER_ID::LOC_INVENTORY || PItem->hasFlag(ItemFlag::NoRecycle)) { charutils::DropItem(PChar, Category, ItemIndex, ItemNum, PItem->getID()); return; diff --git a/src/map/treasure_pool.cpp b/src/map/treasure_pool.cpp index 0b65f137a8b..5b9705ae5be 100644 --- a/src/map/treasure_pool.cpp +++ b/src/map/treasure_pool.cpp @@ -175,8 +175,10 @@ uint8 CTreasurePool::addItem(uint16 ItemID, CBaseEntity* PEntity) return m_count; // no change } - // Check if everyone in the treasure pool already has this tiem - if (PNewItem->hasFlag(ItemFlag::Rare)) + // Check if everyone in the treasure pool already has this item + // Some items do not honor this check and will be added to the party pool regardless + const bool skipRareCheck = m_TreasurePoolType != TreasurePoolType::Solo && PNewItem->hasFlag(ItemFlag::NoRareCheck); + if (PNewItem->hasFlag(ItemFlag::Rare) && !skipRareCheck) { bool doesNotHaveRareItem = false;