Disable Easter 2010

1 files changed, 2 insertions, 63 deletions

diff --git a/npc/013-2_Magic_house/wizard.txt b/npc/013-2_Magic_house/wizard.txt
index 45fd8034..e74b15ec 100644
--- a/npc/013-2_Magic_house/wizard.txt
+++ b/npc/013-2_Magic_house/wizard.txt
@@ -3,11 +3,10 @@
         set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_KNOWS_OLD_WIZARD;
 
         mes "[Old Wizard]";
-        mes "\"Ah, hello... \"";
+        mes "\"Welcome, dear wanderer! Come into my humble home. Take a rest, eat and drink.\"";
         next;
 
         menu
-		"Hey old man, you look worried - you okay?", L_easter_worried,
         	"Thanks, that's very kind of you!",thanks,
                 "Can you teach me magic?", L_teach_rude,
         	"Oh, shut up!",shutup;
@@ -42,7 +41,7 @@ nothx:
 
 L_new_student:
         mes "[Old Wizard]";
-        mes "\"Studying is very good for the mind... um, I'm afraid that just at the moment I'm - well, I suppose I could teach you one spell.\"";
+        mes "\"Studying is always an excellent use of one's mind! I fear that I can't offer too much assistance to you, however. But if you are interested, I could perhaps teach you a simple spell?\"";
         next;
 
         menu
@@ -78,65 +77,5 @@ ok:
         next;
         mes "\"Oh, and please don't take my apprentice too seriously. He still has a lot to learn.\"";
         close;
-
-L_easter_worried:
-	mes "[Old Wizard]";
-	setarray @cryptic$, "\"Mm, I'm alright. But you'd better head off home... doesn't do to be abroad of late.\"",	"\"An intruder is abroad, my young man. It may be nothing, but I doubt it! Best go home before it gets dark.\"", "\"Darkness, my boy, darkness. I'm not afraid, but I'm worried!\"", "\"I was out gathering herbs, but... well, you should go home as well.\"";
-	set @random_index, rand(getarraysize(@cryptic$));
-	mes @cryptic$[@random_index];
-	if (@random_index == 1) goto L_easter_abroad;
-	if (@random_index == 2) goto L_easter_abroad;
-	if (@random_index == 3) goto L_easter_darkness;
-	if (@random_index == 4) goto L_easter_gohome;
-	close;
-
-L_easter_abroad:
-	menu
-		"Abroad? You mean like, the beach? Sand, sun and... palm trees?", L_easter_holiday,
-		"Um, okay.", -,
-	close;
-
-L_easter_holiday:
-	mes "[Old Wizard]";
-	mes "\"No, you fool! I mean like... about. You know? *sigh* Never mind...\"";
-	close;
-
-L_easter_darkness:
-	menu
-		"Ha! Bet you are afraid.", L_easter_afraid,
-		"Worried? Why?", L_easter_whyworried,
-		"Okay. Bye.", -;
-	close;
-
-L_easter_afraid:
-	mes "[Old Wizard]";
-	mes "\"Don't be ridiculous! Humph!\"";
-	close;
-
-L_easter_whyworried:
-	mes "[Old Wizard]";
-	mes "\"I'm afraid I can't tell you that...\"";
-	next;
-	mes "\"I don't know myself!\"";
-	close;
-
-L_easter_gohome:
-	menu
-		"Leave me alone, you crazy old man.", L_easter_crazy,
-		"Thanks for the advice, I guess...", L_easter_thanks,
-		"Yeah, I think so too.", -,
-		close;
-
-L_easter_crazy:
-	mes "[Old Wizard]";
-	mes "\"Humph! Young scoundrel, be off with you! Do something useful for once... I hear the old woman in Hurnscald was looking for some help.\"";
-	close;
-
-L_easter_thanks:
-	mes "[Old Wizard]";
-	mes "\"Take care, now, my boy.\"";
-	close;	
-
-
 }