Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes Palm Push Strike to push characters in Safety Wall - bugreport:7500

Browse Source 
Ventus - Zephyr (defensive state) no longer nullifies magic damage - bugreport:7506

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17244 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
akinari1087 2013-04-10 07:03:07 +00:00
parent a08015cb16
commit 0ccd53156b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/map/battle.c
View File

@ -793,7 +793,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,struct Damag
} }
if(sc->data[SC_ZEPHYR] && if(sc->data[SC_ZEPHYR] &&
flag&(BF_LONG|BF_SHORT)){ flag&(BF_LONG|BF_SHORT) == (BF_SHORT|BF_LONG)){
d->dmg_lv = ATK_BLOCK; d->dmg_lv = ATK_BLOCK;
return 0; return 0;
} }

4
src/map/skill.c
View File

@ -3374,6 +3374,10 @@ static int skill_timerskill(int tid, unsigned int tick, int id, intptr_t data)
( sc && sc->option&OPTION_HIDE ) ){ ( sc && sc->option&OPTION_HIDE ) ){
skill_blown(src,target,skill_get_blewcount(skl->skill_id, skl->skill_lv), -1, 0x0 ); skill_blown(src,target,skill_get_blewcount(skl->skill_id, skl->skill_lv), -1, 0x0 );
break; break;
} else if( tsc && tsc->data[SC_SAFETYWALL] ){
skill_attack(skl->type,src,src,target,skl->skill_id,skl->skill_lv,tick,skl->flag);
skill_blown(src,target,skill_get_blewcount(skl->skill_id, skl->skill_lv), -1, 0x0 );
break;
} }
} }
default: default: