Finishing new UI

OneButtonPromptNodes.py

@@ -26,7 +26,7 @@ emojis = [False, True]
 
 models = ["SD1.5", "SDXL", "Stable Cascade"]
 prompt_enhancers = ["none", "superprompt-v1"]
-subjects =["all"]
+subjects =["------ all"]
 subjectsubtypesobject = ["all"]
 subjectsubtypeshumanoid = ["all"]
 subjectsubtypesconcept = ["all"]
@@ -66,7 +66,14 @@ generatefood = True
 generatebuilding = True
 generatespace = True
 generateflora = True
+
 generateanimal = True
+generatebird = True
+generatecat = True
+generatedog = True
+generateinsect = True
+generatepokemon = True
+
 generatemanwoman = True
 generatemanwomanrelation = True
 generatemanwomanmultiple = True
@@ -75,7 +82,15 @@ generatenonfictionalcharacter = True
 generatehumanoids = True
 generatejob = True
 generatefirstnames = True
+
 generatelandscape = True
+generatelocation = True
+generatelocationfantasy = True
+generatelocationscifi = True
+generatelocationvideogame = True
+generatelocationbiome = True
+generatelocationcity = True
+
 generateevent = True
 generateconcepts = True
 generatepoemline = True
@@ -102,6 +117,16 @@ for item in config:
         # animals
         if item[0] == 'subject_animal' and item[1] != 'on':
             generateanimal = False
+        if item[0] == 'subject_bird' and item[1] != 'on':
+            generatebird = False
+        if item[0] == 'subject_cat' and item[1] != 'on':
+            generatecat = False
+        if item[0] == 'subject_dog' and item[1] != 'on':
+            generatedog = False
+        if item[0] == 'subject_insect' and item[1] != 'on':
+            generateinsect = False
+        if item[0] == 'subject_pokemon' and item[1] != 'on':
+            generatepokemon = False
         # humanoids
         if item[0] == 'subject_manwoman' and item[1] != 'on':
             generatemanwoman = False
@@ -120,8 +145,18 @@ for item in config:
         if item[0] == 'subject_firstnames' and item[1] != 'on':
             generatefirstnames = False
         # landscape
-        if item[0] == 'subject_landscape' and item[1] != 'on':
-            generatelandscape = False
+        if item[0] == 'subject_location' and item[1] != 'on':
+            generatelocation = False
+        if item[0] == 'subject_location_fantasy' and item[1] != 'on':
+            generatelocationfantasy = False
+        if item[0] == 'subject_location_scifi' and item[1] != 'on':
+            generatelocationscifi = False
+        if item[0] == 'subject_location_videogame' and item[1] != 'on':
+            generatelocationvideogame = False
+        if item[0] == 'subject_location_biome' and item[1] != 'on':
+            generatelocationbiome = False
+        if item[0] == 'subject_location_city' and item[1] != 'on':
+            generatelocationcity = False
         # concept
         if item[0] == 'subject_event' and item[1] != 'on':
             generateevent = False
@@ -139,16 +174,86 @@ for item in config:
             generateconceptmixer = False
 
 # build up all subjects we can choose based on the loaded config file
-if(generatevehicle or generateobject or generatefood or generatebuilding or generatespace):
-     subjects.append("object")
-if(generateanimal):
-     subjects.append("animal")
+if(generatevehicle or generateobject or generatefood or generatebuilding or generatespace or generateflora):
+    subjects.append("--- object - all")
+    if(generateobject):
+          subjects.append("object - generic")
+    if(generatevehicle):
+          subjects.append("object - vehicle")
+    if(generatefood):
+          subjects.append("object - food")
+    if(generatebuilding):
+          subjects.append("object - building")
+    if(generatespace):
+          subjects.append("object - space")
+    if(generateflora):
+          subjects.append("object - flora")
+          
+if(generateanimal or generatebird or generatecat or generatedog or generateinsect or generatepokemon):
+    subjects.append("--- animal - all")
+    if(generateanimal):
+        subjects.append("animal - generic")
+    if(generatebird):
+        subjects.append("animal - bird")
+    if(generatecat):
+        subjects.append("animal - cat")
+    if(generatedog):
+        subjects.append("animal - dog")
+    if(generateinsect):
+        subjects.append("animal - insect")
+    if(generatepokemon):
+        subjects.append("animal - pokémon")
+
 if(generatemanwoman or generatemanwomanrelation or generatefictionalcharacter or generatenonfictionalcharacter or generatehumanoids or generatejob or generatemanwomanmultiple):
-     subjects.append("humanoid")
-if(generatelandscape):
-     subjects.append("landscape")
+    subjects.append("--- human - all")
+    if(generatemanwoman):
+        subjects.append("human - generic")
+    if(generatemanwomanrelation):
+        subjects.append("human - relations")
+    if(generatenonfictionalcharacter):
+        subjects.append("human - celebrity")
+    if(generatefictionalcharacter):
+        subjects.append("human - fictional")
+    if(generatehumanoids):
+        subjects.append("human - humanoids")
+    if(generatejob):
+        subjects.append("human - job/title")
+    if(generatefirstnames):
+        subjects.append("human - first name")
+    if(generatemanwomanmultiple):
+        subjects.append("human - multiple")
+
+if(generatelandscape or generatelocation or generatelocationfantasy or generatelocationscifi or generatelocationvideogame or generatelocationbiome or generatelocationcity):
+    subjects.append("--- landscape - all")
+    if(generatelocation):
+        subjects.append("landscape - generic")
+    if(generatelocationfantasy):
+        subjects.append("landscape - fantasy")
+    if(generatelocationscifi):
+        subjects.append("landscape - sci-fi")
+    if(generatelocationvideogame):
+        subjects.append("landscape - videogame")
+    if(generatelocationbiome):
+        subjects.append("landscape - biome")
+    if(generatelocationcity):
+        subjects.append("landscape - city")
+
 if(generateevent or generateconcepts or generatepoemline or generatesongline or generatecardname or generateepisodetitle or generateconceptmixer):
-     subjects.append("concept")
+    subjects.append("--- concept - all")
+    if(generateevent):
+        subjects.append("concept - event")
+    if(generateconcepts):
+        subjects.append("concept - the x of y")
+    if(generatepoemline):
+        subjects.append("concept - poem lines")
+    if(generatesongline):
+        subjects.append("concept - song lines")
+    if(generatecardname):
+        subjects.append("concept - card names")
+    if(generateepisodetitle):
+        subjects.append("concept - episode titles")
+    if(generateconceptmixer):
+        subjects.append("concept - mixer")
 
 
 # do the same for the subtype subjects
@@ -232,7 +337,7 @@ class OneButtonPrompt:
                     "max": 100, #Maximum value
                     "step": 1 #Slider's step
                 }),
