Refactored the way messages are processed. Added new raffle.

Barry
Showing 4 changed files with 350 additions and 156 deletions
data.py
db.sqlite3
hellsbot.py
pankration.py
--- a/data.py
View file @4264acb
+++ b/data.py
View file @4264acb
+import operator
 import sqlite3
+import datetime
 conn = sqlite3.connect('db.sqlite3')
 def log(message):
+    try:
        logging.warning("{} - {}".format(datetime.datetime.now().strftime('%Y/%m/%d %H:%M:%S'), message))
+    except:
+        pass
 ##################
 ## Database Calls
--- a/db.sqlite3
View file @4264acb
+++ b/db.sqlite3
View file @4264acb
--- a/hellsbot.py
View file @4264acb
+++ b/hellsbot.py
View file @4264acb
@@ -4,8 +4,8 @@ import requests
 import discord
 import random
 import datetime
+import time
 import re
-import operator
 import pickle
 import logging
@@ -39,12 +39,48 @@ client = discord.Client()
 wolf = {}
 logging.basicConfig(filename='hellsbot.log',level=logging.WARNING)
+registered_commands = {'!help': 'do_help', '!commands': 'do_help', 
+                       '!shutup': 'do_shutup',
+                       '!roll': 'do_roll',
+                       '!lastseen': 'do_lastseen',
+                       '!youtube': 'do_youtube',
+                       '!image': 'do_image',
+                       '!gif': 'do_gif',
+                       '!gameslist': 'do_gameslist', '!gamelist': 'do_gameslist',
+                       '!aliases': 'do_alias', '!alias': 'do_alias',
+                       '!addalias': 'do_addalias',
+                       '!games': 'do_games',
+                       '!reloadbot': 'do_reload', '!restartbot': 'do_reload', '!rebootbot': 'do_reload',
+                       '!whoplayed': 'do_whoplayed',
+                       '!gimmecredits': 'do_gimmecredits', '!gimmecredit': 'do_gimmecredits',
+                       '!grantcredits': 'do_grantcredits',
+                       '!ticketrank': 'do_ticketrank',
+                       '!startraffle': 'do_startraffle',
+                       '!raffle': 'do_raffle',
+                       '!buyticket': 'do_buyticket',
+                       '!balance': 'do_balance',
+                       '!slotsrules': 'do_slotsrules',
+                       '!slots': 'do_slots',
+                       '!hit': 'do_bj_hit', '!draw': 'do_bj_hit',
+                       '!stay': 'do_bj_stay', '!stand': 'do_bj_stay',
+                       '!bet': 'do_bj_bet',
+                       '!msg': 'do_msg',
+                       '!addfortune': 'do_addfortune',
+                       '!fortune': 'do_fortune',
+                       '!question': 'do_question',
+                       '!addjoke': 'do_addjoke',
+                       '!joke': 'do_joke',
+                       }
 #####################
 ## Utility Functions
 #####################
 def log(message):
+    try:
        logging.warning("{} - {}".format(datetime.datetime.now().strftime('%Y/%m/%d %H:%M:%S'), message))
+    except:
+        pass
 def format_exception(e):
    exception_list = traceback.format_stack()
@@ -145,30 +181,60 @@ def check_msg_queue():
                log("{}\nFailed to send message: {}".format(format_exception(e), message['message_id'],))
    return
-@client.event
+def do_roll(client, message_parts, message):
-def on_message(message):
+    request = message_parts[0]
-    #print message.content
+    count = 1
-    #print message.author
+    dice = 100
-    #print client.user
+    if request.strip() != '':
-    global muted_until
+        if 'd' in request:
-    # we do not want the bot to reply to itself
+            dice_parts = request.split('d')
-    if message.author == client.user:
+            if len(dice_parts) == 2:
+                if dice_parts[0].isdigit() and dice_parts[1].isdigit():
+                    count = int(dice_parts[0])
+                    dice = int(dice_parts[1])
+    if count > 100000000000000000:
+        client.send_message(message.channel, '{} stop fucking around with those stupid numbers...'.format(message.author.mention()))
        return
