diff --git a/_module/are/aantiochstart.are.json b/_module/are/aantiochstart.are.json
index 55aa7c5f..9edc07de 100644
--- a/_module/are/aantiochstart.are.json
+++ b/_module/are/aantiochstart.are.json
@@ -4891,7 +4891,7 @@
   },
   "Version": {
     "type": "dword",
-    "value": 151
+    "value": 152
   },
   "Width": {
     "type": "int",
diff --git a/_module/are/sarumcastleupper.are.json b/_module/are/sarumcastleupper.are.json
index a80ef047..4f49658b 100644
--- a/_module/are/sarumcastleupper.are.json
+++ b/_module/are/sarumcastleupper.are.json
@@ -2913,7 +2913,7 @@
   },
   "Version": {
     "type": "dword",
-    "value": 15
+    "value": 16
   },
   "Width": {
     "type": "int",
diff --git a/_module/dlg/random_npc_chat.dlg.json b/_module/dlg/random_npc_chat.dlg.json
index b6a97de7..f555af0a 100644
--- a/_module/dlg/random_npc_chat.dlg.json
+++ b/_module/dlg/random_npc_chat.dlg.json
@@ -21,6 +21,10 @@
     "value": [
       {
         "__struct_id": 0,
+        "ActionParams": {
+          "type": "list",
+          "value": []
+        },
         "Animation": {
           "type": "dword",
           "value": 0
@@ -66,6 +70,10 @@
       },
       {
         "__struct_id": 1,
+        "ActionParams": {
+          "type": "list",
+          "value": []
+        },
         "Animation": {
           "type": "dword",
           "value": 0
@@ -111,6 +119,10 @@
       },
       {
         "__struct_id": 2,
+        "ActionParams": {
+          "type": "list",
+          "value": []
+        },
         "Animation": {
           "type": "dword",
           "value": 0
@@ -156,6 +168,10 @@
       },
       {
         "__struct_id": 3,
+        "ActionParams": {
+          "type": "list",
+          "value": []
+        },
         "Animation": {
           "type": "dword",
           "value": 0
@@ -201,6 +217,10 @@
       },
       {
         "__struct_id": 4,
+        "ActionParams": {
+          "type": "list",
+          "value": []
+        },
         "Animation": {
           "type": "dword",
           "value": 0
@@ -246,6 +266,10 @@
       },
       {
         "__struct_id": 5,
+        "ActionParams": {
+          "type": "list",
+          "value": []
+        },
         "Animation": {
           "type": "dword",
           "value": 0
@@ -291,6 +315,10 @@
       },
       {
         "__struct_id": 6,
+        "ActionParams": {
+          "type": "list",
+          "value": []
+        },
         "Animation": {
           "type": "dword",
           "value": 0
@@ -336,6 +364,10 @@
       },
       {
         "__struct_id": 7,
+        "ActionParams": {
+          "type": "list",
+          "value": []
+        },
         "Animation": {
           "type": "dword",
           "value": 0
@@ -381,6 +413,10 @@
       },
       {
         "__struct_id": 8,
+        "ActionParams": {
+          "type": "list",
+          "value": []
+        },
         "Animation": {
           "type": "dword",
           "value": 0
@@ -426,6 +462,10 @@
       },
       {
         "__struct_id": 9,
+        "ActionParams": {
+          "type": "list",
+          "value": []
+        },
         "Animation": {
           "type": "dword",
           "value": 0
@@ -490,7 +530,11 @@
         "__struct_id": 0,
         "Active": {
           "type": "resref",
-          "value": "062_npc_say"
+          "value": ""
+        },
+        "ConditionParams": {
+          "type": "list",
+          "value": []
         },
         "Index": {
           "type": "dword",
@@ -501,7 +545,11 @@
         "__struct_id": 1,
         "Active": {
           "type": "resref",
-          "value": "062_npc_say"
+          "value": ""
+        },
+        "ConditionParams": {
+          "type": "list",
+          "value": []
         },
         "Index": {
           "type": "dword",
@@ -512,7 +560,11 @@
         "__struct_id": 2,
         "Active": {
           "type": "resref",
-          "value": "062_npc_say"
+          "value": ""
+        },
+        "ConditionParams": {
+          "type": "list",
+          "value": []
         },
         "Index": {
           "type": "dword",
@@ -523,7 +575,11 @@
         "__struct_id": 3,
         "Active": {
           "type": "resref",
-          "value": "062_npc_say"
+          "value": ""
+        },
+        "ConditionParams": {
+          "type": "list",
+          "value": []
         },
         "Index": {
           "type": "dword",
@@ -534,7 +590,11 @@
         "__struct_id": 4,
         "Active": {
           "type": "resref",
-          "value": "062_npc_say"
+          "value": ""
+        },
+        "ConditionParams": {
+          "type": "list",
+          "value": []
         },
         "Index": {
           "type": "dword",
@@ -545,7 +605,11 @@
         "__struct_id": 5,
         "Active": {
           "type": "resref",
-          "value": "062_npc_say"
+          "value": ""
+        },
+        "ConditionParams": {
+          "type": "list",
+          "value": []
         },
         "Index": {
           "type": "dword",
@@ -556,7 +620,11 @@
         "__struct_id": 6,
         "Active": {
           "type": "resref",
-          "value": "062_npc_say"
+          "value": ""
+        },
+        "ConditionParams": {
+          "type": "list",
+          "value": []
         },
         "Index": {
           "type": "dword",
@@ -567,7 +635,11 @@
         "__struct_id": 7,
         "Active": {
           "type": "resref",
-          "value": "062_npc_say"
+          "value": ""
+        },
+        "ConditionParams": {
+          "type": "list",
+          "value": []
         },
         "Index": {
           "type": "dword",
@@ -578,7 +650,11 @@
         "__struct_id": 8,
         "Active": {
           "type": "resref",
-          "value": "062_npc_say"
+          "value": ""
+        },
+        "ConditionParams": {
+          "type": "list",
+          "value": []
         },
         "Index": {
           "type": "dword",
@@ -589,7 +665,11 @@
         "__struct_id": 9,
         "Active": {
           "type": "resref",
-          "value": "062_npc_say"
+          "value": ""
+        },
+        "ConditionParams": {
+          "type": "list",
+          "value": []
         },
         "Index": {
           "type": "dword",
diff --git a/_module/gic/sarumcastleupper.gic.json b/_module/gic/sarumcastleupper.gic.json
index a8f4ce8f..f9c3ff82 100644
--- a/_module/gic/sarumcastleupper.gic.json
+++ b/_module/gic/sarumcastleupper.gic.json
@@ -750,6 +750,13 @@
           "type": "cexostring",
           "value": ""
         }
+      },
+      {
+        "__struct_id": 5,
+        "Comment": {
+          "type": "cexostring",
+          "value": "This is the default waypoint you may place to set a patrol path for a creature or NPC.\r\n1. Create the creature and either use its current Tag or fill in a new one.\r\n2. Place or make sure the WalkWayPoints() is within the body of the On Spawn script for the creature.\r\n3. Place a series of waypoints along the route you wish the creature to walk.\r\n4. Select all of the newly created waypoints and right click. Choose the Create Set option.\r\n5. The waypoint set will have a set name of \"WP_\" + NPC Tag. Thus if an NPC with the Tag \"Guard\" will have a waypoint set called \"WP_Guard\". Note that Tags are case sensitive."
+        }
       }
     ]
   }
diff --git a/_module/git/aantiochstart.git.json b/_module/git/aantiochstart.git.json
index 6291eae2..be9bb57d 100644
--- a/_module/git/aantiochstart.git.json
+++ b/_module/git/aantiochstart.git.json
@@ -17028,7 +17028,7 @@
         },
         "LinkedToFlags": {
           "type": "byte",
-          "value": 1
+          "value": 2
         },
         "LoadScreenID": {
           "type": "word",
diff --git a/_module/git/sarumcastleupper.git.json b/_module/git/sarumcastleupper.git.json
index 355d0f4f..cfb07266 100644
--- a/_module/git/sarumcastleupper.git.json
+++ b/_module/git/sarumcastleupper.git.json
@@ -474,6 +474,90 @@
                 "value": 0
               }
             },
+            {
+              "__struct_id": 0,
+              "Rank": {
+                "type": "byte",
+                "value": 0
+              }
+            },
+            {
+              "__struct_id": 0,
+              "Rank": {
+                "type": "byte",
+                "value": 0
+              }
+            },
+            {
+              "__struct_id": 0,
+              "Rank": {
+                "type": "byte",
+                "value": 0
+              }
+            },
+            {
+              "__struct_id": 0,
+              "Rank": {
+                "type": "byte",
+                "value": 0
+              }
+            },
+            {
+              "__struct_id": 0,
+              "Rank": {
+                "type": "byte",
+                "value": 0
+              }
+            },
+            {
+              "__struct_id": 0,
+              "Rank": {
+                "type": "byte",
+                "value": 0
+              }
+            },
+            {
+              "__struct_id": 0,
+              "Rank": {
+                "type": "byte",
+                "value": 0
+              }
+            },
+            {
+              "__struct_id": 0,
+              "Rank": {
+                "type": "byte",
+                "value": 0
+              }
+            },
+            {
+              "__struct_id": 0,
+              "Rank": {
+                "type": "byte",
+                "value": 0
+              }
+            },
+            {
+              "__struct_id": 0,
+              "Rank": {
+                "type": "byte",
+                "value": 0
+              }
+            },
+            {
+              "__struct_id": 0,
+              "Rank": {
+                "type": "byte",
+                "value": 0
+              }
+            },
+            {
+              "__struct_id": 0,
+              "Rank": {
+                "type": "byte",
+                "value": 0
+              }
+            },
             {
               "__struct_id": 0,
               "Rank": {
@@ -507,8 +591,8 @@
           "type": "cexostring",
           "value": "Chair_ghost"
         },
-        "Tail": {
-          "type": "byte",
+        "Tail_New": {
+          "type": "dword",
           "value": 205
         },
         "TemplateList": {
@@ -527,8 +611,8 @@
           "type": "short",
           "value": 0
         },
-        "Wings": {
-          "type": "byte",
+        "Wings_New": {
+          "type": "dword",
           "value": 205
         },
         "Wis": {
@@ -610,8 +694,8 @@
           "type": "byte",
           "value": 16
         },
-        "GenericType": {
-          "type": "byte",
+        "GenericType_New": {
+          "type": "dword",
           "value": 1
         },
         "Hardness": {
@@ -831,8 +915,8 @@
           "type": "byte",
           "value": 16
         },
-        "GenericType": {
-          "type": "byte",
+        "GenericType_New": {
+          "type": "dword",
           "value": 8
         },
         "Hardness": {
@@ -1052,8 +1136,8 @@
           "type": "byte",
           "value": 16
         },
-        "GenericType": {
-          "type": "byte",
+        "GenericType_New": {
+          "type": "dword",
           "value": 1
         },
         "Hardness": {
@@ -1273,8 +1357,8 @@
           "type": "byte",
           "value": 16
         },
-        "GenericType": {
-          "type": "byte",
+        "GenericType_New": {
+          "type": "dword",
           "value": 1
         },
         "Hardness": {
@@ -1494,8 +1578,8 @@
           "type": "byte",
           "value": 16
         },
-        "GenericType": {
-          "type": "byte",
+        "GenericType_New": {
+          "type": "dword",
           "value": 1
         },
         "Hardness": {
@@ -1715,8 +1799,8 @@
           "type": "byte",
           "value": 16
         },
-        "GenericType": {
-          "type": "byte",
+        "GenericType_New": {
+          "type": "dword",
           "value": 1
         },
         "Hardness": {
@@ -1936,8 +2020,8 @@
           "type": "byte",
           "value": 16
         },
-        "GenericType": {
-          "type": "byte",
+        "GenericType_New": {
+          "type": "dword",
           "value": 1
         },
         "Hardness": {
@@ -2157,8 +2241,8 @@
           "type": "byte",
           "value": 16
         },
-        "GenericType": {
-          "type": "byte",
+        "GenericType_New": {
+          "type": "dword",
           "value": 1
         },
         "Hardness": {
@@ -2378,8 +2462,8 @@
           "type": "byte",
           "value": 16
         },
-        "GenericType": {
-          "type": "byte",
+        "GenericType_New": {
+          "type": "dword",
           "value": 1
         },
         "Hardness": {
@@ -2599,8 +2683,8 @@
           "type": "byte",
           "value": 16
         },
-        "GenericType": {
-          "type": "byte",
+        "GenericType_New": {
+          "type": "dword",
           "value": 1
         },
         "Hardness": {
@@ -2820,8 +2904,8 @@
           "type": "byte",
           "value": 16
         },
-        "GenericType": {
-          "type": "byte",
+        "GenericType_New": {
+          "type": "dword",
           "value": 1
         },
         "Hardness": {
@@ -3041,8 +3125,8 @@
           "type": "byte",
           "value": 16
         },
-        "GenericType": {
-          "type": "byte",
+        "GenericType_New": {
+          "type": "dword",
           "value": 1
         },
         "Hardness": {
@@ -3262,8 +3346,8 @@
           "type": "byte",
           "value": 16
         },
-        "GenericType": {
-          "type": "byte",
+        "GenericType_New": {
+          "type": "dword",
           "value": 1
         },
         "Hardness": {
@@ -3483,8 +3567,8 @@
           "type": "byte",
           "value": 16
         },
-        "GenericType": {
-          "type": "byte",
+        "GenericType_New": {
+          "type": "dword",
           "value": 1
         },
         "Hardness": {
@@ -3704,8 +3788,8 @@
           "type": "byte",
           "value": 16
         },
-        "GenericType": {
-          "type": "byte",
+        "GenericType_New": {
+          "type": "dword",
           "value": 1
         },
         "Hardness": {
@@ -3925,8 +4009,8 @@
           "type": "byte",
           "value": 16
         },
-        "GenericType": {
-          "type": "byte",
+        "GenericType_New": {
+          "type": "dword",
           "value": 1
         },
         "Hardness": {
@@ -4202,6 +4286,10 @@
             "0": "Area Spawner"
           }
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -4423,6 +4511,10 @@
           "type": "cexolocstring",
           "value": {}
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -4644,6 +4736,10 @@
           "type": "cexolocstring",
           "value": {}
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -4865,6 +4961,10 @@
           "type": "cexolocstring",
           "value": {}
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -5086,6 +5186,10 @@
           "type": "cexolocstring",
           "value": {}
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -5307,6 +5411,10 @@
           "type": "cexolocstring",
           "value": {}
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -5528,6 +5636,10 @@
           "type": "cexolocstring",
           "value": {}
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -5749,6 +5861,10 @@
           "type": "cexolocstring",
           "value": {}
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -5970,6 +6086,10 @@
           "type": "cexolocstring",
           "value": {}
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -6191,6 +6311,10 @@
           "type": "cexolocstring",
           "value": {}
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -6412,6 +6536,10 @@
           "type": "cexolocstring",
           "value": {}
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -6633,6 +6761,10 @@
           "type": "cexolocstring",
           "value": {}
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -6854,6 +6986,10 @@
           "type": "cexolocstring",
           "value": {}
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -7075,6 +7211,10 @@
           "type": "cexolocstring",
           "value": {}
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -7296,6 +7436,10 @@
           "type": "cexolocstring",
           "value": {}
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -7517,6 +7661,10 @@
           "type": "cexolocstring",
           "value": {}
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -7738,6 +7886,10 @@
           "type": "cexolocstring",
           "value": {}
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -7963,6 +8115,10 @@
             "0": "Candelabra"
           }
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -8188,6 +8344,10 @@
             "0": "Candelabra"
           }
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -8413,6 +8573,10 @@
             "0": "Candelabra"
           }
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -8634,6 +8798,10 @@
           "type": "cexolocstring",
           "value": {}
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -8855,6 +9023,10 @@
           "type": "cexolocstring",
           "value": {}
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -9076,6 +9248,10 @@
           "type": "cexolocstring",
           "value": {}
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -9297,6 +9473,10 @@
           "type": "cexolocstring",
           "value": {}
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -9518,6 +9698,10 @@
           "type": "cexolocstring",
           "value": {}
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -9743,6 +9927,10 @@
             "0": "Candelabra"
           }
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -9968,6 +10156,10 @@
             "0": "Candelabra"
           }
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -10193,6 +10385,10 @@
             "0": "Candelabra"
           }
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -10418,6 +10614,10 @@
             "0": "Candelabra"
           }
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -10643,6 +10843,10 @@
             "0": "Candelabra"
           }
         },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
         "OnClosed": {
           "type": "resref",
           "value": ""
@@ -14837,6 +15041,68 @@
           "type": "float",
           "value": -9.5367431640625e-007
         }
+      },
+      {
+        "__struct_id": 5,
+        "Appearance": {
+          "type": "byte",
+          "value": 1
+        },
+        "Description": {
+          "type": "cexolocstring",
+          "value": {}
+        },
+        "HasMapNote": {
+          "type": "byte",
+          "value": 0
+        },
+        "LinkedTo": {
+          "type": "cexostring",
+          "value": ""
+        },
+        "LocalizedName": {
+          "id": 14817,
+          "type": "cexolocstring",
+          "value": {
+            "0": "dt_upstairs2innerkeep"
+          }
+        },
+        "MapNote": {
+          "type": "cexolocstring",
+          "value": {}
+        },
+        "MapNoteEnabled": {
+          "type": "byte",
+          "value": 1
+        },
+        "Tag": {
+          "type": "cexostring",
+          "value": "dt_upstairs2innerkeep"
+        },
+        "TemplateResRef": {
+          "type": "resref",
+          "value": "nw_waypoint001"
+        },
+        "XOrientation": {
+          "type": "float",
+          "value": 0.0
+        },
+        "XPosition": {
+          "type": "float",
+          "value": 15.02999973297119
+        },
+        "YOrientation": {
+          "type": "float",
+          "value": -1.0
+        },
+        "YPosition": {
+          "type": "float",
+          "value": 61.20999908447266
+        },
+        "ZPosition": {
+          "type": "float",
+          "value": 0.0
+        }
       }
     ]
   }
diff --git a/_module/ifo/module.ifo.json b/_module/ifo/module.ifo.json
index d7533bdf..2df175fc 100644
--- a/_module/ifo/module.ifo.json
+++ b/_module/ifo/module.ifo.json
@@ -5079,7 +5079,7 @@
         },
         "Value": {
           "type": "int",
-          "value": 1
+          "value": 3
         }
       },
       {
@@ -5186,6 +5186,246 @@
           "type": "int",
           "value": 1
         }
+      },
+      {
+        "__struct_id": 0,
+        "Name": {
+          "type": "cexostring",
+          "value": "PRC_SCRIBE_SCROLL_CASTER_LEVEL"
+        },
+        "Type": {
+          "type": "dword",
+          "value": 1
+        },
+        "Value": {
+          "type": "int",
+          "value": 1
+        }
+      },
+      {
+        "__struct_id": 0,
+        "Name": {
+          "type": "cexostring",
+          "value": "PRC_CRAFT_WAND_CASTER_LEVEL"
+        },
+        "Type": {
+          "type": "dword",
+          "value": 1
+        },
+        "Value": {
+          "type": "int",
+          "value": 1
+        }
+      },
+      {
+        "__struct_id": 0,
+        "Name": {
+          "type": "cexostring",
+          "value": "PRC_BREW_POTION_CASTER_LEVEL"
+        },
+        "Type": {
+          "type": "dword",
+          "value": 1
+        },
+        "Value": {
+          "type": "int",
+          "value": 1
+        }
+      },
+      {
+        "__struct_id": 0,
+        "Name": {
+          "type": "cexostring",
+          "value": "PRC_CRAFT_ROD_CASTER_LEVEL"
+        },
+        "Type": {
+          "type": "dword",
+          "value": 1
+        },
+        "Value": {
+          "type": "int",
+          "value": 1
+        }
+      },
+      {
+        "__struct_id": 0,
+        "Name": {
+          "type": "cexostring",
+          "value": "PRC_CRAFT_STAFF_CASTER_LEVEL"
+        },
+        "Type": {
+          "type": "dword",
+          "value": 1
+        },
+        "Value": {
+          "type": "int",
+          "value": 1
+        }
+      },
+      {
+        "__struct_id": 0,
+        "Name": {
+          "type": "cexostring",
+          "value": "X2_CI_BREWPOTION_MAXLEVEL"
+        },
+        "Type": {
+          "type": "dword",
+          "value": 1
+        },
+        "Value": {
+          "type": "int",
+          "value": 9
+        }
+      },
+      {
+        "__struct_id": 0,
+        "Name": {
+          "type": "cexostring",
+          "value": "X2_CI_CRAFTWAND_MAXLEVEL"
+        },
+        "Type": {
+          "type": "dword",
+          "value": 1
+        },
+        "Value": {
+          "type": "int",
+          "value": 9
+        }
+      },
+      {
+        "__struct_id": 0,
+        "Name": {
+          "type": "cexostring",
+          "value": "PRC_CRAFTING_ARBITRARY"
+        },
+        "Type": {
+          "type": "dword",
+          "value": 1
+        },
+        "Value": {
+          "type": "int",
+          "value": 1
+        }
+      },
+      {
+        "__struct_id": 0,
+        "Name": {
+          "type": "cexostring",
+          "value": "PRC_CRAFTING_COST_SCALE"
+        },
+        "Type": {
+          "type": "dword",
+          "value": 1
+        },
+        "Value": {
+          "type": "int",
+          "value": 25
+        }
+      },
+      {
+        "__struct_id": 0,
+        "Name": {
+          "type": "cexostring",
+          "value": "PRC_CRAFTING_TIME_SCALE"
+        },
+        "Type": {
+          "type": "dword",
+          "value": 1
+        },
+        "Value": {
+          "type": "int",
+          "value": 3
+        }
+      },
+      {
+        "__struct_id": 0,
+        "Name": {
+          "type": "cexostring",
+          "value": "PRC_DISABLE_ENCOUNTERS"
+        },
+        "Type": {
+          "type": "dword",
+          "value": 1
+        },
+        "Value": {
+          "type": "int",
+          "value": 1
+        }
+      },
+      {
+        "__struct_id": 0,
+        "Name": {
+          "type": "cexostring",
+          "value": "PRC_DISABLE_SWITCH_CHANGING_CONVO"
+        },
+        "Type": {
+          "type": "dword",
+          "value": 1
+        },
+        "Value": {
+          "type": "int",
+          "value": 1
+        }
+      },
+      {
+        "__struct_id": 0,
+        "Name": {
+          "type": "cexostring",
+          "value": "PRC_PNP_DEATH_ENABLE"
+        },
+        "Type": {
+          "type": "dword",
+          "value": 1
+        },
+        "Value": {
+          "type": "int",
+          "value": 1
+        }
+      },
+      {
+        "__struct_id": 0,
+        "Name": {
+          "type": "cexostring",
+          "value": "PRC_DEATH_OR_BLEED"
+        },
+        "Type": {
+          "type": "dword",
+          "value": 1
+        },
+        "Value": {
+          "type": "int",
+          "value": 1
+        }
+      },
+      {
+        "__struct_id": 0,
+        "Name": {
+          "type": "cexostring",
+          "value": "PRC_DEATH_HEAL_FROM_STABLE"
+        },
+        "Type": {
+          "type": "dword",
+          "value": 1
+        },
+        "Value": {
+          "type": "int",
+          "value": 1
+        }
+      },
+      {
+        "__struct_id": 0,
+        "Name": {
+          "type": "cexostring",
+          "value": "PRC_DEATH_BLEED_TO_STABLE_CHANCE"
+        },
+        "Type": {
+          "type": "dword",
+          "value": 1
+        },
+        "Value": {
+          "type": "int",
+          "value": 20
+        }
       }
     ]
   }
diff --git a/_module/ncs/_ness_spawn_hb.ncs b/_module/ncs/_ness_spawn_hb.ncs
index 7f766092..f998eb1a 100644
Binary files a/_module/ncs/_ness_spawn_hb.ncs and b/_module/ncs/_ness_spawn_hb.ncs differ
diff --git a/_module/ncs/_on_cliententer.ncs b/_module/ncs/_on_cliententer.ncs
index 78c2f0e2..ee92f2ef 100644
Binary files a/_module/ncs/_on_cliententer.ncs and b/_module/ncs/_on_cliententer.ncs differ
diff --git a/_module/ncs/_ondeath.ncs b/_module/ncs/_ondeath.ncs
index be0dc14a..2e6275f0 100644
Binary files a/_module/ncs/_ondeath.ncs and b/_module/ncs/_ondeath.ncs differ
diff --git a/_module/ncs/aa_rod_of_wonder.ncs b/_module/ncs/aa_rod_of_wonder.ncs
index e11968fa..066cbb88 100644
Binary files a/_module/ncs/aa_rod_of_wonder.ncs and b/_module/ncs/aa_rod_of_wonder.ncs differ
diff --git a/_module/ncs/area_spawner.ncs b/_module/ncs/area_spawner.ncs
index 3d472ab1..2b7f30f5 100644
Binary files a/_module/ncs/area_spawner.ncs and b/_module/ncs/area_spawner.ncs differ
diff --git a/_module/ncs/areacleanup.ncs b/_module/ncs/areacleanup.ncs
index 81f7bdff..8f300648 100644
Binary files a/_module/ncs/areacleanup.ncs and b/_module/ncs/areacleanup.ncs differ
diff --git a/_module/ncs/attack_pc.ncs b/_module/ncs/attack_pc.ncs
index 2f3f2006..10fd2158 100644
Binary files a/_module/ncs/attack_pc.ncs and b/_module/ncs/attack_pc.ncs differ
diff --git a/_module/ncs/barrel_ondeath.ncs b/_module/ncs/barrel_ondeath.ncs
index 2a32c21e..15ca5149 100644
Binary files a/_module/ncs/barrel_ondeath.ncs and b/_module/ncs/barrel_ondeath.ncs differ
diff --git a/_module/ncs/chng_fact_hostil.ncs b/_module/ncs/chng_fact_hostil.ncs
index ffa72752..cbdf83f9 100644
Binary files a/_module/ncs/chng_fact_hostil.ncs and b/_module/ncs/chng_fact_hostil.ncs differ
diff --git a/_module/ncs/clone_test_ring3.ncs b/_module/ncs/clone_test_ring3.ncs
index 07719dfb..29aabae8 100644
Binary files a/_module/ncs/clone_test_ring3.ncs and b/_module/ncs/clone_test_ring3.ncs differ
diff --git a/_module/ncs/convo_script_sit.ncs b/_module/ncs/convo_script_sit.ncs
index 033ed00d..30f115c8 100644
Binary files a/_module/ncs/convo_script_sit.ncs and b/_module/ncs/convo_script_sit.ncs differ
diff --git a/_module/ncs/dragonspawn.ncs b/_module/ncs/dragonspawn.ncs
index ad2ffa0b..0378653b 100644
Binary files a/_module/ncs/dragonspawn.ncs and b/_module/ncs/dragonspawn.ncs differ
diff --git a/_module/ncs/drow_bell_ring.ncs b/_module/ncs/drow_bell_ring.ncs
index 73c2e2c4..94b7c7e8 100644
Binary files a/_module/ncs/drow_bell_ring.ncs and b/_module/ncs/drow_bell_ring.ncs differ
diff --git a/_module/ncs/drow_ck_race.ncs b/_module/ncs/drow_ck_race.ncs
index e76f9d0e..0547204a 100644
Binary files a/_module/ncs/drow_ck_race.ncs and b/_module/ncs/drow_ck_race.ncs differ
diff --git a/_module/ncs/drow_explosion.ncs b/_module/ncs/drow_explosion.ncs
index 62b27113..b570e6a8 100644
Binary files a/_module/ncs/drow_explosion.ncs and b/_module/ncs/drow_explosion.ncs differ
diff --git a/_module/ncs/drow_merc_ck.ncs b/_module/ncs/drow_merc_ck.ncs
index e801eb73..0ef7beb7 100644
Binary files a/_module/ncs/drow_merc_ck.ncs and b/_module/ncs/drow_merc_ck.ncs differ
diff --git a/_module/ncs/dwarf_merc_ck.ncs b/_module/ncs/dwarf_merc_ck.ncs
index dbe4b834..aac315bf 100644
Binary files a/_module/ncs/dwarf_merc_ck.ncs and b/_module/ncs/dwarf_merc_ck.ncs differ
diff --git a/_module/ncs/emperor_attack.ncs b/_module/ncs/emperor_attack.ncs
index 4f4d5856..ced07852 100644
Binary files a/_module/ncs/emperor_attack.ncs and b/_module/ncs/emperor_attack.ncs differ
diff --git a/_module/ncs/explosive_death.ncs b/_module/ncs/explosive_death.ncs
index b567a5f2..244ca12c 100644
Binary files a/_module/ncs/explosive_death.ncs and b/_module/ncs/explosive_death.ncs differ
diff --git a/_module/ncs/gen_treasure1.ncs b/_module/ncs/gen_treasure1.ncs
index 1ee4ac25..cd91015f 100644
Binary files a/_module/ncs/gen_treasure1.ncs and b/_module/ncs/gen_treasure1.ncs differ
diff --git a/_module/ncs/gz_healer_spawn.ncs b/_module/ncs/gz_healer_spawn.ncs
index c7c51463..cd298b6f 100644
Binary files a/_module/ncs/gz_healer_spawn.ncs and b/_module/ncs/gz_healer_spawn.ncs differ
diff --git a/_module/ncs/hif_onclientente.ncs b/_module/ncs/hif_onclientente.ncs
index fdc92c6b..63fdc519 100644
Binary files a/_module/ncs/hif_onclientente.ncs and b/_module/ncs/hif_onclientente.ncs differ
diff --git a/_module/ncs/hif_onplayerdyin.ncs b/_module/ncs/hif_onplayerdyin.ncs
index 606df027..d763422d 100644
Binary files a/_module/ncs/hif_onplayerdyin.ncs and b/_module/ncs/hif_onplayerdyin.ncs differ
diff --git a/_module/ncs/irda_start.ncs b/_module/ncs/irda_start.ncs
index 714f9d7a..26fbc723 100644
Binary files a/_module/ncs/irda_start.ncs and b/_module/ncs/irda_start.ncs differ
diff --git a/_module/ncs/lmpperfacttheft.ncs b/_module/ncs/lmpperfacttheft.ncs
index 97513296..663ed894 100644
Binary files a/_module/ncs/lmpperfacttheft.ncs and b/_module/ncs/lmpperfacttheft.ncs differ
diff --git a/_module/ncs/lmpperfconvabort.ncs b/_module/ncs/lmpperfconvabort.ncs
index ddc59533..be130e88 100644
Binary files a/_module/ncs/lmpperfconvabort.ncs and b/_module/ncs/lmpperfconvabort.ncs differ
diff --git a/_module/ncs/lmpperfspawn.ncs b/_module/ncs/lmpperfspawn.ncs
index 795d423e..cfa917dd 100644
Binary files a/_module/ncs/lmpperfspawn.ncs and b/_module/ncs/lmpperfspawn.ncs differ
diff --git a/_module/ncs/mud_golem_ondam.ncs b/_module/ncs/mud_golem_ondam.ncs
index 9c59656c..f66277c4 100644
Binary files a/_module/ncs/mud_golem_ondam.ncs and b/_module/ncs/mud_golem_ondam.ncs differ
diff --git a/_module/ncs/npc_sit_chair.ncs b/_module/ncs/npc_sit_chair.ncs
index fb89ee5d..4d99530f 100644
Binary files a/_module/ncs/npc_sit_chair.ncs and b/_module/ncs/npc_sit_chair.ncs differ
diff --git a/_module/ncs/npc_sit_stay.ncs b/_module/ncs/npc_sit_stay.ncs
index 75d79375..2b3b672a 100644
Binary files a/_module/ncs/npc_sit_stay.ncs and b/_module/ncs/npc_sit_stay.ncs differ
diff --git a/_module/ncs/npc_sit_woodenbe.ncs b/_module/ncs/npc_sit_woodenbe.ncs
index 6ed998bc..3d0aebd8 100644
Binary files a/_module/ncs/npc_sit_woodenbe.ncs and b/_module/ncs/npc_sit_woodenbe.ncs differ
diff --git a/_module/ncs/nw_c2_bossdie.ncs b/_module/ncs/nw_c2_bossdie.ncs
index b7c8a5ad..1532115a 100644
Binary files a/_module/ncs/nw_c2_bossdie.ncs and b/_module/ncs/nw_c2_bossdie.ncs differ
diff --git a/_module/ncs/nw_c2_default1.ncs b/_module/ncs/nw_c2_default1.ncs
index 7083f4f1..85e03fcc 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 4a01cdf4..7abe77e2 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_default3.ncs b/_module/ncs/nw_c2_default3.ncs
index acefe162..ee8126f9 100644
Binary files a/_module/ncs/nw_c2_default3.ncs and b/_module/ncs/nw_c2_default3.ncs differ
diff --git a/_module/ncs/nw_c2_default4.ncs b/_module/ncs/nw_c2_default4.ncs
index 54b65985..9fa3da78 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 9ee9eccc..78e76704 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 459990a2..4a45d8ec 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_default8.ncs b/_module/ncs/nw_c2_default8.ncs
index 9061bdd8..be3702fb 100644
Binary files a/_module/ncs/nw_c2_default8.ncs and b/_module/ncs/nw_c2_default8.ncs differ
diff --git a/_module/ncs/nw_c2_default9_t.ncs b/_module/ncs/nw_c2_default9_t.ncs
index 79223641..39a88ce9 100644
Binary files a/_module/ncs/nw_c2_default9_t.ncs and b/_module/ncs/nw_c2_default9_t.ncs differ
diff --git a/_module/ncs/nw_c2_defaultb.ncs b/_module/ncs/nw_c2_defaultb.ncs
index c19b083a..bcb8ca67 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_o2_boss.ncs b/_module/ncs/nw_o2_boss.ncs
index aeabdb71..8cca0fa8 100644
Binary files a/_module/ncs/nw_o2_boss.ncs and b/_module/ncs/nw_o2_boss.ncs differ
diff --git a/_module/ncs/nw_o2_generalhig.ncs b/_module/ncs/nw_o2_generalhig.ncs
index 105799a2..6ae43ab3 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 8b9e6349..f141a5ab 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 d581fc7f..c86c52cd 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_s1_aurablnda.ncs b/_module/ncs/nw_s1_aurablnda.ncs
index 376b84a9..d0724951 100644
Binary files a/_module/ncs/nw_s1_aurablnda.ncs and b/_module/ncs/nw_s1_aurablnda.ncs differ
diff --git a/_module/ncs/nw_s1_auracoldc.ncs b/_module/ncs/nw_s1_auracoldc.ncs
index 841ab57b..86315279 100644
Binary files a/_module/ncs/nw_s1_auracoldc.ncs and b/_module/ncs/nw_s1_auracoldc.ncs differ
diff --git a/_module/ncs/nw_s1_auraelecc.ncs b/_module/ncs/nw_s1_auraelecc.ncs
index 6e622d99..42bdbe95 100644
Binary files a/_module/ncs/nw_s1_auraelecc.ncs and b/_module/ncs/nw_s1_auraelecc.ncs differ
diff --git a/_module/ncs/nw_s1_aurafirec.ncs b/_module/ncs/nw_s1_aurafirec.ncs
index 50fe6329..77f3e6c3 100644
Binary files a/_module/ncs/nw_s1_aurafirec.ncs and b/_module/ncs/nw_s1_aurafirec.ncs differ
diff --git a/_module/ncs/nw_s1_auramenca.ncs b/_module/ncs/nw_s1_auramenca.ncs
index cfdaf28a..9ffa8ee0 100644
Binary files a/_module/ncs/nw_s1_auramenca.ncs and b/_module/ncs/nw_s1_auramenca.ncs differ
diff --git a/_module/ncs/nw_s1_aurastuna.ncs b/_module/ncs/nw_s1_aurastuna.ncs
index 279ae960..6710ed26 100644
Binary files a/_module/ncs/nw_s1_aurastuna.ncs and b/_module/ncs/nw_s1_aurastuna.ncs differ
diff --git a/_module/ncs/nw_s1_aurauneaa.ncs b/_module/ncs/nw_s1_aurauneaa.ncs
index f2ae3376..d0ae8f3b 100644
Binary files a/_module/ncs/nw_s1_aurauneaa.ncs and b/_module/ncs/nw_s1_aurauneaa.ncs differ
diff --git a/_module/ncs/nw_s1_bltacid.ncs b/_module/ncs/nw_s1_bltacid.ncs
index 9e9d57ba..2c5f9772 100644
Binary files a/_module/ncs/nw_s1_bltacid.ncs and b/_module/ncs/nw_s1_bltacid.ncs differ
diff --git a/_module/ncs/nw_s1_bltcharm.ncs b/_module/ncs/nw_s1_bltcharm.ncs
index 60db2a78..15e2f88c 100644
Binary files a/_module/ncs/nw_s1_bltcharm.ncs and b/_module/ncs/nw_s1_bltcharm.ncs differ
diff --git a/_module/ncs/nw_s1_bltchrdr.ncs b/_module/ncs/nw_s1_bltchrdr.ncs
index d86707e7..ba5088f7 100644
Binary files a/_module/ncs/nw_s1_bltchrdr.ncs and b/_module/ncs/nw_s1_bltchrdr.ncs differ
diff --git a/_module/ncs/nw_s1_bltcold.ncs b/_module/ncs/nw_s1_bltcold.ncs
index 373a803b..65c18b44 100644
Binary files a/_module/ncs/nw_s1_bltcold.ncs and b/_module/ncs/nw_s1_bltcold.ncs differ
diff --git a/_module/ncs/nw_s1_bltcondr.ncs b/_module/ncs/nw_s1_bltcondr.ncs
index e8c357f8..fc489eb4 100644
Binary files a/_module/ncs/nw_s1_bltcondr.ncs and b/_module/ncs/nw_s1_bltcondr.ncs differ
diff --git a/_module/ncs/nw_s1_bltconf.ncs b/_module/ncs/nw_s1_bltconf.ncs
index 914f4a12..393d3e17 100644
Binary files a/_module/ncs/nw_s1_bltconf.ncs and b/_module/ncs/nw_s1_bltconf.ncs differ
diff --git a/_module/ncs/nw_s1_bltdaze.ncs b/_module/ncs/nw_s1_bltdaze.ncs
index 708985f1..84410e13 100644
Binary files a/_module/ncs/nw_s1_bltdaze.ncs and b/_module/ncs/nw_s1_bltdaze.ncs differ
diff --git a/_module/ncs/nw_s1_bltdeath.ncs b/_module/ncs/nw_s1_bltdeath.ncs
index c1ecd7d8..ee8ad28a 100644
Binary files a/_module/ncs/nw_s1_bltdeath.ncs and b/_module/ncs/nw_s1_bltdeath.ncs differ
diff --git a/_module/ncs/nw_s1_bltdexdr.ncs b/_module/ncs/nw_s1_bltdexdr.ncs
index ecc29838..320571a0 100644
Binary files a/_module/ncs/nw_s1_bltdexdr.ncs and b/_module/ncs/nw_s1_bltdexdr.ncs differ
diff --git a/_module/ncs/nw_s1_bltdisese.ncs b/_module/ncs/nw_s1_bltdisese.ncs
index 8580d056..5540adce 100644
Binary files a/_module/ncs/nw_s1_bltdisese.ncs and b/_module/ncs/nw_s1_bltdisese.ncs differ
diff --git a/_module/ncs/nw_s1_bltdomn.ncs b/_module/ncs/nw_s1_bltdomn.ncs
index ab8a4bea..3798c891 100644
Binary files a/_module/ncs/nw_s1_bltdomn.ncs and b/_module/ncs/nw_s1_bltdomn.ncs differ
diff --git a/_module/ncs/nw_s1_bltfire.ncs b/_module/ncs/nw_s1_bltfire.ncs
index cf13feaf..94914546 100644
Binary files a/_module/ncs/nw_s1_bltfire.ncs and b/_module/ncs/nw_s1_bltfire.ncs differ
diff --git a/_module/ncs/nw_s1_bltintdr.ncs b/_module/ncs/nw_s1_bltintdr.ncs
index 33b3da46..e1853804 100644
Binary files a/_module/ncs/nw_s1_bltintdr.ncs and b/_module/ncs/nw_s1_bltintdr.ncs differ
diff --git a/_module/ncs/nw_s1_bltknckd.ncs b/_module/ncs/nw_s1_bltknckd.ncs
index 5c098196..5e6d411c 100644
Binary files a/_module/ncs/nw_s1_bltknckd.ncs and b/_module/ncs/nw_s1_bltknckd.ncs differ
diff --git a/_module/ncs/nw_s1_bltlightn.ncs b/_module/ncs/nw_s1_bltlightn.ncs
index 93155270..022d8709 100644
Binary files a/_module/ncs/nw_s1_bltlightn.ncs and b/_module/ncs/nw_s1_bltlightn.ncs differ
diff --git a/_module/ncs/nw_s1_bltlvldr.ncs b/_module/ncs/nw_s1_bltlvldr.ncs
index 7f6d6ea1..f82d2911 100644
Binary files a/_module/ncs/nw_s1_bltlvldr.ncs and b/_module/ncs/nw_s1_bltlvldr.ncs differ
diff --git a/_module/ncs/nw_s1_bltparal.ncs b/_module/ncs/nw_s1_bltparal.ncs
index 352beb7c..e5229f26 100644
Binary files a/_module/ncs/nw_s1_bltparal.ncs and b/_module/ncs/nw_s1_bltparal.ncs differ
diff --git a/_module/ncs/nw_s1_bltpoison.ncs b/_module/ncs/nw_s1_bltpoison.ncs
index d7368cb1..38439919 100644
Binary files a/_module/ncs/nw_s1_bltpoison.ncs and b/_module/ncs/nw_s1_bltpoison.ncs differ
diff --git a/_module/ncs/nw_s1_bltshards.ncs b/_module/ncs/nw_s1_bltshards.ncs
index b260bb75..37746037 100644
Binary files a/_module/ncs/nw_s1_bltshards.ncs and b/_module/ncs/nw_s1_bltshards.ncs differ
diff --git a/_module/ncs/nw_s1_bltslow.ncs b/_module/ncs/nw_s1_bltslow.ncs
index 779dedd9..12ffa8e8 100644
Binary files a/_module/ncs/nw_s1_bltslow.ncs and b/_module/ncs/nw_s1_bltslow.ncs differ
diff --git a/_module/ncs/nw_s1_bltstrdr.ncs b/_module/ncs/nw_s1_bltstrdr.ncs
index 7ecf22e8..a79d28da 100644
Binary files a/_module/ncs/nw_s1_bltstrdr.ncs and b/_module/ncs/nw_s1_bltstrdr.ncs differ
diff --git a/_module/ncs/nw_s1_bltstun.ncs b/_module/ncs/nw_s1_bltstun.ncs
index 0b8993e3..21db221b 100644
Binary files a/_module/ncs/nw_s1_bltstun.ncs and b/_module/ncs/nw_s1_bltstun.ncs differ
diff --git a/_module/ncs/nw_s1_bltweb.ncs b/_module/ncs/nw_s1_bltweb.ncs
index 25d622a0..42bed50b 100644
Binary files a/_module/ncs/nw_s1_bltweb.ncs and b/_module/ncs/nw_s1_bltweb.ncs differ
diff --git a/_module/ncs/nw_s1_bltwisdr.ncs b/_module/ncs/nw_s1_bltwisdr.ncs
index f357cf1b..ded49261 100644
Binary files a/_module/ncs/nw_s1_bltwisdr.ncs and b/_module/ncs/nw_s1_bltwisdr.ncs differ
diff --git a/_module/ncs/nw_s1_coneacid.ncs b/_module/ncs/nw_s1_coneacid.ncs
index bad07028..2a7bdf38 100644
Binary files a/_module/ncs/nw_s1_coneacid.ncs and b/_module/ncs/nw_s1_coneacid.ncs differ
diff --git a/_module/ncs/nw_s1_conecold.ncs b/_module/ncs/nw_s1_conecold.ncs
index 21c9e7e2..d0c3e0e2 100644
Binary files a/_module/ncs/nw_s1_conecold.ncs and b/_module/ncs/nw_s1_conecold.ncs differ
diff --git a/_module/ncs/nw_s1_conedisea.ncs b/_module/ncs/nw_s1_conedisea.ncs
index 3bac3ebd..c97a585d 100644
Binary files a/_module/ncs/nw_s1_conedisea.ncs and b/_module/ncs/nw_s1_conedisea.ncs differ
diff --git a/_module/ncs/nw_s1_coneelec.ncs b/_module/ncs/nw_s1_coneelec.ncs
index f1cfdc77..84f5b5cc 100644
Binary files a/_module/ncs/nw_s1_coneelec.ncs and b/_module/ncs/nw_s1_coneelec.ncs differ
diff --git a/_module/ncs/nw_s1_conesonic.ncs b/_module/ncs/nw_s1_conesonic.ncs
index f7b256b4..83e041d4 100644
Binary files a/_module/ncs/nw_s1_conesonic.ncs and b/_module/ncs/nw_s1_conesonic.ncs differ
diff --git a/_module/ncs/nw_s1_dragfear.ncs b/_module/ncs/nw_s1_dragfear.ncs
index e0a66afa..f5e87c6a 100644
Binary files a/_module/ncs/nw_s1_dragfear.ncs and b/_module/ncs/nw_s1_dragfear.ncs differ
diff --git a/_module/ncs/nw_s1_dragfeara.ncs b/_module/ncs/nw_s1_dragfeara.ncs
index 717ef4f6..810924b6 100644
Binary files a/_module/ncs/nw_s1_dragfeara.ncs and b/_module/ncs/nw_s1_dragfeara.ncs differ
diff --git a/_module/ncs/nw_s1_gazechaos.ncs b/_module/ncs/nw_s1_gazechaos.ncs
index 584a1fd8..a882311f 100644
Binary files a/_module/ncs/nw_s1_gazechaos.ncs and b/_module/ncs/nw_s1_gazechaos.ncs differ
diff --git a/_module/ncs/nw_s1_gazecharm.ncs b/_module/ncs/nw_s1_gazecharm.ncs
index b27cd59f..a71d2741 100644
Binary files a/_module/ncs/nw_s1_gazecharm.ncs and b/_module/ncs/nw_s1_gazecharm.ncs differ
diff --git a/_module/ncs/nw_s1_gazeconfu.ncs b/_module/ncs/nw_s1_gazeconfu.ncs
index f5a010fd..c6ff90b9 100644
Binary files a/_module/ncs/nw_s1_gazeconfu.ncs and b/_module/ncs/nw_s1_gazeconfu.ncs differ
diff --git a/_module/ncs/nw_s1_gazedaze.ncs b/_module/ncs/nw_s1_gazedaze.ncs
index d63fc808..9706a1d2 100644
Binary files a/_module/ncs/nw_s1_gazedaze.ncs and b/_module/ncs/nw_s1_gazedaze.ncs differ
diff --git a/_module/ncs/nw_s1_gazedeath.ncs b/_module/ncs/nw_s1_gazedeath.ncs
index 149369ae..aad794c1 100644
Binary files a/_module/ncs/nw_s1_gazedeath.ncs and b/_module/ncs/nw_s1_gazedeath.ncs differ
diff --git a/_module/ncs/nw_s1_gazedomn.ncs b/_module/ncs/nw_s1_gazedomn.ncs
index ec2f33fe..f6e12e43 100644
Binary files a/_module/ncs/nw_s1_gazedomn.ncs and b/_module/ncs/nw_s1_gazedomn.ncs differ
diff --git a/_module/ncs/nw_s1_gazedoom.ncs b/_module/ncs/nw_s1_gazedoom.ncs
index 9b0f39ad..d2ce7860 100644
Binary files a/_module/ncs/nw_s1_gazedoom.ncs and b/_module/ncs/nw_s1_gazedoom.ncs differ
diff --git a/_module/ncs/nw_s1_gazeevil.ncs b/_module/ncs/nw_s1_gazeevil.ncs
index d5e209d4..45d0e5ea 100644
Binary files a/_module/ncs/nw_s1_gazeevil.ncs and b/_module/ncs/nw_s1_gazeevil.ncs differ
diff --git a/_module/ncs/nw_s1_gazefear.ncs b/_module/ncs/nw_s1_gazefear.ncs
index bb9fe902..e28c865b 100644
Binary files a/_module/ncs/nw_s1_gazefear.ncs and b/_module/ncs/nw_s1_gazefear.ncs differ
diff --git a/_module/ncs/nw_s1_gazegood.ncs b/_module/ncs/nw_s1_gazegood.ncs
index 33deeef8..f956a449 100644
Binary files a/_module/ncs/nw_s1_gazegood.ncs and b/_module/ncs/nw_s1_gazegood.ncs differ
diff --git a/_module/ncs/nw_s1_gazelaw.ncs b/_module/ncs/nw_s1_gazelaw.ncs
index c4d06dc9..bf1a83a7 100644
Binary files a/_module/ncs/nw_s1_gazelaw.ncs and b/_module/ncs/nw_s1_gazelaw.ncs differ
diff --git a/_module/ncs/nw_s1_gazestun.ncs b/_module/ncs/nw_s1_gazestun.ncs
index 717ed05c..4ae84c60 100644
Binary files a/_module/ncs/nw_s1_gazestun.ncs and b/_module/ncs/nw_s1_gazestun.ncs differ
diff --git a/_module/ncs/nw_s1_hndbreath.ncs b/_module/ncs/nw_s1_hndbreath.ncs
index aa1ea7e9..d4712b84 100644
Binary files a/_module/ncs/nw_s1_hndbreath.ncs and b/_module/ncs/nw_s1_hndbreath.ncs differ
diff --git a/_module/ncs/nw_s1_howlconf.ncs b/_module/ncs/nw_s1_howlconf.ncs
index 10cd0209..2b29884e 100644
Binary files a/_module/ncs/nw_s1_howlconf.ncs and b/_module/ncs/nw_s1_howlconf.ncs differ
diff --git a/_module/ncs/nw_s1_howldaze.ncs b/_module/ncs/nw_s1_howldaze.ncs
index 82237ef9..360193d4 100644
Binary files a/_module/ncs/nw_s1_howldaze.ncs and b/_module/ncs/nw_s1_howldaze.ncs differ
diff --git a/_module/ncs/nw_s1_howldeath.ncs b/_module/ncs/nw_s1_howldeath.ncs
index 06fe047f..10ae3c6a 100644
Binary files a/_module/ncs/nw_s1_howldeath.ncs and b/_module/ncs/nw_s1_howldeath.ncs differ
diff --git a/_module/ncs/nw_s1_howlfear.ncs b/_module/ncs/nw_s1_howlfear.ncs
index a2af6c1e..35b5d88e 100644
Binary files a/_module/ncs/nw_s1_howlfear.ncs and b/_module/ncs/nw_s1_howlfear.ncs differ
diff --git a/_module/ncs/nw_s1_howlparal.ncs b/_module/ncs/nw_s1_howlparal.ncs
index aed44157..27f33d9b 100644
Binary files a/_module/ncs/nw_s1_howlparal.ncs and b/_module/ncs/nw_s1_howlparal.ncs differ
diff --git a/_module/ncs/nw_s1_howlsonic.ncs b/_module/ncs/nw_s1_howlsonic.ncs
index 62c88721..69714568 100644
Binary files a/_module/ncs/nw_s1_howlsonic.ncs and b/_module/ncs/nw_s1_howlsonic.ncs differ
diff --git a/_module/ncs/nw_s1_howlstun.ncs b/_module/ncs/nw_s1_howlstun.ncs
index 28a19f6e..cae87497 100644
Binary files a/_module/ncs/nw_s1_howlstun.ncs and b/_module/ncs/nw_s1_howlstun.ncs differ
diff --git a/_module/ncs/nw_s1_krenscare.ncs b/_module/ncs/nw_s1_krenscare.ncs
index fcbbba78..9846d70f 100644
Binary files a/_module/ncs/nw_s1_krenscare.ncs and b/_module/ncs/nw_s1_krenscare.ncs differ
diff --git a/_module/ncs/nw_s1_mephsalt.ncs b/_module/ncs/nw_s1_mephsalt.ncs
index 0e92ae39..f9e0f1f6 100644
Binary files a/_module/ncs/nw_s1_mephsalt.ncs and b/_module/ncs/nw_s1_mephsalt.ncs differ
diff --git a/_module/ncs/nw_s1_mephsteam.ncs b/_module/ncs/nw_s1_mephsteam.ncs
index 91107e1c..edb3afbd 100644
Binary files a/_module/ncs/nw_s1_mephsteam.ncs and b/_module/ncs/nw_s1_mephsteam.ncs differ
diff --git a/_module/ncs/nw_s1_pulschrdr.ncs b/_module/ncs/nw_s1_pulschrdr.ncs
index e3f8c5ac..ce2188a8 100644
Binary files a/_module/ncs/nw_s1_pulschrdr.ncs and b/_module/ncs/nw_s1_pulschrdr.ncs differ
diff --git a/_module/ncs/nw_s1_pulscold.ncs b/_module/ncs/nw_s1_pulscold.ncs
index b17e5afb..5cbf34e7 100644
Binary files a/_module/ncs/nw_s1_pulscold.ncs and b/_module/ncs/nw_s1_pulscold.ncs differ
diff --git a/_module/ncs/nw_s1_pulscondr.ncs b/_module/ncs/nw_s1_pulscondr.ncs
index a1301921..74ea0478 100644
Binary files a/_module/ncs/nw_s1_pulscondr.ncs and b/_module/ncs/nw_s1_pulscondr.ncs differ
diff --git a/_module/ncs/nw_s1_pulsdeath.ncs b/_module/ncs/nw_s1_pulsdeath.ncs
index 230f564b..3e89bc83 100644
Binary files a/_module/ncs/nw_s1_pulsdeath.ncs and b/_module/ncs/nw_s1_pulsdeath.ncs differ
diff --git a/_module/ncs/nw_s1_pulsdexdr.ncs b/_module/ncs/nw_s1_pulsdexdr.ncs
index a2fd8841..07952fc7 100644
Binary files a/_module/ncs/nw_s1_pulsdexdr.ncs and b/_module/ncs/nw_s1_pulsdexdr.ncs differ
diff --git a/_module/ncs/nw_s1_pulsdis.ncs b/_module/ncs/nw_s1_pulsdis.ncs
index 80e023b5..9fd0a3e8 100644
Binary files a/_module/ncs/nw_s1_pulsdis.ncs and b/_module/ncs/nw_s1_pulsdis.ncs differ
diff --git a/_module/ncs/nw_s1_pulselec.ncs b/_module/ncs/nw_s1_pulselec.ncs
index 40fc5cfe..2c33421d 100644
Binary files a/_module/ncs/nw_s1_pulselec.ncs and b/_module/ncs/nw_s1_pulselec.ncs differ
diff --git a/_module/ncs/nw_s1_pulsfire.ncs b/_module/ncs/nw_s1_pulsfire.ncs
index 20f097e2..2237ac7a 100644
Binary files a/_module/ncs/nw_s1_pulsfire.ncs and b/_module/ncs/nw_s1_pulsfire.ncs differ
diff --git a/_module/ncs/nw_s1_pulsholy.ncs b/_module/ncs/nw_s1_pulsholy.ncs
index c2302071..b7e8e12f 100644
Binary files a/_module/ncs/nw_s1_pulsholy.ncs and b/_module/ncs/nw_s1_pulsholy.ncs differ
diff --git a/_module/ncs/nw_s1_pulsintdr.ncs b/_module/ncs/nw_s1_pulsintdr.ncs
index 6730fc8f..cdb75258 100644
Binary files a/_module/ncs/nw_s1_pulsintdr.ncs and b/_module/ncs/nw_s1_pulsintdr.ncs differ
diff --git a/_module/ncs/nw_s1_pulslvldr.ncs b/_module/ncs/nw_s1_pulslvldr.ncs
index de1184e1..1aee6262 100644
Binary files a/_module/ncs/nw_s1_pulslvldr.ncs and b/_module/ncs/nw_s1_pulslvldr.ncs differ
diff --git a/_module/ncs/nw_s1_pulsneg.ncs b/_module/ncs/nw_s1_pulsneg.ncs
index 373c0523..dda43b8b 100644
Binary files a/_module/ncs/nw_s1_pulsneg.ncs and b/_module/ncs/nw_s1_pulsneg.ncs differ
diff --git a/_module/ncs/nw_s1_pulspois.ncs b/_module/ncs/nw_s1_pulspois.ncs
index cafb629b..a416e79a 100644
Binary files a/_module/ncs/nw_s1_pulspois.ncs and b/_module/ncs/nw_s1_pulspois.ncs differ
diff --git a/_module/ncs/nw_s1_pulsstrdr.ncs b/_module/ncs/nw_s1_pulsstrdr.ncs
index aa85653d..1ae14105 100644
Binary files a/_module/ncs/nw_s1_pulsstrdr.ncs and b/_module/ncs/nw_s1_pulsstrdr.ncs differ
diff --git a/_module/ncs/nw_s1_pulswind.ncs b/_module/ncs/nw_s1_pulswind.ncs
index 92fccc72..4597f06d 100644
Binary files a/_module/ncs/nw_s1_pulswind.ncs and b/_module/ncs/nw_s1_pulswind.ncs differ
diff --git a/_module/ncs/nw_s1_pulswisdr.ncs b/_module/ncs/nw_s1_pulswisdr.ncs
index 19253dea..52c263c0 100644
Binary files a/_module/ncs/nw_s1_pulswisdr.ncs and b/_module/ncs/nw_s1_pulswisdr.ncs differ
diff --git a/_module/ncs/nw_s1_smokeclaw.ncs b/_module/ncs/nw_s1_smokeclaw.ncs
index ebed03b3..f6e3f0f3 100644
Binary files a/_module/ncs/nw_s1_smokeclaw.ncs and b/_module/ncs/nw_s1_smokeclaw.ncs differ
diff --git a/_module/ncs/nw_s1_stink_a.ncs b/_module/ncs/nw_s1_stink_a.ncs
index bb2bc5b1..1141d7fe 100644
Binary files a/_module/ncs/nw_s1_stink_a.ncs and b/_module/ncs/nw_s1_stink_a.ncs differ
diff --git a/_module/ncs/nw_s1_tyrantfga.ncs b/_module/ncs/nw_s1_tyrantfga.ncs
index a28a1dfe..af54a6e1 100644
Binary files a/_module/ncs/nw_s1_tyrantfga.ncs and b/_module/ncs/nw_s1_tyrantfga.ncs differ
diff --git a/_module/ncs/nw_s2_divprot.ncs b/_module/ncs/nw_s2_divprot.ncs
index c2f36e0c..1af20701 100644
Binary files a/_module/ncs/nw_s2_divprot.ncs and b/_module/ncs/nw_s2_divprot.ncs differ
diff --git a/_module/ncs/nw_s3_balordeth.ncs b/_module/ncs/nw_s3_balordeth.ncs
index 8efd90ae..daf32fa9 100644
Binary files a/_module/ncs/nw_s3_balordeth.ncs and b/_module/ncs/nw_s3_balordeth.ncs differ
diff --git a/_module/ncs/on_damage_dr.ncs b/_module/ncs/on_damage_dr.ncs
index 8734aae5..d0a47c09 100644
Binary files a/_module/ncs/on_damage_dr.ncs and b/_module/ncs/on_damage_dr.ncs differ
diff --git a/_module/ncs/open_attack_pc.ncs b/_module/ncs/open_attack_pc.ncs
index 46968c64..11b31e21 100644
Binary files a/_module/ncs/open_attack_pc.ncs and b/_module/ncs/open_attack_pc.ncs differ
diff --git a/_module/ncs/pw_sp_troll.ncs b/_module/ncs/pw_sp_troll.ncs
index e4b0548e..08d7fe3d 100644
Binary files a/_module/ncs/pw_sp_troll.ncs and b/_module/ncs/pw_sp_troll.ncs differ
diff --git a/_module/ncs/rh_golem_attack.ncs b/_module/ncs/rh_golem_attack.ncs
index 81c044a6..b856dd25 100644
Binary files a/_module/ncs/rh_golem_attack.ncs and b/_module/ncs/rh_golem_attack.ncs differ
diff --git a/_module/ncs/skull_final.ncs b/_module/ncs/skull_final.ncs
index 1bbd24b5..c0db34d6 100644
Binary files a/_module/ncs/skull_final.ncs and b/_module/ncs/skull_final.ncs differ
diff --git a/_module/ncs/spawn_orig_hb.ncs b/_module/ncs/spawn_orig_hb.ncs
index 7f766092..f998eb1a 100644
Binary files a/_module/ncs/spawn_orig_hb.ncs and b/_module/ncs/spawn_orig_hb.ncs differ
diff --git a/_module/ncs/spawn_sample_hb.ncs b/_module/ncs/spawn_sample_hb.ncs
index 7f766092..f998eb1a 100644
Binary files a/_module/ncs/spawn_sample_hb.ncs and b/_module/ncs/spawn_sample_hb.ncs differ
diff --git a/_module/ncs/spawn_sc_spawn.ncs b/_module/ncs/spawn_sc_spawn.ncs
index 66135680..29946ecd 100644
Binary files a/_module/ncs/spawn_sc_spawn.ncs and b/_module/ncs/spawn_sc_spawn.ncs differ
diff --git a/_module/ncs/spawndaemon.ncs b/_module/ncs/spawndaemon.ncs
index a2696ce9..bcc06411 100644
Binary files a/_module/ncs/spawndaemon.ncs and b/_module/ncs/spawndaemon.ncs differ
diff --git a/_module/ncs/svirf_ck_race.ncs b/_module/ncs/svirf_ck_race.ncs
index a0c91040..e21d26a3 100644
Binary files a/_module/ncs/svirf_ck_race.ncs and b/_module/ncs/svirf_ck_race.ncs differ
diff --git a/_module/ncs/svirf_common_ck.ncs b/_module/ncs/svirf_common_ck.ncs
index d48546dc..a4ce0a4c 100644
Binary files a/_module/ncs/svirf_common_ck.ncs and b/_module/ncs/svirf_common_ck.ncs differ
diff --git a/_module/ncs/svirf_hostile_ck.ncs b/_module/ncs/svirf_hostile_ck.ncs
index 3571f1f6..1d5bb5b7 100644
Binary files a/_module/ncs/svirf_hostile_ck.ncs and b/_module/ncs/svirf_hostile_ck.ncs differ
diff --git a/_module/ncs/tracking.ncs b/_module/ncs/tracking.ncs
index 29951543..d5b39d80 100644
Binary files a/_module/ncs/tracking.ncs and b/_module/ncs/tracking.ncs differ
diff --git a/_module/ncs/troll_userdefine.ncs b/_module/ncs/troll_userdefine.ncs
index c384ff63..b0c3abcc 100644
Binary files a/_module/ncs/troll_userdefine.ncs and b/_module/ncs/troll_userdefine.ncs differ
diff --git a/_module/ncs/valen_attacks.ncs b/_module/ncs/valen_attacks.ncs
index 14c3d96e..451b0e2b 100644
Binary files a/_module/ncs/valen_attacks.ncs and b/_module/ncs/valen_attacks.ncs differ
diff --git a/_module/ncs/yang_death.ncs b/_module/ncs/yang_death.ncs
index 997e2295..8d9f12ea 100644
Binary files a/_module/ncs/yang_death.ncs and b/_module/ncs/yang_death.ncs differ
diff --git a/_module/ncs/yin_death.ncs b/_module/ncs/yin_death.ncs
index 959cade9..a0f301b1 100644
Binary files a/_module/ncs/yin_death.ncs and b/_module/ncs/yin_death.ncs differ
diff --git a/_module/nss/_on_cliententer.nss b/_module/nss/_on_cliententer.nss
index 77ad1714..0a0dd06e 100644
--- a/_module/nss/_on_cliententer.nss
+++ b/_module/nss/_on_cliententer.nss
@@ -11,6 +11,7 @@ sPrint =sPrint + "\n";
 PrintString(sPrint);
 
 object oPC = GetEnteringObject();
+    ActionPlayAnimation(ANIMATION_FIREFORGET_SALUTE);
 // log in/out
     if (GetLocalInt(oPC,"PCDead")==1)
        {
diff --git a/_module/nss/_ondeath.nss b/_module/nss/_ondeath.nss
index 919f0e04..f256b986 100644
--- a/_module/nss/_ondeath.nss
+++ b/_module/nss/_ondeath.nss
@@ -47,6 +47,7 @@ SetLocalInt(oPlayer,"dungeon_died",1);
 Stolen(oPlayer);
 
 AssignCommand(oPlayer, ClearAllActions());
+AssignCommand(oPlayer, SurrenderToEnemies());
 SetStandardFactionReputation(STANDARD_FACTION_COMMONER, 74, oPlayer);
 SetStandardFactionReputation(STANDARD_FACTION_MERCHANT, 74, oPlayer);
 SetStandardFactionReputation(STANDARD_FACTION_DEFENDER, 74, oPlayer);
@@ -57,6 +58,7 @@ SetStandardFactionReputation(STANDARD_FACTION_DEFENDER, 74, oPlayer);
          }
          else
          {
-         DelayCommand(5.0, PopUpGUIPanel(oPlayer,GUI_PANEL_PLAYER_DEATH));
+         //SurrenderToEnemies();
+         DelayCommand(3.0,ExecuteScript("prc_ondeath",oPlayer));
          }
 }
diff --git a/_module/nss/hif_onclientente.nss b/_module/nss/hif_onclientente.nss
index 9a110212..d7039391 100644
--- a/_module/nss/hif_onclientente.nss
+++ b/_module/nss/hif_onclientente.nss
@@ -9,7 +9,10 @@
 void main()
 {
     SendMessageToPC (GetEnteringObject(), "This server is under active development and could go down arbitrarily. Admin will try to give notice beforehand.");
+    object oPC = GetEnteringObject();
 
     ExecuteScript("prc_onenter", OBJECT_SELF);
     ExecuteScript("_oncliententer", OBJECT_SELF);
+    AssignCommand(oPC, DelayCommand (1.0, ClearAllActions(TRUE)));
+    AssignCommand(oPC, DelayCommand(1.2, PlayAnimation(ANIMATION_LOOPING_TALK_NORMAL, 1.0, 0.5)));
 }
diff --git a/_module/nss/hif_onplayerdyin.nss b/_module/nss/hif_onplayerdyin.nss
index 2c0ee4f6..71d7e096 100644
--- a/_module/nss/hif_onplayerdyin.nss
+++ b/_module/nss/hif_onplayerdyin.nss
@@ -8,6 +8,10 @@
 
 void main()
 {
+    object oPC = GetLastPlayerDying();
+    AssignCommand(oPC, ClearAllActions());
+    effect eSanctuary = EffectSanctuary(80);
+    ApplyEffectToObject(DURATION_TYPE_TEMPORARY, eSanctuary, oPC);
     ExecuteScript("prc_ondying", OBJECT_SELF);
-    ExecuteScript("nw_o0_dying", OBJECT_SELF);
+    //ExecuteScript("nw_o0_dying", OBJECT_SELF);
 }