Merge branch 'master' of github.com:NikolajDanger/Gwendolyn

funcs/__init__.py

@@ -1 +1,7 @@
-from .gwendolynFuncs import helloFunc, roll_dice, cap, imageFunc, movieFunc, parseChar, parseRoll, spellFunc, monsterFunc, nameGen, tavernGen
+from .gwendolynFuncs import helloFunc, roll_dice, cap, imageFunc
+
+from .swfuncs import parseChar, parseRoll
+
+from .lookup import spellFunc, monsterFunc
+
+from .other import nameGen, tavernGen, movieFunc

funcs/gwendolynFuncs.py

@@ -7,11 +7,8 @@ import urllib           #used by imageFunc
 import imdb             #used by movieFunc
 
 from .roll import dice
-from .lookup import lookupFuncs
-from .other import movie, generators
-from .swfuncs import swchar, swroll
 
-def roll_dice(author, rollStr: str = "1d20"):
+def roll_dice(author : str, rollStr : str = "1d20"):
     print("Rolling "+str(rollStr))
     if rollStr == '0/0':  # easter eggs
         return("What do you expect me to do, destroy the universe?")
@@ -100,50 +97,3 @@ def imageFunc():
     print("Successfully returned an image")
     print("")
     return(image)
-
-def movieFunc():
-    try:
-    	print("Creating IMDb object")
-    	ia = imdb.IMDb()
-
-    	print("Picking a movie")
-    	movs = open("funcs/other/movies.txt", "r")
-    	movlist = movs.read().split("\n")
-    	mov = random.choice(movlist)
-    	movs.close()
-
-    	print("Searching for "+mov)
-    	s_result = ia.search_movie(mov)
-
-    	print("Getting the data")
-    	movie = s_result[0]
-    	ia.update(movie)
-    	cast = movie['cast']
-    	pcast = ""
-    	for x in range(3):
-    		if cast[x]:
-    			pcast += cast[x]['name']+", "
-    	print("Successfully ran !movie")
-    	print("")
-    	return(movie['title'], movie['plot'][0].split("::")[0], movie['cover url'].replace("150","600").replace("101","404"), pcast[:-2])
-    except:
-        print("Something bad happened...")
-        return("error","","","")
-
-def parseChar(user : str, cmd : str = ""):
-    return swchar.parseChar(user,cmd)
-
-def parseRoll(user : str, cmd : str = ""):
-    return swroll.parseRoll(user,cmd)
-
-def spellFunc(content):
-    return lookupFuncs.spellFunc(content)
-
-def monsterFunc(content):
-    return lookupFuncs.monsterFunc(content)
-
-def nameGen():
-    return generators.nameGen()
-
-def tavernGen():
-    return generators.tavernGen()

funcs/lookup/__init__.py

@@ -0,0 +1 @@
+from .lookupFuncs import spellFunc, monsterFunc

funcs/lookup/lookupFuncs.py

@@ -1,10 +1,11 @@
 import math
 import discord
 import json
+import logging
 
 from funcs import gwendolynFuncs as gf
 
-
+logging.basicConfig(filename="gwendolyn.log", level=logging.INFO)
 
 def modifier(statistic):
     mods = math.floor((statistic-10)/2)
