Merge pull request #132 from AIrjen/card_game_names_update
Added card names list
This commit is contained in:
AIrjen
@@ -63,6 +63,7 @@ generateevent = True
|
||||
generateconcepts = True
|
||||
generatepoemline = True
|
||||
generatesongline = True
|
||||
generatecardname = True
|
||||
|
||||
|
||||
for item in config:
|
||||
@@ -105,10 +106,12 @@ for item in config:
|
||||
generateevent = False
|
||||
if item[0] == 'subject_concept' and item[1] != 'on':
|
||||
generateconcepts = False
|
||||
if item[0] == 'poemline' and item[1] != 'on':
|
||||
if item[0] == 'subject_poemline' and item[1] != 'on':
|
||||
generatepoemline = False
|
||||
if item[0] == 'songline' and item[1] != 'on':
|
||||
if item[0] == 'subject_songline' and item[1] != 'on':
|
||||
generatesongline = False
|
||||
if item[0] == 'subject_cardname' and item[1] != 'on':
|
||||
generatecardname = False
|
||||
|
||||
# build up all subjects we can choose based on the loaded config file
|
||||
if(generatevehicle or generateobject or generatefood or generatebuilding or generatespace):
|
||||
@@ -119,7 +122,7 @@ if(generatemanwoman or generatemanwomanrelation or generatefictionalcharacter or
|
||||
subjects.append("humanoid")
|
||||
if(generatelandscape):
|
||||
subjects.append("landscape")
|
||||
if(generateevent or generateconcepts or generatepoemline or generatesongline):
|
||||
if(generateevent or generateconcepts or generatepoemline or generatesongline or generatecardname):
|
||||
subjects.append("concept")
|
||||
|
||||
|
||||
@@ -167,6 +170,8 @@ if(generatepoemline):
|
||||
subjectsubtypesconcept.append("lines from poems")
|
||||
if(generatesongline):
|
||||
subjectsubtypesconcept.append("lines from songs")
|
||||
if(generatecardname):
|
||||
subjectsubtypesconcept.append("names from card based games")
|
||||
|
||||
class OneButtonPrompt:
|
||||
|
||||
|
||||
+30
-8
@@ -103,6 +103,7 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all
|
||||
printlist = csv_to_list("prints", antilist)
|
||||
patternlist = csv_to_list("patterns", antilist)
|
||||
chairlist = csv_to_list("chairs", antilist)
|
||||
cardnamelist = csv_to_list("card_names", antilist)
|
||||
|
||||
humanlist = fictionallist + nonfictionallist + humanoidlist
|
||||
objecttotallist = objectlist + buildinglist + vehiclelist + foodlist + spacelist + floralist + containerlist
|
||||
@@ -191,6 +192,7 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all
|
||||
generateconcepts = True
|
||||
generatepoemline = True
|
||||
generatesongline = True
|
||||
generatecardname = True
|
||||
|
||||
custominputprefixrepeats = 2
|
||||
custominputprefixchance = 'uncommon'
|
||||
@@ -305,10 +307,12 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all
|
||||
generateevent = False
|
||||
if item[0] == 'subject_concept' and item[1] != 'on':
|
||||
generateconcepts = False
|
||||
if item[0] == 'poemline' and item[1] != 'on':
|
||||
if item[0] == 'subject_poemline' and item[1] != 'on':
|
||||
generatepoemline = False
|
||||
if item[0] == 'songline' and item[1] != 'on':
|
||||
if item[0] == 'subject_songline' and item[1] != 'on':
|
||||
generatesongline = False
|
||||
if item[0] == 'subject_cardname' and item[1] != 'on':
|
||||
generatecardname = False
|
||||
|
||||
# main list stuff
|
||||
if item[0] == 'custominputprefixrepeats':
|
||||
@@ -546,6 +550,7 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all
|
||||
generateconcepts = bool(conceptprefixlist) and bool(conceptsuffixlist) and generateconcepts
|
||||
generatepoemline = bool(poemlinelist) and generatepoemline
|
||||
generatesongline = bool(songlinelist) and generatesongline
|
||||
generatecardname = bool(cardnamelist) and generatecardname
|
||||
|
||||
|
||||
|
||||
@@ -562,10 +567,15 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all
|
||||
|
||||
if(generatesongline):
|
||||
eventsubjectchooserlist.append("songline")
|
||||
|
||||
if(generatecardname):
|
||||
eventsubjectchooserlist.append("cardname")
|
||||
|
||||
if(generateconcept):
|
||||
mainchooserlist.append("concept")
|
||||
|
||||
|
||||
|
||||
# determine wether we have a special mode or not
|
||||
if(random.randint(1,int(imagemodechance)) == 1 and imagetype == "all" and giventypeofimage == ""):
|
||||
imagetype = random.choice(imagetypemodelist) # override imagetype with a random "mode" value
|
||||
@@ -669,6 +679,7 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all
|
||||
generategreatwork = bool(greatworklist) and not specialmode
|
||||
generatepoemline = bool(poemlinelist) and not specialmode
|
||||
generatesongline = bool(songlinelist) and not specialmode
|
||||
generatecardname = bool(cardnamelist) and not specialmode
|
||||
|
||||
generateminilocationaddition = bool(minilocationadditionslist) and not specialmode
|
||||
generateminivomit = bool(minivomitlist) and not specialmode
|
||||
@@ -947,6 +958,8 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all
|
||||
subjectchooser = "poemline"
|
||||
if(subtypeconcept == "lines from songs"):
|
||||
subjectchooser = "songline"
|
||||
if(subtypeconcept == "names from card based games"):
|
||||
subjectchooser = "cardname"
|
||||
|
||||
|
||||
|
||||
@@ -1505,6 +1518,9 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all
|
||||
|
||||
if(subjectchooser == "songline"):
|
||||
completeprompt += " \" -songline- \" "
|
||||
|
||||
if(subjectchooser == "cardname"):
|
||||
completeprompt += " \" -cardname- \" "
|
||||
else:
|
||||
completeprompt += " " + givensubject + " "
|
||||
|
||||
@@ -1994,9 +2010,10 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all
|
||||
"-miniactivity-" in completeprompt or
|
||||
"-pattern-" in completeprompt or
|
||||
"-animalsuffixaddition-" in completeprompt or
|
||||
"-chair-" in completeprompt):
|
||||
allwildcardslistnohybrid = [ "-color-","-object-", "-animal-", "-fictional-","-nonfictional-","-building-","-vehicle-","-location-","-conceptprefix-","-food-","-haircolor-","-hairstyle-","-job-", "-accessory-", "-humanoid-", "-manwoman-", "-human-", "-colorscheme-", "-mood-", "-genderdescription-", "-artmovement-", "-malefemale-", "-bodytype-", "-minilocation-", "-minilocationaddition-", "-pose-", "-season-", "-minioutfit-", "-elaborateoutfit-", "-minivomit-", "-vomit-", "-rpgclass-", "-subjectfromfile-", "-brand-", "-space-", "-artist-", "-imagetype-", "-othertype-", "-quality-", "-lighting-", "-camera-", "-lens-","-imagetypequality-", "-poemline-", "-songline-", "-greatwork-", "-artistfantasy-", "-artistpopular-", "-artistromanticism-", "-artistphotography-", "-emoji-", "-timeperiod-", "-shotsize-", "-musicgenre-", "-animaladdition-", "-addontolocationinside-", "-addontolocation-", "-objectaddition-", "-humanaddition-", "-overalladdition-", "-focus-", "-direction-", "-styletilora-", "-manwomanrelation-", "-waterlocation-", "-container-", "-firstname-", "-flora-", "-print-", "-miniactivity-", "-pattern-", "-animalsuffixaddition-", "-chair-"]
|
||||
allwildcardslistnohybridlists = [colorlist, objectlist, animallist, fictionallist, nonfictionallist, buildinglist, vehiclelist, locationlist,conceptprefixlist,foodlist,haircolorlist, hairstylelist,joblist, accessorielist, humanoidlist, manwomanlist, humanlist, colorschemelist, moodlist, genderdescriptionlist, artmovementlist, malefemalelist, bodytypelist, minilocationlist, minilocationadditionslist, poselist, seasonlist, minioutfitlist, elaborateoutfitlist, minivomitlist, vomitlist, rpgclasslist, customsubjectslist, brandlist, spacelist, artistlist, imagetypelist, othertypelist, qualitylist, lightinglist, cameralist, lenslist, imagetypequalitylist, poemlinelist, songlinelist, greatworklist, fantasyartistlist, popularartistlist, romanticismartistlist, photographyartistlist, emojilist, timeperiodlist, shotsizelist, musicgenrelist, animaladditionlist, addontolocationinsidelist, addontolocationlist, objectadditionslist, humanadditionlist, overalladditionlist, focuslist, directionlist, stylestiloralist, manwomanrelationlist, waterlocationlist, containerlist, firstnamelist, floralist, printlist, miniactivitylist, patternlist, animalsuffixadditionlist, chairlist]
|
||||
"-chair-" in completeprompt or
|
||||
"-cardname-" 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-"]
|
||||
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]
|
||||
|
||||
allwildcardslistwithhybrid = ["-material-", "-descriptor-", "-outfit-", "-conceptsuffix-","-culture-", "-objecttotal-", "-outfitprinttotal-"]
|
||||
allwildcardslistwithhybridlists = [materiallist, descriptorlist,outfitlist,conceptsuffixlist,culturelist, objecttotallist, outfitprinttotallist]
|
||||
@@ -2132,6 +2149,7 @@ def createpromptvariant(prompt = "", insanitylevel = 5, antivalues = "" , gender
|
||||
printlist = csv_to_list("prints", antilist)
|
||||
patternlist = csv_to_list("patterns", antilist)
|
||||
chairlist = csv_to_list("chairs", antilist)
|
||||
cardnamelist = csv_to_list("card_names", antilist)
|
||||
|
||||
humanlist = fictionallist + nonfictionallist + humanoidlist + malefemalelist + manwomanlist + manwomanrelationlist
|
||||
objecttotallist = objectlist + buildinglist + vehiclelist + foodlist + spacelist + floralist + containerlist
|
||||
@@ -2398,6 +2416,8 @@ def createpromptvariant(prompt = "", insanitylevel = 5, antivalues = "" , gender
|
||||
prompt = prompt.replace(combination," -pattern- ")
|
||||
if lowercase_combination in [x.lower() for x in chairlist] and chance_roll(insanitylevel, "uncommon"):
|
||||
prompt = prompt.replace(combination," -chair- ")
|
||||
if lowercase_combination in [x.lower() for x in cardnamelist] and chance_roll(insanitylevel, "uncommon"):
|
||||
prompt = prompt.replace(combination," -cardname- ")
|
||||
|
||||
|
||||
if lowercase_combination in [x.lower() for x in fantasyartistlist] and chance_roll(insanitylevel, "uncommon"):
|
||||
@@ -2501,9 +2521,11 @@ def createpromptvariant(prompt = "", insanitylevel = 5, antivalues = "" , gender
|
||||
"-flora-" in completeprompt or
|
||||
"-print-" in completeprompt or
|
||||
"-miniactivity-" in completeprompt or
|
||||
"-pattern-" in completeprompt):
|
||||
allwildcardslistnohybrid = [ "-color-","-object-", "-animal-", "-fictional-","-nonfictional-","-building-","-vehicle-","-location-","-conceptprefix-","-food-","-haircolor-","-hairstyle-","-job-", "-accessory-", "-humanoid-", "-manwoman-", "-human-", "-colorscheme-", "-mood-", "-genderdescription-", "-artmovement-", "-malefemale-", "-bodytype-", "-minilocation-", "-minilocationaddition-", "-pose-", "-season-", "-minioutfit-", "-elaborateoutfit-", "-minivomit-", "-vomit-", "-rpgclass-", "-subjectfromfile-", "-brand-", "-space-", "-artist-", "-imagetype-", "-othertype-", "-quality-", "-lighting-", "-camera-", "-lens-","-imagetypequality-", "-poemline-", "-songline-", "-greatwork-", "-artistfantasy-", "-artistpopular-", "-artistromanticism-", "-artistphotography-", "-emoji-", "-timeperiod-", "-shotsize-", "-musicgenre-", "-animaladdition-", "-objectaddition-", "-humanaddition-", "-overalladdition-", "-focus-", "-direction-", "-styletilora-", "-manwomanrelation-", "-waterlocation-", "-container-", "-firstname-", "-flora-", "-print-", "-miniactivity-", "-pattern-"]
|
||||
allwildcardslistnohybridlists = [colorlist, objectlist, animallist, fictionallist, nonfictionallist, buildinglist, vehiclelist, locationlist,conceptprefixlist,foodlist,haircolorlist, hairstylelist,joblist, accessorielist, humanoidlist, manwomanlist, humanlist, colorschemelist, moodlist, genderdescriptionlist, artmovementlist, malefemalelist, bodytypelist, minilocationlist, minilocationadditionslist, poselist, seasonlist, minioutfitlist, elaborateoutfitlist, minivomitlist, vomitlist, rpgclasslist, customsubjectslist, brandlist, spacelist, artistlist, imagetypelist, othertypelist, qualitylist, lightinglist, cameralist, lenslist, imagetypequalitylist, poemlinelist, songlinelist, greatworklist, fantasyartistlist, popularartistlist, romanticismartistlist, photographyartistlist, emojilist, timeperiodlist, shotsizelist, musicgenrelist, animaladditionlist, objectadditionslist, humanadditionlist, overalladditionlist, focuslist, directionlist, stylestiloralist, manwomanrelationlist, waterlocationlist, containerlist, firstnamelist, floralist, printlist, miniactivitylist, patternlist]
|
||||
"-pattern-" in completeprompt or
|
||||
"-chair-" in completeprompt or
|
||||
"-cardname-" 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-"]
|
||||
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]
|
||||
|
||||
allwildcardslistwithhybrid = ["-material-", "-descriptor-", "-outfit-", "-conceptsuffix-","-culture-", "-objecttotal-", "-outfitprinttotal-"]
|
||||
allwildcardslistwithhybridlists = [materiallist, descriptorlist,outfitlist,conceptsuffixlist,culturelist, objecttotallist, outfitprinttotallist]
|
||||
|
||||
+20030
File diff suppressed because it is too large
Load Diff
@@ -98,6 +98,7 @@ generateevent = True
|
||||
generateconcepts = True
|
||||
generatepoemline = True
|
||||
generatesongline = True
|
||||
generatecardname = True
|
||||
|
||||
|
||||
for item in config:
|
||||
@@ -140,10 +141,12 @@ for item in config:
|
||||
generateevent = False
|
||||
if item[0] == 'subject_concept' and item[1] != 'on':
|
||||
generateconcepts = False
|
||||
if item[0] == 'poemline' and item[1] != 'on':
|
||||
if item[0] == 'subject_poemline' and item[1] != 'on':
|
||||
generatepoemline = False
|
||||
if item[0] == 'songline' and item[1] != 'on':
|
||||
if item[0] == 'subject_songline' and item[1] != 'on':
|
||||
generatesongline = False
|
||||
if item[0] == 'subject_cardname' and item[1] != 'on':
|
||||
generatecardname = False
|
||||
|
||||
# build up all subjects we can choose based on the loaded config file
|
||||
if(generatevehicle or generateobject or generatefood or generatebuilding or generatespace):
|
||||
@@ -154,7 +157,7 @@ if(generatemanwoman or generatemanwomanrelation or generatefictionalcharacter or
|
||||
subjects.append("humanoid")
|
||||
if(generatelandscape):
|
||||
subjects.append("landscape")
|
||||
if(generateevent or generateconcepts or generatepoemline or generatesongline):
|
||||
if(generateevent or generateconcepts or generatepoemline or generatesongline or generatecardname):
|
||||
subjects.append("concept")
|
||||
|
||||
|
||||
@@ -202,6 +205,8 @@ if(generatepoemline):
|
||||
subjectsubtypesconcept.append("lines from poems")
|
||||
if(generatesongline):
|
||||
subjectsubtypesconcept.append("lines from songs")
|
||||
if(generatecardname):
|
||||
subjectsubtypesconcept.append("names from card based games")
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user