From 5785248211ca1f9b3b5128bd476646dc04748c12 Mon Sep 17 00:00:00 2001 From: Jaysyn904 <68194417+Jaysyn904@users.noreply.github.com> Date: Tue, 5 Sep 2023 20:20:35 -0400 Subject: [PATCH] Soulreaving Aura targeting fix Soulreaving Aura targeting fix. Frost mage marker feat enforcement fix. --- nwn/nwnprc/trunk/2das/feat.2da | 2 +- nwn/nwnprc/trunk/scripts/prc_enforce_mark.nss | 42 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/nwn/nwnprc/trunk/2das/feat.2da b/nwn/nwnprc/trunk/2das/feat.2da index ece84fcd..a9d050b5 100644 --- a/nwn/nwnprc/trunk/2das/feat.2da +++ b/nwn/nwnprc/trunk/2das/feat.2da @@ -7524,7 +7524,7 @@ 7520 Warlock_SeeTheUnseen 16838740 16832998 inv_seeunseen **** **** **** **** **** **** **** **** **** **** **** **** **** 7 **** 18181 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** 0 **** **** **** **** **** 0 7521 Warlock_SerpentsTongue 16838741 16834351 inv_serptongue **** **** **** **** **** **** **** **** **** **** **** **** **** 9 **** 18182 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** 0 **** **** **** **** **** 0 7522 Warlock_SickeningBlast 16838742 16834353 inv_sickenblast **** **** **** **** **** **** **** **** **** **** **** **** **** 10 **** 18183 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** 0 **** **** **** **** **** 0 -7523 Warlock_SoulreavingAura 16838743 16834355 inv_soulreavaura **** **** **** **** **** **** **** **** **** **** **** **** **** 2 **** 18184 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** 1 **** **** **** **** **** 0 +7523 Warlock_SoulreavingAura 16838743 16834355 inv_soulreavaura **** **** **** **** **** **** **** **** **** **** **** **** **** 2 **** 18184 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** 0 **** **** **** **** **** 0 7524 Warlock_SummonSwarm 16838744 16834357 inv_summonswarm **** **** **** **** **** **** **** **** **** **** **** **** **** 13 **** 18185 **** **** **** **** 0 **** **** **** **** **** **** **** **** **** **** **** 1 **** **** **** **** **** 0 7525 Warlock_SwimmingTheStyx 16838747 16834361 inv_swimthestyx **** **** **** **** **** **** **** **** **** **** **** **** **** 9 **** 18188 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** 0 **** **** **** **** **** 0 7526 Warlock_BanefulBlastAbberation 16838748 16834363 inv_banefulblast **** **** **** **** **** **** **** **** **** **** **** **** **** 10 **** 18189 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** 0 **** **** **** **** **** 0 diff --git a/nwn/nwnprc/trunk/scripts/prc_enforce_mark.nss b/nwn/nwnprc/trunk/scripts/prc_enforce_mark.nss index 1661f78f..cc5c3a68 100644 --- a/nwn/nwnprc/trunk/scripts/prc_enforce_mark.nss +++ b/nwn/nwnprc/trunk/scripts/prc_enforce_mark.nss @@ -1592,27 +1592,27 @@ int FrostMageMarkerFeats() { if(GetLevelByClass(CLASS_TYPE_FROST_MAGE)) { - int nFrostMage = GetHasFeat(FEAT_ENLIGHTENEDFIST_SPELLCASTING_FEY) - + GetHasFeat(FEAT_ENLIGHTENEDFIST_SPELLCASTING_ABERRATION) - + GetHasFeat(FEAT_ENLIGHTENEDFIST_SPELLCASTING_MONSTROUS) - + GetHasFeat(FEAT_ENLIGHTENEDFIST_SPELLCASTING_OUTSIDER) - + GetHasFeat(FEAT_ENLIGHTENEDFIST_SPELLCASTING_SHAPECHANGER) - + GetHasFeat(FEAT_ENLIGHTENEDFIST_SPELLCASTING_ASSASSIN) - + GetHasFeat(FEAT_ENLIGHTENEDFIST_SPELLCASTING_BARD) - + GetHasFeat(FEAT_ENLIGHTENEDFIST_SPELLCASTING_BEGUILER) - + GetHasFeat(FEAT_ENLIGHTENEDFIST_SPELLCASTING_CELEBRANT_SHARESS) - + GetHasFeat(FEAT_ENLIGHTENEDFIST_SPELLCASTING_CULTIST_PEAK) - + GetHasFeat(FEAT_ENLIGHTENEDFIST_SPELLCASTING_DNECRO) - + GetHasFeat(FEAT_ENLIGHTENEDFIST_SPELLCASTING_DUSKBLADE) - + GetHasFeat(FEAT_ENLIGHTENEDFIST_SPELLCASTING_HARPER) - + GetHasFeat(FEAT_ENLIGHTENEDFIST_SPELLCASTING_HEXBLADE) - + GetHasFeat(FEAT_ENLIGHTENEDFIST_SPELLCASTING_KNIGHT_WEAVE) - + GetHasFeat(FEAT_ENLIGHTENEDFIST_SPELLCASTING_SHADOWLORD) - + GetHasFeat(FEAT_ENLIGHTENEDFIST_SPELLCASTING_SORCERER) - + GetHasFeat(FEAT_ENLIGHTENEDFIST_SPELLCASTING_SUBLIME_CHORD) - + GetHasFeat(FEAT_ENLIGHTENEDFIST_SPELLCASTING_SUEL_ARCHANAMACH) - + GetHasFeat(FEAT_ENLIGHTENEDFIST_SPELLCASTING_WARMAGE) - + GetHasFeat(FEAT_ENLIGHTENEDFIST_SPELLCASTING_WIZARD); + int nFrostMage = GetHasFeat(FEAT_FROSTMAGE_SPELLCASTING_FEY) + + GetHasFeat(FEAT_FROSTMAGE_SPELLCASTING_ABERRATION) + + GetHasFeat(FEAT_FROSTMAGE_SPELLCASTING_MONSTROUS) + + GetHasFeat(FEAT_FROSTMAGE_SPELLCASTING_OUTSIDER) + + GetHasFeat(FEAT_FROSTMAGE_SPELLCASTING_SHAPECHANGER) + + GetHasFeat(FEAT_FROSTMAGE_SPELLCASTING_ASSASSIN) + + GetHasFeat(FEAT_FROSTMAGE_SPELLCASTING_BARD) + + GetHasFeat(FEAT_FROSTMAGE_SPELLCASTING_BEGUILER) + + GetHasFeat(FEAT_FROSTMAGE_SPELLCASTING_CELEBRANT_SHARESS) + + GetHasFeat(FEAT_FROSTMAGE_SPELLCASTING_CULTIST_PEAK) + + GetHasFeat(FEAT_FROSTMAGE_SPELLCASTING_DNECRO) + + GetHasFeat(FEAT_FROSTMAGE_SPELLCASTING_DUSKBLADE) + + GetHasFeat(FEAT_FROSTMAGE_SPELLCASTING_HARPER) + + GetHasFeat(FEAT_FROSTMAGE_SPELLCASTING_HEXBLADE) + + GetHasFeat(FEAT_FROSTMAGE_SPELLCASTING_KNIGHT_WEAVE) + + GetHasFeat(FEAT_FROSTMAGE_SPELLCASTING_SHADOWLORD) + + GetHasFeat(FEAT_FROSTMAGE_SPELLCASTING_SORCERER) + + GetHasFeat(FEAT_FROSTMAGE_SPELLCASTING_SUBLIME_CHORD) + + GetHasFeat(FEAT_FROSTMAGE_SPELLCASTING_SUEL_ARCHANAMACH) + + GetHasFeat(FEAT_FROSTMAGE_SPELLCASTING_WARMAGE) + + GetHasFeat(FEAT_FROSTMAGE_SPELLCASTING_WIZARD); if(nFrostMage > 1) {