Updated Invoking include to allow invoking past 3rd class

Updated Invoking include to allow invoking past 3rd class.  Updated epic spell include to allow epic spellcasting past 3rd class.  Updated nwscript compiler for .35.  Added .35 change log / notes.

nwsyc commands.txt

@@ -0,0 +1,11 @@
+sudo ./nwsync_write --verbose --path "/mnt/pve/maint/server/hak" --description="PRC presents Path of Ascension" /var/www/html/poa/ "/mnt/pve/nwn/poa/server/modules/poa.mod"
+
+sudo ./nwsync_write --verbose --path "/mnt/pve/maint/server/hak" --description="PRC presents Land of Destiny" /var/www/html/destiny/ "/mnt/pve/nwn/destiny/server/modules/Land.mod"
+
+sudo ./nwsync_write --verbose --path "/mnt/pve/maint/server/hak" --description="PRC presents Underworld 2" /var/www/html/under/ "/mnt/pve/nwn/under/server/modules/underworld.mod"
+
+sudo ./nwsync_write --verbose --path "/mnt/pve/maint/server/hak" --description="PRC presents The Frozen North" /var/www/html/north/ "/mnt/pve/nwn/north/server/modules/tfn.mod"
+
+sudo ./nwsync_write --verbose --path "/mnt/pve/maint/server/hak" --description="PRC presents Lankhmar Nights" /var/www/html/ "/mnt/pve/nwn/mouser/server/modules/mouser.mod"
+
+sudo ./nwsync_write --verbose --path "/mnt/pve/maint/server/hak" --description="PRC presents Horde of Orcs" /var/www/html/horde/ "/mnt/pve/nwn/horde/server/modules/horde.mod"

trunk/2das/iprp_bonuscost.2da

@@ -0,0 +1,54 @@
+2DA V2.0                                  
+                                          
+           Name   Label    Cost   Value   
+0          ****   Random   0      0       
+1          1045   1        1      1       
+2          1046   2        2      2       
+3          1047   3        3      3       
+4          1048   4        4      4       
+5          1049   5        5      5       
+6          1050   6        6      6       
+7          1051   7        7      7       
+8          1052   8        8      8       
+9          1053   9        9      9       
+10         1054   10       10     10      
+11         1954   11       11     11      
+12         1992   12       12     12      
+13         2113   13       13     13 
+14         2119   14       14     14  
+15         2139   15       15     15  
+16         2163   16       16     16  
+17         2164   17       17     17  
+18         2187   18       18     18  
+19         2191   19       19     19  
+20         2192   20       20     20  
+21         2332   21       21     21
+22         2333   22       22     22
+23         2334   23       23     23 
+24         2335   24       24     24 
+25         2336   25       25     25
+26         2337   26       26     26
+27         2338   27       27     27
+28         2339   28       28     28
+29         2340   29       29     29
+30         2341   30       30     30
+31         2342   31       31     31
+32         2343   32       32     32  
+33         2344   33       33     33  
+34         2345   34       34     34  
+35         2346   35       35     35  
+36         2347   36       36     36  
+37         2348   37       37     37  
+38         2349   38       38     38
+39         2350   39       39     39
+40         2351   40       40     40
+41         2352   41       41     41
+42         2353   42       42     42  
+43         2354   43       43     43  
+44         2355   44       44     44  
+45         2356   45       45     45  
+46         2357   46       46     46  
+47         2358   47       47     47  
+48         2359   48       48     48
+49         2360   49       49     49
+50         2361   50       50     50             

trunk/DevNotes/Files Changed for .35.txt

@@ -0,0 +1,5 @@
+Files changed for .35:
+
+inv_inc_invfunc.nss	- GetHighestInvokerLevel(), GetFirstInvocationClassPosition(), GetPrimaryInvocationClass()
+
+inc_epicspellfnc.nss	- GetCanLearnSeed()

trunk/DevNotes/updating weapons.txt

