Magnum Break will now affect traps. See (r12516).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12517 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Kevin 2008-04-07 04:59:46 +00:00
parent 9320f89d09
commit bb63504c0f
2 changed files with 3 additions and 1 deletions

View File

@ -3070,6 +3070,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
case AC_SHOWER: case AC_SHOWER:
case WZ_SIGHTRASHER: case WZ_SIGHTRASHER:
case WZ_SIGHTBLASTER: case WZ_SIGHTBLASTER:
case SM_MAGNUM:
state |= BCT_ENEMY; state |= BCT_ENEMY;
strip_enemy = 0; strip_enemy = 0;
break; break;

View File

@ -1627,6 +1627,7 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds
if (skillid != WZ_SIGHTRASHER && if (skillid != WZ_SIGHTRASHER &&
skillid != WZ_SIGHTBLASTER && skillid != WZ_SIGHTBLASTER &&
skillid != AC_SHOWER && skillid != AC_SHOWER &&
skillid != SM_MAGNUM &&
bl->type == BL_SKILL && damage > 0) { bl->type == BL_SKILL && damage > 0) {
struct skill_unit* su = (struct skill_unit*)bl; struct skill_unit* su = (struct skill_unit*)bl;
if (su->group && skill_get_inf2(su->group->skill_id)&INF2_TRAP) 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. //Passive Magnum, should had been casted on yourself.
case SM_MAGNUM: case SM_MAGNUM:
skill_area_temp[1] = 0; 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); src,skillid,skilllv,tick, flag|BCT_ENEMY|1, skill_castend_damage_id);
clif_skill_nodamage (src,src,skillid,skilllv,1); clif_skill_nodamage (src,src,skillid,skilllv,1);
//Initiate 10% of your damage becomes fire element. //Initiate 10% of your damage becomes fire element.