summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorMichieru <Michieru@users.noreply.github.com>2014-09-14 17:20:07 +0200
committerMichieru <Michieru@users.noreply.github.com>2014-09-14 17:20:07 +0200
commit51fd6b4def852bbdc9f53cff6f42206ce270287e (patch)
treeb76e9d2ce502efcc85c3bb9c43fd30757916c6f3 /src/map/battle.c
parent35fd42449fcbe8c228a41777e630d4ded8357aae (diff)
downloadhercules-51fd6b4def852bbdc9f53cff6f42206ce270287e.tar.gz
hercules-51fd6b4def852bbdc9f53cff6f42206ce270287e.tar.bz2
hercules-51fd6b4def852bbdc9f53cff6f42206ce270287e.tar.xz
hercules-51fd6b4def852bbdc9f53cff6f42206ce270287e.zip
Storm Gust freeze chance is only 150% and not 300% (Thanks to Playtester)
Spiral Pierce should hitlock to 100% but not work on bosses (Thanks to Playtester) Implemented the official formula for Potion Pitcher when used by monsters (Thanks to Playtester) Golden Thief Bug card should not immune masquerades Desperado should not be reflect by Shield Reflect (bug:7624)
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index b969f3cc6..07a195503 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -5461,7 +5461,7 @@ void battle_reflect_damage(struct block_list *target, struct block_list *src, st
if( wd->dmg_lv >= ATK_BLOCK ) {/* yes block still applies, somehow gravity thinks it makes sense. */
if( sc ) {
- if( sc->data[SC_REFLECTSHIELD] && skill_id != WS_CARTTERMINATION ) {
+ if( sc->data[SC_REFLECTSHIELD] && skill_id != WS_CARTTERMINATION && skill_id != GS_DESPERADO ) {
NORMALIZE_RDAMAGE(damage * sc->data[SC_REFLECTSHIELD]->val2 / 100);
#ifndef RENEWAL