From b8bec28b62db49329ca30bf5d04b37c40cb147ea Mon Sep 17 00:00:00 2001 From: skotlex Date: Thu, 16 Nov 2006 15:09:05 +0000 Subject: - Shadow Jump and Kirikage won't "move" you if you use them in GvG grounds. Fixed Kirikage so it first warps you, and then you unhide. - Corrected Zeny Nage so the Zeny spent on the attack is always the exact same value as the damage you are dealing. Also corrected it so it does half damage when used on players. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9229 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/skill.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/map/skill.c') diff --git a/src/map/skill.c b/src/map/skill.c index aa79bf71d..4b077fb1a 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -3141,14 +3141,15 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int sc_start(src,SC_HIDING,100,skilllv,skill_get_time(skillid,skilllv)); break; case NJ_KIRIKAGE: - { + if (!map_flag_gvg(src->m)) + { //You don't move on GVG grounds. short x, y; map_search_freecell(bl, 0, &x, &y, 1, 1, 0); - status_change_end(src, SC_HIDING, -1); if (unit_movepos(src, x, y, 0, 0)) clif_slide(src,src->x,src->y); - skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,flag); } + status_change_end(src, SC_HIDING, -1); + skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,flag); break; case 0: if(sd) { @@ -6077,9 +6078,11 @@ int skill_castend_pos2 (struct block_list *src, int x, int y, int skillid, int s break; case NJ_SHADOWJUMP: { - unit_movepos(src, x, y, 1, 0); - clif_slide(src,x,y); - + if (!map_flag_gvg(src->m)) + { //You don't move on GVG grounds. + unit_movepos(src, x, y, 1, 0); + clif_slide(src,x,y); + } if (sc && sc->data[SC_HIDING].timer != -1) status_change_end(src, SC_HIDING, -1); } -- cgit v1.2.3-70-g09d2