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

Fixed unproficient TWF bug.

Browse Source 
Fixed unproficient TWF bug.
Tried giving Bloodclaw Rending an on/off switch.
This commit is contained in:
Jaysyn904
2025-05-10 22:29:31 -04:00
parent e856279b2b
commit 2792ed00fc
16 changed files with 151 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nwn/nwnprc/trunk/include/prc_feat_const.nss
View File

@@ -3529,6 +3529,9 @@ const int FEAT_EPIC_ARTIFICER = 4072;
//Justice of Weald and Woe
const int FEAT_LUCKY_SHOT = 24021;
//:: Bloodclaw Master
const int FEAT_BCM_RENDING_CLAWS = 24065;
// Dread Necromancer
const int FEAT_DN_SCABROUS_TOUCH = 24145;
const int FEAT_DN_NEG_NRG_BURST = 24149;

66
nwn/nwnprc/trunk/include/prc_inc_wpnrest.nss
View File

@@ -607,8 +607,41 @@ int IsWeaponMartial(int nBaseItemType, object oPC)
return FALSE;
}
//checks to see if the PC can wield the weapon. If not, applies a -4 penalty.
void DoProficiencyCheck(object oPC, object oItem, int nHand)
{
int bProficient = FALSE;
int nBase = GetBaseItemType(oItem);
bProficient = IsProficient(oPC, nBase);
if (!bProficient)
{
if (nHand == ATTACK_BONUS_ONHAND)
{
SetCompositeAttackBonus(oPC, "Unproficient" + IntToString(ATTACK_BONUS_ONHAND), -4, ATTACK_BONUS_ONHAND);
}
if (nHand == ATTACK_BONUS_OFFHAND)
{
SetCompositeAttackBonus(oPC, "Unproficient" + IntToString(ATTACK_BONUS_OFFHAND), -4, ATTACK_BONUS_OFFHAND);
}
// Handle specific double-sided weapon logic
if (nBase == BASE_ITEM_DOUBLEAXE || nBase == BASE_ITEM_TWOBLADEDSWORD || nBase == BASE_ITEM_DIREMACE || nBase == BASE_ITEM_DOUBLE_SCIMITAR)
{ // This should only affect offhand if the main hand is these types
SetCompositeAttackBonus(oPC, "Unproficient" + IntToString(ATTACK_BONUS_OFFHAND), -4, ATTACK_BONUS_OFFHAND);
}
}
else
{
SetCompositeAttackBonus(oPC, "Unproficient" + IntToString(ATTACK_BONUS_ONHAND), 0, ATTACK_BONUS_ONHAND);
SetCompositeAttackBonus(oPC, "Unproficient" + IntToString(ATTACK_BONUS_OFFHAND), 0, ATTACK_BONUS_OFFHAND);
}
}
//checks to see if the PC can wield the weapon. If not, applies a -4 penalty.
/* void DoProficiencyCheck(object oPC, object oItem, int nHand)
{
int bProficient = FALSE;
@@ -631,9 +664,15 @@ void DoProficiencyCheck(object oPC, object oItem, int nHand)
SetCompositeAttackBonus(oPC, "Unproficient" + IntToString(nHand), -4, ATTACK_BONUS_ONHAND);
if(nBase == BASE_ITEM_DOUBLEAXE || nBase == BASE_ITEM_TWOBLADEDSWORD || nBase == BASE_ITEM_DIREMACE || nBase == BASE_ITEM_DOUBLE_SCIMITAR)
SetCompositeAttackBonus(oPC, "Unproficient" + IntToString(ATTACK_BONUS_OFFHAND), -4, ATTACK_BONUS_OFFHAND);
}
}
else
{
SetCompositeAttackBonus(oPC, "Unproficient" + IntToString(nHand), 0, ATTACK_BONUS_ONHAND);
if(nBase == BASE_ITEM_DOUBLEAXE || nBase == BASE_ITEM_TWOBLADEDSWORD || nBase == BASE_ITEM_DIREMACE || nBase == BASE_ITEM_DOUBLE_SCIMITAR)
SetCompositeAttackBonus(oPC, "Unproficient" + IntToString(ATTACK_BONUS_OFFHAND), 0, ATTACK_BONUS_OFFHAND);
}
}
*/
void DoWeaponEquip(object oPC, object oItem, int nHand)
{
if(GetIsDM(oPC) || !GetIsWeapon(oItem)) return;
@@ -662,7 +701,13 @@ void DoWeaponEquip(object oPC, object oItem, int nHand)
{
SetCompositeAttackBonus(oPC, "MonkeyGripL", -2, ATTACK_BONUS_OFFHAND);
SetCompositeAttackBonus(oPC, "MonkeyGripR", -2, ATTACK_BONUS_ONHAND);
}
}
else
{
SetCompositeAttackBonus(oPC, "MonkeyGripL", 0, ATTACK_BONUS_OFFHAND);
SetCompositeAttackBonus(oPC, "MonkeyGripR", 0, ATTACK_BONUS_ONHAND);
}
}
if(DEBUG) DoDebug("prc_inc_wpnrest - Weapon size: " + IntToString(nWeaponSize));
@@ -710,7 +755,13 @@ void DoWeaponEquip(object oPC, object oItem, int nHand)
{
SetCompositeAttackBonus(oPC, "OTWFL", 2, ATTACK_BONUS_OFFHAND);
SetCompositeAttackBonus(oPC, "OTWFR", 2, ATTACK_BONUS_ONHAND);
}
}
else
{
SetCompositeAttackBonus(oPC, "OTWFL", 0, ATTACK_BONUS_OFFHAND);
SetCompositeAttackBonus(oPC, "OTWFR", 0, ATTACK_BONUS_ONHAND);
}
}
}
@@ -749,7 +800,12 @@ void DoWeaponEquip(object oPC, object oItem, int nHand)
// Assign penalty
if(DEBUG) DoDebug("prc_inc_wpnrest - OTWFPenalty: " + IntToString(-2));
SetCompositeAttackBonus(oPC, "OTWFPenalty", -2);
}
}
else
{
SetCompositeAttackBonus(oPC, "OTWFPenalty", 0);
}
//Handle feat bonuses for Lightblade, thinblade, and courtblade
//using else if so they don't overlap.

3
nwn/nwnprc/trunk/include/prc_spell_const.nss
View File

@@ -10,6 +10,9 @@ const int SPELL_BLACKLIGHT = 2091;
const int SPELL_BARD_SONG = 411;
const int SPELL_BARD_CURSE_SONG = 644;
//:: Bloodclaw Master
const int SPELL_BCM_RENDING_CLAWS = 17997;
//:: Complete Warrior
const int SPELL_RANGED_DISARM = 3493;

1
nwn/nwnprc/trunk/include/psi_inc_core.nss
View File

@@ -871,6 +871,7 @@ void LocalCleanExtraFists(object oCreature)
oClean = GetNextItemInInventory(oCreature);
}
}
object GetPsionicCreatureWeapon(object oCreature, string sResRef, int nInventorySlot, float fDuration)
{
int bCreatedWeapon = FALSE;