Made the whole thing work

This commit is contained in:
NikolajDanger
2020-03-24 00:07:17 +01:00
parent 7a5d462a68
commit 9bb95cfa40
12 changed files with 119 additions and 40 deletions

View File

@ -6,10 +6,10 @@ import random #used by imageFunc
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
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"):
print("Rolling "+str(rollStr))
@ -107,7 +107,7 @@ def movieFunc():
ia = imdb.IMDb()
print("Picking a movie")
movs = open("movies.txt", "r")
movs = open("funcs/other/movies.txt", "r")
movlist = movs.read().split("\n")
mov = random.choice(movlist)
movs.close()
@ -140,10 +140,10 @@ def spellFunc(content):
return lookupFuncs.spellFunc(content)
def monsterFunc(content):
return lookupFuncs.spellFunc(content)
return lookupFuncs.monsterFunc(content)
def nameGen():
return generators.nameGen
return generators.nameGen()
def tavernGen():
return generators.tavernGen
return generators.tavernGen()