diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/battle.c | 27 | ||||
| -rw-r--r-- | src/map/mob.c | 20 |
2 files changed, 26 insertions, 21 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index e315142f9..f82153c37 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3254,11 +3254,23 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f case BL_MOB: { TBL_MOB *md = (TBL_MOB*)t_bl; - if(md->state.killer) //Enable retaliation - state |= BCT_ENEMY; - + if (!agit_flag && md->guardian_data && md->guardian_data->guild_id) return 0; //Disable guardians/emperiums owned by Guilds on non-woe times. + if(md->state.killer || !(battle_config.mob_ai&0x400)) + state |= BCT_ENEMY; //By default everyone hates mobs. + else + { //Smart enemy criteria. + if (!md->special_state.ai) { //Normal mobs. + if (s_bl->type == BL_MOB && !((TBL_MOB*)s_bl)->special_state.ai) + state |= BCT_PARTY; //Normal mobs with no ai are friends. + else + state |= BCT_ENEMY; //However, all else are enemies. + } else { + if (s_bl->type == BL_MOB && !((TBL_MOB*)s_bl)->special_state.ai) + state |= BCT_ENEMY; //Natural enemy for AI mobs are normal mobs. + } + } break; } } @@ -3335,15 +3347,6 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f return 0; //Disable guardians/emperium owned by Guilds on non-woe times. if(md->state.killer) // Is on a rampage too :D state |= BCT_ENEMY; - else if (!md->special_state.ai) { //Normal mobs. - if (t_bl->type == BL_MOB && !((TBL_MOB*)t_bl)->special_state.ai) - state |= BCT_PARTY; //Normal mobs with no ai are friends. - else - state |= BCT_ENEMY; //However, all else are enemies. - } else { - if (t_bl->type == BL_MOB && !((TBL_MOB*)t_bl)->special_state.ai) - state |= BCT_ENEMY; //Natural enemy for AI mobs are normal mobs. - } break; } default: diff --git a/src/map/mob.c b/src/map/mob.c index 286146e5c..32deef2bc 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -1162,14 +1162,6 @@ static int mob_ai_sub_hard(struct block_list *bl,va_list ap) } } } - if (md->state.aggressive && md->attacked_id == md->target_id) - { //No longer aggressive, change to retaliate AI. - md->state.aggressive = 0; - if(md->state.skillstate== MSS_ANGRY) - md->state.skillstate = MSS_BERSERK; - if(md->state.skillstate== MSS_FOLLOW) - md->state.skillstate = MSS_RUSH; - } //Clear it since it's been checked for already. md->attacked_id = 0; } @@ -1582,8 +1574,18 @@ void mob_damage(struct mob_data *md, struct block_list *src, int damage) { int char_id = 0, flag = 0; - if (damage > 0) //Store total damage... + if (damage > 0) + { //Store total damage... md->tdmg+=damage; + if (md->state.aggressive) + { //No longer aggressive, change to retaliate AI. + md->state.aggressive = 0; + if(md->state.skillstate== MSS_ANGRY) + md->state.skillstate = MSS_BERSERK; + if(md->state.skillstate== MSS_FOLLOW) + md->state.skillstate = MSS_RUSH; + } + } if(md->guardian_data && md->guardian_data->number < MAX_GUARDIANS) // guardian hp update [Valaris] (updated by [Skotlex]) md->guardian_data->castle->guardian[md->guardian_data->number].hp = md->status.hp; |