-    if message.content.lower().startswith(client.user.name.lower()):
+    if count > 100:
-        log('Someone is talking to %s' % (client.user.name.lower(),))
+        client.send_message(message.channel, '{} 100 is the largest number of dice I will roll.'.format(message.author.mention()))
-        if ' or ' in message.content:
+        return
-            questions = message.content[len(client.user.name)+1:].replace('?', '').split(' or ')
+    roll_results = []
-            client.send_message(message.channel, '{} I choose: {}'.format(message.author.mention(), random.choice(questions).encode('utf-8',errors='ignore')))
+    for i in range(count):
+        roll_results.append(random.randint(1,dice))
+    out_string = '{} your roll {}d{}: {} = {}'.format(message.author.mention(), count, dice, '+'.join(str(r) for r in roll_results), sum(roll_results))
+    client.send_message(message.channel, out_string)
+    return
+def do_lastseen(client, message_parts, message):
+    username = ' '.join(message_parts).replace('@', '').lower()
+    member = data.db_get_member(username=username)
+    #log(member)
+    if member:
+        out_string = ''
+        if member['is_afk'] == 1:
+            out_string = 'Went AFK at: {}\n'.format(member['afk_at'])
+        elif member['status'] == 'offline':
+            out_string = 'Currently Offline\n'                    
+        else:
+            out_string = 'Currently Online\n'
+        out_string += 'Last Status: {} at {} which was {}\nPrevious Status: {}\n'.format(member['status'], 
+            member['status_change_at'], 
+            human(datetime.datetime.strptime(member['status_change_at'], '%Y/%m/%d %H:%M:%S')),
+            member['prev_status'])
+        client.send_message(message.channel, 'Last Information on {}:\n{}'.format(byteify(username), out_string))
+    else:
+        client.send_message(message.channel, 'I don\'t have any data on {} yet {}'.format(byteify(username), message.author.mention()))
+    return    
-    if message.content.startswith('!help') or message.content.startswith('!commands'):
+def do_help(client, message_parts, message):
        client.send_message(message.channel, 
            """{} Available Commands:
 You can ask compound or questions and I will choose. Example: HellsBot Rui is a Faggot or Rui is a faggot?
 User Info:
-    !aliases - Returns a list of all aliases a user has set for themselves.
+    !aliases <username> - Returns a list of all aliases a user has set for themselves.
    !addalias <alias> - Adds an alias to your list of aliases.
    !lastseen <username> - Returns info on when the user was last seen and their status.
 Messages:
@@ -203,88 +269,36 @@ Stuff:
    !joke - Returns a random joke.
    !roll <1d20> - Roll X number of dice of size X. 1d20 returns 1 roll 1-20. 3d6 returns 3 rolls of 1-6 etc...
    !secret
-    !shutup - disables all image / gif / youtube span for 5 minutes
+    !shutup - disables all image / gif / youtube spam for 5 minutes
    !bemyirlwaifu""".format(message.author.mention()))
-        return
-    if message.content.startswith('!lastseen'):
-        username = message.content[10:].replace('@', '').lower()
-        member = data.db_get_member(username=username)
-        #log(member)
-        if member:
-            out_string = ''
-            if member['is_afk'] == 1:
-                out_string = 'Went AFK at: {}\n'.format(member['afk_at'])
-            elif member['status'] == 'offline':
-                out_string = 'Currently Offline\n'                    
-            else:
-                out_string = 'Currently Online\n'
-            out_string += 'Last Status: {} at {} which was {}\nPrevious Status: {}\n'.format(member['status'], 
-                member['status_change_at'], 
-                human(datetime.datetime.strptime(member['status_change_at'], '%Y/%m/%d %H:%M:%S')),
-                member['prev_status'])
-            client.send_message(message.channel, 'Last Information on {}:\n{}'.format(username, out_string))
-        else:
-            client.send_message(message.channel, 'I don\'t have any data on {} yet {}'.format(username, message.author.mention()))
-        return
-    if message.content.startswith('!shutup'):        
+def do_shutup(client, message_parts, message):
    muted_until = datetime.datetime.now() + datetime.timedelta(minutes=5)
-        client.send_message(message.channel, search_youtube(query))
+    client.send_message(message.channel, 'All image / gif / youtube spam disabled for 5 minutes')
    return
-    if message.content.startswith('!youtube'):
+def do_youtube(client, message_parts, message):
    if datetime.datetime.now() < muted_until:
        return
-        query = message.content[9:]
+    client.send_message(message.channel, search_youtube(' '.join(message_parts)))
-        client.send_message(message.channel, search_youtube(query))
    return
-    if message.content.startswith('!image'):
+def do_image(client, message_parts, message):
    if datetime.datetime.now() < muted_until:
        return
-        query = message.content[7:]
+    client.send_message(message.channel, search_google_images(' '.join(message_parts)))
-        client.send_message(message.channel, search_google_images(query))
    return
-    if message.content.startswith('!gif'):
+def do_gif(client, message_parts, message):
    if datetime.datetime.now() < muted_until:
        return
-        query = message.content[7:]
+    client.send_message(message.channel, search_google_images(' '.join(message_parts), True))
-        client.send_message(message.channel, search_google_images(query, True))
-        return
-    if message.content.startswith('!roll'):
-        request = message.content[6:]
-        count = 1
-        dice = 100
-        if request.strip() != '':
-            if 'd' in request:
-                dice_parts = request.split('d')
-                if len(dice_parts) == 2:
-                    if dice_parts[0].isdigit() and dice_parts[1].isdigit():
-                        count = int(dice_parts[0])
-                        dice = int(dice_parts[1])
-        if count > 100000000000000000:
-            client.send_message(message.channel, '{} stop fucking around with those stupid numbers...'.format(message.author.mention()))
    return
-        if count > 100:
+def do_gameslist(client, message_parts, message):
-            client.send_message(message.channel, '{} 100 is the largest number of dice I will roll.'.format(message.author.mention()))
-            return
-        roll_results = []
-        for i in range(count):
-            roll_results.append(random.randint(1,dice))
-        out_string = '{} your roll {}d{}: {} = {}'.format(message.author.mention(), count, dice, '+'.join(str(r) for r in roll_results), sum(roll_results))
-        client.send_message(message.channel, out_string)
-        return
-    if message.content.startswith('!gameslist') or message.content.startswith('!gamelist') :
-        parts = message.content.split(' ')
    limit = 20
