From c3dc1f1cc655445cc9bed660757e343ae5aa095d Mon Sep 17 00:00:00 2001 From: AIrjen Date: Mon, 21 Aug 2023 20:32:51 +0200 Subject: [PATCH] Adding animal stuff and chairs! --- build_dynamic_prompt.py | 21 ++++++++-- csvfiles/accessories.csv | 3 +- csvfiles/chairs.csv | 40 +++++++++++++++++++ csvfiles/prints.csv | 4 +- .../special_lists/animalsuffixadditions.csv | 15 +++++++ csvfiles/special_lists/humanadditions.csv | 6 +-- csvfiles/special_lists/miniactivity.csv | 3 +- csvfiles/special_lists/overalladditions.csv | 1 + prompttester.py | 2 +- 9 files changed, 84 insertions(+), 11 deletions(-) create mode 100644 csvfiles/chairs.csv create mode 100644 csvfiles/special_lists/animalsuffixadditions.csv diff --git a/build_dynamic_prompt.py b/build_dynamic_prompt.py index ec1aba8..aa1896f 100644 --- a/build_dynamic_prompt.py +++ b/build_dynamic_prompt.py @@ -92,6 +92,7 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all floralist = csv_to_list("flora", antilist) printlist = csv_to_list("prints", antilist) patternlist = csv_to_list("patterns", antilist) + chairlist = csv_to_list("chairs", antilist) humanlist = fictionallist + nonfictionallist + humanoidlist objecttotallist = objectlist + buildinglist + vehiclelist + foodlist + spacelist + floralist + containerlist @@ -144,6 +145,7 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all overalladditionlist = csv_to_list("overalladditions", antilist,"./csvfiles/special_lists/") imagetypemodelist = csv_to_list("imagetypemodes", antilist,"./csvfiles/special_lists/") miniactivitylist = csv_to_list("miniactivity", antilist,"./csvfiles/special_lists/") + animalsuffixadditionlist = csv_to_list("animalsuffixadditions", antilist,"./csvfiles/special_lists/") styleslist = csv_to_list("styles", antilist,"./csvfiles/templates/") @@ -1328,6 +1330,8 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all if(animaladdedsomething != 1): completeprompt += "-animal- " + + if(hybridorswap == "hybrid"): if(uncommon_dist(insanitylevel)): completeprompt += "|" + random.choice(hybridlist) + "] " @@ -1345,6 +1349,10 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all # completion of strenght end completeprompt += "-objectstrengthend-" + + if(legendary_dist(insanitylevel)): + animaladdedsomething = 1 + completeprompt += "-animalsuffixaddition- " # if we have a given subject, we should skip making an actual subject if(mainchooser == "humanoid"): @@ -1974,9 +1982,11 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all "-flora-" in completeprompt or "-print-" in completeprompt or "-miniactivity-" in completeprompt or - "-pattern-" 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-", "-brand-", "-space-", "-artist-", "-imagetype-", "-othertype-", "-quality-", "-lighting-", "-camera-", "-lens-","-imagetypequality-", "-poemline-", "-songline-", "-greatwork-", "-artistfantasy-", "-artistpopular-", "-artistromanticism-", "-artistphotography-", "-emoji-", "-timeperiod-", "-shotsize-", "-musicgenre-", "-animaladdition-", "-addontolocationinside-", "-addontolocation-", "-objectaddition-", "-humanaddition-", "-overalladdition-", "-focus-", "-direction-", "-styletilora-", "-manwomanrelation-", "-waterlocation-", "-container-", "-firstname-", "-flora-", "-print-", "-miniactivity-", "-pattern-"] - 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, 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] + "-pattern-" in completeprompt or + "-animalsuffixaddition-" in completeprompt or + "-chair-" 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-", "-brand-", "-space-", "-artist-", "-imagetype-", "-othertype-", "-quality-", "-lighting-", "-camera-", "-lens-","-imagetypequality-", "-poemline-", "-songline-", "-greatwork-", "-artistfantasy-", "-artistpopular-", "-artistromanticism-", "-artistphotography-", "-emoji-", "-timeperiod-", "-shotsize-", "-musicgenre-", "-animaladdition-", "-addontolocationinside-", "-addontolocation-", "-objectaddition-", "-humanaddition-", "-overalladdition-", "-focus-", "-direction-", "-styletilora-", "-manwomanrelation-", "-waterlocation-", "-container-", "-firstname-", "-flora-", "-print-", "-miniactivity-", "-pattern-", "-animalsuffixaddition-", "-chair-"] + 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, 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] allwildcardslistwithhybrid = ["-material-", "-descriptor-", "-outfit-", "-conceptsuffix-","-culture-", "-objecttotal-", "-outfitprinttotal-"] allwildcardslistwithhybridlists = [materiallist, descriptorlist,outfitlist,conceptsuffixlist,culturelist, objecttotallist, outfitprinttotallist] @@ -2111,6 +2121,7 @@ def createpromptvariant(prompt = "", insanitylevel = 5, antivalues = "" , gender floralist = csv_to_list("flora", antilist) printlist = csv_to_list("prints", antilist) patternlist = csv_to_list("patterns", antilist) + chairlist = csv_to_list("chairs", antilist) humanlist = fictionallist + nonfictionallist + humanoidlist + malefemalelist + manwomanlist + manwomanrelationlist objecttotallist = objectlist + buildinglist + vehiclelist + foodlist + spacelist + floralist + containerlist @@ -2251,7 +2262,7 @@ def createpromptvariant(prompt = "", insanitylevel = 5, antivalues = "" , gender if lowercase_combination in [x.lower() for x in accessorielist] and chance_roll(insanitylevel, "uncommon"): - prompt = prompt.replace(combination," -accessorie- ") + prompt = prompt.replace(combination," -accessory- ") if lowercase_combination in [x.lower() for x in artmovementlist] and chance_roll(insanitylevel, "uncommon"): @@ -2375,6 +2386,8 @@ def createpromptvariant(prompt = "", insanitylevel = 5, antivalues = "" , gender prompt = prompt.replace(combination," -miniactivity- ") if lowercase_combination in [x.lower() for x in patternlist] and chance_roll(insanitylevel, "uncommon"): prompt = prompt.replace(combination," -pattern- ") + if lowercase_combination in [x.lower() for x in chairlist] and chance_roll(insanitylevel, "uncommon"): + prompt = prompt.replace(combination," -chair- ") if lowercase_combination in [x.lower() for x in fantasyartistlist] and chance_roll(insanitylevel, "uncommon"): diff --git a/csvfiles/accessories.csv b/csvfiles/accessories.csv index e1e2db3..4d5ef22 100644 --- a/csvfiles/accessories.csv +++ b/csvfiles/accessories.csv @@ -150,4 +150,5 @@ Body Tattoos Face Tattoos Tattoos Tribal Tattoos -Geass \ No newline at end of file +Geass +Shoulder pads \ No newline at end of file diff --git a/csvfiles/chairs.csv b/csvfiles/chairs.csv new file mode 100644 index 0000000..36b9d6e --- /dev/null +++ b/csvfiles/chairs.csv @@ -0,0 +1,40 @@ +Chair +Sofa +Couch +Stool +Bench +Bed +Ottoman +Rocking chair +Recliner +Armchair +Bar stool +Bean bag +Chaise lounge +Dining chair +Loveseat +Window seat +Hammock +Swing +Floor cushion +Pouf +Folding chair +Deck chair +Picnic blanket +Outdoor cushion +Piano bench +Footstool +Inflatable chair +Meditation cushion +Campfire log +Beach chair +Tree stump +Park bench +Porch swing +Throne +Swing chair +Sackcloth +Backless bench +Tire swing +Lounge chair +Clouds \ No newline at end of file diff --git a/csvfiles/prints.csv b/csvfiles/prints.csv index 7635f1c..52ea566 100644 --- a/csvfiles/prints.csv +++ b/csvfiles/prints.csv @@ -5,4 +5,6 @@ details accessories trimmings designs -embroidery \ No newline at end of file +embroidery +ornaments +adornments \ No newline at end of file diff --git a/csvfiles/special_lists/animalsuffixadditions.csv b/csvfiles/special_lists/animalsuffixadditions.csv new file mode 100644 index 0000000..6bdf3bf --- /dev/null +++ b/csvfiles/special_lists/animalsuffixadditions.csv @@ -0,0 +1,15 @@ +with -material- wings +with -material- tail +with -material- ears +-animal- hybrid +with -animal- skin +with -pattern- skin +wearing a -accessory- +with -pattern- -print- +with -color- details +with -material- -minioutfit- +with -descriptor- parts +-miniactivity- at a -location- +-miniactivity- in a -building- +- -humanoid- +looking like a -objecttotal- \ No newline at end of file diff --git a/csvfiles/special_lists/humanadditions.csv b/csvfiles/special_lists/humanadditions.csv index 9534de4..609c9fd 100644 --- a/csvfiles/special_lists/humanadditions.csv +++ b/csvfiles/special_lists/humanadditions.csv @@ -16,10 +16,10 @@ expression is -mood- -miniactivity- in a -waterlocation- -miniactivity- at a -location- -miniactivity- in a -building- --pose- under a -waterlocation- , torn -minioutfit- wearing -elaborateoutfit- -animal- hybrid as -culture- -rpgclass- -sitting in a -descriptor- chair -inside a -container- \ No newline at end of file +sitting in a -descriptor- -chair- +inside a -container- +- -humanoid- \ No newline at end of file diff --git a/csvfiles/special_lists/miniactivity.csv b/csvfiles/special_lists/miniactivity.csv index 1aea272..0202663 100644 --- a/csvfiles/special_lists/miniactivity.csv +++ b/csvfiles/special_lists/miniactivity.csv @@ -7,4 +7,5 @@ Frolicking Sitting Lounging Laying -Standing \ No newline at end of file +Standing +-pose- \ No newline at end of file diff --git a/csvfiles/special_lists/overalladditions.csv b/csvfiles/special_lists/overalladditions.csv index db0b502..9997a1b 100644 --- a/csvfiles/special_lists/overalladditions.csv +++ b/csvfiles/special_lists/overalladditions.csv @@ -21,6 +21,7 @@ in -culture- city street covered in -color- paint, dripping paint designed by -brand- in style of -brand- +forged by -brand- overgrown with plants and -color- flowers cyberpunk style, neo-tokyo, -color- neon highlights designed as a -culture- rug from fiber diff --git a/prompttester.py b/prompttester.py index a6ce53f..740e767 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(10,8,"humanoid","all","all",False,"","","PREFIXPROMPT" ,"SUFFIXPROMPT","",1,"","",True,"",100, "all", "all", "all", "all", False, True) \ No newline at end of file +generateprompts(10,8,"all","all","all",False,"","","PREFIXPROMPT" ,"SUFFIXPROMPT","",1,"","",True,"",100, "all", "all", "all", "all", False, True) \ No newline at end of file