[RETCON] Reinstate Christmas 2011 "Balthasar" over Chayenne/Wushin edits.

Orum has been **removed** from Christmas Quest.
This is for the sake of Blue Sage consistency.

4 files changed, 41 insertions, 41 deletions

diff --git a/npc/030-2/eljas.txt b/npc/030-2/eljas.txt
index 8b943678..cb06f82b 100644
--- a/npc/030-2/eljas.txt
+++ b/npc/030-2/eljas.txt
@@ -182,10 +182,10 @@ L_Research:
     goto L_close;
 
 L_NotWelcome:
-    mes "... You hear a voice calling your name ... ";
-    mes "[Orum's Homunculus]";
-    mes "\"Come See me in the caves below.\"";
-    mes "\"go south till you reach the snowman. Then head into the cave to the east.\"";
+    mes l("... You hear a voice calling your name ... ");
+    mesn l("Balthasar");
+    mesq l("Come see me in the caves below.");
+    mesq l("go south till you reach the snowman. Then head into the cave to the east.");
     warp "020-1",33,94;
     close;
 
diff --git a/npc/030-3/orum_homunculus.txt b/npc/030-3/orum_homunculus.txt
index a9e83da7..fef218e9 100644
--- a/npc/030-3/orum_homunculus.txt
+++ b/npc/030-3/orum_homunculus.txt
@@ -12,7 +12,7 @@ L_XmasMain:
     goto L_End;
 
 L_Telepathy:
-    mes "[Orum's Homunculus]";
+    mesn l("Balthasar");
     mes "\"Not that way!\"";
     mes "\"Use the southernmost exit.\"";
     close;
@@ -34,7 +34,7 @@ L_XmasMain:
     goto L_End;
 
 L_Telepathy:
-    mes "[Orum's Homunculus]";
+    mesn l("Balthasar");
     mes "\"That is the long way!\"";
     mes "\"Just go south from here to the southernmost exit.\"";
     close;
@@ -56,7 +56,7 @@ L_XmasMain:
     goto L_End;
 
 L_Telepathy:
-    mes "[Orum's Homunculus]";
+    mesn l("Balthasar");
     mes "\"Ok. You are getting closer, I can feel it!\"";
     mes "\"You are heading in the right direction - to the southern most exit.\"";
     close;
@@ -78,7 +78,7 @@ L_XmasMain:
     goto L_End;
 
 L_Telepathy:
-    mes "[Orum's Homunculus]";
+    mesn l("Balthasar");
     mes "\"Ok, you are getting closer, I can feel it.!\"";
     mes "\"Go take the south west path towards the brazier.\"";
     close;
@@ -100,7 +100,7 @@ L_XmasMain:
     goto L_End;
 
 L_Telepathy:
-    mes "[Orum's Homunculus]";
+    mesn l("Balthasar");
     mes "\"Wrong way!\"";
     mes "\"I am in the northeastern corner.\"";
     close;
@@ -122,7 +122,7 @@ L_XmasMain:
     goto L_End;
 
 L_Telepathy:
-    mes "[Orum's Homunculus]";
+    mesn l("Balthasar");
     mes "\"Wrong Way!\"";
     mes "\"I am in the northeastern corner.\"";
     close;
@@ -144,7 +144,7 @@ L_XmasMain:
     goto L_End;
 
 L_Telepathy:
-    mes "[Orum's Homunculus]";
+    mesn l("Balthasar");
     mes "\"Wrong Way!\"";
     mes "\"I am in the northeastern corner.\"";
     close;
@@ -153,7 +153,7 @@ L_End:
     end;
 }
 
