From cb1d2d92afbf8d9ebec4c9290a180835ad5dae78 Mon Sep 17 00:00:00 2001 From: skotlex Date: Thu, 3 Aug 2006 14:39:38 +0000 Subject: - Cleaned up the last NJ update code. - Added @ command `charspeed` - Fixed @jailfor using MAP_PRONTERA as jail instead of MAP_JAIL - Removed case for GS_SPREADATTACK on damage packets to see if the skill displays correctly now. - Corrected Deluge/Volcano/V. Gale overlaps so that the placing tiles are removed, NOT the ones who were already placed. - Made SC_SPEEDUP0 and SC_SPEEDUP1 use different icon IDs, to fix icon-confusion when both are enabled at a time. - Mob rude-attacked count is not reset now on picking a new char (gotta investigate this further) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8096 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/battle.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/map/battle.c') diff --git a/src/map/battle.c b/src/map/battle.c index 4a84744d1..225cc9670 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -325,13 +325,13 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i if(sc->data[SC_UTSUSEMI].timer != -1 && !skill_num) { clif_skill_nodamage(bl,bl,NJ_UTSUSEMI,1,1); - skill_blown (src, bl, sc->data[SC_UTSUSEMI].val3|(map_calc_dir(bl,src->x,src->y)<<20)); + skill_blown (src, bl, sc->data[SC_UTSUSEMI].val3); if (--sc->data[SC_UTSUSEMI].val2 <= 0) status_change_end(bl, SC_UTSUSEMI, -1); return 0; } - if(sc->data[SC_BUNSINJYUTSU].timer != -1 && (flag&BF_WEAPON || flag&BF_MISC) ) + if(sc->data[SC_BUNSINJYUTSU].timer != -1 && (flag&(BF_WEAPON|BF_MISC)) ) { clif_skill_nodamage(bl,bl,NJ_BUNSINJYUTSU,1,1); if (--sc->data[SC_BUNSINJYUTSU].val2 <= 0) @@ -340,7 +340,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i } //Now damage increasing effects - if(sc->data[SC_AETERNA].timer!=-1 && skill_num != PA_PRESSURE && skill_num != PF_SOULBURN && skill_num != NJ_ZENYNAGE){ + if(sc->data[SC_AETERNA].timer!=-1 && skill_num != PA_PRESSURE && skill_num != PF_SOULBURN){ damage<<=1; status_change_end( bl,SC_AETERNA,-1 ); } -- cgit v1.2.3-70-g09d2