summaryrefslogtreecommitdiff
path: root/world/map/npc/024-2
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/024-2
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/024-2')
-rw-r--r--world/map/npc/024-2/_mobs.txt3
-rw-r--r--world/map/npc/024-2/barrier.txt3
-rw-r--r--world/map/npc/024-2/tyer.txt3
-rw-r--r--world/map/npc/024-2/tyer_trigger.txt3
4 files changed, 8 insertions, 4 deletions
diff --git a/world/map/npc/024-2/_mobs.txt b/world/map/npc/024-2/_mobs.txt
index 92276ebf..b526b00a 100644
--- a/world/map/npc/024-2/_mobs.txt
+++ b/world/map/npc/024-2/_mobs.txt
@@ -3,6 +3,7 @@
-024-2.gat,0,0,0|script|Mob024-2|-1,{
+024-2.gat,0,0,0|script|Mob024-2|-1,
+{
end;
}
diff --git a/world/map/npc/024-2/barrier.txt b/world/map/npc/024-2/barrier.txt
index e5de5bb9..6b971d1f 100644
--- a/world/map/npc/024-2/barrier.txt
+++ b/world/map/npc/024-2/barrier.txt
@@ -1,6 +1,7 @@
// A barrier in the magic school to keep less experienced players out of the canyon
-024-2.gat,31,24,0|script|#MagicSchoolBarrier1#M|0,1,1,{
+024-2.gat,31,24,0|script|#MagicSchoolBarrier1#M|0,1,1,
+{
if (BaseLevel < 40) goto L_PushBack;
close;
diff --git a/world/map/npc/024-2/tyer.txt b/world/map/npc/024-2/tyer.txt
index bbd829cd..334c62ad 100644
--- a/world/map/npc/024-2/tyer.txt
+++ b/world/map/npc/024-2/tyer.txt
@@ -1,6 +1,7 @@
// A man in the magic school
-024-2.gat,36,21,0|script|Tyer|157,{
+024-2.gat,36,21,0|script|Tyer|157,
+{
mes "[Tyer]";
mes "\"Hello.\"";
close;
diff --git a/world/map/npc/024-2/tyer_trigger.txt b/world/map/npc/024-2/tyer_trigger.txt
index 603eb7d8..9a1a8c27 100644
--- a/world/map/npc/024-2/tyer_trigger.txt
+++ b/world/map/npc/024-2/tyer_trigger.txt
@@ -1,6 +1,7 @@
// A man in the magic school
-024-2.gat,33,24,0|script|#Tyer_Trigger|0,1,1,{
+024-2.gat,33,24,0|script|#Tyer_Trigger|0,1,1,
+{
if (BaseLevel >= 40) end;
mes "[Tyer]";