Added PW hook for alcohol & onUserDefined. Removed ability score check for Psilike [PRC_IsPsiLike] creatures. Updated scripted Favored Enemy for Plant & Ooze. Removed extra scythe entry from CheckCraftingMaterial(). Added missing morningstar entry in GetBaseResRef(). Increased Template limit to 250. Changed Lich templates to count Practiced Spellcaster in calculation.

nwn/nwnprc/trunk/include/inc_eventhook.nss

@@ -396,7 +396,7 @@ int GetRunningEvent();
 
 //#include "inc_utility"
 //#include "prc_inc_array"
-#include "inc_pers_array"  // link higher than inc_array
+#include "inc_pers_array"  // link higher than prc_inc_array
 
 
 

nwn/nwnprc/trunk/include/inc_rand_equip.nss

@@ -3685,6 +3685,9 @@ string GetBaseResRef(int nBaseItemType)
     case BASE_ITEM_LONGSWORD:
         sResRef = "nw_wswls001";
         break;
+    case BASE_ITEM_MORNINGSTAR:
+        sResRef = "nw_wblms001";
+        break;        
     case BASE_ITEM_MAUL:
         sResRef = "prc_wxblma001";
         break;

nwn/nwnprc/trunk/include/inc_switch_setup.nss

@@ -783,7 +783,7 @@ void SetDefaultFileEnds()
     SetPRCSwitch("PRC_FILE_END_tdr01_edge", 18);
     SetPRCSwitch("PRC_FILE_END_tds01_edge", 12);
     SetPRCSwitch("PRC_FILE_END_tdt01_edge", 11);
-    SetPRCSwitch("PRC_FILE_END_templates", 105);
+    SetPRCSwitch("PRC_FILE_END_templates", 250);
     SetPRCSwitch("PRC_FILE_END_tib01_edge", 3);
     SetPRCSwitch("PRC_FILE_END_tic01_edge", 18);
     SetPRCSwitch("PRC_FILE_END_tid01_edge", 10);

nwn/nwnprc/trunk/include/prc_craft_inc.nss

@@ -1727,7 +1727,6 @@ int CheckCraftingMaterial(int nBaseItem, int nMaterial, int nBaseAC = -1)
         (nBaseItem == BASE_ITEM_QUARTERSTAFF) ||
         (nBaseItem == BASE_ITEM_CLUB) ||
         (nBaseItem == BASE_ITEM_NUNCHAKU) ||   //nunchaku
-        (nBaseItem == BASE_ITEM_SCYTHE) ||		
         (nBaseItem == BASE_ITEM_SCYTHE) ||
         (nBaseItem == BASE_ITEM_SHORTSPEAR) ||
         (nBaseItem == BASE_ITEM_TRIDENT) ||

nwn/nwnprc/trunk/include/prc_inc_combat.nss

@@ -3905,6 +3905,8 @@ int GetFavoredEnemyFeat(int iRacialType)
         case RACIAL_TYPE_SHAPECHANGER:          return FEAT_FAVORED_ENEMY_SHAPECHANGER;
         case RACIAL_TYPE_UNDEAD:                return FEAT_FAVORED_ENEMY_UNDEAD;
         case RACIAL_TYPE_VERMIN:                return FEAT_FAVORED_ENEMY_VERMIN;
+		case RACIAL_TYPE_PLANT:					return FEAT_FAVORED_ENEMY_PLANT;
+		case RACIAL_TYPE_OOZE:					return FEAT_FAVORED_ENEMY_OOZE;
     }
     return -1;
 }

nwn/nwnprc/trunk/include/prc_inc_template.nss

@@ -145,7 +145,7 @@ int ApplyTemplateToObject(int nTemplate, object oPC = OBJECT_SELF, int bApply =
     //sanity checks
     if(GetObjectType(oPC) != OBJECT_TYPE_CREATURE)
         return FALSE;
-    if(nTemplate < 0 || nTemplate > 200)
+    if(nTemplate < 0 || nTemplate > 250)
         return FALSE;
     
     //test if it can be applied

nwn/nwnprc/trunk/include/psi_inc_psifunc.nss

@@ -17,6 +17,7 @@
 //:://////////////////////////////////////////////
 //:://////////////////////////////////////////////
 
+//void main (){}
 
 //////////////////////////////////////////////////
 /*                 Constants                    */
@@ -714,7 +715,11 @@ struct manifestation EvaluateManifestation(object oManifester, object oTarget, s
     manif.nSpellID          = PRCGetSpellId();
 
     // Run an ability score check to see if the manifester can manifest the power at all
-    if(GetAbilityScoreOfClass(oManifester, nClass) - 10 < nPowerLevel && !bIgnoreConstraints && !bIsPsiLike && !GetHasSpellEffect(VESTIGE_ARETE, oManifester) && !GetHasSpellEffect(VESTIGE_THETRIAD, oManifester) && !GetHasSpellEffect(VESTIGE_ABYSM, oManifester) && manif.nSpellID != POWER_ELAN_RESILIANCE)
+	if (bIsPsiLike)
+    {
+        manif.bCanManifest = TRUE;
+    }	
+	else if(GetAbilityScoreOfClass(oManifester, nClass) - 10 < nPowerLevel && !bIgnoreConstraints && !bIsPsiLike && !GetHasSpellEffect(VESTIGE_ARETE, oManifester) && !GetHasSpellEffect(VESTIGE_THETRIAD, oManifester) && !GetHasSpellEffect(VESTIGE_ABYSM, oManifester) && manif.nSpellID != POWER_ELAN_RESILIANCE)
     {
         FloatingTextStrRefOnCreature(16826411, oManifester, FALSE); // "You do not have a high enough ability score to manifest this power"
         manif.bCanManifest = FALSE;

nwn/nwnprc/trunk/scripts/nw_c2_defaultd.nss

@@ -16,4 +16,5 @@ void main()
     // enter desired behaviour here
 
     ExecuteScript("prc_onuserdef", OBJECT_SELF);
+	ExecuteScript("prc_pwonuserdef", OBJECT_SELF);
 }

nwn/nwnprc/trunk/scripts/prc_domain_skin.nss

@@ -146,6 +146,7 @@ void AddDomainFeat(object oPC, object oSkin, int bFuncs)
         SetCompositeBonus(oSkin, "SpellDomainPowerConc", 2, ITEM_PROPERTY_SKILL_BONUS, SKILL_CONCENTRATION);
         SetCompositeBonus(oSkin, "SpellDomainPowerSpell", 2, ITEM_PROPERTY_SKILL_BONUS, SKILL_SPELLCRAFT);
     }
+
     // Electrical resist 5
     if (GetHasFeat(FEAT_DOMAIN_POWER_STORM, oPC))
     {

nwn/nwnprc/trunk/scripts/tmp_t_lich.nss

@@ -169,8 +169,8 @@ void main()
         SetExecutedScriptReturnValue(X2_EXECUTE_SCRIPT_END);
     }
 
-    int nArcCasterLevel = GetPrCAdjustedCasterLevelByType(TYPE_ARCANE, oPC, FALSE);
+    int nArcCasterLevel = GetPrCAdjustedCasterLevelByType(TYPE_ARCANE, oPC, TRUE);
-    int nDivCasterLevel = GetPrCAdjustedCasterLevelByType(TYPE_DIVINE, oPC, FALSE);
+    int nDivCasterLevel = GetPrCAdjustedCasterLevelByType(TYPE_DIVINE, oPC, TRUE);
     if(nArcCasterLevel < 11 && nDivCasterLevel < 11)
     {
         SendMessageToPC(oPC, sString+"Arcane Caster Level = "+IntToString(nArcCasterLevel));

nwn/nwnprc/trunk/scripts/tmp_t_licha.nss

@@ -111,8 +111,8 @@ void main()
         SetExecutedScriptReturnValue(X2_EXECUTE_SCRIPT_END);
     }
 	
-    int nArcCasterLevel = GetPrCAdjustedCasterLevelByType(TYPE_ARCANE, oPC, FALSE);
+    int nArcCasterLevel = GetPrCAdjustedCasterLevelByType(TYPE_ARCANE, oPC, TRUE);
-    int nDivCasterLevel = GetPrCAdjustedCasterLevelByType(TYPE_DIVINE, oPC, FALSE);
+    int nDivCasterLevel = GetPrCAdjustedCasterLevelByType(TYPE_DIVINE, oPC, TRUE);
     if(nArcCasterLevel < 11 && nDivCasterLevel < 11)
     {
         SendMessageToPC(oPC, sString+"Arcane Caster Level = "+IntToString(nArcCasterLevel));

nwn/nwnprc/trunk/scripts/tmp_t_lichd.nss

@@ -222,8 +222,8 @@ void main()
         SetExecutedScriptReturnValue(X2_EXECUTE_SCRIPT_END);
     }
 
-    int nArcCasterLevel = GetPrCAdjustedCasterLevelByType(TYPE_ARCANE, oPC, FALSE);
+    int nArcCasterLevel = GetPrCAdjustedCasterLevelByType(TYPE_ARCANE, oPC, TRUE);
-    int nDivCasterLevel = GetPrCAdjustedCasterLevelByType(TYPE_DIVINE, oPC, FALSE);
+    int nDivCasterLevel = GetPrCAdjustedCasterLevelByType(TYPE_DIVINE, oPC, TRUE);
     if(nArcCasterLevel < 21 && nDivCasterLevel < 21)
     {
         SendMessageToPC(oPC, PRC_TEXT_RED+sString+"Arcane Caster Level = "+IntToString(nArcCasterLevel));

nwn/nwnprc/trunk/spells/nw_s3_alcohol.nss

@@ -15,13 +15,13 @@
 //:: Modified by Jeremiah Teague for
 //:: Drunken Master Prestige Class
 //:://////////////////////////////////////////////
-
 #include "prc_inc_clsfunc"
 
 void main()
 {
-    int nSpellID = GetSpellId();
+	int nSpellID 		= PRCGetSpellId();
-    int nDrunkenMaster = GetLevelByClass(CLASS_TYPE_DRUNKEN_MASTER);
+    int nDrunkenMaster 	= GetLevelByClass(CLASS_TYPE_DRUNKEN_MASTER);
+		
     if(nDrunkenMaster)
     {
         if(nDrunkenMaster > 4)
@@ -35,6 +35,14 @@ void main()
         DrunkenMasterSpeakString();
         DrunkenMasterCreateEmptyBottle(nSpellID);
     }
-    else
+
-        MakeDrunk(nSpellID);
+//:: Only overrides alcohol payload if PW hook script exists.    
-}
+	if(ResManGetAliasFor("prc_pwalcohol", RESTYPE_NSS) != "")
+	{
+		ExecuteScript("prc_pwalcohol");
+	}
+	
+	else
+		MakeDrunk(nSpellID);
+	
+}

nwn/nwnprc/trunk/tlk/prc8_consortium.tlk.xml

@@ -27433,7 +27433,7 @@ Use: Selected.</entry>
 Requires Training: Yes.
 Classes: Truenamer, Truenaming prestige classes.
 
-A successful check allows a character to properly truespeak an utterance, changing the universe in some way. This skill is only used by those versed in truename magic. This skill is cross-class for all classes except Truenamer and Truenaming prestige classes unless the character has the Truename Training feat.
+A successful check allows a character to properly truespeak an utterance, changing the universe in some way. This skill is only used by those versed in truename magic. This skill is cross-class for all classes except Truenamer and Truenaming prestige classes unless the character has the Truename Training feat.  If you select more ranks in Truespeak than you are allowed to take you will be forced to relevel.
 Use: Automatic.</entry>
   <entry id="51256" lang="en" sex="m">Return to lexicon selection.</entry>
   <entry id="51257" lang="en" sex="m">Select level of utterance to gain.
@@ -58502,7 +58502,7 @@ Use: Automatic</entry>
   <entry id="61013" lang="en" sex="m">Shield Specialization (Heavy)</entry>
   <entry id="61014" lang="en" sex="m">Type of Feat: General
 Prerequisites: Shield proficiency
-Benefit: Choose one type of shield from the following list: heavy, or light. When using a shield of the appropriate type, you increase its shield bonus to AC by 1.
+Benefit: When using a shield of the appropriate type, you increase its shield bonus to AC by 1.  The heavy sheild version of this feat does not work with tower shields.
 Use: Automatic</entry>
   <entry id="61015" lang="en" sex="m">Shield Ward</entry>
   <entry id="61016" lang="en" sex="m">Type of Feat: General