-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

3 files changed, 11 insertions, 4 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index ec3b6effe..330894a5c 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,9 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2008/04/06
+	* Sight rasher now affects the wizard's own and other's icewalls. (r12516) [Kevin]
+	* Sight rasher, sight blaster, and arrow shower are now the only
+	- three skills that will affect traps. (r12516) [Kevin]
 	* NPC earthquake now divides the atk2 bonus between players. (r12514) [Kevin]
 	* Changed guild skills restore, regen, and battle order to only affect BL_PC. (r12513) [Kevin]
 	* Reverted one of the changes in dynamic mobs that may
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;