summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVicious <Vicious@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-27 19:45:08 +0000
committerVicious <Vicious@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-27 19:45:08 +0000
commit16363d4263bdd3cf7f1030db96796c3b67335a99 (patch)
treed9f8d092e195240a5ed0f26217937d5bf7106b60
parent148161601425b067ec57ab6e035effa6928bb26e (diff)
downloadhercules-16363d4263bdd3cf7f1030db96796c3b67335a99.tar.gz
hercules-16363d4263bdd3cf7f1030db96796c3b67335a99.tar.bz2
hercules-16363d4263bdd3cf7f1030db96796c3b67335a99.tar.xz
hercules-16363d4263bdd3cf7f1030db96796c3b67335a99.zip
some jA thing
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5776 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--db/skill_unit_db.txt11
-rw-r--r--src/map/skill.c15
2 files changed, 18 insertions, 8 deletions
diff --git a/db/skill_unit_db.txt b/db/skill_unit_db.txt
index c615b30be..7ac5f8ed9 100644
--- a/db/skill_unit_db.txt
+++ b/db/skill_unit_db.txt
@@ -82,8 +82,9 @@
409,0xb2, , 0,-1, -1,noone, 0x000 //WE_CALLBABY
410,0xb2, , 0,-1, -1,noone, 0x000 //WE_CALLPARENT
484,0xb8, , 2, 0,1000,enemy, 0x808 //HW_GRAVITATION
-488,0xb9, , 3, 0, -1,all, 0x000 //CG_HERMODE
-535,0xba, , 2, 0,1000,enemy, 0x008 //NJ_KAENSIN#NJ_KAENSIN#
-538,0x9b, , 1:1:1:2:2:2:3:3:3:4, 0, -1,all, 0x000 //NJ_SUITON#NJ_SUITON#
-539,0x86, , 3, 0,1000,enemy, 0x008 //NJ_HYOUSYOURAKU#NJ_HYOUSYOURAKU#
-541,0x86,,2:2:3:3:4,0,1000,enemy,0x008 //NJ_RAIGEKISAI#NJ_RAIGEKISAI#
+488,0xb9, , 3, 0, -1,all, 0x100 //CG_HERMODE
+516,0xbc, , 0, 3,1000,enemy,0x000,GS_DESPERADO#デスペラード
+521,0xbd, , 0, 1,1000,enemy,0x006,GS_GROUNDDRIFT#グラウンドドリフト
+535,0x86, , 0, 2,2000,enemy,0x008,NJ_KAENSIN#火炎陣#
+536,0x86, , 0, 2, 300,enemy,0x008,NJ_BAKUENRYU#爆炎龍#
+538,0xbb,,1:1:1:2:2:2:3:3:3:4,0, -1,all,0x010,NJ_SUITON#水遁# \ No newline at end of file
diff --git a/src/map/skill.c b/src/map/skill.c
index d6ca85447..b78054491 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -3172,7 +3172,11 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
return skill_castend_pos2(src,src->x,src->y,skillid,skilllv,tick,0);
//Until they're at right position - gs_ground- [Vicious]
- case NJ_KAENSIN:
+ case NJ_KAENSIN: /*火炎陣*/
+ case GS_DESPERADO: /*デスペラード*/
+ return skill_castend_pos2(src,src->x,src->y,skillid,skilllv,tick,0);
+ break;
+
case NJ_HYOUSYOURAKU:
case NJ_RAIGEKISAI:
return skill_castend_pos2(src,src->x,src->y,skillid,skilllv,tick,0);
@@ -6081,8 +6085,13 @@ int skill_castend_pos2( struct block_list *src, int x,int y,int skillid,int skil
break;
//Until they're at right position - gs_unit- [Vicious]
- case NJ_KAENSIN:
- case NJ_BAKUENRYU:
+ case GS_DESPERADO: /* デスペラード*/
+ case GS_GROUNDDRIFT: /* グラウンドドリフト*/
+ case NJ_KAENSIN: /* 火炎陣*/
+ case NJ_BAKUENRYU: /* 爆炎龍*/
+ skill_unitsetting(src,skillid,skilllv,x,y,0);
+ break;
+
case NJ_HYOUSYOURAKU:
skill_unitsetting(src,skillid,skilllv,x,y,0);
break;