|
@@ -3240,7 +3240,11 @@ static bool attack_ignores_def(struct Damage* wd, struct block_list *src, struct
|
|
#endif
|
|
#endif
|
|
if (sc && sc->getSCE(SC_FUSION))
|
|
if (sc && sc->getSCE(SC_FUSION))
|
|
return true;
|
|
return true;
|
|
- else if (skill_id != CR_GRANDCROSS && skill_id != NPC_GRANDDARKNESS)
|
|
|
|
|
|
+
|
|
|
|
+ if (skill_id == RK_WINDCUTTER && sd && sd->status.weapon == W_2HSWORD)
|
|
|
|
+ return true;
|
|
|
|
+
|
|
|
|
+ if (skill_id != CR_GRANDCROSS && skill_id != NPC_GRANDDARKNESS)
|
|
{ //Ignore Defense?
|
|
{ //Ignore Defense?
|
|
if (sd && (sd->right_weapon.ignore_def_ele & (1<<tstatus->def_ele) || sd->right_weapon.ignore_def_ele & (1<<ELE_ALL) ||
|
|
if (sd && (sd->right_weapon.ignore_def_ele & (1<<tstatus->def_ele) || sd->right_weapon.ignore_def_ele & (1<<ELE_ALL) ||
|
|
sd->right_weapon.ignore_def_race & (1<<tstatus->race) || sd->right_weapon.ignore_def_race & (1<<RC_ALL) ||
|
|
sd->right_weapon.ignore_def_race & (1<<tstatus->race) || sd->right_weapon.ignore_def_race & (1<<RC_ALL) ||
|
|
@@ -3258,8 +3262,7 @@ static bool attack_ignores_def(struct Damage* wd, struct block_list *src, struct
|
|
} else if (weapon_position == EQI_HAND_L)
|
|
} else if (weapon_position == EQI_HAND_L)
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
- } else if (skill_id == RK_WINDCUTTER && sd && sd->status.weapon == W_2HSWORD)
|
|
|
|
- return true;
|
|
|
|
|
|
+ }
|
|
|
|
|
|
return nk[NK_IGNOREDEFENSE] != 0;
|
|
return nk[NK_IGNOREDEFENSE] != 0;
|
|
}
|
|
}
|