Add item attribute what prevent item removing on use.

New item attribute: KeepAfterUse
HerculesWS · Dec 2, 2014 · 40a239f · 40a239f
1 parent 274aaeb
commit 40a239f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
@@ -31,6 +31,7 @@ item_db: (
 	BindOnEquip: true/false       (boolean, defaults to false)
 	BuyingStore: true/false       (boolean, defaults to false)
 	Delay: Delay to use item      (int, defaults to 0)
+	KeepAfterUse: true/false      (boolean, defaults to false)
 	Trade: {                      (defaults to no restrictions)
 		override: GroupID             (int, defaults to 100)
 		nodrop: true/false            (boolean, defaults to false)

diff --git a/doc/item_db.txt b/doc/item_db.txt
@@ -36,6 +36,7 @@ item_db: (
 	BindOnEquip: true/false       (boolean, defaults to false)
 	BuyingStore: true/false       (boolean, defaults to false)
 	Delay: Delay to use item      (int, defaults to 0)
+	KeepAfterUse: true/false      (boolean, defaults to false)
 	Trade: {                      (defaults to no restrictions)
 		override: GroupID             (int, defaults to 100)
 		nodrop: true/false            (boolean, defaults to false)

diff --git a/src/map/itemdb.c b/src/map/itemdb.c
@@ -1787,9 +1787,12 @@ int itemdb_readdb_libconfig_sub(config_setting_t *it, int n, const char *source)
 	if ( (t = libconfig->setting_get_member(it, "BuyingStore")) )
 		id.flag.buyingstore = libconfig->setting_get_bool(t) ? 1 : 0;
 
+	if ((t = libconfig->setting_get_member(it, "KeepAfterUse")))
+		id.flag.keepafteruse = libconfig->setting_get_bool(t) ? 1 : 0;
+
 	if (libconfig->setting_lookup_int(it, "Delay", &i32) && i32 >= 0)
 		id.delay = i32;
-	
+
 	if ( (t = libconfig->setting_get_member(it, "Trade")) ) {
 		if (config_setting_is_group(t)) {
 			config_setting_t *tt = NULL;

diff --git a/src/map/itemdb.h b/src/map/itemdb.h
@@ -414,6 +414,7 @@ struct item_data {
 		unsigned autoequip: 1;
 		unsigned buyingstore : 1;
 		unsigned bindonequip : 1;
+		unsigned keepafteruse : 1;
 	} flag;
 	struct {// item stacking limitation
 		unsigned short amount;

diff --git a/src/map/pc.c b/src/map/pc.c
@@ -4519,7 +4519,7 @@ int pc_useitem(struct map_session_data *sd,int n) {
 	if( sd->inventory_data[n]->flag.delay_consume )
 		clif->useitemack(sd,n,amount,true);
 	else {
-		if( sd->status.inventory[n].expire_time == 0 ) {
+		if (sd->status.inventory[n].expire_time == 0 && !(sd->inventory_data[n]->flag.keepafteruse)) {
 			clif->useitemack(sd,n,amount-1,true);
 			pc->delitem(sd,n,1,1,0,LOG_TYPE_CONSUME); // Rental Usable Items are not deleted until expiration
 		} else