From bc3b30a2d32cd17836b63fae8fe0a44150d71866 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Wed, 1 Oct 2008 12:27:51 +0000 Subject: [PATCH] Kaupe will now trigger from mobs, homuns and mercenaries, as well. (bugreport:2297) git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13252 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 1 + src/map/battle.c | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index bd6742abac..43c34cd9aa 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2008/10/01 + * Rev. 13252 Kaupe will now trigger from mobs, homuns and mercenaries, as well. (bugreport:2297) [L0ne_W0lf] * Rev. 13251 Removed 'casttime' adjustment from offensive ressurection. Follow up to r13225. [L0ne_W0lf] * Kaahi will now override override higher existing levels previously casted. (bugreport:2296) 2008/09/27 diff --git a/src/map/battle.c b/src/map/battle.c index d671be45eb..850a0aea97 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -363,10 +363,8 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i if(sc->data[SC_TATAMIGAESHI] && (flag&(BF_MAGIC|BF_LONG)) == BF_LONG) return 0; - if((sce=sc->data[SC_KAUPE]) && - rand()%100 < sce->val2 && - (src->type == BL_PC || !skill_num)) - { //Kaupe only blocks all skills of players. + if((sce=sc->data[SC_KAUPE]) && rand()%100 < sce->val2) + { //Kaupe blocks damage (skill or otherwise) from players, mobs, homuns, mercenaries. clif_specialeffect(bl, 462, AREA); //Shouldn't end until Breaker's non-weapon part connects. if (skill_num != ASC_BREAKER || !(flag&BF_WEAPON))