From 837e4b3d6b83a9b29608f1fa659b3c8ccd03a80e Mon Sep 17 00:00:00 2001
From: Reid <reidyaro@gmail.com>
Date: Tue, 3 Feb 2015 03:43:01 +0100
Subject: Correct hammock animation.

---
 npc/000-2-1/hammock.txt    | 135 +++++++++++++------------------------
 npc/000-2-3/hammock.txt    |  15 ++---
 npc/001-2-22/hammock.txt   | 165 +++++++++++++++------------------------------
 npc/001-2-24/hammock.txt   |  15 ++---
 npc/functions/hammocks.txt |  50 ++++++++++++++
 npc/scripts.conf           |   3 +-
 6 files changed, 162 insertions(+), 221 deletions(-)
 create mode 100644 npc/functions/hammocks.txt

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;
 }
diff --git a/npc/000-2-3/hammock.txt b/npc/000-2-3/hammock.txt
index 1a1b90a6..d5b6972e 100644
--- a/npc/000-2-3/hammock.txt
+++ b/npc/000-2-3/hammock.txt
@@ -6,17 +6,12 @@
 
 000-2-3,28,24,0	script	#name5	904,1,0,{
 
-OnTouchFirst:
-    setnpcdir 4;
-    close;
+OnTouch:
+    hamTouchRight;
 
-OnUnTouchAll:
-    setnpcdir 2;
-    initnpctimer;
-    close;
+OnUnTouch:
+    hamUnTouch;
 
 OnTimer5440:
-    setnpcdir 4;
-    stopnpctimer;
-    end;
+    hamTimerRight;
 }
diff --git a/npc/001-2-22/hammock.txt b/npc/001-2-22/hammock.txt
index b64fdba0..68ed3951 100644
--- a/npc/001-2-22/hammock.txt
+++ b/npc/001-2-22/hammock.txt
@@ -6,187 +6,132 @@
 
 001-2-22,32,27,0	script	#hammockArtis1	904,1,0,{
 
-OnTouchFirst:
-    setnpcdir 0;
-    close;
+OnTouch:
+    hamTouchLeft;
 
-OnUnTouchAll:
-    setnpcdir 2;
-    initnpctimer;
-    close;
+OnUnTouch:
+    hamUnTouch;
 
 OnTimer5440:
-    setnpcdir 0;
-    stopnpctimer;
-    end;
+    hamTimerLeft;
 }
 
 001-2-22,32,25,0	script	#hammockArtis2	904,1,0,{
 
-OnTouchFirst:
-    setnpcdir 0;
-    close;
+OnTouch:
+    hamTouchLeft;
 
-OnUnTouchAll:
-    setnpcdir 2;
-    initnpctimer;
-    close;
+OnUnTouch:
+    hamUnTouch;
 
 OnTimer5440:
-    setnpcdir 0;
-    stopnpctimer;
-    end;
+    hamTimerLeft;
 }
 
 001-2-22,37,25,0	script	#hammockArtis3	905,1,0,{
 
-OnTouchFirst:
-    setnpcdir 0;
-    close;
+OnTouch:
+    hamTouchLeft;
 
-OnUnTouchAll:
-    setnpcdir 2;
-    initnpctimer;
-    close;
+OnUnTouch:
+    hamUnTouch;
 
 OnTimer5440:
-    setnpcdir 0;
-    stopnpctimer;
-    end;
+    hamTimerLeft;
 }
 
 001-2-22,37,27,0	script	#hammockArtis4	905,1,0,{
 
-OnTouchFirst:
-    setnpcdir 0;
-    close;
+OnTouch:
+    hamTouchLeft;
 
-OnUnTouchAll:
-    setnpcdir 2;
-    initnpctimer;
-    close;
+OnUnTouch:
+    hamUnTouch;
 
 OnTimer5440:
-    setnpcdir 0;
-    stopnpctimer;
-    end;
+    hamTimerLeft;
 }
 
 001-2-22,37,29,0	script	#hammockArtis5	905,1,0,{
 
-OnTouchFirst:
-    setnpcdir 0;
-    close;
+OnTouch:
+    hamTouchLeft;
 
-OnUnTouchAll:
-    setnpcdir 2;
-    initnpctimer;
-    close;
+OnUnTouch:
+    hamUnTouch;
 
 OnTimer5440:
-    setnpcdir 0;
-    stopnpctimer;
-    end;
+    hamTimerLeft;
 }
 
 001-2-22,37,34,0	script	#hammockArtis6	905,1,0,{
 
-OnTouchFirst:
-    setnpcdir 0;
-    close;
+OnTouch:
+    hamTouchLeft;
 
-OnUnTouchAll:
-    setnpcdir 2;
-    initnpctimer;
-    close;
+OnUnTouch:
+    hamUnTouch;
 
 OnTimer5440:
-    setnpcdir 0;
-    stopnpctimer;
-    end;
+    hamTimerLeft;
 }
 
 001-2-22,37,36,0	script	#hammockArtis7	905,1,0,{
 
-OnTouchFirst:
-    setnpcdir 0;
-    close;
+OnTouch:
+    hamTouchLeft;
 
