mpeg's ninja work

http://gpegon.free.fr/ea/ninja_08-07-06_mpeg.txt

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8160 54d463be-8e91-2dee-dedb-b68131a5f0ec

7 files changed, 33 insertions, 35 deletions

diff --git a/db/job_db1.txt b/db/job_db1.txt
index f4a05480b..3d3e45f90 100644
--- a/db/job_db1.txt
+++ b/db/job_db1.txt
@@ -1,7 +1,7 @@
 // Job-specific Values Database

 //

 // Structure of Database:

-// JobID,Weight,HPFactor,HPMultiplicator,SPFactor,BareFist,Dagger,1HSword,2HSword,1HSpear,2HSpear,1HAxe,2HAxe,1HMace,2HMace(unused),Rod,Bow,Knuckle,Instrument,Whip,Book,Katar,Revolver,Rifle,Shotgun,Gatling Gun,Grenade Launcher

+// JobID,Weight,HPFactor,HPMultiplicator,SPFactor,BareFist,Dagger,1HSword,2HSword,1HSpear,2HSpear,1HAxe,2HAxe,1HMace,2HMace(unused),Rod,Bow,Knuckle,Instrument,Whip,Book,Katar,Revolver,Rifle,Shotgun,Gatling Gun,Grenade Launcher,Fuuma Shuriken

 //

 // Novice

 0,	20000,0    ,500  ,100  ,500  ,650  ,700  ,2000 ,2000 ,2000 ,800  ,2000 ,700  ,700  ,650  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000

@@ -53,8 +53,8 @@
 23,	20000,0    ,500  ,100  ,500  ,650  ,700  ,2000 ,2000 ,2000 ,800  ,2000 ,700  ,700  ,650  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000

 // Gunslinger

 24,	27000,75   ,300  ,600,  400  ,2000, 2000, 2000, 2000, 2000, 2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 700 , 800 ,1200 ,200  ,1400 ,2000

-// Ninja

-25,	24000,110  ,500  ,400  ,400  ,500  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000, 500

+// Ninja // Dagger is a bit faster than Fuuma Shuriken > temp value

+25,	24000,60   ,700  ,400  ,400  ,500  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000, 550

 // Novice High

 4001,	20000,0    ,500  ,100  ,500  ,650  ,700  ,2000 ,2000 ,2000 ,800  ,2000 ,700  ,700  ,650  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000

 // Swordman High

diff --git a/db/job_db2.txt b/db/job_db2.txt
index 51f657b15..d3805d144 100644
--- a/db/job_db2.txt
+++ b/db/job_db2.txt
@@ -62,7 +62,7 @@
 // Gunslinger

 24,5,6,0,6,0,5,0,0,0,5,5,6,2,0,0,0,5,0,0,0,6,0,0,0,5,0,0,0,0,0,6,1,0,0,5,0,0,0,0,0,1,0,0,0,5,0,0,0,0,1,6,4,0,0,5,0,0,0,2,3,0,5,6,1,0,0,0,0,0,0

 // Ninja

-25,2,2,0,0,0,0,0,0,0,5,0,0,2,0,0,0,0,0,0,2,4,5,0,0,0,0,0,0,4,6,2,5,0,0,0,0,0,0,0,6,2,4,5,0,0,0,0,0,0,4,2,6,5,0,0,0,0,0,1,3,2,0,5,6,0,0,0,0,0,0

+25,2,2,0,0,0,0,0,0,0,5,2,0,0,0,0,0,0,0,0,4,2,5,0,0,0,0,0,0,4,6,2,5,0,0,0,0,0,0,0,6,2,4,5,0,0,0,0,0,0,4,2,6,5,0,0,0,0,0,1,3,2,4,5,6,0,0,0,0,0,0

 // Novice High

 4001,0,0,0,0,0,0,0,0,0,0

 // Swordman High

diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt
index 5ad74815f..27d99c583 100644
--- a/db/skill_cast_db.txt
+++ b/db/skill_cast_db.txt
@@ -885,20 +885,20 @@
 525,1000,1000,0,0,0

 //-- NJ_ZENYNAGE

 526,0,5000,0,0,0

-//-- NJ_TATAMIGAESHI

-527,0,0,0,3000,3000

+//-- NJ_TATAMIGAESHI // Duration1 used for SC_TATAMIGAESHI and ground visual effect and Duration2 for "damage-can-be-done" duration

+527,0,3000,0,3000,200 // ex> Skill will only hit during 200 first ticks (concretely do only 1 hit just after being casted)

 //-- NJ_KASUMIKIRI // Delay unknown (if there is one)

 528,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0

 //-- NJ_SHADOWJUMP // Delay unknown (if there is one)

 529,0,0,0,0,0

 //-- NJ_KIRIKAGE // Seems to have no delay (English Translation Project)

 530,0,0,0,0,0

