Fixed unitroubles

18 files changed, 5 insertions, 7 deletions

diff --git a/plugins/README.txt b/plugins/README.txt
index 8324b3d..8324b3d 100644..100755
--- a/plugins/README.txt
+++ b/plugins/README.txt
diff --git a/plugins/__init__.py b/plugins/__init__.py
index 0e40be9..0e40be9 100644..100755
--- a/plugins/__init__.py
+++ b/plugins/__init__.py
diff --git a/plugins/autofollow.py b/plugins/autofollow.py
index ff34bde..ff34bde 100644..100755
--- a/plugins/autofollow.py
+++ b/plugins/autofollow.py
diff --git a/plugins/autospell.py b/plugins/autospell.py
index 30d0ec6..30d0ec6 100644..100755
--- a/plugins/autospell.py
+++ b/plugins/autospell.py
diff --git a/plugins/battlebot.py b/plugins/battlebot.py
index 5cba467..5cba467 100644..100755
--- a/plugins/battlebot.py
+++ b/plugins/battlebot.py
diff --git a/plugins/chatbot.py b/plugins/chatbot.py
index e26928d..e26928d 100644..100755
--- a/plugins/chatbot.py
+++ b/plugins/chatbot.py
diff --git a/plugins/chatlogfile.py b/plugins/chatlogfile.py
index 7d97c8c..7d97c8c 100644..100755
--- a/plugins/chatlogfile.py
+++ b/plugins/chatlogfile.py
diff --git a/plugins/guildbot/__init__.py b/plugins/guildbot/__init__.py
index 0e4ffd5..0e4ffd5 100644..100755
--- a/plugins/guildbot/__init__.py
+++ b/plugins/guildbot/__init__.py
diff --git a/plugins/guildbot/create_db.sql b/plugins/guildbot/create_db.sql
index bdf1d76..bdf1d76 100644..100755
--- a/plugins/guildbot/create_db.sql
+++ b/plugins/guildbot/create_db.sql
diff --git a/plugins/guildbot/guilddb.py b/plugins/guildbot/guilddb.py
index a720b49..a720b49 100644..100755
--- a/plugins/guildbot/guilddb.py
+++ b/plugins/guildbot/guilddb.py
diff --git a/plugins/guildbot/handlers.py b/plugins/guildbot/handlers.py
index 6d032b5..6d032b5 100644..100755
--- a/plugins/guildbot/handlers.py
+++ b/plugins/guildbot/handlers.py
diff --git a/plugins/lazytree.py b/plugins/lazytree.py
index 64efda0..1216b25 100644..100755
--- a/plugins/lazytree.py
+++ b/plugins/lazytree.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import random
 import chatbot
 from commands import general_chat, send_whisper
diff --git a/plugins/manaboy.py b/plugins/manaboy.py
index 0578e21..b145cdb 100644..100755
--- a/plugins/manaboy.py
+++ b/plugins/manaboy.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import subprocess
 import time
 import net.mapserv as mapserv
@@ -55,7 +54,7 @@ def XECUTE(nick, is_whisper, command, args=""):
     if is_whisper:
         whisper(nick,(s.strip('\r\n\t')))
     else:
-        mapserv.cmsg_chat_message(s.strip('\r\n\t'))
+        mapserv.cmsg_chat_message(nick + ": " + s.strip('\r\n\t'))
 
 # ====================== XCAL =============
 
@@ -409,8 +408,8 @@ whoami_answers = [
     "Who are you?",
     "On the 8th day, God was bored and said 'There will be bots'. \
 So here I am.",
-    "♪ I'm your hell, I'm your dream, I'm nothing in between ♪♪",
-    "♪♪ Aperture Science. We do what we must, because.. we can ♪",
+    " I'm your hell, I'm your dream, I'm nothing in between ",
+    " Aperture Science. We do what we must, because.. we can ",
     "I'm just a reincarnation of a copy.",
 ]
 
@@ -454,7 +453,7 @@ dislike_answers = [
     "Go away!!!",
     "I don't want to see!",
     "Your face makes onions cry.",
-    "You look like I need another drink…",
+    "You look like I need another drink...",
     "Mayas were right...",
 ]
 
@@ -472,7 +471,7 @@ dislikebye_answers = [
     "Go away!!!",
     "Don't come back!",
     "Whew...",
-    "I need another drink…",
+    "I need another drink...",
     "*picking my nose*"
 ]
 
diff --git a/plugins/msgqueue.py b/plugins/msgqueue.py
index 25fe2b0..25fe2b0 100644..100755
--- a/plugins/msgqueue.py
+++ b/plugins/msgqueue.py
diff --git a/plugins/notify.py b/plugins/notify.py
index ace4e0b..ace4e0b 100644..100755
--- a/plugins/notify.py
+++ b/plugins/notify.py
diff --git a/plugins/npc.py b/plugins/npc.py
index 5013562..5013562 100644..100755
--- a/plugins/npc.py
+++ b/plugins/npc.py
diff --git a/plugins/restapi.py b/plugins/restapi.py
index 5b1d0eb..5b1d0eb 100644..100755
--- a/plugins/restapi.py
+++ b/plugins/restapi.py
diff --git a/plugins/shop.py b/plugins/shop.py
index be66cea..be66cea 100644..100755
--- a/plugins/shop.py
+++ b/plugins/shop.py