-        if len(parts) > 1 and parts[1].isdigit():
+    if len(message_parts) > 0 and message_parts[0].isdigit():
-            limit = int(parts[1])
+        limit = int(message_parts[0])
    games_list = data.db_get_games_list(limit)
    out_string = ''
@@ -294,24 +308,27 @@ Stuff:
    while len(out_string) > 0:
        client.send_message(message.channel, out_string[:1900])
        out_string = out_string[1900:]
    return
-    if message.content.startswith('!aliases'):
+def do_alias(client, message_parts, message):
-        username = message.content[9:].replace('@', '').lower()
+    if len(message_parts) > 0:
+        username = ' '.join(message_parts).replace('@', '').lower()
        member = data.db_get_member(username=username)
+    else:
+        username = message.author.name
+        member = data.db_get_member(message.author.id)
    if member:
        aliases = data.db_get_aliases(member['member_id'])
        if aliases:
-                client.send_message(message.channel, '{} has the following aliases: {}'.format(username, byteify(', '.join(aliases))))
+            client.send_message(message.channel, '{} has the following aliases: {}'.format(byteify(username), byteify(', '.join(aliases))))
        else:
-                client.send_message(message.channel, 'No known alises for {} yet {}'.format(username, message.author.mention()))
+            client.send_message(message.channel, 'No known alises for {} yet {}'.format(byteify(username), message.author.mention()))
    else:
        client.send_message(message.channel, 'I don\'t know who you are speaking of {}!'.format(message.author.mention()))            
    return
-    if message.content.startswith('!addalias'):
+def do_addalias(client, message_parts, message):
-        alias = message.content[10:]
+    alias = ' '.join(message_parts)
    username = message.author.name.lower()
    member = data.db_get_member(username=username)
    if member:
@@ -321,17 +338,28 @@ Stuff:
        client.send_message(message.channel, 'Something horrible happened and it is all your fault, try logging out / on again or play a game. (or fuck off i dunno i\'m just an error message. Who am I to tell you how to run your life...)')
    return
-    if message.content.startswith('!games'):
+def do_games(client, message_parts, message):
-        username = message.content[7:].replace('@', '').lower()
+    if len(message_parts) > 0:
+        username = ' '.join(message_parts).replace('@', '').lower()
+    else:
+        username = message.author.name
    games_list = data.db_get_games(username)
    if games_list:
        games = ', '.join(games_list)
-            client.send_message(message.channel, 'I have seen {} playing: {}'.format(username, games))
+        games = games.replace("FINAL FANTASY XIV", "**FINAL FANTASY XIV**")
+        log(byteify(games))
+        client.send_message(message.channel, 'I have seen {} playing: {}'.format(byteify(username), byteify(games)))
    else:
-            client.send_message(message.channel, 'I don\'t have any data on {} yet {}'.format(username, message.author.mention()))
+        client.send_message(message.channel, 'I don\'t have any data on {} yet {}'.format(byteify(username), message.author.mention()))
+def do_reload(client, message_parts, message):
+    if message.author.id != '78767557628133376':
+        client.send_message(message.channel, "You shouldn't be calling this. You are clearly looking to piss Hellsbreath off.")
+        return
+    call(["service", "hellsbot", "restart"])
-    if message.content.startswith('!whoplayed'):
+def do_whoplayed(client, message_parts, message):
-        game_name = message.content[11:]
+    game_name = ' '.join(message_parts)
    member_list = data.db_get_whoplayed(game_name)
    if not member_list:
        client.send_message(message.channel, 'I don\'t have any data on {} yet {}'.format(byteify(game_name), message.author.mention()))
@@ -345,7 +373,7 @@ Stuff:
            out_string = out_string[1900:]
    return
-    if message.content.startswith('!gimmecredits'):
+def do_gimmecredits(client, message_parts, message):
    member = data.db_get_member(message.author.id)
    if not member:
        client.send_message(message.author, "There was a problem looking up your information.")
@@ -359,7 +387,7 @@ Stuff:
            client.send_message(message.author, "You already have credits. Stop begging.")
    return
-    if message.content.startswith('!grantcredits'):
+def do_grantcredits(clients, message_parts, message):
    if message.author.id != '78767557628133376':
        client.send_message(message.channel, "You are not Hellsbreath. Use !gimmecredits to get a few extra if you run out.")
        return
@@ -374,10 +402,7 @@ Stuff:
                client.send_message(message.channel, "{} has been given {} credits.".format(member['member_name'], 100))
    return
-    if message.content.startswith('!ticketrank'):
+def do_ticketrank(clients, message_parts, message):
-        # if message.author.id != '78767557628133376':
-        #     client.send_message(message.channel, "You are not Hellsbreath. Use !gimmecredits to get a few extra if you run out.")
-        #     return
    members = data.db_get_all_members()
    if len(members) < 0:
        client.send_message(message.channel, "There was a problem looking up your information.")
@@ -401,7 +426,7 @@ Stuff:
        client.send_message(message.channel, out_string)
    return
