summaryrefslogtreecommitdiff
path: root/src/map/mob.c
diff options
context:
space:
mode:
authorJedzkie <jedzkie13@rocketmail.com>2015-12-10 14:57:48 +0800
committerHaru <haru@dotalux.com>2015-12-13 16:04:45 +0100
commitf00431e91557205ae5373a8afb1b91c6b1350590 (patch)
treeed9af11ae55ec5971aa78b1553137d1e26f864b8 /src/map/mob.c
parentd4737c7141d936133493a79bde34af944e3d0c7c (diff)
downloadhercules-f00431e91557205ae5373a8afb1b91c6b1350590.tar.gz
hercules-f00431e91557205ae5373a8afb1b91c6b1350590.tar.bz2
hercules-f00431e91557205ae5373a8afb1b91c6b1350590.tar.xz
hercules-f00431e91557205ae5373a8afb1b91c6b1350590.zip
ItemDB Updates:
- Added 'Malang Cat Can' item. - Added 'Ru Blue Spear' item. - Change the item id of 'RWC Silver Brooch' from 2998 to 2999. - Follow up https://github.com/HerculesWS/Hercules/commit/e511dcf5940cee7a6e43744543a5ca96bc23cf84, thanks to zackdreaver. - item_db.conf renewal minor clean-up xD
Diffstat (limited to 'src/map/mob.c')
-rw-r--r--src/map/mob.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/map/mob.c b/src/map/mob.c
index d9a3f6776..a6e2c7c21 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2351,7 +2351,9 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) {
// Increase drop rate if user has SC_CASH_RECEIVEITEM
if (sd && sd->sc.data[SC_CASH_RECEIVEITEM]) // now rig the drop rate to never be over 90% unless it is originally >90%.
- drop_rate = max(drop_rate,cap_value((int)(0.5+drop_rate*(sd->sc.data[SC_CASH_RECEIVEITEM]->val1)/100.),0,9000));
+ drop_rate = max(drop_rate, cap_value((int)(0.5 + drop_rate * (sd->sc.data[SC_CASH_RECEIVEITEM]->val1) / 100.), 0, 9000));
+ if (sd && sd->sc.data[SC_OVERLAPEXPUP])
+ drop_rate = max(drop_rate, cap_value((int)(0.5 + drop_rate * (sd->sc.data[SC_OVERLAPEXPUP]->val2) / 100.), 0, 9000));
#ifdef RENEWAL_DROP
if( drop_modifier != 100 ) {
drop_rate = drop_rate * drop_modifier / 100;