Merge pull request #293 from mekolat/announce

Fix deprecated asterisk in announcements

11 files changed, 99 insertions, 99 deletions

diff --git a/world/map/npc/009-6/brodomir.txt b/world/map/npc/009-6/brodomir.txt
index 9b2c55d5..9b7fa583 100644
--- a/world/map/npc/009-6/brodomir.txt
+++ b/world/map/npc/009-6/brodomir.txt
@@ -133,11 +133,11 @@ L_Go:
     set $@BRODOMIR_MONEY, @brodomir_money;
     set $@brodomir_delay_seconds, 600;
     set $@BRODOMIR_PVP_STATUS, 1;
-    announce "Brodomir: In "+$@brodomir_delay_seconds/60+" minutes, I will start a PvP tournament, if at least 3 fighters are present. Make your way in Hurnscald Underground Caves!", 0;
+    announce "Brodomir : In "+$@brodomir_delay_seconds/60+" minutes, I will start a PvP tournament, if at least 3 fighters are present. Make your way in Hurnscald Underground Caves!", 0;
     if ($@BRODOMIR_ITEM_AMOUNT > 0)
-        announce "Brodomir: The winner will receive 150GP per fighter and " + $@BRODOMIR_ITEM_AMOUNT + " " + $@BRODOMIR_ITEM$ + ".", 0;
+        announce "Brodomir : The winner will receive 150GP per fighter and " + $@BRODOMIR_ITEM_AMOUNT + " " + $@BRODOMIR_ITEM$ + ".", 0;
     if ($@BRODOMIR_MONEY > 0)
-        announce "Brodomir: The winner will receive " + $@BRODOMIR_MONEY + "GP and additionally 150GP per fighter.", 0;
+        announce "Brodomir : The winner will receive " + $@BRODOMIR_MONEY + "GP and additionally 150GP per fighter.", 0;
     mes "[Brodomir]";
     mes "\"In "+$@brodomir_delay_seconds/60+" minutes I will bring you all to the PvP cave. If there are less than 3 players here the event will not start and your money will be lost.\"";
     set $@BRODOMIR_START_TIME, gettimetick(2) + $@brodomir_delay_seconds;
@@ -169,12 +169,12 @@ L_Warp:
     set $@BRODOMIR_PVP_STATUS, $@BRODOMIR_PVP_STATUS + 1;
     set $@BRODOMIR_PLAYERS, getareausers("009-6", 20, 20, 80, 80, 1);
     mapwarp "009-6", "009-5", 0, 0;
-    mapannounce "009-5", "PvP On!", 0;
+    mapannounce "009-5", "Brodomir : PvP On!", 0;
     pvpon "009-5";
     end;
 
 L_Warpfail:
-    mapannounce "009-6", "There are not enough players around to start!", 0;
+    mapannounce "009-6", "Brodomir : There are not enough players around to start!", 0;
     if ($@BRODOMIR_ITEM_AMOUNT == 0 || $@BRODOMIR_ITEM$ == "")
         goto L_Cleanup;
     if (attachrid($@BRODOMIR_SPONSOR) == 0)
diff --git a/world/map/npc/027-6/general_krukan.txt b/world/map/npc/027-6/general_krukan.txt
index 637befc8..91d8b35f 100644
--- a/world/map/npc/027-6/general_krukan.txt
+++ b/world/map/npc/027-6/general_krukan.txt
@@ -215,17 +215,17 @@ L_End:
 
 OnInit:
     setarray $@CRYPT_FIGHT1_MESSAGES$,
-        "General Krukan:* Haha, Thank you mortal. You have released me from my prison. To show my graditude you can die swiftly at my hands and become part of my undead army. MUhahahahaha! Minions, Dispose of these Adventurers!",
-        "General Krukan:* Ha, Looks like your tougher then I thought.",
-        "General Krukan:* and here I thought I wasn't going to enjoy this.",
-        "General Krukan:* More of them are coming!",
-        "General Krukan:* Minions! Kill them already!",
-        "General Krukan:* *facepalm* I knew I should have hired better help.",
-        "General Krukan:* Well at least you will make a good addition to my army.",
-        "General Krukan:* To the Abyss with you already!",
-        "General Krukan:* How about you try a different approach and kill them already!",
-        "General Krukan:* Minions! Last chance or it's back to being part of an ossuary for you!",
-        "General Krukan:* Looks like if you want something done right you have to do it yourself.",
-        "General Krukan:* Charge!.";
+        "General Krukan : Haha, Thank you mortal. You have released me from my prison. To show my graditude you can die swiftly at my hands and become part of my undead army. MUhahahahaha! Minions, Dispose of these Adventurers!",
+        "General Krukan : Ha, Looks like your tougher then I thought.",
+        "General Krukan : and here I thought I wasn't going to enjoy this.",
+        "General Krukan : More of them are coming!",
+        "General Krukan : Minions! Kill them already!",
+        "General Krukan : *facepalm* I knew I should have hired better help.",
+        "General Krukan : Well at least you will make a good addition to my army.",
+        "General Krukan : To the Abyss with you already!",
+        "General Krukan : How about you try a different approach and kill them already!",
+        "General Krukan : Minions! Last chance or it's back to being part of an ossuary for you!",
+        "General Krukan : Looks like if you want something done right you have to do it yourself.",
+        "General Krukan : Charge!.";
     end;
 }
