From 6ada5fd3dbd9cb9d1f9cdbac136746cc15c43070 Mon Sep 17 00:00:00 2001 From: AIrjen <130234949+AIrjen@users.noreply.github.com> Date: Sat, 23 Sep 2023 12:50:50 +0200 Subject: [PATCH] Working on rebuilding build lists --- build_dynamic_prompt.py | 2 ++ csvfiles/patterns.csv | 1 - csvfiles/special_lists/buildhair.csv | 16 ++--------- csvfiles/special_lists/buildoutfit.csv | 28 ++++--------------- csvfiles/special_lists/humanadditions.csv | 28 ++++++------------- csvfiles/special_lists/insideshots.csv | 9 +----- .../special_lists/minilocationadditions.csv | 11 +------- prompttester.py | 2 +- 8 files changed, 22 insertions(+), 75 deletions(-) diff --git a/build_dynamic_prompt.py b/build_dynamic_prompt.py index 72055c4..f7bd30b 100644 --- a/build_dynamic_prompt.py +++ b/build_dynamic_prompt.py @@ -2691,6 +2691,8 @@ def custom_or(values, insanitylevel = 5): # Check if the last element is one of the specific values last_element = values[-1] first_element = values[0] + + print(values) if last_element in ['always', 'common', 'normal','uncommon', 'rare', 'legendary','unique', 'extraordinary', 'novel', 'never']: # If we do not hit the change roll, then take the first element. diff --git a/csvfiles/patterns.csv b/csvfiles/patterns.csv index 278e68f..d65cca8 100644 --- a/csvfiles/patterns.csv +++ b/csvfiles/patterns.csv @@ -9,7 +9,6 @@ barcode awning bayadere argyle -Basketweave Plaid Checkerboard Harlequin diff --git a/csvfiles/special_lists/buildhair.csv b/csvfiles/special_lists/buildhair.csv index eff91bd..b957530 100644 --- a/csvfiles/special_lists/buildhair.csv +++ b/csvfiles/special_lists/buildhair.csv @@ -1,14 +1,2 @@ --haircolor- hair styled as -hairstyle- --haircolor- hair, -descriptor- -hairstyle- hairstyle --haircolor- hair --haircolor- -hairstyle- hairstyle --haircolor- -descriptor- hair --descriptor- hair --descriptor- -haircolor- hair --descriptor- hair styled as -hairstyle- --descriptor- hair, -hairstyle- hairstyle --descriptor- -hairstyle- hairstyle --hairstyle- hair --hairstyle- hairstyle --culture- hair --culture- hairstyle \ No newline at end of file +OR(-haircolor-;-descriptor-;-culture-;uncommon) hair OR(styled as -hairstyle-;;rare) +OR(-haircolor-; -hairstyle-) OR(hairstyle;hair) \ No newline at end of file diff --git a/csvfiles/special_lists/buildoutfit.csv b/csvfiles/special_lists/buildoutfit.csv index 3d7cc62..7706bad 100644 --- a/csvfiles/special_lists/buildoutfit.csv +++ b/csvfiles/special_lists/buildoutfit.csv @@ -1,22 +1,6 @@ --descriptor- -outfit- --descriptor- -culture- -outfit- --descriptor- -culture- -color- -outfit- --descriptor- -culture- -material- -outfit- --descriptor- -culture- -material- -color- -outfit- --culture- -outfit- --material- -outfit- --color- -outfit- --material- -color- -outfit- --descriptor- -color- -outfit- --descriptor- -material- -outfit- --descriptor- -material- -color- -outfit- --job- -outfit- --rpgclass- -minioutfit- --season- -minioutfit- --animal--style -outfit- --minioutfit- designed by -brand- --material- --descriptor- -outfit- with -outfitprinttotal- -print- --material- -minioutfit- with -outfitprinttotal- -print- --color- -outfit- with -material- -print- --outfit- in -pattern- -print- \ No newline at end of file +OR(;-descriptor-;normal) OR(;-color-;uncommon) OR(;-culture-;uncommon) OR (;-material-;rare) -outfit- +OR(;-descriptor-;normal) OR(;-descriptor-;uncommon) OR(;-color-;uncommon) -outfit- +OR(-job-;-rpgclass-;-season-;-animal--style) OR(-minioutfit-;-outfit-;rare) +OR(;-descriptor-;uncommon) OR(-minioutfit-;-outfit-;rare) OR(;designed by -brand-;uncommon) +OR(-material-;-color-) +OR(;-descriptor-;-material-;-color-;uncommon) OR(-outfit-;-minioutfit-;rare) with OR(-pattern-;-outfitprinttotal-;-material-;uncommon) -print- \ No newline at end of file diff --git a/csvfiles/special_lists/humanadditions.csv b/csvfiles/special_lists/humanadditions.csv index 609c9fd..6139db5 100644 --- a/csvfiles/special_lists/humanadditions.csv +++ b/csvfiles/special_lists/humanadditions.csv @@ -1,25 +1,15 @@ -riding a -animal- +OR(riding;with) a -animal- holding a -object- driving a -vehicle- -with a -animal- -surrounded by -object-s -surrounded by -flora-s -surrounded by -space- +surrounded by OR(-object-s;-flora-s;-space-) eating -food- -and -human- -holding hands with -human- +OR(and;holding hands with) -human- cosplaying as -fictional- -with -color- skin -with -material- skin -feeling -mood- -expression is -mood- --miniactivity- in a -waterlocation- --miniactivity- at a -location- --miniactivity- in a -building- -, torn -minioutfit- +with OR(-color-;-material-) skin +OR(feeling;expression is) -mood- +-miniactivity- OR(in;at) a (-location-;-building-;-waterlocation-) wearing -elaborateoutfit- --animal- hybrid +- OR(-animal-;-humanoid-) OR(;hybrid;normal) as -culture- -rpgclass- -sitting in a -descriptor- -chair- -inside a -container- -- -humanoid- \ No newline at end of file +sitting in a OR(-descriptor-;uncommon) -chair- +inside a -container- \ No newline at end of file diff --git a/csvfiles/special_lists/insideshots.csv b/csvfiles/special_lists/insideshots.csv index c5f3a99..3f4c46d 100644 --- a/csvfiles/special_lists/insideshots.csv +++ b/csvfiles/special_lists/insideshots.csv @@ -1,8 +1 @@ -from inside of a -location- -from inside of a -building- -from inside of a -descriptor- -location- -from inside of a -descriptor- -building- -inside a -location- -inside of a -building- -inside a -descriptor- -location- -inside of a -descriptor- -building- \ No newline at end of file +OR(;from;normal) inside OR(;of;normal) a OR(;-descriptor-;uncommon) OR(-location-;-building-) \ No newline at end of file diff --git a/csvfiles/special_lists/minilocationadditions.csv b/csvfiles/special_lists/minilocationadditions.csv index fe6454a..fea4fc8 100644 --- a/csvfiles/special_lists/minilocationadditions.csv +++ b/csvfiles/special_lists/minilocationadditions.csv @@ -1,10 +1 @@ --minilocation- --minilocation- and -minilocation- -[-minilocation-|-minilocation-] --descriptor- -minilocation- --culture- -minilocation- --color- -minilocation- -lush -minilocation- -dense -minilocation- --season- -minilocation- --minilocation- with -flora- \ No newline at end of file +OR(;-descriptor-;-culture-;-color-;lush;dense;-season-;normal) -minilocation- OR(; with -flora-; and -space- in background; and -minilocation-;rare) \ No newline at end of file diff --git a/prompttester.py b/prompttester.py index 6e67e0c..56446f2 100644 --- a/prompttester.py +++ b/prompttester.py @@ -46,4 +46,4 @@ def generateprompts(amount = 1,insanitylevel="5",subject="all", artist="all", im print("") print("All done!") -generateprompts(20,8,"all","all","all",False,"","","PREFIXPROMPT" ,"OR(;-descriptor-;normal) OR(;-culture-;uncommon) OR(;-color-;uncommon) -accessory- OR(; , -accessory-; , -descriptor- -accessory-;rare) OR(; and -accessory-;unique)","",1,"","OR(;-descriptor-;normal), BLA",True,"",100, "all", "all", "all", "all", False, True) \ No newline at end of file +generateprompts(20,8,"all","all","all",False,"","","PREFIXPROMPT" ,"OR(;-descriptor-;-culture-;-color-;lush;dense;-season-;normal) -minilocation- OR(; with -flora-; and -space- in background; and -minilocation-;rare)","",1,"","OR(;-descriptor-;normal), BLA",True,"",100, "all", "all", "all", "all", False, True) \ No newline at end of file