summaryrefslogtreecommitdiff
path: root/world/map/npc/025-1
diff options
context:
space:
mode:
authorAli-G <gauvain.dauchy@free.fr>2011-06-30 20:08:34 +0200
committerAli-G <gauvain.dauchy@free.fr>2011-06-30 20:08:34 +0200
commit43f86875dc03451824ac19cb27e196f2c9ab65b3 (patch)
tree145b5aaf0de5f4dde193d259854264020ea8b737 /world/map/npc/025-1
parentd7fc41a69bce75177626b1fe9d63469e1895e92d (diff)
parentdca6665aa89a5818c7e1b7eb905f1b03ba4e633f (diff)
downloadserverdata-43f86875dc03451824ac19cb27e196f2c9ab65b3.tar.gz
serverdata-43f86875dc03451824ac19cb27e196f2c9ab65b3.tar.bz2
serverdata-43f86875dc03451824ac19cb27e196f2c9ab65b3.tar.xz
serverdata-43f86875dc03451824ac19cb27e196f2c9ab65b3.zip
Merge branch 'master' of git://gitorious.org/+tmw-admins/tmw/tmwa-server-test
Diffstat (limited to 'world/map/npc/025-1')
-rw-r--r--world/map/npc/025-1/barrier.txt3
-rw-r--r--world/map/npc/025-1/rossy.txt2
2 files changed, 4 insertions, 1 deletions
diff --git a/world/map/npc/025-1/barrier.txt b/world/map/npc/025-1/barrier.txt
index df5ffc2a..7a238480 100644
--- a/world/map/npc/025-1/barrier.txt
+++ b/world/map/npc/025-1/barrier.txt
@@ -1,4 +1,5 @@
-//
+// Authors: alastrim, Ali-g, Dark Mage
+
025-1.gat,42,79,0 script #JuliaBarrier 45,1,1,{
if (Rossy_Quest <= 13) goto L_Block;
if (@Alrd_Been != 1 && Rossy_Quest == 14) message strcharinfo(0), "You hear distant screams of fear.";
diff --git a/world/map/npc/025-1/rossy.txt b/world/map/npc/025-1/rossy.txt
index b78def6b..3cfc834a 100644
--- a/world/map/npc/025-1/rossy.txt
+++ b/world/map/npc/025-1/rossy.txt
@@ -1,3 +1,5 @@
+// Authors: alastrim, Ali-g, Dark Mage
+
025-1.gat,80,88,0 script Rossy 114,{
if (FLAGS & FLAG_ROSSI_COMPLETED) goto L_FinalEnd;