-    if message.content.startswith('!startraffle'):
+def do_startraffle(client, message_parts, message):
    if message.author.id != '78767557628133376':
        client.send_message(message.channel, "You are not Hellsbreath. Go die in an especially hot fire.")
        return
@@ -426,28 +451,33 @@ Stuff:
                ticket_reel += [member['discord_mention']] * member['tickets']
                percent = (float(member['tickets']) / float(ticket_count)) * 100.0
                out_string += "{} - {}%\n".format(byteify(member['member_name']), int(percent))
+        if len(ticket_reel) > 0:
            winner = random.choice(ticket_reel)
            while winner in ticket_reel:
                ticket_reel.remove(winner)
+            client.send_message(message.channel, "\n\n\n**The winner is....\n\n{}!**".format(byteify(winner)))
+        if len(ticket_reel) > 0:
            second = random.choice(ticket_reel)
            while second in ticket_reel:
                ticket_reel.remove(second)
+            time.sleep(0.5)
+            client.send_message(message.channel, "\n\n*2nd Place:* {}".format(byteify(winner)))
+        if len(ticket_reel) > 0:
            third = random.choice(ticket_reel)
+            time.sleep(0.5)
-            out_string += "\n\n\n**The winner is....\n\n{}!**\n\n*2nd Place:* {}\n*3rd Place:* {}".format(byteify(winner), byteify(second), byteify(third))
+            client.send_message(message.channel, "\n*3rd Place:* {}".format(byteify(winner)))
-            client.send_message(message.channel, byteify(out_string))
    return    
-    if message.content.startswith('!raffle'):
+def do_raffle(client, message_parts, message):
    client.send_message(message.channel, """Current Raffle Item:
 **1st Place**
-Game: **Fairy Fencer F**
+Game: **Lightning Returns**
 Description: 
-*Long ago, the Vile God and the Goddess waged war with each other. Equally matched, they were sealed away in another world… Now a lazy young man named Fang somehow finds himself a key part of this war he’d really rather not deal with, but fate beckons in this uncommon RPG!*
+*Lightning Returns is the concluding chapter of the Final Fantasy XIII saga and series heroine Lightning's final battle. The grand finale of the trilogy brings a world reborn as well as free character customization and stunning action based battles.*
-http://store.steampowered.com/app/347830/
+http://store.steampowered.com/app/345350/
 **2nd Place**
@@ -457,7 +487,7 @@ http://store.steampowered.com/app/347830/
 1 Random Steam Key
-Raffle Date: **2/2/2016 00:00:00 (ish)**
+Raffle Date: **2/9/2016 00:00:00 (ish)**
 You will be contacted if you win. To win you must purchase tickets with the !buyticket command for 100 credits.
 You can get extra credits by playing !slots <amount> and !bet <amount> on BlackJack.
@@ -465,7 +495,8 @@ You can get extra credits by playing !slots <amount> and !bet <amount> on BlackJ
 **Disclaimer:** *If anything should go wrong you get no refund and there is no guarantee or warrantee on anything. 1 prize per person no matter how many tickets you have.*
 """)
    return
-    if message.content.startswith('!buyticket'):
+def do_buyticket(client, message_parts, message):
    member = data.db_get_member(message.author.id)
    if not member:
        client.send_message(message.author, "There was a problem looking up your information.")
@@ -479,7 +510,7 @@ You can get extra credits by playing !slots <amount> and !bet <amount> on BlackJ
        client.send_message(message.author, "Raffle ticket purchased. Tickets: {} Credits: {}".format(response, credits))
    return
-    if message.content.startswith('!balance'):
+def do_balance(client, message_parts, message):
    member = data.db_get_member(message.author.id)
    if not member:
        client.send_message(message.author, "There was a problem looking up your information.")
@@ -487,7 +518,7 @@ You can get extra credits by playing !slots <amount> and !bet <amount> on BlackJ
        client.send_message(message.author, "Credits: {}\nTickets: {}".format(member['credits'], member['tickets']))
    return
-    if message.content.startswith('!slotsrules'):
+def do_slotsrules(client, message_parts, message):
    client.send_message(message.channel, """Paying Combinations:
 :moneybag:\t:moneybag:\t:moneybag:\t\t\t  pays\t250
@@ -506,7 +537,8 @@ Max Bet: 10 credits
 To Play: !slots <bet>""")
    return
-    if message.content.startswith('!slots'):
+def do_slots(client, message_parts, message):
    member = data.db_get_member(message.author.id)
    if not member:
        client.send_message(message.author, "There was a problem looking up your information.")
@@ -571,12 +603,10 @@ To Play: !slots <bet>""")
    credits = data.db_get_credit(member['member_id'])
    out_string += "\nCredits: {}".format(credits)
-        #log(out_string)
    client.send_message(message.author, out_string)
    return    
-    if message.content.startswith('!hit') or message.content.startswith('!draw'):
+def do_bj_hit(client, message_parts, message):
    member = data.db_get_member(message.author.id)
    if not member:
        client.send_message(message.author, "There was a problem looking up your information.")
@@ -613,7 +643,7 @@ To Play: !slots <bet>""")
            client.send_message(message.author, "You must start a game with !bet before you can ask for a new card.")
    return