-OnUnTouchAll:
-    setnpcdir 2;
-    initnpctimer;
-    close;
+OnUnTouch:
+    hamUnTouch;
 
 OnTimer5440:
-    setnpcdir 0;
-    stopnpctimer;
-    end;
+    hamTimerLeft;
 }
 
 001-2-22,37,38,0	script	#hammockArtis8	905,1,0,{
 
-OnTouchFirst:
-    setnpcdir 0;
-    close;
+OnTouch:
+    hamTouchLeft;
 
-OnUnTouchAll:
-    setnpcdir 2;
-    initnpctimer;
-    close;
+OnUnTouch:
+    hamUnTouch;
 
 OnTimer5440:
-    setnpcdir 0;
-    stopnpctimer;
-    end;
+    hamTimerLeft;
 }
 
 001-2-22,37,40,0	script	#hammockArtis9	905,1,0,{
 
-OnTouchFirst:
-    setnpcdir 0;
-    close;
+OnTouch:
+    hamTouchLeft;
 
-OnUnTouchAll:
-    setnpcdir 2;
-    initnpctimer;
-    close;
+OnUnTouch:
+    hamUnTouch;
 
 OnTimer5440:
-    setnpcdir 0;
-    stopnpctimer;
-    end;
+    hamTimerLeft;
 }
 
 001-2-22,32,38,0	script	#hammockArtis10	904,1,0,{
 
-OnTouchFirst:
-    setnpcdir 0;
-    close;
+OnTouch:
+    hamTouchLeft;
 
-OnUnTouchAll:
-    setnpcdir 2;
-    initnpctimer;
-    close;
+OnUnTouch:
+    hamUnTouch;
 
 OnTimer5440:
-    setnpcdir 0;
-    stopnpctimer;
-    end;
+    hamTimerLeft;
 }
 
 001-2-22,32,40,0	script	#hammockArtis11	904,1,0,{
 
-OnTouchFirst:
-    setnpcdir 0;
-    close;
+OnTouch:
+    hamTouchLeft;
 
-OnUnTouchAll:
-    setnpcdir 2;
-    initnpctimer;
-    close;
+OnUnTouch:
+    hamUnTouch;
 
 OnTimer5440:
-    setnpcdir 0;
-    stopnpctimer;
-    end;
+    hamTimerLeft;
 }
diff --git a/npc/001-2-24/hammock.txt b/npc/001-2-24/hammock.txt
index 9991ea84..b88cb298 100644
--- a/npc/001-2-24/hammock.txt
+++ b/npc/001-2-24/hammock.txt
@@ -6,17 +6,12 @@
 
 001-2-24,28,24,0	script	#nardArtisHammock	904,1,0,{
 
-OnTouchFirst:
-    setnpcdir 4;
-    close;
+OnTouch:
+    hamTouchRight;
 
-OnUnTouchAll:
-    setnpcdir 2;
-    initnpctimer;
-    close;
+OnUnTouch:
+    hamUnTouch;
 
 OnTimer5440:
-    setnpcdir 4;
-    stopnpctimer;
-    end;
+    hamTimerRight;
 }
diff --git a/npc/functions/hammocks.txt b/npc/functions/hammocks.txt
new file mode 100644
index 00000000..79b9328d
--- /dev/null
+++ b/npc/functions/hammocks.txt
@@ -0,0 +1,50 @@
+// Evol functions.
+// Authors:
+//    4144
+//    Reid
+// Description:
+//    Hammocks utility functions
+// Variables:
+//    none
+
+function	script	hamTouchLeft	{
+    if (getareausers() <= 1)
+    {
+        setnpcdir 0;
+        stopnpctimer;
+        initnpctimer;
+    }
+    close;
+}
+
+function	script	hamUnTouch	{
+    if (getareausers() == 0)
+    {
+        setnpcdir 2;
+        initnpctimer;
+        startnpctimer;
+    }
+    close;
+}
+
+function	script	hamTimerLeft	{
+    stopnpctimer;
+    if (getnpcdir() == 2) setnpcdir 0;
+    end;
+}
+
+function	script	hamTouchRight	{
+    if (getareausers() <= 1)
+    {
+        setnpcdir 0;
+        stopnpctimer;
+        initnpctimer;
+    }
+    close;
+}
+
+function	script	hamTimerRight	{
+    stopnpctimer;
+    if (getnpcdir() == 2) setnpcdir 0;
+    end;
+}
diff --git a/npc/scripts.conf b/npc/scripts.conf
index ce4642d6..118226eb 100644
--- a/npc/scripts.conf
+++ b/npc/scripts.conf
@@ -7,11 +7,12 @@ npc: npc/items/oldbook.txt
 // Script functions
 npc: npc/functions/asleep.txt
 npc: npc/functions/clientversion.txt
+npc: npc/functions/doors.txt
+npc: npc/functions/hammocks.txt
 npc: npc/functions/inventoryplace.txt
 npc: npc/functions/goodbye.txt
 npc: npc/functions/sailordialogue.txt
 npc: npc/functions/savepoint.txt
-npc: npc/functions/doors.txt
 
 // Maps specific scripts
 import: npc/_import.txt
-- 
cgit v1.2.3-70-g09d2