diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/mob.c | 8 | ||||
| -rw-r--r-- | src/map/status.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/map/mob.c b/src/map/mob.c index 47dcd85fd..bae209fc1 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -84,7 +84,9 @@ int mobdb_searchname(const char *str) static int mobdb_searchname_array_sub(struct mob_db* mob, const char *str)
{
if (mob == mob_dummy)
- return 1; //Invalid item.
+ return 1; //Invalid mob.
+ if(!mob->base_exp && !mob->job_exp)
+ return 1; //Discount slave-mobs (no exp) as requested by Playtester. [Skotlex]
if(stristr(mob->jname,str))
return 0;
if(stristr(mob->name,str))
@@ -3267,7 +3269,9 @@ static int mob_readdb(void) mob_db_data[class_]->dropitem[i].p = mob_drop_adjust(rate, rate_adjust, ratemin, ratemax);
//calculate and store Max available drop chance of the item
- if (mob_db_data[class_]->dropitem[i].p) {
+ if (mob_db_data[class_]->dropitem[i].p &&
+ (class_ < 1324 || class_ > 1363) //Skip treasure chests.
+ ) {
id = itemdb_search(mob_db_data[class_]->dropitem[i].nameid);
if (id->maxchance==10000 || (id->maxchance < mob_db_data[class_]->dropitem[i].p) ) {
//item has bigger drop chance or sold in shops
diff --git a/src/map/status.c b/src/map/status.c index 6f3ea5770..5140cf4e5 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -232,7 +232,7 @@ void initChangeTables(void) { set_sc(CG_MARIONETTE, SC_MARIONETTE2, SI_MARIONETTE2);
set_sc(LK_SPIRALPIERCE, SC_STOP, SI_BLANK);
set_sc(LK_HEADCRUSH, SC_BLEEDING, SI_BLEEDING);
- set_sc(LK_JOINTBEAT, SC_JOINTBEAT, SI_BLANK);
+ set_sc(LK_JOINTBEAT, SC_JOINTBEAT, SI_JOINTBEAT);
set_sc(HW_NAPALMVULCAN, SC_CURSE, SI_BLANK);
set_sc(PF_MINDBREAKER, SC_MINDBREAKER, SI_BLANK);
set_sc(PF_MEMORIZE, SC_MEMORIZE, SI_BLANK);
|