diff --git a/dist/extension.zip b/dist/extension.zip index ee7e777..ce46b25 100644 Binary files a/dist/extension.zip and b/dist/extension.zip differ diff --git a/dist/extension/birb.js b/dist/extension/birb.js index 253d389..c7f3c66 100644 --- a/dist/extension/birb.js +++ b/dist/extension/birb.js @@ -599,9 +599,7 @@ "#373737": PALETTE.FEATHER_SPINE, }; - /** - * Bird species rarit * @type {Record} */ const RARITY = { diff --git a/dist/obsidian/main.js b/dist/obsidian/main.js index d01aaba..6e70c92 100644 --- a/dist/obsidian/main.js +++ b/dist/obsidian/main.js @@ -604,9 +604,7 @@ module.exports = class PocketBird extends Plugin { "#373737": PALETTE.FEATHER_SPINE, }; - /** - * Bird species rarit * @type {Record} */ const RARITY = { diff --git a/dist/userscript/birb.user.js b/dist/userscript/birb.user.js index 024b199..ba7366e 100644 --- a/dist/userscript/birb.user.js +++ b/dist/userscript/birb.user.js @@ -613,9 +613,7 @@ "#373737": PALETTE.FEATHER_SPINE, }; - /** - * Bird species rarit * @type {Record} */ const RARITY = { diff --git a/dist/web/birb.embed.js b/dist/web/birb.embed.js index ef1f4ba..bdeee7f 100644 --- a/dist/web/birb.embed.js +++ b/dist/web/birb.embed.js @@ -599,9 +599,7 @@ "#373737": PALETTE.FEATHER_SPINE, }; - /** - * Bird species rarit * @type {Record} */ const RARITY = { diff --git a/dist/web/birb.js b/dist/web/birb.js index ef1f4ba..bdeee7f 100644 --- a/dist/web/birb.js +++ b/dist/web/birb.js @@ -599,9 +599,7 @@ "#373737": PALETTE.FEATHER_SPINE, }; - /** - * Bird species rarit * @type {Record} */ const RARITY = { diff --git a/editor/editor.js b/editor/editor.js index 9aa2965..0ef9204 100644 --- a/editor/editor.js +++ b/editor/editor.js @@ -1,5 +1,5 @@ // @ts-check -import { SPRITE_SHEET_COLOR_MAP, PALETTE, loadSpriteSheetPixels } from '../src/animation/sprites.js'; +import { SPRITE_SHEET_COLOR_MAP, PALETTE, DEFAULT_COLOR_OVERRIDES, loadSpriteSheetPixels } from '../src/animation/sprites.js'; import Layer, { TAG } from '../src/animation/layer.js'; import Frame from '../src/animation/frame.js'; import { Directions, getLayerPixels } from '../src/shared.js'; @@ -10,23 +10,6 @@ import species from '../src/species.js'; const COLOR_MAP = SPRITE_SHEET_COLOR_MAP; const SPRITE_PATH = "../sprites/birb.png"; const SPRITE_SIZE = 32; -/** @type {Record} */ -const DEFAULT_OVERRIDES = { - "hood": "face", - "eyebrow": "face", - "upper-eyelid": "eyebrow", - "upper-corner-eye": "eyebrow", - "behind-eye": "face", - "corner-eye": "face", - "temple": "face", - "lower-eyelid": "face", - "nose": "face", - "nose-tip": "nose", - "cheek": "face", - "scruff": "face", - "collar": "face", - "collar-scruff": "collar" -}; const IGNORED_PARTS = new Set( ["transparent", "border", "heart", "heart-border", "heart-shine", "feather-spine"] ); @@ -169,8 +152,8 @@ function getColor(part) { if (currentSpecies.colors[part]) { return currentSpecies.colors[part]; } - if (DEFAULT_OVERRIDES[part]) { - return getColor(DEFAULT_OVERRIDES[part]); + if (DEFAULT_COLOR_OVERRIDES[part]) { + return getColor(DEFAULT_COLOR_OVERRIDES[part]); } for (const [color, partName] of Object.entries(COLOR_MAP)) { if (partName === part) { diff --git a/src/animation/sprites.js b/src/animation/sprites.js index a65263c..092ce29 100644 --- a/src/animation/sprites.js +++ b/src/animation/sprites.js @@ -76,7 +76,26 @@ export const SPRITE_SHEET_COLOR_MAP = { /** - * Bird species rarit + * @type {Record} + */ +export const DEFAULT_COLOR_OVERRIDES = { + [PALETTE.HOOD]: PALETTE.FACE, + [PALETTE.EYEBROW]: PALETTE.FACE, + [PALETTE.UPPER_EYELID]: PALETTE.EYEBROW, + [PALETTE.UPPER_CORNER_EYE]: PALETTE.EYEBROW, + [PALETTE.BEHIND_EYE]: PALETTE.FACE, + [PALETTE.CORNER_EYE]: PALETTE.FACE, + [PALETTE.TEMPLE]: PALETTE.FACE, + [PALETTE.LOWER_EYELID]: PALETTE.FACE, + [PALETTE.NOSE]: PALETTE.FACE, + [PALETTE.NOSE_TIP]: PALETTE.NOSE, + [PALETTE.CHEEK]: PALETTE.FACE, + [PALETTE.SCRUFF]: PALETTE.FACE, + [PALETTE.COLLAR]: PALETTE.FACE, + [PALETTE.COLLAR_SCRUFF]: PALETTE.COLLAR, +}; + +/** * @type {Record} */ export const RARITY = {