Removed unused json data files. Updated pankration and hellsbot.

-{"<@49237234515181568>": {"<@47934670406422528>": {"delivery_time": "2047/08/11 18:39:12", "message": "ur a fgt", "user_id": "49237234515181568", "channel": "47934985176354816"}}, "<@121404665727418368>": {"<@47934670406422528>": {"delivery_time": "2016/12/02 16:54:33", "message": "I'm gay.", "user_id": "121404665727418368", "channel": "47934985176354816"}}, "<@48148712194576384>": {"<@121404665727418368>": {"delivery_time": "2019/02/03 02:38:24", "message": "u gay", "user_id": "48148712194576384", "channel": "47934985176354816"}}}
\ No newline at end of file

-["あなたのガールフレンドは、あなたの後ろの大きな黒い男とセックスを持っているし、それは非常に楽しんでいます。あなたは3年後、彼女はあなたが仕事であったが、それは毎日起こっている明らかにし、その時点でアウトになるまで見つけることができません。あなたはそこに彼女のためにされていないことをお詫びし、あなたと結婚するために彼女をお願いします。 wwwwwww", "Your future is looking grim, consider purchasing Fallout 4™", "あなたのガールフレンドは、あなたの後ろの大きな黒い男とセックスを持っているし、それは非常に楽しんでいます。あなたは3年後、彼女はあなたが仕事であったが、それは毎日起こっている明らかにし、その時点でアウトになるまで見つけることができません。あなたはそこに彼女のためにされていないことをお詫びし、あなたと結婚するために彼女をお願いします。 wwwwwww", "You are being cucked as you are reading this.", "In a world of immigration, censorship and equality... You are being cucked.", "Bright future, white future.", "Fortune Not Found: Abort, Retry, Ignore?", "Now would be a good time to get cucked.", "Come back later... I am sleeping.", "http://cdn.memegenerator.net/instances/400x/12009294.jpg", "Your Allagan Cane will drop next run.", "Your Allagan Cane will never drop.", "http://puu.sh/lFYCG/7f0cfb0004.jpg", "You could not be less interesting, but you are going to keep trying -- right?", "Xorfos will get his Dreadwyrm Axe someday.", "Reminder that Rui never beat Turn 13.", "Fallout 4 will win TGA 2015", "You will get a big fat futa cock up your ass soon.", "Your current problems will only get worse.", "Your cuck shed will see lots of activity in the near future.", "To do great things is difficult; but for you, it is impossible.", "When people tell you that you can't do something, they are probably right.", "There are now 23 nicknames going around for you; None of them are flattering. Tonight you're getting another one.", "Undertale will win TGA 2015", "You are going to develop http://puu.sh/lGFdS/71d497e8e8.gif", "You will go blind and your penis will shrivel by next week, but all can be prevented by inviting your friends & family to use Discord!", "Fortune smiles upon you! Goshzilla will be receiving his BBC into his ass shortly -- AND YOU GOT FRONT ROW SEAT.", "Miss Fortune demands that you play this http://store.steampowered.com/app/418010/", "Everything will be fire.", "Good bombings and many refugees will come to you but only if you post \"HILLARY 2016\" in this chat.", "You will marry 3dpd and have many ugly children. http://i.imgur.com/uNSz7B7.jpg","You will have a wonderful day filled with lollipops, candy canes, and a sense of entitlement."]
\ No newline at end of file

