diff options
| author | gepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-01-25 14:41:32 +0000 |
|---|---|---|
| committer | gepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-01-25 14:41:32 +0000 |
| commit | 996e110eed6376fca158fb0136c55aea5ac819be (patch) | |
| tree | c1785869e8249116ed0fe6e38c18d716498460d0 | |
| parent | 3e77d310d328a98814df15ba80913833421cdae9 (diff) | |
| download | hercules-996e110eed6376fca158fb0136c55aea5ac819be.tar.gz hercules-996e110eed6376fca158fb0136c55aea5ac819be.tar.bz2 hercules-996e110eed6376fca158fb0136c55aea5ac819be.tar.xz hercules-996e110eed6376fca158fb0136c55aea5ac819be.zip | |
Added two picklog types to distinguish regular monster drops (M) from stolen items (D) and MVP prizes (U)(bugreport:4590).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15519 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | sql-files/upgrade_svn15519_log.sql | 3 | ||||
| -rw-r--r-- | src/map/log.c | 4 | ||||
| -rw-r--r-- | src/map/log.h | 4 | ||||
| -rw-r--r-- | src/map/mob.c | 2 | ||||
| -rw-r--r-- | src/map/pc.c | 2 |
5 files changed, 9 insertions, 6 deletions
diff --git a/sql-files/upgrade_svn15519_log.sql b/sql-files/upgrade_svn15519_log.sql new file mode 100644 index 000000000..623b022b8 --- /dev/null +++ b/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'; diff --git a/src/map/log.c b/src/map/log.c index 76497db3c..7823b5e02 100644 --- a/src/map/log.c +++ b/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 diff --git a/src/map/log.h b/src/map/log.h index 7c46712cf..5324bb599 100644 --- a/src/map/log.h +++ b/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, diff --git a/src/map/mob.c b/src/map/mob.c index a079bbdf9..123ae1c7f 100644 --- a/src/map/mob.c +++ b/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; } diff --git a/src/map/pc.c b/src/map/pc.c index 1b0d3f57a..44de2f8d4 100644 --- a/src/map/pc.c +++ b/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) { |