Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15519 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
gepard1984 2012-01-25 14:41:32 +00:00
parent 4d01a4f6e6
commit 11c1789b80
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql-files/upgrade_svn15519_log.sql Normal file
View File

@ -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';

4
src/map/log.c
View File

@ -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_PICKDROP_MONSTER: return 'M'; // (M)onster
case LOG_TYPE_NPC: return 'S'; // NPC (S)hop case LOG_TYPE_NPC: return 'S'; // NPC (S)hop
case LOG_TYPE_SCRIPT: return 'N'; // (N)PC Script 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_CONSUME: return 'C'; // (C)onsumed
case LOG_TYPE_PRODUCE: return 'O'; // Pr(O)duced/Ingredients 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_COMMAND: return 'A'; // (A)dmin command
case LOG_TYPE_STORAGE: return 'R'; // Sto(R)age case LOG_TYPE_STORAGE: return 'R'; // Sto(R)age
case LOG_TYPE_GSTORAGE: return 'G'; // (G)uild storage case LOG_TYPE_GSTORAGE: return 'G'; // (G)uild storage

4
src/map/log.h
View File

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

2
src/map/mob.c
View File

@ -2407,7 +2407,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
} }
//Logs items, MVP prizes [Lupus] //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; break;
} }

2
src/map/pc.c
View File

@ -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); party_foreachsamemap(pc_show_steal,sd,AREA_SIZE,sd,tmp_item.nameid);
//Logs items, Stolen from mobs [Lupus] //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 //A Rare Steal Global Announce by Lupus
if(md->db->dropitem[i].p<=battle_config.rare_drop_announce) { if(md->db->dropitem[i].p<=battle_config.rare_drop_announce) {