@@ -88,11 +88,11 @@ registered_commands = {'!help': 'do_help', '!commands': 'do_help',
                        '!rigged': 'do_rigged',
                        '!rigged': 'do_rigged',
                        '!listzones': 'do_list_zones',
                        '!listzones': 'do_list_zones',
                        '!huntmonster': 'do_hunt_monster', '!hunt': 'do_hunt_monster',
                        '!huntmonster': 'do_hunt_monster', '!hunt': 'do_hunt_monster',
-                       '!listskills': 'do_list_feral_skills', '!listferalskills': 'do_list_feral_skills', '!listferalskill': 'do_list_feral_skills',
-                       '!listreflectors': 'do_list_reflectors', '!listreflector': 'do_list_reflectors',
-                       '!listsoulplates': 'do_list_soul_plates', '!listsoulplate': 'do_list_soul_plates',
+                       '!skills': 'do_list_feral_skills', '!feralskills': 'do_list_feral_skills', '!feralskill': 'do_list_feral_skills',
+                       '!reflectors': 'do_list_reflectors', '!reflector': 'do_list_reflectors',
+                       '!plates': 'do_list_soul_plates', '!soulplates': 'do_list_soul_plates', '!soulplate': 'do_list_soul_plates',
                        '!convert': 'do_convert_plate', '!convertplate': 'do_convert_plate', '!convertsoulplate': 'do_convert_plate',
                        '!convert': 'do_convert_plate', '!convertplate': 'do_convert_plate', '!convertsoulplate': 'do_convert_plate',
-                       '!registerbattle': 'do_register_battle',
+                       '!registerbattle': 'do_register_battle', '!battle': 'do_register_battle',
                        '!setreflectorname': 'do_set_reflector_name',
                        '!setreflectorname': 'do_set_reflector_name',
                        '!equip': 'do_equip_feral_skills', '!equipskill': 'do_equip_feral_skills', '!equipferalskill': 'do_equip_feral_skills',
                        '!equip': 'do_equip_feral_skills', '!equipskill': 'do_equip_feral_skills', '!equipferalskill': 'do_equip_feral_skills',
                        '!pankration': 'do_pankration',
                        '!pankration': 'do_pankration',
@@ -1032,7 +1032,7 @@ def do_stars(client, message_parts, message):
 
 
 def do_rigged(client, message_parts, message):
 def do_rigged(client, message_parts, message):
     lines = open('studylyrics.txt').read().splitlines()
     lines = open('studylyrics.txt').read().splitlines()
-    send_message(client, message.channel, ":musical_note: {} :musical_note:".format(random.choice(lines)))
+    send_message(client, message.channel, ":musical_note: {} :musical_note:".format(byteify(random.choice(lines))))
     return
     return
 
 
 #### PANKRATION
 #### PANKRATION
@@ -1047,9 +1047,9 @@ def do_pankration(client, message_parts, message):
     **!hunt <zone>** - An attempt will be made to search for a soul plate (monster) in the zone specified. Each search costs a certain amount of credits. Each zone has a different cost.
     **!hunt <zone>** - An attempt will be made to search for a soul plate (monster) in the zone specified. Each search costs a certain amount of credits. Each zone has a different cost.
 
 
 *Viewing Your Inventory:*
 *Viewing Your Inventory:*
-    **!listsoulplates** - Returns a list of all soul plates you have in your posession.
-    **!listreflectors** - Returns a list of all reflectors you have in your posession (The available monsters you can fight with).
-    **!listferalskills** - Returns a list of all feral skills you have in your inventory
+    **!soulplates** - Returns a list of all soul plates you have in your posession.
+    **!reflectors** - Returns a list of all reflectors you have in your posession (The available monsters you can fight with).
+    **!skills** - Returns a list of all feral skills you have in your inventory
 
 
 *Editing Your Collections:*
 *Editing Your Collections:*
     **!convert <plate number> <convert_to>** - From the list of soul plates you can choose to either convert the plate into a \"reflector\" or \"skill\".
     **!convert <plate number> <convert_to>** - From the list of soul plates you can choose to either convert the plate into a \"reflector\" or \"skill\".
@@ -1059,8 +1059,8 @@ def do_pankration(client, message_parts, message):
     **!setreflectorname <reflector number> <name>** - This will rename a monster in your collection to a custom name.
     **!setreflectorname <reflector number> <name>** - This will rename a monster in your collection to a custom name.
 
 
 *Arena Battle:*
 *Arena Battle:*
-    **!registerbattle <reflector number>** - Adds your reflector to the queue in the arena.  When the arena is available your monster will be paired with either another players monster or a similarly matched arena monster.
-    **!registerbattle <reflector number> <player name>** - If you want to challenge a specific user to a battle just provide their user name. Have them do the same and your battle will start when the arena is available.
+    **!battle <reflector number>** - Adds your reflector to the queue in the arena.  When the arena is available your monster will be paired with either another players monster or a similarly matched arena monster.
+    **!battle <reflector number> <player name>** - If you want to challenge a specific user to a battle just provide their user name. Have them do the same and your battle will start when the arena is available.
 
 
 """.format(message.author.mention()))
 """.format(message.author.mention()))
 
 
