summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorcelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-02-16 12:46:21 +0000
committercelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-02-16 12:46:21 +0000
commitd704f26907c104336bc47fde4e27448dcfa38444 (patch)
treecda6f3758af8c7ba80d0c125039f89a8eae87d17 /src/map/battle.c
parent4431323e09b1ab9875ea8ac67f0ecd1b36420559 (diff)
downloadhercules-d704f26907c104336bc47fde4e27448dcfa38444.tar.gz
hercules-d704f26907c104336bc47fde4e27448dcfa38444.tar.bz2
hercules-d704f26907c104336bc47fde4e27448dcfa38444.tar.xz
hercules-d704f26907c104336bc47fde4e27448dcfa38444.zip
Added 3 more of the new card effects
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1117 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c28
1 files changed, 22 insertions, 6 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 35b1d2737..634b04a70 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2365,6 +2365,19 @@ static struct Damage battle_calc_pc_weapon_attack(
}
t_def = def2*8/10;
vitbonusmax = (t_vit/20)*(t_vit/20)-1;
+ if (tmd) {
+ if(t_mode & 0x20) {
+ if(sd->ignore_def_mob & 2)
+ idef_flag = 1;
+ if(sd->ignore_def_mob_ & 2)
+ idef_flag_ = 1;
+ } else {
+ if(sd->ignore_def_mob & 1)
+ idef_flag = 1;
+ if(sd->ignore_def_mob_ & 1)
+ idef_flag_ = 1;
+ }
+ }
if(sd->ignore_def_ele & (1<<t_ele) || sd->ignore_def_race & (1<<t_race))
idef_flag = 1;
if(sd->ignore_def_ele_ & (1<<t_ele) || sd->ignore_def_race_ & (1<<t_race))
@@ -3598,19 +3611,22 @@ int battle_weapon_attack( struct block_list *src,struct block_list *target,
if(skilllv < 1) skilllv = 1;
sp = skill_get_sp(tsd->autospell2_id,skilllv)*2/3;
if(tsd->status.sp >= sp) {
+ struct block_list *tbl;
+ if (tsd->autospell2_type == 0) tbl = target;
+ else tbl = src;
if((i=skill_get_inf(tsd->autospell2_id) == 2) || i == 32)
- f = skill_castend_pos2(target,src->x,src->y,tsd->autospell2_id,skilllv,tick,flag);
+ f = skill_castend_pos2(target,tbl->x,tbl->y,tsd->autospell2_id,skilllv,tick,flag);
else {
switch( skill_get_nk(tsd->autospell2_id) ) {
case 0: case 2:
- f = skill_castend_damage_id(target,src,tsd->autospell2_id,skilllv,tick,flag);
+ f = skill_castend_damage_id(target,tbl,tsd->autospell2_id,skilllv,tick,flag);
break;
case 1:/* Žx‰‡Œn */
- if((tsd->autospell2_id==AL_HEAL || (tsd->autospell2_id==ALL_RESURRECTION && src->type != BL_PC)) &&
- battle_check_undead(status_get_race(src),status_get_elem_type(src)))
- f = skill_castend_damage_id(target,src,tsd->autospell2_id,skilllv,tick,flag);
+ if((tsd->autospell2_id==AL_HEAL || (tsd->autospell2_id==ALL_RESURRECTION && tbl->type != BL_PC)) &&
+ battle_check_undead(status_get_race(tbl),status_get_elem_type(tbl)))
+ f = skill_castend_damage_id(target,tbl,tsd->autospell2_id,skilllv,tick,flag);
else
- f = skill_castend_nodamage_id(target,src,tsd->autospell2_id,skilllv,tick,flag);
+ f = skill_castend_nodamage_id(target,tbl,tsd->autospell2_id,skilllv,tick,flag);
break;
}
}