-    if message.content.startswith('!stay') or  message.content.startswith('!stand'):
+def do_bj_stay(client, message_parts, message):
    member = data.db_get_member(message.author.id)
    if not member:
        client.send_message(message.author, "There was a problem looking up your information.")
@@ -639,7 +669,7 @@ To Play: !slots <bet>""")
            client.send_message(message.author, out_string)
    return
-    if message.content.startswith('!bet'):
+def do_bj_bet(client, message_parts, message):
    member = data.db_get_member(message.author.id)
    if not member:
        client.send_message(message.author, "There was a problem looking up your information.")
@@ -707,16 +737,15 @@ To Play: !slots <bet>""")
            out_string += "\nCredits: {}".format(credits)
        client.send_message(message.author, out_string)
    return
-    # !msg joe in 5 minutes YOU ARE A DICK
+def do_msg(client, message_parts, message):
-    if message.content.startswith('!msg'):
    channel = message.channel
    author = message.author
    #author = message.author.name
    username = ''
    try:
+        # TODO: Switch message_bits with message_parts
        message_bits = message.content.split(" ")
        msg_datetime = datetime.datetime.now()
        msg_idx = 2
@@ -745,7 +774,7 @@ To Play: !slots <bet>""")
        user_mention = ''
        # TODO: have it look in the database. Do this AFTER on startup we add all users.
        for member in client.get_all_members():
-                log("MEMBER: %s" % member)
+            #log("MEMBER: {}".format(byteify(member)))
            if username.lower() == member.name.lower():
                user_mention = member.mention()
                user_id = member.id
@@ -755,13 +784,13 @@ To Play: !slots <bet>""")
        msg_text = byteify(' '.join(message_bits[msg_idx:]))
        message = {'user_id': user_id, 'channel': channel.id, 'delivery_time': msg_datetime.strftime('%Y/%m/%d %H:%M:%S'), 'message': msg_text}
-            log("Message: %s" % message)
+        log("Message: %s" % byteify(message))
        data.db_add_message(msg_text, msg_datetime.strftime('%Y-%m-%d %H:%M:%S'), channel.id, author.mention(), user_mention, user_id)
        # print("Data: %s" % data)
        #test_ch = Object(channel.id)
        #client.send_message(test_ch, 'Test Message {}.'.format(author))
    except Exception as e:
-           client.send_message(channel, 'Your shitty message has been rejected {}. {}'.format(author.name, e))
+       client.send_message(channel, 'Your shitty message has been rejected {}. {}'.format(author.name, format_exception(e)))
       return
    if msg_datetime < datetime.datetime.now():
        client.send_message(channel, '{} your message will be delivered to {} as soon as they are available.'.format(author.name, user_mention))
@@ -770,7 +799,7 @@ To Play: !slots <bet>""")
    check_msg_queue()
    return    
-    if message.content.startswith('!addfortune'):
+def do_addfortune(client, message_parts, message):
    try:
        fortune = message.content[9:]
        if 'aa737a5846' in fortune:
@@ -788,10 +817,11 @@ To Play: !slots <bet>""")
    client.send_message(message.channel, 'Your shitty fortune has been added {}.'.format(message.author.mention()))
    return    
-    if message.content.startswith('!fortune'):
+def do_fortune(client, message_parts, message):
    fortune = None
    try:
        c = conn.cursor()
+        # TODO: Move this shit to data
        fortune = c.execute("SELECT fortune FROM fortunes ORDER BY RANDOM() LIMIT 1;").fetchone()[0]
        log(fortune)
    except Exception as e:
@@ -803,7 +833,7 @@ To Play: !slots <bet>""")
        client.send_message(message.channel, '{} Your fortune is... {}'.format(message.author.mention(), byteify(fortune)))
    return
-    if message.content.startswith('!question'):
+def do_question(client, message_parts, message):
    question = message.content[10:]
    if "is it gay" in question:
        client.send_message(message.channel, 'Yes {}, it is gay.'.format(message.author.mention()))
@@ -832,7 +862,7 @@ To Play: !slots <bet>""")
        client.send_message(message.channel, 'I don\'t know {}.'.format(message.author.mention()))
        return
-    if message.content.startswith('!addjoke'):
+def do_addjoke(client, message_parts, message):
    try:
        joke = message.content[9:]
        if 'aa737a5846' in joke:
@@ -850,7 +880,7 @@ To Play: !slots <bet>""")
    client.send_message(message.channel, 'Your shitty joke has been added {}.'.format(message.author.mention()))
    return    
-    if message.content.startswith('!joke'):
+def do_joke(client, message_parts, message):
    joke = None
    try:
        c = conn.cursor()
@@ -865,23 +895,54 @@ To Play: !slots <bet>""")
        client.send_message(message.channel, '{} {}'.format(message.author.mention(), byteify(joke)))
    return