@@ -1078,7 +1078,7 @@ def do_set_reflector_name(client, message_parts, message):
         reflectors = pickle.loads(str(pankration_data['reflectors']))
         reflectors = pickle.loads(str(pankration_data['reflectors']))
 
 
         if not reflector_num.isdigit() or int(reflector_num) < 1 or int(reflector_num) > len(reflectors):
         if not reflector_num.isdigit() or int(reflector_num) < 1 or int(reflector_num) > len(reflectors):
-            send_message(client, message.channel, 'The requested reflector is invalid. Please provide the number from !listreflectors')
+            send_message(client, message.channel, 'The requested reflector is invalid. Please provide the number from !reflectors')
             return
             return
         reflector_num = int(reflector_num) - 1
         reflector_num = int(reflector_num) - 1
         reflectors[reflector_num].set_monster_name(new_name)
         reflectors[reflector_num].set_monster_name(new_name)
@@ -1100,7 +1100,7 @@ def do_register_battle(client, message_parts, message):
         reflectors = pickle.loads(str(pankration_data['reflectors']))
         reflectors = pickle.loads(str(pankration_data['reflectors']))
 
 
         if not reflector_num.isdigit() or int(reflector_num) < 1 or int(reflector_num) > len(reflectors):
         if not reflector_num.isdigit() or int(reflector_num) < 1 or int(reflector_num) > len(reflectors):
-            send_message(client, message.channel, 'The requested reflector is invalid. Please provide the number from !listreflectors')
+            send_message(client, message.channel, 'The requested reflector is invalid. Please provide the number from !reflectors')
             return
             return
         reflector_num = int(reflector_num) - 1
         reflector_num = int(reflector_num) - 1
 
 
@@ -1117,7 +1117,7 @@ def do_register_battle(client, message_parts, message):
             data.db_register_battle(member['member_id'], reflectors[reflector_num], reflector_num)
             data.db_register_battle(member['member_id'], reflectors[reflector_num], reflector_num)
             send_message(client, message.channel, "Your *{} level {}* has been registered for battle. The battle will begin when the arena is availble with the next challenger".format(reflectors[reflector_num].get_monster_name(), reflectors[reflector_num].level))
             send_message(client, message.channel, "Your *{} level {}* has been registered for battle. The battle will begin when the arena is availble with the next challenger".format(reflectors[reflector_num].get_monster_name(), reflectors[reflector_num].level))
     else:
     else:
-        send_message(client, message.channel, 'You have no available reflectors. You can get reflectors by converting soul plates with !convertplate')
+        send_message(client, message.channel, 'You have no available reflectors. You can get reflectors by converting soul plates with !convert')
         return
         return
 
 
 
 
@@ -1140,25 +1140,28 @@ def do_convert_plate(client, message_parts, message):
 
 
         soul_plates = pickle.loads(str(pankration_data['soul_plates']))
         soul_plates = pickle.loads(str(pankration_data['soul_plates']))
         if not plate_num.isdigit() or int(plate_num) < 1 or int(plate_num) > len(soul_plates):
         if not plate_num.isdigit() or int(plate_num) < 1 or int(plate_num) > len(soul_plates):
