From eed743d1e90eeaa20b41f3d08547721a3ea42b59 Mon Sep 17 00:00:00 2001 From: AIrjen Date: Tue, 18 Apr 2023 19:15:30 +0200 Subject: [PATCH] lots of list refinements --- build_dynamic_prompt.py | 6 +- csvfiles/accessories.csv | 5 +- csvfiles/animals.csv | 12 ++- csvfiles/artmovements.csv | 3 +- csvfiles/buildings.csv | 4 +- csvfiles/concept_prefix.csv | 3 +- csvfiles/concept_suffix.csv | 4 +- csvfiles/cultures.csv | 3 +- csvfiles/descriptors.csv | 6 +- csvfiles/fictional characters.csv | 151 +++++++++++------------------- csvfiles/hairstyles.csv | 3 +- csvfiles/imagetypes.csv | 3 +- csvfiles/jobs.csv | 4 +- csvfiles/locations.csv | 3 +- csvfiles/objects.csv | 3 +- csvfiles/othertypes.csv | 4 +- csvfiles/outfits.csv | 1 + csvfiles/poses.csv | 4 +- csvfiles/shotsizes.csv | 3 +- csvfiles/vomit.csv | 3 +- 20 files changed, 114 insertions(+), 114 deletions(-) diff --git a/build_dynamic_prompt.py b/build_dynamic_prompt.py index 70f4a05..ba22f36 100644 --- a/build_dynamic_prompt.py +++ b/build_dynamic_prompt.py @@ -132,7 +132,7 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all completeprompt += " [" if(imagetype != "all" and imagetype != "all - force multiple" and imagetype != "only other types"): - completeprompt += " " + imagetype + " " + completeprompt += " " + imagetype + ", " elif(imagetype == "all - force multiple" or rare_dist(insanitylevel)): amountofimagetypes = random.randint(2,3) elif(imagetype == "only other types"): @@ -335,6 +335,7 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all humanspecial = 1 speciallist = [" riding a -animal- ", "holding a -object- ", " driving a -vehicle-", " visiting a -building-", "with a -animal-", "surrounded by -object-s"] completeprompt += random.choice(speciallist) + # SD understands emoji's. Can be used to manipulate facial expressions. # emoji, legendary @@ -466,7 +467,7 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all #adding a great work of art, like starry night has cool effects. But this should happen only very rarely. if(novel_dist(insanitylevel)): - completeprompt = add_from_csv(completeprompt, "greatworks", 1, "","") + completeprompt = add_from_csv(completeprompt, "greatworks", 1, "in style of ","") # everyone loves the adding quality. The better models don't need this, but lets add it anyway if(uncommon_dist(insanitylevel)): @@ -611,6 +612,7 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all completeprompt = re.sub('a The', 'The', completeprompt) completeprompt = re.sub('ss ', 's ', completeprompt) + completeprompt = re.sub('ss, ', 's, ', completeprompt) completeprompt = re.sub(' +', ' ', completeprompt[2:]) # remove first character, that is always a comma. Remove any excess spaces diff --git a/csvfiles/accessories.csv b/csvfiles/accessories.csv index d2946f4..23d3889 100644 --- a/csvfiles/accessories.csv +++ b/csvfiles/accessories.csv @@ -106,4 +106,7 @@ one-eyed Hair ribbons Fangs Belts --material- helmet \ No newline at end of file +-material- helmet +Cape +Cloak +-material- trimmings \ No newline at end of file diff --git a/csvfiles/animals.csv b/csvfiles/animals.csv index e2472b3..e2590a5 100644 --- a/csvfiles/animals.csv +++ b/csvfiles/animals.csv @@ -324,4 +324,14 @@ Brachiosaurus Allosaurus Ankylosaurus Diplodocus -Pterodactyl \ No newline at end of file +Pterodactyl +Pikachu +Charizard +Mewtwo +Bulbasaur +Squirtle +Jigglypuff +Snorlax +Eevee +Gyarados +Dragonite \ No newline at end of file diff --git a/csvfiles/artmovements.csv b/csvfiles/artmovements.csv index c60356c..0a67397 100644 --- a/csvfiles/artmovements.csv +++ b/csvfiles/artmovements.csv @@ -134,4 +134,5 @@ Minecraft MinecraftCore Orientalism Art Dieselpunk -Synthwave Art \ No newline at end of file +Synthwave Art +Emopunk \ No newline at end of file diff --git a/csvfiles/buildings.csv b/csvfiles/buildings.csv index 6be724b..36e6f73 100644 --- a/csvfiles/buildings.csv +++ b/csvfiles/buildings.csv @@ -175,4 +175,6 @@ The Pyramids of Teotihuacan The Burj Khalifa The Golden Gate Bridge Stargate -Portal \ No newline at end of file +Portal +Monolith +-color- Monoliths \ No newline at end of file diff --git a/csvfiles/concept_prefix.csv b/csvfiles/concept_prefix.csv index 2c1a4cf..3c23fb6 100644 --- a/csvfiles/concept_prefix.csv +++ b/csvfiles/concept_prefix.csv @@ -93,4 +93,5 @@ Gift Pillars Burden Dawn -Need \ No newline at end of file +Need +Shape \ No newline at end of file diff --git a/csvfiles/concept_suffix.csv b/csvfiles/concept_suffix.csv index 440241a..3da9864 100644 --- a/csvfiles/concept_suffix.csv +++ b/csvfiles/concept_suffix.csv @@ -76,4 +76,6 @@ Beauty Blood Elegance Study -Metal \ No newline at end of file +Metal +Paradise +Sea \ No newline at end of file diff --git a/csvfiles/cultures.csv b/csvfiles/cultures.csv index 420d86d..3e2612c 100644 --- a/csvfiles/cultures.csv +++ b/csvfiles/cultures.csv @@ -173,4 +173,5 @@ Georgian Regency Atomic Age Digital Age -Baroque \ No newline at end of file +Baroque +Pirate \ No newline at end of file diff --git a/csvfiles/descriptors.csv b/csvfiles/descriptors.csv index da6944a..cb9445e 100644 --- a/csvfiles/descriptors.csv +++ b/csvfiles/descriptors.csv @@ -283,4 +283,8 @@ Folded Glam Chic Zen -Rustic \ No newline at end of file +Rustic +Rich +Varied +Injured +Scrumptious \ No newline at end of file diff --git a/csvfiles/fictional characters.csv b/csvfiles/fictional characters.csv index b9ddc53..ff52af6 100644 --- a/csvfiles/fictional characters.csv +++ b/csvfiles/fictional characters.csv @@ -30,7 +30,6 @@ Tinker Bell Peter Pan Captain Hook Winnie the Pooh -Shrek Donkey from Shrek Fiona from Shrek Pinocchio @@ -58,11 +57,6 @@ Slinky Dog from Toy Story Jessie from Toy Story Rex from Toy Story Hamm from Toy Story -Nemo from Finding Nemo -Dory from Finding Nemo -Marlin from Finding Nemo -Crush from Finding Nemo -Squirt from Finding Nemo Lightning McQueen from Cars Mater from Cars Doc Hudson from Cars @@ -71,9 +65,6 @@ Sulley Randall Boggs Remy from Ratatouille Linguini from Ratatouille -Carl Fredricksen from Up -Dug from Up -Russell from Up Joy from Inside Out Sadness from Inside Out Anger from Inside Out @@ -225,12 +216,6 @@ Tauriel Thranduil Arwen Glorfindel -Beren -Luthien -Melian -Tuor -Idril -Earendil Harry Potter Hermione Granger Ron Weasley @@ -370,21 +355,18 @@ Ryu Ken Masters Chun-Li Sub-Zero -Scorpion +Scorpion from Mortal Kombat Solid Snake Big Boss Ezio Auditore Altair Ibn-La'Ahad Aloy -Joel -Ellie Geralt of Rivia Trevor Philips Michael De Santa Franklin Clinton Niko Bellic Tommy Vercetti -CJ Marcus Fenix Dom Santiago Arthur Morgan @@ -392,23 +374,12 @@ John Marston Red Dead Redemption Arthur Curry Cole MacGrath -Bugs Bunny SpongeBob SquarePants Homer Simpson -Scooby-Doo -Tom and Jerry -Pikachu -Woody Woodpecker Betty Boop -Mickey Mouse -Donald Duck -Goofy -Daffy Duck -Garfield Bart Simpson Fred Flintstone Shrek -Stewie Griffin Pink Panther Popeye Charlie Brown @@ -435,81 +406,69 @@ Kyle Broflovski Peter Griffin Brian Griffin Stewie Griffin -Bender +Bender from Futurama Fry from Futurama Leela from Futurama Roger from American Dad -Steve Smith from American Dad -Homer Simpson from The Simpsons -Walter White from Breaking Bad -Tony Soprano from The Sopranos -Don Draper from Mad Men -Ross Geller from Friends -Jerry Seinfeld from Seinfeld -Michael Scott from The Office -Carrie Bradshaw from Sex and the City -Buffy Summers from Buffy the Vampire Slayer -Tyrion Lannister from Game of Thrones -Olivia Pope from Scandal -Dexter Morgan from Dexter -Meredith Grey from Grey's Anatomy -Rachel Green from Friends -Sheldon Cooper from The Big Bang Theory -Lorelai Gilmore from Gilmore Girls -Cookie Lyon from Empire -Barney Stinson from How I Met Your Mother -Daenerys Targaryen from Game of Thrones -Sherlock Holmes from Sherlock -Leslie Knope from Parks and Recreation -Alicia Florrick from The Good Wife +Steve Smith +Walter White +Tony Soprano +Don Draper +Ross Geller +Jerry Seinfeld +Michael Scott +Carrie Bradshaw +Buffy Summers +Tyrion Lannister +Olivia Pope +Dexter Morgan +Meredith Grey +Rachel Green +Sheldon Cooper +Lorelai Gilmore +Cookie Lyon +Barney Stinson +Daenerys Targaryen +Sherlock Holmes +Leslie Knope +Alicia Florrick Eleven from Stranger Things -Carrie Mathison from Homeland -Mindy Lahiri from The Mindy Project +Carrie Mathison +Mindy Lahiri Agent Dale Cooper from Twin Peaks -Eric Cartman from South Park -Will Byers from Stranger Things -Dr. House from House -Claire Underwood from House of Cards -Rick Grimes from The Walking Dead -Carrie Brownstein from Portlandia -Abed Nadir from Community -Agent Mulder from The X-Files -Carmela Soprano from The Sopranos -Fred Flintstone from The Flintstones -Leslie Poole from Veep -Jesse Pinkman from Breaking Bad -Lorelei Lee from The Marvelous Mrs. Maisel -Tracy Jordan from 30 Rock -Omar Little from The Wire -Dwight Schrute from The Office -Tyrone Biggums from Chappelle's Show -Omarosa Manigault Newman from The Apprentice -Issa Dee from Insecure -David Brent from The Office -Betty Draper from Mad Men -Kenny Powers from Eastbound & Down -Selina Meyer from Veep -Peggy Olson from Mad Men +Eric Cartman +Will Byers +Dr. House +Claire Underwood +Rick Grimes +Carrie Brownstein +Abed Nadir +Agent Mulder +Carmela Soprano +Leslie Poole +Jesse Pinkman +Lorelei Lee +Tracy Jordan +Omar Little +Dwight Schrute +Tyrone Biggums +Omarosa Manigault Newman +Issa Dee +David Brent +Betty Draper +Kenny Powers +Selina Meyer +Peggy Olson Ash Ketchum Misty from pokemon Brock from pokemon -Gary Oak from pokemon -Professor Oak from pokemon -Nurse Joy from pokemon -Officer Jenny from pokemon +Gary Oak +Professor Oak +Nurse Joy +Officer Jenny Jessie from pokemon James from pokemon Team rocket -Pikachu -Charizard -Mewtwo -Bulbasaur -Squirtle -Jigglypuff -Snorlax -Eevee -Gyarados -Dragonite John Wick Captain -material-beard -animal-man @@ -542,4 +501,6 @@ Saitama Jotaro Kujo Guts Alucard --animal- like human \ No newline at end of file +-animal- like human +Kermit the frog +Miss piggy \ No newline at end of file diff --git a/csvfiles/hairstyles.csv b/csvfiles/hairstyles.csv index 2f99dc4..81c5548 100644 --- a/csvfiles/hairstyles.csv +++ b/csvfiles/hairstyles.csv @@ -101,4 +101,5 @@ Side-swept curls Pigtails Braided pigtails Space buns -Mermaid waves \ No newline at end of file +Mermaid waves +Balayage \ No newline at end of file diff --git a/csvfiles/imagetypes.csv b/csvfiles/imagetypes.csv index 08b921f..61925fa 100644 --- a/csvfiles/imagetypes.csv +++ b/csvfiles/imagetypes.csv @@ -32,4 +32,5 @@ VRay Abstract Fractal portrait -Raw digital photo \ No newline at end of file +Raw digital photo +Airbrush painting \ No newline at end of file diff --git a/csvfiles/jobs.csv b/csvfiles/jobs.csv index a9cbf39..a06651f 100644 --- a/csvfiles/jobs.csv +++ b/csvfiles/jobs.csv @@ -359,4 +359,6 @@ Sultan Geisha Yogi Adventurer -Royalty \ No newline at end of file +Royalty +Cowboy +Cowgirl \ No newline at end of file diff --git a/csvfiles/locations.csv b/csvfiles/locations.csv index d040492..6e2fea8 100644 --- a/csvfiles/locations.csv +++ b/csvfiles/locations.csv @@ -672,4 +672,5 @@ The Moai of Easter Island city of -material- -color- nebula Wormhole -Portal \ No newline at end of file +Portal +Bamboo Forest \ No newline at end of file diff --git a/csvfiles/objects.csv b/csvfiles/objects.csv index aa95a4d..d02d2a1 100644 --- a/csvfiles/objects.csv +++ b/csvfiles/objects.csv @@ -401,4 +401,5 @@ Baklava Strudel Beignet Scone -Bread \ No newline at end of file +Bread +Skull \ No newline at end of file diff --git a/csvfiles/othertypes.csv b/csvfiles/othertypes.csv index 8303852..15b40be 100644 --- a/csvfiles/othertypes.csv +++ b/csvfiles/othertypes.csv @@ -83,4 +83,6 @@ Miniature diorama Anime key visual Multiple layers of silhouette Retro comic style artwork -Metal pin \ No newline at end of file +Metal pin +a felt muppet +Glitch art \ No newline at end of file diff --git a/csvfiles/outfits.csv b/csvfiles/outfits.csv index 6337398..2e9f752 100644 --- a/csvfiles/outfits.csv +++ b/csvfiles/outfits.csv @@ -486,6 +486,7 @@ Field jacket Chore coat Raincoat Fur coat +Fur trimmed coat Armor Short skirt and a long jacket -material- outfit diff --git a/csvfiles/poses.csv b/csvfiles/poses.csv index bb7bc2f..6e6c07c 100644 --- a/csvfiles/poses.csv +++ b/csvfiles/poses.csv @@ -62,4 +62,6 @@ fashion modeling pose relaxing pose sleeping pose Contrapposto -Tilted head \ No newline at end of file +Tilted head +Action scene +Fluid movement \ No newline at end of file diff --git a/csvfiles/shotsizes.csv b/csvfiles/shotsizes.csv index fcdd651..6ebdfd6 100644 --- a/csvfiles/shotsizes.csv +++ b/csvfiles/shotsizes.csv @@ -36,4 +36,5 @@ cinematic shot overhead angle Sharp focus Street level shot -Fashion shot \ No newline at end of file +Fashion shot +Full length frame \ No newline at end of file diff --git a/csvfiles/vomit.csv b/csvfiles/vomit.csv index 91292ad..f85f66d 100644 --- a/csvfiles/vomit.csv +++ b/csvfiles/vomit.csv @@ -49,4 +49,5 @@ Light sparkles Complex background Plain white background Zentangle -Mandala \ No newline at end of file +Mandala +Luminous trails \ No newline at end of file