diff --git a/world/map/npc/027-7/general_razha.txt b/world/map/npc/027-7/general_razha.txt
index 9a99e8b8..60886f78 100644
--- a/world/map/npc/027-7/general_razha.txt
+++ b/world/map/npc/027-7/general_razha.txt
@@ -169,7 +169,7 @@ OnPetDeath:
     end;
 
 L_CleanUpLosers:
-    mapannounce "027-7", "General Razha:* Oh where did you all go, I was beginning to have fun here.", 0;
+    mapannounce "027-7", "General Razha : Oh where did you all go, I was beginning to have fun here.", 0;
     mapannounce "027-4", "The battle is lost.", 0;
     set $@CRYPT_FIGHT2, 0;
     set $@CRYPT_FIGHT2_PLAYER_COUNT, 0;
@@ -184,7 +184,7 @@ L_CleanUpLosers:
     end;
 
 L_CleanUp:
-    mapannounce "027-7", "General Razha:* How in all hells could that happen? I am lost forever.", 0;
+    mapannounce "027-7", "General Razha : How in all hells could that happen? I am lost forever.", 0;
     mapannounce "027-4", "General Razha is defeated.", 0;
     areatimer "027-7", 0, 0, 79, 84, 10, "General Razha::OnReward";
     set $@CRYPT_FIGHT2, 0;
@@ -219,17 +219,17 @@ L_End:
 
 OnInit:
     setarray $@CRYPT_FIGHT2_MESSAGES$,
-        "General Razha:* Haha, Thank you mortal. You have released me from my prison. To show my graditude you can die swiftly at my hands and become part of my undead army. MUhahahahaha! Minions, Dispose of these Adventurers!",
-        "General Razha:* Ha, Looks like your tougher then I thought.",
-        "General Razha:* and here I thought I wasn't going to enjoy this.",
-        "General Razha:* More of them are coming!",
-        "General Razha:* Minions! Kill them already!",
-        "General Razha:* *facepalm* I knew I should have hired better help.",
-        "General Razha:* Well at least you will make a good addition to my army.",
-        "General Razha:* To the Abyss with you already!",
-        "General Razha:* How about you try a different approach and kill them already!",
-        "General Razha:* Minions! Last chance or it's back to being part of an ossuary for you!",
-        "General Razha:* Looks like if you want something done right you have to do it yourself.",
-        "General Razha:* Charge!.";
+        "General Razha : Haha, Thank you mortal. You have released me from my prison. To show my graditude you can die swiftly at my hands and become part of my undead army. MUhahahahaha! Minions, Dispose of these Adventurers!",
+        "General Razha : Ha, Looks like your tougher then I thought.",
+        "General Razha : and here I thought I wasn't going to enjoy this.",
+        "General Razha : More of them are coming!",
+        "General Razha : Minions! Kill them already!",
+        "General Razha : *facepalm* I knew I should have hired better help.",
+        "General Razha : Well at least you will make a good addition to my army.",
+        "General Razha : To the Abyss with you already!",
+        "General Razha : How about you try a different approach and kill them already!",
+        "General Razha : Minions! Last chance or it's back to being part of an ossuary for you!",
+        "General Razha : Looks like if you want something done right you have to do it yourself.",
+        "General Razha : Charge!.";
     end;
 }
diff --git a/world/map/npc/027-8/general_terogan.txt b/world/map/npc/027-8/general_terogan.txt
index c0adafd1..099430ee 100644
--- a/world/map/npc/027-8/general_terogan.txt
+++ b/world/map/npc/027-8/general_terogan.txt
@@ -233,7 +233,7 @@ L_Failure:
     goto L_NextWave;
 
 L_CleanUpLosers:
-    mapannounce "027-8", "General Terogan:* You just proved you cannot even coordinate a simple task. Come back when you are prepared", 0;
+    mapannounce "027-8", "General Terogan : You just proved you cannot even coordinate a simple task. Come back when you are prepared", 0;
     set $@CRYPT_FIGHT3, 0;
     set $@CRYPT_FIGHT3_PLAYER_COUNT, 0;
     set $@CRYPT_FIGHT3_WAVE, 0;
@@ -248,7 +248,7 @@ L_CleanUpLosers:
     end;
 
 L_CleanUp:
-    mapannounce "027-8", "General Terogan: You might have won this battle, but you will never defeat me!", 0;
+    mapannounce "027-8", "General Terogan : You might have won this battle, but you will never defeat me!", 0;
     areatimer "027-8", 0, 0, 79, 84, 10, "General Terogan#Main::OnReward";
     set $@CRYPT_FIGHT3, 0;
     set $@CRYPT_FIGHT3_PLAYER_COUNT, 0;
@@ -284,18 +284,18 @@ L_End:
 
 OnInit:
     setarray $@CRYPT_FIGHT3_MESSAGES$,
-        "General Terogan:* Haha, Thank you mortal. You have released me from my prison. To show my graditude you can die swiftly at my hands and become part of my undead army. MUhahahahaha! Minions, Dispose of these Adventurers!",
-        "General Terogan:* Ha, Looks like your tougher then I thought.",
-        "General Terogan:* and here I thought I wasn't going to enjoy this.",
-        "General Terogan:* More of them are coming!",
-        "General Terogan:* Minions! Kill them already!",
-        "General Terogan:* *facepalm* I knew I should have hired better help.",
-        "General Terogan:* Well at least you will make a good addition to my army.",
-        "General Terogan:* To the Abyss with you already!",
-        "General Terogan:* How about you try a different approach and kill them already!",
-        "General Terogan:* Minions! Last chance or it's back to being part of an ossuary for you!",
-        "General Terogan:* Looks like if you want something done right you have to do it yourself.",
-        "General Terogan:* Charge!.";
+        "General Terogan : Haha, Thank you mortal. You have released me from my prison. To show my graditude you can die swiftly at my hands and become part of my undead army. MUhahahahaha! Minions, Dispose of these Adventurers!",
+        "General Terogan : Ha, Looks like your tougher then I thought.",
+        "General Terogan : and here I thought I wasn't going to enjoy this.",
+        "General Terogan : More of them are coming!",
+        "General Terogan : Minions! Kill them already!",
+        "General Terogan : *facepalm* I knew I should have hired better help.",
+        "General Terogan : Well at least you will make a good addition to my army.",
+        "General Terogan : To the Abyss with you already!",
+        "General Terogan : How about you try a different approach and kill them already!",
+        "General Terogan : Minions! Last chance or it's back to being part of an ossuary for you!",
+        "General Terogan : Looks like if you want something done right you have to do it yourself.",
+        "General Terogan : Charge!.";
     end;
 }
 
diff --git a/world/map/npc/029-1/barrier.txt b/world/map/npc/029-1/barrier.txt
index 1e5281a4..78cd93cd 100644
--- a/world/map/npc/029-1/barrier.txt
+++ b/world/map/npc/029-1/barrier.txt
@@ -13,7 +13,11 @@ L_Block:
 029-1,69,61,0|script|#CandorAnnouncer|127
 {
     end;
+OnTalk:
+    if (BaseLevel >= 40) announce "Parua : " + $@candor_npctalk$, 3; // do not show these to newbies
+    end;
+
 OnCommandTalk:
-    npctalk $@candor_npctalk$;
+    areatimer "029-1", 61, 61, 69, 73, 0, "#CandorAnnouncer::OnTalk";
     end;
 }
diff --git a/world/map/npc/029-3/parua.txt b/world/map/npc/029-3/parua.txt
index 59e0c8b6..e3bb7bfa 100644
--- a/world/map/npc/029-3/parua.txt
+++ b/world/map/npc/029-3/parua.txt
@@ -221,7 +221,7 @@ L_NextRound:
 
     set $@candor_npctalk$, "The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive.";
     donpcevent "#CandorAnnouncer::OnCommandTalk";
