From df3a4d166c38fb385c1d8817523a6e92af890279 Mon Sep 17 00:00:00 2001
From: Vicious <Vicious@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Tue, 7 Mar 2006 21:11:54 +0000
Subject: more ground work for ninja/GS

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5500 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 Changelog-Trunk.txt     |  1 +
 db/job_db1.txt          |  2 +-
 db/skill_db.txt         | 87 +++++++++++++++++++++++-----------------------
 db/skill_require_db.txt | 91 ++++++++++++++++++++++++-------------------------
 db/skill_tree.txt       | 90 ++++++++++++++++++++++++------------------------
 src/map/skill.c         | 61 ++++++++++++++++++++++++++++-----
 src/map/skill.h         | 46 +++++++++++++++++++++++++
 7 files changed, 234 insertions(+), 144 deletions(-)

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index fc5962ac1..8b426f46b 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -5,6 +5,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.  EV
 GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
 
 2006/03/07
+	* More ground work for Ninja/Gunslinger [Vicious]
 	* status_calc_pc now assumes that if your max hp is negative, it has
 	  overflowed, and as such, it is set to the max_hp setting instead of 1. This
 	  'dangerous' assumptio is alright as long as there aren't equipment that can
diff --git a/db/job_db1.txt b/db/job_db1.txt
index db91fdf6a..a4f82b518 100644
--- a/db/job_db1.txt
+++ b/db/job_db1.txt
@@ -52,7 +52,7 @@
 // Super Novice
 23,	20000,0    ,500  ,100  ,500  ,650  ,700  ,2000 ,2000 ,2000 ,800  ,2000 ,700  ,700  ,650  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000
 // Gunslinger
-24,	24000,110  ,500  ,400  ,400  ,500  ,650  ,2000 ,2000 ,2000 ,800  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,500
+24,	27000,75   ,300  ,600  ,400  ,550  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,650  ,2000 ,575  ,2000 ,2000 ,2000
 // Ninja
 25,	24000,110  ,500  ,400  ,400  ,500  ,650  ,2000 ,2000 ,2000 ,800  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,500
 // Novice High
diff --git a/db/skill_db.txt b/db/skill_db.txt
index b5ed57603..b15f7c153 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -518,53 +518,52 @@
 497,0,6,4,0,1,0,1,0,no,0,8,0,none,0	//AM_TWILIGHT2#Twilight Alchemy 2#
 498,0,6,4,0,1,0,1,0,no,0,8,0,none,0	//AM_TWILIGHT3#Twilight Alchemy 3#
 499,-9,8,4,-1,0,0,1,2,no,0,8,0,weapon,0	//HT_POWER#Beast Strafing#
-
 //Temp Plugs(using bash as base)
-500,-1,6,1,-1,0,0,5,1,no,0,0,0,weapon,0	//GS_GLITTERING#Flip Coin#
-501,-1,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//GS_FLING#????#
+500,-1,6,1,-1,0,0,5,1,no,0,0,0,weapon,0	//GS_GLITTERING#Flip the Coin#
+501,-1,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//GS_FLING#Fling#
 502,-1,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//GS_TRIPLEACTION#Triple Action#
-503,-1,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//GS_BULLSEYE#Bullseye#
-504,-1,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//GS_MADNESSCANCEL#????????_?????»#
-505,-1,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//GS_ADJUSTMENT#?????·???«???«#
-506,-1,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//GS_INCREASING#?????«?í_???Ñ?»??#
-507,-1,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//GS_MAGICALBULLET#???÷??_????#
-508,-1,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//GS_CRACKER#???í??#
+503,-1,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//GS_BULLSEYE#Bulls Eye#
+504,-1,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//GS_MADNESSCANCEL#Madness Canceler#
+505,-1,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//GS_ADJUSTMENT#AdJustment#
+506,-1,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//GS_INCREASING#Increasing Accuracy#
+507,-1,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//GS_MAGICALBULLET#Magical Bullet#
+508,-1,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//GS_CRACKER#Cracker#
 509,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_SINGLEACTION#Single Action#