@@ -0,0 +1,25 @@
+Scripts that need to be updated whenever we get a new weapon type:
+
+prc_misc_const.nss		- New weapon constants go here
+prc_dispater.nss		- Metal / Iron weapons
+inc_item_props.nss 		- Missing Light lance
+inc_rand_equip.nss 		- Missing all new weapons
+prc_craft_inc.nss
+prc_inc_clsfunc.nss 	- Missing Light Lance & new weapons.  Needs update for .35
+prc_inc_combat.nss 		- Missing Light lance, elf blades & new weapons.
+prc_inc_fork.nss 		- Missing Light Lance & new weapons.
+prc_inc_wpnrest.nss 	- Missing Light Lance for some functions
+prc_x2_itemprop.nss 	- Missing Light lance.
+psi_callweapon.nss 		- May need to make a new default version for each new weapon, needs testing.
+prc_ad_falskeen.nss 	- Missing Light lance, elf blades & new weapons.
+prc_battletempus.nss 	- Martial melee weapons.  Missing new Martial weapons.
+prc_intuiatk.nss		- Simple melee weapons.  Missing new Simple weapons.
+prc_swashweak.nss		- All melee weapons. Missing Light lance, elf blades & new weapons.
+prc_ipfeat_const.nss	- Weapon Feat constants go here.
+
+
+
+2DAs that need updating for new weapon types:
+
+baseitems.2da			- Obviously.
+prc_weap_items.2da

trunk/include/inc_epicspellfnc.nss

