@botharness/pixel-avatar 0.3.0 → 0.4.0

package/README.md

@@ -19,5 +19,6 @@ const svg = pixelAvatarSvg(recipe); // 32×32 viewBox, crisp edges, no ids or sc
 - `isPixelAvatarRecipe`, `canonicalRecipe`: validate and normalise saved recipes.
 - `AVATAR_HAIR_PARTS`, `AVATAR_RANGES`, `detailedRecipe(recipe)`: optional finer controls. A recipe may carry `bangs`, `sideHair`, `backHair`, `spacing`, `height` and `hairLength`, all six or none; `detailedRecipe` derives them from the plain `hair` so an editor can start from what is on screen. Recipes without them render exactly as before.
 - `AVATAR_SPECIES`, `AVATAR_SPECIES_SWATCHES`, `AVATAR_PIECE_COLORS`, `withSpecies(recipe, species)`: Avatar Species (`human`, `goblin`) on the same rig, as asset version 2. `withSpecies` keeps every choice, splits side hair into `sideHair` (left) and `rightSideHair`, and accepts optional `leftSideHairColor`/`rightSideHairColor`, where left and right are as seen on screen. Consumers built before version 2 reject these recipes with `isPixelAvatarRecipe` and can show a saved snapshot instead.
+- `AVATAR_PARTS_V2`, `AVATAR_EXTRA_PARTS`, `hiddenChoices(recipe)`: version 2 adds elf, dwarf, orc and flower species, armor/robe/tunic/cloak outfits, helmet/hood headwear, an optional `beard`, and a flower's `petals` and `flowerBase`. `hiddenChoices` names saved choices the current species or headwear keeps but does not draw, so an editor can say so instead of discarding them.
 - `faceCells`, `pixelSymbolCells`, `symbolArtCells`: pixels for [`@botharness/pixel-morph`](../morph).
 - `pixelAvatarSvg(recipe, { turns, classPrefix })`: optional pre-rendered head turns, and rig layer classes (`<prefix>-body`, `-head`, `-face`, `-gaze`, `-blink`) for CSS animation.

package/dist/index.d.ts

@@ -34,37 +34,65 @@ type AvatarColor = (typeof AVATAR_COLORS)[number];
  * Avatar Species: a base on the pixel bust rig. Species share motion and anchors; each sets its
  * own ears, face details and suggested body colors. A recipe with a species is asset version 2.
  */
-declare const AVATAR_SPECIES: readonly ["human", "goblin"];
+declare const AVATAR_SPECIES: readonly ["human", "goblin", "elf", "dwarf", "orc", "flower"];
 type AvatarSpecies = (typeof AVATAR_SPECIES)[number];
 /** Optional per-piece hair colors (asset version 2); an absent piece uses `hairColor`. */
 declare const AVATAR_PIECE_COLORS: readonly ["leftSideHairColor", "rightSideHairColor"];
 type AvatarPieceColor = (typeof AVATAR_PIECE_COLORS)[number];
-type BaseRecipe = {
+/** Part choices that exist only in asset version 2, added after every version 1 choice. */
+declare const AVATAR_PARTS_V2: {
+  readonly outfit: readonly ["tee", "shirttie", "hoodie", "turtleneck", "sailor", "blazer", "overalls", "dress", "kimono", "cardigan", "maid", "jacket", "armor", "robe", "tunic", "cloak"];
+  readonly accessory: readonly ["none", "beanie", "cap", "headphones", "flower", "bow", "earring", "crown", "halo", "catears", "hairclip", "horns", "beret", "ribbon", "headband", "bunnyears", "horseears", "flowercrown", "witch", "pins", "helmet", "hood"];
+  readonly head: readonly ["round", "oval", "square", "long", "heart", "vchin", "chubby", "diamond"];
+  readonly pose: readonly ["front", "left", "right"];
+  readonly hair: readonly ["crop", "sweep", "spiky", "buzz", "curly", "mohawk", "bob", "long", "bun", "pigtails", "afro", "twintails", "drills", "ponytail", "sidetail", "hime", "odango", "messy", "wavy", "braids", "wolf", "ahoge", "none"];
+  readonly eyes: readonly ["round", "dot", "sparkle", "lashes", "sleepy", "happy", "wink", "sharp"];
+  readonly brows: readonly ["soft", "thick", "raised", "angry", "worried", "none"];
+  readonly nose: readonly ["button", "dot", "line", "none"];
+  readonly mouth: readonly ["smile", "grin", "open", "flat", "smirk", "cat", "tongue", "o"];
+  readonly cheeks: readonly ["blush", "freckles", "none"];
+  readonly glasses: readonly ["none", "round", "square", "shades", "monocle"];
+  readonly backdrop: readonly ["sparkles", "hearts", "stars", "dots", "none"];
+};
+/** Optional asset version 2 parts; an absent part is not drawn (or uses the first choice). */
+declare const AVATAR_EXTRA_PARTS: {
+  readonly beard: readonly ["short", "full", "braided"];
+  readonly petals: readonly ["trumpet", "daisy", "sunflower", "tulip", "sakura"];
+  readonly flowerBase: readonly ["leaves", "pot"];
+};
+type AvatarExtraPart = keyof typeof AVATAR_EXTRA_PARTS;
+type Meta = {
   schemaVersion: 1;
   family: 'illustrated';
   rigVersion: 1;
-} & { [P in AvatarPart]: (typeof AVATAR_PARTS)[P][number] } & Record<AvatarColor, string>;
+} & Record<AvatarColor, string>;
 /** Asset version 1: optional split hair and geometry, all six or none. */
