diff --git a/.gitignore b/.gitignore index 8b5dcce0..b588d56e 100644 --- a/.gitignore +++ b/.gitignore @@ -146,3 +146,4 @@ nwn/nwnprc/trunk/makefile.temp /Release /old_backup *.7z +nwn/nwnprc/trunk/newcompilepsi.bat diff --git a/nwn/nwnprc/trunk/2das/cls_feat_palema.2da b/nwn/nwnprc/trunk/2das/cls_feat_palema.2da index 988130e6..f6e86070 100644 --- a/nwn/nwnprc/trunk/2das/cls_feat_palema.2da +++ b/nwn/nwnprc/trunk/2das/cls_feat_palema.2da @@ -13,26 +13,26 @@ 9 FEAT_DEATHLESS_MASTER_TOUCH 897 3 10 1 10 darkvision 228 3 3 0 11 FEAT_EPIC_PALE_MASTER 984 3 11 0 -12 FEAT_PALEMASTER_SPELLCASTING_FEY 18239 2 999 0 -13 FEAT_PALEMASTER_SPELLCASTING_ABERRATION 18285 2 999 0 -14 FEAT_PALEMASTER_SPELLCASTING_MONSTROUS 18332 2 999 0 -15 FEAT_PALEMASTER_SPELLCASTING_OUTSIDER 18379 2 999 0 -16 FEAT_PALEMASTER_SPELLCASTING_SHAPECHANGER 18426 2 999 0 -17 FEAT_PALEMASTER_SPELLCASTING_ASSASSIN 18462 2 999 0 -18 FEAT_PALEMASTER_SPELLCASTING_BARD 18503 2 999 0 -19 FEAT_PALEMASTER_SPELLCASTING_BEGUILER 18547 2 999 0 -20 FEAT_PALEMASTER_SPELLCASTING_CULTIST_PEAK 18613 2 999 0 -21 FEAT_PALEMASTER_SPELLCASTING_DNECRO 18655 2 999 0 -22 FEAT_PALEMASTER_SPELLCASTING_DUSKBLADE 18697 2 999 0 -23 FEAT_PALEMASTER_SPELLCASTING_HARPER 18731 2 999 0 -24 FEAT_PALEMASTER_SPELLCASTING_HEXBLADE 18768 2 999 0 -25 FEAT_PALEMASTER_SPELLCASTING_KNIGHT_WEAVE 18805 2 999 0 -26 FEAT_PALEMASTER_SPELLCASTING_SHADOWLORD 18843 2 999 0 -27 FEAT_PALEMASTER_SPELLCASTING_SORCERER 18889 2 999 0 -28 FEAT_PALEMASTER_SPELLCASTING_SUBLIME_CHORD 18935 2 999 0 -29 FEAT_PALEMASTER_SPELLCASTING_SUEL_ARCHANAMACH 18978 2 999 0 -30 FEAT_PALEMASTER_SPELLCASTING_WARMAGE 19021 2 999 0 -31 FEAT_PALEMASTER_SPELLCASTING_WIZARD 19066 2 999 0 +12 FEAT_PALEMASTER_SPELLCASTING_FEY 18239 2 1 0 +13 FEAT_PALEMASTER_SPELLCASTING_ABERRATION 18285 2 1 0 +14 FEAT_PALEMASTER_SPELLCASTING_MONSTROUS 18332 2 1 0 +15 FEAT_PALEMASTER_SPELLCASTING_OUTSIDER 18379 2 1 0 +16 FEAT_PALEMASTER_SPELLCASTING_SHAPECHANGER 18426 2 1 0 +17 FEAT_PALEMASTER_SPELLCASTING_ASSASSIN 18462 2 1 0 +18 FEAT_PALEMASTER_SPELLCASTING_BARD 18503 2 1 0 +19 FEAT_PALEMASTER_SPELLCASTING_BEGUILER 18547 2 1 0 +20 FEAT_PALEMASTER_SPELLCASTING_CULTIST_PEAK 18613 2 1 0 +21 FEAT_PALEMASTER_SPELLCASTING_DNECRO 18655 2 1 0 +22 FEAT_PALEMASTER_SPELLCASTING_DUSKBLADE 18697 2 1 0 +23 FEAT_PALEMASTER_SPELLCASTING_HARPER 18731 2 1 0 +24 FEAT_PALEMASTER_SPELLCASTING_HEXBLADE 18768 2 1 0 +25 FEAT_PALEMASTER_SPELLCASTING_KNIGHT_WEAVE 18805 2 1 0 +26 FEAT_PALEMASTER_SPELLCASTING_SHADOWLORD 18843 2 1 0 +27 FEAT_PALEMASTER_SPELLCASTING_SORCERER 18889 2 1 0 +28 FEAT_PALEMASTER_SPELLCASTING_SUBLIME_CHORD 18935 2 1 0 +29 FEAT_PALEMASTER_SPELLCASTING_SUEL_ARCHANAMACH 18978 2 1 0 +30 FEAT_PALEMASTER_SPELLCASTING_WARMAGE 19021 2 1 0 +31 FEAT_PALEMASTER_SPELLCASTING_WIZARD 19066 2 1 0 32 DefArrow 8 0 -1 0 33 Ambidex 1 0 -1 0 34 FEAT_EPIC_SPELL_FOCUS_ABJURATION 610 1 -1 0 diff --git a/nwn/nwnprc/trunk/CompiledResources/PRC8_Tester.mod b/nwn/nwnprc/trunk/CompiledResources/PRC8_Tester.mod index 13e98583..9ca3184e 100644 Binary files a/nwn/nwnprc/trunk/CompiledResources/PRC8_Tester.mod and b/nwn/nwnprc/trunk/CompiledResources/PRC8_Tester.mod differ diff --git a/nwn/nwnprc/trunk/include/prc_add_spl_pen.nss b/nwn/nwnprc/trunk/include/prc_add_spl_pen.nss index e339ebd7..646cab40 100644 --- a/nwn/nwnprc/trunk/include/prc_add_spl_pen.nss +++ b/nwn/nwnprc/trunk/include/prc_add_spl_pen.nss @@ -58,7 +58,7 @@ int SPGetPenetrAOE(object oCaster = OBJECT_SELF, int nCasterLvl = 0); //#include "prc_alterations" //#include "prcsp_archmaginc" //#include "prc_inc_racial" - +#include "inc_2dacache" ////////////////////////////////////////////////// /* Function definitions */ diff --git a/nwn/nwnprc/trunk/include/prc_inc_shifting.nss b/nwn/nwnprc/trunk/include/prc_inc_shifting.nss index 7cac1edf..1e0fadc9 100644 --- a/nwn/nwnprc/trunk/include/prc_inc_shifting.nss +++ b/nwn/nwnprc/trunk/include/prc_inc_shifting.nss @@ -1370,7 +1370,9 @@ void _prc_inc_shifting_ShiftIntoTemplateAux(object oShifter, int nShifterType, o if(GetIsObjectValid(oShifterCWpR)) MyDestroyObject(oShifterCWpR); if(GetIsObjectValid(oShifterCWpL)) MyDestroyObject(oShifterCWpL); if(GetIsObjectValid(oShifterCWpB)) MyDestroyObject(oShifterCWpB); - oShifterCWpR = oShifterCWpL = oShifterCWpR = OBJECT_INVALID; + oShifterCWpR = OBJECT_INVALID; + oShifterCWpL = OBJECT_INVALID; + oShifterCWpB = OBJECT_INVALID; // Copy the template's weapons and assign equipping diff --git a/nwn/nwnprc/trunk/include/prc_inc_switch.nss b/nwn/nwnprc/trunk/include/prc_inc_switch.nss index d9384452..f27060ac 100644 --- a/nwn/nwnprc/trunk/include/prc_inc_switch.nss +++ b/nwn/nwnprc/trunk/include/prc_inc_switch.nss @@ -76,7 +76,7 @@ /* This variable MUST be updated with every new version of the PRC!!! */ - const string PRC_VERSION = "PRC8 4.73"; + const string PRC_VERSION = "PRC8 4.74"; /* This variable MUST be updated every time 'assemble_spellbooks.bat' is run!!! */ diff --git a/nwn/nwnprc/trunk/include/prc_x2_itemprop.nss b/nwn/nwnprc/trunk/include/prc_x2_itemprop.nss index d6efc307..ded08330 100644 --- a/nwn/nwnprc/trunk/include/prc_x2_itemprop.nss +++ b/nwn/nwnprc/trunk/include/prc_x2_itemprop.nss @@ -20,9 +20,6 @@ //:: Last Update: 2003-10-07 //::////////////////////////////////////////////// -//:: Test void -//:: void main (){} - //Changed by primogenitor to include CEP itemtypes // * The tag of the ip work container, a placeable which has to be set into each diff --git a/nwn/nwnprc/trunk/others/mc_charcoal.uti b/nwn/nwnprc/trunk/others/mc_charcoal.uti index 77e64e86..b609ffd0 100644 Binary files a/nwn/nwnprc/trunk/others/mc_charcoal.uti and b/nwn/nwnprc/trunk/others/mc_charcoal.uti differ diff --git a/nwn/nwnprc/trunk/others/mc_flint.uti b/nwn/nwnprc/trunk/others/mc_flint.uti index a245c055..d9a87108 100644 Binary files a/nwn/nwnprc/trunk/others/mc_flint.uti and b/nwn/nwnprc/trunk/others/mc_flint.uti differ diff --git a/nwn/nwnprc/trunk/others/mc_hand.uti b/nwn/nwnprc/trunk/others/mc_hand.uti index de2072f5..21d058bb 100644 Binary files a/nwn/nwnprc/trunk/others/mc_hand.uti and b/nwn/nwnprc/trunk/others/mc_hand.uti differ diff --git a/nwn/nwnprc/trunk/others/mc_jade.uti b/nwn/nwnprc/trunk/others/mc_jade.uti index ff37a553..6442bd1a 100644 Binary files a/nwn/nwnprc/trunk/others/mc_jade.uti and b/nwn/nwnprc/trunk/others/mc_jade.uti differ diff --git a/nwn/nwnprc/trunk/others/mc_ointment.uti b/nwn/nwnprc/trunk/others/mc_ointment.uti index 5d567e38..f7eaf721 100644 Binary files a/nwn/nwnprc/trunk/others/mc_ointment.uti and b/nwn/nwnprc/trunk/others/mc_ointment.uti differ diff --git a/nwn/nwnprc/trunk/others/mc_phosphorus.uti b/nwn/nwnprc/trunk/others/mc_phosphorus.uti index bdcbeded..a4f3279a 100644 Binary files a/nwn/nwnprc/trunk/others/mc_phosphorus.uti and b/nwn/nwnprc/trunk/others/mc_phosphorus.uti differ diff --git a/nwn/nwnprc/trunk/others/mc_sulfur.uti b/nwn/nwnprc/trunk/others/mc_sulfur.uti index d4dbd237..e6334ce5 100644 Binary files a/nwn/nwnprc/trunk/others/mc_sulfur.uti and b/nwn/nwnprc/trunk/others/mc_sulfur.uti differ diff --git a/nwn/nwnprc/trunk/psionics/psi_pow_ddoor.nss b/nwn/nwnprc/trunk/psionics/psi_pow_ddoor.nss index f99f6414..77e3a038 100644 --- a/nwn/nwnprc/trunk/psionics/psi_pow_ddoor.nss +++ b/nwn/nwnprc/trunk/psionics/psi_pow_ddoor.nss @@ -38,7 +38,7 @@ #include "psi_inc_psifunc" #include "psi_spellhook" -#include "spinc_dimdoor"; +#include "spinc_dimdoor" void main() diff --git a/nwn/nwnprc/trunk/psionics/psi_pow_encurr.nss b/nwn/nwnprc/trunk/psionics/psi_pow_encurr.nss index c34fda45..417c23fe 100644 --- a/nwn/nwnprc/trunk/psionics/psi_pow_encurr.nss +++ b/nwn/nwnprc/trunk/psionics/psi_pow_encurr.nss @@ -328,9 +328,12 @@ void SecondaryTargetsCheck(object oManifester, object oMainTarget, int nSecondar // Store the target in the secondary target array array_set_object(oManifester, SECONDARY_TARGETS_ARRAY, i, oTest); - // Find next empty slot - while(array_get_object(oManifester, SECONDARY_TARGETS_ARRAY, ++i) != OBJECT_INVALID) - ; + // Find next empty slot + while(i < nSecondaryTargets && + array_get_object(oManifester, SECONDARY_TARGETS_ARRAY, ++i) != OBJECT_INVALID) + { + // Continue searching + } } // Get next potential target diff --git a/nwn/nwnprc/trunk/psionics/psi_sk_event.nss b/nwn/nwnprc/trunk/psionics/psi_sk_event.nss index abb44b9f..3640c2f4 100644 --- a/nwn/nwnprc/trunk/psionics/psi_sk_event.nss +++ b/nwn/nwnprc/trunk/psionics/psi_sk_event.nss @@ -30,7 +30,7 @@ //::////////////////////////////////////////////// //::////////////////////////////////////////////// -#include "prc_alterations" Provided by prc_alterations +#include "prc_alterations" //:: Provided by prc_alterations #include "psi_inc_soulkn" int LOCAL_DEBUG = DEBUG; diff --git a/nwn/nwnprc/trunk/scripts/prc_ea_return.nss b/nwn/nwnprc/trunk/scripts/prc_ea_return.nss index a2638d9a..e89dd6cf 100644 --- a/nwn/nwnprc/trunk/scripts/prc_ea_return.nss +++ b/nwn/nwnprc/trunk/scripts/prc_ea_return.nss @@ -1,6 +1,6 @@ void Cleanup(object oArea) { - if (GetResRef(oArea) == "bdd_cave"); + if (GetResRef(oArea) == "bdd_cave") { DestroyArea(GetObjectByTag("bdd_basinrim")); //DestroyArea(GetObjectByTag("bdd_cave")); diff --git a/nwn/nwnprc/trunk/scripts/prc_shift_convo.nss b/nwn/nwnprc/trunk/scripts/prc_shift_convo.nss index 62482fae..9ae29185 100644 --- a/nwn/nwnprc/trunk/scripts/prc_shift_convo.nss +++ b/nwn/nwnprc/trunk/scripts/prc_shift_convo.nss @@ -135,7 +135,7 @@ void GenerateNewShapePackageList(object oPC, string sFilter) } } -int AddNewShape(string sShapeList, object oPC, int nShape, int nShifterLevel, int nCharacterLevel, string sShapeResRefFilter, int bUseCR, int nExactMatchSL, int bShowAllShapes, int bUseCR) +int AddNewShape(string sShapeList, object oPC, int nShape, int nShifterLevel, int nCharacterLevel, string sShapeResRefFilter, int bUseCR, int nExactMatchSL, int bShowAllShapes,int bUseCR) { string sShapeResRef = Get2DACache(sShapeList, "ResRef", nShape); if (DEBUG_NEW_SHAPE_LIST) DoDebug("AddNewShape, ShapeList:" + sShapeList + ", Shape: " + IntToString(nShape) + "='" + sShapeResRef + "', ShifterLevel: " + IntToString(nShifterLevel) + ", CharacterLevel: " + IntToString(nCharacterLevel) + ", UseCR: " + IntToString(bUseCR)); diff --git a/nwn/nwnprc/trunk/spells/sp_animobj.nss b/nwn/nwnprc/trunk/spells/sp_animobj.nss index 85bf0bee..2fac6d9d 100644 --- a/nwn/nwnprc/trunk/spells/sp_animobj.nss +++ b/nwn/nwnprc/trunk/spells/sp_animobj.nss @@ -1,6 +1,6 @@ #include "prc_alterations" -#include "prc_inc_spells.nss" +#include "prc_inc_spells" #include "prc_add_spell_dc" int GetIsValidAnimate(object oTarget); @@ -247,7 +247,4 @@ void main() SendMessageToPC(OBJECT_SELF, "Target must be armour/clothing/melee weapon"); SendMessageToPC(OBJECT_SELF, "Target cannot be magical"); } -} - - - +} \ No newline at end of file diff --git a/nwn/nwnprc/trunk/spells/sp_exaltd_raim.nss b/nwn/nwnprc/trunk/spells/sp_exaltd_raim.nss index ac478f58..bc38d45b 100644 --- a/nwn/nwnprc/trunk/spells/sp_exaltd_raim.nss +++ b/nwn/nwnprc/trunk/spells/sp_exaltd_raim.nss @@ -36,11 +36,8 @@ Created: 6/28/06 */ //::////////////////////////////////////////////// //::////////////////////////////////////////////// - - - #include "prc_inc_spells" -#include "prc_ip_srcost.nss" +#include "prc_ip_srcost" int GetERSpellResistance(int nCasterLvl) { @@ -101,7 +98,7 @@ void main() } effect eDur = EffectVisualEffect(VFX_DUR_CESSATE_POSITIVE); - itemproperty ipArmor = ItemPropertyACBonus(nBonusAC += nArmor); + itemproperty ipArmor = ItemPropertyACBonus(nBonusAC + nArmor); itemproperty ipDR = ItemPropertyDamageReduction(IP_CONST_DAMAGEREDUCTION_2, IP_CONST_DAMAGESOAK_10_HP); itemproperty ipSR = ItemPropertyBonusSpellResistance(nSR);