diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-27 11:02:13 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-27 11:02:13 +0000 |
| commit | cf44279d5416a3290d1c0ab735579aab16787ddf (patch) | |
| tree | a2915d1541f83d95128dcc1103bbe26800fdcc28 /src/map/mob.c | |
| parent | af8672130d9fee3c8cbef87d61479df7f1bb0bda (diff) | |
| download | hercules-cf44279d5416a3290d1c0ab735579aab16787ddf.tar.gz hercules-cf44279d5416a3290d1c0ab735579aab16787ddf.tar.bz2 hercules-cf44279d5416a3290d1c0ab735579aab16787ddf.tar.xz hercules-cf44279d5416a3290d1c0ab735579aab16787ddf.zip | |
* Summoned monsters will not give exp and items
* Added the 6 new Yuno fields
* Added some Freya's optimisations in clif_parse
* Added clif_update_mobhp
* Set alive_timer to -1 when quitting, not 0
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@811 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/mob.c')
| -rw-r--r-- | src/map/mob.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/map/mob.c b/src/map/mob.c index 7fa39b7ca..3c3fc76a5 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -536,7 +536,7 @@ static int mob_walk(struct mob_data *md,unsigned int tick,int data) if(md->walkpath.path_pos>=md->walkpath.path_len) clif_fixmobpos(md); // とまったときに位置の再送信 - } + } return 0; } @@ -2303,6 +2303,8 @@ int mob_damage(struct block_list *src,struct mob_data *md,int damage,int type) } if(md->hp>0){ + if (battle_config.show_mob_hp) + clif_update_mobhp (md); return 0; } @@ -2394,7 +2396,7 @@ int mob_damage(struct block_list *src,struct mob_data *md,int damage,int type) if(sd && md && battle_config.pk_mode==1 && (mob_db[md->class].lv - sd->status.base_level >= 20)) { job_exp*=1.15; // pk_mode additional exp if monster >20 levels [Valaris] } - if(md->state.special_mob_ai >= 1 && battle_config.alchemist_summon_reward != 1) { // for summoned creatures [Valaris] + if(md->master_id || (md->state.special_mob_ai >= 1 && battle_config.alchemist_summon_reward != 1)) { // for summoned creatures [Valaris] base_exp = 0; job_exp = 0; } @@ -2454,7 +2456,7 @@ int mob_damage(struct block_list *src,struct mob_data *md,int damage,int type) struct delay_item_drop *ditem; int drop_rate; - if(md->state.special_mob_ai >= 1 && battle_config.alchemist_summon_reward != 1) // Added [Valaris] + if(md->master_id || (md->state.special_mob_ai >= 1 && battle_config.alchemist_summon_reward != 1)) // Added [Valaris] break; // End if(mob_db[md->class].dropitem[i].nameid <= 0) |