summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormalufett <malufett.eat.my.binaries@gmail.com>2015-03-19 23:25:13 +0800
committermalufett <malufett.eat.my.binaries@gmail.com>2015-03-19 23:25:13 +0800
commit12ce31d68bd5e040feefa5b096b7e30b8abaf88d (patch)
tree527bc32a1a11f3865b7108e9871751795e2767ff
parent370c96e24ac21b47a4da6fb9c14dfcb8e9fbd19a (diff)
downloadhercules-12ce31d68bd5e040feefa5b096b7e30b8abaf88d.tar.gz
hercules-12ce31d68bd5e040feefa5b096b7e30b8abaf88d.tar.bz2
hercules-12ce31d68bd5e040feefa5b096b7e30b8abaf88d.tar.xz
hercules-12ce31d68bd5e040feefa5b096b7e30b8abaf88d.zip
Follow up@210c963d2851eb880ba3560998ee984d942cde19
-Thanks to michi and chatchanunn Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
-rw-r--r--src/map/battle.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 70b9550d0..9def70dd7 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -928,7 +928,7 @@ int64 battle_calc_cardfix2(struct block_list *src, struct block_list *bl, int64
sstatus = status->get_status_data(src);
if ( tsd ) {
- if ( !(nk&NK_NO_CARDFIX_ATK) ) {
+ if ( !(nk&NK_NO_CARDFIX_DEF) ) {
// RaceAddTolerance
damage -= damage * tsd->race_tolerance[sstatus->race] / 100;
damage -= damage * tsd->race_tolerance[is_boss(src) ? RC_BOSS : RC_NONBOSS] / 100;
@@ -4348,6 +4348,8 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
case GS_PIERCINGSHOT:
case AM_ACIDTERROR:
case AM_DEMONSTRATION:
+ case NJ_ISSEN:
+ case PA_SACRIFICE:
flag.distinct = 1;
break;
case PA_SHIELDCHAIN: