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

Mobs may now drop pet eggs, bugreport:2968

Browse Source 
Also did a small performance improvement at lupus' rare drop announce thing which happened to be just near where i was editing.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15373 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
shennetsind 2012-01-04 00:03:58 +00:00
parent 1a61c2d24e
commit 0b6c65aec9
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/map/mob.c
View File

@ -2185,6 +2185,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
{ // Item Drop { // Item Drop
struct item_drop_list *dlist = ers_alloc(item_drop_list_ers, struct item_drop_list); struct item_drop_list *dlist = ers_alloc(item_drop_list_ers, struct item_drop_list);
struct item_drop *ditem; struct item_drop *ditem;
struct item_data* it = NULL;
int drop_rate; int drop_rate;
#if REMODE #if REMODE
int drop_modifier = mvp_sd ? party_renewal_drop_mod(mvp_sd->status.base_level - md->level) : int drop_modifier = mvp_sd ? party_renewal_drop_mod(mvp_sd->status.base_level - md->level) :
@ -2203,7 +2204,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
{ {
if (md->db->dropitem[i].nameid <= 0) if (md->db->dropitem[i].nameid <= 0)
continue; continue;
if (!itemdb_exists(md->db->dropitem[i].nameid)) if ( !(it = itemdb_exists(md->db->dropitem[i].nameid)) )
continue; continue;
drop_rate = md->db->dropitem[i].p; drop_rate = md->db->dropitem[i].p;
if (drop_rate <= 0) { if (drop_rate <= 0) {
@ -2240,15 +2241,17 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
if (rand() % 10000 >= drop_rate) if (rand() % 10000 >= drop_rate)
continue; continue;
if( mvp_sd && it->type == IT_PETEGG ) {
pet_create_egg(mvp_sd, md->db->dropitem[i].nameid);
continue;
}
ditem = mob_setdropitem(md->db->dropitem[i].nameid, 1); ditem = mob_setdropitem(md->db->dropitem[i].nameid, 1);
//A Rare Drop Global Announce by Lupus //A Rare Drop Global Announce by Lupus
if( mvp_sd && drop_rate <= battle_config.rare_drop_announce ) if( mvp_sd && drop_rate <= battle_config.rare_drop_announce ) {
{
struct item_data *i_data;
char message[128]; char message[128];
i_data = itemdb_search(ditem->item_data.nameid); sprintf (message, msg_txt(541), mvp_sd->status.name, md->name, it->jname, (float)drop_rate/100);
sprintf (message, msg_txt(541), mvp_sd->status.name, md->name, i_data->jname, (float)drop_rate/100);
//MSG: "'%s' won %s's %s (chance: %0.02f%%)" //MSG: "'%s' won %s's %s (chance: %0.02f%%)"
intif_broadcast(message,strlen(message)+1,0); intif_broadcast(message,strlen(message)+1,0);
} }