:spakles: Database and OOP
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import discord, string
|
||||
from discord.ext import commands
|
||||
|
||||
from funcs import parseRoll, parseDestiny, critRoll, parseChar, cap
|
||||
from funcs import cap
|
||||
|
||||
class SwCog(commands.Cog):
|
||||
|
||||
@@ -13,7 +13,7 @@ class SwCog(commands.Cog):
|
||||
@commands.command()
|
||||
async def swroll(self, ctx, *, content):
|
||||
command = cap(content)
|
||||
newMessage = parseRoll("#"+str(ctx.message.author.id),command)
|
||||
newMessage = self.client.swroll.parseRoll("#"+str(ctx.message.author.id),command)
|
||||
messageList = newMessage.split("\n")
|
||||
for messageItem in messageList:
|
||||
await ctx.send(messageItem)
|
||||
@@ -21,7 +21,7 @@ class SwCog(commands.Cog):
|
||||
# Controls destiny points
|
||||
@commands.command()
|
||||
async def swd(self, ctx, *, content):
|
||||
newMessage = parseDestiny("#"+str(ctx.message.author.id),content)
|
||||
newMessage = self.client.swdestiny.parseDestiny("#"+str(ctx.message.author.id),content)
|
||||
messageList = newMessage.split("\n")
|
||||
for messageItem in messageList:
|
||||
await ctx.send(messageItem)
|
||||
@@ -29,7 +29,7 @@ class SwCog(commands.Cog):
|
||||
# Rolls for critical injuries
|
||||
@commands.command()
|
||||
async def swcrit(self, ctx, arg : int = 0):
|
||||
newMessage = critRoll(int(arg))
|
||||
newMessage = self.client.swroll.critRoll(int(arg))
|
||||
|
||||
messageList = newMessage.split("\n")
|
||||
for messageItem in messageList:
|
||||
@@ -40,7 +40,7 @@ class SwCog(commands.Cog):
|
||||
@commands.command(aliases=["sw"])
|
||||
async def swchar(self, ctx, *, content = ""):
|
||||
command = string.capwords(content.replace("+","+ ").replace("-","- ").replace(",",", "))
|
||||
title, desc = parseChar("#"+str(ctx.message.author.id),command)
|
||||
title, desc = self.client.swchar.parseChar("#"+str(ctx.message.author.id),command)
|
||||
if title != "":
|
||||
em1 = discord.Embed(title = title, description = desc, colour=0xDEADBF)
|
||||
await ctx.send(embed = em1)
|
||||
|
||||
Reference in New Issue
Block a user