summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKevin <Kevin@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-07 04:59:46 +0000
committerKevin <Kevin@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-07 04:59:46 +0000
commitbb0522001e835ead594ca80c386c2d10db7fe124 (patch)
tree6cf49b0b88c1b946984893d3f06cdcf4e3afbc20 /src
parent2dccb6282656562bb0a5a7af6b9cd8677dc4e9c6 (diff)
downloadhercules-bb0522001e835ead594ca80c386c2d10db7fe124.tar.gz
hercules-bb0522001e835ead594ca80c386c2d10db7fe124.tar.bz2
hercules-bb0522001e835ead594ca80c386c2d10db7fe124.tar.xz
hercules-bb0522001e835ead594ca80c386c2d10db7fe124.zip
Magnum Break will now affect traps. See (r12516).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12517 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/battle.c1
-rw-r--r--src/map/skill.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 99dff6e31..1c52cbd4b 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3070,6 +3070,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
case AC_SHOWER:
case WZ_SIGHTRASHER:
case WZ_SIGHTBLASTER:
+ case SM_MAGNUM:
state |= BCT_ENEMY;
strip_enemy = 0;
break;
diff --git a/src/map/skill.c b/src/map/skill.c
index 1ba45bbed..cd2b5fc4d 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1627,6 +1627,7 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds
if (skillid != WZ_SIGHTRASHER &&
skillid != WZ_SIGHTBLASTER &&
skillid != AC_SHOWER &&
+ skillid != SM_MAGNUM &&
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)
@@ -3264,7 +3265,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
//Passive Magnum, should had been casted on yourself.
case SM_MAGNUM:
skill_area_temp[1] = 0;
- map_foreachinrange(skill_area_sub, src, skill_get_splash(skillid, skilllv), splash_target(src),
+ map_foreachinrange(skill_area_sub, src, skill_get_splash(skillid, skilllv), BL_SKILL|BL_CHAR,
src,skillid,skilllv,tick, flag|BCT_ENEMY|1, skill_castend_damage_id);
clif_skill_nodamage (src,src,skillid,skilllv,1);
//Initiate 10% of your damage becomes fire element.