summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorrud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-12-16 15:43:32 +0000
committerrud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-12-16 15:43:32 +0000
commit44582e9466bd8160a3156d5e77b7b7b778f2c999 (patch)
tree49487229a8250ebf23b966c062d248b83c4275dc /src/map/battle.c
parent3baf38b0d93ff29a902de61e9f2eb665dad444c1 (diff)
downloadhercules-44582e9466bd8160a3156d5e77b7b7b778f2c999.tar.gz
hercules-44582e9466bd8160a3156d5e77b7b7b778f2c999.tar.bz2
hercules-44582e9466bd8160a3156d5e77b7b7b778f2c999.tar.xz
hercules-44582e9466bd8160a3156d5e77b7b7b778f2c999.zip
Fixed bugreport:7010 where r17014 missing status_change check that may cause map server crash.
Fixed bugreport:6953 where RK_WINDCUTTER don't have skill effect. Fixed bugreport:6701 change RK_CRUSHTRIKE to self target skill. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17026 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c8
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)