- Changed some duplicates so they use a floating NPC as their original. (bugreport:1395)

- Fixed the NPC looking for missing label in the Cursed Spirit quest. (bugreport:4654)
- Applied Uno's fix for the cooldown condition in Endless Tower. (bugreport:4677)
- Removed level requirement for the Viens Stone gathering quest. (bugreport:4678)
- Added the missing restricted skills to zone 6 for Endless Tower. (bugreport:4707)
  It's worth noting how much I hate the system for restricting skills per zone.
- Fixed Cat Hand warp service warping players to all warp options. (bugreport:4709)
- Fixed floor 75 warp in endless tower disabling the wrong warp. (bugreport:4711)
- Added a condition for Chungwolmang to only delete items if a certain ID is specified. (bugreport:4719)
- Corrected a mobcount specifying the wrong NPC in the Moscovia Ship quest. (bugreport:4736)


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

1 files changed, 30 insertions, 20 deletions

diff --git a/db/skill_nocast_db.txt b/db/skill_nocast_db.txt
index f52324d0e..47ec1226b 100644
--- a/db/skill_nocast_db.txt
+++ b/db/skill_nocast_db.txt
@@ -39,12 +39,14 @@
 27,8	//AL_WARP
 87,8	//WZ_ICEWALL
 150,8	//TF_BACKSLIDING
+264,8	//MO_BODYRELOCATION
 361,8	//HP_ASSUMPTIO
 362,8	//HP_BASILICA
 395,8	//CG_MOONLIT
+396,8	//CG_MARIONETTE
 491,8	//CR_CULTIVATION
 411,8	//TK_RUN
-426,8	//High Jump
+426,8	//TK_HIGHJUMP
 427,8	//SG_FEEL
 428,8	//SG_SUN_WARM
 429,8	//SG_MOON_WARM
@@ -59,6 +61,7 @@
 438,8	//SG_SUN_BLESS
 439,8	//SG_MOON_BLESS
 440,8	//SG_STAR_BLESS
+530,8	//NJ_KIRIKAGE
 691,8	//CASH_ASSUMPITO
 
 //mixed
@@ -69,34 +72,41 @@
 79,16	//PR_MAGNUS
 
 //Zone 1 - Aldebaran Turbo Track
-219,32	//Snatch
-26,32	//Teleport
-27,32	//Warp portal
-51,32	//Hiding
-135,32	//Cloaking
-389,32	//Stealth
-35,32	//Cure
-87,32	//Ice Wall
-359,32	//Berserk (Frenzy)
-362,32	//Basilica
-395,32	//Sheltering Bliss
-357,32	//Spear Dynamo (Concentration)
-264,32	//Snap (Body Relocation)
+219,32	//RG_INTIMIDATE
+26,32	//AL_TELEPORT
+27,32	//AL_WARP
+51,32	//TF_HIDING
+135,32	//AS_CLOAKING
+389,32	//ST_CHASEWALK
+35,32	//AL_CURE
+87,32	//WZ_ICEWALL
+359,32	//LK_BERSERK
+362,32	//HP_BASILICA
+395,32	//CG_MOONLIT
+357,32	//LK_CONCENTRATION
+264,32	//MO_BODYRELOCATION
 
 //Zone 2 - Jail
-421,64	//TK_JUMPKICK#Flying Side Kick#
-426,64	//TK_HIGHJUMP#Taekwon Jump#
+421,64	//TK_JUMPKICK
+426,64	//TK_HIGHJUMP
 
 //Zone 3 - Izlude Battle Arena
-219,128 //Snatch
-26,128	//Teleport
+219,128 //RG_INTIMIDATE
+26,128	//AL_TELEPORT
 
 //Zone 4 - WoE:SE
-426,256 //High Jump
+426,256 //TK_HIGHJUMP
 
 //Zone 5 - Sealed Shrine
 12,512	//MG_SAFETYWALL
 26,512	//AL_TELEPORT
-219,512	//Snatch
+219,512	//RG_INTIMIDATE
 361,512	//HP_ASSUMPTIO
 691,512	//CASH_ASSUMPTIO
+
+//Zone 6 -Endless Tower
+26,1024	//AL_TELEPORT
+87,1024	//WZ_ICEWALL
+219,1024	//RG_INTIMIDATE
+405,1024	//PF_SPIDERWEB
+674,1024	//NPC_EXPULSION