summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-07-04 11:29:36 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-07-04 11:29:36 +0000
commit115c213a4004195917272597764dd5dc96654f78 (patch)
tree470c73322bb2a964cb0d838efb56e9a88f235abe
parent7c3e5c8d6b6a6609645ed9974c4e6adf590534d0 (diff)
downloadhercules-115c213a4004195917272597764dd5dc96654f78.tar.gz
hercules-115c213a4004195917272597764dd5dc96654f78.tar.bz2
hercules-115c213a4004195917272597764dd5dc96654f78.tar.xz
hercules-115c213a4004195917272597764dd5dc96654f78.zip
TK_POWER shouldn't count the player him/herself for the skill.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13931 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 e718ecf46..5611c57f4 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/04
+ * TK_POWER shouldn't count the player him/herself for the skill. [Inkfish]
09/07/03
* Martyr's Reckoning can be perfect dodged. [Inkfish]
* Casting Flying Kick while running and in the spurt status doubles the damage dealt without spurt status. (bugreport:1898) [Inkfish]
diff --git a/src/map/battle.c b/src/map/battle.c
index 68d04d135..cfeeeb095 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -1359,8 +1359,8 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
ATK_ADDRATE(sd->crit_atk_rate);
if(sd->status.party_id && (skill=pc_checkskill(sd,TK_POWER)) > 0){
- i = party_foreachsamemap(party_sub_count, sd, 0);
- ATK_ADDRATE(2*skill*i);
+ if( (i = party_foreachsamemap(party_sub_count, sd, 0)) > 1 ) // exclude the player himself [Inkfish]
+ ATK_ADDRATE(2*skill*i);
}
}
break;