No more disarming yourself.

No more disarming yourself.  Fixed Reckless Rage typo.  Updated release archive.

nwn/nwnprc/trunk/include/prc_inc_combmove.nss

@@ -1898,23 +1898,33 @@ int DoDisarm(object oPC, object oTarget, int nExtraBonus = 0, int nGenerateAoO =
         if (DEBUG_COMBAT_MOVE) DoDebug("Warblade Battle Skill Disarm bonus (defender)");
     }
     if (GetHasFeat(FEAT_PRC_IMP_DISARM, oPC)) 
-    {
+	// Check if oPC is the same as oTarget and return immediately
-        nPCAttack += 4;
+	if (oPC == oTarget)
-        nGenerateAoO = FALSE;
+	{
-        nCounter = FALSE;
+		FloatingTextStringOnCreature("You can't Disarm yourself.", oPC, FALSE);
-    }    
+		return FALSE;
-    // Do the AoO for a trip attempt
+	}
-    if (nGenerateAoO)
+
-    {
+	if (GetHasFeat(FEAT_PRC_IMP_DISARM, oPC)) 
-        // Perform the Attack
+	{
-        effect eNone;
+		nPCAttack += 4;
-        DelayCommand(0.0, PerformAttack(oPC, oTarget, eNone, 0.0, 0, 0, 0, "Attack of Opportunity Hit", "Attack of Opportunity Miss"));    
+		nGenerateAoO = FALSE;
-        if (GetLocalInt(oPC, "PRCCombat_StruckByAttack"))
+		nCounter = FALSE;
-        {
+	}    
-            FloatingTextStringOnCreature("You have failed at your Disarm Attempt.", oPC, FALSE);
+
-            return FALSE;
+	// Do the AoO for a trip attempt
-        }            
+	if (nGenerateAoO)
-    }
+	{
+		// Perform the Attack
+		effect eNone;
+		DelayCommand(0.0, PerformAttack(oPC, oTarget, eNone, 0.0, 0, 0, 0, "Attack of Opportunity Hit", "Attack of Opportunity Miss"));    
+		if (GetLocalInt(oPC, "PRCCombat_StruckByAttack"))
+		{
+			FloatingTextStringOnCreature("You have failed at your Disarm Attempt.", oPC, FALSE);
+			return FALSE;
+		}            
+	}
+
     
     SendMessageToPC(oPC, "Disarm Check: "+IntToString(nPCAttack)+" vs "+IntToString(nTargetAttack));
     // Now the outcome

nwn/nwnprc/trunk/makefile.temp

@@ -328,6 +328,7 @@ include\prc_inc_chat_pow.nss \
 include\prc_inc_chat_shf.nss \
 include\prc_inc_clsfunc.nss \
 include\prc_inc_combat.nss \
+include\prc_inc_combmove.ncs \
 include\prc_inc_combmove.nss \
 include\prc_inc_core.nss \
 include\prc_inc_damage.nss \

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

@@ -68097,7 +68097,7 @@ Use: Automatic.</entry>
   <entry id="70129" lang="en" sex="m">Reckless Rage</entry>
   <entry id="70130" lang="en" sex="m">Type of Feat: General
 Prerequisite: Ability to Rage, Con 13
-Specifics: You gain an additional +2 bonus to Strength and Rage, and a further -2 penalty to AC.
+Specifics: Whenever you activate your rage ability, you take an additional -2 penalty to your Armor Class, but you gain an additional +2 bonus to Strength and Constitution. These bonuses and penalties stack with the effects of rage, greater rage, and mighty rage.
 Use: Automatic.</entry>
   <entry id="70131" lang="en" sex="m">Heavy Lithoderms</entry>
   <entry id="70132" lang="en" sex="m">Type of Feat: General