summaryrefslogtreecommitdiff
path: root/src/map/skill.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-10-19 16:47:30 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-10-19 16:47:30 +0000
commit5e17d1a084598a12fd1872f8c8c9965ecaed6592 (patch)
treee77d97dfddd8688ebd1433f575e3257654c8eb8c /src/map/skill.c
parent11e47ab6ff3d3ba751bf111d0c1948ac23dbb313 (diff)
downloadhercules-5e17d1a084598a12fd1872f8c8c9965ecaed6592.tar.gz
hercules-5e17d1a084598a12fd1872f8c8c9965ecaed6592.tar.bz2
hercules-5e17d1a084598a12fd1872f8c8c9965ecaed6592.tar.xz
hercules-5e17d1a084598a12fd1872f8c8c9965ecaed6592.zip
- Corrected a compilation error.
- Fixed SG_FRIEND, it should be triggering when Monks do Combo Finish (not triple blows), and the trigger rate increase should be based on your known level of SG_FRIEND, NOT TK_COUNTER. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9013 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
-rw-r--r--src/map/skill.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index d9af46f18..84c174788 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1934,8 +1934,6 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds
switch(skillid)
{
case MO_TRIPLEATTACK:
- if (sd->status.party_id>0) //bonus from SG_FRIEND [Komurka]
- party_skill_check(sd, sd->status.party_id, MO_TRIPLEATTACK, skilllv);
if (pc_checkskill(sd, MO_CHAINCOMBO) > 0)
flag=1;
break;
@@ -1944,6 +1942,8 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds
flag=1;
break;
case MO_COMBOFINISH:
+ if (sd->status.party_id>0) //bonus from SG_FRIEND [Komurka]
+ party_skill_check(sd, sd->status.party_id, MO_COMBOFINISH, skilllv);
if (pc_checkskill(sd, CH_TIGERFIST) > 0 && sd->spiritball > 0)
flag=1;
case CH_TIGERFIST: