2025/12/31 Update

Happy New Year!
Added Defensive Manifestation for psionics users.
Removed Talent from Grapple Combat Ability so AI wouldn't use it.
Charnel Touch is unlimited uses & shouldn't cause an AoO.
Switched Rain of Fire to use PRCEffectDamage().
Fixed issue where initiator couldn't take a maneuver in a 2nd sword magic class when having the prereq manuevers from a previous sword magic class.
Set Archetypal Form on Sphere of Ultimate Destruction.
Set Archetypal Form on Black Blade of Disaster.
Added missing immunities to Blighter's Undead WIldshape.
Removed incorrect prereq from Claw at the Moon's TLK entry.
Fixed pluralized Undead Wildshapes.
NPC death always cleans up a grapple.
This commit is contained in:
Jaysyn904
2025-12-31 22:09:21 -05:00
parent 33098fc061
commit 3fb5d61772
27 changed files with 6240 additions and 6053 deletions

View File

@@ -56,6 +56,14 @@ void main()
eLink = EffectLinkEffects(eLink, EffectDamageResistance(DAMAGE_TYPE_PIERCING, 5));
eLink = EffectLinkEffects(eLink, EffectDamageResistance(DAMAGE_TYPE_SLASHING, 5));
eLink = EffectLinkEffects(eLink, EffectACIncrease(2, AC_NATURAL_BONUS));
eLink = EffectLinkEffects(eLink, EffectImmunity(IMMUNITY_TYPE_NEGATIVE_LEVEL));
eLink = EffectLinkEffects(eLink, EffectImmunity(IMMUNITY_TYPE_ABILITY_DECREASE));
eLink = EffectLinkEffects(eLink, EffectImmunity(IMMUNITY_TYPE_CRITICAL_HIT));
eLink = EffectLinkEffects(eLink, EffectImmunity(IMMUNITY_TYPE_MIND_SPELLS));
eLink = EffectLinkEffects(eLink, EffectImmunity(IMMUNITY_TYPE_SNEAK_ATTACK));
eLink = EffectLinkEffects(eLink, EffectBonusFeat(FEAT_IMPROVED_INITIATIVE));
eLink = EffectLinkEffects(eLink, EffectBonusFeat(FEAT_UNDEAD));
ApplyEffectToObject(DURATION_TYPE_TEMPORARY, eLink, OBJECT_SELF, HoursToSeconds(nDuration));
return;
}
@@ -141,7 +149,15 @@ void main()
eLink = EffectLinkEffects(eLink, EffectDamageResistance(DAMAGE_TYPE_PIERCING, 5));
eLink = EffectLinkEffects(eLink, EffectDamageResistance(DAMAGE_TYPE_SLASHING, 5));
eLink = EffectLinkEffects(eLink, EffectACIncrease(2, AC_NATURAL_BONUS));
ePoly = EffectLinkEffects(ePoly, eLink);
eLink = EffectLinkEffects(eLink, EffectImmunity(IMMUNITY_TYPE_NEGATIVE_LEVEL));
eLink = EffectLinkEffects(eLink, EffectImmunity(IMMUNITY_TYPE_ABILITY_DECREASE));
eLink = EffectLinkEffects(eLink, EffectImmunity(IMMUNITY_TYPE_CRITICAL_HIT));
eLink = EffectLinkEffects(eLink, EffectImmunity(IMMUNITY_TYPE_MIND_SPELLS));
eLink = EffectLinkEffects(eLink, EffectImmunity(IMMUNITY_TYPE_SNEAK_ATTACK));
eLink = EffectLinkEffects(eLink, EffectBonusFeat(FEAT_IMPROVED_INITIATIVE));
eLink = EffectLinkEffects(eLink, EffectBonusFeat(FEAT_UNDEAD));
ePoly = EffectLinkEffects(ePoly, eLink);
ApplyEffectToObject(DURATION_TYPE_INSTANT, eVis, OBJECT_SELF);
ApplyEffectToObject(DURATION_TYPE_TEMPORARY, ePoly, OBJECT_SELF, HoursToSeconds(nDuration));

View File

@@ -3,6 +3,7 @@
//:: prc_npc_death
//:://////////////////////////////////////////////
#include "moi_inc_moifunc"
#include "prc_inc_combmove"
void main()
{
@@ -135,7 +136,7 @@ void main()
DelayCommand(HoursToSeconds(1), DeleteLocalInt(oBinder, "AgaresDelay"));
DelayCommand(HoursToSeconds(1), FloatingTextStringOnCreature("You can now resummon your elemental companion!", oBinder, FALSE));
}
// Trigger the death/bleed if the PRC Death system is enabled (ElgarL).
if(GetPRCSwitch(PRC_PNP_DEATH_ENABLE))
AddEventScript(oDead, EVENT_ONHEARTBEAT, "prc_timer_dying", TRUE, FALSE);

View File

@@ -50,9 +50,6 @@ void main()
object oDead = GetLastBeingDied();
object oKiller = MyGetLastKiller();
DelayCommand(0.1f, EndGrapple(oDead, oKiller));
DelayCommand(0.2f, EndGrapple(oKiller, oDead));
// We are not actually dead until -10
// Unless it's a spell death
@@ -137,6 +134,28 @@ void main()
DeleteLocalInt(oDead, "PRC_SPELL_CHARGE_COUNT");
DeleteLocalInt(oDead, "PRC_SPELL_HOLD");
// Clean up grapples when any creature dies
// Check if dead creature was actively grappling
if (GetGrapple(oDead))
{
object oGrappleTarget = GetGrappleTarget(oDead);
if (GetIsObjectValid(oGrappleTarget))
{
EndGrapple(oDead, oGrappleTarget);
RemoveEventScript(oDead, EVENT_ONHEARTBEAT, "prc_grapple", TRUE, FALSE);
DeleteLocalInt(oDead, "GrappleHeartbeatTimer");
}
}
// ALSO check if dead creature was someone's grapple target
object oPossibleGrappler = GetLocalObject(oDead, "GrappledBy");
if (GetIsObjectValid(oPossibleGrappler))
{
EndGrapple(oPossibleGrappler, oDead);
RemoveEventScript(oPossibleGrappler, EVENT_ONHEARTBEAT, "prc_grapple", TRUE, FALSE);
DeleteLocalInt(oDead, "GrappleHeartbeatTimer");
}
// Trigger the death/bleed if the PRC Death system is enabled (ElgarL).
if((GetPRCSwitch(PRC_PNP_DEATH_ENABLE)) && GetIsPC(oDead))