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

TLK Cleanup

Browse Source 
TLK Cleanup (thanks @barmlot).  Added grapple check to catch dead grappler.  Made plot items immune to PnP Disarm.  Fixed minor script typos.  Fixed missing Totemist soulmeld (thanks @barmlot). Fixed Grasping Shadows tlk pointer (thanks @barmlot).  Added Duskblade notes.
This commit is contained in:
Jaysyn904
2024-10-17 13:32:35 -04:00
parent 3e7fbbae80
commit 31331675fa
15 changed files with 389 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nwn/nwnprc/trunk/include/inc_acp.nss
View File

@@ -95,4 +95,4 @@ void SetCustomFightingStyle(int iStyle) //Sets character phenotype to 5,6,7 or 8
}
// Test main
//void main(){}
//void main(){}

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

@@ -313,7 +313,7 @@ int GetDCAbilityModForClass(int nClass, object oPC)
return GetAbilityScore(oPC, ABILITY_CHARISMA);
//outsider HD count as sorc for raks
case CLASS_TYPE_OUTSIDER: {
/// @todo Will eventually need to add a check here to differentiate between races. Not all are sorcerers, just most
// @todo Will eventually need to add a check here to differentiate between races. Not all are sorcerers, just most
return GetAbilityModifier(ABILITY_CHARISMA, oPC);
}
}
@@ -485,7 +485,7 @@ int bKnowsAllClassSpells(int nClass)
int GetSpellKnownMaxCount(int nLevel, int nSpellLevel, int nClass, object oPC)
{
// If the character doesn't have any spell slots available on for this level, it can't know any spells of that level either
/// @todo Check rules. There might be cases where this doesn't hold
// @todo Check rules. There might be cases where this doesn't hold
if(!GetSlotCount(nLevel, nSpellLevel, GetAbilityScoreForClass(nClass, oPC), nClass))
return 0;
int nKnown;

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

@@ -1848,7 +1848,7 @@ int DoDisarm(object oPC, object oTarget, int nExtraBonus = 0, int nGenerateAoO =
{
object oTargetWep = GetItemInSlot(INVENTORY_SLOT_RIGHTHAND, oTarget);
if (!GetIsObjectValid(oTargetWep) || (!GetIsCreatureDisarmable(oTarget) && !GetPRCSwitch(PRC_PNP_DISARM)) || GetLocalInt(oTarget, "TigerFangDisarm"))
if (!GetIsObjectValid(oTargetWep) || GetPlotFlag(oTargetWep) || (!GetIsCreatureDisarmable(oTarget) && !GetPRCSwitch(PRC_PNP_DISARM)) || GetLocalInt(oTarget, "TigerFangDisarm"))
{
FloatingTextStringOnCreature("Target is not a legal target", oPC, FALSE);
AssignCommand(oPC, ActionAttack(oTarget));
@@ -2233,4 +2233,5 @@ void DoShieldCharge(object oPC, object oTarget, int nSlam = FALSE)
}
}
//void main (){}
//:: Test void
//:: void main (){}

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

@@ -268,7 +268,6 @@ const int POLYMORPH_TYPE_TWIG_BLIGHT = 162;
const int POLYMORPH_TYPE_MYCONID = 163;
const int POLYMORPH_TYPE_ALGOID = 164;
//::///////////////////
//:: DOMAIN CONSTANTS
//:: These constants are off by 1 to allow 0 to be the FALSE return value.

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

@@ -1293,7 +1293,7 @@ const int SPELL_REGEN_MODERATE_WOUNDS = 17244;
const int SPELL_REGEN_SERIOUS_WOUNDS = 17245;
const int SPELL_REGEN_CRITICAL_WOUNDS = 17246;
const int SPELL_SPEED_WIND = 17247;
const int SPELL_TORTISE_SHELL = 17250;
const int SPELL_TORTISE_SHELL = 17250;
//x
const int SPELL_TENSERS_FLOATING_DISK = 3849;

2
nwn/nwnprc/trunk/include/x2_inc_spellhook.nss
View File

@@ -3171,4 +3171,4 @@ int X2PreSpellCastCode2()
// Test main
// void main(){}
//:: void main(){}