fixed compile issue. fixed ninja issues.

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

5 files changed, 49 insertions, 51 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 6c725d9e5..551e334f2 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

+	* Base for ninja/gunslinger is mostly done. need to work on skills now. [Vicious]

 	- Updated sql-files/ mob_db.sql and item_db.sql to current txt dbs. [Skotlex]

 	* @job ninja/gunslinger. No skill tree or anything yet. [Vicious]

 	* Gospel won't start taking effect until after 10 secs have passed since

diff --git a/db/item_db.txt b/db/item_db.txt
index a7cdb23c9..94ecdba43 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -2377,26 +2377,26 @@
 //12141,Fifth_Stage,Fifth Stage,2,,10,,,,,,127918079,7,2,,,,,,{}

 

 // Guns

-13100,Branch,Branch,4,10,,500,20,,9,3,134217728,7,2,2,1,1,1,,{}

-13101,Six_Shooter,Six Shooter,4,10,,400,30,,9,1,134217728,7,2,2,1,1,1,,{ bonus bHit,-10; }

-13102,Six_Shooter,Six Shooter,4,10,,400,30,,9,2,134217728,7,2,2,1,1,1,,{ bonus bHit,-10; }

-13103,Crimson_Bolt,Crimson Bolt,4,10,,450,45,,9,1,134217728,7,2,2,2,6,1,,{ bonus bHit,-10; }

-13104,Crimson_Bolt_,Crimson Bolt,4,10,,450,45,,9,2,134217728,7,2,2,2,6,1,,{ bonus bHit,-10; }

-13105,Garrison,Garrison,4,10,,500,70,,9,1,134217728,7,2,2,2,22,1,,{ bonus bHit,-10; }

-13106,Garrison_,Garrison,4,10,,500,70,,9,2,134217728,7,2,2,2,22,1,,{ bonus bHit,-10; }

-13107,Gold_Lux,Gold Lux,4,10,,500,20,,9,0,134217728,7,2,2,3,12,1,,{ bonus bHit,-10; }

-13108,Cyclone,Cyclone,4,10,,700,130,,9,1,134217728,7,2,2,2,24,1,,{ bonus bHit,10; bonus bCritical,10; }

-13109,Cyclone_,Cyclone,4,10,,700,130,,9,2,134217728,7,2,2,2,24,1,,{ bonus bHit,10; bonus bCritical,10; }

-13110,Dusk,Dusk,4,10,,750,160,,9,1,134217728,7,2,2,1,1,1,,{ bonus bHit,10; bonus bCritical,10; }

-13111,Rolling_Stone,Rolling Stone,4,10,,900,135,,9,1,134217728,7,2,2,1,14,1,,{ bonus bSplashRange,1; }

-13112,Black_Rose,Black Rose,4,10,,900,180,,9,1,134217728,7,2,2,2,35,1,,{ bonus bSplashRange,1; }

-13113,Gate_Keeper,Gate Keeper,4,10,,1000,195,,9,0,134217728,7,2,2,2,6,1,,{ bonus bSplashRange,1; }

-13114,Drifter,Drifter,4,10,,2300,50,,9,1,134217728,7,2,2,2,55,1,,{}

-13115,Butcher,Butcher,4,10,,2500,75,,9,1,134217728,7,2,2,2,68,1,,{ bonus2 bCriticalAddRace,RC_Brute,5; }

-13116,Butcher_,Butcher,4,10,,2500,75,,9,2,134217728,7,2,2,2,68,1,,{ bonus2 bCriticalAddRace,RC_Brute,5; }

-13117,Destroyer,Destroyer,4,10,,1200,220,,9,0,134217728,7,2,2,2,52,1,,{ bonus bHit,-10; } //break armor at close range

-13118,Destroyer_,Destroyer,4,10,,1200,220,,9,1,134217728,7,2,2,2,52,1,,{ bonus bHit,-10; } //break armor at close range

-13119,Inferno,Inferno,4,10,,1250,280,,9,1,134217728,7,2,2,2,65,1,,{}

+13150,Branch,Branch,4,10,,500,20,,9,3,134217728,7,2,2,1,1,1,,{}