@@ -132,7 +132,7 @@ int GetCanLearnSeed(object oPC, int nSeedID)
 {
     int nRestr = GetClassForSeed(nSeedID);
     int i, nClass;
-    for(i = 1; i <= 3; i++)
+    for(i = 1; i <= 8; i++)
     {
         nClass = GetClassByPosition(i, oPC);
         if(_CheckEpicSpellcastingForClass(oPC, nClass)//this class has epic spellcasting

trunk/include/inc_item_props.nss

@@ -373,12 +373,12 @@ void SetCompositeBonus(object oItem, string sBonus, int iVal, int iType, int iSu
             iCurVal = TotalAndRemoveProperty(oItem, iType, iSubType);
             iCurVal -= GetPersistantLocalInt(GetItemPossessor(oItem), "LetoAbility_"+IntToString(iSubType));
             if (DEBUG) DoDebug("Ability Decrease #1: oItem "+GetName(oItem)+" sBonus "+sBonus+" iChange "+IntToString(iChange)+" iCurVal "+IntToString(iCurVal)+" iSubType "+IntToString(iSubType));
-            /*if ((iCurVal + iChange) > 12)
+            if ((iCurVal + iChange) > 50)
             {
-                iVal -= iCurVal + iChange - 12;
-                iCurVal = 12;
+                iVal -= iCurVal + iChange - 50;
+                iCurVal = 50;
                 iChange = 0;
-            }*/
+            }
             if(iCurVal+iChange > 0)
             {
                 AddItemProperty(DURATION_TYPE_PERMANENT, ItemPropertyAbilityBonus(iSubType, iCurVal + iChange), oItem);
@@ -764,10 +764,10 @@ void SetCompositeBonusT(object oItem, string sBonus, int iVal, int iType, int iS
     {
         case ITEM_PROPERTY_ABILITY_BONUS:
             iCurVal = TotalAndRemovePropertyT(oItem, iType, iSubType);
-            if ((iCurVal + iChange)  > 12)
+            if ((iCurVal + iChange)  > 50)
             {
-                iVal -= iCurVal + iChange - 12;
-                iCurVal = 12;
+                iVal -= iCurVal + iChange - 50;
+                iCurVal = 50;
                 iChange = 0;
             }
             AddItemProperty(DURATION_TYPE_TEMPORARY, ItemPropertyAbilityBonus(iSubType, iCurVal + iChange), oItem,9999.0);

trunk/include/inv_inc_invfunc.nss

@@ -230,14 +230,37 @@ int GetIsInvocationUser(object oCreature)
              );
 }
 
+
 int GetHighestInvokerLevel(object oCreature)
+{
+	int n = 0;
+	int nHighest;
+	int nTemp;
+	
+    while(n <= 8)
+	{
+		if(GetClassByPosition(n, oCreature) != CLASS_TYPE_INVALID)
+		{
+			nTemp = GetInvokerLevel(oCreature, GetClassByPosition(n, oCreature));
+			
+			if(nTemp > nHighest) 
+				nHighest = nTemp;
+		}
+	n++;
+
+	}
+	
+	return nHighest;
+}
+
+/* int GetHighestInvokerLevel(object oCreature)
 {
     return max(max(GetClassByPosition(1, oCreature) != CLASS_TYPE_INVALID ? GetInvokerLevel(oCreature, GetClassByPosition(1, oCreature)) : 0,
                    GetClassByPosition(2, oCreature) != CLASS_TYPE_INVALID ? GetInvokerLevel(oCreature, GetClassByPosition(2, oCreature)) : 0
                    ),
                GetClassByPosition(3, oCreature) != CLASS_TYPE_INVALID ? GetInvokerLevel(oCreature, GetClassByPosition(3, oCreature)) : 0
                );
-}
+} */
 
 int GetIsInvocationClass(int nClass)
 {
@@ -278,7 +301,7 @@ int GetPrimaryInvocationClass(object oCreature = OBJECT_SELF)
 {
     int nClass;
 
-    if(GetPRCSwitch(PRC_CASTERLEVEL_FIRST_CLASS_RULE))
+    if(GetPRCSwitch(PRC_CASTERLEVEL_FIRST_CLASS_RULE))  //: Kinda pointless for .35
     {
         int nInvocationPos = GetFirstInvocationClassPosition(oCreature);
         if (!nInvocationPos) return CLASS_TYPE_INVALID; // no invoking class
@@ -288,18 +311,30 @@ int GetPrimaryInvocationClass(object oCreature = OBJECT_SELF)
     else
     {
         int nClassLvl;
-        int nClass1, nClass2, nClass3;
-        int nClass1Lvl, nClass2Lvl, nClass3Lvl;
+        int nClass1, nClass2, nClass3, nClass4, nClass5, nClass6, nClass7, nClass8;
+        int nClass1Lvl, nClass2Lvl, nClass3Lvl, nClass4Lvl, nClass5Lvl, nClass6Lvl, nClass7Lvl, nClass8Lvl;
 
         nClass1 = GetClassByPosition(1, oCreature);
         nClass2 = GetClassByPosition(2, oCreature);
         nClass3 = GetClassByPosition(3, oCreature);
+		nClass4 = GetClassByPosition(4, oCreature);
+		nClass5 = GetClassByPosition(5, oCreature);
+		nClass6 = GetClassByPosition(6, oCreature);
+		nClass7 = GetClassByPosition(7, oCreature);
+		nClass8 = GetClassByPosition(8, oCreature);
+		
         if(GetIsInvocationClass(nClass1)) nClass1Lvl = GetLevelByClass(nClass1, oCreature);
         if(GetIsInvocationClass(nClass2)) nClass2Lvl = GetLevelByClass(nClass2, oCreature);
         if(GetIsInvocationClass(nClass3)) nClass3Lvl = GetLevelByClass(nClass3, oCreature);
+		if(GetIsInvocationClass(nClass4)) nClass4Lvl = GetLevelByClass(nClass4, oCreature);
+		if(GetIsInvocationClass(nClass5)) nClass5Lvl = GetLevelByClass(nClass5, oCreature);
+		if(GetIsInvocationClass(nClass6)) nClass6Lvl = GetLevelByClass(nClass6, oCreature);
+		if(GetIsInvocationClass(nClass7)) nClass7Lvl = GetLevelByClass(nClass7, oCreature);
+		if(GetIsInvocationClass(nClass8)) nClass8Lvl = GetLevelByClass(nClass8, oCreature);
 
         nClass = nClass1;
         nClassLvl = nClass1Lvl;
+		
         if(nClass2Lvl > nClassLvl)
         {
             nClass = nClass2;
@@ -310,6 +345,32 @@ int GetPrimaryInvocationClass(object oCreature = OBJECT_SELF)
             nClass = nClass3;
             nClassLvl = nClass3Lvl;
         }
+		if(nClass4Lvl > nClassLvl)
+        {
+            nClass = nClass4;
+            nClassLvl = nClass4Lvl;
+        }
+        if(nClass5Lvl > nClassLvl)
+        {
+            nClass = nClass5;
+            nClassLvl = nClass5Lvl;
+        }
+		if(nClass6Lvl > nClassLvl)
+        {
+            nClass = nClass6;
+            nClassLvl = nClass6Lvl;
+        }
+        if(nClass7Lvl > nClassLvl)
+        {
+            nClass = nClass7;
+            nClassLvl = nClass7Lvl;
+        }		
+        if(nClass8Lvl > nClassLvl)
+        {
+            nClass = nClass8;
+            nClassLvl = nClass8Lvl;
+        }		
+		
         if(nClassLvl == 0)
             nClass = CLASS_TYPE_INVALID;
     }
@@ -325,7 +386,17 @@ int GetFirstInvocationClassPosition(object oCreature = OBJECT_SELF)
         return 2;
     if (GetIsInvocationClass(GetClassByPosition(3, oCreature)))
         return 3;
-
+    if (GetIsInvocationClass(GetClassByPosition(4, oCreature)))
+        return 4;
+	if (GetIsInvocationClass(GetClassByPosition(5, oCreature)))
+        return 5;
+	if (GetIsInvocationClass(GetClassByPosition(6, oCreature)))
+        return 6;	
+	if (GetIsInvocationClass(GetClassByPosition(7, oCreature)))
+        return 7;	
+	if (GetIsInvocationClass(GetClassByPosition(8, oCreature)))
+        return 8;	
+	
     return 0;
 }
 

trunk/newspellbook/prc_kngtw_sp_gen.nss

@@ -0,0 +1,6 @@
+#include "inc_newspellbook"
+
+void main()
+{
+    NewSpellbookSpell(CLASS_TYPE_KNIGHT_WEAVE, SPELLBOOK_TYPE_SPONTANEOUS);
+}

trunk/scripts/prc_dispater.nss

@@ -10,33 +10,45 @@ int IsItemMetal(object oItem)
 
   // Any of these Base Item Types can be considered "mostly metal"
    if (type==BASE_ITEM_BASTARDSWORD ||
-       type==BASE_ITEM_BATTLEAXE ||
-       type==BASE_ITEM_DAGGER ||
-       type==BASE_ITEM_DIREMACE ||
-       type==BASE_ITEM_DOUBLEAXE ||
-       type==BASE_ITEM_DWARVENWARAXE ||
-       type==BASE_ITEM_GREATAXE ||
-       type==BASE_ITEM_GREATSWORD ||
-       type==BASE_ITEM_HALBERD ||
-       type==BASE_ITEM_HANDAXE ||
-       type==BASE_ITEM_HEAVYFLAIL ||
-       type==BASE_ITEM_KAMA ||
-       type==BASE_ITEM_KATANA ||
-       type==BASE_ITEM_KUKRI ||
-       type==BASE_ITEM_LIGHTFLAIL ||
-       type==BASE_ITEM_LIGHTHAMMER ||
-       type==BASE_ITEM_LIGHTMACE ||
-       type==BASE_ITEM_LONGSWORD ||
-       type==BASE_ITEM_MORNINGSTAR ||
-       type==BASE_ITEM_RAPIER ||
-       type==BASE_ITEM_SCIMITAR ||
-       type==BASE_ITEM_SCYTHE ||
-       type==BASE_ITEM_SHORTSWORD ||
-       type==BASE_ITEM_SHURIKEN ||
-       type==BASE_ITEM_SICKLE ||
-       type==BASE_ITEM_THROWINGAXE ||
-       type==BASE_ITEM_TWOBLADEDSWORD ||
-       type==BASE_ITEM_WARHAMMER)
+		type==BASE_ITEM_BATTLEAXE ||
+		type==BASE_ITEM_DAGGER ||
+		type==BASE_ITEM_DIREMACE ||
+		type==BASE_ITEM_DOUBLEAXE ||
+		type==BASE_ITEM_DWARVENWARAXE ||
+		type==BASE_ITEM_GREATAXE ||
+		type==BASE_ITEM_GREATSWORD ||
+		type==BASE_ITEM_HALBERD ||
+		type==BASE_ITEM_HANDAXE ||
+		type==BASE_ITEM_HEAVYFLAIL ||
+		type==BASE_ITEM_KAMA ||
+		type==BASE_ITEM_KATANA ||
+		type==BASE_ITEM_KUKRI ||
+		type==BASE_ITEM_LIGHTFLAIL ||
+		type==BASE_ITEM_LIGHTHAMMER ||
+		type==BASE_ITEM_LIGHTMACE ||
+		type==BASE_ITEM_LONGSWORD ||
+		type==BASE_ITEM_MORNINGSTAR ||
+		type==BASE_ITEM_RAPIER ||
+		type==BASE_ITEM_SCIMITAR ||
+		type==BASE_ITEM_SCYTHE ||
+		type==BASE_ITEM_SHORTSWORD ||
+		type==BASE_ITEM_SHURIKEN ||
+		type==BASE_ITEM_SICKLE ||
+		type==BASE_ITEM_THROWINGAXE ||
+		type==BASE_ITEM_TWOBLADEDSWORD ||
+		type==BASE_ITEM_WARHAMMER ||
+		type==BASE_ITEM_HEAVY_PICK ||
+		type==BASE_ITEM_LIGHT_PICK ||
+		type==BASE_ITEM_SAI ||
+		type==BASE_ITEM_FALCHION ||
+		type==BASE_ITEM_KATAR ||
+		type==BASE_ITEM_HEAVY_MACE ||
+		type==BASE_ITEM_MAUL ||
+		type==BASE_ITEM_DOUBLE_SCIMITAR ||
+		type==BASE_ITEM_EAGLE_CLAW ||
+		type==BASE_ITEM_ELVEN_LIGHTBLADE ||
+		type==BASE_ITEM_ELVEN_THINBLADE ||
+		type==BASE_ITEM_ELVEN_COURTBLADE)
   {
     nReturnVal=2; // Mostly metal
   }