summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorHaruna <haru@dotalux.com>2015-10-25 23:39:57 +0100
committerHaruna <haru@dotalux.com>2015-10-25 23:39:57 +0100
commitc956a618cb92b53407a0dc0c999f4cd68e63d536 (patch)
treeeb6c1974c8ad0369c3e2219b5d82db1252b5e3f0 /src/map
parent924faec00d2c0e5444d60eb88fde41d630c91f9e (diff)
parentca014e193703f71678a38be8b687637d45ac81f5 (diff)
downloadhercules-c956a618cb92b53407a0dc0c999f4cd68e63d536.tar.gz
hercules-c956a618cb92b53407a0dc0c999f4cd68e63d536.tar.bz2
hercules-c956a618cb92b53407a0dc0c999f4cd68e63d536.tar.xz
hercules-c956a618cb92b53407a0dc0c999f4cd68e63d536.zip
Merge pull request #516 from milky-milk/pre-re_defender
Fixed defending aura bug in pre-renewal
Diffstat (limited to 'src/map')
-rw-r--r--src/map/battle.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index be508dae0..1cbc3baa5 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3007,8 +3007,13 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam
#endif
if(sc->data[SC_DEFENDER] &&
+#ifdef RENEWAL
((flag&(BF_LONG|BF_WEAPON)) == (BF_LONG|BF_WEAPON) || skill_id == CR_ACIDDEMONSTRATION))
+#else
+ (flag&(BF_LONG|BF_WEAPON)) == (BF_LONG|BF_WEAPON)) // In pre-re Defender doesn't reduce damage from Acid Demonstration
+#endif
damage = damage * ( 100 - sc->data[SC_DEFENDER]->val2 ) / 100;
+
#ifndef RENEWAL
if(sc->data[SC_GS_ADJUSTMENT] &&
(flag&(BF_LONG|BF_WEAPON)) == (BF_LONG|BF_WEAPON))