-    mapannounce "029-3", "Parua: The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive." , 0;
+    mapannounce "029-3", "Parua : The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive." , 0;
 
     set $@MOB_1_SUMMON, 0;
     set $@MOB_2_SUMMON, 0;
@@ -267,25 +267,25 @@ L_GlobalAnnounce:
 L_Five_Minutes:
     if ($@ANNOUNCE_TIME - gettimetick(2) > 300)
         end;
-    if($@FIGHT_CAVE_PLAYER_COUNT == 1) announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. It is almost time! The fight will start in ##B##75 minutes##1##b and, at the moment, there is ##3only 1 fighter##1 in the cave.", 0;
-    if(($@FIGHT_CAVE_PLAYER_COUNT > 1) && ($@FIGHT_CAVE_PLAYER_COUNT < 5)) announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. It is almost time! The fight will start in ##B##75 minutes##1##b and, at the moment, there are ##3only " + $@FIGHT_CAVE_PLAYER_COUNT + " fighters##1 in the cave.", 0;
-    if($@FIGHT_CAVE_PLAYER_COUNT >= 5) announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. It is almost time! The fight will start in ##B##75 minutes##1##b and, at the moment, there are ##0" + $@FIGHT_CAVE_PLAYER_COUNT + " fighters##1 in the cave.", 0;
+    if($@FIGHT_CAVE_PLAYER_COUNT == 1) announce "Parua : " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. It is almost time! The fight will start in ##B##75 minutes##1##b and, at the moment, there is ##3only 1 fighter##1 in the cave.", 0;
+    if(($@FIGHT_CAVE_PLAYER_COUNT > 1) && ($@FIGHT_CAVE_PLAYER_COUNT < 5)) announce "Parua : " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. It is almost time! The fight will start in ##B##75 minutes##1##b and, at the moment, there are ##3only " + $@FIGHT_CAVE_PLAYER_COUNT + " fighters##1 in the cave.", 0;
+    if($@FIGHT_CAVE_PLAYER_COUNT >= 5) announce "Parua : " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. It is almost time! The fight will start in ##B##75 minutes##1##b and, at the moment, there are ##0" + $@FIGHT_CAVE_PLAYER_COUNT + " fighters##1 in the cave.", 0;
     set $@FIGHT_CAVE_STATUS, 2;
     end;
 
 L_Ten_Minutes:
     if ($@ANNOUNCE_TIME - gettimetick(2) > 600)
         end;
-    if($@FIGHT_CAVE_PLAYER_COUNT == 1) announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. You still have time to prepare yourself for this fight, since it will only start in ##B##610 minutes##1##b. Right now, there is ##3only 1 fighter##1 in the cave.", 0;
-    if(($@FIGHT_CAVE_PLAYER_COUNT > 1) && ($@FIGHT_CAVE_PLAYER_COUNT < 5)) announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. You still have time to prepare yourself for this fight, since it will only start in ##B##610 minutes##1##b. Right now, there are ##3only " + $@FIGHT_CAVE_PLAYER_COUNT + " fighters##1 in the cave.", 0;
-    if($@FIGHT_CAVE_PLAYER_COUNT >= 5) announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. You still have time to prepare yourself for this fight, since it will only start in ##B##610 minutes##1##b. Right now, there are ##0" + $@FIGHT_CAVE_PLAYER_COUNT + " fighters##1 in the cave.", 0;
+    if($@FIGHT_CAVE_PLAYER_COUNT == 1) announce "Parua : " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. You still have time to prepare yourself for this fight, since it will only start in ##B##610 minutes##1##b. Right now, there is ##3only 1 fighter##1 in the cave.", 0;
+    if(($@FIGHT_CAVE_PLAYER_COUNT > 1) && ($@FIGHT_CAVE_PLAYER_COUNT < 5)) announce "Parua : " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. You still have time to prepare yourself for this fight, since it will only start in ##B##610 minutes##1##b. Right now, there are ##3only " + $@FIGHT_CAVE_PLAYER_COUNT + " fighters##1 in the cave.", 0;
+    if($@FIGHT_CAVE_PLAYER_COUNT >= 5) announce "Parua : " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. You still have time to prepare yourself for this fight, since it will only start in ##B##610 minutes##1##b. Right now, there are ##0" + $@FIGHT_CAVE_PLAYER_COUNT + " fighters##1 in the cave.", 0;
     set $@FIGHT_CAVE_STATUS, 3;
     end;
 
 L_Fifteen_Minutes:
