TLK Cleanup

TLK Cleanup (thanks @barmlot).  Added grapple check to catch dead grappler.  Made plot items immune to PnP Disarm.  Fixed minor script typos.  Fixed missing Totemist soulmeld (thanks @barmlot). Fixed Grasping Shadows tlk pointer (thanks @barmlot).  Added Duskblade notes.

Notes/future spells/Duskblade Missing Spells.txt

@@ -0,0 +1,3 @@
+Toxic Weapon
+
+Darkvision

nwn/nwnprc/trunk/2das/soulmelds.2da

@@ -31,7 +31,7 @@
 27 GirallonArms              16836798 8726   13576    18727   18826      ****      ****     1        ****      ****  **** ****  4    **** ****      ****   ****  ****  **** 11    
 28 GlovesofthePoisonedSoul   16836800 8727   13577    18728   18827      ****      1        ****     1         ****  **** 3     **** **** ****      ****   ****  ****  **** ****  
 29 GorgonMask                16836803 8728   13578    18729   18828      ****      ****     1        ****      ****  **** ****  **** **** ****      7      ****  ****  **** 11    
-30 GreatRaptorMask           16836807 8729   13579    18730   18829      ****      ****     1        ****      ****  **** ****  **** 5    ****      ****   ****  ****  **** ****  
+30 GreatRaptorMask           16836807 8729   13579    18730   18829      ****      ****     1        ****      ****  **** ****  **** 5    ****      ****   ****  ****  **** 11    
 31 HeartofFire               16836809 8730   13580    18731   18830      ****      ****     1        ****      ****  **** ****  **** **** ****      ****   8     ****  **** 11    
 32 HuntersCirclet            16836811 8731   13581    18732   18831      ****      1        1        1         1     **** ****  **** **** ****      ****   ****  ****  **** 11    
 33 IllusionVeil              16836813 8732   13582    18733   18832      1         1        ****     1         ****  **** ****  **** 5    ****      ****   ****  ****  **** ****  

nwn/nwnprc/trunk/2das/spells.2da

@@ -18588,7 +18588,7 @@
 18584 SickeningShadows 16836066 **** N S s **** 0x2E shd_myst_sickshd **** **** **** **** **** **** 5 1500 head vco_smhannatr01 **** **** sco_mehannatr01 vs_chant_conj_lm vs_chant_conj_lf out 1000 **** **** **** **** 1 vpr_ectonatr01 homing hand spr_ectonatr01 path **** 1 **** **** **** **** **** 11 **** 1 6163 1 0 **** 1 **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** ****
 18585 DeadlyShade_Absorb 16836066 **** N S s **** 0x2E shd_myst_ddlyshd **** **** **** **** **** **** 6 1500 head vco_smhannatr01 **** **** sco_mehannatr01 vs_chant_conj_lm vs_chant_conj_lf out 1000 **** **** **** **** 1 vpr_ectonatr01 homing hand spr_ectonatr01 path **** 1 **** **** **** **** **** 11 **** 1 6163 1 0 **** 1 **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** ****
 18586 DeadlyShade_Deal 16836066 **** N S s **** 0x2E shd_myst_ddlyshd **** **** **** **** **** **** 6 1500 head vco_smhannatr01 **** **** sco_mehannatr01 vs_chant_conj_lm vs_chant_conj_lf out 1000 **** **** **** **** 1 vpr_ectonatr01 homing hand spr_ectonatr01 path **** 1 **** **** **** **** **** 11 **** 1 6163 1 0 **** 1 **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** ****
-18587 GraspingShadows 6341 is_Evards C M s **** 0x3E shd_myst_grspshd **** **** **** **** **** **** 7 1500 hand **** **** vco_megrdevil01 sco_megrdevil01 vs_chant_conj_hm vs_chant_conj_hf out 1000 **** **** **** **** 1 vpr_los homing hand spr_los path **** 0 **** **** **** **** **** 1 **** 1 6542 1 0 **** 1 **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** ****
+18587 GraspingShadows 16847688 is_Evards C M s **** 0x3E shd_myst_grspshd **** **** **** **** **** **** 7 1500 hand **** **** vco_megrdevil01 sco_megrdevil01 vs_chant_conj_hm vs_chant_conj_hf out 1000 **** **** **** **** 1 vpr_los homing hand spr_los path **** 0 **** **** **** **** **** 1 **** 1 6542 1 0 **** 1 **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** ****
 18588 MenagerieOfDarkness 16836072 is_X2DthArm T P s **** 0x09 shd_myst_menag **** **** **** **** **** **** 8 1500 hand **** vco_smhanelec01 **** sco_mehanelec01 vs_chant_conj_lm vs_chant_conj_lf self 1000 **** **** **** **** 0 **** **** **** **** **** **** 0 **** **** **** **** **** 12 **** 1 **** 1 0 **** 0 **** **** **** 0 **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** ****
 18589 BlackLabyrinth 16836072 is_X2DthArm C P s **** 0x09 shd_myst_lbyrnth **** **** **** **** **** **** 9 1500 hand **** vco_smhanelec01 **** sco_mehanelec01 vs_chant_conj_lm vs_chant_conj_lf self 1000 **** **** **** **** 0 **** **** **** **** **** **** 0 **** **** **** **** **** 12 **** 1 **** 1 0 **** 0 **** **** **** 0 **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** ****
 18590 **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** ****

