Update README.md

README.md

@@ -22,13 +22,14 @@ import functools
 class REMSleepPrmAnime:
 	def __init__(self):
 		# Time
-		self.year_range = {"both": {"newest", "recent", "mid", "early", "oldest"}}
+		self.year_ranges = {"both": {"newest", "recent", "mid", "early", "oldest"}}
 
 		# --- Subject
 		# Head
 		self.haircuts = {"both": {"bob", "pixie", "cut", "shaggy", "layers", "mullet", "afro", "fringe", "bangs", "quiff", "undercut", "braids", "knot", "ponytail", "curls", "blunt", "perm", "fade", "crop", "bowl", "curtain", "top", "balayage", "shag", "bang", "waves"},
 				"male": {"mohawk", "dreadlocks"}}
-		self.eye_colors = {"both": {"blue", "red", "yellow", "green", "orange", "red-orange", "yellow-orange", "yellow-green", "blue-green"} | {"gray", "amber", "hazel", "gold", "silver"},
+		self.eye_colors = {"both": {"blue", "red", "yellow", "green", "orange", "red-orange", "yellow-orange", "yellow-green", "blue-green"} \
+				| {"gray", "amber", "hazel", "gold", "silver"},
 				"female": {"pink", "purple", "red-purple", "blue-purple"}}
 		self.eye_shapes = {"both": {"normal", "large", "moe", "realistic", "cat", "wolf", "dog", "bird", "no irises", "heterochromia", "glowing", "small", "starburst pupils", "googly", "tearful", "chibi"}, "female": {"shoujo"}}
 		self.blush = {"female": {"blush"}}
@@ -42,9 +43,9 @@ class REMSleepPrmAnime:
 				"female": {"blush pink and white", "pink and red", "pink and orange", "gray and light pink", "dark green and pink", "pink and warm black", "pink and blue", "medium pink and red", "rose pink and periwinkle", "yellow and pink", "purple and pink", "pink and turquoise", "pink and green", "navy blue and pink", "purple and charcoal gray", "turquoise and purple", "purple and yellow", "electric purple and black", "purple and orange", "green and purple", "red and purple"}}
 		self.tops = {"female": {"t-shirts", "blouses", "tunics", "camisoles", "tank tops", "crewneck", "v-neck", "cardigan", "turtleneck", "pullovers", "henleys", "crop tops", "off-the-shoulder tops", "cold shoulder tops", "peplum tops"}}
 		self.bottoms = {"both": {"shorts", "chinos", "cargo pants"},
-				"female": {"skinny jeans", "straight jeans", "bootcut jeans", "flare jeans", "wide-leg jeans", "bermuda shorts", "hotpants", "A-line skirts", "pencil skirts", "maxi skirts", "midi skirts", "mini skirts", "dress pants", "linen pants", "capris"} | \
-						{"stockings", "tights", "fishnets", "leggings", "yoga pants"}}
-		self.one_piece = {"female": {"jumpsuits", "rompers", "swimsuits", "bodysuits"}}
+				"female": {"skinny jeans", "straight jeans", "bootcut jeans", "flare jeans", "wide-leg jeans", "bermuda shorts", "hotpants", "A-line skirts", "pencil skirts", "maxi skirts", "midi skirts", "mini skirts", "dress pants", "linen pants", "capris"} \
+				| {"stockings", "tights", "fishnets", "leggings", "yoga pants"}}
+		self.one_pieces = {"female": {"jumpsuits", "rompers", "swimsuits", "bodysuits"}}
 
 		# Personality
 		self.personality_traits = {"both": {"creative", "determined", "enthusiastic", "friendly", "generous", "humorous", "intelligent", "kind", "loyal", "motivated", "optimistic", "persistent", "resilient", "sincere", "thoughtful", "trustworthy", "versatile", "compassionate", "ambitious", "confident", "honest", "brave", "patient", "reliable", "adventurous", "charismatic", "gracious", "insightful", "perceptive", "resourceful", "selfless", "talented", "witty", "zealous"}}
@@ -61,8 +62,8 @@ class REMSleepPrmAnime:
 		self.eras = {"both": {"meiji period", "edo period"}}
 
 		# Styles
-		self.resolution = {"both": {"sharp focus", "8k"}}
-		self.lighting = {"both": {"rim lighting", "flat lighting", "cinematic lighting", "crepuscular rays"}}
+		self.resolutions = {"both": {"sharp focus", "8k"}}
+		self.lightings = {"both": {"rim lighting", "flat lighting", "cinematic lighting", "crepuscular rays"}}
 
 	def main(self):
 		def get_random_x(x, gender=["both"]):
@@ -78,7 +79,7 @@ class REMSleepPrmAnime:
 
 		commands = (
 			# You must put trailing comma to convert a parenthesized expression into a tuple
-			(self.year_range,),
+			(self.year_ranges,),
 			(self.personality_traits if rand50() else None,),
 			(self.actions,),
 
@@ -91,25 +92,23 @@ class REMSleepPrmAnime:
 			(self.earrings if rand50() else None,),
 
 			(self.outfit_colors, "outfit",),
-			*(((self.one_piece,),) if rand50() else ((self.tops,), (self.bottoms,))),
+			*(((self.one_pieces,),) if rand50() else ((self.tops,), (self.bottoms,))),
 
 			(self.camera_angels, "shot",),
 			((self.places,) if rand85() else (self.eras,)),
 
 			# ("masterpiece",), ("best quality",), ("very aesthetic",), ("absurdres",), # Already prepended
-			(self.resolution if rand50() else None,),
-			(self.lighting if rand50() else None,),
+			(self.resolutions if rand50() else None,),
+			(self.lightings if rand50() else None,),
 		)
 
-		output = [gender] + [
-			" ".join(
-				get_random_x_by_gender(elem) if isinstance(elem, dict) else elem
-				for elem in cmd
-				if elem is not None and isinstance(elem, (str, dict))
-			) for cmd in commands
-		]
+		output = [gender] + [" ".join(
+			get_random_x_by_gender(elem) if isinstance(elem, dict) else elem
+			for elem in cmd
+			if elem is not None and isinstance(elem, (str, dict))
+		) for cmd in commands]
 
-		return ", ".join([s for s in output if s != ""])
+		return ", ".join(filter(lambda s: s != "", output))
 
 if __name__ == "__main__":
 	prompt_generator = REMSleepPrmAnime()