@@ -18,15 +19,21 @@ abilities = ["acrobatics","animal_handling","arcana","athletics","deception","hi
 def monsterFunc(content):
     command = gf.cap(content.lower().replace("!monster ",""))
     print("Looking up "+command)
+    logging.info("Looking up "+command)
     if len(content.lower().split()) < 2:
-        print("Monster doesn't exist in database")
-        print("")
+        print("Monster doesn't exist in database\n")
+        logging.info("Monster doesn't exist in database\n")
         return("I don't know that monster...","","","","","")
     else:
-        data = json.load(open('funcs/lookup/monsters.json', encoding = "utf8"))
+        data = json.load(open('resources/monsters.json', encoding = "utf8"))
         for monster in data:
-            print("Found it!")
             if str(command) == monster["name"]:
+                print("Found it!")
+                logging.info("Found it!")
+
+                # Looks at the information about the monster and returns that information
+                # in seperate variables, allowing Gwendolyn to know where to seperate
+                # the messages
                 if monster["subtype"] != "":
                     typs = (monster["type"]+" ("+monster["subtype"]+")")
                 else:
@@ -96,29 +103,40 @@ def monsterFunc(content):
                     hit_dice += (" - "+str(con_mod * int(monster["hit_dice"].replace("d"," ").split()[0])*(-1)))
                 if con_mod > 0:
                     hit_dice += (" + "+str(con_mod * int(monster["hit_dice"].replace("d"," ").split()[0])))
+                    
                 new_part = "\n--------------------"
+
                 monster_type = monster["size"]+" "+typs+", "+monster["alignment"]+"*"
+
                 basic_info = "\n**Armor Class** "+str(monster["armor_class"])+"\n**Hit Points** "+str(monster["hit_points"])+" ("+hit_dice+")\n**Speed **"+monster["speed"]+new_part+"\n"
+
                 text1 = (monster_type+new_part+basic_info+stats+new_part+saving_throws+skills+vulnerabilities+resistances+immunities+c_immunities+"\n**Senses** "+monster["senses"]+"\n**Languages** "+monster["languages"]+"\n**Challenge** "+monster["challenge_rating"])
+
                 text2 = (spec_ab)
                 text3 = (act)
                 text4 = (react)
                 text5 = (leg_act)
+
                 print("Returning monster information")
-                print("")
+                logging.info("Returning monster information")
                 return(str(command),text1,text2,text3,text4,text5)
-        print("")
+        print("Couldn't find monster")
+        logging.info("Couldn't find monster")
         return("I don't know that monster...","","","","","")
 
 def spellFunc(content):
     command = gf.cap(content.lower().replace("!spell ",""))
     print("Looking up "+command)
-    data = json.load(open('funcs/lookup/spells.json', encoding = "utf8"))
+    logging.info("Looking up "+command)
+    data = json.load(open('resources/spells.json', encoding = "utf8"))
     if str(command) in data:
         print("Returning spell information")
+        logging.info("Returning spell information")
         spell_output = ("***"+str(command)+"***\n*"+str(data[str(command)]["level"])+" level "+str(data[str(command)]["school"])+"\nCasting Time: "+str(data[str(command)]["casting_time"])+"\nRange: "+str(data[str(command)]["range"])+"\nComponents: "+str(data[str(command)]["components"])+"\nDuration: "+str(data[str(command)]["duration"])+"*\n \n"+str(data[str(command)]["description"]))
     else:
         print("I don't know that spell")
+        logging.info("I don't know that spell")
         spell_output = "I don't think that's a spell"
     print("Successfully ran !spell")
+    logging.info("Successfully ran !spell")
     return(spell_output)

funcs/other/__init__.py

@@ -0,0 +1,2 @@
+from .generators import nameGen, tavernGen
+from .movie import movieFunc

funcs/other/generators.py

@@ -1,14 +1,15 @@
 import numpy as np
 import random
+import logging
 
-
+logging.basicConfig(filename="gwendolyn.log", level=logging.INFO)
 
 def make_pairs(corpus):
     for i in range(len(corpus)-1):
         yield (corpus[i], corpus[i+1])
 
 def nameGen():
-    names = open('funcs/other/names.txt', encoding='utf8').read()
+    names = open('resources/names.txt', encoding='utf8').read()
     corpus = list(names)
 
     pairs = make_pairs(corpus)
@@ -36,13 +37,15 @@ def nameGen():
         if new_letter == "\n":
             done = True
     genName = "".join(chain)
-    print("Generated "+genName+"\n")
+    print("Generated "+genName)
+    logging.info("Generated "+genName)
     return(genName)
 
 def tavernGen():
-    fp = ["The Silver","The Golden","The Staggering","The Laughing","The Prancing","The Gilded","The Running","The Howling","The Slaughtered","The Leering","The Drunken","The Leaping","The Roaring","The Frowning","The Lonely","The Wandering","The Mysterious","The Barking","The Black","The Gleaming","The Tap-Dancing","The Sad","The Sexy","The Artificial","The Groovy","The Merciful","The Confused","The Pouting","The Horny","The Okay","The Friendly","The Hungry","The Handicapped","The Fire-breathing","The One-Eyed","The Psychotic","The Mad","The Evil","The Idiotic"]
-    sp = ["Eel","Dolphin","Dwarf","Pegasus","Pony","Rose","Stag","Wolf","Lamb","Demon","Goat","Spirit","Horde","Jester","Mountain","Eagle","Satyr","Dog","Spider","Star","Dad","Rat","Jeremy","Mouse","Unicorn","Pearl","Ant","Crab","Penguin","Octopus","Lawyer","Ghost","Toad","Handjob","Immigrant","SJW","Dragon","Bard","Sphinx","Soldier","Salmon","Owlbear","Kite","Frost Giant","'̶̧̗̣̰̞̜̤̦̖͗̈́̏͊͒͜+̴͎̰͓̱̻̝̬̼͕̥͍̪͕̮͙͂͝*̶̲̓̊̏'̷̥̺͈̞͒̆̏͋̀̐̇͆̓͊͠'̷͖̱̟̟͉̝̪̮͕̃͑́̍͆̓̌͒̄͛̇͘̚ͅ!̷̡̻̈́#̸̳̰̿̿̏͐̏̓̌̚̚͠¨̷̟͙̱͎̟̱̅̀͋̇͗͂͋͋̕͘´̴̡̡͎͔̦̜̟̼̠̰̤͋́̀̓́̄́̏͂̀͜.̸̛̭͍̮̜͑̋̀̋̈́̇̆̆̌_̸̡̥̜̞̝̮̑͑̓̓̇͜͜^̴̡̢͕̠̖̤̺̭̮̙͕̼̳̺̼͋̿̏̎̑͑̊̀̅͐̚͝͝","Arsonist"]
+    fp = ["The Silver","The Golden","The Staggering","The Laughing","The Prancing","The Gilded","The Running","The Howling","The Slaughtered","The Leering","The Drunken","The Leaping","The Roaring","The Frowning","The Lonely","The Wandering","The Mysterious","The Barking","The Black","The Gleaming","The Tap-Dancing","The Sad","The Sexy","The Artificial","The Groovy","The Merciful","The Confused","The Pouting","The Horny","The Okay","The Friendly","The Hungry","The Handicapped","The Fire-breathing","The One-Eyed","The Psychotic","The Mad","The Evil","The Idiotic","The Trusty","The Busty"]
+    sp = ["Eel","Dolphin","Dwarf","Pegasus","Pony","Rose","Stag","Wolf","Lamb","Demon","Goat","Spirit","Horde","Jester","Mountain","Eagle","Satyr","Dog","Spider","Star","Dad","Rat","Jeremy","Mouse","Unicorn","Pearl","Ant","Crab","Penguin","Octopus","Lawyer","Ghost","Toad","Handjob","Immigrant","SJW","Dragon","Bard","Sphinx","Soldier","Salmon","Owlbear","Kite","Frost Giant","Arsonist"]
     tp = [" Tavern"," Inn","","","","","","","","",""]
     genTav = random.choice(fp)+" "+random.choice(sp)+random.choice(tp)
-    print("Generated "+genTav+"\n")
+    print("Generated "+genTav)
+    logging.info("Generated "+genTav)
     return(genTav)

funcs/other/movie.py

@@ -1,28 +1,39 @@
 import imdb
 import random
+import logging
+
+logging.basicConfig(filename="gwendolyn.log", level=logging.INFO)
 
 def movieFunc():
-	print("Running !movie")
-	print("Creating IMDb object")
-	ia = imdb.IMDb()
+	try:
+		print("Creating IMDb object")
+		logging.info("Creating IMDb object")
+		ia = imdb.IMDb()
 
-	print("Picking a movie")
-	movs = open("movies.txt", "r")
-	movlist = movs.read().split("\n")
-	mov = random.choice(movlist)
-	movs.close()
+		print("Picking a movie")
+		logging.info("Picking a movie")
+		movs = open("resources/movies.txt", "r")
+		movlist = movs.read().split("\n")
+		mov = random.choice(movlist)
+		movs.close()
 
-	print("Searching")
-	s_result = ia.search_movie(mov)
+		print("Searching for "+mov)
+		logging.info("Searching for "+mov)
+		s_result = ia.search_movie(mov)
 
-	print("Picking the movie")
-	movie = s_result[0]
-	ia.update(movie)
-	cast = movie['cast']
-	pcast = ""
-	for x in range(3):
-		if cast[x]:
-			pcast += cast[x]['name']+", "
-	print("Successfully ran !movie")
-	print("")
-	return(movie['title'], movie['plot'][0].split("::")[0], movie['cover url'].replace("150","600").replace("101","404"), pcast[:-2])
+		print("Getting the data")
+		logging.info("Getting the data")
+		movie = s_result[0]
+		ia.update(movie)
+		cast = movie['cast']
+		pcast = ""
+		for x in range(3):
+			if cast[x]:
+				pcast += cast[x]['name']+", "
+		print("Successfully ran !movie")
+		logging.info("Successfully ran !movie")
+		return(movie['title'], movie['plot'][0].split("::")[0], movie['cover url'].replace("150","600").replace("101","404"), pcast[:-2])
+	except:
+		print("Something bad happened...")
+		logging.info("Something bad happened...")
+		return("error","","","")

funcs/other/names.txt

@@ -1,307 +0,0 @@
-Eddard Ned Stark
-Robert Baratheon
-Jaime Lannister
-Catelyn Stark
-Cersei Lannister
-Daenerys Targaryen
-Jorah Mormont
-Viserys Targaryen
-Jon Snow
-Sansa Stark
-Arya Stark
-Robb Stark
-Theon Greyjoy
-Bran Stark
-Joffrey Baratheon
-Sandor The Hound Clegane
-Tyrion Lannister
-Khal Drogo
-Petyr Littlefinger Baelish
-Davos Seaworth
-Samwell Tarly
-Stannis Baratheon
-Melisandre
-Jeor Mormont
-Bronn
-Varys
-Shae
-Margaery Tyrell
-Tywin Lannister
-Talisa Maegyr
-Ygritte
-Gendry
-Tormund Giantsbane
-Brienne of Tarth
-Ramsay Bolton
-Gilly
-Daario Naharis
-Missandei
-Ellaria Sand
-Tommen Baratheon
-Jaqen H'ghar
-Roose Bolton
-The High Sparrow
-Grand Maester Pycelle
-Meryn Trant
-Hodor
-Grenn
-Osha
-Rickon Stark
-Ros
-Gregor Clegane
-Janos Slynt
-Lancel Lannister
-Myrcella Baratheon
-Rodrik Cassel
-Maester Luwin
-Irri
-Doreah
-Kevan Lannister
-Barristan Selmy
-Rast
-Maester Aemon
-Pypar
-Alliser Thorne
-Othell Yarwyck
-Loras Tyrell
-Hot Pie
-Beric Dondarrion
-Podrick Payne
-Eddison Tollett
-Yara Greyjoy
-Selyse Florent
-Little Sam
-Grey Worm
-Qyburn
-Olenna Tyrell
-Shireen Baratheon
-Meera Reed
-Jojen Reed
-Thoros of Myr
-Yohn Royce
-Olly
-Mace Tyrell
-The Waif
-Bowen Marsh
-Aragorn
-Arwen
-Bilbo
-Boromir
-Celeborn
-Denethor
-Elrond
-Eomer
-Eowyn
-Faramir
-Frodo
-Galadriel
-Gandalf
-Gimli
-Gollum
-Legolas
-Merry
-Mouth of Sauron
-Old Man Willow
-Pippin
-Radagast
-Sam
-Saruman
-Sauron
-Shelob
-Theoden
-Tom Bombadil
-Treebeard
-Witch king
-Wormtongue
-Adon
-Methrammar Aerasume
-Sernius Alathar
-Alaundo
-Alias
-Alicia Kendrick
-Arganth Snarrl
-Khelben Arunsun
-Jorus Azuremantle
-Berg'inyon Baenre
-Dantrag Baenre
-Gromph Baenre
-Liriel Baenre
-Quenthel Baenre
-Triel Baenre
-Yvonnel Baenre
-Balduron
-Bruenor Battlehammer
-Akabar Bel Akash
-Belhifet
-Aballister Bonaduce
-Erevis Cale
-Captain Deudermont
-Catti-brie
-Clacker
-Companions of the Hall
-Elaith Craulnober
-Cyric
-Danica Maupoissant
-Montolio Debrouchee
-Briza Do'Urden
-Dinin Do'Urden
-Malice Do'Urden
-Maya Do'Urden
-Nalfein Do'Urden
-Shi'nayne Do'Urden
-Vartha Do'Urden
-Vierna Do'Urden
-Drizzt Do'Urden
-Dove Falconhand
-Dragonbait
-Gareth Dragonsbane
-Elk Tribe
-Ellifain
-Elminster
-Artemis Entreri
-Errtu
-Galaeron Nihmedu
-Volothamp Geddarm
-Halisstra Melarn
-Halueth Never
-Harkle Harpell
-Taern Hornblade
-Imoen
-Ingeloakastimizilian
-Innovindil
-Ivan and Pikel Bouldershoulder
-Jander Sunstar
-Jarlaxle
-Kelemvor Lyonsbane
-Kierkan Rufo
-Manshoon
-Obould Many-Arrows
-Minder the Golem
-Minsc
-Pharaun Mizzrym
-Arilyn Moonblade
-Narnra Shalace
-Nasher Alagondar
-Taegan Nightwind
-Nimor Imphraezl
-Thibbledorf Pwent
-Regis Rumblebelly
-Rizzen Do'Urden
-Sammaster
-Seven Sisters
-Shandril Shessair
-Alustriel Silverhand
-The Simbul
-Storm Silverhand
-Sylune
-Szass Tam
-Tarathiel
-Araevin Teshurr
-Danilo Thann
-Urlgen Threefist
-Valas Hune
-Vangerdahast
-Wulfgar
-Finder Wyvernspur
-Yharaskrik
-Zaknafein Do'Urden
-Johnny Depp
-Arnold Schwarzenegger
-Jim Carrey
-Emma Watson
-Daniel Radcliffe
-Leonardo DiCaprio
-Tom Cruise
-Brad Pitt
-Charles Chaplin
-Morgan Freeman
-Tom Hanks
-Hugh Jackman
-Matt Damon
-Sylvester Stallone
-Will Smith
-Clint Eastwood
-Cameron Diaz
-George Clooney
-Steven Spielberg
-Harrison Ford
-Robert De Niro
-Al Pacino
-Robert Downey Jr.
-Russell Crowe
-Liam Neeson
-Kate Winslet
-Mark Wahlberg
-Natalie Portman
-Pierce Brosnan
-Sean Connery
-Orlando Bloom
-Dwayne Johnson
-Jackie Chan
-Angelina Jolie
-Adam Sandler
-Scarlett Johansson
-Heath Ledger
-Anne Hathaway
-Jessica Alba
-Edward Norton
-Keira Knightley
-Bradley Cooper
-Will Ferrell
-Julia Roberts
-Nicolas Cage
-Daniel Craig
-Keanu Reeves
-Ian McKellen
-Halle Berry
-Bruce Willis
-Samuel L. Jackson
-Ben Stiller
-Tommy Lee Jones
-Antonio Banderas
-Denzel Washington
-Steve Carell
-Shia LaBeouf
-Megan Fox
-James Franco
-Mel Gibson
-Vin Diesel
-Tim Allen
-Robin Williams
-Kevin Spacey
-Jason Biggs
-Seann William Scott
-Jean-Claude Van Damme
-Zach Galifianakis
-Owen Wilson
-Christian Bale
-Peter Jackson
-Sandra Bullock
-Bruce Lee
-Drew Barrymore
-Macaulay Culkin
-Jack Nicholson
-Bill Murray
-Sigourney Weaver
-Jake Gyllenhaal
-Kamal Haasan
-Jason Statham
-Jet Li
-Kate Beckinsale
-Rowan Atkinson
-Marlon Brando
-John Travolta
-Channing Tatum
-Ben Affleck
-Shah Rukh Khan
-Jennifer Aniston
-Emma Stone
-Chris Hemsworth
-James McAvoy
-James Cameron
-Amitabh Bachchan
-Brendan Fraser
-Rachel McAdams
-Tom Hiddleston
-Aamir Khan
-Rajinikanth

funcs/roll/dice.py

@@ -10,7 +10,7 @@ import numexpr
 
 from . import errors
 
-log = logging.getLogger(__name__)
+logging.basicConfig(filename="gwendolyn.log", level=logging.INFO)
 
 VALID_OPERATORS = 'k|rr|ro|mi|ma|ra|e|p'
 VALID_OPERATORS_ARRAY = VALID_OPERATORS.split('|')
@@ -41,10 +41,10 @@ def get_roll_comment(rollStr):
         no_comment = ''
         dice_set = re.split('([-+*/().=])', rollStr)
         dice_set = [d for d in dice_set if not d in (None, '')]
-        log.debug("Found dice set: " + str(dice_set))
+        logging.debug("Found dice set: " + str(dice_set))
         for index, dice in enumerate(dice_set):
             match = DICE_PATTERN.match(dice)
-            log.debug("Found dice group: " + str(match.groups()))
+            logging.debug("Found dice group: " + str(match.groups()))
             no_comment += dice.replace(match.group(5), '')
             if match.group(5):
                 comment = match.group(5) + ''.join(dice_set[index + 1:])
@@ -85,10 +85,10 @@ class Roll(object):
             # parse each, returning a SingleDiceResult
             dice_set = re.split('([-+*/().=])', rollStr)
             dice_set = [d for d in dice_set if not d in (None, '')]
-            log.debug("Found dice set: " + str(dice_set))
+            logging.debug("Found dice set: " + str(dice_set))
             for index, dice in enumerate(dice_set):
                 match = DICE_PATTERN.match(dice)
-                log.debug("Found dice group: " + str(match.groups()))
+                logging.debug("Found dice group: " + str(match.groups()))
                 # check if it's dice
                 if match.group(1):
                     roll = self.roll_one(dice.replace(match.group(5), ''), adv)
@@ -157,7 +157,7 @@ class Roll(object):
                               skeleton=skeletonReply, raw_dice=self)
         except Exception as ex:
             if not isinstance(ex, (SyntaxError, KeyError, errors.AvraeException)):
