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

- Merged the code of NJ_SHADOWJUMP with TK_JUMPKICK.

Browse Source 
- Moved the hiding requirement to the skill_require_db.txt as it should be.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6403 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-04-30 17:20:31 +00:00
parent 03db04332b
commit 0c0fe1e647
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/skill_require_db.txt
View File

@ -415,7 +415,7 @@
526,0,0,50,0,0,0,0,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NJ_ZENYNAGE
527,0,0,40,0,0,0,0,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NJ_TATAMIGAESHI
528,0,0,10:12:14:16:18:20:22:24:26:28,0,0,0,0,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NJ_KASUMIKIRI
529,0,0,40,0,0,0,0,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NJ_SHADOWJUMP
529,0,0,40,0,0,0,0,0,0,hiding,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NJ_SHADOWJUMP
530,0,0,14:16:18:20:22,0,0,0,0,0,0,hiding,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NJ_KIRIKAGE
531,0,0,12:15:18:21:24,0,0,0,0,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NJ_UTSUSEMI
532,0,0,30:32:34:36:38:40:42:44:46:48,0,0,0,0,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NJ_BUNSINJYUTSU

22
src/map/skill.c
View File

@ -2577,12 +2577,14 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl,int s
skill_get_splash(skillid, skilllv), BL_CHAR,
BF_WEAPON, src, src, skillid, skilllv, tick, flag, BCT_ENEMY);
break;
case NJ_SHADOWJUMP: //[blackhole89]
case TK_JUMPKICK:
{
short x, y;
x = bl->x;
y = bl->y;
if (!unit_can_move(src))
if (skillid == TK_JUMPKICK && !unit_can_move(src))
break;
if (src->x < bl->x) x--;
else if (src->x > bl->x) x++;
@ -2590,7 +2592,8 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl,int s
else if (src->y > bl->y) y++;
if (map_getcell(bl->m, x, y, CELL_CHKNOPASS))
{ x = bl->x; y = bl->y; }
skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,flag);
if (skillid == TK_JUMPKICK)
skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,flag);
if (unit_movepos(src, x, y, 0, 0))
clif_slide(src,src->x,src->y);
break;
@ -4695,21 +4698,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
skill_blown(src,bl,skill_get_blewcount(skillid,skilllv)|0x10000);
break;
case NJ_SHADOWJUMP: //[blackhole89]
{
if (sd && !(sd->sc.count && sd->sc.data[SC_HIDING].timer != -1)) {
map_freeblock_unlock();
return 1;
}
clif_skill_nodamage(src,src,NJ_SHADOWJUMP,skilllv,1);
if(map_getcell(src->m,x,y,CELL_CHKPASS)) {
unit_movepos(src, x, y, 1, 0);
clif_slide(src,x,y);
}
}
break;
case TK_HIGHJUMP:
{
int x,y, dir = unit_getdir(src);