-//-- NJ_UTSUSEMI // Cast and Delay unknown (temp : NJ_NEN cast time)

-531,5000:4000:3000:2000:1000,0,0,20000:30000:40000:50000:60000,0

-//-- NJ_BUNSINJYUTSU // Cast and Delay unknown (temp : random cast :p)

+//-- NJ_UTSUSEMI

+531,0,0,0,20000:30000:40000:50000:60000,0

+//-- NJ_BUNSINJYUTSU // Cast and Delay unknown (temp > random cast)

 532,4000:3500:3000:2500:2000:3000:2500:2000:1500:1000,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0

 

-//-- NJ_KOUENKA

+//-- NJ_KOUENKA // Should there really be a delay ?

 534,700:1400:2100:2800:3500:4200:4900:5600:6300:7000,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0

 //-- NJ_KAENSIN

 535,6000:5500:5000:4500:4000:3500:3000:2500:2000:1500,1000,0,20000,0,

@@ -908,17 +908,17 @@
 537,700:1400:2100:2800:3500:4200:4900:5600:6300:7000,0,0,0,0

 //-- NJ_SUITON

 538,3300:3200:3100:3000:2900:2800:2700:2600:2500:2400,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000

-//-- NJ_HYOUSYOURAKU

-539,3000,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000 // converted from jAthena

+//-- NJ_HYOUSYOURAKU // Cast time taken from jA (not reliable, must be checked)

+539,3000,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000

 //-- NJ_HUUJIN

 540,700:1400:2100:2800:3500:4200:4900:5600:6300:7000,0,0,0,0

 //-- NJ_RAIGEKISAI

-541,3700:3400:3100:2800:2500,0,0,0,0 // not sure of cast but very litely to be correct (English Translation Project)

+541,3700:3400:3100:2800:2500,0,0,0,0 // Not sure of cast but very litely to be correct (English Translation Project)

 //-- NJ_KAMAITACHI

-542,3000,2000,0,0,0 // cast and delay unknown. temp values (I put the same as bakuenryu)

+542,3000,2000,0,0,0 // Cast and delay unknown > temp values taken from NJ_BAKUENRYU

 //-- NJ_NEN

 543,5000:4000:3000:2000:1000,0,0,30000:45000:60000:75000:90000,30000:45000:60000:75000:90000

-//-- NJ_ISSEN // cast and delay unknown. temp values (same as MO_EXTREMITYFIST)

+//-- NJ_ISSEN // cast and delay unknown > temp values taken from MO_EXTREMITYFIST

 544,4000:3500:3000:2500:2000:3000:2500:2000:1500:1000,0,0,0,0

 //==========================================

 

diff --git a/db/skill_db.txt b/db/skill_db.txt
index bb251f974..298ef3549 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -4,7 +4,7 @@
 // 03 hit (8- repeated hitting, 6- single-hit)

 // 04 inf (0- passive, 1- enemy, 2- place, 4- self, 16- friend, 32- trap)

 // 05 pl attributes (0- nothing, 1- water, 2- earth, 3- fire, 4- wind, 5- poison, 6- saint, 7- darkness, 8- sense, 9- immortality)

-// 06 nk (0- normal skill, 1-no damage skill, 2-splash damage skill, 3-no damage area skill)

+// 06 nk (0- normal skill, 1-no damage skill, 2-splash damage skill, 3-no damage area skill, 4-splash and split damage skill)

 // 07 splash/effect range (-1 for screen-wide)

 // 08 MaxLv

 // 09 Number of hits (when positive, damage is increased by hits, 

@@ -31,7 +31,7 @@
 8,0,6,4,0,1,0,10,1,no,0,0,0,weapon,0	//SM_ENDURE#Endure#

 9,0,0,0,0,0,0,10,0,no,0,0,0,none,0	//MG_SRECOVERY#Increase SP Recovery#

 10,0,6,4,3,3,3,1,1,yes,0,0,0,magic,0	//MG_SIGHT#Sight#

-11,9,6,1,8,0,1,10,1,yes,0,0,0,magic,0	//MG_NAPALMBEAT#Napalm Beat#

+11,9,6,1,8,4,1,10,1,yes,0,0,0,magic,0	//MG_NAPALMBEAT#Napalm Beat#

 12,9,8,2,8,1,0,10,1,yes,0,0,0,magic,0	//MG_SAFETYWALL#Safety Wall#

 13,9,8,1,8,0,0,10,1:1:2:2:3:3:4:4:5:5,yes,0,0,0,magic,0	//MG_SOULSTRIKE#Soul Strike#

 14,9,8,1,1,0,0,10,1:2:3:4:5:6:7:8:9:10,yes,0,0,0,magic,0	//MG_COLDBOLT#Cold Bolt#

