make repo compilable under nsc

nwn/nwnprc/trunk/include/inc_epicspellfnc.nss

@@ -26,7 +26,7 @@ int GetSpellFromAbrev(string sAbrev);
 //////////////////////////////////////////////////
 
 #include "inc_utility"
-//#include "inc_epicspelldef"
+#include "inc_epicspells"
 
 // SEED FUNCTIONS
 

nwn/nwnprc/trunk/include/inc_newspellbook.nss

@@ -108,11 +108,10 @@ void ProcessPreparedSpellLevel(object oPC, int nClass, int nSpellLevel, int nLev
 //#include "prc_effect_inc"         //access via prc_inc_core
 //#include "inc_lookups"            //access via prc_inc_core
 #include "prc_inc_core"
-#include "inc_sp_gain_mem"          //providing child access to prc_inc_core
+#include "inc_sp_gain_mem"
-                                    //Must load in this order.
 //#include "prc_inc_castlvl"        //access via prc_inc_core
 //#include "prc_inc_descrptr"       //access via prc_inc_core
-#include "inc_item_props" 
+#include "inc_item_props"
 
 //////////////////////////////////////////////////
 /*             Function definitions             */
@@ -1622,6 +1621,3 @@ void DoCleanUp(int nMetamagic)
     DeleteLocalInt(OBJECT_SELF, "NSB_SpellLevel");
     DeleteLocalInt(OBJECT_SELF, "NSB_SpellbookID");
 }
-
-//:: Test Void
-//:: void main (){}

nwn/nwnprc/trunk/include/inc_rend.nss

@@ -30,6 +30,7 @@ int GetDamageFromConstant(int nIPConst);
 void DoFrostRend(object oTarget, object oAttacker, object oWeapon);
 
 #include "moi_inc_moifunc"
+#include "prc_inc_combat"
 
 //////////////////////////////////////////////////
 /* Function defintions                          */

nwn/nwnprc/trunk/include/inc_sp_gain_mem.nss

@@ -17,9 +17,6 @@ Created:   May 1, 2008
 
 //:: Updated for .35 by Jaysyn 2023/03/11
 
-//:: Test Void
-//void main (){}
-
 //:://////////////////////////////////////////////
 //:: Constants
 //:://////////////////////////////////////////////
@@ -63,6 +60,14 @@ string GetMetaMagicString(int nMetaMagic);
 int GetMetaMagicFromFeat(int nFeat);
 int GetMetaMagicOfCaster(object oPC = OBJECT_SELF);
 
