added things

added a crafting tool merchant,
added a training hall (not quite working yet)
fixed crafting issues,
exchanged the small cave area

_module/nss/nw_c2_default8.nss

@@ -1,30 +1,35 @@
-//:://////////////////////////////////////////////////
+//::///////////////////////////////////////////////
+//:: Default: On Disturbed
 //:: NW_C2_DEFAULT8
+//:: Copyright (c) 2001 Bioware Corp.
+//:://////////////////////////////////////////////
 /*
-  Default OnDisturbed event handler for NPCs.
- */
-//:://////////////////////////////////////////////////
-//:: Copyright (c) 2002 Floodgate Entertainment
-//:: Created By: Naomi Novik
-//:: Created On: 12/22/2002
-//:://////////////////////////////////////////////////
+    Calls the end of combat script every round
+*/
+//:://////////////////////////////////////////////
+//:: Created By: Preston Watamaniuk
+//:: Created On: Oct 16, 2001
+//::///////////////////////////////////////////
 
-#include "nw_i0_generic"
+// * Make me hostile the faction of my last attacker (TEMP)
+//  AdjustReputation(OBJECT_SELF,GetFaction(GetLastAttacker()),-100);
+// * Determined Combat Round
+
+#include "NW_I0_GENERIC"
 
 void main()
 {
-    ExecuteScript("prc_npc_disturb", OBJECT_SELF);
-
     object oTarget = GetLastDisturbed();
 
-    // If we've been disturbed and are not already fighting,
-    // attack our disturber.
-    if (GetIsObjectValid(oTarget) && !GetIsFighting(OBJECT_SELF)) {
-        DetermineCombatRound(oTarget);
+    if(!GetIsObjectValid(GetAttemptedAttackTarget()) && !GetIsObjectValid(GetAttemptedSpellTarget()))
+    {
+        if(GetIsObjectValid(oTarget))
+        {
+            DetermineCombatRound(oTarget);
+        }
     }
-
-    // Send the disturbed flag if appropriate.
-    if(GetSpawnInCondition(NW_FLAG_DISTURBED_EVENT)) {
-        SignalEvent(OBJECT_SELF, EventUserDefined(EVENT_DISTURBED));
+    if(GetSpawnInCondition(NW_FLAG_DISTURBED_EVENT))
+    {
+        SignalEvent(OBJECT_SELF, EventUserDefined(1008));
     }
-}
+}