Fixes #994

6 files changed, 22 insertions, 12 deletions

diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index cfa7cb7d1..7309af4d3 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -70,7 +70,7 @@ item_db: (
 		Taekwon: true/false           (boolean, defaults to false)
 		Star_Gladiator: true/false    (boolean, defaults to false)
 		Soul_Linker: true/false       (boolean, defaults to false)
-		Gunslinger: true/false       (boolean, defaults to false)
+		Gunslinger: true/false        (boolean, defaults to false)
 		Ninja: true/false             (boolean, defaults to false)
 		Gangsi: true/false            (boolean, defaults to false)
 		Death_Knight: true/false      (boolean, defaults to false)
@@ -93,6 +93,7 @@ item_db: (
 	BuyingStore: true/false       (boolean, defaults to false)
 	Delay: Delay to use item      (int, defaults to 0)
 	KeepAfterUse: true/false      (boolean, defaults to false)
+	DropAnnounce: true/false      (boolean, defaults to false)
 	Trade: {                      (defaults to no restrictions)
 		override: GroupID             (int, defaults to 100)
 		nodrop: true/false            (boolean, defaults to false)
@@ -63262,6 +63263,7 @@ item_db: (
 	Name: "Episode 13.1 Poporing Key"
 	Type: 3
 	Weight: 10
+	DropAnnounce: true
 },
 {
 	Id: 7783
@@ -63269,6 +63271,7 @@ item_db: (
 	Name: "Episode 13.2 Poring Key"
 	Type: 3
 	Weight: 10
+	DropAnnounce: true
 },
 {
 	Id: 7784
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index d1f416b08..b47bd46d4 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -70,7 +70,7 @@ item_db: (
 		Taekwon: true/false           (boolean, defaults to false)
 		Star_Gladiator: true/false    (boolean, defaults to false)
 		Soul_Linker: true/false       (boolean, defaults to false)
-		Gunslinger: true/false       (boolean, defaults to false)
+		Gunslinger: true/false        (boolean, defaults to false)
 		Ninja: true/false             (boolean, defaults to false)
 		Gangsi: true/false            (boolean, defaults to false)
 		Death_Knight: true/false      (boolean, defaults to false)
@@ -93,6 +93,7 @@ item_db: (
 	BuyingStore: true/false       (boolean, defaults to false)
 	Delay: Delay to use item      (int, defaults to 0)
 	KeepAfterUse: true/false      (boolean, defaults to false)
+	DropAnnounce: true/false      (boolean, defaults to false)
 	Trade: {                      (defaults to no restrictions)
 		override: GroupID             (int, defaults to 100)
 		nodrop: true/false            (boolean, defaults to false)
@@ -80968,12 +80969,14 @@ item_db: (
 	AegisName: "Gold_Key77"
 	Name: "Episode 13.1 Poporing Key"
 	Weight: 10
+	DropAnnounce: true
 },
 {
 	Id: 7783
 	AegisName: "Silver_Key77"
 	Name: "Episode 13.2 Poring Key"
 	Weight: 10
+	DropAnnounce: true
 },
 {
 	Id: 7784
diff --git a/doc/item_db.txt b/doc/item_db.txt
index 6ffc8a52b..86e397636 100644
--- a/doc/item_db.txt
+++ b/doc/item_db.txt
@@ -71,6 +71,7 @@ item_db: (
 	BuyingStore: true/false       (boolean, defaults to false)
 	Delay: Delay to use item      (int, defaults to 0)
 	KeepAfterUse: true/false      (boolean, defaults to false)
+	DropAnnounce: true/false      (boolean, defaults to false)
 	Trade: {                      (defaults to no restrictions)
 		override: GroupID             (int, defaults to 100)
 		nodrop: true/false            (boolean, defaults to false)
@@ -290,6 +291,8 @@ ForceSerial: Whether the item will be given new unique id or not. When the item
 BuyingStore: Whether the item can be sold via buyingstore, one must also edit
              data\buyingstoreitemlist.txt for client to accept item.
 
+DropAnnounce: Enables global announcement of the selected item when dropped by monster.
+
 Delay: Delay for an item to be used again. Value is in milliseconds.
        There is a max concurrent number of entries modifiable in
        src/map/itemdb.h as MAX_ITEMDELAYS.
diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index a35aa67f1..4076e295c 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -2073,6 +2073,9 @@ int itemdb_readdb_libconfig_sub(struct config_setting_t *it, int n, const char *
 	if ((t = libconfig->setting_get_member(it, "KeepAfterUse")))
 		id.flag.keepafteruse = libconfig->setting_get_bool(t) ? 1 : 0;
 
+	if ((t = libconfig->setting_get_member(it, "DropAnnounce")))
+		id.flag.drop_announce = libconfig->setting_get_bool(t) ? 1 : 0;
+
 	if (itemdb->lookup_const(it, "Delay", &i32) && i32 >= 0)
 		id.delay = i32;
 
diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index 138a783ae..f77801e09 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -111,8 +111,6 @@ enum item_itemid {
 	ITEMID_FRAGMENT_OF_CRYSTAL   = 7321,
 	ITEMID_SKULL_                = 7420,
 	ITEMID_TOKEN_OF_SIEGFRIED    = 7621,
-	ITEMID_GOLD_KEY77            = 7782,
-	ITEMID_SILVER_KEY77          = 7783,
 	ITEMID_SPECIAL_ALLOY_TRAP    = 7940,
 	ITEMID_CATNIP_FRUIT          = 11602,
 	ITEMID_RED_POUCH_OF_SURPRISE = 12024,
@@ -510,6 +508,7 @@ struct item_data {
 		unsigned keepafteruse : 1;
 		unsigned force_serial : 1;
 		unsigned no_options: 1; // < disallows use of item options on the item. (non-equippable items are automatically flagged) [Smokexyz]
+		unsigned drop_announce : 1; // Official Drop Announce [Jedzkie]
 	} flag;
 	struct {// item stacking limitation
 		unsigned short amount;
diff --git a/src/map/mob.c b/src/map/mob.c
index 74d25b805..4f08cf38e 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2151,6 +2151,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) {
 	struct map_session_data *sd = BL_CAST(BL_PC, src);
 	struct map_session_data *tmpsd[DAMAGELOG_SIZE] = { NULL };
 	struct map_session_data *mvp_sd = sd, *second_sd = NULL, *third_sd = NULL;
+	struct item_data *id = NULL;
 
 	struct {
 		struct party_data *p;
@@ -2447,14 +2448,12 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) {
 				intif->broadcast(message, (int)strlen(message)+1, BC_DEFAULT);
 			}
 
-			/* heres the thing we got the feature set up however we're still discussing how to best define the ids,
-			 * so while we discuss, for a small period of time, the list is hardcoded (yes officially only those 2 use it,
-			 * thus why we're unsure on how to best place the setting) */
-			/* temp, will not be hardcoded for long thudu. */
-			// TODO: This should be a field in the item db.
-			if (mvp_sd != NULL
-			 && (it->nameid == ITEMID_GOLD_KEY77 || it->nameid == ITEMID_SILVER_KEY77)) /* for when not hardcoded: add a check on mvp bonus drop as well */
-				clif->item_drop_announce(mvp_sd, it->nameid, md->name);
+			// Official Drop Announce [Jedzkie]
+			if (mvp_sd != NULL) {
+				if ((id = itemdb->search(it->nameid)) != NULL && id->flag.drop_announce) {
+					clif->item_drop_announce(mvp_sd, it->nameid, md->name);
+				}
+			}
 
 			// Announce first, or else ditem will be freed. [Lance]
 			// By popular demand, use base drop rate for autoloot code. [Skotlex]