more ground work for ninja/GS

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

2 files changed, 99 insertions, 8 deletions

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,