-                log.error('Error in roll() caused by roll {}:'.format(rollStr))
+                logging.error('Error in roll() caused by roll {}:'.format(rollStr))
                 traceback.print_exc()
             return DiceResult(verbose_result="Invalid input: {}".format(ex))
 

funcs/swfuncs/__init__.py

@@ -0,0 +1,2 @@
+from .swchar import parseChar
+from .swroll import parseRoll

funcs/swfuncs/characters.json

@@ -1,73 +0,0 @@
-{
-    "Nikolaj": {
-        "Name": "Jared",
-        "Species": "",
-        "Career": "",
-        "Specialization Trees": [],
-        "Soak": 0,
-        "Wound Threshold": 0,
-        "Wounds": 0,
-        "Strain Threshold": 0,
-        "Strain": 0,
-        "Defense, Ranged": 0,
-        "Defense, Melee": 0,
-        "Force Rating": 0,
-        "Characteristics": {
-            "Brawn": 5,
-            "Agility": 0,
-            "Intellect": 0,
-            "Cunning": 0,
-            "Willpower": 0,
-            "Presence": 0
-        },
-        "Skills": {
-            "Astrogation": 0,
-            "Athletics": 0,
-            "Brawl": 1,
-            "Charm": 0,
-            "Coercion": 0,
-            "Computers": 0,
-            "Cool": 0,
-            "Coordination": 0,
-            "Core Worlds": 0,
-            "Discipline": 0,
-            "Gunnery": 0,
-            "Leadership": 0,
-            "Lightsaber": 0,
-            "Lore": 0,
-            "Mechanics": 0,
-            "Medicine": 0,
-            "Melee": 0,
-            "Negotiation": 0,
-            "Outer Rim": 0,
-            "Perception": 0,
-            "Piloting - Planetary": 0,
-            "Piloting - Space": 0,
-            "Ranged - Heavy": 0,
-            "Ranged - Light": 0,
-            "Resilience": 0,
-            "Skullduggery": 0,
-            "Stealth": 0,
-            "Streetwise": 0,
-            "Survival": 0,
-            "Underworld": 0,
-            "Vigilance": 0,
-            "Xenology": 0
-        },
-        "Lightsaber Characteristic": "Brawn",
-        "Obligations": {},
-        "Morality": {
-            "Emotional Weakness": "",
-            "Emotional Strength": "",
-            "Conflict": "",
-            "Morality": ""
-        },
-        "Credits": 0,
-        "Equipment": [],
-        "Armor": "",
-        "Critical Injuries": {},
-        "Weapons": {},
-        "Talents": {},
-        "Force Powers": {}
-    }
-}

