summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authormilky-milk <welcomerooot@gmail.com>2015-05-13 13:46:36 +0500
committermilky-milk <welcomerooot@gmail.com>2015-05-13 13:46:36 +0500
commitf6abfb47831311a79bc448b2716a58b3d1f2853d (patch)
tree55e272e0d58a00d67127231f0b4892edcb6d1fcb /src/map/battle.c
parentcb4dd8bbe173597661c0a634b2ac2791de1cc077 (diff)
downloadhercules-f6abfb47831311a79bc448b2716a58b3d1f2853d.tar.gz
hercules-f6abfb47831311a79bc448b2716a58b3d1f2853d.tar.bz2
hercules-f6abfb47831311a79bc448b2716a58b3d1f2853d.tar.xz
hercules-f6abfb47831311a79bc448b2716a58b3d1f2853d.zip
Fixed defending aura bug in pre-renewal (http://hercules.ws/board/tracker/issue-8560-pre-renewal-defending-aura-bug/)
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 6573ca703..d7ffb4ca1 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3001,8 +3001,14 @@ 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))
damage = damage * ( 100 - sc->data[SC_DEFENDER]->val2 ) / 100;
+#else
+ (flag&(BF_LONG|BF_WEAPON)) == (BF_LONG|BF_WEAPON)) // In pre-re Defender doesn't reduce damage from Acid Demonstration
+ damage = damage * ( 100 - sc->data[SC_DEFENDER]->val2 ) / 100;
+#endif
+
#ifndef RENEWAL
if(sc->data[SC_GS_ADJUSTMENT] &&
(flag&(BF_LONG|BF_WEAPON)) == (BF_LONG|BF_WEAPON))