Merge pull request #443 from mekolat/npc-45

do not use npc 45 when not needed

3 files changed, 11 insertions, 11 deletions

diff --git a/world/map/npc/013-3/barrier.txt b/world/map/npc/013-3/barrier.txt
index 0e00a40c..d7875009 100644
--- a/world/map/npc/013-3/barrier.txt
+++ b/world/map/npc/013-3/barrier.txt
@@ -1,19 +1,19 @@
 //
 
-013-3,71,21,0|script|#DemonMineBarrier1#_M|45,1,1
+013-3,71,21,0|script|#DemonMineBarrier1#_M|32767,1,0
 {
     set @state, ((QUEST_Hurnscald & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT);
 
     if (@state >= 2) goto L_End;
     if (@state == 1 && countitem("Soul") >= 1) goto L_Has_Soul;
 
-    message strcharinfo(0), "A barrier around the opening pushes you back as you approach.";
+    message strcharinfo(0), "Barrier : ##3A barrier around the opening pushes you back as you approach.";
 
     warp "013-3", 71, 25;
     goto L_End;
 
 L_Has_Soul:
-    message strcharinfo(0), "The barrier around the opening allows you passage.";
+    message strcharinfo(0), "Barrier : ##3The barrier around the opening allows you passage.";
     set @state, 2;
     callsub S_Update_Mask;
     delitem "Soul", 1;
diff --git a/world/map/npc/029-2/bankroom.txt b/world/map/npc/029-2/bankroom.txt
index dea5a428..44dc3b4d 100644
--- a/world/map/npc/029-2/bankroom.txt
+++ b/world/map/npc/029-2/bankroom.txt
@@ -2,7 +2,7 @@
 // He explains how to use the bank.
 // Author: Cassy
 
-029-2,36,122,0|script|#BankRoom|45,1,0
+029-2,35,122,0|script|#BankRoom|32767,0,0
 {
     message strcharinfo(0), "The door is locked. This must be where Cynric saves the people's money and items.";
     end;
diff --git a/world/map/npc/030-3/orum_homunculus.txt b/world/map/npc/030-3/orum_homunculus.txt
index c31cbf04..aa5d6953 100644
--- a/world/map/npc/030-3/orum_homunculus.txt
+++ b/world/map/npc/030-3/orum_homunculus.txt
@@ -1,7 +1,7 @@
 // Annual Xmas
 // Authors: Wushin, Chayenne
 
-019-3,79,30,0|script|#OrumTelepathy1|45,3,3
+019-3,79,30,0|script|#OrumTelepathy1|127,3,3
 {
     callfunc "XmasStates";
 
@@ -24,7 +24,7 @@ L_End:
     end;
 }
 
-019-3,104,67,0|script|#OrumTelepathy2|45,1,1
+019-3,104,67,0|script|#OrumTelepathy2|127,1,1
 {
     callfunc "XmasStates";
 
@@ -47,7 +47,7 @@ L_End:
     end;
 }
 
-019-3,102,95,0|script|#OrumTelepathy3|45,3,3
+019-3,102,95,0|script|#OrumTelepathy3|127,3,3
 {
     callfunc "XmasStates";
 
@@ -70,7 +70,7 @@ L_End:
     end;
 }
 
-019-3,81,61,0|script|#OrumTelepathy4|45,3,3
+019-3,81,61,0|script|#OrumTelepathy4|127,3,3
 {
     callfunc "XmasStates";
 
@@ -93,7 +93,7 @@ L_End:
     end;
 }
 
-030-3,49,53,0|script|#OrumTelepathy5|45,1,1
+030-3,49,53,0|script|#OrumTelepathy5|127,1,1
 {
     callfunc "XmasStates";
 
@@ -116,7 +116,7 @@ L_End:
     end;
 }
 
-030-3,48,73,0|script|#OrumTelepathy6|45,1,1
+030-3,48,73,0|script|#OrumTelepathy6|127,1,1
 {
     callfunc "XmasStates";
 
@@ -139,7 +139,7 @@ L_End:
     end;
 }
 
-030-3,95,66,0|script|#OrumTelepathy7|45,1,1
+030-3,95,66,0|script|#OrumTelepathy7|127,1,1
 {
     callfunc "XmasStates";