summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2015-11-09 01:29:30 +0100
committerReid <reidyaro@gmail.com>2015-11-09 01:29:30 +0100
commit010c33a15f7c81a2fa4db1f6c689cc5ed608fe51 (patch)
tree094dd59286d8351b8bfd5c1840abaf8e3697713d /npc
parentaa7d95f35c4da3674d93943c1012b8eaf6fa6dad (diff)
downloadserverdata-010c33a15f7c81a2fa4db1f6c689cc5ed608fe51.tar.gz
serverdata-010c33a15f7c81a2fa4db1f6c689cc5ed608fe51.tar.bz2
serverdata-010c33a15f7c81a2fa4db1f6c689cc5ed608fe51.tar.xz
serverdata-010c33a15f7c81a2fa4db1f6c689cc5ed608fe51.zip
Add Merlin on Artis's market.
Diffstat (limited to 'npc')
-rw-r--r--npc/001-1/_import.txt1
-rw-r--r--npc/001-1/merlin.txt18
2 files changed, 19 insertions, 0 deletions
diff --git a/npc/001-1/_import.txt b/npc/001-1/_import.txt
index b429f46a..5d509830 100644
--- a/npc/001-1/_import.txt
+++ b/npc/001-1/_import.txt
@@ -15,6 +15,7 @@ npc: npc/001-1/harbours.txt
npc: npc/001-1/juscare.txt
npc: npc/001-1/katja.txt
npc: npc/001-1/lozerk.txt
+npc: npc/001-1/merlin.txt
npc: npc/001-1/nalkri.txt
npc: npc/001-1/panels.txt
npc: npc/001-1/qonan.txt
diff --git a/npc/001-1/merlin.txt b/npc/001-1/merlin.txt
new file mode 100644
index 00000000..0223e3ce
--- /dev/null
+++ b/npc/001-1/merlin.txt
@@ -0,0 +1,18 @@
+// Evol scripts.
+// Author:
+// Reid
+// Description:
+// Fishmonger NPC
+
+001-1,72,128,0 script Merlin NPC_MERLIN,{
+
+ speech
+ l("Fish is good for the brain!");
+
+ close;
+
+OnInit:
+ .sex = G_MALE;
+ .distance = 2;
+ end;
+}