Merge pull request #135 from AIrjen/Big_logic_update

Big logic update

OneButtonPromptNodes.py

@@ -13,7 +13,7 @@ sys.path.append(onebuttonprompt_path)
 from build_dynamic_prompt import *
 from csv_reader import *
 
-artists = ["all", "none", "popular", "greg mode", "3D",	"abstract",	"angular", "anime"	,"architecture",	"art nouveau",	"art deco",	"baroque",	"bauhaus", 	"cartoon",	"character",	"children's illustration", 	"cityscape", 	"clean",	"cloudscape",	"collage",	"colorful",	"comics",	"cubism",	"dark",	"detailed", 	"digital",	"expressionism",	"fantasy",	"fashion",	"fauvism",	"figurativism",	"gore",	"graffiti",	"graphic design",	"high contrast",	"horror",	"impressionism",	"installation",	"landscape",	"light",	"line drawing",	"low contrast",	"luminism",	"magical realism",	"manga",	"melanin",	"messy",	"monochromatic",	"nature",	"nudity",	"photography",	"pop art",	"portrait",	"primitivism",	"psychedelic",	"realism",	"renaissance",	"romanticism",	"scene",	"sci-fi",	"sculpture",	"seascape",	"space",	"stained glass",	"still life",	"storybook realism",	"street art",	"streetscape",	"surrealism",	"symbolism",	"textile",	"ukiyo-e",	"vibrant",	"watercolor",	"whimsical"]
+artists = ["all", "all (wild)", "none", "popular", "greg mode", "3D",	"abstract",	"angular", "anime"	,"architecture",	"art nouveau",	"art deco",	"baroque",	"bauhaus", 	"cartoon",	"character",	"children's illustration", 	"cityscape", 	"clean",	"cloudscape",	"collage",	"colorful",	"comics",	"cubism",	"dark",	"detailed", 	"digital",	"expressionism",	"fantasy",	"fashion",	"fauvism",	"figurativism",	"gore",	"graffiti",	"graphic design",	"high contrast",	"horror",	"impressionism",	"installation",	"landscape",	"light",	"line drawing",	"low contrast",	"luminism",	"magical realism",	"manga",	"melanin",	"messy",	"monochromatic",	"nature",	"nudity",	"photography",	"pop art",	"portrait",	"primitivism",	"psychedelic",	"realism",	"renaissance",	"romanticism",	"scene",	"sci-fi",	"sculpture",	"seascape",	"space",	"stained glass",	"still life",	"storybook realism",	"street art",	"streetscape",	"surrealism",	"symbolism",	"textile",	"ukiyo-e",	"vibrant",	"watercolor",	"whimsical"]
 imagetypes = ["all", "all - force multiple",  "photograph", "octane render","digital art","concept art", "painting", "portrait", "anime key visual", "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"]
 subjects =["all", "object", "animal", "humanoid", "landscape", "concept"]
 genders = ["all", "male", "female"]
@@ -53,6 +53,7 @@ generateflora = True
 generateanimal = True
 generatemanwoman = True
 generatemanwomanrelation = True
+generatemanwomanmultiple = True
 generatefictionalcharacter = True
 generatenonfictionalcharacter = True
 generatehumanoids = True
@@ -88,6 +89,8 @@ for item in config:
             generatemanwoman = False
         if item[0] == 'subject_manwomanrelation' and item[1] != 'on':
             generatemanwomanrelation = False
+        if item[0] == 'subject_manwomanmultiple' and item[1] != 'on':
+            generatemanwomanmultiple = False
         if item[0] == 'subject_fictional' and item[1] != 'on':
             generatefictionalcharacter = False
         if item[0] == 'subject_nonfictional' and item[1] != 'on':
@@ -118,7 +121,7 @@ if(generatevehicle or generateobject or generatefood or generatebuilding or gene
      subjects.append("object")
 if(generateanimal):
      subjects.append("animal")
-if(generatemanwoman or generatemanwomanrelation or generatefictionalcharacter or generatenonfictionalcharacter or generatehumanoids or generatejob):
+if(generatemanwoman or generatemanwomanrelation or generatefictionalcharacter or generatenonfictionalcharacter or generatehumanoids or generatejob or generatemanwomanmultiple):
      subjects.append("humanoid")
 if(generatelandscape):
      subjects.append("landscape")
@@ -160,6 +163,8 @@ if(generatejob):
      subjectsubtypeshumanoid.append("based on job or title")
 if(generatefirstnames):
      subjectsubtypeshumanoid.append("based on first name")
+if(generatemanwomanmultiple):
+     subjectsubtypeshumanoid.append("multiple humans")
 
 # concepts
 if(generateevent):
@@ -205,6 +210,10 @@ class OneButtonPrompt:
                     "multiline": False, #True if you want the field to look like the one on the ClipTextEncode node
                     "default": ""
                 }),
+                "custom_outfit": ("STRING", {
+                    "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"}),
@@ -224,8 +233,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):
-        generatedprompt = 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)
+    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):
+        generatedprompt = 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)
         #print(generatedprompt)
         return (generatedprompt,)
 

csv_reader.py