-                "subject": (subjects, {"default": "all"}),
+                "subject": (subjects, {"default": "------ all"}),
                 "custom_subject": ("STRING", {
                     "multiline": False, #True if you want the field to look like the one on the ClipTextEncode node
                     "default": ""
@@ -241,10 +346,7 @@ class OneButtonPrompt:
                     "multiline": False, # This is the overwrite for an outfit, super nice
                     "default": ""
                 }),
-                "subject_subtype_objects": (subjectsubtypesobject, {"default": "all"}),
-                "subject_subtypes_humanoids": (subjectsubtypeshumanoid, {"default": "all"}),
                 "humanoids_gender": (genders, {"default": "all"}),
-                "subject_subtypes_concepts": (subjectsubtypesconcept, {"default": "all"}),
                 "emojis":(emojis, {"default": False}),
                 "base_model":(models, {"default": "SDXL"}),
                 "prompt_enhancer":(prompt_enhancers, {"default": "none"}),
@@ -262,8 +364,8 @@ class OneButtonPrompt:
 
     CATEGORY = "OneButtonPrompt"
     
-    def Comfy_OBP(self, insanitylevel, custom_subject, seed, artist, imagetype, subject, imagemodechance, humanoids_gender, subject_subtype_objects, subject_subtypes_humanoids, subject_subtypes_concepts, emojis, custom_outfit, base_model, prompt_enhancer):
-        generatedpromptlist = build_dynamic_prompt(insanitylevel,subject,artist,imagetype,False,"","","",1,"",custom_subject,True,"",imagemodechance, humanoids_gender, subject_subtype_objects, subject_subtypes_humanoids, subject_subtypes_concepts, False, emojis, seed, custom_outfit, True, base_model, "", prompt_enhancer)
+    def Comfy_OBP(self, insanitylevel, custom_subject, seed, artist, imagetype, subject, imagemodechance, humanoids_gender, emojis, custom_outfit, base_model, prompt_enhancer):
+        generatedpromptlist = build_dynamic_prompt(insanitylevel,subject,artist,imagetype,False,"","","",1,"",custom_subject,True,"",imagemodechance, humanoids_gender,"all", "all", "all", False, emojis, seed, custom_outfit, True, base_model, "", prompt_enhancer)
         #print(generatedprompt)
         generatedprompt = generatedpromptlist[0]
         prompt_g = generatedpromptlist[1]

build_dynamic_prompt.py

@@ -27,6 +27,22 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all
     if(superprompter==True):
         base_model = "Stable Cascade"
    
+    # new method of subject choosing from the interface, lets translate this:
+    subjectlist = translate_main_subject(forcesubject)
+    forcesubject = subjectlist[0]
+
+
+    # ugly but it works :D Keeps both methods working while the UI changes.
+    if(subtypeobject != "all" or subtypeobject != ""):
+        subtypeobject = subjectlist[1]
+    if(subtypeanimal != "all" or subtypeanimal != ""):
+        subtypeanimal = subjectlist[1]
+    if(subtypelocation != "all" or subtypelocation != ""):
+        subtypelocation = subjectlist[1]
+    if(subtypehumanoid != "all" or subtypehumanoid != ""):
+        subtypehumanoid = subjectlist[1]
+    if(subtypeconcept != "all" or subtypeconcept != ""):
+        subtypeconcept = subjectlist[1]
 
     # set seed
     # For use in ComfyUI (might bring to Automatic1111 as well)
@@ -466,6 +482,7 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all
     generatehumanoids = True
     generatejob = True
     generatefirstnames = True
+
     generatelandscape = True
     generatelocation = True
     generatelocationfantasy = True
@@ -473,6 +490,7 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all
     generatelocationvideogame = True
     generatelocationbiome = True
     generatelocationcity = True
+
     generateevent = True
     generateconcepts = True
     generatepoemline = True
@@ -1442,20 +1460,22 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all
             if(subtypehumanoid != "all"):
                 if(subtypehumanoid == "generic humans"):
                     subjectchooser = "human"
-                if(subtypehumanoid == "generic human relations"):
+                elif(subtypehumanoid == "generic human relations"):
                     subjectchooser = "manwomanrelation"
-                if(subtypehumanoid == "multiple humans"):
+                elif(subtypehumanoid == "multiple humans"):
                     subjectchooser = "manwomanmultiple"
-                if(subtypehumanoid == "celebrities e.a."):
+                elif(subtypehumanoid == "celebrities e.a."):
                     subjectchooser = "non fictional"
-                if(subtypehumanoid == "fictional characters"):
+                elif(subtypehumanoid == "fictional characters"):
                     subjectchooser = "fictional"
-                if(subtypehumanoid == "humanoids"):
+                elif(subtypehumanoid == "humanoids"):
                     subjectchooser = "humanoid"
-                if(subtypehumanoid == "based on job or title"):
+                elif(subtypehumanoid == "based on job or title"):
                     subjectchooser = "job"
-                if(subtypehumanoid == "based on first name"):
+                elif(subtypehumanoid == "based on first name"):
                     subjectchooser = "firstname"
+                else:
+                    subjectchooser = subtypehumanoid
         if(mainchooser == "landscape"):
             subjectchooser = random.choice(locationsubjectchooserlist)
 
@@ -2078,8 +2098,9 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all
                         objectwildcardlist = ["-space-"]
                     if(subtypeobject == "flora"):
                         objectwildcardlist = ["-flora-"]
-                    if(subtypeobject == "occult"):
-                        objectwildcardlist = ["-occult-"]
+                    # not varied enough
+                    #if(subtypeobject == "occult"):
+                    #    objectwildcardlist = ["-occult-"]
                     subjectchooser = subtypeobject
 
                 
@@ -2124,18 +2145,19 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all
                 # if we have a given subject, we should skip making an actual subject
                 if(givensubject == "" or (subjectingivensubject and givensubject != "")):
 
-                    if(subjectchooser=="animal"):
-                        animalwildcardlist = ["-animal-"]
-                    elif(subjectchooser=="bird"):
-                        animalwildcardlist = ["-bird-"]
-                    elif(subjectchooser=="cat"):
-                        animalwildcardlist = ["-cat-"]
-                    elif(subjectchooser=="dog"):
-                        animalwildcardlist = ["-dog-"]
-                    elif(subjectchooser=="insect"):
-                        animalwildcardlist = ["-insect-"]
-                    elif(subjectchooser=="pokemon"):
-                        animalwildcardlist = ["-pokemon-"]
+                    if(subtypeanimal != "all"):
+                        if(subtypeanimal=="generic animal"):
+                            animalwildcardlist = ["-animal-"]
+                        elif(subtypeanimal=="bird"):
+                            animalwildcardlist = ["-bird-"]
+                        elif(subtypeanimal=="cat"):
+                            animalwildcardlist = ["-cat-"]
+                        elif(subtypeanimal=="dog"):
+                            animalwildcardlist = ["-dog-"]
+                        elif(subtypeanimal=="insect"):
+                            animalwildcardlist = ["-insect-"]
+                        elif(subtypeanimal=="pokemon"):
+                            animalwildcardlist = ["-pokemon-"]
 
                     
                     chosenanimalwildcard = random.choice(animalwildcardlist)
