diff --git a/build_dynamic_prompt.py b/build_dynamic_prompt.py index cd03c57..16350ea 100644 --- a/build_dynamic_prompt.py +++ b/build_dynamic_prompt.py @@ -3527,7 +3527,9 @@ def replacewildcard(completeprompt, insanitylevel, wildcard,listname, activatehy if(wildcard in ["-fictional-" , "-nonfictional-" - , "-firstname-"] + , "-firstname-" + , "-oppositefictional-" + , "-oppositenonfictional-"] and "-samehumansubject-" in completeprompt): if(completeprompt.index(wildcard) < completeprompt.index("-samehumansubject-")): completeprompt = completeprompt.replace("-samehumansubject-", replacementvalueforoverrides) diff --git a/csvfiles/accessories.csv b/csvfiles/accessories.csv index 8b90ee1..812f58f 100644 --- a/csvfiles/accessories.csv +++ b/csvfiles/accessories.csv @@ -143,4 +143,5 @@ Browline glasses?both Goggles?both Horn-rimmed glasses?both sun hat?both -Veil?both \ No newline at end of file +Veil?both +Bindi?both \ No newline at end of file diff --git a/csvfiles/animals.csv b/csvfiles/animals.csv index 480b6b6..5b342bd 100644 --- a/csvfiles/animals.csv +++ b/csvfiles/animals.csv @@ -168,6 +168,7 @@ Ostrich Otter Owl Oyster +Panda Panther Parrot Peacock @@ -190,6 +191,7 @@ Raccoon Ragdoll Cat Rat Raven +Red Panda Rhinoceros Robin Roc @@ -219,6 +221,7 @@ Snorlax Sparrow Sphinx Sphynx Cat +Spice worm Spider Squid Squirrel @@ -254,4 +257,4 @@ Woolly rhinoceros Yak Yeti Yorkshire Terrier -Zebra +Zebra \ No newline at end of file diff --git a/csvfiles/cultures.csv b/csvfiles/cultures.csv index d34db62..d71e66d 100644 --- a/csvfiles/cultures.csv +++ b/csvfiles/cultures.csv @@ -232,4 +232,6 @@ Skater Hipster Northern Southern -Arcadian \ No newline at end of file +Arcadian +Navajo +Spartan \ No newline at end of file diff --git a/csvfiles/humanexpressions.csv b/csvfiles/humanexpressions.csv index 7409475..2790689 100644 --- a/csvfiles/humanexpressions.csv +++ b/csvfiles/humanexpressions.csv @@ -44,4 +44,6 @@ OR(;-heshe- is ;uncommon) expressing guilt OR(;-heshe- is ;uncommon) expressing joy OR(;-heshe- is;uncommon) laughing OR(;-heshe- is;uncommon) grinning -OR(;-heshe- is ;uncommon) feeling OR(;very;normal) relaxed \ No newline at end of file +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 diff --git a/csvfiles/outfits.csv b/csvfiles/outfits.csv index b5d1eaa..e4b8dd0 100644 --- a/csvfiles/outfits.csv +++ b/csvfiles/outfits.csv @@ -390,10 +390,12 @@ Snowboarding clothing Somali dirac Sombrero South Sudanese thobe +Spartan Armor Sports team uniform Steampunk clothing Strapless dress Streetwear +Stormtrooper Armor Striped dress and sneakers Striped shirt and denim shorts Sundress and sandals diff --git a/csvfiles/outfitvomit.csv b/csvfiles/outfitvomit.csv index 466435f..4dbee05 100644 --- a/csvfiles/outfitvomit.csv +++ b/csvfiles/outfitvomit.csv @@ -2,7 +2,7 @@ has OR(;large;small;giant;tiny;normal) OR(;-color-;normal) bowOR(;s;normal) has OR(;large;small;giant;tiny;normal) OR(;Leather;normal) OR(belt;strap)OR(;s;normal) has OR(Metal;Iron;Diamond;Steel;metallic;-materialcombination-) OR(plates;plating) has a crest on chest -is OR(zipped up;unzipped;partially unzipped;zipper;buttons;buttoned up;partially unbuttoned;unbuttoned) +OR(is zipped up;is unzipped;is partially unzipped;zipper;buttons;is buttoned up;is partially unbuttoned;is unbuttoned) has OR(;large;small;giant;tiny;normal) (zipper;button;buttons;zippers) is OR(off-the-shoulder;strapless;cropped;ruffled) is OR(;very;normal) OR(large;small;tight;loose;baggy;delicate;wet;-outfitdescriptor-) diff --git a/csvfiles/setttings.csv b/csvfiles/settings.csv similarity index 100% rename from csvfiles/setttings.csv rename to csvfiles/settings.csv diff --git a/prompttester.py b/prompttester.py index bda03f5..48c14b3 100644 --- a/prompttester.py +++ b/prompttester.py @@ -53,6 +53,7 @@ def generateprompts(amount = 1,insanitylevel="5",subject="all", artist="all", im resultnew = resultnew.replace("-the-", " the ") resultnew = resultnew.replace("-up-", " up ") resultnew = resultnew.replace("-in-", " in ") + resultnew = resultnew.replace("-au-", " au ") matches = re.findall(r'-\w+-', resultnew) # Filter out matches with commas and spaces @@ -65,6 +66,12 @@ def generateprompts(amount = 1,insanitylevel="5",subject="all", artist="all", im print(result) break + if("setting" in result): + print("TEST THIS") + print("") + print(result) + break + steps += 1 @@ -72,7 +79,7 @@ def generateprompts(amount = 1,insanitylevel="5",subject="all", artist="all", im print("") print("All done!") -generateprompts(25,5 +generateprompts(250,5 ,"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"