diff --git a/Release/PRC4_NWN35.7z b/Release/PRC4_NWN35.7z
index 9b4d2564..fe49c45c 100644
Binary files a/Release/PRC4_NWN35.7z and b/Release/PRC4_NWN35.7z differ
diff --git a/trunk/DevNotes/updating weapons.txt b/trunk/DevNotes/updating weapons.txt
new file mode 100644
index 00000000..fd6995a1
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/trunk/scripts/prc_dispater.nss b/trunk/scripts/prc_dispater.nss
index 50e25c09..8ece88db 100644
--- a/trunk/scripts/prc_dispater.nss
+++ b/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
   }