Merge remote-tracking branch 'duckie/main' into merge-duckie-main-2026-05-06

# Conflicts:
#	packages/communication/src/messages/parser/room/unit/RoomUnitInfoParser.ts
#	packages/communication/src/messages/parser/user/data/UserProfileParser.ts
#	packages/events/src/session/RoomSessionUserFigureUpdateEvent.ts
#	packages/session/src/handler/RoomUsersHandler.ts
This commit is contained in:
Lorenzune
2026-05-06 04:23:13 +02:00
24 changed files with 493 additions and 813 deletions
@@ -10,6 +10,7 @@ export class RoomUnitInfoParser implements IMessageParser
private _backgroundId: number;
private _standId: number;
private _overlayId: number;
private _cardBackgroundId: number;
private _nickIcon: string;
private _prefixText: string;
private _prefixColor: string;
@@ -28,6 +29,7 @@ export class RoomUnitInfoParser implements IMessageParser
this._backgroundId = 0;
this._standId = 0;
this._overlayId = 0;
this._cardBackgroundId = 0;
this._nickIcon = '';
this._prefixText = '';
this._prefixColor = '';
@@ -51,6 +53,7 @@ export class RoomUnitInfoParser implements IMessageParser
this._backgroundId = wrapper.readInt();
this._standId = wrapper.readInt();
this._overlayId = wrapper.readInt();
this._cardBackgroundId = (wrapper.bytesAvailable ? wrapper.readInt() : 0);
this._nickIcon = (wrapper.bytesAvailable ? wrapper.readString() : '');
this._prefixText = (wrapper.bytesAvailable ? wrapper.readString() : '');
this._prefixColor = (wrapper.bytesAvailable ? wrapper.readString() : '');
@@ -102,6 +105,11 @@ export class RoomUnitInfoParser implements IMessageParser
return this._overlayId;
}
public get cardBackgroundId(): number
{
return this._cardBackgroundId;
}
public get nickIcon(): string
{
return this._nickIcon;
@@ -37,6 +37,7 @@ export class RoomUnitParser implements IMessageParser
const background = wrapper.readInt();
const stand = wrapper.readInt();
const overlay = wrapper.readInt();
const cardBackground = wrapper.readInt();
let figure = wrapper.readString();
const roomIndex = wrapper.readInt();
const x = wrapper.readInt();
@@ -53,6 +54,7 @@ export class RoomUnitParser implements IMessageParser
user.background = background;
user.stand = stand;
user.overlay = overlay;
user.cardBackground = cardBackground;
user.x = x;
user.y = y;
user.z = z;
@@ -24,6 +24,7 @@ export class UserMessageData
private _background: number = 0;
private _stand: number = 0;
private _overlay: number = 0;
private _cardBackground: number = 0;
private _webID: number = 0;
private _groupID: number = 0;
private _groupStatus: number = 0;
@@ -221,6 +222,16 @@ export class UserMessageData
this._overlay = k;
}
public get cardBackground(): number
{
return this._cardBackground;
}
public set cardBackground(k: number)
{
this._cardBackground = k;
}
public get webID(): number
{
return this._webID;
@@ -19,6 +19,7 @@ export class UserProfileParser implements IMessageParser
private _backgroundId: number;
private _standId: number;
private _overlayId: number;
private _cardBackgroundId: number;
private _nickIcon: string;
private _prefixText: string;
private _prefixColor: string;
@@ -45,6 +46,7 @@ export class UserProfileParser implements IMessageParser
this._backgroundId = 0;
this._standId = 0;
this._overlayId = 0;
this._cardBackgroundId = 0;
this._nickIcon = '';
this._prefixText = '';
this._prefixColor = '';
@@ -86,6 +88,8 @@ export class UserProfileParser implements IMessageParser
this._standId = wrapper.readInt();
this._overlayId = wrapper.readInt();
this._cardBackgroundId = (wrapper.bytesAvailable ? wrapper.readInt() : 0);
if(wrapper.bytesAvailable)
{
this._nickIcon = wrapper.readString();
@@ -185,6 +189,11 @@ export class UserProfileParser implements IMessageParser
return this._overlayId;
}
public get cardBackgroundId(): number
{
return this._cardBackgroundId;
}
public get nickIcon(): string
{
return this._nickIcon;