🆙 Fixed Buddy Pets showing in catalogue

2026-06-19 23:16:21 +00:00 · 2026-04-15 13:09:27 +02:00
parent a770b99e2e
commit 9dbe360448
4 changed files with 99 additions and 19 deletions
@@ -1,6 +1,6 @@
 import { GetAvatarRenderManager, GetSessionDataManager, Vector3d } from '@nitrots/nitro-renderer';
 import { FC, useEffect } from 'react';
-import { FurniCategory, Offer, ProductTypeEnum } from '../../../../../api';
+import { BuildPurchasableClothingFigure, FurniCategory, Offer, ProductTypeEnum } from '../../../../../api';
 import { AutoGrid, Column, LayoutGridItem, LayoutRoomPreviewerView } from '../../../../../common';
 import { useCatalog } from '../../../../../hooks';

@@ -24,18 +24,37 @@ export const CatalogViewProductWidgetView: FC<{}> = props =>
            case ProductTypeEnum.FLOOR: {
                if(!product.furnitureData) return;

-                if(product.furnitureData.specialType === FurniCategory.FIGURE_PURCHASABLE_SET)
+                const furniData = GetSessionDataManager().getFloorItemData(product.furnitureData.id);
+                const isPurchasableClothing = (product.furnitureData.specialType === FurniCategory.FIGURE_PURCHASABLE_SET);
+                const hasResolvableFigureSets = (() =>
+                {
+                    if(!furniData || !furniData.customParams || !furniData.customParams.length) return false;
+
+                    const parts = furniData.customParams.split(',').map(value => parseInt(value));
+
+                    for(const part of parts)
+                    {
+                        if(isNaN(part)) continue;
+
+                        if(GetAvatarRenderManager().structureData?.getFigurePartSet(part)) return true;
+                    }
+
+                    return false;
+                })();
+
+                if(isPurchasableClothing || hasResolvableFigureSets)
                {
-                    const furniData = GetSessionDataManager().getFloorItemData(product.furnitureData.id);
                    const customParts = furniData.customParams.split(',').map(value => parseInt(value));
                    const figureSets: number[] = [];

                    for(const part of customParts)
                    {
+                        if(isNaN(part)) continue;
+
                        if(GetAvatarRenderManager().isValidFigureSetForGender(part, GetSessionDataManager().gender)) figureSets.push(part);
                    }

-                    const figureString = GetAvatarRenderManager().getFigureStringWithFigureIds(GetSessionDataManager().figure, GetSessionDataManager().gender, figureSets);
+                    const figureString = BuildPurchasableClothingFigure(GetSessionDataManager().figure, figureSets);

                    roomPreviewer.addAvatarIntoRoom(figureString, product.productClassId);
                }
@@ -1,6 +1,6 @@
 import { AvatarFigurePartType, GetAvatarRenderManager, GetSessionDataManager, RedeemItemClothingComposer, RoomObjectCategory, UserFigureComposer } from '@nitrots/nitro-renderer';
 import { FC, useEffect, useState } from 'react';
-import { FurniCategory, GetFurnitureDataForRoomObject, LocalizeText, SendMessageComposer } from '../../../../../api';
+import { BuildPurchasableClothingFigure, GetFurnitureDataForRoomObject, LocalizeText, SendMessageComposer } from '../../../../../api';
 import { Button, Column, LayoutAvatarImageView, NitroCardContentView, NitroCardHeaderView, NitroCardView, Text } from '../../../../../common';
 import { useRoom } from '../../../../../hooks';

@@ -41,22 +41,18 @@ export const PurchasableClothingConfirmView: FC<PurchasableClothingConfirmViewPr
        {
            const furniData = GetFurnitureDataForRoomObject(roomSession.roomId, objectId, RoomObjectCategory.FLOOR);

-            if(furniData)
+            if(furniData && furniData.customParams && furniData.customParams.length)
            {
-                switch(furniData.specialType)
+                const setIds = furniData.customParams.split(',')
+                    .map(part => parseInt(part))
+                    .filter(id => !isNaN(id));
+
+                for(const setId of setIds)
                {
-                    case FurniCategory.FIGURE_PURCHASABLE_SET:
-                        mode = MODE_PURCHASABLE_CLOTHING;
-
-                        const setIds = furniData.customParams.split(',').map(part => parseInt(part));
-
-                        for(const setId of setIds)
-                        {
-                            if(GetAvatarRenderManager().isValidFigureSetForGender(setId, gender)) validSets.push(setId);
-                        }
-
-                        break;
+                    if(GetAvatarRenderManager().isValidFigureSetForGender(setId, gender)) validSets.push(setId);
                }
+
+                if(validSets.length) mode = MODE_PURCHASABLE_CLOTHING;
            }
        }

@@ -68,7 +64,7 @@ export const PurchasableClothingConfirmView: FC<PurchasableClothingConfirmViewPr
        }

        setGender(gender);
-        setNewFigure(GetAvatarRenderManager().getFigureStringWithFigureIds(figure, gender, validSets));
+        setNewFigure(BuildPurchasableClothingFigure(figure, validSets));

        // if owns clothing, change to it