some cleaning up
This commit is contained in:
Nikolaj
@ -6,18 +6,18 @@ class StarWarsChar():
|
||||
def __init__(self, bot):
|
||||
self.bot = bot
|
||||
|
||||
def getChar_name(self, user : str):
|
||||
def get_char_name(self, user : str):
|
||||
self.bot.log("Getting name for "+self.bot.database_funcs.get_name(user)+"'s character")
|
||||
userCharacter = self.bot.database["starwars characters"].find_one({"_id":user})
|
||||
user_character = self.bot.database["starwars characters"].find_one({"_id":user})
|
||||
|
||||
if userCharacter != None:
|
||||
self.bot.log("Name is "+userCharacter["Name"])
|
||||
return userCharacter["Name"]
|
||||
if user_character != None:
|
||||
self.bot.log("Name is "+user_character["Name"])
|
||||
return user_character["Name"]
|
||||
else:
|
||||
self.bot.log("Just using "+self.bot.database_funcs.get_name(user))
|
||||
return self.bot.database_funcs.get_name(user)
|
||||
|
||||
def setUpDict(self, cmd : dict):
|
||||
def set_up_dict(self, cmd : dict):
|
||||
self.bot.log("Setting up a dictionary in a nice way")
|
||||
if bool(cmd):
|
||||
keys = list(cmd)
|
||||
@ -26,24 +26,24 @@ class StarWarsChar():
|
||||
if isinstance(values[0],dict):
|
||||
return ", ".join(values)
|
||||
else:
|
||||
for x, key in enumerate(keys):
|
||||
for i, key in enumerate(keys):
|
||||
if type(key) is list:
|
||||
if x%3 != 2:
|
||||
result += "**" + key + "**" + ": " + ", ".join(values[x]) + " "
|
||||
if i%3 != 2:
|
||||
result += "**" + key + "**" + ": " + ", ".join(values[i]) + " "
|
||||
else:
|
||||
result += "**" + key + "**" + ": " + ", ".join(values[x]) + "\n"
|
||||
result += "**" + key + "**" + ": " + ", ".join(values[i]) + "\n"
|
||||
else:
|
||||
if x%3 != 2:
|
||||
result += "**" + key + "**" + ": " + str(values[x]) + " "
|
||||
if i%3 != 2:
|
||||
result += "**" + key + "**" + ": " + str(values[i]) + " "
|
||||
else:
|
||||
result += "**" + key + "**" + ": " + str(values[x]) + "\n"
|
||||
result += "**" + key + "**" + ": " + str(values[i]) + "\n"
|
||||
self.bot.log("Returning a dictionary, but well formatted")
|
||||
return result
|
||||
else:
|
||||
self.bot.log("Couldn't find anything")
|
||||
return "There doesn't seem to be anything here..."
|
||||
|
||||
def lookUp(self, data : dict, key : str, cmd : str = ""):
|
||||
def look_up(self, data : dict, key : str, cmd : str = ""):
|
||||
if cmd == " ":
|
||||
cmd = ""
|
||||
elif cmd != "":
|
||||
@ -57,7 +57,7 @@ class StarWarsChar():
|
||||
self.bot.log(key+" exists")
|
||||
if cmd == "":
|
||||
if type(data[key]) is dict and key != "Weapons":
|
||||
return self.setUpDict(data[key])
|
||||
return self.set_up_dict(data[key])
|
||||
elif key == "Weapons":
|
||||
self.bot.log("Does this even get used? I'm too scared to delete it")
|
||||
if bool(data[key]):
|
||||
@ -85,21 +85,21 @@ class StarWarsChar():
|
||||
|
||||
if type(data[key]) is int:
|
||||
try:
|
||||
newValue = data[key] + int(cmd)
|
||||
data[key] = newValue
|
||||
new_value = data[key] + int(cmd)
|
||||
data[key] = new_value
|
||||
self.bot.log("Added "+cmd+" to "+key)
|
||||
return data
|
||||
except:
|
||||
self.bot.log("Couldn't add "+cmd+" to "+key)
|
||||
return "Can't add that"
|
||||
elif type(data[key]) is list:
|
||||
try:
|
||||
data[key].append(cmd)
|
||||
self.bot.log("Added "+cmd+" to "+key)
|
||||
return data
|
||||
except:
|
||||
self.bot.log("Couldn't add "+cmd+" to "+key)
|
||||
return "Can't add that"
|
||||
try:
|
||||
data[key].append(cmd)
|
||||
self.bot.log("Added "+cmd+" to "+key)
|
||||
return data
|
||||
except:
|
||||
self.bot.log("Couldn't add "+cmd+" to "+key)
|
||||
return "Can't add that"
|
||||
else:
|
||||
self.bot.log("Yeah, I can't add that to "+key)
|
||||
return "Can't add that"
|
||||
@ -116,21 +116,21 @@ class StarWarsChar():
|
||||
|
||||
if type(data[key]) is int:
|
||||
try:
|
||||
newValue = data[key] - int(cmd)
|
||||
data[key] = newValue
|
||||
new_value = data[key] - int(cmd)
|
||||
data[key] = new_value
|
||||
self.bot.log("Subtracted "+cmd+" from "+key)
|
||||
return data
|
||||
except:
|
||||
self.bot.log("Couldn't subtract "+cmd+" from "+key)
|
||||
return "Can't remove that"
|
||||
elif type(data[key]) is list:
|
||||
try:
|
||||
data[key].remove(cmd)
|
||||
self.bot.log("Removed "+cmd+" from "+key)
|
||||
return data
|
||||
except:
|
||||
self.bot.log("Couldn't remove "+cmd+" from "+key)
|
||||
return "Can't remove that"
|
||||
try:
|
||||
data[key].remove(cmd)
|
||||
self.bot.log("Removed "+cmd+" from "+key)
|
||||
return data
|
||||
except:
|
||||
self.bot.log("Couldn't remove "+cmd+" from "+key)
|
||||
return "Can't remove that"
|
||||
else:
|
||||
self.bot.log("Yeah, I can't remove/subtract that from "+key)
|
||||
return "Can't remove that"
|
||||
@ -139,20 +139,20 @@ class StarWarsChar():
|
||||
cmd = cmd[1:]
|
||||
|
||||
if type(data[key]) is dict:
|
||||
newKey = cmd.split(" ")[0]
|
||||
cmd = cmd[len(newKey):]
|
||||
new_key = cmd.split(" ")[0]
|
||||
cmd = cmd[len(new_key):]
|
||||
if cmd != "":
|
||||
while cmd[0] == " ":
|
||||
cmd = cmd[1:]
|
||||
if cmd == "":
|
||||
break
|
||||
self.bot.log("Looking up "+newKey+" in "+key)
|
||||
lookUpResult = self.lookUp(data[key],newKey,cmd)
|
||||
if type(lookUpResult) is dict:
|
||||
data[key] = lookUpResult
|
||||
self.bot.log("Looking up "+new_key+" in "+key)
|
||||
look_up_result = self.look_up(data[key],new_key,cmd)
|
||||
if type(look_up_result) is dict:
|
||||
data[key] = look_up_result
|
||||
return data
|
||||
else:
|
||||
return lookUpResult
|
||||
return look_up_result
|
||||
elif type(data[key]) != list:
|
||||
self.bot.log("Trying to change "+key+" to "+cmd)
|
||||
try:
|
||||
@ -193,23 +193,23 @@ class StarWarsChar():
|
||||
|
||||
if cmd == "":
|
||||
self.bot.log("Returning "+search)
|
||||
return self.setUpDict(data[search])
|
||||
return self.set_up_dict(data[search])
|
||||
else:
|
||||
newKey = cmd.split(" ")[0]
|
||||
cmd = cmd[len(newKey):]
|
||||
new_key = cmd.split(" ")[0]
|
||||
cmd = cmd[len(new_key):]
|
||||
if cmd != "":
|
||||
while cmd[0] == " ":
|
||||
cmd = cmd[1:]
|
||||
if cmd == "":
|
||||
break
|
||||
lookUpResult = self.lookUp(data[search],newKey,cmd)
|
||||
if type(lookUpResult) is dict:
|
||||
data[search] = lookUpResult
|
||||
look_up_result = self.look_up(data[search],new_key,cmd)
|
||||
if type(look_up_result) is dict:
|
||||
data[search] = look_up_result
|
||||
return data
|
||||
else:
|
||||
return lookUpResult
|
||||
return look_up_result
|
||||
|
||||
def characterSheet(self,character : dict):
|
||||
def character_sheet(self,character : dict):
|
||||
self.bot.log("Setting up a character sheet for "+character["Name"])
|
||||
divider = "--------------------\n"
|
||||
name = character["Name"]
|
||||
@ -219,8 +219,8 @@ class StarWarsChar():
|
||||
|
||||
text1 = "**Species**: "+character["Species"]+"\n**Career**: "+character["Career"]+"\n**Specialization Trees**: "+", ".join(character["Specialization-trees"])+textf+"\n**Soak**: "+str(character["Soak"])
|
||||
text2 = "\n\n**Wounds**: "+str(character["Wounds"])+"/"+str(character["Wound-threshold"])+"\n**Strain**: "+str(character["Strain"])+"/"+str(character["Strain-threshold"])
|
||||
text3 = self.setUpDict(character["Characteristics"])
|
||||
text4 = self.setUpDict(character["Skills"])
|
||||
text3 = self.set_up_dict(character["Characteristics"])
|
||||
text4 = self.set_up_dict(character["Skills"])
|
||||
text5 = ""
|
||||
text6 = ""
|
||||
text7 = ""
|
||||
@ -240,7 +240,7 @@ class StarWarsChar():
|
||||
return name, text1+text2+"\n\n"+text3+divider+text4+"\n"+divider+text5+text6+text7+text8
|
||||
|
||||
def char_data(self,user : str,cmd : str):
|
||||
userCharacter = self.bot.database["starwars characters"].find_one({"_id":user})
|
||||
user_character = self.bot.database["starwars characters"].find_one({"_id":user})
|
||||
|
||||
key = string.capwords(cmd.split(" ")[0])
|
||||
cmd = cmd[len(key):]
|
||||
@ -253,23 +253,23 @@ class StarWarsChar():
|
||||
break
|
||||
|
||||
self.bot.log("Looking for "+self.bot.database_funcs.get_name(user)+"'s character")
|
||||
if userCharacter != None:
|
||||
if user_character != None:
|
||||
self.bot.log("Found it! Looking for "+key+" in the data")
|
||||
if key in userCharacter:
|
||||
if key in user_character:
|
||||
self.bot.log("Found it!")
|
||||
if type(userCharacter[key]) is dict:
|
||||
if type(user_character[key]) is dict:
|
||||
self.bot.log("It's a dictionary!")
|
||||
if cmd == "":
|
||||
self.bot.log("Retrieving data")
|
||||
if key == "Weapons":
|
||||
if bool(userCharacter[key]):
|
||||
if bool(user_character[key]):
|
||||
self.bot.log("Returning a list of weapons")
|
||||
return ", ".join(list(userCharacter[key]))
|
||||
return ", ".join(list(user_character[key]))
|
||||
else:
|
||||
self.bot.log("The character doesn't have any weapons. Which is probably for the best. Like, who just walks around with weapons?")
|
||||
return "There doesn't seem to be anything there..."
|
||||
else:
|
||||
return self.setUpDict(userCharacter[key])
|
||||
return self.set_up_dict(user_character[key])
|
||||
elif cmd[0] == "+":
|
||||
self.bot.log("Gonna add something!!!")
|
||||
try:
|
||||
@ -287,7 +287,7 @@ class StarWarsChar():
|
||||
self.bot.log("Adding "+cmd[0]+" to "+key)
|
||||
self.bot.database["starwars characters"].update_one({"_id":user},
|
||||
{"$set": {key+"."+cmd[0] : cmd[1]}})
|
||||
return cmd[0]+" added to "+key+" for " + userCharacter["Name"]
|
||||
return cmd[0]+" added to "+key+" for " + user_character["Name"]
|
||||
|
||||
elif key == "Obligations" and "," in cmd:
|
||||
cmd = cmd.split(",")
|
||||
@ -300,17 +300,17 @@ class StarWarsChar():
|
||||
except:
|
||||
self.bot.log("Fucked that up")
|
||||
return "Wrong data type"
|
||||
return cmd[0]+" added to "+key+" for " + userCharacter["Name"]
|
||||
return cmd[0]+" added to "+key+" for " + user_character["Name"]
|
||||
|
||||
elif key == "Weapons":
|
||||
with open("gwendolyn/resources/star_wars/starwarstemplates.json", "r") as f:
|
||||
templates = json.load(f)
|
||||
newWeapon = templates["Weapon"]
|
||||
with open("gwendolyn/resources/star_wars/starwarstemplates.json", "r") as file_pointer:
|
||||
templates = json.load(file_pointer)
|
||||
new_weapon = templates["Weapon"]
|
||||
self.bot.log("Adding "+cmd+" to "+key)
|
||||
self.bot.database["starwars characters"].update_one({"_id":user},
|
||||
{"$set": {key+"."+cmd : newWeapon}})
|
||||
{"$set": {key+"."+cmd : new_weapon}})
|
||||
|
||||
return cmd+" added to weapons for " + userCharacter["Name"]
|
||||
return cmd+" added to weapons for " + user_character["Name"]
|
||||
|
||||
else:
|
||||
self.bot.log("That's not happening")
|
||||
@ -328,11 +328,11 @@ class StarWarsChar():
|
||||
|
||||
if key == "Talents" or key == "Force-powers" or key == "Weapons" or key == "Obligations":
|
||||
self.bot.log("Trying to remove "+cmd+" from "+key)
|
||||
if cmd in userCharacter[key]:
|
||||
if cmd in user_character[key]:
|
||||
self.bot.database["starwars characters"].update_one({"_id":user},
|
||||
{"$unset": {cmd}})
|
||||
self.bot.log("I did that")
|
||||
return cmd+" removed from "+key+" from "+userCharacter["Name"]
|
||||
return cmd+" removed from "+key+" from "+user_character["Name"]
|
||||
else:
|
||||
self.bot.log("Welp. I fucked that up")
|
||||
return "Can't remove that"
|
||||
@ -343,27 +343,27 @@ class StarWarsChar():
|
||||
else:
|
||||
self.bot.log("Looking up "+cmd+" in "+key)
|
||||
if key == "Talents" or key == "Force-powers":
|
||||
newKey = cmd
|
||||
newcmd = ""
|
||||
new_key = cmd
|
||||
new_cmd = ""
|
||||
else:
|
||||
newKey = string.capwords(cmd.split(" ")[0])
|
||||
newcmd = cmd[len(newKey):]
|
||||
new_key = string.capwords(cmd.split(" ")[0])
|
||||
new_cmd = cmd[len(new_key):]
|
||||
|
||||
lookUpResult = self.lookUp(userCharacter[key],newKey,newcmd)
|
||||
look_up_result = self.look_up(user_character[key],new_key,new_cmd)
|
||||
|
||||
if type(lookUpResult) is dict:
|
||||
if type(look_up_result) is dict:
|
||||
self.bot.database["starwars characters"].update_one({"_id":user},
|
||||
{"$set": {key : lookUpResult}})
|
||||
return "Changed " + userCharacter["Name"] + "'s " + key
|
||||
{"$set": {key : look_up_result}})
|
||||
return "Changed " + user_character["Name"] + "'s " + key
|
||||
else:
|
||||
return lookUpResult
|
||||
return look_up_result
|
||||
else:
|
||||
if cmd == "":
|
||||
self.bot.log("Retrieving data")
|
||||
if type(userCharacter[key]) is list:
|
||||
return key+":\n"+", ".join(userCharacter[key])
|
||||
if type(user_character[key]) is list:
|
||||
return key+":\n"+", ".join(user_character[key])
|
||||
else:
|
||||
return userCharacter[key]
|
||||
return user_character[key]
|
||||
elif cmd[0] == '+':
|
||||
self.bot.log("Adding")
|
||||
try:
|
||||
@ -374,21 +374,21 @@ class StarWarsChar():
|
||||
self.bot.log("Error message")
|
||||
return "Can't do that"
|
||||
|
||||
if type(userCharacter[key]) is int:
|
||||
if type(user_character[key]) is int:
|
||||
try:
|
||||
self.bot.log("Adding "+cmd+" to "+key)
|
||||
self.bot.database["starwars characters"].update_one({"_id":user},
|
||||
{"$inc": {key : int(cmd)}})
|
||||
return "Added " + cmd + " to " + userCharacter["Name"] + "'s " + key
|
||||
return "Added " + cmd + " to " + user_character["Name"] + "'s " + key
|
||||
except:
|
||||
self.bot.log("BITCH SANDWICH")
|
||||
return "Can't add that"
|
||||
elif type(userCharacter[key]) is list:
|
||||
elif type(user_character[key]) is list:
|
||||
try:
|
||||
self.bot.log("Adding "+cmd+" to "+key)
|
||||
self.bot.database["starwars characters"].update_one({"_id":user},
|
||||
{"$push": {key : cmd}})
|
||||
return "Added " + cmd + " to " + userCharacter["Name"] + "'s " + key
|
||||
return "Added " + cmd + " to " + user_character["Name"] + "'s " + key
|
||||
except:
|
||||
self.bot.log("tstststststs")
|
||||
return "Can't add that"
|
||||
@ -405,16 +405,16 @@ class StarWarsChar():
|
||||
self.bot.log("lalalala ")
|
||||
return "Can't do that"
|
||||
|
||||
if type(userCharacter[key]) is int:
|
||||
if type(user_character[key]) is int:
|
||||
try:
|
||||
self.bot.log("Subtracting "+cmd+" from "+key)
|
||||
self.bot.database["starwars characters"].update_one({"_id":user},
|
||||
{"$inc": {key : -int(cmd)}})
|
||||
return "Subtracted " + cmd + " from " + userCharacter["Name"] + "'s " + key
|
||||
return "Subtracted " + cmd + " from " + user_character["Name"] + "'s " + key
|
||||
except:
|
||||
self.bot.log("Tried it. Didn't want to")
|
||||
return "Can't remove that"
|
||||
elif type(userCharacter[key]) is list:
|
||||
elif type(user_character[key]) is list:
|
||||
try:
|
||||
self.bot.log("removing "+cmd+" from "+key)
|
||||
try:
|
||||
@ -423,7 +423,7 @@ class StarWarsChar():
|
||||
except:
|
||||
self.bot.log("They can only remove stuff that's actually in the list")
|
||||
return "Not in list"
|
||||
return "Removed " + cmd + " from " + userCharacter["Name"] + "'s " + key
|
||||
return "Removed " + cmd + " from " + user_character["Name"] + "'s " + key
|
||||
except:
|
||||
self.bot.log("nah")
|
||||
return "Can't remove that"
|
||||
@ -432,20 +432,20 @@ class StarWarsChar():
|
||||
return "Can't remove that"
|
||||
else:
|
||||
self.bot.log("Changing "+key+" to "+cmd)
|
||||
if type(userCharacter[key]) is int:
|
||||
if type(user_character[key]) is int:
|
||||
try:
|
||||
self.bot.database["starwars characters"].update_one({"_id":user},
|
||||
{"$set": {key : int(cmd)}})
|
||||
except:
|
||||
self.bot.log("I don't wanna tho")
|
||||
return "Can't do that"
|
||||
elif type(userCharacter[key]) is str:
|
||||
elif type(user_character[key]) is str:
|
||||
self.bot.database["starwars characters"].update_one({"_id":user},
|
||||
{"$set": {key : cmd}})
|
||||
else:
|
||||
self.bot.log("I don't wanna tho")
|
||||
return "Can't do that"
|
||||
return "Changed " + userCharacter["Name"] + "'s " + key +" to " + cmd
|
||||
return "Changed " + user_character["Name"] + "'s " + key +" to " + cmd
|
||||
else:
|
||||
self.bot.log(key+" isn't in there")
|
||||
return "Couldn't find that data. Are you sure you spelled it correctly?"
|
||||
@ -453,32 +453,32 @@ class StarWarsChar():
|
||||
self.bot.log(user+" doesn't have a character")
|
||||
return "You don't have a character. You can make one with /starwarscharacter"
|
||||
|
||||
def replaceSpaces(self,cmd : str):
|
||||
withSpaces = ["Specialization Trees","Wound Threshold","Strain Threshold","Defense - Ranged","Defense - Melee","Force Rating","Core Worlds","Outer Rim","Piloting - Planetary","Piloting - Space","Ranged - Heavy","Ranged - Light","Lightsaber Characteristic","Critical Injuries","Force Powers"]
|
||||
withoutSpaces = ["Specialization-trees","Wound-threshold","Strain-threshold","Defense-ranged","Defense-melee","Force-rating","Core-worlds","Outer-rim","Piloting-planetary","Piloting-space","Ranged-heavy","Ranged-light","Lightsaber-characteristic","Critical-injuries","Force-powers"]
|
||||
def replace_spaces(self,cmd : str):
|
||||
with_spaces = ["Specialization Trees","Wound Threshold","Strain Threshold","Defense - Ranged","Defense - Melee","Force Rating","Core Worlds","Outer Rim","Piloting - Planetary","Piloting - Space","Ranged - Heavy","Ranged - Light","Lightsaber Characteristic","Critical Injuries","Force Powers"]
|
||||
without_spaces = ["Specialization-trees","Wound-threshold","Strain-threshold","Defense-ranged","Defense-melee","Force-rating","Core-worlds","Outer-rim","Piloting-planetary","Piloting-space","Ranged-heavy","Ranged-light","Lightsaber-characteristic","Critical-injuries","Force-powers"]
|
||||
|
||||
for x, value in enumerate(withoutSpaces):
|
||||
cmd = cmd.replace(withSpaces[x],value)
|
||||
for i, value in enumerate(without_spaces):
|
||||
cmd = cmd.replace(with_spaces[i],value)
|
||||
|
||||
return cmd
|
||||
|
||||
def replaceWithSpaces(self,cmd : str):
|
||||
withSpaces = ["Specialization Trees","Wound Threshold","Strain Threshold","Defense - Ranged","Defense - Melee","Force Rating","Core Worlds","Outer Rim","Piloting - Planetary","Piloting - Space","Ranged - Heavy","Ranged - light","Lightsaber Characteristic","Critical Injuries","Force Powers"]
|
||||
withoutSpaces = ["Specialization-trees","Wound-threshold","Strain-threshold","Defense-ranged","Defense-melee","Force-rating","Core-worlds","Outer-rim","Piloting-planetary","Piloting-space","Ranged-heavy","Ranged-light","Lightsaber-characteristic","Critical-injuries","Force-powers"]
|
||||
def replace_with_spaces(self,cmd : str):
|
||||
with_spaces = ["Specialization Trees","Wound Threshold","Strain Threshold","Defense - Ranged","Defense - Melee","Force Rating","Core Worlds","Outer Rim","Piloting - Planetary","Piloting - Space","Ranged - Heavy","Ranged - light","Lightsaber Characteristic","Critical Injuries","Force Powers"]
|
||||
without_spaces = ["Specialization-trees","Wound-threshold","Strain-threshold","Defense-ranged","Defense-melee","Force-rating","Core-worlds","Outer-rim","Piloting-planetary","Piloting-space","Ranged-heavy","Ranged-light","Lightsaber-characteristic","Critical-injuries","Force-powers"]
|
||||
|
||||
for x, value in enumerate(withoutSpaces):
|
||||
cmd = cmd.replace(value,withSpaces[x])
|
||||
for i, value in enumerate(without_spaces):
|
||||
cmd = cmd.replace(value,with_spaces[i])
|
||||
|
||||
return cmd
|
||||
|
||||
async def parseChar(self, ctx, parameters : str):
|
||||
async def parse_char(self, ctx, parameters : str):
|
||||
user = f"#{ctx.author.id}"
|
||||
cmd = string.capwords(parameters.replace("+","+ ").replace("-","- ").replace(",",", "))
|
||||
returnEmbed = False
|
||||
return_embed = False
|
||||
|
||||
cmd = self.replaceSpaces(cmd)
|
||||
cmd = self.replace_spaces(cmd)
|
||||
|
||||
userCharacter = self.bot.database["starwars characters"].find_one({"_id":user})
|
||||
user_character = self.bot.database["starwars characters"].find_one({"_id":user})
|
||||
|
||||
if cmd == " ":
|
||||
cmd = ""
|
||||
@ -490,17 +490,17 @@ class StarWarsChar():
|
||||
|
||||
|
||||
if cmd == "":
|
||||
if userCharacter != None:
|
||||
title, text = self.characterSheet(userCharacter)
|
||||
text = self.replaceWithSpaces(text)
|
||||
returnEmbed = True
|
||||
if user_character != None:
|
||||
title, text = self.character_sheet(user_character)
|
||||
text = self.replace_with_spaces(text)
|
||||
return_embed = True
|
||||
else:
|
||||
self.bot.log("Makin' a character for "+self.bot.database_funcs.get_name(user))
|
||||
with open("gwendolyn/resources/star_wars/starwarstemplates.json", "r") as f:
|
||||
templates = json.load(f)
|
||||
newChar = templates["Character"]
|
||||
newChar["_id"] = user
|
||||
self.bot.database["starwars characters"].insert_one(newChar)
|
||||
with open("gwendolyn/resources/star_wars/starwarstemplates.json", "r") as file_pointer:
|
||||
templates = json.load(file_pointer)
|
||||
new_char = templates["Character"]
|
||||
new_char["_id"] = user
|
||||
self.bot.database["starwars characters"].insert_one(new_char)
|
||||
await ctx.send("Character for " + self.bot.database_funcs.get_name(user) + " created")
|
||||
else:
|
||||
if cmd == "Purge":
|
||||
@ -508,22 +508,21 @@ class StarWarsChar():
|
||||
self.bot.database["starwars characters"].delete_one({"_id":user})
|
||||
await ctx.send("Character for " + self.bot.database_funcs.get_name(user) + " deleted")
|
||||
else:
|
||||
await ctx.send(self.replaceWithSpaces(str(self.char_data(user,cmd))))
|
||||
await ctx.send(self.replace_with_spaces(str(self.char_data(user,cmd))))
|
||||
|
||||
if returnEmbed:
|
||||
em = discord.Embed(title = title, description = text, colour=0xDEADBF)
|
||||
await ctx.send(embed = em)
|
||||
if return_embed:
|
||||
embed = discord.Embed(title = title, description = text, colour=0xDEADBF)
|
||||
await ctx.send(embed = embed)
|
||||
|
||||
|
||||
|
||||
def lightsaberChar(self,user : str):
|
||||
userCharacter = self.bot.database["starwars characters"].find_one({"_id":user})
|
||||
def lightsaber_char(self,user : str):
|
||||
user_character = self.bot.database["starwars characters"].find_one({"_id":user})
|
||||
|
||||
if userCharacter != None:
|
||||
return userCharacter["Lightsaber-characteristic"]
|
||||
if user_character != None:
|
||||
return user_character["Lightsaber-characteristic"]
|
||||
|
||||
def userHasChar(self,user : str):
|
||||
userCharacter = self.bot.database["starwars characters"].find_one({"_id":user})
|
||||
|
||||
return userCharacter != None
|
||||
def user_has_char(self,user : str):
|
||||
user_character = self.bot.database["starwars characters"].find_one({"_id":user})
|
||||
|
||||
return user_character != None
|
||||
|
||||
Reference in New Issue
Block a user