@@ -2301,19 +2323,19 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all
                         hybridorswap = random.choice(hybridorswaplist)
                         completeprompt += "["
                     
-                    
-                    if(subjectchooser=="location"):
-                        locationwildcardlist = ["-location-"]
-                    elif(subjectchooser=="fantasy location"):
-                        locationwildcardlist = ["-locationfantasy-"]
-                    elif(subjectchooser=="videogame location"):
-                        locationwildcardlist = ["-locationvideogame-"]
-                    elif(subjectchooser=="sci-fi location"):
-                        locationwildcardlist = ["-locationscifi-"]
-                    elif(subjectchooser=="biome"):
-                        locationwildcardlist = ["-locationbiome-"]
-                    elif(subjectchooser=="city"):
-                        locationwildcardlist = ["-locationcity-"]
+                    if(subtypelocation != "all"):
+                        if(subtypelocation=="location"):
+                            locationwildcardlist = ["-location-"]
+                        elif(subtypelocation=="fantasy location"):
+                            locationwildcardlist = ["-locationfantasy-"]
+                        elif(subtypelocation=="videogame location"):
+                            locationwildcardlist = ["-locationvideogame-"]
+                        elif(subtypelocation=="sci-fi location"):
+                            locationwildcardlist = ["-locationscifi-"]
+                        elif(subtypelocation=="biome"):
+                            locationwildcardlist = ["-locationbiome-"]
+                        elif(subtypelocation=="city"):
+                            locationwildcardlist = ["-locationcity-"]
 
                     
                     chosenlocationwildcard = random.choice(locationwildcardlist)
@@ -2332,7 +2354,7 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all
                 completeprompt += "-objectstrengthend-"
 
                 # shots from inside can create cool effects in landscapes
-                if(chance_roll(insanitylevel, subjectlandscapeaddonlocationchance) and insideshot == 0):
+                if(chance_roll(max(1,insanitylevel-2), subjectlandscapeaddonlocationchance) and insideshot == 0):
                     insideshot = 1
                     # lets cheat a bit here, we can do something cool I saw on reddit
                     if(mainchooser=="humanoid" and legendary_dist(insanitylevel)):
@@ -5345,4 +5367,194 @@ def replace_user_wildcards(completeprompt):
             if(wordlist):
                 completeprompt = completeprompt.replace(user_wildcard, random.choice(wordlist),1)
 
