Merge pull request #411 from wushin/nick-broken-fix

Fix Broken Nick Message

5 files changed, 10 insertions, 10 deletions

diff --git a/world/map/npc/029-2/sorfina.txt b/world/map/npc/029-2/sorfina.txt
index 6af2912e..ff5b3a3b 100644
--- a/world/map/npc/029-2/sorfina.txt
+++ b/world/map/npc/029-2/sorfina.txt
@@ -331,7 +331,7 @@ L_CloseDis:
     end;
 
 L_Block:
-    message strcharinfo(0), "##3Sorfina : ##BWait a moment! ##bYou're not ready to leave.";
+    message strcharinfo(0), "Sorfina : ##BWait a moment! ##bYou're not ready to leave.";
     // FIXME: this should be changed to npctalk with strcharinfo(0) once we increase the view area
     end;
 }
@@ -362,7 +362,7 @@ L_Block:
     goto L_Close;
 
 L_KnockBack:
-    message strcharinfo(0), "##1Server : ##BPlease Accept the Game rules";
+    message strcharinfo(0), "Server : ##BPlease Accept the Game rules";
     warp "029-2", 22, 24;
     goto L_Close;
 
@@ -376,7 +376,7 @@ L_Close:
     goto L_Close;
 
 L_KnockBack:
-    message strcharinfo(0), "##1Server : ##BPlease Accept the Game rules";
+    message strcharinfo(0), "Server : ##BPlease Accept the Game rules";
     warp "029-2", 22, 24;
     goto L_Close;
 
diff --git a/world/map/npc/031-1/house.txt b/world/map/npc/031-1/house.txt
index f7ffb549..7e086986 100644
--- a/world/map/npc/031-1/house.txt
+++ b/world/map/npc/031-1/house.txt
@@ -6,7 +6,7 @@
 {
     if (QL_CINDY == 3 || QL_CINDY == 4)
         goto L_Warp;
-    message strcharinfo(0), "##3Door : ##BThe door is locked.";
+    message strcharinfo(0), "Door : ##BThe door is locked.";
     end;
 
 L_Warp:
diff --git a/world/map/npc/functions/default_npc_checks.txt b/world/map/npc/functions/default_npc_checks.txt
index c714c931..da080e82 100644
--- a/world/map/npc/functions/default_npc_checks.txt
+++ b/world/map/npc/functions/default_npc_checks.txt
@@ -21,11 +21,11 @@ function|script|PCtoNPCRange
     if(@distance_handler) goto L_Return;
     set @dnpc_name$, strnpcinfo(1);
     if(@dnpc_name$ != "") goto L_Named;
-    message strcharinfo(0), "##3Server : ##BYou need to move closer to interact with this npc.";
+    message strcharinfo(0), "Server : ##BYou need to move closer to interact with this npc.";
     goto L_Return;
 
 L_Named:
-    message strcharinfo(0), "##3"+@dnpc_name$+" : ##BPlease move closer.";
+    message strcharinfo(0), ""+@dnpc_name$+" : ##BPlease move closer.";
     goto L_Return;
 
 L_Return:
diff --git a/world/map/npc/functions/motdconfig.txt b/world/map/npc/functions/motdconfig.txt
index 9ad2b43f..2d0ae049 100644
--- a/world/map/npc/functions/motdconfig.txt
+++ b/world/map/npc/functions/motdconfig.txt
@@ -30,7 +30,7 @@ function|script|DisplayMOTD
     goto L_MOTD;
 
 L_MOTD:
-    message strcharinfo(0), "##7Server : " + $@MOTD$[@motd_index];
+    message strcharinfo(0), "Server : " + $@MOTD$[@motd_index];
     set @motd_index, @motd_index + 1;
     if($@MOTD$[@motd_index] == "") goto L_Return;
     goto L_MOTD;
diff --git a/world/map/npc/items/warpTowels.txt b/world/map/npc/items/warpTowels.txt
index dd8bc71e..122ac7c0 100644
--- a/world/map/npc/items/warpTowels.txt
+++ b/world/map/npc/items/warpTowels.txt
@@ -131,16 +131,16 @@ L_BreakChance:
     goto L_End;
 
 L_Forbid:
-    message strcharinfo(0), "##1Towel : This area is protected by a force that doesn't tolerate the power of the Towel.";
+    message strcharinfo(0), "Towel : This area is protected by a force that doesn't tolerate the power of the Towel.";
     goto L_Keep;
 
 L_Prison:
-    message strcharinfo(0), "##1Towel : You must be warped by a GM to leave the botcheck area.";
+    message strcharinfo(0), "Towel : You must be warped by a GM to leave the botcheck area.";
     goto L_Keep;
 
 L_DontPanic:
     callfunc "HumanTime";
-    message strcharinfo(0), "##3Towel : Your towel is still too low on power to jump again. Try again in ##B"+ @time$ + "##b.";
+    message strcharinfo(0), "Towel : Your towel is still too low on power to jump again. Try again in ##B"+ @time$ + "##b.";
     goto L_Keep;
 
 L_Keep: