diff --git a/packages/frontend/assets/room/objects/pet-bottle/label.png b/packages/frontend/assets/room/objects/pet-bottle/label.png new file mode 100644 index 0000000000..c463be90f4 Binary files /dev/null and b/packages/frontend/assets/room/objects/pet-bottle/label.png differ diff --git a/packages/frontend/assets/room/objects/pet-bottle/pet-bottle.blend b/packages/frontend/assets/room/objects/pet-bottle/pet-bottle.blend new file mode 100644 index 0000000000..903226567f Binary files /dev/null and b/packages/frontend/assets/room/objects/pet-bottle/pet-bottle.blend differ diff --git a/packages/frontend/assets/room/objects/pet-bottle/pet-bottle.glb b/packages/frontend/assets/room/objects/pet-bottle/pet-bottle.glb new file mode 100644 index 0000000000..e1bb3863f7 Binary files /dev/null and b/packages/frontend/assets/room/objects/pet-bottle/pet-bottle.glb differ diff --git a/packages/frontend/assets/room/objects/pet-bottle/textures/label.png b/packages/frontend/assets/room/objects/pet-bottle/textures/label.png new file mode 100644 index 0000000000..60280d157b Binary files /dev/null and b/packages/frontend/assets/room/objects/pet-bottle/textures/label.png differ diff --git a/packages/frontend/src/utility/room/object-defs.ts b/packages/frontend/src/utility/room/object-defs.ts index cce69adcd8..abaf2ace3f 100644 --- a/packages/frontend/src/utility/room/object-defs.ts +++ b/packages/frontend/src/utility/room/object-defs.ts @@ -30,6 +30,7 @@ import { monstera } from './objects/monstera.js'; import { mug } from './objects/mug.js'; import { openedCardboardBox } from './objects/openedCardboardBox.js'; import { pachira } from './objects/pachira.js'; +import { petBottle } from './objects/petBottle.js'; import { plant } from './objects/plant.js'; import { plant2 } from './objects/plant2.js'; import { powerStrip } from './objects/powerStrip.js'; @@ -74,6 +75,7 @@ export const OBJECT_DEFS = [ mug, openedCardboardBox, pachira, + petBottle, plant, plant2, powerStrip, diff --git a/packages/frontend/src/utility/room/objects/petBottle.ts b/packages/frontend/src/utility/room/objects/petBottle.ts new file mode 100644 index 0000000000..e3d9f4b763 --- /dev/null +++ b/packages/frontend/src/utility/room/objects/petBottle.ts @@ -0,0 +1,21 @@ +/* + * SPDX-FileCopyrightText: syuilo and misskey-project + * SPDX-License-Identifier: AGPL-3.0-only + */ + +import { defineObject } from '../engine.js'; + +export const petBottle = defineObject({ + id: 'petBottle', + name: 'PET Bottle', + options: { + schema: {}, + default: {}, + }, + placement: 'top', + createInstance: () => { + return { + interactions: {}, + }; + }, +});