diff options
| author | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-14 17:33:21 +0000 |
|---|---|---|
| committer | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-14 17:33:21 +0000 |
| commit | c07a09726d9e94d75786192fc671cde81dc73176 (patch) | |
| tree | 8cf57867e258ba4d4c1fbfff8c55d0af760b1a1e /src/map/mob.c | |
| parent | 7167494574430bdaa1fe7fa13d106e2eabbf0f08 (diff) | |
| download | hercules-c07a09726d9e94d75786192fc671cde81dc73176.tar.gz hercules-c07a09726d9e94d75786192fc671cde81dc73176.tar.bz2 hercules-c07a09726d9e94d75786192fc671cde81dc73176.tar.xz hercules-c07a09726d9e94d75786192fc671cde81dc73176.zip | |
Fixed bugreport:5954 SC_SHADOWFORM Can now be canceled with detecting skills which is check in every 2 seconds.
Fixed bugreport:6010 AB_EXPIATIO now give a piercing damage bonus.
Fixed Diamond/Crystallize status to work only to non mob target and its official behavior(bugreport:5893)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16296 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/mob.c')
| -rw-r--r-- | src/map/mob.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/mob.c b/src/map/mob.c index 8924ae6eb..b3316b5e9 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -1416,7 +1416,7 @@ static bool mob_ai_sub_hard(struct mob_data *md, unsigned int tick) return false; // Abnormalities - if(( md->sc.opt1 > 0 && md->sc.opt1 != OPT1_STONEWAIT && md->sc.opt1 != OPT1_BURNING ) + if(( md->sc.opt1 > 0 && md->sc.opt1 != OPT1_STONEWAIT && md->sc.opt1 != OPT1_BURNING && md->sc.opt1 != OPT1_CRYSTALIZE ) || md->sc.data[SC_BLADESTOP] || md->sc.data[SC__MANHOLE] || md->sc.data[SC_CURSEDCIRCLE_TARGET]) {//Should reset targets. md->target_id = md->attacked_id = 0; return false; @@ -1456,7 +1456,7 @@ static bool mob_ai_sub_hard(struct mob_data *md, unsigned int tick) if( !battle_check_range(&md->bl, tbl, md->status.rhw.range) && ( //Can't attack back and can't reach back. (!can_move && DIFF_TICK(tick, md->ud.canmove_tick) > 0 && (battle_config.mob_ai&0x2 || (md->sc.data[SC_SPIDERWEB] && md->sc.data[SC_SPIDERWEB]->val1) - || md->sc.data[SC_BITE] || md->sc.data[SC_VACUUM_EXTREME] || md->sc.data[SC_CRYSTALIZE] || md->sc.data[SC_THORNSTRAP] + || md->sc.data[SC_BITE] || md->sc.data[SC_VACUUM_EXTREME] || md->sc.data[SC_THORNSTRAP] || md->sc.data[SC__MANHOLE])) // Not yet confirmed if boss will teleport once it can't reach target. || !mob_can_reach(md, tbl, md->min_chase, MSS_RUSH) ) @@ -1478,7 +1478,7 @@ static bool mob_ai_sub_hard(struct mob_data *md, unsigned int tick) || (!battle_check_range(&md->bl, abl, md->status.rhw.range) // Not on Melee Range and ... && ( // Reach check (!can_move && DIFF_TICK(tick, md->ud.canmove_tick) > 0 && (battle_config.mob_ai&0x2 || (md->sc.data[SC_SPIDERWEB] && md->sc.data[SC_SPIDERWEB]->val1) - || md->sc.data[SC_BITE] || md->sc.data[SC_VACUUM_EXTREME] || md->sc.data[SC_CRYSTALIZE] || md->sc.data[SC_THORNSTRAP] + || md->sc.data[SC_BITE] || md->sc.data[SC_VACUUM_EXTREME] || md->sc.data[SC_THORNSTRAP] || md->sc.data[SC__MANHOLE])) // Not yet confirmed if boss will teleport once it can't reach target. || !mob_can_reach(md, abl, dist+md->db->range3, MSS_RUSH) ) |