diff options
author | Fate <fate-tmw@googlemail.com> | 2009-05-30 20:03:41 +0000 |
---|---|---|
committer | Fate <fate-tmw@googlemail.com> | 2009-05-30 20:03:41 +0000 |
commit | 8b70df06b9454fe76765dd3044b378d4b3002002 (patch) | |
tree | 8518b9c58642ae85d17bc62ae87d0501858b7bdd /npc/024-1_Tulimshar_Canyon/ched.txt | |
parent | 96c8a2957d499b4dd7c867455bdff51920eb31ea (diff) | |
parent | f17c823d6f91ae535ebcadd8b5b369efea09b772 (diff) | |
download | serverdata-8b70df06b9454fe76765dd3044b378d4b3002002.tar.gz serverdata-8b70df06b9454fe76765dd3044b378d4b3002002.tar.bz2 serverdata-8b70df06b9454fe76765dd3044b378d4b3002002.tar.xz serverdata-8b70df06b9454fe76765dd3044b378d4b3002002.zip |
Merge branch 'master' of the testing branch
Conflicts:
conf/magic.conf
db/item_db.txt
npc/013-3_Cave/barrier.txt
Eliminated conf/magic.conf. Re-build this file using conf/build-magic.sh;
otherwise marriage will be disabled and spells won't work.
Diffstat (limited to 'npc/024-1_Tulimshar_Canyon/ched.txt')
-rw-r--r-- | npc/024-1_Tulimshar_Canyon/ched.txt | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/npc/024-1_Tulimshar_Canyon/ched.txt b/npc/024-1_Tulimshar_Canyon/ched.txt index 2f935364..43dd832e 100644 --- a/npc/024-1_Tulimshar_Canyon/ched.txt +++ b/npc/024-1_Tulimshar_Canyon/ched.txt @@ -5,9 +5,29 @@ if (isin("024-1.gat", 66, 43, 80, 54)) goto L_Canyon; mes "[Ched]"; - mes "\"I'm a student here.\""; + mes "\"I'm trying to get a spell to work. It's supposed to combine two potions, but I can't seem to figure out which two those are...\""; + next; + + menu + "Well, good luck with that!", L_Done, + "What spell is that?", -; + + + mes "[Ched]"; + mes "\"Well, I don't know what it's called... I took it out of `Timbleweed's Advanced Transmutations.' It seems awfully hard to cast, somehow.\""; + next; + + mes "[Ched]"; + mes "\"Well, the invocation is `" + getspellinvocation("merge-concentration-potions") + "'. You're supposed to just hold up the potions and cast it, and then they're supposed to merge.\""; close; + mes "[Ched]"; + mes "\"Maybe I should go back to `detect magic' until I can cast that one properly.\""; + close; + +L_Done: + close; + L_Garden: if (BaseLevel < 40) goto L_Warp; mes "[Ched]"; |