-    if($@FIGHT_CAVE_PLAYER_COUNT == 1) announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. The fight will start in ##B##615 minutes##1##b, so prepare yourself and call your friends. At the moment there is ##3only 1 fighter##1 in the cave.", 0;
-    if(($@FIGHT_CAVE_PLAYER_COUNT > 1) && ($@FIGHT_CAVE_PLAYER_COUNT < 5)) announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. The fight will start in ##B##615 minutes##1##b, so prepare yourself and call your friends. At the moment there are ##3only " + $@FIGHT_CAVE_PLAYER_COUNT + " fighters##1 in the cave.", 0;
-    if($@FIGHT_CAVE_PLAYER_COUNT >= 5) announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. The fight will start in ##B##615 minutes##1##b, so prepare yourself and call your friends. At the moment there are ##0" + $@FIGHT_CAVE_PLAYER_COUNT + " fighters##1 in the cave.", 0;
+    if($@FIGHT_CAVE_PLAYER_COUNT == 1) announce "Parua : " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. The fight will start in ##B##615 minutes##1##b, so prepare yourself and call your friends. At the moment there is ##3only 1 fighter##1 in the cave.", 0;
+    if(($@FIGHT_CAVE_PLAYER_COUNT > 1) && ($@FIGHT_CAVE_PLAYER_COUNT < 5)) announce "Parua : " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. The fight will start in ##B##615 minutes##1##b, so prepare yourself and call your friends. At the moment there are ##3only " + $@FIGHT_CAVE_PLAYER_COUNT + " fighters##1 in the cave.", 0;
+    if($@FIGHT_CAVE_PLAYER_COUNT >= 5) announce "Parua : " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. The fight will start in ##B##615 minutes##1##b, so prepare yourself and call your friends. At the moment there are ##0" + $@FIGHT_CAVE_PLAYER_COUNT + " fighters##1 in the cave.", 0;
     set $@FIGHT_CAVE_STATUS, 4;
     end;
 
diff --git a/world/map/npc/030-4/mana_battery.txt b/world/map/npc/030-4/mana_battery.txt
index 18507bc9..28f791c8 100644
--- a/world/map/npc/030-4/mana_battery.txt
+++ b/world/map/npc/030-4/mana_battery.txt
@@ -360,34 +360,34 @@ L_Restart:
     "", // unused
     "Scrrreeeeeeeeeeeeeeeeeeeeeaaaaaaaaaaaaaaaaaaaaatch",
     "Scrrreeeeeeeeeeeeeeeeeeeeeaaaaaaaaaaaaaaaaaaaaatch",
-    "Avalia: I am getting a weird sensation ... ",
-    "Orums Homunculus:* 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.",
-    "Avalia:* Guards of Honor I demand you: STOP!",
-    "Orums Homunculus:* 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!",
-    "Avalia:* Oh boy we are so screwed.",
-    "Orums Homunculus:* 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.",
-    "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..",
-    "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.",
-    "Avalia:* Those poor creatures. Just kill them all.",
-    "Orums Homunculus:* A N Y  S E C O N D.",
-    "Avalia:* Oh well... just try again, I trust in you.",
-    "Orum's Homunculus:* just lol.",
-    "Avalia:* Wow! You saved christmas.",
-    "Orum's Homunculus:* Yep, it's over... and strange enough you survived.";
+    "Avalia : I am getting a weird sensation ... ",
+    "Orums Homunculus : 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.",
+    "Avalia : Guards of Honor I demand you: STOP!",
+    "Orums Homunculus : 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!",
+    "Avalia : Oh boy we are so screwed.",
+    "Orums Homunculus : 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.",
+    "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..",
+    "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.",
+    "Avalia : Those poor creatures. Just kill them all.",
+    "Orums Homunculus : A N Y  S E C O N D.",
+    "Avalia : Oh well... just try again, I trust in you.",
+    "Orum's Homunculus : just lol.",
+    "Avalia : Wow! You saved christmas.",
+    "Orum's Homunculus : 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!",
-        "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!";
+        "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!",
+        "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!";
     // Danger Cells to attack sitters
     // 0: 19,20,29,29
     // 1: 30,20,40,29
diff --git a/world/map/npc/031-4/cindyCave.txt b/world/map/npc/031-4/cindyCave.txt
index 2bce44bf..218e4c08 100644
--- a/world/map/npc/031-4/cindyCave.txt
+++ b/world/map/npc/031-4/cindyCave.txt
@@ -238,17 +238,17 @@ L_End:
 OnInit:
     setarray $@FIGHT_YETI_MESSAGES$,
         "", // unused
