diff --git a/aseprite/birb.aseprite b/aseprite/birb.aseprite index 1c0bc7e..e60d06f 100644 Binary files a/aseprite/birb.aseprite and b/aseprite/birb.aseprite differ diff --git a/dist/extension.zip b/dist/extension.zip index cfcefad..47a4389 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 2a47c40..9667956 100644 --- a/dist/extension/birb.js +++ b/dist/extension/birb.js @@ -416,6 +416,7 @@ EYEBROW: "eyebrow", NOSE: "nose", CHEEK: "cheek", + COLLAR: "collar", BELLY: "belly", UNDERBELLY: "underbelly", WING: "wing", @@ -443,6 +444,7 @@ "#ff5573": PALETTE.EYEBROW, "#d95763": PALETTE.NOSE, "#ff67a9": PALETTE.CHEEK, + "#ffe955": PALETTE.COLLAR, "#f8b143": PALETTE.BELLY, "#ec8637": PALETTE.UNDERBELLY, "#578ae6": PALETTE.WING, @@ -477,6 +479,7 @@ [PALETTE.EYEBROW]: colors.face, [PALETTE.NOSE]: colors.face, [PALETTE.CHEEK]: colors.face, + [PALETTE.COLLAR]: colors.face, }; /** @type {Record} */ this.colors = { ...defaultColors, ...colors, [PALETTE.THEME_HIGHLIGHT]: colors[PALETTE.THEME_HIGHLIGHT] ?? colors.hood ?? colors.face }; diff --git a/dist/obsidian/main.js b/dist/obsidian/main.js index 5ce1d15..7c40706 100644 --- a/dist/obsidian/main.js +++ b/dist/obsidian/main.js @@ -421,6 +421,7 @@ module.exports = class PocketBird extends Plugin { EYEBROW: "eyebrow", NOSE: "nose", CHEEK: "cheek", + COLLAR: "collar", BELLY: "belly", UNDERBELLY: "underbelly", WING: "wing", @@ -448,6 +449,7 @@ module.exports = class PocketBird extends Plugin { "#ff5573": PALETTE.EYEBROW, "#d95763": PALETTE.NOSE, "#ff67a9": PALETTE.CHEEK, + "#ffe955": PALETTE.COLLAR, "#f8b143": PALETTE.BELLY, "#ec8637": PALETTE.UNDERBELLY, "#578ae6": PALETTE.WING, @@ -482,6 +484,7 @@ module.exports = class PocketBird extends Plugin { [PALETTE.EYEBROW]: colors.face, [PALETTE.NOSE]: colors.face, [PALETTE.CHEEK]: colors.face, + [PALETTE.COLLAR]: colors.face, }; /** @type {Record} */ this.colors = { ...defaultColors, ...colors, [PALETTE.THEME_HIGHLIGHT]: colors[PALETTE.THEME_HIGHLIGHT] ?? colors.hood ?? colors.face }; diff --git a/dist/userscript/birb.user.js b/dist/userscript/birb.user.js index 3d45397..8750ec9 100644 --- a/dist/userscript/birb.user.js +++ b/dist/userscript/birb.user.js @@ -430,6 +430,7 @@ EYEBROW: "eyebrow", NOSE: "nose", CHEEK: "cheek", + COLLAR: "collar", BELLY: "belly", UNDERBELLY: "underbelly", WING: "wing", @@ -457,6 +458,7 @@ "#ff5573": PALETTE.EYEBROW, "#d95763": PALETTE.NOSE, "#ff67a9": PALETTE.CHEEK, + "#ffe955": PALETTE.COLLAR, "#f8b143": PALETTE.BELLY, "#ec8637": PALETTE.UNDERBELLY, "#578ae6": PALETTE.WING, @@ -491,6 +493,7 @@ [PALETTE.EYEBROW]: colors.face, [PALETTE.NOSE]: colors.face, [PALETTE.CHEEK]: colors.face, + [PALETTE.COLLAR]: colors.face, }; /** @type {Record} */ this.colors = { ...defaultColors, ...colors, [PALETTE.THEME_HIGHLIGHT]: colors[PALETTE.THEME_HIGHLIGHT] ?? colors.hood ?? colors.face }; diff --git a/dist/web/birb.embed.js b/dist/web/birb.embed.js index 57d6149..a7e044c 100644 --- a/dist/web/birb.embed.js +++ b/dist/web/birb.embed.js @@ -416,6 +416,7 @@ EYEBROW: "eyebrow", NOSE: "nose", CHEEK: "cheek", + COLLAR: "collar", BELLY: "belly", UNDERBELLY: "underbelly", WING: "wing", @@ -443,6 +444,7 @@ "#ff5573": PALETTE.EYEBROW, "#d95763": PALETTE.NOSE, "#ff67a9": PALETTE.CHEEK, + "#ffe955": PALETTE.COLLAR, "#f8b143": PALETTE.BELLY, "#ec8637": PALETTE.UNDERBELLY, "#578ae6": PALETTE.WING, @@ -477,6 +479,7 @@ [PALETTE.EYEBROW]: colors.face, [PALETTE.NOSE]: colors.face, [PALETTE.CHEEK]: colors.face, + [PALETTE.COLLAR]: colors.face, }; /** @type {Record} */ this.colors = { ...defaultColors, ...colors, [PALETTE.THEME_HIGHLIGHT]: colors[PALETTE.THEME_HIGHLIGHT] ?? colors.hood ?? colors.face }; diff --git a/dist/web/birb.js b/dist/web/birb.js index 57d6149..a7e044c 100644 --- a/dist/web/birb.js +++ b/dist/web/birb.js @@ -416,6 +416,7 @@ EYEBROW: "eyebrow", NOSE: "nose", CHEEK: "cheek", + COLLAR: "collar", BELLY: "belly", UNDERBELLY: "underbelly", WING: "wing", @@ -443,6 +444,7 @@ "#ff5573": PALETTE.EYEBROW, "#d95763": PALETTE.NOSE, "#ff67a9": PALETTE.CHEEK, + "#ffe955": PALETTE.COLLAR, "#f8b143": PALETTE.BELLY, "#ec8637": PALETTE.UNDERBELLY, "#578ae6": PALETTE.WING, @@ -477,6 +479,7 @@ [PALETTE.EYEBROW]: colors.face, [PALETTE.NOSE]: colors.face, [PALETTE.CHEEK]: colors.face, + [PALETTE.COLLAR]: colors.face, }; /** @type {Record} */ this.colors = { ...defaultColors, ...colors, [PALETTE.THEME_HIGHLIGHT]: colors[PALETTE.THEME_HIGHLIGHT] ?? colors.hood ?? colors.face }; diff --git a/editor/editor.js b/editor/editor.js index c0cd2c1..428dda2 100644 --- a/editor/editor.js +++ b/editor/editor.js @@ -17,6 +17,7 @@ const DEFAULT_OVERRIDES = { "eyebrow": "face", "nose": "face", "cheek": "face", + "collar": "face", }; const IGNORED_PARTS = new Set( ["transparent", "border", "heart", "heart-border", "heart-shine", "feather-spine"] diff --git a/src/animation/sprites.js b/src/animation/sprites.js index e13e5f8..472e9b7 100644 --- a/src/animation/sprites.js +++ b/src/animation/sprites.js @@ -17,6 +17,7 @@ export const PALETTE = { EYEBROW: "eyebrow", NOSE: "nose", CHEEK: "cheek", + COLLAR: "collar", BELLY: "belly", UNDERBELLY: "underbelly", WING: "wing", @@ -44,6 +45,7 @@ export const SPRITE_SHEET_COLOR_MAP = { "#ff5573": PALETTE.EYEBROW, "#d95763": PALETTE.NOSE, "#ff67a9": PALETTE.CHEEK, + "#ffe955": PALETTE.COLLAR, "#f8b143": PALETTE.BELLY, "#ec8637": PALETTE.UNDERBELLY, "#578ae6": PALETTE.WING, @@ -78,6 +80,7 @@ export class BirdType { [PALETTE.EYEBROW]: colors.face, [PALETTE.NOSE]: colors.face, [PALETTE.CHEEK]: colors.face, + [PALETTE.COLLAR]: colors.face, }; /** @type {Record} */ this.colors = { ...defaultColors, ...colors, [PALETTE.THEME_HIGHLIGHT]: colors[PALETTE.THEME_HIGHLIGHT] ?? colors.hood ?? colors.face };