- Enabled Mastery damage on Soul Breaker again, moved adv katar mastery out of the mastery function so that it may apply to all skills except Soul Breaker.

- Changed name of the setting log_pick to log_filter since that's what it does now.
- Modified enable_logs so that instead of a 0/1 setting, you can specify which kind of events to log (so you can use a combination), see log_athena for the bitmask configuration.
- Cleaned a bit the contents of log_athena.conf


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8129 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 6 insertions, 17 deletions

diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 7117a8265..695cdf416 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -2642,9 +2642,8 @@ int atcommand_item(
 	}

 

 	//Logs (A)dmins items [Lupus]

-	if(log_config.pick > 0 )

+	if(log_config.enable_logs&0x400)

 		log_pick(sd, "A", 0, item_id, number, NULL);

-	//Logs

 

 	clif_displaymessage(fd, msg_table[18]); // Item created.

 	return 0;

@@ -2718,10 +2717,8 @@ int atcommand_item2(
 		}

 

 		//Logs (A)dmins items [Lupus]

-		if(log_config.pick > 0 ) {

+		if(log_config.enable_logs&0x400)

 			log_pick(sd, "A", 0, item_tmp.nameid, number, &item_tmp);

-		}

-		//Logs

 

 		clif_displaymessage(fd, msg_table[18]); // Item created.

 	} else {

@@ -2747,10 +2744,8 @@ int atcommand_itemreset(
 		if (sd->status.inventory[i].amount && sd->status.inventory[i].equip == 0) {

 

 			//Logs (A)dmins items [Lupus]

-			if(log_config.pick > 0 ) {

+			if(log_config.enable_logs&0x400)

 				log_pick(sd, "A", 0, sd->status.inventory[i].nameid, -sd->status.inventory[i].amount, &sd->status.inventory[i]);

-			}

-			//Logs

 

 			pc_delitem(sd, i, sd->status.inventory[i].amount, 0);

 		}

@@ -3913,10 +3908,8 @@ int atcommand_produce(
 		clif_misceffect(&sd->bl, 3);

 

 		//Logs (A)dmins items [Lupus]

-		if(log_config.pick > 0 ) {

+		if(log_config.enable_logs&0x400)

 			log_pick(sd, "A", 0, tmp_item.nameid, 1, &tmp_item);

-		}

-		//Logs

 

 		if ((flag = pc_additem(sd, &tmp_item, 1)))

 			clif_additem(sd, 0, 0, flag);

@@ -6377,10 +6370,8 @@ int atcommand_chardelitem(const int fd, struct map_session_data* sd,
 					for(i = 0; i < number && item_position >= 0; i++) {

 

 						//Logs (A)dmins items [Lupus]

-						if(log_config.pick > 0 ) {

+						if(log_config.enable_logs&0x400)

 							log_pick(pl_sd, "A", 0, pl_sd->status.inventory[item_position].nameid, -1, &pl_sd->status.inventory[item_position]);

-						}

-						//Logs

 

 						pc_delitem(pl_sd, item_position, 1, 0);

 						count++;

@@ -7678,10 +7669,8 @@ void getring (struct map_session_data *sd)
 	item_tmp.card[3]=sd->status.partner_id >> 16;

 

 	//Logs (A)dmins items [Lupus]

-	if(log_config.pick > 0 ) {

+	if(log_config.enable_logs&0x400)

 		log_pick(sd, "A", 0, item_id, 1, &item_tmp);

-	}

-	//Logs

 

 	if((flag = pc_additem(sd,&item_tmp,1))) {

 		clif_additem(sd,0,0,flag);