Forráskód Böngészése

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://svn.code.sf.net/p/rathena/svn/trunk@16063 54d463be-8e91-2dee-dedb-b68131a5f0ec
shennetsind 13 éve
szülő
commit
00846d9366
1 módosított fájl, 6 hozzáadás és 3 törlés
  1. 6 3
      src/map/battle.c

+ 6 - 3
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;
 		}