2026/05/07 Update
Hospitaler had incorrect epic bonus feat progression Hospitaler had incorrect bonus feat list. Hospitaler was missing Ride from its skill list. Runecaster had incorrect epic bonus feat progression Runecaster had incorrect bonus feat list. Warmage Edge should work with magic staves. Added PRC_RETH_DEKALA_AURA_HOSTILE_ONLY switch and modified Vilefire aura to use it. Spells that use DoCone() should now respect Mastery of Shaping. Removed Hospitaler from list of classes that use the Fighter Bonus Feat list. ExtraordinarySpellAim() now handles persistent AoEs Acid Fog, Blade Barrier, Creeping Doom, Grease, Incindiary Cloud, Wall of Fire, Wall of Frost, Prismatic Wall, Prismatic Sphere, Sleet Storm and Spike Growth now respect Extraordinary Spell Aim.
This commit is contained in:
@@ -869,6 +869,9 @@ void CreateSwitchNameArray()
|
||||
array_set_string(oWP, "Switch_Name", array_get_size(oWP, "Switch_Name"), PRC_DEBUG);
|
||||
array_set_string(oWP, "Switch_Name", array_get_size(oWP, "Switch_Name"), PRC_COMBAT_DEBUG);
|
||||
array_set_string(oWP, "Switch_Name", array_get_size(oWP, "Switch_Name"), PRC_PRCX_ENABLED);
|
||||
|
||||
// racial
|
||||
array_set_string(oWP, "Switch_Name", array_get_size(oWP, "Switch_Name"), PRC_RETH_DEKALA_AURA_HOSTILE_ONLY);
|
||||
|
||||
//craft
|
||||
array_set_string(oWP, "Switch_Name", array_get_size(oWP, "Switch_Name"), PRC_DISABLE_CRAFT);
|
||||
|
||||
@@ -2664,8 +2664,10 @@ effect PRCEffectDamage(object oTarget, int nDamageAmount, int nDamageType=DAMAGE
|
||||
}
|
||||
}
|
||||
|
||||
// None of the stuff here works when items are involved
|
||||
if (!GetIsObjectValid(PRCGetSpellCastItem()))
|
||||
object oSpellCastItem = PRCGetSpellCastItem();
|
||||
|
||||
//if (!GetIsObjectValid(PRCGetSpellCastItem()))
|
||||
if (!GetIsObjectValid(oSpellCastItem) || GetBaseItemType(oSpellCastItem) == BASE_ITEM_MAGICSTAFF)
|
||||
{
|
||||
if(PRCGetLastSpellCastClass(oCaster) == CLASS_TYPE_WARMAGE && !GetLocalInt(oTarget, "WarmageEdgeDelay"))
|
||||
{
|
||||
|
||||
@@ -637,6 +637,17 @@ const string PRC_PNP_SHIFTER_BONUS = "PRC_PNP_SHIFTER
|
||||
*/
|
||||
const string PRC_CHICKEN_INFESTED = "PRC_CHICKEN_INFESTED";
|
||||
|
||||
/******************************************************************************\
|
||||
* Racial switches *
|
||||
\******************************************************************************/
|
||||
|
||||
/**
|
||||
* When enabled, Reth Dekala's vilefire aura only affects hostile creatures
|
||||
* instead of all creatures in melee range.
|
||||
*/
|
||||
const string PRC_RETH_DEKALA_AURA_HOSTILE_ONLY = "PRC_RETH_DEKALA_AURA_HOSTILE_ONLY";
|
||||
|
||||
|
||||
/******************************************************************************\
|
||||
* Template and Weapon of Legacy switches *
|
||||
\******************************************************************************/
|
||||
|
||||
@@ -67,14 +67,17 @@ void ToggleMasteryOfShapes(object oCaster);
|
||||
|
||||
void SetMasteryOfElements();
|
||||
|
||||
object GetAreaOfEffectObject(location lTarget, string sTag, object oCaster = OBJECT_SELF);
|
||||
|
||||
//////////////////////////////////////////////////
|
||||
/* Includes */
|
||||
//////////////////////////////////////////////////
|
||||
|
||||
#include "prc_feat_const"
|
||||
//#include "prc_inc_spells"
|
||||
//#include "lookup_2da_spell"
|
||||
#include "prcsp_reputation"
|
||||
#include "prc_inc_core"
|
||||
//#include "prc_inc_spells"
|
||||
|
||||
|
||||
|
||||
//////////////////////////////////////////////////
|
||||
@@ -95,7 +98,46 @@ int CheckMasteryOfShapes(object oCaster, object oTarget)
|
||||
return bRetVal;
|
||||
}
|
||||
|
||||
int ExtraordinarySpellAim(object oCaster, object oTarget)
|
||||
int ExtraordinarySpellAim(object oCaster, object oTarget)
|
||||
{
|
||||
int bRetVal = FALSE;
|
||||
|
||||
if(GetHasFeat(FEAT_EXTRAORDINARY_SPELL_AIM, oCaster)
|
||||
&& GetIsFriend(oTarget, oCaster))
|
||||
{
|
||||
// Check if this is an AOE spell
|
||||
object oAoE = GetAreaOfEffectObject(GetLocation(oTarget), "", oCaster);
|
||||
|
||||
if(GetIsObjectValid(oAoE))
|
||||
{
|
||||
// For persistent AOEs, store exclusion on the AOE object
|
||||
string sTargetID = ObjectToString(oTarget);
|
||||
if(!GetLocalInt(oAoE, "ExtraordinarySpellAim_" + sTargetID))
|
||||
{
|
||||
if(GetIsSkillSuccessful(oCaster, SKILL_SPELLCRAFT, 25 + PRCGetSpellLevel(oCaster, PRCGetSpellId())))
|
||||
{
|
||||
SetLocalInt(oAoE, "ExtraordinarySpellAim_" + sTargetID, TRUE);
|
||||
bRetVal = TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// For instant spells, use original logic
|
||||
if(!GetLocalInt(oCaster, "ExtraordinarySpellAim"))
|
||||
{
|
||||
SetLocalInt(oCaster, "ExtraordinarySpellAim", TRUE);
|
||||
DelayCommand(1.0, DeleteLocalInt(oCaster, "ExtraordinarySpellAim"));
|
||||
|
||||
if(GetIsSkillSuccessful(oCaster, SKILL_SPELLCRAFT, 25 + PRCGetSpellLevel(oCaster, PRCGetSpellId())))
|
||||
bRetVal = TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
return bRetVal;
|
||||
}
|
||||
|
||||
/* int ExtraordinarySpellAim(object oCaster, object oTarget)
|
||||
{
|
||||
int bRetVal = FALSE;
|
||||
|
||||
@@ -114,7 +156,7 @@ int ExtraordinarySpellAim(object oCaster, object oTarget)
|
||||
|
||||
return bRetVal;
|
||||
}
|
||||
|
||||
*/
|
||||
//
|
||||
// Help with Visual Effects when setting feats
|
||||
//
|
||||
|
||||
@@ -21,7 +21,6 @@ int CheckSpellfire(object oCaster, object oTarget, int bFriendly = FALSE);
|
||||
//#include "prc_add_spell_dc"
|
||||
#include "prc_add_spl_pen"
|
||||
|
||||
|
||||
//
|
||||
// This function is a wrapper should someone wish to rewrite the Bioware
|
||||
// version. This is where it should be done.
|
||||
|
||||
@@ -51,7 +51,13 @@ void DoCone (int nDieSize, int nBonusDam, int nDieCap, int nConeEffect /* unused
|
||||
{
|
||||
if(spellsIsTarget(oTarget, SPELL_TARGET_STANDARDHOSTILE, OBJECT_SELF))
|
||||
{
|
||||
//Fire cast spell at event for the specified target
|
||||
if(CheckMasteryOfShapes(OBJECT_SELF, oTarget))
|
||||
{
|
||||
// Target is protected by Mastery of Shaping, skip damage
|
||||
oTarget = MyNextObjectInShape(SHAPE_SPELLCONE, 11.0, lTargetLocation, FALSE, OBJECT_TYPE_CREATURE | OBJECT_TYPE_DOOR | OBJECT_TYPE_PLACEABLE);
|
||||
continue;
|
||||
}
|
||||
//Fire cast spell at event for the specified target
|
||||
PRCSignalSpellEvent(oTarget, TRUE, nSpellID);
|
||||
|
||||
//Get the distance between the target and caster to delay the application of effects
|
||||
|
||||
Reference in New Issue
Block a user