diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index d1e2b93b2c..9fd45658e3 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -4042,3 +4042,4 @@ _miRoom: kakejiku: "掛軸" _kakejiku: image: "画像" + "image:kitsuaishinsei": "喫藍心整" diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/kakejiku.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/kakejiku.ts index f4dce6e9e4..30d2dd4ec0 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/kakejiku.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/kakejiku.ts @@ -22,6 +22,8 @@ export const kakejiku = defineFuniture(kakejiku_schema, { let url: string | null = null; if (options.image.type === '_custom_') { url = options.image.custom?.url ?? null; + } else if (options.image.type === 'kitsuaishinsei') { + url = '/client-assets/world/objects/kakejiku/images/kitsuaishinsei.png'; } return textureManager.change(url, options.image.fit, options.image.rotation).then((tex) => { imageMaterial.albedoTexture = tex; diff --git a/packages/frontend/assets/world/objects/kakejiku/images/kitsuaishinsei.af b/packages/frontend/assets/world/objects/kakejiku/images/kitsuaishinsei.af new file mode 100644 index 0000000000..f750ad8919 Binary files /dev/null and b/packages/frontend/assets/world/objects/kakejiku/images/kitsuaishinsei.af differ diff --git a/packages/frontend/assets/world/objects/kakejiku/images/kitsuaishinsei.png b/packages/frontend/assets/world/objects/kakejiku/images/kitsuaishinsei.png new file mode 100644 index 0000000000..96f4d74b78 Binary files /dev/null and b/packages/frontend/assets/world/objects/kakejiku/images/kitsuaishinsei.png differ diff --git a/packages/frontend/src/world/room/furnitures/kakejiku.ui.ts b/packages/frontend/src/world/room/furnitures/kakejiku.ui.ts index a83b083321..ee7e3c578e 100644 --- a/packages/frontend/src/world/room/furnitures/kakejiku.ui.ts +++ b/packages/frontend/src/world/room/furnitures/kakejiku.ui.ts @@ -12,6 +12,11 @@ export const kakejiku_ui = defineFurnitureUi({ options: { image: { label: i18n.ts._miRoom._furnitures._kakejiku.image, + presets: { + 'kitsuaishinsei': { + label: i18n.ts._miRoom._furnitures._kakejiku['image:kitsuaishinsei'], + }, + }, }, }, }); diff --git a/packages/i18n/src/autogen/locale.ts b/packages/i18n/src/autogen/locale.ts index 86d336e479..7114b1eddb 100644 --- a/packages/i18n/src/autogen/locale.ts +++ b/packages/i18n/src/autogen/locale.ts @@ -15032,6 +15032,10 @@ export interface Locale extends ILocale { * 画像 */ "image": string; + /** + * 喫藍心整 + */ + "image:kitsuaishinsei": string; }; }; }; diff --git a/packages/misskey-world/src/room/furnitures/kakejiku.schema.ts b/packages/misskey-world/src/room/furnitures/kakejiku.schema.ts index 15cc10b797..e874a3f60d 100644 --- a/packages/misskey-world/src/room/furnitures/kakejiku.schema.ts +++ b/packages/misskey-world/src/room/furnitures/kakejiku.schema.ts @@ -10,11 +10,13 @@ export const kakejiku_schema = defineFurnitureSchema({ schema: { image: { type: 'image', - presets: [], + presets: [{ + value: 'kitsuaishinsei', + }], }, }, default: { - image: { type: null }, + image: { type: 'kitsuaishinsei' }, }, }, placement: 'side',