- Applied most of Mpeg's work on Ninja Skills. For information see: http://gpegon.free.fr/ea/ninja_10-15-06_mpeg.txt

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

6 files changed, 33 insertions, 30 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index fcd7bdcc9..a4640b0ca 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -20,6 +20,8 @@
 

 ========================

 10/16

+	* Applied most of Mpeg's work on Ninja Skills. For information see:

+	  http://gpegon.free.fr/ea/ninja_10-15-06_mpeg.txt [Skotlex]

 	* Small Kiel MVP drop rate increase [Playtester]

 10/14

 	* Fixed Bacsojin's and Chung E's stats [Playtester]

diff --git a/db/job_db1.txt b/db/job_db1.txt
index f486e6414..c002fed87 100644
--- a/db/job_db1.txt
+++ b/db/job_db1.txt
@@ -54,7 +54,7 @@
 // Gunslinger

 24,	27000,75   ,300  ,600,  500  ,2000, 2000, 2000, 2000, 2000, 2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 700 , 750 ,1500 , 700 ,1500 ,2000

 // Ninja

-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, 750

+25,	26000,80   ,150  ,500  ,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/skill_cast_db.txt b/db/skill_cast_db.txt
index ad804f3b2..bcc587ea6 100644
--- a/db/skill_cast_db.txt
+++ b/db/skill_cast_db.txt
@@ -878,45 +878,47 @@
 

 

 //===== Ninja ==============================

-//-- NJ_HUUMA // Unknown casting time. temp value (taken from jA)

-525,1000,1000,0,0,0

+//-- NJ_KUNAI

+525,0,1000,0,0,0

+//-- NJ_HUUMA

+525,3000,2000,0,0,0

 //-- NJ_ZENYNAGE

 526,0,5000,0,0,0

-//-- NJ_TATAMIGAESHI // Duration1 is land-effect, Duration2 is range-inmunity effect.

+//-- NJ_TATAMIGAESHI

 527,0,3000,0,3000,3000

-//-- 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_KASUMIKIRI

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

+//-- NJ_SHADOWJUMP

+529,0,1000,0,0,0

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

 530,0,0,0,0,0

 //-- 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

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

+//-- NJ_BUNSINJYUTSU

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

 

 //-- NJ_KOUENKA

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

 //-- NJ_KAENSIN

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

-//-- NJ_BAKUENRYU // Cast and Delay taken from lvl5 (need to confirm it's not influenced by lvl)

+//-- NJ_BAKUENRYU

 536,3000,2000,0,0,0

 //-- NJ_HYOUSENSOU

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

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

+//-- NJ_SUITON

 538,3000,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000

-//-- NJ_HYOUSYOURAKU // Cast time and Delay 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_HYOUSYOURAKU

+539,2000:2500:3000:3500:4000,2000,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 // Cast and Delay must be checked (Seems to be more 4s at lvl1. Don't have other lvls)

-541,3700:3400:3100:2800:2500,0,0,0,0

-//-- NJ_KAMAITACHI // Cast and delay unknown > temp values taken from NJ_BAKUENRYU

-542,3000,2000,0,0,0

+540,1000:1500:2000:2500:3000:3500:4000:5000:5500:6000,1000,0,0,0

+//-- NJ_RAIGEKISAI

+541,4000,0,0,0,0

+//-- NJ_KAMAITACHI

+542,4000,0,0,0,0

 //-- 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 taken from MO_EXTREMITYFIST

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

+//-- NJ_ISSEN

+544,0,3000,0,0,0

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

 

 

diff --git a/db/skill_db.txt b/db/skill_db.txt
index 0ddc19ac8..03e93eb96 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -549,14 +549,14 @@
 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,4,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,-3:-3:-4:-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,-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#

 531,0,6,4,0,1,0,5,1,no,0,0,0,none,7	//NJ_UTSUSEMI#NJ_UTSUSEMI#

-532,0,6,4,0,1,0,10,1,no,0,0,0,none,0	//NJ_BUNSINJYUTSU#NJ_BUNSINJYUTSU#

+532,0,6,4,0,1,0,10,1,yes,0,0,0,magic,0	//NJ_BUNSINJYUTSU#NJ_BUNSINJYUTSU#

 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#

@@ -564,11 +564,11 @@
 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,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#

+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,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#

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

+543,0,6,4,0,1,0,5,1,yes,0,0,0,none,0	//NJ_NEN#NJ_NEN#

+544,-4,6,1,0,0,0,10,1,no,0,0,0,weapon,0	//NJ_ISSEN#NJ_ISSEN#

 

 1001,9,6,1,-1,0,0,1,1,no,0,1,0,weapon,0	//KN_CHARGEATK#Charge Attack#

 1002,0,6,4,0,1,0,1,0,no,0,1,0,weapon,2	//CR_SHRINK#Shrink#

diff --git a/db/skill_nocast_db.txt b/db/skill_nocast_db.txt
index bceeb98e6..a126610f3 100644
--- a/db/skill_nocast_db.txt
+++ b/db/skill_nocast_db.txt
@@ -56,4 +56,3 @@
 //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_require_db.txt b/db/skill_require_db.txt
index 6320a4d3a..c971c00e7 100644
--- a/db/skill_require_db.txt
+++ b/db/skill_require_db.txt
@@ -431,7 +431,7 @@
 540,0,0,12:14:16:18:20:22:24:26:28:30,0,0,0,99,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_HUUJIN

 541,0,0,16:20:24:28:32,0,0,0,99,0,0,none,0,7523,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NJ_RAIGEKISAI

 542,0,0,24:28:32:36:40,0,0,0,99,0,0,none,0,7523,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NJ_KAMAITACHI

-543,80,0,20:30:40:50:60,0,0,0,99,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_NEN

+543,0,0,20:30:40:50:60,-5,0,0,99,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_NEN

 544,0,0,55:60:65:70:75:80:85:90:95:100,0,0,0,99,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_ISSEN

 

 1001,0,0,40,0,0,0,99,0,0,move_enable,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//KN_CHARGEATK#チャ?[ジアタック#