diff --git a/.gitignore b/.gitignore index 74c52acd..56eaf035 100644 --- a/.gitignore +++ b/.gitignore @@ -163,3 +163,4 @@ nwn/nwnprc/trunk/makefile.temp nwn/nwnprc/trunk/makefile.temp /Release /Notes/Class Expansion +/old_backup diff --git a/_backup/20240327_CompiledResources.7z b/_backup/20240327_CompiledResources.7z deleted file mode 100644 index e7af53a0..00000000 Binary files a/_backup/20240327_CompiledResources.7z and /dev/null differ diff --git a/_backup/20240407_CompiledResources.7z b/_backup/20240407_CompiledResources.7z deleted file mode 100644 index 366ac626..00000000 Binary files a/_backup/20240407_CompiledResources.7z and /dev/null differ diff --git a/_backup/20240824_CompiledResources.7z b/_backup/20240824_CompiledResources.7z deleted file mode 100644 index 3f5af1ab..00000000 Binary files a/_backup/20240824_CompiledResources.7z and /dev/null differ diff --git a/_backup/20250121_Neverwinter Nights Campaigns [PRC8].7z b/_backup/20250121_Neverwinter Nights Campaigns [PRC8].7z deleted file mode 100644 index db5916c1..00000000 Binary files a/_backup/20250121_Neverwinter Nights Campaigns [PRC8].7z and /dev/null differ diff --git a/_backup/PRC8_20240309.7z b/_backup/PRC8_20240309.7z deleted file mode 100644 index 33d4b73d..00000000 Binary files a/_backup/PRC8_20240309.7z and /dev/null differ diff --git a/_backup/PRC8_20240313.7z b/_backup/PRC8_20240313.7z deleted file mode 100644 index 8beb1bf5..00000000 Binary files a/_backup/PRC8_20240313.7z and /dev/null differ diff --git a/_backup/PRC8_20240315.7z b/_backup/PRC8_20240315.7z deleted file mode 100644 index 8ed0d63d..00000000 Binary files a/_backup/PRC8_20240315.7z and /dev/null differ diff --git a/_backup/PRC8_20240323.7z b/_backup/PRC8_20240323.7z deleted file mode 100644 index 39c790ed..00000000 Binary files a/_backup/PRC8_20240323.7z and /dev/null differ diff --git a/_backup/PRC8_20240407.7z b/_backup/PRC8_20240407.7z deleted file mode 100644 index aaa5e9dd..00000000 Binary files a/_backup/PRC8_20240407.7z and /dev/null differ diff --git a/_backup/PRC8_20240511.7z b/_backup/PRC8_20240511.7z deleted file mode 100644 index 4a5d77b6..00000000 Binary files a/_backup/PRC8_20240511.7z and /dev/null differ diff --git a/_backup/PRC8_20240522.7z b/_backup/PRC8_20240522.7z deleted file mode 100644 index 807a81ee..00000000 Binary files a/_backup/PRC8_20240522.7z and /dev/null differ diff --git a/_backup/PRC8_20240528.7z b/_backup/PRC8_20240528.7z deleted file mode 100644 index 5d8fd0b7..00000000 Binary files a/_backup/PRC8_20240528.7z and /dev/null differ diff --git a/_backup/PRC8_20240622.7z b/_backup/PRC8_20240622.7z deleted file mode 100644 index aaf80e85..00000000 Binary files a/_backup/PRC8_20240622.7z and /dev/null differ diff --git a/_backup/PRC8_20240801.7z b/_backup/PRC8_20240801.7z deleted file mode 100644 index ff50a76e..00000000 Binary files a/_backup/PRC8_20240801.7z and /dev/null differ diff --git a/_backup/PRC8_20240806-1.7z b/_backup/PRC8_20240806-1.7z deleted file mode 100644 index a47b4fc3..00000000 Binary files a/_backup/PRC8_20240806-1.7z and /dev/null differ diff --git a/_backup/PRC8_20240806.7z b/_backup/PRC8_20240806.7z deleted file mode 100644 index 85802b0d..00000000 Binary files a/_backup/PRC8_20240806.7z and /dev/null differ diff --git a/_backup/PRC8_20240807.7z b/_backup/PRC8_20240807.7z deleted file mode 100644 index 6562bd4d..00000000 Binary files a/_backup/PRC8_20240807.7z and /dev/null differ diff --git a/_backup/PRC8_20240829.7z b/_backup/PRC8_20240829.7z deleted file mode 100644 index a6324933..00000000 Binary files a/_backup/PRC8_20240829.7z and /dev/null differ diff --git a/_backup/PRC8_20240830.7z b/_backup/PRC8_20240830.7z deleted file mode 100644 index debac70a..00000000 Binary files a/_backup/PRC8_20240830.7z and /dev/null differ diff --git a/_backup/PRC8_20240904.7z b/_backup/PRC8_20240904.7z deleted file mode 100644 index b2e57e07..00000000 Binary files a/_backup/PRC8_20240904.7z and /dev/null differ diff --git a/_backup/PRC8_20240909.7z b/_backup/PRC8_20240909.7z deleted file mode 100644 index 798a8683..00000000 Binary files a/_backup/PRC8_20240909.7z and /dev/null differ diff --git a/_backup/PRC8_20240914.7z b/_backup/PRC8_20240914.7z deleted file mode 100644 index cff2bbc9..00000000 Binary files a/_backup/PRC8_20240914.7z and /dev/null differ diff --git a/_backup/PRC8_20240917.7z b/_backup/PRC8_20240917.7z deleted file mode 100644 index 3382b9e5..00000000 Binary files a/_backup/PRC8_20240917.7z and /dev/null differ diff --git a/_backup/PRC8_20240919.7z b/_backup/PRC8_20240919.7z deleted file mode 100644 index 68a6cdc3..00000000 Binary files a/_backup/PRC8_20240919.7z and /dev/null differ diff --git a/_backup/PRC8_20240921.7z b/_backup/PRC8_20240921.7z deleted file mode 100644 index 5e15abac..00000000 Binary files a/_backup/PRC8_20240921.7z and /dev/null differ diff --git a/_backup/PRC8_20240925.7z b/_backup/PRC8_20240925.7z deleted file mode 100644 index e86d77cb..00000000 Binary files a/_backup/PRC8_20240925.7z and /dev/null differ diff --git a/_backup/PRC8_20241007.7z b/_backup/PRC8_20241007.7z deleted file mode 100644 index 888a5b93..00000000 Binary files a/_backup/PRC8_20241007.7z and /dev/null differ diff --git a/_backup/PRC8_20241011.7z b/_backup/PRC8_20241011.7z deleted file mode 100644 index 62110e7c..00000000 Binary files a/_backup/PRC8_20241011.7z and /dev/null differ diff --git a/_backup/PRC8_20241013.7z b/_backup/PRC8_20241013.7z deleted file mode 100644 index bfe90f3b..00000000 Binary files a/_backup/PRC8_20241013.7z and /dev/null differ diff --git a/_backup/PRC8_20241014.7z b/_backup/PRC8_20241014.7z deleted file mode 100644 index 078566cb..00000000 Binary files a/_backup/PRC8_20241014.7z and /dev/null differ diff --git a/_backup/PRC8_20241022.7z b/_backup/PRC8_20241022.7z deleted file mode 100644 index 721205e4..00000000 Binary files a/_backup/PRC8_20241022.7z and /dev/null differ diff --git a/_backup/PRC8_20241025.7z b/_backup/PRC8_20241025.7z deleted file mode 100644 index f15c1d14..00000000 Binary files a/_backup/PRC8_20241025.7z and /dev/null differ diff --git a/_backup/PRC8_20241103.7z b/_backup/PRC8_20241103.7z deleted file mode 100644 index fc82ee12..00000000 Binary files a/_backup/PRC8_20241103.7z and /dev/null differ diff --git a/_backup/PRC8_20241106.7z b/_backup/PRC8_20241106.7z deleted file mode 100644 index f059cc06..00000000 Binary files a/_backup/PRC8_20241106.7z and /dev/null differ diff --git a/_backup/PRC8_20241116.7z b/_backup/PRC8_20241116.7z deleted file mode 100644 index c49632f8..00000000 Binary files a/_backup/PRC8_20241116.7z and /dev/null differ diff --git a/_backup/PRC8_20241213.7z b/_backup/PRC8_20241213.7z deleted file mode 100644 index 1028e188..00000000 Binary files a/_backup/PRC8_20241213.7z and /dev/null differ diff --git a/_backup/PRC8_20241220.7z b/_backup/PRC8_20241220.7z deleted file mode 100644 index 9f70f317..00000000 Binary files a/_backup/PRC8_20241220.7z and /dev/null differ diff --git a/_backup/PRC8_20241221.7z b/_backup/PRC8_20241221.7z deleted file mode 100644 index 9a69f5d0..00000000 Binary files a/_backup/PRC8_20241221.7z and /dev/null differ diff --git a/_backup/PRC8_20241226.7z b/_backup/PRC8_20241226.7z deleted file mode 100644 index b35ac19f..00000000 Binary files a/_backup/PRC8_20241226.7z and /dev/null differ diff --git a/_backup/PRC8_20241228.7z b/_backup/PRC8_20241228.7z deleted file mode 100644 index abc26af7..00000000 Binary files a/_backup/PRC8_20241228.7z and /dev/null differ diff --git a/_backup/PRC8_20241231.7z b/_backup/PRC8_20241231.7z deleted file mode 100644 index 088f1d96..00000000 Binary files a/_backup/PRC8_20241231.7z and /dev/null differ diff --git a/_backup/PRC8_20250103.7z b/_backup/PRC8_20250103.7z deleted file mode 100644 index 4eebcb49..00000000 Binary files a/_backup/PRC8_20250103.7z and /dev/null differ diff --git a/_backup/PRC8_20250104.7z b/_backup/PRC8_20250104.7z deleted file mode 100644 index 00fca625..00000000 Binary files a/_backup/PRC8_20250104.7z and /dev/null differ diff --git a/_backup/PRC8_20250107.7z b/_backup/PRC8_20250107.7z deleted file mode 100644 index e266f8ac..00000000 Binary files a/_backup/PRC8_20250107.7z and /dev/null differ diff --git a/_backup/PRC8_20250108.7z b/_backup/PRC8_20250108.7z deleted file mode 100644 index 88b82f6b..00000000 Binary files a/_backup/PRC8_20250108.7z and /dev/null differ diff --git a/_backup/PRC8_20250117.7z b/_backup/PRC8_20250117.7z deleted file mode 100644 index 560a93d6..00000000 Binary files a/_backup/PRC8_20250117.7z and /dev/null differ diff --git a/_backup/PRC8_20250121.7z b/_backup/PRC8_20250121.7z deleted file mode 100644 index f9e6c9c6..00000000 Binary files a/_backup/PRC8_20250121.7z and /dev/null differ diff --git a/_backup/PRC8_20250128.7z b/_backup/PRC8_20250128.7z deleted file mode 100644 index f9e6c9c6..00000000 Binary files a/_backup/PRC8_20250128.7z and /dev/null differ diff --git a/_backup/PRC8_20250129.7z b/_backup/PRC8_20250129.7z deleted file mode 100644 index 6e4dbd74..00000000 Binary files a/_backup/PRC8_20250129.7z and /dev/null differ diff --git a/_backup/PRC8_20250205.7z b/_backup/PRC8_20250205.7z deleted file mode 100644 index 2733382c..00000000 Binary files a/_backup/PRC8_20250205.7z and /dev/null differ diff --git a/_backup/PRC8_20250209.7z b/_backup/PRC8_20250209.7z deleted file mode 100644 index 53af3e14..00000000 Binary files a/_backup/PRC8_20250209.7z and /dev/null differ diff --git a/_backup/PRC8_4110.7z b/_backup/PRC8_4110.7z deleted file mode 100644 index e272318b..00000000 Binary files a/_backup/PRC8_4110.7z and /dev/null differ diff --git a/nwn/nwnprc/trunk/epicspellscripts/ss_ep_armyunfall.nss b/nwn/nwnprc/trunk/epicspellscripts/ss_ep_armyunfall.nss index 84c2c22e..04ca143d 100644 --- a/nwn/nwnprc/trunk/epicspellscripts/ss_ep_armyunfall.nss +++ b/nwn/nwnprc/trunk/epicspellscripts/ss_ep_armyunfall.nss @@ -11,6 +11,105 @@ #include "nw_i0_generic" void main() +{ + // Set up the spell school context + DeleteLocalInt(OBJECT_SELF, "X2_L_LAST_SPELLSCHOOL_VAR"); + SetLocalInt(OBJECT_SELF, "X2_L_LAST_SPELLSCHOOL_VAR", SPELL_SCHOOL_CONJURATION); + + // Standard pre-cast check + if (!X2PreSpellCastCode()) + { + DeleteLocalInt(OBJECT_SELF, "X2_L_LAST_SPELLSCHOOL_VAR"); + return; + } + + // Check if caster can cast the spell + if (GetCanCastSpell(OBJECT_SELF, SPELL_EPIC_ARMY_UN)) + { + int nAlly = 0; + int nBLD; + int nX; + + // Prepare visual effects + effect eVis = EffectVisualEffect(VFX_FNF_LOS_HOLY_10); + effect eVis2 = EffectVisualEffect(VFX_FNF_PWSTUN); + effect eVis3 = EffectVisualEffect(VFX_IMP_HEALING_G); + effect eRez, eHeal, eLink, eBLD; + + // === Handle caster (OBJECT_SELF) first === + nX = GetMaxHitPoints(OBJECT_SELF) - GetCurrentHitPoints(OBJECT_SELF); + if (nX < 0) nX = 0; + + if (nX && !MatchNonliving(MyPRCGetRacialType(OBJECT_SELF))) + { + eRez = EffectResurrection(); + eHeal = EffectHeal(nX); + eLink = EffectLinkEffects(eHeal, eVis); + eLink = EffectLinkEffects(eLink, eVis2); + eLink = EffectLinkEffects(eLink, eVis3); + + if (GetIsDead(OBJECT_SELF)) + { + SPApplyEffectToObject(DURATION_TYPE_INSTANT, eRez, OBJECT_SELF); + ExecuteScript("prc_pw_armyunfall", OBJECT_SELF); + + if (GetPRCSwitch(PRC_PW_DEATH_TRACKING) && GetIsPC(OBJECT_SELF)) + SetPersistantLocalInt(OBJECT_SELF, "persist_dead", FALSE); + } + + SPApplyEffectToObject(DURATION_TYPE_INSTANT, eLink, OBJECT_SELF); + nAlly++; + } + + // === Handle other allies in faction === + object oTarget = GetFirstFactionMember(OBJECT_SELF, FALSE); + while (GetIsObjectValid(oTarget)) + { + if (oTarget != OBJECT_SELF) + { + nX = GetMaxHitPoints(oTarget) - GetCurrentHitPoints(oTarget); + if (nX < 0) nX = 0; + + if (nX && !MatchNonliving(MyPRCGetRacialType(oTarget))) + { + eRez = EffectResurrection(); + eHeal = EffectHeal(nX); + eLink = EffectLinkEffects(eHeal, eVis); + eLink = EffectLinkEffects(eLink, eVis2); + eLink = EffectLinkEffects(eLink, eVis3); + + if (GetIsDead(oTarget)) + { + SPApplyEffectToObject(DURATION_TYPE_INSTANT, eRez, oTarget); + ExecuteScript("prc_pw_armyunfall", oTarget); + + if (GetPRCSwitch(PRC_PW_DEATH_TRACKING) && GetIsPC(oTarget)) + SetPersistantLocalInt(oTarget, "persist_dead", FALSE); + } + + SPApplyEffectToObject(DURATION_TYPE_INSTANT, eLink, oTarget); + nAlly++; + } + } + + oTarget = GetNextFactionMember(OBJECT_SELF, FALSE); + } + + // === Apply backlash damage if enabled === + if (GetPRCSwitch(PRC_EPIC_BACKLASH_DAMAGE) == TRUE) + { + nBLD = d6(nAlly); + eBLD = EffectDamage(nBLD); + SPApplyEffectToObject(DURATION_TYPE_INSTANT, eBLD, OBJECT_SELF); + } + } + + // Clean up spell school variable + DeleteLocalInt(OBJECT_SELF, "X2_L_LAST_SPELLSCHOOL_VAR"); +} + + +/* void main() { DeleteLocalInt(OBJECT_SELF, "X2_L_LAST_SPELLSCHOOL_VAR"); SetLocalInt(OBJECT_SELF, "X2_L_LAST_SPELLSCHOOL_VAR", SPELL_SCHOOL_CONJURATION); @@ -64,4 +163,4 @@ void main() } } DeleteLocalInt(OBJECT_SELF, "X2_L_LAST_SPELLSCHOOL_VAR"); -} +} */ \ No newline at end of file