-510,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_SNAKEEYE#Snake's Eye#
-511,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_CHAINACTION#????_????#
-512,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_TRACKING#?«?í??#
-513,-1,6,1,-1,0,0,5,1,no,0,0,0,weapon,0	//GS_DISARM#??????#
-514,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_PIERCINGSHOT#??????_?ª#
-515,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_RAPIDSHOWER#?í????_???÷#
-516,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_DESPERADO#?Ñ????????#
-517,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_GATLINGFEVER#??????_???÷#
-518,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_DUST#?????«#
-519,-1,6,1,-1,0,0,5,1,no,0,0,0,weapon,0	//GS_FULLBUSTER#?«_?÷????#
-520,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_SPREADATTACK#????????_????#
-521,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_GROUNDDRIFT#????????_???«???«#
-522,0,0,0,0,0,0,10,1,no,0,0,0,weapon,0	//NJ_TOBIDOUGU#?±??_?÷??#
-523,9,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//NJ_SYURIKEN#?÷?«??_?°?÷??#
-524,9,8,1,-1,0,0,5,3,no,0,0,0,weapon,0	//NJ_KUNAI#???¬??_?°?÷??#
-525,9,8,1,-1,2,2,5,1:2:3:4:5,no,0,0,0,weapon,0	//NJ_HUUMA#?????÷?«??_?°?÷??#
-526,9,6,1,0,0,0,10,1,no,0,0,0,weapon,0	//NJ_ZENYNAGE#??_?°?÷??#
-527,0,6,4,3,0,0,5,1,no,0,0,0,weapon,0	//NJ_TATAMIGAESHI#??????_???²??#
-528,1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//NJ_KASUMIKIRI#????_?ú??#
-529,1,6,4,0,1,0,5,1,no,0,0,0,none,0	//NJ_SHADOWJUMP#??????_????#
-530,1,6,1,-1,0,0,5,1,no,0,0,0,weapon,0	//NJ_KIRIKAGE#??????_?ú??#
-531,0,6,4,0,1,0,5,1,no,0,0,0,none,0	//NJ_UTSUSEMI#????????_????#
-532,0,6,4,0,1,0,10,1,no,0,0,0,none,0	//NJ_BUNSINJYUTSU#?»??????#
-533,0,0,0,0,0,0,10,0,no,0,0,0,none,0	//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#?½???¡(??µ·?ñ)#
-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#?¡???°(?²µ·?µ)#
-536,9,8,2,3,0,2,5,3,no,0,0,0,magic,0	//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#?????ó(?????µ)#
-538,2,6,2,0,1,0,10,1,no,0,0,0,magic,0	//NJ_SUITON#?÷??(????)#
-539,0,6,4,1,0,3,5,1,no,0,0,0,magic,0	//NJ_HYOUSYOURAKU#???ñ??(?????µ)#
-540,9,8,1,4,0,0,10,1:2:2:3:3:4:4:5:5:6,no,0,0,0,magic,0	//NJ_HUUJIN#????(?ª??)#
-541,0,6,4,0,1,0,5,1,no,0,0,0,magic,0	//NJ_RAIGEKISAI#?·????(???¬ß?)#
-542,9,8,1,-1,0,0,5,1,no,0,0,0,magic,0	//NJ_KAMAITACHI#????(?²?ª)#
-543,0,6,4,0,1,0,5,1,no,0,0,0,none,0	//NJ_NEN#??(µ÷)#
-544,2,6,4,0,0,0,10,1,no,0,0,0,weapon,0	//NJ_ISSEN#????#
+510,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_SNAKEEYE#Snake Eye#
+511,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_CHAINACTION#Chain Action#
+512,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_TRACKING#Tracking#
+513,-1,6,1,-1,0,0,5,1,no,0,0,0,weapon,0	//GS_DISARM#Disarm#
+514,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_PIERCINGSHOT#Piercing Shot#
+515,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_RAPIDSHOWER#Rapid Shower#
+516,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_DESPERADO#Desperado#
+517,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_GATLINGFEVER#Gatling Fever#
+518,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_DUST#Dust#
+519,-1,6,1,-1,0,0,5,1,no,0,0,0,weapon,0	//GS_FULLBUSTER#Full Buster#
+520,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_SPREADATTACK#Spread Attack#
+521,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_GROUNDDRIFT#Ground Drift#
+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,2,2,5,1:2:3:4:5,no,0,0,0,weapon,0	//NJ_HUUMA#NJ_HUUMA#
+526,9,6,1,0,0,0,10,1,no,0,0,0,weapon,0	//NJ_ZENYNAGE#NJ_ZENYNAGE#
+527,0,6,4,3,0,0,5,1,no,0,0,0,weapon,0	//NJ_TATAMIGAESHI#NJ_TATAMIGAESHI#
+528,1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//NJ_KASUMIKIRI#NJ_KASUMIKIRI#
+529,1,6,4,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,0	//NJ_UTSUSEMI#NJ_UTSUSEMI#
+532,0,6,4,0,1,0,10,1,no,0,0,0,none,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,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#
+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#
+540,9,8,1,4,0,0,10,1:2:2:3:3:4:4:5:5:6,no,0,0,0,magic,0	//NJ_HUUJIN#NJ_HUUJIN#
+541,0,6,4,0,1,0,5,1,no,0,0,0,magic,0	//NJ_RAIGEKISAI#NJ_RAIGEKISAI#
+542,9,8,1,-1,0,0,5,1,no,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,4,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_require_db.txt b/db/skill_require_db.txt
index 99edeb352..60162fbde 100644
--- a/db/skill_require_db.txt
+++ b/db/skill_require_db.txt
@@ -387,53 +387,52 @@
 497,0,0,200,0,0,0,99,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//AM_TWILIGHT2#ƒgƒ?ƒCƒ‰ƒCƒgƒtƒ@?[ƒ}ƒV?[2#
 498,0,0,200,0,0,0,99,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0//AM_TWILIGHT3#ƒgƒ?ƒCƒ‰ƒCƒgƒtƒ@?[ƒ}ƒV?[3#
 499,0,0,8,0,0,0,11,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//HT_POWER#ƒr?[ƒXƒgƒXƒgƒŒƒCƒsƒ“ƒO#
