Tondar now hands out the ask-magic-progress spell

2 files changed, 71 insertions, 7 deletions

diff --git a/conf/magic.conf.template b/conf/magic.conf.template
index aa37257b..0dbbaba4 100644
--- a/conf/magic.conf.template
+++ b/conf/magic.conf.template
@@ -232,19 +232,29 @@ SPELL ask-magic-exp : "#G01" =
                     THEN max_experience = 1200;
                     ELSE max_experience = 100;
 
-                    ratio = (10 * experience) / max_experience;
+                    ratio = (10 * experience - random(max_experience / 30)) / max_experience; #Randomness:  jitter a bit at the transitions to give more precise information if used frequently
 
                     IF ratio >= 10
-                    THEN message(caster, "You feel that are ready to advance to the next level of magic.");
+                    THEN message(caster, "You feel in perfect control of your magic.");
                     ELSE IF ratio >= 9
-                    THEN message(caster, "You feel that are very close to having the prowess needed to advance to the next level of magic.");
+                    THEN message(caster, "You feel in almost perfect control of your magic.");
+                    ELSE IF ratio >= 8
+                    THEN message(caster, "You feel that you have very good control of your magic.");
                     ELSE IF ratio >= 7
-                    THEN message(caster, "You feel quite skilled at this level of magic but still need to get used to some more corner cases before you can advance.");
+                    THEN message(caster, "You feel quite in control of your magic.");
+                    ELSE IF ratio >= 6
+                    THEN message(caster, "You feel mostly in control of your magic.");
                     ELSE IF ratio >= 5
-                    THEN message(caster, "You feel competent at this level of magic but realise that you must practice more.");
+                    THEN message(caster, "You feel somewhat in control of your magic.");
+                    ELSE IF ratio >= 4
+                    THEN message(caster, "You feel somewhat uneasy about controlling your magic.");
                     ELSE IF ratio >= 3
-                    THEN message(caster, "You feel that you have grasped the basics of this level of magic, but still have some way to go.");
-                    ELSE message (caster, "You feel that you are still at the beginning of your quest for mastering this level of magic.");
+                    THEN message(caster, "Trying to control your magic makes you quite uncomfortable.");
+                    ELSE IF ratio >= 2
+                    THEN message(caster, "You feel that you have only the bare minimum of control over your magic.");
+                    ELSE IF ratio >= 1
+                    THEN message(caster, "You feel quite overwhelmed by your magic, but are beginning to see patterns.");
+                    ELSE message (caster, "You feel completely overwhelmed by your magic.");
                 )
 
 # SPELL ask-life-magic-exp : "#G02" =
diff --git a/npc/024-1_Tulimshar_Canyon/tondar.txt b/npc/024-1_Tulimshar_Canyon/tondar.txt
index ba97d2ee..ea44e635 100644
--- a/npc/024-1_Tulimshar_Canyon/tondar.txt
+++ b/npc/024-1_Tulimshar_Canyon/tondar.txt
@@ -3,5 +3,59 @@
 024-1.gat,83,51,0	script	Tondar	168,{
 	mes "[Tondar]";
 	mes "\"We're not accepting any new students right now.\"";
+        if (getskilllv(SKILL_MAGIC) > 0)
+		goto L_may_ask;
+
 	close;
+
+L_may_ask:
+        next;
+        menu
+		"Can you teach me a spell?", L_askspell,
+                "Do you have a magic library?", L_library,
+		"Are you sure?  I can pay well...", L_nopay,
+                "That's unfortunate.", -,
+                "Goodbye, then.", -;
+
+	close;
+
+L_library:
+	mes "[Tondar]";
+	mes "\"Of course we do.  It is only for graduate students, alumni, and faculty.\"";
+        next;
+        menu
+		"Thank you, and goodbye.", L_end,
+		"Nobody else is allowed inside?", -;
+
+
+	mes "[Tondar]";
+	mes "\"Well, it is possible to get a special permit from the headmaster.  But he is currently on sabbatical.\"";
+        close;
+        
+
+L_askspell:
+	mes "[Tondar]";
+	mes "\"We only teach spells to students.\"";
+        next;
+
+        menu
+		"Oh, come on... just one little spell!", L_nopay,
+                "Pretty please?", L_spell,
+		"I can pay you, too...", L_nopay;
+
+
+L_spell:
+	mes "[Tondar]";
+	mes "\"Well, all right; this one can't do much harm.  Press your hands together and say `" + getspellinvocation("ask-magic-exp") + "'.\"";
+        mes "\"This will release a steady flow of magic within you.  Focus and try to control it; it is a good metitative practice.\"";
+        close;
+
+
+L_nopay:
+	mes "[Tondar]";
+        mes "The wizard frowns angrily.";
+	mes "\"Do not tempt me to teach you a different kind of lesson, young one!  Begone!\"";
+
+L_end:
+        close;
 }