diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2011-09-08 20:36:29 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2011-09-08 20:36:29 +0200 |
| commit | 5ea6c568c86d9c0f76983705258951e2db9974fa (patch) | |
| tree | 94a402b645140a7bb9fbfa467a73cfb30d880a56 /world/map/npc/024-2 | |
| parent | 2629fa14c6f7e6a5a7a71f5c784424cf80189f17 (diff) | |
| parent | cba4de9a5f7b9de412b9f458c80904cee9764a85 (diff) | |
| download | serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.gz serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.bz2 serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.xz serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.zip | |
Merge remote-tracking branch 'testing/master'v2011.09.08
Diffstat (limited to 'world/map/npc/024-2')
| -rw-r--r-- | world/map/npc/024-2/barrier.txt | 10 | ||||
| -rw-r--r-- | world/map/npc/024-2/tyer.txt | 8 | ||||
| -rw-r--r-- | world/map/npc/024-2/tyer_trigger.txt | 30 |
3 files changed, 24 insertions, 24 deletions
diff --git a/world/map/npc/024-2/barrier.txt b/world/map/npc/024-2/barrier.txt index ede39644..e5de5bb9 100644 --- a/world/map/npc/024-2/barrier.txt +++ b/world/map/npc/024-2/barrier.txt @@ -1,10 +1,10 @@ // 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,{ - if (BaseLevel < 40) goto L_PushBack; - close; +024-2.gat,31,24,0|script|#MagicSchoolBarrier1#M|0,1,1,{ + if (BaseLevel < 40) goto L_PushBack; + close; L_PushBack: - warp "024-2.gat", 34, 24; - close; + warp "024-2.gat", 34, 24; + close; } diff --git a/world/map/npc/024-2/tyer.txt b/world/map/npc/024-2/tyer.txt index f6b78331..bbd829cd 100644 --- a/world/map/npc/024-2/tyer.txt +++ b/world/map/npc/024-2/tyer.txt @@ -1,7 +1,7 @@ // A man in the magic school -024-2.gat,36,21,0 script Tyer 157,{ - mes "[Tyer]"; - mes "\"Hello.\""; - close; +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 ee588365..603eb7d8 100644 --- a/world/map/npc/024-2/tyer_trigger.txt +++ b/world/map/npc/024-2/tyer_trigger.txt @@ -1,23 +1,23 @@ // A man in the magic school -024-2.gat,33,24,0 script #Tyer_Trigger 0,1,1,{ - if (BaseLevel >= 40) end; +024-2.gat,33,24,0|script|#Tyer_Trigger|0,1,1,{ + if (BaseLevel >= 40) end; - mes "[Tyer]"; - mes "\"You're still too young to go in there.\""; - next; + mes "[Tyer]"; + mes "\"You're still too young to go in there.\""; + next; - menu - "What do you mean I'm too young to go in there?", L_Explain, - "Ah, right.", -; - close; + menu + "What do you mean I'm too young to go in there?", L_Explain, + "Ah, right.", -; + close; L_Explain: - mes "[Tyer]"; - mes "\"The canyon is a dangerous place, so only more experienced people are allowed there.\""; - next; + mes "[Tyer]"; + mes "\"The canyon is a dangerous place, so only more experienced people are allowed there.\""; + next; - mes "[Tyer]"; - mes "\"That barrier was made to keep those that are too young out.\""; - close; + mes "[Tyer]"; + mes "\"That barrier was made to keep those that are too young out.\""; + close; } |