diff options
| author | Fate <fate-tmw@googlemail.com> | 2009-10-10 07:02:51 +0000 |
|---|---|---|
| committer | Fate <fate-tmw@googlemail.com> | 2009-10-10 07:02:51 +0000 |
| commit | 78f36299f3d878c935f8388ec23934239d0cdaa6 (patch) | |
| tree | 9e905213b1949f3010b068cc4ed91c0a5f831ad3 /src/map/mob.c | |
| parent | d90c344f576d0be5206db7f7e7eb265a6a38019c (diff) | |
| download | tmwa-78f36299f3d878c935f8388ec23934239d0cdaa6.tar.gz tmwa-78f36299f3d878c935f8388ec23934239d0cdaa6.tar.bz2 tmwa-78f36299f3d878c935f8388ec23934239d0cdaa6.tar.xz tmwa-78f36299f3d878c935f8388ec23934239d0cdaa6.zip | |
Better logging, initial job experience gathering, naming fixes to the skill script commands
Diffstat (limited to 'src/map/mob.c')
| -rw-r--r-- | src/map/mob.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/map/mob.c b/src/map/mob.c index a5fc159..cec0b92 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -2242,11 +2242,11 @@ int mob_damage(struct block_list *src,struct mob_data *md,int damage,int type) if (src && src->id == md->master_id && md->mode & MOB_MODE_TURNS_AGAINST_BAD_MASTER) { - /* If the master hits a monster, have the monster turn against him */ - md->master_id = 0; - md->mode = 0x85; /* Regular war mode */ - md->target_id = src->id; - md->attacked_id = src->id; + /* If the master hits a monster, have the monster turn against him */ + md->master_id = 0; + md->mode = 0x85; /* Regular war mode */ + md->target_id = src->id; + md->attacked_id = src->id; } max_hp = battle_get_max_hp(&md->bl); @@ -2313,6 +2313,14 @@ int mob_damage(struct block_list *src,struct mob_data *md,int damage,int type) } if(src && src->type == BL_MOB && ((struct mob_data*)src)->state.special_mob_ai){ struct mob_data *md2 = (struct mob_data *)src; + struct block_list *master_bl = map_id2bl(md2->master_id); + if (master_bl->type == BL_PC) { + MAP_LOG_PC(((struct map_session_data *)master_bl), "MOB-TO-MOB-DMG FROM MOB%d %d TO MOB%d %d FOR %d", + md2->bl.id, md2->class, + md->bl.id, md->class, + damage); + } + nullpo_retr(0, md2); for(i=0,minpos=0,mindmg=0x7fffffff;i<DAMAGELOG_SIZE;i++){ if(md->dmglog[i].id==md2->master_id) |