summaryrefslogtreecommitdiff
path: root/world/map/npc/027-2/testnpcs.txt
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2013-07-07 12:51:32 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2013-07-07 12:51:32 +0200
commit0dd134db3f6f67bb5e4401f1ba7bf3e97f201505 (patch)
tree4a200c1eeb684039390959107a6f413e065384fd /world/map/npc/027-2/testnpcs.txt
parenta89882b69d9f12499404ca9d471d5a735bc63988 (diff)
parent135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff)
downloadserverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.gz
serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.bz2
serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.xz
serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.zip
Merge remote-tracking branch 'origin/master' into waric
Conflicts: world/map/db/mob_db.txt
Diffstat (limited to 'world/map/npc/027-2/testnpcs.txt')
-rw-r--r--world/map/npc/027-2/testnpcs.txt12
1 files changed, 8 insertions, 4 deletions
diff --git a/world/map/npc/027-2/testnpcs.txt b/world/map/npc/027-2/testnpcs.txt
index 48f85a95..88d762e3 100644
--- a/world/map/npc/027-2/testnpcs.txt
+++ b/world/map/npc/027-2/testnpcs.txt
@@ -1,6 +1,7 @@
//several NPCs in the Reid's Inn
-027-2.gat,80,34,0|script|Lovers|303,{
+027-2.gat,80,34,0|script|Lovers|303,
+{
mes "You see a man and a woman holding each other very tight.";
next;
mes "They are kissing and whispering things to each other you can't hear.";
@@ -11,7 +12,8 @@
close;
}
-027-2.gat,75,29,0|script|Archibald|306,{
+027-2.gat,75,29,0|script|Archibald|306,
+{
//the broken grammar is intentional
mes "[Archibald]";
mes "\"Me need to prepare the food. Me helping the chef cook.\"";
@@ -20,7 +22,8 @@
close;
}
-027-2.gat,77,40,0|script|Darnel|308,{
+027-2.gat,77,40,0|script|Darnel|308,
+{
set @drunker, rand(4);
if (@drunker == 0) goto L_0;
if (@drunker == 1) goto L_1;
@@ -49,7 +52,8 @@ L_Close:
close;
}
-027-2.gat,110,23,0|script|Nigel|312,{
+027-2.gat,110,23,0|script|Nigel|312,
+{
mes "[Nigel]";
mes "\"Ohh... My head is killing me! I have to stop "
+ "drinking too much or I will lose my job... But "