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/001-1_Tulimshar/guide.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/001-1_Tulimshar/guide.txt')
| -rw-r--r-- | npc/001-1_Tulimshar/guide.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/001-1_Tulimshar/guide.txt b/npc/001-1_Tulimshar/guide.txt index 75b4dcc3..16be310b 100644 --- a/npc/001-1_Tulimshar/guide.txt +++ b/npc/001-1_Tulimshar/guide.txt @@ -128,7 +128,7 @@ L_Stats: L_Magic: mes "[Ian the Guide]"; mes "\"In decades past, there was a Mana Seed south of Tulimshar, from which people could draw magical energies. Unfortunately, the seed is gone."; - mes "Until we find a new Mana Seed, there will be no magic, except for those who already possess magical powers.\""; + mes "However, I've overheard the bard mentioning something about this recently... if you are interested in magic, try talking to him!\""; next; goto L_Menu_A; @@ -153,7 +153,7 @@ S_Grad: mes "[Ian the Guide]"; mes "\"Hey, you've been doing good, let me give you this.\""; - getitem 675, 1; + getitem "GraduationCap", 1; set TUT_var, TUT_var | 2; next; |