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

Found more spots for "new" weapon types

Browse Source 
Added "new" weapon types to crafting & random NPC gear includes
This commit is contained in:
Jaysyn904 2024-01-01 22:21:08 -05:00
parent ce42b992cd
commit 21095477e7
3 changed files with 73 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Notes/old - Marker Feat Work.xlsx Normal file
View File

Binary file not shown.

71
nwn/nwnprc/trunk/include/inc_rand_equip.nss
View File

@ -592,6 +592,7 @@ void EquipWeapon(object oObject = OBJECT_SELF)
return; return;
} }
} }
object EquipWeaponProfSimple(object oObject, int nHands = 1) object EquipWeaponProfSimple(object oObject, int nHands = 1)
{ {
int nMaxSize; int nMaxSize;
@ -2536,6 +2537,7 @@ object EquipImprovedCritical(object oObject)
EquipDebugString(GetName(oObject) + " has ImpCrit "+GetName(oItem)); EquipDebugString(GetName(oObject) + " has ImpCrit "+GetName(oItem));
return oItem; return oItem;
} }
object EquipWeaponFocus(object oObject) object EquipWeaponFocus(object oObject)
{ {
int nRandom = Random(37); int nRandom = Random(37);
@ -2693,7 +2695,75 @@ object EquipWeaponFocus(object oObject)
case 36: case 36:
if(GetHasFeat(FEAT_WEAPON_FOCUS_WAR_HAMMER,oObject)) if(GetHasFeat(FEAT_WEAPON_FOCUS_WAR_HAMMER,oObject))
nBaseItemType = BASE_ITEM_WARHAMMER; nBaseItemType = BASE_ITEM_WARHAMMER;
break;
case 37:
if(GetHasFeat(FEAT_WEAPON_FOCUS_WHIP,oObject))
nBaseItemType = BASE_ITEM_WHIP;
break;
case 38:
if(GetHasFeat(FEAT_WEAPON_FOCUS_HEAVY_PICK,oObject))
nBaseItemType = BASE_ITEM_HEAVY_PICK;
break;
case 39:
if(GetHasFeat(FEAT_WEAPON_FOCUS_LIGHT_PICK,oObject))
nBaseItemType = BASE_ITEM_LIGHT_PICK;
break;
case 40:
if(GetHasFeat(FEAT_WEAPON_FOCUS_SAI,oObject))
nBaseItemType = BASE_ITEM_SAI;
break;
case 41:
if(GetHasFeat(FEAT_WEAPON_FOCUS_NUNCHAKU,oObject))
nBaseItemType = BASE_ITEM_NUNCHAKU;
break;
case 42:
if(GetHasFeat(FEAT_WEAPON_FOCUS_FALCHION,oObject))
nBaseItemType = BASE_ITEM_FALCHION;
break;
case 43:
if(GetHasFeat(FEAT_WEAPON_FOCUS_SAP,oObject))
nBaseItemType = BASE_ITEM_SAP;
break;
case 44:
if(GetHasFeat(FEAT_WEAPON_FOCUS_KATAR,oObject))
nBaseItemType = BASE_ITEM_KATAR;
break;
case 45:
if(GetHasFeat(FEAT_WEAPON_FOCUS_HEAVY_MACE,oObject))
nBaseItemType = BASE_ITEM_HEAVY_MACE;
break;
case 46:
if(GetHasFeat(FEAT_WEAPON_FOCUS_MAUL,oObject))
nBaseItemType = BASE_ITEM_MAUL;
break; break;
case 46:
if(GetHasFeat(FEAT_WEAPON_FOCUS_DOUBLE_SCIMITAR,oObject))
nBaseItemType = BASE_ITEM_DOUBLE_SCIMITAR;
break;
case 47:
if(GetHasFeat(FEAT_WEAPON_FOCUS_GOAD,oObject))
nBaseItemType = BASE_ITEM_GOAD;
break;
case 48:
if(GetHasFeat(FEAT_WEAPON_FOCUS_EAGLE_CLAW,oObject))
nBaseItemType = BASE_ITEM_EAGLE_CLAW;
break;
case 49:
if(GetHasFeat(FEAT_WEAPON_FOCUS_ELVEN_LIGHTBLADE,oObject))
nBaseItemType = BASE_ITEM_ELVEN_LIGHTBLADE;
break;
case 50:
if(GetHasFeat(FEAT_WEAPON_FOCUS_ELVEN_THINBLADE,oObject))
nBaseItemType = BASE_ITEM_ELVEN_THINBLADE;
break;
case 51:
if(GetHasFeat(FEAT_WEAPON_FOCUS_ELVEN_COURTBLADE,oObject))
nBaseItemType = BASE_ITEM_ELVEN_COURTBLADE;
break;
case 52:
if(GetHasFeat(FEAT_WEAPON_FOCUS_TRIDENT,oObject))
nBaseItemType = BASE_ITEM_TRIDENT;
break;
} }
if(nBaseItemType == -1) if(nBaseItemType == -1)
{ {
@ -2712,6 +2782,7 @@ object EquipWeaponFocus(object oObject)
EquipDebugString(GetName(oObject) + " has WeaponFocus "+GetName(oItem)); EquipDebugString(GetName(oObject) + " has WeaponFocus "+GetName(oItem));
return oItem; return oItem;
} }
int GetCanDualWeild(object oObject) int GetCanDualWeild(object oObject)
{ {
if(GetHasFeat(FEAT_AMBIDEXTERITY,oObject) == TRUE if(GetHasFeat(FEAT_AMBIDEXTERITY,oObject) == TRUE

4
nwn/nwnprc/trunk/include/prc_craft_inc.nss
View File

@ -1359,6 +1359,8 @@ int GetWeaponType(int nBaseItem)
case BASE_ITEM_RAPIER: case BASE_ITEM_RAPIER:
case BASE_ITEM_SCIMITAR: case BASE_ITEM_SCIMITAR:
case BASE_ITEM_THROWINGAXE: case BASE_ITEM_THROWINGAXE:
case BASE_ITEM_TRIDENT:
case BASE_ITEM_KATAR:
case BASE_ITEM_HEAVY_PICK: case BASE_ITEM_HEAVY_PICK:
case BASE_ITEM_LIGHT_PICK: case BASE_ITEM_LIGHT_PICK:
case BASE_ITEM_FALCHION: case BASE_ITEM_FALCHION:
@ -1373,13 +1375,11 @@ int GetWeaponType(int nBaseItem)
case BASE_ITEM_SHORTSPEAR: case BASE_ITEM_SHORTSPEAR:
case BASE_ITEM_SICKLE: case BASE_ITEM_SICKLE:
case BASE_ITEM_SLING: case BASE_ITEM_SLING:
case BASE_ITEM_TRIDENT:
case BASE_ITEM_DAGGER: case BASE_ITEM_DAGGER:
case BASE_ITEM_LIGHTCROSSBOW: case BASE_ITEM_LIGHTCROSSBOW:
case BASE_ITEM_HEAVYCROSSBOW: case BASE_ITEM_HEAVYCROSSBOW:
case BASE_ITEM_CLUB: case BASE_ITEM_CLUB:
case BASE_ITEM_QUARTERSTAFF: case BASE_ITEM_QUARTERSTAFF:
case BASE_ITEM_KATAR:
case BASE_ITEM_HEAVY_MACE: case BASE_ITEM_HEAVY_MACE:
case BASE_ITEM_GOAD: case BASE_ITEM_GOAD:
return PRC_CRAFT_SIMPLE_WEAPON; return PRC_CRAFT_SIMPLE_WEAPON;