fix badges style and stuff

1 files changed, 28 insertions, 21 deletions

diff --git a/badges.py b/badges.py
index 69a73a5..4cbc49b 100644
--- a/badges.py
+++ b/badges.py
@@ -1,17 +1,15 @@
 from helpers import *
-from traceback import format_exc as print_traceback
-
 
 badges            = open_json_file("badges", {})
 badges_available  = {
-  "helpful": "A very helpful player",
-  "expert_minecraft": "An expert in Minecraft",
-  "expert_coder": "A good coder",
-  "oldtimer": "A long time player",
-  "good_builder": "A very good builder",
-  "friendly": "Many think that this player is friendly",
-  "very_active": "A very active player",
-  "trustworthy": "This player is very trustworthy",
+  "helpful"          : "A very helpful player",
+  "expert_minecraft" : "An expert in Minecraft",
+  "expert_coder"     : "A good coder",
+  "oldtimer"         : "A long time player",
+  "good_builder"     : "A very good builder",
+  "friendly"         : "Many think that this player is friendly",
+  "very_active"      : "A very active player",
+  "trustworthy"      : "This player is very trustworthy",
 }
 badges_perm_add   = "utils.badges.add"
 badges_perm_del   = "utils.badges.delete"
@@ -19,6 +17,7 @@ badges_perm_del   = "utils.badges.delete"
 def save_badges():
   save_json_file("badges", badges)
 
+
 def get_badges(player):
   sender_id = uid(player)
   if sender_id in badges.keys():
@@ -27,6 +26,7 @@ def get_badges(player):
     badges_list = []
   return badges_list
 
+
 def show_badges(sender, player):
   player_badges = get_badges(player)
   if player_badges:
@@ -35,6 +35,7 @@ def show_badges(sender, player):
   else:
     msg(sender, "&eThis player has no badges yet")
 
+
 def new_badge_event(player, badge):
   msg(player, "")
   msg(player, "&6Wow! You just received a badge!")
@@ -43,9 +44,11 @@ def new_badge_event(player, badge):
   msg(player, "")
   player.playSound(player.getLocation(), "random.orb", 1, 1)
 
+
 def del_badge_event(player, badge):
   msg(player, "&cWe took your badge \"%s\"." % badges_available[badge])
 
+
 def list_badges(sender):
   if badges_available:
     for key in badges_available.keys():
@@ -53,6 +56,7 @@ def list_badges(sender):
   else:
     msg(sender, "&cThere are currently no badges available")
 
+
 def add_badge(sender, target, badge):
   if badge in badges_available:
     player_badges = get_badges(target)
@@ -68,6 +72,7 @@ def add_badge(sender, target, badge):
   else:
     msg(sender, "&cThere is no badge called %s. Check /badge list!" % badge)
 
+
 def del_badge(sender, target, badge):
   if badge in badges_available.keys():
     player_badges = get_badges(target)
@@ -78,7 +83,7 @@ def del_badge(sender, target, badge):
       badges[uid(target)] = player_badges
       msg(sender, "&7... set player_badges to uid badges target ...")
       msg(sender, "&7... result: %s" % ", ".join(badges[uid(target)]))
-      
+
       msg(sender, "&aYou just took %s from %s!" % (badge, target.getName()))
       save_badges()
       del_badge_event(target)
@@ -87,6 +92,7 @@ def del_badge(sender, target, badge):
   else:
     msg(sender, "&cThere is no badge called %s. Check /badge list!" % badge)
 
+
 @hook.command("badge", aliases=["badges", "rewards"])
 def on_badge_command(sender, args):
   argnum = int(len(args))
@@ -95,25 +101,25 @@ def on_badge_command(sender, args):
   if argnum is 0:
     show_badges(sender, sender)
 
-  # Length of arguments is 1 
+  # Length of arguments is 1
   if argnum == 1:
 
     # If only argument is "list"
     if args[0].lower() == "list":
       list_badges(sender)
-      return
+      return True
 
     # If only argument is a player name
     target = server.getPlayer(args[0])
     if is_player(target):
       show_badges(sender, target)
-      return
+      return True
     else:
       msg(sender, "&cThere is no player called %s online." % args[0])
-      return
+      return True
 
     msg(sender, "&cUnknown syntax: /badge <playername> &o&c /badge list")
-    return
+    return True
 
   # Length of arguments is 3
   if argnum == 3:
@@ -124,15 +130,16 @@ def on_badge_command(sender, args):
     if cmd == "add":
       if not sender.hasPermission(badges_perm_add):
         noperm(sender)
-        return
+        return True
       add_badge(sender, target, new_badge)
-      return
+      return True
 
     if cmd == "take" or cmd == "del":
       if not sender.hasPermission(badges_perm_del):
         noperm(sender)
-        return
+        return True
       del_badge(sender, target, new_badge)
-      return
+      return True
 
-    msg(sender, "&cUnknown syntax: /badge <add|take> <playername> <badge>")
\ No newline at end of file
+    msg(sender, "&cUnknown syntax: /badge <add|take> <playername> <badge>")
+    return True
\ No newline at end of file