+13100,Six_Shooter,Six Shooter,4,10,,400,30,,9,1,134217728,7,2,2,1,1,1,,{ bonus bHit,-10; }

+13101,Six_Shooter,Six Shooter,4,10,,400,30,,9,2,134217728,7,2,2,1,1,1,,{ bonus bHit,-10; }

+13102,Crimson_Bolt,Crimson Bolt,4,10,,450,45,,9,1,134217728,7,2,2,2,6,1,,{ bonus bHit,-10; }

+13103,Crimson_Bolt_,Crimson Bolt,4,10,,450,45,,9,2,134217728,7,2,2,2,6,1,,{ bonus bHit,-10; }

+13104,Garrison,Garrison,4,10,,500,70,,9,1,134217728,7,2,2,2,22,1,,{ bonus bHit,-10; }

+13105,Garrison_,Garrison,4,10,,500,70,,9,2,134217728,7,2,2,2,22,1,,{ bonus bHit,-10; }

+13106,Gold_Lux,Gold Lux,4,10,,500,20,,9,0,134217728,7,2,2,3,12,1,,{ bonus bHit,-10; }

+13151,Cyclone,Cyclone,4,10,,700,130,,9,1,134217728,7,2,2,2,24,1,,{ bonus bHit,10; bonus bCritical,10; }

+13152,Cyclone_,Cyclone,4,10,,700,130,,9,2,134217728,7,2,2,2,24,1,,{ bonus bHit,10; bonus bCritical,10; }

+13153,Dusk,Dusk,4,10,,750,160,,9,1,134217728,7,2,2,1,1,1,,{ bonus bHit,10; bonus bCritical,10; }

+13154,Rolling_Stone,Rolling Stone,4,10,,900,135,,9,1,134217728,7,2,2,1,14,1,,{ bonus bSplashRange,1; }

+13155,Black_Rose,Black Rose,4,10,,900,180,,9,1,134217728,7,2,2,2,35,1,,{ bonus bSplashRange,1; }

+13156,Gate_Keeper,Gate Keeper,4,10,,1000,195,,9,0,134217728,7,2,2,2,6,1,,{ bonus bSplashRange,1; }

+13157,Drifter,Drifter,4,10,,2300,50,,9,1,134217728,7,2,2,2,55,1,,{}

+13158,Butcher,Butcher,4,10,,2500,75,,9,1,134217728,7,2,2,2,68,1,,{ bonus2 bCriticalAddRace,RC_Brute,5; }

+13159,Butcher_,Butcher,4,10,,2500,75,,9,2,134217728,7,2,2,2,68,1,,{ bonus2 bCriticalAddRace,RC_Brute,5; }

+13160,Destroyer,Destroyer,4,10,,1200,220,,9,0,134217728,7,2,2,2,52,1,,{ bonus bHit,-10; } //break armor at close range

+13161,Destroyer_,Destroyer,4,10,,1200,220,,9,1,134217728,7,2,2,2,52,1,,{ bonus bHit,-10; } //break armor at close range

+13162,Inferno,Inferno,4,10,,1250,280,,9,1,134217728,7,2,2,2,65,1,,{}

 

 // Bullets

 13200,Bullet,Bullet,10,1,,2,10,,,,134217728,7,2,32768,,1,,,{}

@@ -2427,11 +2427,11 @@
 7524,Fang_,Fang,3,10,,10,,,,,,7,2,,,,,,{}

 

 // Ninja Weapons

-13006,Gokurin,Gokurin,4,10,,1000,140,,1,0,268435456,7,2,2,4,45,1,,{ bonus2 bAddEff,Eff_Curse,500; }

-13007,Jitte,Jitte,4,10,,1000,140,,1,0,268435456,7,2,2,4,45,1,,{ bonus bBreakWeaponRate,500; }

-13008,Jitte_,Jitte,4,10,,1000,140,,1,0,268435456,7,2,2,4,45,1,,{ bonus bBreakWeaponRate,500; }

-13009,Kamaitachi,Kamaitachi,4,10,,1000,140,,1,0,268435456,7,2,2,4,45,1,,{ bonus bCritical,1; }

-13010,Ashura,Ashura,4,0,,1000,140,,1,0,268435456,7,2,2,4,45,1,,{}