@@ -420,7 +420,7 @@
 397,5,8,1,-1,0,0,5,5,no,0,0,0,weapon,0	//LK_SPIRALPIERCE#Spiral Pierce#

 398,4,6,1,-1,0,0,5,1,no,0,0,0,weapon,0	//LK_HEADCRUSH#Traumatic Blow#

 399,4,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//LK_JOINTBEAT#Vital Strike#

-400,9,8,1,8,0,1,5,1:2:3:4:5,yes,0,0,0,magic,0	//HW_NAPALMVULCAN#Napalm Vulcan#

+400,9,8,1,8,4,1,5,1:2:3:4:5,yes,0,0,0,magic,0	//HW_NAPALMVULCAN#Napalm Vulcan#

 401,0,6,4,0,1,0,1,1,yes,0,0,0,none,0	//CH_SOULCOLLECT#Zen#

 402,9,6,1,0,1,0,5,1,no,0,0,0,none,0	//PF_MINDBREAKER#Mind Breaker#

 403,0,0,4,0,1,0,1,1,yes,0,0,0,magic,0	//PF_MEMORIZE#Foresight#

@@ -546,9 +546,9 @@
 522,0,0,0,0,0,0,10,1,no,0,0,0,weapon,0	//NJ_TOBIDOUGU#NJ_TOBIDOUGU#

 523,9,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//NJ_SYURIKEN#NJ_SYURIKEN#

 524,9,8,1,-1,0,0,5,3,no,0,0,0,weapon,0	//NJ_KUNAI#NJ_KUNAI#

-525,9,8,1,-1,0,1,5,-1:-2:-3:-4:-5,yes,0,0,0,weapon,0	//NJ_HUUMA#NJ_HUUMA#

+525,9,8,1,-1,4,1,5,-1:-2:-3:-4:-5,yes,0,0,0,weapon,0	//NJ_HUUMA#NJ_HUUMA#

 526,9,6,1,0,0,0,10,1,no,0,0,0,misc,0	//NJ_ZENYNAGE#NJ_ZENYNAGE#

-527,0,6,4,3,0,0,5,1,no,0,0,0,weapon,3	//NJ_TATAMIGAESHI#NJ_TATAMIGAESHI#

+527,0,6,4,-1,0,0,5,1,no,0,0,0,weapon,3	//NJ_TATAMIGAESHI#NJ_TATAMIGAESHI#

 528,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//NJ_KASUMIKIRI#NJ_KASUMIKIRI#

 529,7:9:11:13:15,6,2,0,1,0,5,1,no,0,0,0,none,0	//NJ_SHADOWJUMP#NJ_SHADOWJUMP#

 530,-1,6,1,-1,0,0,5,1,no,0,0,0,weapon,0	//NJ_KIRIKAGE#NJ_KIRIKAGE#

@@ -557,12 +557,12 @@
 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,yes,0,0,0,magic,0	//NJ_KOUENKA#NJ_KOUENKA#

 535,0,8,4,3,0,0,10,1,yes,0,0,0,magic,0	//NJ_KAENSIN#NJ_KAENSIN#

-536,9,8,1,3,2,1,5,3,yes,0,0,0,magic,0	//NJ_BAKUENRYU#NJ_BAKUENRYU#

+536,9,8,1,3,2,2,5,3,yes,0,0,0,magic,0	//NJ_BAKUENRYU#NJ_BAKUENRYU#

 537,9,8,1,1,0,0,10,3:4:5:6:7:8:9:10:11:12,yes,0,0,0,magic,0	//NJ_HYOUSENSOU#NJ_HYOUSENSOU#

 538,9,6,2,0,1,0,10,1,yes,0,0,0,magic,0	//NJ_SUITON#NJ_SUITON#

-539,0,6,4,1,1,0,5,1,yes,0,0,0,magic,0	//NJ_HYOUSYOURAKU#NJ_HYOUSYOURAKU#

+539,0,6,4,1,2,3,5,1,yes,0,0,0,magic,0	//NJ_HYOUSYOURAKU#NJ_HYOUSYOURAKU#

 540,9,8,1,4,0,0,10,-1:-2:-2:-3:-3:-4:-4:-5:-5:-6,yes,0,0,0,magic,0	//NJ_HUUJIN#NJ_HUUJIN#

-541,9,6,4,4,1,0,5,1,yes,0,0,0,magic,0	//NJ_RAIGEKISAI#NJ_RAIGEKISAI#

+541,9,6,4,4,2,2:2:3:3:4,5,1,yes,0,0,0,magic,0	//NJ_RAIGEKISAI#NJ_RAIGEKISAI#

 542,5:6:7:8:9,8,1,4,0,2,5,1,yes,0,0,0,magic,0	//NJ_KAMAITACHI#NJ_KAMAITACHI#

 543,0,6,4,0,1,0,5,1,no,0,0,0,none,0	//NJ_NEN#NJ_NEN#

 544,-2,6,1,0,0,0,10,1,yes,0,0,0,weapon,0	//NJ_ISSEN#NJ_ISSEN#

