Jaysyn/PRC8
1
0
Fork 0
Code Issues 21 Pull Requests Packages Projects Releases Wiki Activity

No more disarming yourself.

Browse Source 
No more disarming yourself.  Fixed Reckless Rage typo.  Updated release archive.
This commit is contained in:
Jaysyn904
2024-12-21 21:52:44 -05:00
parent 4f8ad7c575
commit 02658b7717
7 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
nwn/nwnprc/trunk/include/prc_inc_combmove.nss
View File

@@ -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