-            send_message(client, message.channel, 'The requested plate is invalid. Please provide the number from !listsoulplates')
+            send_message(client, message.channel, 'The requested plate is invalid. Please provide the number from !plates')
             return
             return
         plate_num = int(plate_num) - 1
         plate_num = int(plate_num) - 1
         if convert_to == "reflector":
         if convert_to == "reflector":
             # do reflector stuff
             # do reflector stuff
             if data.db_convert_soul_plate_to_reflector(member['member_id'], soul_plates[plate_num], plate_num):
             if data.db_convert_soul_plate_to_reflector(member['member_id'], soul_plates[plate_num], plate_num):
-                send_message(client, message.channel, 'The soul plate was successfully converted into an official reflector. To view your reflectors: !listreflectors')
+                send_message(client, message.channel, 'The soul plate was successfully converted into an official reflector. To view your reflectors: !reflectors')
+                return
             else:
             else:
                 send_message(client, message.channel, 'There was an issue converting your soul plate...Conversion failed.')                
                 send_message(client, message.channel, 'There was an issue converting your soul plate...Conversion failed.')                
+                return
         elif convert_to == "skill":
         elif convert_to == "skill":
             soul_plates[plate_num].convert_to_feral_skill()
             soul_plates[plate_num].convert_to_feral_skill()
             skill = soul_plates[plate_num].convert_to_feral_skill()
             skill = soul_plates[plate_num].convert_to_feral_skill()
             if not skill:
             if not skill:
                 send_message(client, message.channel, 'The conversion **failed** the soul plate has been destroyed in the process.')
                 send_message(client, message.channel, 'The conversion **failed** the soul plate has been destroyed in the process.')
+                return
             else:
             else:
                 send_message(client, message.channel, 'Congratulations! The soul plate was converted to feral skill: **{}**'.format(byteify(skill)))
                 send_message(client, message.channel, 'Congratulations! The soul plate was converted to feral skill: **{}**'.format(byteify(skill)))
                 data.db_convert_soul_plate_to_skill(member['member_id'], soul_plates[plate_num], plate_num, skill)
                 data.db_convert_soul_plate_to_skill(member['member_id'], soul_plates[plate_num], plate_num, skill)
                 do_list_feral_skills(client, message_parts, message)
                 do_list_feral_skills(client, message_parts, message)
-            pass
+                return
         else:
         else:
             send_message(client, message.channel, 'A plate can only be converted into a reflector or skill.  Please see !pankration for an example.')
             send_message(client, message.channel, 'A plate can only be converted into a reflector or skill.  Please see !pankration for an example.')
             return
             return
@@ -1210,11 +1213,11 @@ def do_equip_feral_skills(client, message_parts, message):
             feral_skills = pickle.loads(str(pankration_data['feral_skills']))
             feral_skills = pickle.loads(str(pankration_data['feral_skills']))
 
 
             if not skill_num.isdigit() or int(skill_num) < 1 or int(skill_num) > len(feral_skills):
             if not skill_num.isdigit() or int(skill_num) < 1 or int(skill_num) > len(feral_skills):
-                send_message(client, message.channel, 'The requested feral skill is invalid. Please provide the number from !listferalskills')
+                send_message(client, message.channel, 'The requested feral skill is invalid. Please provide the number from !skills')
                 return
                 return
             skill_num = int(skill_num) - 1
             skill_num = int(skill_num) - 1
             if not reflector_num.isdigit() or int(reflector_num) < 1 or int(reflector_num) > len(reflectors):
             if not reflector_num.isdigit() or int(reflector_num) < 1 or int(reflector_num) > len(reflectors):
-                send_message(client, message.channel, 'The requested reflector is invalid. Please provide the number from !listreflectors')
+                send_message(client, message.channel, 'The requested reflector is invalid. Please provide the number from !reflectors')
                 return
                 return
             reflector_num = int(reflector_num) - 1
             reflector_num = int(reflector_num) - 1
 
 

