🆙 Merge Dev to Prod

This commit is contained in:
duckietm
2026-04-14 11:57:23 +02:00
parent af78e9288c
commit bbedf2e5fe
65 changed files with 1769 additions and 68 deletions
@@ -271,6 +271,13 @@ export class OutgoingHeader
public static WIRED_ACTION_SAVE = 2281;
public static WIRED_APPLY_SNAPSHOT = 3373;
public static WIRED_CONDITION_SAVE = 3203;
public static WIRED_MONITOR_REQUEST = 10021;
public static WIRED_ROOM_SETTINGS_REQUEST = 10022;
public static WIRED_ROOM_SETTINGS_SAVE = 10023;
public static WIRED_USER_VARIABLES_REQUEST = 10024;
public static WIRED_USER_VARIABLE_UPDATE = 10025;
public static WIRED_USER_VARIABLE_MANAGE = 10026;
public static WIRED_USER_INSPECT_MOVE = 10027;
public static WIRED_OPEN = 768;
public static WIRED_TRIGGER_SAVE = 1520;
public static GET_ITEM_DATA = 3964;
@@ -503,8 +510,8 @@ export class OutgoingHeader
public static SET_ACTIVE_PREFIX = 7012;
public static DELETE_PREFIX = 7013;
public static PURCHASE_PREFIX = 7014;
// YouTube Room Broadcast
// YouTube Room Broadcast
public static YOUTUBE_ROOM_PLAY = 8001;
public static YOUTUBE_ROOM_WATCHING = 8002;
public static YOUTUBE_ROOM_SETTINGS = 8003;
@@ -4,9 +4,9 @@ export class CatalogAdminCreateOfferComposer implements IMessageComposer<Constru
{
private _data: ConstructorParameters<typeof CatalogAdminCreateOfferComposer>;
constructor(pageId: number, itemId: number, catalogName: string, costCredits: number, costPoints: number, pointsType: number, amount: number, clubOnly: number, extradata: string, haveOffer: boolean, offerIdGroup: number, limitedStack: number, orderNumber: number)
constructor(pageId: number, itemId: number, catalogName: string, costCredits: number, costPoints: number, pointsType: number, amount: number, clubOnly: number, extradata: string, haveOffer: boolean, offerIdGroup: number, limitedStack: number, orderNumber: number, catalogMode: string = 'NORMAL')
{
this._data = [ pageId, itemId, catalogName, costCredits, costPoints, pointsType, amount, clubOnly, extradata, haveOffer, offerIdGroup, limitedStack, orderNumber ];
this._data = [ pageId, itemId, catalogName, costCredits, costPoints, pointsType, amount, clubOnly, extradata, haveOffer, offerIdGroup, limitedStack, orderNumber, catalogMode ];
}
dispose(): void
@@ -4,9 +4,9 @@ export class CatalogAdminCreatePageComposer implements IMessageComposer<Construc
{
private _data: ConstructorParameters<typeof CatalogAdminCreatePageComposer>;
constructor(caption: string, caption2: string, layout: string, iconType: number, minRank: number, visible: boolean, enabled: boolean, orderNum: number, parentId: number)
constructor(caption: string, caption2: string, layout: string, iconType: number, minRank: number, visible: boolean, enabled: boolean, orderNum: number, parentId: number, targetCatalogType: string, catalogMode: string = 'NORMAL')
{
this._data = [ caption, caption2, layout, iconType, minRank, visible, enabled, orderNum, parentId ];
this._data = [ caption, caption2, layout, iconType, minRank, visible, enabled, orderNum, parentId, targetCatalogType, catalogMode ];
}
dispose(): void
@@ -4,9 +4,9 @@ export class CatalogAdminDeleteOfferComposer implements IMessageComposer<Constru
{
private _data: ConstructorParameters<typeof CatalogAdminDeleteOfferComposer>;
constructor(offerId: number)
constructor(offerId: number, catalogMode: string = 'NORMAL')
{
this._data = [ offerId ];
this._data = [ offerId, catalogMode ];
}
dispose(): void
@@ -4,9 +4,9 @@ export class CatalogAdminDeletePageComposer implements IMessageComposer<Construc
{
private _data: ConstructorParameters<typeof CatalogAdminDeletePageComposer>;
constructor(pageId: number)
constructor(pageId: number, catalogMode: string = 'NORMAL')
{
this._data = [ pageId ];
this._data = [ pageId, catalogMode ];
}
dispose(): void
@@ -4,9 +4,9 @@ export class CatalogAdminMoveOfferComposer implements IMessageComposer<Construct
{
private _data: ConstructorParameters<typeof CatalogAdminMoveOfferComposer>;
constructor(offerId: number, orderNumber: number)
constructor(offerId: number, orderNumber: number, catalogMode: string = 'NORMAL')
{
this._data = [ offerId, orderNumber ];
this._data = [ offerId, orderNumber, catalogMode ];
}
dispose(): void
@@ -4,9 +4,9 @@ export class CatalogAdminMovePageComposer implements IMessageComposer<Constructo
{
private _data: ConstructorParameters<typeof CatalogAdminMovePageComposer>;
constructor(pageId: number, newParentId: number, newIndex: number)
constructor(pageId: number, newParentId: number, newIndex: number, catalogMode: string = 'NORMAL')
{
this._data = [ pageId, newParentId, newIndex ];
this._data = [ pageId, newParentId, newIndex, catalogMode ];
}
dispose(): void
@@ -4,9 +4,9 @@ export class CatalogAdminSaveOfferComposer implements IMessageComposer<Construct
{
private _data: ConstructorParameters<typeof CatalogAdminSaveOfferComposer>;
constructor(offerId: number, pageId: number, itemId: number, catalogName: string, costCredits: number, costPoints: number, pointsType: number, amount: number, clubOnly: number, extradata: string, haveOffer: boolean, offerIdGroup: number, limitedStack: number, orderNumber: number)
constructor(offerId: number, pageId: number, itemId: number, catalogName: string, costCredits: number, costPoints: number, pointsType: number, amount: number, clubOnly: number, extradata: string, haveOffer: boolean, offerIdGroup: number, limitedStack: number, orderNumber: number, catalogMode: string = 'NORMAL')
{
this._data = [ offerId, pageId, itemId, catalogName, costCredits, costPoints, pointsType, amount, clubOnly, extradata, haveOffer, offerIdGroup, limitedStack, orderNumber ];
this._data = [ offerId, pageId, itemId, catalogName, costCredits, costPoints, pointsType, amount, clubOnly, extradata, haveOffer, offerIdGroup, limitedStack, orderNumber, catalogMode ];
}
dispose(): void
@@ -4,9 +4,9 @@ export class CatalogAdminSavePageComposer implements IMessageComposer<Constructo
{
private _data: ConstructorParameters<typeof CatalogAdminSavePageComposer>;
constructor(pageId: number, caption: string, caption2: string, layout: string, iconType: number, minRank: number, visible: boolean, enabled: boolean, orderNum: number, parentId: number, headline: string, teaser: string, textDetails: string)
constructor(pageId: number, caption: string, caption2: string, layout: string, iconType: number, minRank: number, visible: boolean, enabled: boolean, orderNum: number, parentId: number, headline: string, teaser: string, textDetails: string, targetCatalogType: string, catalogMode: string = 'NORMAL')
{
this._data = [ pageId, caption, caption2, layout, iconType, minRank, visible, enabled, orderNum, parentId, headline, teaser, textDetails ];
this._data = [ pageId, caption, caption2, layout, iconType, minRank, visible, enabled, orderNum, parentId, headline, teaser, textDetails, targetCatalogType, catalogMode ];
}
dispose(): void
@@ -55,6 +55,7 @@ export * from './room/furniture/presents';
export * from './room/furniture/toner';
export * from './room/furniture/wall';
export * from './room/furniture/youtube';
export * from './room/youtube';
export * from './room/layout';
export * from './room/pets';
export * from './room/session';
@@ -17,4 +17,3 @@ export * from './RedeemItemClothingComposer';
export * from './session';
export * from './unit';
export * from './unit/chat';
export * from './youtube';
@@ -6,8 +6,6 @@ export class YouTubeRoomWatchingComposer implements IMessageComposer<any[]>
constructor(watching: boolean)
{
// Send as int (0/1) instead of bare boolean to avoid
// serialization ambiguity in the Nitro wire protocol.
this._data = [watching ? 1 : 0];
}
@@ -0,0 +1,21 @@
import { IMessageComposer } from '@nitrots/api';
export class WiredMonitorRequestComposer implements IMessageComposer<ConstructorParameters<typeof WiredMonitorRequestComposer>>
{
private _data: ConstructorParameters<typeof WiredMonitorRequestComposer>;
constructor(action: number = 0)
{
this._data = [ action ];
}
public getMessageArray()
{
return this._data;
}
public dispose(): void
{
return;
}
}
@@ -0,0 +1,14 @@
import { IMessageComposer } from '@nitrots/api';
export class WiredRoomSettingsRequestComposer implements IMessageComposer<ConstructorParameters<typeof WiredRoomSettingsRequestComposer>>
{
public getMessageArray()
{
return [];
}
public dispose(): void
{
return;
}
}
@@ -0,0 +1,21 @@
import { IMessageComposer } from '@nitrots/api';
export class WiredRoomSettingsSaveComposer implements IMessageComposer<ConstructorParameters<typeof WiredRoomSettingsSaveComposer>>
{
private _data: ConstructorParameters<typeof WiredRoomSettingsSaveComposer>;
constructor(inspectMask: number, modifyMask: number)
{
this._data = [ inspectMask, modifyMask ];
}
public getMessageArray()
{
return this._data;
}
public dispose(): void
{
return;
}
}
@@ -0,0 +1,21 @@
import { IMessageComposer } from '@nitrots/api';
export class WiredUserInspectMoveComposer implements IMessageComposer<ConstructorParameters<typeof WiredUserInspectMoveComposer>>
{
private _data: ConstructorParameters<typeof WiredUserInspectMoveComposer>;
constructor(roomUnitId: number, x: number, y: number, direction: number)
{
this._data = [ roomUnitId, x, y, direction ];
}
public getMessageArray()
{
return this._data;
}
public dispose(): void
{
return;
}
}
@@ -0,0 +1,21 @@
import { IMessageComposer } from '@nitrots/api';
export class WiredUserVariableManageComposer implements IMessageComposer<ConstructorParameters<typeof WiredUserVariableManageComposer>>
{
private _data: ConstructorParameters<typeof WiredUserVariableManageComposer>;
constructor(action: number, targetType: number, targetId: number, variableItemId: number, value: number)
{
this._data = [ action, targetType, targetId, variableItemId, value ];
}
public getMessageArray()
{
return this._data;
}
public dispose(): void
{
return;
}
}
@@ -0,0 +1,21 @@
import { IMessageComposer } from '@nitrots/api';
export class WiredUserVariableUpdateComposer implements IMessageComposer<ConstructorParameters<typeof WiredUserVariableUpdateComposer>>
{
private _data: ConstructorParameters<typeof WiredUserVariableUpdateComposer>;
constructor(targetType: number, targetId: number, variableItemId: number, value: number)
{
this._data = [ targetType, targetId, variableItemId, value ];
}
public getMessageArray()
{
return this._data;
}
public dispose(): void
{
return;
}
}
@@ -0,0 +1,14 @@
import { IMessageComposer } from '@nitrots/api';
export class WiredUserVariablesRequestComposer implements IMessageComposer<ConstructorParameters<typeof WiredUserVariablesRequestComposer>>
{
public getMessageArray()
{
return [];
}
public dispose(): void
{
return;
}
}
@@ -4,3 +4,10 @@ export * from './RoomMuteComposer';
export * from './UpdateActionMessageComposer';
export * from './UpdateConditionMessageComposer';
export * from './UpdateTriggerMessageComposer';
export * from './WiredMonitorRequestComposer';
export * from './WiredRoomSettingsRequestComposer';
export * from './WiredRoomSettingsSaveComposer';
export * from './WiredUserInspectMoveComposer';
export * from './WiredUserVariableManageComposer';
export * from './WiredUserVariablesRequestComposer';
export * from './WiredUserVariableUpdateComposer';