duckietm/Nitro-V3
1
0
Fork 0
mirror of https://github.com/duckietm/Nitro-V3.git synced 2026-06-20 07:26:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

🆕 Updated Chooser & Furni command - now glowing !

Browse Source
This commit is contained in:
duckietm
2026-02-24 08:16:37 +01:00
parent 458e4f6d43
commit 6f44dce04b
8 changed files with 377 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/hooks/rooms/widgets/useFurniChooserWidget.ts
+36 -7
View File
@@ -4,6 +4,13 @@ import { GetRoomSession, LocalizeText, RoomObjectItem } from '../../../api';
import { useFurniAddedEvent, useFurniRemovedEvent } from '../engine';
import { useRoom } from '../useRoom';
const isPetOrBot = (roomObjectType: string): boolean =>
roomObjectType.includes('pet_') ||
roomObjectType.includes('bot_') ||
roomObjectType === 'pet' ||
roomObjectType === 'bot' ||
roomObjectType.includes('rentableBot');
const useFurniChooserWidgetState = () =>
{
const [ items, setItems ] = useState<RoomObjectItem[]>(null);
@@ -22,6 +29,7 @@ const useFurniChooserWidgetState = () =>
const wallItems = wallObjects.map(roomObject =>
{
if(roomObject.id < 0) return null;
if(isPetOrBot(roomObject.type)) return null;
let name = roomObject.type;
@@ -37,12 +45,18 @@ const useFurniChooserWidgetState = () =>
if(furniData && furniData.name.length) name = furniData.name;
}
return new RoomObjectItem(roomObject.id, RoomObjectCategory.WALL, name);
});
const ownerId = roomObject.model.getValue<number>(RoomObjectVariable.FURNITURE_OWNER_ID) || 0;
const ownerName = roomObject.model.getValue<string>(RoomObjectVariable.FURNITURE_OWNER_NAME) ||
(sessionDataManager.getUserData ? sessionDataManager.getUserData(ownerId)?.name : null) ||
`User_${ownerId}`;
return new RoomObjectItem(roomObject.id, RoomObjectCategory.WALL, name, ownerId, ownerName, 'furniture');
}).filter(item => item !== null);
const floorItems = floorObjects.map(roomObject =>
{
if(roomObject.id < 0) return null;
if(isPetOrBot(roomObject.type)) return null;
let name = roomObject.type;
@@ -51,8 +65,13 @@ const useFurniChooserWidgetState = () =>
if(furniData && furniData.name.length) name = furniData.name;
return new RoomObjectItem(roomObject.id, RoomObjectCategory.FLOOR, name);
});
const ownerId = roomObject.model.getValue<number>(RoomObjectVariable.FURNITURE_OWNER_ID) || 0;
const ownerName = roomObject.model.getValue<string>(RoomObjectVariable.FURNITURE_OWNER_NAME) ||
(sessionDataManager.getUserData ? sessionDataManager.getUserData(ownerId)?.name : null) ||
`User_${ownerId}`;
return new RoomObjectItem(roomObject.id, RoomObjectCategory.FLOOR, name, ownerId, ownerName, 'furniture');
}).filter(item => item !== null);
setItems([ ...wallItems, ...floorItems ].sort((a, b) => ((a.name < b.name) ? -1 : 1)));
};
@@ -64,6 +83,7 @@ const useFurniChooserWidgetState = () =>
const roomObject = GetRoomEngine().getRoomObject(GetRoomSession().roomId, event.id, event.category);
if(!roomObject) return;
if(isPetOrBot(roomObject.type)) return;
let item: RoomObjectItem = null;
@@ -84,8 +104,12 @@ const useFurniChooserWidgetState = () =>
if(furniData && furniData.name.length) name = furniData.name;
}
item = new RoomObjectItem(roomObject.id, RoomObjectCategory.WALL, name);
const wallOwnerId = roomObject.model.getValue<number>(RoomObjectVariable.FURNITURE_OWNER_ID) || 0;
const wallOwnerName = roomObject.model.getValue<string>(RoomObjectVariable.FURNITURE_OWNER_NAME) ||
(GetSessionDataManager().getUserData ? GetSessionDataManager().getUserData(wallOwnerId)?.name : null) ||
`User_${wallOwnerId}`;
item = new RoomObjectItem(roomObject.id, RoomObjectCategory.WALL, name, wallOwnerId, wallOwnerName, 'furniture');
break;
}
case RoomObjectCategory.FLOOR: {
@@ -96,11 +120,16 @@ const useFurniChooserWidgetState = () =>
if(furniData && furniData.name.length) name = furniData.name;
item = new RoomObjectItem(roomObject.id, RoomObjectCategory.FLOOR, name);
const floorOwnerId = roomObject.model.getValue<number>(RoomObjectVariable.FURNITURE_OWNER_ID) || 0;
const floorOwnerName = roomObject.model.getValue<string>(RoomObjectVariable.FURNITURE_OWNER_NAME) ||
(GetSessionDataManager().getUserData ? GetSessionDataManager().getUserData(floorOwnerId)?.name : null) ||
`User_${floorOwnerId}`;
item = new RoomObjectItem(roomObject.id, RoomObjectCategory.FLOOR, name, floorOwnerId, floorOwnerName, 'furniture');
}
}
setItems(prevValue => [ ...prevValue, item ].sort((a, b) => ((a.name < b.name) ? -1 : 1)));
if(item) setItems(prevValue => [ ...prevValue, item ].sort((a, b) => ((a.name < b.name) ? -1 : 1)));
});
useFurniRemovedEvent(!!items, event =>
src/hooks/rooms/widgets/useUserChooserWidget.ts
+19 -2
View File
@@ -4,6 +4,17 @@ import { GetRoomSession, RoomObjectItem } from '../../../api';
import { useUserAddedEvent, useUserRemovedEvent } from '../engine';
import { useRoom } from '../useRoom';
const resolveUserType = (userType: number): string =>
{
switch(userType)
{
case 1: return 'Habbo';
case 2: return 'Pet';
case 3: return 'Bot';
default: return '-';
}
}
const useUserChooserWidgetState = () =>
{
const [ items, setItems ] = useState<RoomObjectItem[]>(null);
@@ -26,9 +37,12 @@ const useUserChooserWidgetState = () =>
const userData = roomSession.userDataManager.getUserDataByIndex(roomObject.id);
if(!userData) return null;
if(userData.type !== 1) return null;
return new RoomObjectItem(userData.roomIndex, RoomObjectCategory.UNIT, userData.name);
const type = resolveUserType(userData.type);
return new RoomObjectItem(userData.roomIndex, RoomObjectCategory.UNIT, userData.name, 0, '-', type);
})
.filter(Boolean)
.sort((a, b) => ((a.name < b.name) ? -1 : 1)));
};
@@ -39,12 +53,15 @@ const useUserChooserWidgetState = () =>
const userData = GetRoomSession().userDataManager.getUserDataByIndex(event.id);
if(!userData) return;
if(userData.type !== 1) return;
const type = resolveUserType(userData.type);
setItems(prevValue =>
{
const newValue = [ ...prevValue ];
newValue.push(new RoomObjectItem(userData.roomIndex, RoomObjectCategory.UNIT, userData.name));
newValue.push(new RoomObjectItem(userData.roomIndex, RoomObjectCategory.UNIT, userData.name, 0, '-', type));
newValue.sort((a, b) => ((a.name < b.name) ? -1 : 1));
return newValue;