@@ -48,7 +48,7 @@ def csv_to_list(csvfilename, antilist=[], directory="./csvfiles/", lowerandstrip
                                 for row in reader:
                                         value = row[0]
                                         if( 
-                                                (gender != "all" and row[1] == gender)
+                                                gender != "all" and (row[1] == gender or row[1] == "genderless" or row[1] == "both")
                                                 or gender == "all"
                                                 ):
                                                 if(value.lower().strip() not in antilist):
@@ -70,7 +70,7 @@ def csv_to_list(csvfilename, antilist=[], directory="./csvfiles/", lowerandstrip
                                         for row in reader:
                                                 value = row[0]
                                                 if( 
-                                                (gender != "all" and row[1] == gender)
+                                                gender != "all" and (row[1] == gender or row[1] == "genderless" or row[1] == "both")
                                                 or gender == "all"
                                                 ):
                                                         if(value.lower().strip() not in antilist):
@@ -94,6 +94,17 @@ def csv_to_list(csvfilename, antilist=[], directory="./csvfiles/", lowerandstrip
         
         return deduplicated_list
 
+def artist_category_by_category_csv_to_list(csvfilename,artist):
+        csvlist = []
+        script_dir = os.path.dirname(os.path.abspath(__file__))
+        full_path = os.path.join(script_dir, "./csvfiles/" )
+        with open(full_path + csvfilename + ".csv", "r", newline="",encoding="utf8") as file:
+                reader = csv.DictReader(file, delimiter=",")
+                for row in reader:
+                        if(row["Artist"] == artist):
+                                csvlist.append(row["Tags"])
+        return csvlist
+
 def artist_category_csv_to_list(csvfilename,category):
         csvlist = []
         script_dir = os.path.dirname(os.path.abspath(__file__))
@@ -105,8 +116,6 @@ def artist_category_csv_to_list(csvfilename,category):
                                 csvlist.append(row["Artist"])
         return csvlist
 
-
-
 def load_config_csv():
         csvlist = []
         script_dir = os.path.dirname(os.path.abspath(__file__))

csvfiles/accessories.csv

@@ -1,154 +1,147 @@
-Beauty Marks
-Freckles
-Scars
-Wrinkles
-Pores
-Eyeliner
-Eyeshadow
-Makeup
-No makeup
-Fantasy Makeup
-Lipstick
-Lip gloss
-Large -color- Eyes
-Glowing -color- Eyes
-Three-Eyed
-One-Eyed
-Crazy Eyes
-Empty Eyes
-Dashed Eyes
-Heart-Shaped Eyes
-Cybernetic Eye
-Amphibian Eyes
--animal- Eyes
-Sharingan Eyes
-Anime Eyes
-Hair Tie
-Hair Clip
-Hair Ribbons
-Flower in hair
-Barrette
-Hat
-Trucker hat
-Witch Hat
-Wizard Hat
--material- helmet
-Bandanna
-Headband
-Crown
-Tiara
-Horns
-Angelic Halo
-Flower Crown
-Circlet
-Large Head
-Face Mask
-Mask made out of -material-
-Samurai Mask
--animal- Ears
-Cat Ears
--animal- Tail
-Tail
-Fangs
-Wings
-Cybernetics
-Mechanical Body Parts
-Mechanical Arms
-Mechanical Legs
-Robotic Body Parts
-Robotic Arms
-Robotic Legs
-Headphones
-Earbuds
-Cellphone
-Phone Case
-Watch
-Fitness Tracker
-Smartwatch
-Fitbit
-Glasses
-Glasses Chain
-Sunglasses
-Blindfold
-Braces
-Gold Tooth
-Ruff
-Scarf
-Fur Scarf
-Tartan Scarf
-Collar
-Choker
-Tie
-Bowtie
-Earrings
-Necklace
-Bracelet
-Ring
-Rings
-Lapel Pin
-Body Chain
-Brooch
-Anklet
-Toe Ring
-Nose Ring
-Lip Ring
-Belly Button Ring
-Navel
-Body Piercings
-Belt
-Belts
-Buckles
-Rope
-Straps
-Keychain
-Cufflink
-Cape
-Cloak
-Pocket Square
-Handkerchief
-Gloves
-Wallet
-Purse
-Backpack
-Briefcase
-Umbrella
-Harness
-Chain
-Medallion
-Patches
-Pins
-Buttons
-Tattoos
-Cigarette
-Pipe
--material- trimmings
-Handlebar Mustache
-Full Beard
-Goatee
-Soul Patch
-Mutton Chops
-Circle Beard
-Horseshoe Mustache
-Stubble Beard
-Imperial Mustache
-Pencil Mustache
-Face Painting
-Day of the Dead Face Paint
--animal- Face Paint
-Tribal Face Paint
-Tribal Face Marks
-Clown Face Paint
-Halloween Face Paint
-Fantasy Face Paint
-Sports Team Face Paint
-Superhero Face Paint
--animal- Tattoo
--object- Tattoo
--vehicle- Tattoo
--building- Tattoo
-Body Tattoos
-Face Tattoos
-Tattoos
-Tribal Tattoos
-Geass
-Shoulder pads
+Beauty Marks?female
+Freckles?both
+Scars?both
+Wrinkles?both
+Pores?both
+Eyeliner?female
+Eyeshadow?female
+Makeup?female
+No makeup?female
+Fantasy Makeup?female
+Lipstick?female
+Lip gloss?female
+-eyecolor- Eyes?both
+Large -eyecolor- Eyes?both
+Glowing -eyecolor- Eyes?both
+Three-Eyed?both
+One-Eyed?both
+Crazy Eyes?both
+Empty Eyes?both
+Dashed Eyes?both
+Heart-Shaped Eyes?both
+Cybernetic Eye?both
+Amphibian Eyes?both
+-animal- Eyes?both
+Sharingan Eyes?both
+Anime Eyes?both
+Hair Tie?both
+Hair Clip?both
+Hair Ribbons?both
+Flower in hair?both
+Barrette?both
+Hat?both
+Trucker hat?both
+Witch Hat?both
+Wizard Hat?both
+-material- helmet?both
+Bandanna?both
+Headband?both
+Crown?both
+Tiara?both
+Horns?both
+Angelic Halo?both
+Flower Crown?both
+Circlet?both
+Large Head?both
+Face Mask?both
+Mask made out of -material-?both
+Samurai Mask?both
+-animal- Ears?female
+OR(Cat;Bunny;Fox) Ears?female
+-animal- Tail?female
+Tail?female
+Fangs?both
+Wings?both
+Cybernetics?both
+Mechanical Body Parts?both
+Mechanical Arms?both
+Mechanical Legs?both
+Robotic Body Parts?both
+Robotic Arms?both
+Robotic Legs?both
+Headphones?both
+Earbuds?both
+Cellphone?both
+Phone Case?both
+Watch?both
+Fitness Tracker?both
+Smartwatch?both
+Fitbit?both
+Glasses?both
+Glasses Chain?both
+Sunglasses?both
+Blindfold?both
+Braces?both
+Gold Tooth?both
+Ruff?both
+Scarf?both
+Fur Scarf?both
+Tartan Scarf?both
+Collar?both
+Choker?both
+Tie?both
+Bowtie?both
+Earrings?both
+Earring?both
+Necklace?both
+Bracelet?both
+Ring?both
+Rings?both
+Lapel Pin?both
+Body Chain?both
+Brooch?both
+Anklet?both
+Nose Ring?both
+Lip Ring?both
+Belly Button Ring?both
+Navel?both
+Body Piercings?both
+Belt?both
+Belts?both
+Buckles?both
+Rope?both
+Straps?both
+Keychain?both
+Cufflink?both
+Cape?both
+Cloak?both
+Pocket Square?both
+Handkerchief?both
+Gloves?both
+Wallet?both
+Purse?both
+Backpack?both
+Briefcase?both
+Umbrella?both
+Harness?both
+Chain?both
+Medallion?both
+Patches?both
+Pins?both
+Buttons?both
+Tattoos?both
+Cigarette?both
+Pipe?both
+OR(-material-;-color-) trimmings?both
+OR(thick;Handlebar;Horseshoe;Pencil;Large;Small) Mustache?male
+mustache??male
+OR(bushy;Full;Stubble;Circle;Light;Large;Small) Beard?male
+beard?male
+Goatee?male
+Soul Patch?male
+Mutton Chops?male
+OR(;Day of the Dead;Tribal;Clown;Halloween;Fantasy;Sports Team;Superhero;-animal-;common) Face OR(Painting;Paint)?both
+OR(-animal-;-objecttotal-;-pattern-;henna;-building-;body;face;tribal) Tattoo?both
+Geass?both
+Shoulder pads?both
+jewelry?both
+wedding ring?both
+amulet?both
+amulet of -conceptsuffix-?both
+aviator sunglasses?both
+ray-ban glasses?both
+monocle?both
+Browline glasses?both
+Goggles?both
+Horn-rimmed glasses?both
+sun hat?both

csvfiles/animaldescriptors.csv

@@ -0,0 +1,128 @@
+Absurd
+Adorable
+Aggressive
+Alien
+Ancient
+Angelic
+Angry
+Anime
+Apocalyptic
+Appealing
+Arcane
+Astonishing
+Asymmetrical
+Average
+Awful
+Basic
+Beautiful
+Bewitching
+Boring
+Breathtaking
+Brilliant
+Celestial
+Charming
+Chibi
+Chic
+Classic
+Creepy
+Cute
+Cyberpunk
+Cyborg
+Dirty
+Disgusting
+Divine
+Drab
+Dreamlike
+Dreamy
+Dull
+Eclectic
+Enchanted
+Enchanting
+Energetic
+Energizing
+Epic
+Ethereal
+Evil
+Exotic
+Expressive
+Extraordinary
+Fairy-Tale
+Fantastical
+Fantasy
+Feminine
+Foul
+Friendly
+Furious
+Furry
+Fluffy
+Futuristic
+Ghastly
+Giant
+Gigantic
+Gloomy
+Glowing
+Gorgeous
+Graceful
+Groovy
+Grotesque
+Gruesome
+Hairy
+Handsome
+Happy
+Harsh
+Hateful
+Heavenly
+Hideous
+Holy
+Horrifying
+Injured
+Kawaii
+Kindhearted
+Lovely
+Loving
+Ludicrous
+Macho
+Magical
+Magnificent
+Majestic
+Masculine
+Mean
+Misshapen
+Monstrous
+Mysterious
+Mystical
+Mystifying
+Mythical
+Nasty
+Natural
+Noble
+Nonchalant
+Old
+Plain
+Playful
+Pretty
+Pure
+Radiant
+Refined
+Regal
+Robotic
+Sad
+Scaly
+Shabby
+Smart
+Spellbinding
+Striking
+Stunning
+Tiny
+Tropical
+Ugly
+Unattractive
+Unconventional
+Unique
+Vampiric
+Vibrant
+Vulgar
+Warlike
+Weird
+Wet
+Young

csvfiles/basicbitchdescriptors.csv

@@ -0,0 +1,16 @@
+alluring
+appealing
+attractive
+beautiful
+charming
+cute
+elegant
+exquisite
+flawless
+glamourous
+good-looking
+gorgeous
+lovely
+magnificent
+pleasant
+pretty

csvfiles/body_types.csv

@@ -1,42 +1,50 @@
-curvy
-voluptuous
-chubby
-buxom
-heavyset
-full-figured
-fat
-plump
-overweight
-burly
-obese
-morbidly obese
-thick
-thicc
-hourglass figure
-stout
-rotund
-hefty
-large
-portly
-midweight
-beefy
-athletic
-fit
-muscular
-buff
-stocky
-well-built
-well-endowed
-thin
-slender
-skinny
-small
-petite
-tiny
-lanky
-slim
-slight
-light-weight
-flyweight
-short
-tall
+curvy;female
+voluptuous;female
+chubby;both
+buxom;female
+heavyset;both
+full-figured;female
+fat;both
+plump;both
+overweight;both
+burly;both
+obese;both
+morbidly obese;both
+thick;female
+thicc;female
+hourglass figure;female
+pear-shaped figure;female
+stout;both
+rotund;both
+hefty;both
+large;both
+portly;both
+midweight;both
+beefy;both
+athletic;both
+fit;both
+muscular;both
+buff;both
+stocky;both
+well-built;both
+well-endowed;male
+thin;both
+slender;both
+skinny;both
+small;both
+petite;female
+tiny;both
+lanky;both
+slim;both
+slight;both
+light-weight;both
+flyweight;both
+short;both
+tall;both
+strong;both
+very tall, long legs;female
+busty;female
+busty petite;female
+ripped;male
+elegant;female
+broad-shouldered;both

csvfiles/brands.csv

@@ -78,4 +78,14 @@ Dwarves
 Orcs
 Trolls
 Gnomes
-Goblins
+Goblins
+Blizzard entertainment
+Riot games
+Mugler
+a -humanoid-
+a -rpgclass-
+Sega
+Konami
+Capcom
+Weyland industries
+meta workshop

csvfiles/buildings.csv

@@ -95,6 +95,7 @@ Tool shed
 Playhouse
 Treehouse
 Doghouse
+Dollhouse
 Birdhouse
 Outhouse
 Cabin

csvfiles/card_names.csv

@@ -10217,7 +10217,7 @@ Eli 1.0;Android netrunner
 Ruhr Valley;Android netrunner
 Ronin;Android netrunner
 Midori;Android netrunner
-NBN: The World is Yours*;Android netrunner
+NBN: The World is Yours;Android netrunner
 Project Beale;Android netrunner
 Midseason Replacements;Android netrunner
 Flare;Android netrunner
@@ -17193,7 +17193,7 @@ Ice Queen;yugioh
 Shutendoji;yugioh
 Clear Vice Dragon;yugioh
 Darklord Desire;yugioh
-Armityle the Chaos Phantasm (Updated from: Armityle the Chaos Phantom);yugioh
+Armityle the Chaos Phantasm;yugioh
 Fusion Recovery;yugioh
 System Down;yugioh
 Grand Convergence;yugioh
@@ -17317,7 +17317,7 @@ Decayed Commander;yugioh
 Zombie Tiger;yugioh
 Giant Orc;yugioh
 Second Goblin;yugioh
-Vampiric Orchis (Updated from: Vampire Orchis);yugioh
+Vampiric Orchis;yugioh
 Des Dendle;yugioh
 Burning Beast;yugioh
 Freezing Beast;yugioh
@@ -17381,7 +17381,7 @@ Royal Magical Library;yugioh
 Armor Exe;yugioh
 Tribe-Infecting Virus;yugioh
 Des Koala;yugioh
-Dark Scorpion - Cliff the Trap Remover (Updated from: Cliff the Trap Remover);yugioh
+Dark Scorpion - Cliff the Trap Remover;yugioh
 Magical Merchant;yugioh
 Koitsu;yugioh
 Cat's Ear Tribe;yugioh
@@ -17396,13 +17396,13 @@ Senri Eye;yugioh
 Emblem of Dragon Destroyer;yugioh
 Jar Robber;yugioh
 My Body as a Shield;yugioh
-Spellbook Organization (Updated from: Pigeonholing Books of Spell);yugioh
+Spellbook Organization;yugioh
 Mega Ton Magical Cannon;yugioh
 Pitch-Black Power Stone;yugioh
 Amazoness Archers;yugioh
 Dramatic Rescue;yugioh
 Exhausting Spell;yugioh
-Hidden Spellbook (Updated from: Hidden Book of Spell);yugioh
+Hidden Spellbook;yugioh
 Miracle Restoring;yugioh
 Remove Brainwashing;yugioh
 Disarmament;yugioh
@@ -17469,7 +17469,7 @@ D.D. Trainer;yugioh
 Ojama Green;yugioh
 Archfiend Soldier;yugioh
 Pandemonium Watchbear;yugioh
-Sasuke Samurai #2;yugioh
+Sasuke Samurai ;yugioh
 Dark Scorpion - Gorg the Strong;yugioh
 Dark Scorpion - Meanae the Thorn;yugioh
 Outstanding Dog Marron;yugioh
@@ -17706,9 +17706,9 @@ Giant Germ;yugioh
 Nimble Momonga;yugioh
 Shining Angel;yugioh
 Mother Grizzly;yugioh
-Flying Kamakiri #1;yugioh
+Flying Kamakiri ;yugioh
 Mystic Tomato;yugioh
-Morphing Jar #2;yugioh
+Morphing Jar ;yugioh
 Goddess of Whim;yugioh
 Kycoo the Ghost Destroyer;yugioh
 Summoner of Illusions;yugioh
@@ -18166,7 +18166,7 @@ Friller Rabca;yugioh
 Vylon Ohm;yugioh
 Shocktopus;yugioh
 Chow Len the Prophet;yugioh
-Vampiric Koala (Updated from: Vampire Koala);yugioh
+Vampiric Koala;yugioh
 Flame Tiger;yugioh
 Tardy Orc;yugioh
 Madolche Baaple;yugioh
@@ -18447,7 +18447,7 @@ Exarion Universe;yugioh
 Flame Manipulator;yugioh
 Masaki the Legendary Swordsman;yugioh
 Rude Kaiser;yugioh
-Rock Ogre Grotto #1;yugioh
+Rock Ogre Grotto ;yugioh
 Baby Dragon;yugioh
 Axe Raider;yugioh
 Tiger Axe;yugioh
@@ -18492,7 +18492,7 @@ Red-Eyes Wyvern;yugioh
 Phoenix Gearfried;yugioh
 Lightray Gearfried;yugioh
 Flame Swordsman;yugioh
-Black Skull Dragon (Updated from: B. Skull Dragon);yugioh
+Black Skull Dragon;yugioh
 Thousand Dragon;yugioh
 Alligator's Sword Dragon;yugioh
 Hinotama;yugioh
@@ -18529,7 +18529,7 @@ Jam Defender;yugioh
 Relieve Monster;yugioh
 Metal Reflect Slime;yugioh
 Serpent Night Dragon;yugioh
-Crawling Dragon #2;yugioh
+Crawling Dragon ;yugioh
 Sabersaurus;yugioh
 Tomozaurus;yugioh
 Little D;yugioh
@@ -18567,7 +18567,7 @@ Fiendish Engine Ω;yugioh
 Dragon Zombie;yugioh
 Armored Zombie;yugioh
 The Snake Hair;yugioh
-Vampire Baby (Updated from: Red-Moon Baby);yugioh
+Vampire Baby;yugioh
 Patrician of Darkness;yugioh
 Dark Dust Spirit;yugioh
 Vampire Lord;yugioh
@@ -18768,7 +18768,7 @@ The Unhappy Maiden;yugioh
 Robbin' Goblin;yugioh
 Ring of Magnetism;yugioh
 Share the Pain;yugioh
-Wattkid (Updated from: Oscillo Hero #2);yugioh
+Wattkid;yugioh
 Soul of the Pure;yugioh
 Dark-Piercing Light;yugioh
 The Statue of Easter Island;yugioh
@@ -18789,7 +18789,7 @@ Dark Ruler Ha Des;yugioh
 Dark Balter the Terrible;yugioh
 Possessed Dark Soul;yugioh
 Winged Minion;yugioh
-Skull Knight #2;yugioh
+Skull Knight ;yugioh
 Twin-Headed Wolf;yugioh
 Opticlops;yugioh
 Fatal Abacus;yugioh
@@ -18812,7 +18812,7 @@ Troop Dragon;yugioh
 The Dragon's Bead;yugioh
 A Wingbeat of Giant Dragon;yugioh
 Dragon's Rage;yugioh
-Luster Dragon #2;yugioh
+Luster Dragon ;yugioh
 Serpentine Princess;yugioh
 Thunder Nyan Nyan;yugioh
 Gradius' Option;yugioh
@@ -20028,3 +20028,457 @@ Keepstone;monster train
 Stackstone;monster train
 Spell Railspike;monster train
 Improved Railspike;monster train
+Beginner Corporation;terraforming mars
+CrediCor;terraforming mars
+Ecoline;terraforming mars
+Helion;terraforming mars
+Interplanetary Cinematics;terraforming mars
+Inventrix;terraforming mars
+Mining Guild;terraforming mars
+PhoboLog;terraforming mars
+Tharsis Republic;terraforming mars
+ThorGate;terraforming mars
+United Nations Mars Initiative;terraforming mars
+Saturn Systems;terraforming mars
+Teractor;terraforming mars
+Aphrodite;terraforming mars
+Celestic;terraforming mars
+Manutech;terraforming mars
+Morning Star Inc.;terraforming mars
+Viron;terraforming mars
+Cheung Shing Mars;terraforming mars
+Point Luna;terraforming mars
+Robinson Industries;terraforming mars
+Valley Trust;terraforming mars
+Vitor;terraforming mars
+Aridor;terraforming mars
+Arklight;terraforming mars
+Polyphemos;terraforming mars
+Poseidon;terraforming mars
+Stormcraft Incorporated;terraforming mars
+Lakefront Resorts;terraforming mars
+Pristar;terraforming mars
+Septem Tribus;terraforming mars
+TerraLabs Research;terraforming mars
+Utopia Invest;terraforming mars
+Arcadian Communities;terraforming mars
+Recyclon;terraforming mars
+Splice Tactical Genomics;terraforming mars
+Factorum;terraforming mars
+Mons Insurance;terraforming mars
+Philares;terraforming mars
+AstroDrill;terraforming mars
+Pharmacy Union;terraforming mars
+Allied Bank;terraforming mars
+Aquifer Turbines;terraforming mars
+Biofuels;terraforming mars
+Biolab;terraforming mars
+Biosphere Support;terraforming mars
+Business Empire;terraforming mars
+Dome Farming;terraforming mars
+Donation;terraforming mars
+Early Settlement;terraforming mars
+Ecology Experts;terraforming mars
+Excentric Sponsor;terraforming mars
+Experimental Forest;terraforming mars
+Galilean Mining;terraforming mars
+Great Aquifer;terraforming mars
+Huge Asteroid;terraforming mars
+Io Research Outpost;terraforming mars
+Loan;terraforming mars
+Martian Industries;terraforming mars
+Metal-Rich Asteroid;terraforming mars
+Metals Company;terraforming mars
+Mining Operations;terraforming mars
+Mohole;terraforming mars
+Mohole Excavation;terraforming mars
+Nitrogen Shipment;terraforming mars
+Orbital Construction Yard;terraforming mars
+Polar Industries;terraforming mars
+Power Generation;terraforming mars
+Research Network;terraforming mars
+Self-Sufficient Settlement;terraforming mars
+Smelting Plant;terraforming mars
+Society Support;terraforming mars
+Supplier;terraforming mars
+Supply Drop;terraforming mars
+UNMI Contractor;terraforming mars
+Acquired Space Agency;terraforming mars
+Colonizer Training Camp;terraforming mars
+Deep Well Heating;terraforming mars
+Cloud Seeding;terraforming mars
+Search For Life;terraforming mars
+Martian Rails;terraforming mars
+Capital;terraforming mars
+Asteroid;terraforming mars
+Comet;terraforming mars
+Big Asteroid;terraforming mars
+Water Import From Europa;terraforming mars
+Equatorial Magnetizer;terraforming mars
+Domed Crater;terraforming mars
+Noctis City;terraforming mars
+Methane From Titan;terraforming mars
+Imported Hydrogen;terraforming mars
+Research Outpost;terraforming mars
+Phobos Space Haven;terraforming mars
+Black Polar Dust;terraforming mars
+Arctic Algae;terraforming mars
+Predators;terraforming mars
+Eos Chasma National Park;terraforming mars
+Cupola City;terraforming mars
+Lunar Beam;terraforming mars
+Optimal Aerobraking;terraforming mars
+Underground City;terraforming mars
+Regolith Eaters;terraforming mars
+GHG Producing Bacteria;terraforming mars
+Ants;terraforming mars
+Release Of Inert Gases;terraforming mars
+Nitrogen-Rich Asteroid;terraforming mars
+Rover Construction;terraforming mars
+Deimos Down;terraforming mars
+Asteroid Mining;terraforming mars
+Food Factory;terraforming mars
+Archaebacteria;terraforming mars
+Carbonate Processing;terraforming mars
+Natural Preserve;terraforming mars
+Nuclear Power;terraforming mars
+Algae;terraforming mars
+Adapted Lichen;terraforming mars
+Fish;terraforming mars
+Lake Marineris;terraforming mars
+Small Animals;terraforming mars
+Kelp Farming;terraforming mars
+Beam From A Thorium Asteroid;terraforming mars
+Mangrove;terraforming mars
+Trees;terraforming mars
+Mining Expedition;terraforming mars
+Mining Rights;terraforming mars
+Birds;terraforming mars
+Towing A Comet;terraforming mars
+Space Mirrors;terraforming mars
+Solar Wind Power;terraforming mars
+Ice Asteroid;terraforming mars
+Giant Ice Asteroid;terraforming mars
+Ganymede Colony;terraforming mars
+Giant Space Mirror;terraforming mars
+Grass;terraforming mars
+Heather;terraforming mars
+Peroxide Power;terraforming mars
+Bushes;terraforming mars
+Greenhouses;terraforming mars
+Nuclear Zone;terraforming mars
+Fueled Generators;terraforming mars
+Ironworks;terraforming mars
+Power Grid;terraforming mars
+Steelworks;terraforming mars
+Ore Processor;terraforming mars
+Open City;terraforming mars
+Solar Power;terraforming mars
+Breathing Filters;terraforming mars
+Artificial Photosynthesis;terraforming mars
+Artificial Lake;terraforming mars
+Geothermal Power;terraforming mars
+Farming;terraforming mars
+Dust Seals;terraforming mars
+Urbanized Area;terraforming mars
+Moss;terraforming mars
+GHG Factories;terraforming mars
+Subterranean Reservoir;terraforming mars
+Ecological Zone;terraforming mars
+Zeppelins;terraforming mars
+Worms;terraforming mars
+Decomposers;terraforming mars
+Fusion Power;terraforming mars
+Symbiotic Fungus;terraforming mars
+Extreme-Cold Fungus;terraforming mars
+Advanced Ecosystems;terraforming mars
+Great Dam;terraforming mars
+Strip Mine;terraforming mars
+Wave Power;terraforming mars
+Lava Flows;terraforming mars
+Power Plant;terraforming mars
+Mohole Area;terraforming mars
+Large Convoy;terraforming mars
+Tectonic Stress Power;terraforming mars
+Nitrophilic Moss;terraforming mars
+Herbivores;terraforming mars
+Insects;terraforming mars
+Insulation;terraforming mars
+Adaptation Technology;terraforming mars
+Designed Microorganisms;terraforming mars
+Nitrite Reducing Bacteria;terraforming mars
+Industrial Microbes;terraforming mars
+Lichen;terraforming mars
+Convoy From Europa;terraforming mars
+Imported GHG;terraforming mars
+Imported Nitrogen;terraforming mars
+Micro-Mills;terraforming mars
+Magnetic Field Generators;terraforming mars
+Shuttles;terraforming mars
+Import Of Advanced GHG;terraforming mars
+Windmills;terraforming mars
+Tundra Farming;terraforming mars
+Aerobraked Ammonia Asteroid;terraforming mars
+Magnetic Field Dome;terraforming mars
+Pets;terraforming mars
+Protected Valley;terraforming mars
+Noctis Farming;terraforming mars
+Water Splitting Plant;terraforming mars
+Heat Trappers;terraforming mars
+Soil Factory;terraforming mars
+Ice Cap Melting;terraforming mars
+Biomass Combustors;terraforming mars
+Livestock;terraforming mars
+Aquifer Pumping;terraforming mars
+Flooding;terraforming mars
+Energy Saving;terraforming mars
+Local Heat Trapping;terraforming mars
+Permafrost Extraction;terraforming mars
+Plantation;terraforming mars
+Immigration Shuttles;terraforming mars
+Immigrant City;terraforming mars
+Underground Detonations;terraforming mars
+Soletta;terraforming mars
+Rad-Chem Factory;terraforming mars
+Special Design;terraforming mars
+Asteroid Mining Consortium;terraforming mars
+Inventors' Guild;terraforming mars
+Space Elevator;terraforming mars
+Development Center;terraforming mars
+Space Station;terraforming mars
+Interstellar Colony Ship;terraforming mars
+Security Fleet;terraforming mars
+Lightning Harvest;terraforming mars
+Tardigrades;terraforming mars
+Virus;terraforming mars
+Miranda Resort;terraforming mars
+Mine;terraforming mars
+Vesta Shipyard;terraforming mars
+Great Escarpment Consortium;terraforming mars
+Mineral Deposit;terraforming mars
+Mining Area;terraforming mars
+Building Industries;terraforming mars
+Land Claim;terraforming mars
+Sponsors;terraforming mars
+Electro Catapult;terraforming mars
+Earth Catapult;terraforming mars
+Advanced Alloys;terraforming mars
+Mars University;terraforming mars
+Viral Enhancers;terraforming mars
+Quantum Extractor;terraforming mars
+Callisto Penal Mines;terraforming mars
+Trans-Neptune Probe;terraforming mars
+Commercial District;terraforming mars
+Robotic Workforce;terraforming mars
+Research;terraforming mars
+Gene Repair;terraforming mars
+Io Mining Industries;terraforming mars
+Mass Converter;terraforming mars
+Physics Complex;terraforming mars
+Tropical Resort;terraforming mars
+Toll Station;terraforming mars
+Earth Office;terraforming mars
+Acquired Company;terraforming mars
+Media Archives;terraforming mars
+Media Group;terraforming mars
+Business Network;terraforming mars
+Business Contacts;terraforming mars
+Bribed Committee;terraforming mars
+Sabotage;terraforming mars
+Industrial Center;terraforming mars
+Hired Raiders;terraforming mars
+Hackers;terraforming mars
+Cartel;terraforming mars
+Titanium Mine;terraforming mars
+CEO's Favorite Project;terraforming mars
+Anti-Gravity Technology;terraforming mars
+Investment Loan;terraforming mars
+Caretaker Contract;terraforming mars
+Standard Technology;terraforming mars
+Power Supply Consortium;terraforming mars
+Protected Habitats;terraforming mars
+Satellites;terraforming mars
+Fuel Factory;terraforming mars
+Corporate Stronghold;terraforming mars
+Olympus Conference;terraforming mars
+Rad-Suits;terraforming mars
+Invention Contest;terraforming mars
+Power Infrastructure;terraforming mars
+Indentured Workers;terraforming mars
+Lagrange Observatory;terraforming mars
+Terraforming Ganymede;terraforming mars
+Restricted Area;terraforming mars
+Energy Tapping;terraforming mars
+Technology Demonstration;terraforming mars
+Medical Lab;terraforming mars
+AI Central;terraforming mars
+Small Asteroid;terraforming mars
+Self-Replicating Robots;terraforming mars
+Snow Algae;terraforming mars
+Penguins;terraforming mars
+Aerial Mappers;terraforming mars
+Aerosport Tournament;terraforming mars
+Air-Scrapping Expedition;terraforming mars
+Atalanta Planitia Lab;terraforming mars
+Atmoscoop;terraforming mars
+Comet For Venus;terraforming mars
+Corroder Suits;terraforming mars
+Dawn City;terraforming mars
+Deuterium Export;terraforming mars
+Dirigibles;terraforming mars
+Extractor Balloons;terraforming mars
+Extremophiles;terraforming mars
+Floating Habs;terraforming mars
+Forced Precipitation;terraforming mars
+Freyja Biodomes;terraforming mars
+GHG Import From Venus;terraforming mars
+Giant Solar Shade;terraforming mars
+Gyropolis;terraforming mars
+Hydrogen To Venus;terraforming mars
+Io Sulphur Research;terraforming mars
+Ishtar Mining;terraforming mars
+Jet Stream Microscrappers;terraforming mars
+Local Shading;terraforming mars
+Luna Metropolis;terraforming mars
+Luxury Foods;terraforming mars
+Maxwell Base;terraforming mars
+Mining Quota;terraforming mars
+Neutralizer Factory;terraforming mars
+Omnicourt;terraforming mars
+Orbital Reflectors;terraforming mars
+Rotator Impacts;terraforming mars
+Sister Planet Support;terraforming mars
+Solarnet;terraforming mars
+Spin-Inducing Asteroid;terraforming mars
+Sponsored Academies;terraforming mars
+Stratopolis;terraforming mars
+Stratospheric Birds;terraforming mars
+Sulphur Exports;terraforming mars
+Sulphur-Eating Bacteria;terraforming mars
+Terraforming Contract;terraforming mars
+Thermophiles;terraforming mars
+Water To Venus;terraforming mars
+Venus Governor;terraforming mars
+Venus Magnetizer;terraforming mars
+Venus Soils;terraforming mars
+Venus Waystation;terraforming mars
+Venusian Animals;terraforming mars
+Venusian Insects;terraforming mars
+Venusian Plants;terraforming mars
+House Printing;terraforming mars
+Lava Tube Settlement;terraforming mars
+Martian Survey;terraforming mars
+Psychrophiles;terraforming mars
+Research Coordination;terraforming mars
+SF Memorial;terraforming mars
+Space Hotels;terraforming mars
+Airliners;terraforming mars
+Air Raid;terraforming mars
+Atmo Collectors;terraforming mars
+Community Services;terraforming mars
+Conscription;terraforming mars
+Corona Extractor;terraforming mars
+Cryo-Sleep;terraforming mars
+Earth Elevator;terraforming mars
+Ecology Research;terraforming mars
+Floater Leasing;terraforming mars
+Floater Prototypes;terraforming mars
+Floater Technology;terraforming mars
+Galilean Waystation;terraforming mars
+Heavy Taxation;terraforming mars
+Ice Moon Colony;terraforming mars
+Impactor Swarm;terraforming mars
+Interplanetary Colony Ship;terraforming mars
+Jovian Lanterns;terraforming mars
+Jupiter Floating Station;terraforming mars
+Luna Governor;terraforming mars
+Lunar Exports;terraforming mars
+Lunar Mining;terraforming mars
+Market Manipulation;terraforming mars
+Martian Zoo;terraforming mars
+Mining Colony;terraforming mars
+Minority Refuge;terraforming mars
+Molecular Printing;terraforming mars
+Nitrogen From Titan;terraforming mars
+Pioneer Settlement;terraforming mars
+Productive Outpost;terraforming mars
+Quantum Communications;terraforming mars
+Red Spot Observatory;terraforming mars
+Refugee Camps;terraforming mars
+Research Colony;terraforming mars
+Rim Freighters;terraforming mars
+Sky Docks;terraforming mars
+Solar Probe;terraforming mars
+Solar Reflectors;terraforming mars
+Space Port;terraforming mars
+Space Port Colony;terraforming mars
+Spin-Off Department;terraforming mars
+Sub-Zero Salt Fish;terraforming mars
+Titan Air-Scrapping;terraforming mars
+Titan Floating Launch-Pad;terraforming mars
+Titan Shuttles;terraforming mars
+Trade Envoys;terraforming mars
+Trading Colony;terraforming mars
+Urban Decomposers;terraforming mars
+Warp Drive;terraforming mars
+Aerial Lenses;terraforming mars
+Banned Delegate;terraforming mars
+Cultural Metropolis;terraforming mars
+Diaspora Movement;terraforming mars
+Event Analysts;terraforming mars
+GMO Contract;terraforming mars
+Martian Media Center;terraforming mars
+Parliament Hall;terraforming mars
+PR Office;terraforming mars
+Public Celebrations;terraforming mars
+Recruitment;terraforming mars
+Red Tourism Wave;terraforming mars
+Sponsored Mohole;terraforming mars
+Supported Research;terraforming mars
+Wildlife Dome;terraforming mars
+Vote Of No Confidence;terraforming mars
+Dusk Laser Mining;terraforming mars
+Project Inspection;terraforming mars
+Energy Market;terraforming mars
+Hi-Tech Lab;terraforming mars
+Interplanetary Trade;terraforming mars
+Law Suit;terraforming mars
+Mercurian Alloys;terraforming mars
+Orbital Cleanup;terraforming mars
+Political Alliance;terraforming mars
+Rego Plastics;terraforming mars
+Saturn Surfing;terraforming mars
+Stanford Torus;terraforming mars
+Advertising;terraforming mars
+Asteroid Deflection System;terraforming mars
+Asteroid Hollowing;terraforming mars
+Comet Aiming;terraforming mars
+Crash Site Cleanup;terraforming mars
+Cutting Edge Technology;terraforming mars
+Directed Impactors;terraforming mars
+Diversity Support;terraforming mars
+Field-Capped City;terraforming mars
+Imported Nutrients;terraforming mars
+Jovian Embassy;terraforming mars
+Magnetic Shield;terraforming mars
+Meat Industry;terraforming mars
+Meltworks;terraforming mars
+Mohole Lake;terraforming mars
+Potatoes;terraforming mars
+Sub-Crust Measurements;terraforming mars
+Topsoil Contract;terraforming mars
+Deimos Down;terraforming mars
+Great Dam;terraforming mars
+Magnetic Field Generators;terraforming mars
+Asteroid Rights;terraforming mars
+Bio Printing Facility;terraforming mars
+Bactoviral Research;terraforming mars
+Harvest;terraforming mars
+Outdoor Sports;terraforming mars
+New Partner;terraforming mars
+Merger;terraforming mars
+Corporate Archives;terraforming mars
+Double Down;terraforming mars
+Head Start;terraforming mars
+16 Psyche;terraforming mars
+Robot Pollinators;terraforming mars

csvfiles/colors.csv

@@ -11,6 +11,7 @@ Black
 White
 Turquoise
 Magenta
+Lazuli
 Lavender
 Indigo
 Azure

csvfiles/concept_prefix.csv

@@ -128,4 +128,6 @@ Element
 Magic
 Underworld
 Bird
--musicgenre--wizards
+-musicgenre--wizards
+Age
+Dream

csvfiles/concept_suffix.csv

@@ -108,4 +108,5 @@ Charm
 Structure
 Embellishment
 Prey
-Manic
+Manic
+-brand-

csvfiles/config/default_config.csv

@@ -16,6 +16,7 @@ subject_animal;on
 # humanoids;
 subject_manwoman;on
 subject_manwomanrelation;on
+subject_manwomanmultiple;on
 subject_fictional;on
 subject_nonfictional;on
 subject_humanoid;on
@@ -63,6 +64,9 @@ humanadditionchance;rare
 overalladditionchance;extraordinary
 # humanoid other stuff;
 emojichance;legendary
+buildfacechance;legendary
+humanexpressionchance;rare
+humanvomitchance;rare
 joboractivitychance;normal
 # things in the middle of the prompt;
 custominputmidrepeats;2

csvfiles/containers.csv

@@ -25,4 +25,5 @@ Paperweight
 Glass canister
 Machine
 Glass case
-Display case
+Display case
+Museum glass

csvfiles/coverings.csv

@@ -0,0 +1,45 @@
+Runes
+Snow
+Foam
+Water
+Colors
+Mud
+Dirt
+Spikes
+Jewels
+Flowers
+Flora
+Fire
+Frost
+Ash
+Sand
+Leaves
+Fur
+Insects
+Rust
+Ice
+Soot
+Paint
+Vines
+Cobwebs
+Tar
+Glitter
+Graffiti
+Fabric
+Moss
+Fog
+Powder
+Stickers
+Posters
+Vinyl
+Decals
+Stencils
+Ink
+Stains
+Graffiti
+Feathers
+Oil
+Dust
+Rubble
+Seashells
+Flames

csvfiles/cultures.csv

@@ -219,4 +219,17 @@ Elvish
 Dwarven
 Peasant
 hip-hop
-Urban
+Urban
+Parisien
+Cosplayer
+Gamer
+Steerage
+Preppy
+Rasta
+Punks
+Metalhead
+Skater
+Hipster
+Northern
+Southern
+Arcadian

csvfiles/descriptors.csv

@@ -103,6 +103,7 @@ Cold
 Collectable
 Colorful
 Colossal
+Comely
 Comfortable
 Compelling
 Complementary
@@ -278,6 +279,7 @@ Handsome
 Happy
 Harsh
 Hateful
+Haunted
 Heartless
 Heartwarming
 Heavenly
@@ -287,24 +289,21 @@ Historical
 Holistic
 Holy
 Homey
+Homely
 Honest
 Honorable
 Hopeless
 Horrid
 Horrifying
-Hospitable
 Hostile
 Human
 Hyper-Creative
 Hyperdetailed
 Hypnotic
 Icy
-Ignorant
 Illuminated
 Illuminating
 Imaginative
-Impassioned
-Impeccable
 Impressionist
 Impressive
 Inconsiderate
@@ -428,9 +427,11 @@ Petrified
 Phenomenal
 Pictorial
 Pitiful
+Plain
 Playful
 Plush
 Pop
+Polygional
 Potent
 Preposterous
 Pressured
@@ -476,6 +477,7 @@ Sad
 Sakura
 Satin
 Saturated
+Sci-fi
 Scrumptious
 Sculptural
 Secret

csvfiles/eyecolors.csv

@@ -0,0 +1,23 @@
+Brown
+Blue
+Green
+Hazel
+Amber
+Gray
+Violet
+Turquoise
+Silver
+Gold
+Copper
+Topaz
+Emerald Green
+Sapphire
+Ruby
+Aquamarine
+Honey
+Chestnut
+Ice Blue
+Moss Green
+Lavender colored
+-color-
+-colorscheme-

csvfiles/faceparts.csv

@@ -0,0 +1,6 @@
+lips
+mouth
+eyes
+eyebrows
+nose
+chin

csvfiles/fictional characters.csv

@@ -481,10 +481,10 @@ Guile from Street Fighter;male
 Blanka from Street Fighter;male
 Dhalsim from Street Fighter;male
 Zangief from Street Fighter;male
-B2 from Nier;genderless
+2B from Nier;female
 A2 from Nier;female
-S9 from Nier;female
-Kainé from Nier;female
+9S from Nier;male
+Kainé from Nier;genderless
 Emil from Nier;male
 Anthropomorphic -animal-;genderless
 Barbie;female

csvfiles/hairdescriptors.csv

@@ -0,0 +1,139 @@
+1600'S
+1700'S
+1800'S
+1900'S
+1920'S
+1940'S
+1950'S
+1960'S
+1970'S
+1980'S
+1990'S
+2000'S
+Abstract
+Absurd
+Adorable
+Aesthetic
+Aesthetically Pleasing
+Alluring
+Ancient
+Angelic
+Angular
+Anime
+Apocalyptic
+Appealing
+Arcane
+Artistic
+Astonishing
+Asymmetrical
+Attractive
+Authentic
+Avant-Garde
+Average
+Award-Winning
+Awe-Inspiring
+Awful
+Baroque
+Basic
+Beautiful
+Bewitching
+Bioluminescent
+Bizarre
+Boring
+Breathtaking
+Bright
+Captivating
+Celestial
+Charming
+Chic
+Classic
+Colorful
+Comely
+Contemporary
+Cool
+Creative
+Curly
+Cute
+Daring
+Delicate
+Dirty
+Divine
+Drab
+Dreamlike
+Dreamy
+Dull
+Dynamic
+Eclectic
+Elegant
+Enchanting
+Enticing
+Ethereal
+Evocative
+Exceptional
+Exotic
+Exquisite
+Extraordinary
+Fairy-Tale
+Fantastical
+Fashionable
+Fluffy
+Flowing
+Funky
+Geeky
+Glam
+Glamorous
+Glittering
+Glowing
+Good
+Gorgeous
+Graceful
+Grand
+Great
+Groovy
+Handsome
+Hideous
+Holy
+Hyperdetailed
+Illuminating
+Imaginative
+Impressive
+Incredibly Detailed
+Inspirational
+Intricate
+Kawaii
+Large
+Layered
+Light
+Lovely
+Luminescent
+Luminous
+Magical
+Magnificent
+Majestic
+Messy
+Mysterious
+Mystical
+Mythical
+Nerdy
+Noble
+Otherworldly
+Pretty
+Radiant
+Really long
+Refined
+Retrofuturistic
+Ruined
+Shiny
+Silky
+Simple
+Stunning
+Surreal
+Trendy
+Tropical
+Ugly
+Unattractive
+Unconventional
+Voluminous
+Vibrant
+Vintage
+Wavy

csvfiles/hairvomit.csv

@@ -0,0 +1,9 @@
+Messy hair
+Wavy hair
+Magical glowing OR(;-haircolor-;-color-;uncommon) hair
+OR(-haircolor-;-color-;rare) highlights
+Voluminous hair
+Grey streaks
+curly hair
+flower in hair
+hairpin

csvfiles/human_activities.csv

@@ -160,4 +160,5 @@ Triathlon
 -animal-back riding
 having a tea party
 Lounging
-Bathing in a -waterlocation-
+Bathing in a -waterlocation-
+drinking coffee in a cafe

csvfiles/humandescriptors.csv

@@ -0,0 +1,193 @@
+lowborn
+highborn
+lower class
+higher class
+1600'S
+1700'S
+1800'S
+1900'S
+1920'S
+1940'S
+1950'S
+1950S Suburbia
+1960'S
+1970'S
+1980'S
+1990'S
+2000'S
+Absurd
+Adorable
+Aggressive
+Alien
+Alluring
+Ancient
+Angelic
+Angry
+Anime
+Apocalyptic
+Appealing
+Arcane
+Artistic
+Astonishing
+Asymmetrical
+Attractive
+Authentic
+Average
+Award-Winning
+Awe-Inspiring
+Awful
+Basic
+Beautiful
+Bewitching
+Boring
+Breathtaking
+Brilliant
+Broken
+Captivating
+Celestial
+Charismatic
+Charming
+Chibi
+Chic
+Classic
+Comely
+Complex
+Cool
+Creepy
+Cute
+Cyberpunk
+Cyborg
+Delightful
+Dirty
+Disgusting
+Divine
+Drab
+Dreamlike
+Dreamy
+Dull
+Eclectic
+Elderly
+Elegant
+Emotional
+Emotionally Charged
+Enchanted
+Enchanting
+Energetic
+Energizing
+Epic
+Ethereal
+Evil
+Exhausted
+Exotic
+Expressive
+Extraordinary
+Fairy-Tale
+Fantastical
+Fantasy
+Fashionable
+Fatigued
+Feminine
+Flirty
+Foul
+Friendly
+Funny
+Funky
+Furious
+Futuristic
+Geeky
+Ghastly
+Ghostly
+Giant
+Gigantic
+Glamorous
+Gloomy
+Glowing
+Good
+Gorgeous
+Graceful
+Greedy
+Groovy
+Grotesque
+Grouchy
+Gruesome
+Grumpy
+Hairy
+Handsome
+Happy
+Harsh
+Hateful
+Heavenly
+Hideous
+Historical
+Holy
+Homely
+Honorable
+Horrifying
+Injured
+Intellectual
+Irresistible
+Kawaii
+Kindhearted
+Lovely
+Loving
+Ludicrous
+Macho
+Magical
+Magnificent
+Majestic
+Masculine
+Mature
+Mean
+Middle Aged
+Miserable
+Misshapen
+Monstrous
+Mysterious
+Mystical
+Mystifying
+Mythical
+Nasty
+Natural
+Nerdy
+Noble
+Nonchalant
+Old
+Passionate
+Plain
+Playful
+Pretty
+Psychotic
+Pure
+Radiant
+Refined
+Regal
+Rich
+Robotic
+Sad
+Seductive
+Sensual
+Serious
+Sexy
+Shabby
+Smart
+Smiling
+Spellbinding
+Stressed
+Striking
+Stunning
+Tiny
+Tired
+Trendy
+Tropical
+Ugly
+Unattractive
+Unconventional
+Unique
+Vampiric
+Vibrant
+Vulgar
+Warlike
+Weary
+Weird
+Wet
+Young

csvfiles/humanexpressions.csv

@@ -0,0 +1,28 @@
+OR(;-heshe- is feeling;uncommon) OR(;very;normal) angry
+OR(;-heshe- is feeling;uncommon) furious
+OR(;-heshe- is feeling;uncommon) OR(;very;normal) confused
+OR(;-heshe- is feeling;uncommon) OR(;very;normal) akward
+OR(;-heshe- is;uncommon) crying OR(;,tears on -hisher- face;uncommon)
+OR(;-heshe- mood is;uncommon) OR(;very;normal) dark
+OR(;-heshe- is looking;uncommon) OR(;very;normal) evil
+OR(;-heshe- is feeling;uncommon) OR(;very;normal) fearful
+OR(;-heshe- is feeling;uncommon) OR(;very;normal) disappointed
+OR(;-heshe- is feeling;uncommon) OR(;very;normal) happy
+OR(;-heshe- mood is;uncommon) OR(;very;normal) light
+OR(;-heshe- is feeling;uncommon) OR(;very;normal) lonely
+OR(;-heshe- is feeling;uncommon) OR(;very;normal) lustful
+OR(;-heshe- is feeling;uncommon) OR(;very;normal) sad
+OR(;-heshe- is;uncommon) screaming
+OR(;-heshe- is;uncommon) smiling
+OR(;-heshe- is;uncommon) smirking
+OR(;-heshe- is;uncommon) chuckling
+OR(;-heshe- is;uncommon) yawning
+OR(;-heshe- is;uncommon) bewildered
+OR(;-heshe- is;uncommon) winking
+OR(;-heshe- is feeling;uncommon) OR(;very;normal) smug
+OR(;-heshe- is;uncommon) laughing hysterically
+OR(;-heshe- has a;uncommon) OR(;very;normal) OR(smug;light;radiant;wicked;grinning) smile
+OR(;-heshe- is;uncommon) biting -himher- lip
+OR(;-heshe- is looking;uncommon) OR(;very;normal) OR(neutral;hollow)
+OR(;-heshe- is feeling;uncommon) OR(;very;normal) shy OR(;, looking away;uncommon)
+OR(;-heshe- is ;uncommon) looking away

csvfiles/humanoids.csv

@@ -123,4 +123,6 @@ Elemental
 Dragonkin
 Valkyrie
 Frost giant
-Mannequin
+Mannequin
+doll
+Garden gnome

csvfiles/humanvomit.csv

@@ -0,0 +1,19 @@
+detailed face
+intricate detailed face
+highly detailed face
+detailed skin
+-basicbitchdescriptor- -eyecolor- eyes
+-eyecolor- detailed eyes
+realistic -basicbitchdescriptor- face
+most -basicbitchdescriptor- in the world
+realistic and detailed
+sharp
+sharp and in focus
+natural skin texture
+natural skin tones
+pale skin
+matte skin
+perfect skin
+skin pores
+freckles
+photo-realistic face

csvfiles/imagetypes.csv

@@ -1,5 +1,6 @@
 RAW photo
 Photograph
+Cosplay Photograph
 Color splash
 Digital artwork
 Digital art

csvfiles/jobs.csv

@@ -1,372 +1,383 @@
-Pirate
-Explorer
-Scientist
-Detective
-Athlete
-Musician
-Chef
-Politician
-Entrepreneur
-Artist
-Sailor
-Soldier
-Astronaut
-Author
-Actor
-Dancer
-Singer
-Architect
-Engineer
-Doctor
-Lawyer
-Teacher
-Professor
-Historian
-Philosopher
-Mathematician
-Programmer
-Designer
-Journalist
-Photographer
-Filmmaker
-Activist
-Environmentalist
-Humanitarian
-Psychologist
-Anthropologist
-Sociologist
-Economist
-Businessperson
-CEO
-Marketer
-Salesperson
-Financial analyst
-Economist
-Geologist
-Biologist
-Chemist
-Physicist
-Veterinarian
-Zoologist
-Botanist
-Ecologist
-Ornithologist
-Entomologist
-Archeologist
-Paleontologist
-Cartographer
-Surveyor
-Explorer
-Mountaineer
-Rock climber
-Surfer
-Scuba diver
-Skydiver
-Base jumper
-Race car driver
-Pilot
-Train conductor
-Ship captain
-Air traffic controller
-Firefighter
-Paramedic
-Emergency medical technician
-Police officer
-Private investigator
-Lawyer
-Judge
-Legal assistant
-Paralegal
-Librarian
-Museum curator
-Gallery owner
-Music producer
-Sound engineer
-Record label executive
-DJ
-Music journalist
-Music critic
-Music teacher
-Dance teacher
-Theater director
-Playwright
-Set designer
-Costume designer
-Makeup artist
-Fashion designer
-Interior designer
-Landscape architect
-Personal trainer
-Yoga instructor
-Blacksmith
-Baker
-Brewer
-Butcher
-Carpenter
-Cook
-Cooper
-Dockworker
-Farmer
-Fisherman
-Glassblower
-Hunter
-Innkeeper
-Jeweler
-Leatherworker
-Lumberjack
-Mason
-Miller
-Miner
-Potter
-Sailor
-Shepherd
-Shoemaker
-Silk weaver
-Soldier
-Spice merchant
-Spinner
-Tailor
-Tanner
-Trader
-Vintner
-Weaver
-Woodcarver
-Alchemist
-Apothecary
-Architect
-Artist
-Astronomer
-Barber
-Bookbinder
-Calligrapher
-Cartographer
-Clerk
-Clockmaker
-Diplomat
-Doctor
-Engineer
-Explorer
-Farrier
-Geographer
-Goldsmith
-Historian
-Illustrator
-Judge
-Librarian
-Mathematician
-Mercenary
-Musician
-Notary
-Painter
-Philosopher
-Physician
-Pilgrim
-Pirate
-Printer
-Professor
-Rabbi
-Sailor
-Sculptor
-Scribe
-Shipbuilder
-Spy
-Surgeon
-Tax collector
-Teacher
-Theologian
-Town crier
-Translator
-Traveler
-Troubadour
-Watchmaker
-Weaponsmith
-Writer
-Bard
-Chancellor
-Chronicler
-Court jester
-Executioner
-Falconer
-Footman
-Gardener
-Groom
-Harpist
-Herald
-Jester
-Lady-in-waiting
-Page
-Stablehand
-Sword bearer
-Valet
-Knight
-Mage
-Rogue
-Samurai
-Barbarian
-Assassin
-Sorcerer
-Paladin
-Druid
-Gladiator
-Pirate
-Ranger
-Bard
-Warlock
-Monk
-Necromancer
-Witch
-Alchemist
-Summoner
-Demon hunter
-Archmage
-Crusader
-Elemental mage
-Shadow assassin
-Dark knight
-Dragon slayer
-Illusionist
-Beastmaster
-Time traveler
-Vampire hunter
-Blacksmith
-Falconer
-Astronomer
-Herbalist
-Inquisitor
-Oracle
-Scribe
-Siege engineer
-Swashbuckler
-Templar
-Thunderer
-Warden
-Arcanist
-Bladesinger
-Celestial
-Dragon rider
-Enchanter
-Healer
-Jester
-Lancer
-Marshal
-Mystic
-Necrophage
-Phantom
-Rune mage
-Sentinel
-Shadowmage
-Soul reaver
-Spellblade
-Star mage
-Technomancer
-Theurge
-Titan
-Trickster
-Valkyrie
-Warlord
-Weaver
-Windcaller
-Witch hunter
-Abjurer
-Arcane trickster
-Beast tamer
-Blood mage
-Bounty hunter
-Chaos mage
-Chronomancer
-Cryptographer
-Death knight
-Dragon knight
-Dreamweaver
-Elementalist
-Enforcer
-Executioner
-Explorer
-Fire mage
-Frost mage
-Geomancer
-Ghost hunter
-Grave robber
-Guardian
-Gunner
-Harbinger
-Ice queen/king
-Investigator
-Judge
-Knight errant
-Librarian
-Loremaster
-Mage slayer
-Mind reader
-Bishop
-Cardinal
-Chaplain
-Deacon
-Elder
-Friar
-Imām
-Monk
-Nuncio
-Pastor
-Priest
-Rabbi
-Reverend
-Sister
-Vicar
-Abbot
-Canon
-Chancellor
-Confessor
-Curate
-Exorcist
-Inquisitor
-Lector
-Missionary
-Papal legate
-Private
-Private First Class
-Lance Corporal
-Corporal
-Sergeant
-Staff Sergeant
-Gunnery Sergeant
-Master Sergeant
-First Sergeant
-Sergeant Major
-Command Sergeant Major
-Sergeant Major of the Army
-Second Lieutenant
-First Lieutenant
-Captain
-Major
-Lieutenant Colonel
-Colonel
-Brigadier General
-General
-King
-Queen
-Lord
-Lady
-Duke
-Duchess
-Count
-Countess
-Baron
-Baroness
-Nobleman
-Vizier
-Sultan
-Geisha
-Yogi
-Adventurer
-Royalty
-Cowboy
-Cowgirl
-Pop Singer
-President
-Construction worker
-Idol
-Nerd
-Geek
-Muse
-Ballerina
+Pirate;both
+Explorer;both
+Scientist;both
+Detective;both
+Athlete;both
+Musician;both
+Chef;both
+Politician;both
+Entrepreneur;both
+Artist;both
+Sailor;both
+Soldier;both
+Astronaut;both
+Author;both
+Actor;both
+Dancer;both
+Singer;both
+Architect;both
+Engineer;both
+Doctor;both
+Lawyer;both
+Teacher;both
+Professor;both
+Historian;both
+Philosopher;both
+Mathematician;both
+Programmer;both
+Designer;both
+Journalist;both
+Photographer;both
+Filmmaker;both
+Activist;both
+Environmentalist;both
+Humanitarian;both
+Psychologist;both
+Anthropologist;both
+Sociologist;both
+Economist;both
+Businessperson;both
+CEO;both
+Marketer;both
+Salesperson;both
+Financial analyst;both
+Economist;both
+Geologist;both
+Biologist;both
+Chemist;both
+Physicist;both
+Veterinarian;both
+Zoologist;both
+Botanist;both
+Ecologist;both
+Ornithologist;both
+Entomologist;both
+Archeologist;both
+Paleontologist;both
+Cartographer;both
+Surveyor;both
+Explorer;both
+Mountaineer;both
+Rock climber;both
+Surfer;both
+Scuba diver;both
+Skydiver;both
+Base jumper;both
+Race car driver;both
+Pilot;both
+Train conductor;both
+Ship captain;both
+Air traffic controller;both
+Firefighter;both
+Paramedic;both
+Emergency medical technician;both
+Police officer;both
+Private investigator;both
+Lawyer;both
+Judge;both
+Legal assistant;both
+Paralegal;both
+Librarian;both
+Museum curator;both
+Gallery owner;both
+Music producer;both
+Sound engineer;both
+Record label executive;both
+DJ;both
+Music journalist;both
+Music critic;both
+Music teacher;both
+Dance teacher;both
+Theater director;both
+Playwright;both
+Set designer;both
+Costume designer;both
+Makeup artist;both
+Fashion designer;both
+Interior designer;both
+Landscape architect;both
+Personal trainer;both
+Yoga instructor;both
+Blacksmith;both
+Baker;both
+Brewer;both
+Butcher;both
+Carpenter;both
+Cook;both
+Cooper;both
+Dockworker;both
+Farmer;both
+Fisherman;both
+Glassblower;both
+Hunter;both
+Innkeeper;both
+Jeweler;both
+Leatherworker;both
+Lumberjack;both
+Mason;both
+Miller;both
+Miner;both
+Potter;both
+Sailor;both
+Shepherd;both
+Shoemaker;both
+Silk weaver;both
+Soldier;both
+Spice merchant;both
+Spinner;both
+Tailor;both
+Tanner;both
+Trader;both
+Vintner;both
+Weaver;both
+Woodcarver;both
+Alchemist;both
+Apothecary;both
+Architect;both
+Artist;both
+Astronomer;both
+Barber;both
+Bookbinder;both
+Calligrapher;both
+Cartographer;both
+Clerk;both
+Clockmaker;both
+Diplomat;both
+Doctor;both
+Engineer;both
+Explorer;both
+Farrier;both
+Geographer;both
+Goldsmith;both
+Historian;both
+Illustrator;both
+Judge;both
+Librarian;both
+Mathematician;both
+Mercenary;both
+Musician;both
+Notary;both
+Painter;both
+Philosopher;both
+Physician;both
+Pilgrim;both
+Pirate;both
+Printer;both
+Professor;both
+Rabbi;both
+Sailor;both
+Sculptor;both
+Scribe;both
+Shipbuilder;both
+Spy;both
+Surgeon;both
+Tax collector;both
+Teacher;both
+Theologian;both
+Town crier;both
+Translator;both
+Traveler;both
+Troubadour;both
+Watchmaker;both
+Weaponsmith;both
+Writer;both
+Bard;both
+Chancellor;both
+Chronicler;both
+Court jester;both
+Executioner;both
+Falconer;both
+Footman;both
+Gardener;both
+Groom;both
+Harpist;both
+Herald;both
+Jester;both
+Lady-in-waiting;female
+Page;both
+Stablehand;both
+Sword bearer;both
+Valet;both
+Knight;both
+Mage;both
+Rogue;both
+Samurai;both
+Barbarian;both
+Assassin;both
+Sorcerer;both
+Paladin;both
+Druid;both
+Gladiator;both
+Pirate;both
+Ranger;both
+Bard;both
+Warlock;both
+Monk;both
+Necromancer;both
+Witch;female
+Alchemist;both
+Summoner;both
+Demon hunter;both
+Archmage;both
+Crusader;both
+Elemental mage;both
+Shadow assassin;both
+Dark knight;both
+Dragon slayer;both
+Illusionist;both
+Beastmaster;both
+Time traveler;both
+Vampire hunter;both
+Blacksmith;both
+Falconer;both
+Astronomer;both
+Herbalist;both
+Inquisitor;both
+Oracle;both
+Scribe;both
+Siege engineer;both
+Swashbuckler;both
+Templar;both
+Thunderer;both
+Warden;both
+Arcanist;both
+Bladesinger;both
+Celestial;both
+Dragon rider;both
+Enchanter;both
+Healer;both
+Jester;both
+Lancer;both
+Marshal;both
+Mystic;both
+Necrophage;both
+Phantom;both
+Rune mage;both
+Sentinel;both
+Shadowmage;both
+Soul reaver;both
+Spellblade;both
+Star mage;both
+Technomancer;both
+Theurge;both
+Titan;both
+Trickster;both
+Valkyrie;both
+Warlord;both
+Weaver;both
+Windcaller;both
+Witch hunter;both
+Abjurer;both
+Arcane trickster;both
+Beast tamer;both
+Blood mage;both
+Bounty hunter;both
+Chaos mage;both
+Chronomancer;both
+Cryptographer;both
+Death knight;both
+Dragon knight;both
+Dreamweaver;both
+Elementalist;both
+Enforcer;both
+Executioner;both
+Explorer;both
+Fire mage;both
+Frost mage;both
+Geomancer;both
+Ghost hunter;both
+Grave robber;both
+Guardian;both
+Gunner;both
+Harbinger;both
+Ice queen;female
+Ice king;male
+Investigator;both
+Judge;both
+Knight errant;both
+Librarian;both
+Loremaster;both
+Mage slayer;both
+Mind reader;both
+Bishop;both
+Cardinal;both
+Chaplain;both
+Deacon;both
+Elder;both
+Friar;both
+Imām;both
+Monk;both
+Nuncio;both
+Pastor;both
+Priest;both
+Rabbi;both
+Reverend;both
+Sister;female
+Vicar;both
+Abbot;both
+Canon;both
+Chancellor;both
+Confessor;both
+Curate;both
+Exorcist;both
+Inquisitor;both
+Lector;both
+Missionary;both
+Papal legate;both
+Private;both
+Private First Class;both
+Lance Corporal;both
+Corporal;both
+Sergeant;both
+Staff Sergeant;both
+Gunnery Sergeant;both
+Master Sergeant;both
+First Sergeant;both
+Sergeant Major;both
+Command Sergeant Major;both
+Sergeant Major of the Army;both
+Second Lieutenant;both
+First Lieutenant;both
+Captain;both
+Major;both
+Lieutenant Colonel;both
+Colonel;both
+Brigadier General;both
+General;both
+King;male
+Queen;female
+Lord;male
+Lady;female
+Duke;male
+Duchess;female
+Count;male
+Countess;female
+Baron;male
+Baroness;female
+Nobleman;male
+Vizier;both
+Sultan;both
+Geisha;both
+Yogi;both
+Adventurer;both
+Royalty;both
+Cowboy;male
+Cowgirl;female
+Pop Singer;both
+President;both
+Construction worker;both
+Idol;both
+Nerd;both
+Geek;both
+Muse;both
+Ballerina;female
+Ballerino;male
+Fighting game character;both
+femme fatale;female
+bimbo;female
+hunk;male
+plain jane;female
+southern belle;female
+doll;both
+villain;both
+protagonist;both

csvfiles/lighting.csv

@@ -44,4 +44,8 @@ Candle light
 Beautifully Lit
 Ethereal Lighting
 Starlight
-Neon Light
+Neon Light
+Light and shadow plays
+Dramatic spotlight
+Cold Lighting
+Warm lighting

csvfiles/locationdescriptors.csv

@@ -0,0 +1,192 @@
+1600'S
+1700'S
+1800'S
+1900'S
+1920'S
+1940'S
+1950'S
+1950S Suburbia
+1960'S
+1970'S
+1980'S
+1990'S
+2000'S
+Abandoned
+Abstract
+Absurd
+Aesthetically Pleasing
+Airy
+Alhambresque
+Alien
+Alluring
+Ancient
+Angelic
+Apocalyptic
+Appealing
+Artistic
+Astonishing
+Atmospheric
+Authentic
+Average
+Award-Winning
+Awe-Inspiring
+Awful
+Baroque
+Basic
+Beautiful
+Bewitching
+Biopunk
+Bizarre
+Breathtaking
+Bright
+Brutal
+Burning
+Charming
+Charred
+Classic
+Cloudy
+Cluttered
+Colorful
+Contemporary
+Cozy
+Crude
+Crowded
+Cyberpunk
+Dense
+Depressing
+Deserted
+Desolate
+Detailed
+Deteriorating
+Dieselpunk
+Dirty
+Divine
+Drab
+Dramatic
+Dreamlike
+Dreamy
+Dull
+Dusty
+Dynamic
+Dystopian
+Eclectic
+Eerie
+Enchanted
+Enchanting
+Epic
+Ethereal
+Evil
+Evocative
+Exceptional
+Exotic
+Exquisite
+Extraordinary
+Extreme
+Fairy-Tale
+Fantastical
+Fiery
+Flaming
+Flat
+Floating
+Flowery
+Foggy
+Folded
+Futuristic
+Ghastly
+Gigantic
+Gloomy
+Glowing
+Gorgeous
+Grand
+Gruesome
+Harsh
+Haunted
+Heavenly
+Hideous
+Historical
+Holy
+Homey
+Horrid
+Hostile
+Hyperdetailed
+Illuminated
+Impressionist
+Impressive
+Incredibly Detailed
+Inspirational
+Internally Glowing
+Intricate
+Jagged
+Layered
+Level
+Lifeless
+Light
+Lively
+Lovely
+Luminescent
+Lush
+Magical
+Magnificent
+Majestic
+Masterpiece
+Melancholy
+Mesmerizing
+Messy
+Moist
+Moody
+Morbid
+Mundane
+Mysterious
+Mystical
+Mystifying
+Mythical
+Natural
+Neat
+Oppressive
+Organic
+Otherworldly
+Overgrown
+Painterly
+Peaceful
+Phenomenal
+Pictorial
+Plain
+Pretty
+Primordial
+Pure
+Radiant
+Realistic
+Refined
+Retrofuturistic
+Romantic
+Ruined
+Sci-fi
+Serene
+Shadowy
+Soothing
+Sparse
+Striking
+Stunning
+Supernatural
+Surreal
+Timeless
+Traditional
+Tranquil
+Tribal
+Tropical
+Twisted
+Ugly
+Ultrarealistic
+Unappealing
+Unattractive
+Underwater
+Unique
+Unnatural
+Unusual
+Uptight
+Varied
+Verdant
+Vibrant
+Vile
+Warm
+Wretched

csvfiles/locations.csv

@@ -680,4 +680,6 @@ alternate dimensions
 jupiter clouds
 crack in the earth
 Mushroom Kingdom
--animal- den
+-animal- den
+Loch
+Loch Ness

csvfiles/manwoman.csv

@@ -1,7 +1,7 @@
 manwoman;gender
 Man;male
 Woman;female
-Boy;male
+Guy;male
 Girl;female
 Male;male
 Female;female

csvfiles/manwomanmultiples.csv

@@ -0,0 +1,12 @@
+manwomanmultiple?gender
+Twins?genderless
+Couple?genderless
+Triplets?genderless
+OR(Husband;Wife) and OR(Husband;Wife)?genderless
+a OR(group;couple;crowd;bunch) of OR(friends;people)?genderless
+OR(2;3;4;5) OR(women;girls)?female
+OR(2;3;4;5) OR(men;guys)?male
+OR(Mother;Father;Grandma;Grandpa) and OR(Daughter;Son)?genderless
+a OR(group;couple;crowd;bunch) of OR(women;girls)?female
+a OR(group;couple;crowd;bunch) of OR(men;guys)?male
+a OR(group;couple;crowd;bunch) of OR(-fictional-;-nonfictional-;-humanoid-)s?genderless

csvfiles/minioutfits.csv

@@ -1,7 +1,8 @@
-outfit
-clothes
-armor
-dress
-suit
-robe
-costume
+OR(;elegant;casual;uncommon) outfit?both
+clothes?both
+OR(;heavy;medium;light;uncommon) armor?both
+OR(;A-line;maxi;formal;Halter;Midi;mini;Off-the-shoulder;Peplum;Ruffled;Sheath;Strapless;wedding;uncommon) dress?female
+OR(;business;formal;uncommon) suit?both
+robe?both
+costume?both
+tunic?both

csvfiles/moods.csv

@@ -3,7 +3,6 @@ Angry
 Confused
 Cosy
 Cozy
-Crying
 Dark
 Depressing
 Disgusting
@@ -32,12 +31,9 @@ Relieving
 Romantic
 Sad
 Satisfying
-Screaming
 Shameful
 Shameless
-Smiling
-Smirking
-Smug
 Suffering
 Surprising
-Tranquil
+Tranquil
+Zen

csvfiles/objects.csv

@@ -323,4 +323,6 @@ Mobius strip
 Klein bottle
 Sphericon
 Totem
--material- Totem
+-material- Totem
+Doll
+matryoshka doll

csvfiles/othertypes.csv

@@ -257,4 +257,5 @@ wireframe drawing
 woodblock print
 woodcut drawing
 woodcut technique
-zig-zag lines drawing
+zig-zag lines drawing
+celtic patch

csvfiles/outfitdescriptors.csv

@@ -0,0 +1,191 @@
+1600'S
+1700'S
+1800'S
+1900'S
+1920'S
+1940'S
+1950'S
+1950S Suburbia
+1960'S
+1970'S
+1980'S
+1990'S
+2000'S
+Abstract
+Absurd
+Acclaimed
+Adorable
+Aesthetic
+Aesthetically Pleasing
+Alien
+Alluring
+Ancient
+Angelic
+Angular
+Anime
+Apocalyptic
+Appealing
+Arcane
+Artistic
+Astonishing
+Asymmetrical
+Attractive
+Authentic
+Avant-Garde
+Average
+Award-Winning
+Awe-Inspiring
+Awful
+Baggy
+Baroque
+Basic
+Beautiful
+Bewitching
+Bioluminescent
+Business
+Boring
+Breathtaking
+Bright
+Captivating
+Cartoony
+Casual
+Celestial
+Charming
+Chic
+Classic
+Colorful
+Comely
+Comfortable
+Contemporary
+Controversial
+Cool
+Cozy
+Creative
+Crude
+Cute
+Cyberpunk
+Cyborg
+Daring
+Decorative
+Delicate
+Detailed
+Dieselpunk
+Dirty
+Divine
+Drab
+Dreamlike
+Dreamy
+Dull
+Dynamic
+Eclectic
+Elegant
+Enchanting
+Enticing
+Ethereal
+Evocative
+Exceptional
+Exotic
+Exquisite
+Extraordinary
+Fairy-Tale
+Fantastical
+Fashionable
+Festive
+Flirty
+Flowing
+Flowery
+Fluffy
+Formal
+Frilled
+Funky
+Fur-Trimmed
+Geeky
+Ghostly
+Glam
+Glamorous
+Glittering
+Glowing
+Good
+Gorgeous
+Graceful
+Grand
+Great
+Groovy
+Handsome
+Hideous
+Historical
+Holy
+Hyper-Creative
+Hyperdetailed
+Illuminating
+Imaginative
+Impressive
+Incredibly Detailed
+Inspirational
+Intricate
+Kawaii
+Lace
+Large
+Layered
+Light
+Lovely
+Luminescent
+Luminous
+Magical
+Magnificent
+Majestic
+Metallic
+Middle Aged
+Minimalist
+Mysterious
+Mystical
+Mythical
+Nerdy
+Noble
+Otherworldly
+Oversized
+Peplum
+Playful
+Pretty
+Psychadelic
+Radiant
+Refined
+Retrofuturistic
+Revealing
+Rich
+Ridiculous
+Robotic
+Romantic
+Ruined
+Rustic
+Satin
+Saturated
+Seductive
+Sensual
+Sexy
+Shabby
+Shabby Chic
+Shiny
+Short
+Silky
+Simple
+Sleek
+Small
+Smart
+Smooth
+Snug
+Soft
+Stunning
+Supersized
+Surreal
+Tight
+Trendy
+Tropical
+Ugly
+Unattractive
+Unconventional
+Velvet
+Vibrant
+Vintage
+Vulgar
+Worn-Out

csvfiles/outfitvomit.csv

@@ -0,0 +1,11 @@
+has OR(;large;small;giant;tiny;normal) OR(;-color-;normal) bowOR(;s;normal)
+has OR(;large;small;giant;tiny;normal) OR(;Leather;normal) OR(belt;strap)OR(;s;normal)
+has OR(Metal;Iron;Diamond;Steel;metallic) OR(plates;plating)
+has a crest on chest
+is OR(zipped up;unzipped;partially unzipped)
+is OR(off-the-shoulder;strapless;cropped;ruffled)
+is OR(;very;normal) OR(large;small;tight;loose;baggy;delicate;wet;-outfitdescriptor-)
+is made from OR(satin;curderoy;lace;cotton;metal;-material-)
+has lots of OR(tiny;intricate) details OR(;and motifs;normal)
+is inspired by OR(nature;futurism;fashion;fantasy;sci-fi;ancient times;cinema)
+also has a OR(;large;flowing;rare) OR(hooded cloak;cloak;cape;coat;-season- coat)

csvfiles/patterns.csv

@@ -2,6 +2,7 @@ stripes
 horizontal stripes
 vertical stripes
 diagonal stripes
+racing stripes
 pinstripe
 herringbone
 regimental
@@ -9,7 +10,6 @@ barcode
 awning
 bayadere
 argyle
-Basketweave
 Plaid
 Checkerboard
 Harlequin
@@ -61,4 +61,10 @@ zalij
 Dots
 Dotted swiss
 smooth
-Edgy
+Edgy
+Safari
+Intecrate metal
+Intecrate
+Organic
+Wavy
+Crystal

csvfiles/rpgclasses.csv

@@ -17,4 +17,6 @@ Dwarf
 Knight
 God
 Goddess
-Alien
+Alien
+Ninja
+Bard

csvfiles/shotsizes.csv

@@ -48,4 +48,7 @@ top-down view
 two shot angle
 wide angle
 wide shot
-zoomed out
+zoomed out
+profile
+side-profile
+upper body shot

csvfiles/special_lists/animalsuffixadditions.csv

@@ -1,15 +1,10 @@
-with -material- wings
-with -material- tail
-with -material- ears
--animal- hybrid
-with -animal- skin
-with -pattern- skin
+with OR(-material-;-descriptor-) OR(wings; tail; ears)
+- OR(-animal-;-humanoid-) OR(;hybrid;normal)
+with OR(-animal-;-pattern-) skin
 wearing a -accessory-
-with -pattern- -print-
-with -color- details
-with -material- -minioutfit-
+with OR(-pattern-;-color-;rare) -print-
+with OR(-color-;-material-;unique) details
+with OR(-material-;-descriptor-;-color-) -minioutfit-
 with -descriptor- parts
--miniactivity- at a -location-
--miniactivity- in a -building-
-- -humanoid-
+-miniactivity- at a OR(-location-;-building-)
 looking like a -objecttotal-

csvfiles/special_lists/backgroundtypes.csv

@@ -1,27 +1,4 @@
-background is -location-
-background is [-location-|-location-]
-background is -building-
-background is [-building-|-building-]
-background is [-location-|-building-]
-at -location-
-at -building-
-near -location-
-near -building-
-inside a -building-
-inside a -descriptor- -building-
-background is -descriptor- -building-
-background is -descriptor- -location-
--descriptor- -location- in background
--descriptor- -building- in background
--building- in background
--location- in background
-plain background
-plain -color- background
-simple background
-simple -color- background
--color- and -color- background
--descriptor- background
--descriptor- -color- background
--culture- background
--space- background
--flora- in background
+OR(background is;at;near;inside a) OR(;-descriptor-;normal) OR(-location-;-building-;-minilocation-)
+OR(;-descriptor-;normal) OR(-location-;-building-;-minilocation-) in background
+OR(;plain;simple;detailed;complex;centered;normal) OR(;-descriptor-;-color-;-color- and -color-;-colorscheme-;normal) background
+OR(-culture-;-space-;-flora-;-minilocation- and -flora-;-season-) background

csvfiles/special_lists/buildaccessorie.csv

@@ -1,11 +1 @@
--accessory-
--descriptor- -accessory-
--culture- -accessory-
--color- -accessory-
--accessory-, -accessory-
--descriptor- -accessory-, -accessory-
--descriptor- -accessory-, -descriptor- -accessory-
--descriptor- -accessory-, -culture- -accessory-
--culture- -accessory-, -accessory-
--accessory-, -accessory-, -accessory-
--descriptor- -accessory-, -accessory-, -accessory-
+OR(;-heshe- has a;rare) OR(;-descriptor-;normal) OR(;-culture-;uncommon) OR(;-color-;uncommon) -accessory- OR(; , -accessory-; , -descriptor- -accessory-;rare) OR(; and -accessory-;unique)

csvfiles/special_lists/buildface.csv

@@ -0,0 +1,5 @@
+OR(;-hisher-;rare) face is a combination of OR(-nonfictional-;-fictional-;legendary) OR(;, OR(-nonfictional-;-fictional-;legendary);rare) and OR(-nonfictional-;-fictional-;legendary)
+OR(;-hisher-;rare) -facepart- of OR(-nonfictional-;-fictional-;legendary), OR(;-hisher-;rare) -facepart- of OR(-nonfictional-;-fictional-;legendary)
+OR(;-heshe- has ;rare) OR(;very;legendary) -buildfacepart- OR(; OR(,;and) -buildfacepart-;normal) OR(; and -buildfacepart-;legendary)
+OR(;-heshe- has ;rare) OR(;very;legendary) -humandescriptor- -facepart- OR(; and -humandescriptor- -facepart-;uncommon)
+OR(;-heshe- has ;rare) -facepart- of OR(-conceptsuffix-;-basicbitchdescriptor-;uncommon) OR(; and -facepart- of OR(-conceptsuffix-;-basicbitchdescriptor-;uncommon);uncommon)

csvfiles/special_lists/buildfaceparts.csv

@@ -0,0 +1,8 @@
+OR(full;thick;thin;plump;cute;beautiful;Pouty;Sensual;Voluptuous;Delicate;Soft;Supple;Natural;Glossy;Defined;Tender;Rosy) lips
+OR(full;thick;thin;open;wide;narrow;expressive;Mysterious;cute;beautiful) mouth
+OR(detailed;clear;cute;beautiful;weary;tired;glowing;narrow;almond-shaped;round;large;small;Sparkling;Luminous;Dreamy;Mysterious) OR(;-eyecolor-;normal) eyes
+OR(thick;arched;bushy;small;large;Well-groomed;Sculpted;Tapered;Curved;Natural;Full;Elegant;Prominent) eyebrows
+OR(large;small;short;long;cute;Button;Upturned;Snub;Sharp;Flat;High-bridged;Bulbous) nose
+OR(strong;pronounced;weak;small;large;Chiseled;Square;Defined;Dimpled;Round;Double;Slender;Soft) chin
+OR(oval;wide;large;small;triangle;round-;square-;hearth-;diamond-;pear-;Rectangular;Long;Angular;Symmetrical;Asymmetrical;full;Slim;Narrow) shaped face
+OR(rosy;defined;Chubby;Sculpted;cute;beautiful;hollow;dimpled;peachy;defined;flushed;plump;rounded;high;subtle) cheeks

csvfiles/special_lists/buildhair.csv

@@ -1,14 +1,3 @@
--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
+OR(;-heshe- has;uncommon) OR(-haircolor-;-hairdescriptor-;-culture-;uncommon) hair OR(styled as -hairstyle-;, ;rare)
+OR(;-heshe- has;uncommon) OR(-haircolor-; -hairstyle-) OR(hairstyle;hair)
+, -hisher- hair is OR(-haircolor-;-hairdescriptor-;-culture-;uncommon) OR(;and styled as -hairstyle-;rare)

csvfiles/special_lists/buildoutfit.csv

@@ -1,22 +1,11 @@
--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-
+, OR(wearing;dressed in;in;normal) OR(;a very;rare) OR(;-outfitdescriptor-;normal) OR(;-color-;uncommon) OR(;-culture-;uncommon) OR(;-material-;rare) -outfit-
+, 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(;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 OR(;very;rare) -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 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)
+, OR(wearing;dressed in;in;normal) OR(;a very;rare) OR(;-outfitdescriptor-;normal) OR(-minioutfit-;-outfit-;uncommon), OR(-hisher-;The;normal) -sameoutfit- -outfitvomit-

csvfiles/special_lists/humanadditions.csv

@@ -1,25 +1,16 @@
-riding a -animal-
-holding a -object-
-driving a -vehicle-
-with a -animal-
-surrounded by -object-s
-surrounded by -flora-s
-surrounded by -space-
-eating -food-
-and -human-
-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-
-wearing -elaborateoutfit-
--animal- hybrid
-as -culture- -rpgclass-
-sitting in a -descriptor- -chair-
-inside a -container-
-- -humanoid-
+OR(;, -heshe- is;rare) OR(riding;with) a -animal-
+OR(;, -heshe- is;rare) holding a -object-
+OR(;, -heshe- is;rare) driving a -vehicle-
+OR(;, -heshe- is;rare) surrounded by OR(-object-s;-flora-s;-space-)
+OR(;, -heshe- is;rare) eating -food-
+OR(;, -heshe- is;rare) OR(and;holding hands with) -human-
+OR(;, -heshe- is;rare) cosplaying as -fictional-
+OR(with;, -heshe- is;rare) OR(-color-;-material-) skin
+OR(, -heshe- is;feeling;expression is) -mood-
+OR(;, -heshe- is;rare) -miniactivity- OR(in;at) a OR(-location-;-building-;-waterlocation-)
+OR(;, -heshe- is;rare) wearing -elaborateoutfit-
+- OR(-animal-;-humanoid-) OR(;hybrid;normal)
+OR(;, -heshe-;rare) as -culture- -rpgclass-
+OR(;, -heshe- is;rare) sitting in a OR(;-descriptor-;uncommon) -chair-
+OR(;, -heshe- is;rare) inside a -container-
+OR(;, -heshe- is;rare) OR(surrounded by;being looked at by) a OR(couple;group) of OR(;-descriptor-;uncommon) OR(people;-malefemale-s;animals) OR(;wearing OR(;-descriptor-;uncommon) -outfit-;rare)

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-
+OR(;from;normal) inside OR(;of;normal) a OR(;-descriptor-;uncommon) OR(-location-;-building-)

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-
+OR(;-descriptor-;-culture-;-color-;lush;dense;-season-;normal) -minilocation- OR(; with -flora-; and -space- in background; and -minilocation-;rare)

csvfiles/special_lists/objectadditions.csv

@@ -1,16 +1,7 @@
-with a face
-made from -material-
-detailed with -material- patterns
-detailed with -material- -descriptor- patterns
--descriptor- details
--color- patterns
--material- patterns
--descriptor- -color- patterns
--material- frame
-intricate details
-smooth
-designed by -brand-
-made from -space-
-made from -flora-
-anthropomorphic
-with -pattern- -print-
+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-

csvfiles/special_lists/overalladditions.csv

@@ -1,30 +1,20 @@
-floating in space
-floating in -space-
-floating over -minilocation-
-floating
-flying
+OR(floating;flying) OR(; in space; in -space-; over -minilocation-;normal)
 distant nuclear explosion
 de dia los muertos
 mechanical
 lord of the rings scenery landscape, -flora-
 between the stars
 surrounded by fire and ice
-infused with ethereal color
-surrounded by ethereal color
-surrounded by ethereal shapes
-surrounded by -color- electric sparks
+OR(infused with;surrounded by) OR(ethereal color; ethereal shapes; -color- OR(electric;glowing;neon) sparks)
 -season-
 -color- smoke
 in -season- landscape
 pronounced -genderdescription- features
-in -culture- city street
+in OR(-culture-;-descriptor-) OR(city;village) OR(street;road)
 covered in -color- paint, dripping paint
-designed by -brand-
-in style of -brand-
-forged by -brand-
+OR(designed by;in style of; forged by) -brand-
 overgrown with plants and -color- flowers
 cyberpunk style, neo-tokyo, -color- neon highlights
-designed as a -culture- rug from fiber
 with a portal to another world
 stylized geometric patterns, gems, steel and chrome
 soft, squishy and jelly
@@ -43,4 +33,5 @@ clean, soap bubbles, iridescent
 and the genre is -musicgenre-
 displayed in a rainbow pattern
 inside a -container-
--flora-, -flora-, -flora-, -flora-
+-flora-, -flora-, -flora-, -flora-
+covered in -covering-

csvfiles/special_lists/photoadditions.csv

@@ -1 +1,4 @@
-film grain
+film grain
+bokeh
+Orton effect
+sharp focus

csvfiles/vehicles.csv

@@ -114,4 +114,9 @@ Snow plow
 Tractor trailer
 Utility van
 Tuk-tuk
-hypercar
+hypercar
+2 wheeled vehicle
+3 wheeled vehicle
+4 wheeled vehicle
+6 wheeled vehicle
+Trike

csvfiles/vomit.csv

@@ -115,4 +115,6 @@ underpainting
 vibrant
 vignette
 vintage
-Zentangle
+Zentangle
+Liminal dream
+-basicbitchdescriptor-

main.py

@@ -13,7 +13,7 @@ from call_extras import *
 from model_lists import *
 
 
-def generateimages(amount = 1, size = "all",model = "currently selected model",samplingsteps = "40",cfg= "7",hiresfix = True,hiressteps ="0",denoisestrength="0.6",samplingmethod="DPM++ SDE Karras", upscaler="R-ESRGAN 4x+", hiresscale="2",apiurl="http://127.0.0.1:7860",qualitygate=False,quality="7.6",runs="5",insanitylevel="5",subject="all", artist="all", imagetype="all",silentmode=False, workprompt="", antistring="",prefixprompt="", suffixprompt="", negativeprompt="",promptcompounderlevel = "1", seperator="comma", img2imgbatch = "1", img2imgsamplingsteps = "20", img2imgcfg = "7", img2imgsamplingmethod = "DPM++ SDE Karras", img2imgupscaler = "R-ESRGAN 4x+", img2imgmodel = "currently selected model", img2imgactivate = False, img2imgscale = "2", img2imgpadding = "64",img2imgdenoisestrength="0.3",ultimatesdupscale=False,usdutilewidth = "512", usdutileheight = "0", usdumaskblur = "8", usduredraw ="Linear", usduSeamsfix = "None", usdusdenoise = "0.35", usduswidth = "64", usduspadding ="32", usdusmaskblur = "8",controlnetenabled=False, controlnetmodel="",img2imgdenoisestrengthmod="-0.05",enableextraupscale = False,controlnetblockymode = False,extrasupscaler1 = "all",extrasupscaler2 ="all",extrasupscaler2visiblity="0.5",extrasupscaler2gfpgan="0",extrasupscaler2codeformer="0.15",extrasupscaler2codeformerweight="0.1",extrasresize="2",onlyupscale="false",givensubject="",smartsubject=True,giventypeofimage="",imagemodechance=20, gender="all", chosensubjectsubtypeobject="all", chosensubjectsubtypehumanoid="all", chosensubjectsubtypeconcept="all", increasestability = False, qualityhiresfix = False, qualitymode = "highest", qualitykeep="keep used", basesize = "512", promptvariantinsanitylevel = 0):
+def generateimages(amount = 1, size = "all",model = "currently selected model",samplingsteps = "40",cfg= "7",hiresfix = True,hiressteps ="0",denoisestrength="0.6",samplingmethod="DPM++ SDE Karras", upscaler="R-ESRGAN 4x+", hiresscale="2",apiurl="http://127.0.0.1:7860",qualitygate=False,quality="7.6",runs="5",insanitylevel="5",subject="all", artist="all", imagetype="all",silentmode=False, workprompt="", antistring="",prefixprompt="", suffixprompt="", negativeprompt="",promptcompounderlevel = "1", seperator="comma", img2imgbatch = "1", img2imgsamplingsteps = "20", img2imgcfg = "7", img2imgsamplingmethod = "DPM++ SDE Karras", img2imgupscaler = "R-ESRGAN 4x+", img2imgmodel = "currently selected model", img2imgactivate = False, img2imgscale = "2", img2imgpadding = "64",img2imgdenoisestrength="0.3",ultimatesdupscale=False,usdutilewidth = "512", usdutileheight = "0", usdumaskblur = "8", usduredraw ="Linear", usduSeamsfix = "None", usdusdenoise = "0.35", usduswidth = "64", usduspadding ="32", usdusmaskblur = "8",controlnetenabled=False, controlnetmodel="",img2imgdenoisestrengthmod="-0.05",enableextraupscale = False,controlnetblockymode = False,extrasupscaler1 = "all",extrasupscaler2 ="all",extrasupscaler2visiblity="0.5",extrasupscaler2gfpgan="0",extrasupscaler2codeformer="0.15",extrasupscaler2codeformerweight="0.1",extrasresize="2",onlyupscale="false",givensubject="",smartsubject=True,giventypeofimage="",imagemodechance=20, gender="all", chosensubjectsubtypeobject="all", chosensubjectsubtypehumanoid="all", chosensubjectsubtypeconcept="all", increasestability = False, qualityhiresfix = False, qualitymode = "highest", qualitykeep="keep used", basesize = "512", promptvariantinsanitylevel = 0, givenoutfit = ""):
     loops = int(amount)  # amount of images to generate
     steps = 0
     upscalefilelist=[]
@@ -133,7 +133,7 @@ def generateimages(amount = 1, size = "all",model = "currently selected model",s
                 
 
             else:    
-                randomprompt = build_dynamic_prompt(insanitylevel,subject,artist,imagetype, False,antistring,prefixprompt,suffixprompt,promptcompounderlevel, seperator,givensubject,smartsubject,giventypeofimage,imagemodechance, gender, chosensubjectsubtypeobject, chosensubjectsubtypehumanoid, chosensubjectsubtypeconcept)
+                randomprompt = build_dynamic_prompt(insanitylevel,subject,artist,imagetype, False,antistring,prefixprompt,suffixprompt,promptcompounderlevel, seperator,givensubject,smartsubject,giventypeofimage,imagemodechance, gender, chosensubjectsubtypeobject, chosensubjectsubtypehumanoid, chosensubjectsubtypeconcept,True,False,-1,givenoutfit)
 
             # make the filename, from from a to the first comma
             # find the index of the first comma after "of a" or end of the prompt

prompttester.py

@@ -10,7 +10,7 @@ from build_dynamic_prompt import *
 
 
 
-def generateprompts(amount = 1,insanitylevel="5",subject="all", artist="all", imagetype="all",onlyartists=False, workprompt="", antistring="",prefixprompt="", suffixprompt="", negativeprompt="",promptcompounderlevel = "1", seperator="comma",givensubject="",smartsubject=True,giventypeofimage="",imagemodechance=20, gender = "all", subtypeobject = "all", subtypehumanoid = "all", subtypeconcept = "all", advancedprompting = True, hardturnoffemojis=False):
+def generateprompts(amount = 1,insanitylevel="5",subject="all", artist="all", imagetype="all",onlyartists=False, workprompt="", antistring="",prefixprompt="", suffixprompt="", negativeprompt="",promptcompounderlevel = "1", seperator="comma",givensubject="",smartsubject=True,giventypeofimage="",imagemodechance=20, gender = "all", subtypeobject = "all", subtypehumanoid = "all", subtypeconcept = "all", advancedprompting = True, hardturnoffemojis=False, seed=0, overrideoutfit=""):
     loops = int(amount)  # amount of images to generate
     steps = 0
    
@@ -18,7 +18,7 @@ def generateprompts(amount = 1,insanitylevel="5",subject="all", artist="all", im
     while steps < loops:
         # build prompt
     
-        result = build_dynamic_prompt(insanitylevel,subject,artist,imagetype, onlyartists,antistring,prefixprompt,suffixprompt,promptcompounderlevel, seperator,givensubject,smartsubject,giventypeofimage,imagemodechance, gender, subtypeobject, subtypehumanoid, subtypeconcept, advancedprompting, hardturnoffemojis)
+        result = build_dynamic_prompt(insanitylevel,subject,artist,imagetype, onlyartists,antistring,prefixprompt,suffixprompt,promptcompounderlevel, seperator,givensubject,smartsubject,giventypeofimage,imagemodechance, gender, subtypeobject, subtypehumanoid, subtypeconcept, advancedprompting, hardturnoffemojis, seed, overrideoutfit)
 
         print("")
         print("loop " + str(steps))
@@ -38,7 +38,12 @@ def generateprompts(amount = 1,insanitylevel="5",subject="all", artist="all", im
             print("")
             print(result)
             break
-        
+
+        if(" OR " in result):
+            print("There is a mistake in a OR statement")
+            print("")
+            print(result)
+            break
 
         steps += 1
     
@@ -46,4 +51,20 @@ def generateprompts(amount = 1,insanitylevel="5",subject="all", artist="all", im
     print("")
     print("All done!")
 
-generateprompts(10,8,"all","all","all",False,"","","PREFIXPROMPT" ,"SUFFIXPROMPT","",1,"","",True,"",100, "all", "all", "all", "all", False, True)
+generateprompts(10,5
+                ,"all" # subject
+                ,"all (wild)" # 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"
+                ,False,"","","PREFIXPROMPT" 
+                ,"SUFFIXPROMPT"
+                ,"",1,""
+                ,"" # subject override
+                ,True,
+                "",20
+                , "all" # gender
+                , "all" # object types
+                , "all"  # humanoid types
+                , "all" # concept types
+                , False, True, 0
+                , "" #outfit override
+                )

promptvarianttester.py

@@ -35,4 +35,4 @@ def generatepromptvariants(amount = 1,prompt="",insanitylevel="5"):
     print("")
     print("All done!")
 
-generatepromptvariants(1,"purple (galaxy) in a (bottle:1.2), <bla:1>, background is a lush jungle and a woman wearing a summer dress, -artmovement-", 5)
+generatepromptvariants(10,"purple (galaxy) in a (bottle:1.2), <bla:1>, background is a lush jungle and a woman wearing a summer dress, -artmovement-", 5)

scripts/onebuttonprompt.py

@@ -21,7 +21,7 @@ subjects =["all"]
 subjectsubtypesobject = ["all"]
 subjectsubtypeshumanoid = ["all"]
 subjectsubtypesconcept = ["all"]
-artists = ["all", "none", "popular", "greg mode", "3D",	"abstract",	"angular", "anime"	,"architecture",	"art nouveau",	"art deco",	"baroque",	"bauhaus", 	"cartoon",	"character",	"children's illustration", 	"cityscape", 	"clean",	"cloudscape",	"collage",	"colorful",	"comics",	"cubism",	"dark",	"detailed", 	"digital",	"expressionism",	"fantasy",	"fashion",	"fauvism",	"figurativism",	"gore",	"graffiti",	"graphic design",	"high contrast",	"horror",	"impressionism",	"installation",	"landscape",	"light",	"line drawing",	"low contrast",	"luminism",	"magical realism",	"manga",	"melanin",	"messy",	"monochromatic",	"nature",	"nudity",	"photography",	"pop art",	"portrait",	"primitivism",	"psychedelic",	"realism",	"renaissance",	"romanticism",	"scene",	"sci-fi",	"sculpture",	"seascape",	"space",	"stained glass",	"still life",	"storybook realism",	"street art",	"streetscape",	"surrealism",	"symbolism",	"textile",	"ukiyo-e",	"vibrant",	"watercolor",	"whimsical"]
+artists = ["all", "all (wild)", "none", "popular", "greg mode", "3D",	"abstract",	"angular", "anime"	,"architecture",	"art nouveau",	"art deco",	"baroque",	"bauhaus", 	"cartoon",	"character",	"children's illustration", 	"cityscape", 	"clean",	"cloudscape",	"collage",	"colorful",	"comics",	"cubism",	"dark",	"detailed", 	"digital",	"expressionism",	"fantasy",	"fashion",	"fauvism",	"figurativism",	"gore",	"graffiti",	"graphic design",	"high contrast",	"horror",	"impressionism",	"installation",	"landscape",	"light",	"line drawing",	"low contrast",	"luminism",	"magical realism",	"manga",	"melanin",	"messy",	"monochromatic",	"nature",	"nudity",	"photography",	"pop art",	"portrait",	"primitivism",	"psychedelic",	"realism",	"renaissance",	"romanticism",	"scene",	"sci-fi",	"sculpture",	"seascape",	"space",	"stained glass",	"still life",	"storybook realism",	"street art",	"streetscape",	"surrealism",	"symbolism",	"textile",	"ukiyo-e",	"vibrant",	"watercolor",	"whimsical"]
 imagetypes = ["all", "all - force multiple",  "photograph", "octane render","digital art","concept art", "painting", "portrait", "anime key visual", "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"]
 promptmode = ["at the back", "in the front"]
 promptcompounder = ["1", "2", "3", "4", "5"]
@@ -88,6 +88,7 @@ generateflora = True
 generateanimal = True
 generatemanwoman = True
 generatemanwomanrelation = True
+generatemanwomanmultiple = True
 generatefictionalcharacter = True
 generatenonfictionalcharacter = True
 generatehumanoids = True
@@ -123,6 +124,8 @@ for item in config:
             generatemanwoman = False
         if item[0] == 'subject_manwomanrelation' and item[1] != 'on':
             generatemanwomanrelation = False
+        if item[0] == 'subject_manwomanmultiple' and item[1] != 'on':
+            generatemanwomanmultiple = False
         if item[0] == 'subject_fictional' and item[1] != 'on':
             generatefictionalcharacter = False
         if item[0] == 'subject_nonfictional' and item[1] != 'on':
@@ -153,7 +156,7 @@ if(generatevehicle or generateobject or generatefood or generatebuilding or gene
      subjects.append("object")
 if(generateanimal):
      subjects.append("animal")
-if(generatemanwoman or generatemanwomanrelation or generatefictionalcharacter or generatenonfictionalcharacter or generatehumanoids or generatejob):
+if(generatemanwoman or generatemanwomanrelation or generatefictionalcharacter or generatenonfictionalcharacter or generatehumanoids or generatejob or generatemanwomanmultiple):
      subjects.append("humanoid")
 if(generatelandscape):
      subjects.append("landscape")
@@ -195,6 +198,9 @@ if(generatejob):
      subjectsubtypeshumanoid.append("based on job or title")
 if(generatefirstnames):
      subjectsubtypeshumanoid.append("based on first name")
+if(generatemanwomanmultiple):
+     subjectsubtypeshumanoid.append("multiple humans")
+
 
 # concepts
 if(generateevent):
@@ -220,12 +226,12 @@ class Script(scripts.Script):
 
         
     def ui(self, is_img2img):
-        def gen_prompt(insanitylevel, subject, artist, imagetype, antistring, prefixprompt, suffixprompt, promptcompounderlevel, seperator,givensubject,smartsubject,giventypeofimage, imagemodechance,chosengender, chosensubjectsubtypeobject, chosensubjectsubtypehumanoid, chosensubjectsubtypeconcept):
+        def gen_prompt(insanitylevel, subject, artist, imagetype, antistring, prefixprompt, suffixprompt, promptcompounderlevel, seperator,givensubject,smartsubject,giventypeofimage, imagemodechance,chosengender, chosensubjectsubtypeobject, chosensubjectsubtypehumanoid, chosensubjectsubtypeconcept,givenoutfit):
 
             promptlist = []
 
             for i in range(5):
-                promptlist.append(build_dynamic_prompt(insanitylevel,subject,artist, imagetype, False, antistring,prefixprompt,suffixprompt,promptcompounderlevel,seperator,givensubject,smartsubject, giventypeofimage, imagemodechance,chosengender, chosensubjectsubtypeobject, chosensubjectsubtypehumanoid, chosensubjectsubtypeconcept))
+                promptlist.append(build_dynamic_prompt(insanitylevel,subject,artist, imagetype, False, antistring,prefixprompt,suffixprompt,promptcompounderlevel,seperator,givensubject,smartsubject, giventypeofimage, imagemodechance,chosengender, chosensubjectsubtypeobject, chosensubjectsubtypehumanoid, chosensubjectsubtypeconcept,True,False,-1,givenoutfit))
 
             return promptlist
         
@@ -293,6 +299,8 @@ class Script(scripts.Script):
             with gr.Row():
                  givensubject = gr.Textbox(label="Overwrite subject: ", value="")
                  smartsubject = gr.Checkbox(label="Smart subject", value = True)
+            with gr.Row():
+                 givenoutfit = gr.Textbox(label="Overwrite outfit: ", value="")
             with gr.Row():
                 gr.Markdown("""
                             <font size="2">
@@ -404,12 +412,20 @@ class Script(scripts.Script):
 
                         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.
+
                         </font>
                         
                         ### Artists
                         
                         <font size="2">
-                        Artists have a major impact on the result. Automatically, it will select between 0-3 artists out of 3483 artists for your prompt.  
+                        Artists have a major impact on the result.
+                        
+                        1. all - it will cohesivly add about between 0-3 artists and style description. 
+                        
+                        2. all (wild) - it will randomly select between 0-3 artists out of 3483 artists for your prompt. 
+
+                        Others will select within that artist category
                         
                         You can turn it off and maybe add your own in the prefix or suffix prompt fields
                         </font>
@@ -481,6 +497,14 @@ class Script(scripts.Script):
                         
                         It will then recognize the body type and not generate it. It also recognizes the keyword wearing, and will not generate an outfit.
 
+                        ### Overwrite outfit
+
+                        When you fill in the override outfit field, it will generate an outfit in the prompt based on the given value. It can be used in combination with override subject, but does not have to be. It works best with smaller descriptions of the outfit.
+
+                        An example would be: space suit, red dress, cloak.
+
+                        Works best when you set the subjects to to humanoid.
+                        
                         ### Other prompt fields
 
                         The existing prompt and negative prompt fields are ignored.
@@ -794,7 +818,7 @@ class Script(scripts.Script):
                             extrasupscaler2codeformerweight = gr.Slider(0, 1, value="0.1", step=0.05, label="CodeFormer weight", visible = False)
                     
 
-        genprom.click(gen_prompt, inputs=[insanitylevel,subject, artist, imagetype, antistring,prefixprompt, suffixprompt,promptcompounderlevel, seperator, givensubject,smartsubject,giventypeofimage,imagemodechance, chosengender, chosensubjectsubtypeobject, chosensubjectsubtypehumanoid, chosensubjectsubtypeconcept], outputs=[prompt1, prompt2, prompt3,prompt4,prompt5])
+        genprom.click(gen_prompt, inputs=[insanitylevel,subject, artist, imagetype, antistring,prefixprompt, suffixprompt,promptcompounderlevel, seperator, givensubject,smartsubject,giventypeofimage,imagemodechance, chosengender, chosensubjectsubtypeobject, chosensubjectsubtypehumanoid, chosensubjectsubtypeconcept, givenoutfit], outputs=[prompt1, prompt2, prompt3,prompt4,prompt5])
 
         prompt1toworkflow.click(prompttoworkflowprompt, inputs=prompt1, outputs=workprompt)
         prompt2toworkflow.click(prompttoworkflowprompt, inputs=prompt2, outputs=workprompt)
@@ -802,7 +826,7 @@ class Script(scripts.Script):
         prompt4toworkflow.click(prompttoworkflowprompt, inputs=prompt4, outputs=workprompt)
         prompt5toworkflow.click(prompttoworkflowprompt, inputs=prompt5, outputs=workprompt)
 
-        startmain.click(generateimages, inputs=[amountofimages,size,model,samplingsteps,cfg,hiresfix,hiressteps,denoisestrength,samplingmethod, upscaler,hiresscale, apiurl, qualitygate, quality, runs,insanitylevel,subject, artist, imagetype, silentmode, workprompt, antistring, prefixprompt, suffixprompt,negativeprompt,promptcompounderlevel, seperator, img2imgbatch, img2imgsamplingsteps, img2imgcfg, img2imgsamplingmethod, img2imgupscaler, img2imgmodel,img2imgactivate, img2imgscale, img2imgpadding,img2imgdenoisestrength,ultimatesdupscale,usdutilewidth, usdutileheight, usdumaskblur, usduredraw, usduSeamsfix, usdusdenoise, usduswidth, usduspadding, usdusmaskblur, controlnetenabled, controlnetmodel,img2imgdenoisestrengthmod,enableextraupscale,controlnetblockymode,extrasupscaler1,extrasupscaler2,extrasupscaler2visiblity,extrasupscaler2gfpgan,extrasupscaler2codeformer,extrasupscaler2codeformerweight,extrasresize,onlyupscale,givensubject,smartsubject,giventypeofimage,imagemodechance, chosengender, chosensubjectsubtypeobject, chosensubjectsubtypehumanoid, chosensubjectsubtypeconcept, increasestability, qualityhiresfix, qualitymode, qualitykeep, basesize, promptvariantinsanitylevel])
+        startmain.click(generateimages, inputs=[amountofimages,size,model,samplingsteps,cfg,hiresfix,hiressteps,denoisestrength,samplingmethod, upscaler,hiresscale, apiurl, qualitygate, quality, runs,insanitylevel,subject, artist, imagetype, silentmode, workprompt, antistring, prefixprompt, suffixprompt,negativeprompt,promptcompounderlevel, seperator, img2imgbatch, img2imgsamplingsteps, img2imgcfg, img2imgsamplingmethod, img2imgupscaler, img2imgmodel,img2imgactivate, img2imgscale, img2imgpadding,img2imgdenoisestrength,ultimatesdupscale,usdutilewidth, usdutileheight, usdumaskblur, usduredraw, usduSeamsfix, usdusdenoise, usduswidth, usduspadding, usdusmaskblur, controlnetenabled, controlnetmodel,img2imgdenoisestrengthmod,enableextraupscale,controlnetblockymode,extrasupscaler1,extrasupscaler2,extrasupscaler2visiblity,extrasupscaler2gfpgan,extrasupscaler2codeformer,extrasupscaler2codeformerweight,extrasresize,onlyupscale,givensubject,smartsubject,giventypeofimage,imagemodechance, chosengender, chosensubjectsubtypeobject, chosensubjectsubtypehumanoid, chosensubjectsubtypeconcept, increasestability, qualityhiresfix, qualitymode, qualitykeep, basesize, promptvariantinsanitylevel, givenoutfit])
         interrupt.click(tryinterrupt, inputs=[apiurl])
         
         automatedoutputsfolderbutton.click(openfolder)
@@ -965,12 +989,12 @@ class Script(scripts.Script):
 
       
 
-        return [insanitylevel,subject, artist, imagetype, prefixprompt,suffixprompt,negativeprompt, promptcompounderlevel, ANDtoggle, silentmode, workprompt, antistring, seperator, givensubject, smartsubject, giventypeofimage, imagemodechance, chosengender, chosensubjectsubtypeobject, chosensubjectsubtypehumanoid, chosensubjectsubtypeconcept, promptvariantinsanitylevel]
+        return [insanitylevel,subject, artist, imagetype, prefixprompt,suffixprompt,negativeprompt, promptcompounderlevel, ANDtoggle, silentmode, workprompt, antistring, seperator, givensubject, smartsubject, giventypeofimage, imagemodechance, chosengender, chosensubjectsubtypeobject, chosensubjectsubtypehumanoid, chosensubjectsubtypeconcept, promptvariantinsanitylevel, givenoutfit]
             
     
 
     
-    def run(self, p, insanitylevel, subject, artist, imagetype, prefixprompt,suffixprompt,negativeprompt, promptcompounderlevel, ANDtoggle, silentmode, workprompt, antistring,seperator, givensubject, smartsubject, giventypeofimage, imagemodechance, chosengender, chosensubjectsubtypeobject, chosensubjectsubtypehumanoid, chosensubjectsubtypeconcept, promptvariantinsanitylevel):
+    def run(self, p, insanitylevel, subject, artist, imagetype, prefixprompt,suffixprompt,negativeprompt, promptcompounderlevel, ANDtoggle, silentmode, workprompt, antistring,seperator, givensubject, smartsubject, giventypeofimage, imagemodechance, chosengender, chosensubjectsubtypeobject, chosensubjectsubtypehumanoid, chosensubjectsubtypeconcept, promptvariantinsanitylevel, givenoutfit):
         
         images = []
         infotexts = []
@@ -1044,7 +1068,7 @@ class Script(scripts.Script):
 
 
                 #Here is where we build a "normal" prompt
-                preppedprompt += build_dynamic_prompt(insanitylevel,subject,artist, imagetype, False, antistring, prefixprompt, suffixprompt,promptcompounderlevel, seperator,givensubject,smartsubject,giventypeofimage,imagemodechance,chosengender, chosensubjectsubtypeobject, chosensubjectsubtypehumanoid, chosensubjectsubtypeconcept)
+                preppedprompt += build_dynamic_prompt(insanitylevel,subject,artist, imagetype, False, antistring, prefixprompt, suffixprompt,promptcompounderlevel, seperator,givensubject,smartsubject,giventypeofimage,imagemodechance,chosengender, chosensubjectsubtypeobject, chosensubjectsubtypehumanoid, chosensubjectsubtypeconcept,True,False,-1,givenoutfit)
 
                 # set the artist mode back when done (for automatic mode)
                 artist = artistcopy

userfiles/add own csv files here.txt

@@ -32,5 +32,7 @@ cat
 - custom_subjects.csv
 Values to be attached to -subjectfromfile- wildcard. This wildcard can be used in the subject override field, and it will pick the subjects randomly from this file.
 
+- custom_outfits.csv
+Values to be attached to -outfitfromfile- wildcard. This wildcard can be used in the outfit override field, and it will pick the outfits randomly from this file.
 
 Happy prompting!

userfiles/custom_outfits_sample.csv

@@ -0,0 +1,3 @@
+space suit
+red dress
+formal business suit