-    return completeprompt
+    return completeprompt
+
+def translate_main_subject(main_subject=""):
+    subjecttype_lookup = {
+        "object - all": ["object", "all"],
+        "--- object - all": ["object", "all"],
+        "object - generic": ["object", "all"],
+        "generic object": ["object", "generic objects"],
+        "generic objects": ["object", "generic objects"],
+        "genericobject": ["object", "generic objects"],
+        "genericobjects": ["object", "generic objects"],
+        "object - vehicle": ["object", "vehicles"],
+        "vehicle": ["object", "vehicles"],
+        "vehicles": ["object", "vehicles"],
+        "object - food": ["object", "food"],
+        "food": ["object", "food"],
+        "object - building": ["object", "buildings"],
+        "building": ["object", "buildings"],
+        "buildings": ["object", "buildings"],
+        "object - space": ["object", "space"],
+        "space": ["object", "space"],
+        "object - flora": ["object", "flora"],
+        "flora": ["object", "flora"],
+        "nature": ["object", "flora"],
+
+        "animal - all": ["animal", "all"],
+        "--- animal - all": ["animal", "all"],
+        "animal": ["animal", "all"],
+        "animals": ["animal", "all"],
+        "animal - generic": ["animal", "generic animal"],
+        "generic animal": ["animal", "generic animal"],
+        "generic animals": ["animal", "generic animal"],
+        "genericanimal": ["animal", "generic animal"],
+        "genericanimals": ["animal", "generic animal"],
+        "animal - cat": ["animal", "cat"],
+        "cat": ["animal", "cat"],
+        "cats": ["animal", "cat"],
+        "animal - dog": ["animal", "dog"],
+        "dog": ["animal", "dog"],
+        "dogs": ["animal", "dog"],
+        "animal - bird": ["animal", "bird"],
+        "bird": ["animal", "bird"],
+        "birds": ["animal", "bird"],
+        "animal - insect": ["animal", "insect"],
+        "insect": ["animal", "insect"],
+        "insects": ["animal", "insect"],
+        "animal - pokémon": ["animal", "pokemon"],
+        "animal - pokemon": ["animal", "pokemon"],
+        "pokemon": ["animal", "pokemon"],
+        "pokemons": ["animal", "pokemon"],
+        "pokémon": ["animal", "pokemon"],
+        "pokémons": ["animal", "pokemon"],
+
+        "human - all": ["humanoid", "all"],
+        "--- human - all": ["humanoid", "all"],
+        "human": ["humanoid", "all"],
+        "humans": ["humanoid", "all"],
+        "person": ["humanoid", "all"],
+        "persons": ["humanoid", "all"],
+        "people": ["humanoid", "all"],
+        "man": ["humanoid", "all"],
+        "woman": ["humanoid", "all"],
+        "male": ["humanoid", "all"],
+        "female": ["humanoid", "all"],
+        "guy": ["humanoid", "all"],
+        "girl": ["humanoid", "all"],
+        "human - generic": ["humanoid", "human"],
+        "generic human": ["humanoid", "human"],
+        "generic humans": ["humanoid", "human"],
+        "generichuman": ["humanoid", "human"],
+        "generichumans": ["humanoid", "human"],
+        "human - relations": ["humanoid","manwomanrelation"],
+        "relations": ["humanoid","manwomanrelation"],
+        "human relations": ["humanoid","manwomanrelation"],
+        "humanrelations": ["humanoid","manwomanrelation"],
+        "human - celebrity": ["humanoid","non fictional"],
+        "celebrities": ["humanoid","non fictional"],
+        "celebrity": ["humanoid","non fictional"],
+        "human - fictional": ["humanoid","fictional"],
+        "fictional characters": ["humanoid","fictional"],
+        "fictional character": ["humanoid","fictional"],
+        "fictionalcharacters": ["humanoid","fictional"],
+        "fictionalcharacter": ["humanoid","fictional"],
+        "fictional": ["humanoid","fictional"],
+        "human - humanoids": ["humanoid","humanoid"],
+        "humanoid": ["humanoid","humanoid"],
+        "humanoids": ["humanoid","humanoid"],
+        "human - job/title": ["humanoid","job"],
+        "job": ["humanoid","job"],
+        "jobs": ["humanoid","job"],
+        "title": ["humanoid","job"],
+        "titles": ["humanoid","job"],
+        "human - first name": ["humanoid","firstname"],
+        "first name": ["humanoid","firstname"],
+        "firstname": ["humanoid","firstname"],
+        "human - multiple": ["humanoid","manwomanmultiple"], 
+        "multiplehumans": ["humanoid","manwomanmultiple"], 
+        "multiple": ["humanoid","manwomanmultiple"], 
+
+        "landscape - all": ["landscape","all"],
+        "--- landscape - all": ["landscape","all"],
+        "landscape": ["landscape","all"],
+        "landscapes": ["landscape","all"],
+        "landscape - generic": ["landscape","location"],
+        "landscape generic": ["landscape","location"],
+        "landscapes generic": ["landscape","location"],
+        "landscapegeneric": ["landscape","location"],
+        "landscapesgeneric": ["landscape","location"],
+        "genericlandscape": ["landscape","location"],
+        "generic landscape": ["landscape","location"],
+        "genericlandscapes": ["landscape","location"],
+        "generic landscapes": ["landscape","location"],
+        "landscape - fantasy": ["landscape","fantasy location"],
+        "landscape fantasy": ["landscape","fantasy location"],
+        "landscapefantasy": ["landscape","fantasy location"],
+        "fantasylandscape": ["landscape","fantasy location"],
+        "fantasy landscape": ["landscape","fantasy location"],
+        "landscape - videogame": ["landscape","videogame location"],
+        "landscape videogame": ["landscape","videogame location"],
+        "landscapevideogame": ["landscape","videogame location"],
+        "videogamelandscape": ["landscape","videogame location"],
+        "videogame landscape": ["landscape","videogame location"],
+        "landscape - sci-fi": ["landscape","sci-fi location"],
+        "landscape sci-fi": ["landscape","sci-fi location"],
+        "landscapesci-fi": ["landscape","sci-fi location"],
+        "sci-filandscape": ["landscape","sci-fi location"],
+        "sci-fi landscape": ["landscape","sci-fi location"],
+        "landscape - scifi": ["landscape","sci-fi location"],
+        "landscape scifi": ["landscape","sci-fi location"],
+        "landscapescifi": ["landscape","sci-fi location"],
+        "scifilandscape": ["landscape","sci-fi location"],
+        "scifi landscape": ["landscape","sci-fi location"],
+        "landscape - biome": ["landscape","biome"],
+        "landscape biome": ["landscape","biome"],
+        "landscapebiome": ["landscape","biome"],
+        "biomelandscape": ["landscape","biome"],
+        "biome landscape": ["landscape","biome"],
+        "biome": ["landscape","biome"],
+        "biomes": ["landscape","biome"],
+        "landscape - city": ["landscape","city"],
+        "landscape city": ["landscape","city"],
+        "landscapecity": ["landscape","city"],
+        "citylandscape": ["landscape","city"],
+        "city landscape": ["landscape","city"],
+        "city": ["landscape","city"],
+        "cities": ["landscape","city"],
+
+        "concept - all": ["concept", "all"],
+        "--- concept - all": ["concept", "all"],
+        "concept": ["concept", "all"],
+        "concepts": ["concept", "all"],
+        "concept - event": ["concept", "event"],
+        "event": ["concept", "event"],
+        "events": ["concept", "event"],
+        "concept - the x of y": ["concept", "concept"],
+        "xofy": ["concept", "concept"],
+        "thexofy": ["concept", "concept"],
+        "concept - poem lines": ["concept", "poemline"],
+        "poem": ["concept", "poemline"],
+        "poems": ["concept", "poemline"],
+        "poemline": ["concept", "poemline"],
+        "poemlines": ["concept", "poemline"],
+        "concept - song lines": ["concept", "songline"],
+        "song": ["concept", "songline"],
+        "songs": ["concept", "songline"],
+        "songline": ["concept", "songline"],
+        "songlines": ["concept", "songline"],
+        "concept - card names": ["concept", "cardname"],
+        "cards": ["concept", "cardname"],
+        "card": ["concept", "cardname"],
+        "cardgame": ["concept", "cardname"],
+        "cardgames": ["concept", "cardname"],
+        "cardname": ["concept", "cardname"],
+        "cardnames": ["concept", "cardname"],
+        "concept - episode titles": ["concept", "episodetitle"],
+        "episode": ["concept", "episodetitle"],
+        "episodes": ["concept", "episodetitle"],
+        "episodetitle": ["concept", "episodetitle"],
+        "episodetitles": ["concept", "episodetitle"],
+        "tv": ["concept", "episodetitle"],
+        "tv shows": ["concept", "episodetitle"],
+        "tvshows": ["concept", "episodetitle"],
+        "concept - mixer": ["concept", "conceptmixer"],
+        "concept mixer": ["concept", "conceptmixer"],
+        "conceptmixer": ["concept", "conceptmixer"],
+        "mixer": ["concept", "conceptmixer"],
+    }
+
+    subjecttype = subjecttype_lookup.get(main_subject, ["all", "all"])
+
+    return subjecttype

csvfiles/special_lists/buildoutfit.csv

@@ -2,13 +2,13 @@
 , OR(wearing;dressed in;in;normal) OR(;OR(;a very;rare) -outfitdescriptor-;normal) OR(;-outfitdescriptor-;uncommon) OR(;-color-;uncommon) -outfit- OR(;from the OR(-age-;the -agecalculator-);rare)
 , OR(wearing;dressed in;in;normal) OR(;OR(;a very;rare) -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(;OR(;a very;rare) -outfitdescriptor-;uncommon) OR(-minioutfit-;-outfit-;rare) OR(;OR(designed;made;inspired;forged) by OR(-brand-;-fashiondesigner-);rare)
+, OR(wearing;dressed in;in;normal) OR(;OR(;a very;rare) -outfitdescriptor-;uncommon) OR(-minioutfit-;-outfit-;rare) OR(;OR(designed;made;inspired;forged) by OR(-brand-;-fashiondesigner-);legendary)
 , wearing OR(-material-;-color-;-element-;uncommon) -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 OR(;very;rare) -outfitdescriptor- on -himher-,;unique)
