summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/map/battle.c2
-rw-r--r--src/map/status.c8
2 files changed, 9 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 2016efa3b..7563df975 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -1133,7 +1133,7 @@ int battle_calc_cardfix(int attack_type, struct block_list *src, struct block_li
if( wflag&BF_SHORT )
cardfix = cardfix * (100 - tsd->bonus.near_attack_def_rate) / 100;
else // BF_LONG (there's no other choice)
- cardfix = cardfix * (100 - tsd->bonus.near_attack_def_rate) / 100;
+ cardfix = cardfix * (100 - tsd->bonus.long_attack_def_rate) / 100;
if( tsd->sc.data[SC_PROTECT_DEF] )
cardfix = cardfix * (100 - tsd->sc.data[SC_PROTECT_DEF]->val1) / 100;
diff --git a/src/map/status.c b/src/map/status.c
index 0d8bedc5e..58e844529 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -6940,6 +6940,14 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
case SC_ELECTRICSHOCKER:
case SC_MAGNETICFIELD:
+ // Masquerades
+ case SC__ENERVATION:
+ case SC__GROOMY:
+ case SC__LAZINESS:
+ case SC__UNLUCKY:
+ case SC__WEAKNESS:
+ case SC__IGNORANCE:
+
return 0;
}
}