diff options
Diffstat (limited to 'src/map/battle.c')
-rw-r--r-- | src/map/battle.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 3dd2c847e..22a3ba948 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -4775,7 +4775,13 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t skill_get_time(MO_CALLSPIRITS, tsc->data[SC_GT_ENERGYGAIN]->val1), tsc->data[SC_GT_ENERGYGAIN]->val1); } - + if( sc && sc->data[SC_CRUSHSTRIKE] ){ + int skilllv = sc->data[SC_CRUSHSTRIKE]->val1; + status_change_end(src, SC_CRUSHSTRIKE, INVALID_TIMER); + if( skill_attack(BF_WEAPON,src,src,target,RK_CRUSHSTRIKE,skilllv,tick,0) ) + return ATK_DEF; + return ATK_MISS; + } } if(tsc && tsc->data[SC_KAAHI] && tsc->data[SC_KAAHI]->val4 == INVALID_TIMER && tstatus->hp < tstatus->max_hp) |