From f6abfb47831311a79bc448b2716a58b3d1f2853d Mon Sep 17 00:00:00 2001 From: milky-milk Date: Wed, 13 May 2015 13:46:36 +0500 Subject: Fixed defending aura bug in pre-renewal (http://hercules.ws/board/tracker/issue-8560-pre-renewal-defending-aura-bug/) --- src/map/battle.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/map') 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)) -- cgit v1.2.3-60-g2f50 From ca014e193703f71678a38be8b687637d45ac81f5 Mon Sep 17 00:00:00 2001 From: Milk Date: Wed, 7 Oct 2015 16:30:44 +0500 Subject: Deleted dublicate --- src/map/battle.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/map') diff --git a/src/map/battle.c b/src/map/battle.c index d7ffb4ca1..a511650a2 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3003,12 +3003,11 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam 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 +#endif 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)) -- cgit v1.2.3-60-g2f50