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

Fixed bugreport:6324 mobs now clear attacked data on death. special thanks to vali.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16527 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
shennetsind 2012-07-29 01:59:38 +00:00
parent b08737ab8c
commit a82b86699f
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/map/mob.c
View File

@ -2055,8 +2055,7 @@ void mob_log_damage(struct mob_data *md, struct block_list *src, int damage)
//Call when a mob has received damage. //Call when a mob has received damage.
void mob_damage(struct mob_data *md, struct block_list *src, int damage) void mob_damage(struct mob_data *md, struct block_list *src, int damage)
{ {
if (damage > 0) if (damage > 0) { //Store total damage...
{ //Store total damage...
if (UINT_MAX - (unsigned int)damage > md->tdmg) if (UINT_MAX - (unsigned int)damage > md->tdmg)
md->tdmg+=damage; md->tdmg+=damage;
else if (md->tdmg == UINT_MAX) else if (md->tdmg == UINT_MAX)
@ -2065,8 +2064,7 @@ void mob_damage(struct mob_data *md, struct block_list *src, int damage)
damage = (int)(UINT_MAX - md->tdmg); damage = (int)(UINT_MAX - md->tdmg);
md->tdmg = UINT_MAX; md->tdmg = UINT_MAX;
} }
if (md->state.aggressive) if (md->state.aggressive) { //No longer aggressive, change to retaliate AI.
{ //No longer aggressive, change to retaliate AI.
md->state.aggressive = 0; md->state.aggressive = 0;
if(md->state.skillstate== MSS_ANGRY) if(md->state.skillstate== MSS_ANGRY)
md->state.skillstate = MSS_BERSERK; md->state.skillstate = MSS_BERSERK;
@ -2085,8 +2083,7 @@ void mob_damage(struct mob_data *md, struct block_list *src, int damage)
if (!src) if (!src)
return; return;
if(md->special_state.ai==2/* && md->master_id == src->id*/) if( md->special_state.ai == 2 ) {//LOne WOlf explained that ANYONE can trigger the marine countdown skill. [Skotlex]
{ //LOne WOlf explained that ANYONE can trigger the marine countdown skill. [Skotlex]
md->state.alchemist = 1; md->state.alchemist = 1;
mobskill_use(md, gettick(), MSC_ALCHEMIST); mobskill_use(md, gettick(), MSC_ALCHEMIST);
} }
@ -2136,10 +2133,11 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
if(src && src->type == BL_MOB) if(src && src->type == BL_MOB)
mob_unlocktarget((struct mob_data *)src,tick); mob_unlocktarget((struct mob_data *)src,tick);
if( sd ) /* clear previous target otherwise we'll respawn aiming at the same dude */
{ md->attacked_id = 0;
if( sd->mission_mobid == md->class_)
{ //TK_MISSION [Skotlex] if( sd ) {
if( sd->mission_mobid == md->class_) { //TK_MISSION [Skotlex]
if( ++sd->mission_count >= 100 && (temp = mob_get_random_id(0, 0xE, sd->status.base_level)) ) if( ++sd->mission_count >= 100 && (temp = mob_get_random_id(0, 0xE, sd->status.base_level)) )
{ {
pc_addfame(sd, 1); pc_addfame(sd, 1);
@ -2152,8 +2150,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
} }
if( sd->status.party_id ) if( sd->status.party_id )
map_foreachinrange(quest_update_objective_sub,&md->bl,AREA_SIZE,BL_PC,sd->status.party_id,md->class_); map_foreachinrange(quest_update_objective_sub,&md->bl,AREA_SIZE,BL_PC,sd->status.party_id,md->class_);
else else if( sd->avail_quests )
if( sd->avail_quests )
quest_update_objective(sd, md->class_); quest_update_objective(sd, md->class_);
} }

6
src/map/status.c
View File

@ -1204,8 +1204,7 @@ int status_damage(struct block_list *src,struct block_list *target,int hp, int s
status_change_end(target, SC_SATURDAYNIGHTFEVER, INVALID_TIMER); status_change_end(target, SC_SATURDAYNIGHTFEVER, INVALID_TIMER);
} }
switch (target->type) switch (target->type) {
{
case BL_PC: pc_damage((TBL_PC*)target,src,hp,sp); break; case BL_PC: pc_damage((TBL_PC*)target,src,hp,sp); break;
case BL_MOB: mob_damage((TBL_MOB*)target, src, hp); break; case BL_MOB: mob_damage((TBL_MOB*)target, src, hp); break;
case BL_HOM: merc_damage((TBL_HOM*)target,src,hp,sp); break; case BL_HOM: merc_damage((TBL_HOM*)target,src,hp,sp); break;
@ -1213,8 +1212,7 @@ int status_damage(struct block_list *src,struct block_list *target,int hp, int s
case BL_ELEM: elemental_damage((TBL_ELEM*)target,src,hp,sp); break; case BL_ELEM: elemental_damage((TBL_ELEM*)target,src,hp,sp); break;
} }
if( target->type == BL_PC && ((TBL_PC*)target)->disguise && src ) if( src && target->type == BL_PC && ((TBL_PC*)target)->disguise ) {// stop walking when attacked in disguise to prevent walk-delay bug
{// stop walking when attacked in disguise to prevent walk-delay bug
unit_stop_walking( target, 1 ); unit_stop_walking( target, 1 );
} }