From 0e4c851c283bb40e7da62eb5cd7d01fa5672d6a5 Mon Sep 17 00:00:00 2001 From: jtkelm2 Date: Tue, 6 Sep 2022 22:06:13 -0500 Subject: [PATCH 01/11] Added functionality for wildcards --- scripts/webui.py | 12 +- scripts/wildcards/adjective.txt | 209 +++++++++++++++ scripts/wildcards/artist.txt | 443 ++++++++++++++++++++++++++++++++ scripts/wildcards/genre.txt | 19 ++ scripts/wildcards/site.txt | 19 ++ scripts/wildcards/style.txt | 63 +++++ 6 files changed, 764 insertions(+), 1 deletion(-) create mode 100644 scripts/wildcards/adjective.txt create mode 100644 scripts/wildcards/artist.txt create mode 100644 scripts/wildcards/genre.txt create mode 100644 scripts/wildcards/site.txt create mode 100644 scripts/wildcards/style.txt diff --git a/scripts/webui.py b/scripts/webui.py index cbcf714bc..1e106ceb2 100644 --- a/scripts/webui.py +++ b/scripts/webui.py @@ -773,7 +773,15 @@ def classToArrays( items, seed, n_iter ): return all_seeds, n_iter, prompt_matrix_parts, all_prompts, needrows - +def replace_wildcard(chunk): + if not " " in chunk: + file_dir = os.path.dirname(os.path.realpath("__file__")) + replacement_file = os.path.join(file_dir, "scripts/wildcards/" + chunk + ".txt") + if os.path.exists(replacement_file): + lines = open(replacement_file, encoding="utf8").read().splitlines() + my_line = random.choice(lines) + return(my_line) + return(chunk) def process_images( outpath, func_init, func_sample, prompt, seed, sampler_name, skip_grid, skip_save, batch_size, @@ -841,6 +849,8 @@ def process_images( all_prompts = batch_size * n_iter * [prompt] all_seeds = [seed + x for x in range(len(all_prompts))] + + all_prompts = list(map(lambda one_prompt: "".join(map(replace_wildcard, one_prompt.split("__"))), all_prompts)) original_seeds = all_seeds.copy() precision_scope = autocast if opt.precision == "autocast" else nullcontext diff --git a/scripts/wildcards/adjective.txt b/scripts/wildcards/adjective.txt new file mode 100644 index 000000000..582eeeb0a --- /dev/null +++ b/scripts/wildcards/adjective.txt @@ -0,0 +1,209 @@ +Skip to content +Search or jump to… +Pull requests +Issues +Marketplace +Explore + +@jtkelm2 +lowfuel +/ +progrock-stable +Public +forked from CompVis/stable-diffusion +Code +Pull requests +1 +Actions +Projects +Security +Insights +progrock-stable/settings/adjective.txt +@lowfuel +lowfuel working! +Latest commit ec55ee5 18 days ago + History + 1 contributor +181 lines (181 sloc) 1.55 KB + +beautiful +fascinating +interesting +dire +terrifying +elusive +frantic +serene +evil +festive +mind-bending +complex +simple +extraordinary +masterpiece +tangible +psychotic +warlike +unusual +astonishing +grumpy +efficacious +nutty +aspiring +functional +ignorant +fallacious +noxious +rich +lyrical +level +grouchy +vengeful +skillful +gruesome +neat +striped +glib +uptight +tremendous +overwrought +dazzling +holistic +lush +abandoned +adorable +abhorrent +resonant +feigned +macho +delicate +thundering +sophisticated +jealous +stimulating +nonchalant +icy +blue +cool +draconian +squealing +puny +hesitant +kindhearted +elite +capricious +meek +nasty +superficial +flowery +elastic +old +witty +pretty +maniacal +glamorous +honorable +delightful +conscious +harsh +average +unadvised +good +serious +untidy +abrasive +deafening +tough +boorish +shaky +elegant +secret +sweltering +parched +smart +epic +dramatic +colossal +gigantic +tiny +ridiculous +cromulent +weird +surreal +boring +funny +cute +natural +unnatural +swirling +twisted +angular +expressive +impressive +oppressive +repressive +colorful +vibrant +modular +steampunk +dieselpunk +clockwork +cyberpunk +cold +cloudy +foggy +sharp +ruined +ancient +futuristic +disgusting +delicious +fruit-flavored +unappetizing +rounded +zany +slimy +dusty +rusty +deteriorating +sturdy +rickety +dreamlike +painterly +wispy +metallic +stone +shiny +matte +pastel +rainbow +atmospheric +moody +spiritual +ghostly +ghastly +biomechanical +petrified +illuminated +glowing +fiery +metallic +retrofuturistic +giant +hyperdetailed +shadowy +supersized +incredibly detailed +otherworldly +cozy +gentle +sprawling +dystopian +apocalyptic +primordial +underwater +psychadelic +groovy +minimalist +cluttered +dilapidated \ No newline at end of file diff --git a/scripts/wildcards/artist.txt b/scripts/wildcards/artist.txt new file mode 100644 index 000000000..01975b4ae --- /dev/null +++ b/scripts/wildcards/artist.txt @@ -0,0 +1,443 @@ +Inyi Han +Pieter Bruegel the Elder +Greg Rutkowski +Michael Whelan +Chriss Foss +Marc Simonetti +Anato Finnstark +Jean Delville +John Harris +Simon Stalenhag +John Howe +James Jean +Don Maitz +Gediminas Pranckevicius +Zdzisław Beksiński +Albert Bierstadt +Kim Jung Gi +Frederick Edwin Church +Thomas Cole +Michael Hussar +Anders Zorn +Thomas Kinkade +James Gurney +James Paick +Jakub Rozalski +Dean Ellis +Federico Pelat +Hyun Lee +Chesley Bonestell +Alfons Maria Mucha +Hethe Srodawa +Jerome Lacoste +Igor Wolkski +Peter Mohrbacher +John Atkinson Grimshaw +Peter Gric +Paul Delvaux +Rob Gonsalves +Karol Bak +Hubert Robert +Michael Parkes +Andrew Wyeth +Rebecca Guay +Fairfield Porter +Jacek Yerka +John Berkey +Margaret Macdonald Mackintosh +Peter Elson +Chris Foss +Bob Eggleton +Takato Yamamoto +Odd Nerdrum +Dean Cornwell +Robert McCall +Edmund Dulac +George Inness +Zdzisław Beksiński +Rodney Matthews +Martin Johnson Heade +Lee Madgwick +Beksinski +John Harris +Gustave Moreau +Yves Tanguy +Guido Borelli da Caluso +Rafal Olbinski +Donato Giancola +Laurie Lipton +Warwick Goble +Coles Phillips +Alex Katz +Kay Nielsen +Victo Ngai +Rockwell Kent +Luis Royo +Vladimir Kush +Mati Klarwein +Edwin Austin Abbey +Henry Ossawa Tanner +Bastien Lecouffe-Deharme +Tim White +Bruce Pennington +Gerald Brom +Elizabeth Shippen Green +Juan Gris +Tomer Hanuka +Ted Nasmith +Arthur Garfield Dove +Giacomo Balla +Jessie Willcox Smith +James C. Christensen +Louis Glackens +Edmund Leighton +Dan Mumford +Odilon Redon +Gil Elvgren +Saul Tepper +John Bauer +Winslow Homer +Ohara Koson +Roger Ballen +Charles Dana Gibson +Egon Schiele +Ted DeGrazia +Gediminas Pranckevicius +N.C. Wyeth +Robert McGinnis +Mike Winkelmann +Stephan Martiniere +Maxfield Parrish +Jean Metzinger +Sonia Delaunay +Tomokazu Matsuyama +JC Leyendecker +Arthur Rackham +Isaac Levitan +Lawren Harris +Kadir Nelson +Frederick McCubbin +Evelyn De Morgan +Richard Dadd +Tamara Lempicka +Esao Andrews +Hans Bellmer +Simon Stalenhag +Dorothea Tanning +Geof Darrow +William-Adolphe Bouguereau +Louise Bourgeois +Louis Janmot +Marc Simonetti +Agnes Lawrence Pelton +Igor Morski +Alexander Jansson +Wifredo Lam +John French Sloan +Camille Corot +Ivan Aivazovsky +James Jean +Chesley Bonestell +Henri Rousseau +Marianne North +Paul Lehr +Clara Peeters +Mark Ryden +Lynda Benglis +Frank Xavier Leyendecker +Wayne Barlowe +Jean Delville +Leonora Carrington +Pieter Claesz +Ilya Repin +Tomi Ungerer +Joe Jusko +Hugh Ferriss +Edward Burne-Jones +Ilya Kuvshinov +Arnold Böcklin +Brian Froud +Michael Whelan +Lucian Freud +Jakub Rozalski +Milton Caniff +Alfred Kubin +Jasper Johns +Mœbius +Saul Steinberg +Mead Schaeffer +Terry Oakes +Ralph McQuarrie +Ivan Bilibin +Pierre Bonnard +Edward Gorey +Asher Brown Durand +Mary Cassatt +Greg Hildebrandt +John Frederick Kensett +Syd Mead +Frank Frazetta +Jeff Easley +Paul Klee +Tim and Greg Hildebrandt +Daniel Merriam +Aaron Douglas +Alex Horley-Orlandelli +Aubrey Beardsley +Tom Lovell +Boris Vallejo +Gaston Bussière +F Scott Hess +Raphael Lacoste +Roger Dean +Albert Bierstadt +Howard Pyle +Earl Norem +Charles Addams +Alphonse Mucha +Craig Mullins +CoWhitmore +Joaquín Sorolla +Caspar David Friedrich +Ivan Shishkin +Alex Grey +Anni Albers +Alberto Vargas +Edwin Deakin +Gustave Dore +Roz Chast +Jean-Honoré Fragonard +Jeffrey Smith +Ayami Kojima +Wassily Kandinsky +Walter Crane +Beeple +Howard Chandler Christy +Terry Redlin +Larry Elmore +Franz Sedlacek +Gwen John +Ray Caesar +Jean Giraud +Peter Max +Henri de Toulouse-Lautrec +Thomas Cole +Laurel Burch +Camille Pissarro +Gustaf Tenggren +Joseph Cornell +Kelly Mckernan +Andreas Rocha +Jim Burns +John Constable +Emory Douglas +Winsor McCay +Dale Chihuly +Giovanni Battista Piranesi +Emmanuel Shiu +Edgar Degas +Simon Bisley +Henry Raleigh +Tom Thomson +O'Keeffe +George Luks +Rene Magritte +John Howe +John Philip Falter +Moebius +Cynthia Sheppard +James Gillray +RHADS +Antonio Mancini +Dave Dorman +Ron Walotsky +Sam Spratt +Bill Sienkiewicz +George B. Bridgman +El Greco +Jon Whitcomb +Giorgio de Chirico +Wendy Froud +Jon Foster +Dave McKean +Paul Cezanne +Cindy Sherman +Filippino Lippi +Gustav Doré +Jamie Hewlett +Ed Emshwiller +Diane Dillon +Chris Moore +Don Maitz +Mikalojus Konstantinas Čiurlionis +Paul Gauguin +Kandinsky +Austin Briggs +Utagawa Kuniyoshi +Gustav Klimt +E.H. Shepard +Aleksi Briclot +Maciej Kuciara +Hans Baldung +Mike Mignola +Cézanne +Anish Kapoor +Giorgione +Pieter Bruegel +William Michael Harnett +Anna Dittmann +Francis Bacon +Greg Rutkowski +Gustave Doré +Maria Sibylla Merian +Jesper Ejsing +Pierre-Auguste Renoir +Edward Hopper +Francisco Goya +Hannah Höch +Alex Ross +Jim Steranko +Keith Haring +Brian Bolland +William Hogarth +Jan van Eyck +Thomas Kinkade +John James Audubon +Mario Sanchez Nevado +Alberto Giacometti +Yayoi Kusama +William Stout +Takashi Murakami +Konstantin Vasilyev +Damien Hirst +George Cruikshank +Milton Glaser +Henri Matisse +Johfra Bosschart +Peter Paul Rubens +Roberto da Matta +Alex Toth +André Masson +Jerry Pinkney +Yayou Kusama +Raymond Swanland +Canaletto +Édouard Manet +Malevich +Kate Greenaway +Dürer +Ivan Albright +Norman Rockwell +Mondrian +Brom +Edward Lear +Robert Rauschenberg +Georgia O'Keeffe +Gillis Rombouts +Jean-Michel Basquiat +M.C. Escher +Klimt +Artemisia Gentileschi +Fitz Henry Lane +Kelly Freas +Earnst Haeckel +Earle Bergey +Will Eisner +Noriyoshi Ohrai +William Steig +Konstantinas Ciurlionis +Seb McKinnon +Eugene Delacroix +Edvard Munch +Albrecht Dürer +Sir John Tenniel +Franklin Booth +J.M.W. Turner +Eugène Delacroix +Yue Minjun +Takeshi Obata +Leo and Diane Dillon +Anthony van Dyck +Richter +James Gurney +Steven DaLuz +Vermeer +Claude Monet +David Firth +Chris Rallis +Anton Otto Fischer +Jack Kirby +Kinuko Craft +Anna Mary Robertson Moses +Delaunay +Johannes Vermeer +H.R. Giger +Noah Bradley +Thomas Nast +John Romita Jr +Rembrandt +Tony Sart +Akihiko Yoshida +Ansel Adams +Cornelis Bisschop +Harvey Kurtzman +John Martin +Ralph Horsley +Kusama +Taro Okamoto +Liam Wong +Wally Wood +Gregory Manchess +Peter Helck +April Gornik +Steve Dillon +Beatrix Potter +Lyubov Popova +Bunny Yeager +Slawomir Maniak +Art Spiegelman +Munch +Dave Gibbons +Lise Deharme +sparth +Kawanabe Kyōsai +Ross Tran +Bill Ward +Hokusai +Jackson Pollock +Rembrandt van Rijn +Darek Zabrocki +MC Escher +Harvey Dunn +Thornton Oakley +Sandro Botticelli +Hiromu Arakawa +Salvador Dalí +Vincent Di Fate +Hieronymus Bosch +Dali +Jeff Koons +Caravaggio +Igor Kieryluk +Harrison Fisher +Dr. Seuss +Bill Watterson +Clyde Caldwell +Bayard Wu +Janet Fish +Lale Westvind +Tyler Edlin +Makoto Shinkai +P.A. Works +Junji Ito +Greg Staples +Yoshitaka Amano +Renoir +Walter Beach Humphrey +Stevan Dohanos +Titian +Tomek Setowski +Dalí +Cedric Peyravernay +Laura Muntz Lyall +Randolph Caldecott \ No newline at end of file diff --git a/scripts/wildcards/genre.txt b/scripts/wildcards/genre.txt new file mode 100644 index 000000000..a17ea0761 --- /dev/null +++ b/scripts/wildcards/genre.txt @@ -0,0 +1,19 @@ +sci-fi +fantasy +dark fantasy +high fantasy +art deco +steampunk +cyberpunk +dieselpunk +film noir +mid-century +ancient +historic +victorian +medieval +renaissance +vintage +weird west +synthwave +gothic \ No newline at end of file diff --git a/scripts/wildcards/site.txt b/scripts/wildcards/site.txt new file mode 100644 index 000000000..0b0e1ed13 --- /dev/null +++ b/scripts/wildcards/site.txt @@ -0,0 +1,19 @@ +trending on ArtStation +trending on ConceptArtWorld +trending on Flickr +trending on Behance +trending on 500px +trending on Getty Images +trending on DeviantArt +trending on Pixiv +trending on cgsociety +featured on ConceptArtWorld +featured on 500px +featured on Getty Images +featured on Pixiv +featured on cgsociety +reimagined by pixar +unsplash contest winner +zbrush central +zbrushcentral +trending on zbrushcentral \ No newline at end of file diff --git a/scripts/wildcards/style.txt b/scripts/wildcards/style.txt new file mode 100644 index 000000000..465aee63d --- /dev/null +++ b/scripts/wildcards/style.txt @@ -0,0 +1,63 @@ +oil painting +matte painting +unreal engine render +rendered in maya +rendered in zbrush +rendered in cinema4d +pencil sketch +watercolor painting +3D VR painting +1950s pulp sci-fi cover +8k resolution +digital painting +highly detailed +vector image +schematic +artistic photograph +surveillance footage +graffiti +sculpture +Veduta painting +Panorama +Fresco painting +Chiaroscuro painting +Gouache Painting +Tempera Painting +Trompe L’oeil +Impasto painting +Sfumato painting +Byzantine mosaic +digital painting +pastel painting +Grisaille painting +Perspective painting +Veduta painting +Sotto In Su +Ukiyo-e +Baroque painting +Luminism painting +visionary hypermaximalism +depiction +low-poly +anime +mixed media +flat shading +#film +pop art +fine art +RTX on +shot on 70mm +filmed in IMAX +Marvel Comics +Flemish Baroque +vray tracing +Playstation 5 screenshot +2d game art +surrealist +hyperrealism +tilt shift +depth of field +volumetric lighting +storybook illustration +parallax +dutch golden age \ No newline at end of file From d0c8fa338b79b1ff5ebce619af9e24480414d27a Mon Sep 17 00:00:00 2001 From: jtkelm2 Date: Wed, 7 Sep 2022 00:34:21 -0500 Subject: [PATCH 02/11] Update adjective.txt --- scripts/wildcards/adjective.txt | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/scripts/wildcards/adjective.txt b/scripts/wildcards/adjective.txt index 582eeeb0a..5ff13f1f1 100644 --- a/scripts/wildcards/adjective.txt +++ b/scripts/wildcards/adjective.txt @@ -1,31 +1,3 @@ -Skip to content -Search or jump to… -Pull requests -Issues -Marketplace -Explore - -@jtkelm2 -lowfuel -/ -progrock-stable -Public -forked from CompVis/stable-diffusion -Code -Pull requests -1 -Actions -Projects -Security -Insights -progrock-stable/settings/adjective.txt -@lowfuel -lowfuel working! -Latest commit ec55ee5 18 days ago - History - 1 contributor -181 lines (181 sloc) 1.55 KB - beautiful fascinating interesting @@ -206,4 +178,4 @@ psychadelic groovy minimalist cluttered -dilapidated \ No newline at end of file +dilapidated From 68d0e639e534df73c51a5ac40d2dfeabd0061771 Mon Sep 17 00:00:00 2001 From: jtkelm2 Date: Wed, 7 Sep 2022 13:38:17 -0500 Subject: [PATCH 03/11] Update scripts/webui.py Co-authored-by: Aarni Koskela --- scripts/webui.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/webui.py b/scripts/webui.py index 1e106ceb2..d2244ccdb 100644 --- a/scripts/webui.py +++ b/scripts/webui.py @@ -778,10 +778,9 @@ def replace_wildcard(chunk): file_dir = os.path.dirname(os.path.realpath("__file__")) replacement_file = os.path.join(file_dir, "scripts/wildcards/" + chunk + ".txt") if os.path.exists(replacement_file): - lines = open(replacement_file, encoding="utf8").read().splitlines() - my_line = random.choice(lines) - return(my_line) - return(chunk) + with open(replacement_file, encoding="utf8") as f: + return random.choice(f.read().splitlines()) + return chunk def process_images( outpath, func_init, func_sample, prompt, seed, sampler_name, skip_grid, skip_save, batch_size, From f258673367679f1715e31df58f622ef21023b430 Mon Sep 17 00:00:00 2001 From: jtkelm2 Date: Wed, 7 Sep 2022 13:38:47 -0500 Subject: [PATCH 04/11] Update scripts/webui.py Co-authored-by: Aarni Koskela --- scripts/webui.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/webui.py b/scripts/webui.py index d2244ccdb..2bbf7b663 100644 --- a/scripts/webui.py +++ b/scripts/webui.py @@ -774,7 +774,7 @@ def classToArrays( items, seed, n_iter ): return all_seeds, n_iter, prompt_matrix_parts, all_prompts, needrows def replace_wildcard(chunk): - if not " " in chunk: + if " " not in chunk: file_dir = os.path.dirname(os.path.realpath("__file__")) replacement_file = os.path.join(file_dir, "scripts/wildcards/" + chunk + ".txt") if os.path.exists(replacement_file): From 895298afc4811103c62a04b819974c381951bf9c Mon Sep 17 00:00:00 2001 From: jtkelm2 Date: Wed, 7 Sep 2022 13:39:24 -0500 Subject: [PATCH 05/11] Update scripts/webui.py Co-authored-by: Aarni Koskela --- scripts/webui.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/webui.py b/scripts/webui.py index 2bbf7b663..ce9690e00 100644 --- a/scripts/webui.py +++ b/scripts/webui.py @@ -776,7 +776,7 @@ def classToArrays( items, seed, n_iter ): def replace_wildcard(chunk): if " " not in chunk: file_dir = os.path.dirname(os.path.realpath("__file__")) - replacement_file = os.path.join(file_dir, "scripts/wildcards/" + chunk + ".txt") + replacement_file = os.path.join(file_dir, f"scripts/wildcards/{chunk}.txt") if os.path.exists(replacement_file): with open(replacement_file, encoding="utf8") as f: return random.choice(f.read().splitlines()) From 2d997478a9bd20c4704c7ff9f31f19742085daef Mon Sep 17 00:00:00 2001 From: jtkelm2 Date: Wed, 7 Sep 2022 13:39:35 -0500 Subject: [PATCH 06/11] Update scripts/webui.py Co-authored-by: Aarni Koskela --- scripts/webui.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/webui.py b/scripts/webui.py index ce9690e00..5d6e29ded 100644 --- a/scripts/webui.py +++ b/scripts/webui.py @@ -849,7 +849,7 @@ def process_images( all_prompts = batch_size * n_iter * [prompt] all_seeds = [seed + x for x in range(len(all_prompts))] - all_prompts = list(map(lambda one_prompt: "".join(map(replace_wildcard, one_prompt.split("__"))), all_prompts)) + all_prompts = ["".join(replace_wildcard(chunk) for chunk in one_prompt.split("__")) for one_prompt in all_prompts] original_seeds = all_seeds.copy() precision_scope = autocast if opt.precision == "autocast" else nullcontext From ddafc0dfa0f622ede3478298fd225bb568908da2 Mon Sep 17 00:00:00 2001 From: jtkelm2 Date: Thu, 8 Sep 2022 02:56:08 -0500 Subject: [PATCH 07/11] Alphabetize --- scripts/wildcards/adjective.txt | 316 ++++++++++++++++---------------- 1 file changed, 158 insertions(+), 158 deletions(-) diff --git a/scripts/wildcards/adjective.txt b/scripts/wildcards/adjective.txt index 5ff13f1f1..3a5460a58 100644 --- a/scripts/wildcards/adjective.txt +++ b/scripts/wildcards/adjective.txt @@ -1,181 +1,181 @@ +abandoned +abhorrent +abrasive +adorable +ancient +angular +apocalyptic +aspiring +astonishing +atmospheric +average beautiful -fascinating -interesting +biomechanical +blue +boorish +boring +capricious +clockwork +cloudy +cluttered +cold +colorful +colossal +complex +conscious +cool +cozy +cromulent +cute +cyberpunk +dazzling +deafening +delicate +delicious +delightful +deteriorating +dieselpunk +dilapidated dire -terrifying +disgusting +draconian +dramatic +dreamlike +dusty +dystopian +efficacious +elastic +elegant +elite elusive -frantic -serene +epic evil -festive -mind-bending -complex -simple +expressive extraordinary -masterpiece -tangible -psychotic -warlike -unusual -astonishing -grumpy -efficacious -nutty -aspiring -functional -ignorant fallacious -noxious -rich -lyrical -level +fascinating +feigned +festive +fiery +flowery +foggy +frantic +fruit-flavored +functional +funny +futuristic +gentle +ghastly +ghostly +giant +gigantic +glamorous +glib +glowing +good +groovy grouchy -vengeful -skillful gruesome -neat -striped -glib -uptight -tremendous -overwrought -dazzling +grumpy +harsh +hesitant holistic -lush -abandoned -adorable -abhorrent -resonant -feigned -macho -delicate -thundering -sophisticated -jealous -stimulating -nonchalant +honorable +hyperdetailed icy -blue -cool -draconian -squealing -puny -hesitant +ignorant +illuminated +impressive +incredibly detailed +interesting +jealous kindhearted -elite -capricious +level +lush +lyrical +macho +maniacal +masterpiece +matte meek +metallic +metallic +mind-bending +minimalist +modular +moody nasty -superficial -flowery -elastic +natural +neat +nonchalant +noxious +nutty old -witty +oppressive +otherworldly +overwrought +painterly +parched +pastel +petrified pretty -maniacal -glamorous -honorable -delightful -conscious -harsh -average -unadvised -good +primordial +psychadelic +psychotic +puny +rainbow +repressive +resonant +retrofuturistic +rich +rickety +ridiculous +rounded +ruined +rusty +secret +serene serious -untidy -abrasive -deafening -tough -boorish +shadowy shaky -elegant -secret -sweltering -parched +sharp +shiny +simple +skillful +slimy smart -epic -dramatic -colossal -gigantic -tiny -ridiculous -cromulent -weird +sophisticated +spiritual +sprawling +squealing +steampunk +stimulating +stone +striped +sturdy +superficial +supersized surreal -boring -funny -cute -natural -unnatural +sweltering swirling +tangible +terrifying +thundering +tiny +tough +tremendous twisted -angular -expressive -impressive -oppressive -repressive -colorful -vibrant -modular -steampunk -dieselpunk -clockwork -cyberpunk -cold -cloudy -foggy -sharp -ruined -ancient -futuristic -disgusting -delicious -fruit-flavored +unadvised unappetizing -rounded -zany -slimy -dusty -rusty -deteriorating -sturdy -rickety -dreamlike -painterly -wispy -metallic -stone -shiny -matte -pastel -rainbow -atmospheric -moody -spiritual -ghostly -ghastly -biomechanical -petrified -illuminated -glowing -fiery -metallic -retrofuturistic -giant -hyperdetailed -shadowy -supersized -incredibly detailed -otherworldly -cozy -gentle -sprawling -dystopian -apocalyptic -primordial underwater -psychadelic -groovy -minimalist -cluttered -dilapidated +unnatural +untidy +unusual +uptight +vengeful +vibrant +warlike +weird +wispy +witty +zany From 20f7d7c45224b4aad06e588a37747c24abc7e3df Mon Sep 17 00:00:00 2001 From: jtkelm2 Date: Thu, 8 Sep 2022 03:19:43 -0500 Subject: [PATCH 08/11] Alphabetized and removed superfluous entries --- scripts/wildcards/artist.txt | 780 +++++++++++++++++------------------ 1 file changed, 375 insertions(+), 405 deletions(-) diff --git a/scripts/wildcards/artist.txt b/scripts/wildcards/artist.txt index 01975b4ae..ce779630e 100644 --- a/scripts/wildcards/artist.txt +++ b/scripts/wildcards/artist.txt @@ -1,443 +1,413 @@ -Inyi Han -Pieter Bruegel the Elder -Greg Rutkowski -Michael Whelan -Chriss Foss -Marc Simonetti -Anato Finnstark -Jean Delville -John Harris -Simon Stalenhag -John Howe -James Jean -Don Maitz -Gediminas Pranckevicius -Zdzisław Beksiński +Aaron Douglas +Agnes Lawrence Pelton +Akihiko Yoshida Albert Bierstadt -Kim Jung Gi -Frederick Edwin Church -Thomas Cole -Michael Hussar -Anders Zorn -Thomas Kinkade -James Gurney -James Paick -Jakub Rozalski -Dean Ellis -Federico Pelat -Hyun Lee -Chesley Bonestell +Albert Bierstadt +Alberto Giacometti +Alberto Vargas +Albrecht Dürer +Aleksi Briclot +Alex Grey +Alex Horley-Orlandelli +Alex Katz +Alex Ross +Alex Toth +Alexander Jansson Alfons Maria Mucha -Hethe Srodawa -Jerome Lacoste -Igor Wolkski -Peter Mohrbacher -John Atkinson Grimshaw -Peter Gric -Paul Delvaux -Rob Gonsalves -Karol Bak -Hubert Robert -Michael Parkes +Alfred Kubin +Alphonse Mucha +Anato Finnstark +Anders Zorn +André Masson +Andreas Rocha Andrew Wyeth -Rebecca Guay -Fairfield Porter -Jacek Yerka -John Berkey -Margaret Macdonald Mackintosh -Peter Elson -Chris Foss +Anish Kapoor +Anna Dittmann +Anna Mary Robertson Moses +Anni Albers +Ansel Adams +Anthony van Dyck +Anton Otto Fischer +Antonio Mancini +April Gornik +Arnold Böcklin +Art Spiegelman +Artemisia Gentileschi +Arthur Garfield Dove +Arthur Rackham +Asher Brown Durand +Aubrey Beardsley +Austin Briggs +Ayami Kojima +Bastien Lecouffe-Deharme +Bayard Wu +Beatrix Potter +Beeple +Beksinski +Bill Sienkiewicz +Bill Ward +Bill Watterson Bob Eggleton -Takato Yamamoto -Odd Nerdrum +Boris Vallejo +Brian Bolland +Brian Froud +Bruce Pennington +Bunny Yeager +Camille Corot +Camille Pissarro +Canaletto +Caravaggio +Caspar David Friedrich +Cedric Peyravernay +Charles Addams +Charles Dana Gibson +Chesley Bonestell +Chris Foss +Chris Moore +Chris Rallis +Chriss Foss +Cindy Sherman +Clara Peeters +Claude Monet +Clyde Caldwell +Coles Phillips +Cornelis Bisschop +Coby Whitmore +Craig Mullins +Cynthia Sheppard +Dale Chihuly +Damien Hirst +Dan Mumford +Daniel Merriam +Darek Zabrocki +Dave Dorman +Dave Gibbons +Dave McKean +David Firth Dean Cornwell -Robert McCall -Edmund Dulac -George Inness -Zdzisław Beksiński -Rodney Matthews -Martin Johnson Heade -Lee Madgwick -Beksinski -John Harris -Gustave Moreau -Yves Tanguy -Guido Borelli da Caluso -Rafal Olbinski +Dean Ellis +Diane Dillon +Disney +Don Maitz Donato Giancola -Laurie Lipton -Warwick Goble -Coles Phillips -Alex Katz -Kay Nielsen -Victo Ngai -Rockwell Kent -Luis Royo -Vladimir Kush -Mati Klarwein +Dorothea Tanning +Dreamworks +Dr. Seuss +Earl Norem +Earle Bergey +Earnst Haeckel +Ed Emshwiller +Edgar Degas +Edmund Dulac +Edmund Leighton +Édouard Manet +Edvard Munch +Edward Burne-Jones +Edward Gorey +Edward Hopper +Edward Lear Edwin Austin Abbey -Henry Ossawa Tanner -Bastien Lecouffe-Deharme -Tim White -Bruce Pennington -Gerald Brom +Edwin Deakin +Egon Schiele +El Greco Elizabeth Shippen Green -Juan Gris -Tomer Hanuka -Ted Nasmith -Arthur Garfield Dove +Emmanuel Shiu +Emory Douglas +Esao Andrews +Eugène Delacroix +Evelyn De Morgan +E.H. Shepard +F. Scott Hess +Fairfield Porter +Federico Pelat +Filippino Lippi +Fitz Henry Lane +Francis Bacon +Francisco Goya +Frank Frazetta +Frank Xavier Leyendecker +Franklin Booth +Franz Sedlacek +Frederick Edwin Church +Frederick McCubbin +Gaston Bussière +Gediminas Pranckevicius +Geof Darrow +George B. Bridgman +George Cruikshank +George Inness +George Luks +Georgia O'Keeffe +Gerald Brom Giacomo Balla -Jessie Willcox Smith -James C. Christensen -Louis Glackens -Edmund Leighton -Dan Mumford -Odilon Redon Gil Elvgren -Saul Tepper -John Bauer -Winslow Homer -Ohara Koson -Roger Ballen -Charles Dana Gibson -Egon Schiele -Ted DeGrazia -Gediminas Pranckevicius -N.C. Wyeth -Robert McGinnis -Mike Winkelmann -Stephan Martiniere -Maxfield Parrish -Jean Metzinger -Sonia Delaunay -Tomokazu Matsuyama -JC Leyendecker -Arthur Rackham -Isaac Levitan -Lawren Harris -Kadir Nelson -Frederick McCubbin -Evelyn De Morgan -Richard Dadd -Tamara Lempicka -Esao Andrews +Gillis Rombouts +Giorgio de Chirico +Giorgione +Giovanni Battista Piranesi +Greg Hildebrandt +Greg Rutkowski +Greg Staples +Gregory Manchess +Guido Borelli da Caluso +Gustaf Tenggren +Gustav Klimt +Gustave Doré +Gustave Moreau +Gwen John +Hannah Höch +Hans Baldung Hans Bellmer -Simon Stalenhag -Dorothea Tanning -Geof Darrow -William-Adolphe Bouguereau -Louise Bourgeois -Louis Janmot -Marc Simonetti -Agnes Lawrence Pelton -Igor Morski -Alexander Jansson -Wifredo Lam -John French Sloan -Camille Corot -Ivan Aivazovsky -James Jean -Chesley Bonestell +Harrison Fisher +Harvey Dunn +Harvey Kurtzman +Henri de Toulouse-Lautrec +Henri Matisse Henri Rousseau -Marianne North -Paul Lehr -Clara Peeters -Mark Ryden -Lynda Benglis -Frank Xavier Leyendecker -Wayne Barlowe -Jean Delville -Leonora Carrington -Pieter Claesz -Ilya Repin -Tomi Ungerer -Joe Jusko +Henry Ossawa Tanner +Henry Raleigh +Hethe Srodawa +Hieronymus Bosch +Hiromu Arakawa +Hokusai +Howard Chandler Christy +Howard Pyle +Hubert Robert Hugh Ferriss -Edward Burne-Jones +Hyun Lee +H.R. Giger +Igor Kieryluk +Igor Morski +Igor Wolkski Ilya Kuvshinov -Arnold Böcklin -Brian Froud -Michael Whelan -Lucian Freud -Jakub Rozalski -Milton Caniff -Alfred Kubin -Jasper Johns -Mœbius -Saul Steinberg -Mead Schaeffer -Terry Oakes -Ralph McQuarrie +Ilya Repin +Inyi Han +Isaac Levitan +Ivan Aivazovsky +Ivan Albright Ivan Bilibin -Pierre Bonnard -Edward Gorey -Asher Brown Durand -Mary Cassatt -Greg Hildebrandt -John Frederick Kensett -Syd Mead -Frank Frazetta -Jeff Easley -Paul Klee -Tim and Greg Hildebrandt -Daniel Merriam -Aaron Douglas -Alex Horley-Orlandelli -Aubrey Beardsley -Tom Lovell -Boris Vallejo -Gaston Bussière -F Scott Hess -Raphael Lacoste -Roger Dean -Albert Bierstadt -Howard Pyle -Earl Norem -Charles Addams -Alphonse Mucha -Craig Mullins -CoWhitmore -Joaquín Sorolla -Caspar David Friedrich Ivan Shishkin -Alex Grey -Anni Albers -Alberto Vargas -Edwin Deakin -Gustave Dore -Roz Chast +Jacek Yerka +Jack Kirby +Jackson Pollock +Jakub Rozalski +James C. Christensen +James Gillray +James Gurney +James Jean +James Paick +Jamie Hewlett +Jan van Eyck +Janet Fish +Jasper Johns +J.C. Leyendecker +Jean Delville +Jean Giraud +Jean Metzinger Jean-Honoré Fragonard +Jean-Michel Basquiat +Jeff Easley +Jeff Koons Jeffrey Smith -Ayami Kojima -Wassily Kandinsky -Walter Crane -Beeple -Howard Chandler Christy -Terry Redlin -Larry Elmore -Franz Sedlacek -Gwen John -Ray Caesar -Jean Giraud -Peter Max -Henri de Toulouse-Lautrec -Thomas Cole -Laurel Burch -Camille Pissarro -Gustaf Tenggren -Joseph Cornell -Kelly Mckernan -Andreas Rocha +Jerome Lacoste +Jerry Pinkney +Jesper Ejsing +Jessie Willcox Smith Jim Burns +Jim Steranko +Joaquín Sorolla +Joe Jusko +Johannes Vermeer +Johfra Bosschart +John Atkinson Grimshaw +John Bauer +John Berkey John Constable -Emory Douglas -Winsor McCay -Dale Chihuly -Giovanni Battista Piranesi -Emmanuel Shiu -Edgar Degas -Simon Bisley -Henry Raleigh -Tom Thomson -O'Keeffe -George Luks -Rene Magritte +John Frederick Kensett +John French Sloan +John Harris John Howe +John James Audubon +John Martin John Philip Falter -Moebius -Cynthia Sheppard -James Gillray -RHADS -Antonio Mancini -Dave Dorman -Ron Walotsky -Sam Spratt -Bill Sienkiewicz -George B. Bridgman -El Greco -Jon Whitcomb -Giorgio de Chirico -Wendy Froud +John Romita Jr Jon Foster -Dave McKean -Paul Cezanne -Cindy Sherman -Filippino Lippi -Gustav Doré -Jamie Hewlett -Ed Emshwiller -Diane Dillon -Chris Moore -Don Maitz -Mikalojus Konstantinas Čiurlionis -Paul Gauguin +Jon Whitcomb +Joseph Cornell +Juan Gris +Junji Ito +J.M.W. Turner +Kadir Nelson Kandinsky -Austin Briggs -Utagawa Kuniyoshi -Gustav Klimt -E.H. Shepard -Aleksi Briclot +Karol Bak +Kate Greenaway +Kawanabe Kyōsai +Kay Nielsen +Keith Haring +Kelly Freas +Kelly Mckernan +Kim Jung Gi +Kinuko Craft +Konstantin Vasilyev +Konstantinas Ciurlionis +Lale Westvind +Larry Elmore +Laura Muntz Lyall +Laurel Burch +Laurie Lipton +Lawren Harris +Lee Madgwick +Leo and Diane Dillon +Leonora Carrington +Liam Wong +Lise Deharme +Louis Glackens +Louis Janmot +Louise Bourgeois +Lucian Freud +Luis Royo +Lynda Benglis +Lyubov Popova Maciej Kuciara -Hans Baldung -Mike Mignola -Cézanne -Anish Kapoor -Giorgione -Pieter Bruegel -William Michael Harnett -Anna Dittmann -Francis Bacon -Greg Rutkowski -Gustave Doré +Makoto Shinkai +Malevich +Marc Simonetti +Margaret Macdonald Mackintosh Maria Sibylla Merian -Jesper Ejsing -Pierre-Auguste Renoir -Edward Hopper -Francisco Goya -Hannah Höch -Alex Ross -Jim Steranko -Keith Haring -Brian Bolland -William Hogarth -Jan van Eyck -Thomas Kinkade -John James Audubon +Marianne North Mario Sanchez Nevado -Alberto Giacometti -Yayoi Kusama -William Stout -Takashi Murakami -Konstantin Vasilyev -Damien Hirst -George Cruikshank +Mark Ryden +Martin Johnson Heade +Mary Cassatt +Mati Klarwein +Maxfield Parrish +Mead Schaeffer +Michael Hussar +Michael Parkes +Michael Whelan +Mikalojus Konstantinas Čiurlionis +Mike Mignola +Milton Caniff Milton Glaser -Henri Matisse -Johfra Bosschart -Peter Paul Rubens -Roberto da Matta -Alex Toth -André Masson -Jerry Pinkney -Yayou Kusama -Raymond Swanland -Canaletto -Édouard Manet -Malevich -Kate Greenaway -Dürer -Ivan Albright -Norman Rockwell +Moebius Mondrian -Brom -Edward Lear -Robert Rauschenberg -Georgia O'Keeffe -Gillis Rombouts -Jean-Michel Basquiat M.C. Escher -Klimt -Artemisia Gentileschi -Fitz Henry Lane -Kelly Freas -Earnst Haeckel -Earle Bergey -Will Eisner +Noah Bradley Noriyoshi Ohrai -William Steig -Konstantinas Ciurlionis +Norman Rockwell +N.C. Wyeth +Odd Nerdrum +Odilon Redon +Ohara Koson +Paul Cézanne +Paul Delvaux +Paul Gauguin +Paul Klee +Paul Lehr +Peter Elson +Peter Gric +Peter Helck +Peter Max +Peter Mohrbacher +Peter Paul Rubens +Pierre Bonnard +Pierre-Auguste Renoir +Pieter Bruegel the Elder +Pieter Claesz +Pixar +P.A. Works +Rafal Olbinski +Ralph Horsley +Ralph McQuarrie +Randolph Caldecott +Raphael Lacoste +Ray Caesar +Raymond Swanland +Rebecca Guay +Rembrandt +Rembrandt van Rijn +Rene Magritte +RHADS +Richard Dadd +Richter +Rob Gonsalves +Robert Delaunay +Robert McCall +Robert McGinnis +Robert Rauschenberg +Roberto da Matta +Rockwell Kent +Rodney Matthews +Roger Ballen +Roger Dean +Ron Walotsky +Ross Tran +Roz Chast +Salvador Dalí +Sam Spratt +Sandro Botticelli +Saul Steinberg +Saul Tepper Seb McKinnon -Eugene Delacroix -Edvard Munch -Albrecht Dürer +Simon Bisley +Simon Stalenhag Sir John Tenniel -Franklin Booth -J.M.W. Turner -Eugène Delacroix -Yue Minjun -Takeshi Obata -Leo and Diane Dillon -Anthony van Dyck -Richter -James Gurney -Steven DaLuz -Vermeer -Claude Monet -David Firth -Chris Rallis -Anton Otto Fischer -Jack Kirby -Kinuko Craft -Anna Mary Robertson Moses -Delaunay -Johannes Vermeer -H.R. Giger -Noah Bradley -Thomas Nast -John Romita Jr -Rembrandt -Tony Sart -Akihiko Yoshida -Ansel Adams -Cornelis Bisschop -Harvey Kurtzman -John Martin -Ralph Horsley -Kusama -Taro Okamoto -Liam Wong -Wally Wood -Gregory Manchess -Peter Helck -April Gornik -Steve Dillon -Beatrix Potter -Lyubov Popova -Bunny Yeager Slawomir Maniak -Art Spiegelman -Munch -Dave Gibbons -Lise Deharme +Sonia Delaunay sparth -Kawanabe Kyōsai -Ross Tran -Bill Ward -Hokusai -Jackson Pollock -Rembrandt van Rijn -Darek Zabrocki -MC Escher -Harvey Dunn -Thornton Oakley -Sandro Botticelli -Hiromu Arakawa -Salvador Dalí -Vincent Di Fate -Hieronymus Bosch -Dali -Jeff Koons -Caravaggio -Igor Kieryluk -Harrison Fisher -Dr. Seuss -Bill Watterson -Clyde Caldwell -Bayard Wu -Janet Fish -Lale Westvind -Tyler Edlin -Makoto Shinkai -P.A. Works -Junji Ito -Greg Staples -Yoshitaka Amano -Renoir -Walter Beach Humphrey +Stephan Martiniere Stevan Dohanos +Steve Dillon +Steven DaLuz +Studio Ghibli +Syd Mead +Takashi Murakami +Takato Yamamoto +Takeshi Obata +Tamara Lempicka +Taro Okamoto +Ted DeGrazia +Ted Nasmith +Terry Oakes +Terry Redlin +Thomas Cole +Thomas Kinkade +Thomas Nast +Thornton Oakley +Brothers Hildebrandt +Tim White Titian +Tom Lovell +Tom Thomson Tomek Setowski -Dalí -Cedric Peyravernay -Laura Muntz Lyall -Randolph Caldecott \ No newline at end of file +Tomer Hanuka +Tomi Ungerer +Tomokazu Matsuyama +Tony Sart +Tsutomu Nihei +Tyler Edlin +Utagawa Kuniyoshi +Victo Ngai +Vincent Di Fate +Vladimir Kush +Wally Wood +Walter Beach Humphrey +Walter Crane +Warwick Goble +Wassily Kandinsky +Wayne Barlowe +Wendy Froud +Wifredo Lam +Will Eisner +William Hogarth +William Michael Harnett +William Steig +William Stout +William-Adolphe Bouguereau +Winslow Homer +Winsor McCay +Yayoi Kusama +Yoshitaka Amano +Yue Minjun +Yves Tanguy +Zdzisław Beksiński From 5d6fe549ec81320b1064bf6cca1dfa960a4e2e9b Mon Sep 17 00:00:00 2001 From: jtkelm2 Date: Thu, 8 Sep 2022 03:24:20 -0500 Subject: [PATCH 09/11] Alphabetized --- scripts/wildcards/genre.txt | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/scripts/wildcards/genre.txt b/scripts/wildcards/genre.txt index a17ea0761..2a108d3ee 100644 --- a/scripts/wildcards/genre.txt +++ b/scripts/wildcards/genre.txt @@ -1,19 +1,20 @@ -sci-fi -fantasy -dark fantasy -high fantasy +ancient +anime art deco -steampunk cyberpunk +dark fantasy dieselpunk +fantasy film noir -mid-century -ancient +gothic +high fantasy historic -victorian medieval +mid-century renaissance +sci-fi +steampunk +synthwave +victorian vintage weird west -synthwave -gothic \ No newline at end of file From 556dccc2d7ecc30ebe8e99079951dd92ee2eb42c Mon Sep 17 00:00:00 2001 From: jtkelm2 Date: Thu, 8 Sep 2022 03:28:21 -0500 Subject: [PATCH 10/11] Reformat and alphabetize --- scripts/wildcards/site.txt | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/scripts/wildcards/site.txt b/scripts/wildcards/site.txt index 0b0e1ed13..d71ec028b 100644 --- a/scripts/wildcards/site.txt +++ b/scripts/wildcards/site.txt @@ -1,19 +1,11 @@ -trending on ArtStation -trending on ConceptArtWorld -trending on Flickr -trending on Behance -trending on 500px -trending on Getty Images -trending on DeviantArt -trending on Pixiv -trending on cgsociety -featured on ConceptArtWorld -featured on 500px -featured on Getty Images -featured on Pixiv -featured on cgsociety -reimagined by pixar -unsplash contest winner -zbrush central +500px +ArtStation +Behance +cgsociety +ConceptArtWorld +DeviantArt +Flickr +Getty Images +Pixiv +unsplash zbrushcentral -trending on zbrushcentral \ No newline at end of file From 2744f66e9060224b0eb4a903b2a01fa56d9b7773 Mon Sep 17 00:00:00 2001 From: jtkelm2 Date: Thu, 8 Sep 2022 03:31:07 -0500 Subject: [PATCH 11/11] Alphabetized --- scripts/wildcards/style.txt | 96 ++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 50 deletions(-) diff --git a/scripts/wildcards/style.txt b/scripts/wildcards/style.txt index 465aee63d..89443db5d 100644 --- a/scripts/wildcards/style.txt +++ b/scripts/wildcards/style.txt @@ -1,63 +1,59 @@ -oil painting -matte painting -unreal engine render -rendered in maya -rendered in zbrush -rendered in cinema4d -pencil sketch -watercolor painting +2d game art 3D VR painting -1950s pulp sci-fi cover 8k resolution -digital painting -highly detailed -vector image -schematic +1950s pulp sci-fi cover +anime artistic photograph -surveillance footage -graffiti -sculpture -Veduta painting -Panorama -Fresco painting -Chiaroscuro painting -Gouache Painting -Tempera Painting -Trompe L’oeil -Impasto painting -Sfumato painting +Baroque painting Byzantine mosaic +Chiaroscuro painting +depth of field digital painting -pastel painting +dutch golden age +filmed in IMAX +fine art +flat shading +Flemish Baroque +Fresco painting +Gouache Painting +graffiti Grisaille painting -Perspective painting -Veduta painting -Sotto In Su -Ukiyo-e -Baroque painting -Luminism painting -visionary hypermaximalism -depiction +highly detailed +hyperrealism +Impasto painting low-poly -anime +Luminism painting +Marvel Comics +matte painting mixed media -flat shading -#film +oil painting +Panorama +parallax +pastel painting +pencil sketch +Perspective painting +Playstation 5 screenshot pop art -fine art -RTX on +raytracing +rendered in cinema4d +rendered in maya +rendered in zbrush +schematic +sculpture +Sfumato painting shot on 70mm -filmed in IMAX -Marvel Comics -Flemish Baroque -vray tracing -Playstation 5 screenshot -2d game art +Sotto In Su +storybook illustration surrealist -hyperrealism +surveillance footage +Tempera Painting tilt shift -depth of field +Trompe L’oeil +Ukiyo-e +unreal engine render +vector image +Veduta painting +visionary hypermaximalism volumetric lighting -storybook illustration -parallax -dutch golden age \ No newline at end of file +vray tracing +watercolor painting