funcs/swfuncs/skills.json

@@ -1,34 +0,0 @@
-{
-    "Astrogation" : "Intellect",
-    "Computers" : "Intellect",
-    "Cool" : "Presence",
-    "Vigilance" : "Willpower",
-    "Mechanics" : "Intellect",
-    "Melee" : "Brawn",
-    "Perception" : "Cunning",
-    "Piloting - Space" : "Agility",
-    "Ranged - Heavy" : "Agility",
-    "Ranged - Light" : "Agility",
-    "Athletics" : "Brawn",
-    "Coercion" : "Willpower",
-    "Coordination" : "Agility",
-    "Charm" : "Presence",
-    "Medicine" : "Intellect",
-    "Negotiation" : "Presence",
-    "Piloting - Planetary" : "Agility",
-    "Stealth" : "Agility",
-    "Skullduggery" : "Cunning",
-    "Brawl" : "Brawn",
-    "Discipline" : "Willpower",
-    "Gunnery" : "Agility",
-    "Core Worlds" : "Intellect",
-    "Outer Rim" : "Intellect",
-    "Underworld" : "Intellect",
-    "Leadership" : "Presence",
-    "Lore" : "Intellect",
-    "Resilience" : "Brawn",
-    "Streetwise" : "Cunning",
-    "Survival" : "Cunning",
-    "Xenology" : "Intellect",
-    "Lightsaber" : "Brawn"
-}

