From 908868a2006d4bdde18b4055c96f725925fbe05a Mon Sep 17 00:00:00 2001 From: ultramage Date: Sat, 22 Mar 2008 17:20:23 +0000 Subject: Cart Termination now bypasses Parrying and Energy Coat (bugreport:476) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12425 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/battle.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/map/battle.c b/src/map/battle.c index 80660510f..c43b9be96 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -322,10 +322,10 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i return 0; } -// -- moonsoul (chance to block attacks with new Lord Knight skill parrying) -// - if((sce=sc->data[SC_PARRYING]) && flag&BF_WEAPON && - rand()%100 < sce->val2) { + if((sce=sc->data[SC_PARRYING]) && flag&BF_WEAPON + && skill_num != WS_CARTTERMINATION + && rand()%100 < sce->val2) + {// attack blocked by Parrying clif_skill_nodamage(bl,bl,LK_PARRYING,sce->val1,1); return 0; } @@ -409,7 +409,9 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i sce->val3&flag && sce->val4&flag) damage -= damage*sc->data[SC_ARMOR]->val2/100; - if(sc->data[SC_ENERGYCOAT] && flag&BF_WEAPON){ + if(sc->data[SC_ENERGYCOAT] && flag&BF_WEAPON + && skill_num != WS_CARTTERMINATION) + { struct status_data *status = status_get_status_data(bl); int per = 100*status->sp / status->max_sp -1; //100% should be counted as the 80~99% interval per /=20; //Uses 20% SP intervals. -- cgit v1.2.3-70-g09d2