summaryrefslogtreecommitdiff
path: root/src/map/skill.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-23 13:51:42 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-23 13:51:42 +0000
commit32eac40604b05dc7bc872b0b8a53ab626bd4a060 (patch)
treef4ad544c37f2a54572399e912c4b97567df6ce5a /src/map/skill.c
parent5523bd56dc2b7bdafa3400d58ef2287799cc94da (diff)
downloadhercules-32eac40604b05dc7bc872b0b8a53ab626bd4a060.tar.gz
hercules-32eac40604b05dc7bc872b0b8a53ab626bd4a060.tar.bz2
hercules-32eac40604b05dc7bc872b0b8a53ab626bd4a060.tar.xz
hercules-32eac40604b05dc7bc872b0b8a53ab626bd4a060.zip
- Corrected clif parse name request failing on disguised characters.
- Corrected Soul Drain draining from all non-ground-based skills including non-magic attacks. - Corrected pc_setoption to change the option and then change class. changing option-wedding will automatically convert the view-class as well. - Corrected the 15% drop rate increase when killing higher level mobs in pk-mode triggering for all mobs with lower level than yourself. Thanks to Vayu. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6709 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
-rw-r--r--src/map/skill.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index c122b2dd2..e058efcc2 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1455,7 +1455,10 @@ int skill_counter_additional_effect (struct block_list* src, struct block_list *
}
}
- if(sd && bl->type == BL_MOB && status_isdead(bl) && skill_get_inf(skillid)!=INF_GROUND_SKILL && (rate=pc_checkskill(sd,HW_SOULDRAIN))>0)
+ if(sd && bl->type == BL_MOB && status_isdead(bl) &&
+ skillid && skill_get_type(skillid)==BF_MAGIC &&
+ skill_get_inf(skillid)!=INF_GROUND_SKILL &&
+ (rate=pc_checkskill(sd,HW_SOULDRAIN))>0)
{ //Soul Drain should only work on targetted spells [Skotlex]
int sp;
if (pc_issit(sd)) pc_setstand(sd); //Character stuck in attacking animation while 'sitting' fix. [Skotlex]