1 files changed, 45 insertions, 90 deletions
diff --git a/npc/000-2-1/hammock.txt b/npc/000-2-1/hammock.txt
index 5e102482..78339fd4 100644
--- a/npc/000-2-1/hammock.txt
+++ b/npc/000-2-1/hammock.txt
@@ -6,153 +6,108 @@
 
 000-2-1,32,27,0	script	#hammock1	904,1,0,{
 
-OnTouchFirst:
-    setnpcdir 0;
-    close;
+OnTouch:
+    hamTouchLeft;
 
-OnUnTouchAll:
-    setnpcdir 2;
-    initnpctimer;
-    close;
+OnUnTouch:
+    hamUnTouch;
 
 OnTimer5440:
-    setnpcdir 0;
-    stopnpctimer;
-    end;
+    hamTimerLeft;
 }
 
 000-2-1,32,25,0	script	#hammock2	904,1,0,{
 
-OnTouchFirst:
-    setnpcdir 0;
-    close;
+OnTouch:
+    hamTouchLeft;
 
-OnUnTouchAll:
-    setnpcdir 2;
-    initnpctimer;
-    close;
+OnUnTouch:
+    hamUnTouch;
 
 OnTimer5440:
-    setnpcdir 0;
-    stopnpctimer;
-    end;
+    hamTimerLeft;
 }
 
 000-2-1,37,25,0	script	#hammock3	905,1,0,{
 
-OnTouchFirst:
-    setnpcdir 0;
-    close;
+OnTouch:
+    hamTouchLeft;
 
-OnUnTouchAll:
-    setnpcdir 2;
-    initnpctimer;
-    close;
+OnUnTouch:
+    hamUnTouch;
 
 OnTimer5440:
-    setnpcdir 0;
-    stopnpctimer;
-    end;
+    hamTimerLeft;
 }
 
 000-2-1,37,27,0	script	#hammock4	905,1,0,{
 
-OnTouchFirst:
-    setnpcdir 0;
-    close;
+OnTouch:
+    hamTouchLeft;
 
-OnUnTouchAll:
-    setnpcdir 2;
-    initnpctimer;
-    close;
+OnUnTouch:
+    hamUnTouch;
 
 OnTimer5440:
-    setnpcdir 0;
-    stopnpctimer;
-    end;
+    hamTimerLeft;
 }
 
 000-2-1,37,29,0	script	#hammock5	905,1,0,{
 
-OnTouchFirst:
-    setnpcdir 0;
-    close;
+OnTouch:
+    hamTouchLeft;
 
-OnUnTouchAll:
-    setnpcdir 2;
-    initnpctimer;
-    close;
+OnUnTouch:
+    hamUnTouch;
 
 OnTimer5440:
-    setnpcdir 0;
-    stopnpctimer;
-    end;
+    hamTimerLeft;
 }
 
 000-2-1,37,34,0	script	#hammock6	905,1,0,{
 
-OnTouchFirst:
-    setnpcdir 0;
-    close;
+OnTouch:
+    hamTouchLeft;
 
-OnUnTouchAll:
-    setnpcdir 2;
-    initnpctimer;
-    close;
+OnUnTouch:
+    hamUnTouch;
 
 OnTimer5440:
-    setnpcdir 0;
-    stopnpctimer;
-    end;
+    hamTimerLeft;
 }
 
 000-2-1,37,36,0	script	#hammock7	905,1,0,{
 
-OnTouchFirst:
-    setnpcdir 0;
-    close;
+OnTouch:
+    hamTouchLeft;
 
-OnUnTouchAll:
-    setnpcdir 2;
-    initnpctimer;
-    close;
+OnUnTouch:
+    hamUnTouch;
 
 OnTimer5440:
-    setnpcdir 0;
-    stopnpctimer;
-    end;
+    hamTimerLeft;
 }
 
 000-2-1,32,40,0	script	#hammock8	904,1,0,{
 
-OnTouchFirst:
-    setnpcdir 0;
-    close;
+OnTouch:
+    hamTouchLeft;
 
-OnUnTouchAll:
-    setnpcdir 2;
-    initnpctimer;
-    close;
+OnUnTouch:
+    hamUnTouch;
 
 OnTimer5440:
-    setnpcdir 0;
-    stopnpctimer;
-    end;
+    hamTimerLeft;
 }
 
 000-2-1,37,40,0	script	#hammock9	905,1,0,{
 
-OnTouchFirst:
-    setnpcdir 0;
-    close;
+OnTouch:
+    hamTouchLeft;
 
-OnUnTouchAll:
-    setnpcdir 2;
-    initnpctimer;
-    close;
+OnUnTouch:
+    hamUnTouch;
 
 OnTimer5440:
-    setnpcdir 0;
-    stopnpctimer;
-    end;
+    hamTimerLeft;
 }