From bacc1d9094c4a11fa66eae8136f72069d9acca7f Mon Sep 17 00:00:00 2001 From: Inkfish Date: Fri, 22 May 2009 08:37:13 +0000 Subject: * Fixed some behaviors of additional effects (bugreport:3100,bugreport:2661) - Coma can now be blocked by such skills as SafetyWall, Pneuma and Basilica. - Equipment breaking behaves exactly like coma. - Skill's self damage may now causes coma, equipment breaking and autospell/autoscript. - GrandCross now allows you to drain hp/sp. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13800 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/battle.c | 34 ---------------------------------- 1 file changed, 34 deletions(-) (limited to 'src/map/battle.c') diff --git a/src/map/battle.c b/src/map/battle.c index 3eced353a..f26a56b89 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2176,40 +2176,6 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo wd.damage += md.damage; } - if (wd.damage || wd.damage2) { - if (sd && battle_config.equip_self_break_rate) - { // Self weapon breaking - int breakrate = battle_config.equip_natural_break_rate; - if (sc) { - if(sc->data[SC_OVERTHRUST]) - breakrate += 10; - if(sc->data[SC_MAXOVERTHRUST]) - breakrate += 10; - } - if (breakrate) - skill_break_equip(src, EQP_WEAPON, breakrate, BCT_SELF); - } - //Cart Termination/Tomahawk won't trigger breaking data. Why? No idea, go ask Gravity. - if (battle_config.equip_skill_break_rate && skill_num != WS_CARTTERMINATION && skill_num != ITM_TOMAHAWK) - { // Target equipment breaking - int breakrate[2] = {0,0}; // weapon = 0, armor = 1 - if (sd) { // Break rate from equipment - breakrate[0] += sd->break_weapon_rate; - breakrate[1] += sd->break_armor_rate; - } - if (sc) { - if (sc->data[SC_MELTDOWN]) { - breakrate[0] += sc->data[SC_MELTDOWN]->val2; - breakrate[1] += sc->data[SC_MELTDOWN]->val3; - } - } - if (breakrate[0]) - skill_break_equip(target, EQP_WEAPON, breakrate[0], BCT_ENEMY); - if (breakrate[1]) - skill_break_equip(target, EQP_ARMOR, breakrate[1], BCT_ENEMY); - } - } - //SG_FUSION hp penalty [Komurka] if (sc && sc->data[SC_FUSION]) { -- cgit v1.2.3-70-g09d2