|
@@ -1440,10 +1440,12 @@ static bool mob_ai_sub_hard(struct mob_data *md, unsigned int tick)
|
|
if( md->attacked_id == md->target_id )
|
|
if( md->attacked_id == md->target_id )
|
|
{ //Rude attacked check.
|
|
{ //Rude attacked check.
|
|
if( !battle_check_range(&md->bl, tbl, md->status.rhw.range)
|
|
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)))
|
|
|
|
- || !mob_can_reach(md, tbl, md->min_chase, MSS_RUSH)
|
|
|
|
- )
|
|
|
|
|
|
+ && ( //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__MANHOLE])) // Not yet confirmed if boss will teleport once it can't reach target.
|
|
|
|
+ || !mob_can_reach(md, tbl, md->min_chase, MSS_RUSH)
|
|
|
|
+ )
|
|
&& md->state.attacked_count++ >= RUDE_ATTACKED_COUNT
|
|
&& md->state.attacked_count++ >= RUDE_ATTACKED_COUNT
|
|
&& !mobskill_use(md, tick, MSC_RUDEATTACKED) // If can't rude Attack
|
|
&& !mobskill_use(md, tick, MSC_RUDEATTACKED) // If can't rude Attack
|
|
&& can_move && unit_escape(&md->bl, tbl, rnd()%10 +1)) // Attempt escape
|
|
&& can_move && unit_escape(&md->bl, tbl, rnd()%10 +1)) // Attempt escape
|
|
@@ -1461,9 +1463,11 @@ static bool mob_ai_sub_hard(struct mob_data *md, unsigned int tick)
|
|
|| (battle_config.mob_ai&0x2 && !status_check_skilluse(&md->bl, abl, 0, 0)) // Cannot normal attack back to Attacker
|
|
|| (battle_config.mob_ai&0x2 && !status_check_skilluse(&md->bl, abl, 0, 0)) // Cannot normal attack back to Attacker
|
|
|| (!battle_check_range(&md->bl, abl, md->status.rhw.range) // Not on Melee Range and ...
|
|
|| (!battle_check_range(&md->bl, abl, md->status.rhw.range) // Not on Melee Range and ...
|
|
&& ( // Reach check
|
|
&& ( // 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)))
|
|
|
|
|
|
+ (!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__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)
|
|
|| !mob_can_reach(md, abl, dist+md->db->range3, MSS_RUSH)
|
|
- )
|
|
|
|
|
|
+ )
|
|
) )
|
|
) )
|
|
{ // Rude attacked
|
|
{ // Rude attacked
|
|
if (md->state.attacked_count++ >= RUDE_ATTACKED_COUNT
|
|
if (md->state.attacked_count++ >= RUDE_ATTACKED_COUNT
|