diff --git a/build_dynamic_prompt.py b/build_dynamic_prompt.py index f94815d..0d5e190 100644 --- a/build_dynamic_prompt.py +++ b/build_dynamic_prompt.py @@ -41,7 +41,7 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all genderchoicelist = ["male", "female"] gender = random.choice(genderchoicelist) heshelist = ["it"] - hisherlist = ["it's"] + hisherlist = ["its"] himherlist = ["it"] # build all lists here @@ -113,7 +113,10 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all chairlist = csv_to_list("chairs", antilist) cardnamelist = csv_to_list("card_names", antilist) coveringlist = csv_to_list("coverings", antilist) + + # additional descriptor lists outfitdescriptorlist = csv_to_list("outfitdescriptors",antilist) + hairdescriptorlist = csv_to_list("hairdescriptors",antilist) humanlist = fictionallist + nonfictionallist + humanoidlist objecttotallist = objectlist + buildinglist + vehiclelist + foodlist + spacelist + floralist + containerlist @@ -1954,7 +1957,9 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all # In front and the back? completeprompt = parse_custom_functions(completeprompt, insanitylevel) - + # hair descriptor + if(rare_dist(insanitylevel)): # Use base outfit descriptor, until we are not. + completeprompt = completeprompt.replace("-hairdescriptor-", "-descriptor-",1) # first some manual stuff for outfit @@ -2061,9 +2066,10 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all "-heshe-" in completeprompt or "-hisher-" in completeprompt or "-himher-" in completeprompt or - "-outfitdescriptor-" in completeprompt): - allwildcardslistnohybrid = [ "-color-","-object-", "-animal-", "-fictional-","-nonfictional-","-building-","-vehicle-","-location-","-conceptprefix-","-food-","-haircolor-","-hairstyle-","-job-", "-accessory-", "-humanoid-", "-manwoman-", "-human-", "-colorscheme-", "-mood-", "-genderdescription-", "-artmovement-", "-malefemale-", "-bodytype-", "-minilocation-", "-minilocationaddition-", "-pose-", "-season-", "-minioutfit-", "-elaborateoutfit-", "-minivomit-", "-vomit-", "-rpgclass-", "-subjectfromfile-", "-brand-", "-space-", "-artist-", "-imagetype-", "-othertype-", "-quality-", "-lighting-", "-camera-", "-lens-","-imagetypequality-", "-poemline-", "-songline-", "-greatwork-", "-artistfantasy-", "-artistpopular-", "-artistromanticism-", "-artistphotography-", "-emoji-", "-timeperiod-", "-shotsize-", "-musicgenre-", "-animaladdition-", "-addontolocationinside-", "-addontolocation-", "-objectaddition-", "-humanaddition-", "-overalladdition-", "-focus-", "-direction-", "-styletilora-", "-manwomanrelation-", "-waterlocation-", "-container-", "-firstname-", "-flora-", "-print-", "-miniactivity-", "-pattern-", "-animalsuffixaddition-", "-chair-", "-cardname-", "-covering-", "-heshe-", "-hisher-", "-himher-", "-outfitdescriptor-"] - allwildcardslistnohybridlists = [colorlist, objectlist, animallist, fictionallist, nonfictionallist, buildinglist, vehiclelist, locationlist,conceptprefixlist,foodlist,haircolorlist, hairstylelist,joblist, accessorielist, humanoidlist, manwomanlist, humanlist, colorschemelist, moodlist, genderdescriptionlist, artmovementlist, malefemalelist, bodytypelist, minilocationlist, minilocationadditionslist, poselist, seasonlist, minioutfitlist, elaborateoutfitlist, minivomitlist, vomitlist, rpgclasslist, customsubjectslist, brandlist, spacelist, artistlist, imagetypelist, othertypelist, qualitylist, lightinglist, cameralist, lenslist, imagetypequalitylist, poemlinelist, songlinelist, greatworklist, fantasyartistlist, popularartistlist, romanticismartistlist, photographyartistlist, emojilist, timeperiodlist, shotsizelist, musicgenrelist, animaladditionlist, addontolocationinsidelist, addontolocationlist, objectadditionslist, humanadditionlist, overalladditionlist, focuslist, directionlist, stylestiloralist, manwomanrelationlist, waterlocationlist, containerlist, firstnamelist, floralist, printlist, miniactivitylist, patternlist, animalsuffixadditionlist, chairlist, cardnamelist, coveringlist, heshelist, hisherlist, himherlist, outfitdescriptorlist] + "-outfitdescriptor-" in completeprompt or + "-hairdescriptor-" in completeprompt): + allwildcardslistnohybrid = [ "-color-","-object-", "-animal-", "-fictional-","-nonfictional-","-building-","-vehicle-","-location-","-conceptprefix-","-food-","-haircolor-","-hairstyle-","-job-", "-accessory-", "-humanoid-", "-manwoman-", "-human-", "-colorscheme-", "-mood-", "-genderdescription-", "-artmovement-", "-malefemale-", "-bodytype-", "-minilocation-", "-minilocationaddition-", "-pose-", "-season-", "-minioutfit-", "-elaborateoutfit-", "-minivomit-", "-vomit-", "-rpgclass-", "-subjectfromfile-", "-brand-", "-space-", "-artist-", "-imagetype-", "-othertype-", "-quality-", "-lighting-", "-camera-", "-lens-","-imagetypequality-", "-poemline-", "-songline-", "-greatwork-", "-artistfantasy-", "-artistpopular-", "-artistromanticism-", "-artistphotography-", "-emoji-", "-timeperiod-", "-shotsize-", "-musicgenre-", "-animaladdition-", "-addontolocationinside-", "-addontolocation-", "-objectaddition-", "-humanaddition-", "-overalladdition-", "-focus-", "-direction-", "-styletilora-", "-manwomanrelation-", "-waterlocation-", "-container-", "-firstname-", "-flora-", "-print-", "-miniactivity-", "-pattern-", "-animalsuffixaddition-", "-chair-", "-cardname-", "-covering-", "-heshe-", "-hisher-", "-himher-", "-outfitdescriptor-", "-hairdescriptor-"] + allwildcardslistnohybridlists = [colorlist, objectlist, animallist, fictionallist, nonfictionallist, buildinglist, vehiclelist, locationlist,conceptprefixlist,foodlist,haircolorlist, hairstylelist,joblist, accessorielist, humanoidlist, manwomanlist, humanlist, colorschemelist, moodlist, genderdescriptionlist, artmovementlist, malefemalelist, bodytypelist, minilocationlist, minilocationadditionslist, poselist, seasonlist, minioutfitlist, elaborateoutfitlist, minivomitlist, vomitlist, rpgclasslist, customsubjectslist, brandlist, spacelist, artistlist, imagetypelist, othertypelist, qualitylist, lightinglist, cameralist, lenslist, imagetypequalitylist, poemlinelist, songlinelist, greatworklist, fantasyartistlist, popularartistlist, romanticismartistlist, photographyartistlist, emojilist, timeperiodlist, shotsizelist, musicgenrelist, animaladditionlist, addontolocationinsidelist, addontolocationlist, objectadditionslist, humanadditionlist, overalladditionlist, focuslist, directionlist, stylestiloralist, manwomanrelationlist, waterlocationlist, containerlist, firstnamelist, floralist, printlist, miniactivitylist, patternlist, animalsuffixadditionlist, chairlist, cardnamelist, coveringlist, heshelist, hisherlist, himherlist, outfitdescriptorlist, hairdescriptorlist] allwildcardslistwithhybrid = ["-material-", "-descriptor-", "-outfit-", "-conceptsuffix-","-culture-", "-objecttotal-", "-outfitprinttotal-"] allwildcardslistwithhybridlists = [materiallist, descriptorlist,outfitlist,conceptsuffixlist,culturelist, objecttotallist, outfitprinttotallist] @@ -2216,6 +2222,7 @@ def createpromptvariant(prompt = "", insanitylevel = 5, antivalues = "" , gender cardnamelist = csv_to_list("card_names", antilist) coveringlist = csv_to_list("coverings", antilist) outfitdescriptorlist = csv_to_list("outfitdescriptors",antilist) + hairdescriptorlist = csv_to_list("hairdescriptors",antilist) humanlist = fictionallist + nonfictionallist + humanoidlist + malefemalelist + manwomanlist + manwomanrelationlist objecttotallist = objectlist + buildinglist + vehiclelist + foodlist + spacelist + floralist + containerlist @@ -2386,8 +2393,10 @@ def createpromptvariant(prompt = "", insanitylevel = 5, antivalues = "" , gender if lowercase_combination in [x.lower() for x in descriptorlist] and chance_roll(insanitylevel, "uncommon"): prompt = prompt.replace(combination," -descriptor- ") - if lowercase_combination in [x.lower() for x in descriptorlist] and chance_roll(insanitylevel, "rare"): + if lowercase_combination in [x.lower() for x in outfitdescriptorlist] and chance_roll(insanitylevel, "rare"): prompt = prompt.replace(combination," -outfitdescriptor- ") + if lowercase_combination in [x.lower() for x in hairdescriptorlist] and chance_roll(insanitylevel, "rare"): + prompt = prompt.replace(combination," -hairdescriptor- ") if lowercase_combination in [x.lower() for x in directionlist] and chance_roll(insanitylevel, "uncommon"): prompt = prompt.replace(combination," -direction- ") @@ -2596,9 +2605,10 @@ def createpromptvariant(prompt = "", insanitylevel = 5, antivalues = "" , gender "-chair-" in completeprompt or "-cardname-" in completeprompt or "-covering-" in completeprompt or - "-outfitdescriptor-" in completeprompt): - allwildcardslistnohybrid = [ "-color-","-object-", "-animal-", "-fictional-","-nonfictional-","-building-","-vehicle-","-location-","-conceptprefix-","-food-","-haircolor-","-hairstyle-","-job-", "-accessory-", "-humanoid-", "-manwoman-", "-human-", "-colorscheme-", "-mood-", "-genderdescription-", "-artmovement-", "-malefemale-", "-bodytype-", "-minilocation-", "-minilocationaddition-", "-pose-", "-season-", "-minioutfit-", "-elaborateoutfit-", "-minivomit-", "-vomit-", "-rpgclass-", "-subjectfromfile-", "-brand-", "-space-", "-artist-", "-imagetype-", "-othertype-", "-quality-", "-lighting-", "-camera-", "-lens-","-imagetypequality-", "-poemline-", "-songline-", "-greatwork-", "-artistfantasy-", "-artistpopular-", "-artistromanticism-", "-artistphotography-", "-emoji-", "-timeperiod-", "-shotsize-", "-musicgenre-", "-animaladdition-", "-objectaddition-", "-humanaddition-", "-overalladdition-", "-focus-", "-direction-", "-styletilora-", "-manwomanrelation-", "-waterlocation-", "-container-", "-firstname-", "-flora-", "-print-", "-miniactivity-", "-pattern-", "-chair-", "-cardname-", "-covering-", "-outfitdescriptor-"] - allwildcardslistnohybridlists = [colorlist, objectlist, animallist, fictionallist, nonfictionallist, buildinglist, vehiclelist, locationlist,conceptprefixlist,foodlist,haircolorlist, hairstylelist,joblist, accessorielist, humanoidlist, manwomanlist, humanlist, colorschemelist, moodlist, genderdescriptionlist, artmovementlist, malefemalelist, bodytypelist, minilocationlist, minilocationadditionslist, poselist, seasonlist, minioutfitlist, elaborateoutfitlist, minivomitlist, vomitlist, rpgclasslist, customsubjectslist, brandlist, spacelist, artistlist, imagetypelist, othertypelist, qualitylist, lightinglist, cameralist, lenslist, imagetypequalitylist, poemlinelist, songlinelist, greatworklist, fantasyartistlist, popularartistlist, romanticismartistlist, photographyartistlist, emojilist, timeperiodlist, shotsizelist, musicgenrelist, animaladditionlist, objectadditionslist, humanadditionlist, overalladditionlist, focuslist, directionlist, stylestiloralist, manwomanrelationlist, waterlocationlist, containerlist, firstnamelist, floralist, printlist, miniactivitylist, patternlist, chairlist, cardnamelist, coveringlist, outfitdescriptorlist] + "-outfitdescriptor-" in completeprompt or + "-hairdescriptor-" in completeprompt): + allwildcardslistnohybrid = [ "-color-","-object-", "-animal-", "-fictional-","-nonfictional-","-building-","-vehicle-","-location-","-conceptprefix-","-food-","-haircolor-","-hairstyle-","-job-", "-accessory-", "-humanoid-", "-manwoman-", "-human-", "-colorscheme-", "-mood-", "-genderdescription-", "-artmovement-", "-malefemale-", "-bodytype-", "-minilocation-", "-minilocationaddition-", "-pose-", "-season-", "-minioutfit-", "-elaborateoutfit-", "-minivomit-", "-vomit-", "-rpgclass-", "-subjectfromfile-", "-brand-", "-space-", "-artist-", "-imagetype-", "-othertype-", "-quality-", "-lighting-", "-camera-", "-lens-","-imagetypequality-", "-poemline-", "-songline-", "-greatwork-", "-artistfantasy-", "-artistpopular-", "-artistromanticism-", "-artistphotography-", "-emoji-", "-timeperiod-", "-shotsize-", "-musicgenre-", "-animaladdition-", "-objectaddition-", "-humanaddition-", "-overalladdition-", "-focus-", "-direction-", "-styletilora-", "-manwomanrelation-", "-waterlocation-", "-container-", "-firstname-", "-flora-", "-print-", "-miniactivity-", "-pattern-", "-chair-", "-cardname-", "-covering-", "-outfitdescriptor-", "-hairdescriptor-"] + allwildcardslistnohybridlists = [colorlist, objectlist, animallist, fictionallist, nonfictionallist, buildinglist, vehiclelist, locationlist,conceptprefixlist,foodlist,haircolorlist, hairstylelist,joblist, accessorielist, humanoidlist, manwomanlist, humanlist, colorschemelist, moodlist, genderdescriptionlist, artmovementlist, malefemalelist, bodytypelist, minilocationlist, minilocationadditionslist, poselist, seasonlist, minioutfitlist, elaborateoutfitlist, minivomitlist, vomitlist, rpgclasslist, customsubjectslist, brandlist, spacelist, artistlist, imagetypelist, othertypelist, qualitylist, lightinglist, cameralist, lenslist, imagetypequalitylist, poemlinelist, songlinelist, greatworklist, fantasyartistlist, popularartistlist, romanticismartistlist, photographyartistlist, emojilist, timeperiodlist, shotsizelist, musicgenrelist, animaladditionlist, objectadditionslist, humanadditionlist, overalladditionlist, focuslist, directionlist, stylestiloralist, manwomanrelationlist, waterlocationlist, containerlist, firstnamelist, floralist, printlist, miniactivitylist, patternlist, chairlist, cardnamelist, coveringlist, outfitdescriptorlist, hairdescriptorlist] allwildcardslistwithhybrid = ["-material-", "-descriptor-", "-outfit-", "-conceptsuffix-","-culture-", "-objecttotal-", "-outfitprinttotal-"] allwildcardslistwithhybridlists = [materiallist, descriptorlist,outfitlist,conceptsuffixlist,culturelist, objecttotallist, outfitprinttotallist] @@ -2657,7 +2667,8 @@ def replacewildcard(completeprompt, insanitylevel, wildcard,listname, activatehy #if list is not empty if(bool(listname)): replacementvalue = random.choice(listname) - listname.remove(replacementvalue) + if(wildcard not in ["-heshe-", "-himher-","-hisher-"]): + listname.remove(replacementvalue) if(wildcard == "-artist-"): replacementvalue = "OR(;art by; designed by; stylized by;common) " + replacementvalue diff --git a/csvfiles/card_names.csv b/csvfiles/card_names.csv index d0d4156..8aa0a96 100644 --- a/csvfiles/card_names.csv +++ b/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 \ No newline at end of file diff --git a/csvfiles/hairdescriptors.csv b/csvfiles/hairdescriptors.csv new file mode 100644 index 0000000..1d8f13e --- /dev/null +++ b/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 \ No newline at end of file diff --git a/csvfiles/manwomanrelations.csv b/csvfiles/manwomanrelations.csv index e77b9fc..2499b29 100644 --- a/csvfiles/manwomanrelations.csv +++ b/csvfiles/manwomanrelations.csv @@ -13,4 +13,5 @@ Wife;female Husband;male Girlfriend;female Boyfriend;male -Twins;genderless \ No newline at end of file +Twins;genderless +Couple;genderless \ No newline at end of file diff --git a/csvfiles/outfitdescriptors.csv b/csvfiles/outfitdescriptors.csv index 0677309..7771eb2 100644 --- a/csvfiles/outfitdescriptors.csv +++ b/csvfiles/outfitdescriptors.csv @@ -95,6 +95,7 @@ Fantastical Fashionable Festive Flirty +Flowing Flowery Fluffy Frilled @@ -125,6 +126,7 @@ Incredibly Detailed Inspirational Intricate Kawaii +Lace Large Layered Light @@ -177,6 +179,7 @@ Soft Stunning Supersized Surreal +Tight Trendy Tropical Ugly diff --git a/csvfiles/special_lists/buildaccessorie.csv b/csvfiles/special_lists/buildaccessorie.csv index 548bf0f..d15011e 100644 --- a/csvfiles/special_lists/buildaccessorie.csv +++ b/csvfiles/special_lists/buildaccessorie.csv @@ -1 +1 @@ -OR(;-descriptor-;normal) OR(;-culture-;uncommon) OR(;-color-;uncommon) -accessory- OR(; , -accessory-; , -descriptor- -accessory-;rare) OR(; and -accessory-;unique) \ No newline at end of file +OR(;-heshe- has a;rare) OR(;-descriptor-;normal) OR(;-culture-;uncommon) OR(;-color-;uncommon) -accessory- OR(; , -accessory-; , -descriptor- -accessory-;rare) OR(; and -accessory-;unique) \ No newline at end of file diff --git a/csvfiles/special_lists/buildhair.csv b/csvfiles/special_lists/buildhair.csv index 15ca09b..0533cd5 100644 --- a/csvfiles/special_lists/buildhair.csv +++ b/csvfiles/special_lists/buildhair.csv @@ -1,3 +1,3 @@ -OR(;-heshe- has;uncommon) OR(-haircolor-;-descriptor-;-culture-;uncommon) hair OR(styled as -hairstyle-;,;rare) +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-;-descriptor-;-culture-;uncommon) OR(;and styled as -hairstyle-;rare) \ No newline at end of file +, -hisher- hair is OR(-haircolor-;-hairdescriptor-;-culture-;uncommon) OR(;and styled as -hairstyle-;rare) \ No newline at end of file diff --git a/csvfiles/special_lists/buildoutfit.csv b/csvfiles/special_lists/buildoutfit.csv index 764246b..233da67 100644 --- a/csvfiles/special_lists/buildoutfit.csv +++ b/csvfiles/special_lists/buildoutfit.csv @@ -4,7 +4,7 @@ , 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(;designed 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 -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 -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) by -brand-. It is OR(-outfitdescriptor-;-color-;normal) OR(;and OR(-outfitdescriptor-;-color-;normal);normal) OR(;. The -sameoutfit- looks -outfitdescriptor- on -himher-.;unique) \ No newline at end of file +, 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 -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 -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) by -brand-, It is OR(-outfitdescriptor-;-color-;normal) OR(;and OR(-outfitdescriptor-;-color-;normal);normal) OR(;, The -sameoutfit- looks -outfitdescriptor- on -himher-,;unique) \ No newline at end of file diff --git a/csvfiles/special_lists/humanadditions.csv b/csvfiles/special_lists/humanadditions.csv index 91b9c9c..5667cea 100644 --- a/csvfiles/special_lists/humanadditions.csv +++ b/csvfiles/special_lists/humanadditions.csv @@ -1,15 +1,16 @@ -OR(riding;with) a -animal- -holding a -object- -driving a -vehicle- -surrounded by OR(-object-s;-flora-s;-space-) -eating -food- -OR(and;holding hands with) -human- -cosplaying as -fictional- -with OR(-color-;-material-) skin -OR(feeling;expression is) -mood- --miniactivity- OR(in;at) a OR(-location-;-building-;-waterlocation-) -wearing -elaborateoutfit- +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) -as -culture- -rpgclass- -sitting in a OR(-descriptor-;uncommon) -chair- -inside a -container- \ No newline at end of file +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) \ No newline at end of file diff --git a/prompttester.py b/prompttester.py index 98328d7..8db9b4a 100644 --- a/prompttester.py +++ b/prompttester.py @@ -51,8 +51,13 @@ def generateprompts(amount = 1,insanitylevel="5",subject="all", artist="all", im print("") print("All done!") -generateprompts(10,5,"all","all","all",False,"","","PREFIXPROMPT" - ,"SUFFIXPROMPT, -hisher- hair is OR(-haircolor-;-descriptor-;-culture-;uncommon) OR(;and styled as -hairstyle-;rare)" - ,"",1,"","",True,"",100, "all", "all", "all", "all", False, True, 0 +generateprompts(10,5 + ,"humanoid" # subject + ,"all","all",False,"","","PREFIXPROMPT" + ,"SUFFIXPROMPT" + ,"",1,"" + ,"" # subject override + ,True, + "",100, "all", "all", "all", "all", False, True, 0 , "armor" #outfit override ) \ No newline at end of file