diff --git a/README.md b/README.md index 8e6fadb..31f11ba 100644 --- a/README.md +++ b/README.md @@ -156,8 +156,8 @@ Afghan, Algerian, American, Argentinian, Australian, Bangladeshi, Brazilian, Bri ### Complexion (15) porcelain, fair, light, light medium, warm beige, warm olive, olive, medium, warm medium, tan, golden brown, medium brown, deep brown, deep, ebony -### Skin Texture (20) -smooth, clear, dewy, glowing, matte, oily, large pores, freckled, beauty spots, moles, blemished, acne scars, rosacea, vitiligo, ruddy, fine lines, wrinkled, sun-spotted, weathered, leathery +### Skin Texture (19) +smooth, clear, dewy, glowing, matte, oily, large pores, beauty spots, moles, blemished, acne scars, rosacea, vitiligo, ruddy, fine lines, wrinkled, sun-spotted, weathered, leathery > Skin texture is separate from complexion (tone). It appends after the complexion in both the `description` and the `complexion` pin, e.g. `tan, smooth skin`. diff --git a/data/shared/skin_texture.json b/data/shared/skin_texture.json index 372ddec..988d491 100644 --- a/data/shared/skin_texture.json +++ b/data/shared/skin_texture.json @@ -27,10 +27,6 @@ "label": "large pores", "description": "visibly large pores" }, - { - "label": "freckled", - "description": "freckled skin" - }, { "label": "beauty spots", "description": "scattered beauty spots" diff --git a/nodes.py b/nodes.py index 2651ee7..68a4552 100644 --- a/nodes.py +++ b/nodes.py @@ -528,7 +528,7 @@ def make_v1_node(node_id, display_name, keys, include_age, output_names): required["age_max"] = ("INT", {"default": 0, "min": 0, "max": 90, "tooltip": _AGEMAX_TIP}) required["age_fixed"] = ("INT", {"default": 0, "min": 0, "max": 90, "tooltip": _AGEFIX_TIP}) required["extra_attributes"] = ("STRING", {"default": "", "multiline": True, - "placeholder": "Add any extra details to pass into the description, e.g. wearing a red scarf, holding a coffee, tattoo on left arm, freckles", + "placeholder": "Add any extra details to pass into the description, e.g. wearing a red scarf, holding a coffee, tattoo on left arm", "tooltip": _EXTRA_TIP}) return {"required": required} @@ -598,7 +598,7 @@ try: ] inputs.append( io.String.Input("extra_attributes", default="", multiline=True, - placeholder="Add any extra details to pass into the description, e.g. wearing a red scarf, holding a coffee, tattoo on left arm, freckles", tooltip=_EXTRA_TIP)) + placeholder="Add any extra details to pass into the description, e.g. wearing a red scarf, holding a coffee, tattoo on left arm", tooltip=_EXTRA_TIP)) outputs = [] for name in output_names: if name == "seed": diff --git a/test_random_person.py b/test_random_person.py index 489af86..54909bf 100644 --- a/test_random_person.py +++ b/test_random_person.py @@ -83,10 +83,10 @@ class TestSelection(unittest.TestCase): self.assertEqual(run(seed=seed, sex="male")[11], "") # makeup pin empty def test_skin_texture_in_complexion_pin(self): - out = run(skin_texture=("fixed", "", "freckled"), + out = run(skin_texture=("fixed", "", "dewy"), complexion=("fixed", "", "tan")) self.assertIn("tan", out[4]) - self.assertIn("freckled", out[4]) + self.assertIn("dewy", out[4]) def test_eye_shape_merges_into_eyes(self): # eye_shape sits in front of the eye colour, single "eyes" suffix, and