-["What's your name?\", asked the teacher.\n\"Mohammad,\" he replied.\n\"You're in Ireland now,\" replied the teacher, \"So from now on you will be known as Mike.\n\" Mohammad returned home after school.\n\"How was your day, Mohammad?\", his mother asked.\n\"My name is not Mohammad. I'm in Ireland and now my name is Mike”.\n\"Are you ashamed of your name? Are you trying to dishonor your parents, your heritage, your religion? Shame on you!\"\nAnd his mother beat the shit out of him. Then she called his father, who beat the shit out of him again.\nThe next day Mohammad returned to school. The teacher saw all of his fresh bruises.\n\"What happened to you, Mike?\", she asked.\n\"Well shortly after becoming an Irishman, I was attacked by two fucking Arabs.\"", "What does a Jew with an erection get when he walks into a wall? A broken nose.", "What’s the difference between a Catholic priest and acne? Acne doesn’t come on a boys face until he’s 13.", "What does a baby look like after a minute in the microwave? I don’t know, I close my eyes when I masturbate.", "I lost my virginity to a retarded girl last night… I wanted my first time to be special.", "What’s the difference between jam and jelly? I don’t jelly my cock down a bitches throat.", "What do you get if you cross an elephant with a poodle?   A dead poodle with an 18 inch wide asshole.", "Why do Jewish girls like to fuck doggy style? They can’t stand to see somebody else have a good time.", "What’s the difference between a British man and his girlfriend? His girlfriend has a higher sperm count.", "How do you know if a Chinese person robs your house? Your homework is done, your computer is upgraded, but two hours later, the fucker is still trying to back out of your driveway.", "What do you call five Mexicans on the bottom of a pool? Cinco", "What did the little Mexican boy (Rui) get for Christmas? My bike.", "How do you kill a redneck? Wait ’till he fucks his sister then cut the brakes on his house.", "What did the kid with no arms get for Christmas?\nA pair of gloves.\nNah just kidding, he's still trying to open his gifts.", "What's black and sits at the top of a staircase?\nStephen Hawking after a house fire.", "What do you call a 5 year old with no friends?\nA sandy hook survivor.", "What's the difference between a Pakistani elementary school and an Al Qaeda base?\nI don't know, I just fly the fucking drone, man.", "What's the difference between food and ebola?\nAfricans get ebola.", "What do you do when your dishwasher doesn't work?\nSlap her.", "http://puu.sh/lSo0C/fcf7ccaed0.jpg", "A man sees a young boy standing at the side of a cliff, looking down.\n\"What's wrong?\" Asks the man.\n\"My parents car skidded and they fell off the cliff.\" Says the crying boy. \n\"Well this just isn't your day is it.\" The man says as he unbuttons his pants.", "I went to my doctor for a checkup last week.\n\"You need to stop masturbating.\" He said.\n\"Why?\"\n\"Because I'm trying to examine you.\"", "I was having sex with a woman last night, and she wouldn't stop calling out another mans name. Who the hell is \"rape\"?", "I don't understand terrorists. They kill themselves to get 72 virgins when they could just become priests and get them now", "Unsure of what to get your girlfriend for Christmas? Get her a pair of shoes and a dildo. If she doesn't like the shoes, she can go fuck herself.", "http://i.imgur.com/BH1kwTG.jpg", "To most Christians, the Bible is like a EULA. Nobody actually reads it, they just skip to the end and say 'I agree'", "When is a fruit also a vegetable? \nWhenever you go into a coma.", "[✓] I'm not a robot", "Goshzilla's height", "I don't find health-related puns funny anymore since I started suffering from an irony deficiency", "I used to be addicted to the Hokey Pokey, but then I turned myself around.", "Roses are red, violets are blue, @rui is a cuck, and so are you", "Did you hear about the guy who got hit in the head with a can of soda? He was lucky it was a soft drink.", "http://puu.sh/mqCuh/d4e52790c7.jpg"]
\ No newline at end of file