-
 //temp plugs
-500,0,0,10,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	//GS_something
-501,0,0,10,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	//GS_something
-502,0,0,10,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	//GS_something
-503,0,0,10,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	//GS_something
-504,0,0,10,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	//GS_something
-505,0,0,10,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	//GS_something
-506,0,0,10,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	//GS_something
-507,0,0,10,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	//GS_something
-508,0,0,10,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	//GS_something
-509,0,0,10,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	//GS_something
-510,0,0,10,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	//GS_something
-511,0,0,10,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	//GS_something
-512,0,0,10,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	//GS_something
-513,0,0,10,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	//GS_something
-514,0,0,10,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	//GS_something
-515,0,0,10,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	//GS_something
-516,0,0,10,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	//GS_something
-517,0,0,10,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	//GS_something
-518,0,0,10,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	//GS_something
-519,0,0,10,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	//GS_something
-520,0,0,10,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	//GS_something
-521,0,0,10,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	//GS_something
-522,0,0,10,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_something
-523,0,0,10,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_something
-524,0,0,10,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_something
-525,0,0,10,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_something
-526,0,0,10,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_something
-527,0,0,10,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_something
-528,0,0,10,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_something
-529,0,0,10,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_something
-530,0,0,10,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_something
-531,0,0,10,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_something
-532,0,0,10,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_something
-533,0,0,10,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_something
-534,0,0,10,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_something
-535,0,0,10,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_something
-536,0,0,10,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_something
-537,0,0,10,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_something
-538,0,0,10,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_something
-539,0,0,10,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_something
-540,0,0,10,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_something
-541,0,0,10,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_something
-542,0,0,10,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_something
-543,0,0,10,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_something
-544,0,0,10,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_something
+500,0,0,10,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	//GS_GLITTERING
+501,0,0,10,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	//GS_FLING
+502,0,0,10,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	//GS_TRIPLEACTION
+503,0,0,10,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	//GS_BULLSEYE
+504,0,0,10,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	//GS_MADNESSCANCEL
+505,0,0,10,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	//GS_ADJUSTMENT
+506,0,0,10,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	//GS_INCREASING
+507,0,0,10,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	//GS_MAGICALBULLET
+508,0,0,10,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	//GS_CRACKER
+509,0,0,10,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	//GS_SINGLEACTION
+510,0,0,10,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	//GS_SNAKEEYE
+511,0,0,10,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	//GS_CHAINACTION
+512,0,0,10,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	//GS_TRACKING
+513,0,0,10,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	//GS_DISARM
+514,0,0,10,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	//GS_PIERCINGSHOT
+515,0,0,10,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	//GS_RAPIDSHOWER
+516,0,0,10,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	//GS_DESPERADO
+517,0,0,10,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	//GS_GATLINGFEVER
+518,0,0,10,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	//GS_DUST
+519,0,0,10,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	//GS_FULLBUSTER
+520,0,0,10,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	//GS_SPREADATTACK
+521,0,0,10,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	//GS_GROUNDDRIFT
+522,0,0,10,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_TOBIDOUGU
+523,0,0,10,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_SYURIKEN
+524,0,0,10,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_KUNAI
+525,0,0,10,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_HUUMA
+526,0,0,10,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,10,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,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,10,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
+530,0,0,10,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_KIRIKAGE
+531,0,0,10,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,10,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
+533,0,0,10,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_NINPOU
+534,0,0,10,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_KOUENKA
+535,0,0,10,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_KAENSIN
+536,0,0,10,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_BAKUENRYU
+537,0,0,10,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_HYOUSENSOU
+538,0,0,10,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_SUITON
+539,0,0,10,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_HYOUSYOURAKU
+540,0,0,10,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_HUUJIN
+541,0,0,10,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_RAIGEKISAI
+542,0,0,10,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_KAMAITACHI
+543,0,0,10,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_NEN
+544,0,0,10,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_ISSEN
 
 1001,0,0,40,0,0,0,99,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//KN_CHARGEATK#ƒ`ƒƒ?[ƒWƒAƒ^ƒbƒN#
 1002,0,0,15,0,0,0,99,shield,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//CR_SHRINK#ƒVƒ…ƒŠƒ“ƒN#
diff --git a/db/skill_tree.txt b/db/skill_tree.txt
index ee865c756..7fe907107 100644
--- a/db/skill_tree.txt
+++ b/db/skill_tree.txt
@@ -2125,49 +2125,49 @@
 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#
 //Gunslinger
