Explorar o código

Added two picklog types to distinguish regular monster drops (M) from stolen items (D) and MVP prizes (U)(bugreport:4590).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15519 54d463be-8e91-2dee-dedb-b68131a5f0ec
gepard1984 %!s(int64=13) %!d(string=hai) anos
pai
achega
11c1789b80
Modificáronse 5 ficheiros con 9 adicións e 6 borrados
  1. 3 0
      sql-files/upgrade_svn15519_log.sql
  2. 2 2
      src/map/log.c
  3. 2 2
      src/map/log.h
  4. 1 1
      src/map/mob.c
  5. 1 1
      src/map/pc.c

+ 3 - 0
sql-files/upgrade_svn15519_log.sql

@@ -0,0 +1,3 @@
+-- Adds 'D' and 'U' to `type` in `picklog` table
+
+ALTER TABLE `picklog` MODIFY `type` ENUM('M','P','L','T','V','S','N','C','A','R','G','E','B','O','I','X','D','U') NOT NULL DEFAULT 'P';

+ 2 - 2
src/map/log.c

@@ -62,10 +62,10 @@ static char log_picktype2char(e_log_pick_type type)
 		case LOG_TYPE_PICKDROP_MONSTER: return 'M';  // (M)onster
 		case LOG_TYPE_NPC:              return 'S';  // NPC (S)hop
 		case LOG_TYPE_SCRIPT:           return 'N';  // (N)PC Script
-		//case LOG_TYPE_STEAL:            return 'D';  // Steal/Snatcher
+		case LOG_TYPE_STEAL:            return 'D';  // Steal/Snatcher
 		case LOG_TYPE_CONSUME:          return 'C';  // (C)onsumed
 		case LOG_TYPE_PRODUCE:          return 'O';  // Pr(O)duced/Ingredients
-		//case LOG_TYPE_MVP:              return 'U';  // MVP Rewards
+		case LOG_TYPE_MVP:              return 'U';  // MVP Rewards
 		case LOG_TYPE_COMMAND:          return 'A';  // (A)dmin command
 		case LOG_TYPE_STORAGE:          return 'R';  // Sto(R)age
 		case LOG_TYPE_GSTORAGE:         return 'G';  // (G)uild storage

+ 2 - 2
src/map/log.h

@@ -33,10 +33,10 @@ typedef enum e_log_pick_type
 	LOG_TYPE_PICKDROP_MONSTER = 0x00008,
 	LOG_TYPE_NPC              = 0x00010,
 	LOG_TYPE_SCRIPT           = 0x00020,
-	//LOG_TYPE_STEAL            = 0x00040,
+	LOG_TYPE_STEAL            = 0x00040,
 	LOG_TYPE_CONSUME          = 0x00080,
 	LOG_TYPE_PRODUCE          = 0x00100,
-	//LOG_TYPE_MVP              = 0x00200,
+	LOG_TYPE_MVP              = 0x00200,
 	LOG_TYPE_COMMAND          = 0x00400,
 	LOG_TYPE_STORAGE          = 0x00800,
 	LOG_TYPE_GSTORAGE         = 0x01000,

+ 1 - 1
src/map/mob.c

@@ -2407,7 +2407,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
 			}
 			
 			//Logs items, MVP prizes [Lupus]
-			log_pick_mob(md, LOG_TYPE_PICKDROP_MONSTER, -1, &item);
+			log_pick_mob(md, LOG_TYPE_MVP, -1, &item);
 			break;
 		}
 

+ 1 - 1
src/map/pc.c

@@ -4223,7 +4223,7 @@ int pc_steal_item(struct map_session_data *sd,struct block_list *bl, int lv)
 		party_foreachsamemap(pc_show_steal,sd,AREA_SIZE,sd,tmp_item.nameid);
 
 	//Logs items, Stolen from mobs [Lupus]
-	log_pick_mob(md, LOG_TYPE_PICKDROP_MONSTER, -1, &tmp_item);
+	log_pick_mob(md, LOG_TYPE_STEAL, -1, &tmp_item);
 		
 	//A Rare Steal Global Announce by Lupus
 	if(md->db->dropitem[i].p<=battle_config.rare_drop_announce) {