From cb63dd927a3be0bd4f86ec8fdd2826b7dd2c20bd Mon Sep 17 00:00:00 2001 From: AIrjen <130234949+AIrjen@users.noreply.github.com> Date: Fri, 29 Sep 2023 17:03:09 +0200 Subject: [PATCH] some additions for replacements --- build_dynamic_prompt.py | 20 ++++++++++++++++++++ csvfiles/brands.csv | 4 +++- csvfiles/special_lists/buildoutfit.csv | 4 ++-- csvfiles/special_lists/objectadditions.csv | 14 +++++++------- prompttester.py | 8 ++++---- 5 files changed, 36 insertions(+), 14 deletions(-) diff --git a/build_dynamic_prompt.py b/build_dynamic_prompt.py index 0d5e190..ae50938 100644 --- a/build_dynamic_prompt.py +++ b/build_dynamic_prompt.py @@ -2680,6 +2680,26 @@ def replacewildcard(completeprompt, insanitylevel, wildcard,listname, activatehy if(wildcard == "-outfit-" or wildcard == "-minioutfit-"): completeprompt = completeprompt.replace("-sameoutfit-", replacementvalue,1) + if(wildcard in ["-animal-" + ,"-human-" + ,"-humanoid-" + , "-manwoman-" + , "-malefemale-" + , "-object-" + , "-fictional-" + , "-nonfictional-" + , "-building-" + , "-vehicle-" + , "-food-" + , "-job-" + , "-objecttotal-" + , "-space-" + , "-firstname-"] + and chance_roll(insanitylevel, "uncommon")): + completeprompt = completeprompt.replace("-heshe-", "the " + replacementvalue,1) + + + completeprompt = completeprompt.replace(wildcard, replacementvalue,1) diff --git a/csvfiles/brands.csv b/csvfiles/brands.csv index 9f6a88c..a044d39 100644 --- a/csvfiles/brands.csv +++ b/csvfiles/brands.csv @@ -81,4 +81,6 @@ Gnomes Goblins Blizzard entertainment Riot games -Mugler \ No newline at end of file +Mugler +a -humanoid- +a -rpgclass- \ No newline at end of file diff --git a/csvfiles/special_lists/buildoutfit.csv b/csvfiles/special_lists/buildoutfit.csv index 233da67..f1d3434 100644 --- a/csvfiles/special_lists/buildoutfit.csv +++ b/csvfiles/special_lists/buildoutfit.csv @@ -2,9 +2,9 @@ , OR(wearing;dressed in;in;normal) OR(;-outfitdescriptor-;normal) OR(;-outfitdescriptor-;uncommon) OR(;-color-;uncommon) -outfit- , OR(wearing;dressed in;in;normal) OR(;-outfitdescriptor-;normal) OR(;-outfitdescriptor-;uncommon) OR(;-color-;uncommon) -outfit- OR(; and OR(;-outfitdescriptor-;uncommon) OR(;-color-;uncommon) -outfit-;rare) , OR(wearing;dressed in;in;normal) OR(-job-;-rpgclass-;-season-;-animal--style) OR(-minioutfit-;-outfit-;rare) -, OR(wearing;dressed in;in;normal) OR(;-outfitdescriptor-;uncommon) OR(-minioutfit-;-outfit-;rare) OR(;designed by -brand-;uncommon) +, OR(wearing;dressed in;in;normal) OR(;-outfitdescriptor-;uncommon) OR(-minioutfit-;-outfit-;rare) OR(;OR(designed;made;inspired;forged) by -brand-;uncommon) , wearing OR(-material-;-color-) -overrideoutfit- , OR(wearing;dressed in;in;normal) OR(;-outfitdescriptor-;-material-;-color-;uncommon) OR(-outfit-;-minioutfit-;rare) with OR(-pattern-;-outfitprinttotal-;-material-;uncommon) -print-, , -heshe- is OR(wearing a;dressed in) OR(;-hisher-;-hisher- -outfitdescriptor-;rare) -outfit-, OR(-hisher-;The;normal) -sameoutfit- is OR(-outfitdescriptor-;-color-) OR( OR(and has;, It has) OR(-pattern-;-outfitprinttotal-;-material-;uncommon) -print- on it,; and is OR(made of;detailed with bits of) -material-;rare) OR(;,It looks -outfitdescriptor- on -himher-,;unique) , -heshe- is OR(wearing;dressed in) OR(;-hisher-;-hisher- traditional;rare) -culture- -outfit-, OR(; OR(-hisher-;The;normal) -sameoutfit- is OR(-outfitdescriptor-;-color-),;normal) OR(;,It looks -outfitdescriptor- on -himher-,;unique) -, -heshe- is OR(wearing a;dressed in a) OR(;-outfitdescriptor-;normal) OR(;-color-;uncommon) OR(;-culture-;uncommon) OR(;-material-;rare) -outfit- that was OR(designed;made;inspired) by -brand-, It is OR(-outfitdescriptor-;-color-;normal) OR(;and OR(-outfitdescriptor-;-color-;normal);normal) OR(;, The -sameoutfit- looks -outfitdescriptor- on -himher-,;unique) \ No newline at end of file +, -heshe- is OR(wearing a;dressed in a) OR(;-outfitdescriptor-;normal) OR(;-color-;uncommon) OR(;-culture-;uncommon) OR(;-material-;rare) -outfit- that was OR(designed;made;inspired;forged) by -brand-, It is OR(-outfitdescriptor-;-color-;normal) OR(;and OR(-outfitdescriptor-;-color-;normal);normal) OR(;, The -sameoutfit- looks -outfitdescriptor- on -himher-,;unique) \ No newline at end of file diff --git a/csvfiles/special_lists/objectadditions.csv b/csvfiles/special_lists/objectadditions.csv index d5ff27c..0ed6242 100644 --- a/csvfiles/special_lists/objectadditions.csv +++ b/csvfiles/special_lists/objectadditions.csv @@ -1,7 +1,7 @@ -made from OR(-material-;-space-;-flora-) -OR(detailed;engraved;rare) with OR(-material-;-color-;-descriptor-;-pattern-) OR(; and -color-; and -descriptor-;rare) OR(patterns;details) -OR(intricate details;smooth;sleek) -designed by -brand- -anthropomorphic OR(;with a face;normal) -with OR(-pattern-;-color-;-descriptor-;rare) -print- -covered in -covering- \ No newline at end of file +OR(;, -heshe- is;uncommon) made from OR(-material-;-space-;-flora-) +OR(;, -heshe- is;uncommon) OR(detailed;engraved;rare) with OR(-material-;-color-;-outfitdescriptor-;-pattern-) OR(; and -color-; and -outfitdescriptor-;rare) OR(patterns;details) +OR(;, -heshe- is;uncommon) OR(intricate details;smooth;sleek) +OR(;, -heshe- is;uncommon) OR(designed;made;inspired;forged) by -brand- +OR(;, -heshe- is;uncommon) anthropomorphic OR(;with a face;normal) +OR(;, -heshe- is;uncommon) with OR(-pattern-;-color-;-descriptor-;rare) -print- +OR(;, -heshe- is;uncommon) covered in -covering- \ No newline at end of file diff --git a/prompttester.py b/prompttester.py index 8db9b4a..ea23f70 100644 --- a/prompttester.py +++ b/prompttester.py @@ -51,13 +51,13 @@ def generateprompts(amount = 1,insanitylevel="5",subject="all", artist="all", im print("") print("All done!") -generateprompts(10,5 - ,"humanoid" # subject +generateprompts(10,10 + ,"" # subject ,"all","all",False,"","","PREFIXPROMPT" - ,"SUFFIXPROMPT" + ,"SUFFIXPROMPT -heshe- is looking here" ,"",1,"" ,"" # subject override ,True, "",100, "all", "all", "all", "all", False, True, 0 - , "armor" #outfit override + , "" #outfit override ) \ No newline at end of file