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

2025/05/16 Update

Browse Source 
Expanded Warblade for epic progression.
Warblade's Aptitude Focus now works with all new weapons.
Expanded Knight of the Middle Circle for epic progression.
Added Swarm of Arrows to fighter bonus feat list.
Added Vile Martial Strike feats for all new weapons.
Added Sanctified Martial Strike feats for all new weapons.
Added missing iprp feats for Eagle Claw & Trident.
Bestow Power shouldn't work on the caster.
Spell Betrayal should only affect a target once per spell casting.
Sap is a Martial weapon.
Arcane Duelist's False Keenness now works with all new weapons.
Disciple of Dispater's Rusting Grasp now works on the appropriate new weapons.
Animate Object now works with all the new weapon types.
This commit is contained in:
Jaysyn904
2025-05-16 16:40:51 -04:00
parent 53c5a9789f
commit 95480e23dd
24 changed files with 3764 additions and 2785 deletions
Download Patch File Download Diff File Expand all files Collapse all files

167
nwn/nwnprc/trunk/include/prc_inc_fork.nss
View File

@@ -263,10 +263,23 @@ int GetFocusFeatOfWeaponType(int iWeaponType)
case BASE_ITEM_WARHAMMER: return FEAT_WEAPON_FOCUS_WAR_HAMMER;
case BASE_ITEM_WHIP: return FEAT_WEAPON_FOCUS_WHIP;
// new item types
case BASE_ITEM_ELVEN_LIGHTBLADE: return FEAT_WEAPON_FOCUS_ELVEN_LIGHTBLADE;
case BASE_ITEM_ELVEN_THINBLADE: return FEAT_WEAPON_FOCUS_ELVEN_THINBLADE;
case BASE_ITEM_ELVEN_COURTBLADE: return FEAT_WEAPON_FOCUS_ELVEN_COURTBLADE;
//:: new item types
case BASE_ITEM_DOUBLE_SCIMITAR: return FEAT_WEAPON_FOCUS_DOUBLE_SCIMITAR;
case BASE_ITEM_EAGLE_CLAW: return FEAT_WEAPON_FOCUS_EAGLE_CLAW;
case BASE_ITEM_ELVEN_COURTBLADE: return FEAT_WEAPON_FOCUS_ELVEN_COURTBLADE;
case BASE_ITEM_ELVEN_LIGHTBLADE: return FEAT_WEAPON_FOCUS_ELVEN_LIGHTBLADE;
case BASE_ITEM_ELVEN_THINBLADE: return FEAT_WEAPON_FOCUS_ELVEN_THINBLADE;
case BASE_ITEM_FALCHION: return FEAT_WEAPON_FOCUS_FALCHION;
case BASE_ITEM_GOAD: return FEAT_WEAPON_FOCUS_GOAD;
case BASE_ITEM_HEAVY_MACE: return FEAT_WEAPON_FOCUS_HEAVY_MACE;
case BASE_ITEM_HEAVY_PICK: return FEAT_WEAPON_FOCUS_HEAVY_PICK;
case BASE_ITEM_KATAR: return FEAT_WEAPON_FOCUS_KATAR;
case BASE_ITEM_LIGHT_LANCE: return FEAT_WEAPON_FOCUS_LIGHT_LANCE;
case BASE_ITEM_LIGHT_PICK: return FEAT_WEAPON_FOCUS_LIGHT_PICK;
case BASE_ITEM_MAUL: return FEAT_WEAPON_FOCUS_MAUL;
case BASE_ITEM_NUNCHAKU: return FEAT_WEAPON_FOCUS_NUNCHAKU;
case BASE_ITEM_SAI: return FEAT_WEAPON_FOCUS_SAI;
case BASE_ITEM_SAP: return FEAT_WEAPON_FOCUS_SAP;
}
return -1;
}
@@ -320,10 +333,23 @@ int GetSpecializationFeatOfWeaponType(int iWeaponType)
case BASE_ITEM_WARHAMMER: return FEAT_WEAPON_SPECIALIZATION_WAR_HAMMER;
case BASE_ITEM_WHIP: return FEAT_WEAPON_SPECIALIZATION_WHIP;
// new item types
case BASE_ITEM_ELVEN_LIGHTBLADE: return FEAT_WEAPON_SPECIALIZATION_ELVEN_LIGHTBLADE;
case BASE_ITEM_ELVEN_THINBLADE: return FEAT_WEAPON_SPECIALIZATION_ELVEN_THINBLADE;
case BASE_ITEM_ELVEN_COURTBLADE: return FEAT_WEAPON_SPECIALIZATION_ELVEN_COURTBLADE;
//:: new item types
case BASE_ITEM_DOUBLE_SCIMITAR: return FEAT_WEAPON_SPECIALIZATION_DBL_SCIMITAR;
case BASE_ITEM_EAGLE_CLAW: return FEAT_WEAPON_SPECIALIZATION_EAGLE_CLAW;
case BASE_ITEM_ELVEN_LIGHTBLADE: return FEAT_WEAPON_SPECIALIZATION_ELVEN_LIGHTBLADE;
case BASE_ITEM_ELVEN_THINBLADE: return FEAT_WEAPON_SPECIALIZATION_ELVEN_THINBLADE;
case BASE_ITEM_ELVEN_COURTBLADE: return FEAT_WEAPON_SPECIALIZATION_ELVEN_COURTBLADE;
case BASE_ITEM_FALCHION: return FEAT_WEAPON_SPECIALIZATION_FALCHION;
case BASE_ITEM_GOAD: return FEAT_WEAPON_SPECIALIZATION_GOAD;
case BASE_ITEM_HEAVY_MACE: return FEAT_WEAPON_SPECIALIZATION_HEAVY_MACE;
case BASE_ITEM_HEAVY_PICK: return FEAT_WEAPON_SPECIALIZATION_HEAVY_PICK;
case BASE_ITEM_KATAR: return FEAT_WEAPON_SPECIALIZATION_KATAR;
case BASE_ITEM_LIGHT_LANCE: return FEAT_WEAPON_SPECIALIZATION_LIGHT_LANCE;
case BASE_ITEM_LIGHT_PICK: return FEAT_WEAPON_SPECIALIZATION_LIGHT_PICK;
case BASE_ITEM_MAUL: return FEAT_WEAPON_SPECIALIZATION_MAUL;
case BASE_ITEM_NUNCHAKU: return FEAT_WEAPON_SPECIALIZATION_NUNCHAKU;
case BASE_ITEM_SAI: return FEAT_WEAPON_SPECIALIZATION_SAI;
case BASE_ITEM_SAP: return FEAT_WEAPON_SPECIALIZATION_SAP;
}
return -1;
}
@@ -377,10 +403,23 @@ int GetEpicFocusFeatOfWeaponType(int iWeaponType)
case BASE_ITEM_WARHAMMER: return FEAT_EPIC_WEAPON_FOCUS_WARHAMMER;
case BASE_ITEM_WHIP: return FEAT_EPIC_WEAPON_FOCUS_WHIP;
// new item types
case BASE_ITEM_ELVEN_LIGHTBLADE: return FEAT_EPIC_WEAPON_FOCUS_ELVEN_LIGHTBLADE;
case BASE_ITEM_ELVEN_THINBLADE: return FEAT_EPIC_WEAPON_FOCUS_ELVEN_THINBLADE;
case BASE_ITEM_ELVEN_COURTBLADE: return FEAT_EPIC_WEAPON_FOCUS_ELVEN_COURTBLADE;
//:: new item types
case BASE_ITEM_DOUBLE_SCIMITAR: return FEAT_EPIC_WEAPON_FOCUS_DBL_SCIMITAR;
case BASE_ITEM_EAGLE_CLAW: return FEAT_EPIC_WEAPON_FOCUS_EAGLE_CLAW;
case BASE_ITEM_ELVEN_LIGHTBLADE: return FEAT_EPIC_WEAPON_FOCUS_ELVEN_LIGHTBLADE;
case BASE_ITEM_ELVEN_THINBLADE: return FEAT_EPIC_WEAPON_FOCUS_ELVEN_THINBLADE;
case BASE_ITEM_ELVEN_COURTBLADE: return FEAT_EPIC_WEAPON_FOCUS_ELVEN_COURTBLADE;
case BASE_ITEM_FALCHION: return FEAT_EPIC_WEAPON_FOCUS_FALCHION;
case BASE_ITEM_GOAD: return FEAT_EPIC_WEAPON_FOCUS_GOAD;
case BASE_ITEM_HEAVY_MACE: return FEAT_EPIC_WEAPON_FOCUS_HEAVY_MACE;
case BASE_ITEM_HEAVY_PICK: return FEAT_EPIC_WEAPON_FOCUS_HEAVY_PICK;
case BASE_ITEM_KATAR: return FEAT_EPIC_WEAPON_FOCUS_KATAR;
case BASE_ITEM_LIGHT_LANCE: return FEAT_EPIC_WEAPON_FOCUS_LIGHT_LANCE;
case BASE_ITEM_LIGHT_PICK: return FEAT_EPIC_WEAPON_FOCUS_LIGHT_PICK;
case BASE_ITEM_MAUL: return FEAT_EPIC_WEAPON_FOCUS_MAUL;
case BASE_ITEM_NUNCHAKU: return FEAT_EPIC_WEAPON_FOCUS_NUNCHAKU;
case BASE_ITEM_SAI: return FEAT_EPIC_WEAPON_FOCUS_SAI;
case BASE_ITEM_SAP: return FEAT_EPIC_WEAPON_FOCUS_SAP;
}
return -1;
}
@@ -434,10 +473,23 @@ int GetEpicSpecializationFeatOfWeaponType(int iWeaponType)
case BASE_ITEM_WARHAMMER: return FEAT_EPIC_WEAPON_SPECIALIZATION_WARHAMMER;
case BASE_ITEM_WHIP: return FEAT_EPIC_WEAPON_SPECIALIZATION_WHIP;
// new item types
case BASE_ITEM_ELVEN_LIGHTBLADE: return FEAT_EPIC_WEAPON_SPECIALIZATION_ELVEN_LIGHTBLADE;
case BASE_ITEM_ELVEN_THINBLADE: return FEAT_EPIC_WEAPON_SPECIALIZATION_ELVEN_THINBLADE;
case BASE_ITEM_ELVEN_COURTBLADE: return FEAT_EPIC_WEAPON_SPECIALIZATION_ELVEN_COURTBLADE;
//:: new item types
case BASE_ITEM_DOUBLE_SCIMITAR: return FEAT_EPIC_WEAPON_SPECIALIZATION_DBL_SCIMITAR;
case BASE_ITEM_EAGLE_CLAW: return FEAT_EPIC_WEAPON_SPECIALIZATION_EAGLE_CLAW;
case BASE_ITEM_ELVEN_LIGHTBLADE: return FEAT_EPIC_WEAPON_SPECIALIZATION_ELVEN_LIGHTBLADE;
case BASE_ITEM_ELVEN_THINBLADE: return FEAT_EPIC_WEAPON_SPECIALIZATION_ELVEN_THINBLADE;
case BASE_ITEM_ELVEN_COURTBLADE: return FEAT_EPIC_WEAPON_SPECIALIZATION_ELVEN_COURTBLADE;
case BASE_ITEM_FALCHION: return FEAT_EPIC_WEAPON_SPECIALIZATION_FALCHION;
case BASE_ITEM_GOAD: return FEAT_EPIC_WEAPON_SPECIALIZATION_GOAD;
case BASE_ITEM_HEAVY_MACE: return FEAT_EPIC_WEAPON_SPECIALIZATION_HEAVY_MACE;
case BASE_ITEM_HEAVY_PICK: return FEAT_EPIC_WEAPON_SPECIALIZATION_HEAVY_PICK;
case BASE_ITEM_KATAR: return FEAT_EPIC_WEAPON_SPECIALIZATION_KATAR;
case BASE_ITEM_LIGHT_LANCE: return FEAT_EPIC_WEAPON_SPECIALIZATION_LIGHT_LANCE;
case BASE_ITEM_LIGHT_PICK: return FEAT_EPIC_WEAPON_SPECIALIZATION_LIGHT_PICK;
case BASE_ITEM_MAUL: return FEAT_EPIC_WEAPON_SPECIALIZATION_MAUL;
case BASE_ITEM_NUNCHAKU: return FEAT_EPIC_WEAPON_SPECIALIZATION_NUNCHAKU;
case BASE_ITEM_SAI: return FEAT_EPIC_WEAPON_SPECIALIZATION_SAI;
case BASE_ITEM_SAP: return FEAT_EPIC_WEAPON_SPECIALIZATION_SAP;
}
return -1;
}
@@ -491,10 +543,23 @@ int GetImprovedCriticalFeatOfWeaponType(int iWeaponType)
case BASE_ITEM_WARHAMMER: return FEAT_IMPROVED_CRITICAL_WAR_HAMMER;
case BASE_ITEM_WHIP: return FEAT_IMPROVED_CRITICAL_WHIP;
// new item types
case BASE_ITEM_ELVEN_LIGHTBLADE: return FEAT_IMPROVED_CRITICAL_ELVEN_LIGHTBLADE;
case BASE_ITEM_ELVEN_THINBLADE: return FEAT_IMPROVED_CRITICAL_ELVEN_THINBLADE;
case BASE_ITEM_ELVEN_COURTBLADE: return FEAT_IMPROVED_CRITICAL_ELVEN_COURTBLADE;
//:: new item types
case BASE_ITEM_DOUBLE_SCIMITAR: return FEAT_IMPROVED_CRITICAL_DBL_SCIMITAR;
case BASE_ITEM_EAGLE_CLAW: return FEAT_IMPROVED_CRITICAL_EAGLE_CLAW;
case BASE_ITEM_ELVEN_LIGHTBLADE: return FEAT_IMPROVED_CRITICAL_ELVEN_LIGHTBLADE;
case BASE_ITEM_ELVEN_THINBLADE: return FEAT_IMPROVED_CRITICAL_ELVEN_THINBLADE;
case BASE_ITEM_ELVEN_COURTBLADE: return FEAT_IMPROVED_CRITICAL_ELVEN_COURTBLADE;
case BASE_ITEM_FALCHION: return FEAT_IMPROVED_CRITICAL_FALCHION;
case BASE_ITEM_GOAD: return FEAT_IMPROVED_CRITICAL_GOAD;
case BASE_ITEM_HEAVY_MACE: return FEAT_IMPROVED_CRITICAL_HEAVY_MACE;
case BASE_ITEM_HEAVY_PICK: return FEAT_IMPROVED_CRITICAL_HEAVY_PICK;
case BASE_ITEM_KATAR: return FEAT_IMPROVED_CRITICAL_KATAR;
case BASE_ITEM_LIGHT_LANCE: return FEAT_IMPROVED_CRITICAL_LIGHT_LANCE;
case BASE_ITEM_LIGHT_PICK: return FEAT_IMPROVED_CRITICAL_LIGHT_PICK;
case BASE_ITEM_MAUL: return FEAT_IMPROVED_CRITICAL_MAUL;
case BASE_ITEM_NUNCHAKU: return FEAT_IMPROVED_CRITICAL_NUNCHAKU;
case BASE_ITEM_SAI: return FEAT_IMPROVED_CRITICAL_SAI;
case BASE_ITEM_SAP: return FEAT_IMPROVED_CRITICAL_SAP;
}
return -1;
}
@@ -548,9 +613,23 @@ int GetOverwhelmingCriticalFeatOfWeaponType(int iWeaponType)
case BASE_ITEM_WARHAMMER: return FEAT_EPIC_OVERWHELMING_CRITICAL_WARHAMMER;
case BASE_ITEM_WHIP: return FEAT_EPIC_OVERWHELMING_CRITICAL_WHIP;
case BASE_ITEM_ELVEN_LIGHTBLADE: return FEAT_EPIC_OVERWHELMING_CRITICAL_ELVEN_LIGHTBLADE;
case BASE_ITEM_ELVEN_THINBLADE: return FEAT_EPIC_OVERWHELMING_CRITICAL_ELVEN_THINBLADE;
case BASE_ITEM_ELVEN_COURTBLADE: return FEAT_EPIC_OVERWHELMING_CRITICAL_ELVEN_COURTBLADE;
//:: new item types
case BASE_ITEM_DOUBLE_SCIMITAR: return FEAT_EPIC_OVERWHELMING_CRITICAL_DBL_SCIMITAR;
case BASE_ITEM_EAGLE_CLAW: return FEAT_EPIC_OVERWHELMING_CRITICAL_EAGLE_CLAW;
case BASE_ITEM_ELVEN_LIGHTBLADE: return FEAT_EPIC_OVERWHELMING_CRITICAL_ELVEN_LIGHTBLADE;
case BASE_ITEM_ELVEN_THINBLADE: return FEAT_EPIC_OVERWHELMING_CRITICAL_ELVEN_THINBLADE;
case BASE_ITEM_ELVEN_COURTBLADE: return FEAT_EPIC_OVERWHELMING_CRITICAL_ELVEN_COURTBLADE;
case BASE_ITEM_FALCHION: return FEAT_EPIC_OVERWHELMING_CRITICAL_FALCHION;
case BASE_ITEM_GOAD: return FEAT_EPIC_OVERWHELMING_CRITICAL_GOAD;
case BASE_ITEM_HEAVY_MACE: return FEAT_EPIC_OVERWHELMING_CRITICAL_HEAVY_MACE;
case BASE_ITEM_HEAVY_PICK: return FEAT_EPIC_OVERWHELMING_CRITICAL_HEAVY_PICK;
case BASE_ITEM_KATAR: return FEAT_EPIC_OVERWHELMING_CRITICAL_KATAR;
case BASE_ITEM_LIGHT_LANCE: return FEAT_EPIC_OVERWHELMING_CRITICAL_LIGHT_LANCE;
case BASE_ITEM_LIGHT_PICK: return FEAT_EPIC_OVERWHELMING_CRITICAL_LIGHT_PICK;
case BASE_ITEM_MAUL: return FEAT_EPIC_OVERWHELMING_CRITICAL_MAUL;
case BASE_ITEM_NUNCHAKU: return FEAT_EPIC_OVERWHELMING_CRITICAL_NUNCHAKU;
case BASE_ITEM_SAI: return FEAT_EPIC_OVERWHELMING_CRITICAL_SAI;
case BASE_ITEM_SAP: return FEAT_EPIC_OVERWHELMING_CRITICAL_SAP;
}
return -1;
}
@@ -604,10 +683,23 @@ int GetDevastatingCriticalFeatOfWeaponType(int iWeaponType)
case BASE_ITEM_WARHAMMER: return FEAT_EPIC_DEVASTATING_CRITICAL_WARHAMMER;
case BASE_ITEM_WHIP: return FEAT_EPIC_DEVASTATING_CRITICAL_WHIP;
// new item types
case BASE_ITEM_ELVEN_LIGHTBLADE: return FEAT_EPIC_DEVASTATING_CRITICAL_ELVEN_LIGHTBLADE;
case BASE_ITEM_ELVEN_THINBLADE: return FEAT_EPIC_DEVASTATING_CRITICAL_ELVEN_THINBLADE;
case BASE_ITEM_ELVEN_COURTBLADE: return FEAT_EPIC_DEVASTATING_CRITICAL_ELVEN_COURTBLADE;
//:: new item types
case BASE_ITEM_DOUBLE_SCIMITAR: return FEAT_EPIC_DEVASTATING_CRITICAL_DBL_SCIMITAR;
case BASE_ITEM_EAGLE_CLAW: return FEAT_EPIC_DEVASTATING_CRITICAL_EAGLE_CLAW;
case BASE_ITEM_ELVEN_LIGHTBLADE: return FEAT_EPIC_DEVASTATING_CRITICAL_ELVEN_LIGHTBLADE;
case BASE_ITEM_ELVEN_THINBLADE: return FEAT_EPIC_DEVASTATING_CRITICAL_ELVEN_THINBLADE;
case BASE_ITEM_ELVEN_COURTBLADE: return FEAT_EPIC_DEVASTATING_CRITICAL_ELVEN_COURTBLADE;
case BASE_ITEM_FALCHION: return FEAT_EPIC_DEVASTATING_CRITICAL_FALCHION;
case BASE_ITEM_GOAD: return FEAT_EPIC_DEVASTATING_CRITICAL_GOAD;
case BASE_ITEM_HEAVY_MACE: return FEAT_EPIC_DEVASTATING_CRITICAL_HEAVY_MACE;
case BASE_ITEM_HEAVY_PICK: return FEAT_EPIC_DEVASTATING_CRITICAL_HEAVY_PICK;
case BASE_ITEM_KATAR: return FEAT_EPIC_DEVASTATING_CRITICAL_KATAR;
case BASE_ITEM_LIGHT_LANCE: return FEAT_EPIC_DEVASTATING_CRITICAL_LIGHT_LANCE;
case BASE_ITEM_LIGHT_PICK: return FEAT_EPIC_DEVASTATING_CRITICAL_LIGHT_PICK;
case BASE_ITEM_MAUL: return FEAT_EPIC_DEVASTATING_CRITICAL_MAUL;
case BASE_ITEM_NUNCHAKU: return FEAT_EPIC_DEVASTATING_CRITICAL_NUNCHAKU;
case BASE_ITEM_SAI: return FEAT_EPIC_DEVASTATING_CRITICAL_SAI;
case BASE_ITEM_SAP: return FEAT_EPIC_DEVASTATING_CRITICAL_SAP;
}
return -1;
}
@@ -648,10 +740,23 @@ int GetWeaponOfChoiceFeatOfWeaponType(int iWeaponType)
case BASE_ITEM_WARHAMMER: return FEAT_WEAPON_OF_CHOICE_WARHAMMER;
case BASE_ITEM_WHIP: return FEAT_WEAPON_OF_CHOICE_WHIP;
// new item types
case BASE_ITEM_ELVEN_LIGHTBLADE: return FEAT_WEAPON_OF_CHOICE_ELVEN_LIGHTBLADE;
case BASE_ITEM_ELVEN_THINBLADE: return FEAT_WEAPON_OF_CHOICE_ELVEN_THINBLADE;
case BASE_ITEM_ELVEN_COURTBLADE: return FEAT_WEAPON_OF_CHOICE_ELVEN_COURTBLADE;
//:: new item types
case BASE_ITEM_DOUBLE_SCIMITAR: return FEAT_WEAPON_OF_CHOICE_DBL_SCIMITAR;
case BASE_ITEM_EAGLE_CLAW: return FEAT_WEAPON_OF_CHOICE_EAGLE_CLAW;
case BASE_ITEM_ELVEN_LIGHTBLADE: return FEAT_WEAPON_OF_CHOICE_ELVEN_LIGHTBLADE;
case BASE_ITEM_ELVEN_THINBLADE: return FEAT_WEAPON_OF_CHOICE_ELVEN_THINBLADE;
case BASE_ITEM_ELVEN_COURTBLADE: return FEAT_WEAPON_OF_CHOICE_ELVEN_COURTBLADE;
case BASE_ITEM_FALCHION: return FEAT_WEAPON_OF_CHOICE_FALCHION;
case BASE_ITEM_GOAD: return FEAT_WEAPON_OF_CHOICE_GOAD;
case BASE_ITEM_HEAVY_MACE: return FEAT_WEAPON_OF_CHOICE_HEAVY_MACE;
case BASE_ITEM_HEAVY_PICK: return FEAT_WEAPON_OF_CHOICE_HEAVY_PICK;
case BASE_ITEM_KATAR: return FEAT_WEAPON_OF_CHOICE_KATAR;
case BASE_ITEM_LIGHT_LANCE: return FEAT_WEAPON_OF_CHOICE_LIGHT_LANCE;
case BASE_ITEM_LIGHT_PICK: return FEAT_WEAPON_OF_CHOICE_LIGHT_PICK;
case BASE_ITEM_MAUL: return FEAT_WEAPON_OF_CHOICE_MAUL;
case BASE_ITEM_NUNCHAKU: return FEAT_WEAPON_OF_CHOICE_NUNCHAKU;
case BASE_ITEM_SAI: return FEAT_WEAPON_OF_CHOICE_SAI;
case BASE_ITEM_SAP: return FEAT_WEAPON_OF_CHOICE_SAP;
}
return -1;
}