Disable Easter 2010

1 files changed, 12 insertions, 35 deletions

diff --git a/npc/011-1_Woodland/auldsbel.txt b/npc/011-1_Woodland/auldsbel.txt
index 24f051ae..595c1a9f 100644
--- a/npc/011-1_Woodland/auldsbel.txt
+++ b/npc/011-1_Woodland/auldsbel.txt
@@ -141,7 +141,7 @@ L_intro_who_are_you:
 
 L_short_intro:
         mes "[Auldsbel the Wizard]";
-        mes "\"Padric, you're back. Well done. I mean...\"";
+        mes "\"Welcome back, Padric!\"";
         next;
         goto L_main_menu;
 
@@ -149,8 +149,7 @@ L_main_menu:
         if (@has_magic)
            goto L_main_menu_magic;
 
-        menu "Why the long face?", L_easter_nomagic,
-             "How does this 'magic' work?", L_about_magic,
+        menu "How does this 'magic' work?", L_about_magic,
              "I want to become a wizard!", L_learn_magic,
              "Where are you from?", L_about_auldsbel,
              "Do you need help with your experiments?", L_quest,
@@ -160,8 +159,7 @@ L_main_menu:
 
 L_main_menu_magic:
         if (@wants_sulphur && @wants_ironpowder)
-          menu "Are you alright? You seem worried.", L_easter_magic,
-             "How does magic work?", L_about_magic,
+          menu "How does magic work?", L_about_magic,
              "Can you teach me a spell?", L_learn_spell,
              "Where are you from?", L_about_auldsbel,
              "Do you need help with your experiments?", L_quest,
@@ -188,7 +186,7 @@ L_main_menu_magic:
 
 L_ironpowder:
         mes "[Auldsbel the Wizard]";
-        mes "\"I'm afraid I don't know the spell for this..  I expect that it shouldn't be too hard an invocation, but I'm too busy to work it out.\"";
+        mes "\"No, I do not know the spell for this.  I expect that it shouldn't be too hard an invocation, but I'm too busy to work it out.\"";
         next;
         mes "[Auldsbel the Wizard]";
         mes "\"I know that they used to make iron ore around here, though, many years ago.  Perhaps the secret is still hidden somewhere?\"";
@@ -198,7 +196,7 @@ L_ironpowder:
 L_sulphur:
         mes "[Auldsbel the Wizard]";
         set @cost, 400 - (@Q_component_quest * 30);
-        mes "\"Sulphur Powder? Picked up a little offensive magic, h'm? Good thinking, I suppose... oh, and of course I can transmute volcanic ashes into sulphur powder... at a ratio of 1:5? For " + @cost + " GP.\"";
+        mes "\"Sulphur powder?  Ah, so we have picked up a little offensive magic, haven't we?  Good thinking, good thinking.  And yes, of course I can transmute volcanic ashes into sulphur powder at a ratio of 1:5, for " + @cost + " GP.\"";
         next;
         if (@Q_main_status >= @Q_STATUS_STUDENT)
             menu
@@ -246,7 +244,7 @@ L_sulphur_noash:
 
 L_sulphur_noroom:
         mes "[Auldsbel the Wizard]";
-        mes "\"How do you expect me to give you this sulphur powder when you've got no room in your pack? Please come back when you've made some room!\"";
+        mes "\"Hmm, you really managed to squeeze something into every little place you had that we could have stored the powder in... you might want to return once you have resolved this matter.\"";
         next;
         goto L_main_menu;
 
@@ -254,7 +252,7 @@ L_sulphur_teach_spell:
         if (@Q_component_quest <= 4)
 		goto L_sulphur_teach_spell_no;
         mes "[Auldsbel the Wizard]";
-        mes "\"Very well, then.  You have been quite helpful with my experiments, after all, even if they... uh, well, as you may have noticed, the spell takes a pile of volcanic ashes.  Close your hands around it, then whisper the invocation.\"";
+        mes "\"Very well, then.  You have been quite helpful with my experiments, after all.  As you may have noticed, the spell takes a pile of volcanic ashes.  Close your hands around it, then whisper the invocation.\"";
         next;
         mes "[Auldsbel the Wizard]";
         mes "\"That invocation is '" + getspellinvocation("make-sulphur") + "'.\"";