funcs/swfuncs/skills.txt

@@ -1,31 +0,0 @@
-Astrogation
-Computers
-Cool
-Vigilance
-Mechanics
-Melee
-Perception
-Piloting - Space
-Ranged - Heavy
-Ranged - Light
-Athletics
-Coercion
-Coordination
-Charm
-Medicine
-Negotiation
-Piloting - Planetary
-Stealth
-Skullduggery
-Brawl
-Discipline
-Gunnery
-Core Worlds
-Outer Rim
-Underworld
-Leadership
-Lore
-Resilience
-Streetwise
-Survival
-Xenology

funcs/swfuncs/swchar.py

@@ -1,8 +1,11 @@
 import json
 import string
+import logging
+
+logging.basicConfig(filename="gwendolyn.log", level=logging.INFO)
 
 def getName(user : str):
-    with open("funcs/swfuncs/characters.json", "r") as f:
+    with open("resources/swcharacters.json", "r") as f:
         data = json.load(f)
     
     if user in data:
@@ -81,7 +84,7 @@ def characterSheet(character : dict):
     return name, text1+"\n\n"+text2+divider+text3
 
 def charData(user : str,cmd : str):
-    with open("funcs/swfuncs/characters.json", "r") as f:
+    with open("resources/swcharacters.json", "r") as f:
         data = json.load(f)
 
     key = string.capwords(cmd.split(" ")[0])