+@client.event
+def on_message(message):
+    #print message.content
+    #print message.author
+    #print client.user
+    global muted_until
+    # we do not want the bot to reply to itself
+    if message.author == client.user:
+        return
+    message_parts = message.content.split(" ")
+    for command, method in registered_commands.iteritems():
+        if message_parts[0] == command:
+            try:
+                globals()[method](client, message_parts[1:], message)
+            except Exception as e:
+                log("{} - {}".format(format_exception(e), e.message))
+            return
+    if message.content.lower().startswith(client.user.name.lower()):
+        log('Someone is talking to %s' % (client.user.name.lower(),))
+        if ' or ' in message.content:
+            questions = message.content[len(client.user.name)+1:].replace('?', '').split(' or ')
+            client.send_message(message.channel, '{} I choose: {}'.format(message.author.mention(), random.choice(questions).encode('utf-8',errors='ignore')))
    if message.content.startswith('!secret'):
        client.send_message(message.channel, 'git gud {}! My source is here: http://git.savsoul.com/barry/discordbot\nVersion: {}'.format(message.author.mention(), VERSION))
+        return
    if message.content.startswith('!bemyirlwaifu'):
        client.send_message(message.channel, 'http://orig13.deviantart.net/b25e/f/2014/175/3/d/no_waifu_no_laifu_by_imtheonenexttome-d7nsx3b.gif {}!'.format(message.author.mention()))
+        return
    if message.content.startswith('HILLARY 2016'):
        client.send_message(message.channel, ':bomb: Ohhhhhh, now you done it...:bomb:'.format(message.author.mention()))
+        return
+    if message.content.startswith('!squid'):
+        client.send_message(message.channel, 'くコ:彡         くコ:彡            くコ:彡          くコ:彡')
+        return
+    if message.content.startswith('!stars'):
+        client.send_message(message.channel, '✮═━┈　　✰═━┈　　✮═━┈　　✰═━┈　　✮═━┈　　✰═━┈　　✮═━┈　　✰═━┈　　✮═━┈　　✰═━┈　✰═━┈┈　✰═━┈┈')
+        return
    if message.content.startswith('!hello'):
        client.send_message(message.channel, 'Hello {}!'.format(message.author.mention()))
-    if message.content.startswith('!reloadbot'):
-        if message.author.id != '78767557628133376':
-            client.send_message(message.channel, "You shouldn't be calling this. You are clearly looking to piss Hellsbreath off.")
        return
-        call(["service", "hellsbot", "restart"])
 @client.event
--- a/pankration.py
View file @4264acb
+++ b/pankration.py
View file @4264acb
 import random
 import time
+import pickle
-FIND_PERCENTAGE = 80
+FIND_PERCENTAGE = 100
+SKILL_PERCENT = 80
 class HuntResponse:
    ERROR = -1
@@ -14,6 +15,7 @@ class HuntResponse:
        self.message = message
        self.monster = monster
+exp_to_level = [500, 1250, 2250, 3500, 5000, 6750, 8750, 10950, 13350, 15950, 18750, 21750, 24950, 28350, 31950, 35750, 39750, 43950, 48350, 52950, 57750, 62750, 67850, 73050, 78350, 83750, 89250, 94850, 100550, 106350, 112250, 118250, 124350, 130550, 136850, 143250, 149750, 156350, 163050, 169850, 176750, 183750, 190850, 198050, 205350, 212750, 220250, 227850, 235550]
 class Jobs:
    WAR = 1
@@ -39,6 +41,20 @@ class Jobs:
    GEO = 21
    RUN = 22
