summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2012-05-03 03:29:49 +0200
committerReid <reidyaro@gmail.com>2012-05-03 03:29:49 +0200
commitcb35abc2a98848a72f072beb042f95101ba7cb2a (patch)
treee5a94a61b902f3bfdf04d63a09bb49837ada474a
parent0ee4db64d30cca2b9e450f60a4946ad9c3b37305 (diff)
downloadserverdata-cb35abc2a98848a72f072beb042f95101ba7cb2a.tar.gz
serverdata-cb35abc2a98848a72f072beb042f95101ba7cb2a.tar.bz2
serverdata-cb35abc2a98848a72f072beb042f95101ba7cb2a.tar.xz
serverdata-cb35abc2a98848a72f072beb042f95101ba7cb2a.zip
Correct some script bugs,
Add hammock test file.
-rw-r--r--db/mob_db.txt2
-rw-r--r--npc/000-2-1/_import.txt3
-rw-r--r--npc/000-2-1/alige.txt6
-rw-r--r--npc/000-2-1/hammock.txt19
-rw-r--r--npc/scripts.conf4
5 files changed, 28 insertions, 6 deletions
diff --git a/db/mob_db.txt b/db/mob_db.txt
index 3dbc6589..c8729adf 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -3,7 +3,7 @@
1003, Piousse, Piousse, 3, 40, 0, 2, 0, 1, 5, 8, 0, 1, 2, 1, 1, 0, 6, 0, 1, 1, 0, 2, 21, 129, 800, 1872, 672, 480, 703, 4000, 505, 2000, 701, 2000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 5
1004, Tortugas, Tortugas, 5, 50, 0, 5, 0, 1, 5, 10, 2, 5, 4, 0, 1, 0, 8, 5, 1, 1, 0, 2, 21, 1048705, 900, 1872, 672, 480, 702, 2000, 709, 1200, 508, 1000, 711, 850, 506, 750, 503, 600, 509, 500, 708, 260, 0, 0, , , , , , , 3, 5
1005, Ratto, Ratto, 5, 70, 0, 3, 0, 1, 6, 12, 1, 5, 2, 2, 1, 0, 6, 5, 1, 1, 0, 2, 21, 129, 400, 1872, 672, 480, 705, 1000, 704, 850, 502, 550, 504, 300, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 3, 5
-1006, Croc, Croc, 12, 200, 0, 15, 0, 1, 35, 50, 10, 5, 10, 1, 2, 0, 5, 5, 1, 1, 0, 2, 21, 129, 800, 1872, 672, 480, 706, 1300, 509, 1100, 508, 1000, 711, 900, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 3, 5
+1006, Croc, Croc, 12, 200, 0, 15, 0, 1, 35, 50, 10, 5, 10, 1, 2, 0, 12, 5, 1, 1, 0, 2, 21, 129, 800, 1872, 672, 480, 706, 1300, 509, 1100, 508, 1000, 711, 900, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 3, 5
1007, LittleBlub, Little Blub, 10, 110, 0, 12, 0, 1, 28, 35, 4, 30, 3, 15, 5, 1, 10, 15, 1, 1, 0, 2, 21, 1048705, 900, 1872, 672, 480, 700, 1400, 510, 1100, 712, 900, 509, 500, 710, 90, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 3, 5
//1008 Coming soon,
//1009 Coming soon, \ No newline at end of file
diff --git a/npc/000-2-1/_import.txt b/npc/000-2-1/_import.txt
index eeaf6f5f..7398a709 100644
--- a/npc/000-2-1/_import.txt
+++ b/npc/000-2-1/_import.txt
@@ -8,4 +8,5 @@ npc: npc/000-2-1/devis.txt
npc: npc/000-2-1/arpan.txt
npc: npc/000-2-1/knife.txt
npc: npc/000-2-1/dan.txt
-npc: npc/000-2-1/savepoint.txt \ No newline at end of file
+npc: npc/000-2-1/savepoint.txt
+npc: npc/000-2-1/hammock.txt \ No newline at end of file
diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt
index ea45765c..060fb1b3 100644
--- a/npc/000-2-1/alige.txt
+++ b/npc/000-2-1/alige.txt
@@ -204,7 +204,7 @@ l_AskForFood:
mesq l("Do you have anything for me today?");
next;
-l_IntroMenu
+l_IntroMenu:
menu
l("Yes."), l_GiveFood,
l("Where can I find some food?"), l_Food,
@@ -222,9 +222,9 @@ l_Food:
mesq l("As you can walk around, it'll be an easy task for you. Impale me one of them!!");
next;
mesn "Narrator";
- mes col(l("You can attack a monster by clicking on him, or from your keyboard, on using the key "A" to select and "Ctrl" to attack."), 9);
+ mes col(l("You can attack a monster by clicking on him, or from your keyboard, on using the key 'A' to select and 'Ctrl' to attack."), 9);
next;
- mes col(l("Once the monster is dead, you can take his drop with your mouse on clicking on it, or by using the key "Z" from your keyboard."), 9);
+ mes col(l("Once the monster is dead, you can take his drop with your mouse on clicking on it, or by using the key 'Z' from your keyboard."), 9);
close;
diff --git a/npc/000-2-1/hammock.txt b/npc/000-2-1/hammock.txt
new file mode 100644
index 00000000..3de878f8
--- /dev/null
+++ b/npc/000-2-1/hammock.txt
@@ -0,0 +1,19 @@
+// Evol scripts.
+// Authors:
+// Reid
+// Description:
+// Animated hammock.
+
+000-2-1.gat,22,36,0,2 script #name 904,{
+
+OnTouchFirst:
+ setnpcdir 2;
+
+ end;
+
+OnUnTouchAll:
+ setnpcdir 4;
+
+ end;
+
+}
diff --git a/npc/scripts.conf b/npc/scripts.conf
index c5322f15..41b02269 100644
--- a/npc/scripts.conf
+++ b/npc/scripts.conf
@@ -5,5 +5,7 @@ import: npc/_import.txt
// Item Functions
npc: npc/items/PoisonedWater.txt
+
+// Script Functions
npc: npc/functions/clientversion.txt
-npc: npc/functions/savepoint.txt
+npc: npc/functions/savepoint.txt \ No newline at end of file