summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--npc/000-2-1/hammock.txt135
-rw-r--r--npc/000-2-3/hammock.txt15
-rw-r--r--npc/001-2-22/hammock.txt165
-rw-r--r--npc/001-2-24/hammock.txt15
-rw-r--r--npc/functions/hammocks.txt50
-rw-r--r--npc/scripts.conf3
6 files changed, 162 insertions, 221 deletions
diff --git a/npc/000-2-1/hammock.txt b/npc/000-2-1/hammock.txt
index 5e1024828..78339fd4c 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 1a1b90a6b..d5b6972e6 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 b64fdba00..68ed39513 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 9991ea845..b88cb2984 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 000000000..79b9328da
--- /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 ce4642d6a..118226eb9 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
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-21 19:25:54 +0000