diff --git a/OneButtonPromptNodes.py b/OneButtonPromptNodes.py index 643546f..11cb6d0 100644 --- a/OneButtonPromptNodes.py +++ b/OneButtonPromptNodes.py @@ -19,7 +19,7 @@ allpresets = [OBPresets.RANDOM_PRESET_OBP] + list(OBPresets.opb_presets.keys()) artists = ["all", "all (wild)", "none", "popular", "greg mode", "3D", "abstract", "angular", "anime" ,"architecture", "art nouveau", "art deco", "baroque", "bauhaus", "cartoon", "character", "children's illustration", "cityscape", "cinema", "clean", "cloudscape", "collage", "colorful", "comics", "cubism", "dark", "detailed", "digital", "expressionism", "fantasy", "fashion", "fauvism", "figurativism", "gore", "graffiti", "graphic design", "high contrast", "horror", "impressionism", "installation", "landscape", "light", "line drawing", "low contrast", "luminism", "magical realism", "manga", "melanin", "messy", "monochromatic", "nature", "nudity", "photography", "pop art", "portrait", "primitivism", "psychedelic", "realism", "renaissance", "romanticism", "scene", "sci-fi", "sculpture", "seascape", "space", "stained glass", "still life", "storybook realism", "street art", "streetscape", "surrealism", "symbolism", "textile", "ukiyo-e", "vibrant", "watercolor", "whimsical"] artifyartists = ["all", "all (wild)", "popular", "greg mode", "3D", "abstract", "angular", "anime" ,"architecture", "art nouveau", "art deco", "baroque", "bauhaus", "cartoon", "character", "children's illustration", "cityscape", "cinema", "clean", "cloudscape", "collage", "colorful", "comics", "cubism", "dark", "detailed", "digital", "expressionism", "fantasy", "fashion", "fauvism", "figurativism", "gore", "graffiti", "graphic design", "high contrast", "horror", "impressionism", "installation", "landscape", "light", "line drawing", "low contrast", "luminism", "magical realism", "manga", "melanin", "messy", "monochromatic", "nature", "nudity", "photography", "pop art", "portrait", "primitivism", "psychedelic", "realism", "renaissance", "romanticism", "scene", "sci-fi", "sculpture", "seascape", "space", "stained glass", "still life", "storybook realism", "street art", "streetscape", "surrealism", "symbolism", "textile", "ukiyo-e", "vibrant", "watercolor", "whimsical"] -imagetypes = ["all", "all - force multiple", "photograph", "octane render","digital art","concept art", "painting", "portrait", "anime key visual", "only other types", "only templates mode", "dynamic templates mode", "art blaster mode", "quality vomit mode", "color cannon mode", "unique art mode", "massive madness mode", "photo fantasy mode", "subject only mode", "fixed styles mode", "the tokinator"] +imagetypes = ["all", "all - force multiple", "none", "photograph", "octane render","digital art","concept art", "painting", "portrait", "anime key visual", "only other types", "only templates mode", "dynamic templates mode", "art blaster mode", "quality vomit mode", "color cannon mode", "unique art mode", "massive madness mode", "photo fantasy mode", "subject only mode", "fixed styles mode", "the tokinator"] subjects =["all", "object", "animal", "humanoid", "landscape", "concept"] genders = ["all", "male", "female"] emojis = [False, True] @@ -73,6 +73,7 @@ generatecat = True generatedog = True generateinsect = True generatepokemon = True +generatemarinelife = True generatemanwoman = True generatemanwomanrelation = True @@ -127,6 +128,8 @@ for item in config: generateinsect = False if item[0] == 'subject_pokemon' and item[1] != 'on': generatepokemon = False + if item[0] == 'subject_marinelife' and item[1] != 'on': + generatemarinelife = False # humanoids if item[0] == 'subject_manwoman' and item[1] != 'on': generatemanwoman = False @@ -189,7 +192,7 @@ if(generatevehicle or generateobject or generatefood or generatebuilding or gene if(generateflora): subjects.append("object - flora") -if(generateanimal or generatebird or generatecat or generatedog or generateinsect or generatepokemon): +if(generateanimal or generatebird or generatecat or generatedog or generateinsect or generatepokemon or generatemarinelife): subjects.append("--- animal - all") if(generateanimal): subjects.append("animal - generic") @@ -201,6 +204,8 @@ if(generateanimal or generatebird or generatecat or generatedog or generateinsec subjects.append("animal - dog") if(generateinsect): subjects.append("animal - insect") + if(generatemarinelife): + subjects.append("animal - marine life") if(generatepokemon): subjects.append("animal - pokémon") diff --git a/build_dynamic_prompt.py b/build_dynamic_prompt.py index dcf33bf..8df54ad 100644 --- a/build_dynamic_prompt.py +++ b/build_dynamic_prompt.py @@ -270,12 +270,13 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all locationbiomelist = csv_to_list("locationsbiome", antilist) locationcitylist = csv_to_list("locationscities", antilist) birdlist = csv_to_list("birds", antilist) - catlist = csv_to_list("cats", antilist) - doglist = csv_to_list("dogs", antilist) + catlist = csv_to_list(csvfilename="cats", antilist=antilist,delimiter="?") + doglist = csv_to_list(csvfilename="dogs", antilist=antilist,delimiter="?") insectlist = csv_to_list("insects", antilist) pokemonlist = csv_to_list("pokemon", antilist) pokemontypelist = csv_to_list("pokemontypes", antilist) occultlist = csv_to_list("occult", antilist) + marinelifelist = csv_to_list("marinelife", antilist) # additional descriptor lists @@ -489,6 +490,7 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all generatedog = True generateinsect = True generatepokemon = True + generatemarinelife = True generatemanwoman = True @@ -620,6 +622,8 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all generateinsect = False if item[0] == 'subject_pokemon' and item[1] != 'on': generatepokemon = False + if item[0] == 'subject_marinelife' and item[1] != 'on': + generatemarinelife = False # humanoids if item[0] == 'subject_manwoman' and item[1] != 'on': generatemanwoman = False @@ -892,6 +896,9 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all if(generatepokemon): animalwildcardlist.append("-pokemon-") + + if(generatemarinelife): + animalwildcardlist.append("-marinelife-") generatefictionalcharacter = bool(fictionallist) and generatefictionalcharacter generatenonfictionalcharacter = bool(nonfictionallist) and generatenonfictionalcharacter @@ -944,8 +951,9 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all generatedog = bool(doglist) and generatedog generateinsect = bool(insectlist) and generateinsect generatepokemon = bool(pokemonlist) and generatepokemon + generatemarinelife = bool(marinelifelist) and generatemarinelife - generateanimaltotal = generateanimal or generatebird or generatecat or generatedog or generateinsect or generatepokemon + generateanimaltotal = generateanimal or generatebird or generatecat or generatedog or generateinsect or generatepokemon or generatemarinelife if(generateanimal): hybridlist.append("-animal-") @@ -960,6 +968,9 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all if(generatepokemon): hybridlist.append("-pokemon-") + if(generatemarinelife): + hybridlist.append("-marinelife-") + if(generateanimaltotal): mainchooserlist.append("animal") @@ -1913,7 +1924,8 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all # start image type - + if(giventypeofimage == "" and (imagetype == "none" or giventypeofimage=="none") ): + generatetype = False if(giventypeofimage=="" and generatetype == True): if(imagetype != "all" and imagetype != "all - force multiple" and imagetype != "only other types"): @@ -2177,6 +2189,8 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all animalwildcardlist = ["-insect-"] elif(subtypeanimal=="pokemon"): animalwildcardlist = ["-pokemon-"] + elif(subtypeanimal=="marine life"): + animalwildcardlist = ["-marinelife-"] chosenanimalwildcard = random.choice(animalwildcardlist) @@ -3481,13 +3495,14 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all "-dog-" in completeprompt or "-insect-" in completeprompt or "-pokemon-" in completeprompt or - "-pokemontype-" in completeprompt): + "-pokemontype-" in completeprompt or + "-marinelife-" in completeprompt): allwildcardslistnohybrid = [ "-color-","-object-", "-animal-", "-fictional-","-nonfictional-","-building-","-vehicle-","-location-","-conceptprefix-","-food-","-haircolor-","-hairstyle-","-job-", "-accessory-", "-humanoid-", "-manwoman-", "-human-", "-colorscheme-", "-mood-", "-genderdescription-", "-artmovement-", "-malefemale-", "-bodytype-", "-minilocation-", "-minilocationaddition-", "-pose-", "-season-", "-minioutfit-", "-elaborateoutfit-", "-minivomit-", "-vomit-", "-rpgclass-", "-subjectfromfile-","-outfitfromfile-", "-brand-", "-space-", "-artist-", "-imagetype-", "-othertype-", "-quality-", "-lighting-", "-camera-", "-lens-","-imagetypequality-", "-poemline-", "-songline-", "-greatwork-", "-fantasyartist-", "-popularartist-", "-romanticismartist-", "-photographyartist-", "-emoji-", "-timeperiod-", "-shotsize-", "-musicgenre-", "-animaladdition-", "-addontolocationinside-", "-addontolocation-", "-objectaddition-", "-humanaddition-", "-overalladdition-", "-focus-", "-direction-", "-styletilora-", "-manwomanrelation-", "-waterlocation-", "-container-", "-firstname-", "-flora-", "-print-", "-miniactivity-", "-pattern-", "-animalsuffixaddition-", "-chair-", "-cardname-", "-covering-", "-heshe-", "-hisher-", "-himher-", "-outfitdescriptor-", "-hairdescriptor-", "-hairvomit-", "-humandescriptor-", "-manwomanmultiple-", "-facepart-", "-buildfacepart-", "-outfitvomit-", "-locationdescriptor-", "-basicbitchdescriptor-", "-animaldescriptor-", "-humanexpression-", "-humanvomit-", "-eyecolor-", "-fashiondesigner-", "-colorcombination-", "-materialcombination-", "-oppositefictional-", "-oppositenonfictional-", "-photoaddition-", "-age-", "-agecalculator-", "-gregmode-" ,"-portraitartist-", "-characterartist-" , "-landscapeartist-", "-scifiartist-", "-graphicdesignartist-", "-digitalartist-", "-architectartist-", "-cinemaartist-", "-setting-", "-charactertype-", "-objectstohold-", "-episodetitle-", "-token-", "-allstylessuffix-", "-fluff-", "-event-", "-background-" - , "-occult-", "-locationfantasy-", "-locationscifi-", "-locationvideogame-", "-locationbiome-", "-locationcity-", "-bird-", "-cat-", "-dog-", "-insect-", "-pokemon-", "-pokemontype-"] + , "-occult-", "-locationfantasy-", "-locationscifi-", "-locationvideogame-", "-locationbiome-", "-locationcity-", "-bird-", "-cat-", "-dog-", "-insect-", "-pokemon-", "-pokemontype-", "-marinelife-"] allwildcardslistnohybridlists = [colorlist, objectlist, animallist, fictionallist, nonfictionallist, buildinglist, vehiclelist, locationlist,conceptprefixlist,foodlist,haircolorlist, hairstylelist,joblist, accessorielist, humanoidlist, manwomanlist, humanlist, colorschemelist, moodlist, genderdescriptionlist, artmovementlist, malefemalelist, bodytypelist, minilocationlist, minilocationadditionslist, poselist, seasonlist, minioutfitlist, elaborateoutfitlist, minivomitlist, vomitlist, rpgclasslist, customsubjectslist, customoutfitslist, brandlist, spacelist, artistlist, imagetypelist, othertypelist, qualitylist, lightinglist, cameralist, lenslist, imagetypequalitylist, poemlinelist, songlinelist, greatworklist, fantasyartistlist, popularartistlist, romanticismartistlist, photographyartistlist, emojilist, timeperiodlist, shotsizelist, musicgenrelist, animaladditionlist, addontolocationinsidelist, addontolocationlist, objectadditionslist, humanadditionlist, overalladditionlist, focuslist, directionlist, stylestiloralist, manwomanrelationlist, waterlocationlist, containerlist, firstnamelist, floralist, printlist, miniactivitylist, patternlist, animalsuffixadditionlist, chairlist, cardnamelist, coveringlist, heshelist, hisherlist, himherlist, outfitdescriptorlist, hairdescriptorlist, hairvomitlist, humandescriptorlist, manwomanmultiplelist, facepartlist, buildfacepartlist, outfitvomitlist, locationdescriptorlist, basicbitchdescriptorlist, animaldescriptorlist, humanexpressionlist, humanvomitlist, eyecolorlist, fashiondesignerlist, colorcombinationlist, materialcombinationlist, oppositefictionallist, oppositenonfictionallist, photoadditionlist, agelist, agecalculatorlist, gregmodelist , portraitartistlist, characterartistlist, landscapeartistlist, scifiartistlist, graphicdesignartistlist, digitalartistlist, architectartistlist, cinemaartistlist, settinglist, charactertypelist, objectstoholdlist, episodetitlelist, tokenlist, allstylessuffixlist, flufferlist, eventlist, backgroundlist - , occultlist, locationfantasylist, locationscifilist, locationvideogamelist, locationbiomelist, locationcitylist, birdlist, catlist, doglist, insectlist, pokemonlist, pokemontypelist] + , occultlist, locationfantasylist, locationscifilist, locationvideogamelist, locationbiomelist, locationcitylist, birdlist, catlist, doglist, insectlist, pokemonlist, pokemontypelist, marinelifelist] allwildcardslistwithhybrid = ["-material-", "-descriptor-", "-outfit-", "-conceptsuffix-","-culture-", "-objecttotal-", "-outfitprinttotal-", "-element-"] allwildcardslistwithhybridlists = [materiallist, descriptorlist,outfitlist,conceptsuffixlist,culturelist, objecttotallist, outfitprinttotallist, elementlist] @@ -3761,6 +3776,7 @@ def createpromptvariant(prompt = "", insanitylevel = 5, antivalues = "" , gender pokemonlist = csv_to_list("pokemon", antilist) pokemontypelist = csv_to_list("pokemontypes", antilist) occultlist = csv_to_list("occult", antilist) + marinelifelist = csv_to_list("marinelife", antilist) # add any other custom lists stylestiloralist = csv_to_list("styles_ti_lora",antilist,"./userfiles/") @@ -3988,6 +4004,8 @@ def createpromptvariant(prompt = "", insanitylevel = 5, antivalues = "" , gender prompt = prompt.replace(combination," -insect- ") if lowercase_combination in [x.lower() for x in pokemonlist] and chance_roll(insanitylevel, "uncommon"): prompt = prompt.replace(combination," -pokemon- ") + if lowercase_combination in [x.lower() for x in marinelifelist] and chance_roll(insanitylevel, "uncommon"): + prompt = prompt.replace(combination," -marinelife- ") if lowercase_combination in [x.lower() for x in pokemontypelist] and chance_roll(insanitylevel, "uncommon"): prompt = prompt.replace(combination," -pokemontype- ") @@ -4314,14 +4332,15 @@ def createpromptvariant(prompt = "", insanitylevel = 5, antivalues = "" , gender "-dog-" in completeprompt or "-insect-" in completeprompt or "-pokemon-" in completeprompt or - "-pokemontype-" in completeprompt + "-pokemontype-" in completeprompt or + "-marinelife-" in completeprompt ): allwildcardslistnohybrid = [ "-color-","-object-", "-animal-", "-fictional-","-nonfictional-","-building-","-vehicle-","-location-","-conceptprefix-","-food-","-haircolor-","-hairstyle-","-job-", "-accessory-", "-humanoid-", "-manwoman-", "-human-", "-colorscheme-", "-mood-", "-genderdescription-", "-artmovement-", "-malefemale-", "-bodytype-", "-minilocation-", "-minilocationaddition-", "-pose-", "-season-", "-minioutfit-", "-elaborateoutfit-", "-minivomit-", "-vomit-", "-rpgclass-", "-subjectfromfile-", "-outfitfromfile-", "-brand-", "-space-", "-artist-", "-imagetype-", "-othertype-", "-quality-", "-lighting-", "-camera-", "-lens-","-imagetypequality-", "-poemline-", "-songline-", "-greatwork-", "-fantasyartist-", "-popularartist-", "-romanticismartist-", "-photographyartist-", "-emoji-", "-timeperiod-", "-shotsize-", "-musicgenre-", "-animaladdition-", "-objectaddition-", "-humanaddition-", "-overalladdition-", "-focus-", "-direction-", "-styletilora-", "-manwomanrelation-", "-waterlocation-", "-container-", "-firstname-", "-flora-", "-print-", "-miniactivity-", "-pattern-", "-chair-", "-cardname-", "-covering-", "-outfitdescriptor-", "-hairdescriptor-", "-hairvomit-", "-humandescriptor-", "-manwomanmultiple-", "-facepart-", "-locationdescriptor-", "-basicbitchdescriptor-", "-animaldescriptor-", "-humanexpression-", "-humanvomit-", "-eyecolor-", "-fashiondesigner-", "-colorcombination-", "-materialcombination-", "-photoaddition-", "-age-", "-agecalculator-", "-gregmode-" ,"-portraitartist-", "-characterartist-" , "-landscapeartist-", "-scifiartist-", "-graphicdesignartist-", "-digitalartist-", "-architectartist-", "-cinemaartist-", "-setting-", "-charactertype-", "-objectstohold-", "-episodetitle-", "-allstylessuffix-", "-fluff-", "-event-", "-background-" - , "-occult-", "-locationfantasy-", "-locationscifi-", "-locationvideogame-", "-locationbiome-", "-locationcity-", "-bird-", "-cat-", "-dog-", "-insect-", "-pokemon-", "-pokemontype-"] + , "-occult-", "-locationfantasy-", "-locationscifi-", "-locationvideogame-", "-locationbiome-", "-locationcity-", "-bird-", "-cat-", "-dog-", "-insect-", "-pokemon-", "-pokemontype-", "-marinelife-"] allwildcardslistnohybridlists = [colorlist, objectlist, animallist, fictionallist, nonfictionallist, buildinglist, vehiclelist, locationlist,conceptprefixlist,foodlist,haircolorlist, hairstylelist,joblist, accessorielist, humanoidlist, manwomanlist, humanlist, colorschemelist, moodlist, genderdescriptionlist, artmovementlist, malefemalelist, bodytypelist, minilocationlist, minilocationadditionslist, poselist, seasonlist, minioutfitlist, elaborateoutfitlist, minivomitlist, vomitlist, rpgclasslist, customsubjectslist, customoutfitslist, brandlist, spacelist, artistlist, imagetypelist, othertypelist, qualitylist, lightinglist, cameralist, lenslist, imagetypequalitylist, poemlinelist, songlinelist, greatworklist, fantasyartistlist, popularartistlist, romanticismartistlist, photographyartistlist, emojilist, timeperiodlist, shotsizelist, musicgenrelist, animaladditionlist, objectadditionslist, humanadditionlist, overalladditionlist, focuslist, directionlist, stylestiloralist, manwomanrelationlist, waterlocationlist, containerlist, firstnamelist, floralist, printlist, miniactivitylist, patternlist, chairlist, cardnamelist, coveringlist, outfitdescriptorlist, hairdescriptorlist, hairvomitlist, humandescriptorlist, manwomanmultiplelist, facepartlist, locationdescriptorlist, basicbitchdescriptorlist, animaldescriptorlist, humanexpressionlist, humanvomitlist, eyecolorlist, fashiondesignerlist, colorcombinationlist, materialcombinationlist, photoadditionlist, agelist, agecalculatorlist, gregmodelist , portraitartistlist, characterartistlist, landscapeartistlist, scifiartistlist, graphicdesignartistlist, digitalartistlist, architectartistlist, cinemaartistlist, settinglist, charactertypelist, objectstoholdlist, episodetitlelist, allstylessuffixlist, flufferlist, eventlist, backgroundlist - , occultlist, locationfantasylist, locationscifilist, locationvideogamelist, locationbiomelist, locationcitylist, birdlist, catlist, doglist, insectlist, pokemonlist, pokemontypelist] + , occultlist, locationfantasylist, locationscifilist, locationvideogamelist, locationbiomelist, locationcitylist, birdlist, catlist, doglist, insectlist, pokemonlist, pokemontypelist, marinelifelist] allwildcardslistwithhybrid = ["-material-", "-descriptor-", "-outfit-", "-conceptsuffix-","-culture-", "-objecttotal-", "-outfitprinttotal-", "-element-"] allwildcardslistwithhybridlists = [materiallist, descriptorlist,outfitlist,conceptsuffixlist,culturelist, objecttotallist, outfitprinttotallist, elementlist] @@ -5438,6 +5457,12 @@ def translate_main_subject(main_subject=""): "pokemons": ["animal", "pokemon"], "pokémon": ["animal", "pokemon"], "pokémons": ["animal", "pokemon"], + "animal - marine life": ["animal", "marine life"], + "marine life": ["animal", "marine life"], + "marinelife": ["animal", "marine life"], + "ocean gang": ["animal", "marine life"], + "oceangang": ["animal", "marine life"], + "marine": ["animal", "marine life"], "human - all": ["humanoid", "all"], "--- human - all": ["humanoid", "all"], diff --git a/csvfiles/accessories.csv b/csvfiles/accessories.csv index 417206f..ec55866 100644 --- a/csvfiles/accessories.csv +++ b/csvfiles/accessories.csv @@ -148,4 +148,7 @@ Veil?both Bindi?both Bling?both Trinkets?both -Ruff?both \ No newline at end of file +Ruff?both +Unicorn horn?both +Nonblinding sunglasses?both +Great-eyed?both \ No newline at end of file diff --git a/csvfiles/cats.csv b/csvfiles/cats.csv index 67a949a..932e5ce 100644 --- a/csvfiles/cats.csv +++ b/csvfiles/cats.csv @@ -1,27 +1,27 @@ -Abyssinian Cat -American Bobtail Cat -American Shorthair Cat -Balinese Cat -Bengal Cat -Birman Cat -British Shorthair Cat -Burmese Cat -Chartreux Cat -Cornish Rex Cat -Devon Rex Cat -Egyptian Mau Cat -Exotic Shorthair Cat -Himalayan Cat -Japanese Bobtail Cat -Maine Coon Cat -Manx Cat -Norwegian Forest Cat -Oriental Shorthair Cat -Persian Cat -Ragdoll Cat -Russian Blue Cat -Scottish Fold Cat -Siamese Cat -Sphynx Cat -Tonkinese Cat -Turkish Angora Cat \ No newline at end of file +Abyssinian OR(Cat;Kitten;rare) +American Bobtail OR(Cat;Kitten;rare) +American Shorthair OR(Cat;Kitten;rare) +Balinese OR(Cat;Kitten;rare) +Bengal OR(Cat;Kitten;rare) +Birman OR(Cat;Kitten;rare) +British Shorthair OR(Cat;Kitten;rare) +Burmese OR(Cat;Kitten;rare) +Chartreux OR(Cat;Kitten;rare) +Cornish Rex OR(Cat;Kitten;rare) +Devon Rex OR(Cat;Kitten;rare) +Egyptian Mau OR(Cat;Kitten;rare) +Exotic Shorthair OR(Cat;Kitten;rare) +Himalayan OR(Cat;Kitten;rare) +Japanese Bobtail OR(Cat;Kitten;rare) +Maine Coon OR(Cat;Kitten;rare) +Manx OR(Cat;Kitten;rare) +Norwegian Forest OR(Cat;Kitten;rare) +Oriental Shorthair OR(Cat;Kitten;rare) +Persian OR(Cat;Kitten;rare) +Ragdoll OR(Cat;Kitten;rare) +Russian Blue OR(Cat;Kitten;rare) +Scottish Fold OR(Cat;Kitten;rare) +Siamese OR(Cat;Kitten;rare) +Sphynx OR(Cat;Kitten;rare) +Tonkinese OR(Cat;Kitten;rare) +Turkish Angora OR(Cat;Kitten;rare) \ No newline at end of file diff --git a/csvfiles/config/default_config.csv b/csvfiles/config/default_config.csv index bbd33cf..c57ec70 100644 --- a/csvfiles/config/default_config.csv +++ b/csvfiles/config/default_config.csv @@ -19,6 +19,7 @@ subject_cat;on subject_dog;on subject_insect;on subject_pokemon;on +subject_marinelife;on # humanoids; subject_manwoman;on subject_manwomanrelation;on diff --git a/csvfiles/cultures.csv b/csvfiles/cultures.csv index 75d9246..a1fe2a4 100644 --- a/csvfiles/cultures.csv +++ b/csvfiles/cultures.csv @@ -235,4 +235,11 @@ Southern Arcadian Navajo Spartan -all-american \ No newline at end of file +all-american +Huguenot +Tovarisch +Homeric +Nisei +Antipatriarch +Ragtime +Scotic \ No newline at end of file diff --git a/csvfiles/descriptors.csv b/csvfiles/descriptors.csv index dab2b9d..b65e7b7 100644 --- a/csvfiles/descriptors.csv +++ b/csvfiles/descriptors.csv @@ -72,8 +72,10 @@ Biomorphic Biophilic Biopunk Bizarre +Black-mouthed Blue Bold +Booby-trapped Boorish Boring Boundless @@ -119,6 +121,7 @@ Controversial Conversational Cool Cozy +Cloth-covered Creative Creepy Cromulent @@ -132,6 +135,7 @@ Dazzling Deafening Decorative Deeply Thoughtful +Deep-rooted Deformed Delicate Delicious @@ -189,6 +193,7 @@ Emotional Emotionally Charged Enchanted Enchanting +Encapsulated Energetic Energizing Engaging @@ -246,6 +251,7 @@ Frilled Frosted Fruit-Flavored Frustrated +Flossier Functional Funny Funky @@ -311,10 +317,12 @@ Imaginative Impressionist Impressive Inconsiderate +Inconsequential Incredibly Detailed Infected Infused Injured +Inappropriate Insecure Insensitive Inspirational @@ -330,6 +338,7 @@ Intuitive Inventive Invigorating Inviting +Intwined Irresistible Irritated Jagged @@ -365,6 +374,7 @@ Masterpiece Matte Mature Maximalist +Maxed Mean Meandering Mecha @@ -389,6 +399,7 @@ Mosaic-Like Moving Mundane Murano +Mushroomy Mysterious Mystical Mystifying @@ -425,6 +436,7 @@ Parched Passionate Pastel Pathetic +Palehearted Peaceful Personal Petrified @@ -447,6 +459,7 @@ Psychadelic Psychotic Puny Pure +Pulsating Radiant Raging Rainbow @@ -500,6 +513,7 @@ Shaky Sharp Shimmering Shiny +Shorty Shy Sickening Signature @@ -536,11 +550,13 @@ Studied Stunning Stupid Sturdy +Styled Sublime Substantive Sultans Superficial Supernatural +Supernaturalist Supersized Supple Surreal @@ -563,6 +579,7 @@ Terrifying Textile Thought-Provoking Thundering +Tiffed Tiki Timeless Tiny @@ -570,6 +587,7 @@ Tired Touching Tough Traditional +Tradition-bound Translucent Tranquil Tremendous @@ -577,6 +595,7 @@ Trendy Tribal Tropical Twisted +Twinkling Ugly Ultrarealistic Unadvised @@ -599,6 +618,8 @@ Unreal Unusual Uptight Upside down +Underwrapped +Undesired Vampiric Varied Velvet @@ -627,6 +648,7 @@ Wispy Witty Worn-Out Worried +World-renowned Wretched Young Zany diff --git a/csvfiles/dogs.csv b/csvfiles/dogs.csv index 9aa5695..40ab16f 100644 --- a/csvfiles/dogs.csv +++ b/csvfiles/dogs.csv @@ -1,35 +1,35 @@ -Australian Cattle Dog -Australian Shepherd -Basset Hound -Beagle -Bernese Mountain Dog -Border Collie -Boston Terrier -Boxer -Bulldog -Cavalier King Charles Spaniel -Chihuahua -Collie -Dachshund -Dalmatian -Doberman Pinscher -French Bulldog -German Shepherd -Golden Retriever -Great Dane -Labrador Retriever -Maltese -Miniature Schnauzer -Newfoundland -Pembroke Welsh Corgi -Pomeranian -Poodle -Rhodesian Ridgeback -Rottweiler -Shetland Sheepdog -Shiba Inu -Shih Tzu -Siberian Husky -Staffordshire Bull Terrier -Weimaraner -Yorkshire Terrier \ No newline at end of file +Australian Cattle OR(Dog;Puppy;rare) +Australian Shepherd OR(;Puppy;rare) +Basset Hound OR(;Puppy;rare) +Beagle OR(;Puppy;rare) +Bernese Mountain OR(Dog;Puppy;rare) +Border Collie OR(;Puppy;rare) +Boston Terrier OR(;Puppy;rare) +Boxer OR(;Puppy;rare) +Bulldog OR(;Puppy;rare) +Cavalier King Charles Spaniel OR(;Puppy;rare) +Chihuahua OR(;Puppy;rare) +Collie OR(;Puppy;rare) +Dachshund OR(;Puppy;rare) +Dalmatian OR(;Puppy;rare) +Doberman Pinscher OR(;Puppy;rare) +French Bulldog OR(;Puppy;rare) +German Shepherd OR(;Puppy;rare) +Golden Retriever OR(;Puppy;rare) +Great Dane OR(;Puppy;rare) +Labrador Retriever OR(;Puppy;rare) +Maltese OR(;Puppy;rare) +Miniature Schnauzer OR(;Puppy;rare) +Newfoundland OR(;Puppy;rare) +Pembroke Welsh Corgi OR(;Puppy;rare) +Pomeranian OR(;Puppy;rare) +Poodle OR(;Puppy;rare) +Rhodesian Ridgeback OR(;Puppy;rare) +Rottweiler OR(;Puppy;rare) +Shetland Sheepdog OR(;Puppy;rare) +Shiba Inu OR(;Puppy;rare) +Shih Tzu OR(;Puppy;rare) +Siberian Husky OR(;Puppy;rare) +Staffordshire Bull Terrier OR(;Puppy;rare) +Weimaraner OR(;Puppy;rare) +Yorkshire Terrier OR(;Puppy;rare) \ No newline at end of file diff --git a/csvfiles/humanexpressions.csv b/csvfiles/humanexpressions.csv index 42d71ff..a7f76f4 100644 --- a/csvfiles/humanexpressions.csv +++ b/csvfiles/humanexpressions.csv @@ -46,4 +46,6 @@ OR(;-heshe- is;uncommon) laughing OR(;-heshe- is;uncommon) grinning OR(;-heshe- is ;uncommon) feeling OR(;very;normal) relaxed OR(;-heshe- is ;uncommon) feeling OR(;very;normal) insecure -OR(;-heshe- is ;uncommon) feeling OR(;very;normal) shocked \ No newline at end of file +OR(;-heshe- is ;uncommon) feeling OR(;very;normal) shocked +OR(;-heshe- is ;uncommon) feeling OR(;very;normal) worried +OR(;-heshe- is ;uncommon) feeling OR(;very;normal) resentfull \ No newline at end of file diff --git a/csvfiles/jobs.csv b/csvfiles/jobs.csv index 09df779..d7a7b3d 100644 --- a/csvfiles/jobs.csv +++ b/csvfiles/jobs.csv @@ -7,6 +7,8 @@ -element- goddess;female -musicgenre-mancer;both -pokemontype- type;both +-humanoid- queen;female +-humanoid- king;male Abbot;both Abjurer;both Acrobat;both @@ -70,12 +72,11 @@ Bookbinder;both Botanist;both Bounty hunter;both Brewer;both -Brewer;both Bride;female Brigadier General;both Businessperson;both Butcher;both -Butcher;both +Bully;both Calligrapher;both Canon;both Captain;both @@ -90,6 +91,7 @@ CEO;both Chancellor;both Chaos mage;both Chaplain;both +Chairperson;both Chauffeur;both Cheerleader;female Chef;both @@ -137,6 +139,7 @@ Death knight;both Death knight;both Deep-Sea Diver;both Defender;both +Demonist;both Demon Hunter;both Demon Queen;female Demon King;male @@ -244,6 +247,7 @@ Historian;both Hillbilly;both Hooded figure;both Humanitarian;both +Humorist;both hunk;male Hunter;both Ice Cream Vendor;both @@ -472,6 +476,7 @@ Steeplejack;both Stormtrooper;both Student;both Sultan;both +Skank;female Summoner;both Sumo Wrestler;both Super model;female @@ -481,6 +486,7 @@ Surgeon;both Surveyor;both Swashbuckler;both Sword bearer;both +Sysadmin;both Tailor;both Tanner;both Tax collector;both @@ -507,6 +513,7 @@ Traveler;both Tribal Chief;both Trickster;both Troubadour;both +Twink;male Vagabond;both Valedictorian;both Valet;both diff --git a/csvfiles/locations.csv b/csvfiles/locations.csv index e6fbaf2..a9077a8 100644 --- a/csvfiles/locations.csv +++ b/csvfiles/locations.csv @@ -713,6 +713,7 @@ Shaniwar Wada Sheikh Zayed Mosque Shoal Shopping mall +Shopwindow Shwedagon Pagoda Shwezigon Pagoda Siem Reap @@ -1066,4 +1067,5 @@ Zanzibar Zimbabwe Zion National Park Zoo -Zurich \ No newline at end of file +Zurich +Viziers \ No newline at end of file diff --git a/csvfiles/locationscities.csv b/csvfiles/locationscities.csv index ff25743..e827ccf 100644 --- a/csvfiles/locationscities.csv +++ b/csvfiles/locationscities.csv @@ -329,6 +329,7 @@ Vrindavan Warsaw Washington, D.C. Wellington +Willemstad Xi'an Yangon Zadar diff --git a/csvfiles/locationsvideogame.csv b/csvfiles/locationsvideogame.csv index dad7a3b..b56496a 100644 --- a/csvfiles/locationsvideogame.csv +++ b/csvfiles/locationsvideogame.csv @@ -545,7 +545,6 @@ Mystic Ruins Myth Drannor Mythril Mine Nagrand -Nagrand (Draenor) Namira's Shrine Natlan Nazjatar @@ -681,7 +680,6 @@ Sen's Fortress Sescheron Shadow Moses Island Shadowmoon Valley -Shadowmoon Valley (Draenor) Sharilton Shattered Throne Shattrath City @@ -1019,7 +1017,6 @@ UAC Facility UAC Mars Base Ul'dah Uldum -Uldum (Battle for Azeroth) Un'Goro Crater Undead Burg Undead Parish @@ -1036,7 +1033,6 @@ Vaermina's Shrine Vaes Dothrak Val'sharah Vale of Eternal Blossoms -Vale of Eternal Blossoms (Mists of Pandaria) Valentia Valley of Bowser Valonia Rise diff --git a/csvfiles/marinelife.csv b/csvfiles/marinelife.csv new file mode 100644 index 0000000..05af2bb --- /dev/null +++ b/csvfiles/marinelife.csv @@ -0,0 +1,122 @@ +Anchovy +Anemone +Angelfish +Anglerfish +Barnacle +Beluga Whale +Betta Fish +Blue Ringed Octopus +Blue Whale +Butterflyfish +Candy Basslet +Cardinalfish +Catfish +Chambered Nautilus +Clam +Cleaner Shrimp +Clownfish +Cod +Comb Jelly +Coral +Crab +Crocodilefish +Crown Jellyfish +Crown-of-Thorns Starfish +Cuttlefish +Decorator Crab +Dolphin +Dragonfish +Eel +Electric Eel +Emperor Penguin +Fairy Basslet +Fangtooth +Feather Star +Fin Whale +Firefish +Fish +Flamingo Tongue Snail +Flounder +Flying Fish +Frog +Frogfish +Ghost Pipefish +Giant Clam +Giant Squid +Goby +Goldfish +Great White Shark +Green Sea Turtle +Guppy +Haddock +Halibut +Hammerhead Shark +Hermit Crab +Horseshoe Crab +Humpback Whale +Jellyfish +Lantern Shark +Lanternfish +Leafy Sea Dragon +Leatherback Turtle +Lion's Mane Jellyfish +Lionfish +Lobster +Loggerhead Turtle +Mackerel +Manatee +Mandarin Fish +Manta Ray +Mantis Shrimp +Marlin +Moon Jellyfish +Mussel +Narwhal +Nautilus +Octopus +Orca +Otter +Oyster +Parrotfish +Penguin +Porcupine Fish +Portuguese Man O' War +Pufferfish +Salmon +Sand Dollar +Sardine +Sawfish +Scallop +Sea Anemone +Sea Cucumber +Sea Hare +Sea Lily +Sea Lion +Sea Pen +Sea Slug +Sea Spider +Sea Sponge +Sea Turtle +Sea Urchin +Seahorse +Seal +Seaweed +Shark +Shrimp +Snail +Snapper +Squid +Starfish +Stingray +Stonefish +Sturgeon +Sunfish +Swordfish +Tiger Shark +Torpedo Ray +Triton's Trumpet +Trout +Tuna +Turtle +Walrus +Whale \ No newline at end of file diff --git a/csvfiles/othertypes.csv b/csvfiles/othertypes.csv index c23f517..a331483 100644 --- a/csvfiles/othertypes.csv +++ b/csvfiles/othertypes.csv @@ -332,6 +332,7 @@ Scratchboard Art Screenprint scribble art Scrimshaw +Semi caricature sgraffito drawing Shibori shin-hanga diff --git a/csvfiles/outfitdescriptors.csv b/csvfiles/outfitdescriptors.csv index d35668e..2d4d8b8 100644 --- a/csvfiles/outfitdescriptors.csv +++ b/csvfiles/outfitdescriptors.csv @@ -42,6 +42,7 @@ Basic Beautiful Bewitching Bioluminescent +Bikinied Business Boring Breathtaking @@ -179,6 +180,8 @@ Soft Stunning Supersized Surreal +Tailor-suited +Tailored Tight Trendy Tropical diff --git a/csvfiles/outfits.csv b/csvfiles/outfits.csv index 3e22f36..3f3ad53 100644 --- a/csvfiles/outfits.csv +++ b/csvfiles/outfits.csv @@ -238,6 +238,7 @@ Kimono jacket Kimono robes Kira Kitenge +Knickerbocker Kofia Krama Kurta diff --git a/csvfiles/poses.csv b/csvfiles/poses.csv index 3da8810..acb0fc2 100644 --- a/csvfiles/poses.csv +++ b/csvfiles/poses.csv @@ -77,4 +77,5 @@ Dancing and looking at camera Walking towards camera Walking away from camera peace sign pose --humanexpression- pose \ No newline at end of file +-humanexpression- pose +Layback pose \ No newline at end of file diff --git a/csvfiles/quality.csv b/csvfiles/quality.csv index d762b77..25fcee1 100644 --- a/csvfiles/quality.csv +++ b/csvfiles/quality.csv @@ -40,4 +40,6 @@ Unsplash Pixabay -fluff- -fluff-, -fluff- --fluff-, -fluff-, -fluff- \ No newline at end of file +-fluff-, -fluff-, -fluff- +World-renowned +Well-visualised \ No newline at end of file diff --git a/csvfiles/special_lists/negativewords.csv b/csvfiles/special_lists/negativewords.csv index a01d009..a7cbafc 100644 --- a/csvfiles/special_lists/negativewords.csv +++ b/csvfiles/special_lists/negativewords.csv @@ -251,4 +251,10 @@ product photo;cluttered background product shot;cluttered background white background;cluttered background plain background;cluttered background -pokémon;people \ No newline at end of file +pokémon;people +score_9;score_4 +score_9_up;score_4_up +score_8;score_5 +score_8_up;score_5_up +score_7;score_6 +score_7_up;score_6_up \ No newline at end of file diff --git a/csvfiles/special_lists/photoadditions.csv b/csvfiles/special_lists/photoadditions.csv index 2875bad..f20e912 100644 --- a/csvfiles/special_lists/photoadditions.csv +++ b/csvfiles/special_lists/photoadditions.csv @@ -14,4 +14,7 @@ High Shutter Speed Slow Shutter Speed Intentional Camera Movement Long exposure -Short exposure \ No newline at end of file +Short exposure +Tintage +Interpolation +Heterotype \ No newline at end of file diff --git a/csvfiles/vomit.csv b/csvfiles/vomit.csv index 18cf909..ad40658 100644 --- a/csvfiles/vomit.csv +++ b/csvfiles/vomit.csv @@ -75,6 +75,7 @@ gilded technique glimmering transformation glitter texture glittering +Glottogonic Gold Leafing Golden ratio halation @@ -137,6 +138,7 @@ Swirling -material- symbolism taiji Temari +Tintage triadic under water underpainting diff --git a/prompttester.py b/prompttester.py index b10bd4c..0d566e1 100644 --- a/prompttester.py +++ b/prompttester.py @@ -110,7 +110,7 @@ def generateprompts(amount = 1,insanitylevel="5",subject="all", artist="all", im if __name__ == "__main__": generateprompts(10,5 - ,"------ all" # subject + ,"all" # subject ,"all" # artists ,"all" # image type "only other types", "only templates mode", "art blaster mode", "quality vomit mode", "color cannon mode", "unique art mode", "massive madness mode", "photo fantasy mode", "subject only mode", "fixed styles mode", "dynamic templates mode", "artify mode" , False # only artists @@ -130,7 +130,7 @@ if __name__ == "__main__": , -1 # seed , "" #outfit override , False #prompt_g_and_l - , "SDXL" #base model + , "SD1.5" #base model , "" #preset "All (random)..." , "" # superprompter ) \ No newline at end of file diff --git a/scripts/onebuttonprompt.py b/scripts/onebuttonprompt.py index 8040bfa..6f46957 100644 --- a/scripts/onebuttonprompt.py +++ b/scripts/onebuttonprompt.py @@ -25,7 +25,7 @@ subjectsubtypesobject = ["all"] subjectsubtypeshumanoid = ["all"] subjectsubtypesconcept = ["all"] artists = ["all", "all (wild)", "none", "popular", "greg mode", "3D", "abstract", "angular", "anime" ,"architecture", "art nouveau", "art deco", "baroque", "bauhaus", "cartoon", "character", "children's illustration", "cityscape", "cinema", "clean", "cloudscape", "collage", "colorful", "comics", "cubism", "dark", "detailed", "digital", "expressionism", "fantasy", "fashion", "fauvism", "figurativism", "gore", "graffiti", "graphic design", "high contrast", "horror", "impressionism", "installation", "landscape", "light", "line drawing", "low contrast", "luminism", "magical realism", "manga", "melanin", "messy", "monochromatic", "nature", "nudity", "photography", "pop art", "portrait", "primitivism", "psychedelic", "realism", "renaissance", "romanticism", "scene", "sci-fi", "sculpture", "seascape", "space", "stained glass", "still life", "storybook realism", "street art", "streetscape", "surrealism", "symbolism", "textile", "ukiyo-e", "vibrant", "watercolor", "whimsical"] -imagetypes = ["all", "all - force multiple", "photograph", "octane render","digital art","concept art", "painting", "portrait", "anime key visual", "only other types", "only templates mode", "dynamic templates mode", "art blaster mode", "quality vomit mode", "color cannon mode", "unique art mode", "massive madness mode", "photo fantasy mode", "subject only mode", "fixed styles mode", "the tokinator"] +imagetypes = ["all", "all - force multiple", "none", "photograph", "octane render","digital art","concept art", "painting", "portrait", "anime key visual", "only other types", "only templates mode", "dynamic templates mode", "art blaster mode", "quality vomit mode", "color cannon mode", "unique art mode", "massive madness mode", "photo fantasy mode", "subject only mode", "fixed styles mode", "the tokinator"] promptmode = ["at the back", "in the front"] promptcompounder = ["1", "2", "3", "4", "5"] ANDtogglemode = ["none", "automatic", "prefix AND prompt + suffix", "prefix + prefix + prompt + suffix"] @@ -99,6 +99,7 @@ generatecat = True generatedog = True generateinsect = True generatepokemon = True +generatemarinelife = True generatemanwoman = True generatemanwomanrelation = True @@ -153,6 +154,8 @@ for item in config: generateinsect = False if item[0] == 'subject_pokemon' and item[1] != 'on': generatepokemon = False + if item[0] == 'subject_marinelife' and item[1] != 'on': + generatemarinelife = False # humanoids if item[0] == 'subject_manwoman' and item[1] != 'on': generatemanwoman = False @@ -215,7 +218,7 @@ if(generatevehicle or generateobject or generatefood or generatebuilding or gene if(generateflora): subjects.append("object - flora") -if(generateanimal or generatebird or generatecat or generatedog or generateinsect or generatepokemon): +if(generateanimal or generatebird or generatecat or generatedog or generateinsect or generatepokemon or generatemarinelife): subjects.append("--- animal - all") if(generateanimal): subjects.append("animal - generic") @@ -227,6 +230,8 @@ if(generateanimal or generatebird or generatecat or generatedog or generateinsec subjects.append("animal - dog") if(generateinsect): subjects.append("animal - insect") + if(generatemarinelife): + subjects.append("animal - marine life") if(generatepokemon): subjects.append("animal - pokémon")