-type PixelAvatarRecipeV1 = BaseRecipe & {
+type PixelAvatarRecipeV1 = Meta & {
   assetVersion: 1;
-} & { [P in AvatarHairPart]?: (typeof AVATAR_PARTS)['hair'][number] } & { [P in AvatarRange]?: number } & {
+} & { [P in AvatarPart]: (typeof AVATAR_PARTS)[P][number] } & { [P in AvatarHairPart]?: (typeof AVATAR_PARTS)['hair'][number] } & { [P in AvatarRange]?: number } & {
   species?: never;
   rightSideHair?: never;
-} & { [P in AvatarPieceColor]?: never };
+} & { [P in AvatarPieceColor | AvatarExtraPart]?: never };
 /**
  * Asset version 2: a species, the full split hair and geometry, a separate right side hair
  * (`sideHair` is then the left side) and optional per-side hair colors.
  */
-type PixelAvatarRecipeV2 = BaseRecipe & {
+type PixelAvatarRecipeV2 = Meta & {
   assetVersion: 2;
-} & { [P in AvatarHairPart]: (typeof AVATAR_PARTS)['hair'][number] } & { [P in AvatarRange]: number } & {
+} & { [P in AvatarPart]: (typeof AVATAR_PARTS_V2)[P][number] } & { [P in AvatarHairPart]: (typeof AVATAR_PARTS)['hair'][number] } & { [P in AvatarRange]: number } & {
   species: AvatarSpecies;
   rightSideHair: (typeof AVATAR_HAIR_PARTS)['sideHair'][number];
-} & { [P in AvatarPieceColor]?: string };
+} & { [P in AvatarPieceColor]?: string } & { [P in AvatarExtraPart]?: (typeof AVATAR_EXTRA_PARTS)[P][number] };
 type PixelAvatarRecipe = PixelAvatarRecipeV1 | PixelAvatarRecipeV2;
 declare const DEFAULT_RECIPE: PixelAvatarRecipeV1;
 declare function isPixelAvatarRecipe(value: unknown): value is PixelAvatarRecipe;
 declare function canonicalRecipe(recipe: PixelAvatarRecipe): PixelAvatarRecipe;
+/**
+ * Saved choices the recipe keeps but does not draw: a flower shows petals and a stem instead of
+ * hair, outfit, beard and headwear, and a helmet or hood covers the hair. The choices return when
+ * the species or headwear changes back.
+ */
+declare function hiddenChoices(recipe: PixelAvatarRecipe): readonly string[];
 /**
  * Returns the recipe as asset version 2 with the given species, keeping every other choice.
  * Side hair splits into left (`sideHair`) and right (`rightSideHair`) pieces that start equal.
@@ -79,6 +107,15 @@ declare const AVATAR_SWATCHES: Record<AvatarColor, readonly string[]>;
  * name; the factory takes the name only, so it is safe to pass straight to `Array.map`.
  */
 declare function createSeededRecipe(namespace: string): (seed: string) => PixelAvatarRecipe;
+/**
+ * A version 2 name-seeded recipe factory over every species. Species are equally likely; a
+ * person may get a beard or a version 2 outfit, and a flower gets petals and a base. Version 1
+ * factories (`createSeededRecipe`) keep their faces, so a consumer chooses per identity which
+ * seed version it was created with.
+ */
+declare function createSeededRecipeV2(namespace: string): (seed: string) => PixelAvatarRecipeV2;
+/** Version 2 counterpart of `seededRecipe` (BotHarness's namespace). */
+declare const seededRecipeV2: (seed: string) => PixelAvatarRecipeV2;
 /** The same name always gives the same face (BotHarness's namespace). */
 declare const seededRecipe: (seed: string) => PixelAvatarRecipe;
 /** Suggested body colors per species; any color remains allowed. */
@@ -150,5 +187,5 @@ declare function pixelSymbolCells(symbol: PixelSymbol, color: string): PixelCell
  */
 declare function symbolArtCells(rows: readonly string[], color: string): PixelCell$1[];
 //#endregion