-24,500,5,0,0,0,0,0,0,0,0,0,0 //GS_GLITTERING#Çø³_´õ_ÄÚÀÎ#
-24,501,1,0,0,0,0,0,0,0,0,0,0 //GS_FLING#Çøµ#
-24,502,1,0,0,0,0,0,0,0,0,0,0 //GS_TRIPLEACTION#Æ®¸®ÇÃ_¾×¼Ç#
-24,503,1,0,0,0,0,0,0,0,0,0,0 //GS_BULLSEYE#ºÒ½º_¾ÆÀÌ#
-24,504,1,0,0,0,0,0,0,0,0,0,0 //GS_MADNESSCANCEL#¸Åµå´Ï½º_ĵ½½·¯#
-24,505,1,0,0,0,0,0,0,0,0,0,0 //GS_ADJUSTMENT#¾ÖµåÀú½ºÆ®¸ÕÆ®#
-24,506,1,0,0,0,0,0,0,0,0,0,0 //GS_INCREASING#ÀÎÅ©¸®Â¡_¾îÅ¥·¯½Ã#
-24,507,1,0,0,0,0,0,0,0,0,0,0 //GS_MAGICALBULLET#¸ÅÁöÄÃ_ºí¸´#
-24,508,1,0,0,0,0,0,0,0,0,0,0 //GS_CRACKER#Å©·¡Ä¿#
-24,509,10,0,0,0,0,0,0,0,0,0,0 //GS_SINGLEACTION#½Ì±Û_¾×¼Ç#
-24,510,10,0,0,0,0,0,0,0,0,0,0 //GS_SNAKEEYE#½º³×ÀÌÅ©_¾ÆÀÌ#
-24,511,10,0,0,0,0,0,0,0,0,0,0 //GS_CHAINACTION#üÀÎ_¾×¼Ç#
-24,512,10,0,0,0,0,0,0,0,0,0,0 //GS_TRACKING#Æ®·¡Å·#
-24,513,5,0,0,0,0,0,0,0,0,0,0 //GS_DISARM#µð½º¾Ï#
-24,514,10,0,0,0,0,0,0,0,0,0,0 //GS_PIERCINGSHOT#ÇǾî½Ì_¼¦#
-24,515,10,0,0,0,0,0,0,0,0,0,0 //GS_RAPIDSHOWER#·¡Çǵå_»þ¿ö#
-24,516,10,0,0,0,0,0,0,0,0,0,0 //GS_DESPERADO#µ¥½ºÆä¶óµµ#
-24,517,10,0,0,0,0,0,0,0,0,0,0 //GS_GATLINGFEVER#ijƲ¸µ_Çǹö#
-24,518,10,0,0,0,0,0,0,0,0,0,0 //GS_DUST#´õ½ºÆ®#
-24,519,5,0,0,0,0,0,0,0,0,0,0 //GS_FULLBUSTER#Ç®_¹ö½ºÅÍ#
-24,520,10,0,0,0,0,0,0,0,0,0,0 //GS_SPREADATTACK#½ºÇÁ·¹µå_¾îÅÃ#
-24,521,10,0,0,0,0,0,0,0,0,0,0 //GS_GROUNDDRIFT#±×¶ó¿îµå_µå¸®ÇÁÆ®#
+24,500,5,0,0,0,0,0,0,0,0,0,0 //GS_GLITTERING#Flip the Coin#
+24,501,1,0,0,0,0,0,0,0,0,0,0 //GS_FLING#Fling#
+24,502,1,0,0,0,0,0,0,0,0,0,0 //GS_TRIPLEACTION#Triple Action#
+24,503,1,0,0,0,0,0,0,0,0,0,0 //GS_BULLSEYE#Bulls Eye#
+24,504,1,0,0,0,0,0,0,0,0,0,0 //GS_MADNESSCANCEL#Madness Canceler#
+24,505,1,0,0,0,0,0,0,0,0,0,0 //GS_ADJUSTMENT#AdJustment#
+24,506,1,0,0,0,0,0,0,0,0,0,0 //GS_INCREASING#Increasing Accuracy#
+24,507,1,0,0,0,0,0,0,0,0,0,0 //GS_MAGICALBULLET#Magical Bullet#
+24,508,1,0,0,0,0,0,0,0,0,0,0 //GS_CRACKER#Cracker#
+24,509,10,0,0,0,0,0,0,0,0,0,0 //GS_SINGLEACTION#Single Action#
+24,510,10,0,0,0,0,0,0,0,0,0,0 //GS_SNAKEEYE#Snake Eye#
+24,511,10,0,0,0,0,0,0,0,0,0,0 //GS_CHAINACTION#Chain Action#
+24,512,10,0,0,0,0,0,0,0,0,0,0 //GS_TRACKING#Tracking#
+24,513,5,0,0,0,0,0,0,0,0,0,0 //GS_DISARM#Disarm#
+24,514,10,0,0,0,0,0,0,0,0,0,0 //GS_PIERCINGSHOT#Piercing Shot#
+24,515,10,0,0,0,0,0,0,0,0,0,0 //GS_RAPIDSHOWER#Rapid Shower#
+24,516,10,0,0,0,0,0,0,0,0,0,0 //GS_DESPERADO#Desperado#
+24,517,10,0,0,0,0,0,0,0,0,0,0 //GS_GATLINGFEVER#Gatling Fever#
+24,518,10,0,0,0,0,0,0,0,0,0,0 //GS_DUST#Dust#
+24,519,5,0,0,0,0,0,0,0,0,0,0 //GS_FULLBUSTER#Full Buster#
+24,520,10,0,0,0,0,0,0,0,0,0,0 //GS_SPREADATTACK#Spread Attack#
+24,521,10,0,0,0,0,0,0,0,0,0,0 //GS_GROUNDDRIFT#Ground Drift#
 //Ninja
