diff --git a/Release/PRC8_20241221.7z b/Release/PRC8_20241221.7z
new file mode 100644
index 00000000..cbee1b94
Binary files /dev/null and b/Release/PRC8_20241221.7z differ
diff --git a/Release/PRC8_20241220.7z b/_backup/PRC8_20241220.7z
similarity index 100%
rename from Release/PRC8_20241220.7z
rename to _backup/PRC8_20241220.7z
diff --git a/nwn/nwnprc/trunk/include/prc_inc_combmove.nss b/nwn/nwnprc/trunk/include/prc_inc_combmove.nss
index 7234523b..8b8ad44a 100644
--- a/nwn/nwnprc/trunk/include/prc_inc_combmove.nss
+++ b/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))
- {
- nPCAttack += 4;
- nGenerateAoO = FALSE;
- nCounter = 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;
- }
- }
+ // Check if oPC is the same as oTarget and return immediately
+ if (oPC == oTarget)
+ {
+ FloatingTextStringOnCreature("You can't Disarm yourself.", oPC, FALSE);
+ return FALSE;
+ }
+
+ if (GetHasFeat(FEAT_PRC_IMP_DISARM, oPC))
+ {
+ nPCAttack += 4;
+ nGenerateAoO = FALSE;
+ nCounter = 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
diff --git a/nwn/nwnprc/trunk/makefile.temp b/nwn/nwnprc/trunk/makefile.temp
index fb8a0fae..feb3085a 100644
--- a/nwn/nwnprc/trunk/makefile.temp
+++ b/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 \
diff --git a/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk b/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk
index 145d1d08..dfe179b2 100644
Binary files a/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk and b/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk differ
diff --git a/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk.xml b/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk.xml
index f0fccd0b..7eb49ea3 100644
--- a/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk.xml
+++ b/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk.xml
@@ -68097,7 +68097,7 @@ Use: Automatic.
Reckless Rage
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.
Heavy Lithoderms
Type of Feat: General
diff --git a/nwn/nwnprc/trunk/tlk/prc_consortium.tlk b/nwn/nwnprc/trunk/tlk/prc_consortium.tlk
index 145d1d08..dfe179b2 100644
Binary files a/nwn/nwnprc/trunk/tlk/prc_consortium.tlk and b/nwn/nwnprc/trunk/tlk/prc_consortium.tlk differ