summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-07-07 10:54:21 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-07-07 10:54:21 +0000
commit0cd74db12dfb1bf98de19134ca7760182ecc2384 (patch)
treea7467d2728af7f1561396e0479d26f00845209a6
parentb047d84cd4edb22e1ab61d8054d69a120e9938a5 (diff)
downloadhercules-0cd74db12dfb1bf98de19134ca7760182ecc2384.tar.gz
hercules-0cd74db12dfb1bf98de19134ca7760182ecc2384.tar.bz2
hercules-0cd74db12dfb1bf98de19134ca7760182ecc2384.tar.xz
hercules-0cd74db12dfb1bf98de19134ca7760182ecc2384.zip
Skills that have multiple hits should do 1 damage per hit to plants.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13938 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/battle.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 822a81e1c..89e9738f3 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.
+09/07/07
+ * Skills with multiple hits should do 1 damage per hit to plants. [Inkfish]
09/07/04
* TK_POWER shouldn't count the player him/herself for the skill. [Inkfish]
* Fixed a wrong check of Intimidate on hp. (bugreport:3305)[Inkfish]
diff --git a/src/map/battle.c b/src/map/battle.c
index a5c17be30..221c2c2de 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2088,9 +2088,9 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
if( flag.infdef )
{ //Plants receive 1 damage when hit
if( flag.hit || wd.damage > 0 )
- wd.damage = 1; // In some cases, right hand no need to have a weapon to increase damage
+ wd.damage = wd.div_; // In some cases, right hand no need to have a weapon to increase damage
if( flag.lh && (flag.hit || wd.damage2 > 0) )
- wd.damage2 = 1;
+ wd.damage2 = wd.div_;
if( !(battle_config.skill_min_damage&1) )
//Do not return if you are supposed to deal greater damage to plants than 1. [Skotlex]
return wd;