-030-3,100,49,0	script	Orum's Homunculus	NPC385,{
+030-3,100,49,0	script	Balthasar	NPC385,{
     callfunc "XmasStates";
 
     if($@xmas_time)
@@ -161,7 +161,7 @@ L_End:
     goto L_OffSeason;
 
 L_OffSeason:
-    mes "Orums Homunculus looks up, inspects you briefly, and looks away again.";
+    mes l("%s looks up, inspects you briefly, and looks away again.", .name$);
     end;
 
 L_XmasMain:
@@ -190,7 +190,7 @@ L_SetPath:
     goto L_XmasMain;
 
 L_QuestStart1:
-    mes "[Orum's Homunculus]";
+    mesn l("Balthasar");
     mes "\"Greetings traveler, Do you have any time to help me out?\"";
     menu
         "No. I really have to go.", L_close,
@@ -208,7 +208,7 @@ L_Next:
     goto L_close;
 
 L_QuestStart2:
-    mes "[Orum's Homunculus]";
+    mesn l("Balthasar");
     mes "\"Greetings traveler, Do you have any time to help me out?\"";
     menu
         "No. I really have to go.", L_close,
@@ -226,7 +226,7 @@ L_KeepGoing:
     goto L_close;
 
 L_HaveList2:
-    mes "[Orum's Homunculus]";
+    mesn l("Balthasar");
     mes "\"Have you got the missing lists?\"";
     menu
         "What were those names again?", L_ListNames,
@@ -257,7 +257,7 @@ L_Foo:
     goto L_close;
 
 L_ListReturn:
-    mes "[Orum's Homunculus]";
+    mesn l("Balthasar");
     mes "\"This had better be important, I've got enough to worry about.\"";
     menu
         "Sorry for interrupting, but I've come down here because I delivered the fake list", L_FakeList;
@@ -312,7 +312,7 @@ L_FakeList:
     goto L_close;
 
 L_HelperQuest:
-    mes "[Orum's Homunculus]";
+    mesn l("Balthasar");
     mes "\"Welcome back!\"";
     mes "\"How is the sabotage coming along?\"";
     menu
@@ -376,7 +376,7 @@ L_IngredientList:
     goto L_close;
 
 L_PowerReagents:
-    mes "[Orum's Homunculus]";
+    mesn l("Balthasar");
     mes "\"Have you gotten the reagents?\"";
     menu
         "Yes.", L_CheckReagents,
@@ -397,7 +397,7 @@ L_CheckReagents:
     mes "He positions the four potions in a stand so all the openings are mostly facing each other.";
     mes "He begins to chant.";
     next;
-    mes "[Orum's Homunculus]";
+    mesn l("Balthasar");
     mes "O";
     next;
     mes "wat";
@@ -409,7 +409,7 @@ L_CheckReagents:
     mes "The potions begin to pulse with mana.";
     mes "He continues to chant";
     next;
-    mes "[Orum's Homunculus]";
+    mesn l("Balthasar");
     mes "Aye";
     next;
     mes "Am";
@@ -431,13 +431,13 @@ L_CheckReagents:
     goto L_close;
 
 L_Quick:
-    mes "[Orum's Homunculus]";
+    mesn l("Balthasar");
     mes "\"What are you still doing here?\"";
     mes "\"Quickly, to the warehouse.\"";
     goto L_close;
 
 L_Reward:
-    mes "[Orum's Homunculus]";
+    mesn l("Balthasar");
     mes "\"Revenge is a dish best served cold..\"";
     if (@xmas_reward2_done_state)
         @xmas_state = $@xmas_reward_done;
@@ -449,7 +449,7 @@ L_Reward:
     goto L_close;
 
 L_Thanks:
-    mes "[Orum's Homunculus]";
+    mesn l("Balthasar");
     mes "\"Please feel free to continue to sabotage whats left of the Inn while I prepare your reward.\"";
     goto L_close;
 
diff --git a/npc/030-4/mana_battery.txt b/npc/030-4/mana_battery.txt
index 2091f5b5..8fd59ab1 100644
--- a/npc/030-4/mana_battery.txt
+++ b/npc/030-4/mana_battery.txt
@@ -27,7 +27,7 @@ L_InitiateBattle:
     goto L_BattleGood;
 
 L_BattleBad:
-    mes "[Orum's Homunculus]";
+    mesn l("Balthasar");
     mes "\"So this is where this whole shallow charade will end...\"";
     mes "\"Good. Are you ready to get this over with?\"";
     menu
@@ -36,7 +36,7 @@ L_BattleBad:
         "Well... since you ask... I prefer to leave now, this is way to dangerous. I have responsibities.", L_Coward;
 
 L_KeepGoing:
-    mes "[Orums Homunculus]";
+    mesn l("Balthasar");
     mes "\"Okay now listen closely, at least for once.\"";
     mes "\"Put the mana battery into that vessel in front of you.\"";
     next;
@@ -49,7 +49,7 @@ L_YeahOk:
     mes "You carefully install the Mana Battery as good as you can manage.";
     mes "As you bend over, you notice a strong sulphur odour coming from the crate";
     next;
-    mes "[Orum]";
+    mesn l("Balthasar");
     mes "\"Ok. now this should be enough.\"";
     mes "\"Get out of here, before the bomb explodes!.\"";
     menu
@@ -341,33 +341,33 @@ L_Restart:
     "Scrrreeeeeeeeeeeeeeeeeeeeeaaaaaaaaaaaaaaaaaaaaatch",
     "Scrrreeeeeeeeeeeeeeeeeeeeeaaaaaaaaaaaaaaaaaaaaatch",
     "Avalia : I am getting a weird sensation ... ",
-    "Orums Homunculus : I think they know what we are up to!",
+    "Balthasar : I think they know what we are up to!",
     "Avalia : Oh no! This is going to blow up",
-    "Orums Homunculus : The Door is locked you idiot, fight for your life.",
+    "Balthasar : The Door is locked you idiot, fight for your life.",
     "Avalia : Guards of Honor I demand you: STOP!",
-    "Orums Homunculus : Okay, this is somewhat funny... why are they coming back?!?",
+    "Balthasar : Okay, this is somewhat funny... why are they coming back?!?",
     "Avalia : You brave fighters! Deactivate the nutcrackers! they are out of control!",
-    "Orums Homunculus : The good news is: if we make it this time we will never have to do that again!",
+    "Balthasar : The good news is: if we make it this time we will never have to do that again!",
     "Avalia : Oh boy we are so screwed.",
-    "Orums Homunculus : Report: I am an Idiot",
+    "Balthasar : Report: I am an Idiot",
     "Avalia : Quick, we need to kill the nutcrackers, before they ruin everything we've been working for.",
-    "Orums Homunculus : Strange they are getting more and not less.",
+    "Balthasar : Strange they are getting more and not less.",
     "Avalia : Oh no, they are too powerful. Fight my warriors, Fight for the spirit of Christmas.",
-    "Orums Homunculus : If I was smart enough to stop talking, it would have happened already..",
+    "Balthasar : If I was smart enough to stop talking, it would have happened already..",
     "Avalia : I cannot believe it, this is making them stronger. More and more of them are coming.",
-    "Orums Homunculus : I think we are almost done, the bomb should explode any second.",
+    "Balthasar : I think we are almost done, the bomb should explode any second.",
     "Avalia : Those poor creatures. Just kill them all.",
-    "Orums Homunculus : A N Y  S E C O N D.",
+    "Balthasar : A N Y  S E C O N D.",
     "Avalia : Oh well... just try again, I trust in you.",
-    "Orum's Homunculus : just lol.",
+    "Balthasar : just lol.",
     "Avalia : Wow! You saved christmas.",
-    "Orum's Homunculus : Yep, it's over... and strange enough you survived.";
+    "Balthasar : Yep, it's over... and strange enough you survived.";
 
     setarray $@xmas_final_announce$,
         "Avalia : Oh no, not only did you slay half my Guard of Honour, but also the issue was not fixed, try to install the battery again!",
-        "Orum's Homunculus : Boy are you lame. So what now? The battery is still not placed! Go try again!",
+        "Balthasar : Boy are you lame. So what now? The battery is still not placed! Go try again!",
         "Avalia : W00t you actually made it through. I think now that the manabattery lost some of its abundant power this seems to have given those nutcrackers that didn't go crazy a good boost of life energy. Thank you for your help all and come see me for a reward.",
-        "Orum's Homunculus : Good. They are dead. Now GET OUT OF THERE, this bomb is dangerous!";
+        "Balthasar : Good. They are dead. Now GET OUT OF THERE, this bomb is dangerous!";
     // Danger Cells to attack sitters
     // 0: 19,20,29,29
     // 1: 30,20,40,29
diff --git a/npc/annuals/xmas/barriers.txt b/npc/annuals/xmas/barriers.txt
index ae73e4bf..0b62281b 100644
--- a/npc/annuals/xmas/barriers.txt
+++ b/npc/annuals/xmas/barriers.txt
@@ -12,7 +12,7 @@ L_SideOut:
 
 L_Hint:
     message strcharinfo(0), "I said get out! We've got no time for your kind here.";
-    mes "[Orum's Homunculus]";
+    mesn l("Balthasar");
     mes "\"What are you doing? Come, see me in the caves below!\"";
     mes "\"I said go south till you reach the snowman. Then head into the cave to the east.\"";
     close2;