-        // ":* " is magic so that it says "global announcement from"
-        "Cindy:* Yetis!",
-        "Cindy:* Watch out!",
-        "Cindy:* More of them are coming!",
-        "Cindy:* Be careful! More of them!",
-        "Cindy:* Attention! There is another bunch of them!",
-        "Cindy:* Hang on! More of them!",
-        "Cindy:* More Yetis! Will this never end?",
-        "Cindy:* There are coming more and more!",
-        "Cindy:* Watch your back! There are so many of them!",
-        "Cindy:* This seems to be their final attack! I believe in you!";
+        // " : " is magic so that it says "global announcement from"
+        "Cindy : Yetis!",
+        "Cindy : Watch out!",
+        "Cindy : More of them are coming!",
+        "Cindy : Be careful! More of them!",
+        "Cindy : Attention! There is another bunch of them!",
+        "Cindy : Hang on! More of them!",
+        "Cindy : More Yetis! Will this never end?",
+        "Cindy : There are coming more and more!",
+        "Cindy : Watch your back! There are so many of them!",
+        "Cindy : This seems to be their final attack! I believe in you!";
     end;
 
 /////////
diff --git a/world/map/npc/051-3/reinforcements.txt b/world/map/npc/051-3/reinforcements.txt
index e52242cd..34f5434b 100644
--- a/world/map/npc/051-3/reinforcements.txt
+++ b/world/map/npc/051-3/reinforcements.txt
@@ -48,7 +48,7 @@ OnRnfrcmts:
     // Spawn 4 bandit lords
     areamonster "051-3", 29, 25, 48, 39, "", 1065, 3, "Door::OnB";
     initnpctimer;
-    mapannounce "051-3", "Bandit Lords:* Do not let them escape!!" , 0;
+    mapannounce "051-3", "Bandit Lords : Do not let them escape!!" , 0;
     areatimer "051-3", 25, 20, 80, 85, 10, "Door::OnDRnfrcmts";
     end;
 
diff --git a/world/map/npc/052-2/partyroom.txt b/world/map/npc/052-2/partyroom.txt
index ce9c9f7d..b5bb5fdd 100644
--- a/world/map/npc/052-2/partyroom.txt
+++ b/world/map/npc/052-2/partyroom.txt
@@ -214,7 +214,7 @@ OnDeath:
         end;
     set $@illia_level_7_progress, 4;
     killmonster "052-2", "#LuviaDaemon::OnWGD";
-    mapannounce "052-2", "Luvia:* How? By mere humans! But we will see again! Enjoy your victory while it lasts, " + $@ILLIA_HERO$ + "!!", 0;
+    mapannounce "052-2", "Luvia : How? By mere humans! But we will see again! Enjoy your victory while it lasts, " + $@ILLIA_HERO$ + "!!", 0;
 
     set $@illia_bp, $Illia_Luvia_Harvest * 16 / 10 + 120;
     areatimer "052-2", 73, 11, 115, 49, 0, "#LuviaDaemon::OnBP";
diff --git a/world/map/npc/functions/ferry.txt b/world/map/npc/functions/ferry.txt
index 3d5f8ebb..aad92b14 100644
--- a/world/map/npc/functions/ferry.txt
+++ b/world/map/npc/functions/ferry.txt
@@ -40,8 +40,6 @@ L_NextDock:
     donpcevent "#k1sound::OnCommandDing";
     donpcevent "#k2sound::OnCommandDing";
 
-    //mapannounce "035-2", " Koga - Main:* Now arriving in "+$@MainDocks$[$@MainCurrentDock]+".", 0;
-    //mapannounce "036-2", " Koga - Candor:* Now arriving in "+$@CandorDocks$[$@CandorCurrentDock]+".", 0;
     initnpctimer;
 
     if($@MainCurrentDock == 2) goto L_k1city1;
@@ -52,8 +50,6 @@ L_NextDock:
 OnTimer8000:
     if ($@DockTickCount > $@DockLeaveCount)
         goto L_NextDock;
-    //mapannounce "035-2", "Koga - Main:* Now docked in "+$@MainDocks$[$@MainCurrentDock]+", Departing soon", 0;
-    //mapannounce "036-2", "Koga - Candor:* Now docked in "+$@CandorDocks$[$@CandorCurrentDock]+", Departing soon", 0;
     set $@DockTickCount, $@DockTickCount + 1;
     initnpctimer;
     end;