From 03e3c726518b8b3d6d28280210510ad37ee896bf Mon Sep 17 00:00:00 2001 From: skotlex Date: Tue, 9 May 2006 20:11:47 +0000 Subject: - Fixed Fog of Wall's symmetry in respect to Misc attacks, they no longer get reduced by 50% regardless of who is standing on the fog. - monster_ai&2 will now trigger the rude-attacked skill when the mob can't move and the attacker is out of it's attack range. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6536 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/battle.c | 2 +- src/map/mob.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/map/battle.c b/src/map/battle.c index 0c9724266..016453592 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -552,7 +552,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i if (flag&BF_MAGIC) { if(!(skill_get_inf(skill_num)&INF_GROUND_SKILL) && rand()%100 < 75) return 0; - } else + } else if (flag&BF_WEAPON) damage >>=1; } } diff --git a/src/map/mob.c b/src/map/mob.c index bae209fc1..d5c9da304 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -1069,7 +1069,6 @@ static int mob_ai_sub_hard(struct block_list *bl,va_list ap) mode = status_get_mode(&md->bl); can_move = (mode&MD_CANMOVE)&&unit_can_move(&md->bl); - //Since can_move is false when you are casting or the damage-delay kicks in, some special considerations if (md->target_id) { //Check validity of current target. [Skotlex] @@ -1093,13 +1092,12 @@ static int mob_ai_sub_hard(struct block_list *bl,va_list ap) { if (md->attacked_id == md->target_id) { - /* Currently being unable to move shouldn't trigger rude-attacked conditions. - if (!can_move && !battle_check_range (&md->bl, tbl, md->db->range)) + if (!can_move && (battle_config.mob_ai&2) && + !battle_check_range(&md->bl, tbl, md->db->range)) { //Rude-attacked. if (md->attacked_count++ > 3) mobskill_use(md, tick, MSC_RUDEATTACKED); } - */ } else if ((abl= map_id2bl(md->attacked_id)) && (!tbl || mob_can_changetarget(md, abl, mode))) { if (md->bl.m != abl->m || abl->prev == NULL || -- cgit v1.2.3-70-g09d2