-export { AVATAR_COLORS, AVATAR_HAIR_PARTS, AVATAR_PARTS, AVATAR_PIECE_COLORS, AVATAR_PRESETS, AVATAR_RANGES, AVATAR_SPECIES, AVATAR_SPECIES_SWATCHES, AVATAR_SWATCHES, AVATAR_TURNS, type AvatarColor, type AvatarHairPart, type AvatarPart, type AvatarPieceColor, type AvatarRange, type AvatarSpecies, DEFAULT_RECIPE, PIXEL_SYMBOLS, type PixelAvatarRecipe, type PixelAvatarRecipeV1, type PixelAvatarRecipeV2, type PixelAvatarSvgOptions, type PixelCell, type PixelFigureOptions, type PixelGrid, type PixelMouthState, type PixelSymbol, canonicalRecipe, createSeededRecipe, detailedRecipe, faceCells, isPixelAvatarRecipe, pixelAvatarSvg, pixelFigure, pixelSymbolCells, pixelTileColor, seededRandom, seededRecipe, symbolArtCells, withSpecies };
+export { AVATAR_COLORS, AVATAR_EXTRA_PARTS, AVATAR_HAIR_PARTS, AVATAR_PARTS, AVATAR_PARTS_V2, AVATAR_PIECE_COLORS, AVATAR_PRESETS, AVATAR_RANGES, AVATAR_SPECIES, AVATAR_SPECIES_SWATCHES, AVATAR_SWATCHES, AVATAR_TURNS, type AvatarColor, type AvatarExtraPart, type AvatarHairPart, type AvatarPart, type AvatarPieceColor, type AvatarRange, type AvatarSpecies, DEFAULT_RECIPE, PIXEL_SYMBOLS, type PixelAvatarRecipe, type PixelAvatarRecipeV1, type PixelAvatarRecipeV2, type PixelAvatarSvgOptions, type PixelCell, type PixelFigureOptions, type PixelGrid, type PixelMouthState, type PixelSymbol, canonicalRecipe, createSeededRecipe, createSeededRecipeV2, detailedRecipe, faceCells, hiddenChoices, isPixelAvatarRecipe, pixelAvatarSvg, pixelFigure, pixelSymbolCells, pixelTileColor, seededRandom, seededRecipe, seededRecipeV2, symbolArtCells, withSpecies };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -323,9 +323,48 @@ const AVATAR_COLORS = [
 * Avatar Species: a base on the pixel bust rig. Species share motion and anchors; each sets its
 * own ears, face details and suggested body colors. A recipe with a species is asset version 2.
 */
-const AVATAR_SPECIES = ["human", "goblin"];
+const AVATAR_SPECIES = [
+	"human",
+	"goblin",
+	"elf",
+	"dwarf",
+	"orc",
+	"flower"
+];
 /** Optional per-piece hair colors (asset version 2); an absent piece uses `hairColor`. */
 const AVATAR_PIECE_COLORS = ["leftSideHairColor", "rightSideHairColor"];
+/** Part choices that exist only in asset version 2, added after every version 1 choice. */
+const AVATAR_PARTS_V2 = {
+	...AVATAR_PARTS,
+	outfit: [
+		...AVATAR_PARTS.outfit,
+		"armor",
+		"robe",
+		"tunic",
+		"cloak"
+	],
+	accessory: [
+		...AVATAR_PARTS.accessory,
+		"helmet",
+		"hood"
+	]
+};
+/** Optional asset version 2 parts; an absent part is not drawn (or uses the first choice). */
+const AVATAR_EXTRA_PARTS = {
+	beard: [
+		"short",
+		"full",
+		"braided"
+	],
+	petals: [
+		"trumpet",
+		"daisy",
+		"sunflower",
+		"tulip",
+		"sakura"
+	],
+	flowerBase: ["leaves", "pot"]
+};
 const DEFAULT_RECIPE = {
 	schemaVersion: 1,
 	family: "illustrated",
@@ -356,14 +395,16 @@ function isPixelAvatarRecipe(value) {
 	if (detailed !== 0 && detailed !== DETAIL_KEYS.length) return false;
 	const v2 = r["assetVersion"] === 2;
 	const pieces = AVATAR_PIECE_COLORS.filter((key) => Object.hasOwn(r, key));
-	const v2Keys = v2 ? 2 + pieces.length : 0;
+	const extras = Object.keys(AVATAR_EXTRA_PARTS).filter((key) => Object.hasOwn(r, key));
+	const v2Keys = v2 ? 2 + pieces.length + extras.length : 0;
 	if (Object.keys(r).length !== Object.keys(DEFAULT_RECIPE).length + detailed + v2Keys) return false;
-	if (v2 && (detailed === 0 || !AVATAR_SPECIES.includes(r["species"]) || !AVATAR_HAIR_PARTS.sideHair.includes(r["rightSideHair"]) || !pieces.every((key) => typeof r[key] === "string" && /^#[\da-f]{6}$/iu.test(r[key])))) return false;
+	if (v2 && (detailed === 0 || !AVATAR_SPECIES.includes(r["species"]) || !AVATAR_HAIR_PARTS.sideHair.includes(r["rightSideHair"]) || !pieces.every((key) => typeof r[key] === "string" && /^#[\da-f]{6}$/iu.test(r[key])) || !extras.every((key) => AVATAR_EXTRA_PARTS[key].includes(r[key])))) return false;
+	const catalog = v2 ? AVATAR_PARTS_V2 : AVATAR_PARTS;
 	return (detailed === 0 || Object.keys(AVATAR_HAIR_PARTS).every((key) => typeof r[key] === "string" && AVATAR_HAIR_PARTS[key].includes(r[key])) && Object.keys(AVATAR_RANGES).every((key) => {
 		const v = r[key];
 		const [min, max] = AVATAR_RANGES[key];
 		return typeof v === "number" && Number.isInteger(v) && v >= min && v <= max;
-	})) && r["schemaVersion"] === 1 && r["family"] === "illustrated" && (r["assetVersion"] === 1 || v2) && r["rigVersion"] === 1 && PART_KEYS.every((key) => typeof r[key] === "string" && AVATAR_PARTS[key].includes(r[key])) && AVATAR_COLORS.every((key) => typeof r[key] === "string" && /^#[\da-f]{6}$/iu.test(r[key]));
+	})) && r["schemaVersion"] === 1 && r["family"] === "illustrated" && (r["assetVersion"] === 1 || v2) && r["rigVersion"] === 1 && PART_KEYS.every((key) => typeof r[key] === "string" && catalog[key].includes(r[key])) && AVATAR_COLORS.every((key) => typeof r[key] === "string" && /^#[\da-f]{6}$/iu.test(r[key]));
 }
 function canonicalRecipe(recipe) {
 	const canonical = {
@@ -379,9 +420,38 @@ function canonicalRecipe(recipe) {
 		canonical["species"] = recipe.species;
 		canonical["rightSideHair"] = recipe.rightSideHair;
 		for (const key of AVATAR_PIECE_COLORS) if (recipe[key] !== void 0) canonical[key] = recipe[key].toLowerCase();
+		for (const key of Object.keys(AVATAR_EXTRA_PARTS)) if (recipe[key] !== void 0) canonical[key] = recipe[key];
 	}
 	return canonical;
 }
+const HAIR_PIECES = [
+	"bangs",
+	"sideHair",
+	"rightSideHair",
+	"backHair"
+];
+/**
+* Saved choices the recipe keeps but does not draw: a flower shows petals and a stem instead of
+* hair, outfit, beard and headwear, and a helmet or hood covers the hair. The choices return when
+* the species or headwear changes back.
+*/
+function hiddenChoices(recipe) {
+	if (recipe.species === "flower") return [
+		...HAIR_PIECES,
+		"outfit",
+		"accessory",
+		"eyes",
+		"brows",
+		"nose",
+		"cheeks",
+		"glasses",
+		...recipe.beard ? ["beard"] : []
+	];
+	const hidden = [];
+	if (recipe.accessory === "helmet" || recipe.accessory === "hood") hidden.push(...HAIR_PIECES);
+	if (recipe.species === "dwarf") hidden.push("nose");
+	return hidden;
+}
 /**
 * Returns the recipe as asset version 2 with the given species, keeping every other choice.
 * Side hair splits into left (`sideHair`) and right (`rightSideHair`) pieces that start equal.
@@ -551,6 +621,38 @@ function createSeededRecipe(namespace) {
 		return recipe;
 	};
 }
+/**
+* A version 2 name-seeded recipe factory over every species. Species are equally likely; a
+* person may get a beard or a version 2 outfit, and a flower gets petals and a base. Version 1
+* factories (`createSeededRecipe`) keep their faces, so a consumer chooses per identity which
+* seed version it was created with.
+*/
+function createSeededRecipeV2(namespace) {
+	const base = createSeededRecipe(`${namespace}:base`);
+	return (seed) => {
+		const random = seededRandom(`${namespace}:${seed.trim().toLowerCase()}`);
+		const pick = (values) => values[Math.floor(random() * values.length)];
+		const species = pick(AVATAR_SPECIES);
+		const recipe = {
+			...withSpecies(base(seed), species),
+			skinColor: pick(AVATAR_SPECIES_SWATCHES[species])
+		};
+		if (species === "flower") return {
+			...recipe,
+			petals: pick(AVATAR_EXTRA_PARTS.petals),
+			flowerBase: pick(AVATAR_EXTRA_PARTS.flowerBase)
+		};
+		const beard = random() < .3 ? pick(AVATAR_EXTRA_PARTS.beard) : void 0;
+		const outfit = random() < .25 ? pick(AVATAR_PARTS_V2.outfit.slice(-4)) : recipe.outfit;
+		return {
+			...recipe,
+			outfit,
+			...beard ? { beard } : {}
+		};
+	};
+}
+/** Version 2 counterpart of `seededRecipe` (BotHarness's namespace). */
+const seededRecipeV2 = createSeededRecipeV2("botharness-avatar-v2");
 /** The same name always gives the same face (BotHarness's namespace). */
 const seededRecipe = createSeededRecipe("botharness-avatar");
 /** Suggested body colors per species; any color remains allowed. */
@@ -563,6 +665,38 @@ const AVATAR_SPECIES_SWATCHES = {
 		"#b3cf7a",
 		"#5c8a4a",
 		"#8fa86a"
+	],
+	elf: [
+		"#fbe7d6",
+		"#f2d3c0",
+		"#e2c9b0",
+		"#d9c7e8",
+		"#b9c6dd",
+		"#8f7fa8"
+	],
+	dwarf: [
+		"#f2c4a0",
+		"#e9b08a",
+		"#e0a87e",
+		"#c68863",
+		"#f0b8a0",
+		"#9a6142"
+	],
+	orc: [
+		"#8a9a5b",
+		"#6f8a4e",
+		"#7d8c6a",
+		"#5f6f4a",
+		"#9aa070",
+		"#6a7a7a"
+	],
+	flower: [
+		"#f6d36b",
+		"#f2b84b",
+		"#ffe3cf",
+		"#e8a85a",
+		"#c98b4a",
+		"#f4f1ec"
 	]
 };
 const preset = (parts) => ({
@@ -1121,6 +1255,34 @@ function outfit(recipe, g, s) {
 			paint(g, (x, y) => y === 24 && Math.abs(dx(x)) <= 4.5, WHITE);
 			sprite(g, ["RR.RR", ".RRR."], Math.round(C + s * .5) - 2, 24, { R: shirt });
 			break;
+		case "armor": {
+			const metal = "#9aa3ad";
+			paint(g, torso, metal);
+			paint(g, (x, y) => torso(x, y) && y >= 26 && Math.abs(dx(x)) <= 2.5, shirt);
+			paint(g, (x, y) => torso(x, y) && y <= 26 && Math.abs(dx(x)) >= half(y) - 3.5, mix$1(metal, WHITE, .35));
+			paint(g, (x, y) => torso(x, y) && y === 27 && Math.abs(dx(x)) >= half(y) - 3.5, shade(metal, .7));
+			paint(g, (x, y) => y === 24 && Math.abs(dx(x)) <= 3.5, shade(metal, .8));
+			sprite(g, ["G"], Math.round(C + s * .5), 28, { G: GOLD });
+			break;
+		}
+		case "robe":
+			paint(g, v(5, 4), mix$1(shirt, WHITE, .7));
+			paint(g, (x, y) => torso(x, y) && y <= 29 && Math.abs(Math.abs(dx(x)) - (4 - (y - 24) * .8)) <= .5, GOLD);
+			paint(g, (x, y) => torso(x, y) && y >= 28 && Math.abs(dx(x)) >= half(y) - 1.5, dark);
+			break;
+		case "tunic":
+			paint(g, v(2, 2), shade(skin, .85));
+			sprite(g, ["L.L", ".L."], Math.round(C + s * .5) - 1, 25, { L: "#6b4a2b" });
+			paint(g, (x, y) => torso(x, y) && y === 29, "#6b4a2b");
+			sprite(g, ["G"], Math.round(C + s * .5), 29, { G: GOLD });
+			break;
+		case "cloak": {
+			const cloak = mix$1(shirt, "#2f3a4a", .55);
+			paint(g, (x, y) => torso(x, y) && Math.abs(dx(x)) >= 2.5, cloak);
+			paint(g, (x, y) => torso(x, y) && y === 24, shade(cloak, .8));
+			sprite(g, ["G...G"], Math.round(C + s * .5) - 2, 25, { G: GOLD });
+			break;
+		}
 		case "jacket":
 			paint(g, v(6, 4.5), WHITE);
 			paint(g, (x, y) => torso(x, y) && Math.abs(Math.abs(dx(x)) - (4.5 - (y - 24) * .6)) <= .6, dark);
@@ -1239,6 +1401,22 @@ function accessory(recipe, g, s, face) {
 			}, true);
 			return;
 		}
+		case "helmet": {
+			const metal = "#9aa3ad";
+			paint(g, (x, y) => cap(x, y) && y <= 11, metal);
+			paint(g, (x, y) => cap(x, y) && y === 11, shade(metal, .75));
+			paint(g, (x, y) => cap(x, y) && y >= 12 && y <= 19 && Math.abs(x + .5 - C - s) >= 7.5, metal);
+			paint(g, (x, y) => Math.abs(x + .5 - C - s) <= .5 && y >= 11 && y <= 16, shade(metal, .7));
+			paint(g, (x, y) => cap(x, y) && y >= 2 && y <= 5 && x + .5 < C + s - 2, mix$1(metal, WHITE, .4));
+			for (let x = Math.round(C + s) - 9; x <= Math.round(C + s) + 9; x += 3) sprite(g, ["G"], x, 10, { G: GOLD });
+			return;
+		}
+		case "hood": {
+			const outer = ellipse(C + s, 15, 12.6, 12.4);
+			paint(g, (x, y) => outer(x, y) && y <= 25 && !(face(x, y) && y >= 10), shirt);
+			paint(g, (x, y) => outer(x, y) && !face(x, y) && y >= 9 && (face(x + 1, y) || face(x - 1, y) || face(x, y + 1)), shade(shirt, .7));
+			return;
+		}
 		case "beret":
 			paint(g, (x, y) => ellipse(C + s + 1.5, 4.6, 10.5, 3.6)(x, y), shirt);
 			paint(g, (x, y) => ellipse(C + s + 1.5, 4.6, 10.5, 3.6)(x, y) && y >= 6, shade(shirt, .78));
@@ -1334,6 +1512,75 @@ function accessory(recipe, g, s, face) {
 			return;
 	}
 }
+const POINTED_EARS = {
+	goblin: {
+		rows: [
+			"E...",
+			"EE..",
+			".EiE",
+			"..Ee"
+		],
+		rise: 2
+	},
+	elf: {
+		rows: [
+			"E....",
+			"EE...",
+			".EE..",
+			"..EiE",
+			"...Ee"
+		],
+		rise: 3
+	},
+	orc: {
+		rows: [
+			"E..",
+			"EE.",
+			".Ee"
+		],
+		rise: 1
+	}
+};
+const leafShape = (cx, cy, long, wide, angle) => (x, y) => {
+	const px = x + .5 - cx;
+	const py = y + .5 - cy;
+	const u = px * Math.cos(angle) + py * Math.sin(angle);
+	const v = -px * Math.sin(angle) + py * Math.cos(angle);
+	return (u / long) ** 2 + (v / wide) ** 2 <= 1;
+};
+function petals(style, s) {
+	const cx = C + s;
+	const cy = 16.6;
+	const ring = (n, radius, long, wide, phase = 0) => (x, y) => Array.from({ length: n }, (_, k) => phase + 2 * Math.PI * k / n).some((a) => leafShape(cx + radius * Math.cos(a), cy + radius * Math.sin(a), long, wide, a)(x, y));
+	switch (style) {
+		case "daisy": return ring(14, 10.4, 3.4, 1.7, Math.PI / 14);
+		case "sunflower": return (x, y) => ring(16, 11.2, 2.6, 1.5)(x, y) || ellipse(cx, cy, 10.6, 10.2)(x, y);
+		case "tulip": return (x, y) => y <= cy + 6 && (ellipse(cx - 6.5, cy - 3, 4.5, 7.5)(x, y) || ellipse(cx + 6.5, cy - 3, 4.5, 7.5)(x, y) || ellipse(cx, cy - 6, 5, 8)(x, y));
+		case "trumpet": return (x, y) => ellipse(cx, cy - .5, 11.6, 10.4)(x, y) || y <= cy - 6 && ellipse(cx, cy - 3, 13, 8.6)(x, y);
+		case "sakura": return (x, y) => ring(5, 8.6, 4.6, 3.8, -Math.PI / 2)(x, y) && !ring(5, 13.4, 1.4, 1.4, -Math.PI / 2)(x, y);
+	}
+}
+function flowerBase(recipe, g, s) {
+	const leaf = "#5f9e4a";
+	const stem = C + s * .5;
+	paint(g, (x, y) => y >= 22 && Math.abs(x + .5 - stem) <= 1, shade(leaf, .82));
+	if (recipe.flowerBase === "pot") {
+		const pot = recipe.shirtColor;
+		const body = (x, y) => y >= 27 && Math.abs(x + .5 - stem) <= 6.5 - (y - 27) * .45;
+		paint(g, leafShape(stem - 3, 25, 2.8, 1.2, -.5), leaf);
+		paint(g, leafShape(stem + 3, 24.5, 2.8, 1.2, .5), shade(leaf, .9));
+		paint(g, body, pot);
+		paint(g, (x, y) => body(x, y) && y === 27, mix$1(pot, WHITE, .3));
+		paint(g, (x, y) => body(x, y) && y >= 28 && x + .5 > stem + 3, shade(pot, .8));
+		return;
+	}
+	const left = leafShape(stem - 4.5, 27, 4.4, 1.9, -.55);
+	const right = leafShape(stem + 4.5, 25.5, 4.4, 1.9, .55);
+	paint(g, left, leaf);
+	paint(g, right, shade(leaf, .92));
+	paint(g, leafShape(stem - 4.5, 27, 3.6, .5, -.55), shade(leaf, .75));
+	paint(g, leafShape(stem + 4.5, 25.5, 3.6, .5, .55), shade(leaf, .7));
+}
 function pixelTileColor(hair) {
 	const [r, g, b] = channels$1(hair).map((v) => v / 255);
 	const max = Math.max(r, g, b);
@@ -1371,34 +1618,56 @@ function pixelFigure(recipe, yawDeg, options = {}) {
 		const tuck = y >= 17 && d * dx > 4 ? Math.min(2, (y - 16) * .35) : 0;
 		return front(x - Math.round(d * (1 + Math.max(0, y - 20) * .4) - d * tuck), y);
 	} : front;
-	const masks = recipe.bangs === void 0 ? hair(recipe, s, b) : detailedHair(recipe, s, b);
+	const flower = recipe.species === "flower";
+	const covered = recipe.accessory === "helmet" || recipe.accessory === "hood";
+	const bare = () => false;
+	const petalRing = flower ? petals(recipe.petals ?? "trumpet", s) : bare;
+	const masks = flower ? {
+		back: petalRing,
+		front: bare,
+		sides: [(x, y) => petalRing(x, y) && x + .5 < C + s, (x, y) => petalRing(x, y) && x + .5 >= C + s]
+	} : covered ? {
+		back: bare,
+		front: bare
+	} : recipe.bangs === void 0 ? hair(recipe, s, b) : detailedHair(recipe, s, b);
 	const body = blank();
-	outfit(recipe, body, s);
+	if (flower) flowerBase(recipe, body, s);
+	else outfit(recipe, body, s);
 	const back = blank();
-	paint(back, masks.back, shade(hairColor, .82));
+	if (flower) {
+		paint(back, petalRing, hairColor);
+		paint(back, (x, y) => petalRing(x, y) && (x + .5 - C - s) ** 2 + (y + .5 - 16.6) ** 2 < 90, shade(hairColor, .84));
+		paint(back, (x, y) => petalRing(x, y) && x + .5 < C + s - 3 && y < 10, mix$1(hairColor, WHITE, .3));
+	} else paint(back, masks.back, shade(hairColor, .82));
 	if (masks.bands) paint(back, (x, y) => masks.back(x, y) && (y + Math.floor(x / 2)) % 4 === 0, shade(hairColor, .68));
 	const head = blank();
 	paint(head, face, skin);
+	const h = recipe.height ?? 0;
+	if (recipe.beard && !flower) {
+		const centre = C + fs * .6;
+		const mouthX = Math.round(C - .5 + fs * .6);
+		const chin = (x, y) => face(x, y) || face(x, y - 2);
+		const open = (x, y) => y >= 20 + h && y <= 22 + h && Math.abs(x - mouthX) <= 3;
+		const full = (x, y) => chin(x, y) && (y >= 22 + h || Math.abs(x + .5 - centre) >= 4 && y >= 17 + h);
+		const shape = recipe.beard === "short" ? (x, y) => chin(x, y) && y >= 22 + h : recipe.beard === "full" ? full : (x, y) => full(x, y) || Math.abs(x + .5 - centre) <= 1 && y >= 24 && y <= 30;
+		paint(head, (x, y) => shape(x, y) && !open(x, y), shade(hairColor, .9));
+		paint(head, (x, y) => shape(x, y) && !open(x, y) && (x + y * 2) % 5 === 0, shade(hairColor, .72));
+	}
 	const earY = 15;
 	const edge = (side) => {
 		const xs = [...Array(N).keys()].filter((x) => face(x, earY));
 		return side < 0 ? xs[0] - 1 : xs.at(-1) + 1;
 	};
-	const goblin = recipe.species === "goblin";
-	if (goblin) {
-		const ear = [
-			"E...",
-			"EE..",
-			".EiE",
-			"..Ee"
-		];
+	const pointed = recipe.species ? POINTED_EARS[recipe.species] : void 0;
+	if (flower) {} else if (pointed) {
 		const pal = {
 			E: skin,
 			e: shade(skin, .86),
 			i: shade(skin, .74)
 		};
+		const width = pointed.rows[0].length;
 		paint(head, masks.front, hairColor);
-		for (const ex of turned ? [-d] : [-1, 1]) sprite(head, ear, ex < 0 ? edge(ex) - 3 : edge(ex), earY - 2, pal, ex > 0);
+		for (const ex of turned ? [-d] : [-1, 1]) sprite(head, pointed.rows, ex < 0 ? edge(ex) - (width - 1) : edge(ex), earY - pointed.rise, pal, ex > 0);
 	} else if (!turned) for (const ex of [-1, 1]) sprite(head, [
 		"E",
 		"E",
@@ -1416,9 +1685,9 @@ function pixelFigure(recipe, yawDeg, options = {}) {
 		E: skin,
 		e: shade(skin, .8)
 	});
-	if (!goblin) paint(head, masks.front, hairColor);
+	if (!pointed && !flower) paint(head, masks.front, hairColor);
 	for (const [x, y] of masks.ties ?? []) sprite(back, ["T"], Math.round(x), y, { T: shade(recipe.shirtColor, .8) });
-	accessory(recipe, head, s, face);
+	if (!flower) accessory(recipe, head, s, face);
 	const shadeHair = (g) => {
 		const out = g.map((r) => [...r]);
 		const cells = g.flatMap((row, y) => row.flatMap((c, x) => c === hairColor ? [[x, y]] : []));
@@ -1470,7 +1739,6 @@ function pixelFigure(recipe, yawDeg, options = {}) {
 	const closed = blank();
 	const glasses = blank();
 	const sp = recipe.spacing ?? 0;
-	const h = recipe.height ?? 0;
 	const eyeTop = 15 + h;
 	const eyeW = (side) => turned && Math.sign(fs) === side ? 3 : 4;
 	const eyeX = (side) => {
@@ -1493,21 +1761,47 @@ function pixelFigure(recipe, yawDeg, options = {}) {
 		I: recipe.eyeColor,
 		L: mix$1(recipe.eyeColor, WHITE, .45)
 	};
-	const style = EYES[recipe.eyes];
-	const extra = style[0].length - 4;
-	sprite(eyes, fit(style, left.w + extra), left.x - extra, eyeTop, pal);
-	sprite(eyes, recipe.eyes === "wink" ? fit(CLOSED, right.w) : fit(style, right.w + extra), right.x, eyeTop, pal, true);
-	sprite(closed, fit(CLOSED, left.w), left.x, eyeTop, pal);
-	sprite(closed, fit(CLOSED, right.w), right.x, eyeTop, pal, true);
-	const browRows = BROWS[recipe.brows];
+	if (flower) {
+		const centre = Math.round(C + fs * .6);
+		const bead = {
+			K: "#1d1b22",
+			W: WHITE
+		};
+		for (const ex of [centre - 3, centre + 1]) {
+			sprite(eyes, [
+				"KK",
+				"KW",
+				"KK",
+				"KK"
+			], ex, eyeTop - 1, bead);
+			sprite(closed, [
+				"..",
+				"..",
+				"KK",
+				".."
+			], ex, eyeTop - 1, bead);
+		}
+	} else {
+		const style = EYES[recipe.eyes];
+		const extra = style[0].length - 4;
+		sprite(eyes, fit(style, left.w + extra), left.x - extra, eyeTop, pal);
+		sprite(eyes, recipe.eyes === "wink" ? fit(CLOSED, right.w) : fit(style, right.w + extra), right.x, eyeTop, pal, true);
+		sprite(closed, fit(CLOSED, left.w), left.x, eyeTop, pal);
+		sprite(closed, fit(CLOSED, right.w), right.x, eyeTop, pal, true);
+	}
+	const browRows = flower ? [] : BROWS[recipe.brows];
 	if (browRows.length) {
 		sprite(features, fit(browRows, left.w), left.x, eyeTop - 2, { B: shade(hairColor, .55) });
 		sprite(features, fit(browRows, right.w), right.x, eyeTop - 2, { B: shade(hairColor, .55) }, true);
 	}
 	const cx = Math.round(C + fs * (turned ? .85 : .6));
-	if (recipe.nose === "dot") sprite(features, ["N"], cx, 18 + h, { N: shade(skin, .78) });
-	if (recipe.nose === "button") sprite(features, ["N"], cx, 18 + h, { N: shade(skin, .88) });
-	if (recipe.nose === "line") sprite(features, ["N", "N"], cx, 17 + h, { N: shade(skin, .82) });
+	if (flower) {} else if (recipe.species === "dwarf") sprite(features, [".N.", "NnN"], cx - 1, 17 + h, {
+		N: shade(skin, .84),
+		n: shade(skin, .72)
+	});
+	else if (recipe.nose === "dot") sprite(features, ["N"], cx, 18 + h, { N: shade(skin, .78) });
+	else if (recipe.nose === "button") sprite(features, ["N"], cx, 18 + h, { N: shade(skin, .88) });
+	else if (recipe.nose === "line") sprite(features, ["N", "N"], cx, 17 + h, { N: shade(skin, .82) });
 	const mx = C - .5 + fs * .6;
 	const withMouth = (mouth) => {
 		const layer = features.map((row) => [...row]);
@@ -1518,11 +1812,12 @@ function pixelFigure(recipe, yawDeg, options = {}) {
 			W: WHITE
 		});
 		if (recipe.species === "goblin") for (const tx of [Math.round(mx - 2.5), Math.round(mx + 2.5)]) sprite(layer, ["T"], tx, 21 + h, { T: TUSK });
-		if (recipe.cheeks === "blush") {
+		if (recipe.species === "orc") for (const tx of [Math.round(mx - 2.5), Math.round(mx + 2.5)]) sprite(layer, ["T", "T"], tx, 20 + h, { T: TUSK });
+		if (recipe.cheeks === "blush" && !flower) {
 			sprite(layer, ["PP"], left.x - 1, 19 + h, { P: mix$1(BLUSH, skin, .25) });
 			sprite(layer, ["PP"], right.x + right.w - 1, 19 + h, { P: mix$1(BLUSH, skin, .25) });
 		}
-		if (recipe.cheeks === "freckles") {
+		if (recipe.cheeks === "freckles" && !flower) {
 			sprite(layer, ["F.F"], left.x, 19 + h, { F: shade(skin, .7) });
 			sprite(layer, ["F.F"], right.x + 1, 19 + h, { F: shade(skin, .7) });
 		}
@@ -1545,17 +1840,18 @@ function pixelFigure(recipe, yawDeg, options = {}) {
 		const corner = (x === fx - 1 || x === fx + w) && (y === eyeTop - 1 || y === eyeTop + 4);
 		return box && !inside && !(round && corner);
 	}, INK$1);
-	if (recipe.glasses === "round" || recipe.glasses === "square") {
-		frame(left.x, left.w, recipe.glasses === "round");
-		frame(right.x, right.w, recipe.glasses === "round");
+	const lenses = flower ? "none" : recipe.glasses;
+	if (lenses === "round" || lenses === "square") {
+		frame(left.x, left.w, lenses === "round");
+		frame(right.x, right.w, lenses === "round");
 		paint(glasses, (x, y) => y === eyeTop + 1 && x > left.x + left.w && x < right.x - 1, INK$1);
 	}
-	if (recipe.glasses === "shades") {
+	if (lenses === "shades") {
 		for (const e of [left, right]) paint(glasses, (x, y) => x >= e.x - 1 && x <= e.x + e.w && y >= eyeTop && y <= eyeTop + 2, INK$1);
 		paint(glasses, (x, y) => y === eyeTop && x > left.x + left.w && x < right.x - 1, INK$1);
 		for (const e of [left, right]) sprite(glasses, ["W"], e.x, eyeTop, { W: "#7d7b88" });
 	}
-	if (recipe.glasses === "monocle") {
+	if (lenses === "monocle") {
 		frame(right.x, right.w, true);
 		sprite(glasses, [
 			"G",
@@ -2131,5 +2427,5 @@ function symbolArtCells(rows, color) {
 }
 
 //#endregion
-export { AVATAR_COLORS, AVATAR_HAIR_PARTS, AVATAR_PARTS, AVATAR_PIECE_COLORS, AVATAR_PRESETS, AVATAR_RANGES, AVATAR_SPECIES, AVATAR_SPECIES_SWATCHES, AVATAR_SWATCHES, AVATAR_TURNS, DEFAULT_RECIPE, PIXEL_SYMBOLS, canonicalRecipe, createSeededRecipe, detailedRecipe, faceCells, isPixelAvatarRecipe, pixelAvatarSvg, pixelFigure, pixelSymbolCells, pixelTileColor, seededRandom, seededRecipe, symbolArtCells, withSpecies };
+export { AVATAR_COLORS, AVATAR_EXTRA_PARTS, AVATAR_HAIR_PARTS, AVATAR_PARTS, AVATAR_PARTS_V2, AVATAR_PIECE_COLORS, AVATAR_PRESETS, AVATAR_RANGES, AVATAR_SPECIES, AVATAR_SPECIES_SWATCHES, AVATAR_SWATCHES, AVATAR_TURNS, DEFAULT_RECIPE, PIXEL_SYMBOLS, canonicalRecipe, createSeededRecipe, createSeededRecipeV2, detailedRecipe, faceCells, hiddenChoices, isPixelAvatarRecipe, pixelAvatarSvg, pixelFigure, pixelSymbolCells, pixelTileColor, seededRandom, seededRecipe, seededRecipeV2, symbolArtCells, withSpecies };
 //# sourceMappingURL=index.js.map