+13006,Gokurin,Gokurin,4,10,,1000,140,,1,0,268435456,7,2,2,4,45,1,19,{ bonus2 bAddEff,Eff_Curse,500; }

+13007,Jitte,Jitte,4,10,,1000,140,,1,0,268435456,7,2,2,4,45,1,20,{ bonus bBreakWeaponRate,500; }

+13008,Jitte_,Jitte,4,10,,1000,140,,1,0,268435456,7,2,2,4,45,1,21,{ bonus bBreakWeaponRate,500; }

+13009,Kamaitachi,Kamaitachi,4,10,,1000,140,,1,0,268435456,7,2,2,4,45,1,22,{ bonus bCritical,1; }

+13010,Ashura,Ashura,4,0,,1000,140,,1,0,268435456,7,2,2,4,45,1,23,{}

 13011,Ashura_,Ashura,4,0,,1000,140,,1,0,268435456,7,2,2,4,45,1,,{}

 13012,Murasame,Murasame,4,10,,1000,140,,1,0,268435456,7,2,2,4,45,1,,{ bonus2 bCriticalAddRace,RC_DemiHuman,5; }

 13013,Murasame_,Murasame,4,10,,1000,140,,1,0,268435456,7,2,2,4,45,1,,{}

diff --git a/db/skill_db.txt b/db/skill_db.txt
index 10fdf38d1..a1b3bab6e 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -518,28 +518,28 @@
 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 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#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 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#

+500,-5,6,1,-1,0,0,5,1,no,0,0,0,weapon,0	//GS_GLITTERING#Flip the Coin#

+501,-5,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//GS_FLING#Fling#

+502,-5,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//GS_TRIPLEACTION#Triple Action#

+503,-5,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//GS_BULLSEYE#Bulls Eye#

+504,-5,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//GS_MADNESSCANCEL#Madness Canceler#

+505,-5,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//GS_ADJUSTMENT#AdJustment#

+506,-5,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//GS_INCREASING#Increasing Accuracy#

+507,-5,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//GS_MAGICALBULLET#Magical Bullet#

+508,-5,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//GS_CRACKER#Cracker#

+509,-5,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_SINGLEACTION#Single Action#

+510,-5,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_SNAKEEYE#Snake Eye#

+511,-5,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_CHAINACTION#Chain Action#

+512,-5,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_TRACKING#Tracking#

+513,-5,6,1,-1,0,0,5,1,no,0,0,0,weapon,0	//GS_DISARM#Disarm#

+514,-5,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_PIERCINGSHOT#Piercing Shot#

+515,-5,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_RAPIDSHOWER#Rapid Shower#

+516,-5,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_DESPERADO#Desperado#

+517,-5,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_GATLINGFEVER#Gatling Fever#

+518,-5,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_DUST#Dust#

+519,-5,6,1,-1,0,0,5,1,no,0,0,0,weapon,0	//GS_FULLBUSTER#Full Buster#

+520,-5,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_SPREADATTACK#Spread Attack#

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

diff --git a/src/map/pc.c b/src/map/pc.c
index aa7e49481..792125ae5 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -3977,6 +3977,7 @@ unsigned short pc_jobid2mapid(unsigned short b_class)
 			break;

 		case JOB_GUNSLINGER:

 			class_ |= MAPID_GUNSLINGER;

+			break;

 		case JOB_NINJA:

 			class_ |= MAPID_NINJA;

 			break;

diff --git a/src/map/skill.c b/src/map/skill.c
index 8caa4031b..468850df1 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -3101,8 +3101,6 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl,int s
 	case GS_SPREADATTACK:

 	case GS_GROUNDDRIFT:

 	

-	case NV_BASIC:

-	case NV_FIRSTAID:

 	case NJ_TOBIDOUGU:

 	case NJ_SYURIKEN:

 	case NJ_KUNAI:

@@ -5664,8 +5662,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 	case GS_SPREADATTACK:

 	case GS_GROUNDDRIFT:

 	

-	case NV_BASIC:

-	case NV_FIRSTAID:

 	case NJ_TOBIDOUGU:

 	case NJ_SYURIKEN:

 	case NJ_KUNAI: