summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-05-03 03:44:41 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-05-03 03:44:41 +0000
commit2896718b7f4663abec0aa0a795018efd86bc58b2 (patch)
tree252d8c234bf9d14b28386dcabe60e139d5203b79 /src/map/battle.c
parent80f384a230600345bbec9b31166dfbff44822cd3 (diff)
downloadhercules-2896718b7f4663abec0aa0a795018efd86bc58b2.tar.gz
hercules-2896718b7f4663abec0aa0a795018efd86bc58b2.tar.bz2
hercules-2896718b7f4663abec0aa0a795018efd86bc58b2.tar.xz
hercules-2896718b7f4663abec0aa0a795018efd86bc58b2.zip
Fixed bugreport:3591 Ninja's Cast-off Ciceda Shell now triggers card effects even tho it misses (e.g. garm card / pest card)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16063 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 961bb3244..18759c790 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -527,9 +527,11 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,struct Damag
}
if (((sce=sc->data[SC_UTSUSEMI]) || sc->data[SC_BUNSINJYUTSU])
- &&
- flag&BF_WEAPON && !(skill_get_nk(skill_num)&NK_NO_CARDFIX_ATK))
- {
+ && flag&BF_WEAPON && !(skill_get_nk(skill_num)&NK_NO_CARDFIX_ATK)) {
+
+ skill_additional_effect (src, bl, skill_num, skill_lv, flag, ATK_BLOCK, gettick() );
+ if( !status_isdead(src) )
+ skill_counter_additional_effect( src, bl, skill_num, skill_lv, flag, gettick() );
if (sce) {
clif_specialeffect(bl, 462, AREA);
skill_blown(src,bl,sce->val3,-1,0);
@@ -539,6 +541,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,struct Damag
status_change_end(bl, SC_UTSUSEMI, INVALID_TIMER);
if ((sce=sc->data[SC_BUNSINJYUTSU]) && --(sce->val2) <= 0)
status_change_end(bl, SC_BUNSINJYUTSU, INVALID_TIMER);
+
return 0;
}