diff --git a/lists/categorized_tags.txt b/lists/categorized_tags.txt index 3211dc7..2bcd484 100644 --- a/lists/categorized_tags.txt +++ b/lists/categorized_tags.txt @@ -3484,7 +3484,7 @@ [speech_and_text] spoken_interrobang [actions] hand_on_another's_thigh [actions] swimming -[sex_acts] gloved_handjob +[specific_garment_interactions] gloved_handjob [content_censorship_methods] novelty_censor [background_objects] seagull [clothes_and_accessories] two-sided_jacket @@ -5857,7 +5857,7 @@ [holding_small_items] holding_megaphone [one_handed_character_items] crime_prevention_buzzer [background_objects] campfire -[sex_acts] tail_grab +[actions] tail_grab [abstract_symbols] ankh [clothes_and_accessories] wrist_bow [clothes_and_accessories] frilled_wrist_cuffs @@ -11209,7 +11209,7 @@ [clothes_and_accessories] spiked_knuckles [standard_physical_descriptors] cashier [sex_acts] foreskin_pull -[sex_acts] fellatio_under_mask +[specific_garment_interactions] fellatio_under_mask [standard_physical_descriptors] half-harpy [one_handed_character_items] detonator [camera_framing_composition] penis_out_of_frame @@ -11795,7 +11795,7 @@ [sex_acts] yukadon [expressions_and_mental_state] fainted [poses] plank -[sex_acts] hand_under_skirt +[specific_garment_interactions] hand_under_skirt [relationships] grandfather_and_granddaughter [standard_physical_descriptors] cheetah_ears [one_handed_character_items] creamer_(vessel) @@ -12535,7 +12535,7 @@ [background_objects] seahorse [clothes_and_accessories] striped_camisole [clothes_and_accessories] feather-trimmed_jacket -[sex_acts] head_under_skirt +[specific_garment_interactions] head_under_skirt [clothes_and_accessories] flannel [female_physical_descriptors] long_nipples [thematic_settings] heian @@ -17509,7 +17509,7 @@ [metadata_and_attribution] 1996 [metadata_and_attribution] ghost_in_the_shell_lineup [standard_physical_descriptors] brushing_tail -[sex_acts] hand_in_bikini +[specific_garment_interactions] hand_in_bikini [holding_small_items] holding_jug [sex_acts] penetration_while_penetrated [two_handed_character_items] escudo_sword_(rayearth) diff --git a/raffle.py b/raffle.py index 6ecbdc4..cd01850 100644 --- a/raffle.py +++ b/raffle.py @@ -11,7 +11,7 @@ gaping, extreme_gaping, prolapse, anal_prolapse, fisting, anal_fisting, anal, anal_only, after_anal, anal_fluid, anal_object_insertion, butt_plug, jewel_butt_plug, anal_beads, vibrator_in_anus, -anus, cum_in_ass, spread_anus, anus_peek, puckered_anus, dark_anus, presenting_anus, spreading_own_anus, anus_cutout, censored_anus, spread_anus_under_clothes, colored_anus, +anus, cum_in_ass, spread_anus, spread_ass, anus_peek, puckered_anus, dark_anus, presenting_anus, spreading_own_anus, anus_cutout, censored_anus, spread_anus_under_clothes, colored_anus, pubic_hair, female_pubic_hair, pubic_hair_peek, colored_pubic_hair, sparse_pubic_hair, mismatched_pubic_hair, excessive_pubic_hair, shaped_pubic_hair, condom, used_condom, condom_wrapper, condom_in_mouth, holding_condom, condom_on_penis, multiple_condoms, condom_packet_strip, pointless_condom, condom_belt, condom_box, used_condom_on_penis, condom_left_inside, colored_condom, okamoto_condoms, condom_wrapper_in_clothes, condom_thigh_strap, buying_condoms, broken_condom, used_condom_in_clothes, """ @@ -20,6 +20,8 @@ DEFAULT_EXCLUDE_TAGLISTS = "comic, 4koma, multiple_girls, multiple_boys, multipl DEFAULT_EXCLUDE_CATEGORIES = "clothes_and_accessories, female_physical_descriptors, named_garment_exposure, specific_garment_interactions, speech_and_text, standard_physical_descriptors, metadata_and_attribution, intentional_design_exposure, two_handed_character_items, holding_large_items, content_censorship_methods" +DEFAULT_TAGLISTS_MUST_INCLUDE = "1girl" + class Raffle: @classmethod def INPUT_TYPES(s): @@ -39,7 +41,7 @@ class Raffle: "use_explicit": ("BOOLEAN", {"default": True, "tooltip": "Enable selection from explicit.txt which contains 100,000 explicit taglists"}), "taglists_must_include": ("STRING", { "multiline": True, - "default": "", + "default": DEFAULT_TAGLISTS_MUST_INCLUDE, "tooltip": " Only selects taglists that contain ALL of these tags. WARNING: Each tag added here severely reduces the available pool of taglists. Check the 'Debug info' output to see how many taglists remain available." }), "negative_prompt": ("STRING", { @@ -239,7 +241,7 @@ class Raffle: categories = {category: (category not in excluded_categories) for category in all_categories} # Create the categories debug output - categories_debug = "Available categories:\n" + "\n".join(all_categories) + categories_debug = "-- List of Categories --\n" + "\n".join(all_categories) # Load categorized tags with error handling allowed_tags = [] # Changed from set to list to preserve order diff --git a/readme.md b/readme.md index c8ae3a7..4993a5f 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,6 @@ # Raffle -A semi-random prompt generator for danbooru tags that works alongside your character prompts, allowing you to put your waifu in many situations. Made for Illustrious/Pony and any models supporting danbooru prompting. +A semi-random prompt generator for danbooru tags that works alongside your character prompt, allowing you to put your waifu in many scenarios. Made for Illustrious/NoobAI/Pony, any models supporting tag prompting. ## Quick Start