+string GetFileForClass(int nClass);
+int GetSpellslotLevel(int nClass, object oPC);
+int GetSpellKnownMaxCount(int nLevel, int nSpellLevel, int nClass, object oPC);
+int GetSpellbookTypeForClass(int nClass);
+
+#include "inc_pers_array"
+#include "inc_2dacache"
+
 // name of the new spellbook file (cls_spell_*)
 string GetNSBDefinitionFileName(int nClass)
 {

nwn/nwnprc/trunk/include/inc_switch_setup.nss

@@ -44,6 +44,7 @@ void CreateSwitchNameArray();
 
 #include "prc_inc_array" // Needs direct include instead of inc_utility
 #include "prc_inc_switch"
+#include "inc_2dacache"
 
 //////////////////////////////////////////////////
 /*             Function definitions             */

nwn/nwnprc/trunk/include/inv_inc_blast.nss

@@ -1,4 +1,5 @@
 #include "prc_inc_clsfunc"
+#include "prc_inc_sp_tch"
 
 int GetBlastDamageDices(object oInvoker, int nInvokerLevel)
 {

nwn/nwnprc/trunk/include/inv_inc_invknown.nss

@@ -135,6 +135,9 @@ int GetHasInvocation(int nInvocation, object oCreature = OBJECT_SELF);
 /*                  Includes                    */
 //////////////////////////////////////////////////
 
+int GetPrimaryInvocationClass(object oCreature = OBJECT_SELF);
+int GetInvocationPRCLevels(object oCaster);
+
 #include "inc_item_props"
 #include "prc_x2_itemprop"
 #include "inc_lookups"

nwn/nwnprc/trunk/include/inv_inc_invoke.nss

@@ -123,7 +123,7 @@ void DeleteLocalInvocation(object oObject, string sName);
 /*                  Includes                    */
 //////////////////////////////////////////////////
 
-//#include "inv_inc_invfunc"	//Access in parent 
+#include "inv_inc_invfunc"	//Access in parent 
 #include "prc_spellf_inc"
 
 //////////////////////////////////////////////////

nwn/nwnprc/trunk/include/prc_add_spl_pen.nss

@@ -54,7 +54,7 @@ int SPGetPenetrAOE(object oCaster = OBJECT_SELF, int nCasterLvl = 0);
 /*                  Includes                    */
 //////////////////////////////////////////////////
 
-//#include "prc_inc_spells"
+#include "prc_inc_spells"
 //#include "prc_alterations"
 //#include "prcsp_archmaginc"
 //#include "prc_inc_racial"

nwn/nwnprc/trunk/include/prc_inc_breath.nss

@@ -124,6 +124,8 @@ void ApplyBreath(struct breath BreathUsed, location lTargetArea, int bLinger = F
 //////////////////////////////////////////////////
 
 #include "prc_alterations"
+#include "prcsp_archmaginc"
+#include "prc_inc_spells"
 
 //////////////////////////////////////////////////
 /*             Internal functions               */

nwn/nwnprc/trunk/include/prc_inc_chat_pow.nss

@@ -16,6 +16,7 @@ Command summary:
 */
 
 #include "prc_inc_chat"
+#include "inc_persist_loca"
 
 const string CMD_POWER_ATTACK = "pow-erattack";
 

nwn/nwnprc/trunk/include/prc_inc_core.nss

@@ -133,6 +133,7 @@ const int METAMAGIC_QUICKEN_LEVEL = 4;
 #include "prc_inc_damage"
 #include "prc_inc_sb_const"	// Spell Book Constants
 #include "x0_i0_position"
+#include "inc_newspellbook"
 
 /*
 	access to prc_inc_nwscript via prc_inc_damage

nwn/nwnprc/trunk/include/prc_inc_descrptr.nss

@@ -169,8 +169,8 @@ int GetSubschoolFlags(int nSpellID);
 /*                  Includes                    */
 //////////////////////////////////////////////////
 
-#include "inc_2dacache"   // already has access via inc_utility
+#include "inc_2dacache"
-//#include "inc_utility"
+#include "inc_utility"
 
 //////////////////////////////////////////////////
 /*             Function definitions             */

nwn/nwnprc/trunk/include/prc_inc_hextor.nss

@@ -1,4 +1,6 @@
 #include "prc_feat_const"
+#include "inc_item_props"
+#include "prc_inc_spells"
 
 const string BRUTAL_STRIKE_MODE_VAR = "PRC_BRUTAL_STRIKE_MODE";
 

nwn/nwnprc/trunk/include/prc_inc_itmrstr.nss

@@ -36,6 +36,8 @@ void CheckForPnPHolyAvenger(object oItem);
 
 #include "inc_utility"
 #include "prc_inc_newip"
+#include "prc_inc_castlvl"
+#include "inc_newspellbook"
 
 
 //////////////////////////////////////////////////

nwn/nwnprc/trunk/include/prc_inc_turning.nss

@@ -10,6 +10,8 @@
 //:://////////////////////////////////////////////
 //:://////////////////////////////////////////////
 
+#include "prc_spell_const"
+
 //////////////////////////////////////////////////
 /*             Function prototypes              */
 //////////////////////////////////////////////////

nwn/nwnprc/trunk/include/prcsp_archmaginc.nss

@@ -73,6 +73,7 @@ void SetMasteryOfElements();
 
 //#include "lookup_2da_spell"
 #include "prcsp_reputation"
+#include "prc_inc_core"
 //#include "prc_inc_spells"
 
 

nwn/nwnprc/trunk/include/psi_inc_ac_spawn.nss

@@ -11,6 +11,7 @@
 #include "prc_ipfeat_const"
 #include "prc_feat_const"
 #include "inc_vfx_const"
+#include "prc_inc_nwscript"
 
 
 //////////////////////////////////////////////////

nwn/nwnprc/trunk/include/psi_inc_metapsi.nss

@@ -110,6 +110,7 @@ object GetSplitPsionicRayTarget(struct manifestation manif, object oPrimaryTarge
 //////////////////////////////////////////////////
 
 #include "psi_inc_core"
+#include "psi_inc_psifunc"
 
 //////////////////////////////////////////////////
 /*             Internal functions               */

nwn/nwnprc/trunk/include/psi_inc_psicraft.nss

@@ -40,7 +40,8 @@ void IdentifyPower(object oManifester, int nPowerId);
 
 // Always access via psi_inc_psifunc.
 
-//#include "psi_inc_core"
+#include "psi_inc_core"
+#include "inc_2dacache"
 
 //////////////////////////////////////////////////
 /*             Internal functions               */

nwn/nwnprc/trunk/include/psi_inc_pwresist.nss

@@ -14,6 +14,7 @@
 #include "prc_class_const"
 */
 #include "prc_alterations"
+#include "prcsp_engine"
 
 // Constants that dictate ResistPower results
 const int POWER_RESIST_FAIL = 1;

nwn/nwnprc/trunk/include/shd_inc_mystknwn.nss

@@ -192,7 +192,8 @@ int PathFeatToIPFeat(int nFeat);
 /*                  Includes                    */
 //////////////////////////////////////////////////
 
-
+#include "inc_lookups"
+#include "inc_pers_array"
 
 //////////////////////////////////////////////////
 /*             Internal functions               */
@@ -519,7 +520,7 @@ int GetMaxMysteryLevelLearnable(object oShadow, int nClass, int nType)
     if(DEBUG) DoDebug("GetMaxMysteryLevelLearnable nType: " + IntToString(nType));
 
     // Rules Quote:
-    // Within a category<72>Apprentice, Initiate, Master<65>you must have at least two mysteries of any given level 
+    // Within a category<72>Apprentice, Initiate, Master<65>you must have at least two mysteries of any given level 
     // before you can take any mysteries of the next higher level. For instance, you must have two 1st-level 
     // mysteries before you can take any 2nds, and at least two 2nds before you can take any 3rds.
     int nMaxLrn, i, nMystLevel, nCount1, nCount2;

nwn/nwnprc/trunk/include/shd_inc_shdfunc.nss

@@ -210,6 +210,7 @@ int GetHasNocturnal(object oShadow, int nPath);
 #include "prc_alterations"
 #include "shd_inc_myst"
 #include "shd_inc_mystknwn"
+#include "lookup_2da_spell"
 
 //////////////////////////////////////////////////
 /*             Internal functions               */

nwn/nwnprc/trunk/include/shd_mysthook.nss

@@ -17,6 +17,8 @@
 #include "prc_inc_spells"
 #include "inc_utility"
 #include "prc_inc_itmrstr"
+#include "shd_inc_shdfunc"
+#include "lookup_2da_spell"
 
 // This function holds all functions that are supposed to run before the actual
 // spellscript gets run. If this functions returns FALSE, the spell is aborted

nwn/nwnprc/trunk/include/tob_movehook.nss

@@ -14,6 +14,7 @@
 #include "prc_inc_spells"
 #include "inc_utility"
 #include "x2_inc_spellhook"
+#include "tob_inc_tobfunc"
 
 // This function holds all functions that are supposed to run before the actual
 // spellscript gets run. If this functions returns FALSE, the spell is aborted

nwn/nwnprc/trunk/include/true_inc_truespk.nss

@@ -109,11 +109,14 @@ int GetIsSyllable(int nSpellId);
  */
 int DoSpellTruenameCheck(object oTrueSpeaker, object oTarget, int nPersonal = FALSE);
 
+string GetNormalUtterSpellId(int nSpellId);
+
 //////////////////////////////////////////////////
 /*                  Includes                    */
 //////////////////////////////////////////////////
 
 #include "prc_inc_spells"
+#include "true_inc_trufunc"
 
 //////////////////////////////////////////////////
 /*             Internal functions               */

nwn/nwnprc/trunk/include/true_inc_trufunc.nss

@@ -260,6 +260,7 @@ int GetCadenceCount(object oTrueSpeaker);
 #include "prc_alterations"
 #include "true_inc_utter"
 #include "true_inc_truknwn"
+#include "true_inc_truespk"
 
 //////////////////////////////////////////////////
 /*             Function definitions             */

nwn/nwnprc/trunk/include/true_inc_truknwn.nss

@@ -141,6 +141,7 @@ int GetHasUtterance(int nUtter, object oCreature = OBJECT_SELF);
 #include "inc_pers_array"
 #include "prc_inc_nwscript"
 #include "inc_lookups"
+#include "prc_x2_itemprop"
 
 //////////////////////////////////////////////////
 /*             Internal functions               */

nwn/nwnprc/trunk/include/true_utterhook.nss

@@ -18,6 +18,7 @@
 #include "prc_inc_spells"
 #include "inc_utility"
 #include "prc_inc_itmrstr"
+#include "true_inc_trufunc"
 
 
 // This function holds all functions that are supposed to run before the actual

nwn/nwnprc/trunk/scripts/PRC_S_spellb.nss

@@ -89,7 +89,7 @@ The array is indexed by a counter (the i-th spell of a given level in the class
 
 #include "x2_inc_spellhook"
 #include "inc_dynconv"
-#include "inc_sp_gain_mem"
+#include "inc_newspellbook"
 
 //////////////////////////////////////////////////
 /* Constant defintions                          */

nwn/nwnprc/trunk/scripts/prc_burnselect.nss

@@ -11,7 +11,7 @@
 //:://////////////////////////////////////////////
 
 #include "prc_inc_spells"
-#include "inc_sp_gain_mem"
+#include "inc_newspellbook"
 
 void main()
 {

nwn/nwnprc/trunk/scripts/prc_s_spellgain.nss

@@ -31,8 +31,8 @@ Sorcerer:
 Upon reaching 4th level, and at every even-numbered sorcerer level
 after that (6th, 8th, and so on), a sorcerer can choose to learn a
 new spell in place of one he already knows. In effect, the
-sorcerer <20>loses<65> the old spell in exchange for the new one.
+sorcerer <20>loses<65> the old spell in exchange for the new one.
-The new spell<6C>s level must be the same as that of the spell
+The new spell<6C>s level must be the same as that of the spell
 being exchanged, and it must be at least two levels lower than
 the highest-level sorcerer spell the sorcerer can cast. A
 sorcerer may swap only a single spell at any given level, and
@@ -42,8 +42,8 @@ that he gains new spells known for the level.
 Bard:
 Upon reaching 5th level, and at every third bard level after that
 (8th, 11th, and so on), a bard can choose to learn a new spell in
-place of one he already knows. In effect, the bard <20>loses<65> the
+place of one he already knows. In effect, the bard <20>loses<65> the
-old spell in exchange for the new one. The new spell<6C>s level must be
+old spell in exchange for the new one. The new spell<6C>s level must be
 the same as that of the spell being exchanged, and it must be at least
 two levels lower than the highest-level bard spell the bard can cast.
 A bard may swap only a single spell at any given level, and must choose
@@ -54,8 +54,8 @@ Favored Soul:
 Upon reaching 4th level, and at every even-numbered 
 favored soul level after that (6th, 8th, and so on), a favored 
 soul can choose to learn a new spell in place of one she 
-already knows. In effect, the favored soul <20>loses<65> the old 
+already knows. In effect, the favored soul <20>loses<65> the old 
-spell in exchange for the new one. The new spell<6C>s level 
+spell in exchange for the new one. The new spell<6C>s level 
 must be the same as that of the spell being exchanged, and 
 it must be at least two levels lower than the highest-level 
 favored soul spell the favored soul can cast. A favored soul 
@@ -66,11 +66,11 @@ that she gains new spells known for the level.
 Warmage:
 When a warmage gains access to a 
 new level of spells, he automatically knows all the spells for 
-that level listed on the warmage<67>s spell list. Essentially, his 
+that level listed on the warmage<67>s spell list. Essentially, his 
 spell list is the same as his spells known list. Warmages also 
 have the option of adding to their existing spell list through 
 their advanced learning ability as they increase in level (see 
-below). See page 90 for the warmage<67>s spell list.
+below). See page 90 for the warmage<67>s spell list.
 
 Advanced Learning (Ex): At 3rd, 6th, 11th, and 16th 
 level, a warmage can add a new spell to his list, representing 
@@ -78,14 +78,14 @@ the result of personal study and experimentation. The spell
 must be a wizard spell of the evocation school, and of a level 
 no higher than that of the highest-level spell the warmage 
 already knows. Once a new spell is selected, it is forever added 
-to that warmage<67>s spell list and can be cast just like any other 
+to that warmage<67>s spell list and can be cast just like any other 
-spell on the warmage<67>s list.
+spell on the warmage<67>s list.
 
 Hexblade:
 Upon reaching 12th level, and at every third hexblade level 
 after that (15th and 18th), a hexblade can choose to learn a new spell in place of one he 
-already knows. In effect, the hexblade <20>loses<65> the 
+already knows. In effect, the hexblade <20>loses<65> the 
-old spell in exchange for the new one. The new spell<6C>s 
+old spell in exchange for the new one. The new spell<6C>s 
 level must be the same as that of the spell being exchanged, 
 and it must be at least two levels lower than the highest-level 
 hexblade spell the hexblade can cast. For instance, upon 
@@ -105,8 +105,8 @@ Duskblade:
 Upon reaching 5th level, and at every odd-numbered 
 Duskblade level after that (7th, 9th, and so on), a Duskblade
  can choose to learn a new spell in place of one she 
-already knows. In effect, the Duskblade <20>loses<65> the old 
+already knows. In effect, the Duskblade <20>loses<65> the old 
-spell in exchange for the new one. The new spell<6C>s level 
+spell in exchange for the new one. The new spell<6C>s level 
 must be the same as that of the spell being exchanged, and 
 it must be at least two levels lower than the highest-level 
 Duskblade spell the Duskblade can cast. A Duskblade
@@ -126,7 +126,6 @@ class level beginning at 4th
 #include "prc_inc_function"
 #include "inc_dynconv"
 #include "inc_newspellbook"
-#include "inc_sp_gain_mem"
 #include "x3_inc_string"
 
 //////////////////////////////////////////////////