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

Saycyber21's NJ work

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7529 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Vicious 2006-07-05 02:11:07 +00:00
parent a11c84d4b1
commit 3bbd24f7fc
6 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/07/04
* Implemented Saycyber21's some NJ work. Untested. :D [Vicious]
* Implemented cooking chances. Chance of success is 70% - 7*(dish-lv)% +
12*(cooking set-lv)%. Exception: When using the legendary cooking set,
success chance is 100% regardless of dish. [Skotlex]

2
db/skill_cast_db.txt
View File

@ -884,7 +884,7 @@
//-- NJ_ZENYNAGE
526,0,5000,0,0,0
//-- NJ_TATAMIGAESHI
527,0,0,0,3000,0
527,0,3000,3000,3000,3000
//-- NJ_KASUMIKIRI
528,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0
//-- NJ_SHADOWJUMP

2
db/skill_db.txt
View File

@ -557,7 +557,7 @@
533,0,0,0,0,0,0,10,0,no,0,0,0,none,0 //NJ_NINPOU#NJ_NINPOU#
534,9,8,1,3,0,0,10,1:2:3:4:5:6:7:8:9:10,no,0,0,0,magic,0 //NJ_KOUENKA#NJ_KOUENKA#
535,0,8,4,3,0,2,10,5:5:6:6:7:7:8:8:9:9,no,0,0,0,magic,0 //NJ_KAENSIN#NJ_KAENSIN#
536,9,8,2,3,0,2,5,3,no,0,0,0,magic,0 //NJ_BAKUENRYU#NJ_BAKUENRYU#
536,9,8,1,3,1,2,5,3,no,0,0,0,magic,0 //NJ_BAKUENRYU#NJ_BAKUENRYU#
537,9,8,1,1,0,0,10,1:2:3:4:5:6:7:7:7:7,no,0,0,0,magic,0 //NJ_HYOUSENSOU#NJ_HYOUSENSOU#
538,2,6,2,0,1,0,10,1,no,0,0,0,magic,0 //NJ_SUITON#NJ_SUITON#
539,0,6,4,1,0,3,5,1,no,0,0,0,magic,0 //NJ_HYOUSYOURAKU#NJ_HYOUSYOURAKU#

12
db/skill_unit_db.txt
View File

@ -79,7 +79,6 @@
339,0x86, , -1, 0, 400,enemy, 0x000 //NPC_DARKGRANDCROSS#闇グランドクロス
362,0xb4, , 0, 3, -1,all, 0x000 //HP_BASILICA#バジリカ
369,0xb3, , -1, 0,10000,all, 0x000 //PA_GOSPEL#ゴスペル
404,0xb6, , -1, 0, -1,all, 0x000 //PF_FOGWALL#フォグウォール
405,0xb7, , 0, 1,1000,enemy, 0x000 //PF_SPIDERWEB#スパイダーウェッブ
409,0xb2, , 0,-1, -1,noone, 0x000 //WE_CALLBABY
@ -89,9 +88,10 @@
430,0x86, , 0, 1, 500,enemy, 0x000 //SG_STAR_WARM
484,0xb8, , 2, 0,1000,enemy, 0x808 //HW_GRAVITATION
488,0xb9, , 3, 0, -1,all, 0x200 //CG_HERMODE
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#水遁#
516,0xbc, , 0, 3, 100,enemy,0x000,GS_DESPERADO#デスペラード
521,0xc2, , 0, 1,1000,enemy,0x006,GS_GROUNDDRIFT#グラウンドドリフト
527,0xbc, , -1, 1,2000,enemy, 0x000 //NJ_TATAMIGAESHI#???_???
535,0xbd, , 2, 0,2000,enemy, 0x000 //NJ_KAENSIN#???(???)
536,0x86, , 2, 0, 300,enemy, 0x000 //NJ_BAKUENRYU#???(???)
538,0xbb,,1:1:1:2:2:2:3:3:3:4,0, -1,all,0x010 //NJ_SUITON#水遁
516,0xbc, , 0, 3, 100,enemy, 0x000 //GS_DESPERADO#デスペラード
521,0xc2, , 0, 1,1000,enemy, 0x006 //GS_GROUNDDRIFT#グラウンドドリフト

17
src/map/skill.c
View File

@ -6040,6 +6040,7 @@ int skill_castend_pos2 (struct block_list *src, int x, int y, int skillid, int s
case NJ_KAENSIN:
case NJ_BAKUENRYU:
case NJ_HYOUSYOURAKU:
clif_skill_nodamage(src,bl,skillid,skilllv,1);
skill_unitsetting(src,skillid,skilllv,x,y,0);
flag|=1;
break;
@ -6438,6 +6439,13 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, int skillid,
case WE_CALLBABY:
if (sd) val1 = sd->status.child;
break;
case NJ_KAENSIN:
val1 = skilllv;
val2 = (skilllv+1)/2 + 4;
break;
case NJ_BAKUENRYU:
val1 = 3;
break;
case GS_GROUNDDRIFT:
{ //Take on the base element, not the elemental one.
struct status_data *bstatus = status_get_base_status(src);
@ -10504,6 +10512,15 @@ void skill_init_unit_layout (void)
memcpy(skill_unit_layout[pos].dy,dy,sizeof(dy));
break;
}
case NJ_TATAMIGAESHI:
{
static const int dx[] = {-1, 0, 0, 1};
static const int dy[] = { 0,-1, 1, 0};
skill_unit_layout[pos].count = 4;
memcpy(skill_unit_layout[pos].dx,dx,sizeof(dx));
memcpy(skill_unit_layout[pos].dy,dy,sizeof(dy));
break;
}
default:
ShowError("unknown unit layout at skill %d\n",i);
break;

5
src/map/skill.h
View File

@ -937,8 +937,9 @@ enum {
UNT_HERMODE,
//0xba
UNT_SUITON = 0xbb,
UNT_DESPERADO,
//0xbd, 0xbe, 0xc0, 0xc1 //Maybe the other elements of Ground Drift?
UNT_DESPERADO, //NJ_TATAMIGAESHI is 0xbc as well?
UNT_KAENSIN,
//0xbe, 0xc0, 0xc1 //Maybe the other elements of Ground Drift?
UNT_GROUNDDRIFT = 0xc2,
};