diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..63a8585
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+
+*.hak
+*.md5
diff --git a/_content/BuildHaks.cmd b/_content/BuildHaks.cmd
new file mode 100644
index 0000000..cc40b21
--- /dev/null
+++ b/_content/BuildHaks.cmd
@@ -0,0 +1,3 @@
+cd _tools\
+NWN.CLI.exe -k
+cd ..
\ No newline at end of file
diff --git a/_content/NWN.CLI.exe b/_content/NWN.CLI.exe
new file mode 100644
index 0000000..67fdd29
Binary files /dev/null and b/_content/NWN.CLI.exe differ
diff --git a/_content/NWN_compDcomp.exe b/_content/NWN_compDcomp.exe
new file mode 100644
index 0000000..18253e0
Binary files /dev/null and b/_content/NWN_compDcomp.exe differ
diff --git a/_content/cygiconv-2.dll b/_content/cygiconv-2.dll
new file mode 100644
index 0000000..926464c
Binary files /dev/null and b/_content/cygiconv-2.dll differ
diff --git a/_content/cygintl-2.dll b/_content/cygintl-2.dll
new file mode 100644
index 0000000..aef3a8c
Binary files /dev/null and b/_content/cygintl-2.dll differ
diff --git a/_content/cygintl-3.dll b/_content/cygintl-3.dll
new file mode 100644
index 0000000..bd6e382
Binary files /dev/null and b/_content/cygintl-3.dll differ
diff --git a/_content/cygintl-8.dll b/_content/cygintl-8.dll
new file mode 100644
index 0000000..e636367
Binary files /dev/null and b/_content/cygintl-8.dll differ
diff --git a/_content/cygpcre-0.dll b/_content/cygpcre-0.dll
new file mode 100644
index 0000000..eb68c8d
Binary files /dev/null and b/_content/cygpcre-0.dll differ
diff --git a/_content/cygwin1.dll b/_content/cygwin1.dll
new file mode 100644
index 0000000..7fd577c
Binary files /dev/null and b/_content/cygwin1.dll differ
diff --git a/_content/cygxml2-2.dll b/_content/cygxml2-2.dll
new file mode 100644
index 0000000..11baa98
Binary files /dev/null and b/_content/cygxml2-2.dll differ
diff --git a/_content/cygz.dll b/_content/cygz.dll
new file mode 100644
index 0000000..c94d66c
Binary files /dev/null and b/_content/cygz.dll differ
diff --git a/_content/hakbuilder.json b/_content/hakbuilder.json
new file mode 100644
index 0000000..a5bd853
--- /dev/null
+++ b/_content/hakbuilder.json
@@ -0,0 +1,10 @@
+{
+  "OutputPath": "../_content/_output/",
+  "HakList": [
+    {
+      "Name":  "prc8_battle_top",
+      "Path": "../_content/prc8_battle_top/",
+      "CompileModels": false
+    },	
+   ]
+}
diff --git a/_content/nwn_erf.exe b/_content/nwn_erf.exe
new file mode 100644
index 0000000..1dba285
Binary files /dev/null and b/_content/nwn_erf.exe differ
diff --git a/_content/pcre64.dll b/_content/pcre64.dll
new file mode 100644
index 0000000..40b4ac3
Binary files /dev/null and b/_content/pcre64.dll differ
diff --git a/_module/ncs/nw_s1_bltcondr.ncs b/_content/prc8_battle_top/nw_s1_aurablnda.ncs
similarity index 68%
rename from _module/ncs/nw_s1_bltcondr.ncs
rename to _content/prc8_battle_top/nw_s1_aurablnda.ncs
index e8c357f..3ce701c 100644
Binary files a/_module/ncs/nw_s1_bltcondr.ncs and b/_content/prc8_battle_top/nw_s1_aurablnda.ncs differ
diff --git a/_module/nss/nw_s1_aurablnda.nss b/_content/prc8_battle_top/nw_s1_aurablnda.nss
similarity index 94%
rename from _module/nss/nw_s1_aurablnda.nss
rename to _content/prc8_battle_top/nw_s1_aurablnda.nss
index 0babfaa..a7b70b4 100644
--- a/_module/nss/nw_s1_aurablnda.nss
+++ b/_content/prc8_battle_top/nw_s1_aurablnda.nss
@@ -12,7 +12,7 @@
 //:: Created By: Preston Watamaniuk
 //:: Created On: May 25, 2001
 //:://////////////////////////////////////////////
-//#include "wm_include"
+#include "wm_include"
 #include "prc_inc_spells"
 
 void main()
@@ -31,7 +31,7 @@ void main()
     effect eVis 	= EffectVisualEffect(VFX_IMP_BLIND_DEAF_M);
     effect eLink 	= EffectLinkEffects(eBlind, eDur);
 
-    //if (NullMagicOverride(GetArea(oTarget), oTarget, oTarget)) {return;}
+    if (NullMagicOverride(GetArea(oTarget), oTarget, oTarget)) {return;}
 	
     //Entering object must make a will save or be blinded for the duration.
     if(GetIsEnemy(oTarget, GetAreaOfEffectCreator()))
diff --git a/_module/ncs/nw_s1_auracoldc.ncs b/_content/prc8_battle_top/nw_s1_auracoldc.ncs
similarity index 94%
rename from _module/ncs/nw_s1_auracoldc.ncs
rename to _content/prc8_battle_top/nw_s1_auracoldc.ncs
index 841ab57..3469001 100644
Binary files a/_module/ncs/nw_s1_auracoldc.ncs and b/_content/prc8_battle_top/nw_s1_auracoldc.ncs differ
diff --git a/_module/nss/nw_s1_auracoldc.nss b/_content/prc8_battle_top/nw_s1_auracoldc.nss
similarity index 98%
rename from _module/nss/nw_s1_auracoldc.nss
rename to _content/prc8_battle_top/nw_s1_auracoldc.nss
index 49cd95e..6f5cfb9 100644
--- a/_module/nss/nw_s1_auracoldc.nss
+++ b/_content/prc8_battle_top/nw_s1_auracoldc.nss
@@ -12,7 +12,7 @@
 //:: Created On: May 25, 2001
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
-//#include "wm_include"
+#include "wm_include"
 #include "prc_inc_spells"
 void main()
 {
diff --git a/_module/ncs/nw_s1_auraelecc.ncs b/_content/prc8_battle_top/nw_s1_auraelecc.ncs
similarity index 94%
rename from _module/ncs/nw_s1_auraelecc.ncs
rename to _content/prc8_battle_top/nw_s1_auraelecc.ncs
index 6e622d9..8266394 100644
Binary files a/_module/ncs/nw_s1_auraelecc.ncs and b/_content/prc8_battle_top/nw_s1_auraelecc.ncs differ
diff --git a/_module/nss/nw_s1_auraelecc.nss b/_content/prc8_battle_top/nw_s1_auraelecc.nss
similarity index 98%
rename from _module/nss/nw_s1_auraelecc.nss
rename to _content/prc8_battle_top/nw_s1_auraelecc.nss
index 06994f4..9a4cd09 100644
--- a/_module/nss/nw_s1_auraelecc.nss
+++ b/_content/prc8_battle_top/nw_s1_auraelecc.nss
@@ -12,7 +12,7 @@
 //:: Created On: May 25, 2001
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
-//#include "wm_include"
+#include "wm_include"
 #include "prc_inc_spells"
 
 void main()
diff --git a/_module/ncs/nw_s1_aurafirec.ncs b/_content/prc8_battle_top/nw_s1_aurafirec.ncs
similarity index 94%
rename from _module/ncs/nw_s1_aurafirec.ncs
rename to _content/prc8_battle_top/nw_s1_aurafirec.ncs
index 50fe632..677eb12 100644
Binary files a/_module/ncs/nw_s1_aurafirec.ncs and b/_content/prc8_battle_top/nw_s1_aurafirec.ncs differ
diff --git a/_module/nss/nw_s1_aurafirec.nss b/_content/prc8_battle_top/nw_s1_aurafirec.nss
similarity index 98%
rename from _module/nss/nw_s1_aurafirec.nss
rename to _content/prc8_battle_top/nw_s1_aurafirec.nss
index a6b9638..fd042f8 100644
--- a/_module/nss/nw_s1_aurafirec.nss
+++ b/_content/prc8_battle_top/nw_s1_aurafirec.nss
@@ -12,7 +12,7 @@
 //:: Created On: May 25, 2001
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
-//#include "wm_include"
+#include "wm_include"
 #include "prc_inc_spells"
 void main()
 {
diff --git a/_content/prc8_battle_top/nw_s1_auramenca.ncs b/_content/prc8_battle_top/nw_s1_auramenca.ncs
new file mode 100644
index 0000000..c5bc4f7
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_auramenca.ncs differ
diff --git a/_module/nss/nw_s1_auramenca.nss b/_content/prc8_battle_top/nw_s1_auramenca.nss
similarity index 91%
rename from _module/nss/nw_s1_auramenca.nss
rename to _content/prc8_battle_top/nw_s1_auramenca.nss
index e786aaa..549c088 100644
--- a/_module/nss/nw_s1_auramenca.nss
+++ b/_content/prc8_battle_top/nw_s1_auramenca.nss
@@ -12,7 +12,7 @@
 //:: Created On: May 25, 2001
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
-//#include "wm_include"
+#include "wm_include"
 #include "prc_inc_spells"
 
 void main()
@@ -21,12 +21,12 @@ void main()
 	object oNPC		= GetAreaOfEffectCreator();
     object oTarget 	= GetEnteringObject();
 	
-    //if (NullMagicOverride(GetArea(oTarget), oTarget, oTarget)) {return;}
+    if (NullMagicOverride(GetArea(oTarget), oTarget, oTarget)) {return;}
     
 	int nDuration 	= 1 + (GetHitDice(oNPC)/3);
 	int nCHAMod		= GetAbilityModifier(ABILITY_CHARISMA, oNPC);
 	int nDC 		= 10 +nCHAMod+ (GetHitDice(oNPC)/2);
-	int nLevel 		= GetCasterLevel(OBJECT_SELF);
+	int nLevel 		= PRCGetCasterLevel(OBJECT_SELF);
     int nMetaMagic 	= PRCGetMetaMagicFeat();
 	
     effect eVis 	= EffectVisualEffect(VFX_IMP_DOOM);
diff --git a/_content/prc8_battle_top/nw_s1_auraprota.ncs b/_content/prc8_battle_top/nw_s1_auraprota.ncs
new file mode 100644
index 0000000..2b05d97
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_auraprota.ncs differ
diff --git a/_module/nss/nw_s1_auraprota.nss b/_content/prc8_battle_top/nw_s1_auraprota.nss
similarity index 91%
rename from _module/nss/nw_s1_auraprota.nss
rename to _content/prc8_battle_top/nw_s1_auraprota.nss
index 548f284..5fc934d 100644
--- a/_module/nss/nw_s1_auraprota.nss
+++ b/_content/prc8_battle_top/nw_s1_auraprota.nss
@@ -13,7 +13,7 @@
 //:: Created On:Jan 8, 2002, 2001
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
-//#include "wm_include"
+#include "wm_include"
 void main()
 {
     //Declare major variables
@@ -25,7 +25,7 @@ void main()
     eLink = EffectLinkEffects(eLink, eDur);
 
     object oTarget = GetEnteringObject();
-    //if (NullMagicOverride(GetArea(oTarget), oTarget, oTarget)) {return;}
+    if (NullMagicOverride(GetArea(oTarget), oTarget, oTarget)) {return;}
     //Faction Check
     if(GetIsFriend(oTarget, GetAreaOfEffectCreator()))
     {
diff --git a/_module/ncs/nw_s1_bltchrdr.ncs b/_content/prc8_battle_top/nw_s1_aurastuna.ncs
similarity index 67%
rename from _module/ncs/nw_s1_bltchrdr.ncs
rename to _content/prc8_battle_top/nw_s1_aurastuna.ncs
index d86707e..e14e18a 100644
Binary files a/_module/ncs/nw_s1_bltchrdr.ncs and b/_content/prc8_battle_top/nw_s1_aurastuna.ncs differ
diff --git a/_module/nss/nw_s1_aurastuna.nss b/_content/prc8_battle_top/nw_s1_aurastuna.nss
similarity index 94%
rename from _module/nss/nw_s1_aurastuna.nss
rename to _content/prc8_battle_top/nw_s1_aurastuna.nss
index 03d0aae..fdea757 100644
--- a/_module/nss/nw_s1_aurastuna.nss
+++ b/_content/prc8_battle_top/nw_s1_aurastuna.nss
@@ -12,7 +12,7 @@
 //:: Created On: May 25, 2001
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
-//#include "wm_include"
+#include "wm_include"
 #include "prc_inc_spells"
 void main()
 {
@@ -24,7 +24,7 @@ void main()
 	int nDuration 	= GetHitDice(oNPC);
     int nDC 		= 10 + nCHAMod + (nDuration/2);
 	
-	//if (NullMagicOverride(GetArea(oTarget), oTarget, oTarget)) {return;}
+	if (NullMagicOverride(GetArea(oTarget), oTarget, oTarget)) {return;}
     
 	effect eVis 	= EffectVisualEffect(VFX_IMP_STUN);
     effect eVis2 	= EffectVisualEffect(VFX_DUR_MIND_AFFECTING_DISABLED);
diff --git a/_content/prc8_battle_top/nw_s1_auraunata.ncs b/_content/prc8_battle_top/nw_s1_auraunata.ncs
new file mode 100644
index 0000000..0a25d40
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_auraunata.ncs differ
diff --git a/_module/nss/nw_s1_auraunata.nss b/_content/prc8_battle_top/nw_s1_auraunata.nss
similarity index 94%
rename from _module/nss/nw_s1_auraunata.nss
rename to _content/prc8_battle_top/nw_s1_auraunata.nss
index a597062..1d6cd15 100644
--- a/_module/nss/nw_s1_auraunata.nss
+++ b/_content/prc8_battle_top/nw_s1_auraunata.nss
@@ -12,7 +12,7 @@
 //:: Created On: May 25, 2001
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
-//#include "wm_include"
+#include "wm_include"
 #include "prc_inc_spells"
 void main()
 {
@@ -23,7 +23,7 @@ void main()
     effect eLink 	= EffectLinkEffects(eVis, eFear);
     object oTarget 	= GetEnteringObject();
 		
-    //if (NullMagicOverride(GetArea(oTarget), oTarget, oTarget)) {return;}
+    if (NullMagicOverride(GetArea(oTarget), oTarget, oTarget)) {return;}
 	
     int nDuration 	= GetHitDice(oNPC);
 	int nCHAMod		= GetAbilityModifier(ABILITY_CHARISMA, oNPC);
diff --git a/_module/ncs/nw_s1_bltslow.ncs b/_content/prc8_battle_top/nw_s1_aurauneaa.ncs
similarity index 68%
rename from _module/ncs/nw_s1_bltslow.ncs
rename to _content/prc8_battle_top/nw_s1_aurauneaa.ncs
index 779dedd..cc317fa 100644
Binary files a/_module/ncs/nw_s1_bltslow.ncs and b/_content/prc8_battle_top/nw_s1_aurauneaa.ncs differ
diff --git a/_module/nss/nw_s1_aurauneaa.nss b/_content/prc8_battle_top/nw_s1_aurauneaa.nss
similarity index 93%
rename from _module/nss/nw_s1_aurauneaa.nss
rename to _content/prc8_battle_top/nw_s1_aurauneaa.nss
index 6f4a75b..2c569b4 100644
--- a/_module/nss/nw_s1_aurauneaa.nss
+++ b/_content/prc8_battle_top/nw_s1_aurauneaa.nss
@@ -13,7 +13,7 @@
 //:: Created On: May 25, 2001
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
-//#include "wm_include"
+#include "wm_include"
 #include "prc_inc_spells"
 
 void main()
@@ -26,7 +26,7 @@ void main()
 	int nCHAMod		= GetAbilityModifier(ABILITY_CHARISMA, oNPC);
     int nDC			= 10 +nCHAMod+ (nHD/2);
 	
-    //if (NullMagicOverride(GetArea(oTarget), oTarget, oTarget)) {return;}
+    if (NullMagicOverride(GetArea(oTarget), oTarget, oTarget)) {return;}
     
 	effect eDeath = EffectDeath();
     effect eVis = EffectVisualEffect(VFX_IMP_DEATH);
diff --git a/_content/prc8_battle_top/nw_s1_bltacid.ncs b/_content/prc8_battle_top/nw_s1_bltacid.ncs
new file mode 100644
index 0000000..3e962c9
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_bltacid.ncs differ
diff --git a/_module/nss/nw_s1_bltacid.nss b/_content/prc8_battle_top/nw_s1_bltacid.nss
similarity index 96%
rename from _module/nss/nw_s1_bltacid.nss
rename to _content/prc8_battle_top/nw_s1_bltacid.nss
index ef53a16..8c985ff 100644
--- a/_module/nss/nw_s1_bltacid.nss
+++ b/_content/prc8_battle_top/nw_s1_bltacid.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_bltcharm.ncs b/_content/prc8_battle_top/nw_s1_bltcharm.ncs
new file mode 100644
index 0000000..11b0169
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_bltcharm.ncs differ
diff --git a/_module/nss/nw_s1_bltcharm.nss b/_content/prc8_battle_top/nw_s1_bltcharm.nss
similarity index 96%
rename from _module/nss/nw_s1_bltcharm.nss
rename to _content/prc8_battle_top/nw_s1_bltcharm.nss
index df11d65..3827630 100644
--- a/_module/nss/nw_s1_bltcharm.nss
+++ b/_content/prc8_battle_top/nw_s1_bltcharm.nss
@@ -13,11 +13,11 @@
 //:: Created On: May 11 , 2001
 //:://////////////////////////////////////////////
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 #include "NW_I0_SPELLS"
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 
 //:: Declare major variables
 	object oNPC = OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_bltchrdr.ncs b/_content/prc8_battle_top/nw_s1_bltchrdr.ncs
new file mode 100644
index 0000000..43d48de
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_bltchrdr.ncs differ
diff --git a/_module/nss/nw_s1_bltchrdr.nss b/_content/prc8_battle_top/nw_s1_bltchrdr.nss
similarity index 96%
rename from _module/nss/nw_s1_bltchrdr.nss
rename to _content/prc8_battle_top/nw_s1_bltchrdr.nss
index e734580..c125c23 100644
--- a/_module/nss/nw_s1_bltchrdr.nss
+++ b/_content/prc8_battle_top/nw_s1_bltchrdr.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_bltcold.ncs b/_content/prc8_battle_top/nw_s1_bltcold.ncs
new file mode 100644
index 0000000..f222e58
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_bltcold.ncs differ
diff --git a/_module/nss/nw_s1_bltcold.nss b/_content/prc8_battle_top/nw_s1_bltcold.nss
similarity index 96%
rename from _module/nss/nw_s1_bltcold.nss
rename to _content/prc8_battle_top/nw_s1_bltcold.nss
index 657f0fe..95bac0f 100644
--- a/_module/nss/nw_s1_bltcold.nss
+++ b/_content/prc8_battle_top/nw_s1_bltcold.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_bltcondr.ncs b/_content/prc8_battle_top/nw_s1_bltcondr.ncs
new file mode 100644
index 0000000..07b05e7
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_bltcondr.ncs differ
diff --git a/_module/nss/nw_s1_bltcondr.nss b/_content/prc8_battle_top/nw_s1_bltcondr.nss
similarity index 96%
rename from _module/nss/nw_s1_bltcondr.nss
rename to _content/prc8_battle_top/nw_s1_bltcondr.nss
index 9d85f04..3c9f35d 100644
--- a/_module/nss/nw_s1_bltcondr.nss
+++ b/_content/prc8_battle_top/nw_s1_bltcondr.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_bltconf.ncs b/_content/prc8_battle_top/nw_s1_bltconf.ncs
new file mode 100644
index 0000000..de11571
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_bltconf.ncs differ
diff --git a/_module/nss/nw_s1_bltconf.nss b/_content/prc8_battle_top/nw_s1_bltconf.nss
similarity index 96%
rename from _module/nss/nw_s1_bltconf.nss
rename to _content/prc8_battle_top/nw_s1_bltconf.nss
index 5bed7dc..7f42b5f 100644
--- a/_module/nss/nw_s1_bltconf.nss
+++ b/_content/prc8_battle_top/nw_s1_bltconf.nss
@@ -13,11 +13,11 @@
 //:: Created On: May 11 , 2001
 //:://////////////////////////////////////////////
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 #include "NW_I0_SPELLS"
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 
 //:: Declare major variables
 	object oNPC 	= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_bltdaze.ncs b/_content/prc8_battle_top/nw_s1_bltdaze.ncs
new file mode 100644
index 0000000..0cc43fc
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_bltdaze.ncs differ
diff --git a/_module/nss/nw_s1_bltdaze.nss b/_content/prc8_battle_top/nw_s1_bltdaze.nss
similarity index 96%
rename from _module/nss/nw_s1_bltdaze.nss
rename to _content/prc8_battle_top/nw_s1_bltdaze.nss
index 68d15c7..0a9b113 100644
--- a/_module/nss/nw_s1_bltdaze.nss
+++ b/_content/prc8_battle_top/nw_s1_bltdaze.nss
@@ -13,11 +13,11 @@
 //:: Created On: May 11 , 2001
 //:://////////////////////////////////////////////
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 #include "NW_I0_SPELLS"
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 
 //:: Declare major variables
 	object oNPC 	= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_bltdeath.ncs b/_content/prc8_battle_top/nw_s1_bltdeath.ncs
new file mode 100644
index 0000000..3771b98
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_bltdeath.ncs differ
diff --git a/_module/nss/nw_s1_bltdeath.nss b/_content/prc8_battle_top/nw_s1_bltdeath.nss
similarity index 95%
rename from _module/nss/nw_s1_bltdeath.nss
rename to _content/prc8_battle_top/nw_s1_bltdeath.nss
index e2cbcd7..f9df010 100644
--- a/_module/nss/nw_s1_bltdeath.nss
+++ b/_content/prc8_battle_top/nw_s1_bltdeath.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_bltdexdr.ncs b/_content/prc8_battle_top/nw_s1_bltdexdr.ncs
new file mode 100644
index 0000000..6d78a3b
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_bltdexdr.ncs differ
diff --git a/_module/nss/nw_s1_bltdexdr.nss b/_content/prc8_battle_top/nw_s1_bltdexdr.nss
similarity index 95%
rename from _module/nss/nw_s1_bltdexdr.nss
rename to _content/prc8_battle_top/nw_s1_bltdexdr.nss
index 4ef34d8..33b3b4b 100644
--- a/_module/nss/nw_s1_bltdexdr.nss
+++ b/_content/prc8_battle_top/nw_s1_bltdexdr.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_bltdisese.ncs b/_content/prc8_battle_top/nw_s1_bltdisese.ncs
new file mode 100644
index 0000000..c043bbb
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_bltdisese.ncs differ
diff --git a/_module/nss/nw_s1_bltdisese.nss b/_content/prc8_battle_top/nw_s1_bltdisese.nss
similarity index 96%
rename from _module/nss/nw_s1_bltdisese.nss
rename to _content/prc8_battle_top/nw_s1_bltdisese.nss
index 6513a06..5e9908f 100644
--- a/_module/nss/nw_s1_bltdisese.nss
+++ b/_content/prc8_battle_top/nw_s1_bltdisese.nss
@@ -15,11 +15,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_bltdomn.ncs b/_content/prc8_battle_top/nw_s1_bltdomn.ncs
new file mode 100644
index 0000000..7fdb6f7
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_bltdomn.ncs differ
diff --git a/_module/nss/nw_s1_bltdomn.nss b/_content/prc8_battle_top/nw_s1_bltdomn.nss
similarity index 96%
rename from _module/nss/nw_s1_bltdomn.nss
rename to _content/prc8_battle_top/nw_s1_bltdomn.nss
index 5027b45..c9a3b85 100644
--- a/_module/nss/nw_s1_bltdomn.nss
+++ b/_content/prc8_battle_top/nw_s1_bltdomn.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_bltfire.ncs b/_content/prc8_battle_top/nw_s1_bltfire.ncs
new file mode 100644
index 0000000..79ab3a1
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_bltfire.ncs differ
diff --git a/_module/nss/nw_s1_bltfire.nss b/_content/prc8_battle_top/nw_s1_bltfire.nss
similarity index 96%
rename from _module/nss/nw_s1_bltfire.nss
rename to _content/prc8_battle_top/nw_s1_bltfire.nss
index 4f7a423..1950c41 100644
--- a/_module/nss/nw_s1_bltfire.nss
+++ b/_content/prc8_battle_top/nw_s1_bltfire.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_bltintdr.ncs b/_content/prc8_battle_top/nw_s1_bltintdr.ncs
new file mode 100644
index 0000000..4225b85
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_bltintdr.ncs differ
diff --git a/_module/nss/nw_s1_bltintdr.nss b/_content/prc8_battle_top/nw_s1_bltintdr.nss
similarity index 96%
rename from _module/nss/nw_s1_bltintdr.nss
rename to _content/prc8_battle_top/nw_s1_bltintdr.nss
index f3ffbad..caab837 100644
--- a/_module/nss/nw_s1_bltintdr.nss
+++ b/_content/prc8_battle_top/nw_s1_bltintdr.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_bltknckd.ncs b/_content/prc8_battle_top/nw_s1_bltknckd.ncs
new file mode 100644
index 0000000..df35d8d
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_bltknckd.ncs differ
diff --git a/_module/nss/nw_s1_bltknckd.nss b/_content/prc8_battle_top/nw_s1_bltknckd.nss
similarity index 95%
rename from _module/nss/nw_s1_bltknckd.nss
rename to _content/prc8_battle_top/nw_s1_bltknckd.nss
index 6816964..3af1e79 100644
--- a/_module/nss/nw_s1_bltknckd.nss
+++ b/_content/prc8_battle_top/nw_s1_bltknckd.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_bltlightn.ncs b/_content/prc8_battle_top/nw_s1_bltlightn.ncs
new file mode 100644
index 0000000..20c04c4
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_bltlightn.ncs differ
diff --git a/_module/nss/nw_s1_bltlightn.nss b/_content/prc8_battle_top/nw_s1_bltlightn.nss
similarity index 96%
rename from _module/nss/nw_s1_bltlightn.nss
rename to _content/prc8_battle_top/nw_s1_bltlightn.nss
index 024eafb..f8e0e79 100644
--- a/_module/nss/nw_s1_bltlightn.nss
+++ b/_content/prc8_battle_top/nw_s1_bltlightn.nss
@@ -13,11 +13,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_bltlvldr.ncs b/_content/prc8_battle_top/nw_s1_bltlvldr.ncs
new file mode 100644
index 0000000..48d8e8a
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_bltlvldr.ncs differ
diff --git a/_module/nss/nw_s1_bltlvldr.nss b/_content/prc8_battle_top/nw_s1_bltlvldr.nss
similarity index 95%
rename from _module/nss/nw_s1_bltlvldr.nss
rename to _content/prc8_battle_top/nw_s1_bltlvldr.nss
index e3f14ca..2dcf6dc 100644
--- a/_module/nss/nw_s1_bltlvldr.nss
+++ b/_content/prc8_battle_top/nw_s1_bltlvldr.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_bltparal.ncs b/_content/prc8_battle_top/nw_s1_bltparal.ncs
new file mode 100644
index 0000000..82ac223
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_bltparal.ncs differ
diff --git a/_module/nss/nw_s1_bltparal.nss b/_content/prc8_battle_top/nw_s1_bltparal.nss
similarity index 95%
rename from _module/nss/nw_s1_bltparal.nss
rename to _content/prc8_battle_top/nw_s1_bltparal.nss
index e4a6b59..6313f1f 100644
--- a/_module/nss/nw_s1_bltparal.nss
+++ b/_content/prc8_battle_top/nw_s1_bltparal.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_bltpoison.ncs b/_content/prc8_battle_top/nw_s1_bltpoison.ncs
new file mode 100644
index 0000000..1f43623
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_bltpoison.ncs differ
diff --git a/_module/nss/nw_s1_bltpoison.nss b/_content/prc8_battle_top/nw_s1_bltpoison.nss
similarity index 98%
rename from _module/nss/nw_s1_bltpoison.nss
rename to _content/prc8_battle_top/nw_s1_bltpoison.nss
index 8a34aca..6bba199 100644
--- a/_module/nss/nw_s1_bltpoison.nss
+++ b/_content/prc8_battle_top/nw_s1_bltpoison.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_bltshards.ncs b/_content/prc8_battle_top/nw_s1_bltshards.ncs
new file mode 100644
index 0000000..4077864
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_bltshards.ncs differ
diff --git a/_module/nss/nw_s1_bltshards.nss b/_content/prc8_battle_top/nw_s1_bltshards.nss
similarity index 96%
rename from _module/nss/nw_s1_bltshards.nss
rename to _content/prc8_battle_top/nw_s1_bltshards.nss
index 1b96e2b..1ef4b2d 100644
--- a/_module/nss/nw_s1_bltshards.nss
+++ b/_content/prc8_battle_top/nw_s1_bltshards.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_bltslow.ncs b/_content/prc8_battle_top/nw_s1_bltslow.ncs
new file mode 100644
index 0000000..cb90b55
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_bltslow.ncs differ
diff --git a/_module/nss/nw_s1_bltslow.nss b/_content/prc8_battle_top/nw_s1_bltslow.nss
similarity index 95%
rename from _module/nss/nw_s1_bltslow.nss
rename to _content/prc8_battle_top/nw_s1_bltslow.nss
index bf4813a..18b1fd0 100644
--- a/_module/nss/nw_s1_bltslow.nss
+++ b/_content/prc8_battle_top/nw_s1_bltslow.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_bltstrdr.ncs b/_content/prc8_battle_top/nw_s1_bltstrdr.ncs
new file mode 100644
index 0000000..437cccc
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_bltstrdr.ncs differ
diff --git a/_module/nss/nw_s1_bltstrdr.nss b/_content/prc8_battle_top/nw_s1_bltstrdr.nss
similarity index 96%
rename from _module/nss/nw_s1_bltstrdr.nss
rename to _content/prc8_battle_top/nw_s1_bltstrdr.nss
index dd03161..53e7f73 100644
--- a/_module/nss/nw_s1_bltstrdr.nss
+++ b/_content/prc8_battle_top/nw_s1_bltstrdr.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_bltstun.ncs b/_content/prc8_battle_top/nw_s1_bltstun.ncs
new file mode 100644
index 0000000..544bc7c
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_bltstun.ncs differ
diff --git a/_module/nss/nw_s1_bltstun.nss b/_content/prc8_battle_top/nw_s1_bltstun.nss
similarity index 96%
rename from _module/nss/nw_s1_bltstun.nss
rename to _content/prc8_battle_top/nw_s1_bltstun.nss
index 1d77008..1f9f81e 100644
--- a/_module/nss/nw_s1_bltstun.nss
+++ b/_content/prc8_battle_top/nw_s1_bltstun.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_bltweb.ncs b/_content/prc8_battle_top/nw_s1_bltweb.ncs
new file mode 100644
index 0000000..d8a0169
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_bltweb.ncs differ
diff --git a/_module/nss/nw_s1_bltweb.nss b/_content/prc8_battle_top/nw_s1_bltweb.nss
similarity index 95%
rename from _module/nss/nw_s1_bltweb.nss
rename to _content/prc8_battle_top/nw_s1_bltweb.nss
index 9ed210a..e09b40d 100644
--- a/_module/nss/nw_s1_bltweb.nss
+++ b/_content/prc8_battle_top/nw_s1_bltweb.nss
@@ -13,11 +13,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_bltwisdr.ncs b/_content/prc8_battle_top/nw_s1_bltwisdr.ncs
new file mode 100644
index 0000000..259e654
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_bltwisdr.ncs differ
diff --git a/_module/nss/nw_s1_bltwisdr.nss b/_content/prc8_battle_top/nw_s1_bltwisdr.nss
similarity index 95%
rename from _module/nss/nw_s1_bltwisdr.nss
rename to _content/prc8_battle_top/nw_s1_bltwisdr.nss
index 49643c0..7164241 100644
--- a/_module/nss/nw_s1_bltwisdr.nss
+++ b/_content/prc8_battle_top/nw_s1_bltwisdr.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_coneacid.ncs b/_content/prc8_battle_top/nw_s1_coneacid.ncs
new file mode 100644
index 0000000..0d8a148
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_coneacid.ncs differ
diff --git a/_module/nss/nw_s1_coneacid.nss b/_content/prc8_battle_top/nw_s1_coneacid.nss
similarity index 97%
rename from _module/nss/nw_s1_coneacid.nss
rename to _content/prc8_battle_top/nw_s1_coneacid.nss
index 97d9393..8ae3efc 100644
--- a/_module/nss/nw_s1_coneacid.nss
+++ b/_content/prc8_battle_top/nw_s1_coneacid.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_conecold.ncs b/_content/prc8_battle_top/nw_s1_conecold.ncs
new file mode 100644
index 0000000..e406498
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_conecold.ncs differ
diff --git a/_module/nss/nw_s1_conecold.nss b/_content/prc8_battle_top/nw_s1_conecold.nss
similarity index 97%
rename from _module/nss/nw_s1_conecold.nss
rename to _content/prc8_battle_top/nw_s1_conecold.nss
index 50f2a0c..214e6a0 100644
--- a/_module/nss/nw_s1_conecold.nss
+++ b/_content/prc8_battle_top/nw_s1_conecold.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_conedisea.ncs b/_content/prc8_battle_top/nw_s1_conedisea.ncs
new file mode 100644
index 0000000..602fa6d
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_conedisea.ncs differ
diff --git a/_module/nss/nw_s1_conedisea.nss b/_content/prc8_battle_top/nw_s1_conedisea.nss
similarity index 97%
rename from _module/nss/nw_s1_conedisea.nss
rename to _content/prc8_battle_top/nw_s1_conedisea.nss
index a1eb9b1..1053845 100644
--- a/_module/nss/nw_s1_conedisea.nss
+++ b/_content/prc8_battle_top/nw_s1_conedisea.nss
@@ -13,11 +13,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_coneelec.ncs b/_content/prc8_battle_top/nw_s1_coneelec.ncs
new file mode 100644
index 0000000..2cf29ff
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_coneelec.ncs differ
diff --git a/_module/nss/nw_s1_coneelec.nss b/_content/prc8_battle_top/nw_s1_coneelec.nss
similarity index 97%
rename from _module/nss/nw_s1_coneelec.nss
rename to _content/prc8_battle_top/nw_s1_coneelec.nss
index 0dba225..d94a47e 100644
--- a/_module/nss/nw_s1_coneelec.nss
+++ b/_content/prc8_battle_top/nw_s1_coneelec.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_conesonic.ncs b/_content/prc8_battle_top/nw_s1_conesonic.ncs
new file mode 100644
index 0000000..7a1b9f8
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_conesonic.ncs differ
diff --git a/_module/nss/nw_s1_conesonic.nss b/_content/prc8_battle_top/nw_s1_conesonic.nss
similarity index 97%
rename from _module/nss/nw_s1_conesonic.nss
rename to _content/prc8_battle_top/nw_s1_conesonic.nss
index 1ba25bf..e899edc 100644
--- a/_module/nss/nw_s1_conesonic.nss
+++ b/_content/prc8_battle_top/nw_s1_conesonic.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "prc_inc_spells"
 #include "NW_I0_SPELLS"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_dragfear.ncs b/_content/prc8_battle_top/nw_s1_dragfear.ncs
new file mode 100644
index 0000000..3ec11e1
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_dragfear.ncs differ
diff --git a/_module/nss/nw_s1_dragfear.nss b/_content/prc8_battle_top/nw_s1_dragfear.nss
similarity index 98%
rename from _module/nss/nw_s1_dragfear.nss
rename to _content/prc8_battle_top/nw_s1_dragfear.nss
index 0b5e882..64c64d6 100644
--- a/_module/nss/nw_s1_dragfear.nss
+++ b/_content/prc8_battle_top/nw_s1_dragfear.nss
@@ -13,10 +13,10 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
     //Declare major variables
     int nAge = GetHitDice(OBJECT_SELF);
     int nCount;
diff --git a/_module/ncs/nw_s1_bltintdr.ncs b/_content/prc8_battle_top/nw_s1_dragfeara.ncs
similarity index 67%
rename from _module/ncs/nw_s1_bltintdr.ncs
rename to _content/prc8_battle_top/nw_s1_dragfeara.ncs
index 33b3da4..ee3be3a 100644
Binary files a/_module/ncs/nw_s1_bltintdr.ncs and b/_content/prc8_battle_top/nw_s1_dragfeara.ncs differ
diff --git a/_module/nss/nw_s1_dragfeara.nss b/_content/prc8_battle_top/nw_s1_dragfeara.nss
similarity index 94%
rename from _module/nss/nw_s1_dragfeara.nss
rename to _content/prc8_battle_top/nw_s1_dragfeara.nss
index 2bb5009..616dc02 100644
--- a/_module/nss/nw_s1_dragfeara.nss
+++ b/_content/prc8_battle_top/nw_s1_dragfeara.nss
@@ -13,13 +13,13 @@
 //:: Created On: May 25, 2001
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
-//#include "wm_include"
+#include "wm_include"
 #include "prc_inc_spells"
 void main()
 {
     //Declare major variables
     object oTarget = GetEnteringObject();
-    //if (NullMagicOverride(GetArea(oTarget), oTarget, oTarget)) {return;}
+    if (NullMagicOverride(GetArea(oTarget), oTarget, oTarget)) {return;}
     effect eVis = EffectVisualEffect(VFX_IMP_FEAR_S);
     effect eDur = EffectVisualEffect(VFX_DUR_MIND_AFFECTING_FEAR);
     effect eDur2 = EffectVisualEffect(VFX_DUR_CESSATE_NEGATIVE);
diff --git a/_module/ncs/nw_s1_feroc3.ncs b/_content/prc8_battle_top/nw_s1_feroc3.ncs
similarity index 100%
rename from _module/ncs/nw_s1_feroc3.ncs
rename to _content/prc8_battle_top/nw_s1_feroc3.ncs
diff --git a/_module/nss/nw_s1_feroc3.nss b/_content/prc8_battle_top/nw_s1_feroc3.nss
similarity index 100%
rename from _module/nss/nw_s1_feroc3.nss
rename to _content/prc8_battle_top/nw_s1_feroc3.nss
diff --git a/_content/prc8_battle_top/nw_s1_gazechaos.ncs b/_content/prc8_battle_top/nw_s1_gazechaos.ncs
new file mode 100644
index 0000000..9ec9555
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_gazechaos.ncs differ
diff --git a/_module/nss/nw_s1_gazechaos.nss b/_content/prc8_battle_top/nw_s1_gazechaos.nss
similarity index 94%
rename from _module/nss/nw_s1_gazechaos.nss
rename to _content/prc8_battle_top/nw_s1_gazechaos.nss
index f15212d..7dd8779 100644
--- a/_module/nss/nw_s1_gazechaos.nss
+++ b/_content/prc8_battle_top/nw_s1_gazechaos.nss
@@ -13,7 +13,7 @@
 //:://////////////////////////////////////////////
 #include "prc_inc_spells"
 #include "NW_I0_SPELLS"
-//#include "wm_include"
+#include "wm_include"
 #include "x0_i0_match"
 
 void main()
@@ -21,13 +21,13 @@ void main()
 //--------------------------------------------------------------------------
 // Make sure we are not blind
 //--------------------------------------------------------------------------
-    if (GetHasEffect(EFFECT_TYPE_BLINDNESS, OBJECT_SELF))
+    if (PRCGetHasEffect(EFFECT_TYPE_BLINDNESS, OBJECT_SELF))
     {
         FloatingTextStrRefOnCreature(84530, OBJECT_SELF, FALSE);
         return;
     }
 	
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_gazecharm.ncs b/_content/prc8_battle_top/nw_s1_gazecharm.ncs
new file mode 100644
index 0000000..9c41cc6
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_gazecharm.ncs differ
diff --git a/_module/nss/nw_s1_gazecharm.nss b/_content/prc8_battle_top/nw_s1_gazecharm.nss
similarity index 95%
rename from _module/nss/nw_s1_gazecharm.nss
rename to _content/prc8_battle_top/nw_s1_gazecharm.nss
index a4af8cb..da5b874 100644
--- a/_module/nss/nw_s1_gazecharm.nss
+++ b/_content/prc8_battle_top/nw_s1_gazecharm.nss
@@ -13,7 +13,7 @@
 //:://////////////////////////////////////////////
 #include "prc_inc_spells"
 #include "NW_I0_SPELLS"
-//#include "wm_include"
+#include "wm_include"
 #include "x0_i0_match"
 
 void main()
@@ -21,13 +21,13 @@ void main()
 //--------------------------------------------------------------------------
 // Make sure we are not blind
 //--------------------------------------------------------------------------
-    if (GetHasEffect(EFFECT_TYPE_BLINDNESS, OBJECT_SELF))
+    if (PRCGetHasEffect(EFFECT_TYPE_BLINDNESS, OBJECT_SELF))
     {
         FloatingTextStrRefOnCreature(84530, OBJECT_SELF, FALSE);
         return;
     }
 	
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_gazeconfu.ncs b/_content/prc8_battle_top/nw_s1_gazeconfu.ncs
new file mode 100644
index 0000000..7d2a31d
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_gazeconfu.ncs differ
diff --git a/_module/nss/nw_s1_gazeconfu.nss b/_content/prc8_battle_top/nw_s1_gazeconfu.nss
similarity index 95%
rename from _module/nss/nw_s1_gazeconfu.nss
rename to _content/prc8_battle_top/nw_s1_gazeconfu.nss
index c3225bc..af86a9c 100644
--- a/_module/nss/nw_s1_gazeconfu.nss
+++ b/_content/prc8_battle_top/nw_s1_gazeconfu.nss
@@ -13,7 +13,7 @@
 //:://////////////////////////////////////////////
 #include "prc_inc_spells"
 #include "NW_I0_SPELLS"
-//#include "wm_include"
+#include "wm_include"
 #include "x0_i0_match"
 
 void main()
@@ -21,13 +21,13 @@ void main()
 //--------------------------------------------------------------------------
 // Make sure we are not blind
 //--------------------------------------------------------------------------
-    if (GetHasEffect(EFFECT_TYPE_BLINDNESS, OBJECT_SELF))
+    if (PRCGetHasEffect(EFFECT_TYPE_BLINDNESS, OBJECT_SELF))
     {
         FloatingTextStrRefOnCreature(84530, OBJECT_SELF, FALSE);
         return;
     }
 	
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_gazedaze.ncs b/_content/prc8_battle_top/nw_s1_gazedaze.ncs
new file mode 100644
index 0000000..1858a8d
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_gazedaze.ncs differ
diff --git a/_module/nss/nw_s1_gazedaze.nss b/_content/prc8_battle_top/nw_s1_gazedaze.nss
similarity index 95%
rename from _module/nss/nw_s1_gazedaze.nss
rename to _content/prc8_battle_top/nw_s1_gazedaze.nss
index c5b386d..9cc062a 100644
--- a/_module/nss/nw_s1_gazedaze.nss
+++ b/_content/prc8_battle_top/nw_s1_gazedaze.nss
@@ -13,7 +13,7 @@
 //:://////////////////////////////////////////////
 #include "prc_inc_spells"
 #include "NW_I0_SPELLS"
-//#include "wm_include"
+#include "wm_include"
 #include "x0_i0_match"
 
 void main()
@@ -21,13 +21,13 @@ void main()
 //--------------------------------------------------------------------------
 // Make sure we are not blind
 //--------------------------------------------------------------------------
-    if (GetHasEffect(EFFECT_TYPE_BLINDNESS, OBJECT_SELF))
+    if (PRCGetHasEffect(EFFECT_TYPE_BLINDNESS, OBJECT_SELF))
     {
         FloatingTextStrRefOnCreature(84530, OBJECT_SELF, FALSE);
         return;
     }
 	
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_gazedeath.ncs b/_content/prc8_battle_top/nw_s1_gazedeath.ncs
new file mode 100644
index 0000000..9e6ed7f
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_gazedeath.ncs differ
diff --git a/_module/nss/nw_s1_gazedeath.nss b/_content/prc8_battle_top/nw_s1_gazedeath.nss
similarity index 94%
rename from _module/nss/nw_s1_gazedeath.nss
rename to _content/prc8_battle_top/nw_s1_gazedeath.nss
index 0909b00..fa685f4 100644
--- a/_module/nss/nw_s1_gazedeath.nss
+++ b/_content/prc8_battle_top/nw_s1_gazedeath.nss
@@ -13,7 +13,7 @@
 //:://////////////////////////////////////////////
 #include "prc_inc_spells"
 #include "NW_I0_SPELLS"
-//#include "wm_include"
+#include "wm_include"
 #include "x0_i0_match"
 
 void main()
@@ -21,13 +21,13 @@ void main()
 //--------------------------------------------------------------------------
 // Make sure we are not blind
 //--------------------------------------------------------------------------
-    if (GetHasEffect(EFFECT_TYPE_BLINDNESS, OBJECT_SELF))
+    if (PRCGetHasEffect(EFFECT_TYPE_BLINDNESS, OBJECT_SELF))
     {
         FloatingTextStrRefOnCreature(84530, OBJECT_SELF, FALSE);
         return;
     }
 	
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_gazedomn.ncs b/_content/prc8_battle_top/nw_s1_gazedomn.ncs
new file mode 100644
index 0000000..718f61b
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_gazedomn.ncs differ
diff --git a/_module/nss/nw_s1_gazedomn.nss b/_content/prc8_battle_top/nw_s1_gazedomn.nss
similarity index 95%
rename from _module/nss/nw_s1_gazedomn.nss
rename to _content/prc8_battle_top/nw_s1_gazedomn.nss
index d4ab12d..0d9c9ef 100644
--- a/_module/nss/nw_s1_gazedomn.nss
+++ b/_content/prc8_battle_top/nw_s1_gazedomn.nss
@@ -13,7 +13,7 @@
 //:://////////////////////////////////////////////
 #include "prc_inc_spells"
 #include "NW_I0_SPELLS"
-//#include "wm_include"
+#include "wm_include"
 #include "x0_i0_match"
 
 void main()
@@ -21,13 +21,13 @@ void main()
 //--------------------------------------------------------------------------
 // Make sure we are not blind
 //--------------------------------------------------------------------------
-    if (GetHasEffect(EFFECT_TYPE_BLINDNESS, OBJECT_SELF))
+    if (PRCGetHasEffect(EFFECT_TYPE_BLINDNESS, OBJECT_SELF))
     {
         FloatingTextStrRefOnCreature(84530, OBJECT_SELF, FALSE);
         return;
     }
 	
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_gazedoom.ncs b/_content/prc8_battle_top/nw_s1_gazedoom.ncs
new file mode 100644
index 0000000..3cb108c
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_gazedoom.ncs differ
diff --git a/_module/nss/nw_s1_gazedoom.nss b/_content/prc8_battle_top/nw_s1_gazedoom.nss
similarity index 95%
rename from _module/nss/nw_s1_gazedoom.nss
rename to _content/prc8_battle_top/nw_s1_gazedoom.nss
index 77e3c54..c1b3c7e 100644
--- a/_module/nss/nw_s1_gazedoom.nss
+++ b/_content/prc8_battle_top/nw_s1_gazedoom.nss
@@ -14,7 +14,7 @@
 //:://////////////////////////////////////////////
 #include "prc_inc_spells"
 #include "NW_I0_SPELLS"
-//#include "wm_include"
+#include "wm_include"
 #include "x0_i0_match"
 
 void main()
@@ -22,13 +22,13 @@ void main()
 //--------------------------------------------------------------------------
 // Make sure we are not blind
 //--------------------------------------------------------------------------
-    if (GetHasEffect(EFFECT_TYPE_BLINDNESS, OBJECT_SELF))
+    if (PRCGetHasEffect(EFFECT_TYPE_BLINDNESS, OBJECT_SELF))
     {
         FloatingTextStrRefOnCreature(84530, OBJECT_SELF, FALSE);
         return;
     }
 	
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_gazeevil.ncs b/_content/prc8_battle_top/nw_s1_gazeevil.ncs
new file mode 100644
index 0000000..015eb72
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_gazeevil.ncs differ
diff --git a/_module/nss/nw_s1_gazeevil.nss b/_content/prc8_battle_top/nw_s1_gazeevil.nss
similarity index 94%
rename from _module/nss/nw_s1_gazeevil.nss
rename to _content/prc8_battle_top/nw_s1_gazeevil.nss
index 4bbb418..0e0d68c 100644
--- a/_module/nss/nw_s1_gazeevil.nss
+++ b/_content/prc8_battle_top/nw_s1_gazeevil.nss
@@ -13,7 +13,7 @@
 //:://////////////////////////////////////////////
 #include "prc_inc_spells"
 #include "NW_I0_SPELLS"
-//#include "wm_include"
+#include "wm_include"
 #include "x0_i0_match"
 
 void main()
@@ -21,13 +21,13 @@ void main()
 //--------------------------------------------------------------------------
 // Make sure we are not blind
 //--------------------------------------------------------------------------
-    if (GetHasEffect(EFFECT_TYPE_BLINDNESS, OBJECT_SELF))
+    if (PRCGetHasEffect(EFFECT_TYPE_BLINDNESS, OBJECT_SELF))
     {
         FloatingTextStrRefOnCreature(84530, OBJECT_SELF, FALSE);
         return;
     }
 	
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_gazefear.ncs b/_content/prc8_battle_top/nw_s1_gazefear.ncs
new file mode 100644
index 0000000..1851b41
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_gazefear.ncs differ
diff --git a/_module/nss/nw_s1_gazefear.nss b/_content/prc8_battle_top/nw_s1_gazefear.nss
similarity index 95%
rename from _module/nss/nw_s1_gazefear.nss
rename to _content/prc8_battle_top/nw_s1_gazefear.nss
index beb4157..a387134 100644
--- a/_module/nss/nw_s1_gazefear.nss
+++ b/_content/prc8_battle_top/nw_s1_gazefear.nss
@@ -13,7 +13,7 @@
 //:://////////////////////////////////////////////
 #include "prc_inc_spells"
 #include "NW_I0_SPELLS"
-//#include "wm_include"
+#include "wm_include"
 #include "x0_i0_match"
 
 void main()
@@ -21,13 +21,13 @@ void main()
 //--------------------------------------------------------------------------
 // Make sure we are not blind
 //--------------------------------------------------------------------------
-    if (GetHasEffect(EFFECT_TYPE_BLINDNESS, OBJECT_SELF))
+    if (PRCGetHasEffect(EFFECT_TYPE_BLINDNESS, OBJECT_SELF))
     {
         FloatingTextStrRefOnCreature(84530, OBJECT_SELF, FALSE);
         return;
     }
 	
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_gazegood.ncs b/_content/prc8_battle_top/nw_s1_gazegood.ncs
new file mode 100644
index 0000000..7180d53
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_gazegood.ncs differ
diff --git a/_module/nss/nw_s1_gazegood.nss b/_content/prc8_battle_top/nw_s1_gazegood.nss
similarity index 94%
rename from _module/nss/nw_s1_gazegood.nss
rename to _content/prc8_battle_top/nw_s1_gazegood.nss
index cb5c239..b8e4d2e 100644
--- a/_module/nss/nw_s1_gazegood.nss
+++ b/_content/prc8_battle_top/nw_s1_gazegood.nss
@@ -13,7 +13,7 @@
 //:://////////////////////////////////////////////
 #include "prc_inc_spells"
 #include "NW_I0_SPELLS"
-//#include "wm_include"
+#include "wm_include"
 #include "x0_i0_match"
 
 void main()
@@ -21,13 +21,13 @@ void main()
 //--------------------------------------------------------------------------
 // Make sure we are not blind
 //--------------------------------------------------------------------------
-    if (GetHasEffect(EFFECT_TYPE_BLINDNESS, OBJECT_SELF))
+    if (PRCGetHasEffect(EFFECT_TYPE_BLINDNESS, OBJECT_SELF))
     {
         FloatingTextStrRefOnCreature(84530, OBJECT_SELF, FALSE);
         return;
     }
 	
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_gazelaw.ncs b/_content/prc8_battle_top/nw_s1_gazelaw.ncs
new file mode 100644
index 0000000..069dd14
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_gazelaw.ncs differ
diff --git a/_module/nss/nw_s1_gazelaw.nss b/_content/prc8_battle_top/nw_s1_gazelaw.nss
similarity index 95%
rename from _module/nss/nw_s1_gazelaw.nss
rename to _content/prc8_battle_top/nw_s1_gazelaw.nss
index b230f4a..1ab79f3 100644
--- a/_module/nss/nw_s1_gazelaw.nss
+++ b/_content/prc8_battle_top/nw_s1_gazelaw.nss
@@ -13,7 +13,7 @@
 //:://////////////////////////////////////////////
 #include "prc_inc_spells"
 #include "NW_I0_SPELLS"
-//#include "wm_include"
+#include "wm_include"
 #include "x0_i0_match"
 
 void main()
@@ -21,13 +21,13 @@ void main()
 //--------------------------------------------------------------------------
 // Make sure we are not blind
 //--------------------------------------------------------------------------
-    if (GetHasEffect(EFFECT_TYPE_BLINDNESS, OBJECT_SELF))
+    if (PRCGetHasEffect(EFFECT_TYPE_BLINDNESS, OBJECT_SELF))
     {
         FloatingTextStrRefOnCreature(84530, OBJECT_SELF, FALSE);
         return;
     }
 	
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_gazestun.ncs b/_content/prc8_battle_top/nw_s1_gazestun.ncs
new file mode 100644
index 0000000..89dbe90
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_gazestun.ncs differ
diff --git a/_module/nss/nw_s1_gazestun.nss b/_content/prc8_battle_top/nw_s1_gazestun.nss
similarity index 95%
rename from _module/nss/nw_s1_gazestun.nss
rename to _content/prc8_battle_top/nw_s1_gazestun.nss
index 2c597e7..9871272 100644
--- a/_module/nss/nw_s1_gazestun.nss
+++ b/_content/prc8_battle_top/nw_s1_gazestun.nss
@@ -13,7 +13,7 @@
 //:://////////////////////////////////////////////
 #include "prc_inc_spells"
 #include "NW_I0_SPELLS"
-//#include "wm_include"
+#include "wm_include"
 #include "x0_i0_match"
 
 void main()
@@ -21,13 +21,13 @@ void main()
 //--------------------------------------------------------------------------
 // Make sure we are not blind
 //--------------------------------------------------------------------------
-    if (GetHasEffect(EFFECT_TYPE_BLINDNESS, OBJECT_SELF))
+    if (PRCGetHasEffect(EFFECT_TYPE_BLINDNESS, OBJECT_SELF))
     {
         FloatingTextStrRefOnCreature(84530, OBJECT_SELF, FALSE);
         return;
     }
 	
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_golemgas.ncs b/_content/prc8_battle_top/nw_s1_golemgas.ncs
new file mode 100644
index 0000000..0c179b3
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_golemgas.ncs differ
diff --git a/_module/nss/nw_s1_golemgas.nss b/_content/prc8_battle_top/nw_s1_golemgas.nss
similarity index 95%
rename from _module/nss/nw_s1_golemgas.nss
rename to _content/prc8_battle_top/nw_s1_golemgas.nss
index b9e4155..b651103 100644
--- a/_module/nss/nw_s1_golemgas.nss
+++ b/_content/prc8_battle_top/nw_s1_golemgas.nss
@@ -13,10 +13,10 @@
 
 #include "prc_inc_spells"
 
-//#include "wm_include"
+#include "wm_include"
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
     //Declare major variables
     location lTargetLocation = PRCGetSpellTargetLocation();
     object oTarget;
diff --git a/_content/prc8_battle_top/nw_s1_hndbreath.ncs b/_content/prc8_battle_top/nw_s1_hndbreath.ncs
new file mode 100644
index 0000000..5575c5d
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_hndbreath.ncs differ
diff --git a/_module/nss/nw_s1_hndbreath.nss b/_content/prc8_battle_top/nw_s1_hndbreath.nss
similarity index 96%
rename from _module/nss/nw_s1_hndbreath.nss
rename to _content/prc8_battle_top/nw_s1_hndbreath.nss
index 4851df7..f32bdf7 100644
--- a/_module/nss/nw_s1_hndbreath.nss
+++ b/_content/prc8_battle_top/nw_s1_hndbreath.nss
@@ -11,11 +11,11 @@
 //:: Created On: May 14, 2001
 //:://////////////////////////////////////////////
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_howlconf.ncs b/_content/prc8_battle_top/nw_s1_howlconf.ncs
new file mode 100644
index 0000000..82fc193
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_howlconf.ncs differ
diff --git a/_module/nss/nw_s1_howlconf.nss b/_content/prc8_battle_top/nw_s1_howlconf.nss
similarity index 97%
rename from _module/nss/nw_s1_howlconf.nss
rename to _content/prc8_battle_top/nw_s1_howlconf.nss
index f9d770e..7e84bba 100644
--- a/_module/nss/nw_s1_howlconf.nss
+++ b/_content/prc8_battle_top/nw_s1_howlconf.nss
@@ -12,12 +12,12 @@
 //:: Created On: May 14, 2000
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
-//#include "wm_include"
+#include "wm_include"
 #include "prc_inc_spells"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_module/ncs/nw_s1_howlfear.ncs b/_content/prc8_battle_top/nw_s1_howldaze.ncs
similarity index 83%
rename from _module/ncs/nw_s1_howlfear.ncs
rename to _content/prc8_battle_top/nw_s1_howldaze.ncs
index a2af6c1..c01526a 100644
Binary files a/_module/ncs/nw_s1_howlfear.ncs and b/_content/prc8_battle_top/nw_s1_howldaze.ncs differ
diff --git a/_module/nss/nw_s1_howldaze.nss b/_content/prc8_battle_top/nw_s1_howldaze.nss
similarity index 96%
rename from _module/nss/nw_s1_howldaze.nss
rename to _content/prc8_battle_top/nw_s1_howldaze.nss
index 7f1d106..ab496bf 100644
--- a/_module/nss/nw_s1_howldaze.nss
+++ b/_content/prc8_battle_top/nw_s1_howldaze.nss
@@ -14,6 +14,7 @@
 
 #include "NW_I0_SPELLS"
 #include "jw_inc_spells"
+#include "prc_inc_spells"
 
 void bombard(object oTarget)
 {
@@ -146,7 +147,7 @@ void main()
             SignalEvent(oTarget, EventSpellCastAt(OBJECT_SELF, SPELLABILITY_HOWL_DAZE));
             fDelay = GetDistanceToObject(oTarget)/10;
             //Make a saving throw check
-            if(!/*Will Save*/ MySavingThrow(SAVING_THROW_WILL, oTarget, nDC, SAVING_THROW_TYPE_MIND_SPELLS, OBJECT_SELF, fDelay))
+            if(!/*Will Save*/ PRCMySavingThrow(SAVING_THROW_WILL, oTarget, nDC, SAVING_THROW_TYPE_MIND_SPELLS, OBJECT_SELF, fDelay))
             {
                 //Apply the VFX impact and effects
                 DelayCommand(fDelay, ApplyEffectToObject(DURATION_TYPE_TEMPORARY, eLink, oTarget, RoundsToSeconds(nDuration)));
diff --git a/_content/prc8_battle_top/nw_s1_howldeath.ncs b/_content/prc8_battle_top/nw_s1_howldeath.ncs
new file mode 100644
index 0000000..7193f10
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_howldeath.ncs differ
diff --git a/_module/nss/nw_s1_howldeath.nss b/_content/prc8_battle_top/nw_s1_howldeath.nss
similarity index 96%
rename from _module/nss/nw_s1_howldeath.nss
rename to _content/prc8_battle_top/nw_s1_howldeath.nss
index 5730647..1d04cbb 100644
--- a/_module/nss/nw_s1_howldeath.nss
+++ b/_content/prc8_battle_top/nw_s1_howldeath.nss
@@ -12,12 +12,12 @@
 //:: Created On: May 14, 2000
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
-//#include "wm_include"
+#include "wm_include"
 #include "prc_inc_spells"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_howlfear.ncs b/_content/prc8_battle_top/nw_s1_howlfear.ncs
new file mode 100644
index 0000000..1047066
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_howlfear.ncs differ
diff --git a/_module/nss/nw_s1_howlfear.nss b/_content/prc8_battle_top/nw_s1_howlfear.nss
similarity index 97%
rename from _module/nss/nw_s1_howlfear.nss
rename to _content/prc8_battle_top/nw_s1_howlfear.nss
index 13dcfaf..f2d871d 100644
--- a/_module/nss/nw_s1_howlfear.nss
+++ b/_content/prc8_battle_top/nw_s1_howlfear.nss
@@ -12,12 +12,12 @@
 //:: Created On: May 14, 2000
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
-//#include "wm_include"
+#include "wm_include"
 #include "prc_inc_spells"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_howlstun.ncs b/_content/prc8_battle_top/nw_s1_howlstun.ncs
new file mode 100644
index 0000000..c5e2483
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_howlstun.ncs differ
diff --git a/_module/nss/nw_s1_howlstun.nss b/_content/prc8_battle_top/nw_s1_howlstun.nss
similarity index 97%
rename from _module/nss/nw_s1_howlstun.nss
rename to _content/prc8_battle_top/nw_s1_howlstun.nss
index 962d9b9..796ac50 100644
--- a/_module/nss/nw_s1_howlstun.nss
+++ b/_content/prc8_battle_top/nw_s1_howlstun.nss
@@ -11,13 +11,13 @@
 //:: Created By: Preston Watamaniuk
 //:: Created On: May 14, 2000
 //:://////////////////////////////////////////////
-//#include "wm_include"
+#include "wm_include"
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_krenscare.ncs b/_content/prc8_battle_top/nw_s1_krenscare.ncs
new file mode 100644
index 0000000..5947946
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_krenscare.ncs differ
diff --git a/_module/nss/nw_s1_krenscare.nss b/_content/prc8_battle_top/nw_s1_krenscare.nss
similarity index 96%
rename from _module/nss/nw_s1_krenscare.nss
rename to _content/prc8_battle_top/nw_s1_krenscare.nss
index 738463e..7d10705 100644
--- a/_module/nss/nw_s1_krenscare.nss
+++ b/_content/prc8_battle_top/nw_s1_krenscare.nss
@@ -10,12 +10,12 @@
 //:: Created By: Preston Watamaniuk
 //:: Created On: Jan 8, 2002
 //:://////////////////////////////////////////////
-//#include "wm_include"
+#include "wm_include"
 #include "prc_inc_spells"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_mephsalt.ncs b/_content/prc8_battle_top/nw_s1_mephsalt.ncs
new file mode 100644
index 0000000..e09ff1e
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_mephsalt.ncs differ
diff --git a/_module/nss/nw_s1_mephsalt.nss b/_content/prc8_battle_top/nw_s1_mephsalt.nss
similarity index 96%
rename from _module/nss/nw_s1_mephsalt.nss
rename to _content/prc8_battle_top/nw_s1_mephsalt.nss
index 03b0b97..68c23a2 100644
--- a/_module/nss/nw_s1_mephsalt.nss
+++ b/_content/prc8_battle_top/nw_s1_mephsalt.nss
@@ -14,11 +14,11 @@
 //:: Created On: May 11, 2001
 //:://////////////////////////////////////////////
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_mephsteam.ncs b/_content/prc8_battle_top/nw_s1_mephsteam.ncs
new file mode 100644
index 0000000..66148cf
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_mephsteam.ncs differ
diff --git a/_module/nss/nw_s1_mephsteam.nss b/_content/prc8_battle_top/nw_s1_mephsteam.nss
similarity index 96%
rename from _module/nss/nw_s1_mephsteam.nss
rename to _content/prc8_battle_top/nw_s1_mephsteam.nss
index 9b46d89..3e582e4 100644
--- a/_module/nss/nw_s1_mephsteam.nss
+++ b/_content/prc8_battle_top/nw_s1_mephsteam.nss
@@ -15,11 +15,11 @@
 //:: Created On: May 11, 2001
 //:://////////////////////////////////////////////
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_mumundead.ncs b/_content/prc8_battle_top/nw_s1_mumundead.ncs
new file mode 100644
index 0000000..d9b971b
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_mumundead.ncs differ
diff --git a/_module/nss/nw_s1_mumundead.nss b/_content/prc8_battle_top/nw_s1_mumundead.nss
similarity index 96%
rename from _module/nss/nw_s1_mumundead.nss
rename to _content/prc8_battle_top/nw_s1_mumundead.nss
index f11db57..a6e97f5 100644
--- a/_module/nss/nw_s1_mumundead.nss
+++ b/_content/prc8_battle_top/nw_s1_mumundead.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_pulschrdr.ncs b/_content/prc8_battle_top/nw_s1_pulschrdr.ncs
new file mode 100644
index 0000000..43cf80c
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_pulschrdr.ncs differ
diff --git a/_module/nss/nw_s1_pulschrdr.nss b/_content/prc8_battle_top/nw_s1_pulschrdr.nss
similarity index 97%
rename from _module/nss/nw_s1_pulschrdr.nss
rename to _content/prc8_battle_top/nw_s1_pulschrdr.nss
index b55902c..8a64d1a 100644
--- a/_module/nss/nw_s1_pulschrdr.nss
+++ b/_content/prc8_battle_top/nw_s1_pulschrdr.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_pulscold.ncs b/_content/prc8_battle_top/nw_s1_pulscold.ncs
new file mode 100644
index 0000000..6922703
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_pulscold.ncs differ
diff --git a/_module/nss/nw_s1_pulscold.nss b/_content/prc8_battle_top/nw_s1_pulscold.nss
similarity index 97%
rename from _module/nss/nw_s1_pulscold.nss
rename to _content/prc8_battle_top/nw_s1_pulscold.nss
index c5ff7d2..51ab832 100644
--- a/_module/nss/nw_s1_pulscold.nss
+++ b/_content/prc8_battle_top/nw_s1_pulscold.nss
@@ -12,12 +12,12 @@
 //:: Created By: Preston Watamaniuk
 //:: Created On: May 14, 2000
 //:://////////////////////////////////////////////
-//#include "wm_include"
+#include "wm_include"
 #include "prc_inc_spells"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_pulscondr.ncs b/_content/prc8_battle_top/nw_s1_pulscondr.ncs
new file mode 100644
index 0000000..2d71927
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_pulscondr.ncs differ
diff --git a/_module/nss/nw_s1_pulscondr.nss b/_content/prc8_battle_top/nw_s1_pulscondr.nss
similarity index 97%
rename from _module/nss/nw_s1_pulscondr.nss
rename to _content/prc8_battle_top/nw_s1_pulscondr.nss
index bfdbfcf..c0cb056 100644
--- a/_module/nss/nw_s1_pulscondr.nss
+++ b/_content/prc8_battle_top/nw_s1_pulscondr.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_pulsdeath.ncs b/_content/prc8_battle_top/nw_s1_pulsdeath.ncs
new file mode 100644
index 0000000..72e4f42
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_pulsdeath.ncs differ
diff --git a/_module/nss/nw_s1_pulsdeath.nss b/_content/prc8_battle_top/nw_s1_pulsdeath.nss
similarity index 97%
rename from _module/nss/nw_s1_pulsdeath.nss
rename to _content/prc8_battle_top/nw_s1_pulsdeath.nss
index 7c949d1..f9e710a 100644
--- a/_module/nss/nw_s1_pulsdeath.nss
+++ b/_content/prc8_battle_top/nw_s1_pulsdeath.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_pulsdexdr.ncs b/_content/prc8_battle_top/nw_s1_pulsdexdr.ncs
new file mode 100644
index 0000000..78c16eb
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_pulsdexdr.ncs differ
diff --git a/_module/nss/nw_s1_pulsdexdr.nss b/_content/prc8_battle_top/nw_s1_pulsdexdr.nss
similarity index 97%
rename from _module/nss/nw_s1_pulsdexdr.nss
rename to _content/prc8_battle_top/nw_s1_pulsdexdr.nss
index d29872a..eb13a27 100644
--- a/_module/nss/nw_s1_pulsdexdr.nss
+++ b/_content/prc8_battle_top/nw_s1_pulsdexdr.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_pulsdis.ncs b/_content/prc8_battle_top/nw_s1_pulsdis.ncs
new file mode 100644
index 0000000..6fad7e9
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_pulsdis.ncs differ
diff --git a/_module/nss/nw_s1_pulsdis.nss b/_content/prc8_battle_top/nw_s1_pulsdis.nss
similarity index 97%
rename from _module/nss/nw_s1_pulsdis.nss
rename to _content/prc8_battle_top/nw_s1_pulsdis.nss
index f81568c..37ad99b 100644
--- a/_module/nss/nw_s1_pulsdis.nss
+++ b/_content/prc8_battle_top/nw_s1_pulsdis.nss
@@ -11,12 +11,12 @@
 //:: Created By: Preston Watamaniuk
 //:: Created On: Aug 14, 2000
 //:://////////////////////////////////////////////
-//#include "wm_include"
+#include "wm_include"
 #include "prc_inc_spells"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_pulselec.ncs b/_content/prc8_battle_top/nw_s1_pulselec.ncs
new file mode 100644
index 0000000..0254a54
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_pulselec.ncs differ
diff --git a/_module/nss/nw_s1_pulselec.nss b/_content/prc8_battle_top/nw_s1_pulselec.nss
similarity index 97%
rename from _module/nss/nw_s1_pulselec.nss
rename to _content/prc8_battle_top/nw_s1_pulselec.nss
index 2f85614..ee678c9 100644
--- a/_module/nss/nw_s1_pulselec.nss
+++ b/_content/prc8_battle_top/nw_s1_pulselec.nss
@@ -11,12 +11,12 @@
 //:: Created By: Preston Watamaniuk
 //:: Created On: May 22, 2001
 //:://////////////////////////////////////////////
-//#include "wm_include"
+#include "wm_include"
 #include "prc_inc_spells"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_pulsfire.ncs b/_content/prc8_battle_top/nw_s1_pulsfire.ncs
new file mode 100644
index 0000000..9e80ba8
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_pulsfire.ncs differ
diff --git a/_module/nss/nw_s1_pulsfire.nss b/_content/prc8_battle_top/nw_s1_pulsfire.nss
similarity index 97%
rename from _module/nss/nw_s1_pulsfire.nss
rename to _content/prc8_battle_top/nw_s1_pulsfire.nss
index 9270aa9..0467f10 100644
--- a/_module/nss/nw_s1_pulsfire.nss
+++ b/_content/prc8_battle_top/nw_s1_pulsfire.nss
@@ -12,12 +12,12 @@
 //:: Created By: Preston Watamaniuk
 //:: Created On: May 14, 2000
 //:://////////////////////////////////////////////
-//#include "wm_include"
+#include "wm_include"
 #include "prc_inc_spells"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_pulsholy.ncs b/_content/prc8_battle_top/nw_s1_pulsholy.ncs
new file mode 100644
index 0000000..ea57455
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_pulsholy.ncs differ
diff --git a/_module/nss/nw_s1_pulsholy.nss b/_content/prc8_battle_top/nw_s1_pulsholy.nss
similarity index 97%
rename from _module/nss/nw_s1_pulsholy.nss
rename to _content/prc8_battle_top/nw_s1_pulsholy.nss
index 20ae463..f240661 100644
--- a/_module/nss/nw_s1_pulsholy.nss
+++ b/_content/prc8_battle_top/nw_s1_pulsholy.nss
@@ -12,12 +12,12 @@
 //:: Created By: Preston Watamaniuk
 //:: Created On: May 14, 2000
 //:://////////////////////////////////////////////
-//#include "wm_include"
+#include "wm_include"
 #include "prc_inc_spells"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_pulsintdr.ncs b/_content/prc8_battle_top/nw_s1_pulsintdr.ncs
new file mode 100644
index 0000000..eb517ff
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_pulsintdr.ncs differ
diff --git a/_module/nss/nw_s1_pulsintdr.nss b/_content/prc8_battle_top/nw_s1_pulsintdr.nss
similarity index 97%
rename from _module/nss/nw_s1_pulsintdr.nss
rename to _content/prc8_battle_top/nw_s1_pulsintdr.nss
index 8558364..13abb7f 100644
--- a/_module/nss/nw_s1_pulsintdr.nss
+++ b/_content/prc8_battle_top/nw_s1_pulsintdr.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_pulslvldr.ncs b/_content/prc8_battle_top/nw_s1_pulslvldr.ncs
new file mode 100644
index 0000000..97e3e6d
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_pulslvldr.ncs differ
diff --git a/_module/nss/nw_s1_pulslvldr.nss b/_content/prc8_battle_top/nw_s1_pulslvldr.nss
similarity index 96%
rename from _module/nss/nw_s1_pulslvldr.nss
rename to _content/prc8_battle_top/nw_s1_pulslvldr.nss
index f65e073..380fbb3 100644
--- a/_module/nss/nw_s1_pulslvldr.nss
+++ b/_content/prc8_battle_top/nw_s1_pulslvldr.nss
@@ -14,10 +14,10 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 
 //:: Declare major variables
 	object oNPC		= GetAreaOfEffectCreator();
diff --git a/_content/prc8_battle_top/nw_s1_pulsneg.ncs b/_content/prc8_battle_top/nw_s1_pulsneg.ncs
new file mode 100644
index 0000000..f5169b8
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_pulsneg.ncs differ
diff --git a/_module/nss/nw_s1_pulsneg.nss b/_content/prc8_battle_top/nw_s1_pulsneg.nss
similarity index 98%
rename from _module/nss/nw_s1_pulsneg.nss
rename to _content/prc8_battle_top/nw_s1_pulsneg.nss
index 9bfa749..876f19c 100644
--- a/_module/nss/nw_s1_pulsneg.nss
+++ b/_content/prc8_battle_top/nw_s1_pulsneg.nss
@@ -13,11 +13,11 @@
 //:: Created On: May 14, 2000
 //:://////////////////////////////////////////////
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 
 //:: Declare major variables
 	object oNPC		= GetAreaOfEffectCreator();
diff --git a/_module/ncs/nw_s1_pulspois.ncs b/_content/prc8_battle_top/nw_s1_pulspois.ncs
similarity index 94%
rename from _module/ncs/nw_s1_pulspois.ncs
rename to _content/prc8_battle_top/nw_s1_pulspois.ncs
index cafb629..d0cd73b 100644
Binary files a/_module/ncs/nw_s1_pulspois.ncs and b/_content/prc8_battle_top/nw_s1_pulspois.ncs differ
diff --git a/_module/nss/nw_s1_pulspois.nss b/_content/prc8_battle_top/nw_s1_pulspois.nss
similarity index 99%
rename from _module/nss/nw_s1_pulspois.nss
rename to _content/prc8_battle_top/nw_s1_pulspois.nss
index 252ae3a..4a1d314 100644
--- a/_module/nss/nw_s1_pulspois.nss
+++ b/_content/prc8_battle_top/nw_s1_pulspois.nss
@@ -13,7 +13,7 @@
 //:: Created On: May 23, 2000
 //:://////////////////////////////////////////////
 #include "prc_inc_racial" 
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
diff --git a/_content/prc8_battle_top/nw_s1_pulsspore.ncs b/_content/prc8_battle_top/nw_s1_pulsspore.ncs
new file mode 100644
index 0000000..9cf5ee2
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_pulsspore.ncs differ
diff --git a/_module/nss/nw_s1_pulsspore.nss b/_content/prc8_battle_top/nw_s1_pulsspore.nss
similarity index 96%
rename from _module/nss/nw_s1_pulsspore.nss
rename to _content/prc8_battle_top/nw_s1_pulsspore.nss
index 7e9e34d..6135c8e 100644
--- a/_module/nss/nw_s1_pulsspore.nss
+++ b/_content/prc8_battle_top/nw_s1_pulsspore.nss
@@ -11,11 +11,11 @@
 //:: Created By: Preston Watamaniuk
 //:: Created On: Jan 8, 2002
 //:://////////////////////////////////////////////
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_pulsstrdr.ncs b/_content/prc8_battle_top/nw_s1_pulsstrdr.ncs
new file mode 100644
index 0000000..f8209b9
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_pulsstrdr.ncs differ
diff --git a/_module/nss/nw_s1_pulsstrdr.nss b/_content/prc8_battle_top/nw_s1_pulsstrdr.nss
similarity index 97%
rename from _module/nss/nw_s1_pulsstrdr.nss
rename to _content/prc8_battle_top/nw_s1_pulsstrdr.nss
index 5f88eab..578b8a2 100644
--- a/_module/nss/nw_s1_pulsstrdr.nss
+++ b/_content/prc8_battle_top/nw_s1_pulsstrdr.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_pulswind.ncs b/_content/prc8_battle_top/nw_s1_pulswind.ncs
new file mode 100644
index 0000000..b448f18
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_pulswind.ncs differ
diff --git a/_module/nss/nw_s1_pulswind.nss b/_content/prc8_battle_top/nw_s1_pulswind.nss
similarity index 95%
rename from _module/nss/nw_s1_pulswind.nss
rename to _content/prc8_battle_top/nw_s1_pulswind.nss
index 0572407..fdab432 100644
--- a/_module/nss/nw_s1_pulswind.nss
+++ b/_content/prc8_battle_top/nw_s1_pulswind.nss
@@ -13,10 +13,10 @@
 //::///////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_pulswisdr.ncs b/_content/prc8_battle_top/nw_s1_pulswisdr.ncs
new file mode 100644
index 0000000..a1ca7df
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_pulswisdr.ncs differ
diff --git a/_module/nss/nw_s1_pulswisdr.nss b/_content/prc8_battle_top/nw_s1_pulswisdr.nss
similarity index 97%
rename from _module/nss/nw_s1_pulswisdr.nss
rename to _content/prc8_battle_top/nw_s1_pulswisdr.nss
index b1bf68c..6732721 100644
--- a/_module/nss/nw_s1_pulswisdr.nss
+++ b/_content/prc8_battle_top/nw_s1_pulswisdr.nss
@@ -14,11 +14,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s1_smokeclaw.ncs b/_content/prc8_battle_top/nw_s1_smokeclaw.ncs
new file mode 100644
index 0000000..a42ce19
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_smokeclaw.ncs differ
diff --git a/_module/nss/nw_s1_smokeclaw.nss b/_content/prc8_battle_top/nw_s1_smokeclaw.nss
similarity index 96%
rename from _module/nss/nw_s1_smokeclaw.nss
rename to _content/prc8_battle_top/nw_s1_smokeclaw.nss
index 6db3666..285ee68 100644
--- a/_module/nss/nw_s1_smokeclaw.nss
+++ b/_content/prc8_battle_top/nw_s1_smokeclaw.nss
@@ -15,11 +15,11 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 
 void main()
 {
-	//if (WildMagicOverride()) { return; }
+	if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_module/ncs/nw_s1_bltacid.ncs b/_content/prc8_battle_top/nw_s1_stink_a.ncs
similarity index 69%
rename from _module/ncs/nw_s1_bltacid.ncs
rename to _content/prc8_battle_top/nw_s1_stink_a.ncs
index 9e9d57b..fb4c5cd 100644
Binary files a/_module/ncs/nw_s1_bltacid.ncs and b/_content/prc8_battle_top/nw_s1_stink_a.ncs differ
diff --git a/_module/nss/nw_s1_stink_a.nss b/_content/prc8_battle_top/nw_s1_stink_a.nss
similarity index 95%
rename from _module/nss/nw_s1_stink_a.nss
rename to _content/prc8_battle_top/nw_s1_stink_a.nss
index 67652dd..29a034c 100644
--- a/_module/nss/nw_s1_stink_a.nss
+++ b/_content/prc8_battle_top/nw_s1_stink_a.nss
@@ -13,7 +13,7 @@
 //:://////////////////////////////////////////////
 
 #include "NW_I0_SPELLS"
-//#include "wm_include"
+#include "wm_include"
 #include "prc_inc_spells"
 
 void main()
@@ -36,7 +36,7 @@ void main()
 
     float fDelay;
     
-    //if (NullMagicOverride(GetArea(oTarget), oTarget, oTarget)) {return;}
+    if (NullMagicOverride(GetArea(oTarget), oTarget, oTarget)) {return;}
 	
     if(MyPRCGetRacialType(oTarget) != RACIAL_TYPE_VERMIN)
     {
diff --git a/_content/prc8_battle_top/nw_s1_tyrantfga.ncs b/_content/prc8_battle_top/nw_s1_tyrantfga.ncs
new file mode 100644
index 0000000..50fb180
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_tyrantfga.ncs differ
diff --git a/_module/nss/nw_s1_tyrantfga.nss b/_content/prc8_battle_top/nw_s1_tyrantfga.nss
similarity index 92%
rename from _module/nss/nw_s1_tyrantfga.nss
rename to _content/prc8_battle_top/nw_s1_tyrantfga.nss
index a2752cb..9ef4e3f 100644
--- a/_module/nss/nw_s1_tyrantfga.nss
+++ b/_content/prc8_battle_top/nw_s1_tyrantfga.nss
@@ -13,17 +13,17 @@
 //:: Created On: May 25, 2001
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
-//#include "wm_include"
+#include "wm_include"
 #include "prc_inc_spells"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 
 //:: Declare major variables
 	object oNPC		= GetAreaOfEffectCreator();
     object oTarget 	= GetEnteringObject();
-    //if (NullMagicOverride(GetArea(oTarget), oTarget, oTarget)) {return;}
+    if (NullMagicOverride(GetArea(oTarget), oTarget, oTarget)) {return;}
 
     int bAbsent 	= TRUE;
     int nHD 		= GetHitDice(oNPC);
diff --git a/_content/prc8_battle_top/nw_s1_tyrantfog.ncs b/_content/prc8_battle_top/nw_s1_tyrantfog.ncs
new file mode 100644
index 0000000..e0ac8bf
Binary files /dev/null and b/_content/prc8_battle_top/nw_s1_tyrantfog.ncs differ
diff --git a/_module/nss/nw_s1_tyrantfog.nss b/_content/prc8_battle_top/nw_s1_tyrantfog.nss
similarity index 91%
rename from _module/nss/nw_s1_tyrantfog.nss
rename to _content/prc8_battle_top/nw_s1_tyrantfog.nss
index e3ab9e6..c62d182 100644
--- a/_module/nss/nw_s1_tyrantfog.nss
+++ b/_content/prc8_battle_top/nw_s1_tyrantfog.nss
@@ -12,12 +12,12 @@
 //:: Created By: Preston Watamaniuk
 //:: Created On: May 25, 2001
 //:://////////////////////////////////////////////
-//#include "wm_include"
+#include "wm_include"
 #include "prc_inc_spells"
 
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 
     //Declare and apply the AOE
     effect eAOE = EffectAreaOfEffect(AOE_MOB_TYRANT_FOG);
diff --git a/_content/prc8_battle_top/nw_s2_divprot.ncs b/_content/prc8_battle_top/nw_s2_divprot.ncs
new file mode 100644
index 0000000..da38ca3
Binary files /dev/null and b/_content/prc8_battle_top/nw_s2_divprot.ncs differ
diff --git a/_module/nss/nw_s2_divprot.nss b/_content/prc8_battle_top/nw_s2_divprot.nss
similarity index 95%
rename from _module/nss/nw_s2_divprot.nss
rename to _content/prc8_battle_top/nw_s2_divprot.nss
index fff40ab..f647b15 100644
--- a/_module/nss/nw_s2_divprot.nss
+++ b/_content/prc8_battle_top/nw_s2_divprot.nss
@@ -13,10 +13,10 @@
 //:: Created On: Jan 8, 2002
 //:://////////////////////////////////////////////
 #include "prc_inc_spells"
-//#include "wm_include"
+#include "wm_include"
 void main()
 {
-    //if (WildMagicOverride()) { return; }
+    if (WildMagicOverride()) { return; }
 	
 //:: Declare major variables
 	object oNPC		= OBJECT_SELF;
diff --git a/_content/prc8_battle_top/nw_s3_balordeth.ncs b/_content/prc8_battle_top/nw_s3_balordeth.ncs
new file mode 100644
index 0000000..51e2f3e
Binary files /dev/null and b/_content/prc8_battle_top/nw_s3_balordeth.ncs differ
diff --git a/_module/nss/nw_s3_balordeth.nss b/_content/prc8_battle_top/nw_s3_balordeth.nss
similarity index 90%
rename from _module/nss/nw_s3_balordeth.nss
rename to _content/prc8_battle_top/nw_s3_balordeth.nss
index 6c3367c..4598bbb 100644
--- a/_module/nss/nw_s3_balordeth.nss
+++ b/_content/prc8_battle_top/nw_s3_balordeth.nss
@@ -13,11 +13,13 @@
 //:://////////////////////////////////////////////
 #include "jw_exp_giver"
 #include "NW_I0_SPELLS"
+#include "prc_inc_spells"
+
 void main()
 {
     //Declare major variables
     object oCaster = OBJECT_SELF;
-    int nMetaMagic = GetMetaMagicFeat();
+    int nMetaMagic = PRCGetMetaMagicFeat();
     int nDamage;
     float fDelay;
     effect eExplode = EffectVisualEffect(VFX_FNF_FIREBALL);
@@ -37,10 +39,10 @@ void main()
         SignalEvent(oTarget, EventSpellCastAt(OBJECT_SELF, SPELL_FIREBALL));
         //Get the distance between the explosion and the target to calculate delay
         fDelay = GetDistanceBetweenLocations(lTarget, GetLocation(oTarget))/20;
-        if (!MyResistSpell(OBJECT_SELF, oTarget, fDelay))
+        if (!PRCDoResistSpell(OBJECT_SELF, oTarget, FloatToInt(fDelay)))
         {
             //Adjust the damage based on the Reflex Save, Evasion and Improved Evasion.
-            nDamage = GetReflexAdjustedDamage(50, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_FIRE);
+            nDamage = PRCGetReflexAdjustedDamage(50, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_FIRE);
             //Set the damage effect
             eDam = EffectDamage(nDamage, DAMAGE_TYPE_FIRE);
             if(nDamage > 0)
@@ -61,7 +63,7 @@ object oPC=GetLastKiller();
 
 
 givexp(OBJECT_SELF,GetLastKiller());
-
+ExecuteScript("prc_npc_death", OBJECT_SELF);
 
 }
 
diff --git a/_module/Battledale [PRC-CEP3].mod b/_module/Battledale [PRC-CEP3].mod
index 224f503..c5c69bd 100644
Binary files a/_module/Battledale [PRC-CEP3].mod and b/_module/Battledale [PRC-CEP3].mod differ
diff --git a/_module/ifo/module.ifo.json b/_module/ifo/module.ifo.json
index 5e7adc7..57ddbd9 100644
--- a/_module/ifo/module.ifo.json
+++ b/_module/ifo/module.ifo.json
@@ -2874,7 +2874,7 @@
   "Mod_Description": {
     "type": "cexolocstring",
     "value": {
-      "0": "Visit the land of Battledale, a persistent world based in the Forgotten Realms.\n\nThis is a strictly roleplaying server. Please use sensible names for your characters. We do not allow drow characters. Please no bright green hair or anything like that. Read the game journal for more detailed info. \n\nHave fun!"
+      "0": "Visit the land of Battledale, a persistent world based in the Forgotten Realms."
     }
   },
   "Mod_DuskHour": {
@@ -2916,6 +2916,13 @@
   "Mod_HakList": {
     "type": "list",
     "value": [
+      {
+        "__struct_id": 8,
+        "Mod_Hak": {
+          "type": "cexostring",
+          "value": "prc8_battle_top"
+        }
+      },
       {
         "__struct_id": 8,
         "Mod_Hak": {
diff --git a/_module/ncs/ah_cryptbossdead.ncs b/_module/ncs/ah_cryptbossdead.ncs
index 70a9152..267d063 100644
Binary files a/_module/ncs/ah_cryptbossdead.ncs and b/_module/ncs/ah_cryptbossdead.ncs differ
diff --git a/_module/ncs/ah_ondeath_skel.ncs b/_module/ncs/ah_ondeath_skel.ncs
index fd8bf9f..62b0fb1 100644
Binary files a/_module/ncs/ah_ondeath_skel.ncs and b/_module/ncs/ah_ondeath_skel.ncs differ
diff --git a/_module/ncs/ah_onspawn_efx.ncs b/_module/ncs/ah_onspawn_efx.ncs
index 89de85f..399273a 100644
Binary files a/_module/ncs/ah_onspawn_efx.ncs and b/_module/ncs/ah_onspawn_efx.ncs differ
diff --git a/_module/ncs/ah_onspawn_flag.ncs b/_module/ncs/ah_onspawn_flag.ncs
index 5293725..32891aa 100644
Binary files a/_module/ncs/ah_onspawn_flag.ncs and b/_module/ncs/ah_onspawn_flag.ncs differ
diff --git a/_module/ncs/ah_onspawn_flag2.ncs b/_module/ncs/ah_onspawn_flag2.ncs
index 8b77046..a579b4a 100644
Binary files a/_module/ncs/ah_onspawn_flag2.ncs and b/_module/ncs/ah_onspawn_flag2.ncs differ
diff --git a/_module/ncs/ah_onspawn_mhorg.ncs b/_module/ncs/ah_onspawn_mhorg.ncs
index 5931a7f..8e74680 100644
Binary files a/_module/ncs/ah_onspawn_mhorg.ncs and b/_module/ncs/ah_onspawn_mhorg.ncs differ
diff --git a/_module/ncs/ah_onspawn_shade.ncs b/_module/ncs/ah_onspawn_shade.ncs
index df47433..0ff03b3 100644
Binary files a/_module/ncs/ah_onspawn_shade.ncs and b/_module/ncs/ah_onspawn_shade.ncs differ
diff --git a/_module/ncs/ah_onspawn_skull.ncs b/_module/ncs/ah_onspawn_skull.ncs
index a509711..4fccd0b 100644
Binary files a/_module/ncs/ah_onspawn_skull.ncs and b/_module/ncs/ah_onspawn_skull.ncs differ
diff --git a/_module/ncs/ah_onspawn_spect.ncs b/_module/ncs/ah_onspawn_spect.ncs
index 7243c18..488dc15 100644
Binary files a/_module/ncs/ah_onspawn_spect.ncs and b/_module/ncs/ah_onspawn_spect.ncs differ
diff --git a/_module/ncs/ah_onspawn_wrait.ncs b/_module/ncs/ah_onspawn_wrait.ncs
index f14b563..5281c5a 100644
Binary files a/_module/ncs/ah_onspawn_wrait.ncs and b/_module/ncs/ah_onspawn_wrait.ncs differ
diff --git a/_module/ncs/bbs_scribe_spawn.ncs b/_module/ncs/bbs_scribe_spawn.ncs
index e551e47..aea3929 100644
Binary files a/_module/ncs/bbs_scribe_spawn.ncs and b/_module/ncs/bbs_scribe_spawn.ncs differ
diff --git a/_module/ncs/by_rotten_usd.ncs b/_module/ncs/by_rotten_usd.ncs
index 70f86d5..117933c 100644
Binary files a/_module/ncs/by_rotten_usd.ncs and b/_module/ncs/by_rotten_usd.ncs differ
diff --git a/_module/ncs/dmfi_execute.ncs b/_module/ncs/dmfi_execute.ncs
index f9dcfe9..c11127a 100644
Binary files a/_module/ncs/dmfi_execute.ncs and b/_module/ncs/dmfi_execute.ncs differ
diff --git a/_module/ncs/dmw_do_dialog1.ncs b/_module/ncs/dmw_do_dialog1.ncs
index c18c44a..51e552f 100644
Binary files a/_module/ncs/dmw_do_dialog1.ncs and b/_module/ncs/dmw_do_dialog1.ncs differ
diff --git a/_module/ncs/dmw_do_dialog2.ncs b/_module/ncs/dmw_do_dialog2.ncs
index 57d2818..276b188 100644
Binary files a/_module/ncs/dmw_do_dialog2.ncs and b/_module/ncs/dmw_do_dialog2.ncs differ
diff --git a/_module/ncs/dmw_do_dialog3.ncs b/_module/ncs/dmw_do_dialog3.ncs
index 011dd40..e8b3a9c 100644
Binary files a/_module/ncs/dmw_do_dialog3.ncs and b/_module/ncs/dmw_do_dialog3.ncs differ
diff --git a/_module/ncs/dmw_do_dialog4.ncs b/_module/ncs/dmw_do_dialog4.ncs
index feaeddc..d57f455 100644
Binary files a/_module/ncs/dmw_do_dialog4.ncs and b/_module/ncs/dmw_do_dialog4.ncs differ
diff --git a/_module/ncs/dmw_do_dialog5.ncs b/_module/ncs/dmw_do_dialog5.ncs
index 6440c7a..21db5d4 100644
Binary files a/_module/ncs/dmw_do_dialog5.ncs and b/_module/ncs/dmw_do_dialog5.ncs differ
diff --git a/_module/ncs/dmw_do_dialog6.ncs b/_module/ncs/dmw_do_dialog6.ncs
index d3a5f68..816438e 100644
Binary files a/_module/ncs/dmw_do_dialog6.ncs and b/_module/ncs/dmw_do_dialog6.ncs differ
diff --git a/_module/ncs/dmw_do_dialog7.ncs b/_module/ncs/dmw_do_dialog7.ncs
index 27c887e..9b13e14 100644
Binary files a/_module/ncs/dmw_do_dialog7.ncs and b/_module/ncs/dmw_do_dialog7.ncs differ
diff --git a/_module/ncs/dmw_do_dialog8.ncs b/_module/ncs/dmw_do_dialog8.ncs
index a4dcfe8..ec4a028 100644
Binary files a/_module/ncs/dmw_do_dialog8.ncs and b/_module/ncs/dmw_do_dialog8.ncs differ
diff --git a/_module/ncs/dmw_do_dialog9.ncs b/_module/ncs/dmw_do_dialog9.ncs
index 901695b..39c0a8f 100644
Binary files a/_module/ncs/dmw_do_dialog9.ncs and b/_module/ncs/dmw_do_dialog9.ncs differ
diff --git a/_module/ncs/fr_daemonfx01.ncs b/_module/ncs/fr_daemonfx01.ncs
index f8dc7fd..53b42f2 100644
Binary files a/_module/ncs/fr_daemonfx01.ncs and b/_module/ncs/fr_daemonfx01.ncs differ
diff --git a/_module/ncs/fr_hadush_spawn.ncs b/_module/ncs/fr_hadush_spawn.ncs
index b0ce033..30a08ec 100644
Binary files a/_module/ncs/fr_hadush_spawn.ncs and b/_module/ncs/fr_hadush_spawn.ncs differ
diff --git a/_module/ncs/fr_hadush_usd.ncs b/_module/ncs/fr_hadush_usd.ncs
index 333cdb0..75399a9 100644
Binary files a/_module/ncs/fr_hadush_usd.ncs and b/_module/ncs/fr_hadush_usd.ncs differ
diff --git a/_module/ncs/fr_halfelf.ncs b/_module/ncs/fr_halfelf.ncs
index 75537d0..269519f 100644
Binary files a/_module/ncs/fr_halfelf.ncs and b/_module/ncs/fr_halfelf.ncs differ
diff --git a/_module/ncs/fr_if_dwarf.ncs b/_module/ncs/fr_if_dwarf.ncs
index b430606..b98b269 100644
Binary files a/_module/ncs/fr_if_dwarf.ncs and b/_module/ncs/fr_if_dwarf.ncs differ
diff --git a/_module/ncs/fr_if_dwarf02.ncs b/_module/ncs/fr_if_dwarf02.ncs
index bf29f5a..c312276 100644
Binary files a/_module/ncs/fr_if_dwarf02.ncs and b/_module/ncs/fr_if_dwarf02.ncs differ
diff --git a/_module/ncs/fr_if_elf.ncs b/_module/ncs/fr_if_elf.ncs
index 7082abf..2f98d2e 100644
Binary files a/_module/ncs/fr_if_elf.ncs and b/_module/ncs/fr_if_elf.ncs differ
diff --git a/_module/ncs/fr_onspawn_0gold.ncs b/_module/ncs/fr_onspawn_0gold.ncs
index 3fe8bea..d4a04f2 100644
Binary files a/_module/ncs/fr_onspawn_0gold.ncs and b/_module/ncs/fr_onspawn_0gold.ncs differ
diff --git a/_module/ncs/fr_onspawn_dance.ncs b/_module/ncs/fr_onspawn_dance.ncs
index b4b6e14..9c4ba06 100644
Binary files a/_module/ncs/fr_onspawn_dance.ncs and b/_module/ncs/fr_onspawn_dance.ncs differ
diff --git a/_module/ncs/fr_onspawn_etght.ncs b/_module/ncs/fr_onspawn_etght.ncs
index 80e0f95..651e10e 100644
Binary files a/_module/ncs/fr_onspawn_etght.ncs and b/_module/ncs/fr_onspawn_etght.ncs differ
diff --git a/_module/ncs/fr_onspawn_ghost.ncs b/_module/ncs/fr_onspawn_ghost.ncs
index 7d8f4bf..b1b710b 100644
Binary files a/_module/ncs/fr_onspawn_ghost.ncs and b/_module/ncs/fr_onspawn_ghost.ncs differ
diff --git a/_module/ncs/fr_onspawn_golem.ncs b/_module/ncs/fr_onspawn_golem.ncs
index 5100a86..c70076b 100644
Binary files a/_module/ncs/fr_onspawn_golem.ncs and b/_module/ncs/fr_onspawn_golem.ncs differ
diff --git a/_module/ncs/fr_onspawn_green.ncs b/_module/ncs/fr_onspawn_green.ncs
index 5e6fbea..dfd6196 100644
Binary files a/_module/ncs/fr_onspawn_green.ncs and b/_module/ncs/fr_onspawn_green.ncs differ
diff --git a/_module/ncs/fr_onspawn_ice.ncs b/_module/ncs/fr_onspawn_ice.ncs
index dd5e94e..c609971 100644
Binary files a/_module/ncs/fr_onspawn_ice.ncs and b/_module/ncs/fr_onspawn_ice.ncs differ
diff --git a/_module/ncs/fr_onspawn_iogre.ncs b/_module/ncs/fr_onspawn_iogre.ncs
index 08bc5ca..5eb5d12 100644
Binary files a/_module/ncs/fr_onspawn_iogre.ncs and b/_module/ncs/fr_onspawn_iogre.ncs differ
diff --git a/_module/ncs/fr_onspawn_petrf.ncs b/_module/ncs/fr_onspawn_petrf.ncs
index 5a71e9a..9f25bfa 100644
Binary files a/_module/ncs/fr_onspawn_petrf.ncs and b/_module/ncs/fr_onspawn_petrf.ncs differ
diff --git a/_module/ncs/fr_onspawn_pgole.ncs b/_module/ncs/fr_onspawn_pgole.ncs
index 89a100e..d369053 100644
Binary files a/_module/ncs/fr_onspawn_pgole.ncs and b/_module/ncs/fr_onspawn_pgole.ncs differ
diff --git a/_module/ncs/fr_onspawn_pixie.ncs b/_module/ncs/fr_onspawn_pixie.ncs
index 718d15c..185b6ee 100644
Binary files a/_module/ncs/fr_onspawn_pixie.ncs and b/_module/ncs/fr_onspawn_pixie.ncs differ
diff --git a/_module/ncs/fr_pers_talk.ncs b/_module/ncs/fr_pers_talk.ncs
index c6b239d..9e760b1 100644
Binary files a/_module/ncs/fr_pers_talk.ncs and b/_module/ncs/fr_pers_talk.ncs differ
diff --git a/_module/ncs/fr_race_dwarf.ncs b/_module/ncs/fr_race_dwarf.ncs
index d1ec61f..c312276 100644
Binary files a/_module/ncs/fr_race_dwarf.ncs and b/_module/ncs/fr_race_dwarf.ncs differ
diff --git a/_module/ncs/fr_race_elf.ncs b/_module/ncs/fr_race_elf.ncs
index f11061f..89a019d 100644
Binary files a/_module/ncs/fr_race_elf.ncs and b/_module/ncs/fr_race_elf.ncs differ
diff --git a/_module/ncs/fr_s2_wildsh_org.ncs b/_module/ncs/fr_s2_wildsh_org.ncs
index 4286466..2aed38e 100644
Binary files a/_module/ncs/fr_s2_wildsh_org.ncs and b/_module/ncs/fr_s2_wildsh_org.ncs differ
diff --git a/_module/ncs/fr_tarrik_spawn.ncs b/_module/ncs/fr_tarrik_spawn.ncs
index 6d228f4..57e1049 100644
Binary files a/_module/ncs/fr_tarrik_spawn.ncs and b/_module/ncs/fr_tarrik_spawn.ncs differ
diff --git a/_module/ncs/fr_tarrik_usd.ncs b/_module/ncs/fr_tarrik_usd.ncs
index 1518c7b..b9d3bd1 100644
Binary files a/_module/ncs/fr_tarrik_usd.ncs and b/_module/ncs/fr_tarrik_usd.ncs differ
diff --git a/_module/ncs/fr_thael_spawn.ncs b/_module/ncs/fr_thael_spawn.ncs
index 4de76c9..3b8c808 100644
Binary files a/_module/ncs/fr_thael_spawn.ncs and b/_module/ncs/fr_thael_spawn.ncs differ
diff --git a/_module/ncs/fr_thael_usd.ncs b/_module/ncs/fr_thael_usd.ncs
index af8559f..266e7d3 100644
Binary files a/_module/ncs/fr_thael_usd.ncs and b/_module/ncs/fr_thael_usd.ncs differ
diff --git a/_module/ncs/frost_elf.ncs b/_module/ncs/frost_elf.ncs
index f11061f..89a019d 100644
Binary files a/_module/ncs/frost_elf.ncs and b/_module/ncs/frost_elf.ncs differ
diff --git a/_module/ncs/frost_not_elf.ncs b/_module/ncs/frost_not_elf.ncs
index 5642f3d..b267e15 100644
Binary files a/_module/ncs/frost_not_elf.ncs and b/_module/ncs/frost_not_elf.ncs differ
diff --git a/_module/ncs/frost_spawn_user.ncs b/_module/ncs/frost_spawn_user.ncs
index 270b341..342f538 100644
Binary files a/_module/ncs/frost_spawn_user.ncs and b/_module/ncs/frost_spawn_user.ncs differ
diff --git a/_module/ncs/gz_healer_spawn.ncs b/_module/ncs/gz_healer_spawn.ncs
index 293fd4d..5167f80 100644
Binary files a/_module/ncs/gz_healer_spawn.ncs and b/_module/ncs/gz_healer_spawn.ncs differ
diff --git a/_module/ncs/gz_healer_ude.ncs b/_module/ncs/gz_healer_ude.ncs
index b2e864f..c4796d7 100644
Binary files a/_module/ncs/gz_healer_ude.ncs and b/_module/ncs/gz_healer_ude.ncs differ
diff --git a/_module/ncs/gz_pkeg_detonate.ncs b/_module/ncs/gz_pkeg_detonate.ncs
index 34a82e2..aa3d3f5 100644
Binary files a/_module/ncs/gz_pkeg_detonate.ncs and b/_module/ncs/gz_pkeg_detonate.ncs differ
diff --git a/_module/ncs/gzcc_is_pc_abdmg.ncs b/_module/ncs/gzcc_is_pc_abdmg.ncs
index 7e8270b..eadd88d 100644
Binary files a/_module/ncs/gzcc_is_pc_abdmg.ncs and b/_module/ncs/gzcc_is_pc_abdmg.ncs differ
diff --git a/_module/ncs/gzcc_is_pc_blind.ncs b/_module/ncs/gzcc_is_pc_blind.ncs
index 65fa811..17983c6 100644
Binary files a/_module/ncs/gzcc_is_pc_blind.ncs and b/_module/ncs/gzcc_is_pc_blind.ncs differ
diff --git a/_module/ncs/gzcc_is_pc_curse.ncs b/_module/ncs/gzcc_is_pc_curse.ncs
index b03efc7..3a73ced 100644
Binary files a/_module/ncs/gzcc_is_pc_curse.ncs and b/_module/ncs/gzcc_is_pc_curse.ncs differ
diff --git a/_module/ncs/gzcc_is_pc_disea.ncs b/_module/ncs/gzcc_is_pc_disea.ncs
index ce6f7ea..488e441 100644
Binary files a/_module/ncs/gzcc_is_pc_disea.ncs and b/_module/ncs/gzcc_is_pc_disea.ncs differ
diff --git a/_module/ncs/gzcc_is_pc_dmged.ncs b/_module/ncs/gzcc_is_pc_dmged.ncs
index f4d83a0..c18d62b 100644
Binary files a/_module/ncs/gzcc_is_pc_dmged.ncs and b/_module/ncs/gzcc_is_pc_dmged.ncs differ
diff --git a/_module/ncs/gzcc_is_pc_neglv.ncs b/_module/ncs/gzcc_is_pc_neglv.ncs
index 7ae5982..243e80c 100644
Binary files a/_module/ncs/gzcc_is_pc_neglv.ncs and b/_module/ncs/gzcc_is_pc_neglv.ncs differ
diff --git a/_module/ncs/gzcc_is_pc_poiso.ncs b/_module/ncs/gzcc_is_pc_poiso.ncs
index 22c85fe..95ab827 100644
Binary files a/_module/ncs/gzcc_is_pc_poiso.ncs and b/_module/ncs/gzcc_is_pc_poiso.ncs differ
diff --git a/_module/ncs/gzcc_needhealer.ncs b/_module/ncs/gzcc_needhealer.ncs
index 7ffb0dc..0a59bde 100644
Binary files a/_module/ncs/gzcc_needhealer.ncs and b/_module/ncs/gzcc_needhealer.ncs differ
diff --git a/_module/ncs/gzcs_heal_damage.ncs b/_module/ncs/gzcs_heal_damage.ncs
index 3718733..dd93c2b 100644
Binary files a/_module/ncs/gzcs_heal_damage.ncs and b/_module/ncs/gzcs_heal_damage.ncs differ
diff --git a/_module/ncs/gzcs_pkeg_ignite.ncs b/_module/ncs/gzcs_pkeg_ignite.ncs
index 80aa38c..a626447 100644
Binary files a/_module/ncs/gzcs_pkeg_ignite.ncs and b/_module/ncs/gzcs_pkeg_ignite.ncs differ
diff --git a/_module/ncs/gzcs_rem_abdmg.ncs b/_module/ncs/gzcs_rem_abdmg.ncs
index fefd7ab..f4a157f 100644
Binary files a/_module/ncs/gzcs_rem_abdmg.ncs and b/_module/ncs/gzcs_rem_abdmg.ncs differ
diff --git a/_module/ncs/gzcs_rem_all.ncs b/_module/ncs/gzcs_rem_all.ncs
index 2951f55..9a7e3e9 100644
Binary files a/_module/ncs/gzcs_rem_all.ncs and b/_module/ncs/gzcs_rem_all.ncs differ
diff --git a/_module/ncs/gzcs_rem_blind.ncs b/_module/ncs/gzcs_rem_blind.ncs
index 5e923a8..01e7406 100644
Binary files a/_module/ncs/gzcs_rem_blind.ncs and b/_module/ncs/gzcs_rem_blind.ncs differ
diff --git a/_module/ncs/gzcs_rem_curse.ncs b/_module/ncs/gzcs_rem_curse.ncs
index 8e9a5cb..9fa0d82 100644
Binary files a/_module/ncs/gzcs_rem_curse.ncs and b/_module/ncs/gzcs_rem_curse.ncs differ
diff --git a/_module/ncs/gzcs_rem_disease.ncs b/_module/ncs/gzcs_rem_disease.ncs
index 69846d1..bab89a1 100644
Binary files a/_module/ncs/gzcs_rem_disease.ncs and b/_module/ncs/gzcs_rem_disease.ncs differ
diff --git a/_module/ncs/gzcs_rem_neglvls.ncs b/_module/ncs/gzcs_rem_neglvls.ncs
index c2b6b01..7df8b67 100644
Binary files a/_module/ncs/gzcs_rem_neglvls.ncs and b/_module/ncs/gzcs_rem_neglvls.ncs differ
diff --git a/_module/ncs/gzcs_rem_poison.ncs b/_module/ncs/gzcs_rem_poison.ncs
index c9a2fa9..e1a38a6 100644
Binary files a/_module/ncs/gzcs_rem_poison.ncs and b/_module/ncs/gzcs_rem_poison.ncs differ
diff --git a/_module/ncs/hc_grenade.ncs b/_module/ncs/hc_grenade.ncs
index ce14e05..40ceb4f 100644
Binary files a/_module/ncs/hc_grenade.ncs and b/_module/ncs/hc_grenade.ncs differ
diff --git a/_module/ncs/i420_helcat_deth.ncs b/_module/ncs/i420_helcat_deth.ncs
index 156f3e6..10d7a25 100644
Binary files a/_module/ncs/i420_helcat_deth.ncs and b/_module/ncs/i420_helcat_deth.ncs differ
diff --git a/_module/ncs/i420_helcat_spwn.ncs b/_module/ncs/i420_helcat_spwn.ncs
index 4edc8f0..c3df93a 100644
Binary files a/_module/ncs/i420_helcat_spwn.ncs and b/_module/ncs/i420_helcat_spwn.ncs differ
diff --git a/_module/ncs/jhr_onactivitem.ncs b/_module/ncs/jhr_onactivitem.ncs
index f983070..af80685 100644
Binary files a/_module/ncs/jhr_onactivitem.ncs and b/_module/ncs/jhr_onactivitem.ncs differ
diff --git a/_module/ncs/jw_abbysold_usd.ncs b/_module/ncs/jw_abbysold_usd.ncs
index c8e5339..0181169 100644
Binary files a/_module/ncs/jw_abbysold_usd.ncs and b/_module/ncs/jw_abbysold_usd.ncs differ
diff --git a/_module/ncs/jw_aisha_spawn.ncs b/_module/ncs/jw_aisha_spawn.ncs
index 7511454..ef6d518 100644
Binary files a/_module/ncs/jw_aisha_spawn.ncs and b/_module/ncs/jw_aisha_spawn.ncs differ
diff --git a/_module/ncs/jw_aisha_usd.ncs b/_module/ncs/jw_aisha_usd.ncs
index 675f6d7..1c73c0f 100644
Binary files a/_module/ncs/jw_aisha_usd.ncs and b/_module/ncs/jw_aisha_usd.ncs differ
diff --git a/_module/ncs/jw_aishadoor_ope.ncs b/_module/ncs/jw_aishadoor_ope.ncs
index f768a05..1643df2 100644
Binary files a/_module/ncs/jw_aishadoor_ope.ncs and b/_module/ncs/jw_aishadoor_ope.ncs differ
diff --git a/_module/ncs/jw_aishatrap_usd.ncs b/_module/ncs/jw_aishatrap_usd.ncs
index 243d61e..bfe5ab3 100644
Binary files a/_module/ncs/jw_aishatrap_usd.ncs and b/_module/ncs/jw_aishatrap_usd.ncs differ
diff --git a/_module/ncs/jw_andmob1_sp.ncs b/_module/ncs/jw_andmob1_sp.ncs
index 83a65c6..4821b4a 100644
Binary files a/_module/ncs/jw_andmob1_sp.ncs and b/_module/ncs/jw_andmob1_sp.ncs differ
diff --git a/_module/ncs/jw_andmob2_sp.ncs b/_module/ncs/jw_andmob2_sp.ncs
index 9bcbf0a..7ec7cb5 100644
Binary files a/_module/ncs/jw_andmob2_sp.ncs and b/_module/ncs/jw_andmob2_sp.ncs differ
diff --git a/_module/ncs/jw_andmob3_sp.ncs b/_module/ncs/jw_andmob3_sp.ncs
index 5af0379..5142193 100644
Binary files a/_module/ncs/jw_andmob3_sp.ncs and b/_module/ncs/jw_andmob3_sp.ncs differ
diff --git a/_module/ncs/jw_anhialator_sp.ncs b/_module/ncs/jw_anhialator_sp.ncs
index 8e88c6a..2fd5a02 100644
Binary files a/_module/ncs/jw_anhialator_sp.ncs and b/_module/ncs/jw_anhialator_sp.ncs differ
diff --git a/_module/ncs/jw_animal_usd.ncs b/_module/ncs/jw_animal_usd.ncs
index 4f9564e..17511de 100644
Binary files a/_module/ncs/jw_animal_usd.ncs and b/_module/ncs/jw_animal_usd.ncs differ
diff --git a/_module/ncs/jw_ball1_spawm.ncs b/_module/ncs/jw_ball1_spawm.ncs
index b75782e..ffcfdb2 100644
Binary files a/_module/ncs/jw_ball1_spawm.ncs and b/_module/ncs/jw_ball1_spawm.ncs differ
diff --git a/_module/ncs/jw_barrel_smash.ncs b/_module/ncs/jw_barrel_smash.ncs
index 7f358c3..313a84d 100644
Binary files a/_module/ncs/jw_barrel_smash.ncs and b/_module/ncs/jw_barrel_smash.ncs differ
diff --git a/_module/ncs/jw_bat_usd.ncs b/_module/ncs/jw_bat_usd.ncs
index d21abf5..97920b5 100644
Binary files a/_module/ncs/jw_bat_usd.ncs and b/_module/ncs/jw_bat_usd.ncs differ
diff --git a/_module/ncs/jw_bdr_rock_usd.ncs b/_module/ncs/jw_bdr_rock_usd.ncs
index 3b0289d..1e2444f 100644
Binary files a/_module/ncs/jw_bdr_rock_usd.ncs and b/_module/ncs/jw_bdr_rock_usd.ncs differ
diff --git a/_module/ncs/jw_belker_spawn.ncs b/_module/ncs/jw_belker_spawn.ncs
index 14a23c9..74840e3 100644
Binary files a/_module/ncs/jw_belker_spawn.ncs and b/_module/ncs/jw_belker_spawn.ncs differ
diff --git a/_module/ncs/jw_birdy_usd.ncs b/_module/ncs/jw_birdy_usd.ncs
index 88b3a40..73635cf 100644
Binary files a/_module/ncs/jw_birdy_usd.ncs and b/_module/ncs/jw_birdy_usd.ncs differ
diff --git a/_module/ncs/jw_blackswrd_spa.ncs b/_module/ncs/jw_blackswrd_spa.ncs
index 294cbb4..e82ebbb 100644
Binary files a/_module/ncs/jw_blackswrd_spa.ncs and b/_module/ncs/jw_blackswrd_spa.ncs differ
diff --git a/_module/ncs/jw_bloodfiend_us.ncs b/_module/ncs/jw_bloodfiend_us.ncs
index aec8ed7..323f5d8 100644
Binary files a/_module/ncs/jw_bloodfiend_us.ncs and b/_module/ncs/jw_bloodfiend_us.ncs differ
diff --git a/_module/ncs/jw_br_cend_dr_un.ncs b/_module/ncs/jw_br_cend_dr_un.ncs
index 4e1e0e9..efc371d 100644
Binary files a/_module/ncs/jw_br_cend_dr_un.ncs and b/_module/ncs/jw_br_cend_dr_un.ncs differ
diff --git a/_module/ncs/jw_brath_drspawn.ncs b/_module/ncs/jw_brath_drspawn.ncs
index 207067b..9832cb9 100644
Binary files a/_module/ncs/jw_brath_drspawn.ncs and b/_module/ncs/jw_brath_drspawn.ncs differ
diff --git a/_module/ncs/jw_bright_hb.ncs b/_module/ncs/jw_bright_hb.ncs
index e4abb51..f760113 100644
Binary files a/_module/ncs/jw_bright_hb.ncs and b/_module/ncs/jw_bright_hb.ncs differ
diff --git a/_module/ncs/jw_bunt_spn.ncs b/_module/ncs/jw_bunt_spn.ncs
index 26e153f..84dcb61 100644
Binary files a/_module/ncs/jw_bunt_spn.ncs and b/_module/ncs/jw_bunt_spn.ncs differ
diff --git a/_module/ncs/jw_c2_bat9.ncs b/_module/ncs/jw_c2_bat9.ncs
index a650f4b..19d7467 100644
Binary files a/_module/ncs/jw_c2_bat9.ncs and b/_module/ncs/jw_c2_bat9.ncs differ
diff --git a/_module/ncs/jw_carytid_usd.ncs b/_module/ncs/jw_carytid_usd.ncs
index 4c78847..aa775c2 100644
Binary files a/_module/ncs/jw_carytid_usd.ncs and b/_module/ncs/jw_carytid_usd.ncs differ
diff --git a/_module/ncs/jw_ccoffin_usd.ncs b/_module/ncs/jw_ccoffin_usd.ncs
index 3eab4f2..7da8c77 100644
Binary files a/_module/ncs/jw_ccoffin_usd.ncs and b/_module/ncs/jw_ccoffin_usd.ncs differ
diff --git a/_module/ncs/jw_chck_notorc.ncs b/_module/ncs/jw_chck_notorc.ncs
index 64d6248..951683e 100644
Binary files a/_module/ncs/jw_chck_notorc.ncs and b/_module/ncs/jw_chck_notorc.ncs differ
diff --git a/_module/ncs/jw_check_is_bard.ncs b/_module/ncs/jw_check_is_bard.ncs
index 9dd0c5d..0d6f920 100644
Binary files a/_module/ncs/jw_check_is_bard.ncs and b/_module/ncs/jw_check_is_bard.ncs differ
diff --git a/_module/ncs/jw_check_rog.ncs b/_module/ncs/jw_check_rog.ncs
index 7b9333f..ceaeb73 100644
Binary files a/_module/ncs/jw_check_rog.ncs and b/_module/ncs/jw_check_rog.ncs differ
diff --git a/_module/ncs/jw_chieforc_usd.ncs b/_module/ncs/jw_chieforc_usd.ncs
index 4ffcb59..86f2b80 100644
Binary files a/_module/ncs/jw_chieforc_usd.ncs and b/_module/ncs/jw_chieforc_usd.ncs differ
diff --git a/_module/ncs/jw_chk_isdwarf.ncs b/_module/ncs/jw_chk_isdwarf.ncs
index d1ec61f..c312276 100644
Binary files a/_module/ncs/jw_chk_isdwarf.ncs and b/_module/ncs/jw_chk_isdwarf.ncs differ
diff --git a/_module/ncs/jw_chk_not_dwarf.ncs b/_module/ncs/jw_chk_not_dwarf.ncs
index bff632b..a137603 100644
Binary files a/_module/ncs/jw_chk_not_dwarf.ncs and b/_module/ncs/jw_chk_not_dwarf.ncs differ
diff --git a/_module/ncs/jw_chkelfhalfelf.ncs b/_module/ncs/jw_chkelfhalfelf.ncs
index 7082abf..2f98d2e 100644
Binary files a/_module/ncs/jw_chkelfhalfelf.ncs and b/_module/ncs/jw_chkelfhalfelf.ncs differ
diff --git a/_module/ncs/jw_chkelfhellr15.ncs b/_module/ncs/jw_chkelfhellr15.ncs
index 8d3741d..597634f 100644
Binary files a/_module/ncs/jw_chkelfhellr15.ncs and b/_module/ncs/jw_chkelfhellr15.ncs differ
diff --git a/_module/ncs/jw_chknothuman.ncs b/_module/ncs/jw_chknothuman.ncs
index c0e4e61..59acb4d 100644
Binary files a/_module/ncs/jw_chknothuman.ncs and b/_module/ncs/jw_chknothuman.ncs differ
diff --git a/_module/ncs/jw_chourm_usd.ncs b/_module/ncs/jw_chourm_usd.ncs
index ce48b60..9095285 100644
Binary files a/_module/ncs/jw_chourm_usd.ncs and b/_module/ncs/jw_chourm_usd.ncs differ
diff --git a/_module/ncs/jw_clone_ai.ncs b/_module/ncs/jw_clone_ai.ncs
index a55f5f6..3723c4e 100644
Binary files a/_module/ncs/jw_clone_ai.ncs and b/_module/ncs/jw_clone_ai.ncs differ
diff --git a/_module/ncs/jw_commoner_spaw.ncs b/_module/ncs/jw_commoner_spaw.ncs
index 602a41a..d3bc0b9 100644
Binary files a/_module/ncs/jw_commoner_spaw.ncs and b/_module/ncs/jw_commoner_spaw.ncs differ
diff --git a/_module/ncs/jw_conisdwarf.ncs b/_module/ncs/jw_conisdwarf.ncs
index d1ec61f..c312276 100644
Binary files a/_module/ncs/jw_conisdwarf.ncs and b/_module/ncs/jw_conisdwarf.ncs differ
diff --git a/_module/ncs/jw_corky_spawn.ncs b/_module/ncs/jw_corky_spawn.ncs
index 5f150de..93ba9ac 100644
Binary files a/_module/ncs/jw_corky_spawn.ncs and b/_module/ncs/jw_corky_spawn.ncs differ
diff --git a/_module/ncs/jw_corky_usd.ncs b/_module/ncs/jw_corky_usd.ncs
index 2e58f4f..a3e949e 100644
Binary files a/_module/ncs/jw_corky_usd.ncs and b/_module/ncs/jw_corky_usd.ncs differ
diff --git a/_module/ncs/jw_cvamp_spawn.ncs b/_module/ncs/jw_cvamp_spawn.ncs
index 3f642a4..bba6f02 100644
Binary files a/_module/ncs/jw_cvamp_spawn.ncs and b/_module/ncs/jw_cvamp_spawn.ncs differ
diff --git a/_module/ncs/jw_cvamp_usd.ncs b/_module/ncs/jw_cvamp_usd.ncs
index d71726d..b72964d 100644
Binary files a/_module/ncs/jw_cvamp_usd.ncs and b/_module/ncs/jw_cvamp_usd.ncs differ
diff --git a/_module/ncs/jw_cvmp1_shd_usd.ncs b/_module/ncs/jw_cvmp1_shd_usd.ncs
index 3081969..cad716e 100644
Binary files a/_module/ncs/jw_cvmp1_shd_usd.ncs and b/_module/ncs/jw_cvmp1_shd_usd.ncs differ
diff --git a/_module/ncs/jw_darkenbeast_s.ncs b/_module/ncs/jw_darkenbeast_s.ncs
index 92eb3bd..5126da8 100644
Binary files a/_module/ncs/jw_darkenbeast_s.ncs and b/_module/ncs/jw_darkenbeast_s.ncs differ
diff --git a/_module/ncs/jw_deathbri2_usd.ncs b/_module/ncs/jw_deathbri2_usd.ncs
index bea0644..e3ff4c1 100644
Binary files a/_module/ncs/jw_deathbri2_usd.ncs and b/_module/ncs/jw_deathbri2_usd.ncs differ
diff --git a/_module/ncs/jw_deepgnone_sp.ncs b/_module/ncs/jw_deepgnone_sp.ncs
index 088c726..3b7eb8b 100644
Binary files a/_module/ncs/jw_deepgnone_sp.ncs and b/_module/ncs/jw_deepgnone_sp.ncs differ
diff --git a/_module/ncs/jw_deepminer_sp.ncs b/_module/ncs/jw_deepminer_sp.ncs
index 2ea766c..0db1095 100644
Binary files a/_module/ncs/jw_deepminer_sp.ncs and b/_module/ncs/jw_deepminer_sp.ncs differ
diff --git a/_module/ncs/jw_deer_spawn.ncs b/_module/ncs/jw_deer_spawn.ncs
index c935994..5056f3f 100644
Binary files a/_module/ncs/jw_deer_spawn.ncs and b/_module/ncs/jw_deer_spawn.ncs differ
diff --git a/_module/ncs/jw_deer_usd.ncs b/_module/ncs/jw_deer_usd.ncs
index 0d81d3d..d6a8777 100644
Binary files a/_module/ncs/jw_deer_usd.ncs and b/_module/ncs/jw_deer_usd.ncs differ
diff --git a/_module/ncs/jw_deformgard_sp.ncs b/_module/ncs/jw_deformgard_sp.ncs
index ddd7d4e..5cd9b1b 100644
Binary files a/_module/ncs/jw_deformgard_sp.ncs and b/_module/ncs/jw_deformgard_sp.ncs differ
diff --git a/_module/ncs/jw_disbeast_spaw.ncs b/_module/ncs/jw_disbeast_spaw.ncs
index 39f0b29..9d9173e 100644
Binary files a/_module/ncs/jw_disbeast_spaw.ncs and b/_module/ncs/jw_disbeast_spaw.ncs differ
diff --git a/_module/ncs/jw_dog_usd.ncs b/_module/ncs/jw_dog_usd.ncs
index eb9f2f2..b6526b5 100644
Binary files a/_module/ncs/jw_dog_usd.ncs and b/_module/ncs/jw_dog_usd.ncs differ
diff --git a/_module/ncs/jw_dogdoor_open.ncs b/_module/ncs/jw_dogdoor_open.ncs
index e8183a3..517de40 100644
Binary files a/_module/ncs/jw_dogdoor_open.ncs and b/_module/ncs/jw_dogdoor_open.ncs differ
diff --git a/_module/ncs/jw_dogdoor_usd.ncs b/_module/ncs/jw_dogdoor_usd.ncs
index b61be68..3522939 100644
Binary files a/_module/ncs/jw_dogdoor_usd.ncs and b/_module/ncs/jw_dogdoor_usd.ncs differ
diff --git a/_module/ncs/jw_doordummy_spa.ncs b/_module/ncs/jw_doordummy_spa.ncs
index 7acfe92..63d679a 100644
Binary files a/_module/ncs/jw_doordummy_spa.ncs and b/_module/ncs/jw_doordummy_spa.ncs differ
diff --git a/_module/ncs/jw_doordummy_usd.ncs b/_module/ncs/jw_doordummy_usd.ncs
index 5b084f1..987f6f5 100644
Binary files a/_module/ncs/jw_doordummy_usd.ncs and b/_module/ncs/jw_doordummy_usd.ncs differ
diff --git a/_module/ncs/jw_dopple_spawn.ncs b/_module/ncs/jw_dopple_spawn.ncs
index 2140f98..ba54309 100644
Binary files a/_module/ncs/jw_dopple_spawn.ncs and b/_module/ncs/jw_dopple_spawn.ncs differ
diff --git a/_module/ncs/jw_dopple_usd.ncs b/_module/ncs/jw_dopple_usd.ncs
index 0664285..4f92242 100644
Binary files a/_module/ncs/jw_dopple_usd.ncs and b/_module/ncs/jw_dopple_usd.ncs differ
diff --git a/_module/ncs/jw_drag_usd.ncs b/_module/ncs/jw_drag_usd.ncs
index 81ae9a1..41ff9ee 100644
Binary files a/_module/ncs/jw_drag_usd.ncs and b/_module/ncs/jw_drag_usd.ncs differ
diff --git a/_module/ncs/jw_dragon_spawn.ncs b/_module/ncs/jw_dragon_spawn.ncs
index 0392054..1a3094d 100644
Binary files a/_module/ncs/jw_dragon_spawn.ncs and b/_module/ncs/jw_dragon_spawn.ncs differ
diff --git a/_module/ncs/jw_dridvamp_sp.ncs b/_module/ncs/jw_dridvamp_sp.ncs
index 03e8933..c23c719 100644
Binary files a/_module/ncs/jw_dridvamp_sp.ncs and b/_module/ncs/jw_dridvamp_sp.ncs differ
diff --git a/_module/ncs/jw_dridvamp_usd.ncs b/_module/ncs/jw_dridvamp_usd.ncs
index a8b9862..c243d34 100644
Binary files a/_module/ncs/jw_dridvamp_usd.ncs and b/_module/ncs/jw_dridvamp_usd.ncs differ
diff --git a/_module/ncs/jw_drowboss_spaw.ncs b/_module/ncs/jw_drowboss_spaw.ncs
index 76ac87f..96a1661 100644
Binary files a/_module/ncs/jw_drowboss_spaw.ncs and b/_module/ncs/jw_drowboss_spaw.ncs differ
diff --git a/_module/ncs/jw_drowchief_usd.ncs b/_module/ncs/jw_drowchief_usd.ncs
index 12f8cd4..d7dfe5d 100644
Binary files a/_module/ncs/jw_drowchief_usd.ncs and b/_module/ncs/jw_drowchief_usd.ncs differ
diff --git a/_module/ncs/jw_drunk_usd.ncs b/_module/ncs/jw_drunk_usd.ncs
index 9d707e6..ddc3a74 100644
Binary files a/_module/ncs/jw_drunk_usd.ncs and b/_module/ncs/jw_drunk_usd.ncs differ
diff --git a/_module/ncs/jw_duergasla_usd.ncs b/_module/ncs/jw_duergasla_usd.ncs
index 8c06fc5..8064a4c 100644
Binary files a/_module/ncs/jw_duergasla_usd.ncs and b/_module/ncs/jw_duergasla_usd.ncs differ
diff --git a/_module/ncs/jw_erthb_spawn.ncs b/_module/ncs/jw_erthb_spawn.ncs
index d5e6ad8..5959251 100644
Binary files a/_module/ncs/jw_erthb_spawn.ncs and b/_module/ncs/jw_erthb_spawn.ncs differ
diff --git a/_module/ncs/jw_erthbetfog_a.ncs b/_module/ncs/jw_erthbetfog_a.ncs
index a6fcbea..46e69fb 100644
Binary files a/_module/ncs/jw_erthbetfog_a.ncs and b/_module/ncs/jw_erthbetfog_a.ncs differ
diff --git a/_module/ncs/jw_erthbt_sp.ncs b/_module/ncs/jw_erthbt_sp.ncs
index c87cd47..160ccc9 100644
Binary files a/_module/ncs/jw_erthbt_sp.ncs and b/_module/ncs/jw_erthbt_sp.ncs differ
diff --git a/_module/ncs/jw_firefun_spell.ncs b/_module/ncs/jw_firefun_spell.ncs
index 4c81705..a6d248c 100644
Binary files a/_module/ncs/jw_firefun_spell.ncs and b/_module/ncs/jw_firefun_spell.ncs differ
diff --git a/_module/ncs/jw_firemon_sp.ncs b/_module/ncs/jw_firemon_sp.ncs
index d265f40..7a77760 100644
Binary files a/_module/ncs/jw_firemon_sp.ncs and b/_module/ncs/jw_firemon_sp.ncs differ
diff --git a/_module/ncs/jw_firemonster_u.ncs b/_module/ncs/jw_firemonster_u.ncs
index 767c26c..a8b1f68 100644
Binary files a/_module/ncs/jw_firemonster_u.ncs and b/_module/ncs/jw_firemonster_u.ncs differ
diff --git a/_module/ncs/jw_gcubeaoe_ent.ncs b/_module/ncs/jw_gcubeaoe_ent.ncs
index 0c9cf06..c1da093 100644
Binary files a/_module/ncs/jw_gcubeaoe_ent.ncs and b/_module/ncs/jw_gcubeaoe_ent.ncs differ
diff --git a/_module/ncs/jw_gcubeaoe_hb.ncs b/_module/ncs/jw_gcubeaoe_hb.ncs
index 953e6d4..6214f14 100644
Binary files a/_module/ncs/jw_gcubeaoe_hb.ncs and b/_module/ncs/jw_gcubeaoe_hb.ncs differ
diff --git a/_module/ncs/jw_ghost_spawn.ncs b/_module/ncs/jw_ghost_spawn.ncs
index 9b77b51..667a53d 100644
Binary files a/_module/ncs/jw_ghost_spawn.ncs and b/_module/ncs/jw_ghost_spawn.ncs differ
diff --git a/_module/ncs/jw_ghoull_usd.ncs b/_module/ncs/jw_ghoull_usd.ncs
index c5c1060..a3be12e 100644
Binary files a/_module/ncs/jw_ghoull_usd.ncs and b/_module/ncs/jw_ghoull_usd.ncs differ
diff --git a/_module/ncs/jw_ghoulord_spaw.ncs b/_module/ncs/jw_ghoulord_spaw.ncs
index 76ac87f..96a1661 100644
Binary files a/_module/ncs/jw_ghoulord_spaw.ncs and b/_module/ncs/jw_ghoulord_spaw.ncs differ
diff --git a/_module/ncs/jw_girlvictm_usd.ncs b/_module/ncs/jw_girlvictm_usd.ncs
index e4ff340..1e02fbb 100644
Binary files a/_module/ncs/jw_girlvictm_usd.ncs and b/_module/ncs/jw_girlvictm_usd.ncs differ
diff --git a/_module/ncs/jw_gnoll1_spawn.ncs b/_module/ncs/jw_gnoll1_spawn.ncs
index 45263cf..316a718 100644
Binary files a/_module/ncs/jw_gnoll1_spawn.ncs and b/_module/ncs/jw_gnoll1_spawn.ncs differ
diff --git a/_module/ncs/jw_gnoll2_spawn.ncs b/_module/ncs/jw_gnoll2_spawn.ncs
index 5b33fa2..5ef6321 100644
Binary files a/_module/ncs/jw_gnoll2_spawn.ncs and b/_module/ncs/jw_gnoll2_spawn.ncs differ
diff --git a/_module/ncs/jw_gnollha_spawn.ncs b/_module/ncs/jw_gnollha_spawn.ncs
index 1be09b1..a1eceb1 100644
Binary files a/_module/ncs/jw_gnollha_spawn.ncs and b/_module/ncs/jw_gnollha_spawn.ncs differ
diff --git a/_module/ncs/jw_gobqueen_usd.ncs b/_module/ncs/jw_gobqueen_usd.ncs
index 6115ccd..f8c56bf 100644
Binary files a/_module/ncs/jw_gobqueen_usd.ncs and b/_module/ncs/jw_gobqueen_usd.ncs differ
diff --git a/_module/ncs/jw_gobwiz_usd.ncs b/_module/ncs/jw_gobwiz_usd.ncs
index dcf72da..9d4580d 100644
Binary files a/_module/ncs/jw_gobwiz_usd.ncs and b/_module/ncs/jw_gobwiz_usd.ncs differ
diff --git a/_module/ncs/jw_golem_spawn.ncs b/_module/ncs/jw_golem_spawn.ncs
index 244f263..ee26d4a 100644
Binary files a/_module/ncs/jw_golem_spawn.ncs and b/_module/ncs/jw_golem_spawn.ncs differ
diff --git a/_module/ncs/jw_golemn_spawn.ncs b/_module/ncs/jw_golemn_spawn.ncs
index cb529a6..ca543cb 100644
Binary files a/_module/ncs/jw_golemn_spawn.ncs and b/_module/ncs/jw_golemn_spawn.ncs differ
diff --git a/_module/ncs/jw_golemn_usd.ncs b/_module/ncs/jw_golemn_usd.ncs
index 46dfa21..ca688d5 100644
Binary files a/_module/ncs/jw_golemn_usd.ncs and b/_module/ncs/jw_golemn_usd.ncs differ
diff --git a/_module/ncs/jw_grell_usd.ncs b/_module/ncs/jw_grell_usd.ncs
index eeac6ca..d91d70d 100644
Binary files a/_module/ncs/jw_grell_usd.ncs and b/_module/ncs/jw_grell_usd.ncs differ
diff --git a/_module/ncs/jw_grove_hb.ncs b/_module/ncs/jw_grove_hb.ncs
index c5cc442..efef41b 100644
Binary files a/_module/ncs/jw_grove_hb.ncs and b/_module/ncs/jw_grove_hb.ncs differ
diff --git a/_module/ncs/jw_guard_spawn.ncs b/_module/ncs/jw_guard_spawn.ncs
index 46bbb0a..267ecb1 100644
Binary files a/_module/ncs/jw_guard_spawn.ncs and b/_module/ncs/jw_guard_spawn.ncs differ
diff --git a/_module/ncs/jw_guardskel_usd.ncs b/_module/ncs/jw_guardskel_usd.ncs
index e798d0b..46f5e1b 100644
Binary files a/_module/ncs/jw_guardskel_usd.ncs and b/_module/ncs/jw_guardskel_usd.ncs differ
diff --git a/_module/ncs/jw_half_fem_usd.ncs b/_module/ncs/jw_half_fem_usd.ncs
index 3c6bb73..8fda145 100644
Binary files a/_module/ncs/jw_half_fem_usd.ncs and b/_module/ncs/jw_half_fem_usd.ncs differ
diff --git a/_module/ncs/jw_half_mal_usd.ncs b/_module/ncs/jw_half_mal_usd.ncs
index 72c3a89..885a7c7 100644
Binary files a/_module/ncs/jw_half_mal_usd.ncs and b/_module/ncs/jw_half_mal_usd.ncs differ
diff --git a/_module/ncs/jw_halfbar_chc.ncs b/_module/ncs/jw_halfbar_chc.ncs
index 3ca5491..6c40af0 100644
Binary files a/_module/ncs/jw_halfbar_chc.ncs and b/_module/ncs/jw_halfbar_chc.ncs differ
diff --git a/_module/ncs/jw_halfling_con_.ncs b/_module/ncs/jw_halfling_con_.ncs
index 9a9c9fb..18c643c 100644
Binary files a/_module/ncs/jw_halfling_con_.ncs and b/_module/ncs/jw_halfling_con_.ncs differ
diff --git a/_module/ncs/jw_halfling_usd.ncs b/_module/ncs/jw_halfling_usd.ncs
index c5b2b06..09ff71d 100644
Binary files a/_module/ncs/jw_halfling_usd.ncs and b/_module/ncs/jw_halfling_usd.ncs differ
diff --git a/_module/ncs/jw_heal_damg_chn.ncs b/_module/ncs/jw_heal_damg_chn.ncs
index 1fd8f4e..9720c21 100644
Binary files a/_module/ncs/jw_heal_damg_chn.ncs and b/_module/ncs/jw_heal_damg_chn.ncs differ
diff --git a/_module/ncs/jw_hunter_spawn.ncs b/_module/ncs/jw_hunter_spawn.ncs
index 4ce5756..8ba1587 100644
Binary files a/_module/ncs/jw_hunter_spawn.ncs and b/_module/ncs/jw_hunter_spawn.ncs differ
diff --git a/_module/ncs/jw_hurt_object.ncs b/_module/ncs/jw_hurt_object.ncs
index 2129388..1ee5ca1 100644
Binary files a/_module/ncs/jw_hurt_object.ncs and b/_module/ncs/jw_hurt_object.ncs differ
diff --git a/_module/ncs/jw_icespider_usd.ncs b/_module/ncs/jw_icespider_usd.ncs
index 74dce0b..d75496d 100644
Binary files a/_module/ncs/jw_icespider_usd.ncs and b/_module/ncs/jw_icespider_usd.ncs differ
diff --git a/_module/ncs/jw_icy_ref_usd.ncs b/_module/ncs/jw_icy_ref_usd.ncs
index fa0bc8f..912a9f5 100644
Binary files a/_module/ncs/jw_icy_ref_usd.ncs and b/_module/ncs/jw_icy_ref_usd.ncs differ
diff --git a/_module/ncs/jw_innef_sp.ncs b/_module/ncs/jw_innef_sp.ncs
index 68cbe8b..7085eb9 100644
Binary files a/_module/ncs/jw_innef_sp.ncs and b/_module/ncs/jw_innef_sp.ncs differ
diff --git a/_module/ncs/jw_isclericdruid.ncs b/_module/ncs/jw_isclericdruid.ncs
index 4b33481..9568668 100644
Binary files a/_module/ncs/jw_isclericdruid.ncs and b/_module/ncs/jw_isclericdruid.ncs differ
diff --git a/_module/ncs/jw_jade_usd.ncs b/_module/ncs/jw_jade_usd.ncs
index 08b0953..60d01a7 100644
Binary files a/_module/ncs/jw_jade_usd.ncs and b/_module/ncs/jw_jade_usd.ncs differ
diff --git a/_module/ncs/jw_jeghri_spell.ncs b/_module/ncs/jw_jeghri_spell.ncs
index 3e08dc1..78870ba 100644
Binary files a/_module/ncs/jw_jeghri_spell.ncs and b/_module/ncs/jw_jeghri_spell.ncs differ
diff --git a/_module/ncs/jw_kalath_usd.ncs b/_module/ncs/jw_kalath_usd.ncs
index 7df549c..8bf7770 100644
Binary files a/_module/ncs/jw_kalath_usd.ncs and b/_module/ncs/jw_kalath_usd.ncs differ
diff --git a/_module/ncs/jw_kethoth_usd.ncs b/_module/ncs/jw_kethoth_usd.ncs
index 4b99dbd..0fc6625 100644
Binary files a/_module/ncs/jw_kethoth_usd.ncs and b/_module/ncs/jw_kethoth_usd.ncs differ
diff --git a/_module/ncs/jw_killer_usd.ncs b/_module/ncs/jw_killer_usd.ncs
index 7fbce0c..f2c8a27 100644
Binary files a/_module/ncs/jw_killer_usd.ncs and b/_module/ncs/jw_killer_usd.ncs differ
diff --git a/_module/ncs/jw_kobking_usd.ncs b/_module/ncs/jw_kobking_usd.ncs
index c407228..9ab2cb6 100644
Binary files a/_module/ncs/jw_kobking_usd.ncs and b/_module/ncs/jw_kobking_usd.ncs differ
diff --git a/_module/ncs/jw_lever_usd.ncs b/_module/ncs/jw_lever_usd.ncs
index 4909a36..55fd8ba 100644
Binary files a/_module/ncs/jw_lever_usd.ncs and b/_module/ncs/jw_lever_usd.ncs differ
diff --git a/_module/ncs/jw_lich_usd.ncs b/_module/ncs/jw_lich_usd.ncs
index 74141c6..bf750d3 100644
Binary files a/_module/ncs/jw_lich_usd.ncs and b/_module/ncs/jw_lich_usd.ncs differ
diff --git a/_module/ncs/jw_lighting_usd.ncs b/_module/ncs/jw_lighting_usd.ncs
index 1cb81e9..07958a0 100644
Binary files a/_module/ncs/jw_lighting_usd.ncs and b/_module/ncs/jw_lighting_usd.ncs differ
diff --git a/_module/ncs/jw_lion_spawn.ncs b/_module/ncs/jw_lion_spawn.ncs
index f7273d0..cf82007 100644
Binary files a/_module/ncs/jw_lion_spawn.ncs and b/_module/ncs/jw_lion_spawn.ncs differ
diff --git a/_module/ncs/jw_lion_usd.ncs b/_module/ncs/jw_lion_usd.ncs
index e3d96af..ecdba09 100644
Binary files a/_module/ncs/jw_lion_usd.ncs and b/_module/ncs/jw_lion_usd.ncs differ
diff --git a/_module/ncs/jw_lockdoor_open.ncs b/_module/ncs/jw_lockdoor_open.ncs
index dc878d4..ae0d5db 100644
Binary files a/_module/ncs/jw_lockdoor_open.ncs and b/_module/ncs/jw_lockdoor_open.ncs differ
diff --git a/_module/ncs/jw_lowcube_usd.ncs b/_module/ncs/jw_lowcube_usd.ncs
index 963f4ce..fb0ad9f 100644
Binary files a/_module/ncs/jw_lowcube_usd.ncs and b/_module/ncs/jw_lowcube_usd.ncs differ
diff --git a/_module/ncs/jw_lumberja_spaw.ncs b/_module/ncs/jw_lumberja_spaw.ncs
index e1526a7..bc434ce 100644
Binary files a/_module/ncs/jw_lumberja_spaw.ncs and b/_module/ncs/jw_lumberja_spaw.ncs differ
diff --git a/_module/ncs/jw_mimic_usd.ncs b/_module/ncs/jw_mimic_usd.ncs
index ddd0278..22be8b7 100644
Binary files a/_module/ncs/jw_mimic_usd.ncs and b/_module/ncs/jw_mimic_usd.ncs differ
diff --git a/_module/ncs/jw_mordsword_spn.ncs b/_module/ncs/jw_mordsword_spn.ncs
index 1017a98..f9357dc 100644
Binary files a/_module/ncs/jw_mordsword_spn.ncs and b/_module/ncs/jw_mordsword_spn.ncs differ
diff --git a/_module/ncs/jw_mummy_death.ncs b/_module/ncs/jw_mummy_death.ncs
index c611588..1e82a10 100644
Binary files a/_module/ncs/jw_mummy_death.ncs and b/_module/ncs/jw_mummy_death.ncs differ
diff --git a/_module/ncs/jw_mystra_open.ncs b/_module/ncs/jw_mystra_open.ncs
index 4f1ca72..678bc90 100644
Binary files a/_module/ncs/jw_mystra_open.ncs and b/_module/ncs/jw_mystra_open.ncs differ
diff --git a/_module/ncs/jw_neg_vortspawn.ncs b/_module/ncs/jw_neg_vortspawn.ncs
index cb8b6a7..83fe6ed 100644
Binary files a/_module/ncs/jw_neg_vortspawn.ncs and b/_module/ncs/jw_neg_vortspawn.ncs differ
diff --git a/_module/ncs/jw_negvortex_usd.ncs b/_module/ncs/jw_negvortex_usd.ncs
index fe89939..9c8fba4 100644
Binary files a/_module/ncs/jw_negvortex_usd.ncs and b/_module/ncs/jw_negvortex_usd.ncs differ
diff --git a/_module/ncs/jw_new_bguard_sp.ncs b/_module/ncs/jw_new_bguard_sp.ncs
index 3f7b815..ae824a0 100644
Binary files a/_module/ncs/jw_new_bguard_sp.ncs and b/_module/ncs/jw_new_bguard_sp.ncs differ
diff --git a/_module/ncs/jw_new_walk_wp.ncs b/_module/ncs/jw_new_walk_wp.ncs
index 9ce6e05..6fff583 100644
Binary files a/_module/ncs/jw_new_walk_wp.ncs and b/_module/ncs/jw_new_walk_wp.ncs differ
diff --git a/_module/ncs/jw_new_zen_def4.ncs b/_module/ncs/jw_new_zen_def4.ncs
index 5f7e852..de60c4e 100644
Binary files a/_module/ncs/jw_new_zen_def4.ncs and b/_module/ncs/jw_new_zen_def4.ncs differ
diff --git a/_module/ncs/jw_new_zen_def6.ncs b/_module/ncs/jw_new_zen_def6.ncs
index 83be386..e18e14c 100644
Binary files a/_module/ncs/jw_new_zen_def6.ncs and b/_module/ncs/jw_new_zen_def6.ncs differ
diff --git a/_module/ncs/jw_new_zen_def8.ncs b/_module/ncs/jw_new_zen_def8.ncs
index c2ef445..f9b13b0 100644
Binary files a/_module/ncs/jw_new_zen_def8.ncs and b/_module/ncs/jw_new_zen_def8.ncs differ
diff --git a/_module/ncs/jw_new_zen_hb.ncs b/_module/ncs/jw_new_zen_hb.ncs
index 13bd3b5..ef8a8b6 100644
Binary files a/_module/ncs/jw_new_zen_hb.ncs and b/_module/ncs/jw_new_zen_hb.ncs differ
diff --git a/_module/ncs/jw_new_zhpat_spa.ncs b/_module/ncs/jw_new_zhpat_spa.ncs
index 3c8c9e0..f382583 100644
Binary files a/_module/ncs/jw_new_zhpat_spa.ncs and b/_module/ncs/jw_new_zhpat_spa.ncs differ
diff --git a/_module/ncs/jw_newgaurd_usd.ncs b/_module/ncs/jw_newgaurd_usd.ncs
index 95a5287..366f416 100644
Binary files a/_module/ncs/jw_newgaurd_usd.ncs and b/_module/ncs/jw_newgaurd_usd.ncs differ
diff --git a/_module/ncs/jw_night_usd.ncs b/_module/ncs/jw_night_usd.ncs
index af8799e..063526d 100644
Binary files a/_module/ncs/jw_night_usd.ncs and b/_module/ncs/jw_night_usd.ncs differ
diff --git a/_module/ncs/jw_nighthag_usd.ncs b/_module/ncs/jw_nighthag_usd.ncs
index 6cee190..2a63225 100644
Binary files a/_module/ncs/jw_nighthag_usd.ncs and b/_module/ncs/jw_nighthag_usd.ncs differ
diff --git a/_module/ncs/jw_noxp_baldeath.ncs b/_module/ncs/jw_noxp_baldeath.ncs
index 06f56b7..30b29ec 100644
Binary files a/_module/ncs/jw_noxp_baldeath.ncs and b/_module/ncs/jw_noxp_baldeath.ncs differ
diff --git a/_module/ncs/jw_nun_gelc_usd.ncs b/_module/ncs/jw_nun_gelc_usd.ncs
index c9d80a1..3f3301a 100644
Binary files a/_module/ncs/jw_nun_gelc_usd.ncs and b/_module/ncs/jw_nun_gelc_usd.ncs differ
diff --git a/_module/ncs/jw_nun_mimc_onus.ncs b/_module/ncs/jw_nun_mimc_onus.ncs
index 57ab0c6..fb59225 100644
Binary files a/_module/ncs/jw_nun_mimc_onus.ncs and b/_module/ncs/jw_nun_mimc_onus.ncs differ
diff --git a/_module/ncs/jw_nun_wild_eff.ncs b/_module/ncs/jw_nun_wild_eff.ncs
index 51da954..e3da6cc 100644
Binary files a/_module/ncs/jw_nun_wild_eff.ncs and b/_module/ncs/jw_nun_wild_eff.ncs differ
diff --git a/_module/ncs/jw_ogregrds_usd.ncs b/_module/ncs/jw_ogregrds_usd.ncs
index 9db499a..bcd4e73 100644
Binary files a/_module/ncs/jw_ogregrds_usd.ncs and b/_module/ncs/jw_ogregrds_usd.ncs differ
diff --git a/_module/ncs/jw_olpara_usd.ncs b/_module/ncs/jw_olpara_usd.ncs
index 24e1ea5..52c865c 100644
Binary files a/_module/ncs/jw_olpara_usd.ncs and b/_module/ncs/jw_olpara_usd.ncs differ
diff --git a/_module/ncs/jw_orbwraith_sp.ncs b/_module/ncs/jw_orbwraith_sp.ncs
index f943ba9..1e9c54d 100644
Binary files a/_module/ncs/jw_orbwraith_sp.ncs and b/_module/ncs/jw_orbwraith_sp.ncs differ
diff --git a/_module/ncs/jw_orbwraith_usd.ncs b/_module/ncs/jw_orbwraith_usd.ncs
index 83a5af4..2557ae7 100644
Binary files a/_module/ncs/jw_orbwraith_usd.ncs and b/_module/ncs/jw_orbwraith_usd.ncs differ
diff --git a/_module/ncs/jw_outcast_usd.ncs b/_module/ncs/jw_outcast_usd.ncs
index 6e13bbd..61d1282 100644
Binary files a/_module/ncs/jw_outcast_usd.ncs and b/_module/ncs/jw_outcast_usd.ncs differ
diff --git a/_module/ncs/jw_panth_spawn.ncs b/_module/ncs/jw_panth_spawn.ncs
index 0d6e2cb..ce53395 100644
Binary files a/_module/ncs/jw_panth_spawn.ncs and b/_module/ncs/jw_panth_spawn.ncs differ
diff --git a/_module/ncs/jw_panth_usd.ncs b/_module/ncs/jw_panth_usd.ncs
index 19d861c..616f8f8 100644
Binary files a/_module/ncs/jw_panth_usd.ncs and b/_module/ncs/jw_panth_usd.ncs differ
diff --git a/_module/ncs/jw_parmold_ent.ncs b/_module/ncs/jw_parmold_ent.ncs
index b72e0e0..9691937 100644
Binary files a/_module/ncs/jw_parmold_ent.ncs and b/_module/ncs/jw_parmold_ent.ncs differ
diff --git a/_module/ncs/jw_parmold_hb.ncs b/_module/ncs/jw_parmold_hb.ncs
index 9530fa8..d7479d2 100644
Binary files a/_module/ncs/jw_parmold_hb.ncs and b/_module/ncs/jw_parmold_hb.ncs differ
diff --git a/_module/ncs/jw_phat_li_spn.ncs b/_module/ncs/jw_phat_li_spn.ncs
index a084123..48f1c01 100644
Binary files a/_module/ncs/jw_phat_li_spn.ncs and b/_module/ncs/jw_phat_li_spn.ncs differ
diff --git a/_module/ncs/jw_phat_palre_us.ncs b/_module/ncs/jw_phat_palre_us.ncs
index aee3df8..b50a49f 100644
Binary files a/_module/ncs/jw_phat_palre_us.ncs and b/_module/ncs/jw_phat_palre_us.ncs differ
diff --git a/_module/ncs/jw_phat_rav_sp.ncs b/_module/ncs/jw_phat_rav_sp.ncs
index d3abf2a..d926c00 100644
Binary files a/_module/ncs/jw_phat_rav_sp.ncs and b/_module/ncs/jw_phat_rav_sp.ncs differ
diff --git a/_module/ncs/jw_phat_spawn.ncs b/_module/ncs/jw_phat_spawn.ncs
index 9b3df61..eab5f80 100644
Binary files a/_module/ncs/jw_phat_spawn.ncs and b/_module/ncs/jw_phat_spawn.ncs differ
diff --git a/_module/ncs/jw_piukk_disturb.ncs b/_module/ncs/jw_piukk_disturb.ncs
index 8f1bf00..878db1a 100644
Binary files a/_module/ncs/jw_piukk_disturb.ncs and b/_module/ncs/jw_piukk_disturb.ncs differ
diff --git a/_module/ncs/jw_plant2_death.ncs b/_module/ncs/jw_plant2_death.ncs
index 036bdb3..ef97193 100644
Binary files a/_module/ncs/jw_plant2_death.ncs and b/_module/ncs/jw_plant2_death.ncs differ
diff --git a/_module/ncs/jw_plant_death.ncs b/_module/ncs/jw_plant_death.ncs
index 3e2d558..67f0c2d 100644
Binary files a/_module/ncs/jw_plant_death.ncs and b/_module/ncs/jw_plant_death.ncs differ
diff --git a/_module/ncs/jw_plant_spawn.ncs b/_module/ncs/jw_plant_spawn.ncs
index b913358..7df20b9 100644
Binary files a/_module/ncs/jw_plant_spawn.ncs and b/_module/ncs/jw_plant_spawn.ncs differ
diff --git a/_module/ncs/jw_plotdoor_open.ncs b/_module/ncs/jw_plotdoor_open.ncs
index 7d79c06..71bf497 100644
Binary files a/_module/ncs/jw_plotdoor_open.ncs and b/_module/ncs/jw_plotdoor_open.ncs differ
diff --git a/_module/ncs/jw_proto_lich_sp.ncs b/_module/ncs/jw_proto_lich_sp.ncs
index 45c5656..2bca10f 100644
Binary files a/_module/ncs/jw_proto_lich_sp.ncs and b/_module/ncs/jw_proto_lich_sp.ncs differ
diff --git a/_module/ncs/jw_quith_spawn.ncs b/_module/ncs/jw_quith_spawn.ncs
index ba32cfa..f2ab718 100644
Binary files a/_module/ncs/jw_quith_spawn.ncs and b/_module/ncs/jw_quith_spawn.ncs differ
diff --git a/_module/ncs/jw_quith_usd.ncs b/_module/ncs/jw_quith_usd.ncs
index dfef1fa..573d127 100644
Binary files a/_module/ncs/jw_quith_usd.ncs and b/_module/ncs/jw_quith_usd.ncs differ
diff --git a/_module/ncs/jw_rany_death.ncs b/_module/ncs/jw_rany_death.ncs
index 8bfd793..8b97706 100644
Binary files a/_module/ncs/jw_rany_death.ncs and b/_module/ncs/jw_rany_death.ncs differ
diff --git a/_module/ncs/jw_raven_spawn.ncs b/_module/ncs/jw_raven_spawn.ncs
index e0dc7ce..e244d6f 100644
Binary files a/_module/ncs/jw_raven_spawn.ncs and b/_module/ncs/jw_raven_spawn.ncs differ
diff --git a/_module/ncs/jw_raven_usd.ncs b/_module/ncs/jw_raven_usd.ncs
index ff75b98..dba2cb3 100644
Binary files a/_module/ncs/jw_raven_usd.ncs and b/_module/ncs/jw_raven_usd.ncs differ
diff --git a/_module/ncs/jw_rest_usd.ncs b/_module/ncs/jw_rest_usd.ncs
index fb8dd66..cea3fb6 100644
Binary files a/_module/ncs/jw_rest_usd.ncs and b/_module/ncs/jw_rest_usd.ncs differ
diff --git a/_module/ncs/jw_reswwp_usd.ncs b/_module/ncs/jw_reswwp_usd.ncs
index 833eca1..976f06d 100644
Binary files a/_module/ncs/jw_reswwp_usd.ncs and b/_module/ncs/jw_reswwp_usd.ncs differ
diff --git a/_module/ncs/jw_rog_spell.ncs b/_module/ncs/jw_rog_spell.ncs
index 9a16bfa..3b09323 100644
Binary files a/_module/ncs/jw_rog_spell.ncs and b/_module/ncs/jw_rog_spell.ncs differ
diff --git a/_module/ncs/jw_rogex_spn.ncs b/_module/ncs/jw_rogex_spn.ncs
index fe7fb41..64e9d11 100644
Binary files a/_module/ncs/jw_rogex_spn.ncs and b/_module/ncs/jw_rogex_spn.ncs differ
diff --git a/_module/ncs/jw_rogex_usd.ncs b/_module/ncs/jw_rogex_usd.ncs
index 19a5ff0..2f4f349 100644
Binary files a/_module/ncs/jw_rogex_usd.ncs and b/_module/ncs/jw_rogex_usd.ncs differ
diff --git a/_module/ncs/jw_rotflesh_usd.ncs b/_module/ncs/jw_rotflesh_usd.ncs
index a58daf8..3b93331 100644
Binary files a/_module/ncs/jw_rotflesh_usd.ncs and b/_module/ncs/jw_rotflesh_usd.ncs differ
diff --git a/_module/ncs/jw_sac_usd.ncs b/_module/ncs/jw_sac_usd.ncs
index 35d3960..f6c2a2b 100644
Binary files a/_module/ncs/jw_sac_usd.ncs and b/_module/ncs/jw_sac_usd.ncs differ
diff --git a/_module/ncs/jw_sembdun_usd.ncs b/_module/ncs/jw_sembdun_usd.ncs
index 2d6803b..a65d899 100644
Binary files a/_module/ncs/jw_sembdun_usd.ncs and b/_module/ncs/jw_sembdun_usd.ncs differ
diff --git a/_module/ncs/jw_shade_usd.ncs b/_module/ncs/jw_shade_usd.ncs
index c54d246..168dcf5 100644
Binary files a/_module/ncs/jw_shade_usd.ncs and b/_module/ncs/jw_shade_usd.ncs differ
diff --git a/_module/ncs/jw_shocker_spawm.ncs b/_module/ncs/jw_shocker_spawm.ncs
index 0e5a773..a722237 100644
Binary files a/_module/ncs/jw_shocker_spawm.ncs and b/_module/ncs/jw_shocker_spawm.ncs differ
diff --git a/_module/ncs/jw_shocker_usd.ncs b/_module/ncs/jw_shocker_usd.ncs
index bb4f8f2..48da19d 100644
Binary files a/_module/ncs/jw_shocker_usd.ncs and b/_module/ncs/jw_shocker_usd.ncs differ
diff --git a/_module/ncs/jw_si_gard_soul_.ncs b/_module/ncs/jw_si_gard_soul_.ncs
index 93df784..f3d8d51 100644
Binary files a/_module/ncs/jw_si_gard_soul_.ncs and b/_module/ncs/jw_si_gard_soul_.ncs differ
diff --git a/_module/ncs/jw_skel_spawn.ncs b/_module/ncs/jw_skel_spawn.ncs
index 1d26306..20cd4b4 100644
Binary files a/_module/ncs/jw_skel_spawn.ncs and b/_module/ncs/jw_skel_spawn.ncs differ
diff --git a/_module/ncs/jw_slasrath_us.ncs b/_module/ncs/jw_slasrath_us.ncs
index 59a661f..f288d4d 100644
Binary files a/_module/ncs/jw_slasrath_us.ncs and b/_module/ncs/jw_slasrath_us.ncs differ
diff --git a/_module/ncs/jw_smith_enter.ncs b/_module/ncs/jw_smith_enter.ncs
index 9655af6..f91298f 100644
Binary files a/_module/ncs/jw_smith_enter.ncs and b/_module/ncs/jw_smith_enter.ncs differ
diff --git a/_module/ncs/jw_smith_usd.ncs b/_module/ncs/jw_smith_usd.ncs
index 83d5963..6f65da9 100644
Binary files a/_module/ncs/jw_smith_usd.ncs and b/_module/ncs/jw_smith_usd.ncs differ
diff --git a/_module/ncs/jw_snivmin_usd.ncs b/_module/ncs/jw_snivmin_usd.ncs
index ac42d46..0886d80 100644
Binary files a/_module/ncs/jw_snivmin_usd.ncs and b/_module/ncs/jw_snivmin_usd.ncs differ
diff --git a/_module/ncs/jw_snwiusd_stlth.ncs b/_module/ncs/jw_snwiusd_stlth.ncs
index 6ff5be0..5bb9cd0 100644
Binary files a/_module/ncs/jw_snwiusd_stlth.ncs and b/_module/ncs/jw_snwiusd_stlth.ncs differ
diff --git a/_module/ncs/jw_sonbird_usd.ncs b/_module/ncs/jw_sonbird_usd.ncs
index 8bfd793..8e9f164 100644
Binary files a/_module/ncs/jw_sonbird_usd.ncs and b/_module/ncs/jw_sonbird_usd.ncs differ
diff --git a/_module/ncs/jw_song_urn_usd.ncs b/_module/ncs/jw_song_urn_usd.ncs
index 49ac36c..8f96050 100644
Binary files a/_module/ncs/jw_song_urn_usd.ncs and b/_module/ncs/jw_song_urn_usd.ncs differ
diff --git a/_module/ncs/jw_sp_wildamnotr.ncs b/_module/ncs/jw_sp_wildamnotr.ncs
index 9ed7781..21aa914 100644
Binary files a/_module/ncs/jw_sp_wildamnotr.ncs and b/_module/ncs/jw_sp_wildamnotr.ncs differ
diff --git a/_module/ncs/jw_spawn_chourm.ncs b/_module/ncs/jw_spawn_chourm.ncs
index fd172b5..d991a10 100644
Binary files a/_module/ncs/jw_spawn_chourm.ncs and b/_module/ncs/jw_spawn_chourm.ncs differ
diff --git a/_module/ncs/jw_spawn_notreas.ncs b/_module/ncs/jw_spawn_notreas.ncs
index 2f95b05..22ef351 100644
Binary files a/_module/ncs/jw_spawn_notreas.ncs and b/_module/ncs/jw_spawn_notreas.ncs differ
diff --git a/_module/ncs/jw_spawn_notrsxp.ncs b/_module/ncs/jw_spawn_notrsxp.ncs
index ecf5bec..d157630 100644
Binary files a/_module/ncs/jw_spawn_notrsxp.ncs and b/_module/ncs/jw_spawn_notrsxp.ncs differ
diff --git a/_module/ncs/jw_spawn_trapped.ncs b/_module/ncs/jw_spawn_trapped.ncs
index a1d0c61..1f99078 100644
Binary files a/_module/ncs/jw_spawn_trapped.ncs and b/_module/ncs/jw_spawn_trapped.ncs differ
diff --git a/_module/ncs/jw_spawnwirun_wp.ncs b/_module/ncs/jw_spawnwirun_wp.ncs
index 58d8af5..0e9e43c 100644
Binary files a/_module/ncs/jw_spawnwirun_wp.ncs and b/_module/ncs/jw_spawnwirun_wp.ncs differ
diff --git a/_module/ncs/jw_spawnwiusd.ncs b/_module/ncs/jw_spawnwiusd.ncs
index 204eea6..d369053 100644
Binary files a/_module/ncs/jw_spawnwiusd.ncs and b/_module/ncs/jw_spawnwiusd.ncs differ
diff --git a/_module/ncs/jw_spiderstn_spn.ncs b/_module/ncs/jw_spiderstn_spn.ncs
index eed255f..0ab871d 100644
Binary files a/_module/ncs/jw_spiderstn_spn.ncs and b/_module/ncs/jw_spiderstn_spn.ncs differ
diff --git a/_module/ncs/jw_spn_wi_wingbl.ncs b/_module/ncs/jw_spn_wi_wingbl.ncs
index a4dc23d..a44fe6f 100644
Binary files a/_module/ncs/jw_spn_wi_wingbl.ncs and b/_module/ncs/jw_spn_wi_wingbl.ncs differ
diff --git a/_module/ncs/jw_spwn_notenc.ncs b/_module/ncs/jw_spwn_notenc.ncs
index 1010f22..9d73a45 100644
Binary files a/_module/ncs/jw_spwn_notenc.ncs and b/_module/ncs/jw_spwn_notenc.ncs differ
diff --git a/_module/ncs/jw_stonef_spawn.ncs b/_module/ncs/jw_stonef_spawn.ncs
index 79a02e1..50c15fe 100644
Binary files a/_module/ncs/jw_stonef_spawn.ncs and b/_module/ncs/jw_stonef_spawn.ncs differ
diff --git a/_module/ncs/jw_stonef_usd.ncs b/_module/ncs/jw_stonef_usd.ncs
index 5a7a751..c3f92fd 100644
Binary files a/_module/ncs/jw_stonef_usd.ncs and b/_module/ncs/jw_stonef_usd.ncs differ
diff --git a/_module/ncs/jw_taghen_usd.ncs b/_module/ncs/jw_taghen_usd.ncs
index a16bf4a..a916161 100644
Binary files a/_module/ncs/jw_taghen_usd.ncs and b/_module/ncs/jw_taghen_usd.ncs differ
diff --git a/_module/ncs/jw_talindra_spaw.ncs b/_module/ncs/jw_talindra_spaw.ncs
index 04cc40a..34808ba 100644
Binary files a/_module/ncs/jw_talindra_spaw.ncs and b/_module/ncs/jw_talindra_spaw.ncs differ
diff --git a/_module/ncs/jw_talindra_usd.ncs b/_module/ncs/jw_talindra_usd.ncs
index 63e0efc..6b3f695 100644
Binary files a/_module/ncs/jw_talindra_usd.ncs and b/_module/ncs/jw_talindra_usd.ncs differ
diff --git a/_module/ncs/jw_testreasure_s.ncs b/_module/ncs/jw_testreasure_s.ncs
index 8aac012..16ca279 100644
Binary files a/_module/ncs/jw_testreasure_s.ncs and b/_module/ncs/jw_testreasure_s.ncs differ
diff --git a/_module/ncs/jw_thief_usd.ncs b/_module/ncs/jw_thief_usd.ncs
index 6d1e7cc..d81d36c 100644
Binary files a/_module/ncs/jw_thief_usd.ncs and b/_module/ncs/jw_thief_usd.ncs differ
diff --git a/_module/ncs/jw_timber_usd.ncs b/_module/ncs/jw_timber_usd.ncs
index c8f77ee..685341d 100644
Binary files a/_module/ncs/jw_timber_usd.ncs and b/_module/ncs/jw_timber_usd.ncs differ
diff --git a/_module/ncs/jw_tort_spawn.ncs b/_module/ncs/jw_tort_spawn.ncs
index 5340c60..be980f9 100644
Binary files a/_module/ncs/jw_tort_spawn.ncs and b/_module/ncs/jw_tort_spawn.ncs differ
diff --git a/_module/ncs/jw_transpa_spawn.ncs b/_module/ncs/jw_transpa_spawn.ncs
index 8080a80..88f6e43 100644
Binary files a/_module/ncs/jw_transpa_spawn.ncs and b/_module/ncs/jw_transpa_spawn.ncs differ
diff --git a/_module/ncs/jw_troll_spawn.ncs b/_module/ncs/jw_troll_spawn.ncs
index e5537cd..6b55a35 100644
Binary files a/_module/ncs/jw_troll_spawn.ncs and b/_module/ncs/jw_troll_spawn.ncs differ
diff --git a/_module/ncs/jw_trollund_spaw.ncs b/_module/ncs/jw_trollund_spaw.ncs
index 8aac012..31fc337 100644
Binary files a/_module/ncs/jw_trollund_spaw.ncs and b/_module/ncs/jw_trollund_spaw.ncs differ
diff --git a/_module/ncs/jw_undgon_spawn.ncs b/_module/ncs/jw_undgon_spawn.ncs
index eaf1100..aa893a2 100644
Binary files a/_module/ncs/jw_undgon_spawn.ncs and b/_module/ncs/jw_undgon_spawn.ncs differ
diff --git a/_module/ncs/jw_undgon_usd.ncs b/_module/ncs/jw_undgon_usd.ncs
index 3185bef..d948bbf 100644
Binary files a/_module/ncs/jw_undgon_usd.ncs and b/_module/ncs/jw_undgon_usd.ncs differ
diff --git a/_module/ncs/jw_unlocdoor_ope.ncs b/_module/ncs/jw_unlocdoor_ope.ncs
index 2ccd1c3..8f192ad 100644
Binary files a/_module/ncs/jw_unlocdoor_ope.ncs and b/_module/ncs/jw_unlocdoor_ope.ncs differ
diff --git a/_module/ncs/jw_unlockedr_ope.ncs b/_module/ncs/jw_unlockedr_ope.ncs
index de28708..871178c 100644
Binary files a/_module/ncs/jw_unlockedr_ope.ncs and b/_module/ncs/jw_unlockedr_ope.ncs differ
diff --git a/_module/ncs/jw_vlasiks_spawn.ncs b/_module/ncs/jw_vlasiks_spawn.ncs
index 77a2e8a..8129a09 100644
Binary files a/_module/ncs/jw_vlasiks_spawn.ncs and b/_module/ncs/jw_vlasiks_spawn.ncs differ
diff --git a/_module/ncs/jw_vlasiks_usd.ncs b/_module/ncs/jw_vlasiks_usd.ncs
index f3f71ea..7922483 100644
Binary files a/_module/ncs/jw_vlasiks_usd.ncs and b/_module/ncs/jw_vlasiks_usd.ncs differ
diff --git a/_module/ncs/jw_werewolf_usd.ncs b/_module/ncs/jw_werewolf_usd.ncs
index 7b83274..1f45e54 100644
Binary files a/_module/ncs/jw_werewolf_usd.ncs and b/_module/ncs/jw_werewolf_usd.ncs differ
diff --git a/_module/ncs/jw_wilberf_spawn.ncs b/_module/ncs/jw_wilberf_spawn.ncs
index ff05e71..398feba 100644
Binary files a/_module/ncs/jw_wilberf_spawn.ncs and b/_module/ncs/jw_wilberf_spawn.ncs differ
diff --git a/_module/ncs/jw_wilberfor_usd.ncs b/_module/ncs/jw_wilberfor_usd.ncs
index e3db625..3d5c7e4 100644
Binary files a/_module/ncs/jw_wilberfor_usd.ncs and b/_module/ncs/jw_wilberfor_usd.ncs differ
diff --git a/_module/ncs/jw_woodelf_usd.ncs b/_module/ncs/jw_woodelf_usd.ncs
index 902e317..c21f261 100644
Binary files a/_module/ncs/jw_woodelf_usd.ncs and b/_module/ncs/jw_woodelf_usd.ncs differ
diff --git a/_module/ncs/jw_wulgar_spawn.ncs b/_module/ncs/jw_wulgar_spawn.ncs
index 4d67618..acc7651 100644
Binary files a/_module/ncs/jw_wulgar_spawn.ncs and b/_module/ncs/jw_wulgar_spawn.ncs differ
diff --git a/_module/ncs/jw_wulgar_usd.ncs b/_module/ncs/jw_wulgar_usd.ncs
index 9b5b2c2..f72e4a0 100644
Binary files a/_module/ncs/jw_wulgar_usd.ncs and b/_module/ncs/jw_wulgar_usd.ncs differ
diff --git a/_module/ncs/jw_x2_im_pol_mod.ncs b/_module/ncs/jw_x2_im_pol_mod.ncs
index 8c0b54c..a7ed559 100644
Binary files a/_module/ncs/jw_x2_im_pol_mod.ncs and b/_module/ncs/jw_x2_im_pol_mod.ncs differ
diff --git a/_module/ncs/jw_yak_usd.ncs b/_module/ncs/jw_yak_usd.ncs
index a4bdf99..0baa445 100644
Binary files a/_module/ncs/jw_yak_usd.ncs and b/_module/ncs/jw_yak_usd.ncs differ
diff --git a/_module/ncs/jw_zen_fairy_sp.ncs b/_module/ncs/jw_zen_fairy_sp.ncs
index 2ce1855..a88078b 100644
Binary files a/_module/ncs/jw_zen_fairy_sp.ncs and b/_module/ncs/jw_zen_fairy_sp.ncs differ
diff --git a/_module/ncs/jw_zen_fairy_usd.ncs b/_module/ncs/jw_zen_fairy_usd.ncs
index 08bacfb..c638dd1 100644
Binary files a/_module/ncs/jw_zen_fairy_usd.ncs and b/_module/ncs/jw_zen_fairy_usd.ncs differ
diff --git a/_module/ncs/jw_zen_magin_usd.ncs b/_module/ncs/jw_zen_magin_usd.ncs
index 20876f3..bc8df12 100644
Binary files a/_module/ncs/jw_zen_magin_usd.ncs and b/_module/ncs/jw_zen_magin_usd.ncs differ
diff --git a/_module/ncs/jw_zhent3_spawn.ncs b/_module/ncs/jw_zhent3_spawn.ncs
index 7c0815e..66281cc 100644
Binary files a/_module/ncs/jw_zhent3_spawn.ncs and b/_module/ncs/jw_zhent3_spawn.ncs differ
diff --git a/_module/ncs/jw_zhent3_usd.ncs b/_module/ncs/jw_zhent3_usd.ncs
index 435da68..a8714b7 100644
Binary files a/_module/ncs/jw_zhent3_usd.ncs and b/_module/ncs/jw_zhent3_usd.ncs differ
diff --git a/_module/ncs/jw_zhent_pat_cbe.ncs b/_module/ncs/jw_zhent_pat_cbe.ncs
index f888134..76ada18 100644
Binary files a/_module/ncs/jw_zhent_pat_cbe.ncs and b/_module/ncs/jw_zhent_pat_cbe.ncs differ
diff --git a/_module/ncs/jw_zhentdun_usd.ncs b/_module/ncs/jw_zhentdun_usd.ncs
index 56eaaa8..f33fc81 100644
Binary files a/_module/ncs/jw_zhentdun_usd.ncs and b/_module/ncs/jw_zhentdun_usd.ncs differ
diff --git a/_module/ncs/jw_zhentins_usd.ncs b/_module/ncs/jw_zhentins_usd.ncs
index caf5429..6c632b5 100644
Binary files a/_module/ncs/jw_zhentins_usd.ncs and b/_module/ncs/jw_zhentins_usd.ncs differ
diff --git a/_module/ncs/jw_zhmach_dam.ncs b/_module/ncs/jw_zhmach_dam.ncs
index c1e237f..325c38e 100644
Binary files a/_module/ncs/jw_zhmach_dam.ncs and b/_module/ncs/jw_zhmach_dam.ncs differ
diff --git a/_module/ncs/jw_zhtsftfem_usd.ncs b/_module/ncs/jw_zhtsftfem_usd.ncs
index 08e742a..515bfff 100644
Binary files a/_module/ncs/jw_zhtsftfem_usd.ncs and b/_module/ncs/jw_zhtsftfem_usd.ncs differ
diff --git a/_module/ncs/jw_zomblord_usd.ncs b/_module/ncs/jw_zomblord_usd.ncs
index 7b63e9e..7c600cc 100644
Binary files a/_module/ncs/jw_zomblord_usd.ncs and b/_module/ncs/jw_zomblord_usd.ncs differ
diff --git a/_module/ncs/jw_zovut_usd.ncs b/_module/ncs/jw_zovut_usd.ncs
index d0233ef..fb17e11 100644
Binary files a/_module/ncs/jw_zovut_usd.ncs and b/_module/ncs/jw_zovut_usd.ncs differ
diff --git a/_module/ncs/lumberjack_usd.ncs b/_module/ncs/lumberjack_usd.ncs
index 3c4f019..6109a5e 100644
Binary files a/_module/ncs/lumberjack_usd.ncs and b/_module/ncs/lumberjack_usd.ncs differ
diff --git a/_module/ncs/mod_activate.ncs b/_module/ncs/mod_activate.ncs
index 2df3c9c..412179d 100644
Binary files a/_module/ncs/mod_activate.ncs and b/_module/ncs/mod_activate.ncs differ
diff --git a/_module/ncs/mod_resting.ncs b/_module/ncs/mod_resting.ncs
index 399e6e7..38ee819 100644
Binary files a/_module/ncs/mod_resting.ncs and b/_module/ncs/mod_resting.ncs differ
diff --git a/_module/ncs/mouther_spawn.ncs b/_module/ncs/mouther_spawn.ncs
index 613b536..76210de 100644
Binary files a/_module/ncs/mouther_spawn.ncs and b/_module/ncs/mouther_spawn.ncs differ
diff --git a/_module/ncs/nk_doorcloselock.ncs b/_module/ncs/nk_doorcloselock.ncs
index 0749600..7269510 100644
Binary files a/_module/ncs/nk_doorcloselock.ncs and b/_module/ncs/nk_doorcloselock.ncs differ
diff --git a/_module/ncs/nk_drcloselck240.ncs b/_module/ncs/nk_drcloselck240.ncs
index 54f68d1..096fc08 100644
Binary files a/_module/ncs/nk_drcloselck240.ncs and b/_module/ncs/nk_drcloselck240.ncs differ
diff --git a/_module/ncs/nk_fp_balordeath.ncs b/_module/ncs/nk_fp_balordeath.ncs
index a9ec03a..b32d99e 100644
Binary files a/_module/ncs/nk_fp_balordeath.ncs and b/_module/ncs/nk_fp_balordeath.ncs differ
diff --git a/_module/ncs/nk_fp_yt_death.ncs b/_module/ncs/nk_fp_yt_death.ncs
index 2d3e0df..3fd476c 100644
Binary files a/_module/ncs/nk_fp_yt_death.ncs and b/_module/ncs/nk_fp_yt_death.ncs differ
diff --git a/_module/ncs/nk_loot_gobbo.ncs b/_module/ncs/nk_loot_gobbo.ncs
index 9eec404..8ba8bca 100644
Binary files a/_module/ncs/nk_loot_gobbo.ncs and b/_module/ncs/nk_loot_gobbo.ncs differ
diff --git a/_module/ncs/nw_c2_default1.ncs b/_module/ncs/nw_c2_default1.ncs
index 72932d5..dc0e3ed 100644
Binary files a/_module/ncs/nw_c2_default1.ncs and b/_module/ncs/nw_c2_default1.ncs differ
diff --git a/_module/ncs/nw_c2_default2.ncs b/_module/ncs/nw_c2_default2.ncs
index 1f85a2e..72e80d0 100644
Binary files a/_module/ncs/nw_c2_default2.ncs and b/_module/ncs/nw_c2_default2.ncs differ
diff --git a/_module/ncs/nw_c2_default4.ncs b/_module/ncs/nw_c2_default4.ncs
index 770fedb..ab01559 100644
Binary files a/_module/ncs/nw_c2_default4.ncs and b/_module/ncs/nw_c2_default4.ncs differ
diff --git a/_module/ncs/nw_c2_default5.ncs b/_module/ncs/nw_c2_default5.ncs
index cbc086d..d3dc9ba 100644
Binary files a/_module/ncs/nw_c2_default5.ncs and b/_module/ncs/nw_c2_default5.ncs differ
diff --git a/_module/ncs/nw_c2_default6.ncs b/_module/ncs/nw_c2_default6.ncs
index d709e0c..022b167 100644
Binary files a/_module/ncs/nw_c2_default6.ncs and b/_module/ncs/nw_c2_default6.ncs differ
diff --git a/_module/ncs/nw_c2_defaultb.ncs b/_module/ncs/nw_c2_defaultb.ncs
index 45a6854..f81d7b3 100644
Binary files a/_module/ncs/nw_c2_defaultb.ncs and b/_module/ncs/nw_c2_defaultb.ncs differ
diff --git a/_module/ncs/nw_c2_dimdoor.ncs b/_module/ncs/nw_c2_dimdoor.ncs
index a2f22eb..82e6798 100644
Binary files a/_module/ncs/nw_c2_dimdoor.ncs and b/_module/ncs/nw_c2_dimdoor.ncs differ
diff --git a/_module/ncs/nw_c2_dropin9.ncs b/_module/ncs/nw_c2_dropin9.ncs
index 9dda7e1..948bb63 100644
Binary files a/_module/ncs/nw_c2_dropin9.ncs and b/_module/ncs/nw_c2_dropin9.ncs differ
diff --git a/_module/ncs/nw_c2_lycan_9.ncs b/_module/ncs/nw_c2_lycan_9.ncs
index 59c956e..edecb48 100644
Binary files a/_module/ncs/nw_c2_lycan_9.ncs and b/_module/ncs/nw_c2_lycan_9.ncs differ
diff --git a/_module/ncs/nw_o2_classhig.ncs b/_module/ncs/nw_o2_classhig.ncs
index 7666382..8897d63 100644
Binary files a/_module/ncs/nw_o2_classhig.ncs and b/_module/ncs/nw_o2_classhig.ncs differ
diff --git a/_module/ncs/nw_o2_classlow.ncs b/_module/ncs/nw_o2_classlow.ncs
index 1bf5386..8846bee 100644
Binary files a/_module/ncs/nw_o2_classlow.ncs and b/_module/ncs/nw_o2_classlow.ncs differ
diff --git a/_module/ncs/nw_o2_classmed.ncs b/_module/ncs/nw_o2_classmed.ncs
index fb0107d..2d23e2d 100644
Binary files a/_module/ncs/nw_o2_classmed.ncs and b/_module/ncs/nw_o2_classmed.ncs differ
diff --git a/_module/ncs/nw_o2_coninclude.ncs b/_module/ncs/nw_o2_coninclude.ncs
deleted file mode 100644
index ecb1c72..0000000
Binary files a/_module/ncs/nw_o2_coninclude.ncs and /dev/null differ
diff --git a/_module/ncs/nw_o2_generalhig.ncs b/_module/ncs/nw_o2_generalhig.ncs
index 9b50353..22cbc68 100644
Binary files a/_module/ncs/nw_o2_generalhig.ncs and b/_module/ncs/nw_o2_generalhig.ncs differ
diff --git a/_module/ncs/nw_o2_generallow.ncs b/_module/ncs/nw_o2_generallow.ncs
index 1f8db5d..7be814c 100644
Binary files a/_module/ncs/nw_o2_generallow.ncs and b/_module/ncs/nw_o2_generallow.ncs differ
diff --git a/_module/ncs/nw_o2_generalmed.ncs b/_module/ncs/nw_o2_generalmed.ncs
index 09d0ced..d4d0d19 100644
Binary files a/_module/ncs/nw_o2_generalmed.ncs and b/_module/ncs/nw_o2_generalmed.ncs differ
diff --git a/_module/ncs/nw_o2_generalmid.ncs b/_module/ncs/nw_o2_generalmid.ncs
index fb0107d..2d23e2d 100644
Binary files a/_module/ncs/nw_o2_generalmid.ncs and b/_module/ncs/nw_o2_generalmid.ncs differ
diff --git a/_module/ncs/nw_s1_aurablnda.ncs b/_module/ncs/nw_s1_aurablnda.ncs
deleted file mode 100644
index 376b84a..0000000
Binary files a/_module/ncs/nw_s1_aurablnda.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_auramenca.ncs b/_module/ncs/nw_s1_auramenca.ncs
deleted file mode 100644
index ed889d3..0000000
Binary files a/_module/ncs/nw_s1_auramenca.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_auraprota.ncs b/_module/ncs/nw_s1_auraprota.ncs
deleted file mode 100644
index 468539b..0000000
Binary files a/_module/ncs/nw_s1_auraprota.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_aurastuna.ncs b/_module/ncs/nw_s1_aurastuna.ncs
deleted file mode 100644
index 279ae96..0000000
Binary files a/_module/ncs/nw_s1_aurastuna.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_auraunata.ncs b/_module/ncs/nw_s1_auraunata.ncs
deleted file mode 100644
index adac269..0000000
Binary files a/_module/ncs/nw_s1_auraunata.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_aurauneaa.ncs b/_module/ncs/nw_s1_aurauneaa.ncs
deleted file mode 100644
index f2ae337..0000000
Binary files a/_module/ncs/nw_s1_aurauneaa.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_bltcharm.ncs b/_module/ncs/nw_s1_bltcharm.ncs
deleted file mode 100644
index 60db2a7..0000000
Binary files a/_module/ncs/nw_s1_bltcharm.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_bltcold.ncs b/_module/ncs/nw_s1_bltcold.ncs
deleted file mode 100644
index 373a803..0000000
Binary files a/_module/ncs/nw_s1_bltcold.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_bltconf.ncs b/_module/ncs/nw_s1_bltconf.ncs
deleted file mode 100644
index 914f4a1..0000000
Binary files a/_module/ncs/nw_s1_bltconf.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_bltdaze.ncs b/_module/ncs/nw_s1_bltdaze.ncs
deleted file mode 100644
index 708985f..0000000
Binary files a/_module/ncs/nw_s1_bltdaze.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_bltdeath.ncs b/_module/ncs/nw_s1_bltdeath.ncs
deleted file mode 100644
index c1ecd7d..0000000
Binary files a/_module/ncs/nw_s1_bltdeath.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_bltdexdr.ncs b/_module/ncs/nw_s1_bltdexdr.ncs
deleted file mode 100644
index ecc2983..0000000
Binary files a/_module/ncs/nw_s1_bltdexdr.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_bltdisese.ncs b/_module/ncs/nw_s1_bltdisese.ncs
deleted file mode 100644
index 8580d05..0000000
Binary files a/_module/ncs/nw_s1_bltdisese.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_bltdomn.ncs b/_module/ncs/nw_s1_bltdomn.ncs
deleted file mode 100644
index ab8a4be..0000000
Binary files a/_module/ncs/nw_s1_bltdomn.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_bltfire.ncs b/_module/ncs/nw_s1_bltfire.ncs
deleted file mode 100644
index cf13fea..0000000
Binary files a/_module/ncs/nw_s1_bltfire.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_bltknckd.ncs b/_module/ncs/nw_s1_bltknckd.ncs
deleted file mode 100644
index 5c09819..0000000
Binary files a/_module/ncs/nw_s1_bltknckd.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_bltlightn.ncs b/_module/ncs/nw_s1_bltlightn.ncs
deleted file mode 100644
index 9315527..0000000
Binary files a/_module/ncs/nw_s1_bltlightn.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_bltlvldr.ncs b/_module/ncs/nw_s1_bltlvldr.ncs
deleted file mode 100644
index 7f6d6ea..0000000
Binary files a/_module/ncs/nw_s1_bltlvldr.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_bltparal.ncs b/_module/ncs/nw_s1_bltparal.ncs
deleted file mode 100644
index 352beb7..0000000
Binary files a/_module/ncs/nw_s1_bltparal.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_bltpoison.ncs b/_module/ncs/nw_s1_bltpoison.ncs
deleted file mode 100644
index d7368cb..0000000
Binary files a/_module/ncs/nw_s1_bltpoison.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_bltshards.ncs b/_module/ncs/nw_s1_bltshards.ncs
deleted file mode 100644
index b260bb7..0000000
Binary files a/_module/ncs/nw_s1_bltshards.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_bltstrdr.ncs b/_module/ncs/nw_s1_bltstrdr.ncs
deleted file mode 100644
index 7ecf22e..0000000
Binary files a/_module/ncs/nw_s1_bltstrdr.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_bltstun.ncs b/_module/ncs/nw_s1_bltstun.ncs
deleted file mode 100644
index 0b8993e..0000000
Binary files a/_module/ncs/nw_s1_bltstun.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_bltweb.ncs b/_module/ncs/nw_s1_bltweb.ncs
deleted file mode 100644
index 25d622a..0000000
Binary files a/_module/ncs/nw_s1_bltweb.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_bltwisdr.ncs b/_module/ncs/nw_s1_bltwisdr.ncs
deleted file mode 100644
index f357cf1..0000000
Binary files a/_module/ncs/nw_s1_bltwisdr.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_coneacid.ncs b/_module/ncs/nw_s1_coneacid.ncs
deleted file mode 100644
index a45c965..0000000
Binary files a/_module/ncs/nw_s1_coneacid.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_conecold.ncs b/_module/ncs/nw_s1_conecold.ncs
deleted file mode 100644
index 92fe7a8..0000000
Binary files a/_module/ncs/nw_s1_conecold.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_conedisea.ncs b/_module/ncs/nw_s1_conedisea.ncs
deleted file mode 100644
index d778580..0000000
Binary files a/_module/ncs/nw_s1_conedisea.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_coneelec.ncs b/_module/ncs/nw_s1_coneelec.ncs
deleted file mode 100644
index 1aa6e0f..0000000
Binary files a/_module/ncs/nw_s1_coneelec.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_conesonic.ncs b/_module/ncs/nw_s1_conesonic.ncs
deleted file mode 100644
index a16336b..0000000
Binary files a/_module/ncs/nw_s1_conesonic.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_dragfear.ncs b/_module/ncs/nw_s1_dragfear.ncs
deleted file mode 100644
index 21ca6ab..0000000
Binary files a/_module/ncs/nw_s1_dragfear.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_dragfeara.ncs b/_module/ncs/nw_s1_dragfeara.ncs
deleted file mode 100644
index 717ef4f..0000000
Binary files a/_module/ncs/nw_s1_dragfeara.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_gazechaos.ncs b/_module/ncs/nw_s1_gazechaos.ncs
deleted file mode 100644
index e5958a4..0000000
Binary files a/_module/ncs/nw_s1_gazechaos.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_gazecharm.ncs b/_module/ncs/nw_s1_gazecharm.ncs
deleted file mode 100644
index 379d974..0000000
Binary files a/_module/ncs/nw_s1_gazecharm.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_gazeconfu.ncs b/_module/ncs/nw_s1_gazeconfu.ncs
deleted file mode 100644
index 733db62..0000000
Binary files a/_module/ncs/nw_s1_gazeconfu.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_gazedaze.ncs b/_module/ncs/nw_s1_gazedaze.ncs
deleted file mode 100644
index 3ca4329..0000000
Binary files a/_module/ncs/nw_s1_gazedaze.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_gazedeath.ncs b/_module/ncs/nw_s1_gazedeath.ncs
deleted file mode 100644
index ebb32d9..0000000
Binary files a/_module/ncs/nw_s1_gazedeath.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_gazedomn.ncs b/_module/ncs/nw_s1_gazedomn.ncs
deleted file mode 100644
index 8ef58a5..0000000
Binary files a/_module/ncs/nw_s1_gazedomn.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_gazedoom.ncs b/_module/ncs/nw_s1_gazedoom.ncs
deleted file mode 100644
index bada649..0000000
Binary files a/_module/ncs/nw_s1_gazedoom.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_gazeevil.ncs b/_module/ncs/nw_s1_gazeevil.ncs
deleted file mode 100644
index a40878f..0000000
Binary files a/_module/ncs/nw_s1_gazeevil.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_gazefear.ncs b/_module/ncs/nw_s1_gazefear.ncs
deleted file mode 100644
index 565ccf2..0000000
Binary files a/_module/ncs/nw_s1_gazefear.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_gazegood.ncs b/_module/ncs/nw_s1_gazegood.ncs
deleted file mode 100644
index f8ff20b..0000000
Binary files a/_module/ncs/nw_s1_gazegood.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_gazelaw.ncs b/_module/ncs/nw_s1_gazelaw.ncs
deleted file mode 100644
index 36c7ff4..0000000
Binary files a/_module/ncs/nw_s1_gazelaw.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_gazestun.ncs b/_module/ncs/nw_s1_gazestun.ncs
deleted file mode 100644
index 1235931..0000000
Binary files a/_module/ncs/nw_s1_gazestun.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_golemgas.ncs b/_module/ncs/nw_s1_golemgas.ncs
deleted file mode 100644
index 1b8a59f..0000000
Binary files a/_module/ncs/nw_s1_golemgas.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_hndbreath.ncs b/_module/ncs/nw_s1_hndbreath.ncs
deleted file mode 100644
index dbaa757..0000000
Binary files a/_module/ncs/nw_s1_hndbreath.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_howlconf.ncs b/_module/ncs/nw_s1_howlconf.ncs
deleted file mode 100644
index 10cd020..0000000
Binary files a/_module/ncs/nw_s1_howlconf.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_howldaze.ncs b/_module/ncs/nw_s1_howldaze.ncs
deleted file mode 100644
index 1dde10d..0000000
Binary files a/_module/ncs/nw_s1_howldaze.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_howldeath.ncs b/_module/ncs/nw_s1_howldeath.ncs
deleted file mode 100644
index 06fe047..0000000
Binary files a/_module/ncs/nw_s1_howldeath.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_howlstun.ncs b/_module/ncs/nw_s1_howlstun.ncs
deleted file mode 100644
index 28a19f6..0000000
Binary files a/_module/ncs/nw_s1_howlstun.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_krenscare.ncs b/_module/ncs/nw_s1_krenscare.ncs
deleted file mode 100644
index 653f168..0000000
Binary files a/_module/ncs/nw_s1_krenscare.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_mephsalt.ncs b/_module/ncs/nw_s1_mephsalt.ncs
deleted file mode 100644
index 0e92ae3..0000000
Binary files a/_module/ncs/nw_s1_mephsalt.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_mephsteam.ncs b/_module/ncs/nw_s1_mephsteam.ncs
deleted file mode 100644
index 91107e1..0000000
Binary files a/_module/ncs/nw_s1_mephsteam.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_mumundead.ncs b/_module/ncs/nw_s1_mumundead.ncs
deleted file mode 100644
index 6897b90..0000000
Binary files a/_module/ncs/nw_s1_mumundead.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_pulschrdr.ncs b/_module/ncs/nw_s1_pulschrdr.ncs
deleted file mode 100644
index e3f8c5a..0000000
Binary files a/_module/ncs/nw_s1_pulschrdr.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_pulscold.ncs b/_module/ncs/nw_s1_pulscold.ncs
deleted file mode 100644
index b17e5af..0000000
Binary files a/_module/ncs/nw_s1_pulscold.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_pulscondr.ncs b/_module/ncs/nw_s1_pulscondr.ncs
deleted file mode 100644
index a130192..0000000
Binary files a/_module/ncs/nw_s1_pulscondr.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_pulsdeath.ncs b/_module/ncs/nw_s1_pulsdeath.ncs
deleted file mode 100644
index 230f564..0000000
Binary files a/_module/ncs/nw_s1_pulsdeath.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_pulsdexdr.ncs b/_module/ncs/nw_s1_pulsdexdr.ncs
deleted file mode 100644
index a2fd884..0000000
Binary files a/_module/ncs/nw_s1_pulsdexdr.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_pulsdis.ncs b/_module/ncs/nw_s1_pulsdis.ncs
deleted file mode 100644
index 80e023b..0000000
Binary files a/_module/ncs/nw_s1_pulsdis.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_pulselec.ncs b/_module/ncs/nw_s1_pulselec.ncs
deleted file mode 100644
index 40fc5cf..0000000
Binary files a/_module/ncs/nw_s1_pulselec.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_pulsfire.ncs b/_module/ncs/nw_s1_pulsfire.ncs
deleted file mode 100644
index 20f097e..0000000
Binary files a/_module/ncs/nw_s1_pulsfire.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_pulsholy.ncs b/_module/ncs/nw_s1_pulsholy.ncs
deleted file mode 100644
index c230207..0000000
Binary files a/_module/ncs/nw_s1_pulsholy.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_pulsintdr.ncs b/_module/ncs/nw_s1_pulsintdr.ncs
deleted file mode 100644
index 6730fc8..0000000
Binary files a/_module/ncs/nw_s1_pulsintdr.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_pulslvldr.ncs b/_module/ncs/nw_s1_pulslvldr.ncs
deleted file mode 100644
index de1184e..0000000
Binary files a/_module/ncs/nw_s1_pulslvldr.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_pulsneg.ncs b/_module/ncs/nw_s1_pulsneg.ncs
deleted file mode 100644
index 373c052..0000000
Binary files a/_module/ncs/nw_s1_pulsneg.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_pulsspore.ncs b/_module/ncs/nw_s1_pulsspore.ncs
deleted file mode 100644
index 723d855..0000000
Binary files a/_module/ncs/nw_s1_pulsspore.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_pulsstrdr.ncs b/_module/ncs/nw_s1_pulsstrdr.ncs
deleted file mode 100644
index aa85653..0000000
Binary files a/_module/ncs/nw_s1_pulsstrdr.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_pulswind.ncs b/_module/ncs/nw_s1_pulswind.ncs
deleted file mode 100644
index 92fccc7..0000000
Binary files a/_module/ncs/nw_s1_pulswind.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_pulswisdr.ncs b/_module/ncs/nw_s1_pulswisdr.ncs
deleted file mode 100644
index 19253de..0000000
Binary files a/_module/ncs/nw_s1_pulswisdr.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_smokeclaw.ncs b/_module/ncs/nw_s1_smokeclaw.ncs
deleted file mode 100644
index ebed03b..0000000
Binary files a/_module/ncs/nw_s1_smokeclaw.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_stink_a.ncs b/_module/ncs/nw_s1_stink_a.ncs
deleted file mode 100644
index bb2bc5b..0000000
Binary files a/_module/ncs/nw_s1_stink_a.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_tyrantfga.ncs b/_module/ncs/nw_s1_tyrantfga.ncs
deleted file mode 100644
index a28a1df..0000000
Binary files a/_module/ncs/nw_s1_tyrantfga.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s1_tyrantfog.ncs b/_module/ncs/nw_s1_tyrantfog.ncs
deleted file mode 100644
index 609cad3..0000000
Binary files a/_module/ncs/nw_s1_tyrantfog.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s2_divprot.ncs b/_module/ncs/nw_s2_divprot.ncs
deleted file mode 100644
index f82e447..0000000
Binary files a/_module/ncs/nw_s2_divprot.ncs and /dev/null differ
diff --git a/_module/ncs/nw_s3_actitem01.ncs b/_module/ncs/nw_s3_actitem01.ncs
index ec852d4..f6b6fd8 100644
Binary files a/_module/ncs/nw_s3_actitem01.ncs and b/_module/ncs/nw_s3_actitem01.ncs differ
diff --git a/_module/ncs/nw_s3_balordeth.ncs b/_module/ncs/nw_s3_balordeth.ncs
deleted file mode 100644
index de0fd4a..0000000
Binary files a/_module/ncs/nw_s3_balordeth.ncs and /dev/null differ
diff --git a/_module/ncs/prc_pwonspawn.ncs b/_module/ncs/prc_pwonspawn.ncs
index 939236a..93f4960 100644
Binary files a/_module/ncs/prc_pwonspawn.ncs and b/_module/ncs/prc_pwonspawn.ncs differ
diff --git a/_module/ncs/px_faeridrag_usd.ncs b/_module/ncs/px_faeridrag_usd.ncs
index 4e43cb0..edaf233 100644
Binary files a/_module/ncs/px_faeridrag_usd.ncs and b/_module/ncs/px_faeridrag_usd.ncs differ
diff --git a/_module/ncs/px_faeriespwn_1.ncs b/_module/ncs/px_faeriespwn_1.ncs
index dbc4e06..bf2651c 100644
Binary files a/_module/ncs/px_faeriespwn_1.ncs and b/_module/ncs/px_faeriespwn_1.ncs differ
diff --git a/_module/ncs/px_faerispawn_2.ncs b/_module/ncs/px_faerispawn_2.ncs
index b658c29..2c60560 100644
Binary files a/_module/ncs/px_faerispawn_2.ncs and b/_module/ncs/px_faerispawn_2.ncs differ
diff --git a/_module/ncs/px_golem_onspwn.ncs b/_module/ncs/px_golem_onspwn.ncs
index dbdfc20..4b8d936 100644
Binary files a/_module/ncs/px_golem_onspwn.ncs and b/_module/ncs/px_golem_onspwn.ncs differ
diff --git a/_module/ncs/px_golem_usd.ncs b/_module/ncs/px_golem_usd.ncs
index c34f4a9..cffa13d 100644
Binary files a/_module/ncs/px_golem_usd.ncs and b/_module/ncs/px_golem_usd.ncs differ
diff --git a/_module/ncs/px_kezzirspawnin.ncs b/_module/ncs/px_kezzirspawnin.ncs
index b696ee8..36364d5 100644
Binary files a/_module/ncs/px_kezzirspawnin.ncs and b/_module/ncs/px_kezzirspawnin.ncs differ
diff --git a/_module/ncs/px_lightspawn.ncs b/_module/ncs/px_lightspawn.ncs
index 5d52d27..86fdf6a 100644
Binary files a/_module/ncs/px_lightspawn.ncs and b/_module/ncs/px_lightspawn.ncs differ
diff --git a/_module/ncs/px_seldshrine_al.ncs b/_module/ncs/px_seldshrine_al.ncs
index aab0db4..3a9c87f 100644
Binary files a/_module/ncs/px_seldshrine_al.ncs and b/_module/ncs/px_seldshrine_al.ncs differ
diff --git a/_module/ncs/px_sorelonspawn.ncs b/_module/ncs/px_sorelonspawn.ncs
index 73876d2..d5f4ee1 100644
Binary files a/_module/ncs/px_sorelonspawn.ncs and b/_module/ncs/px_sorelonspawn.ncs differ
diff --git a/_module/ncs/sc_chk_rogue.ncs b/_module/ncs/sc_chk_rogue.ncs
index 7b9333f..ceaeb73 100644
Binary files a/_module/ncs/sc_chk_rogue.ncs and b/_module/ncs/sc_chk_rogue.ncs differ
diff --git a/_module/ncs/sc_fmr_hrtbt.ncs b/_module/ncs/sc_fmr_hrtbt.ncs
index f754817..90070d0 100644
Binary files a/_module/ncs/sc_fmr_hrtbt.ncs and b/_module/ncs/sc_fmr_hrtbt.ncs differ
diff --git a/_module/ncs/sc_guard_percept.ncs b/_module/ncs/sc_guard_percept.ncs
index 48de0d5..a5bf331 100644
Binary files a/_module/ncs/sc_guard_percept.ncs and b/_module/ncs/sc_guard_percept.ncs differ
diff --git a/_module/ncs/sc_hid_trapdoor.ncs b/_module/ncs/sc_hid_trapdoor.ncs
index 5e5e24d..aab9cda 100644
Binary files a/_module/ncs/sc_hid_trapdoor.ncs and b/_module/ncs/sc_hid_trapdoor.ncs differ
diff --git a/_module/ncs/stx_cr_dobelt.ncs b/_module/ncs/stx_cr_dobelt.ncs
index 18da85b..718dfa5 100644
Binary files a/_module/ncs/stx_cr_dobelt.ncs and b/_module/ncs/stx_cr_dobelt.ncs differ
diff --git a/_module/ncs/stx_cr_dobicep_l.ncs b/_module/ncs/stx_cr_dobicep_l.ncs
index 102aaa1..af217ae 100644
Binary files a/_module/ncs/stx_cr_dobicep_l.ncs and b/_module/ncs/stx_cr_dobicep_l.ncs differ
diff --git a/_module/ncs/stx_cr_dobicep_r.ncs b/_module/ncs/stx_cr_dobicep_r.ncs
index 2d95adf..6f8136c 100644
Binary files a/_module/ncs/stx_cr_dobicep_r.ncs and b/_module/ncs/stx_cr_dobicep_r.ncs differ
diff --git a/_module/ncs/stx_cr_doccloth1.ncs b/_module/ncs/stx_cr_doccloth1.ncs
index 23d1be8..4dc721c 100644
Binary files a/_module/ncs/stx_cr_doccloth1.ncs and b/_module/ncs/stx_cr_doccloth1.ncs differ
diff --git a/_module/ncs/stx_cr_doccloth2.ncs b/_module/ncs/stx_cr_doccloth2.ncs
index 18eafb5..33b29f9 100644
Binary files a/_module/ncs/stx_cr_doccloth2.ncs and b/_module/ncs/stx_cr_doccloth2.ncs differ
diff --git a/_module/ncs/stx_cr_docleath1.ncs b/_module/ncs/stx_cr_docleath1.ncs
index 9734326..043cbb3 100644
Binary files a/_module/ncs/stx_cr_docleath1.ncs and b/_module/ncs/stx_cr_docleath1.ncs differ
diff --git a/_module/ncs/stx_cr_docleath2.ncs b/_module/ncs/stx_cr_docleath2.ncs
index 944f1f9..f5b3e19 100644
Binary files a/_module/ncs/stx_cr_docleath2.ncs and b/_module/ncs/stx_cr_docleath2.ncs differ
diff --git a/_module/ncs/stx_cr_docmetal1.ncs b/_module/ncs/stx_cr_docmetal1.ncs
index 71f53fa..204f887 100644
Binary files a/_module/ncs/stx_cr_docmetal1.ncs and b/_module/ncs/stx_cr_docmetal1.ncs differ
diff --git a/_module/ncs/stx_cr_docmetal2.ncs b/_module/ncs/stx_cr_docmetal2.ncs
index 664637b..dd57ee2 100644
Binary files a/_module/ncs/stx_cr_docmetal2.ncs and b/_module/ncs/stx_cr_docmetal2.ncs differ
diff --git a/_module/ncs/stx_cr_dofoot_l.ncs b/_module/ncs/stx_cr_dofoot_l.ncs
index 25165db..abc4877 100644
Binary files a/_module/ncs/stx_cr_dofoot_l.ncs and b/_module/ncs/stx_cr_dofoot_l.ncs differ
diff --git a/_module/ncs/stx_cr_dofoot_r.ncs b/_module/ncs/stx_cr_dofoot_r.ncs
index ed3775c..a4a69c5 100644
Binary files a/_module/ncs/stx_cr_dofoot_r.ncs and b/_module/ncs/stx_cr_dofoot_r.ncs differ
diff --git a/_module/ncs/stx_cr_dohand_l.ncs b/_module/ncs/stx_cr_dohand_l.ncs
index 2f109d6..c6c96af 100644
Binary files a/_module/ncs/stx_cr_dohand_l.ncs and b/_module/ncs/stx_cr_dohand_l.ncs differ
diff --git a/_module/ncs/stx_cr_dohand_r.ncs b/_module/ncs/stx_cr_dohand_r.ncs
index f71d98b..cc0762e 100644
Binary files a/_module/ncs/stx_cr_dohand_r.ncs and b/_module/ncs/stx_cr_dohand_r.ncs differ
diff --git a/_module/ncs/stx_cr_doloarm_l.ncs b/_module/ncs/stx_cr_doloarm_l.ncs
index 2aa0c17..c9089f5 100644
Binary files a/_module/ncs/stx_cr_doloarm_l.ncs and b/_module/ncs/stx_cr_doloarm_l.ncs differ
diff --git a/_module/ncs/stx_cr_doloarm_r.ncs b/_module/ncs/stx_cr_doloarm_r.ncs
index b090bc7..7e7683e 100644
Binary files a/_module/ncs/stx_cr_doloarm_r.ncs and b/_module/ncs/stx_cr_doloarm_r.ncs differ
diff --git a/_module/ncs/stx_cr_doneck.ncs b/_module/ncs/stx_cr_doneck.ncs
index 55dc389..8eaf992 100644
Binary files a/_module/ncs/stx_cr_doneck.ncs and b/_module/ncs/stx_cr_doneck.ncs differ
diff --git a/_module/ncs/stx_cr_dopelvis.ncs b/_module/ncs/stx_cr_dopelvis.ncs
index 18a3f07..a3a3f11 100644
Binary files a/_module/ncs/stx_cr_dopelvis.ncs and b/_module/ncs/stx_cr_dopelvis.ncs differ
diff --git a/_module/ncs/stx_cr_dorobe.ncs b/_module/ncs/stx_cr_dorobe.ncs
index fdd52d7..ea1d238 100644
Binary files a/_module/ncs/stx_cr_dorobe.ncs and b/_module/ncs/stx_cr_dorobe.ncs differ
diff --git a/_module/ncs/stx_cr_doshin_l.ncs b/_module/ncs/stx_cr_doshin_l.ncs
index 3e2140e..48b6563 100644
Binary files a/_module/ncs/stx_cr_doshin_l.ncs and b/_module/ncs/stx_cr_doshin_l.ncs differ
diff --git a/_module/ncs/stx_cr_doshin_r.ncs b/_module/ncs/stx_cr_doshin_r.ncs
index 24548a3..20fd3d8 100644
Binary files a/_module/ncs/stx_cr_doshin_r.ncs and b/_module/ncs/stx_cr_doshin_r.ncs differ
diff --git a/_module/ncs/stx_cr_doshold_l.ncs b/_module/ncs/stx_cr_doshold_l.ncs
index 8e9d406..7bd4761 100644
Binary files a/_module/ncs/stx_cr_doshold_l.ncs and b/_module/ncs/stx_cr_doshold_l.ncs differ
diff --git a/_module/ncs/stx_cr_doshold_r.ncs b/_module/ncs/stx_cr_doshold_r.ncs
index 84a9c21..86459df 100644
Binary files a/_module/ncs/stx_cr_doshold_r.ncs and b/_module/ncs/stx_cr_doshold_r.ncs differ
diff --git a/_module/ncs/stx_cr_dothigh_l.ncs b/_module/ncs/stx_cr_dothigh_l.ncs
index 672540e..a95abd9 100644
Binary files a/_module/ncs/stx_cr_dothigh_l.ncs and b/_module/ncs/stx_cr_dothigh_l.ncs differ
diff --git a/_module/ncs/stx_cr_dothigh_r.ncs b/_module/ncs/stx_cr_dothigh_r.ncs
index 0b59457..fcd8021 100644
Binary files a/_module/ncs/stx_cr_dothigh_r.ncs and b/_module/ncs/stx_cr_dothigh_r.ncs differ
diff --git a/_module/ncs/stx_cr_dotorso.ncs b/_module/ncs/stx_cr_dotorso.ncs
index f062a4f..c7e7f35 100644
Binary files a/_module/ncs/stx_cr_dotorso.ncs and b/_module/ncs/stx_cr_dotorso.ncs differ
diff --git a/_module/ncs/stx_cr_dowbottom.ncs b/_module/ncs/stx_cr_dowbottom.ncs
index 564d672..73ac6e5 100644
Binary files a/_module/ncs/stx_cr_dowbottom.ncs and b/_module/ncs/stx_cr_dowbottom.ncs differ
diff --git a/_module/ncs/stx_cr_dowmiddle.ncs b/_module/ncs/stx_cr_dowmiddle.ncs
index 629266d..6ebb34f 100644
Binary files a/_module/ncs/stx_cr_dowmiddle.ncs and b/_module/ncs/stx_cr_dowmiddle.ncs differ
diff --git a/_module/ncs/stx_cr_dowtop.ncs b/_module/ncs/stx_cr_dowtop.ncs
index dfdd239..ed687e2 100644
Binary files a/_module/ncs/stx_cr_dowtop.ncs and b/_module/ncs/stx_cr_dowtop.ncs differ
diff --git a/_module/ncs/stx_cr_start_ch.ncs b/_module/ncs/stx_cr_start_ch.ncs
index 255062b..92dd021 100644
Binary files a/_module/ncs/stx_cr_start_ch.ncs and b/_module/ncs/stx_cr_start_ch.ncs differ
diff --git a/_module/ncs/stx_cr_start_cs.ncs b/_module/ncs/stx_cr_start_cs.ncs
index 3431cb0..b925bda 100644
Binary files a/_module/ncs/stx_cr_start_cs.ncs and b/_module/ncs/stx_cr_start_cs.ncs differ
diff --git a/_module/ncs/swt_door_close.ncs b/_module/ncs/swt_door_close.ncs
index 531bc20..41b939b 100644
Binary files a/_module/ncs/swt_door_close.ncs and b/_module/ncs/swt_door_close.ncs differ
diff --git a/_module/ncs/tri_aeneaspaw.ncs b/_module/ncs/tri_aeneaspaw.ncs
index 107d652..dbe123c 100644
Binary files a/_module/ncs/tri_aeneaspaw.ncs and b/_module/ncs/tri_aeneaspaw.ncs differ
diff --git a/_module/ncs/tri_deathslaad.ncs b/_module/ncs/tri_deathslaad.ncs
index 2335a49..1536c54 100644
Binary files a/_module/ncs/tri_deathslaad.ncs and b/_module/ncs/tri_deathslaad.ncs differ
diff --git a/_module/ncs/tri_disp.ncs b/_module/ncs/tri_disp.ncs
index 306acc2..8515c0c 100644
Binary files a/_module/ncs/tri_disp.ncs and b/_module/ncs/tri_disp.ncs differ
diff --git a/_module/ncs/tri_hobtrap1.ncs b/_module/ncs/tri_hobtrap1.ncs
index 4be5eee..7dc4b0f 100644
Binary files a/_module/ncs/tri_hobtrap1.ncs and b/_module/ncs/tri_hobtrap1.ncs differ
diff --git a/_module/ncs/tri_hobtrap2.ncs b/_module/ncs/tri_hobtrap2.ncs
index 5b2512a..43e29c2 100644
Binary files a/_module/ncs/tri_hobtrap2.ncs and b/_module/ncs/tri_hobtrap2.ncs differ
diff --git a/_module/ncs/tri_inv_liste.ncs b/_module/ncs/tri_inv_liste.ncs
index b1a4c86..a943a95 100644
Binary files a/_module/ncs/tri_inv_liste.ncs and b/_module/ncs/tri_inv_liste.ncs differ
diff --git a/_module/ncs/tri_koboldspa.ncs b/_module/ncs/tri_koboldspa.ncs
index 33ddb76..904d33d 100644
Binary files a/_module/ncs/tri_koboldspa.ncs and b/_module/ncs/tri_koboldspa.ncs differ
diff --git a/_module/ncs/tri_lichlordsp.ncs b/_module/ncs/tri_lichlordsp.ncs
index 9b3df61..eab5f80 100644
Binary files a/_module/ncs/tri_lichlordsp.ncs and b/_module/ncs/tri_lichlordsp.ncs differ
diff --git a/_module/ncs/tri_mithralspawn.ncs b/_module/ncs/tri_mithralspawn.ncs
index 12e9891..21c606c 100644
Binary files a/_module/ncs/tri_mithralspawn.ncs and b/_module/ncs/tri_mithralspawn.ncs differ
diff --git a/_module/ncs/tri_pitfiendspaw.ncs b/_module/ncs/tri_pitfiendspaw.ncs
index 567ca11..0fad527 100644
Binary files a/_module/ncs/tri_pitfiendspaw.ncs and b/_module/ncs/tri_pitfiendspaw.ncs differ
diff --git a/_module/ncs/tri_spinaflysp.ncs b/_module/ncs/tri_spinaflysp.ncs
index c70ffbf..a83423a 100644
Binary files a/_module/ncs/tri_spinaflysp.ncs and b/_module/ncs/tri_spinaflysp.ncs differ
diff --git a/_module/ncs/tri_stormspawn.ncs b/_module/ncs/tri_stormspawn.ncs
index 3f75a8f..dc61573 100644
Binary files a/_module/ncs/tri_stormspawn.ncs and b/_module/ncs/tri_stormspawn.ncs differ
diff --git a/_module/ncs/tri_undeaddeath.ncs b/_module/ncs/tri_undeaddeath.ncs
index b08faef..3509622 100644
Binary files a/_module/ncs/tri_undeaddeath.ncs and b/_module/ncs/tri_undeaddeath.ncs differ
diff --git a/_module/ncs/tri_undeadsp.ncs b/_module/ncs/tri_undeadsp.ncs
index 2033866..a3a1f7a 100644
Binary files a/_module/ncs/tri_undeadsp.ncs and b/_module/ncs/tri_undeadsp.ncs differ
diff --git a/_module/ncs/tri_undeanew.ncs b/_module/ncs/tri_undeanew.ncs
index c12cf8c..45f4fcf 100644
Binary files a/_module/ncs/tri_undeanew.ncs and b/_module/ncs/tri_undeanew.ncs differ
diff --git a/_module/ncs/ty_doorcloselock.ncs b/_module/ncs/ty_doorcloselock.ncs
index f617fbb..37eed9e 100644
Binary files a/_module/ncs/ty_doorcloselock.ncs and b/_module/ncs/ty_doorcloselock.ncs differ
diff --git a/_module/ncs/vortexspawn.ncs b/_module/ncs/vortexspawn.ncs
index 76c1025..46e9f09 100644
Binary files a/_module/ncs/vortexspawn.ncs and b/_module/ncs/vortexspawn.ncs differ
diff --git a/_module/ncs/vortexude.ncs b/_module/ncs/vortexude.ncs
index ea16cc1..28db702 100644
Binary files a/_module/ncs/vortexude.ncs and b/_module/ncs/vortexude.ncs differ
diff --git a/_module/ncs/x0_s3_gemspray.ncs b/_module/ncs/x0_s3_gemspray.ncs
index ef5bdf9..ac5d674 100644
Binary files a/_module/ncs/x0_s3_gemspray.ncs and b/_module/ncs/x0_s3_gemspray.ncs differ
diff --git a/_module/ncs/x2_s1_hurlrock.ncs b/_module/ncs/x2_s1_hurlrock.ncs
index 4e11e82..9b31c16 100644
Binary files a/_module/ncs/x2_s1_hurlrock.ncs and b/_module/ncs/x2_s1_hurlrock.ncs differ
diff --git a/_module/nss/ah_cryptbossdead.nss b/_module/nss/ah_cryptbossdead.nss
index 5197cc1..d32d936 100644
--- a/_module/nss/ah_cryptbossdead.nss
+++ b/_module/nss/ah_cryptbossdead.nss
@@ -13,13 +13,14 @@
 #include "NW_I0_GENERIC"
 #include "jw_exp_giver"
 #include "jw_custom_spells"
+#include "prc_inc_spells"
 
 void main()
 {
 
     //Declare major variables
     object oCaster = OBJECT_SELF;
-    int nMetaMagic = GetMetaMagicFeat();
+    int nMetaMagic = PRCGetMetaMagicFeat();
     float fDelay;
     effect eExplode = EffectVisualEffect(VFX_FNF_WAIL_O_BANSHEES);
 //    effect eVis = EffectVisualEffect(VFX_FNF_WAIL_O_BANSHEES);
@@ -69,5 +70,5 @@ sObject="ah_banering9";
 CreateItemOnObject(sObject,OBJECT_SELF,1);
 
 givexp(OBJECT_SELF,GetLastKiller());
-
+ExecuteScript("prc_npc_death", OBJECT_SELF);
 }
diff --git a/_module/nss/ah_ondeath_skel.nss b/_module/nss/ah_ondeath_skel.nss
index 597d6c4..047af51 100644
--- a/_module/nss/ah_ondeath_skel.nss
+++ b/_module/nss/ah_ondeath_skel.nss
@@ -40,5 +40,5 @@ void main()
 
 
 givexp(OBJECT_SELF,GetLastKiller());
-
+ExecuteScript("prc_npc_death", OBJECT_SELF);
 }
diff --git a/_module/nss/ah_onspawn_mhorg.nss b/_module/nss/ah_onspawn_mhorg.nss
index 423eaeb..284d641 100644
--- a/_module/nss/ah_onspawn_mhorg.nss
+++ b/_module/nss/ah_onspawn_mhorg.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 // Start The Visual Effects
  effect vfx = EffectVisualEffect(VFX_DUR_PARALYZED);
      ApplyEffectToObject(DURATION_TYPE_PERMANENT, vfx, OBJECT_SELF);
diff --git a/_module/nss/ah_onspawn_shade.nss b/_module/nss/ah_onspawn_shade.nss
index 6a10e4a..e65be9e 100644
--- a/_module/nss/ah_onspawn_shade.nss
+++ b/_module/nss/ah_onspawn_shade.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 // Start The Visual Effects
  effect vfx = EffectVisualEffect(VFX_DUR_PROT_SHADOW_ARMOR);
      ApplyEffectToObject(DURATION_TYPE_PERMANENT, vfx, OBJECT_SELF);
diff --git a/_module/nss/ah_onspawn_skull.nss b/_module/nss/ah_onspawn_skull.nss
index 8e843ab..2e34ab8 100644
--- a/_module/nss/ah_onspawn_skull.nss
+++ b/_module/nss/ah_onspawn_skull.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 // Start The Visual Effects
  effect vfx = EffectVisualEffect(VFX_DUR_MIND_AFFECTING_FEAR);
      ApplyEffectToObject(DURATION_TYPE_PERMANENT, vfx, OBJECT_SELF);
diff --git a/_module/nss/ah_onspawn_spect.nss b/_module/nss/ah_onspawn_spect.nss
index 4a609f2..56ca3e1 100644
--- a/_module/nss/ah_onspawn_spect.nss
+++ b/_module/nss/ah_onspawn_spect.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 // Start The Visual Effects
  effect vfx = EffectVisualEffect(VFX_DUR_PROT_SHADOW_ARMOR);
      ApplyEffectToObject(DURATION_TYPE_PERMANENT, vfx, OBJECT_SELF);
diff --git a/_module/nss/ah_onspawn_wrait.nss b/_module/nss/ah_onspawn_wrait.nss
index 1cbda3f..36b8adc 100644
--- a/_module/nss/ah_onspawn_wrait.nss
+++ b/_module/nss/ah_onspawn_wrait.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 // Start The Visual Effects
  effect vfx = EffectVisualEffect(VFX_DUR_GHOSTLY_VISAGE);
      ApplyEffectToObject(DURATION_TYPE_PERMANENT, vfx, OBJECT_SELF);
diff --git a/_module/nss/bbs_scribe_spawn.nss b/_module/nss/bbs_scribe_spawn.nss
index 1c61dfe..a164717 100644
--- a/_module/nss/bbs_scribe_spawn.nss
+++ b/_module/nss/bbs_scribe_spawn.nss
@@ -18,6 +18,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/by_rotten_usd.nss b/_module/nss/by_rotten_usd.nss
index fe55e2a..d4fd62d 100644
--- a/_module/nss/by_rotten_usd.nss
+++ b/_module/nss/by_rotten_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
     int nRandom;
     int nEffect;
diff --git a/_module/nss/dmfi_execute.nss b/_module/nss/dmfi_execute.nss
index 5e6dc26..6a75dcf 100644
--- a/_module/nss/dmfi_execute.nss
+++ b/_module/nss/dmfi_execute.nss
@@ -37,6 +37,7 @@
 #include "dmfi_plychat_inc"
 #include "dmfi_plchlishk_i"
 #include "dmfi_getln_inc"
+#include "prc_inc_util"
 
 int iNightMusic;
 int iDayMusic;
@@ -3701,7 +3702,7 @@ void DoRestFunction(int iRest, object oUser)
             while (GetIsObjectValid(oLoop))
             {
                 if (oArea == GetArea(oLoop))
-                    ForceRest(oLoop);
+                    PRCForceRest(oLoop);
                 oLoop = GetNextPC();
             }
         }
@@ -4142,7 +4143,7 @@ void DoRestFunction(int iRest, object oUser)
         oLoop = GetFirstPC();
         while (GetIsObjectValid(oLoop))
         {
-            ForceRest(oLoop);
+            PRCForceRest(oLoop);
             oLoop = GetNextPC();
         }
         break;
diff --git a/_module/nss/dmw_func_inc.nss b/_module/nss/dmw_func_inc.nss
index e882570..a0a4946 100644
--- a/_module/nss/dmw_func_inc.nss
+++ b/_module/nss/dmw_func_inc.nss
@@ -4,6 +4,7 @@
 //::
 //:: Useful functions for the DM's Helper
 //:://////////////////////////////////////////////
+#include "prc_inc_racial"
 
 void dmwand_AbilityCheck(int nAbility, int nSecret = TRUE)
 {
@@ -585,7 +586,7 @@ void dmwand_PlayerListConv(string sParams)
 
 string dmwand_Race(object oEntity)
 {
-   switch (GetRacialType(oEntity))
+   switch (MyPRCGetRacialType(oEntity))
    {
       case RACIAL_TYPE_ALL:   return "All"; break;
       case RACIAL_TYPE_ANIMAL:   return "Animal"; break;
diff --git a/_module/nss/fr_hadush_spawn.nss b/_module/nss/fr_hadush_spawn.nss
index ec36b90..0fecbf0 100644
--- a/_module/nss/fr_hadush_spawn.nss
+++ b/_module/nss/fr_hadush_spawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/fr_hadush_usd.nss b/_module/nss/fr_hadush_usd.nss
index eedbfab..7c0ada2 100644
--- a/_module/nss/fr_hadush_usd.nss
+++ b/_module/nss/fr_hadush_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/fr_halfelf.nss b/_module/nss/fr_halfelf.nss
index 4268d27..79cf464 100644
--- a/_module/nss/fr_halfelf.nss
+++ b/_module/nss/fr_halfelf.nss
@@ -2,10 +2,21 @@
 //:: FileName fr_halfelf
 //:://////////////////////////////////////////////
 //:://////////////////////////////////////////////
-//:: Created By: Script Wizard
-//:: Created On: 21.12.2002 0:29:22
-//:://////////////////////////////////////////////
+#include "prc_inc_racial"
+
+//:: Returns TRUE if PC is a half-elf
 int StartingConditional()
+{
+	object oPC = GetPCSpeaker();
+
+    if(!(MyPRCGetRacialType(oPC) == RACIAL_TYPE_HALFELF))
+        return FALSE;
+	
+     return TRUE;
+}
+
+
+/* int StartingConditional()
 {
 
 	// Reject player races
@@ -60,3 +71,4 @@ int StartingConditional()
 
 	return TRUE;
 }
+ */
\ No newline at end of file
diff --git a/_module/nss/fr_if_dwarf.nss b/_module/nss/fr_if_dwarf.nss
index d18df46..1196667 100644
--- a/_module/nss/fr_if_dwarf.nss
+++ b/_module/nss/fr_if_dwarf.nss
@@ -5,27 +5,28 @@
 //:: Created By: Script Wizard
 //:: Created On: 26.12.2003 22:31:19
 //:://////////////////////////////////////////////
+#include "prc_inc_racial"
+
 int StartingConditional()
 {
 
     //accept a dwarf
-    if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_DWARF)
+    if(MyPRCGetRacialType(GetPCSpeaker()) == RACIAL_TYPE_DWARF)
         return TRUE;
 
     //test lore for others
-    else{
+    else
+	{
         //int iDice = d20(1);
         int iLore =  GetSkillRank(SKILL_LORE, GetPCSpeaker());
         if(iLore >= 15)
-                {
-                return TRUE;
-                }
+        {
+			return TRUE;
+        }
         else
-                {
-                SpeakString("[You do not understand the dwarven language well enough to read complicated content the book.]");
-                return FALSE;
-                }
+        {
+			SpeakString("[You do not understand the dwarven language well enough to read the content of this book.]");
+            return FALSE;
+        }
     }
-
-
-}
+}
\ No newline at end of file
diff --git a/_module/nss/fr_if_dwarf02.nss b/_module/nss/fr_if_dwarf02.nss
index 3395518..562665d 100644
--- a/_module/nss/fr_if_dwarf02.nss
+++ b/_module/nss/fr_if_dwarf02.nss
@@ -5,7 +5,22 @@
 //:: Created By: Script Wizard
 //:: Created On: 3.1.2004 20:17:29
 //:://////////////////////////////////////////////
+#include "prc_inc_racial"
+
+//:: Returns TRUE if PC is a dwarf
 int StartingConditional()
+{
+	object oPC = GetPCSpeaker();
+
+    if(!(MyPRCGetRacialType(oPC) == RACIAL_TYPE_DWARF))
+        return FALSE;
+	
+     return TRUE;
+}
+
+
+
+/* int StartingConditional()
 {
 
 	// Reject player races
@@ -61,4 +76,4 @@ int StartingConditional()
 		return FALSE;
 
 	return TRUE;
-}
+} */
diff --git a/_module/nss/fr_if_elf.nss b/_module/nss/fr_if_elf.nss
index aa8bcbc..afe5031 100644
--- a/_module/nss/fr_if_elf.nss
+++ b/_module/nss/fr_if_elf.nss
@@ -1,11 +1,25 @@
 //::///////////////////////////////////////////////
 //:: FileName fr_if_elf
 //:://////////////////////////////////////////////
-//:://////////////////////////////////////////////
-//:: Created By: Script Wizard
-//:: Created On: 28.3.2003 20:01:39
-//:://////////////////////////////////////////////
+#include "prc_inc_racial"
+
+//:: Returns TRUE if PC is an elf or half-elf
 int StartingConditional()
+{
+    object oPC = GetPCSpeaker();
+
+    if (!(MyPRCGetRacialType(oPC) == RACIAL_TYPE_ELF
+	|| MyPRCGetRacialType(oPC) == RACIAL_TYPE_HALFELF))
+    {
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+
+
+/* int StartingConditional()
 {
 
 	// Reject player races
@@ -57,4 +71,4 @@ int StartingConditional()
 		return FALSE;
 
 	return TRUE;
-}
+} */
diff --git a/_module/nss/fr_onspawn_0gold.nss b/_module/nss/fr_onspawn_0gold.nss
index 7e23bf1..a28d1a7 100644
--- a/_module/nss/fr_onspawn_0gold.nss
+++ b/_module/nss/fr_onspawn_0gold.nss
@@ -19,6 +19,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/fr_onspawn_dance.nss b/_module/nss/fr_onspawn_dance.nss
index 4dda638..ff22d54 100644
--- a/_module/nss/fr_onspawn_dance.nss
+++ b/_module/nss/fr_onspawn_dance.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 AssignCommand(OBJECT_SELF, PlayAnimation(ANIMATION_LOOPING_WORSHIP, 0.7, 600.0));
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
diff --git a/_module/nss/fr_onspawn_etght.nss b/_module/nss/fr_onspawn_etght.nss
index f0a0908..02b06a8 100644
--- a/_module/nss/fr_onspawn_etght.nss
+++ b/_module/nss/fr_onspawn_etght.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+
 ApplyEffectToObject(DURATION_TYPE_PERMANENT,EffectVisualEffect(VFX_DUR_GHOST_TRANSPARENT),OBJECT_SELF);
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
diff --git a/_module/nss/fr_onspawn_ghost.nss b/_module/nss/fr_onspawn_ghost.nss
index d0ebda7..aa65869 100644
--- a/_module/nss/fr_onspawn_ghost.nss
+++ b/_module/nss/fr_onspawn_ghost.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 ApplyEffectToObject(DURATION_TYPE_INSTANT,EffectVisualEffect(VFX_IMP_FROST_L),OBJECT_SELF);
 ApplyEffectToObject(DURATION_TYPE_PERMANENT,EffectVisualEffect(VFX_DUR_GHOST_TRANSPARENT),OBJECT_SELF);
 ApplyEffectToObject(DURATION_TYPE_PERMANENT,EffectVisualEffect(VFX_DUR_GHOST_SMOKE_2),OBJECT_SELF);
diff --git a/_module/nss/fr_onspawn_golem.nss b/_module/nss/fr_onspawn_golem.nss
index 2565a74..775c640 100644
--- a/_module/nss/fr_onspawn_golem.nss
+++ b/_module/nss/fr_onspawn_golem.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 ApplyEffectToObject(DURATION_TYPE_PERMANENT,EffectVisualEffect(VFX_DUR_GHOSTLY_VISAGE),OBJECT_SELF);
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
diff --git a/_module/nss/fr_onspawn_green.nss b/_module/nss/fr_onspawn_green.nss
index 437ae1c..9163bdb 100644
--- a/_module/nss/fr_onspawn_green.nss
+++ b/_module/nss/fr_onspawn_green.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 ApplyEffectToObject(DURATION_TYPE_PERMANENT,EffectVisualEffect(VFX_DUR_GLOW_GREEN),OBJECT_SELF);
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
diff --git a/_module/nss/fr_onspawn_ice.nss b/_module/nss/fr_onspawn_ice.nss
index 1ed4870..4e29f8e 100644
--- a/_module/nss/fr_onspawn_ice.nss
+++ b/_module/nss/fr_onspawn_ice.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 ApplyEffectToObject(DURATION_TYPE_PERMANENT,EffectVisualEffect(VFX_DUR_ICESKIN),OBJECT_SELF);
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
diff --git a/_module/nss/fr_onspawn_iogre.nss b/_module/nss/fr_onspawn_iogre.nss
index c04f5d0..3edd679 100644
--- a/_module/nss/fr_onspawn_iogre.nss
+++ b/_module/nss/fr_onspawn_iogre.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 ApplyEffectToObject(DURATION_TYPE_PERMANENT,EffectVisualEffect(VFX_DUR_ICESKIN),OBJECT_SELF);
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
diff --git a/_module/nss/fr_onspawn_pgole.nss b/_module/nss/fr_onspawn_pgole.nss
index 2d246c5..8fb2771 100644
--- a/_module/nss/fr_onspawn_pgole.nss
+++ b/_module/nss/fr_onspawn_pgole.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/fr_onspawn_pixie.nss b/_module/nss/fr_onspawn_pixie.nss
index a238e3e..e0ac1b1 100644
--- a/_module/nss/fr_onspawn_pixie.nss
+++ b/_module/nss/fr_onspawn_pixie.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 ApplyEffectToObject(DURATION_TYPE_PERMANENT,EffectVisualEffect(VFX_DUR_GLOW_BLUE),OBJECT_SELF);
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
diff --git a/_module/nss/fr_pers_talk.nss b/_module/nss/fr_pers_talk.nss
index ac17688..2c0105b 100644
--- a/_module/nss/fr_pers_talk.nss
+++ b/_module/nss/fr_pers_talk.nss
@@ -12,7 +12,7 @@
 //:: Created By: Preston Watamaniuk
 //:: Created On: Oct 16, 2001
 //:://////////////////////////////////////////////
-
+#include "prc_inc_spells"
 #include "NW_I0_GENERIC"
 
 void main()
@@ -47,7 +47,7 @@ void main()
             }
             else if(GetIsEnemy(GetLastPerceived()))
             {
-                if(!GetHasEffect(EFFECT_TYPE_SLEEP))
+                if(!PRCGetHasEffect(EFFECT_TYPE_SLEEP))
                 {
                     SetFacingPoint(GetPosition(GetLastPerceived()));
                     SpeakString("NW_I_WAS_ATTACKED", TALKVOLUME_SILENT_TALK);
diff --git a/_module/nss/fr_race_dwarf.nss b/_module/nss/fr_race_dwarf.nss
index 3c714c5..3138e46 100644
--- a/_module/nss/fr_race_dwarf.nss
+++ b/_module/nss/fr_race_dwarf.nss
@@ -1,11 +1,25 @@
 //::///////////////////////////////////////////////
-//:: FileName fr_race_elf
-//:://////////////////////////////////////////////
-//:://////////////////////////////////////////////
-//:: Created By: Script Wizard
-//:: Created On: 21.12.2002 0:16:20
+//:: FileName fr_race_dwarf
+//:: 
+//:: Dupe of: fr_if_dwarf02
+//::
 //:://////////////////////////////////////////////
+#include "prc_inc_racial"
+
+//:: Returns TRUE if PC is a dwarf
 int StartingConditional()
+{
+	object oPC = GetPCSpeaker();
+
+    if(!(MyPRCGetRacialType(oPC) == RACIAL_TYPE_DWARF))
+        return FALSE;
+	
+     return TRUE;
+}
+
+
+
+/* int StartingConditional()
 {
 
     // Reject player races
@@ -59,4 +73,4 @@ int StartingConditional()
         return FALSE;
 
     return TRUE;
-}
+} */
diff --git a/_module/nss/fr_race_elf.nss b/_module/nss/fr_race_elf.nss
index 09c8cdd..41e82b4 100644
--- a/_module/nss/fr_race_elf.nss
+++ b/_module/nss/fr_race_elf.nss
@@ -1,11 +1,25 @@
 //::///////////////////////////////////////////////
 //:: FileName fr_race_elf
+//::
+//:: Dupe of: frost_elf
+//::
 //:://////////////////////////////////////////////
-//:://////////////////////////////////////////////
-//:: Created By: Script Wizard
-//:: Created On: 21.12.2002 0:16:20
-//:://////////////////////////////////////////////
+#include "prc_inc_racial"
+
+//:: Returns TRUE if PC is an elf
 int StartingConditional()
+{
+    object oPC = GetPCSpeaker();
+
+    if (!(MyPRCGetRacialType(oPC) == RACIAL_TYPE_ELF))
+    {
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+/* int StartingConditional()
 {
 
 	// Reject player races
@@ -59,4 +73,4 @@ int StartingConditional()
 		return FALSE;
 
 	return TRUE;
-}
+} */
diff --git a/_module/nss/fr_s2_wildsh_org.nss b/_module/nss/fr_s2_wildsh_org.nss
index e0057e4..e1653c5 100644
--- a/_module/nss/fr_s2_wildsh_org.nss
+++ b/_module/nss/fr_s2_wildsh_org.nss
@@ -10,16 +10,17 @@
 //:: Created By: Preston Watamaniuk
 //:: Created On: Jan 22, 2002
 //:://////////////////////////////////////////////
+#include "prc_inc_spells"
 
 void main()
 {
     //Declare major variables
-    int nSpell = GetSpellId();
-    object oTarget = GetSpellTargetObject();
+    int nSpell = PRCGetSpellId();
+    object oTarget = PRCGetSpellTargetObject();
     effect eVis = EffectVisualEffect(VFX_IMP_POLYMORPH);
     effect ePoly;
     int nPoly;
-    int nMetaMagic = GetMetaMagicFeat();
+    int nMetaMagic = PRCGetMetaMagicFeat();
     int nDuration = GetLevelByClass(CLASS_TYPE_DRUID);
     //Enter Metamagic conditions
     if (nMetaMagic == METAMAGIC_EXTEND)
diff --git a/_module/nss/fr_tarrik_spawn.nss b/_module/nss/fr_tarrik_spawn.nss
index 992c0a2..293b4e1 100644
--- a/_module/nss/fr_tarrik_spawn.nss
+++ b/_module/nss/fr_tarrik_spawn.nss
@@ -16,7 +16,9 @@
 #include "jw_privates_inc"
 
 void main()
-{
+{	
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/fr_tarrik_usd.nss b/_module/nss/fr_tarrik_usd.nss
index 1df2faa..5d20c94 100644
--- a/_module/nss/fr_tarrik_usd.nss
+++ b/_module/nss/fr_tarrik_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/fr_thael_spawn.nss b/_module/nss/fr_thael_spawn.nss
index 80f2491..4fc87ef 100644
--- a/_module/nss/fr_thael_spawn.nss
+++ b/_module/nss/fr_thael_spawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/fr_thael_usd.nss b/_module/nss/fr_thael_usd.nss
index 00f6753..f91a737 100644
--- a/_module/nss/fr_thael_usd.nss
+++ b/_module/nss/fr_thael_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/frost_elf.nss b/_module/nss/frost_elf.nss
index e959ead..cb2cbfe 100644
--- a/_module/nss/frost_elf.nss
+++ b/_module/nss/frost_elf.nss
@@ -2,61 +2,17 @@
 //:: FileName frost_elf
 //:://////////////////////////////////////////////
 //:://////////////////////////////////////////////
-//:: Created By: Script Wizard
-//:: Created On: 16.9.2002 21:05:18
-//:://////////////////////////////////////////////
+#include "prc_inc_racial"
+
+//:: Returns TRUE if PC is an elf
 int StartingConditional()
 {
+    object oPC = GetPCSpeaker();
 
-	// Reject player races
-	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_DWARF)
-		return FALSE;
-	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_GNOME)
-		return FALSE;
-	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_HALFELF)
-		return FALSE;
-	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_HALFLING)
-		return FALSE;
-	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_HALFORC)
-		return FALSE;
-	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_HUMAN)
-		return FALSE;
+    if (!(MyPRCGetRacialType(oPC) == RACIAL_TYPE_ELF))
+    {
+        return FALSE;
+    }
 
-	// Reject other races
-	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_ABERRATION)
-		return FALSE;
-	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_ANIMAL)
-		return FALSE;
-	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_BEAST)
-		return FALSE;
-	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_CONSTRUCT)
-		return FALSE;
-	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_DRAGON)
-		return FALSE;
-	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_ELEMENTAL)
-		return FALSE;
-	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_FEY)
-		return FALSE;
-	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_GIANT)
-		return FALSE;
-	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_HUMANOID_GOBLINOID)
-		return FALSE;
-	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_MAGICAL_BEAST)
-		return FALSE;
-	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_HUMANOID_MONSTROUS)
-		return FALSE;
-	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_HUMANOID_ORC)
-		return FALSE;
-	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_OUTSIDER)
-		return FALSE;
-	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_HUMANOID_REPTILIAN)
-		return FALSE;
-	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_SHAPECHANGER)
-		return FALSE;
-	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_UNDEAD)
-		return FALSE;
-	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_VERMIN)
-		return FALSE;
-
-	return TRUE;
+    return TRUE;
 }
diff --git a/_module/nss/frost_not_elf.nss b/_module/nss/frost_not_elf.nss
index 73cb852..0aceae2 100644
--- a/_module/nss/frost_not_elf.nss
+++ b/_module/nss/frost_not_elf.nss
@@ -2,13 +2,21 @@
 //:: FileName frost_not_elf
 //:://////////////////////////////////////////////
 //:://////////////////////////////////////////////
-//:: Created By: Script Wizard
-//:: Created On: 16.9.2002 21:08:20
-//:://////////////////////////////////////////////
+
+#include "prc_inc_racial"
+
+//:: Returns FALSE if the player is an elf
 int StartingConditional()
 {
+	object oPC = GetPCSpeaker();
 
-	// Reject player races
+    if(MyPRCGetRacialType(oPC) == RACIAL_TYPE_ELF)
+        return FALSE;
+	
+     return TRUE;
+}	 
+
+/* 	// Reject player races
 	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_ELF)
 		return FALSE;
 
@@ -48,5 +56,4 @@ int StartingConditional()
 	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_VERMIN)
 		return FALSE;
 
-	return TRUE;
-}
+	return TRUE; */
diff --git a/_module/nss/frost_spawn_user.nss b/_module/nss/frost_spawn_user.nss
index ce3432c..a82b06e 100644
--- a/_module/nss/frost_spawn_user.nss
+++ b/_module/nss/frost_spawn_user.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/gz_healer_spawn.nss b/_module/nss/gz_healer_spawn.nss
index 15db639..340bd8f 100644
--- a/_module/nss/gz_healer_spawn.nss
+++ b/_module/nss/gz_healer_spawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/gz_pkeg_detonate.nss b/_module/nss/gz_pkeg_detonate.nss
index 592303c..54c3a1a 100644
--- a/_module/nss/gz_pkeg_detonate.nss
+++ b/_module/nss/gz_pkeg_detonate.nss
@@ -1,4 +1,6 @@
+#include "prc_inc_spells"
 #include "NW_I0_SPELLS"
+
 void main()
 {
     if (GetLocalInt(OBJECT_SELF,"GZ_OBJECT_DETONATING") == TRUE)
@@ -71,7 +73,7 @@ void main()
                 nDamage = (d6(3)*nArmed)+5;
                 nDamage=nDamage/FloatToInt(fDistance);
             //Adjust the damage based on the Reflex Save, Evasion and Improved Evasion.
-            nDamage = GetReflexAdjustedDamage(nDamage, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_FIRE);
+            nDamage = PRCGetReflexAdjustedDamage(nDamage, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_FIRE);
             //Set the damage effect
             eDam = EffectDamage(nDamage, DAMAGE_TYPE_FIRE);
             if(nDamage > 0)
diff --git a/_module/nss/gzcs_pkeg_ignite.nss b/_module/nss/gzcs_pkeg_ignite.nss
index 7c8b4ee..04fc058 100644
--- a/_module/nss/gzcs_pkeg_ignite.nss
+++ b/_module/nss/gzcs_pkeg_ignite.nss
@@ -1,3 +1,5 @@
+#include "prc_inc_racial"
+
 void DoSmoke()
 {
     effect eSmoke = EffectVisualEffect(VFX_FNF_SMOKE_PUFF);
@@ -13,9 +15,9 @@ void DoFlee()
     {
         if ((!GetIsPC(oTarget)) && GetLocalInt(oTarget,"GZ_CRE_PKEGFLEE")!=TRUE)
         {
-        if (GetRacialType(oTarget) == RACIAL_TYPE_HUMAN || GetRacialType(oTarget) == RACIAL_TYPE_DWARF || GetRacialType(oTarget) == RACIAL_TYPE_ELF || GetRacialType(oTarget) == RACIAL_TYPE_FEY ||
-            GetRacialType(oTarget) == RACIAL_TYPE_GNOME || GetRacialType(oTarget) == RACIAL_TYPE_HALFELF || GetRacialType(oTarget) == RACIAL_TYPE_HALFLING ||
-            GetRacialType(oTarget) == RACIAL_TYPE_HALFORC || GetRacialType(oTarget) == RACIAL_TYPE_OUTSIDER)
+        if (MyPRCGetRacialType(oTarget) == RACIAL_TYPE_HUMAN || MyPRCGetRacialType(oTarget) == RACIAL_TYPE_DWARF || MyPRCGetRacialType(oTarget) == RACIAL_TYPE_ELF || MyPRCGetRacialType(oTarget) == RACIAL_TYPE_FEY ||
+            MyPRCGetRacialType(oTarget) == RACIAL_TYPE_GNOME || MyPRCGetRacialType(oTarget) == RACIAL_TYPE_HALFELF || MyPRCGetRacialType(oTarget) == RACIAL_TYPE_HALFLING ||
+            MyPRCGetRacialType(oTarget) == RACIAL_TYPE_HALFORC || MyPRCGetRacialType(oTarget) == RACIAL_TYPE_OUTSIDER)
             {
                  int nRand=d8();
                  switch(nRand)
diff --git a/_module/nss/gzinc_effecttool.nss b/_module/nss/gzinc_effecttool.nss
index 2312907..27b159b 100644
--- a/_module/nss/gzinc_effecttool.nss
+++ b/_module/nss/gzinc_effecttool.nss
@@ -11,7 +11,7 @@
 //:: Created On: 06-13-2002
 //:://////////////////////////////////////////////
 
-
+#include "prc_inc_spells"
 #include "nw_i0_generic"
 
 /*
@@ -61,7 +61,7 @@ int GZHasNegativeEffects(object oPC)
 
 int GZGetIsBlindOrDeaf(object oPC)
 {
-    int bBlind = ((GetHasEffect(EFFECT_TYPE_BLINDNESS,oPC) == TRUE) || (GetHasEffect(EFFECT_TYPE_DEAF,oPC)==TRUE));
+    int bBlind = ((PRCGetHasEffect(EFFECT_TYPE_BLINDNESS,oPC) == TRUE) || (PRCGetHasEffect(EFFECT_TYPE_DEAF,oPC)==TRUE));
     return bBlind;
 }
 
@@ -73,37 +73,37 @@ int GZGetIsDamaged(object oPC)
 
 int GZGetHasAbilityDamage(object oPC)
 {
-    int bAbilityDmg = (GetHasEffect(EFFECT_TYPE_ABILITY_DECREASE,oPC) == TRUE);
+    int bAbilityDmg = (PRCGetHasEffect(EFFECT_TYPE_ABILITY_DECREASE,oPC) == TRUE);
     return bAbilityDmg;
 }
 
 int GZGetIsPoisoned(object oPC)
 {
-    int bPoisoned = (GetHasEffect(EFFECT_TYPE_POISON,oPC) == TRUE);
+    int bPoisoned = (PRCGetHasEffect(EFFECT_TYPE_POISON,oPC) == TRUE);
     return bPoisoned;
 }
 
 int GZGetIsDiseased(object oPC)
 {
-    int bDiseased = (GetHasEffect(EFFECT_TYPE_DISEASE,oPC) == TRUE);
+    int bDiseased = (PRCGetHasEffect(EFFECT_TYPE_DISEASE,oPC) == TRUE);
     return bDiseased;
 }
 
 int GZGetIsCursed(object oPC)
 {
-    int bCursed = (GetHasEffect(EFFECT_TYPE_CURSE,oPC) == TRUE);
+    int bCursed = (PRCGetHasEffect(EFFECT_TYPE_CURSE,oPC) == TRUE);
     return bCursed;
 }
 
 int GZGetIsPolymorphed(object oPC)
 {
-    int bPoly = (GetHasEffect(EFFECT_TYPE_POLYMORPH,oPC) == TRUE);
+    int bPoly = (PRCGetHasEffect(EFFECT_TYPE_POLYMORPH,oPC) == TRUE);
     return bPoly;
 }
 
 int GZHasNegativeLevels(object oPC)
 {
-    int bLvl = (GetHasEffect(EFFECT_TYPE_NEGATIVELEVEL,oPC) == TRUE);
+    int bLvl = (PRCGetHasEffect(EFFECT_TYPE_NEGATIVELEVEL,oPC) == TRUE);
     return bLvl;
 }
 
diff --git a/_module/nss/hc_grenade.nss b/_module/nss/hc_grenade.nss
index 032f1c9..bff0020 100644
--- a/_module/nss/hc_grenade.nss
+++ b/_module/nss/hc_grenade.nss
@@ -4,7 +4,7 @@
 
 // Modified by Celedhros, 29 July 2002
 // Added PHB deviation rules, enhanced visual effects, and various bug fixes
-
+#include "prc_inc_racial"
 #include "hc_text_grenade"
 
 void main()
@@ -100,7 +100,7 @@ void main()
             DestroyObject(oItem);
             return;
         }
-        if(sNM == "hc_holywater" && GetRacialType(oTarget) != RACIAL_TYPE_UNDEAD)
+        if(sNM == "hc_holywater" && MyPRCGetRacialType(oTarget) != RACIAL_TYPE_UNDEAD)
         {
             SendMessageToPC(oPC, NOEFFECT);
             DestroyObject(oItem);
@@ -169,7 +169,7 @@ void main()
         lTarget = Location(oDeviation,vDeviation,fDeviation);
     }
 //  Apply visual effects at target location
-    if (sNM == "hc_holywater" && GetRacialType(oTarget) == RACIAL_TYPE_UNDEAD && touchAttack == 1)
+    if (sNM == "hc_holywater" && MyPRCGetRacialType(oTarget) == RACIAL_TYPE_UNDEAD && touchAttack == 1)
     {
         ApplyEffectAtLocation(DURATION_TYPE_TEMPORARY, eVis, lTarget);
         ApplyEffectAtLocation(DURATION_TYPE_TEMPORARY, eExplode, lTarget);
@@ -202,7 +202,7 @@ void main()
                 ApplyEffectToObject(DURATION_TYPE_INSTANT, eSplash, oSplashTarget);
             SignalEvent(oSplashTarget, EventSpellCastAt(oPC, SPELL_MAGIC_MISSILE));
             oSplashTarget = GetNextObjectInShape(SHAPE_SPHERE, nSplashRange, lTarget, TRUE, OBJECT_TYPE_CREATURE);
-        } else if (sNM == "hc_holywater" && GetRacialType(oTarget) == RACIAL_TYPE_UNDEAD){
+        } else if (sNM == "hc_holywater" && MyPRCGetRacialType(oTarget) == RACIAL_TYPE_UNDEAD){
 //  Apply holy water splash damage to valid target in radius and get next target
             ApplyEffectToObject(DURATION_TYPE_INSTANT, eSplash, oSplashTarget);
             SignalEvent(oSplashTarget, EventSpellCastAt(oPC, SPELL_MAGIC_MISSILE));
diff --git a/_module/nss/i420_helcat_deth.nss b/_module/nss/i420_helcat_deth.nss
index 9d5acc1..fd9eff4 100644
--- a/_module/nss/i420_helcat_deth.nss
+++ b/_module/nss/i420_helcat_deth.nss
@@ -16,5 +16,5 @@ DelayCommand(1.6,DeathEffect(OBJECT_SELF));
 
 
 givexp(OBJECT_SELF,GetLastKiller());
-
+ExecuteScript("prc_npc_death", OBJECT_SELF);
 }
diff --git a/_module/nss/i420_helcat_spwn.nss b/_module/nss/i420_helcat_spwn.nss
index a03205f..0c253d5 100644
--- a/_module/nss/i420_helcat_spwn.nss
+++ b/_module/nss/i420_helcat_spwn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jhr_i0_pipe.nss b/_module/nss/jhr_i0_pipe.nss
index 786942b..322dc97 100644
--- a/_module/nss/jhr_i0_pipe.nss
+++ b/_module/nss/jhr_i0_pipe.nss
@@ -1,3 +1,5 @@
+#include "prc_inc_racial"
+
 location GetLocationAboveAndInFrontOf(object oPC, float fDist, float fHeight)
 {
     float fDistance = -fDist;
@@ -29,7 +31,7 @@ void SmokePipe(object oActivator)
     // Set height based on race and gender
     if (GetGender(oActivator) == GENDER_MALE)
     {
-        switch (GetRacialType(oActivator))
+        switch (MyPRCGetRacialType(oActivator))
         {
             case RACIAL_TYPE_HUMAN:
             case RACIAL_TYPE_HALFELF:
@@ -62,7 +64,7 @@ void SmokePipe(object oActivator)
     else
     {
         // FEMALES
-        switch (GetRacialType(oActivator))
+        switch (MyPRCGetRacialType(oActivator))
         {
             case RACIAL_TYPE_HUMAN:
             case RACIAL_TYPE_HALFELF:
@@ -121,7 +123,7 @@ void SmokePipe(object oActivator)
     AssignCommand(oActivator, ActionDoCommand(ApplyEffectAtLocation(DURATION_TYPE_INSTANT, EffectVisualEffect(VFX_FNF_SMOKE_PUFF), lAboveHead)));
 
     // if female, turn head to left
-    if ((GetGender(oActivator) == GENDER_FEMALE) && (GetRacialType(oActivator) != RACIAL_TYPE_DWARF))
+    if ((GetGender(oActivator) == GENDER_FEMALE) && (MyPRCGetRacialType(oActivator) != RACIAL_TYPE_DWARF))
         AssignCommand(oActivator, ActionPlayAnimation(ANIMATION_FIREFORGET_HEAD_TURN_LEFT, 1.0, 5.0));
 
     // funky effect
diff --git a/_module/nss/jth_dmwand.nss b/_module/nss/jth_dmwand.nss
index b986ff4..ad8bf50 100644
--- a/_module/nss/jth_dmwand.nss
+++ b/_module/nss/jth_dmwand.nss
@@ -1,8 +1,10 @@
 //////////////////////////////////
-/// Script: jth_dmwand
-/// Purpose: include file for a DM's Helper wand
-/// Author: Dopple (dopple@why-bother-me.com
+//: Script: jth_dmwand
+//: Purpose: include file for a DM's Helper wand
+//: Author: Dopple (dopple@why-bother-me.com
 //////////////////////////////////
+#include "prc_inc_racial"
+
 // function for OnActivateItem
 object oMySpeaker = GetLastSpeaker();
 object oMyTarget = GetLocalObject(oMySpeaker, "dmwandtarget");
@@ -230,7 +232,7 @@ string Alignment(object oEntity)
 string Race(object oEntity)
 {
    // Returns striong version of objects race
-   switch (GetRacialType(oEntity))
+   switch (MyPRCGetRacialType(oEntity))
    {
       case RACIAL_TYPE_ALL:   return "All"; break;
       case RACIAL_TYPE_ANIMAL:   return "Animal"; break;
diff --git a/_module/nss/jw_abbysold_usd.nss b/_module/nss/jw_abbysold_usd.nss
index 781e082..4396149 100644
--- a/_module/nss/jw_abbysold_usd.nss
+++ b/_module/nss/jw_abbysold_usd.nss
@@ -15,6 +15,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_aisha_spawn.nss b/_module/nss/jw_aisha_spawn.nss
index 7b89133..38d45e9 100644
--- a/_module/nss/jw_aisha_spawn.nss
+++ b/_module/nss/jw_aisha_spawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 SetLocalInt(OBJECT_SELF,"njw_current",3);
 SetLocalInt(OBJECT_SELF,"njw_completed",2);
 SetLocalInt(OBJECT_SELF,"njw_steps",0);
diff --git a/_module/nss/jw_aisha_usd.nss b/_module/nss/jw_aisha_usd.nss
index 6681ff1..90b613e 100644
--- a/_module/nss/jw_aisha_usd.nss
+++ b/_module/nss/jw_aisha_usd.nss
@@ -23,6 +23,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
     object oObject;
     int nCounter;
diff --git a/_module/nss/jw_aishatrap_usd.nss b/_module/nss/jw_aishatrap_usd.nss
index 36f1b6f..9a26244 100644
--- a/_module/nss/jw_aishatrap_usd.nss
+++ b/_module/nss/jw_aishatrap_usd.nss
@@ -12,7 +12,10 @@
 //:://////////////////////////////////////////////
 
 void main()
-{    object oObject;
+{
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
+    object oObject;
     int nCounter;
     int nUser = GetUserDefinedEventNumber();
 
diff --git a/_module/nss/jw_andmob1_sp.nss b/_module/nss/jw_andmob1_sp.nss
index 8fd0e7c..8db710d 100644
--- a/_module/nss/jw_andmob1_sp.nss
+++ b/_module/nss/jw_andmob1_sp.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_andmob2_sp.nss b/_module/nss/jw_andmob2_sp.nss
index a779b4c..fd2692e 100644
--- a/_module/nss/jw_andmob2_sp.nss
+++ b/_module/nss/jw_andmob2_sp.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_andmob3_sp.nss b/_module/nss/jw_andmob3_sp.nss
index 4c0d7fb..1c173f6 100644
--- a/_module/nss/jw_andmob3_sp.nss
+++ b/_module/nss/jw_andmob3_sp.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_anhialator_sp.nss b/_module/nss/jw_anhialator_sp.nss
index 0cf313b..59e7e2e 100644
--- a/_module/nss/jw_anhialator_sp.nss
+++ b/_module/nss/jw_anhialator_sp.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_animal_usd.nss b/_module/nss/jw_animal_usd.nss
index 5b00290..f1d9bc1 100644
--- a/_module/nss/jw_animal_usd.nss
+++ b/_module/nss/jw_animal_usd.nss
@@ -15,6 +15,8 @@ int GetFactionEmpskill (object oPC);
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
 int nUser = GetUserDefinedEventNumber();
 if (GetIsPC(GetMaster(OBJECT_SELF)))
 {
diff --git a/_module/nss/jw_asheebalife.nss b/_module/nss/jw_asheebalife.nss
index d9340bd..ada467d 100644
--- a/_module/nss/jw_asheebalife.nss
+++ b/_module/nss/jw_asheebalife.nss
@@ -1,4 +1,5 @@
 #include "NW_I0_GENERIC"
+#include "prc_inc_spells"
 
 /////
 void jw_woken();
@@ -415,7 +416,7 @@ object oTarget;
 if ((!IsInConversation(OBJECT_SELF))&&(!GetIsInCombat(OBJECT_SELF)))
     {
     // if I am asleep
-    if (GetHasEffect(EFFECT_TYPE_SLEEP))
+    if (PRCGetHasEffect(EFFECT_TYPE_SLEEP))
     {
         // get the nearest enemy creature to me
          oTarget = GetNearestCreature(CREATURE_TYPE_PLAYER_CHAR,PLAYER_CHAR_IS_PC);
@@ -467,7 +468,7 @@ int nFoundchair=0;
 {
 
 
- if (GetHasEffect(EFFECT_TYPE_SLEEP))
+ if (PRCGetHasEffect(EFFECT_TYPE_SLEEP))
     {
         effect eSleep = GetFirstEffect(OBJECT_SELF);
             // scroll through my current effects
@@ -829,7 +830,7 @@ void jw_forcewake()
 object oTarget;
 
     // if I am asleep
-    if (GetHasEffect(EFFECT_TYPE_SLEEP))
+    if (PRCGetHasEffect(EFFECT_TYPE_SLEEP))
     {
 
             effect eSleep = GetFirstEffect(OBJECT_SELF);
diff --git a/_module/nss/jw_ball1_spawm.nss b/_module/nss/jw_ball1_spawm.nss
index 3cb196e..cbf77d4 100644
--- a/_module/nss/jw_ball1_spawm.nss
+++ b/_module/nss/jw_ball1_spawm.nss
@@ -23,6 +23,8 @@ DelayCommand(0.5,BurningObject(OBJECT_SELF));
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_bat_usd.nss b/_module/nss/jw_bat_usd.nss
index cd707c6..2af463e 100644
--- a/_module/nss/jw_bat_usd.nss
+++ b/_module/nss/jw_bat_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_bdr_rock_usd.nss b/_module/nss/jw_bdr_rock_usd.nss
index e1f1eb6..b7d0790 100644
--- a/_module/nss/jw_bdr_rock_usd.nss
+++ b/_module/nss/jw_bdr_rock_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
  if(nUser == 50) //boulder smash
diff --git a/_module/nss/jw_belker_spawn.nss b/_module/nss/jw_belker_spawn.nss
index b678a08..5374454 100644
--- a/_module/nss/jw_belker_spawn.nss
+++ b/_module/nss/jw_belker_spawn.nss
@@ -23,6 +23,8 @@ DelayCommand(0.5,BurningObject(OBJECT_SELF));
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_birdy_usd.nss b/_module/nss/jw_birdy_usd.nss
index 84bc70b..b9d387a 100644
--- a/_module/nss/jw_birdy_usd.nss
+++ b/_module/nss/jw_birdy_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
 
 object oObject;
 string sString;
diff --git a/_module/nss/jw_blackswrd_spa.nss b/_module/nss/jw_blackswrd_spa.nss
index a87bbe1..e590037 100644
--- a/_module/nss/jw_blackswrd_spa.nss
+++ b/_module/nss/jw_blackswrd_spa.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_brath_drspawn.nss b/_module/nss/jw_brath_drspawn.nss
index c55807d..4352682 100644
--- a/_module/nss/jw_brath_drspawn.nss
+++ b/_module/nss/jw_brath_drspawn.nss
@@ -15,6 +15,7 @@
 #include "NW_I0_GENERIC"
 #include "nw_i0_spells"
 #include "jw_privates_inc"
+#include "prc_inc_spells"
 
 void BurningObject(object oTarget)
 {
@@ -24,6 +25,8 @@ DelayCommand(0.5,BurningObject(OBJECT_SELF));
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
@@ -94,7 +97,7 @@ void main()
         nAmount = 15;
     }
     int nDamage = nAmount * 10;
-    if (GetMetaMagicFeat() == METAMAGIC_EXTEND)
+    if (PRCGetMetaMagicFeat() == METAMAGIC_EXTEND)
     {
         nDuration *= 2;
     }
diff --git a/_module/nss/jw_bunt_spn.nss b/_module/nss/jw_bunt_spn.nss
index 18d08ff..bbb32ee 100644
--- a/_module/nss/jw_bunt_spn.nss
+++ b/_module/nss/jw_bunt_spn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_carytid_usd.nss b/_module/nss/jw_carytid_usd.nss
index 1bb8724..62c8f79 100644
--- a/_module/nss/jw_carytid_usd.nss
+++ b/_module/nss/jw_carytid_usd.nss
@@ -15,6 +15,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_ccoffin_usd.nss b/_module/nss/jw_ccoffin_usd.nss
index bb0aea9..5905ccd 100644
--- a/_module/nss/jw_ccoffin_usd.nss
+++ b/_module/nss/jw_ccoffin_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
     object oObject;
     effect eEffect;
diff --git a/_module/nss/jw_chck_notorc.nss b/_module/nss/jw_chck_notorc.nss
index ad18464..65af1f5 100644
--- a/_module/nss/jw_chck_notorc.nss
+++ b/_module/nss/jw_chck_notorc.nss
@@ -5,11 +5,13 @@
 //:: Created By: Script Wizard
 //:: Created On: 13/08/2002 15:46:13
 //:://////////////////////////////////////////////
+#include "prc_inc_racial"
+
 int StartingConditional()
 {
 
 	// Reject player races
-	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_HALFORC)
+	if(MyPRCGetRacialType(GetPCSpeaker()) == RACIAL_TYPE_HALFORC)
 		return FALSE;
 
 	// Reject other races
diff --git a/_module/nss/jw_check_is_bard.nss b/_module/nss/jw_check_is_bard.nss
index 1f67acf..a2fa295 100644
--- a/_module/nss/jw_check_is_bard.nss
+++ b/_module/nss/jw_check_is_bard.nss
@@ -5,13 +5,25 @@
 //:: Created By: Script Wizard
 //:: Created On: 27/08/2002 01:36:24
 //:://////////////////////////////////////////////
+#include "prc_class_const"
+
 int StartingConditional()
 {
-
+	object oPC = GetPCSpeaker();
+	
+	int iBard = GetLevelByClass(CLASS_TYPE_BARD, oPC) +
+				GetLevelByClass(CLASS_TYPE_HARPER, oPC) +
+				GetLevelByClass(CLASS_TYPE_DIRGESINGER, oPC) +
+				GetLevelByClass(CLASS_TYPE_DRAGONSONG_LYRIST, oPC) +
+				GetLevelByClass(CLASS_TYPE_SUBLIME_CHORD, oPC) +
+				GetLevelByClass(CLASS_TYPE_VIRTUOSO, oPC);
+				
 	// Restrict based on the player's class
 	int iPassed = 0;
-	if(GetLevelByClass(CLASS_TYPE_BARD, GetPCSpeaker()) >= 1)
+	
+	if(iBard >= 1)
 		iPassed = 1;
+	
 	if(iPassed == 0)
 		return FALSE;
 
diff --git a/_module/nss/jw_check_rog.nss b/_module/nss/jw_check_rog.nss
index c64ad01..d3745a2 100644
--- a/_module/nss/jw_check_rog.nss
+++ b/_module/nss/jw_check_rog.nss
@@ -5,13 +5,25 @@
 //:: Created By: Script Wizard
 //:: Created On: 16/03/2003 17:00:27
 //:://////////////////////////////////////////////
+#include "prc_class_const"
+
 int StartingConditional()
 {
-
+	object oPC = GetPCSpeaker();
+	
+	int iRogue	= GetLevelByClass(CLASS_TYPE_ROGUE, oPC)
+				+ GetLevelByClass(CLASS_TYPE_SCOUT, oPC)
+				+ GetLevelByClass(CLASS_TYPE_BEGUILER, oPC)
+				+ GetLevelByClass(CLASS_TYPE_NINJA, oPC)
+				+ GetLevelByClass(CLASS_TYPE_FACTOTUM, oPC)
+				+ GetLevelByClass(CLASS_TYPE_PSYCHIC_ROGUE, oPC);
+				
 	// Restrict based on the player's class
 	int iPassed = 0;
-	if(GetLevelByClass(CLASS_TYPE_ROGUE, GetPCSpeaker()) >= 1)
+	
+	if(iRogue >= 1)
 		iPassed = 1;
+	
 	if(iPassed == 0)
 		return FALSE;
 
diff --git a/_module/nss/jw_chieforc_usd.nss b/_module/nss/jw_chieforc_usd.nss
index 855303b..e227bbc 100644
--- a/_module/nss/jw_chieforc_usd.nss
+++ b/_module/nss/jw_chieforc_usd.nss
@@ -15,6 +15,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_chk_isdwarf.nss b/_module/nss/jw_chk_isdwarf.nss
index bca9732..c461289 100644
--- a/_module/nss/jw_chk_isdwarf.nss
+++ b/_module/nss/jw_chk_isdwarf.nss
@@ -1,11 +1,24 @@
 //::///////////////////////////////////////////////
 //:: FileName jw_chk_isdwarf
+//::
+//:: Dupe of: fr_race_dwarf
+//::
 //:://////////////////////////////////////////////
-//:://////////////////////////////////////////////
-//:: Created By: Script Wizard
-//:: Created On: 20/04/2003 15:56:25
-//:://////////////////////////////////////////////
+#include "prc_inc_racial"
+
+//:: Returns TRUE if PC is a dwarf
 int StartingConditional()
+{
+	object oPC = GetPCSpeaker();
+
+    if(!(MyPRCGetRacialType(oPC) == RACIAL_TYPE_DWARF))
+        return FALSE;
+	
+     return TRUE;
+}
+
+
+/* int StartingConditional()
 {
 
 	// Reject player races
@@ -60,3 +73,4 @@ int StartingConditional()
 
 	return TRUE;
 }
+ */
\ No newline at end of file
diff --git a/_module/nss/jw_chk_not_dwarf.nss b/_module/nss/jw_chk_not_dwarf.nss
index f7f736d..12138eb 100644
--- a/_module/nss/jw_chk_not_dwarf.nss
+++ b/_module/nss/jw_chk_not_dwarf.nss
@@ -1,11 +1,56 @@
 //::///////////////////////////////////////////////
 //:: FileName jw_chk_not_dwarf
 //:://////////////////////////////////////////////
-//:://////////////////////////////////////////////
-//:: Created By: Script Wizard
-//:: Created On: 20/04/2003 19:14:24
-//:://////////////////////////////////////////////
+#include "prc_inc_racial"
+
+//:: Returns FALSE if PC is a dwarf
 int StartingConditional()
+{
+	object oPC = GetPCSpeaker();
+
+	// Reject other races
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_ABERRATION)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_ANIMAL)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_BEAST)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_CONSTRUCT)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_DRAGON)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_ELEMENTAL)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_FEY)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_GIANT)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_HUMANOID_GOBLINOID)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_MAGICAL_BEAST)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_HUMANOID_MONSTROUS)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_HUMANOID_ORC)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_OUTSIDER)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_HUMANOID_REPTILIAN)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_SHAPECHANGER)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_UNDEAD)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_VERMIN)
+		return FALSE;
+	
+	if(MyPRCGetRacialType(oPC) == RACIAL_TYPE_DWARF)
+		return FALSE;
+	
+    return TRUE;
+}
+
+/* int StartingConditional()
 {
 
 	// Reject player races
@@ -49,4 +94,4 @@ int StartingConditional()
 		return FALSE;
 
 	return TRUE;
-}
+} */
diff --git a/_module/nss/jw_chkelfhalfelf.nss b/_module/nss/jw_chkelfhalfelf.nss
index 6568430..ace4a25 100644
--- a/_module/nss/jw_chkelfhalfelf.nss
+++ b/_module/nss/jw_chkelfhalfelf.nss
@@ -1,11 +1,26 @@
 //::///////////////////////////////////////////////
 //:: FileName jw_chkelfhalfelf
+//::
+//:: Dupe of: fr_if_elf
 //:://////////////////////////////////////////////
-//:://////////////////////////////////////////////
-//:: Created By: Script Wizard
-//:: Created On: 11/10/2002 19:05:09
-//:://////////////////////////////////////////////
+#include "prc_inc_racial"
+
+//:: Returns TRUE if PC is an elf or half-elf
 int StartingConditional()
+{
+    object oPC = GetPCSpeaker();
+
+    if (!(MyPRCGetRacialType(oPC) == RACIAL_TYPE_ELF
+	|| MyPRCGetRacialType(oPC) == RACIAL_TYPE_HALFELF))
+    {
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+
+/* int StartingConditional()
 {
 
 	// Reject player races
@@ -58,3 +73,4 @@ int StartingConditional()
 
 	return TRUE;
 }
+ */
\ No newline at end of file
diff --git a/_module/nss/jw_chkelfhellr15.nss b/_module/nss/jw_chkelfhellr15.nss
index 96d2877..9410ba6 100644
--- a/_module/nss/jw_chkelfhellr15.nss
+++ b/_module/nss/jw_chkelfhellr15.nss
@@ -1,11 +1,31 @@
 //::///////////////////////////////////////////////
 //:: FileName jw_chkelfhalfelf
 //:://////////////////////////////////////////////
-//:://////////////////////////////////////////////
-//:: Created By: Script Wizard
-//:: Created On: 11/10/2002 19:05:09
-//:://////////////////////////////////////////////
+#include "prc_inc_racial"
+
+//:: Returns TRUE if PC is an elf or half-elf
+//:: or has a Lore of 15 ranks or more.
 int StartingConditional()
+{
+    object oPC = GetPCSpeaker();
+
+    if (GetSkillRank(SKILL_LORE, oPC) > 14)
+    {
+		return TRUE;
+    }
+	
+    if (!(MyPRCGetRacialType(oPC) == RACIAL_TYPE_ELF
+	|| MyPRCGetRacialType(oPC) == RACIAL_TYPE_HALFELF))
+    {
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+
+
+/* int StartingConditional()
 {
 
     if (GetSkillRank(SKILL_LORE,GetPCSpeaker())>14)
@@ -64,3 +84,4 @@ int StartingConditional()
 
     return TRUE;
 }
+ */
\ No newline at end of file
diff --git a/_module/nss/jw_chknothuman.nss b/_module/nss/jw_chknothuman.nss
index 4ff5940..dd18783 100644
--- a/_module/nss/jw_chknothuman.nss
+++ b/_module/nss/jw_chknothuman.nss
@@ -1,11 +1,57 @@
 //::///////////////////////////////////////////////
 //:: FileName jw_chknothuman
 //:://////////////////////////////////////////////
-//:://////////////////////////////////////////////
-//:: Created By: Script Wizard
-//:: Created On: 11/10/2002 19:23:01
-//:://////////////////////////////////////////////
+#include "prc_inc_racial"
+
+//:: Returns TRUE if PC is not a human
 int StartingConditional()
+{
+    object oPC = GetPCSpeaker();
+
+    if (!(MyPRCGetRacialType(oPC) == RACIAL_TYPE_HUMAN))
+    {
+        return FALSE;
+    }
+
+// Reject other races
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_ABERRATION)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_ANIMAL)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_BEAST)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_CONSTRUCT)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_DRAGON)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_ELEMENTAL)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_FEY)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_GIANT)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_HUMANOID_GOBLINOID)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_MAGICAL_BEAST)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_HUMANOID_MONSTROUS)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_HUMANOID_ORC)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_OUTSIDER)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_HUMANOID_REPTILIAN)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_SHAPECHANGER)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_UNDEAD)
+		return FALSE;
+	if(GetRacialType(GetPCSpeaker()) == RACIAL_TYPE_VERMIN)
+		return FALSE;
+    return TRUE;
+}
+
+/* int StartingConditional()
 {
 
 	// Reject player races
@@ -50,3 +96,4 @@ int StartingConditional()
 
 	return TRUE;
 }
+ */
\ No newline at end of file
diff --git a/_module/nss/jw_chourm_usd.nss b/_module/nss/jw_chourm_usd.nss
index 63329ed..8d26fd6 100644
--- a/_module/nss/jw_chourm_usd.nss
+++ b/_module/nss/jw_chourm_usd.nss
@@ -15,6 +15,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_commoner_spaw.nss b/_module/nss/jw_commoner_spaw.nss
index e3cef37..e0aca53 100644
--- a/_module/nss/jw_commoner_spaw.nss
+++ b/_module/nss/jw_commoner_spaw.nss
@@ -17,6 +17,7 @@
 
 void main()
 {
+ExecuteScript("prc_npc_spawn", OBJECT_SELF);
 
 SetLocalInt(OBJECT_SELF,"njw_current",3);
 SetLocalInt(OBJECT_SELF,"njw_completed",2);
diff --git a/_module/nss/jw_conisdwarf.nss b/_module/nss/jw_conisdwarf.nss
index c61f575..5c109f4 100644
--- a/_module/nss/jw_conisdwarf.nss
+++ b/_module/nss/jw_conisdwarf.nss
@@ -1,11 +1,23 @@
 //::///////////////////////////////////////////////
 //:: FileName jw_conisdwarf
+//::
+//:: Dupe of: fr_if_dwarf02
+//::
 //:://////////////////////////////////////////////
-//:://////////////////////////////////////////////
-//:: Created By: Script Wizard
-//:: Created On: 04/08/2002 10:39:31
-//:://////////////////////////////////////////////
+#include "prc_inc_racial"
+
+//:: Returns TRUE if PC is a dwarf
 int StartingConditional()
+{
+	object oPC = GetPCSpeaker();
+
+    if(!(MyPRCGetRacialType(oPC) == RACIAL_TYPE_DWARF))
+        return FALSE;
+	
+     return TRUE;
+}
+
+/* int StartingConditional()
 {
 
 	// Reject player races
@@ -60,3 +72,4 @@ int StartingConditional()
 
 	return TRUE;
 }
+ */
\ No newline at end of file
diff --git a/_module/nss/jw_corky_spawn.nss b/_module/nss/jw_corky_spawn.nss
index d39d468..1057ee1 100644
--- a/_module/nss/jw_corky_spawn.nss
+++ b/_module/nss/jw_corky_spawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_corky_usd.nss b/_module/nss/jw_corky_usd.nss
index bd4f0fc..0a7e32c 100644
--- a/_module/nss/jw_corky_usd.nss
+++ b/_module/nss/jw_corky_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_custom_spells.nss b/_module/nss/jw_custom_spells.nss
index dc3e67f..2b86fc1 100644
--- a/_module/nss/jw_custom_spells.nss
+++ b/_module/nss/jw_custom_spells.nss
@@ -1,5 +1,7 @@
 
 #include "NW_I0_SPELLS"
+#include "prc_inc_spells"
+
 // The creature running this script tries to use a medicine bag on oTarget
 void medicinebag(object oTarget);
 // Paladin uses holy symbol. nLevel is the paladin level
@@ -442,7 +444,7 @@ void cascade(object oTarget)
         if (!ScrollResist(OBJECT_SELF, oFirstTarget))
         {
             //Adjust damage via Reflex Save or Evasion or Improved Evasion
-            nDamStrike = GetReflexAdjustedDamage(nDamage, oFirstTarget, 24, SAVING_THROW_TYPE_FIRE);
+            nDamStrike = PRCGetReflexAdjustedDamage(nDamage, oFirstTarget, 24, SAVING_THROW_TYPE_FIRE);
             //Set the damage effect for the first target
             eDamage = EffectDamage(nDamStrike, DAMAGE_TYPE_FIRE);
             //Apply damage to the first target and the VFX impact.
@@ -478,7 +480,7 @@ void cascade(object oTarget)
                 nDamage = d6(nCasterLevel);
 
                 //Adjust damage via Reflex Save or Evasion or Improved Evasion
-                nDamStrike = GetReflexAdjustedDamage(nDamage, oTarget, 24, SAVING_THROW_TYPE_FIRE);
+                nDamStrike = PRCGetReflexAdjustedDamage(nDamage, oTarget, 24, SAVING_THROW_TYPE_FIRE);
                 //Apply the damage and VFX impact to the current target
                 eDamage = EffectDamage(nDamStrike, DAMAGE_TYPE_FIRE);
                 if(nDamStrike > 0) //age > 0)
@@ -578,7 +580,7 @@ void minorcascade(object oTarget)
         if (!ScrollResist(OBJECT_SELF, oFirstTarget))
         {
             //Adjust damage via Reflex Save or Evasion or Improved Evasion
-            nDamStrike = GetReflexAdjustedDamage(nDamage, oFirstTarget, 24, SAVING_THROW_TYPE_FIRE);
+            nDamStrike = PRCGetReflexAdjustedDamage(nDamage, oFirstTarget, 24, SAVING_THROW_TYPE_FIRE);
             //Set the damage effect for the first target
             eDamage = EffectDamage(nDamStrike, DAMAGE_TYPE_FIRE);
             //Apply damage to the first target and the VFX impact.
@@ -614,7 +616,7 @@ void minorcascade(object oTarget)
                 nDamage = d6(nCasterLevel);
 
                 //Adjust damage via Reflex Save or Evasion or Improved Evasion
-                nDamStrike = GetReflexAdjustedDamage(nDamage, oTarget, 24, SAVING_THROW_TYPE_FIRE);
+                nDamStrike = PRCGetReflexAdjustedDamage(nDamage, oTarget, 24, SAVING_THROW_TYPE_FIRE);
                 //Apply the damage and VFX impact to the current target
                 eDamage = EffectDamage(nDamStrike, DAMAGE_TYPE_FIRE);
                 if(nDamStrike > 0) //age > 0)
@@ -704,19 +706,19 @@ void garrote(object oTarget, int nStrength)
     return;
     }
 
-    if (GetRacialType(oTarget)==RACIAL_TYPE_UNDEAD)
+    if (MyPRCGetRacialType(oTarget)==RACIAL_TYPE_UNDEAD)
     {
     DelayCommand(fDelay,FloatingTextStringOnCreature("Undead cannot be strangled",OBJECT_SELF));
     return;
     }
 
-    if (GetRacialType(oTarget)==RACIAL_TYPE_ELEMENTAL)
+    if (MyPRCGetRacialType(oTarget)==RACIAL_TYPE_ELEMENTAL)
     {
     DelayCommand(fDelay,FloatingTextStringOnCreature("Elementals cannot be strangled",OBJECT_SELF));
     return;
     }
 
-    if (GetRacialType(oTarget)==RACIAL_TYPE_CONSTRUCT)
+    if (MyPRCGetRacialType(oTarget)==RACIAL_TYPE_CONSTRUCT)
     {
     DelayCommand(fDelay,FloatingTextStringOnCreature("Constructs cannot be strangled",OBJECT_SELF));
     return;
@@ -949,26 +951,26 @@ void blindust(object oVictim)
     {
 
 // Dont have any effect on Undead/Magical Beasts/Elementals and Constructs
-             if(GetRacialType(oVictim) == RACIAL_TYPE_UNDEAD)
+             if(MyPRCGetRacialType(oVictim) == RACIAL_TYPE_UNDEAD)
         {
 
             SendMessageToPC(oRogue, "The dust has no effect on this kind of target");
 
             return;
                     }
-             if(GetRacialType(oVictim) == RACIAL_TYPE_MAGICAL_BEAST)
+             if(MyPRCGetRacialType(oVictim) == RACIAL_TYPE_MAGICAL_BEAST)
         {
             SendMessageToPC(oRogue, "The dust has no effect on this kind of target");
 
             return;
         }
-            if(GetRacialType(oVictim) == RACIAL_TYPE_ELEMENTAL)
+            if(MyPRCGetRacialType(oVictim) == RACIAL_TYPE_ELEMENTAL)
         {
             SendMessageToPC(oRogue, "The dust has no effect on this kind of target");
 
             return;
         }
-            if(GetRacialType(oVictim) == RACIAL_TYPE_CONSTRUCT)
+            if(MyPRCGetRacialType(oVictim) == RACIAL_TYPE_CONSTRUCT)
         {
             SendMessageToPC(oRogue, "The dust has no effect on this kind of target");
 
diff --git a/_module/nss/jw_cvamp_spawn.nss b/_module/nss/jw_cvamp_spawn.nss
index 8317382..c99bdbb 100644
--- a/_module/nss/jw_cvamp_spawn.nss
+++ b/_module/nss/jw_cvamp_spawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_cvamp_usd.nss b/_module/nss/jw_cvamp_usd.nss
index 78af352..1218c05 100644
--- a/_module/nss/jw_cvamp_usd.nss
+++ b/_module/nss/jw_cvamp_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_cvmp1_shd_usd.nss b/_module/nss/jw_cvmp1_shd_usd.nss
index 9995e7b..2e6a917 100644
--- a/_module/nss/jw_cvmp1_shd_usd.nss
+++ b/_module/nss/jw_cvmp1_shd_usd.nss
@@ -15,6 +15,8 @@
 //:://////////////////////////////////////////////
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nEvent = GetUserDefinedEventNumber();
     if (nEvent == 7777)
     {     SetCommandable(TRUE);
diff --git a/_module/nss/jw_deathbri2_usd.nss b/_module/nss/jw_deathbri2_usd.nss
index 304023d..f3b7c55 100644
--- a/_module/nss/jw_deathbri2_usd.nss
+++ b/_module/nss/jw_deathbri2_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_deepgnone_sp.nss b/_module/nss/jw_deepgnone_sp.nss
index 53fb134..e0e015c 100644
--- a/_module/nss/jw_deepgnone_sp.nss
+++ b/_module/nss/jw_deepgnone_sp.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_deepminer_sp.nss b/_module/nss/jw_deepminer_sp.nss
index 178d6b1..dbb4564 100644
--- a/_module/nss/jw_deepminer_sp.nss
+++ b/_module/nss/jw_deepminer_sp.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_deer_spawn.nss b/_module/nss/jw_deer_spawn.nss
index 0837cea..0af0254 100644
--- a/_module/nss/jw_deer_spawn.nss
+++ b/_module/nss/jw_deer_spawn.nss
@@ -18,6 +18,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 SetStartLocation();
 
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
diff --git a/_module/nss/jw_deer_usd.nss b/_module/nss/jw_deer_usd.nss
index 47d1502..61b0c49 100644
--- a/_module/nss/jw_deer_usd.nss
+++ b/_module/nss/jw_deer_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
 
 object oObject;
 string sString;
diff --git a/_module/nss/jw_deformgard_sp.nss b/_module/nss/jw_deformgard_sp.nss
index 7278085..916ee66 100644
--- a/_module/nss/jw_deformgard_sp.nss
+++ b/_module/nss/jw_deformgard_sp.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_disbeast_spaw.nss b/_module/nss/jw_disbeast_spaw.nss
index 3bbe052..11a7752 100644
--- a/_module/nss/jw_disbeast_spaw.nss
+++ b/_module/nss/jw_disbeast_spaw.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_dog_usd.nss b/_module/nss/jw_dog_usd.nss
index 9973443..ef7ba1f 100644
--- a/_module/nss/jw_dog_usd.nss
+++ b/_module/nss/jw_dog_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
 
 object oObject;
 string sString;
diff --git a/_module/nss/jw_dogdoor_usd.nss b/_module/nss/jw_dogdoor_usd.nss
index 14ecfdc..b2eda44 100644
--- a/_module/nss/jw_dogdoor_usd.nss
+++ b/_module/nss/jw_dogdoor_usd.nss
@@ -14,6 +14,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
 object oObject;
 int nCounter;
 int nIdx;
diff --git a/_module/nss/jw_doordummy_spa.nss b/_module/nss/jw_doordummy_spa.nss
index 4db1726..6a1c8a5 100644
--- a/_module/nss/jw_doordummy_spa.nss
+++ b/_module/nss/jw_doordummy_spa.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //ApplyEffectToObject(DURATION_TYPE_PERMANENT,EffectVisualEffect(VFX_DUR_GHOSTLY_PULSE),OBJECT_SELF);
      SetStartLocation();
 
diff --git a/_module/nss/jw_doordummy_usd.nss b/_module/nss/jw_doordummy_usd.nss
index a290b22..0827077 100644
--- a/_module/nss/jw_doordummy_usd.nss
+++ b/_module/nss/jw_doordummy_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
 object oObject;
 int nCounter;
 
diff --git a/_module/nss/jw_dopple_spawn.nss b/_module/nss/jw_dopple_spawn.nss
index c4282f1..356229a 100644
--- a/_module/nss/jw_dopple_spawn.nss
+++ b/_module/nss/jw_dopple_spawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_dopple_usd.nss b/_module/nss/jw_dopple_usd.nss
index 54be2f1..27e5cc0 100644
--- a/_module/nss/jw_dopple_usd.nss
+++ b/_module/nss/jw_dopple_usd.nss
@@ -16,6 +16,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_drag_usd.nss b/_module/nss/jw_drag_usd.nss
index b656d13..408760c 100644
--- a/_module/nss/jw_drag_usd.nss
+++ b/_module/nss/jw_drag_usd.nss
@@ -15,6 +15,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_dragon_spawn.nss b/_module/nss/jw_dragon_spawn.nss
index 53d8eae..8bf57c8 100644
--- a/_module/nss/jw_dragon_spawn.nss
+++ b/_module/nss/jw_dragon_spawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_dridvamp_sp.nss b/_module/nss/jw_dridvamp_sp.nss
index 5d3852e..20c5202 100644
--- a/_module/nss/jw_dridvamp_sp.nss
+++ b/_module/nss/jw_dridvamp_sp.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_dridvamp_usd.nss b/_module/nss/jw_dridvamp_usd.nss
index d178d66..c06d0b8 100644
--- a/_module/nss/jw_dridvamp_usd.nss
+++ b/_module/nss/jw_dridvamp_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     location lLoc;
diff --git a/_module/nss/jw_drowboss_spaw.nss b/_module/nss/jw_drowboss_spaw.nss
index 318e2dd..9f701e8 100644
--- a/_module/nss/jw_drowboss_spaw.nss
+++ b/_module/nss/jw_drowboss_spaw.nss
@@ -19,6 +19,8 @@ void generate();
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_drowchief_usd.nss b/_module/nss/jw_drowchief_usd.nss
index 5c7e84e..1e86f10 100644
--- a/_module/nss/jw_drowchief_usd.nss
+++ b/_module/nss/jw_drowchief_usd.nss
@@ -15,6 +15,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_drunk_usd.nss b/_module/nss/jw_drunk_usd.nss
index 646aa47..a8813ec 100644
--- a/_module/nss/jw_drunk_usd.nss
+++ b/_module/nss/jw_drunk_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_duergasla_usd.nss b/_module/nss/jw_duergasla_usd.nss
index 6bb6fa5..f1ca894 100644
--- a/_module/nss/jw_duergasla_usd.nss
+++ b/_module/nss/jw_duergasla_usd.nss
@@ -13,6 +13,8 @@
 #include "NW_I0_GENERIC"
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
 int nRandom;
 object oObject;
 
diff --git a/_module/nss/jw_erthb_spawn.nss b/_module/nss/jw_erthb_spawn.nss
index 6c8c23f..e8fcf95 100644
--- a/_module/nss/jw_erthb_spawn.nss
+++ b/_module/nss/jw_erthb_spawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_erthbetfog_a.nss b/_module/nss/jw_erthbetfog_a.nss
index 6e56612..90f81eb 100644
--- a/_module/nss/jw_erthbetfog_a.nss
+++ b/_module/nss/jw_erthbetfog_a.nss
@@ -13,6 +13,7 @@
 //:: Created On: May 25, 2001
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
+#include "prc_inc_spells"
 
 void main()
 {
@@ -35,7 +36,7 @@ void main()
                 //Fire cast spell at event for the specified target
                 SignalEvent(oTarget, EventSpellCastAt(OBJECT_SELF, SPELLABILITY_TYRANT_FOG_MIST));
                 //Make a saving throw check
-                if(!MySavingThrow(SAVING_THROW_FORT, oTarget, 15, SAVING_THROW_TYPE_POISON))
+                if(!PRCMySavingThrow(SAVING_THROW_FORT, oTarget, 15, SAVING_THROW_TYPE_POISON))
                 {
                     //Apply the VFX impact and effects
                     ApplyEffectToObject(DURATION_TYPE_TEMPORARY, eLink, oTarget, RoundsToSeconds(4));
diff --git a/_module/nss/jw_erthbt_sp.nss b/_module/nss/jw_erthbt_sp.nss
index 5ff2269..9568366 100644
--- a/_module/nss/jw_erthbt_sp.nss
+++ b/_module/nss/jw_erthbt_sp.nss
@@ -14,6 +14,8 @@ const int EVENT_USER_DEFINED_PRESPAWN = 1510;
 const int EVENT_USER_DEFINED_POSTSPAWN = 1511;
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == EVENT_HEARTBEAT ) //HEARTBEAT
diff --git a/_module/nss/jw_exp_functions.nss b/_module/nss/jw_exp_functions.nss
index f654071..ca168c8 100644
--- a/_module/nss/jw_exp_functions.nss
+++ b/_module/nss/jw_exp_functions.nss
@@ -1,3 +1,5 @@
+#include "prc_inc_racial"
+
 // returns TRUE if the PC qualifies for a multiclass penalty, FALSE if not
 int Multipen(object oPC);
 // Returns a float which can be more than 1 if the mob is higher level than the party, and less than
@@ -11,13 +13,18 @@ int PCHasExpToLevel(object oObject);
 
 int Multipen(object oPC)
 {
-
-
 int nClass1=GetClassByPosition(1,oPC);
 int nClass2=GetClassByPosition(2,oPC);
 int nClass3=GetClassByPosition(3,oPC);
+int nClass4=GetClassByPosition(4,oPC);
+int nClass5=GetClassByPosition(5,oPC);
+int nClass6=GetClassByPosition(6,oPC);
+int nClass7=GetClassByPosition(7,oPC);
+int nClass8=GetClassByPosition(8,oPC);
 
-if ((nClass1==CLASS_TYPE_ARCANE_ARCHER)||(nClass1==CLASS_TYPE_ASSASSIN)|| (nClass1==CLASS_TYPE_BLACKGUARD)||(nClass1==CLASS_TYPE_HARPER)||(nClass1==CLASS_TYPE_SHADOWDANCER)||(nClass1==CLASS_TYPE_ANIMAL)||(nClass1==CLASS_TYPE_DIVINECHAMPION)||(nClass1==CLASS_TYPE_DRAGONDISCIPLE)||(nClass1==CLASS_TYPE_DWARVENDEFENDER)||(nClass1==CLASS_TYPE_PALEMASTER)||(nClass1==CLASS_TYPE_SHIFTER)||(nClass1==CLASS_TYPE_WEAPON_MASTER))
+
+//::: Yeah, not doing this bullshit  -Jaysyn
+/* if ((nClass1==CLASS_TYPE_ARCANE_ARCHER)||(nClass1==CLASS_TYPE_ASSASSIN)|| (nClass1==CLASS_TYPE_BLACKGUARD)||(nClass1==CLASS_TYPE_HARPER)||(nClass1==CLASS_TYPE_SHADOWDANCER)||(nClass1==CLASS_TYPE_ANIMAL)||(nClass1==CLASS_TYPE_DIVINECHAMPION)||(nClass1==CLASS_TYPE_DRAGONDISCIPLE)||(nClass1==CLASS_TYPE_DWARVENDEFENDER)||(nClass1==CLASS_TYPE_PALEMASTER)||(nClass1==CLASS_TYPE_SHIFTER)||(nClass1==CLASS_TYPE_WEAPON_MASTER))
 {
  nClass1=CLASS_TYPE_INVALID;
 }
@@ -31,26 +38,27 @@ if ((nClass3==CLASS_TYPE_ARCANE_ARCHER)||(nClass3==CLASS_TYPE_ASSASSIN)|| (nClas
 {
  nClass3=CLASS_TYPE_INVALID;
 }
-
-
-
+ */
 int nLevel1=GetLevelByClass(nClass1,oPC);
 int nLevel2=GetLevelByClass(nClass2,oPC);
 int nLevel3=GetLevelByClass(nClass3,oPC);
+int nLevel4=GetLevelByClass(nClass4,oPC);
+int nLevel5=GetLevelByClass(nClass5,oPC);
+int nLevel6=GetLevelByClass(nClass6,oPC);
+int nLevel7=GetLevelByClass(nClass7,oPC);
+int nLevel8=GetLevelByClass(nClass8,oPC);
 
-int nRace=GetRacialType(oPC);
+int nRace = GetRacialType(oPC);
 
 int nFavoured;
 
 // favoured == 99 means any
 
-int nProblem1=0;
-int nProblem2=0;
-int nProblem3=0;
+int nProblem1 = 0;
+int nProblem2 = 0;
+int nProblem3 = 0;
 
-
-
-int nPenalty=0;
+int nPenalty = 0;
 
 if (nRace==RACIAL_TYPE_DWARF)         //RACIAL_TYPE_DWARF
    {nFavoured=CLASS_TYPE_FIGHTER;}
diff --git a/_module/nss/jw_firefun_spell.nss b/_module/nss/jw_firefun_spell.nss
index 99acace..6e4e646 100644
--- a/_module/nss/jw_firefun_spell.nss
+++ b/_module/nss/jw_firefun_spell.nss
@@ -1,3 +1,5 @@
+#include "prc_inc_spells"
+
 void main()
 {
 // will only do it every so often
@@ -66,7 +68,7 @@ int iSpell=GetLastSpell();
                     //Resolve metamagic
 
                     //Adjust the damage based on the Reflex Save, Evasion and Improved Evasion.
-                    nDamage = GetReflexAdjustedDamage(nDamage, oTarget, 20, SAVING_THROW_TYPE_FIRE);
+                    nDamage = PRCGetReflexAdjustedDamage(nDamage, oTarget, 20, SAVING_THROW_TYPE_FIRE);
                     //Set the damage effect
                     eDam = EffectDamage(nDamage, DAMAGE_TYPE_FIRE);
                     if(nDamage > 0)
diff --git a/_module/nss/jw_firemon_sp.nss b/_module/nss/jw_firemon_sp.nss
index 00f7192..64650f8 100644
--- a/_module/nss/jw_firemon_sp.nss
+++ b/_module/nss/jw_firemon_sp.nss
@@ -24,6 +24,8 @@ DelayCommand(0.4,BurningObject(OBJECT_SELF));
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_firemonster_u.nss b/_module/nss/jw_firemonster_u.nss
index 126d67f..ba90dcc 100644
--- a/_module/nss/jw_firemonster_u.nss
+++ b/_module/nss/jw_firemonster_u.nss
@@ -13,6 +13,7 @@
 #include "jw_custom_spells"
 #include "NW_I0_GENERIC"
 #include "jw_privates_inc"
+#include "prc_inc_spells"
 
 // do the custom firesstorm effect
 void firestorm();
@@ -147,7 +148,7 @@ void firestorm()
                 //Fire cast spell at event for the specified target
                 SignalEvent(oTarget, EventSpellCastAt(OBJECT_SELF, SPELL_FIRE_STORM));
                 //Make SR check, and appropriate saving throw(s).
-                if (!MyResistSpell(OBJECT_SELF, oTarget, fDelay))
+                if (!PRCDoResistSpell(OBJECT_SELF, oTarget, FloatToInt(fDelay)))
                 {
                       //Roll Damage
                       nDamage = d6(nCasterLevel);
@@ -161,8 +162,8 @@ void firestorm()
                          nDamage = nDamage + (nDamage/2);//Damage/Healing is +50%
                       }
                       //Save versus both holy and fire damage
-                      nDamage = GetReflexAdjustedDamage(nDamage/2, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_FIRE);
-                      nDamage2 = GetReflexAdjustedDamage(nDamage/2, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_DIVINE);
+                      nDamage = PRCGetReflexAdjustedDamage(nDamage/2, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_FIRE);
+                      nDamage2 = PRCGetReflexAdjustedDamage(nDamage/2, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_DIVINE);
                     if(nDamage > 0)
                     {
                           // Apply effects to the currently selected target.  For this spell we have used
@@ -192,7 +193,7 @@ void wallfire()
     {
         nDuration = 1;
     }
-    int nMetaMagic = GetMetaMagicFeat();
+    int nMetaMagic = PRCGetMetaMagicFeat();
 
         //Check fort metamagic
         if (nMetaMagic == METAMAGIC_EXTEND)
@@ -228,7 +229,7 @@ void lessercascade()
         if (!ScrollResist(OBJECT_SELF, oFirstTarget))
         {
             //Adjust damage via Reflex Save or Evasion or Improved Evasion
-            nDamStrike = GetReflexAdjustedDamage(nDamage, oFirstTarget, 24, SAVING_THROW_TYPE_FIRE);
+            nDamStrike = PRCGetReflexAdjustedDamage(nDamage, oFirstTarget, 24, SAVING_THROW_TYPE_FIRE);
             //Set the damage effect for the first target
             eDamage = EffectDamage(nDamStrike, DAMAGE_TYPE_FIRE);
             //Apply damage to the first target and the VFX impact.
@@ -264,7 +265,7 @@ void lessercascade()
                 nDamage = d6(nCasterLevel);
 
                 //Adjust damage via Reflex Save or Evasion or Improved Evasion
-                nDamStrike = GetReflexAdjustedDamage(nDamage, oTarget, 24, SAVING_THROW_TYPE_FIRE);
+                nDamStrike = PRCGetReflexAdjustedDamage(nDamage, oTarget, 24, SAVING_THROW_TYPE_FIRE);
                 //Apply the damage and VFX impact to the current target
                 eDamage = EffectDamage(nDamStrike, DAMAGE_TYPE_FIRE);
                 if(nDamStrike > 0) //age > 0)
@@ -301,7 +302,7 @@ void lesserfireball()
     //Declare major variables
 
     int nCasterLvl = 2;
-    int nMetaMagic = GetMetaMagicFeat();
+    int nMetaMagic = PRCGetMetaMagicFeat();
     int nDamage;
     float fDelay;
     effect eExplode = EffectVisualEffect(VFX_FNF_FIREBALL);
@@ -322,13 +323,13 @@ void lesserfireball()
     {
         if(!GetIsReactionTypeFriendly(oTarget))
         {
-            if((GetSpellId() == 341 && !GetIsFriend(oTarget)) || GetSpellId() == 58)
+            if((PRCGetSpellId() == 341 && !GetIsFriend(oTarget)) || PRCGetSpellId() == 58)
             {
                 //Fire cast spell at event for the specified target
                 SignalEvent(oTarget, EventSpellCastAt(OBJECT_SELF, SPELL_FIREBALL));
                 //Get the distance between the explosion and the target to calculate delay
                 fDelay = GetDistanceBetweenLocations(lTarget, GetLocation(oTarget))/20;
-                if (!MyResistSpell(OBJECT_SELF, oTarget, fDelay))
+                if (!PRCDoResistSpell(OBJECT_SELF, oTarget, FloatToInt(fDelay)))
                 {
                     //Roll damage for each target
                     nDamage = d6(nCasterLvl);
@@ -342,7 +343,7 @@ void lesserfireball()
                        nDamage = nDamage + nDamage / 2;
                     }
                     //Adjust the damage based on the Reflex Save, Evasion and Improved Evasion.
-                    nDamage = GetReflexAdjustedDamage(nDamage, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_FIRE);
+                    nDamage = PRCGetReflexAdjustedDamage(nDamage, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_FIRE);
                     //Set the damage effect
                     eDam = EffectDamage(nDamage, DAMAGE_TYPE_FIRE);
                     if(nDamage > 0)
diff --git a/_module/nss/jw_gcubeaoe_ent.nss b/_module/nss/jw_gcubeaoe_ent.nss
index 2ced423..0135076 100644
--- a/_module/nss/jw_gcubeaoe_ent.nss
+++ b/_module/nss/jw_gcubeaoe_ent.nss
@@ -41,7 +41,7 @@ void main()
             nDamage = d6(4);
 
             //Make a Fortitude Save to avoid the effects of the movement hit.
-            if(!MySavingThrow(SAVING_THROW_FORT, oTarget, 16, SAVING_THROW_TYPE_ACID, GetAreaOfEffectCreator(), fDelay))
+            if(!PRCMySavingThrow(SAVING_THROW_FORT, oTarget, 16, SAVING_THROW_TYPE_ACID, GetAreaOfEffectCreator(), fDelay))
             {
                 //slowing effect
                 ApplyEffectToObject(DURATION_TYPE_PERMANENT, eSlow, oTarget);
diff --git a/_module/nss/jw_gcubeaoe_hb.nss b/_module/nss/jw_gcubeaoe_hb.nss
index f791def..d4ba159 100644
--- a/_module/nss/jw_gcubeaoe_hb.nss
+++ b/_module/nss/jw_gcubeaoe_hb.nss
@@ -51,7 +51,7 @@ void main()
     {
         if (spellsIsTarget(oTarget, SPELL_TARGET_STANDARDHOSTILE, GetAreaOfEffectCreator()))
         {
-            if(!MySavingThrow(SAVING_THROW_FORT, oTarget, 17, SAVING_THROW_TYPE_ACID, GetAreaOfEffectCreator(), fDelay))
+            if(!PRCMySavingThrow(SAVING_THROW_FORT, oTarget, 17, SAVING_THROW_TYPE_ACID, GetAreaOfEffectCreator(), fDelay))
             {
 
 
diff --git a/_module/nss/jw_ghost_spawn.nss b/_module/nss/jw_ghost_spawn.nss
index d8eb11a..7abbe0c 100644
--- a/_module/nss/jw_ghost_spawn.nss
+++ b/_module/nss/jw_ghost_spawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_ghoull_usd.nss b/_module/nss/jw_ghoull_usd.nss
index 1b4d915..c0401d2 100644
--- a/_module/nss/jw_ghoull_usd.nss
+++ b/_module/nss/jw_ghoull_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_ghoulord_spaw.nss b/_module/nss/jw_ghoulord_spaw.nss
index 82f7234..9b2c4f6 100644
--- a/_module/nss/jw_ghoulord_spaw.nss
+++ b/_module/nss/jw_ghoulord_spaw.nss
@@ -19,6 +19,8 @@ void generate();
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_girlvictm_usd.nss b/_module/nss/jw_girlvictm_usd.nss
index 2dce51e..e9df33b 100644
--- a/_module/nss/jw_girlvictm_usd.nss
+++ b/_module/nss/jw_girlvictm_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_gnoll1_spawn.nss b/_module/nss/jw_gnoll1_spawn.nss
index a5f2946..ff0f168 100644
--- a/_module/nss/jw_gnoll1_spawn.nss
+++ b/_module/nss/jw_gnoll1_spawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_gnoll2_spawn.nss b/_module/nss/jw_gnoll2_spawn.nss
index 82cc30b..7093fbb 100644
--- a/_module/nss/jw_gnoll2_spawn.nss
+++ b/_module/nss/jw_gnoll2_spawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_gnollha_spawn.nss b/_module/nss/jw_gnollha_spawn.nss
index 912a426..cfa9ebf 100644
--- a/_module/nss/jw_gnollha_spawn.nss
+++ b/_module/nss/jw_gnollha_spawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_gobqueen_usd.nss b/_module/nss/jw_gobqueen_usd.nss
index c4e829a..db6464e 100644
--- a/_module/nss/jw_gobqueen_usd.nss
+++ b/_module/nss/jw_gobqueen_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
     int nRandom;
     object oObject;
diff --git a/_module/nss/jw_gobwiz_usd.nss b/_module/nss/jw_gobwiz_usd.nss
index d3f6bb7..d5f3d0b 100644
--- a/_module/nss/jw_gobwiz_usd.nss
+++ b/_module/nss/jw_gobwiz_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     object oAttacker;
     object oDog;
     location lLoc;
diff --git a/_module/nss/jw_golem_spawn.nss b/_module/nss/jw_golem_spawn.nss
index edc62c8..d9dea78 100644
--- a/_module/nss/jw_golem_spawn.nss
+++ b/_module/nss/jw_golem_spawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_golemn_spawn.nss b/_module/nss/jw_golemn_spawn.nss
index 9369f45..ba54437 100644
--- a/_module/nss/jw_golemn_spawn.nss
+++ b/_module/nss/jw_golemn_spawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_golemn_usd.nss b/_module/nss/jw_golemn_usd.nss
index 7d3923c..e78bd77 100644
--- a/_module/nss/jw_golemn_usd.nss
+++ b/_module/nss/jw_golemn_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
      int nCounter;
      object oMob;
diff --git a/_module/nss/jw_grell_usd.nss b/_module/nss/jw_grell_usd.nss
index 00e2264..374eb90 100644
--- a/_module/nss/jw_grell_usd.nss
+++ b/_module/nss/jw_grell_usd.nss
@@ -10,13 +10,13 @@
 //:: Created By:
 //:: Created On:
 //:://////////////////////////////////////////////
-
+#include "prc_inc_spells"
 
 void ExplodeAtLocation(location lTarget, int nDamage, int nSaveDC = 15, float fRadius = 3.) {
   ApplyEffectAtLocation(DURATION_TYPE_INSTANT, EffectVisualEffect(VFX_FNF_FIREBALL), lTarget);
   object oObject = GetFirstObjectInShape(SHAPE_SPHERE, fRadius, lTarget);
   do {
-    int nDamageAfterSave = GetReflexAdjustedDamage(nDamage/2, oObject, nSaveDC)+nDamage/2;
+    int nDamageAfterSave = PRCGetReflexAdjustedDamage(nDamage/2, oObject, nSaveDC)+nDamage/2;
     ApplyEffectToObject(DURATION_TYPE_INSTANT, EffectDamage(nDamageAfterSave, DAMAGE_TYPE_FIRE), oObject);
    } while ((oObject = GetNextObjectInShape(SHAPE_SPHERE, fRadius, lTarget)) != OBJECT_INVALID);
 }
@@ -25,6 +25,8 @@ void ExplodeAtLocation(location lTarget, int nDamage, int nSaveDC = 15, float fR
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_guard_spawn.nss b/_module/nss/jw_guard_spawn.nss
index d041c1a..35d9993 100644
--- a/_module/nss/jw_guard_spawn.nss
+++ b/_module/nss/jw_guard_spawn.nss
@@ -18,6 +18,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_guardskel_usd.nss b/_module/nss/jw_guardskel_usd.nss
index 4c1c2fa..c47d73a 100644
--- a/_module/nss/jw_guardskel_usd.nss
+++ b/_module/nss/jw_guardskel_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_half_fem_usd.nss b/_module/nss/jw_half_fem_usd.nss
index 7b93be3..7713129 100644
--- a/_module/nss/jw_half_fem_usd.nss
+++ b/_module/nss/jw_half_fem_usd.nss
@@ -13,9 +13,12 @@
 #include "jw_custom_spells"
 #include "NW_I0_GENERIC"
 #include "jw_privates_inc"
+#include "prc_inc_racial"
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
@@ -86,7 +89,7 @@ void main()
     else if(nUser == 1002) // PERCEIVE
     {
      object oPC=GetLastPerceived();
-      if ((GetIsPC(oPC))&&(GetRacialType(oPC)!=RACIAL_TYPE_HALFLING))
+      if ((GetIsPC(oPC))&&(MyPRCGetRacialType(oPC)!=RACIAL_TYPE_HALFLING))
      {
      SetIsTemporaryEnemy(oPC,OBJECT_SELF,TRUE,600.0);
      if (!GetIsFighting(OBJECT_SELF))
diff --git a/_module/nss/jw_half_mal_usd.nss b/_module/nss/jw_half_mal_usd.nss
index 2b3bdb8..a870b01 100644
--- a/_module/nss/jw_half_mal_usd.nss
+++ b/_module/nss/jw_half_mal_usd.nss
@@ -13,9 +13,12 @@
 #include "jw_custom_spells"
 #include "NW_I0_GENERIC"
 #include "jw_privates_inc"
+#include "prc_inc_racial"
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
@@ -78,15 +81,13 @@ void main()
               }
 
 
-     }
-
-
+		}
     }
     else if(nUser == 1002) // PERCEIVE
 
     {
      object oPC=GetLastPerceived();
-      if ((GetIsPC(oPC))&&(GetRacialType(oPC)!=RACIAL_TYPE_HALFLING))
+      if ((GetIsPC(oPC))&&(MyPRCGetRacialType(oPC)!=RACIAL_TYPE_HALFLING))
      {
      SetIsTemporaryEnemy(oPC,OBJECT_SELF,TRUE,600.0);
      if (!GetIsFighting(OBJECT_SELF))
diff --git a/_module/nss/jw_halfbar_chc.nss b/_module/nss/jw_halfbar_chc.nss
index eda401f..cf98005 100644
--- a/_module/nss/jw_halfbar_chc.nss
+++ b/_module/nss/jw_halfbar_chc.nss
@@ -1,4 +1,5 @@
 #include "NW_I0_GENERIC"
+#include "prc_inc_racial"
 
 int StartingConditional()
 {
@@ -6,7 +7,7 @@ int StartingConditional()
     object oPC=GetPCSpeaker();
     int iResult;
 
-    if (GetRacialType(oPC)==RACIAL_TYPE_HALFLING)
+    if (MyPRCGetRacialType(oPC)==RACIAL_TYPE_HALFLING)
     {
      return TRUE;
     }
diff --git a/_module/nss/jw_halfling_con_.nss b/_module/nss/jw_halfling_con_.nss
index 07c1823..2b5a0a8 100644
--- a/_module/nss/jw_halfling_con_.nss
+++ b/_module/nss/jw_halfling_con_.nss
@@ -1,9 +1,10 @@
 #include "NW_I0_GENERIC"
+#include "prc_inc_racial"
 
 int StartingConditional()
 {
     object oPC=GetPCSpeaker();
-    if (GetRacialType(oPC)==RACIAL_TYPE_HALFLING)
+    if (MyPRCGetRacialType(oPC)==RACIAL_TYPE_HALFLING)
     {
     return TRUE;
     }
diff --git a/_module/nss/jw_halfling_usd.nss b/_module/nss/jw_halfling_usd.nss
index a6ea176..27c3682 100644
--- a/_module/nss/jw_halfling_usd.nss
+++ b/_module/nss/jw_halfling_usd.nss
@@ -13,9 +13,12 @@
 #include "jw_custom_spells"
 #include "NW_I0_GENERIC"
 #include "jw_privates_inc"
+#include "prc_inc_racial"
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
@@ -27,7 +30,7 @@ void main()
     {
      object oPC=GetLastPerceived();
 
-     if ((GetIsPC(oPC))&&(GetRacialType(oPC)!=RACIAL_TYPE_HALFLING))
+     if ((GetIsPC(oPC))&&(MyPRCGetRacialType(oPC)!=RACIAL_TYPE_HALFLING))
      {
      SetIsTemporaryEnemy(oPC,OBJECT_SELF,TRUE,600.0);
      if (!GetIsFighting(OBJECT_SELF))
diff --git a/_module/nss/jw_homelife.nss b/_module/nss/jw_homelife.nss
index f6a5883..c8f8c21 100644
--- a/_module/nss/jw_homelife.nss
+++ b/_module/nss/jw_homelife.nss
@@ -1,4 +1,5 @@
 #include "NW_I0_GENERIC"
+#include "prc_inc_spells"
 
 ////
 void jw_woken();
@@ -203,7 +204,7 @@ object oTarget;
 if ((!IsInConversation(OBJECT_SELF))&&(!GetIsInCombat(OBJECT_SELF)))
     {
     // if I am asleep
-    if (GetHasEffect(EFFECT_TYPE_SLEEP))
+    if (PRCGetHasEffect(EFFECT_TYPE_SLEEP))
     {
         // get the nearest enemy creature to me
          oTarget = GetNearestCreature(CREATURE_TYPE_PLAYER_CHAR,PLAYER_CHAR_IS_PC);
@@ -254,7 +255,7 @@ object oObject;
    {ClearAllActions();}
 
 
- if (GetHasEffect(EFFECT_TYPE_SLEEP))
+ if (PRCGetHasEffect(EFFECT_TYPE_SLEEP))
     {
         effect eSleep = GetFirstEffect(OBJECT_SELF);
             // scroll through my current effects
diff --git a/_module/nss/jw_hunter_spawn.nss b/_module/nss/jw_hunter_spawn.nss
index 8679543..77e65ee 100644
--- a/_module/nss/jw_hunter_spawn.nss
+++ b/_module/nss/jw_hunter_spawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 SetLocalInt(OBJECT_SELF,"njw_current",3);
 SetLocalInt(OBJECT_SELF,"njw_completed",2);
 SetLocalInt(OBJECT_SELF,"njw_steps",0);
diff --git a/_module/nss/jw_hurt_object.nss b/_module/nss/jw_hurt_object.nss
index 7c318f5..439ea94 100644
--- a/_module/nss/jw_hurt_object.nss
+++ b/_module/nss/jw_hurt_object.nss
@@ -13,11 +13,13 @@
 //:://////////////////////////////////////////////
 
 #include "NW_I0_SPELLS"
+#include "prc_inc_spells"
+
 void main()
 {
     //Declare major variables
     object oCaster = OBJECT_SELF;
-    int nMetaMagic = GetMetaMagicFeat();
+    int nMetaMagic = PRCGetMetaMagicFeat();
     int nDamage;
     float fDelay;
     effect eExplode = EffectVisualEffect(VFX_COM_HIT_FIRE);
@@ -37,10 +39,10 @@ void main()
         SignalEvent(oTarget, EventSpellCastAt(OBJECT_SELF, SPELL_FIREBALL));
         //Get the distance between the explosion and the target to calculate delay
         fDelay = GetDistanceBetweenLocations(lTarget, GetLocation(oTarget))/20;
-        if (!MyResistSpell(OBJECT_SELF, oTarget, fDelay)&&GetIsPC(oTarget))
+        if (!PRCDoResistSpell(OBJECT_SELF, oTarget, FloatToInt(fDelay))&&GetIsPC(oTarget))
         {
             //Adjust the damage based on the Reflex Save, Evasion and Improved Evasion.
-            nDamage = GetReflexAdjustedDamage(10, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_FIRE);
+            nDamage = PRCGetReflexAdjustedDamage(10, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_FIRE);
             //Set the damage effect
             eDam = EffectDamage(nDamage, DAMAGE_TYPE_FIRE);
             if(nDamage > 0)
diff --git a/_module/nss/jw_icespider_usd.nss b/_module/nss/jw_icespider_usd.nss
index 765bec4..35a90a2 100644
--- a/_module/nss/jw_icespider_usd.nss
+++ b/_module/nss/jw_icespider_usd.nss
@@ -13,6 +13,8 @@
 #include "NW_I0_GENERIC"
 #include "NW_I0_SPELLS"
 #include "jw_privates_inc"
+#include "prc_inc_spells"
+
 
 void JumpToWeakestEnemy(object oTarget)
 {
@@ -35,6 +37,8 @@ void JumpToWeakestEnemy(object oTarget)
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
@@ -71,7 +75,7 @@ void main()
     {
       //Declare major variables
     object oCaster = OBJECT_SELF;
-    int nMetaMagic = GetMetaMagicFeat();
+    int nMetaMagic = PRCGetMetaMagicFeat();
     int nDamage;
     float fDelay;
     location llocation = GetLocation(OBJECT_SELF);
@@ -95,12 +99,12 @@ void main()
         SignalEvent(oTarget, EventSpellCastAt(OBJECT_SELF, SPELL_ICE_STORM));
         //Get the distance between the explosion and the target to calculate delay
         fDelay = GetDistanceBetweenLocations(lTarget, GetLocation(oTarget))/20;
-        if (!MyResistSpell(OBJECT_SELF, oTarget, fDelay))
+        if (!PRCDoResistSpell(OBJECT_SELF, oTarget, FloatToInt(fDelay)))
         {
 
 
             //Adjust the damage based on the Reflex Save, Evasion and Improved Evasion.
-            nDamage = GetReflexAdjustedDamage(d4(2), oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_COLD);
+            nDamage = PRCGetReflexAdjustedDamage(d4(2), oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_COLD);
             //Set the damage effect
             eDam = EffectDamage(nDamage, DAMAGE_TYPE_COLD);
             if(nDamage > 0)
diff --git a/_module/nss/jw_icy_ref_usd.nss b/_module/nss/jw_icy_ref_usd.nss
index b59ae03..18bbd62 100644
--- a/_module/nss/jw_icy_ref_usd.nss
+++ b/_module/nss/jw_icy_ref_usd.nss
@@ -15,6 +15,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_include_funct.nss b/_module/nss/jw_include_funct.nss
index e5bbb57..50b7ad5 100644
--- a/_module/nss/jw_include_funct.nss
+++ b/_module/nss/jw_include_funct.nss
@@ -5,6 +5,7 @@
 #include "jw_custom_spells"
 #include "jw_trap_funct"
 #include "jw_persist_store"
+#include "prc_inc_spells"
 
 // Returns true if this item is meant to decay, otherwise returns false
 int GetIsDecayable(object oItem);
@@ -1500,7 +1501,7 @@ void DeathExplode(int nDamage = 8, int nInitialVFX = VFX_FNF_FIREBALL, int nDama
 {
       //Declare major variables
     object oCaster = OBJECT_SELF;
-    int nMetaMagic = GetMetaMagicFeat();
+    int nMetaMagic = PRCGetMetaMagicFeat();
     int nDamageBase=nDamage;
 
     float fDelay;
@@ -1527,7 +1528,7 @@ void DeathExplode(int nDamage = 8, int nInitialVFX = VFX_FNF_FIREBALL, int nDama
         fDelay = GetDistanceBetweenLocations(lTarget, GetLocation(oTarget))/20;
 
             //Adjust the damage based on the Reflex Save, Evasion and Improved Evasion.
-            nDamage = GetReflexAdjustedDamage(nDamageBase, oTarget, nSaveDC, nSaveType);
+            nDamage = PRCGetReflexAdjustedDamage(nDamageBase, oTarget, nSaveDC, nSaveType);
             //Set the damage effect
             eDam = EffectDamage(nDamage, nDamageType);
             if(nDamage > 0)
@@ -1569,7 +1570,7 @@ void deathcascade(object oTarget)
         //Make an SR Check
 
             //Adjust damage via Reflex Save or Evasion or Improved Evasion
-            nDamStrike = GetReflexAdjustedDamage(nDamage, oFirstTarget, 24, SAVING_THROW_TYPE_FIRE);
+            nDamStrike = PRCGetReflexAdjustedDamage(nDamage, oFirstTarget, 24, SAVING_THROW_TYPE_FIRE);
             //Set the damage effect for the first target
             eDamage = EffectDamage(nDamStrike, DAMAGE_TYPE_FIRE);
             //Apply damage to the first target and the VFX impact.
@@ -1604,7 +1605,7 @@ void deathcascade(object oTarget)
                 nDamage = d6(nCasterLevel);
 
                 //Adjust damage via Reflex Save or Evasion or Improved Evasion
-                nDamStrike = GetReflexAdjustedDamage(nDamage, oTarget, 24, SAVING_THROW_TYPE_FIRE);
+                nDamStrike = PRCGetReflexAdjustedDamage(nDamage, oTarget, 24, SAVING_THROW_TYPE_FIRE);
                 //Apply the damage and VFX impact to the current target
                 eDamage = EffectDamage(nDamStrike, DAMAGE_TYPE_FIRE);
                 if(nDamStrike > 0) //age > 0)
@@ -1635,7 +1636,7 @@ void DiseaseExplode(int nDisease=DISEASE_SOLDIER_SHAKES)
        ApplyEffectAtLocation(DURATION_TYPE_INSTANT, EffectVisualEffect(VFX_IMP_DISEASE_S), llocation);
 
     object oCaster = OBJECT_SELF;
-    int nMetaMagic = GetMetaMagicFeat();
+    int nMetaMagic = PRCGetMetaMagicFeat();
     int nDamage;
     float fDelay;
     effect eCon = EffectDisease(nDisease);
@@ -1674,7 +1675,7 @@ void PoisonExplode(int nPoison=POISON_BLACK_LOTUS_EXTRACT)
        ApplyEffectAtLocation(DURATION_TYPE_INSTANT, EffectVisualEffect(VFX_IMP_POISON_S), llocation);
 
     object oCaster = OBJECT_SELF;
-    int nMetaMagic = GetMetaMagicFeat();
+    int nMetaMagic = PRCGetMetaMagicFeat();
     int nDamage;
     float fDelay;
     effect eCon = EffectPoison(nPoison);
@@ -1718,7 +1719,7 @@ void ZapTargets(int nBeam=VFX_BEAM_EVIL, int nDamage = 12, int nDC = 24, int nDa
        if (!GetPlotFlag(oTarget)&&(!GetIsFriend(oTarget)))
        {
 
-            nDamage = GetReflexAdjustedDamage(nDamage, oTarget, nDC, SAVING_THROW_TYPE_EVIL);
+            nDamage = PRCGetReflexAdjustedDamage(nDamage, oTarget, nDC, SAVING_THROW_TYPE_EVIL);
             eDam = EffectDamage(nDamage, nDamageType);
             if(nDamage > 0 )
             {
diff --git a/_module/nss/jw_innef_sp.nss b/_module/nss/jw_innef_sp.nss
index f9e28f9..4692e84 100644
--- a/_module/nss/jw_innef_sp.nss
+++ b/_module/nss/jw_innef_sp.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_isclericdruid.nss b/_module/nss/jw_isclericdruid.nss
index 33d76d7..f0a5f5a 100644
--- a/_module/nss/jw_isclericdruid.nss
+++ b/_module/nss/jw_isclericdruid.nss
@@ -5,19 +5,25 @@
 //:: Created By: Script Wizard
 //:: Created On: 01/12/2002 23:19:12
 //:://////////////////////////////////////////////
+#include "prc_class_const"
+
 int StartingConditional()
 {
-
+	object oPC = GetPCSpeaker();
+	
+	int iDivine	= GetLevelByClass(CLASS_TYPE_CLERIC, oPC) 	
+				+ GetLevelByClass(CLASS_TYPE_ARCHIVIST, oPC)
+				+ GetLevelByClass(CLASS_TYPE_FAVOURED_SOUL, oPC)
+				+ GetLevelByClass(CLASS_TYPE_HEALER, oPC)
+				+ GetLevelByClass(CLASS_TYPE_DRUID, oPC) 
+				+ GetLevelByClass(CLASS_TYPE_RANGER, oPC) 
+				+ GetLevelByClass(CLASS_TYPE_SHAMAN, oPC);
+			
     // Restrict based on the player's class
     int iPassed = 0;
-    if(GetLevelByClass(CLASS_TYPE_CLERIC, GetPCSpeaker()) >= 1)
-        iPassed = 1;
-    if((iPassed == 0) && (GetLevelByClass(CLASS_TYPE_DRUID, GetPCSpeaker()) >= 1))
-        iPassed = 1;
-    if((iPassed == 0) && (GetLevelByClass(CLASS_TYPE_PALADIN, GetPCSpeaker()) >= 1))
-        iPassed = 1;
-    if((iPassed == 0) && (GetLevelByClass(CLASS_TYPE_RANGER, GetPCSpeaker()) >= 1))
+    if(iDivine >= 1)
         iPassed = 1;
+
     if(iPassed == 0)
         return FALSE;
 
diff --git a/_module/nss/jw_jade_usd.nss b/_module/nss/jw_jade_usd.nss
index 17ae28b..5dda23c 100644
--- a/_module/nss/jw_jade_usd.nss
+++ b/_module/nss/jw_jade_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_jeghri_spell.nss b/_module/nss/jw_jeghri_spell.nss
index f00d883..1bbb74c 100644
--- a/_module/nss/jw_jeghri_spell.nss
+++ b/_module/nss/jw_jeghri_spell.nss
@@ -16,6 +16,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spellat", OBJECT_SELF);
+	
     int nSpell=GetLastSpell();
     object oCaster = GetLastSpellCaster();
     if(GetLastSpellHarmful())
diff --git a/_module/nss/jw_kalath_usd.nss b/_module/nss/jw_kalath_usd.nss
index 319c7d5..9ba495f 100644
--- a/_module/nss/jw_kalath_usd.nss
+++ b/_module/nss/jw_kalath_usd.nss
@@ -15,6 +15,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_kethoth_usd.nss b/_module/nss/jw_kethoth_usd.nss
index 522030a..b02cc8b 100644
--- a/_module/nss/jw_kethoth_usd.nss
+++ b/_module/nss/jw_kethoth_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_killer_usd.nss b/_module/nss/jw_killer_usd.nss
index 2e37509..e605bf4 100644
--- a/_module/nss/jw_killer_usd.nss
+++ b/_module/nss/jw_killer_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
     int nIdx;
     object oObject;
diff --git a/_module/nss/jw_kobking_usd.nss b/_module/nss/jw_kobking_usd.nss
index 8117d7a..5ebcc15 100644
--- a/_module/nss/jw_kobking_usd.nss
+++ b/_module/nss/jw_kobking_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_lever_usd.nss b/_module/nss/jw_lever_usd.nss
index 1666536..f9fe05f 100644
--- a/_module/nss/jw_lever_usd.nss
+++ b/_module/nss/jw_lever_usd.nss
@@ -13,7 +13,9 @@
 
 void main()
 {
-object oObject;
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
+	object oObject;
 
     int nUser = GetUserDefinedEventNumber();
 
diff --git a/_module/nss/jw_lich_usd.nss b/_module/nss/jw_lich_usd.nss
index 794e67f..4045506 100644
--- a/_module/nss/jw_lich_usd.nss
+++ b/_module/nss/jw_lich_usd.nss
@@ -13,7 +13,9 @@
 
 void main()
 {
-    int nUser = GetUserDefinedEventNumber();
+    ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
+	int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
     {
diff --git a/_module/nss/jw_lighting_usd.nss b/_module/nss/jw_lighting_usd.nss
index 22fb4a8..e15d76e 100644
--- a/_module/nss/jw_lighting_usd.nss
+++ b/_module/nss/jw_lighting_usd.nss
@@ -10,13 +10,13 @@
 //:: Created By:
 //:: Created On:
 //:://////////////////////////////////////////////
-
+#include "prc_inc_spells"
 
 //void ExplodeAtLocation(location lTarget, int nDamage, int nSaveDC = 15, float fRadius = 3.) {
 //  ApplyEffectAtLocation(DURATION_TYPE_INSTANT, EffectVisualEffect(VFX_FNF_FIREBALL), lTarget);
 //  object oObject = GetFirstObjectInShape(SHAPE_SPHERE, fRadius, lTarget);
 //  do {
-//    int nDamageAfterSave = GetReflexAdjustedDamage(nDamage/2, oObject, nSaveDC)+nDamage/2;
+//    int nDamageAfterSave = PRCGetReflexAdjustedDamage(nDamage/2, oObject, nSaveDC)+nDamage/2;
 //    ApplyEffectToObject(DURATION_TYPE_INSTANT, EffectDamage(nDamageAfterSave, DAMAGE_TYPE_FIRE), oObject);
 ////   } while ((oObject = GetNextObjectInShape(SHAPE_SPHERE, fRadius, lTarget)) != OBJECT_INVALID);
 //}
@@ -33,7 +33,7 @@ void ZapTargets()
        if (!GetIsFriend(oTarget))
        {
             nDamage = d8(4)+4;
-            nDamage = GetReflexAdjustedDamage(nDamage, oTarget, 24, SAVING_THROW_TYPE_ELECTRICITY);
+            nDamage = PRCGetReflexAdjustedDamage(nDamage, oTarget, 24, SAVING_THROW_TYPE_ELECTRICITY);
             eDam = EffectDamage(nDamage, DAMAGE_TYPE_ELECTRICAL);
             if(nDamage > 0 )
             {
@@ -54,6 +54,8 @@ void Heartbeat()
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
@@ -68,7 +70,7 @@ void main()
        if (!GetIsFriend(oTarget))
        {
             nDamage = d8(5)+4;
-            nDamage = GetReflexAdjustedDamage(nDamage, oTarget, 24, SAVING_THROW_TYPE_ELECTRICITY);
+            nDamage = PRCGetReflexAdjustedDamage(nDamage, oTarget, 24, SAVING_THROW_TYPE_ELECTRICITY);
             eDam = EffectDamage(nDamage, DAMAGE_TYPE_ELECTRICAL);
             if(nDamage > 0 )
             {
diff --git a/_module/nss/jw_lion_spawn.nss b/_module/nss/jw_lion_spawn.nss
index d897bde..31c29e2 100644
--- a/_module/nss/jw_lion_spawn.nss
+++ b/_module/nss/jw_lion_spawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 ApplyEffectToObject(DURATION_TYPE_PERMANENT,EffectVisualEffect(VFX_DUR_GHOSTLY_PULSE),OBJECT_SELF);
 
 
diff --git a/_module/nss/jw_lion_usd.nss b/_module/nss/jw_lion_usd.nss
index 6ff9515..0ca8d96 100644
--- a/_module/nss/jw_lion_usd.nss
+++ b/_module/nss/jw_lion_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
 object oObject;
 int nCounter;
 
diff --git a/_module/nss/jw_lowcube_usd.nss b/_module/nss/jw_lowcube_usd.nss
index 1474d4b..df93da3 100644
--- a/_module/nss/jw_lowcube_usd.nss
+++ b/_module/nss/jw_lowcube_usd.nss
@@ -14,6 +14,8 @@ const int EVENT_USER_DEFINED_PRESPAWN = 1510;
 const int EVENT_USER_DEFINED_POSTSPAWN = 1511;
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == EVENT_HEARTBEAT ) //HEARTBEAT
diff --git a/_module/nss/jw_lumberja_spaw.nss b/_module/nss/jw_lumberja_spaw.nss
index 72d2b6b..f942f73 100644
--- a/_module/nss/jw_lumberja_spaw.nss
+++ b/_module/nss/jw_lumberja_spaw.nss
@@ -17,6 +17,7 @@
 
 void main()
 {
+ExecuteScript("prc_npc_spawn", OBJECT_SELF);
 
 SetLocalInt(OBJECT_SELF,"njw_current",3);
 SetLocalInt(OBJECT_SELF,"njw_completed",2);
diff --git a/_module/nss/jw_mimic_usd.nss b/_module/nss/jw_mimic_usd.nss
index 3fdac2d..0c84ec2 100644
--- a/_module/nss/jw_mimic_usd.nss
+++ b/_module/nss/jw_mimic_usd.nss
@@ -14,6 +14,8 @@ const int EVENT_USER_DEFINED_PRESPAWN = 1510;
 const int EVENT_USER_DEFINED_POSTSPAWN = 1511;
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == EVENT_HEARTBEAT ) //HEARTBEAT
diff --git a/_module/nss/jw_mummy_death.nss b/_module/nss/jw_mummy_death.nss
index 4d6b2aa..9f19d84 100644
--- a/_module/nss/jw_mummy_death.nss
+++ b/_module/nss/jw_mummy_death.nss
@@ -11,6 +11,8 @@
 //:: Created On:
 //:://////////////////////////////////////////////
 #include "NW_I0_SPELLS"
+#include "prc_inc_spells"
+
 void main()
 {
     int nUser = GetUserDefinedEventNumber();
@@ -47,7 +49,7 @@ void main()
        ApplyEffectAtLocation(DURATION_TYPE_INSTANT, EffectVisualEffect(VFX_IMP_DISEASE_S), llocation);
 
     object oCaster = OBJECT_SELF;
-    int nMetaMagic = GetMetaMagicFeat();
+    int nMetaMagic = PRCGetMetaMagicFeat();
     int nDamage;
     float fDelay;
 
diff --git a/_module/nss/jw_negvortex_usd.nss b/_module/nss/jw_negvortex_usd.nss
index c3ca9fd..0af9a1a 100644
--- a/_module/nss/jw_negvortex_usd.nss
+++ b/_module/nss/jw_negvortex_usd.nss
@@ -1,4 +1,6 @@
 //Generate a random spot around pos
+#include "prc_inc_spells"
+
 vector RandomSpot(vector pos)
 {
     vector ret = pos;
@@ -81,7 +83,7 @@ void ZapTargets()
        if (!GetPlotFlag(oTarget)&&(!GetIsFriend(oTarget)))
        {
             nDamage = d8(2)+4;
-            nDamage = GetReflexAdjustedDamage(nDamage, oTarget, 24, SAVING_THROW_TYPE_EVIL);
+            nDamage = PRCGetReflexAdjustedDamage(nDamage, oTarget, 24, SAVING_THROW_TYPE_EVIL);
             eDam = EffectDamage(nDamage, DAMAGE_TYPE_NEGATIVE);
             if(nDamage > 0 )
             {
@@ -102,6 +104,8 @@ void Heartbeat()
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int u = GetUserDefinedEventNumber();
 
     if(u == 1001)
diff --git a/_module/nss/jw_new_bguard_sp.nss b/_module/nss/jw_new_bguard_sp.nss
index ed10055..05c5c94 100644
--- a/_module/nss/jw_new_bguard_sp.nss
+++ b/_module/nss/jw_new_bguard_sp.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_new_io_zhpatr.nss b/_module/nss/jw_new_io_zhpatr.nss
index 29349ed..cd61801 100644
--- a/_module/nss/jw_new_io_zhpatr.nss
+++ b/_module/nss/jw_new_io_zhpatr.nss
@@ -19,6 +19,9 @@
 //:: Created On: Sept 20, 2001
 //:://////////////////////////////////////////////
 
+#include "prc_inc_spells"
+
+
 //GENERIC STRUCTURES
 
 struct sEnemies
@@ -101,7 +104,7 @@ int NW_TALENT_ENHANCE = 2;
 //PRIVATE FUNCTION DECLARATIONS
 
 //Checks the target for a specific EFFECT_TYPE constant value
-int GetHasEffect(int nEffectType, object oTarget = OBJECT_SELF);
+//int PRCGetHasEffect(int nEffectType, object oTarget = OBJECT_SELF);
 //Adds all three of the class levels together.  Used before GetHitDice became available
 int GetCharacterLevel(object oTarget);
 //Returns the number of persons who are considered friendly to the the target.
@@ -441,7 +444,7 @@ void DetermineCombatRound(object oIntruder = OBJECT_INVALID, int nAI_Difficulty
             }
             return;
         }
-        else if((nClass == CLASS_TYPE_CLERIC || nClass == CLASS_TYPE_DRUID) && GetRacialType(OBJECT_SELF) != RACIAL_TYPE_UNDEAD)
+        else if((nClass == CLASS_TYPE_CLERIC || nClass == CLASS_TYPE_DRUID) && MyPRCGetRacialType(OBJECT_SELF) != RACIAL_TYPE_UNDEAD)
         {
             //Cast spells specific to the main enemy I am facing.
             if(TalentAdvancedProtectSelf()) {return;} //******************************************//
@@ -508,7 +511,7 @@ void DetermineCombatRound(object oIntruder = OBJECT_INVALID, int nAI_Difficulty
             }
             return;
         }
-        else if((nClass == CLASS_TYPE_CLERIC || nClass == CLASS_TYPE_DRUID) && GetRacialType(OBJECT_SELF) == RACIAL_TYPE_UNDEAD)
+        else if((nClass == CLASS_TYPE_CLERIC || nClass == CLASS_TYPE_DRUID) && MyPRCGetRacialType(OBJECT_SELF) == RACIAL_TYPE_UNDEAD)
         {
             //Turning check
             if(TalentUseTurning()) {return;}
@@ -2813,7 +2816,7 @@ int TalentUseTurning()
     {
         object oUndead = GetNearestSeenOrHeardEnemy();
         int nHD = GetHitDice(oUndead);
-        if(GetHasEffect(EFFECT_TYPE_TURNED, oUndead) || GetHitDice(OBJECT_SELF) <= nHD)
+        if(PRCGetHasEffect(EFFECT_TYPE_TURNED, oUndead) || GetHitDice(OBJECT_SELF) <= nHD)
         {
             return FALSE;
         }
@@ -3418,7 +3421,7 @@ int GetCharacterLevel(object oTarget)
 //:: Created By: Preston Watamaniuk
 //:: Created On: Oct 26, 2001
 //:://////////////////////////////////////////////
-int GetHasEffect(int nEffectType, object oTarget = OBJECT_SELF)
+/* int PRCGetHasEffect(int nEffectType, object oTarget = OBJECT_SELF)
 {
     effect eCheck = GetFirstEffect(oTarget);
     while(GetIsEffectValid(eCheck))
@@ -3431,7 +3434,7 @@ int GetHasEffect(int nEffectType, object oTarget = OBJECT_SELF)
     }
     return FALSE;
 }
-
+ */
 //::///////////////////////////////////////////////
 //:: Check Friendly Fire on Target
 //:: Copyright (c) 2001 Bioware Corp.
@@ -3637,7 +3640,7 @@ int GetRacialTypeCount(int nRacial_Type)
     object oTarget = GetNearestCreature(CREATURE_TYPE_REPUTATION, REPUTATION_TYPE_ENEMY, OBJECT_SELF, nCnt, CREATURE_TYPE_PERCEPTION, PERCEPTION_SEEN, CREATURE_TYPE_RACIAL_TYPE, nRacial_Type);
     while(GetIsObjectValid(oTarget) && GetDistanceToObject(oTarget) <= 20.0)
     {
-        if(!GetHasEffect(EFFECT_TYPE_TURNED, oTarget))
+        if(!PRCGetHasEffect(EFFECT_TYPE_TURNED, oTarget))
         {
             nCount++;
         }
@@ -3731,7 +3734,7 @@ int CompareLastSpellCast(int nSpell)
 
 void RemoveAmbientSleep()
 {
-    if(GetHasEffect(EFFECT_TYPE_SLEEP))
+    if(PRCGetHasEffect(EFFECT_TYPE_SLEEP))
     {
         effect eSleep = GetFirstEffect(OBJECT_SELF);
         while(GetIsEffectValid(eSleep))
diff --git a/_module/nss/jw_new_zen_hb.nss b/_module/nss/jw_new_zen_hb.nss
index 71d443a..2bcdbbc 100644
--- a/_module/nss/jw_new_zen_hb.nss
+++ b/_module/nss/jw_new_zen_hb.nss
@@ -12,6 +12,7 @@
 //:: Created On: Nov 23, 2001
 //:://////////////////////////////////////////////
 #include "jw_new_io_zhpatr"
+#include "prc_inc_spells"
 
 void main()
 {
@@ -45,7 +46,7 @@ void main()
         }
     }
 
-    if(!GetHasEffect(EFFECT_TYPE_SLEEP))
+    if(!PRCGetHasEffect(EFFECT_TYPE_SLEEP))
     {
         if(!GetIsPostOrWalking())
         {
diff --git a/_module/nss/jw_new_zhpat_spa.nss b/_module/nss/jw_new_zhpat_spa.nss
index bbd65a4..ab87691 100644
--- a/_module/nss/jw_new_zhpat_spa.nss
+++ b/_module/nss/jw_new_zhpat_spa.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_newgaurd_usd.nss b/_module/nss/jw_newgaurd_usd.nss
index 33a8730..9b2ecd7 100644
--- a/_module/nss/jw_newgaurd_usd.nss
+++ b/_module/nss/jw_newgaurd_usd.nss
@@ -33,6 +33,8 @@ void JumpToWeakestEnemy(object oTarget)
 }
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     // * During Combat try teleporting around
     if (GetUserDefinedEventNumber() == 1003)
     {
diff --git a/_module/nss/jw_night_usd.nss b/_module/nss/jw_night_usd.nss
index f93ce33..3cd915c 100644
--- a/_module/nss/jw_night_usd.nss
+++ b/_module/nss/jw_night_usd.nss
@@ -13,7 +13,7 @@
 #include "NW_I0_SPELLS"
 void makesleep()
 {
-effect eVis = EffectVisualEffect(SPELLABILITY_DRAGON_BREATH_SLEEP);
+	effect eVis = EffectVisualEffect(SPELLABILITY_DRAGON_BREATH_SLEEP);
     effect eHowl = EffectSleep();
     effect eDur = EffectVisualEffect(VFX_DUR_CESSATE_NEGATIVE);
     effect eDur2 = EffectVisualEffect(VFX_DUR_PARALYZE_HOLD);
@@ -52,6 +52,8 @@ effect eVis = EffectVisualEffect(SPELLABILITY_DRAGON_BREATH_SLEEP);
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_nighthag_usd.nss b/_module/nss/jw_nighthag_usd.nss
index 0d0bd28..c1d0576 100644
--- a/_module/nss/jw_nighthag_usd.nss
+++ b/_module/nss/jw_nighthag_usd.nss
@@ -33,6 +33,8 @@ void JumpToWeakestEnemy(object oTarget)
 }
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     // * During Combat try teleporting around
     if (GetUserDefinedEventNumber() == 1003)
     {
diff --git a/_module/nss/jw_noxp_baldeath.nss b/_module/nss/jw_noxp_baldeath.nss
index bd098e7..a6b6e58 100644
--- a/_module/nss/jw_noxp_baldeath.nss
+++ b/_module/nss/jw_noxp_baldeath.nss
@@ -13,11 +13,13 @@
 //:://////////////////////////////////////////////
 #include "jw_exp_giver"
 #include "NW_I0_SPELLS"
+#include "prc_inc_spells"
+
 void main()
 {
     //Declare major variables
     object oCaster = OBJECT_SELF;
-    int nMetaMagic = GetMetaMagicFeat();
+    int nMetaMagic = PRCGetMetaMagicFeat();
     int nDamage;
     float fDelay;
     effect eExplode = EffectVisualEffect(VFX_FNF_FIREBALL);
@@ -37,10 +39,10 @@ void main()
         SignalEvent(oTarget, EventSpellCastAt(OBJECT_SELF, SPELL_FIREBALL));
         //Get the distance between the explosion and the target to calculate delay
         fDelay = GetDistanceBetweenLocations(lTarget, GetLocation(oTarget))/20;
-        if (!MyResistSpell(OBJECT_SELF, oTarget, fDelay))
+        if (!PRCDoResistSpell(OBJECT_SELF, oTarget, FloatToInt(fDelay)))
         {
             //Adjust the damage based on the Reflex Save, Evasion and Improved Evasion.
-            nDamage = GetReflexAdjustedDamage(50, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_FIRE);
+            nDamage = PRCGetReflexAdjustedDamage(50, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_FIRE);
             //Set the damage effect
             eDam = EffectDamage(nDamage, DAMAGE_TYPE_FIRE);
             if(nDamage > 0)
@@ -62,6 +64,6 @@ void main()
 
 //givexp(OBJECT_SELF,GetLastKiller());
 
-
+ExecuteScript("prc_npc_death", OBJECT_SELF);
 }
 
diff --git a/_module/nss/jw_nun_gelc_usd.nss b/_module/nss/jw_nun_gelc_usd.nss
index fd42338..eeb6c30 100644
--- a/_module/nss/jw_nun_gelc_usd.nss
+++ b/_module/nss/jw_nun_gelc_usd.nss
@@ -18,6 +18,8 @@ const int EVENT_USER_DEFINED_PRESPAWN = 1510;
 const int EVENT_USER_DEFINED_POSTSPAWN = 1511;
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == EVENT_HEARTBEAT ) //HEARTBEAT
diff --git a/_module/nss/jw_nun_wild.nss b/_module/nss/jw_nun_wild.nss
index 309b3fc..140caf6 100644
--- a/_module/nss/jw_nun_wild.nss
+++ b/_module/nss/jw_nun_wild.nss
@@ -1,8 +1,8 @@
 // Wild magic spell-script:
 // all spells are
 // jw_nun_wild
-
 #include "x2_inc_switches"
+#include "prc_inc_spells"
 
 // Checks whether to run wild magic or not. Returns TRUE if wildmagic does fire
 // Else returns FALSE
@@ -20,8 +20,8 @@ int jw_check_wildmagic()
    //SpeakString("You are not in a wild magic area");
     return FALSE;
     }
-    int nSpell = GetSpellId();
-    object oItem = GetSpellCastItem();
+    int nSpell = PRCGetSpellId();
+    object oItem = PRCGetSpellCastItem();
     if(GetBaseItemType(oItem) == BASE_ITEM_POTIONS)
         return FALSE;
     if(nSpell == SPELL_RESURRECTION || nSpell == SPELL_RAISE_DEAD)
diff --git a/_module/nss/jw_nun_wild_eff.nss b/_module/nss/jw_nun_wild_eff.nss
index edbf7e4..e9b9a64 100644
--- a/_module/nss/jw_nun_wild_eff.nss
+++ b/_module/nss/jw_nun_wild_eff.nss
@@ -14,9 +14,10 @@ This spell produces a random spell effect.
 //:://////////////////////////////////////////////////
 
 #include "x0_i0_petrify"
-#include "x0_i0_spells"
+//#include "x0_i0_spells"
 #include "x0_i0_common"
 #include "x0_i0_position"
+#include "prc_inc_spells"
 
 /**********************************************************************
  * TEMPORARY CONSTANTS
@@ -65,7 +66,7 @@ void main()
     object oTarget = GetAttemptedSpellTarget();
     if(oTarget == OBJECT_INVALID)
         oTarget = oCaster;
-    location lTargetLoc = GetSpellTargetLocation();
+    location lTargetLoc = PRCGetSpellTargetLocation();
 
 
     // Get rid of the casting object
@@ -173,7 +174,7 @@ void main()
         SignalEvent(oTarget, EventSpellCastAt(OBJECT_SELF,
                                               SPELLABILITY_BOLT_LIGHTNING));
 
-        nDamage = GetReflexAdjustedDamage(nDamage,
+        nDamage = PRCGetReflexAdjustedDamage(nDamage,
                                           oTarget,
                                           13,
                                           SAVING_THROW_TYPE_ELECTRICITY);
@@ -490,9 +491,9 @@ void DoBlindnessEffect(object oCaster, location lTarget, float fRadius, int nDur
                     SPELL_BLINDNESS_AND_DEAFNESS));
 
         //Do SR check
-        if ( !MyResistSpell(OBJECT_SELF, oTarget)) {
+        if ( !PRCDoResistSpell(OBJECT_SELF, oTarget)) {
             // Make Fortitude save to negate
-            if (! MySavingThrow(SAVING_THROW_FORT, oTarget, 13)) {
+            if (! PRCMySavingThrow(SAVING_THROW_FORT, oTarget, 13)) {
                 //Apply visual and effects
                 ApplyEffectToObject(DURATION_TYPE_TEMPORARY, eLink, oTarget,
                                     RoundsToSeconds(nDuration));
@@ -540,7 +541,7 @@ void DoWyrmBreath(object oTarget)
         {
             SignalEvent(oTarget, EventSpellCastAt(OBJECT_SELF, nSpell));
             fDelay = GetDistanceBetween(OBJECT_SELF, oTarget)/20;
-            nDamStrike =  GetReflexAdjustedDamage(nDamage, oTarget, nDC);
+            nDamStrike =  PRCGetReflexAdjustedDamage(nDamage, oTarget, nDC);
             if (nDamStrike > 0)
             {
                 eBreath = EffectDamage(nDamStrike, nDamageType);
diff --git a/_module/nss/jw_ogregrds_usd.nss b/_module/nss/jw_ogregrds_usd.nss
index 4df0865..9d4ea38 100644
--- a/_module/nss/jw_ogregrds_usd.nss
+++ b/_module/nss/jw_ogregrds_usd.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_olpara_usd.nss b/_module/nss/jw_olpara_usd.nss
index b2bff1e..088a178 100644
--- a/_module/nss/jw_olpara_usd.nss
+++ b/_module/nss/jw_olpara_usd.nss
@@ -14,6 +14,8 @@ const int EVENT_USER_DEFINED_PRESPAWN = 1510;
 const int EVENT_USER_DEFINED_POSTSPAWN = 1511;
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == EVENT_HEARTBEAT ) //HEARTBEAT
diff --git a/_module/nss/jw_orbwraith_sp.nss b/_module/nss/jw_orbwraith_sp.nss
index b16ef4f..70859d6 100644
--- a/_module/nss/jw_orbwraith_sp.nss
+++ b/_module/nss/jw_orbwraith_sp.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_orbwraith_usd.nss b/_module/nss/jw_orbwraith_usd.nss
index 0c42a93..81f8b27 100644
--- a/_module/nss/jw_orbwraith_usd.nss
+++ b/_module/nss/jw_orbwraith_usd.nss
@@ -16,6 +16,8 @@ const int EVENT_USER_DEFINED_PRESPAWN = 1510;
 const int EVENT_USER_DEFINED_POSTSPAWN = 1511;
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == EVENT_HEARTBEAT ) //HEARTBEAT
diff --git a/_module/nss/jw_outcast_usd.nss b/_module/nss/jw_outcast_usd.nss
index c997ca0..4c32461 100644
--- a/_module/nss/jw_outcast_usd.nss
+++ b/_module/nss/jw_outcast_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
     int nRandom;
     int nEffect;
diff --git a/_module/nss/jw_panth_spawn.nss b/_module/nss/jw_panth_spawn.nss
index a971782..98b485d 100644
--- a/_module/nss/jw_panth_spawn.nss
+++ b/_module/nss/jw_panth_spawn.nss
@@ -15,6 +15,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 ApplyEffectToObject(DURATION_TYPE_PERMANENT,EffectVisualEffect(6),OBJECT_SELF);
 
 // OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
diff --git a/_module/nss/jw_panth_usd.nss b/_module/nss/jw_panth_usd.nss
index 4bd17d1..1212ced 100644
--- a/_module/nss/jw_panth_usd.nss
+++ b/_module/nss/jw_panth_usd.nss
@@ -14,6 +14,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_parmold_ent.nss b/_module/nss/jw_parmold_ent.nss
index 982d441..c40f964 100644
--- a/_module/nss/jw_parmold_ent.nss
+++ b/_module/nss/jw_parmold_ent.nss
@@ -22,7 +22,7 @@ void main()
 {
 
     //Declare major variables
-    int nMetaMagic = GetMetaMagicFeat();
+    int nMetaMagic = PRCGetMetaMagicFeat();
     int nDamage;
     effect eDam;
     effect eVis = EffectVisualEffect(VFX_DUR_FLIES);
@@ -41,7 +41,7 @@ void main()
 
 
             //Make a Fortitude Save to avoid the effects of the movement hit.
-            if(!MySavingThrow(SAVING_THROW_FORT, oTarget, 18, SAVING_THROW_TYPE_DISEASE, GetAreaOfEffectCreator(), fDelay))
+            if(!PRCMySavingThrow(SAVING_THROW_FORT, oTarget, 18, SAVING_THROW_TYPE_DISEASE, GetAreaOfEffectCreator(), fDelay))
             {
                 //lose con effect
                 ApplyEffectToObject(DURATION_TYPE_TEMPORARY, eSlow, oTarget,240.0);
diff --git a/_module/nss/jw_parmold_hb.nss b/_module/nss/jw_parmold_hb.nss
index 2e6b326..bc152cf 100644
--- a/_module/nss/jw_parmold_hb.nss
+++ b/_module/nss/jw_parmold_hb.nss
@@ -22,7 +22,7 @@ void main()
 {
 
     //Declare major variables
-    int nMetaMagic = GetMetaMagicFeat();
+    int nMetaMagic = PRCGetMetaMagicFeat();
     int nDamage = d6(3);
     effect eDam;
     effect eVis = EffectVisualEffect(VFX_IMP_GREASE);
@@ -54,7 +54,7 @@ void main()
         {
              DelayCommand(fDelay, ApplyEffectToObject(DURATION_TYPE_INSTANT, eDisease, oTarget));
 
-            if(!MySavingThrow(SAVING_THROW_FORT, oTarget, 19, SAVING_THROW_TYPE_DISEASE, GetAreaOfEffectCreator(), fDelay))
+            if(!PRCMySavingThrow(SAVING_THROW_FORT, oTarget, 19, SAVING_THROW_TYPE_DISEASE, GetAreaOfEffectCreator(), fDelay))
             {
 
             fDelay = GetRandomDelay(0.4, 1.2);
diff --git a/_module/nss/jw_phat_li_spn.nss b/_module/nss/jw_phat_li_spn.nss
index ea4128f..674f824 100644
--- a/_module/nss/jw_phat_li_spn.nss
+++ b/_module/nss/jw_phat_li_spn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_phat_rav_sp.nss b/_module/nss/jw_phat_rav_sp.nss
index 980ce2f..4e43db0 100644
--- a/_module/nss/jw_phat_rav_sp.nss
+++ b/_module/nss/jw_phat_rav_sp.nss
@@ -17,6 +17,7 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
 
    SetStartLocation();
 
diff --git a/_module/nss/jw_phat_spawn.nss b/_module/nss/jw_phat_spawn.nss
index 2d5ca8c..befbe7f 100644
--- a/_module/nss/jw_phat_spawn.nss
+++ b/_module/nss/jw_phat_spawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_plant2_death.nss b/_module/nss/jw_plant2_death.nss
index af84878..b5608e6 100644
--- a/_module/nss/jw_plant2_death.nss
+++ b/_module/nss/jw_plant2_death.nss
@@ -14,11 +14,13 @@
 
 #include "NW_I0_SPELLS"
 #include "jw_exp_giver"
+#include "prc_inc_spells"
+
 void main()
 {
     //Declare major variables
     object oCaster = OBJECT_SELF;
-    int nMetaMagic = GetMetaMagicFeat();
+    int nMetaMagic = PRCGetMetaMagicFeat();
     int nDamage;
     float fDelay;
     effect eExplode = EffectVisualEffect(VFX_FNF_GAS_EXPLOSION_EVIL);
@@ -38,10 +40,10 @@ void main()
         SignalEvent(oTarget, EventSpellCastAt(OBJECT_SELF, SPELL_FINGER_OF_DEATH));
         //Get the distance between the explosion and the target to calculate delay
         fDelay = GetDistanceBetweenLocations(lTarget, GetLocation(oTarget))/20;
-        if (!MyResistSpell(OBJECT_SELF, oTarget, fDelay))
+        if (!PRCDoResistSpell(OBJECT_SELF, oTarget, FloatToInt(fDelay)))
         {
             //Adjust the damage based on the Reflex Save, Evasion and Improved Evasion.
-            nDamage = GetReflexAdjustedDamage(40, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_NEGATIVE);
+            nDamage = PRCGetReflexAdjustedDamage(40, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_NEGATIVE);
             //Set the damage effect
             eDam = EffectDamage(nDamage, DAMAGE_TYPE_NEGATIVE);
             if(nDamage > 0&&(GetIsEnemy(oTarget,OBJECT_SELF)))
@@ -59,6 +61,6 @@ void main()
 
 
 givexp(OBJECT_SELF,GetLastKiller());
-
+ExecuteScript("prc_npc_death", OBJECT_SELF);
 }
 
diff --git a/_module/nss/jw_plant_death.nss b/_module/nss/jw_plant_death.nss
index 2b0112c..f0c52d9 100644
--- a/_module/nss/jw_plant_death.nss
+++ b/_module/nss/jw_plant_death.nss
@@ -14,11 +14,13 @@
 
 #include "NW_I0_SPELLS"
 #include "jw_exp_giver"
+#include "prc_inc_spells"
+
 void main()
 {
     //Declare major variables
     object oCaster = OBJECT_SELF;
-    int nMetaMagic = GetMetaMagicFeat();
+    int nMetaMagic = PRCGetMetaMagicFeat();
     int nDamage;
     float fDelay;
     effect eExplode = EffectVisualEffect(VFX_FNF_GAS_EXPLOSION_NATURE);
@@ -38,10 +40,10 @@ void main()
         SignalEvent(oTarget, EventSpellCastAt(OBJECT_SELF, SPELL_FINGER_OF_DEATH));
         //Get the distance between the explosion and the target to calculate delay
         fDelay = GetDistanceBetweenLocations(lTarget, GetLocation(oTarget))/20;
-        if (!MyResistSpell(OBJECT_SELF, oTarget, fDelay))
+        if (!PRCDoResistSpell(OBJECT_SELF, oTarget, FloatToInt(fDelay)))
         {
             //Adjust the damage based on the Reflex Save, Evasion and Improved Evasion.
-            nDamage = GetReflexAdjustedDamage(30, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_DISEASE);
+            nDamage = PRCGetReflexAdjustedDamage(30, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_DISEASE);
             //Set the damage effect
             eDam = EffectDamage(nDamage, DAMAGE_TYPE_ACID);
             if(nDamage > 0&&(GetIsEnemy(oTarget,OBJECT_SELF)))
@@ -57,8 +59,10 @@ void main()
        oTarget = GetNextObjectInShape(SHAPE_SPHERE, RADIUS_SIZE_COLOSSAL, lTarget, TRUE, OBJECT_TYPE_CREATURE | OBJECT_TYPE_DOOR);
     }
 
+	ExecuteScript("prc_npc_death", OBJECT_SELF);
+	ExecuteScript("prc_pwondeath", OBJECT_SELF);
 
-givexp(OBJECT_SELF,GetLastKiller());
-
+	givexp(OBJECT_SELF,GetLastKiller());
+ExecuteScript("prc_npc_death", OBJECT_SELF);
 }
 
diff --git a/_module/nss/jw_plant_spawn.nss b/_module/nss/jw_plant_spawn.nss
index afc5f07..98f980e 100644
--- a/_module/nss/jw_plant_spawn.nss
+++ b/_module/nss/jw_plant_spawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 ApplyEffectToObject(DURATION_TYPE_PERMANENT,EffectVisualEffect(VFX_DUR_ENTANGLE),OBJECT_SELF);
 
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
diff --git a/_module/nss/jw_privates_inc.nss b/_module/nss/jw_privates_inc.nss
index fec8809..4fec06f 100644
--- a/_module/nss/jw_privates_inc.nss
+++ b/_module/nss/jw_privates_inc.nss
@@ -1,6 +1,18 @@
 //:: jw_privates_inc.nss
 
+const int X2_SPELL_AOEBEHAVIOR_FLEE = 0;
+const int X2_SPELL_AOEBEHAVIOR_IGNORE = 1;
+const int X2_SPELL_AOEBEHAVIOR_GUST = 2;
+const int X2_SPELL_AOEBEHAVIOR_DISPEL_L = SPELL_LESSER_DISPEL;
+const int X2_SPELL_AOEBEHAVIOR_DISPEL_N = SPELL_DISPEL_MAGIC;
+const int X2_SPELL_AOEBEHAVIOR_DISPEL_G = SPELL_GREATER_DISPELLING;
+const int X2_SPELL_AOEBEHAVIOR_DISPEL_M = SPELL_MORDENKAINENS_DISJUNCTION;
+const int X2_SPELL_AOEBEHAVIOR_DISPEL_C = 727;
+
+
 #include "x0_inc_generic"
+#include "prc_inc_spells"
+#include "prc_inc_skills"
 
 //::///////////////////////////////////////////////////////////////////////////////////////////////
 //:: Associate Include Functions
@@ -31,6 +43,14 @@ void CheckIsUnlocked(object oLastObject);
 //PRIVATE FUNCTION DECLARATIONS
 
 
+
+// --------------------------------------------------------------------------------
+// GZ: Sept 2003
+// Determines the optimal behavior against AoESpell nSpellId for a NPC
+// use in OnSpellCastAt
+// --------------------------------------------------------------------------------
+int GetBestAOEBehavior(int nSpellID);
+
 // Gets the number of wingblast attacks this mob has
 int GetWingblast(object oMob=OBJECT_SELF);
 // Sets the number of wingblast attacks this mob has (default is zero)
@@ -676,7 +696,7 @@ object GetTargetFighting()
 
 /* void RemoveAmbientSleep()
 {
-    if(GetHasEffect(EFFECT_TYPE_SLEEP))
+    if(PRCGetHasEffect(EFFECT_TYPE_SLEEP))
     {
         effect eSleep = GetFirstEffect(OBJECT_SELF);
         while(GetIsEffectValid(eSleep))
@@ -778,6 +798,46 @@ int GetAssociateCRMax()
     return 20;
 }
 
+// --------------------------------------------------------------------------------
+// GZ: Sept 2003
+// Determines the optimal behavior against AoESpell nSpellId for a NPC
+// use in OnSpellCastAt
+// --------------------------------------------------------------------------------
+int GetBestAOEBehavior(int nSpellID)
+{
+        if (nSpellID == SPELL_GREASE)
+        {
+           if (PRCIsFlying(OBJECT_SELF))
+           return X2_SPELL_AOEBEHAVIOR_IGNORE;
+        }
+
+//        if (GetHasSpell(SPELL_GUST_OF_WIND) == TRUE)
+        if (GetHasSpell(SPELL_GUST_OF_WIND))
+            return X2_SPELL_AOEBEHAVIOR_GUST;
+
+        if (GetModuleSwitchValue(MODULE_SWITCH_DISABLE_AI_DISPEL_AOE) == 0 )
+        {
+            if (d100() > GetLocalInt(GetModule(),MODULE_VAR_AI_NO_DISPEL_AOE_CHANCE))
+            {
+//                if (GetHasSpell(SPELL_LESSER_DISPEL) == TRUE)
+                if (GetHasSpell(SPELL_LESSER_DISPEL))
+                    return X2_SPELL_AOEBEHAVIOR_DISPEL_L;
+//                if (GetHasSpell(SPELL_DISPEL_MAGIC) == TRUE)
+                if (GetHasSpell(SPELL_DISPEL_MAGIC))
+                    return X2_SPELL_AOEBEHAVIOR_DISPEL_N;
+//                if (GetHasSpell(SPELL_GREATER_DISPELLING) == TRUE)
+                if (GetHasSpell(SPELL_GREATER_DISPELLING))
+                    return X2_SPELL_AOEBEHAVIOR_DISPEL_G;
+//                if (GetHasSpell(SPELL_MORDENKAINENS_DISJUNCTION) == TRUE)
+                if (GetHasSpell(SPELL_MORDENKAINENS_DISJUNCTION))
+                    return X2_SPELL_AOEBEHAVIOR_DISPEL_M;
+            }
+        }
+
+    return X2_SPELL_AOEBEHAVIOR_FLEE;
+}
+
+
 
 //::///////////////////////////////////////////////
 //:: Check if an item is locked
diff --git a/_module/nss/jw_proto_lich_sp.nss b/_module/nss/jw_proto_lich_sp.nss
index 4791a70..d8b6d7b 100644
--- a/_module/nss/jw_proto_lich_sp.nss
+++ b/_module/nss/jw_proto_lich_sp.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_quith_spawn.nss b/_module/nss/jw_quith_spawn.nss
index 5162877..4e97f08 100644
--- a/_module/nss/jw_quith_spawn.nss
+++ b/_module/nss/jw_quith_spawn.nss
@@ -18,6 +18,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_quith_usd.nss b/_module/nss/jw_quith_usd.nss
index 3fbeea2..2ef3058 100644
--- a/_module/nss/jw_quith_usd.nss
+++ b/_module/nss/jw_quith_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
     int nRandom;
     int nEffect;
diff --git a/_module/nss/jw_rany_death.nss b/_module/nss/jw_rany_death.nss
index bc1c6f9..47cd916 100644
--- a/_module/nss/jw_rany_death.nss
+++ b/_module/nss/jw_rany_death.nss
@@ -48,6 +48,6 @@ void main()
     {
 
     }
-
+ExecuteScript("prc_npc_userdef", OBJECT_SELF);
 }
 
diff --git a/_module/nss/jw_raven_spawn.nss b/_module/nss/jw_raven_spawn.nss
index d033700..208716d 100644
--- a/_module/nss/jw_raven_spawn.nss
+++ b/_module/nss/jw_raven_spawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_raven_usd.nss b/_module/nss/jw_raven_usd.nss
index bc88c76..7eefef1 100644
--- a/_module/nss/jw_raven_usd.nss
+++ b/_module/nss/jw_raven_usd.nss
@@ -14,6 +14,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
 object oObject;
 int nCounter;
 
diff --git a/_module/nss/jw_rest_usd.nss b/_module/nss/jw_rest_usd.nss
index 1103c0d..391fc68 100644
--- a/_module/nss/jw_rest_usd.nss
+++ b/_module/nss/jw_rest_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_reswwp_usd.nss b/_module/nss/jw_reswwp_usd.nss
index 5820768..5254a94 100644
--- a/_module/nss/jw_reswwp_usd.nss
+++ b/_module/nss/jw_reswwp_usd.nss
@@ -15,6 +15,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_rog_spell.nss b/_module/nss/jw_rog_spell.nss
index 058369e..1f99125 100644
--- a/_module/nss/jw_rog_spell.nss
+++ b/_module/nss/jw_rog_spell.nss
@@ -16,6 +16,7 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spellat", OBJECT_SELF);
 
     if(GetLastSpellHarmful())
     {
diff --git a/_module/nss/jw_rogex_spn.nss b/_module/nss/jw_rogex_spn.nss
index deca1e8..356b2ad 100644
--- a/_module/nss/jw_rogex_spn.nss
+++ b/_module/nss/jw_rogex_spn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_rogex_usd.nss b/_module/nss/jw_rogex_usd.nss
index df15415..8bbf905 100644
--- a/_module/nss/jw_rogex_usd.nss
+++ b/_module/nss/jw_rogex_usd.nss
@@ -15,6 +15,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_rotflesh_usd.nss b/_module/nss/jw_rotflesh_usd.nss
index fb419c0..b408b52 100644
--- a/_module/nss/jw_rotflesh_usd.nss
+++ b/_module/nss/jw_rotflesh_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
     int nRandom;
     int nEffect;
diff --git a/_module/nss/jw_sac_usd.nss b/_module/nss/jw_sac_usd.nss
index 39f96a3..d4c4009 100644
--- a/_module/nss/jw_sac_usd.nss
+++ b/_module/nss/jw_sac_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 50) //Event sent by signposts
diff --git a/_module/nss/jw_sembdun_usd.nss b/_module/nss/jw_sembdun_usd.nss
index 8739d7e..de710f6 100644
--- a/_module/nss/jw_sembdun_usd.nss
+++ b/_module/nss/jw_sembdun_usd.nss
@@ -15,7 +15,7 @@
 //I make most plants green and many people brown. What am I?
 //Sun (yellow)
 
-//Pulled by a night pearl, I bow politely and slowly straughten up twice a day. What am I?
+//Pulled by a night pearl, I bow politely and slowly straighten up twice a day. What am I?
 //Ocean (blue)
 
 //I'm often held, yet rarely touched;
@@ -29,6 +29,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
     int nIdx;
     object oDoor;
diff --git a/_module/nss/jw_shade_usd.nss b/_module/nss/jw_shade_usd.nss
index 61bce49..711ff2f 100644
--- a/_module/nss/jw_shade_usd.nss
+++ b/_module/nss/jw_shade_usd.nss
@@ -13,7 +13,7 @@
 
 void main()
 {
-
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
     int nSet;
     int nUser = GetUserDefinedEventNumber();
 
diff --git a/_module/nss/jw_shocker_spawm.nss b/_module/nss/jw_shocker_spawm.nss
index fd9b4de..abcba60 100644
--- a/_module/nss/jw_shocker_spawm.nss
+++ b/_module/nss/jw_shocker_spawm.nss
@@ -23,6 +23,8 @@ DelayCommand(0.5,BurningObject(OBJECT_SELF));
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_shocker_usd.nss b/_module/nss/jw_shocker_usd.nss
index 98bf1b8..ea0282e 100644
--- a/_module/nss/jw_shocker_usd.nss
+++ b/_module/nss/jw_shocker_usd.nss
@@ -16,15 +16,17 @@
 //  ApplyEffectAtLocation(DURATION_TYPE_INSTANT, EffectVisualEffect(VFX_FNF_FIREBALL), lTarget);
 //  object oObject = GetFirstObjectInShape(SHAPE_SPHERE, fRadius, lTarget);
 //  do {
-//    int nDamageAfterSave = GetReflexAdjustedDamage(nDamage/2, oObject, nSaveDC)+nDamage/2;
+//    int nDamageAfterSave = PRCGetReflexAdjustedDamage(nDamage/2, oObject, nSaveDC)+nDamage/2;
 //    ApplyEffectToObject(DURATION_TYPE_INSTANT, EffectDamage(nDamageAfterSave, DAMAGE_TYPE_FIRE), oObject);
 ////   } while ((oObject = GetNextObjectInShape(SHAPE_SPHERE, fRadius, lTarget)) != OBJECT_INVALID);
 //}
 
-
+#include "prc_inc_spells"
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_skel_spawn.nss b/_module/nss/jw_skel_spawn.nss
index 7828af1..0b1467e 100644
--- a/_module/nss/jw_skel_spawn.nss
+++ b/_module/nss/jw_skel_spawn.nss
@@ -23,6 +23,8 @@ DelayCommand(0.5,BurningObject(OBJECT_SELF));
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_smith_enter.nss b/_module/nss/jw_smith_enter.nss
index 69f06b9..9d5b23c 100644
--- a/_module/nss/jw_smith_enter.nss
+++ b/_module/nss/jw_smith_enter.nss
@@ -1,4 +1,4 @@
-#include "x0_i0_spells"
+#include "prc_inc_spells"
 
 void main()
 {
@@ -6,7 +6,7 @@ void main()
 // smith entering
 object oPC=GetEnteringObject();
 
-if (!GetIsObjectValid(oPC)||!GetIsPC(oPC)||GetIsDM(oPC)||GetIsDMPossessed(oPC)||GetHasEffect(EFFECT_TYPE_POLYMORPH,oPC))
+if (!GetIsObjectValid(oPC)||!GetIsPC(oPC)||GetIsDM(oPC)||GetIsDMPossessed(oPC)||PRCGetHasEffect(EFFECT_TYPE_POLYMORPH,oPC))
 {
 return;
 }
diff --git a/_module/nss/jw_smith_usd.nss b/_module/nss/jw_smith_usd.nss
index c1523c6..2840b65 100644
--- a/_module/nss/jw_smith_usd.nss
+++ b/_module/nss/jw_smith_usd.nss
@@ -23,6 +23,8 @@ void jw_smith();
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
     object oObject;
     int nCounter;
diff --git a/_module/nss/jw_snivmin_usd.nss b/_module/nss/jw_snivmin_usd.nss
index 82682f2..0be36d4 100644
--- a/_module/nss/jw_snivmin_usd.nss
+++ b/_module/nss/jw_snivmin_usd.nss
@@ -14,8 +14,10 @@
 #include "NW_I0_GENERIC"
 void main()
 {
-int nRandom;
-object oObject;
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
+	int nRandom;
+	object oObject;
 
     int nUser = GetUserDefinedEventNumber();
 
diff --git a/_module/nss/jw_snwiusd_stlth.nss b/_module/nss/jw_snwiusd_stlth.nss
index 8bc244d..f41b578 100644
--- a/_module/nss/jw_snwiusd_stlth.nss
+++ b/_module/nss/jw_snwiusd_stlth.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_sonbird_usd.nss b/_module/nss/jw_sonbird_usd.nss
index bc1c6f9..73b2e81 100644
--- a/_module/nss/jw_sonbird_usd.nss
+++ b/_module/nss/jw_sonbird_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_song_urn_usd.nss b/_module/nss/jw_song_urn_usd.nss
index f6cb206..a33fa11 100644
--- a/_module/nss/jw_song_urn_usd.nss
+++ b/_module/nss/jw_song_urn_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
     int nIdx;
 
diff --git a/_module/nss/jw_sp_wildamnotr.nss b/_module/nss/jw_sp_wildamnotr.nss
index ab68996..77bfe51 100644
--- a/_module/nss/jw_sp_wildamnotr.nss
+++ b/_module/nss/jw_sp_wildamnotr.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_spawn_chourm.nss b/_module/nss/jw_spawn_chourm.nss
index aac30ca..fc9ca0a 100644
--- a/_module/nss/jw_spawn_chourm.nss
+++ b/_module/nss/jw_spawn_chourm.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_spawn_notreas.nss b/_module/nss/jw_spawn_notreas.nss
index a20495c..34d214d 100644
--- a/_module/nss/jw_spawn_notreas.nss
+++ b/_module/nss/jw_spawn_notreas.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_spawn_notrsxp.nss b/_module/nss/jw_spawn_notrsxp.nss
index f489eaf..3b1e98b 100644
--- a/_module/nss/jw_spawn_notrsxp.nss
+++ b/_module/nss/jw_spawn_notrsxp.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_spawn_trapped.nss b/_module/nss/jw_spawn_trapped.nss
index e138992..05cdca0 100644
--- a/_module/nss/jw_spawn_trapped.nss
+++ b/_module/nss/jw_spawn_trapped.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_spawnwirun_wp.nss b/_module/nss/jw_spawnwirun_wp.nss
index 6fa6e0c..fad44c4 100644
--- a/_module/nss/jw_spawnwirun_wp.nss
+++ b/_module/nss/jw_spawnwirun_wp.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_spiderstn_spn.nss b/_module/nss/jw_spiderstn_spn.nss
index 1b779d3..054db2c 100644
--- a/_module/nss/jw_spiderstn_spn.nss
+++ b/_module/nss/jw_spiderstn_spn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //ApplyEffectToObject(DURATION_TYPE_PERMANENT,EffectVisualEffect(VFX_DUR_PROT_SHADOW_ARMOR),OBJECT_SELF);
 
 
diff --git a/_module/nss/jw_spn_wi_wingbl.nss b/_module/nss/jw_spn_wi_wingbl.nss
index 16083f1..816e529 100644
--- a/_module/nss/jw_spn_wi_wingbl.nss
+++ b/_module/nss/jw_spn_wi_wingbl.nss
@@ -18,6 +18,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_spwn_notenc.nss b/_module/nss/jw_spwn_notenc.nss
index 18f570a..06b78de 100644
--- a/_module/nss/jw_spwn_notenc.nss
+++ b/_module/nss/jw_spwn_notenc.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_stonef_spawn.nss b/_module/nss/jw_stonef_spawn.nss
index 4432604..1db766a 100644
--- a/_module/nss/jw_stonef_spawn.nss
+++ b/_module/nss/jw_stonef_spawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_stonef_usd.nss b/_module/nss/jw_stonef_usd.nss
index 04c6f10..9513f66 100644
--- a/_module/nss/jw_stonef_usd.nss
+++ b/_module/nss/jw_stonef_usd.nss
@@ -14,6 +14,8 @@ const int EVENT_USER_DEFINED_PRESPAWN = 1510;
 const int EVENT_USER_DEFINED_POSTSPAWN = 1511;
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == EVENT_HEARTBEAT ) //HEARTBEAT
diff --git a/_module/nss/jw_taghen_usd.nss b/_module/nss/jw_taghen_usd.nss
index b976f2a..fbf1eab 100644
--- a/_module/nss/jw_taghen_usd.nss
+++ b/_module/nss/jw_taghen_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_talents_inc.nss b/_module/nss/jw_talents_inc.nss
index 0ddb5c2..97ba16d 100644
--- a/_module/nss/jw_talents_inc.nss
+++ b/_module/nss/jw_talents_inc.nss
@@ -1,15 +1,16 @@
 ///////
 #include "jw_combsubs_inc"
 #include "jw_custom_spells"
+#include "prc_inc_spells"
 
 // Bitwise constants for negative conditions we might want to try to cure
-int COND_CURSE     = 0x00000001;
+/* int COND_CURSE     = 0x00000001;
 int COND_POISON    = 0x00000002;
 int COND_DISEASE   = 0x00000004;
 int COND_ABILITY   = 0x00000008;
 int COND_DRAINED   = 0x00000010;
 int COND_BLINDDEAF = 0x00000020;
-// NEW
+// NEW */
 
 // * Wrapper function so that I could add a variable to allow randomization
 // * to the AI.
@@ -143,7 +144,7 @@ int TalentCurseSong (object oIntruder)
         return FALSE;
    }
 
-    if (GetHasEffect(EFFECT_TYPE_SILENCE,OBJECT_SELF))
+    if (PRCGetHasEffect(EFFECT_TYPE_SILENCE,OBJECT_SELF))
     {
          // not useable when silenced
         return FALSE;
@@ -1843,7 +1844,7 @@ int TalentUseTurning()
     {
         object oUndead = GetNearestPerceivedEnemy();
         int nHD = GetHitDice(oUndead);
-        if(GetHasEffect(EFFECT_TYPE_TURNED, oUndead)
+        if(PRCGetHasEffect(EFFECT_TYPE_TURNED, oUndead)
            || GetHitDice(OBJECT_SELF) <= nHD)
         {
             return FALSE;
@@ -2658,9 +2659,9 @@ int TryKiDamage(object oTarget)
             bHasHitpoints = TRUE;
         if (nCurrentHP > 200)
             bHasMassiveHitpoints = TRUE;
-        if (GetHasEffect(EFFECT_TYPE_DAMAGE_REDUCTION, oTarget) == TRUE)
+        if (PRCGetHasEffect(EFFECT_TYPE_DAMAGE_REDUCTION, oTarget) == TRUE)
             bHasDamageReduction = TRUE;
-        if (GetHasEffect(EFFECT_TYPE_DAMAGE_RESISTANCE, oTarget) == TRUE)
+        if (PRCGetHasEffect(EFFECT_TYPE_DAMAGE_RESISTANCE, oTarget) == TRUE)
             bHasDamageResistance = TRUE;
 
         if (GetIsObjectValid(GetNearestEnemy(OBJECT_SELF, 3)) == TRUE)
@@ -2701,7 +2702,7 @@ int TrySpell(int nSpell, object oTarget=OBJECT_SELF, object oCaster=OBJECT_SELF)
 // Returns TRUE on success, FALSE on failure.
 int TrySpellForEffect(int nSpell, int nEffect, object oTarget=OBJECT_SELF, object oCaster=OBJECT_SELF)
 {
-    if (GetHasSpell(nSpell, oCaster) && GetHasEffect(nEffect, oTarget)) {
+    if (GetHasSpell(nSpell, oCaster) && PRCGetHasEffect(nEffect, oTarget)) {
         AssignCommand(oCaster,
                       ActionCastSpellAtObject(nSpell, oTarget));
         return TRUE;
@@ -2852,7 +2853,7 @@ void DoRadiusDamage(int iSpell, location lLoc, int iExplosion, int iDamage, int
     {
         if (GetIsReactionTypeHostile(oDamaged))
         {
-        nDamage = GetReflexAdjustedDamage(iDamage, oDamaged, nDC, SAVING_THROW_TYPE_NONE);
+        nDamage = PRCGetReflexAdjustedDamage(iDamage, oDamaged, nDC, SAVING_THROW_TYPE_NONE);
         DelayCommand(0.5, ApplyEffectToObject(DURATION_TYPE_INSTANT, EffectDamage(nDamage, iDamageType, nPower), oDamaged));
         if (nKnockDC>0)
           {
diff --git a/_module/nss/jw_talindra_spaw.nss b/_module/nss/jw_talindra_spaw.nss
index eab35f2..ebc1c68 100644
--- a/_module/nss/jw_talindra_spaw.nss
+++ b/_module/nss/jw_talindra_spaw.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_talindra_usd.nss b/_module/nss/jw_talindra_usd.nss
index 6e406ef..002fac9 100644
--- a/_module/nss/jw_talindra_usd.nss
+++ b/_module/nss/jw_talindra_usd.nss
@@ -11,12 +11,11 @@
 //:: Created On:
 //:://////////////////////////////////////////////
 #include "NW_I0_GENERIC"
+#include "prc_inc_racial"
 
 void main()
-
-
 {
-
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
 
     int nCounter;
     int nUser = GetUserDefinedEventNumber();
@@ -37,7 +36,7 @@ object oObject=GetLastPerceived();
 if (!GetIsInCombat(OBJECT_SELF)&&!IsInConversation(OBJECT_SELF)&&GetObjectSeen(oObject,OBJECT_SELF)&&GetIsPC(oObject)&&GetIsObjectValid(oObject))
 
 {
-  if (GetRacialType(oObject)!=RACIAL_TYPE_HUMAN)
+  if (MyPRCGetRacialType(oObject)!=RACIAL_TYPE_HUMAN)
   {
    ActionUseSkill(SKILL_HIDE, OBJECT_SELF);
 ActionUseSkill(SKILL_MOVE_SILENTLY, OBJECT_SELF);
diff --git a/_module/nss/jw_thief_usd.nss b/_module/nss/jw_thief_usd.nss
index 9b487e6..e6fe7f1 100644
--- a/_module/nss/jw_thief_usd.nss
+++ b/_module/nss/jw_thief_usd.nss
@@ -13,6 +13,7 @@
 
 #include "NW_I0_GENERIC"
 #include "jw_custom_spells"
+#include "prc_inc_spells"
 
 string sPlace="PLACE_"+GetTag(OBJECT_SELF);
 // waypoints should be called WALK_tag1 to WALK_tag6
@@ -58,8 +59,7 @@ int isatwaypoint();
 
 void main()
 {
-
-
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
 
     int nUser = GetUserDefinedEventNumber();
 
@@ -107,7 +107,7 @@ void main()
      object oPC=GetLastPerceived();
      if (!ishome()&&getstate()==LOOKING)
      {
-       if ((GetIsPC(oPC))&&(!GetIsDM(oPC))&&(GetRacialType(oPC)!=RACIAL_TYPE_HALFLING))
+       if ((GetIsPC(oPC))&&(!GetIsDM(oPC))&&(MyPRCGetRacialType(oPC)!=RACIAL_TYPE_HALFLING))
        {
        setstate(STEALING);
        stealing (oPC);
@@ -334,7 +334,7 @@ void standardhb()
         }
     }
 
-    if(!GetHasEffect(EFFECT_TYPE_SLEEP))
+    if(!PRCGetHasEffect(EFFECT_TYPE_SLEEP))
     {
         if(!GetIsPostOrWalking())
         {
@@ -422,7 +422,7 @@ void standardperc()
             }
             else if(GetIsEnemy(GetLastPerceived()))
             {
-                if(!GetHasEffect(EFFECT_TYPE_SLEEP))
+                if(!PRCGetHasEffect(EFFECT_TYPE_SLEEP))
                 {
                     SetFacingPoint(GetPosition(GetLastPerceived()));
                     SpeakString("NW_I_WAS_ATTACKED", TALKVOLUME_SILENT_TALK);
diff --git a/_module/nss/jw_timber_usd.nss b/_module/nss/jw_timber_usd.nss
index 0e7b2ec..0f558cf 100644
--- a/_module/nss/jw_timber_usd.nss
+++ b/_module/nss/jw_timber_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 50) //Command sent by tree
diff --git a/_module/nss/jw_tort_spawn.nss b/_module/nss/jw_tort_spawn.nss
index 58f5c11..7ebfe52 100644
--- a/_module/nss/jw_tort_spawn.nss
+++ b/_module/nss/jw_tort_spawn.nss
@@ -15,6 +15,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 ApplyEffectToObject(DURATION_TYPE_PERMANENT,EffectVisualEffect(VFX_DUR_GHOSTLY_VISAGE),OBJECT_SELF);
 
 // OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
diff --git a/_module/nss/jw_transpa_spawn.nss b/_module/nss/jw_transpa_spawn.nss
index 98a0320..d5f771e 100644
--- a/_module/nss/jw_transpa_spawn.nss
+++ b/_module/nss/jw_transpa_spawn.nss
@@ -15,6 +15,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 ApplyEffectToObject(DURATION_TYPE_PERMANENT,EffectVisualEffect(6),OBJECT_SELF);
 
 // OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
diff --git a/_module/nss/jw_troll_spawn.nss b/_module/nss/jw_troll_spawn.nss
index 4c4a1da..56137e9 100644
--- a/_module/nss/jw_troll_spawn.nss
+++ b/_module/nss/jw_troll_spawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_trollund_spaw.nss b/_module/nss/jw_trollund_spaw.nss
index cc7a29e..eeb5ad9 100644
--- a/_module/nss/jw_trollund_spaw.nss
+++ b/_module/nss/jw_trollund_spaw.nss
@@ -19,6 +19,8 @@ void generate();
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 // OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_undgon_spawn.nss b/_module/nss/jw_undgon_spawn.nss
index a8610e8..6d70f33 100644
--- a/_module/nss/jw_undgon_spawn.nss
+++ b/_module/nss/jw_undgon_spawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_undgon_usd.nss b/_module/nss/jw_undgon_usd.nss
index ef761f8..ab0d791 100644
--- a/_module/nss/jw_undgon_usd.nss
+++ b/_module/nss/jw_undgon_usd.nss
@@ -15,6 +15,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_vlasiks_spawn.nss b/_module/nss/jw_vlasiks_spawn.nss
index 45f2cd8..32abfaf 100644
--- a/_module/nss/jw_vlasiks_spawn.nss
+++ b/_module/nss/jw_vlasiks_spawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_vlasiks_usd.nss b/_module/nss/jw_vlasiks_usd.nss
index d0d8b6f..3773154 100644
--- a/_module/nss/jw_vlasiks_usd.nss
+++ b/_module/nss/jw_vlasiks_usd.nss
@@ -13,6 +13,8 @@
   #include "NW_I0_GENERIC"
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
 
diff --git a/_module/nss/jw_werewolf_usd.nss b/_module/nss/jw_werewolf_usd.nss
index dde7f98..61733e7 100644
--- a/_module/nss/jw_werewolf_usd.nss
+++ b/_module/nss/jw_werewolf_usd.nss
@@ -14,8 +14,9 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
 
-int nUser = GetUserDefinedEventNumber();
+	int nUser = GetUserDefinedEventNumber();
     int nChange = GetLocalInt(OBJECT_SELF,"NW_LYCANTHROPE");
     effect eShape = EffectPolymorph(POLYMORPH_TYPE_WEREWOLF); //Use one of the polymorph constants here (WERE_RAT, WERE_WOLF or WERE_CAT)
     effect eVis = EffectVisualEffect(VFX_FNF_SUMMON_UNDEAD);
diff --git a/_module/nss/jw_wilberf_spawn.nss b/_module/nss/jw_wilberf_spawn.nss
index a0c8b29..057eb84 100644
--- a/_module/nss/jw_wilberf_spawn.nss
+++ b/_module/nss/jw_wilberf_spawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_wilberfor_usd.nss b/_module/nss/jw_wilberfor_usd.nss
index 65801d8..d2d3ef5 100644
--- a/_module/nss/jw_wilberfor_usd.nss
+++ b/_module/nss/jw_wilberfor_usd.nss
@@ -17,6 +17,8 @@ void jw_wilberupdown();
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
     int nCounter;
     object oObject;
diff --git a/_module/nss/jw_woodelf_usd.nss b/_module/nss/jw_woodelf_usd.nss
index 9678ca0..c46e47a 100644
--- a/_module/nss/jw_woodelf_usd.nss
+++ b/_module/nss/jw_woodelf_usd.nss
@@ -11,9 +11,12 @@
 //:: Created On:
 //::///////////////////////////////////////////////
 #include "NW_I0_GENERIC"
+#include "prc_inc_racial"
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
@@ -29,23 +32,23 @@ object oObject=GetLastPerceived();
 
 
 if (!GetIsInCombat(OBJECT_SELF)&&!IsInConversation(OBJECT_SELF)&&GetObjectSeen(oObject,OBJECT_SELF)&&GetIsPC(oObject)&&GetIsObjectValid(oObject))
-
 {
-  if ((GetRacialType(oObject)!=RACIAL_TYPE_HUMAN)&&(GetSubRace(oObject)!="drow")&&(GetSubRace(oObject)!="Drow"))
-  {
-   ActionUseSkill(SKILL_HIDE, OBJECT_SELF);
-ActionUseSkill(SKILL_MOVE_SILENTLY, OBJECT_SELF);
+	if ((GetRacialType(oObject)!= RACIAL_TYPE_HUMAN)		&&
+		(GetRacialType(oObject)!= RACIAL_TYPE_DROW_FEMALE)	&& 
+		(GetRacialType(oObject)!= RACIAL_TYPE_DROW_MALE)  	&& 
+		(GetSubRace(oObject)!="drow")						&&
+		(GetSubRace(oObject)!="Drow"))
+	{
+		ActionUseSkill(SKILL_HIDE, OBJECT_SELF);
+		ActionUseSkill(SKILL_MOVE_SILENTLY, OBJECT_SELF);
+	}
 
-  }
-
-else
-
-{
-  ActionSpeakString("Human!");
-  SetIsTemporaryEnemy(oObject,OBJECT_SELF,TRUE,600.0);
-  DetermineCombatRound();
-
-}
+	else
+	{
+		ActionSpeakString("Human!");
+		SetIsTemporaryEnemy(oObject,OBJECT_SELF,TRUE,600.0);
+		DetermineCombatRound();
+	}
 
 }
 
diff --git a/_module/nss/jw_wulgar_spawn.nss b/_module/nss/jw_wulgar_spawn.nss
index 2183a48..8daeaed 100644
--- a/_module/nss/jw_wulgar_spawn.nss
+++ b/_module/nss/jw_wulgar_spawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_wulgar_usd.nss b/_module/nss/jw_wulgar_usd.nss
index f983c74..6c07f6c 100644
--- a/_module/nss/jw_wulgar_usd.nss
+++ b/_module/nss/jw_wulgar_usd.nss
@@ -13,8 +13,10 @@
 #include "NW_I0_GENERIC"
 void main()
 {
-int nRandom;
-object oObject;
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
+	int nRandom;
+	object oObject;
 
     int nUser = GetUserDefinedEventNumber();
 
diff --git a/_module/nss/jw_x2_im_pol_mod.nss b/_module/nss/jw_x2_im_pol_mod.nss
index 6b340e4..d08d6fe 100644
--- a/_module/nss/jw_x2_im_pol_mod.nss
+++ b/_module/nss/jw_x2_im_pol_mod.nss
@@ -1,4 +1,4 @@
-#include "x0_i0_spells"
+#include "prc_inc_spells"
 
 /* Can not allow a character to use skills while not in their standard form */
 
@@ -13,26 +13,26 @@ int StartingConditional()
     AssignCommand(oPC,ActionStartConversation(oPC, "jw_craft_arm", TRUE, FALSE));
     return FALSE;
     }
-    int nEff = GetHasEffect(EFFECT_TYPE_POLYMORPH,oPC);
-    nEff = nEff || GetHasEffect(EFFECT_TYPE_PETRIFY,oPC);
-    nEff = nEff || GetHasEffect(EFFECT_TYPE_STUNNED,oPC);
-    nEff = nEff || GetHasEffect(EFFECT_TYPE_DAZED,oPC);
-    nEff = nEff || GetHasEffect(EFFECT_TYPE_SLEEP,oPC);
-    nEff = nEff || GetHasEffect(EFFECT_TYPE_FRIGHTENED,oPC);
-    nEff = nEff || GetHasEffect(EFFECT_TYPE_CHARMED,oPC);
-    nEff = nEff || GetHasEffect(EFFECT_TYPE_DOMINATED,oPC);
-    nEff = nEff || GetHasEffect(EFFECT_TYPE_TURNED,oPC);
-    nEff = nEff || GetHasEffect(EFFECT_TYPE_TIMESTOP,oPC);
-    nEff = nEff || GetHasEffect(EFFECT_TYPE_PARALYZE,oPC);
-    nEff = nEff || GetHasEffect(EFFECT_TYPE_IMPROVEDINVISIBILITY,oPC);
-    nEff = nEff || GetHasEffect(EFFECT_TYPE_INVISIBILITY,oPC);
-    nEff = nEff || GetHasEffect(EFFECT_TYPE_ETHEREAL,oPC);
-    nEff = nEff || GetHasEffect(EFFECT_TYPE_ENTANGLE,oPC);
-    nEff = nEff || GetHasEffect(EFFECT_TYPE_DARKNESS,oPC);
-    nEff = nEff || GetHasEffect(EFFECT_TYPE_DOMINATED,oPC);
-    nEff = nEff || GetHasEffect(EFFECT_TYPE_CUTSCENE_PARALYZE,oPC);
-    nEff = nEff || GetHasEffect(EFFECT_TYPE_SWARM,oPC);
-    nEff = nEff || GetHasEffect(EFFECT_TYPE_BLINDNESS,oPC);
+    int nEff = PRCGetHasEffect(EFFECT_TYPE_POLYMORPH,oPC);
+    nEff = nEff || PRCGetHasEffect(EFFECT_TYPE_PETRIFY,oPC);
+    nEff = nEff || PRCGetHasEffect(EFFECT_TYPE_STUNNED,oPC);
+    nEff = nEff || PRCGetHasEffect(EFFECT_TYPE_DAZED,oPC);
+    nEff = nEff || PRCGetHasEffect(EFFECT_TYPE_SLEEP,oPC);
+    nEff = nEff || PRCGetHasEffect(EFFECT_TYPE_FRIGHTENED,oPC);
+    nEff = nEff || PRCGetHasEffect(EFFECT_TYPE_CHARMED,oPC);
+    nEff = nEff || PRCGetHasEffect(EFFECT_TYPE_DOMINATED,oPC);
+    nEff = nEff || PRCGetHasEffect(EFFECT_TYPE_TURNED,oPC);
+    nEff = nEff || PRCGetHasEffect(EFFECT_TYPE_TIMESTOP,oPC);
+    nEff = nEff || PRCGetHasEffect(EFFECT_TYPE_PARALYZE,oPC);
+    nEff = nEff || PRCGetHasEffect(EFFECT_TYPE_IMPROVEDINVISIBILITY,oPC);
+    nEff = nEff || PRCGetHasEffect(EFFECT_TYPE_INVISIBILITY,oPC);
+    nEff = nEff || PRCGetHasEffect(EFFECT_TYPE_ETHEREAL,oPC);
+    nEff = nEff || PRCGetHasEffect(EFFECT_TYPE_ENTANGLE,oPC);
+    nEff = nEff || PRCGetHasEffect(EFFECT_TYPE_DARKNESS,oPC);
+    nEff = nEff || PRCGetHasEffect(EFFECT_TYPE_DOMINATED,oPC);
+    nEff = nEff || PRCGetHasEffect(EFFECT_TYPE_CUTSCENE_PARALYZE,oPC);
+    nEff = nEff || PRCGetHasEffect(EFFECT_TYPE_SWARM,oPC);
+    nEff = nEff || PRCGetHasEffect(EFFECT_TYPE_BLINDNESS,oPC);
     nEff = nEff || GetIsInCombat(oPC);
     nEff = nEff || GetLocalInt(oPC, "X2_L_DO_NOT_ALLOW_CRAFTSKILLS");
     nEff = nEff || GetLocalInt(GetArea(oPC), "X2_L_DO_NOT_ALLOW_CRAFTSKILLS");
diff --git a/_module/nss/jw_yak_usd.nss b/_module/nss/jw_yak_usd.nss
index fd78efd..0175737 100644
--- a/_module/nss/jw_yak_usd.nss
+++ b/_module/nss/jw_yak_usd.nss
@@ -15,17 +15,18 @@
 
 void main()
 {
-
-object oObject;
-string sString;
-object oCreate;
-object oLoot;
-int nCounter;
-int nGold;
-object oBlood;
-object oShouter;
-object oSeen;
-int nRandom;
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
+	object oObject;
+	string sString;
+	object oCreate;
+	object oLoot;
+	int nCounter;
+	int nGold;
+	object oBlood;
+	object oShouter;
+	object oSeen;
+	int nRandom;
 
     int nUser = GetUserDefinedEventNumber();
 
diff --git a/_module/nss/jw_zen_fairy_sp.nss b/_module/nss/jw_zen_fairy_sp.nss
index b2354ff..23f91a1 100644
--- a/_module/nss/jw_zen_fairy_sp.nss
+++ b/_module/nss/jw_zen_fairy_sp.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_zen_fairy_usd.nss b/_module/nss/jw_zen_fairy_usd.nss
index 9444492..32511ad 100644
--- a/_module/nss/jw_zen_fairy_usd.nss
+++ b/_module/nss/jw_zen_fairy_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
      int nCounter;
      object oObject;
diff --git a/_module/nss/jw_zen_magin_usd.nss b/_module/nss/jw_zen_magin_usd.nss
index da0c344..f4d5843 100644
--- a/_module/nss/jw_zen_magin_usd.nss
+++ b/_module/nss/jw_zen_magin_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_zhent3_spawn.nss b/_module/nss/jw_zhent3_spawn.nss
index d649781..176c74d 100644
--- a/_module/nss/jw_zhent3_spawn.nss
+++ b/_module/nss/jw_zhent3_spawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/jw_zhent3_usd.nss b/_module/nss/jw_zhent3_usd.nss
index c99bf7f..7873559 100644
--- a/_module/nss/jw_zhent3_usd.nss
+++ b/_module/nss/jw_zhent3_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
 
diff --git a/_module/nss/jw_zhentdun_usd.nss b/_module/nss/jw_zhentdun_usd.nss
index 5acb61d..ce56c95 100644
--- a/_module/nss/jw_zhentdun_usd.nss
+++ b/_module/nss/jw_zhentdun_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_zhentins_usd.nss b/_module/nss/jw_zhentins_usd.nss
index 19b807e..cc69871 100644
--- a/_module/nss/jw_zhentins_usd.nss
+++ b/_module/nss/jw_zhentins_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_zhtsftfem_usd.nss b/_module/nss/jw_zhtsftfem_usd.nss
index 7690303..67b4036 100644
--- a/_module/nss/jw_zhtsftfem_usd.nss
+++ b/_module/nss/jw_zhtsftfem_usd.nss
@@ -13,6 +13,8 @@
  #include "nw_i0_generic"
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/jw_zomblord_usd.nss b/_module/nss/jw_zomblord_usd.nss
index 7a7b7f1..2473643 100644
--- a/_module/nss/jw_zomblord_usd.nss
+++ b/_module/nss/jw_zomblord_usd.nss
@@ -23,6 +23,8 @@ void JumpToWeakestEnemy(object oTarget)
 }
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     // * During Combat try teleporting around
     if (GetUserDefinedEventNumber() == 1003)
     {
diff --git a/_module/nss/jw_zovut_usd.nss b/_module/nss/jw_zovut_usd.nss
index fca5701..895a30f 100644
--- a/_module/nss/jw_zovut_usd.nss
+++ b/_module/nss/jw_zovut_usd.nss
@@ -13,7 +13,9 @@
 
 void main()
 {
-    int nUser = GetUserDefinedEventNumber();
+    ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
+	int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
     {
diff --git a/_module/nss/lumberjack_usd.nss b/_module/nss/lumberjack_usd.nss
index fb8ffc3..7c63c32 100644
--- a/_module/nss/lumberjack_usd.nss
+++ b/_module/nss/lumberjack_usd.nss
@@ -23,6 +23,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
     object oObject;
     int nCounter;
diff --git a/_module/nss/mod_activate.nss b/_module/nss/mod_activate.nss
index dd580aa..08bad1f 100644
--- a/_module/nss/mod_activate.nss
+++ b/_module/nss/mod_activate.nss
@@ -20,7 +20,7 @@
 #include "jw_custom_spells"
 #include "jw_wolf_script"
 #include "jw_zachs_scrolls"
-
+#include "prc_class_const"
 
 
 void main()
@@ -266,13 +266,20 @@ else
 // bard's songbird flute
 if(sItemTag=="ah_songbird_call")
 {
-
-  if (!GetLevelByClass(CLASS_TYPE_BARD,oPC)>4)
-{
-DestroyObject(oItem);
-SendMessageToPC(oPC,"That item may be used only by bards of at least fifth level.");
-return;
-}
+	int iBard = GetLevelByClass(CLASS_TYPE_BARD, oPC) +
+				GetLevelByClass(CLASS_TYPE_HARPER, oPC) +
+				GetLevelByClass(CLASS_TYPE_DIRGESINGER, oPC) +
+				GetLevelByClass(CLASS_TYPE_DRAGONSONG_LYRIST, oPC) +
+				GetLevelByClass(CLASS_TYPE_SUBLIME_CHORD, oPC) +
+				GetLevelByClass(CLASS_TYPE_VIRTUOSO, oPC);
+	
+	
+	if (iBard < 5)
+	{
+		//DestroyObject(oItem);
+		SendMessageToPC(oPC,"That item may be used only by bards of at least fifth level.");
+		return;
+	}
 
   if ((GetLocalInt(oUser,"hench")!=2))
 
diff --git a/_module/nss/mouther_spawn.nss b/_module/nss/mouther_spawn.nss
index 020c1e5..8daf2b2 100644
--- a/_module/nss/mouther_spawn.nss
+++ b/_module/nss/mouther_spawn.nss
@@ -17,6 +17,7 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
 
 if (GetHitDice(OBJECT_SELF)>4)
      {
diff --git a/_module/nss/nk_fp_balordeath.nss b/_module/nss/nk_fp_balordeath.nss
index c13d30e..9b2d105 100644
--- a/_module/nss/nk_fp_balordeath.nss
+++ b/_module/nss/nk_fp_balordeath.nss
@@ -13,11 +13,13 @@
 //:://////////////////////////////////////////////
 #include "jw_exp_giver"
 #include "NW_I0_SPELLS"
+#include "prc_inc_spells"
+
 void main()
 {
     //Declare major variables
     object oCaster = OBJECT_SELF;
-    int nMetaMagic = GetMetaMagicFeat();
+    int nMetaMagic = PRCGetMetaMagicFeat();
     int nDamage;
     float fDelay;
     effect eExplode = EffectVisualEffect(VFX_FNF_FIREBALL);
@@ -37,10 +39,10 @@ void main()
         SignalEvent(oTarget, EventSpellCastAt(OBJECT_SELF, SPELL_FIREBALL));
         //Get the distance between the explosion and the target to calculate delay
         fDelay = GetDistanceBetweenLocations(lTarget, GetLocation(oTarget))/20;
-        if (!MyResistSpell(OBJECT_SELF, oTarget, fDelay))
+        if (!PRCDoResistSpell(OBJECT_SELF, oTarget, FloatToInt(fDelay)))
         {
             //Adjust the damage based on the Reflex Save, Evasion and Improved Evasion.
-            nDamage = GetReflexAdjustedDamage(50, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_FIRE);
+            nDamage = PRCGetReflexAdjustedDamage(50, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_FIRE);
             //Set the damage effect
             eDam = EffectDamage(nDamage, DAMAGE_TYPE_FIRE);
             if(nDamage > 0)
@@ -82,7 +84,7 @@ object oPC=GetLastKiller();
 
 
 givexp(OBJECT_SELF,GetLastKiller());
-
+ExecuteScript("prc_npc_death", OBJECT_SELF);
 
 }
 
diff --git a/_module/nss/nk_fp_yt_death.nss b/_module/nss/nk_fp_yt_death.nss
index 99c6f41..6d7dba5 100644
--- a/_module/nss/nk_fp_yt_death.nss
+++ b/_module/nss/nk_fp_yt_death.nss
@@ -40,5 +40,5 @@ object oPC=GetLastKiller();
 
 
 givexp(OBJECT_SELF,GetLastKiller());
-
+ExecuteScript("prc_npc_death", OBJECT_SELF);
 }
diff --git a/_module/nss/nw_c2_default1.nss b/_module/nss/nw_c2_default1.nss
index 4373b45..b6870ff 100644
--- a/_module/nss/nw_c2_default1.nss
+++ b/_module/nss/nw_c2_default1.nss
@@ -17,6 +17,7 @@ void CheckSneak(object oMob=OBJECT_SELF);
 
 #include "NW_I0_GENERIC"
 #include "jw_privates_inc"
+#include "prc_inc_spells"
 
 void main()
 {
@@ -42,7 +43,7 @@ void main()
         }
     }
 
-    if(GetHasEffect(EFFECT_TYPE_SLEEP))
+    if(PRCGetHasEffect(EFFECT_TYPE_SLEEP))
     {
         // If we're asleep and this is the result of sleeping
         // at night, apply the floating 'z's visual effect
@@ -87,7 +88,7 @@ nCoward=TRUE;
 
 if ((!GetObjectSeen(oTarget))&&(GetIsObjectValid(oTarget))&&(GetDistanceToObject(oTarget)<12.0)&&(!GetIsFighting(OBJECT_SELF)))
 {
-    if ((!GetHasEffect(EFFECT_TYPE_TRUESEEING))&&(!GetHasEffect(EFFECT_TYPE_SEEINVISIBLE)))
+    if ((!PRCGetHasEffect(EFFECT_TYPE_TRUESEEING))&&(!PRCGetHasEffect(EFFECT_TYPE_SEEINVISIBLE)))
 
 
     {
@@ -209,7 +210,7 @@ if((!GetIsInCombat())&&(GetSpawnInCondition(NW_FLAG_DAY_NIGHT_POSTING))&&(!GetIs
     }
 
 else
-if((!GetIsInCombat())&&(!GetHasEffect(EFFECT_TYPE_SLEEP))&&(!GetIsObjectValid(oTarget))&& (!IsInConversation(OBJECT_SELF)))
+if((!GetIsInCombat())&&(!PRCGetHasEffect(EFFECT_TYPE_SLEEP))&&(!GetIsObjectValid(oTarget))&& (!IsInConversation(OBJECT_SELF)))
     {
       // make the mob sneak at this point if it should be
        CheckSneak(OBJECT_SELF);
diff --git a/_module/nss/nw_c2_default2.nss b/_module/nss/nw_c2_default2.nss
index 72a93e9..2b0b114 100644
--- a/_module/nss/nw_c2_default2.nss
+++ b/_module/nss/nw_c2_default2.nss
@@ -16,8 +16,8 @@
 //:: Created By: Preston Watamaniuk
 //:: Created On: Oct 16, 2001
 //:://///////////////////////////////////////////////////////////////
-
 #include "nw_i0_generic"
+#include "prc_inc_spells"
 
 void main()
 {
@@ -62,7 +62,7 @@ void main()
 /*     //Do not bother checking the last target seen if already fighting
     else  if(GetLastPerceptionSeen()&&GetIsEnemy(GetLastPerceived()))
         {
-          if(!GetHasEffect(EFFECT_TYPE_SLEEP))
+          if(!PRCGetHasEffect(EFFECT_TYPE_SLEEP))
               {
                 //Shout Attack my target, only works with the On Spawn In setup
                 SpeakString("NW_ATTACK_MY_TARGET", TALKVOLUME_SILENT_TALK);
@@ -96,7 +96,7 @@ void main()
     { // SpawnScriptDebugger();
         //MyPrintString("GetIsEnemy: TRUE");
         // We spotted an enemy and we're not already fighting
-        if(!GetHasEffect(EFFECT_TYPE_SLEEP)) {
+        if(!PRCGetHasEffect(EFFECT_TYPE_SLEEP)) {
             if(GetBehaviorState(NW_FLAG_BEHAVIOR_SPECIAL))
             {
                 //MyPrintString("DetermineSpecialBehavior");
diff --git a/_module/nss/nw_c2_default4.nss b/_module/nss/nw_c2_default4.nss
index 76f85d4..908a34d 100644
--- a/_module/nss/nw_c2_default4.nss
+++ b/_module/nss/nw_c2_default4.nss
@@ -1,11 +1,12 @@
 ////////
 #include "NW_I0_GENERIC"
 #include "jw_privates_inc"
+#include "prc_inc_spells"
 
 void main()
 {
 	// * if petrified, jump out
-    if (GetHasEffect(EFFECT_TYPE_PETRIFY, OBJECT_SELF) == TRUE)
+    if (PRCGetHasEffect(EFFECT_TYPE_PETRIFY, OBJECT_SELF) == TRUE)
     {
         return;
     }
diff --git a/_module/nss/nw_c2_defaulta.nss b/_module/nss/nw_c2_defaulta.nss
new file mode 100644
index 0000000..e76fe15
--- /dev/null
+++ b/_module/nss/nw_c2_defaulta.nss
@@ -0,0 +1,20 @@
+//::///////////////////////////////////////////////
+//:: Default: On Rested
+//:: NW_C2_DEFAULTA
+//:: Copyright (c) 2002 Bioware Corp.
+//:://////////////////////////////////////////////
+/*
+    Determines the course of action to be taken
+    after having just rested.
+*/
+//:://////////////////////////////////////////////
+//:: Created By: Don Moar
+//:: Created On: April 28, 2002
+//:://////////////////////////////////////////////
+void main()
+{
+    ExecuteScript("prc_npc_rested", OBJECT_SELF);
+
+    return;
+
+}
diff --git a/_module/nss/nw_c2_defaultb.nss b/_module/nss/nw_c2_defaultb.nss
index 148cc2f..dcdb3c9 100644
--- a/_module/nss/nw_c2_defaultb.nss
+++ b/_module/nss/nw_c2_defaultb.nss
@@ -18,7 +18,9 @@
 //:://////////////////////////////////////////////
 #include "NW_I0_GENERIC"
 #include "jw_privates_inc"
-#include "x2_i0_spells"
+//#include "x2_i0_spells"
+#include "prc_inc_spells"
+#include "prc_inc_skills"
 
 void main()
 {
diff --git a/_module/nss/nw_s3_actitem01.nss b/_module/nss/nw_s3_actitem01.nss
index 07cf2f0..433be82 100644
--- a/_module/nss/nw_s3_actitem01.nss
+++ b/_module/nss/nw_s3_actitem01.nss
@@ -11,12 +11,13 @@
 //:: Created By: Preston Watamaniuk
 //:: Created On: Dec 19, 2001
 //:://////////////////////////////////////////////
+#include "prc_inc_spells"
 
 void main()
 {
-    object oItem = GetSpellCastItem();
-    object oTarget = GetSpellTargetObject();
-    location lLocal = GetSpellTargetLocation();
+    object oItem = PRCGetSpellCastItem();
+    object oTarget = PRCGetSpellTargetObject();
+    location lLocal = PRCGetSpellTargetLocation();
 
     if (GetStringLeft(GetTag(oItem), 5) == "dmfi_" ||
     GetStringLeft(GetTag(oItem), 8) == "hlslang_")
diff --git a/_module/nss/px_faeridrag_usd.nss b/_module/nss/px_faeridrag_usd.nss
index 55e4524..df7fded 100644
--- a/_module/nss/px_faeridrag_usd.nss
+++ b/_module/nss/px_faeridrag_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/px_faeriespwn_1.nss b/_module/nss/px_faeriespwn_1.nss
index 2f5e4fb..93d9753 100644
--- a/_module/nss/px_faeriespwn_1.nss
+++ b/_module/nss/px_faeriespwn_1.nss
@@ -15,6 +15,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
     SetListening(OBJECT_SELF,TRUE);
 // OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
diff --git a/_module/nss/px_faerispawn_2.nss b/_module/nss/px_faerispawn_2.nss
index 86ab13a..a021fea 100644
--- a/_module/nss/px_faerispawn_2.nss
+++ b/_module/nss/px_faerispawn_2.nss
@@ -15,6 +15,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
     SetListening(OBJECT_SELF,TRUE);
 // OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
diff --git a/_module/nss/px_golem_onspwn.nss b/_module/nss/px_golem_onspwn.nss
index 3f6dab0..0db750a 100644
--- a/_module/nss/px_golem_onspwn.nss
+++ b/_module/nss/px_golem_onspwn.nss
@@ -15,6 +15,7 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
     SetListening(OBJECT_SELF,TRUE);
 // OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
diff --git a/_module/nss/px_golem_usd.nss b/_module/nss/px_golem_usd.nss
index 4c8215c..a2cb568 100644
--- a/_module/nss/px_golem_usd.nss
+++ b/_module/nss/px_golem_usd.nss
@@ -13,6 +13,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+	
     int nUser = GetUserDefinedEventNumber();
 
     if(nUser == 1001) //HEARTBEAT
diff --git a/_module/nss/px_kezzirspawnin.nss b/_module/nss/px_kezzirspawnin.nss
index d458e31..85afc64 100644
--- a/_module/nss/px_kezzirspawnin.nss
+++ b/_module/nss/px_kezzirspawnin.nss
@@ -15,6 +15,9 @@
 
 void main()
 {
+	
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 // OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/px_lightspawn.nss b/_module/nss/px_lightspawn.nss
index dc57762..e4a8da7 100644
--- a/_module/nss/px_lightspawn.nss
+++ b/_module/nss/px_lightspawn.nss
@@ -15,6 +15,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
     SetListening(OBJECT_SELF,TRUE);
 // OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
diff --git a/_module/nss/px_seldshrine_al.nss b/_module/nss/px_seldshrine_al.nss
index 153eaa1..8dd4f49 100644
--- a/_module/nss/px_seldshrine_al.nss
+++ b/_module/nss/px_seldshrine_al.nss
@@ -1,7 +1,30 @@
+#include "prc_inc_racial"
+
 void main()
  {
      object oPC = GetLastUsedBy();
 
+     if((GetRacialType(oPC) == RACIAL_TYPE_DROW_FEMALE) || (GetRacialType(oPC) == RACIAL_TYPE_DROW_MALE) || (GetRacialType(oPC) == RACIAL_TYPE_HALFDROW) && (GetAlignmentGoodEvil(oPC) == ALIGNMENT_EVIL))
+     {
+         ApplyEffectToObject(DURATION_TYPE_TEMPORARY, EffectBeam(VFX_BEAM_EVIL,oPC, BODY_NODE_CHEST, FALSE), OBJECT_SELF, 3.0);
+         ApplyEffectToObject(DURATION_TYPE_INSTANT, EffectVisualEffect(VFX_FNF_SOUND_BURST_SILENT),OBJECT_SELF,2.0);
+         FloatingTextStringOnCreature("You sense a feeling of sadness and great disappointment as you touch the altar. Regret and sorrow for a kindred lost.",oPC,FALSE);
+     }
+
+     if((GetRacialType(oPC) == RACIAL_TYPE_DROW_FEMALE) || (GetRacialType(oPC) == RACIAL_TYPE_DROW_MALE) || (GetRacialType(oPC) == RACIAL_TYPE_HALFDROW) && (GetAlignmentGoodEvil(oPC) == ALIGNMENT_GOOD))
+     {
+         ApplyEffectToObject(DURATION_TYPE_TEMPORARY, EffectBeam(VFX_BEAM_EVIL,oPC, BODY_NODE_CHEST, FALSE), OBJECT_SELF, 3.0);
+         ApplyEffectToObject(DURATION_TYPE_INSTANT, EffectVisualEffect(VFX_FNF_SOUND_BURST_SILENT),OBJECT_SELF,2.0);
+         FloatingTextStringOnCreature("You sense a feeling of pride and joyful acknowledgement upon touching the altar. Your path seems to be true, in the eyes of the Seldarine.",oPC,FALSE);
+     }
+
+     if((GetRacialType(oPC) == RACIAL_TYPE_DROW_FEMALE) || (GetRacialType(oPC) == RACIAL_TYPE_DROW_MALE) || (GetRacialType(oPC) == RACIAL_TYPE_HALFDROW) && (GetAlignmentGoodEvil(oPC) == ALIGNMENT_NEUTRAL))
+     {
+         ApplyEffectToObject(DURATION_TYPE_TEMPORARY, EffectBeam(VFX_BEAM_EVIL,oPC, BODY_NODE_CHEST, FALSE), OBJECT_SELF, 3.0);
+         ApplyEffectToObject(DURATION_TYPE_INSTANT, EffectVisualEffect(VFX_FNF_SOUND_BURST_SILENT),OBJECT_SELF,2.0);
+         FloatingTextStringOnCreature("You sense a feeling of encouragement and well-wishes upon touching the altar. It seems the Seldarine considers you worthy.",oPC,FALSE);
+     }
+	 
      if((GetRacialType(oPC) == RACIAL_TYPE_HALFELF) && (GetAlignmentGoodEvil(oPC) == ALIGNMENT_EVIL))
      {
          ApplyEffectToObject(DURATION_TYPE_TEMPORARY, EffectBeam(VFX_BEAM_EVIL,oPC, BODY_NODE_CHEST, FALSE), OBJECT_SELF, 3.0);
@@ -9,36 +32,34 @@ void main()
          FloatingTextStringOnCreature("You sense a feeling of sadness and great disappointment as you touch the altar. Regret and sorrow for a kindred lost.",oPC,FALSE);
      }
 
-
-     if((GetRacialType(oPC) == RACIAL_TYPE_ELF) && (GetAlignmentGoodEvil(oPC) == ALIGNMENT_EVIL))
+     if((MyPRCGetRacialType(oPC) == RACIAL_TYPE_ELF) && (GetAlignmentGoodEvil(oPC) == ALIGNMENT_EVIL))
      {
          ApplyEffectToObject(DURATION_TYPE_TEMPORARY, EffectBeam(VFX_BEAM_EVIL,oPC, BODY_NODE_CHEST, FALSE), OBJECT_SELF, 3.0);
          ApplyEffectToObject(DURATION_TYPE_INSTANT, EffectVisualEffect(VFX_FNF_SOUND_BURST_SILENT),OBJECT_SELF,2.0);
          FloatingTextStringOnCreature("You sense a feeling of sadness and great disappointment as you touch the altar. Regret and sorrow for a kindred lost.",oPC,FALSE);
 
      }
-       if((GetRacialType(oPC) == RACIAL_TYPE_ELF) && (GetAlignmentGoodEvil(oPC) == ALIGNMENT_GOOD))
+	if((MyPRCGetRacialType(oPC) == RACIAL_TYPE_ELF) && (GetAlignmentGoodEvil(oPC) == ALIGNMENT_GOOD))
      {
-         ApplyEffectToObject(DURATION_TYPE_INSTANT, EffectVisualEffect(VFX_FNF_SOUND_BURST_SILENT),OBJECT_SELF,2.0);
-         FloatingTextStringOnCreature("You sense a feeling of pride and joyful acknowledgement upon touching the altar. Your path seems to be true, in the eyes of the Seldarine.",oPC,FALSE);
+		ApplyEffectToObject(DURATION_TYPE_INSTANT, EffectVisualEffect(VFX_FNF_SOUND_BURST_SILENT),OBJECT_SELF,2.0);
+		FloatingTextStringOnCreature("You sense a feeling of pride and joyful acknowledgement upon touching the altar. Your path seems to be true, in the eyes of the Seldarine.",oPC,FALSE);
 
      }
-            if((GetRacialType(oPC) == RACIAL_TYPE_HALFELF) && (GetAlignmentGoodEvil(oPC) == ALIGNMENT_GOOD))
-     {
-         ApplyEffectToObject(DURATION_TYPE_INSTANT, EffectVisualEffect(VFX_FNF_SOUND_BURST_SILENT),OBJECT_SELF,2.0);
-         FloatingTextStringOnCreature("You sense a feeling of pride and joyful acknowledgement upon touching the altar. Your path seems to be true, in the eyes of the Seldarine.",oPC,FALSE);
+	if((GetRacialType(oPC) == RACIAL_TYPE_HALFELF) && (GetAlignmentGoodEvil(oPC) == ALIGNMENT_GOOD))
+	{
+		ApplyEffectToObject(DURATION_TYPE_INSTANT, EffectVisualEffect(VFX_FNF_SOUND_BURST_SILENT),OBJECT_SELF,2.0);
+		FloatingTextStringOnCreature("You sense a feeling of pride and joyful acknowledgement upon touching the altar. Your path seems to be true, in the eyes of the Seldarine.",oPC,FALSE);
 
      }
-              if((GetRacialType(oPC) == RACIAL_TYPE_HALFELF) && (GetAlignmentGoodEvil(oPC) == ALIGNMENT_NEUTRAL))
-     {
-         ApplyEffectToObject(DURATION_TYPE_INSTANT, EffectVisualEffect(VFX_FNF_SOUND_BURST_SILENT),OBJECT_SELF,2.0);
-         FloatingTextStringOnCreature("You sense a feeling of encouragement and well-wishes upon touching the altar. It seems the Seldarine considers you worthy.",oPC,FALSE);
-
-     }
-                   if((GetRacialType(oPC) == RACIAL_TYPE_ELF) && (GetAlignmentGoodEvil(oPC) == ALIGNMENT_NEUTRAL))
-     {
-         ApplyEffectToObject(DURATION_TYPE_INSTANT, EffectVisualEffect(VFX_FNF_SOUND_BURST_SILENT),OBJECT_SELF,2.0);
-         FloatingTextStringOnCreature("You sense a feeling of encouragement and well-wishes upon touching the altar. It seems the Seldarine considers you worthy.",oPC,FALSE);
+	if((GetRacialType(oPC) == RACIAL_TYPE_HALFELF) && (GetAlignmentGoodEvil(oPC) == ALIGNMENT_NEUTRAL))
+	{
+		ApplyEffectToObject(DURATION_TYPE_INSTANT, EffectVisualEffect(VFX_FNF_SOUND_BURST_SILENT),OBJECT_SELF,2.0);
+		FloatingTextStringOnCreature("You sense a feeling of encouragement and well-wishes upon touching the altar. It seems the Seldarine considers you worthy.",oPC,FALSE);
 
+	}
+	if((MyPRCGetRacialType(oPC) == RACIAL_TYPE_ELF) && (GetAlignmentGoodEvil(oPC) == ALIGNMENT_NEUTRAL))
+	{
+		ApplyEffectToObject(DURATION_TYPE_INSTANT, EffectVisualEffect(VFX_FNF_SOUND_BURST_SILENT),OBJECT_SELF,2.0);
+		FloatingTextStringOnCreature("You sense a feeling of encouragement and well-wishes upon touching the altar. It seems the Seldarine considers you worthy.",oPC,FALSE);
      }
  }
diff --git a/_module/nss/px_sorelonspawn.nss b/_module/nss/px_sorelonspawn.nss
index bc3707a..77b91f9 100644
--- a/_module/nss/px_sorelonspawn.nss
+++ b/_module/nss/px_sorelonspawn.nss
@@ -15,6 +15,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 // OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/sc_chk_rogue.nss b/_module/nss/sc_chk_rogue.nss
index dc73502..b65793a 100644
--- a/_module/nss/sc_chk_rogue.nss
+++ b/_module/nss/sc_chk_rogue.nss
@@ -5,15 +5,25 @@
 //:: Created By: Script Wizard
 //:: Created On: 26.06.2002 17:43:20
 //:://////////////////////////////////////////////
+#include "prc_class_const"
+
 int StartingConditional()
 {
-
+	object oPC = GetPCSpeaker();
+	
+	int iRogue	= GetLevelByClass(CLASS_TYPE_ROGUE, oPC)
+				+ GetLevelByClass(CLASS_TYPE_SCOUT, oPC)
+				+ GetLevelByClass(CLASS_TYPE_BEGUILER, oPC)
+				+ GetLevelByClass(CLASS_TYPE_NINJA, oPC)
+				+ GetLevelByClass(CLASS_TYPE_FACTOTUM, oPC)
+				+ GetLevelByClass(CLASS_TYPE_PSYCHIC_ROGUE, oPC);
+			
 	// Restrict based on the player's class
 	int iPassed = 0;
-	if(GetLevelByClass(CLASS_TYPE_ROGUE, GetPCSpeaker()) >= 1)
+	if(iRogue >= 1)
 		iPassed = 1;
 	if(iPassed == 0)
 		return FALSE;
 
 	return TRUE;
-}
+}
\ No newline at end of file
diff --git a/_module/nss/sc_fmr_hrtbt.nss b/_module/nss/sc_fmr_hrtbt.nss
index f64a2cf..99f6128 100644
--- a/_module/nss/sc_fmr_hrtbt.nss
+++ b/_module/nss/sc_fmr_hrtbt.nss
@@ -12,6 +12,7 @@
 //:: Created On: Nov 23, 2001
 //:://////////////////////////////////////////////
 #include "NW_I0_GENERIC"
+#include "prc_inc_spells"
 
 void main()
 {
@@ -45,7 +46,7 @@ void main()
         }
     }
 
-    if(!GetHasEffect(EFFECT_TYPE_SLEEP))
+    if(!PRCGetHasEffect(EFFECT_TYPE_SLEEP))
     {
         if(!GetIsPostOrWalking())
         {
diff --git a/_module/nss/sc_guard_percept.nss b/_module/nss/sc_guard_percept.nss
index c86e891..9827b32 100644
--- a/_module/nss/sc_guard_percept.nss
+++ b/_module/nss/sc_guard_percept.nss
@@ -16,6 +16,7 @@
 #include "NW_I0_GENERIC"
 //#include "array_api"
 #include "rpo_inc"
+#include "prc_inc_spells"
 
 void main()
 {
@@ -54,7 +55,7 @@ void main()
             else if(GetIsEnemy(GetLastPerceived()) &&
                 GetLocalInt(GetLastPerceived(),"State") != PWS_PLAYER_STATE_PRISON)
             {
-                if(!GetHasEffect(EFFECT_TYPE_SLEEP) && GetLocalInt(GetLastPerceived(),"PlayerState") != PWS_PLAYER_STATE_PRISON)
+                if(!PRCGetHasEffect(EFFECT_TYPE_SLEEP) && GetLocalInt(GetLastPerceived(),"PlayerState") != PWS_PLAYER_STATE_PRISON)
                 {
                     PrintString(GetName(OBJECT_SELF) + " perceived hostile creature " + GetName(GetLastPerceived()));
                     SetFacingPoint(GetPosition(GetLastPerceived()));
diff --git a/_module/nss/sc_hid_trapdoor.nss b/_module/nss/sc_hid_trapdoor.nss
index 3c8493e..deec3c0 100644
--- a/_module/nss/sc_hid_trapdoor.nss
+++ b/_module/nss/sc_hid_trapdoor.nss
@@ -15,6 +15,7 @@ or it will be undestroyable.
 //:: Created By: Mark "Levian Del'Orr" Fritzlen
 //:: Created On: June 21, 2002
 //:://////////////////////////////////////////////
+#include "prc_inc_racial"
 
 void FoundSecretTrapdoor(object oFinder);
 
@@ -36,26 +37,29 @@ void main()
             //NOT SURE OF THESE RULES...NEED TO CHECK AD&D PLAYERS GUIDE
             if (GetLevelByClass(CLASS_TYPE_ROGUE, oFinder) > 0)
             {
-                    iClassModifier = 2;
+                    iClassModifier =+ 2;
             }
             else if (GetLevelByClass(CLASS_TYPE_RANGER, oFinder) > 0 ||
             GetLevelByClass (CLASS_TYPE_BARD, oFinder) > 0)
             {
-                    iClassModifier = 1;
+                    iClassModifier =+ 1;
             }
 
             //Assign Race Modifier
             //NOT SURE OF THESE RULES...NEED TO CHECK AD&D PLAYERS GUIDE
-            if (GetRacialType(oFinder) ==  RACIAL_TYPE_DWARF ||
-            GetRacialType(oFinder) ==  RACIAL_TYPE_ELF)
+            if (MyPRCGetRacialType(oFinder) ==  RACIAL_TYPE_DWARF ||
+            MyPRCGetRacialType(oFinder) ==  RACIAL_TYPE_ELF)
             {
-                    iRaceModifier = 2;
+                    iRaceModifier =+ 2;
             }
-            else if (GetRacialType(oFinder) ==  RACIAL_TYPE_HALFELF)
+            else if (MyPRCGetRacialType(oFinder) ==  RACIAL_TYPE_HALFELF)
             {
-                    iRaceModifier = 1;
+                    iRaceModifier =+ 1;
+            }
+            if (GetHasFeat(FEAT_KEEN_SENSE, oFinder))
+            {
+                    iRaceModifier =+ 2;
             }
-
             //Assign Skill Modifier
             //NOT SURE OF THESE RULES...NEED TO CHECK AD&D PLAYERS GUIDE
             //Just assigning the search skill value
diff --git a/_module/nss/stx_inc_craft.nss b/_module/nss/stx_inc_craft.nss
index b9b88bd..e089690 100644
--- a/_module/nss/stx_inc_craft.nss
+++ b/_module/nss/stx_inc_craft.nss
@@ -37,8 +37,7 @@
 //:: Created On: 16-dec-2003
 //:: Updated On: 01-jan-2004
 //:://////////////////////////////////////////////
-
-
+#include "prc_inc_racial"
 #include "prc_x2_craft"
 
 // Set to FALSE to disable the requirement of the proper placeable to be near the PC
@@ -368,7 +367,7 @@ void StX_SetPart(object oPC, int nPart, int nStrRef) {
         fPitch = 65.0;
     }
     if (fFacing >= 360.0) fFacing -=360.0;
-    if (GetRacialType(oPC) == RACIAL_TYPE_HALFORC) fDistance += 1.0f;
+    if (MyPRCGetRacialType(oPC) == RACIAL_TYPE_HALFORC) fDistance += 1.0f;
     SetCameraFacing(fFacing, fDistance, fPitch, CAMERA_TRANSITION_TYPE_VERY_FAST);
 
     int nCost = GetLocalInt(oPC, "STX_CR_COST");
diff --git a/_module/nss/tri_aeneaspaw.nss b/_module/nss/tri_aeneaspaw.nss
index 2485d9a..c00ba4d 100644
--- a/_module/nss/tri_aeneaspaw.nss
+++ b/_module/nss/tri_aeneaspaw.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 // OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/tri_hobtrap1.nss b/_module/nss/tri_hobtrap1.nss
index 9e4316d..04a93ef 100644
--- a/_module/nss/tri_hobtrap1.nss
+++ b/_module/nss/tri_hobtrap1.nss
@@ -1,3 +1,5 @@
+#include "prc_inc_spells"
+
 void main()
 {
 location lLoc = GetLocation(GetObjectByTag("WP_tri_hobtraploc"));
@@ -17,7 +19,7 @@ effect eDam;
 
         {
             //Adjust the damage based on the Reflex Save, Evasion and Improved Evasion.
-            nDamage = GetReflexAdjustedDamage(20, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_ACID);
+            nDamage = PRCGetReflexAdjustedDamage(20, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_ACID);
             //Set the damage effect
             eDam = EffectDamage(nDamage, DAMAGE_TYPE_ACID);
             if(nDamage > 0)
diff --git a/_module/nss/tri_hobtrap2.nss b/_module/nss/tri_hobtrap2.nss
index f648c5a..e66d348 100644
--- a/_module/nss/tri_hobtrap2.nss
+++ b/_module/nss/tri_hobtrap2.nss
@@ -1,3 +1,5 @@
+#include "prc_inc_spells"
+
 void main()
 {
 location lLoc = GetLocation(GetObjectByTag("WP_tri_hobtraploc2"));
@@ -17,7 +19,7 @@ effect eDam;
 
         {
             //Adjust the damage based on the Reflex Save, Evasion and Improved Evasion.
-            nDamage = GetReflexAdjustedDamage(20, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_ACID);
+            nDamage = PRCGetReflexAdjustedDamage(20, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_ACID);
             //Set the damage effect
             eDam = EffectDamage(nDamage, DAMAGE_TYPE_ACID);
             if(nDamage > 0)
diff --git a/_module/nss/tri_koboldspa.nss b/_module/nss/tri_koboldspa.nss
index 60dc5c0..3ff994b 100644
--- a/_module/nss/tri_koboldspa.nss
+++ b/_module/nss/tri_koboldspa.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/tri_lichlordsp.nss b/_module/nss/tri_lichlordsp.nss
index d829b83..e8dad56 100644
--- a/_module/nss/tri_lichlordsp.nss
+++ b/_module/nss/tri_lichlordsp.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/tri_mithralspawn.nss b/_module/nss/tri_mithralspawn.nss
index 05d4f78..09cd5a8 100644
--- a/_module/nss/tri_mithralspawn.nss
+++ b/_module/nss/tri_mithralspawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 // OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/tri_pitfiendspaw.nss b/_module/nss/tri_pitfiendspaw.nss
index c5ab48c..b545824 100644
--- a/_module/nss/tri_pitfiendspaw.nss
+++ b/_module/nss/tri_pitfiendspaw.nss
@@ -18,6 +18,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 // OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/tri_spinaflysp.nss b/_module/nss/tri_spinaflysp.nss
index c681fff..1669abd 100644
--- a/_module/nss/tri_spinaflysp.nss
+++ b/_module/nss/tri_spinaflysp.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/tri_stormspawn.nss b/_module/nss/tri_stormspawn.nss
index 60c6062..4823346 100644
--- a/_module/nss/tri_stormspawn.nss
+++ b/_module/nss/tri_stormspawn.nss
@@ -26,6 +26,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/tri_undeaddeath.nss b/_module/nss/tri_undeaddeath.nss
index c0352c3..1510863 100644
--- a/_module/nss/tri_undeaddeath.nss
+++ b/_module/nss/tri_undeaddeath.nss
@@ -11,13 +11,14 @@
 //:: Created By: Preston Watamaniuk
 //:: Created On: Jan 9, 2002
 //:://////////////////////////////////////////////
-
 #include "NW_I0_SPELLS"
+#include "prc_inc_spells"
+
 void main()
 {
     //Declare major variables
     object oCaster = OBJECT_SELF;
-    int nMetaMagic = GetMetaMagicFeat();
+    int nMetaMagic = PRCGetMetaMagicFeat();
     int nDamage;
     float fDelay;
     effect eExplode = EffectVisualEffect(VFX_FNF_IMPLOSION);
@@ -37,10 +38,10 @@ void main()
         SignalEvent(oTarget, EventSpellCastAt(OBJECT_SELF, SPELL_FIREBALL));
         //Get the distance between the explosion and the target to calculate delay
         fDelay = GetDistanceBetweenLocations(lTarget, GetLocation(oTarget))/20;
-        if (!MyResistSpell(OBJECT_SELF, oTarget, fDelay))
+        if (!PRCDoResistSpell(OBJECT_SELF, oTarget, FloatToInt(fDelay)))
         {
             //Adjust the damage based on the Reflex Save, Evasion and Improved Evasion.
-            nDamage = GetReflexAdjustedDamage(80, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_FIRE);
+            nDamage = PRCGetReflexAdjustedDamage(80, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_FIRE);
             //Set the damage effect
             eDam = EffectDamage(nDamage, DAMAGE_TYPE_FIRE);
             if(nDamage > 0)
@@ -54,6 +55,10 @@ void main()
          }
        //Select the next target within the spell shape.
        oTarget = GetNextObjectInShape(SHAPE_SPHERE, RADIUS_SIZE_HUGE, lTarget, TRUE, OBJECT_TYPE_CREATURE | OBJECT_TYPE_DOOR);
-    }
+	   
+		ExecuteScript("prc_npc_death", OBJECT_SELF);
+		ExecuteScript("prc_pwondeath", OBJECT_SELF);
+    
+	}
 }
 
diff --git a/_module/nss/tri_undeadsp.nss b/_module/nss/tri_undeadsp.nss
index 9e709c9..516b20e 100644
--- a/_module/nss/tri_undeadsp.nss
+++ b/_module/nss/tri_undeadsp.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 //// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/tri_undeanew.nss b/_module/nss/tri_undeanew.nss
index f87008d..fa60d65 100644
--- a/_module/nss/tri_undeanew.nss
+++ b/_module/nss/tri_undeanew.nss
@@ -10,8 +10,8 @@
 //:: Created By:
 //:: Created On:
 //:://////////////////////////////////////////////
-
 #include "NW_I0_SPELLS"
+#include "prc_inc_spells"
 
 void main()
 {
@@ -47,7 +47,7 @@ void main()
     {
     //Declare major variables
     object oCaster = OBJECT_SELF;
-    int nMetaMagic = GetMetaMagicFeat();
+    int nMetaMagic = PRCGetMetaMagicFeat();
     int nDamage;
     float fDelay;
     effect eExplode = EffectVisualEffect(VFX_FNF_IMPLOSION);
@@ -67,10 +67,10 @@ void main()
         SignalEvent(oTarget, EventSpellCastAt(OBJECT_SELF, SPELL_FIREBALL));
         //Get the distance between the explosion and the target to calculate delay
         fDelay = GetDistanceBetweenLocations(lTarget, GetLocation(oTarget))/20;
-        if (!MyResistSpell(OBJECT_SELF, oTarget, fDelay))
+        if (!PRCDoResistSpell(OBJECT_SELF, oTarget, FloatToInt(fDelay)))
         {
             //Adjust the damage based on the Reflex Save, Evasion and Improved Evasion.
-            nDamage = GetReflexAdjustedDamage(80, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_FIRE);
+            nDamage = PRCGetReflexAdjustedDamage(80, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_FIRE);
             //Set the damage effect
             eDam = EffectDamage(nDamage, DAMAGE_TYPE_FIRE);
             if(nDamage > 0)
@@ -91,5 +91,7 @@ void main()
 
     }
 
+	ExecuteScript("prc_npc_userdef", OBJECT_SELF);
+
 }
 
diff --git a/_module/nss/vortexspawn.nss b/_module/nss/vortexspawn.nss
index fa08b1e..6023a70 100644
--- a/_module/nss/vortexspawn.nss
+++ b/_module/nss/vortexspawn.nss
@@ -17,6 +17,8 @@
 
 void main()
 {
+	ExecuteScript("prc_npc_spawn", OBJECT_SELF);
+	
 /// OPTIONAL BEHAVIORS (Comment In or Out to Activate ) ****************************************************************************
      //SetSpawnInCondition(NW_FLAG_SPECIAL_CONVERSATION);
      //SetSpawnInCondition(NW_FLAG_SPECIAL_COMBAT_CONVERSATION);
diff --git a/_module/nss/vortexude.nss b/_module/nss/vortexude.nss
index 581da44..c7882dd 100644
--- a/_module/nss/vortexude.nss
+++ b/_module/nss/vortexude.nss
@@ -1,4 +1,6 @@
 //Generate a random spot around pos
+#include "prc_inc_spells"
+
 vector RandomSpot(vector pos)
 {
     vector ret = pos;
@@ -81,7 +83,7 @@ void ZapTargets()
        if (!GetPlotFlag(oTarget)&&(!GetIsFriend(oTarget)))
        {
             nDamage = d4(2)+1;
-            nDamage = GetReflexAdjustedDamage(nDamage, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_ELECTRICITY);
+            nDamage = PRCGetReflexAdjustedDamage(nDamage, oTarget, GetSpellSaveDC(), SAVING_THROW_TYPE_ELECTRICITY);
             eDam = EffectDamage(nDamage, DAMAGE_TYPE_ELECTRICAL);
             if(nDamage > 0 )
             {
diff --git a/_module/nss/wm_include.nss b/_module/nss/wm_include.nss
index 13d2fea..58dcb26 100644
--- a/_module/nss/wm_include.nss
+++ b/_module/nss/wm_include.nss
@@ -1,5 +1,6 @@
 // WILD MAGIC SYSTEM by Lex
 // Adapted to HCR system by Archaegeo
+#include "prc_inc_spells"
 
 // Set MATERCOMP to 0 to not use material components for those spells that need.
 object oMod=GetModule();
@@ -136,13 +137,13 @@ int NullMagicOverride(object oArea = OBJECT_INVALID,
 {
     int nModuleState = GetWMState(GetModule());
     object oItem = GetItemActivated();
-    if (oItem == OBJECT_INVALID) oItem = GetSpellCastItem();
+    if (oItem == OBJECT_INVALID) oItem = PRCGetSpellCastItem();
     int nItemState = GetWMState(oItem);
     location lTargetLocation;
     if (oCaster == OBJECT_INVALID)
     {
         oCaster = GetLastSpellCaster();
-        lTargetLocation = GetSpellTargetLocation();
+        lTargetLocation = PRCGetSpellTargetLocation();
     }
     if (oCaster == OBJECT_INVALID) {
         oCaster = GetItemActivator();
@@ -153,7 +154,7 @@ int NullMagicOverride(object oArea = OBJECT_INVALID,
         oCaster = OBJECT_SELF;
         lTargetLocation = GetLocation(OBJECT_SELF);
     }
-    if (oTarget == OBJECT_INVALID) oTarget = GetSpellTargetObject();
+    if (oTarget == OBJECT_INVALID) oTarget = PRCGetSpellTargetObject();
     if (oTarget == OBJECT_INVALID) oTarget = GetItemActivatedTarget();
     if (oTarget == OBJECT_INVALID) oTarget = oCaster;
     if (oArea == OBJECT_INVALID) oArea = GetArea(oCaster);
@@ -190,13 +191,13 @@ int WildMagicOverride(object oArea = OBJECT_INVALID,
 {
     int nModuleState = GetWMState(GetModule());
     object oItem = GetItemActivated();
-    if (oItem == OBJECT_INVALID) oItem = GetSpellCastItem();
+    if (oItem == OBJECT_INVALID) oItem = PRCGetSpellCastItem();
     int nItemState = GetWMState(oItem);
-    location lTargetLocation = GetSpellTargetLocation();
+    location lTargetLocation = PRCGetSpellTargetLocation();
     if (oCaster == OBJECT_INVALID)
     {
         oCaster = GetLastSpellCaster();
-        lTargetLocation = GetSpellTargetLocation();
+        lTargetLocation = PRCGetSpellTargetLocation();
     }
     if (oCaster == OBJECT_INVALID) {
         oCaster = GetItemActivator();
@@ -207,7 +208,7 @@ int WildMagicOverride(object oArea = OBJECT_INVALID,
         oCaster = OBJECT_SELF;
         lTargetLocation = GetLocation(OBJECT_SELF);
     }
-    if (oTarget == OBJECT_INVALID) oTarget = GetSpellTargetObject();
+    if (oTarget == OBJECT_INVALID) oTarget = PRCGetSpellTargetObject();
     if (oTarget == OBJECT_INVALID) oTarget = GetItemActivatedTarget();
     if (oTarget == OBJECT_INVALID) oTarget = oCaster;
     if (oArea == OBJECT_INVALID) oArea = GetArea(oCaster);
@@ -245,15 +246,15 @@ int WildMagicOverride(object oArea = OBJECT_INVALID,
 
 int GoWild(object oCaster, object oTarget, location lLocation)
 {
-    int nCasterLevel = GetCasterLevel(oCaster);
+    int nCasterLevel = PRCGetCasterLevel(oCaster);
     if (GetLocalInt(OBJECT_SELF, "WILDCASTING"))
     {
         DeleteLocalInt(OBJECT_SELF, "WILDCASTING");
         return 0;
     }
 
-    int nSpell = GetSpellId();
-    int nMetaMagic = GetMetaMagicFeat();
+    int nSpell = PRCGetSpellId();
+    int nMetaMagic = PRCGetMetaMagicFeat();
 
     int nRoll = d100();
 
@@ -352,7 +353,7 @@ void RandomCast ()
     object oTarget = GetRandomNearby(OBJECT_SELF);
     location lLocation = GetLocation(oTarget);
     SpecialCast(Random(412), oTarget, lLocation,
-                GetCasterLevel(OBJECT_SELF), GetMetaMagicFeat());
+                PRCGetCasterLevel(OBJECT_SELF), PRCGetMetaMagicFeat());
 }
 
 object GetRandomNearby(object oTarget=OBJECT_SELF)
diff --git a/_module/nss/x0_s3_gemspray.nss b/_module/nss/x0_s3_gemspray.nss
index df3345e..b8feeec 100644
--- a/_module/nss/x0_s3_gemspray.nss
+++ b/_module/nss/x0_s3_gemspray.nss
@@ -13,7 +13,7 @@ This script fires when gem spray ability from wand is activated
 // Gems go flying out in a cone. All targets in the area take d4() damage
 // for each of 1-5 gems, and end up with that number of gems in their
 // inventory. Reflex save halves damage.
-#include "x0_i0_spells"
+#include "prc_inc_spells"
 // Gems go flying out in a cone. All targets in the area take d4() damage
 // for each of 1-5 gems, and end up with that number of gems in their
 // inventory. Reflex save halves damage.
@@ -33,11 +33,11 @@ void DoFlyingGems(object oCaster, location lTarget)
     {
         if (!GetIsFriend(oTarget))
        {
-            nDamage = d4(GetCasterLevel(OBJECT_SELF));
+            nDamage = d4(PRCGetCasterLevel(OBJECT_SELF));
 
 
         // Make Reflex save to halve
-        if ( MySavingThrow(SAVING_THROW_REFLEX, oTarget, 14)) {
+        if ( PRCMySavingThrow(SAVING_THROW_REFLEX, oTarget, 14)) {
             nDamage = nDamage/2;
         }
 
@@ -56,5 +56,5 @@ void DoFlyingGems(object oCaster, location lTarget)
 
 void main ()
 {
-    DoFlyingGems(OBJECT_SELF, GetSpellTargetLocation());
+    DoFlyingGems(OBJECT_SELF, PRCGetSpellTargetLocation());
 }
diff --git a/_module/nss/x2_s1_hurlrock.nss b/_module/nss/x2_s1_hurlrock.nss
index 4db8539..272fb19 100644
--- a/_module/nss/x2_s1_hurlrock.nss
+++ b/_module/nss/x2_s1_hurlrock.nss
@@ -17,7 +17,7 @@
 void RockDamage(location lImpact);
 
 #include "x2_inc_shifter"
-#include "x0_i0_spells"
+#include "prc_inc_spells"
 
 void main()
 {
@@ -25,7 +25,7 @@ void main()
     effect eImpact = EffectVisualEffect(354);
     effect eImpac1 = EffectVisualEffect(460);
     int nDamage;
-    location lImpact = GetSpellTargetLocation();
+    location lImpact = PRCGetSpellTargetLocation();
     ApplyEffectAtLocation(DURATION_TYPE_INSTANT, eImpact, lImpact);
     DelayCommand(0.2f,ApplyEffectAtLocation(DURATION_TYPE_INSTANT, eImpac1, lImpact));
     RockDamage(lImpact);
@@ -42,7 +42,8 @@ void RockDamage(location lImpact)
     effect eVisRock = EffectVisualEffect(VFX_COM_CHUNK_STONE_MEDIUM);
     int nDC;
 
-    int bShifter = (GetLevelByClass(CLASS_TYPE_SHIFTER,OBJECT_SELF)>10);
+    int bShifter = GetLevelByClass(CLASS_TYPE_SHIFTER, OBJECT_SELF) + 
+					GetLevelByClass(CLASS_TYPE_PNP_SHIFTER, OBJECT_SELF) > 10;
 
     if (bShifter)
     {
@@ -80,7 +81,7 @@ void RockDamage(location lImpact)
         if (spellsIsTarget(oTarget,SPELL_TARGET_STANDARDHOSTILE,OBJECT_SELF))
         {
             //Fire cast spell at event for the specified target
-            SignalEvent(oTarget, EventSpellCastAt(OBJECT_SELF, GetSpellId()));
+            SignalEvent(oTarget, EventSpellCastAt(OBJECT_SELF, PRCGetSpellId()));
             //Get the distance between the explosion and the target to calculate delay
             fDelay = GetDistanceBetweenLocations(lImpact, GetLocation(oTarget))/20;
             //Roll damage for each target, but doors are always killed
@@ -91,7 +92,7 @@ void RockDamage(location lImpact)
 
 
             //Adjust the damage based on the Reflex Save, Evasion and Improved Evasion.
-            nDamage = GetReflexAdjustedDamage(nDamage, oTarget, nDC, SAVING_THROW_TYPE_NONE);
+            nDamage = PRCGetReflexAdjustedDamage(nDamage, oTarget, nDC, SAVING_THROW_TYPE_NONE);
             //Set the damage effect
             eDam = EffectDamage(nDamage, DAMAGE_TYPE_BLUDGEONING,nPower);
             if(nDamage > 0)
diff --git a/_release/Battledale [PRC-CEP3].7z b/_release/Battledale [PRC-CEP3].7z
new file mode 100644
index 0000000..451730e
Binary files /dev/null and b/_release/Battledale [PRC-CEP3].7z differ