diff --git a/db/skill_nocast_db.txt b/db/skill_nocast_db.txt
index afcc62b91..538933c87 100644
--- a/db/skill_nocast_db.txt
+++ b/db/skill_nocast_db.txt
@@ -55,4 +55,4 @@
 //Zone 2 - Jail

 421,64 //TK_JUMPKICK#Flying Side Kick#

 426,64 //TK_HIGHJUMP#Taekwon Jump#

-

+529,64 //NJ_SHADOWJUMP#NJ_SHADOWJUMP#

diff --git a/db/skill_tree.txt b/db/skill_tree.txt
index 1cb03dc12..b8f066179 100644
--- a/db/skill_tree.txt
+++ b/db/skill_tree.txt
@@ -678,10 +678,10 @@
 25,525,5,522,5,524,5,0,0,0,0,0,0 //NJ_HUUMA#NJ_HUUMA#

 25,526,10,522,10,525,5,0,0,0,0,0,0 //NJ_ZENYNAGE#NJ_ZENYNAGE#

 25,527,5,0,0,0,0,0,0,0,0,0,0 //NJ_TATAMIGAESHI#NJ_TATAMIGAESHI#

-25,528,10,0,0,0,0,0,0,0,0,0,0 //NJ_KASUMIKIRI#NJ_KASUMIKIRI#

-25,529,10,0,0,0,0,0,0,0,0,0,0 //NJ_SHADOWJUMP#NJ_SHADOWJUMP#

-25,530,5,0,0,0,0,0,0,0,0,0,0 //NJ_KIRIKAGE#NJ_KIRIKAGE#

-25,531,5,0,0,0,0,0,0,0,0,0,0 //NJ_UTSUSEMI#NJ_UTSUSEMI#

+25,528,10,529,1,0,0,0,0,0,0,0,0 //NJ_KASUMIKIRI#NJ_KASUMIKIRI#

+25,529,10,527,1,0,0,0,0,0,0,0,0 //NJ_SHADOWJUMP#NJ_SHADOWJUMP#

+25,530,5,528,5,0,0,0,0,0,0,0,0 //NJ_KIRIKAGE#NJ_KIRIKAGE#

+25,531,5,529,5,0,0,0,0,0,0,0,0 //NJ_UTSUSEMI#NJ_UTSUSEMI#

 25,532,10,531,4,530,3,543,1,0,0,0,0 //NJ_BUNSINJYUTSU#NJ_BUNSINJYUTSU#

 25,533,10,0,0,0,0,0,0,0,0,0,0 //NJ_NINPOU#NJ_NINPOU#

 25,534,10,533,1,0,0,0,0,0,0,0,0 //NJ_KOUENKA#NJ_KOUENKA#

@@ -2174,4 +2174,4 @@
 4049,471,3,452,1,0,0,0,0,0,0,0,0	//SL_SKE#Esk#

 4049,472,3,447,1,0,0,0,0,0,0,0,0	//SL_SKA#Eska#

 4049,494,5,451,1,0,0,0,0,0,0,0,0	//SL_HIGH#Spirit of Rebirth#

-4049,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
\ No newline at end of file
+4049,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#

diff --git a/db/skill_unit_db.txt b/db/skill_unit_db.txt
index 93c384340..6e39ac2a2 100644
--- a/db/skill_unit_db.txt
+++ b/db/skill_unit_db.txt
@@ -87,10 +87,8 @@
 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

-527,0xba,    , -1, 0,2500,enemy, 0x000	//NJ_TATAMIGAESHI

-535,0xbd,    ,  2, 0, 100,enemy, 0x008	//NJ_KAENSIN

-541,0x86,,0,2:2:3:3:4,1000,enemy,0x000 //NJ_RAIGEKISAI

-538,0xbb,,1:1:1:2:2:2:3:3:3:4,0,-1,all,0x002	//NJ_SUITON

-516,0xbc,    ,  0, 3, 100,enemy, 0x000	//GS_DESPERADO

+516,0xba,    ,  0, 3, 100,enemy, 0x000	//GS_DESPERADO

 521,0xc2,    ,  0, 1,1000,enemy, 0x006	//GS_GROUNDDRIFT

-539,0x86,    ,  0, 3,1000,enemy, 0x000	//NJ_HYOUSYOURAKU

+527,0xbc,    , -1, 0,2500,enemy, 0x000	//NJ_TATAMIGAESHI

+535,0xbd,    , -1, 0, 200,enemy, 0x008	//NJ_KAENSIN

+538,0xbb,,1:1:1:2:2:2:3:3:3:4,0,-1,all,0x000	//NJ_SUITON