-25,522,10,0,0,0,0,0,0,0,0,0,0 //NJ_TOBIDOUGU#ºñµµ_¼ö·Ã#
-25,523,10,0,0,0,0,0,0,0,0,0,0 //NJ_SYURIKEN#¼ö¸®°Ë_´øÁö±â#
-25,524,5,0,0,0,0,0,0,0,0,0,0 //NJ_KUNAI#Äí³ªÀÌ_´øÁö±â#
-25,525,5,0,0,0,0,0,0,0,0,0,0 //NJ_HUUMA#dz¸¶¼ö¸®°Ë_´øÁö±â#
-25,526,10,0,0,0,0,0,0,0,0,0,0 //NJ_ZENYNAGE#µ·_´øÁö±â#
-25,527,5,0,0,0,0,0,0,0,0,0,0 //NJ_TATAMIGAESHI#´Ù´Ù¹Ì_µÚÁý±â#
-25,528,10,0,0,0,0,0,0,0,0,0,0 //NJ_KASUMIKIRI#¾È°³_º£±â#
-25,529,10,0,0,0,0,0,0,0,0,0,0 //NJ_SHADOWJUMP#±×¸²ÀÚ_µµ¾à#
-25,530,5,0,0,0,0,0,0,0,0,0,0 //NJ_KIRIKAGE#±×¸²ÀÚ_º£±â#
-25,531,5,0,0,0,0,0,0,0,0,0,0 //NJ_UTSUSEMI#¸Å¹ÌÇã¹°_¹þ±â#
-25,532,10,0,0,0,0,0,0,0,0,0,0 //NJ_BUNSINJYUTSU#ȯ¿µºÐ½Å#
-25,533,10,0,0,0,0,0,0,0,0,0,0 //NJ_NINPOU#Àιý_¼ö·Ã#
-25,534,10,0,0,0,0,0,0,0,0,0,0 //NJ_KOUENKA#È«¿°È­(ûõæúü¤)#
-25,535,10,0,0,0,0,0,0,0,0,0,0 //NJ_KAENSIN#È­¿°Áø(ûýæúòæ)#
-25,536,5,0,0,0,0,0,0,0,0,0,0 //NJ_BAKUENRYU#Æø¿°·æ(øïæú×£)#
-25,537,10,0,0,0,0,0,0,0,0,0,0 //NJ_HYOUSENSOU#ºù¼¶Ã¢(Þ¼àìóæ)#
-25,538,10,0,0,0,0,0,0,0,0,0,0 //NJ_SUITON#¼öµÐ(â©Ôí)#
-25,539,5,0,0,0,0,0,0,0,0,0,0 //NJ_HYOUSYOURAKU#ºùÁ¤¶ô(Þ¼ïÜÑæ)#
-25,540,10,0,0,0,0,0,0,0,0,0,0 //NJ_HUUJIN#dzÀÎ(ù¦ìÓ)#
-25,541,5,0,0,0,0,0,0,0,0,0,0 //NJ_RAIGEKISAI#³ú°Ý¼â(Òâ̪áï)#
-25,542,5,0,0,0,0,0,0,0,0,0,0 //NJ_KAMAITACHI#»èdz(Þýù¦)#
-25,543,5,0,0,0,0,0,0,0,0,0,0 //NJ_NEN#¿°(æö)#
-25,544,10,0,0,0,0,0,0,0,0,0,0 //NJ_ISSEN#Àϼ¶#
+25,522,10,0,0,0,0,0,0,0,0,0,0 //NJ_TOBIDOUGU#NJ_TOBIDOUGU#
+25,523,10,0,0,0,0,0,0,0,0,0,0 //NJ_SYURIKEN#NJ_SYURIKEN#
+25,524,5,0,0,0,0,0,0,0,0,0,0 //NJ_KUNAI#NJ_KUNAI#
+25,525,5,0,0,0,0,0,0,0,0,0,0 //NJ_HUUMA#NJ_HUUMA#
+25,526,10,0,0,0,0,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,532,10,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0 //NJ_KOUENKA#NJ_KOUENKA#
+25,535,10,0,0,0,0,0,0,0,0,0,0 //NJ_KAENSIN#NJ_KAENSIN#
+25,536,5,0,0,0,0,0,0,0,0,0,0 //NJ_BAKUENRYU#NJ_BAKUENRYU#
+25,537,10,0,0,0,0,0,0,0,0,0,0 //NJ_HYOUSENSOU#NJ_HYOUSENSOU#
+25,538,10,0,0,0,0,0,0,0,0,0,0 //NJ_SUITON#NJ_SUITON#
+25,539,5,0,0,0,0,0,0,0,0,0,0 //NJ_HYOUSYOURAKU#NJ_HYOUSYOURAKU#
+25,540,10,0,0,0,0,0,0,0,0,0,0 //NJ_HUUJIN#NJ_HUUJIN#
+25,541,5,0,0,0,0,0,0,0,0,0,0 //NJ_RAIGEKISAI#NJ_RAIGEKISAI#
+25,542,5,0,0,0,0,0,0,0,0,0,0 //NJ_KAMAITACHI#NJ_KAMAITACHI#
+25,543,5,0,0,0,0,0,0,0,0,0,0 //NJ_NEN#NJ_NEN#
+25,544,10,0,0,0,0,0,0,0,0,0,0 //NJ_ISSEN#NJ_ISSEN#
diff --git a/src/map/skill.c b/src/map/skill.c
index c1fab8d91..28c6cfbc8 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -153,13 +153,11 @@ const struct skill_name_db skill_names[] = {
  { CH_TIGERFIST, "CH_TIGERFIST", "Glacier_Fist" } ,
  { CR_ACIDDEMONSTRATION, "CR_ACIDDEMONSTRATION", "Acid_Demonstration" } ,
  { CR_ALCHEMY, "CR_ALCHEMY", "Alchemy" } ,
- { CR_CULTIVATION, "CR_CULTIVATION", "Plant_Cultivation" } ,
- { CR_SLIMPITCHER, "CR_SLIMPITCHER", "Slim_Pitcher" } ,
- { CR_FULLPROTECTION, "CR_FULLPROTECTION", "Full_Protection" } ,
- { CR_SYNTHESISPOTION, "CR_SYNTHESISPOTION", "Potion_Synthesis" } ,
  { CR_AUTOGUARD, "CR_AUTOGUARD", "Guard" } ,
+ { CR_CULTIVATION, "CR_CULTIVATION", "Plant_Cultivation" } ,
  { CR_DEFENDER, "CR_DEFENDER", "Defending_Aura" } ,
  { CR_DEVOTION, "CR_DEVOTION", "Sacrifice" } ,
+ { CR_FULLPROTECTION, "CR_FULLPROTECTION", "Full_Protection" } ,
  { CR_GRANDCROSS, "CR_GRANDCROSS", "Grand_Cross" } ,
  { CR_HOLYCROSS, "CR_HOLYCROSS", "Holy_Cross" } ,
  { CR_PROVIDENCE, "CR_PROVIDENCE", "Resistant_Souls" } ,
@@ -167,7 +165,9 @@ const struct skill_name_db skill_names[] = {
  { CR_SHIELDBOOMERANG, "CR_SHIELDBOOMERANG", "Shield_Boomerang" } ,
  { CR_SHIELDCHARGE, "CR_SHIELDCHARGE", "Smite" } ,
  { CR_SHRINK, "CR_SHRINK", "Shrink" } ,
+ { CR_SLIMPITCHER, "CR_SLIMPITCHER", "Slim_Pitcher" } ,
  { CR_SPEARQUICKEN, "CR_SPEARQUICKEN", "Spear_Quicken" } ,
+ { CR_SYNTHESISPOTION, "CR_SYNTHESISPOTION", "Potion_Synthesis" } ,
  { CR_TRUST, "CR_TRUST", "Faith" } ,
  { DC_DANCINGLESSON, "DC_DANCINGLESSON", "Dance_Lessons" } ,
  { DC_DONTFORGETME, "DC_DONTFORGETME", "Slow_Grace" } ,
@@ -186,12 +186,34 @@ const struct skill_name_db skill_names[] = {
  { GD_GLORYGUILD, "GD_GLORYGUILD", "Glory_of_Guild" } ,
  { GD_GLORYWOUNDS, "GD_GLORYWOUNDS", "Glorious_Wounds" } ,
  { GD_GUARDUP, "GD_GUARDUP", "Strengthen_Guardian" } ,
- { GD_LEADERSHIP, "GD_LEADERSHIP", "Great_Leadership" } ,
  { GD_HAWKEYES, "GD_HAWKEYES", "Sharp_Gaze" } ,
  { GD_KAFRACONTRACT, "GD_KAFRACONTRACT", "Contract_with_Kafra" } ,
+ { GD_LEADERSHIP, "GD_LEADERSHIP", "Great_Leadership" } ,
  { GD_REGENERATION, "GD_REGENERATION", "Regeneration" } ,
  { GD_RESTORE, "GD_RESTORE", "Restoration" } ,
  { GD_SOULCOLD, "GD_SOULCOLD", "Cold_Heart" } ,
+ { GS_ADJUSTMENT, "GS_ADJUSTMENT", "Adjustment" } ,
+ { GS_BULLSEYE, "GS_BULLSEYE", "Bulls_Eye" } ,
+ { GS_CHAINACTION, "GS_CHAINACTION", "Chain_Action" } ,
+ { GS_CRACKER, "GS_CRACKER", "Cracker" } ,
+ { GS_DESPERADO, "GS_DESPERADO", "Desperado" } ,
+ { GS_DISARM, "GS_DISARM", "Disarm" } ,
+ { GS_DUST, "GS_DUST", "Dust" } ,
+ { GS_FLING, "GS_FLING", "Fling" } ,
+ { GS_FULLBUSTER, "GS_FULLBUSTER", "Full_Buster" } ,
+ { GS_GATLINGFEVER, "GS_GATLINGFEVER", "Gatling_Fever" } ,
+ { GS_GLITTERING, "GS_GLITTERING", "Flip_the_Coin" } ,
+ { GS_GROUNDDRIFT, "GS_GROUNDDRIFT", "Ground_Drift" } ,
+ { GS_INCREASING, "GS_INCREASING", "Increasing_Accuracy" } ,
+ { GS_MADNESSCANCEL, "GS_MADNESSCANCEL", "Madness_Canceler" } ,
+ { GS_MAGICALBULLET, "GS_MAGICALBULLET", "Magical_Bullet" } ,
+ { GS_PIERCINGSHOT, "GS_PIERCINGSHOT", "Piercing_Shot" } ,
+ { GS_RAPIDSHOWER, "GS_RAPIDSHOWER", "Rapid_Shower" } ,
+ { GS_SINGLEACTION, "GS_SINGLEACTION", "Single_Action" } ,
+ { GS_SNAKEEYE, "GS_SNAKEEYE", "Snake_Eye" } ,
+ { GS_SPREADATTACK, "GS_SPREADATTACK", "Spread_Attack" } ,
+ { GS_TRACKING, "GS_TRACKING", "Tracking" } ,
+ { GS_TRIPLEACTION, "GS_TRIPLEACTION", "Triple_Action" } ,
  { HP_ASSUMPTIO, "HP_ASSUMPTIO", "Assumptio" } ,
  { HP_BASILICA, "HP_BASILICA", "Basilica" } ,
  { HP_MANARECHARGE, "HP_MANARECHARGE", "Mana_Recharge" } ,
@@ -283,6 +305,29 @@ const struct skill_name_db skill_names[] = {
  { MO_SPIRITSRECOVERY, "MO_SPIRITSRECOVERY", "Spiritual_Cadence" } ,
  { MO_STEELBODY, "MO_STEELBODY", "Mental_Strength" } ,
  { MO_TRIPLEATTACK, "MO_TRIPLEATTACK", "Raging_Trifecta_Blow" } ,
+ { NJ_BAKUENRYU, "NJ_BAKUENRYU", "NJ_BAKUENRYU" } ,
+ { NJ_BUNSINJYUTSU, "NJ_BUNSINJYUTSU", "NJ_BUNSINJYUTSU" } ,
+ { NJ_HUUJIN, "NJ_HUUJIN", "NJ_HUUJIN" } ,
+ { NJ_HUUMA, "NJ_HUUMA", "NJ_HUUMA" } ,
+ { NJ_HYOUSENSOU, "NJ_HYOUSENSOU", "NJ_HYOUSENSOU" } ,
+ { NJ_HYOUSYOURAKU, "NJ_HYOUSYOURAKU", "NJ_HYOUSYOURAKU" } ,
+ { NJ_ISSEN, "NJ_ISSEN", "NJ_ISSEN" } ,
+ { NJ_KAENSIN, "NJ_KAENSIN", "NJ_KAENSIN" } ,
+ { NJ_KAMAITACHI, "NJ_KAMAITACHI", "NJ_KAMAITACHI" } ,
+ { NJ_KASUMIKIRI, "NJ_KASUMIKIRI", "NJ_KASUMIKIRI" } ,
+ { NJ_KIRIKAGE, "NJ_KIRIKAGE", "NJ_KIRIKAGE" } ,
+ { NJ_KOUENKA, "NJ_KOUENKA", "NJ_KOUENKA" } ,
+ { NJ_KUNAI, "NJ_KUNAI", "NJ_KUNAI" } ,
+ { NJ_NEN, "NJ_NEN", "NJ_NEN" } ,
+ { NJ_NINPOU, "NJ_NINPOU", "NJ_NINPOU" } ,
+ { NJ_RAIGEKISAI, "NJ_RAIGEKISAI", "NJ_RAIGEKISAI" } ,
+ { NJ_SHADOWJUMP, "NJ_SHADOWJUMP", "NJ_SHADOWJUMP" } ,
+ { NJ_SUITON, "NJ_SUITON", "NJ_SUITON" } ,
+ { NJ_SYURIKEN, "NJ_SYURIKEN", "NJ_SYURIKEN" } ,
+ { NJ_TATAMIGAESHI, "NJ_TATAMIGAESHI", "NJ_TATAMIGAESHI" } ,
+ { NJ_TOBIDOUGU, "NJ_TOBIDOUGU", "NJ_TOBIDOUGU" } ,
+ { NJ_UTSUSEMI, "NJ_UTSUSEMI", "NJ_UTSUSEMI" } ,
+ { NJ_ZENYNAGE, "NJ_ZENYNAGE", "NJ_ZENYNAGE" } ,
  { NPC_AGIUP, "NPC_AGIUP", "NPC_AGIUP" } ,
  { NPC_ATTRICHANGE, "NPC_ATTRICHANGE", "NPC_ATTRICHANGE" } ,
  { NPC_BARRIER, "NPC_BARRIER", "NPC_BARRIER" } ,
@@ -409,8 +454,8 @@ const struct skill_name_db skill_names[] = {
  { SA_AUTOSPELL, "SA_AUTOSPELL", "Hindsight" } ,
  { SA_CASTCANCEL, "SA_CASTCANCEL", "Cast_Cancel" } ,
  { SA_CLASSCHANGE, "SA_CLASSCHANGE", "Class_Change" } ,
- { SA_CREATECON, "SA_CREATECON", "Create_Elemental_Converter" } ,
  { SA_COMA, "SA_COMA", "Coma" } ,
+ { SA_CREATECON, "SA_CREATECON", "Create_Elemental_Converter" } ,
  { SA_DEATH, "SA_DEATH", "Grim_Reaper" } ,
  { SA_DELUGE, "SA_DELUGE", "Deluge" } ,
  { SA_DISPELL, "SA_DISPELL", "Dispell" } ,
@@ -499,9 +544,9 @@ const struct skill_name_db skill_names[] = {
  { SN_SIGHT, "SN_SIGHT", "Falcon_Eyes" } ,
  { SN_WINDWALK, "SN_WINDWALK", "Wind_Walker" } ,
  { ST_CHASEWALK, "ST_CHASEWALK", "Stealth" } ,
- { ST_REJECTSWORD, "ST_REJECTSWORD", "Counter_Instinct" } ,
- { ST_PRESERVE, "ST_PRESERVE", "Preserve" } ,
  { ST_FULLSTRIP, "ST_FULLSTRIP", "Full_Divestment" } ,
+ { ST_PRESERVE, "ST_PRESERVE", "Preserve" } ,
+ { ST_REJECTSWORD, "ST_REJECTSWORD", "Counter_Instinct" } ,
  { TF_BACKSLIDING, "TF_BACKSLIDING", "Back_Slide" } ,
  { TF_DETOXIFY, "TF_DETOXIFY", "Detoxify" } ,
  { TF_DOUBLE, "TF_DOUBLE", "Double_Attack" } ,
diff --git a/src/map/skill.h b/src/map/skill.h
index a87daa66a..0d359e507 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -783,6 +783,52 @@ enum {
 	AM_TWILIGHT3,
 	HT_POWER,
 
+	GS_GLITTERING,
+	GS_FLING,
+	GS_TRIPLEACTION,
+	GS_BULLSEYE,
+	GS_MADNESSCANCEL,
+	GS_ADJUSTMENT,
+	GS_INCREASING,
+	GS_MAGICALBULLET,
+	GS_CRACKER,
+	GS_SINGLEACTION,
+	GS_SNAKEEYE,
+	GS_CHAINACTION,
+	GS_TRACKING,
+	GS_DISARM,
+	GS_PIERCINGSHOT,
+	GS_RAPIDSHOWER,
+	GS_DESPERADO,
+	GS_GATLINGFEVER,
+	GS_DUST,
+	GS_FULLBUSTER,
+	GS_SPREADATTACK,
+	GS_GROUNDDRIFT,
+	NJ_TOBIDOUGU,
+	NJ_SYURIKEN,
+	NJ_KUNAI,
+	NJ_HUUMA,
+	NJ_ZENYNAGE,
+	NJ_TATAMIGAESHI,
+	NJ_KASUMIKIRI,
+	NJ_SHADOWJUMP,
+	NJ_KIRIKAGE,
+	NJ_UTSUSEMI,
+	NJ_BUNSINJYUTSU,
+	NJ_NINPOU,
+	NJ_KOUENKA,
+	NJ_KAENSIN,
+	NJ_BAKUENRYU,
+	NJ_HYOUSENSOU,
+	NJ_SUITON,
+	NJ_HYOUSYOURAKU,
+	NJ_HUUJIN,
+	NJ_RAIGEKISAI,
+	NJ_KAMAITACHI,
+	NJ_NEN,
+	NJ_ISSEN,
+
 	KN_CHARGEATK = 1001,
 	CR_SHRINK,
 	AS_SONICACCEL,
-- 
cgit v1.2.3-70-g09d2