@@ -483,14 +481,14 @@ L_about_auldsbel:
 
 L_about_auldsbel_2:
         mes "[Auldsbel the Wizard]";
-        mes "\"Oh, myself? Well... I was just vacationing here, but lately... I don't know. And my newest experiment isn't going well either, I'm afraid.\"";
+        mes "\"Oh, myself?  I am just vacationing in the area.  Very relaxed and peaceful place, the Hurnscald area.  And plenty of splendid specimen for experimentation.\"";
         next;
         goto L_main_menu;
 
 L_learn_magic:
         mes "[Auldsbel the Wizard]";
-        mes "Auldsbel frowns.";
-        mes "\"Oh, if only it were so easy!  No, my young friend, I fear that 'learning magic' here is not an option.  Either you are born with it, or without.\"";
+        mes "Auldsbel laughs heartily.";
+        mes "\"Hah, if only it were so easy!  No, my young friend, I fear that 'learning magic' here is not an option.  Either you are born with it, or without.\"";
         next;
         mes "[Auldsbel the Wizard]";
         mes "\"Sure, there are a few entities that may grant you magic-- Ether Spirits or Mana Seeds or Great Dragons-- but those are the stuff of legends, so I suggest that you don't waste your life trying to find one of them.\"";
@@ -554,7 +552,7 @@ L_Q_sagatha:
         goto L_main_menu;
 
 L_Q_manaseed_rumour:
-        mes "\"A mana seed?  Around here?  No, I'm afraid they've been pulling your leg...  Those things are extremely rare, after all.\"";
+        mes "\"A mana seed?  Around here?  Nah, they've been pulling your leg.  Those things are extremely rare, after all.\"";
         next;
         goto L_main_menu;
 
@@ -568,7 +566,7 @@ L_Q_manaseed:
 		goto L_Q_manaseed_prepared;
         if (MAGIC_FLAGS & MFLAG_TOUCHED_MANASEED)
 		goto L_Q_manaseed_touched;
-        mes "\"You have found an actual Mana Seed?  That's impossible!  Well, very unlikely...  Then again, some others have told me similar rumours.  I find it hard to believe that...\"";
+        mes "\"You have found an acual Mana Seed?  That's impossible!  Well, very unlikely...  Then again, some others have told me similar rumours.  I find it hard to believe that...\"";
         next;
         mes "[Auldsbel the Wizard]";
         mes "\"Well, if it's true, then try touching it.  That should do you no harm, but if you are very, very lucky, it just might grant you some minuscule amount of magical power.\"";
@@ -960,27 +958,6 @@ L_learn_spell:
         callsub S_update_var;        
         goto L_main_menu;
 
-L_easter_nomagic:
-	mes "[Auldsbel the Wizard]";
-	mes "\"H'm? What? Long face? My face is perfectly normal, thank you very much. Although... I am a little worried about my current experiment. It's not going well.\"";
-	next;
-	goto L_main_menu;
-
-L_easter_magic:
-	mes "[Auldsbel the Wizard]";
-	mes "\"Ah, Padric. It's my experiments... they're confusing me, and I fear they're not going at all well.\"";
-        next;
-        menu
-		"Is there anything I can do?", L_easter_help,
-                "Well that's just too bad.", -;
-	close;
-
-L_easter_help:
-	mes "[Auldsbel the Wizard";
-	mes "\"Alas... you've helped with my experiments before, but I fear that this is beyond your capabilities. Thank you for the offer, though.\"";
-	next;
-	goto L_main_menu;
-
 LL_repeat_spell:
         mes "[Auldsbel the Wizard]";
         mes "\"The invocation is `" + getspellinvocation("transmute-wood-to-figurine") + ",' followed by the last syllable of the name of the creature you want to shape the log into.  So `" + getspellinvocation("transmute-wood-to-figurine") + " lurk' for a Skrytlurk figurine.\"";