summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-10-01 12:27:51 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-10-01 12:27:51 +0000
commit87d0d703b3133c2c8a3d6f6fa8ec14ed8aeb19a7 (patch)
tree3282213ae9c480df8d3960b0345e90c915f85c97
parent517031c26c79c6375120c73a2e16fc129428f10b (diff)
downloadhercules-87d0d703b3133c2c8a3d6f6fa8ec14ed8aeb19a7.tar.gz
hercules-87d0d703b3133c2c8a3d6f6fa8ec14ed8aeb19a7.tar.bz2
hercules-87d0d703b3133c2c8a3d6f6fa8ec14ed8aeb19a7.tar.xz
hercules-87d0d703b3133c2c8a3d6f6fa8ec14ed8aeb19a7.zip
Kaupe will now trigger from mobs, homuns and mercenaries, as well. (bugreport:2297)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13252 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/battle.c6
2 files changed, 3 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index bd6742aba..43c34cd9a 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 d671be45e..850a0aea9 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))