@@ -107,7 +110,7 @@ def charData(user : str,cmd : str):
 
                     if type(lookUpResult) is dict:
                         data[user][key] = lookUpResult
-                        with open("funcs/swfuncs/characters.json", "w") as f:
+                        with open("resources/swcharacters.json", "w") as f:
                             json.dump(data,f,indent = 4)
                         return "Changed " + data[user]["Name"] + "'s " + key
                     else:
@@ -133,7 +136,7 @@ def charData(user : str,cmd : str):
                         return "Can't add that"
                 else:
                     data[user][key] = cmd
-                    with open("funcs/swfuncs/characters.json", "w") as f:
+                    with open("resources/swcharacters.json", "w") as f:
                             json.dump(data,f,indent = 4)
                     return "Changed " + data[user]["Name"] + "'s " + key +" to " + cmd
         else:
@@ -142,7 +145,7 @@ def charData(user : str,cmd : str):
         return "You don't have a character. You can make one with !swchar"
 
 def parseChar(user : str, cmd : str):
-    with open("funcs/swfuncs/characters.json", "r") as f:
+    with open("resources/swcharacters.json", "r") as f:
         data = json.load(f)
 
     if cmd == " ":
@@ -157,25 +160,30 @@ def parseChar(user : str, cmd : str):
         if user in data:
             return characterSheet(data[user])
         else:
-            with open("funcs/swfuncs/templates.json", "r") as f:
+            with open("resources/swtemplates.json", "r") as f:
                 templates = json.load(f)
             newChar = templates["Character"]
             data[user] = newChar
-            with open("funcs/swfuncs/characters.json", "w") as f:
+            with open("resources/swcharacters.json", "w") as f:
                 json.dump(data,f,indent = 4)
                 return "", "Character for " + user + " created"
     else:
+        if cmd == "purge":
+            del data[user]
+            with open("resources/swcharacters.json", "w") as f:
+                json.dump(data,f,indent = 4)
+                return "", "Character for " + user + " deleted"
         return "", charData(user,cmd)
 
 def lightsaberChar(user : str):
-    with open("funcs/swfuncs/characters.json", "r") as f:
+    with open("resources/swcharacters.json", "r") as f:
         data = json.load(f)
 
     if user in data:
         return data[user]["Lightsaber Characteristic"]
 
 def userHasChar(user : str):
-    with open("funcs/swfuncs/characters.json", "r") as f:
+    with open("resources/swcharacters.json", "r") as f:
         data = json.load(f)
 
     return user in data

funcs/swfuncs/swroll.py

@@ -2,10 +2,11 @@ import random
 import re
 import string
 import json
+import os
 
 from . import swchar
 
