diff options
| author | Kevin <Kevin@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-04-07 04:55:26 +0000 |
|---|---|---|
| committer | Kevin <Kevin@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-04-07 04:55:26 +0000 |
| commit | 2dccb6282656562bb0a5a7af6b9cd8677dc4e9c6 (patch) | |
| tree | 7ec1eac707376b6329ebf414fde6f61889455795 /src/map | |
| parent | e11ccbba63907baa536f43ca7f9ed79bd5b6ad4f (diff) | |
| download | hercules-2dccb6282656562bb0a5a7af6b9cd8677dc4e9c6.tar.gz hercules-2dccb6282656562bb0a5a7af6b9cd8677dc4e9c6.tar.bz2 hercules-2dccb6282656562bb0a5a7af6b9cd8677dc4e9c6.tar.xz hercules-2dccb6282656562bb0a5a7af6b9cd8677dc4e9c6.zip | |
-Sight rasher now affects the wizard's own and other's icewalls.
-Sight rasher, sight blaster, and arrow shower are now the only three skills that will affect traps.
(bugreport:59)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12516 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/battle.c | 3 | ||||
| -rw-r--r-- | src/map/skill.c | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 16651ef0c..99dff6e31 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3068,7 +3068,8 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f { case HT_REMOVETRAP: case AC_SHOWER: - case WZ_HEAVENDRIVE: + case WZ_SIGHTRASHER: + case WZ_SIGHTBLASTER: state |= BCT_ENEMY; strip_enemy = 0; break; diff --git a/src/map/skill.c b/src/map/skill.c index fd7d3994d..1ba45bbed 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1624,10 +1624,13 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds clif_skillinfoblock(tsd); } } - if (skillid != WZ_HEAVENDRIVE && bl->type == BL_SKILL && damage > 0) { + if (skillid != WZ_SIGHTRASHER && + skillid != WZ_SIGHTBLASTER && + skillid != AC_SHOWER && + bl->type == BL_SKILL && damage > 0) { struct skill_unit* su = (struct skill_unit*)bl; if (su->group && skill_get_inf2(su->group->skill_id)&INF2_TRAP) - damage = 0; //Only Heaven's drive may damage traps. [Skotlex] + damage = 0; //Sight rasher, blaster, and arrow shower may dmg traps. [Kevin] } if (dmg.dmg_lv == ATK_DEF && (type = skill_get_walkdelay(skillid, skilllv)) > 0) @@ -3632,7 +3635,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in status_change_end(src,SC_SIGHT,-1); clif_skill_nodamage(src,bl,skillid,skilllv,1); map_foreachinrange(skill_area_sub,src, - skill_get_splash(skillid, skilllv),splash_target(src), + skill_get_splash(skillid, skilllv),BL_CHAR|BL_SKILL, src,skillid,skilllv,tick, flag|BCT_ENEMY|1, skill_castend_damage_id); break; |