summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParadox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-05-30 10:29:34 +0000
committerParadox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-05-30 10:29:34 +0000
commitb41cff9662f5a5095aba9460474c601fde2637d8 (patch)
treeeb76cdad19f9634f118d00fe0508ea4fdace34d0
parent0f670e5a6e960a8d06fc8f9f15440851c935411d (diff)
downloadhercules-b41cff9662f5a5095aba9460474c601fde2637d8.tar.gz
hercules-b41cff9662f5a5095aba9460474c601fde2637d8.tar.bz2
hercules-b41cff9662f5a5095aba9460474c601fde2637d8.tar.xz
hercules-b41cff9662f5a5095aba9460474c601fde2637d8.zip
Damaged reflected from skills will now be shown as multiple hits if the skill used was multi-hit.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14314 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/skill.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 9bac27295..0d374fe5e 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2010/05/30
+ * Damaged reflected from skills will now be shown as multiple hits if the skill used was multi-hit. [Paradox924X]
2010/05/29
* Rev. 14313 Added a pc_isdead check to warpparty. Only warp and mapwarp (moveto, warpallpcinthemap, and warpwaitingpc aegis script equivilents) should revive players when placing them on new maps. [L0ne_W0lf]
* Rewrote/optimized script command warpparty. [Paradox924X]
diff --git a/src/map/skill.c b/src/map/skill.c
index b23a96007..4c34094b1 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1948,7 +1948,7 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds
battle_delay_damage(tick, dmg.amotion,bl,src,0,0,0,rdamage,ATK_DEF,0);
else
status_fix_damage(bl,src,rdamage,0);
- clif_damage(src,src,tick, dmg.amotion,0,rdamage,1,4,0);
+ clif_damage(src,src,tick, dmg.amotion,0,rdamage,dmg.div_>1?dmg.div_:1,4,0);
//Use Reflect Shield to signal this kind of skill trigger. [Skotlex]
if( tsd && src != bl )
battle_drain(tsd, src, rdamage, rdamage, sstatus->race, is_boss(src));