nwn/nwnprc/trunk/include/inc_newspellbook.nss

@@ -313,7 +313,7 @@ int GetDCAbilityModForClass(int nClass, object oPC)
 			return GetAbilityScore(oPC, ABILITY_CHARISMA);		
         //outsider HD count as sorc for raks
         case CLASS_TYPE_OUTSIDER: {
-            /// @todo Will eventually need to add a check here to differentiate between races. Not all are sorcerers, just most
+            // @todo Will eventually need to add a check here to differentiate between races. Not all are sorcerers, just most
             return GetAbilityModifier(ABILITY_CHARISMA, oPC);
         }
     }
@@ -485,7 +485,7 @@ int bKnowsAllClassSpells(int nClass)
 int GetSpellKnownMaxCount(int nLevel, int nSpellLevel, int nClass, object oPC)
 {
     // If the character doesn't have any spell slots available on for this level, it can't know any spells of that level either
-    /// @todo Check rules. There might be cases where this doesn't hold
+    // @todo Check rules. There might be cases where this doesn't hold
     if(!GetSlotCount(nLevel, nSpellLevel, GetAbilityScoreForClass(nClass, oPC), nClass))
         return 0;
     int nKnown;

nwn/nwnprc/trunk/include/prc_inc_combmove.nss

@@ -1848,7 +1848,7 @@ int DoDisarm(object oPC, object oTarget, int nExtraBonus = 0, int nGenerateAoO =
 {
     object oTargetWep = GetItemInSlot(INVENTORY_SLOT_RIGHTHAND, oTarget);
     
-    if (!GetIsObjectValid(oTargetWep) || (!GetIsCreatureDisarmable(oTarget) && !GetPRCSwitch(PRC_PNP_DISARM)) || GetLocalInt(oTarget, "TigerFangDisarm")) 
+    if (!GetIsObjectValid(oTargetWep) || GetPlotFlag(oTargetWep) || (!GetIsCreatureDisarmable(oTarget) && !GetPRCSwitch(PRC_PNP_DISARM)) || GetLocalInt(oTarget, "TigerFangDisarm")) 
     {    
         FloatingTextStringOnCreature("Target is not a legal target", oPC, FALSE);
         AssignCommand(oPC, ActionAttack(oTarget));
@@ -2233,4 +2233,5 @@ void DoShieldCharge(object oPC, object oTarget, int nSlam = FALSE)
     }
 }
 
-//void main (){}
+//:: Test void
+//:: void main (){}

nwn/nwnprc/trunk/include/prc_misc_const.nss

@@ -268,7 +268,6 @@ const int POLYMORPH_TYPE_TWIG_BLIGHT		= 162;
 const int POLYMORPH_TYPE_MYCONID			= 163;
 const int POLYMORPH_TYPE_ALGOID				= 164;
 
-
 //::///////////////////
 //:: DOMAIN CONSTANTS
 //:: These constants are off by 1 to allow 0 to be the FALSE return value.

nwn/nwnprc/trunk/include/x2_inc_spellhook.nss

@@ -3171,4 +3171,4 @@ int X2PreSpellCastCode2()
 
 
 // Test main
-// void main(){}
+//:: void main(){}

nwn/nwnprc/trunk/scripts/prc_evnt_clbebil.nss

@@ -1,5 +1,5 @@
 //::///////////////////////////////////////////////
-//:: Name      Boneblade event script
+//:: Name      Claws of the Bebilith event script
 //:: FileName  prc_evnt_clbebil.nss
 //:://////////////////////////////////////////////
 #include "prc_inc_combmove"

nwn/nwnprc/trunk/scripts/prc_ft_secauth.nss

@@ -16,7 +16,7 @@ persuade and intimidate skills for 1 turn.
 void main()
 {
     object oPC = OBJECT_SELF;
-    int nBonus = 5 + GetLevelByClass(CLASS_TYPE_TEMPLAR, oPC) / 2;
+    int nBonus = (1 + GetLevelByClass(CLASS_TYPE_TEMPLAR, oPC)) / 2;
     float fDuration = TurnsToSeconds(1);
 
     effect eBonus = EffectSkillIncrease(SKILL_PERSUADE, nBonus);

nwn/nwnprc/trunk/scripts/prc_grapple.nss

@@ -77,8 +77,15 @@ int CanGrapple(object oPlayer)
          {
            bRet = FALSE;
          }
+		
+		if(GetIsDead(oPlayer))
+		{
+			bRet = FALSE;
+		}
+		
          e1 = GetNextEffect(oPlayer);
      }
+	 
     return bRet;
 }