diff options
| author | shadow <shadow@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-07-03 02:18:44 +0000 |
|---|---|---|
| committer | shadow <shadow@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-07-03 02:18:44 +0000 |
| commit | f02e49e2f48c7aa316bffce2ec51357e9e869b7c (patch) | |
| tree | a132b9b00e308e26002a13e872c949c15ca41e8f /src/map/skill.c | |
| parent | 747b5c7474ac2d42f7242dfb3baeb46d5450a2ed (diff) | |
| download | hercules-f02e49e2f48c7aa316bffce2ec51357e9e869b7c.tar.gz hercules-f02e49e2f48c7aa316bffce2ec51357e9e869b7c.tar.bz2 hercules-f02e49e2f48c7aa316bffce2ec51357e9e869b7c.tar.xz hercules-f02e49e2f48c7aa316bffce2ec51357e9e869b7c.zip | |
Fixes regarding bugreport:1727 (undead element/race skill behaviors) follow up on revisions r12820 r12821 and r12822
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12903 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 758aa6fd2..f106ebd57 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -609,7 +609,8 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int case CR_GRANDCROSS: case NPC_GRANDDARKNESS: - if(tstatus->race == RC_UNDEAD || tstatus->race == RC_DEMON) + //Chance to cause blind status vs demon and undead element, but not against players + if(!dstsd && (battle_check_undead(tstatus->race,tstatus->def_ele) || tstatus->race == RC_DEMON)) sc_start(bl,SC_BLIND,100,skilllv,skill_get_time2(skillid,skilllv)); break; @@ -6817,7 +6818,8 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns break; case UNT_EVILLAND: - if (tstatus->race!=RC_UNDEAD && tstatus->race!=RC_DEMON) + //Will heal demon and undead element monsters, but not players. + if (bl->type != BL_PC && !battle_check_undead(tstatus->race, tstatus->def_ele) && tstatus->race!=RC_DEMON) { //Damage enemies if(battle_check_target(&src->bl,bl,BCT_ENEMY)>0) skill_attack(BF_MISC, ss, &src->bl, bl, sg->skill_id, sg->skill_lv, tick, 0); |