From bc7048d493546e4a87aa453ecd8fa5e627c3596d Mon Sep 17 00:00:00 2001 From: NikolajDanger Date: Mon, 23 Mar 2020 22:34:53 +0100 Subject: [PATCH] cleaning up --- .vscode/settings.json | 3 + Gwendolyn.py | 35 +- dice.py => funcs/dice/dice.py | 0 errors.py => funcs/dice/errors.py | 0 GwendolynFuncs.py => funcs/gwendolynFuncs.py | 33 +- help.txt => funcs/help.txt | 4 + lookupFuncs.py => funcs/lookup/lookupFuncs.py | 16 +- monsters.json => funcs/lookup/monsters.json | 0 spells.json => funcs/lookup/spells.json | 0 names.txt => funcs/names.txt | 0 generators.py => funcs/other/generators.py | 6 +- movie.py => funcs/other/movie.py | 0 funcs/other/movies.txt | 1167 +++++++++++++++++ .../swfuncs/characters.json | 0 skills.json => funcs/swfuncs/skills.json | 0 skills.txt => funcs/swfuncs/skills.txt | 0 swchar.py => funcs/swfuncs/swchar.py | 0 swroll.py => funcs/swfuncs/swroll.py | 12 +- .../swfuncs/templates.json | 0 movies.txt | 645 --------- testing.py | 4 - 21 files changed, 1234 insertions(+), 691 deletions(-) create mode 100644 .vscode/settings.json rename dice.py => funcs/dice/dice.py (100%) rename errors.py => funcs/dice/errors.py (100%) rename GwendolynFuncs.py => funcs/gwendolynFuncs.py (87%) rename help.txt => funcs/help.txt (57%) rename lookupFuncs.py => funcs/lookup/lookupFuncs.py (91%) rename monsters.json => funcs/lookup/monsters.json (100%) rename spells.json => funcs/lookup/spells.json (100%) rename names.txt => funcs/names.txt (100%) rename generators.py => funcs/other/generators.py (94%) rename movie.py => funcs/other/movie.py (100%) create mode 100644 funcs/other/movies.txt rename characters.json => funcs/swfuncs/characters.json (100%) rename skills.json => funcs/swfuncs/skills.json (100%) rename skills.txt => funcs/swfuncs/skills.txt (100%) rename swchar.py => funcs/swfuncs/swchar.py (100%) rename swroll.py => funcs/swfuncs/swroll.py (93%) rename templates.json => funcs/swfuncs/templates.json (100%) delete mode 100644 movies.txt delete mode 100644 testing.py diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..10113a6 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "python.pythonPath": "C:\\Users\\Nikolaj\\AppData\\Local\\Programs\\Python\\Python38-32\\python.exe" +} \ No newline at end of file diff --git a/Gwendolyn.py b/Gwendolyn.py index 0df240d..4e01b37 100644 --- a/Gwendolyn.py +++ b/Gwendolyn.py @@ -3,11 +3,7 @@ import asyncio import pickle import time -from GwendolynFuncs import roll_dice, helloFunc, imageFunc, movieFunc, cap -from lookupFuncs import monsterFunc, spellFunc -from generators import nameGen, tavernGen -from swroll import parseRoll -from swchar import parseChar +from funcs import gwendolynFuncs client = discord.Client() @@ -32,26 +28,25 @@ async def on_message(message): if message.content.lower().startswith("!hello"): localtime = time.asctime( time.localtime(time.time()) ) print("\n"+localtime+"\n"+message.author.name+" ran !hello") - await message.channel.send(helloFunc(message.author.name)) + await message.channel.send(gwendolynFuncs.helloFunc(message.author.name)) elif message.content.lower().startswith("!roll"): localtime = time.asctime( time.localtime(time.time()) ) print("\n"+localtime+"\n"+message.author.name+" ran !roll") if message.content.lower() == "!roll" or message.content.lower() == "!roll ": - print(roll_dice(message.author.name)) - await message.channel.send(roll_dice(message.author.name)) + await message.channel.send(gwendolynFuncs.roll_dice(message.author.name)) else: - await message.channel.send(roll_dice(message.author.name, message.content.lower().replace("!roll",""))) + await message.channel.send(gwendolynFuncs.roll_dice(message.author.name, message.content.lower().replace("!roll",""))) elif message.content.lower().startswith("!spell "): localtime = time.asctime( time.localtime(time.time()) ) print("\n"+localtime+"\n"+message.author.name+" ran !spell") - await message.channel.send(spellFunc(message.content)) + await message.channel.send(gwendolynFuncs.spellFunc(message.content)) elif message.content.lower().startswith("!monster "): localtime = time.asctime( time.localtime(time.time()) ) print("\n"+localtime+"\n"+message.author.name+" ran !monster") - title, text1, text2, text3, text4, text5 = monsterFunc(message.content) + title, text1, text2, text3, text4, text5 = gwendolynFuncs.monsterFunc(message.content) em1 = discord.Embed(title = title, description = text1, colour=0xDEADBF) await message.channel.send(embed = em1) if text2 != "": @@ -99,13 +94,13 @@ async def on_message(message): elif message.content.lower().startswith("!image"): localtime = time.asctime( time.localtime(time.time()) ) print("\n"+localtime+"\n"+message.author.name+" ran !image") - await message.channel.send(imageFunc()) + await message.channel.send(gwendolynFuncs.imageFunc()) elif message.content.lower().startswith("!movie"): localtime = time.asctime( time.localtime(time.time()) ) print("\n"+localtime+"\n"+message.author.name+" ran !movie") async with message.channel.typing(): - title, plot, cover, cast = movieFunc() + title, plot, cover, cast = gwendolynFuncs.movieFunc() if title == "error": await message.channel.send("An error occurred. Try again") else: @@ -117,15 +112,15 @@ async def on_message(message): elif message.content.lower().startswith("!name"): localtime = time.asctime( time.localtime(time.time()) ) print("\n"+localtime+"\n"+message.author.name+" ran !name") - await message.channel.send(nameGen()) + await message.channel.send(gwendolynFuncs.nameGen()) elif message.content.lower().startswith("!tavern"): localtime = time.asctime( time.localtime(time.time()) ) print("\n"+localtime+"\n"+message.author.name+" ran !tavern") - await message.channel.send(tavernGen()) + await message.channel.send(gwendolynFuncs.tavernGen()) elif message.content.lower().startswith("!game "): - gamePlaying = cap(message.content.lower().replace("!game ","")) + gamePlaying = gwendolynFuncs.cap(message.content.lower().replace("!game ","")) localtime = time.asctime( time.localtime(time.time()) ) print("\n"+localtime+"\n"+message.author.name+" ran !game, changing the game to '"+gamePlaying+"'") game = discord.Game(gamePlaying) @@ -134,14 +129,14 @@ async def on_message(message): elif message.content.lower().startswith("!swroll"): localtime = time.asctime( time.localtime(time.time()) ) print("\n"+localtime+"\n"+message.author.name+" ran !swroll") - command = cap(message.content.lower().replace("!swroll","")) - await message.channel.send(parseRoll(message.author.name,command)) + command = gwendolynFuncs.cap(message.content.lower().replace("!swroll","")) + await message.channel.send(gwendolynFuncs.parseRoll(message.author.name,command)) elif message.content.lower().startswith("!swchar"): localtime = time.asctime(time.localtime(time.time())) print("\n"+localtime+"\n"+message.author.name+" ran !swchar") - command = cap(message.content.lower().replace("!swchar","")) - title, desc = parseChar(message.author.name,command) + command = gwendolynFuncs.cap(message.content.lower().replace("!swchar","")) + title, desc = gwendolynFuncs.parseChar(message.author.name,command) if title != "": em1 = discord.Embed(title = title, description = desc, colour=0xDEADBF) await message.channel.send(embed = em1) diff --git a/dice.py b/funcs/dice/dice.py similarity index 100% rename from dice.py rename to funcs/dice/dice.py diff --git a/errors.py b/funcs/dice/errors.py similarity index 100% rename from errors.py rename to funcs/dice/errors.py diff --git a/GwendolynFuncs.py b/funcs/gwendolynFuncs.py similarity index 87% rename from GwendolynFuncs.py rename to funcs/gwendolynFuncs.py index d7fe92e..96df2f2 100644 --- a/GwendolynFuncs.py +++ b/funcs/gwendolynFuncs.py @@ -1,4 +1,4 @@ -from lxml import etree #used by imageFunc +import lxml.etree #used by imageFunc import re #used by roll_dice import datetime #used by helloFunc import json #used by spellFunc @@ -6,7 +6,10 @@ import random #used by imageFunc import urllib #used by imageFunc import imdb #used by movieFunc -from dice import roll +from dice 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)) @@ -17,7 +20,7 @@ def roll_dice(author, rollStr: str = "1d20"): if re.search('(^|\s+)(adv|dis)(\s+|$)', rollStr) is not None: adv = 1 if re.search('(^|\s+)adv(\s+|$)', rollStr) is not None else -1 rollStr = re.sub('(adv|dis)(\s+|$)', '', rollStr) - res = roll(rollStr, adv=adv) + res = dice.roll(rollStr, adv=adv) out = res.result outStr = author + ' :game_die:\n' + out if len(outStr) > 1999: @@ -27,7 +30,9 @@ def roll_dice(author, rollStr: str = "1d20"): print("Successfully ran !roll") print("") return(outputs) + no_caps_list = ["of","the"] + def cap(s): word_number = 0 lst = s.split() @@ -64,8 +69,6 @@ def helloFunc(author): return("Why hello, "+str(author)) def imageFunc(): - mh = 730 - mw = 900 cams = ("one","two","three","four") cam = random.choice(cams) if cam == "one": @@ -90,7 +93,7 @@ def imageFunc(): search = ("DSC_"+a+b+c+d) page = urllib.request.urlopen("https://www.bing.com/images/search?q="+search+"&safesearch=off") read = page.read() - tree = etree.HTML(read) + tree = lxml.etree.HTML(read) images = tree.xpath('//a[@class = "thumb"]/@href') number = random.randint(1,len(images))-1 image = images[number] @@ -126,3 +129,21 @@ def movieFunc(): 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.spellFunc(content) + +def nameGen(): + return generators.nameGen + +def tavernGen(): + return generators.tavernGen diff --git a/help.txt b/funcs/help.txt similarity index 57% rename from help.txt rename to funcs/help.txt index 9fe5462..eb896bb 100644 --- a/help.txt +++ b/funcs/help.txt @@ -22,3 +22,7 @@ l/h før x: For de laveste/højeste x rul. **!name** - Genererer et tilfældigt navn. **!tavern** - Genererer en tilfældig tavern. + +**!swchar** - Lader dig lave en Star Wars karakter. Du kan bruge kommandoer som "!swchar name Jared" eller "!swchar skills astrogation 3" til at ændre din karakters info. + +**!swroll** - Lader dig rulle Star Wars terninger. Du kan skrive tal der repræsenterer antallet af hver terning i rækkefølgen: ability, proficiency, difficulty, challenge, boost, setback og force. Du behøver ikke skrive et tal til alle terningerne. Du kan også skrive forbogstavet for terningen du vil rulle før antallet, såsom "!swroll f2", der ruller 2 force terninger. diff --git a/lookupFuncs.py b/funcs/lookup/lookupFuncs.py similarity index 91% rename from lookupFuncs.py rename to funcs/lookup/lookupFuncs.py index a92f1b7..3f9df6f 100644 --- a/lookupFuncs.py +++ b/funcs/lookup/lookupFuncs.py @@ -2,7 +2,9 @@ import math import discord import json -from GwendolynFuncs import cap +from funcs import gwendolynFuncs as gf + + def modifier(statistic): mods = math.floor((statistic-10)/2) @@ -14,7 +16,7 @@ saves = ["strength_save","dexterity_save","constitution_save","intelligence_save abilities = ["acrobatics","animal_handling","arcana","athletics","deception","history","insight","intimidation","investigation","medicine","nature","perception","performance","persuasion","religion","sleight_of_hand","stealth","survival"] def monsterFunc(content): - command = cap(content.lower().replace("!monster ","")) + command = gf.cap(content.lower().replace("!monster ","")) print("Looking up "+command) if len(content.lower().split()) < 2: print("Monster doesn't exist in database") @@ -37,9 +39,9 @@ def monsterFunc(content): for save in saves: if save in monster: if monster[save] >= 0: - saving_throws += " "+cap(save[:3])+" +"+str(monster[save])+"," + saving_throws += " "+gf.cap(save[:3])+" +"+str(monster[save])+"," else: - saving_throws += " "+cap(save[:3])+" "+str(monster[save])+"," + saving_throws += " "+gf.cap(save[:3])+" "+str(monster[save])+"," if saving_throws != "": saving_throws = "\n**Saving Throws**"+saving_throws[:-1] @@ -47,9 +49,9 @@ def monsterFunc(content): for skill in abilities: if skill in monster: if monster[skill] >= 0: - skills += " "+cap(skill.replace("_"," "))+" +"+str(monster[skill])+"," + skills += " "+gf.cap(skill.replace("_"," "))+" +"+str(monster[skill])+"," else: - skills += " "+cap(skill.replace("_"," "))+" "+str(monster[skill])+"," + skills += " "+gf.cap(skill.replace("_"," "))+" "+str(monster[skill])+"," if skills != "": skills = "\n**Skills**"+skills[:-1] @@ -108,7 +110,7 @@ def monsterFunc(content): return("I don't know that monster...","","","","","") def spellFunc(content): - command = cap(content.lower().replace("!spell ","")) + command = gf.cap(content.lower().replace("!spell ","")) print("Looking up "+command) data = json.load(open('spells.json', encoding = "utf8")) if str(command) in data: diff --git a/monsters.json b/funcs/lookup/monsters.json similarity index 100% rename from monsters.json rename to funcs/lookup/monsters.json diff --git a/spells.json b/funcs/lookup/spells.json similarity index 100% rename from spells.json rename to funcs/lookup/spells.json diff --git a/names.txt b/funcs/names.txt similarity index 100% rename from names.txt rename to funcs/names.txt diff --git a/generators.py b/funcs/other/generators.py similarity index 94% rename from generators.py rename to funcs/other/generators.py index 0abe2b5..fadecf0 100644 --- a/generators.py +++ b/funcs/other/generators.py @@ -21,17 +21,17 @@ def nameGen(): else: word_dict[word_1] = [word_2] - first_word = np.random.choice(corpus) + first_word = random.choice(corpus) while first_word.islower() or first_word == " " or first_word == "-" or first_word == "\n": - first_word = np.random.choice(corpus) + first_word = random.choice(corpus) chain = [first_word] done = False while done == False: - new_letter = np.random.choice(word_dict[chain[-1]]) + new_letter = random.choice(word_dict[chain[-1]]) chain.append(new_letter) if new_letter == "\n": done = True diff --git a/movie.py b/funcs/other/movie.py similarity index 100% rename from movie.py rename to funcs/other/movie.py diff --git a/funcs/other/movies.txt b/funcs/other/movies.txt new file mode 100644 index 0000000..f1a6295 --- /dev/null +++ b/funcs/other/movies.txt @@ -0,0 +1,1167 @@ +6 Days to Air +8 Mile +8mm +10 Things I Hate About You +12 Angry Men +12 Years a Slave +13 Going on 30 +13th +17 Again +21 Jump Street +22 Jump Street +25th Hour +28 Days Later +The 40 Year-Old Virgin +101 Dalmatians (1961) +101 Dalmatians (1996) +101 Dalmatians II: Patch's London Adventure +127 Hours +211 +300 +The 400 Blows +500 Days of Summer +1917 +2001: A Space Odyssey +About Time +Across the Universe +Ad Astra +Adaptation +After +Aguirre, the Wrath of God +Air Bud +Airplane! +Akira +Aladdin (1992) +Aladdin (2019) +Aladdin and the King of Thieves +Alice in Wonderland (1951) +Alice in Wonderland (2010) +Alice Through the Looking Glass +Alien +Alien 3 +Aliens +Alien Vs. Predator +Alita: Battle Angel +All the President’s Men +Amadeus +American Beauty +American History X +American Honey +American Made +The American Meme +American Pie +American Psycho +Amy +Amélie +Anatomy of a Murder +Anchorman +Anchorman 2 +Anders Matthesen/Thomas Hartmann: Bytte Bytte Købmand +Anders Matthesen: Anden Paa Coke? +Anders Matthesen: Anders +Anders Matthesen: Shhh +Anders Matthesen: Tal For Dig Selv +Anders Matthesen: Vender Tilbage +Annie Hall +Annihilation +Anomalisa +Ant-Man +Ant-Man and the Wasp +The Apartment +Apocalypse Now +Apollo 13 +Aquaman +The Aristocats +Army of One +Arrival +As Good as it Gets +Ashens and the Quest for the Gamechild +The Assassination of Jesse James by the Coward Robert Ford +Astro Boy +Atlantis: Milo's Return +Atlantis: The Lost Empire +Austin Powers: International Man of Mystery +Austin Powers: The Spy Who Shagged Me +Austin Powers in Goldmember +Avatar +The Avengers +Avengers: Age of Ultron +Avengers: Endgame +Avengers: Infinity War +The Aviator +Baby Driver +Back to the Future +Back to the Future part II +Back to the Future part III +Bad Lieutenant +Bad Lieutenant: Port of Call New Orleans +The Ballad of Big Al +The Ballad of Buster Scruggs +Bambi +Bambi II +Bangkok Dangerous +Barry Lyndon +Batman Begins +Batman V Superman: Dawn of Justice +Battle Royale +A Beautiful Day in the Neighborhood +A Beautiful Mind +Beauty and the Beast (1991) +Beauty and the Beast (2017) +Bee Movie +Beetlejuice +Before Sunrise +Before Sunset +Behind the Curve +Being John Malkovich +Bend It Like Beckham +Between Two Ferns: The Movie +Between Worlds +Big +Big Hero 6 +The Big Lebowski +The Big Short +Bill & Ted's Bogus Journey +Bill & Ted's Excellent Adventure +Bird Box +Birdemic +Birdman +Birdy +Blackfish +Black Hawk Down +Black Panther +Black Swan +Blade Runner +Blade Runner 2049 +The Blair Witch Project +Blazing Saddles +The Blind Side +Blue is the Warmest Color +The Blues Brothers +Blue Velvet +Bo Burnham: Make Happy +Bo Burnham: What +Bohemian Rhapsody +Bombshell +Bonnie and Clyde +Boogie Nights +Borat! Cultural Learnings of America for Make Benefit Glorious Nation of Kazakhstan +Bottle Shock +The Bourne Identity +The Bourne Legacy +The Bourne Supremacy +The Bourne Ultimatum +Boyhood +The Boy in the Striped Pyjamas +Brave +Brazil +Breakfast at Tiffany's +The Breakfast Club +Breakthrough +Brexit the Uncivil War +Bridesmaids +Bridge of Spies +The Bridge on the River Kwai +Bright +Brokeback Mountain +Brother Bear +Brother Bear 2 +Brother’s Keeper +Bruce Almighty +The Bucket List +Buffy the Vampire Slayer +Bugsy Malone +Bumblebee +Burning +The Butterfly Effect +Cabaret +The Cabin in the Woods +Caddyshack +Call Me By Your Name +Camp Rock +Cape Fear +Captain America: Civil War +Captain America: The First Avenger +Captain America: The Winter Soldier +Captain Corelli’s Mandolin +Captain Fantastic +Captain Marvel +Carol +Cars +Cars 2 +Cars 3 +Casablanca +Casino Royale +Castle in the Sky +Catch Me if You Can +Charlie and the Chocolate Factory +Charlie’s Angels +Chef +Children of Men +Chinatown +The Christmas Chronicles +A Christmas Prince +A Christmas Prince: The Royal Wedding +A Christmas Prince: The Royal Baby +Christopher Robin +Chronicle +Chungking Express +Cinderella (1950) +Cinderella (2015) +Cinderella II: Dreams Come True +Cinderella III: A Twist in Time +Circle +The Circle +Citizen Kane +City Lights +City of Angels +City of God +Clerks +A Clockwork Orange +Cloudy With a Chance of Meatballs +Cloudy With a Chance of Meatballs 2 +Cloverfield +Clue +Clueless +Coco +Color out of Space +Coming to America +Con Air +Concussion +Confessions of a Shopaholic +The Conjuring +The Constant Gardener +Contagion +Cool Runnings +Coraline +Corpse Bride +The Cotton Club +Creed +Crouching Tiger, Hidden Dragon +Cube +Cyberbully +Dances with Wolves +The Dark Crystal +The Dark Knight +The Dark Knight Rises +Dark Pheonix +Deadpool +Deadpool 2 +Death Note +The Deer Hunter +Deliverance +Den Eneste Ene +The Departed +Diamonds Are Forever +Die Another Day +Die Hard +Die Hard 2 +Die Hard 3 +Die Hard 4 +Die Hard 5: A Good Day to Die Hard +The Disaster Artist +District 9 +Django Unchained +Do the Right Thing +Doctor Sleep +Doctor Strange +Dog Day Afternoon +Dog Eat Dog +Downsizing +Drive +Drive Angry +Driving Miss Daisy +Dr. No +Dr. Strangelove +Dumbo +Dumbo (2019) +Dunkirk +East of Eden +Easy A +The Edge of Seventeen +Edge of Tomorrow +Edward Scissorhands +Eighth Grade +The Elephant Man +Elf +The Emperor's new Groove +Enchanted +Eraserhead +ET +Eternal Sunshine of the Spotless Mind +Eurotrip +Ex Machina +Extremely Wicked, Shockingly Evil and Vile +Eyes Wide Shut +Face/Off +The Family Man +Fantasia +Fantasia 2000 +Fantastic Beasts: The Crimes of Grindelwald +Fantastic Beasts and Where to Find Them +Fantastic Four +Fantastic Mr Fox +Fargo +The Fast and the Furious +The Fast and the Furious 2 (2 Fast 2 Furious) +The Fast and the Furious 3 (Tokyo Drift) +The Fast and the Furious 4 (Fast & Furious) +The Fast and the Furious 5 (Fast Five) +The Fast and the Furious 6 +The Fast and the Furious 7 (Furious 7) +The Fast and the Furious 8 (The Fate of the Furious) +Fast and Furious Presents: Hobbs and Shaw +Fast Times of Ridgemont High +The Fault in Our Stars +The Favourite +Ferris Bueller's day off +Festival of the Spoken Nerd: Full Frontal Nerdity +Festival of the Spoken Nerd: Just for Graphs +Festival of the Spoken Nerd: You Can’t Polish a Nerd +The Fifth Element +Fifty Shades Darker +Fifty Shades Freed +Fifty Shades of Grey +Fight Club +The Fighter +Final Destination +Final Destination 2 +Final Destination 3 +Final Destination 4 +Final Destination 5 +Finding Dory +Finding Nemo +Fire Birds +First Man +Flammen og Citronen +The Florida Project +Flubber +The Fly (1968) +Following +Ford v. Ferrari +Forrest Gump +For Your Eyes Only +The Founder +The Fox and the Hound +The Fox and the Hound 2 +Frances Ha +Freaky Friday (2003) +Freddy vs. Jason +Freddy’s Dead: The Final Nightmare +Friday the 13th (1980) +Friday the 13th (2009) +Friday the 13th: A New Beginning +Friday the 13th: The Final Chapter +Friday the 13th Part 2 +Friday the 13th Part III +Friday the 13th Part VI: Jason Lives +Friday the 13th Part VII: The New Blood +Friday the 13th Part VIII: Jason Takes Manhattan +From Russia with Love +Frozen +Frozen II +The Frozen Ground +Full Metal Jacket +The Fundamentals of Caring +Fyre +Fyre Fraud +The Game +The Garden of Words +Garfield: A Tail of Two Kitties +Garfield: The Movie +Gerald’s Game +Get Out +Ghost +Ghostbuster (2016) +Ghostbusters (1984) +Ghostbusters II +Ghost Rider +Ghost Rider: Spirit of Vengeance +Gladiator +Glass +The Godfather +The Godfather: Part II +The Godfather: Part III +Godzilla (2014) +Godzilla (2019) +Going Clear +GoldenEye +Goldfinger +Gone Girl +Gone in 60 Seconds (2000) +The Good, the Bad and the Ugly +Goodfellas +Good Night, and Good Luck +Good Will Hunting +The Goonies +The Graduate +The Grand Budapest Hotel +Grand Isle +Grave of the fireflies +Gravity +Grease +The Great Dictator +The Great Hack +The Green Mile +Green Street Hooligans +Gremlins +Gremlins 2 +Groundhog Day +Guardians of the Galaxy +Guardians of the Galaxy Vol 2 +Guldhornene +Halloween +Halloweentown +Halloweentown II: Kalabar's Revenge +Halloweentown High +Return to Halloweentown +Hamlet (1996) +Hancock +The Handmaiden +The Hangover +The Hangover Part II +The Hangover Part III +Hanna +The Happening +Happy Feet +Harriet +Harry Potter and the Chamber of Secrets +Harry Potter and the Deathly Hallows – Part +Harry Potter and the Deathly Hallows – Part 2 +Harry Potter and the Goblet of Fire +Harry Potter and the Half-Blood Prince +Harry Potter and the Order of the Phoenix +Harry Potter and the Philosopher's Stone +Harry Potter and the Prisoner of Azkaban +The Hateful Eight +Heat +Heathers +Hell or High Water +Hellboy (2004) +Hellboy (2019) +Hellraiser +Her +Hercules +High School Musical +High School Musical 2 +High School Musical 3 +The Hitchhiker’s Guide to the Galaxy +Home Alone +Home Alone 2 +Home Alone 3 +Home Alone 4 +Home Alone 5 +Honeymoon in Vegas +Horns +Hot Fuzz +Hot Tub Time Machine +Hot Tub Time Machine 2 +Howards End +Howl's Moving Castle +How the Grinch Stole Christmas! (1966) +How the Grinch Stole Christmas (2000) +How to Train Your Dragon +How to Train Your Dragon 2 +How to Train Your Dragon 3: The Hidden World +The Humanity Bureau +The Hunchback of Notre Dame +The Hunchback of Notre Dame II +Hunger Games +Hunger Games: Catching Fire +Hunger Games: Mockingjay part 1 +Hunger Games: Mockingjay part 2 +The Hurt Locker +I, Robot +I, Tonya +I Am Legend +I Don't Feel at Home in This World Anymore. +I Now Pronounce You Chuck and Larry +Ice Age +Ice Age 2 +Ice Age 3 +Ice Age 4 +Ice Age 5 +Ikiru +The Imitation Game +In Bruges +Inception +Inconceivable +An Inconvenient Truth +The Incredible Burt Wonderstone +The Incredible Hulk +The Incredibles +Incredibles 2 +Independence Day +Indiana Jones and the Kingdom of the Crystal Skull +Indiana Jones and the Last Crusade +Indiana Jones and the Raiders of the Lost Ark +Indiana Jones and the Temple of Doom +The Informant! +Inglourious Basterds +Ingrid Goes West +Inside Llewyn Davis +Inside Out +The Intern +Interstellar +The Interview +In the Mood For Love +Into the Forest of Fireflies’ Light +Into the Woods +Into the Wild +The Intouchables +The Invention of Lying +The Irishman +The Iron Giant +Iron Man +Iron Man 2 +Iron Man 3 +The Island +Isle of Dogs +It (1990) +It (2017) +It Chapter Two +It Follows +It’s a Wonderful Life +It’s the Great Pumpkin, Charlie Brown +Jackass number 3D +Jackass number Number Two +Jackass the movie +Jack Whitehall: At Large +Jagten +Jason Bourne +Jason Goes to Hell: The Final Friday +Jason X +Jaws +Jigsaw +Jim and Andy +Jim Jefferies: Bare +Jim Jefferies: Freedumb +Jim Jefferies: This is Me Now +Jimmy Carr: Being Funny +Jimmy Carr: Comedian +Jimmy Carr: Funny Business +Jimmy Carr: In Concert +Jimmy Carr: Laughing And Joking +Jimmy Carr: Live +Jimmy Carr: Making People Laugh Live +Jimmy Carr: Stand Up +Jimmy Carr: Telling Jokes +Jimmy Carr: The Best of Ultimate Gold Greatest Hits +Jiro Dreams of Sushi +Joe +John Mulaney: Kid Gorgeous at Radio City +John Mulaney: New in Town +John Mulaney: The Comeback Kid +Johnny English +Johnny English Reborn +Johnny English Strikes Again +John Wick +John Wick: Chapter 2 +John Wick: Chapter 3 - Parabellum +Jojo Rabbit +Joker +Judy +The Jungle Book (1969) +The Jungle Book (2016) +Juno +Jurassic Park +Jurassic Park: The Lost World +Jurassic Park III +Jurassic World +Jurassic World: Fallen Kingdom +Justice League +The Karate Kid (1984) +The Karate Kid (2010) +The Karate Kid Part II +The Karate Kid Part III +Katherine Ryan: Glitter Bomb +Kick-Ass +Kick-Ass 2 +Kiki’s Delivery Service +Kill Bill: Vol 1 +Kill Bill: Vol 2 +Kill Chain +Kingsman: The Secret Service +Kingsman: The Golden Circle +The King’s Speech +Kiss Kiss Bang Bang +The Kissing Booth +Klaus +Knives Out +Knowing +Kronk's New Groove +Kung Fu Panda +Kung Fu Panda 2 +Kung Fu Panda 3 +L A Confidential +Lady and the Tramp (1955) +Lady and the Tramp (2019) +Lady and the Tramp II: Scamp's Adventure +Lady Bird +La La Land +Last Action Hero +Lawrence of Arabia +The League of Extraordinary Gentlemen +A League of Their Own +Leap! +Leaving Las Vegas +Left Behind +The LEGO Batman Movie +The LEGO Movie +The LEGO Movie 2: The Second Part +Leprechaun +Leprechaun 2 +Leprechaun 3 +Leprechaun 4: In Space +Leprechaun in the Hood +Leprechaun: Back 2 tha Hood +Leprechaun Origins +Leroy & Stitch +Let the Right One In +Liar, Liar +Licence to Kill +Life of Brian +Lighthouse +Some Like it Hot +Lilo & Stitch 2: Stitch Has a Glitch +Lilo and Stitch +Lincoln +Lion +The Lion King (1994) +The Lion King (2019) +The Lion King 1½ +The Lion King II: Simba's Pride +The Little Mermaid +The Little Mermaid II: Return to the Sea +Little Shop of Horrors +Little Women (1994) +Little Women (2019) +Live and Let Die +The Lives of Others +The Living Daylights +Logan +Looking Glass +The Lord of the Rings: The Fellowship of the Ring +The Lord of the Rings: The Return of the King +The Lord of the Rings: The Two Towers +Lord of War +Lost in Translation +Love Actually +The Lovely Bones +Love Simon +Léon +M +Madagascar +Madagascar 3: Europe's Most Wanted +Madagascar: Escape 2 Africa +Mad Max: Fury Road +Magic Mike +Magic Mike XXL +The Magnificent Ambersons +The Magnificent Seven (1960) +The Magnificent Seven (2016) +Magnolia +Maleficent +Maleficent: Mistress of Evil +Mallrats +Mamma Mia +Mamma Mia: Here I Go Again +Manchester by the Sea +Man of Steel +The Man with the Golden Gun +The Manchurian Candidate +Mandy +The Many Adventures of Winnie the Pooh +Marriage Story +The Martian +Mary and the Witch’s Flower +Mary Poppins +Mary Poppins Returns +The Mask +The Master +Matchstick Men +The Matrix +The Matrix Reloaded +The Matrix Revolutions +Maze Runner +Maze Runner: The Death Cure +Maze Runner: The Scorch Trials +Mean Girls +Mean Streets +Megamind +Memento +Men In Black +Men In Black 3 +Men In Black II +Metropolis +The Meyerowitz Stories (New and Selected) +Miami Vice +Michael Bolton’s Big Sexy Valentine’s Day Special +Mickey, Donald, Goofy: The Three Musketeers +Mikael Wulff: Forklarer Alt +Milk +Minority Report +Miracle +Miracle on 34th Street +Mission Impossible +Mission Impossible - Fallout +Mission Impossible - Rogue Nation +Mission Impossible 2 +Mission Impossible: Ghost Protocol +Mission Impossible III +Moana +Monsters, inc +Monsters U +Monsters Vs Aliens +Monty Python and the Holy Grail +Moonlight +Moonraker +Moonrise Kingdom +Mortal Engines +A Most Violent Year +Moulin Rouge! +Mrs. Doubtfire +Mudbound +Mulan +Mulan II +Mulholland Drive +The Mummy +The Mustang +My Friend Dahmer +My Life as a Zucchini +My Little Pony: The Movie +My Neighbor Totoro +Napoleon Dynamite +National Treasure +National Treasure: Book of Secrets +Nausicaä of the Valley of the Wind +Network +Never Say Never Again +Next +The Nice Guys +Nightcrawler +The Nightmare Before Christmas +A Nightmare on Elm Street (1984) +A Nightmare on Elm Street (2010) +A Nightmare on Elm Street 2: Freddy’s Revenge +A Nightmare on Elm Street 3: Dream Warriors +A Nightmare on Elm Street 4: The Dream Master +A Nightmare on Elm Street 5: The Dream Child +No Country for Old Men +The Notebook +Now You See Me +Now You See Me 2 +The Nutty Professor +O Brother, Where Art Thou? +Ocean’s 8 +Ocean’s Eleven +Ocean’s Thirteen +Ocean’s Twelve +Octopussy +Office Space +Okja +Oldboy +Olsen-Banden +Olsen-Banden Deruda +Olsen-Banden går Amok +Olsen-Banden Går i Krig +Olsen-Banden i Jylland +Olsen-Banden Over Alle Bjerge +Olsen-Banden Overgiver Sig Aldrig +Olsen-Banden på Spanden +Olsen-Banden på Sporet +Olsen-Banden ser Rødt +Olsen-Bandens Flugt Over Plankeværket +Olsen-Bandens Sidste Bedrifter +Olsen-Bandens Sidste Stik +Olsen-Bandens Store Kup +On Her Majesty's Secret Service +On the Basis of Sex +On the Town +On the Waterfront +Once Upon a Time in Hollywood +Once Upon a Time in the West +One Flew Over The Cuckoo’s Nest +Osmosis Jones +The Other Guys +The Other Side of the Wind +Outcast +Over the Hedge +Paddington +Paddington 2 +Pain and Glory +Pan’s Labyrinth +Paper Towns +Paprika +Paranormal Activity +Paranormal Activity 2 +Paranormal Activity 3 +Paranormal Activity 4 +Paranormal Activity: The Marked Ones +Parasite +Paris, Texas +Paterson +Paths of Glory +Paul Blart Mall Cop +Paul Blart Mall Cop 2 +Penguins of Madagascar +Perfect Blue +The Perks of Being a Wallflower +Persona +Personal Shopper +Peter Pan +Phantom of the Opera (1925) +Phantom of the Opera (1989) +Phantom of the opera (2004) +Phantom Thread +Philadelphia +Phineas and Ferb the Movie: Across the 2nd Dimension +Pinocchio +Pirates of the Caribbean: At World's End +Pirates of the Caribbean: Dead Man's Chest +Pirates of the Caribbean: Dead Men Tell No Tales +Pirates of the Caribbean: On Stranger Tides +Pirates of the Caribbean: The Curse of the Black Pearl +Pitch Perfect +Pitch Perfect 2 +Pitch Perfect 3 +Planes, Trains and Automobiles +Pleasantville +Pocahontas +Pocahontas II: Journey to a New World +Point Break +Pokemon: Detective Pikachu +Poltergeist +Ponyo +Popstar: Never Stop Never Stopping +Porco Rosso +Predator +The Prestige +Pretty in Pink +Pride and Prejudice +Primal +Primer +The Prince of Egypt +The Princess and the Frog +The Princess Bride +Princess Mononoke +Prisoners +Private Life +Psycho +Pulp Fiction +Punch-Drunk Love +The Purge +The Purge 2 +The Purge 3 +The Purge 4 +Quantum of Solace +A Quiet Place +Quiz Show +Raging Bull +Rain Man +Raising Arizona +Rampage +Rashomon +Ratatouille +Ready Player One +Rear Window +Red Rock West +Rent +Reservoir Dogs +The Return of Jafar +The Revenant +Richard Jewell +Rim of the World +Rio +The Road to El Dorado +Robin Hood +Robots +The Rock +Rocketman +Rocky +Rocky Balboa +The Rocky Horror Picture Show +Rocky II +Rocky III +Rocky IV +Rocky V +Rogue One: A Star Wars Story +Roma +Romeo + Juliet +Room +The Room +The Royal Tenenbaums +Rudy +Rumble Fish +The Runner +Running with the Devil +Rushmore +The Santa Clause +The Santa Clause 2 +The Santa Clause 3: The Escape Clause +Saving Mr Banks +Saving Private Ryan +Saw +Saw II +Saw III +Saw IV +Saw V +Saw VI +Saw VII +Scarface +Schindler’s List +School of Rock +A Score to Settle +Scott Pilgrim vs the World +Scream +Se7en +The Searchers +Season of the Witch +Seeking Justice +A Separation +A Serious Man +Seven Samurai +The Seventh Seal +The Shape of Water +Shaun of the Dead +The Shawshank Redemption +Shazam! +She’s Gotta Have It +Shirkers +Shrek +Shrek 2 +Shrek Forever After +Shrek the Third +Shutter Island +Sicario +Signs +The Silence of the Lambs +A Silent voice +The Simpsons Movie +Sinbad: Legend of the Seven Seas +Sin City +Singing in the Rain +Sixth Sense +Skyfall +Sleeping Beauty +Slumdog Millionaire +Smokey and the Bandit +Smurfs +Snake Eyes +Snakes on a Plane +Snow White +Snowden +Snowpiercer +The Social Network +Solaris +Solo: A Star Wars Story +The Sorcerer’s Apprentice +The Sound of Music +South Park: Bigger, Longer & Uncut +Space Jam +Spectre +Speed +Spider-man +Spider-man 2 +Spider-man 3 +Spider-man: Far From Home +Spider-man: Homecoming +Spider-man: Into the Spider-verse +Spirited away +Split +Spotlight +The Spy Who Loved Me +Stalker +Stand By Me +A Star is Born +Starship Troopers +Star Trek (2009) +Star Trek: First Contact +Star Trek: Insurrection +Star Trek: Nemesis +Star Trek: The Motion Picture +Star Trek Beyond +Star Trek Generations +Star Trek II: The Wrath of Khan +Star Trek III: The Search for Spock +Star Trek Into Darkness +Star Trek IV: The Voyage Home +Star Trek V: The Final Frontier +Star Trek VI: The Undiscovered Country +Star Wars Episode I +Star Wars Episode II +Star Wars Episode III +Star Wars Episode IV +Star Wars Episode V +Star Wars Episode VI +Star Wars Episode VII +Star Wars Episode VIII +Star Wars Episode IX +Star Wars Holiday Special +Star Wars: The Clone Wars +Stargate +Stay Alive +Steve Jobs +Steven Universe: The Movie +The Sting +Stitch! The Movie +Stolen +Strange Magic +Strangers on a Train +Suicide Squad +Sully +Sunset Blvd +Super Size Me +Superbad +Superman +Superman II +Superman III +Superman IV: The Quest for Peace +Superman Returns +Sweeney Todd +The Sword in the Stone +Synecdoche, New York +Tag +Take the Money and Run +Talladega Nights: The Ballad of Ricky Bobby +Tangled +Tarzan +Tarzan & Jane +Tarzan II +Taxi Driver +Team America: World Police +Teenage Mutant Ninja Turtles +Tempelriddernes Skat +Tempelriddernes Skat III +Tempelriddernes Skat II Stormesterens Hemmelighed +Tenacious D in The Pick of Destiny +The Terminal +Terminator +Terminator 2 +Terminator 3 +Terminator Genisys +Terminator Salvation +Ternet Ninja +The Texas Chainsaw Massacre +The Theory of Everything +There Will Be Blood +The Thing +The Third Man +This Is Spinal Tap +This Is the End +Thor +Thor: Ragnarok +Thor: The Dark World +Three Billboards Outside Ebbing, Missouri +Thunderball +The Time Machine (1960) +The Time Machine (2002) +Time to Kill +Tinker Bell +Tinker Bell and the Great Fairy Rescue +Tinker Bell and the Legend of the NeverBeast +Tinker Bell and the Lost Treasure +Tinker Bell and the Pirate Fairy +Titanic +To All the Boys I’ve Loved Before +The To Do List +To Kill a Mockingbird +Tokyo Story +Tomorrow Never Dies +To the Bone +Toy Story +Toy Story 2 +Toy Story 3 +Toy Story 4 +Trainspotting +Transformers +Transformers 2: Revenge of the Fallen +Transformers 3: Dark of the Moon +Transformers 4: Age of Extinction +Transformers 5: The Last Knight +The Treasure of the Sierra Madre +Trespass +Trolls +Tron +Tron: Legacy +The Trotsky +The Truman Show +The Trust +Turbo +Twilight +Twilight: Breaking Dawn part 1 +Twilight: Breaking Dawn part 2 +Twilight: Eclipse +Twilight: New Moon +The Two Popes +Unbreakable +Uncle Buck +Uncut Gems +Under the Skin +Unforgiven +Up +Us +The Usual Suspects +Valley Girl +Vampire’s Kiss +The VelociPastor +Venom +Vertigo +Vice +Videodrome +A View to a Kill +The Wall +Wall-E +Wallace & Gromit: The Curse of the Were-Rabbit +War of the Worlds +Watchmen +Wayne’s World +The Weather Man +West Side Story +We the Animals +Wet Hot American Summer +What We Do in the Shadows +Where The Wild Things Are +Whiplash +White Chicks +Who Framed Roger Rabbit? +Who’s Afraid of Virginia Woolf +The Wicker Man +Wild at Heart +Wild Rose +Wild Strawberries +Willy Wonka and the Chocolate Factory +The Wind Rises +Wind River +Windtalkers +Wine Country +The Witch +The Wizard of Oz +Wolf Children +The Wolf of Wall Street +The Wolverine +Wonder Woman +The World Is Not Enough +World Trade Center +The World’s End +Wreck-it-Ralph +Wreck-it-Ralph Breaks the Internet +X-Men +X-Men 2 +X-Men: Apocalypse +X-Men: Days of Future Past +X-Men: First Class +X-Men: The Last Stand +X-Men Origins: Wolverine +Yesterday +Yojimbo +Young Frankenstein +You Only Live Twice +Your Name +Y Tu Mama Tambien +Zodiac +Zombieland +Zombieland: Double Tap +Zoolander +Zoolander 2 +Zootopia diff --git a/characters.json b/funcs/swfuncs/characters.json similarity index 100% rename from characters.json rename to funcs/swfuncs/characters.json diff --git a/skills.json b/funcs/swfuncs/skills.json similarity index 100% rename from skills.json rename to funcs/swfuncs/skills.json diff --git a/skills.txt b/funcs/swfuncs/skills.txt similarity index 100% rename from skills.txt rename to funcs/swfuncs/skills.txt diff --git a/swchar.py b/funcs/swfuncs/swchar.py similarity index 100% rename from swchar.py rename to funcs/swfuncs/swchar.py diff --git a/swroll.py b/funcs/swfuncs/swroll.py similarity index 93% rename from swroll.py rename to funcs/swfuncs/swroll.py index b0df393..d5beac4 100644 --- a/swroll.py +++ b/funcs/swfuncs/swroll.py @@ -3,7 +3,7 @@ import re import string import json -from swchar import getName, charData, lightsaberChar, userHasChar +import swchar with open("skills.json", "r") as f: skillData = json.load(f) @@ -113,13 +113,13 @@ def parseRoll(user : str,cmd : str = ""): rollParameters = [0,0,0,0,0,0,0] if string.capwords(commands[0]) in skillData: - if userHasChar: - skillLevel = charData(user,"Skills " + string.capwords(commands[0])) + if swchar.userHasChar: + skillLevel = swchar.charData(user,"Skills " + string.capwords(commands[0])) if string.capwords(commands[0]) == "Lightsaber": - charLevel = charData(user,"Characteristics " + lightsaberChar(user)) + charLevel = swchar.charData(user,"Characteristics " + swchar.lightsaberChar(user)) else: - charLevel = charData(user,"Characteristics " + skillData[string.capwords(commands[0])]) + charLevel = swchar.charData(user,"Characteristics " + skillData[string.capwords(commands[0])]) abilityDice = abs(charLevel-skillLevel) proficiencyDice = min(skillLevel,charLevel) @@ -160,7 +160,7 @@ def parseRoll(user : str,cmd : str = ""): simplified = simplify(rollResults) - name = getName(user) + name = swchar.getName(user) if simplified != rollResults: return name + " rolls " + diceToEmoji(rollParameters) + "\nResult: " + resultToEmoji(rollResults) + "\nSimplified: " + resultToEmoji(simplify(rollResults)) diff --git a/templates.json b/funcs/swfuncs/templates.json similarity index 100% rename from templates.json rename to funcs/swfuncs/templates.json diff --git a/movies.txt b/movies.txt deleted file mode 100644 index aa4870b..0000000 --- a/movies.txt +++ /dev/null @@ -1,645 +0,0 @@ -101 Dalmatians -12 Angry Men -12 Years a Slave -17 Again -2001: A Space Odyssey -21 Jump Street -22 Jump Street -28 Days Later -300 -500 Days of Summer -8 Mile -A Christmas Prince -A Christmas Prince: The Royal Wedding -A Clockwork Orange -A Silent voice -A Star is Born -A View to a Kill -Adaptation -Aguirre, the Wrath of God -Air Bud -Airplane! -Akira -Aladdin -Alice in Wonderland -Alien -Aliens -Amadeus -Amelie -American Beauty -American History X -American Psycho -Anchorman -Anchorman 2 -Anders Matthesen/Thomas Hartmann: Bytte Bytte Koebmand -Anders Matthesen: Anden Paa Coke? -Anders Matthesen: Anders -Anders Matthesen: Shhh -Anders Matthesen: Tal For Dig Selv -Anders Matthesen: Vender Tilbage -Annihilation -Ant-Man -Ant-Man and the Wasp -Apocalypse Now -Apollo 13 -Aquaman -Arrival -Atlantis: The Lost Empire -Austin Powers: International Man of Mystery -Austin Powers: The Spy Who Shagged Me -Austin Powers in Goldmember -Avatar -Baby Driver -Back to the Future -Back to the Future part II -Back to the Future part III -Bambi -Barry Lyndon -Batman Begins -Batman V Superman: Dawn of Justice -Beauty and the Beast -Bee Movie -Before Sunrise -Before Sunset -Being John Malkovich -Big -Big Hero 6 -Bird Box -Birdemic -Birdman -Black Panther -Black Swan -Blade Runner -Blade Runner 2049 -Blazing Saddles -Blue is the Warmest Color -Blue Velvet -Bo Burnham: Make Happy -Bo Burnham: What -Bohemian Rhapsody -Boogie Nights -Boyhood -Brazil -Brokeback Mountain -Brother Bear -Bruce Almighty -Buffy the Vampire Slayer -Bumblebee -Call Me By Your Name -Captain America: Civil War -Captain America: The First Avenger -Captain America: The Winter Soldier -Captain Fantastic -Casablanca -Casino Royale -Castle in the Sky -Catch Me if You Can -Charlies Angels -Children of Men -Chinatown -Christopher Robin -Chronicle -Chungking Express -Cinderella -Citizen Kane -City Lights -City of God -Cloudy With a Chance of Meatballs -Cloudy With a Chance of Meatballs 2 -Cloverfield -Clueless -Coco -Coming to America -Concussion -Cool Runnings -Coraline -Creed -Dances with Wolves -Deadpool -Deadpool 2 -Diamonds Are Forever -Die Another Day -Die Hard -Die Hard 2 -Die Hard 3 -Die Hard 4 -Die Hard 5: A Good Day to Die Hard -District 9 -Django Unchained -Doctor Strange -Do the Right Thing -Dog Day Afternoon -Dr. No -Dr. Strangelove -Drive -Dumbo -Easy A -Edge of Tomorrow -Elf -Eraserhead -ET -Eternal Sunshine of the Spotless Mind -Ex Machina -Eyes Wide Shut -Fantasia -Fantasia 2000 -Fantastic Beasts and Where to Find Them -Fantastic Beasts: The Crimes of Grindelwald -Fantastic Four -Fantastic Mr. Fox -Fargo -Ferris Bueller's day off -Festival of the Spoken Nerd: Full Frontal Nerdity -Festival of the Spoken Nerd: Just for Graphs -Festival of the Spoken Nerd: You Cant Polish a Nerd -Fifty Shades of Grey -Fifty Shades Darker -Fifty Shades Freed -Fight Club -Final Destination -Final Destination 2 -Final Destination 3 -Final Destination 4 -Final Destination 5 -Finding Dory -Finding Nemo -For Your Eyes Only -Forrest Gump -From Russia with Love -Frozen -Full Metal Jacket -Garfield: The Movie -Garfield: A Tail of Two Kitties -Get Out -Ghost -Ghost Rider -Ghostbusters -Gladiator -Going Clear -GoldenEye -Goldfinger -Gone Girl -Good Will Hunting -Goodfellas -Grave of the fireflies -Gravity -Grease -Green Street Hooligans -Groundhog Day -Guardians of the Galaxy -Guardians of the Galaxy Vol. 2 -Guldhornene -Halloween -Hancock -Harry Potter and the Chamber of Secrets -Harry Potter and the Deathly Hallows Part -Harry Potter and the Deathly Hallows Part 2 -Harry Potter and the Goblet of Fire -Harry Potter and the Half-Blood Prince -Harry Potter and the Order of the Phoenix -Harry Potter and the Philosopher's Stone -Harry Potter and the Prisoner of Azkaban -Heat -Her -Hercules -Home Alone -Home Alone 2 -Home Alone 3 -Home Alone 4 -Home Alone 5 -Hot Fuzz -How to Train Your Dragon -How to Train Your Dragon 2 -Howl's Moving Castle -Hunger Games -Hunger Games: Catching Fire -Hunger Games: Mockingjay part 1 -Hunger Games: Mockingjay part 2 -I Am Legend -Ice Age -Ice Age 2 -Ice Age 3 -Ice Age 4 -Ice Age 5 -Ikiru -In Bruges -In the Mood For Love -Inception -Independence Day -Indiana Jones and the Kingdom of the Crystal Skull -Indiana Jones and the Last Crusade -Indiana Jones and the Raiders of the Lost Ark -Indiana Jones and the Temple of Doom -Inglourious Basterds -Inside Llewyn Davis -Inside Out -Interstellar -Into the Forest of Fireflies Light -Into the Woods -Iron Man -Iron Man 2 -Iron Man 3 -It Follows -Its a Wonderful Life -I, Robot -Jagten -Jaws -John Wick -Juno -Jurassic Park -Jurassic Park: The Lost World -Jurassic Park III -Jurassic World -Jurassic World: Fallen Kingdom -Justice League -Kick-Ass -Kick-Ass 2 -Kill Bill: Vol. 1 -Kill Bill: Vol. 2 -Kingsman: The Secret Service -Kiss Kiss Bang Bang -Kung Fu Panda -Kung Fu Panda 2 -Kung Fu Panda 3 -L.A. Confidential -La La Land -Lady Bird -Lady and the Tramp -Lawrence of Arabia -Leon -Let the Right One In -Liar, Liar -Licence to Kill -Life of Brian -Lilo and Stitch -Live and Let Die -Logan -Lost in Translation -Love Actually -Love Simon -M -Mad Max: Fury Road -Madagascar -Magnolia -Mamma Mia -Mamma Mia: Here I Go Again -Man of Steel -Manchester by the Sea -Mary and the Witchs Flower -Mary Poppins -Mary Poppins Returns -Mean Girls -Megamind -Memento -Men In Black -Men In Black II -Men In Black 3 -Metropolis -Mikael Wulff: Forklarer Alt -Moana -Monsters, inc. -Monsters Vs. Aliens -Monty Python and the Holy Grail -Moonlight -Moonraker -Moonrise Kingdom -Mulan -Mulholland Drive -My Little Pony: The Movie -My Neighbor Totoro -National Treasure -National Treasure: Book of Secrets -Nausica of the Valley of the Wind -Network -Never Say Never Again -Nightcrawler -No Country for Old Men -Now You See Me -Now You See Me 2 -O Brother, Where Art Thou? -Oceans Eleven -Octopussy -Office Space -Oldboy -Olsen-Banden -Olsen-Banden Deruda -Olsen-Banden Gaar i Krig -Olsen-Banden Over Alle Bjerge -Olsen-Banden Overgiver Sig Aldrig -Olsen-Banden gaar Amok -Olsen-Banden i Jylland -Olsen-Banden paa Spanden -Olsen-Banden paa Sporet -Olsen-Banden ser Roedt -Olsen-Bandens Flugt Over Plankevaerket -Olsen-Bandens Sidste Bedrifter -Olsen-Bandens Sidste Stik -Olsen-Bandens Store Kup -On Her Majesty's Secret Service -On the Waterfront -Once Upon a Time in the West -One Flew Over The Cuckoos Nest -Osmosis Jones -Over the Hedge -Pans Labyrinth -Paprika -Paranormal Activity -Paranormal Activity 2 -Paranormal Activity 3 -Paranormal Activity 4 -Paranormal Activity: The Marked Ones -Paris, Texas -Paths of Glory -Paul Blart Mall Cop -Paul Blart Mall Cop 2 -Perfect Blue -Persona -Peter Pan -Phantom Thread -Pinocchio -Pirates of the Caribbean: At World's End -Pirates of the Caribbean: Dead Man's Chest -Pirates of the Caribbean: Dead Men Tell No Tales -Pirates of the Caribbean: On Stranger Tides -Pirates of the Caribbean: The Curse of the Black Pearl -Pitch Perfect -Pitch Perfect 2 -Pitch Perfect 3 -Planes, Trains and Automobiles -Pocahontas -Porco Rosso -Predator -Primer -Princess Mononoke -Prisoners -Psycho -Punch-Drunk Love -Quantum of Solace -Raging Bull -Rashomon -Ratatouille -Ready Player One -Rear Window -Reservoir Dogs -Rio -Robin Hood -Robots -Rocky -Rocky II -Rocky III -Rocky IV -Rocky V -Rocky Balboa -Rogue One: A Star Wars Story -Room -Rudy -Rushmore -Saving Mr. Banks -Saving Private Ryan -Saw -Saw II -Saw III -Saw IV -Saw V -Saw VI -Saw VII -Schindlers List -School of Rock -Scott Pilgrim vs. the World -Se7en -Seven Samurai -Shaun of the Dead -Shrek -Shrek 2 -Shrek the Third -Shrek Forever After -Shutter Island -Sicario -Signs -Sinbad: Legend of the Seven Seas -Singing in the Rain -Sixth Sense -Skyfall -Sleeping Beauty -Slumdog Millionaire -Smokey and the Bandit -Smurfs -Snow White -Solaris -Solo: A Star Wars Story -Some Like it Hot -Space Jam -Spectre -Speed -Spider-man -Spider-man 2 -Spider-man 3 -Spiderman: Homecoming -Spider-man: Into the Spider-verse -Spirited away -Split -Stalker -Stand By Me -Star Wars Episode I -Star Wars Episode II -Star Wars Episode III -Star Wars Episode IV -Star Wars Episode V -Star Wars Episode VI -Star Wars Episode VII -Star Wars Episode VIII -Star Wars Holiday Special -Starship Troopers -Stay Alive -Suicide Squad -Sunset Blvd. -Superbad -Superman -Superman II -Superman III -Superman IV: The Quest for Peace -Superman Returns -Sweeney Todd -Synecdoche, New York -Tangled -Tarzan -Taxi Driver -Tempelriddernes Skat -Tempelriddernes Skat II Stormesterens Hemmelighed -Tempelriddernes Skat III -Tenacious D in The Pick of Destiny -Terminator -Terminator 2 -Terminator 3 -Terminator Genisys -Terminator Salvation -The 400 Blows -The Apartment -The Aristocats -The Assassination of Jesse James by the Coward Robert Ford -The Avengers -The Avengers: Age of Ultron -The Avengers: Infinity War -The Ballad of Big Al -The Big Lebowski -The Blind Side -The Breakfast Club -The Bridge on the River Kwai -The Bucket List -The Butterfly Effect -The Cabin in the Woods -The Dark Knight -The Dark Knight Rises -The Deer Hunter -The Departed -The Disaster Artist -The Emperor's new Groove -The Fast and the Furious -The Fast and the Furious 2 -The Fast and the Furious 3 -The Fast and the Furious 4 -The Fast and the Furious 5 -The Fast and the Furious 6 -The Fast and the Furious 7 -The Fault in Our Stars -The Florida Project -The Founder -The Game -The Garden of Words -The Godfather -The Godfather: Part II -The Godfather: Part III -The Good, the Bad and the Ugly -The Graduate -The Grand Budapest Hotel -The Great Dictator -The Green Mile -The Handmaiden -The Hunchback of Notre Dame -The Imitation Game -The Incredible Hulk -The Incredibles -The Intern -The Intouchables -The Iron Giant -The Jungle Book -The LEGO Batman Movie -The LEGO Movie -The Lion King -The Lion King 1 -The Little Mermaid -The Living Daylights -The Lord of the Rings: The Fellowship of the Ring -The Lord of the Rings: The Return of the King -The Lord of the Rings: The Two Towers -The Man with the Golden Gun -The Many Adventures of Winnie the Pooh -The Martian -The Mask -The Master -The Matrix -The Matrix Reloaded -The Matrix Revolutions -The Mummy -The Nice Guys -The Nightmare Before Christmas -The Nutty Professor -The Perks of Being a Wallflower -The Prestige -The Prince of Egypt -The Princess and the Frog -The Princess Bride -The Purge -The Purge 2 -The Purge 3 -The Purge 4 -The Road to El Dorado -The Room -The Royal Tenenbaums -The Santa Clause -The Searchers -The Seventh Seal -The Shape of Water -The Shawshank Redemption -The Silence of the Lambs -The Simpsons Movie -The Social Network -The Sound of Music -The Spy Who Loved Me -The Sting -The Sword in the Stone -The Terminal -The Thing -The Third Man -The To Do List -The Treasure of the Sierra Madre -The Truman Show -The Usual Suspects -The Wolf of Wall Street -The Wolverine -The World Is Not Enough -The Worlds End -The Wind Rises -The Wizard of Oz -There Will Be Blood -This Is Spinal Tap -Thor -Thor: Ragnarok -Thor: The Dark World -Three Billboards Outside Ebbing, Missouri -Thunderball -Titanic -To Kill a Mockingbird -Tokyo Story -Tomorrow Never Dies -Toy Story -Toy Story 2 -Toy Story 3 -Trainspotting -Transformers -Transformers 2: Revenge of the Fallen -Transformers 3: Dark of the Moon -Transformers 4: Age of Extinction -Transformers 5: The Last Knight -Trolls -Turbo -Twilight -Twilight: New Moon -Twilight: Eclipse -Twilight: Breaking Dawn part 1 -Twilight: Breaking Dawn part 2 -Unbreakable -Uncle Buck -Unforgiven -Up -Venom -Vertigo -Wall-E -War of the Worlds -Watchmen -Waynes World -What We Do in the Shadows -Whiplash -White Chicks -Wild Strawberries -Willy Wonka and the Chocolate Factory -Wind River -Wolf Children -Wonder Woman -Wreck-it-Ralph -Wreck-it-Ralph Breaks the Internet -X-Men -X-Men 2 -X-Men: Apocalypse -X-Men: Days of Future Past -X-Men: First Class -X-Men Origins: Wolverine -X-Men: The Last Stand -Yojimbo -You Only Live Twice -Young Frankenstein -Your Name -Zodiac -Zombieland -Zoolander -Zootopia diff --git a/testing.py b/testing.py deleted file mode 100644 index 2673e33..0000000 --- a/testing.py +++ /dev/null @@ -1,4 +0,0 @@ -from swchar import charData, parseChar -from swroll import parseRoll - -print(parseChar("Yeet","")) \ No newline at end of file