diff --git a/csvfiles/accessories.csv b/csvfiles/accessories.csv index cc4b10f..d2946f4 100644 --- a/csvfiles/accessories.csv +++ b/csvfiles/accessories.csv @@ -102,6 +102,7 @@ Circlet -vehicle- Tattoo -building- Tattoo Three-eyed +one-eyed Hair ribbons Fangs Belts diff --git a/csvfiles/concept_suffix.csv b/csvfiles/concept_suffix.csv index 1f88e3c..440241a 100644 --- a/csvfiles/concept_suffix.csv +++ b/csvfiles/concept_suffix.csv @@ -75,4 +75,5 @@ Pain Beauty Blood Elegance -Study \ No newline at end of file +Study +Metal \ No newline at end of file diff --git a/csvfiles/othertypes.csv b/csvfiles/othertypes.csv index 68140ec..8303852 100644 --- a/csvfiles/othertypes.csv +++ b/csvfiles/othertypes.csv @@ -82,4 +82,5 @@ Stained glass window Miniature diorama Anime key visual Multiple layers of silhouette -Retro comic style artwork \ No newline at end of file +Retro comic style artwork +Metal pin \ No newline at end of file diff --git a/scripts/onebuttonprompt.py b/scripts/onebuttonprompt.py index ae5d167..a2e7aff 100644 --- a/scripts/onebuttonprompt.py +++ b/scripts/onebuttonprompt.py @@ -127,6 +127,10 @@ class Script(scripts.Script): with gr.Row(): promptcompounderlevel = gr.Dropdown( promptcompounder, label="Prompt compunder", value=1) + with gr.Row(): + ANDtoggle = gr.Checkbox( + label="toggle AND mode" + ) with gr.Row(): gr.Markdown( """ @@ -141,14 +145,15 @@ class Script(scripts.Script): This was originally a bug in the first release when using multiple batches, now brought back as a feature. Raised by redditor drone2222, to bring this back as a toggle, since it did create interesting results. So here it is. + You can toggle "AND mode". This will seperate the prompts with an AND and a newline. This can than be used in conjuction with the Latent Couple extension. """ ) - return [insanitylevel,subject, artist, imagetype, promptlocation, promptcompounderlevel] + return [insanitylevel,subject, artist, imagetype, promptlocation, promptcompounderlevel, ANDtoggle] - def run(self, p, insanitylevel, subject, artist, imagetype, promptlocation, promptcompounderlevel): + def run(self, p, insanitylevel, subject, artist, imagetype, promptlocation, promptcompounderlevel, ANDtoggle): images = [] infotexts = [] @@ -172,8 +177,11 @@ class Script(scripts.Script): preppedprompt = "" for i in range(promptcompounderlevel): preppedprompt += build_dynamic_prompt(insanitylevel,subject,artist, imagetype) - if i + 1 != promptcompounderlevel: - preppedprompt += ", " + if(i + 1 != promptcompounderlevel): + if(ANDtoggle): + preppedprompt += " \n AND " + else: + preppedprompt += ", " if(promptlocation == "in the front" and originalprompt != ""): p.prompt = originalprompt + ", " + preppedprompt