+, OR(wearing;dressed in;in;normal) OR(;-outfitdescriptor-;-material-;-color-;uncommon) OR(-outfit-;-minioutfit-;rare) OR(;with OR(-pattern-;-outfitprinttotal-;-material-;rare) -print-;rare)
+, -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-;legendary) OR(;, It looks OR(;very;rare) -outfitdescriptor- on -himher-,;unique)
 , -heshe- is OR(wearing;dressed in) OR(;-hisher-;rare) -culture- -outfit-, OR(; OR(-hisher-;The;normal) -sameoutfit- is OR(-outfitdescriptor-;-color-),;normal) OR(;, It looks OR(;very;rare) -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;forged) by -brand-, It is OR(;very;rare) OR(-outfitdescriptor-;-color-;normal) OR(;and OR(-outfitdescriptor-;-color-;normal);normal) OR(;, The -sameoutfit- looks OR(;very;rare) -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- OR(;that was OR(designed;made;inspired;forged) by -brand-;rare), It is OR(;very;rare) OR(-outfitdescriptor-;-color-;normal) OR(;and OR(-outfitdescriptor-;-color-;normal);normal) OR(;, The -sameoutfit- looks OR(;very;rare) -outfitdescriptor- on -himher-,;unique)
 , OR(wearing;dressed in;in;normal) OR(;OR(;a very;rare) -outfitdescriptor-;normal) OR(-minioutfit-;-outfit-;uncommon), OR(-hisher-;The;normal) -sameoutfit- -outfitvomit-
-, -heshe- is OR(wearing a;dressed in) OR(;-hisher-;-hisher- -outfitdescriptor-;rare) -outfit-, OR(-hisher-;The;normal) -sameoutfit- OR(is tailored by -fashiondesigner- OR(; and -fashiondesigner-;uncommon);is inspired by the -charactertype- OR(;and -charactertype-;rare))
+, -heshe- is OR(wearing a;dressed in) OR(;-hisher-;-hisher- -outfitdescriptor-;rare) -outfit-, OR(;OR(-hisher-;The;normal) -sameoutfit- OR(is tailored by -fashiondesigner- OR(; and -fashiondesigner-;uncommon);is inspired by the -charactertype- OR(;and -charactertype-;rare));rare)
 , -heshe- is OR(wearing a;dressed in) OR(;-hisher-;-hisher- -outfitdescriptor-;rare) -artmovement- fashion style -outfit-
 , OR(wearing;dressed in;in;normal) OR(;OR(;a very;rare) -outfitdescriptor-;normal) -outfit-

csvfiles/special_lists/buildoutfit_less_verbose.csv

@@ -2,13 +2,13 @@
 , OR(;-outfitdescriptor-;normal) OR(;-outfitdescriptor-;uncommon) OR(;-color-;uncommon) -outfit- OR(;from the OR(-age-;the -agecalculator-);rare)
 , OR(;-outfitdescriptor-;normal) OR(;-outfitdescriptor-;uncommon) OR(;-color-;uncommon) -outfit- OR(; and OR(;-outfitdescriptor-;uncommon) OR(;-color-;uncommon) -outfit-;rare)
 , OR(-job-;-rpgclass-;-season-;-animal--style) OR(-minioutfit-;-outfit-;rare)
-, OR(;-outfitdescriptor-;uncommon) OR(-minioutfit-;-outfit-;rare) OR(;OR(designed;made;inspired;forged) by OR(-brand-;-fashiondesigner-);rare)
+, OR(;-outfitdescriptor-;uncommon) OR(-minioutfit-;-outfit-;rare) OR(;OR(designed;made;inspired;forged) by OR(-brand-;-fashiondesigner-);legendary)
 , OR(-material-;-color-;-element-;uncommon) -overrideoutfit-
-, OR(;-outfitdescriptor-;-material-;-color-;uncommon) OR(-outfit-;-minioutfit-;rare), OR(-pattern-;-outfitprinttotal-;-material-;uncommon) -print-,
+, OR(;-outfitdescriptor-;-material-;-color-;uncommon) OR(-outfit-;-minioutfit-;rare), OR(-pattern-;-outfitprinttotal-;-material-;rare) -print-,
 , OR(;-outfitdescriptor-;normal) -outfit-, OR(-outfitdescriptor-;-color-), OR(-pattern-;-outfitprinttotal-;-material-;uncommon) -print- OR(;-material-;rare)
 , -culture- -outfit-, OR(;OR(-outfitdescriptor-;-color-),;normal) 
-, OR(;-outfitdescriptor-;normal) OR(;-color-;uncommon) OR(;-culture-;uncommon) OR(;-material-;rare) -outfit- that was OR(designed;made;inspired;forged) by -brand-
+, OR(;-outfitdescriptor-;normal) OR(;-color-;uncommon) OR(;-culture-;uncommon) OR(;-material-;rare) -outfit- OR(that was OR(designed;made;inspired;forged) by -brand-;rare)
 , OR(;-outfitdescriptor-;normal) OR(-minioutfit-;-outfit-;uncommon), -outfitvomit-
-, OR(;-outfitdescriptor-;normal) -outfit-, OR(is tailored by -fashiondesigner- OR(; and -fashiondesigner-;uncommon);-charactertype- OR(;and -charactertype-;rare))
+, OR(;-outfitdescriptor-;normal) -outfit-, OR(;OR(is tailored by -fashiondesigner- OR(; and -fashiondesigner-;uncommon);-charactertype- OR(;and -charactertype-;rare));rare)
 , OR(;-outfitdescriptor-;normal) -artmovement- fashion style -outfit-
 , OR(;-outfitdescriptor-;normal) -outfit-

presets/obp_presets.default

@@ -1,7 +1,7 @@
 {
     "Standard": {
       "insanitylevel": 5,
-      "subject": "all",
+      "subject": "------ all",
       "artist": "all",
       "chosensubjectsubtypeobject": "all",
       "chosensubjectsubtypehumanoid": "all",
@@ -19,11 +19,11 @@
     },
     "Consistent results": {
       "insanitylevel": 2,
-      "subject": "concept",
+      "subject": "concept - card names",
       "artist": "none",
-      "chosensubjectsubtypeobject": "flora",
-      "chosensubjectsubtypehumanoid": "generic humans",
-      "chosensubjectsubtypeconcept": "names from card based games",
+      "chosensubjectsubtypeobject": "all",
+      "chosensubjectsubtypehumanoid": "all",
+      "chosensubjectsubtypeconcept": "all",
       "chosengender": "all",
       "imagetype": "fixed styles mode",
       "imagemodechance": "20",
@@ -37,10 +37,10 @@
     },
     "Unique People Portraits": {
       "insanitylevel": 3,
-      "subject": "humanoid",
+      "subject": "human - first name",
       "artist": "photography",
       "chosensubjectsubtypeobject": "all",
-      "chosensubjectsubtypehumanoid": "based on first name",
+      "chosensubjectsubtypehumanoid": "all",
       "chosensubjectsubtypeconcept": "all",
       "chosengender": "all",
       "imagetype": "portrait",
@@ -55,10 +55,10 @@
     },
     "Artful People Portraits": {
       "insanitylevel": 5,
-      "subject": "humanoid",
+      "subject": "human - generic",
       "artist": "character",
       "chosensubjectsubtypeobject": "all",
-      "chosensubjectsubtypehumanoid": "generic humans",
+      "chosensubjectsubtypehumanoid": "all",
       "chosensubjectsubtypeconcept": "all",
       "chosengender": "all",
       "imagetype": "art blaster mode",
@@ -73,10 +73,10 @@
     },
     "D&D Style Portraits": {
       "insanitylevel": 2,
-      "subject": "humanoid",
+      "subject": "human - humanoids",
       "artist": "fantasy",
       "chosensubjectsubtypeobject": "all",
-      "chosensubjectsubtypehumanoid": "humanoids",
+      "chosensubjectsubtypehumanoid": "all",
       "chosensubjectsubtypeconcept": "all",
       "chosengender": "all",
       "imagetype": "digital art",
@@ -91,10 +91,10 @@
     },
     "Cybernetic Animals": {
       "insanitylevel": 3,
-      "subject": "animal",
+      "subject": "animal - generic",
       "artist": "sci-fi",
       "chosensubjectsubtypeobject": "all",
-      "chosensubjectsubtypehumanoid": "generic humans",
+      "chosensubjectsubtypehumanoid": "all",
       "chosensubjectsubtypeconcept": "all",
       "chosengender": "all",
       "imagetype": "digital art",
@@ -109,10 +109,10 @@
     },
     "Greg mode - The Preset": {
       "insanitylevel": 3,
-      "subject": "humanoid",
+      "subject": "human - generic",
       "artist": "greg mode",
       "chosensubjectsubtypeobject": "all",
-      "chosensubjectsubtypehumanoid": "generic humans",
+      "chosensubjectsubtypehumanoid": "all",
       "chosensubjectsubtypeconcept": "all",
       "chosengender": "all",
       "imagetype": "digital art",
@@ -127,7 +127,7 @@
     },
     "Cyberpunk Characters": {
       "insanitylevel": 3,
-      "subject": "humanoid",
+      "subject": "--- human - all",
       "artist": "character",
       "chosensubjectsubtypeobject": "all",
       "chosensubjectsubtypehumanoid": "all",
@@ -145,10 +145,10 @@
     },
     "Waifu's": {
       "insanitylevel": 7,
-      "subject": "humanoid",
+      "subject": "human - generic",
       "artist": "none",
       "chosensubjectsubtypeobject": "all",
-      "chosensubjectsubtypehumanoid": "generic humans",
+      "chosensubjectsubtypehumanoid": "all",
       "chosensubjectsubtypeconcept": "all",
       "chosengender": "female",
       "imagetype": "subject only mode",
@@ -163,10 +163,10 @@
     },
     "Husbando's": {
       "insanitylevel": 7,
-      "subject": "humanoid",
+      "subject": "human - generic",
       "artist": "none",
       "chosensubjectsubtypeobject": "all",
-      "chosensubjectsubtypehumanoid": "generic humans",
+      "chosensubjectsubtypehumanoid": "all",
       "chosensubjectsubtypeconcept": "all",
       "chosengender": "male",
       "imagetype": "subject only mode",
@@ -181,10 +181,10 @@
     },
     "Fashion Models": {
       "insanitylevel": 3,
-      "subject": "humanoid",
+      "subject": "human - generic",
       "artist": "fashion",
       "chosensubjectsubtypeobject": "all",
-      "chosensubjectsubtypehumanoid": "generic humans",
+      "chosensubjectsubtypehumanoid": "all",
       "chosensubjectsubtypeconcept": "all",
       "chosengender": "all",
       "imagetype": "photograph",
@@ -199,10 +199,10 @@
     },
     "WIERD HATS": {
       "insanitylevel": 4,
-      "subject": "humanoid",
+      "subject": "human - generic",
       "artist": "none",
       "chosensubjectsubtypeobject": "all",
-      "chosensubjectsubtypehumanoid": "generic humans",
+      "chosensubjectsubtypehumanoid": "all",
       "chosensubjectsubtypeconcept": "all",
       "chosengender": "all",
       "imagetype": "photograph",
@@ -217,12 +217,12 @@
     },
     "Wallpaper art": {
       "insanitylevel": 3,
-      "subject": "concept",
+      "subject": "concept - the x of y",
       "artist": "digital",
       "chosensubjectsubtypeobject": "all",
       "chosensubjectsubtypehumanoid": "all",
-      "chosensubjectsubtypeconcept": "the X of Y concepts",
-      "chosengender": "female",
+      "chosensubjectsubtypeconcept": "all",
+      "chosengender": "all",
       "imagetype": "all",
       "imagemodechance": 6,
       "givensubject": "",
@@ -235,11 +235,11 @@
     },
     "The Cauldron": {
       "insanitylevel": 5,
-      "subject": "concept",
+      "subject": "concept - mixer",
       "artist": "all",
       "chosensubjectsubtypeobject": "all",
       "chosensubjectsubtypehumanoid": "all",
-      "chosensubjectsubtypeconcept": "concept mixer",
+      "chosensubjectsubtypeconcept": "all",
       "chosengender": "all",
       "imagetype": "subject only mode",
       "imagemodechance": "20",
@@ -253,12 +253,12 @@
     },
     "The Connaisseur": {
       "insanitylevel": 5,
-      "subject": "concept",
+      "subject": "concept - poem lines",
       "artist": "all (wild)",
       "chosensubjectsubtypeobject": "all",
       "chosensubjectsubtypehumanoid": "all",
-      "chosensubjectsubtypeconcept": "lines from poems",
-      "chosengender": "female",
+      "chosensubjectsubtypeconcept": "all",
+      "chosengender": "all",
       "imagetype": "unique art mode",
       "imagemodechance": 20,
       "givensubject": "",
@@ -271,9 +271,9 @@
     },
     "Interesting Landscapes": {
       "insanitylevel": 5,
-      "subject": "landscape",
+      "subject": "--- landscape - all",
       "artist": "landscape",
-      "chosensubjectsubtypeobject": "buildings",
+      "chosensubjectsubtypeobject": "all",
       "chosensubjectsubtypehumanoid": "all",
       "chosensubjectsubtypeconcept": "all",
       "chosengender": "all",
@@ -287,11 +287,29 @@
       "giventypeofimage": "",
       "antistring": ""
     },
+    "Videogame Landscapes": {
+      "insanitylevel": 4,
+      "subject": "landscape - videogame",
+      "artist": "digital",
+      "chosensubjectsubtypeobject": "all",
+      "chosensubjectsubtypehumanoid": "all",
+      "chosensubjectsubtypeconcept": "all",
+      "chosengender": "all",
+      "imagetype": "concept art",
+      "imagemodechance": 100,
+      "givensubject": "",
+      "smartsubject": true,
+      "givenoutfit": "",
+      "prefixprompt": "video game concept art, 2d game art",
+      "suffixprompt": "",
+      "giventypeofimage": "",
+      "antistring": ""
+    },
     "Relaxing Seascapes": {
       "insanitylevel": 4,
-      "subject": "concept",
+      "subject": "--- concept - all",
       "artist": "seascape",
-      "chosensubjectsubtypeobject": "buildings",
+      "chosensubjectsubtypeobject": "all",
       "chosensubjectsubtypehumanoid": "all",
       "chosensubjectsubtypeconcept": "all",
       "chosengender": "all",
@@ -307,9 +325,9 @@
     },
     "Architecture": {
       "insanitylevel": 3,
-      "subject": "object",
+      "subject": "object - building",
       "artist": "architecture",
-      "chosensubjectsubtypeobject": "buildings",
+      "chosensubjectsubtypeobject": "all",
       "chosensubjectsubtypehumanoid": "all",
       "chosensubjectsubtypeconcept": "all",
       "chosengender": "all",
@@ -325,10 +343,10 @@
     },
     "Nature": {
       "insanitylevel": 4,
-      "subject": "object",
+      "subject": "object - flora",
       "artist": "nature",
-      "chosensubjectsubtypeobject": "flora",
-      "chosensubjectsubtypehumanoid": "generic humans",
+      "chosensubjectsubtypeobject": "all",
+      "chosensubjectsubtypehumanoid": "all",
       "chosensubjectsubtypeconcept": "all",
       "chosengender": "all",
       "imagetype": "all",
@@ -343,9 +361,9 @@
     },
     "Let the CFG sort it out": {
       "insanitylevel": 2,
-      "subject": "concept",
+      "subject": "--- concept - all",
       "artist": "all (wild)",
-      "chosensubjectsubtypeobject": "buildings",
+      "chosensubjectsubtypeobject": "all",
       "chosensubjectsubtypehumanoid": "all",
       "chosensubjectsubtypeconcept": "all",
       "chosengender": "all",
@@ -361,10 +379,10 @@
     },
     "Now this is podracing": {
       "insanitylevel": 9,
-      "subject": "concept",
+      "subject": "--- concept - all",
       "artist": "all (wild)",
-      "chosensubjectsubtypeobject": "flora",
-      "chosensubjectsubtypehumanoid": "generic humans",
+      "chosensubjectsubtypeobject": "all",
+      "chosensubjectsubtypehumanoid": "all",
       "chosensubjectsubtypeconcept": "all",
       "chosengender": "all",
       "imagetype": "massive madness mode",

prompttester.py

@@ -110,7 +110,7 @@ def generateprompts(amount = 1,insanitylevel="5",subject="all", artist="all", im
 
 if __name__ == "__main__":
     generateprompts(10,5
-                ,"all" # subject
+                ,"------ 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", "dynamic templates mode", "artify mode"
                 , False # only artists

scripts/onebuttonprompt.py

@@ -20,7 +20,7 @@ OBPresets = OneButtonPresets()
 
 basemodelslist = ["SD1.5", "SDXL", "Stable Cascade"]
 #subjects = ["all","object","animal","humanoid", "landscape", "concept"]
-subjects =["all"]
+subjects =["------ all"]
 subjectsubtypesobject = ["all"]
 subjectsubtypeshumanoid = ["all"]
 subjectsubtypesconcept = ["all"]
@@ -92,7 +92,14 @@ generatefood = True
 generatebuilding = True
 generatespace = True
 generateflora = True
+
 generateanimal = True
+generatebird = True
+generatecat = True
+generatedog = True
+generateinsect = True
+generatepokemon = True
+
 generatemanwoman = True
 generatemanwomanrelation = True
 generatemanwomanmultiple = True
@@ -101,7 +108,15 @@ generatenonfictionalcharacter = True
 generatehumanoids = True
 generatejob = True
 generatefirstnames = True
+
 generatelandscape = True
+generatelocation = True
+generatelocationfantasy = True
+generatelocationscifi = True
+generatelocationvideogame = True
+generatelocationbiome = True
+generatelocationcity = True
+
 generateevent = True
 generateconcepts = True
 generatepoemline = True
@@ -128,6 +143,16 @@ for item in config:
         # animals
         if item[0] == 'subject_animal' and item[1] != 'on':
             generateanimal = False
+        if item[0] == 'subject_bird' and item[1] != 'on':
+            generatebird = False
+        if item[0] == 'subject_cat' and item[1] != 'on':
+            generatecat = False
+        if item[0] == 'subject_dog' and item[1] != 'on':
+            generatedog = False
+        if item[0] == 'subject_insect' and item[1] != 'on':
+            generateinsect = False
+        if item[0] == 'subject_pokemon' and item[1] != 'on':
+            generatepokemon = False
         # humanoids
         if item[0] == 'subject_manwoman' and item[1] != 'on':
             generatemanwoman = False
@@ -146,8 +171,18 @@ for item in config:
         if item[0] == 'subject_firstnames' and item[1] != 'on':
             generatefirstnames = False
         # landscape
-        if item[0] == 'subject_landscape' and item[1] != 'on':
-            generatelandscape = False
+        if item[0] == 'subject_location' and item[1] != 'on':
+            generatelocation = False
+        if item[0] == 'subject_location_fantasy' and item[1] != 'on':
+            generatelocationfantasy = False
+        if item[0] == 'subject_location_scifi' and item[1] != 'on':
+            generatelocationscifi = False
+        if item[0] == 'subject_location_videogame' and item[1] != 'on':
+            generatelocationvideogame = False
+        if item[0] == 'subject_location_biome' and item[1] != 'on':
+            generatelocationbiome = False
+        if item[0] == 'subject_location_city' and item[1] != 'on':
+            generatelocationcity = False
         # concept
         if item[0] == 'subject_event' and item[1] != 'on':
             generateevent = False
@@ -165,16 +200,87 @@ for item in config:
             generateconceptmixer = False
 
 # build up all subjects we can choose based on the loaded config file
-if(generatevehicle or generateobject or generatefood or generatebuilding or generatespace):
-     subjects.append("object")
-if(generateanimal):
-     subjects.append("animal")
+if(generatevehicle or generateobject or generatefood or generatebuilding or generatespace or generateflora):
+    subjects.append("--- object - all")
+    if(generateobject):
+          subjects.append("object - generic")
+    if(generatevehicle):
+          subjects.append("object - vehicle")
+    if(generatefood):
+          subjects.append("object - food")
+    if(generatebuilding):
+          subjects.append("object - building")
+    if(generatespace):
+          subjects.append("object - space")
+    if(generateflora):
+          subjects.append("object - flora")
+          
+if(generateanimal or generatebird or generatecat or generatedog or generateinsect or generatepokemon):
+    subjects.append("--- animal - all")
+    if(generateanimal):
+        subjects.append("animal - generic")
+    if(generatebird):
+        subjects.append("animal - bird")
+    if(generatecat):
+        subjects.append("animal - cat")
+    if(generatedog):
+        subjects.append("animal - dog")
+    if(generateinsect):
+        subjects.append("animal - insect")
+    if(generatepokemon):
+        subjects.append("animal - pokémon")
+
 if(generatemanwoman or generatemanwomanrelation or generatefictionalcharacter or generatenonfictionalcharacter or generatehumanoids or generatejob or generatemanwomanmultiple):
-     subjects.append("humanoid")
-if(generatelandscape):
-     subjects.append("landscape")
-if(generateevent or generateconcepts or generatepoemline or generatesongline or generatecardname or generateepisodetitle):
-     subjects.append("concept")
+    subjects.append("--- human - all")
+    if(generatemanwoman):
+        subjects.append("human - generic")
+    if(generatemanwomanrelation):
+        subjects.append("human - relations")
+    if(generatenonfictionalcharacter):
+        subjects.append("human - celebrity")
+    if(generatefictionalcharacter):
+        subjects.append("human - fictional")
+    if(generatehumanoids):
+        subjects.append("human - humanoids")
+    if(generatejob):
+        subjects.append("human - job/title")
+    if(generatefirstnames):
+        subjects.append("human - first name")
+    if(generatemanwomanmultiple):
+        subjects.append("human - multiple")
+
+if(generatelandscape or generatelocation or generatelocationfantasy or generatelocationscifi or generatelocationvideogame or generatelocationbiome or generatelocationcity):
+    subjects.append("--- landscape - all")
+    if(generatelocation):
+        subjects.append("landscape - generic")
+    if(generatelocationfantasy):
+        subjects.append("landscape - fantasy")
+    if(generatelocationscifi):
+        subjects.append("landscape - sci-fi")
+    if(generatelocationvideogame):
+        subjects.append("landscape - videogame")
+    if(generatelocationbiome):
+        subjects.append("landscape - biome")
+    if(generatelocationcity):
+        subjects.append("landscape - city")
+
+if(generateevent or generateconcepts or generatepoemline or generatesongline or generatecardname or generateepisodetitle or generateconceptmixer):
+    subjects.append("--- concept - all")
+    if(generateevent):
+        subjects.append("concept - event")
+    if(generateconcepts):
+        subjects.append("concept - the x of y")
+    if(generatepoemline):
+        subjects.append("concept - poem lines")
+    if(generatesongline):
+        subjects.append("concept - song lines")
+    if(generatecardname):
+        subjects.append("concept - card names")
+    if(generateepisodetitle):
+        subjects.append("concept - episode titles")
+    if(generateconceptmixer):
+        subjects.append("concept - mixer")
+         
 
 
 # do the same for the subtype subjects
@@ -401,55 +507,22 @@ class Script(scripts.Script):
                             ### 📸 Subject Types
                             
                             <font size="2">
-                            You can choose a certain subject type, if you want to generate something more specific. It has the following types:  
+                            You can choose a certain subject type. Choose the all version to randomly choose between the subtypes. Iff you want to generate something more specific, choose the subtype. It has the following types:  
                             
-                            1. object - Can be a random object, a building or a vehicle.  
+                            1. object - Can be a random object, a building, vehicle, space or flora.
                             
                             2. animal - A random (fictional) animal. Has a chance to have human characteristics, such as clothing added.  
                             
                             3. humanoid - A random humanoid, males, females, fantasy types, fictional and non-fictional characters. Can add clothing, features and a bunch of other things.  
                             
-                            4. landscape - A landscape or a landscape with a building.  
+                            4. landscape - A landscape, choose a cool location.
                             
                             5. concept - Can be a concept, such as "a X of Y", or an historical event such as "The Trojan War". It can also generate a line from a poem or a song. 
 
                             After choosing object, humanoid or concept a subselection menu will show. You can pick further details here. When choosing humanoid, you can also select the gender you wish to generate.
 
-                            🏺 Type of Object:
-
-                            1. all - selects randomly (default)
-
-                            2. generic objects - Hodgepodge of objects, can be household items, weapons or any other general object.
-
-                            3. vehicles - Cars, but also planes, trains and boats.
-
-                            4. food - Meals, fruits and others.
-
-                            5. buildings - From churches to libraries to castles.
-
-                            6. space - Some bigger objects, nebula's, black holes and constellations
-
-                            7. flora - Flowers and trees.
-
-                            👨‍👩‍👧 Type of humanoid:
-
-                            1. all - selects randomly (default)
-
-                            2. generic humans - Generic human descriptions. Example values would be Man, Woman, Male, etc
-
-                            3. generic human relations - Human relations, example values would be Grandpa, Sister, Father, etc
-
-                            4. celebrities e.a. - Known people, usually celebrities.
-
-                            5. fictional characters - Movie and videogame characters, such as Mario and Peach.
-
-                            6. humanoids - Humanoid type races, think Elves, Orcs, Dwarves, etc
-
-                            7. based on job or title - Examples are Queen, Carpenter, Vampire hunter
-
-                            8. based on first name - Examples are Anna, James, Emma etc.
-
-                            🚻 gender:
+                           
+                            🚻 gender (only available for human generations):
 
                             1. all - selects randomly
 
@@ -457,23 +530,6 @@ class Script(scripts.Script):
 
                             3. female
 
-                            💡🧠💭 Type of concept:
-
-                            1. all - selects randomly (default)
-
-                            2. event - an historical event, or even mythological event. Example The fall of Rome
-
-                            3. the X of Y concepts - Randomly creates a small sentence, example The Ocean of Thought or The Fortress of Flame, etc
-
-                            4. lines from poems - Picks a line from a poem
-
-                            5. lines from songs - Picks a line from a song
-
-                            6. names from card based games - Picks a card name from various card games, such as magic the gathering, yugioh and many others.
-
-                            7. episode titles from tv shows - Picks a episode title from a popular tv series, such as Star Trek, Simpsons, game of Thrones, etc.
-
-                            6. concept mixer - A mixer of different keywords and concepts. For example animal hybrids, objects shaped as other objects or other unusual combinations.
                             </font>
                             
                             ### 🎨 Artists
@@ -1109,7 +1165,7 @@ class Script(scripts.Script):
 
         # turn things on and off for gender
         def subjectsvalue(subject):
-             enable=(subject=="humanoid")
+             enable=("human" in subject)
              return {
                   chosengender: gr.update(visible=enable),
              }