diff --git a/nwn/nwnprc/trunk/2das/cls_feat_kngtwv.2da b/nwn/nwnprc/trunk/2das/cls_feat_kngtwv.2da index 09b6c906..df0585e7 100644 --- a/nwn/nwnprc/trunk/2das/cls_feat_kngtwv.2da +++ b/nwn/nwnprc/trunk/2das/cls_feat_kngtwv.2da @@ -1,55 +1,55 @@ 2DA V2.0 - FeatLabel FeatIndex List GrantedOnLevel OnMenu -0 ArmouredMage 2780 3 2 0 -1 BurnSpell 5225 3 2 1 -2 KnightWeave_ReadMagic 5224 3 1 1 -3 KnightWeave_Heal 5223 3 6 1 -4 KnightWeave_Damage 5222 3 10 1 -5 BattleCaster 23589 0 -1 0 -6 SuddenEmpower 2830 2 4 1 -7 SuddenExtend 2831 2 4 1 -8 SuddenMaximize 2832 2 4 1 -9 SuddenWiden 2833 2 4 1 -10 Spellbook 1999 3 1 1 -11 ####START_OF_NEW_SPELLBOOK_RESERVE **** **** **** **** -12 KnightoftheWeave_Bless 12696 0 99 1 -13 KnightoftheWeave_Bless_Weapon 12697 0 99 1 -14 KnightoftheWeave_Charm_Person 12698 0 99 1 -15 KnightoftheWeave_Command_RadialMaster 12699 0 99 1 -16 KnightoftheWeave_Cure_Light_Wounds 12700 0 99 1 -17 KnightoftheWeave_Divine_Favor 12701 0 99 1 -18 KnightoftheWeave_Lesser_Restoration 12702 0 99 1 -19 KnightoftheWeave_Mage_Armor 12703 0 99 1 -20 KnightoftheWeave_Magic_Missile 12704 0 99 1 -21 KnightoftheWeave_Magic_Weapon 12705 0 99 1 -22 KnightoftheWeave_Read_Magic 12706 0 99 1 -23 KnightoftheWeave_Shield 12707 0 99 1 -24 KnightoftheWeave_Bulls_Strength 12708 0 99 1 -25 KnightoftheWeave_Cats_Grace 12709 0 99 1 -26 KnightoftheWeave_Endurance 12710 0 99 1 -27 KnightoftheWeave_Ultravision 12711 0 99 1 -28 KnightoftheWeave_Eagle_Splendor 12712 0 99 1 -29 KnightoftheWeave_Resist_Elements 12713 0 99 1 -30 KnightoftheWeave_See_Invisibility 12714 0 99 1 -31 KnightoftheWeave_ShieldOther 12715 0 99 1 -32 KnightoftheWeave_Cure_Moderate_Wounds 12716 0 99 1 -33 KnightoftheWeave_Daylight 12717 0 99 1 -34 KnightoftheWeave_Dispel_Magic 12718 0 99 1 -35 KnightoftheWeave_Greater_Magic_Weapon 12719 0 99 1 -36 KnightoftheWeave_Remove_Curse 12720 0 99 1 -37 KnightoftheWeave_BreakEnchantment 12721 0 99 1 -38 KnightoftheWeave_Cure_Serious_Wounds 12722 0 99 1 -39 KnightoftheWeave_Death_Ward 12723 0 99 1 -40 KnightoftheWeave_Minor_Globe_of_Invulnerability 12724 0 99 1 -41 KnightoftheWeave_Neutralize_Poison 12725 0 99 1 -42 KnightoftheWeave_Restoration 12726 0 99 1 -43 KnightoftheWeave_Cure_Critical_Wounds 12727 0 99 1 -44 KnightoftheWeave_DimensionDoor_RadialMaster 12728 0 99 1 -45 KnightoftheWeave_Spell_Resistance 12729 0 99 1 -46 KnightoftheWeave_True_Seeing 12730 0 99 1 -47 KnightoftheWeave_Banishment 12731 0 99 1 -48 KnightoftheWeave_Greater_Dispelling 12732 0 99 1 -49 KnightoftheWeave_Teleport_RadialMaster 12733 0 99 1 -50 **** **** **** **** **** -51 ####END_OF_NEW_SPELLBOOK_RESERVE **** **** **** **** + FeatLabel FeatIndex List GrantedOnLevel OnMenu +0 ArmouredMage 2780 3 2 0 +1 BurnSpell 5225 3 2 1 +2 KnightWeave_ReadMagic 5224 3 1 1 +3 KnightWeave_Heal 5223 3 6 1 +4 KnightWeave_Damage 5222 3 10 1 +5 BattleCaster 23589 0 -1 0 +6 SuddenEmpower 2830 2 4 1 +7 SuddenExtend 2831 2 4 1 +8 SuddenMaximize 2832 2 4 1 +9 SuddenWiden 2833 2 4 1 +10 Spellbook_[DEFUNCT] 1999 3 99 0 +11 ####START_OF_NEW_SPELLBOOK_RESERVE **** **** **** **** +12 KnightoftheWeave_Bless 12696 0 99 1 +13 KnightoftheWeave_Bless_Weapon 12697 0 99 1 +14 KnightoftheWeave_Charm_Person 12698 0 99 1 +15 KnightoftheWeave_Command_RadialMaster 12699 0 99 1 +16 KnightoftheWeave_Cure_Light_Wounds 12700 0 99 1 +17 KnightoftheWeave_Divine_Favor 12701 0 99 1 +18 KnightoftheWeave_Lesser_Restoration 12702 0 99 1 +19 KnightoftheWeave_Mage_Armor 12703 0 99 1 +20 KnightoftheWeave_Magic_Missile 12704 0 99 1 +21 KnightoftheWeave_Magic_Weapon 12705 0 99 1 +22 KnightoftheWeave_Read_Magic 12706 0 99 1 +23 KnightoftheWeave_Shield 12707 0 99 1 +24 KnightoftheWeave_Bulls_Strength 12708 0 99 1 +25 KnightoftheWeave_Cats_Grace 12709 0 99 1 +26 KnightoftheWeave_Endurance 12710 0 99 1 +27 KnightoftheWeave_Ultravision 12711 0 99 1 +28 KnightoftheWeave_Eagle_Splendor 12712 0 99 1 +29 KnightoftheWeave_Resist_Elements 12713 0 99 1 +30 KnightoftheWeave_See_Invisibility 12714 0 99 1 +31 KnightoftheWeave_ShieldOther 12715 0 99 1 +32 KnightoftheWeave_Cure_Moderate_Wounds 12716 0 99 1 +33 KnightoftheWeave_Daylight 12717 0 99 1 +34 KnightoftheWeave_Dispel_Magic 12718 0 99 1 +35 KnightoftheWeave_Greater_Magic_Weapon 12719 0 99 1 +36 KnightoftheWeave_Remove_Curse 12720 0 99 1 +37 KnightoftheWeave_BreakEnchantment 12721 0 99 1 +38 KnightoftheWeave_Cure_Serious_Wounds 12722 0 99 1 +39 KnightoftheWeave_Death_Ward 12723 0 99 1 +40 KnightoftheWeave_Minor_Globe_of_Invulnerability 12724 0 99 1 +41 KnightoftheWeave_Neutralize_Poison 12725 0 99 1 +42 KnightoftheWeave_Restoration 12726 0 99 1 +43 KnightoftheWeave_Cure_Critical_Wounds 12727 0 99 1 +44 KnightoftheWeave_DimensionDoor_RadialMaster 12728 0 99 1 +45 KnightoftheWeave_Spell_Resistance 12729 0 99 1 +46 KnightoftheWeave_True_Seeing 12730 0 99 1 +47 KnightoftheWeave_Banishment 12731 0 99 1 +48 KnightoftheWeave_Greater_Dispelling 12732 0 99 1 +49 KnightoftheWeave_Teleport_RadialMaster 12733 0 99 1 +50 **** **** **** **** **** +51 ####END_OF_NEW_SPELLBOOK_RESERVE **** **** **** **** diff --git a/nwn/nwnprc/trunk/CompiledResources/PRC8.hif b/nwn/nwnprc/trunk/CompiledResources/PRC8.hif index a8f42a23..6559f77f 100644 --- a/nwn/nwnprc/trunk/CompiledResources/PRC8.hif +++ b/nwn/nwnprc/trunk/CompiledResources/PRC8.hif @@ -55,11 +55,11 @@ # module.OnUserDefined : Assigns script(s) to handle this module event # Title for the HIF. -Title : PRC +Title : PRC8 # Add the PRC pack version and specify at least 1.62 to install. -Version : 4.1.6 -MinNWNVersion: 1.67 +Version : 4.1.11 +MinNWNVersion: 1.68 # ERF with the required areas. erf : prc8_consortium.erf diff --git a/nwn/nwnprc/trunk/include/prc_add_spell_dc.nss b/nwn/nwnprc/trunk/include/prc_add_spell_dc.nss index b0d30449..fc5a080a 100644 --- a/nwn/nwnprc/trunk/include/prc_add_spell_dc.nss +++ b/nwn/nwnprc/trunk/include/prc_add_spell_dc.nss @@ -322,7 +322,7 @@ int SaintHolySpellPower(object oCaster) } //:: If it gets here, the caster does not have the feat return 0; -} +} //Draconic Power's elemental boost to spell DCs int DraconicPowerDC(int spell_id, int nElement, object oCaster) @@ -487,8 +487,8 @@ int PRCGetSpellSaveDC(int nSpellID = -1, int nSchool = -1, object oCaster = OBJE int nClass = PRCGetLastSpellCastClass(oCaster); int nDC = 10; - - if(nClass == CLASS_TYPE_BARD) + + if(nClass == CLASS_TYPE_BARD) nDC += StringToInt(Get2DACache("Spells", "Bard", nSpellID)); else if(nClass == CLASS_TYPE_CLERIC || nClass == CLASS_TYPE_UR_PRIEST || nClass == CLASS_TYPE_OCULAR) nDC += StringToInt(Get2DACache("Spells", "Cleric", nSpellID)); @@ -759,4 +759,4 @@ int GetChangesToSaveDC(object oTarget, object oCaster, int nSpellID, int nSchool } // Test main -//void main(){} +//:: void main(){} diff --git a/nwn/nwnprc/trunk/others/bdd_eagle_claw.uti b/nwn/nwnprc/trunk/others/bdd_eagle_claw.uti index 8d9280a8..175b3633 100644 Binary files a/nwn/nwnprc/trunk/others/bdd_eagle_claw.uti and b/nwn/nwnprc/trunk/others/bdd_eagle_claw.uti differ diff --git a/nwn/nwnprc/trunk/others/eagleclaw.uti b/nwn/nwnprc/trunk/others/eagleclaw.uti deleted file mode 100644 index 1e257a50..00000000 Binary files a/nwn/nwnprc/trunk/others/eagleclaw.uti and /dev/null differ diff --git a/nwn/nwnprc/trunk/others/heavy_mace.uti b/nwn/nwnprc/trunk/others/heavy_mace.uti deleted file mode 100644 index 01f4dc2b..00000000 Binary files a/nwn/nwnprc/trunk/others/heavy_mace.uti and /dev/null differ diff --git a/nwn/nwnprc/trunk/spells/nw_s0_darknessa.nss b/nwn/nwnprc/trunk/spells/nw_s0_darknessa.nss index bd55d861..8784293b 100644 --- a/nwn/nwnprc/trunk/spells/nw_s0_darknessa.nss +++ b/nwn/nwnprc/trunk/spells/nw_s0_darknessa.nss @@ -28,13 +28,19 @@ SetLocalInt(OBJECT_SELF, "X2_L_LAST_SPELLSCHOOL_VAR", SPELL_SCHOOL_EVOCATION); effect eInvis = EffectInvisibility(INVISIBILITY_TYPE_DARKNESS); effect eDark = EffectDarkness(); effect eDur = EffectVisualEffect(VFX_DUR_CESSATE_NEGATIVE); + effect eLink = EffectLinkEffects(eDark, eDur); - + eLink = TagEffect(eLink, "BIO_DARKNESS"); + effect eLink2 = EffectLinkEffects(eInvis, eDur); + eLink2 = TagEffect(eLink2, "PNP_DARKNESS"); effect ePnP = EffectLinkEffects(eDur, EffectDarkness()); if(GetPRCSwitch(PRC_PNP_DARKNESS_35ED)) - ePnP = EffectLinkEffects(eDur, EffectConcealment(20)); + { + ePnP = EffectLinkEffects(eDur, EffectConcealment(20)); + ePnP = TagEffect(ePnP, "PNP35_DARKNESS"); + } object oTarget = GetEnteringObject(); int iShadow = GetLevelByClass(CLASS_TYPE_SHADOWLORD,oTarget); diff --git a/nwn/nwnprc/trunk/spells/nw_s0_darknessb.nss b/nwn/nwnprc/trunk/spells/nw_s0_darknessb.nss index 6006a26f..00023e47 100644 --- a/nwn/nwnprc/trunk/spells/nw_s0_darknessb.nss +++ b/nwn/nwnprc/trunk/spells/nw_s0_darknessb.nss @@ -56,6 +56,21 @@ SetLocalInt(OBJECT_SELF, "X2_L_LAST_SPELLSCHOOL_VAR", SPELL_SCHOOL_EVOCATION); eAOE = GetNextEffect(oTarget); } + effect eEffect = GetFirstEffect(oTarget); + while(GetIsEffectValid(eEffect)) + { + if(GetEffectTag(eEffect) == "PNP_DARKNESS") + RemoveEffect(oTarget, eEffect); + + if(GetEffectTag(eEffect) == "PNP35_DARKNESS") + RemoveEffect(oTarget, eEffect); + + if(GetEffectTag(eEffect) == "BIO_DARKNESS") + RemoveEffect(oTarget, eEffect); + + eEffect = GetNextEffect(oTarget); + } + DeleteLocalInt(OBJECT_SELF, "X2_L_LAST_SPELLSCHOOL_VAR"); // Getting rid of the local integer storing the spellschool name }