-with open("funcs/swfuncs/skills.json", "r") as f:
+with open("resources/swskills.json", "r") as f:
     skillData = json.load(f)
 
 def roll(abi : int = 1, prof : int = 0, dif : int = 3, cha : int = 0, boo : int = 0, setb : int = 0, force : int = 0):

funcs/swfuncs/templates.json

@@ -1,73 +0,0 @@
-{
-    "Character": {
-        "Name": "New Character",
-        "Species": "",
-        "Career": "",
-        "Specialization Trees": [],
-        "Soak": 0,
-        "Wound Threshold": 0,
-        "Wounds": 0,
-        "Strain Threshold": 0,
-        "Strain": 0,
-        "Defense, Ranged": 0,
-        "Defense, Melee": 0,
-        "Force Rating": 0,
-        "Characteristics": {
-            "Brawn": 0,
-            "Agility": 0,
-            "Intellect": 0,
-            "Cunning": 0,
-            "Willpower": 0,
-            "Presence": 0
-        },
-        "Skills": {
-            "Astrogation": 0,
-            "Athletics": 0,
-            "Brawl": 0,
-            "Charm": 0,
-            "Coercion": 0,
-            "Computers": 0,
-            "Cool": 0,
-            "Coordination": 0,
-            "Core Worlds": 0,
-            "Discipline": 0,
-            "Gunnery": 0,
-            "Leadership": 0,
-            "Lightsaber": 0,
-            "Lore": 0,
-            "Mechanics": 0,
-            "Medicine": 0,
-            "Melee": 0,
-            "Negotiation": 0,
-            "Outer Rim": 0,
-            "Perception": 0,
-            "Piloting - Planetary": 0,
-            "Piloting - Space": 0,
-            "Ranged - Heavy": 0,
-            "Ranged - Light": 0,
-            "Resilience": 0,
-            "Skullduggery": 0,
-            "Stealth": 0,
-            "Streetwise": 0,
-            "Survival": 0,
-            "Underworld": 0,
-            "Vigilance": 0,
-            "Xenology": 0
-        },
-        "Lightsaber Characteristic": "Brawn",
-        "Obligations": {},
-        "Morality": {
-            "Emotional Weakness": "",
-            "Emotional Strength": "",
-            "Conflict": "",
-            "Morality": ""
-        },
-        "Credits": 0,
-        "Equipment": [],
-        "Armor": "",
-        "Critical Injuries": {},
-        "Weapons": {},
-        "Talents": {},
-        "Force Powers": {}
-    }
-}