+TemperamentPosture = {
+    4: {"name": "Very Agressive", "message": "Show no mercy!", "value": 4},
+    3: {"name": "Somewhat Agressive", "message": "Give em' a little more bite!", "value": 3},
+    2: {"name": "Somewhat Defensive", "message": "Back off a bit!", "value": 2},
+    1: {"name": "Very Defensive", "message": "Guard! Block! Parry! Hold!", "value": 1}
+}
+TemperamentAttitude = {
+    4: {"name": "Very Wild", "message": "Don't think, kill!", "value": 4},
+    3: {"name": "Somewhat Wild", "message": "Less thinking, more striking!", "value": 3},
+    2: {"name": "Somewhat Tame", "message": "Watch your opponent, then attack!", "value": 2},
+    1: {"name": "Very Tame", "message": "Think, and think again!", "value": 1}
+}
 PhysicalDamageTypes = {
    'blunt': ['Hand-to-Hand', 'Club', 'Staff', 'Harlequin Frame', 'Stormwaker Frame', 'Sharpshot Frame'],
    'slashing': ['Axe', 'Great Axe', 'Great Sword', 'Sword', 'Scythe', 'Katana', 'Great Katana', 'Valoredge Frame'],
@@ -46,7 +62,7 @@ PhysicalDamageTypes = {
 }
 FeralSkills = {
-    'Airy Shield': {'type': 'Enhancing', 'sub_type': 'arrow shield', 'shadows': 'ignore', 'range': None, 'aoe': False, 'spell': 'arrow shield'},
+    'Airy Shield': {'fp_cost': 0, 'type': 'Enhancing', 'sub_type': 'arrow shield', 'shadows': 'ignore', 'range': None, 'aoe': False, 'spell': 'arrow shield'},
    'Binding Wave': {'type': 'Enfeebling', 'shadows': 'ignore', 'range': 15, 'aoe': True, 'spell': 'bind'},
    'Dire Straight': {'type': 'Physical', 'shadows': 'wipe', 'range': None, 'aoe': False},
    'Dismemberment': {'type': 'Piercing', 'shadows': 'absorb', 'range': None, 'aoe': False}, # causes the monster to lose a body part
@@ -61,36 +77,74 @@ Families = {
        'base_fp': 50,
        'fp_per_level': 0.1,
        'max_fp': 55,        
-        'main_job': Jobs.WAR,
+        'available_main_job': [Jobs.WAR, Jobs.DRG, Jobs.DRK, Jobs.PLD],
-        'support_job': None,
+        'available_support_job': [Jobs.WAR, Jobs.DRG, Jobs.DRK, Jobs.PLD],
        'innate_feral_skills': ['Sinker Drill', 'Dire Straight', 'Dismemberment', 'Earthshatter'],
        'type': 'Arcana',
        'strong_vs': ['Dark'],
        'charmable': False,
        'aspir': False,
-        'drain': False
+        'drain': False,
+        'temperament_attitude': {
+            'initial_value': 4, 
+            'actions': {
+                4: {'use_tp_chance': 100, 'ws': ['Sinker Drill'], 'side_attack_chance': 0, 'range_chance': 0},
+                3: {'use_tp_chance': 75, 'ws': ['Eyes On Me'], 'side_attack_chance': 70, 'range_chance': 10},
+                2: {'use_tp_chance': 50, 'ws': ['Binding Wave', 'Hypnosis'], 'side_attack_chance': 25, 'range_chance': 70},
+                1: {'use_tp_chance': 70, 'ws': ['Binding Wave', 'Hypnosis', 'Magic Barrier', 'Airy Shield'], 'side_attack_chance': 25, 'range_chance': 70}
+            }
+        },
+        'temperament_posture': {
+            'initial_value': 4, 
+            'actions': {
+                4: {'use_tp_chance': 100, 'ws': ['Eyes On Me'], 'side_attack_chance': 0, 'range_chance': 0},
+                3: {'use_tp_chance': 75, 'ws': ['Eyes On Me'], 'side_attack_chance': 70, 'range_chance': 10},
+                2: {'use_tp_chance': 50, 'ws': ['Binding Wave', 'Hypnosis'], 'side_attack_chance': 25, 'range_chance': 70},
+                1: {'use_tp_chance': 70, 'ws': ['Magic Barrier', 'Airy Shield'], 'side_attack_chance': 25, 'range_chance': 100}
+            }
+        }
    },
    'ahriman': {
        'base_fp': 65,
        'fp_per_level': 0.3,
        'max_fp': 80,
-        'main_job': Jobs.WAR,
+        'available_main_job': [Jobs.BLM, Jobs.RDM, Jobs.WAR],
-        'support_job': Jobs.BLM,
+        'available_support_job': [Jobs.BLM, Jobs.RDM, Jobs.WAR],
        'innate_feral_skills': ['Binding Wave', 'Magic Barrier', 'Hypnosis', 'Eyes On Me', 'Airy Shield'],
        'type': 'Demon',
        'traits': ['magic defence bonus +25%'],
        'charmable': False,
        'aspir': True,
-        'drain': True
+        'drain': True,
+        'temperament_attitude': {
+            'initial_value': 4, 
+            'actions': {
+                4: {'use_tp_chance': 100, 'ws': ['Eyes On Me'], 'side_attack_chance': 0, 'range_chance': 0},
+                3: {'use_tp_chance': 75, 'ws': ['Eyes On Me'], 'side_attack_chance': 70, 'range_chance': 10},
+                2: {'use_tp_chance': 50, 'ws': ['Binding Wave', 'Hypnosis'], 'side_attack_chance': 25, 'range_chance': 70},
+                1: {'use_tp_chance': 70, 'ws': ['Binding Wave', 'Hypnosis', 'Magic Barrier', 'Airy Shield'], 'side_attack_chance': 25, 'range_chance': 70}
+            }
+        },
+        'temperament_posture': {
+            'initial_value': 4, 
+            'actions': {
+                4: {'use_tp_chance': 100, 'ws': ['Eyes On Me'], 'side_attack_chance': 0, 'range_chance': 0},
+                3: {'use_tp_chance': 75, 'ws': ['Eyes On Me'], 'side_attack_chance': 70, 'range_chance': 10},
+                2: {'use_tp_chance': 50, 'ws': ['Binding Wave', 'Hypnosis'], 'side_attack_chance': 25, 'range_chance': 70},
+                1: {'use_tp_chance': 70, 'ws': ['Magic Barrier', 'Airy Shield'], 'side_attack_chance': 25, 'range_chance': 100}
+            }
+        }
    }
 }
 Monsters = {
    'Mechanical Menace': {
+        'initial_level': 9,
        'family': 'acrolith',
        'zone': 'Abyssea - Uleguerand'
    },
    'Floating Eye': {
+        'initial_level': 3,
        'family': 'ahriman',
        'zone': 'Ranguemont Pass'
    }
@@ -120,8 +174,27 @@ class Pankration:
    def hunt_monster(self, zone):
        if random.randint(1, 100) < FIND_PERCENTAGE:
+            monster_data = Monsters[random.choice(self.get_monsters(zone))]
+            print(monster_data)
+            family_name = monster_data['family']
+            level = monster_data['initial_level']
+            family = Families[family_name]
+            main_job = random.choice(family['available_main_job'])
+            support_job = random.choice(family['available_support_job'])
+            feral_skills = []
+            skills = random.sample(family['innate_feral_skills'], 3)
+            if random.randint(1, 100) < SKILL_PERCENT:
+                feral_skills.append(skills[0])
+                if random.randint(1, 100) < SKILL_PERCENT:
+                    feral_skills.append(skills[1])
+                    if random.randint(1, 100) < SKILL_PERCENT:
+                        feral_skills.append(skills[2])
+            dicipline_level = 1
+            monster = Monster(family, level, main_job, support_job, feral_skills,
+                 [], dicipline_level)
            return HuntResponse(HuntResponse.SUCCESS, "You captured the monster!",
-                                random.choice(self.get_monsters(zone)))
+                                monster)
        else:
            return HuntResponse(HuntResponse.FAILURE, "You were unable to capture a monster's soul.",
                                None)
@@ -130,26 +203,77 @@ class Pankration:
        return ""
 class Monster:
-    def __init__(self, family, level, main_job, support_job, fp_capacity, innate_feral_skills,
+    def __init__(self, family, level, main_job, support_job, innate_feral_skills,
-                 eqipped_feral_skills, dicipline_level, temperament):
+                 equipped_feral_skills, dicipline_level):
        self.family = family
        self.level = level
        self.main_job = main_job
        self.support_job = support_job
-        self.fp_capacity = fp_capacity
        self.innate_feral_skills = innate_feral_skills
-        self.equipped_feral_skills = eqipped_feral_skills
+        self.equipped_feral_skills = equipped_feral_skills
        self.discipline_level = dicipline_level
-        self.temperament = temperament
+        self.temperament_posture = family['temperament_posture']['initial_value']
+        self.temperament_attitude = family['temperament_attitude']['initial_value']
-    def calculate_fp_gain(self):
+        self.pre_fight_command = {"temperament_posture": None, "temperament_attitude": None}
+        self.exp = exp_to_level[level] + 1
+    def __str__(self):
+        return "Family: {}\nLevel: {}\nMain Job: {}\nSupport Job: {}\nInnate Feral Skills: {}\nEquipped Feral Skills: {}\nDicipline Level: {}\nTemperament...".format(self.family, self.level, self.main_job, self.support_job, self.innate_feral_skills, self.equipped_feral_skills, self.discipline_level)
+    def get_fp(self):
+        return int(self.level / self.family['fp_per_level'])
+    def add_xp(self, exp_to_add):
+        self.exp += exp_to_add
+        for i in range(self.level, 50):
+            if self.exp > exp_to_level[i]:
+                if i > self.level:
+                    # We leveled up!
+                    print("Start level: {} New Level: {}".format(self.level, i))
+                else:
+                    print("Just another brick in the wall...")
+            else:
+                break
+        # calc level based on xp
+        # stop at 50
        pass
-    def set_strategy(self, strategy_type):
+    def get_current_posture(self):
-        if strategy_type not in self.monster_data['strategies']:
+        return TemperamentPosture(self.temperament_posture)
-            return False
+    def get_current_attitude(self):
+        return TemperamentAttitude(self.temperament_attitude)
+    def get_dicipline_level(self):
+        if self.dicipline_level < 2:
+            return "Defiant"
+        elif self.dicipline_level < 5:
+            return "Disrespectful"
+        elif self.dicipline_level < 7:
+            return "Disobedient"
+        else:
+            return "Obedient"
+    # This should ONLY be executed at the start of battle.
+    def set_strategy(self, temperament_posture, temperament_attitude):        
+        distance_from_nature = abs(self.temperament_posture - temperament_posture)
+        distance_from_nature += abs(self.temperament_attitude - temperament_attitude)
+        if distance_from_nature == 0:
+            chance_of_listening = self.discipline_level
+        else:
+            chance_of_listening = float(float(self.discipline_level) / (float(distance_from_nature)/10))
+        chance_of_listening = abs(float((float(chance_of_listening)-1)/(20-1)))
+        if random.randint(1, 100) > chance_of_listening * 100:
+            print("DO ACTION:")
+            # adjust dicipline_level
+            # move temperament
        else:
-            self.strategy = strategy_type
+            #continue action
+            #if severe request then reduce dicipline_level
+            pass
 class Battle:
    pass
@@ -169,8 +293,12 @@ print(str(hunt_response.result))
 time.sleep(0.5)
 if hunt_response.result == HuntResponse.SUCCESS:
    print(hunt_response.message)
-    monster = Monsters[hunt_response.monster]
+    monster = hunt_response.monster
-    print("The Soul Plate Shows: \n\n{}\n{}{}".format(hunt_response.monster))
+    print("The Soul Plate Shows: \n\n{}".format(monster))
+    print(monster.set_strategy(4, 3))
+    print(monster.set_strategy(1, 1))
+    print(monster.set_strategy(1, 2))
+    monster.add_xp(2900)
 else:
    print(hunt_response.message)